diff options
author | Eli Zaretskii <eliz@gnu.org> | 2019-04-21 14:21:52 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2019-04-21 14:21:52 +0300 |
commit | fd6ff29506cd55ace8fdfa1c3f370cbc7e074ec2 (patch) | |
tree | 794cb9b0a28e6cedeb6ad8bbb322b7ac7c9b89ad | |
parent | bacdaa5b25f9946290d81325e8f7b94c1705c0a2 (diff) | |
parent | cd2204f0ee018ef29c2d8536b7e6d41dc9b10052 (diff) | |
download | emacs-fd6ff29506cd55ace8fdfa1c3f370cbc7e074ec2.tar.gz |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | admin/admin.el | 5 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | etc/NEWS | 36 | ||||
-rw-r--r-- | lisp/progmodes/cc-mode.el | 20 | ||||
-rw-r--r-- | msdos/sed2v2.inp | 2 | ||||
-rw-r--r-- | nt/README.W32 | 2 |
7 files changed, 54 insertions, 15 deletions
@@ -2,7 +2,7 @@ Copyright (C) 2001-2019 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 26.2 of GNU Emacs, the extensible, +This directory tree holds version 26.2.50 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/admin/admin.el b/admin/admin.el index c1f6174874b..fda6708d4cd 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -138,7 +138,10 @@ Root must be the root of an Emacs source tree." (if (eq 2 (length newversion)) 0 1)))) (majorbump (and oldversion (not (equal oldmajor newmajor)))) (minorbump (and oldversion (not majorbump) - (not (equal (cadr oldversion) (cadr newversion))))) + (or (not (equal (cadr oldversion) + (cadr newversion))) + (and (equal (cadr oldversion) (cadr newversion)) + (equal (nth 2 newversion) 50))))) (newsfile (expand-file-name "etc/NEWS" root)) (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) (unless (> (length newversion) 2) ; pretest or release candidate? diff --git a/configure.ac b/configure.ac index 5ad3cda6e9d..cf3fbd9d503 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. AC_PREREQ(2.65) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT(GNU Emacs, 26.2, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 26.2.50, bug-gnu-emacs@gnu.org) dnl Set emacs_config_options to the options of 'configure', quoted for the shell, dnl and then quoted again for a C string. Separate options with spaces. @@ -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 5283cfea6eb..aa2a286dbe9 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -2220,6 +2220,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." @@ -2284,9 +2285,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))))))) diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 5141047a09f..26d0a77b058 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -66,7 +66,7 @@ /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ -/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.2"/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.2.50"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --git a/nt/README.W32 b/nt/README.W32 index da5151fb024..58d1adf6e13 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2019 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 26.2 for MS-Windows + Emacs version 26.2.50 for MS-Windows This README file describes how to set up and run a precompiled distribution of the latest version of GNU Emacs for MS-Windows. You |