[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 828a6eb 5/7: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 828a6eb 5/7: Merge from origin/emacs-26 |
Date: |
Sun, 21 Apr 2019 10:55:59 -0400 (EDT) |
branch: master
commit 828a6eb64f66b2452d0eb0f5b54f274320f28bba
Merge: 86a8b49 cd2204f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
cd2204f Add a package: line to c-submit-bug-report.
a992dca ; Remove empty NEWS sections
ea67270 ; Add NEWS sections for 26.3
Conflicts:
etc/NEWS
---
etc/NEWS.26 | 36 +++++++++++++++++++++++++++---------
lisp/progmodes/cc-mode.el | 20 +++++++++++++++++++-
2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index f570f75..aa583f4 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -16,6 +16,33 @@ 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
** Building Emacs with the '--with-xwidgets' option now requires WebKit2.
@@ -30,9 +57,6 @@ 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
** Emacs is now compliant with the latest version 11.0 of the Unicode Standard.
@@ -42,9 +66,6 @@ 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
** Dired
@@ -116,9 +137,6 @@ 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
** shadowfile config files have changed their syntax.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index aea9c7f..35de756 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -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)))))))
- [Emacs-diffs] master updated (3f90aa7 -> d9664f0), Glenn Morris, 2019/04/21
- [Emacs-diffs] master 828a6eb 5/7: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master d9664f0 7/7: Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master 5185b39 2/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master d2b78ea 6/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master 86a8b49 4/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master e8d4839 3/7: Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master 50d00e7 1/7: Merge from origin/emacs-26, Glenn Morris, 2019/04/21