Now on revision 114088. ------------------------------------------------------------ revno: 114088 fixes bug: http://debbugs.gnu.org/15170 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 19:12:32 -0700 message: Tweak to Makefile rules that list *.el files * lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs): * test/automated/Makefile.in (setwins): Avoid leading space in $wins. Otherwise the sed command used by eg compile-main ends up containing "/*.el". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-09-01 01:29:50 +0000 +++ lisp/ChangeLog 2013-09-01 02:12:32 +0000 @@ -1,5 +1,9 @@ 2013-09-01 Glenn Morris + * Makefile.in (setwins, setwins_almost, setwins_for_subdirs): + Avoid leading space in $wins. Otherwise the sed command used by + eg compile-main ends up containing "/*.el". (Bug#15170) + * frame.el (frame-background-mode): Doc fix. (Bug#15226) 2013-08-30 Glenn Morris === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2013-08-28 06:01:52 +0000 +++ lisp/Makefile.in 2013-09-01 02:12:32 +0000 @@ -118,7 +118,7 @@ setwins=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* ) ;; \ - *) wins="$$wins $$file" ;; \ + *) wins="$$wins$${wins:+ }$$file" ;; \ esac; \ done @@ -126,7 +126,7 @@ setwins_almost=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \ - *) wins="$$wins $$file" ;; \ + *) wins="$$wins$${wins:+ }$$file" ;; \ esac; \ done @@ -134,7 +134,7 @@ setwins_for_subdirs=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \ - *) wins="$$wins $$file" ;; \ + *) wins="$$wins$${wins:+ }$$file" ;; \ esac; \ done === modified file 'test/ChangeLog' --- test/ChangeLog 2013-08-28 06:01:52 +0000 +++ test/ChangeLog 2013-09-01 02:12:32 +0000 @@ -1,3 +1,9 @@ +2013-09-01 Glenn Morris + + * automated/Makefile.in (setwins): Avoid leading space in $wins. + Otherwise the sed command used by eg compile-main ends up + containing "/*.el". (Bug#15170) + 2013-08-28 Paul Eggert * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, === modified file 'test/automated/Makefile.in' --- test/automated/Makefile.in 2013-08-28 06:01:52 +0000 +++ test/automated/Makefile.in 2013-09-01 02:12:32 +0000 @@ -52,7 +52,7 @@ setwins=subdirs=`find . -type d -print`; \ for file in $$subdirs; do \ case $$file in */.* | */.*/* | */=* | ./data* ) ;; \ - *) wins="$$wins $$file" ;; \ + *) wins="$$wins$${wins:+ }$$file" ;; \ esac; \ done ------------------------------------------------------------ revno: 114087 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 18:52:54 -0700 message: Further tweak previous change diff: === modified file 'lisp/frame.el' --- lisp/frame.el 2013-09-01 01:32:41 +0000 +++ lisp/frame.el 2013-09-01 01:52:54 +0000 @@ -875,7 +875,8 @@ if you want Emacs to examine the brightness for you. If you change this without using customize, you should use -`frame-set-background-mode' to update existing frames." +`frame-set-background-mode' to update existing frames; +e.g. (mapc 'frame-set-background-mode (frame-list))." :group 'faces :set #'(lambda (var value) (set-default var value) ------------------------------------------------------------ revno: 114086 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 18:32:41 -0700 message: Tweak previous change diff: === modified file 'lisp/frame.el' --- lisp/frame.el 2013-09-01 01:29:50 +0000 +++ lisp/frame.el 2013-09-01 01:32:41 +0000 @@ -874,8 +874,8 @@ `light' if your background is light, or nil (automatic by default) if you want Emacs to examine the brightness for you. -If you change this without using customize after Emacs has started, -you should use `frame-set-background-mode' to update existing frames." +If you change this without using customize, you should use +`frame-set-background-mode' to update existing frames." :group 'faces :set #'(lambda (var value) (set-default var value) ------------------------------------------------------------ revno: 114085 fixes bug: http://debbugs.gnu.org/15226 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 18:29:50 -0700 message: * lisp/frame.el (frame-background-mode): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-08-30 17:40:39 +0000 +++ lisp/ChangeLog 2013-09-01 01:29:50 +0000 @@ -1,3 +1,7 @@ +2013-09-01 Glenn Morris + + * frame.el (frame-background-mode): Doc fix. (Bug#15226) + 2013-08-30 Glenn Morris * emacs-lisp/bytecomp.el (byte-recompile-directory): === modified file 'lisp/frame.el' --- lisp/frame.el 2013-08-13 02:45:12 +0000 +++ lisp/frame.el 2013-09-01 01:29:50 +0000 @@ -872,8 +872,10 @@ "The brightness of the background. Set this to the symbol `dark' if your background color is dark, `light' if your background is light, or nil (automatic by default) -if you want Emacs to examine the brightness for you. Don't set this -variable with `setq'; this won't have the expected effect." +if you want Emacs to examine the brightness for you. + +If you change this without using customize after Emacs has started, +you should use `frame-set-background-mode' to update existing frames." :group 'faces :set #'(lambda (var value) (set-default var value) ------------------------------------------------------------ revno: 114084 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 18:23:06 -0700 message: * lispintro/emacs-lisp-intro.texi (beginning-of-buffer complete): Put back a version of the removed paragraph about raw prefix arg. diff: === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-09-01 01:18:41 +0000 +++ doc/lispintro/ChangeLog 2013-09-01 01:23:06 +0000 @@ -1,3 +1,8 @@ +2013-09-01 Glenn Morris + + * emacs-lisp-intro.texi (beginning-of-buffer complete): + Put back a version of the removed paragraph about raw prefix arg. + 2013-09-01 Dani Moncayo * emacs-lisp-intro.texi (beginning-of-buffer complete): === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2013-09-01 01:18:41 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2013-09-01 01:23:06 +0000 @@ -6399,7 +6399,10 @@ means that the cursor is always located @emph{at least} the requested tenths of the way through the buffer, which is a nicety that is, perhaps, not necessary, but which, if it did not occur, would be sure -to draw complaints. +to draw complaints. (The @code{(not (consp arg))} portion is so that +if you specify the command with a @kbd{C-u}, but without a number, +that is to say, if the `raw prefix argument' is simply a cons cell, +the command does not put you at the beginning of the second line.) @node Second Buffer Related Review @section Review ------------------------------------------------------------ revno: 114083 fixes bug: http://debbugs.gnu.org/15085 author: Dani Moncayo committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 18:18:41 -0700 message: * emacs-lisp-intro.texi (beginning-of-buffer complete): Update function details. diff: === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-08-28 06:01:52 +0000 +++ doc/lispintro/ChangeLog 2013-09-01 01:18:41 +0000 @@ -1,3 +1,8 @@ +2013-09-01 Dani Moncayo + + * emacs-lisp-intro.texi (beginning-of-buffer complete): + Update function details. (Bug#15085) + 2013-08-28 Paul Eggert * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2013-08-12 00:09:11 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2013-09-01 01:18:41 +0000 @@ -6323,7 +6323,7 @@ (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) (point-min)))) - (if arg (forward-line 1))) + (if (and arg (not (consp arg))) (forward-line 1))) @end group @end smallexample @@ -6390,7 +6390,7 @@ invoked with an argument: @smallexample -(if arg (forward-line 1))) +(if (and arg (not (consp arg))) (forward-line 1)) @end smallexample @noindent @@ -6401,13 +6401,6 @@ perhaps, not necessary, but which, if it did not occur, would be sure to draw complaints. -On the other hand, it also means that if you specify the command with -a @kbd{C-u}, but without a number, that is to say, if the `raw prefix -argument' is simply a cons cell, then the command puts you at the -beginning of the second line @dots{} I don't know whether this is -intended or whether no one has dealt with the code to avoid this -happening. - @node Second Buffer Related Review @section Review ------------------------------------------------------------ revno: 114082 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 13:00:22 -0700 message: * configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio, and voxware to oss. diff: === modified file 'ChangeLog' --- ChangeLog 2013-08-31 19:54:17 +0000 +++ ChangeLog 2013-08-31 20:00:22 +0000 @@ -1,3 +1,8 @@ +2013-08-31 Glenn Morris + + * configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio, + and voxware to oss. + 2013-08-31 Ulrich Müller * configure.ac: Allow for --with-sound=voxware that will enable === modified file 'configure.ac' --- configure.ac 2013-08-31 19:54:17 +0000 +++ configure.ac 2013-08-31 20:00:22 +0000 @@ -167,12 +167,12 @@ AC_DEFINE_UNQUOTED(MAILHOST, ["$withval"], [String giving fallback POP mail host.])) AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE], - [compile with sound support (VALUE one of: yes, ossaudio, alsa, voxware, no; + [compile with sound support (VALUE one of: yes, alsa, oss, bsd-ossaudio, no; default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW.])], [ case "${withval}" in - yes|no|ossaudio|alsa|voxware) val=$withval ;; + yes|no|alsa|oss|bsd-ossaudio) val=$withval ;; *) AC_MSG_ERROR([`--with-sound=$withval' is invalid; -this option's value should be `yes', `no', `ossaudio', `alsa', or `voxware'.]) +this option's value should be `yes', `no', `alsa', `oss', or `bsd-ossaudio'.]) ;; esac with_sound=$val @@ -1307,15 +1307,15 @@ #include #endif ]) - test "${with_sound}" = "voxware" && test "${have_sound_header}" != "yes" && \ - AC_MSG_ERROR([OSS/Voxware sound support requested but not found.]) + test "${with_sound}" = "oss" && test "${have_sound_header}" != "yes" && \ + AC_MSG_ERROR([OSS sound support requested but not found.]) - if test "${with_sound}" = "ossaudio" || test "${with_sound}" = "yes"; then + if test "${with_sound}" = "bsd-ossaudio" || test "${with_sound}" = "yes"; then # Emulation library used on NetBSD. AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) - test "${with_sound}" = "ossaudio" && test -z "$LIBSOUND" && \ - AC_MSG_ERROR([ossaudio sound support requested but not found.]) - dnl FIXME? If we did find ossaudio, should we set with_sound=ossaudio? + test "${with_sound}" = "bsd-ossaudio" && test -z "$LIBSOUND" && \ + AC_MSG_ERROR([bsd-ossaudio sound support requested but not found.]) + dnl FIXME? If we did find ossaudio, should we set with_sound=bsd-ossaudio? dnl Traditionally, we go on to check for alsa too. Does that make sense? fi AC_SUBST(LIBSOUND) ------------------------------------------------------------ revno: 114081 fixes bug: http://debbugs.gnu.org/15067 author: Ulrich Müller committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 12:54:17 -0700 message: * configure.ac: Allow for --with-sound=voxware that will enable sound but otherwise disable ALSA. This will use the OSS device, typically /dev/dsp, for sound output. diff: === modified file 'ChangeLog' --- ChangeLog 2013-08-31 18:26:59 +0000 +++ ChangeLog 2013-08-31 19:54:17 +0000 @@ -1,3 +1,9 @@ +2013-08-31 Ulrich Müller + + * configure.ac: Allow for --with-sound=voxware that will enable + sound but otherwise disable ALSA. This will use the OSS device, + typically /dev/dsp, for sound output. (Bug#15067) + 2013-08-31 Glenn Morris * make-dist: Update for nt/INSTALL* changes. === modified file 'configure.ac' --- configure.ac 2013-08-28 01:37:13 +0000 +++ configure.ac 2013-08-31 19:54:17 +0000 @@ -167,12 +167,12 @@ AC_DEFINE_UNQUOTED(MAILHOST, ["$withval"], [String giving fallback POP mail host.])) AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE], - [compile with sound support (VALUE one of: yes, ossaudio, alsa, no; + [compile with sound support (VALUE one of: yes, ossaudio, alsa, voxware, no; default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW.])], [ case "${withval}" in - yes|no|ossaudio|alsa) val=$withval ;; + yes|no|ossaudio|alsa|voxware) val=$withval ;; *) AC_MSG_ERROR([`--with-sound=$withval' is invalid; -this option's value should be `yes', `no', `ossaudio', or `alsa'.]) +this option's value should be `yes', `no', `ossaudio', `alsa', or `voxware'.]) ;; esac with_sound=$val @@ -1307,6 +1307,9 @@ #include #endif ]) + test "${with_sound}" = "voxware" && test "${have_sound_header}" != "yes" && \ + AC_MSG_ERROR([OSS/Voxware sound support requested but not found.]) + if test "${with_sound}" = "ossaudio" || test "${with_sound}" = "yes"; then # Emulation library used on NetBSD. AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) ------------------------------------------------------------ revno: 114080 fixes bug: http://debbugs.gnu.org/15145 author: Ulrich Müller committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 12:49:52 -0700 message: * doc/emacs/xresources.texi (Motif Resources): Rename from LessTif Resources. Update xrefs. * doc/emacs/emacs.texi: Update menu. * doc/man/emacs.1: Update manual links. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-08-28 06:01:52 +0000 +++ doc/emacs/ChangeLog 2013-08-31 19:49:52 +0000 @@ -1,3 +1,9 @@ +2013-08-31 Ulrich Müller + + * xresources.texi (Motif Resources): + Rename from LessTif Resources. Update xrefs. (Bug#15145) + * emacs.texi: Update menu. + 2013-08-28 Paul Eggert * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2013-07-31 16:20:13 +0000 +++ doc/emacs/emacs.texi 2013-08-31 19:49:52 +0000 @@ -1189,7 +1189,7 @@ * Resources:: Using X resources with Emacs (in general). * Table of Resources:: Table of specific X resources that affect Emacs. * Lucid Resources:: X resources for Lucid menus. -* LessTif Resources:: X resources for LessTif and Motif menus. +* Motif Resources:: X resources for Motif and LessTif menus. * GTK resources:: Resources for GTK widgets. GTK resources === modified file 'doc/emacs/xresources.texi' --- doc/emacs/xresources.texi 2013-02-27 07:32:16 +0000 +++ doc/emacs/xresources.texi 2013-08-31 19:49:52 +0000 @@ -27,7 +27,7 @@ * Resources:: Using X resources with Emacs (in general). * Table of Resources:: Table of specific X resources that affect Emacs. * Lucid Resources:: X resources for Lucid menus. -* LessTif Resources:: X resources for LessTif and Motif menus. +* Motif Resources:: X resources for Motif and LessTif menus. * GTK resources:: Resources for GTK widgets. @end menu @@ -260,7 +260,7 @@ @ifnottex @item @code{selectionFont} (class @code{SelectionFont}) Font name for pop-up menu items, in non-toolkit versions of Emacs. (For -toolkit versions, see @ref{Lucid Resources}, also see @ref{LessTif +toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif Resources}.) @item @code{selectionTimeout} (class @code{SelectionTimeout}) @@ -370,15 +370,15 @@ Margin of the menu bar, in characters. Default is 1. @end table -@node LessTif Resources -@appendixsec LessTif Menu X Resources -@cindex Menu X Resources (LessTif widgets) -@cindex LessTif Widget X Resources +@node Motif Resources +@appendixsec Motif Menu X Resources +@cindex Menu X Resources (Motif widgets) +@cindex Motif Widget X Resources - If Emacs is compiled with the X toolkit support using LessTif or -Motif widgets, you can use X resources to customize the appearance of -the menu bar, pop-up menus, and dialog boxes. However, the resources -are organized differently from Lucid widgets. + If Emacs is compiled with the X toolkit support using Motif or +LessTif widgets, you can use X resources to customize the appearance +of the menu bar, pop-up menus, and dialog boxes. However, the +resources are organized differently from Lucid widgets. The resource names for the menu bar are in the @samp{pane.menubar} class, and they must be specified in this form: === modified file 'doc/man/ChangeLog' --- doc/man/ChangeLog 2013-04-20 19:11:25 +0000 +++ doc/man/ChangeLog 2013-08-31 19:49:52 +0000 @@ -1,3 +1,7 @@ +2013-08-31 Ulrich Müller + + * emacs.1: Update manual links. + 2013-04-20 Petr Hracek (tiny change) * emacs.1: Add some more command-line options. (Bug#14165) === modified file 'doc/man/emacs.1' --- doc/man/emacs.1 2013-04-20 19:11:25 +0000 +++ doc/man/emacs.1 2013-08-31 19:49:52 +0000 @@ -445,7 +445,7 @@ .IR on ; don't have menu bars if .IR off . -See the Emacs manual, sections "Lucid Resources" and "LessTif +See the Emacs manual, sections "Lucid Resources" and "Motif Resources", for how to control the appearance of the menu bar if you have one. .TP @@ -492,7 +492,7 @@ Font name for pop-up menu items, in non-toolkit versions of .IR Emacs . (For toolkit versions, see the Emacs manual, sections -"Lucid Resources" and "LessTif Resources".) +"Lucid Resources" and "Motif Resources".) .TP .BR selectionTimeout " (class " SelectionTimeout ) Number of milliseconds to wait for a selection reply. ------------------------------------------------------------ revno: 114079 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-08-31 11:26:59 -0700 message: Update nt installation instructions to point to supported method * nt/INSTALL: Rename from INSTALL.MSYS. * nt/INSTALL.OLD: Rename from INSTALL. * nt/configure.bat: Update for INSTALL name changes. * make-dist: Update for nt/INSTALL* changes. diff: === modified file 'ChangeLog' --- ChangeLog 2013-08-28 06:01:52 +0000 +++ ChangeLog 2013-08-31 18:26:59 +0000 @@ -1,3 +1,7 @@ +2013-08-31 Glenn Morris + + * make-dist: Update for nt/INSTALL* changes. + 2013-08-28 Paul Eggert * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, === modified file 'etc/NEWS' --- etc/NEWS 2013-08-16 06:33:08 +0000 +++ etc/NEWS 2013-08-31 18:26:59 +0000 @@ -762,12 +762,10 @@ * Changes in Emacs 24.4 on Non-Free Operating Systems -** Emacs for MS-Windows can now be built by running the configure script -using the MSYS environment and MinGW development tools. -This is from now on the preferred method of building Emacs on -MS-Windows. The Windows-specific configure.bat and makefile.w32-in -files are deprecated. See the file nt/INSTALL.MSYS for detailed -instructions. +** The procedure for building Emacs on MS-Windows has changed. +It is now built by running the same configure script as on all other +platforms. This requires the MSYS environment and MinGW development +tools. See the updated instructions in nt/INSTALL for details. Using the Posix configure script and Makefile's also means a change in the directory structure of the Emacs installation on Windows. It is === modified file 'make-dist' --- make-dist 2013-08-15 06:31:14 +0000 +++ make-dist 2013-08-31 18:26:59 +0000 @@ -404,7 +404,7 @@ ln config.nt emacsclient.rc emacs-src.tags ../${tempdir}/nt ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt ln Makefile.in gnulib.mk ../${tempdir}/nt - ln msysconfig.sh mingw-cfg.site epaths.nt INSTALL.MSYS ../${tempdir}/nt + ln msysconfig.sh mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) echo "Making links to \`nt/inc' and its subdirectories" === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-08-25 20:11:56 +0000 +++ nt/ChangeLog 2013-08-31 18:26:59 +0000 @@ -1,3 +1,9 @@ +2013-08-31 Glenn Morris + + * INSTALL: Rename from INSTALL.MSYS. + * INSTALL.OLD: Rename from INSTALL. + * configure.bat: Update for INSTALL name changes. + 2013-08-25 Vincent Belaïche * configure.bat: Rather than disabling, make configure.bat produce === renamed file 'nt/INSTALL.MSYS' => 'nt/INSTALL' --- nt/INSTALL.MSYS 2013-06-08 15:01:45 +0000 +++ nt/INSTALL 2013-08-31 18:26:59 +0000 @@ -19,9 +19,6 @@ Do not use this recipe with Cygwin. For building on Cygwin, use the normal installation instructions, ../INSTALL. - Do not use these instructions if you don't have MSYS installed; for - that, see the file INSTALL in this directory. - 0. Start the MSYS Bash window. Everything else below is done from that window's Bash prompt. === renamed file 'nt/INSTALL' => 'nt/INSTALL.OLD' --- nt/INSTALL 2013-08-25 19:46:41 +0000 +++ nt/INSTALL.OLD 2013-08-31 18:26:59 +0000 @@ -5,7 +5,9 @@ See the end of the file for license conditions. *** This method of building Emacs is no longer supported. *** - Instead, see INSTALL.MSYS. + It may fail to produce a correctly working Emacs. + Do not report bugs associated with this build method. + Instead, follow the new instructions in INSTALL. * For the impatient @@ -18,7 +20,7 @@ Do not use these instructions with MSYS environment. For building the native Windows binary with MinGW and MSYS, follow the - instructions in the file INSTALL.MSYS in this directory. + instructions in the file INSTALL in this directory. For building without MSYS, if you have a Cygwin or MSYS port of Bash on your Path, you will be better off removing it from PATH. (For === modified file 'nt/configure.bat' --- nt/configure.bat 2013-08-25 20:11:56 +0000 +++ nt/configure.bat 2013-08-31 18:26:59 +0000 @@ -60,7 +60,7 @@ rem echo **************************************************************** echo *** THIS METHOD OF BUILDING EMACS IS NO LONGER SUPPORTED. ** -echo *** INSTEAD, FOLLOW THE INSTRUCTIONS FROM INSTALL.MSYS. ** +echo *** INSTEAD, FOLLOW THE INSTRUCTIONS FROM INSTALL. ** echo **************************************************************** :confirm_continue set /p answer=Continue running this script at your own risks ? (Y/N) @@ -191,7 +191,7 @@ echo. IMPORTANT: This method of building Emacs for MS-Windows is deprecated, echo. and could be removed in a future version of Emacs. The preferred way echo to build Emacs for MS-Windows from now on is using the MSYS environment -echo. and MinGW development tools. Please see nt/INSTALL.MSYS for details. +echo. and MinGW development tools. Please see nt/INSTALL for details. goto end rem ---------------------------------------------------------------------- ------------------------------------------------------------ revno: 114078 committer: martin rudalics branch nick: trunk timestamp: Sat 2013-08-31 11:22:53 +0200 message: In temp_output_buffer_show make sure window returned by display_buffer is live (Bug#15213). * window.c (temp_output_buffer_show): Make sure window returned by display_buffer is live (Bug#15213). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-30 12:17:44 +0000 +++ src/ChangeLog 2013-08-31 09:22:53 +0000 @@ -1,3 +1,8 @@ +2013-08-31 Martin Rudalics + + * window.c (temp_output_buffer_show): Make sure window returned + by display_buffer is live (Bug#15213). + 2013-08-30 Dmitry Antipov Minor cleanup to avoid forward declarations. === modified file 'src/window.c' --- src/window.c 2013-08-29 16:36:54 +0000 +++ src/window.c 2013-08-31 09:22:53 +0000 @@ -3341,10 +3341,8 @@ if (!NILP (Vtemp_buffer_show_function)) call1 (Vtemp_buffer_show_function, buf); - else + else if (WINDOW_LIVE_P (window = display_buffer (buf, Qnil, Qnil))) { - window = display_buffer (buf, Qnil, Qnil); - if (!EQ (XWINDOW (window)->frame, selected_frame)) Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); Vminibuf_scroll_window = window; ------------------------------------------------------------ revno: 114077 fixes bug: http://debbugs.gnu.org/15220 committer: Glenn Morris branch nick: trunk timestamp: Fri 2013-08-30 13:40:39 -0400 message: * bytecomp.el (byte-recompile-directory): Fix is-this-a-directory logic. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-08-29 21:00:18 +0000 +++ lisp/ChangeLog 2013-08-30 17:40:39 +0000 @@ -1,3 +1,8 @@ +2013-08-30 Glenn Morris + + * emacs-lisp/bytecomp.el (byte-recompile-directory): + Fix is-this-a-directory logic. (Bug#15220) + 2013-08-29 Stefan Monnier * textmodes/css-mode.el: Use SMIE. === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2013-08-16 06:53:41 +0000 +++ lisp/emacs-lisp/bytecomp.el 2013-08-30 17:40:39 +0000 @@ -1,7 +1,7 @@ ;;; bytecomp.el --- compilation of Lisp code into byte code -*- lexical-binding: t -*- -;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2013 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2013 +;; Free Software Foundation, Inc. ;; Author: Jamie Zawinski ;; Hallvard Furuseth @@ -1593,14 +1593,14 @@ (message "Checking %s..." directory) (dolist (file (directory-files directory)) (let ((source (expand-file-name file directory))) - (if (and (not (member file '("RCS" "CVS"))) - (not (eq ?\. (aref file 0))) - (file-directory-p source) - (not (file-symlink-p source))) - ;; This file is a subdirectory. Handle them differently. - (when (or (null arg) (eq 0 arg) - (y-or-n-p (concat "Check " source "? "))) - (setq directories (nconc directories (list source)))) + (if (file-directory-p source) + (and (not (member file '("RCS" "CVS"))) + (not (eq ?\. (aref file 0))) + (not (file-symlink-p source)) + ;; This file is a subdirectory. Handle them differently. + (or (null arg) (eq 0 arg) + (y-or-n-p (concat "Check " source "? "))) + (setq directories (nconc directories (list source)))) ;; It is an ordinary file. Decide whether to compile it. (if (and (string-match emacs-lisp-file-regexp source) ;; The next 2 tests avoid compiling lock files