Commit 828a6eb6 authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

cd2204f0 Add a package: line to c-submit-bug-report.
a992dcab ; Remove empty NEWS sections
ea672707 ; Add NEWS sections for 26.3

Conflicts:
	etc/NEWS
parents 86a8b49b cd2204f0
......@@ -15,6 +15,33 @@ in older Emacs versions.
You can narrow news to a specific version by calling 'view-emacs-news'
with a prefix argument or by typing 'C-u C-h C-n'.
* Installation Changes in Emacs 26.3
* Startup Changes in Emacs 26.3
* Changes in Emacs 26.3
* Editing Changes in Emacs 26.3
* Changes in Specialized Modes and Packages in Emacs 26.3
* New Modes and Packages in Emacs 26.3
* Incompatible Lisp Changes in Emacs 26.3
* Lisp Changes in Emacs 26.3
* Changes in Emacs 26.3 on Non-Free Operating Systems
* Installation Changes in Emacs 26.2
......@@ -29,9 +56,6 @@ The emacs-module.h file is now installed in the system-wide include
directory as part of the Emacs installation. This allows to build
Emacs modules outside of the Emacs source tree.
* Startup Changes in Emacs 26.2
* Changes in Emacs 26.2
......@@ -41,9 +65,6 @@ Emacs modules outside of the Emacs source tree.
Default t means don't try to load color fonts when using Xft, as they
often cause crashes. Set it to nil if you really need those fonts.
* Editing Changes in Emacs 26.2
* Changes in Specialized Modes and Packages in Emacs 26.2
......@@ -115,9 +136,6 @@ it now shows the global revision number, in the form of its changeset
hash value. To get back the previous behavior, customize the new
option 'vc-hg-symbolic-revision-styles' to the value '("{rev}")'.
* New Modes and Packages in Emacs 26.2
* Incompatible Lisp Changes in Emacs 26.2
......
......@@ -2584,6 +2584,7 @@ Key bindings:
;; reporter-submit-bug-report requires sendmail.
(declare-function mail-position-on-field "sendmail" (field &optional soft))
(declare-function mail-text "sendmail" ())
(defun c-submit-bug-report ()
"Submit via mail a bug report on CC Mode."
......@@ -2648,9 +2649,26 @@ Key bindings:
vars)
(lambda ()
(run-hooks 'c-prepare-bug-report-hook)
(let ((hook (get mail-user-agent 'hookvar)))
(if hook
(add-hook hook
(lambda ()
(save-excursion
(mail-text)
(unless (looking-at "Package: ")
(insert "Package: " c-mode-bug-package "\n\n"))))
nil t)))
(save-excursion
(or (mail-position-on-field "X-Debbugs-Package")
(insert c-mode-bug-package)))
(insert c-mode-bug-package))
;; For mail clients that do not support X- headers.
;; Sadly reporter-submit-bug-report unconditionally adds
;; a blank line before SALUTATION, so we can't use that.
;; It is also sad that reporter offers no way to leave point
;; after this line we are now inserting.
(mail-text)
(or (looking-at "Package:")
(insert "Package: " c-mode-bug-package)))
(insert (format "Buffer Style: %s\nc-emacs-features: %s\n"
style c-features)))))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment