commit 65dc67c87553bec4c8b36432246b13f09d653118 (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Fri Sep 23 10:40:47 2016 +0300 Bump the version to 25.2.50 * README: * configure.ac: * etc/NEWS: * msdos/sed2v2.inp: Increment the Emacs version to 25.2.50. diff --git a/README b/README index 35a31db..ffa92c6 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 25.1.50 of GNU Emacs, the extensible, +This directory tree holds version 25.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/configure.ac b/configure.ac index 6488f90..8479b07 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT(GNU Emacs, 25.1.50, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 25.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. diff --git a/etc/NEWS b/etc/NEWS index 9b992d0..3149d91 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -21,9 +21,8 @@ Temporary note: --- means no change in the manuals is needed. When you add a new item, use the appropriate mark if you are sure it applies, otherwise leave it unmarked. - -* Installation Changes in Emacs 25.2 +* Installation Changes in Emacs 25.3 ** By default libgnutls is now required when building Emacs. Use 'configure --with-gnutls=no' to build even when GnuTLS is missing. @@ -57,10 +56,10 @@ erc-emacs-build-time. affected by this, as SGI stopped supporting IRIX in December 2013. -* Startup Changes in Emacs 25.2 +* Startup Changes in Emacs 25.3 -* Changes in Emacs 25.2 +* Changes in Emacs 25.3 +++ ** The new function 'call-shell-region' executes a command in an @@ -207,7 +206,7 @@ questions, with a handy way to display help texts. ** 'switch-to-buffer-preserve-window-point' now defaults to t. -* Editing Changes in Emacs 25.2 +* Editing Changes in Emacs 25.3 +++ ** New bindings for 'query-replace-map'. @@ -225,7 +224,7 @@ Instead of only checking the modification time, Emacs now also checks the file's actual content before prompting the user. -* Changes in Specialized Modes and Packages in Emacs 25.2 +* Changes in Specialized Modes and Packages in Emacs 25.3 ** Ibuffer @@ -450,12 +449,12 @@ contents of the buffer to determine whether it's a C or C++ source file. -* New Modes and Packages in Emacs 25.2 +* New Modes and Packages in Emacs 25.3 ** New Elisp data-structure library 'radix-tree'. -* Incompatible Lisp Changes in Emacs 25.2 +* Incompatible Lisp Changes in Emacs 25.3 +++ ** Resizing a frame no longer runs 'window-configuration-change-hook'. @@ -484,7 +483,7 @@ now generate less chatter and more-compact diagnostics. The auxiliary function 'check-declare-errmsg' has been removed. -* Lisp Changes in Emacs 25.2 +* Lisp Changes in Emacs 25.3 ** New function undo-amalgamate-change-group to get rid of undo-boundaries between two states. @@ -599,7 +598,7 @@ collection). can be used for creation of temporary files of remote or mounted directories. -* Changes in Emacs 25.2 on Non-Free Operating Systems +* Changes in Emacs 25.3 on Non-Free Operating Systems ** Intercepting hotkeys on Windows 7 and later now works better. The new keyboard hooking code properly grabs system hotkeys such as diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index d1a6eab..2c1855a 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -66,7 +66,7 @@ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ -/^#undef VERSION/s/^.*$/#define VERSION "25.1.50"/ +/^#undef VERSION/s/^.*$/#define VERSION "25.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/ commit 87925f1125acf95439e4563f9a30864cadf7cafb Author: Tino Calancha Date: Fri Sep 23 15:16:15 2016 +0900 ibuffer-do-view-other-frame: Display each buffer in a new frame * lisp/ibuffer.el (ibuffer-do-view-1): When TYPE equals 'other-frame, then display each buffer in a new frame (Bug#24086). diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 0336f1d..e965535 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -1143,17 +1143,17 @@ a new window in the current frame, splitting vertically." (ibuffer-do-view-1 (if other-frame 'other-frame 'horizontally))) (defun ibuffer-do-view-1 (type) - (let ((marked-bufs (ibuffer-get-marked-buffers))) - (when (null marked-bufs) - (setq marked-bufs (list (ibuffer-current-buffer t)))) + (let ((marked-bufs (or (ibuffer-get-marked-buffers) + (list (ibuffer-current-buffer t))))) (unless (and (eq type 'other-frame) (not ibuffer-expert) (> (length marked-bufs) 3) (not (y-or-n-p (format "Really create a new frame for %s buffers? " (length marked-bufs))))) - (set-buffer-modified-p nil) - (delete-other-windows) - (switch-to-buffer (pop marked-bufs)) + (unless (eq type 'other-frame) + (set-buffer-modified-p nil) + (delete-other-windows) + (switch-to-buffer (pop marked-bufs))) (let ((height (/ (1- (if (eq type 'horizontally) (frame-width) (frame-height))) (1+ (length marked-bufs))))) commit 0041ce81897ef837d04674b634720645379f3b18 Author: Paul Eggert Date: Thu Sep 22 14:52:59 2016 -0700 Update from gnulib This incorporates: 2016-09-22 stdint: port to GCC 7 2016-09-22 limits-h, stdint: don't assume extensions * doc/misc/texinfo.tex, m4/limits-h.m4, m4/stdint.m4: Copy from gnulib. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 3d41530..c8913ab 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2016-09-18.11} +\def\texinfoversion{2016-09-18.18} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -2296,7 +2296,7 @@ \font\ssecsy=cmsy10 scaled 1315 \def\ssececsize{1200} -% Reduced fonts for @acro in text (10pt). +% Reduced fonts for @acronym in text (10pt). \def\reducednominalsize{10pt} \setfont\reducedrm\rmshape{10}{1000}{OT1} \setfont\reducedtt\ttshape{10}{1000}{OT1TT} @@ -2429,7 +2429,7 @@ \font\ssecsy=cmsy10 \def\ssececsize{1000} -% Reduced fonts for @acro in text (9pt). +% Reduced fonts for @acronym in text (9pt). \def\reducednominalsize{9pt} \setfont\reducedrm\rmshape{9}{1000}{OT1} \setfont\reducedtt\ttshape{9}{1000}{OT1TT} @@ -2564,56 +2564,28 @@ \csname\curfontstyle\endcsname }% -\def\textfonts{% - \def\curfontsize{text}% - \def\lsize{reduced}\def\lllsize{smaller}% - \rmisboldfalse - \assignfonts{text}% - \resetmathfonts \setleading{\textleading}} -\def\titlefonts{% - \def\curfontsize{title}% - \def\lsize{chap}\def\lllsize{subsec}% - \rmisboldtrue - \assignfonts{title}% - \resetmathfonts \setleading{27pt}} +\def\definefontsetatsize#1#2#3#4#5{% +\expandafter\def\csname #1fonts\endcsname{% + \def\curfontsize{#1}% + \def\lsize{#2}\def\lllsize{#3}% + \csname rmisbold#5\endcsname + \assignfonts{#1}% + \resetmathfonts + \setleading{#4}% +}} + +\definefontsetatsize{text} {reduced}{smaller}{\textleading}{false} +\definefontsetatsize{title} {chap} {subsec} {27pt} {true} +\definefontsetatsize{chap} {sec} {text} {19pt} {true} +\definefontsetatsize{sec} {subsec} {reduced}{17pt} {true} +\definefontsetatsize{ssec} {text} {small} {15pt} {true} +\definefontsetatsize{reduced}{small} {smaller}{10.5pt}{false} +\definefontsetatsize{small} {smaller}{smaller}{10.5pt}{false} +\definefontsetatsize{smaller}{smaller}{smaller}{9.5pt} {false} + \def\titlefont#1{{\titlefonts\rm #1}} -\def\chapfonts{% - \def\curfontsize{chap}% - \def\lsize{sec}\def\lllsize{text}% - \rmisboldtrue - \assignfonts{chap}% - \resetmathfonts \setleading{19pt}} -\def\secfonts{% - \def\curfontsize{sec}% - \def\lsize{subsec}\def\lllsize{reduced}% - \rmisboldtrue - \assignfonts{sec}% - \resetmathfonts \setleading{17pt}} -\def\subsecfonts{% - \def\curfontsize{ssec}% - \def\lsize{text}\def\lllsize{small}% - \rmisboldtrue - \assignfonts{ssec}% - \resetmathfonts \setleading{15pt}} -\let\subsubsecfonts = \subsecfonts -\def\reducedfonts{% - \def\curfontsize{reduced}% - \def\lsize{small}\def\lllsize{smaller}% - \rmisboldfalse - \assignfonts{reduced}% - \resetmathfonts \setleading{10.5pt}} -\def\smallfonts{% - \def\curfontsize{small}% - \def\lsize{smaller}\def\lllsize{smaller}% - \rmisboldfalse - \assignfonts{small}% - \resetmathfonts \setleading{10.5pt}} -\def\smallerfonts{% - \def\curfontsize{smaller}% - \def\lsize{smaller}\def\lllsize{smaller}% - \rmisboldfalse - \assignfonts{smaller}% - \resetmathfonts \setleading{9.5pt}} +\let\subsecfonts = \ssecfonts +\let\subsubsecfonts = \ssecfonts % Define these just so they can be easily changed for other fonts. \def\angleleft{$\langle$} diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index 9130786..31fdf0a 100644 --- a/m4/limits-h.m4 +++ b/m4/limits-h.m4 @@ -14,7 +14,9 @@ AC_DEFUN_ONCE([gl_LIMITS_H], AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.], [gl_cv_header_limits_width], [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif #include int ullw = ULLONG_WIDTH;]])], [gl_cv_header_limits_width=yes], diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 52f7814..fa6f103 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 45 +# stdint.m4 serial 47 dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -321,6 +321,9 @@ int32_t i32 = INT32_C (0x7fffffff); [AC_LANG_PROGRAM([[ /* Work if build is not clean. */ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif #include ]gl_STDINT_INCLUDES[ int iw = UINTMAX_WIDTH; @@ -343,7 +346,8 @@ int32_t i32 = INT32_C (0x7fffffff); fi # The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. - test -z "$STDINT_H" || LIMITS_H=limits.h + LIMITS_H=limits.h + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) AC_SUBST([HAVE_C99_STDINT_H]) AC_SUBST([HAVE_SYS_BITYPES_H]) commit 0b6d8053eaeff2eb58472d28057425c63d24e880 Author: Alan Mackenzie Date: Thu Sep 22 09:56:55 2016 +0000 * lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): Fix coding error diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 9bd78fb..5a26c0f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -8633,7 +8633,7 @@ comment at the start of cc-engine.el for more info." (when (and got-identifier (looking-at c-after-suffixed-type-decl-key) (or (eq context 'top) - (and eq context nil + (and (eq context nil) (match-beginning 1))) (if (and got-parens (not got-prefix)