Now on revision 109318. ------------------------------------------------------------ revno: 109318 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 23:58:54 -0700 message: etc/PROBLEMS small updates Remove references to m/ and s/ files. Remove reference to hpux _FILE_OFFSET_BITS issue, no longer true since 2012-05-31. diff: === modified file 'etc/PROBLEMS' --- etc/PROBLEMS 2012-07-11 07:07:19 +0000 +++ etc/PROBLEMS 2012-07-31 06:58:54 +0000 @@ -388,7 +388,7 @@ the `flock' system call. The other involves creating a lock file; `movemail' must be able to write in /usr/spool/mail in order to do this. You control which one is used by defining, or not defining, -the macro MAIL_USE_FLOCK in config.h or the m/ or s/ file it includes. +the macro MAIL_USE_FLOCK in config.h. IF YOU DON'T USE THE FORM OF INTERLOCKING THAT IS NORMAL ON YOUR SYSTEM, YOU CAN LOSE MAIL! @@ -2904,10 +2904,6 @@ pen@lysator.liu.se says (Feb 1998) that the Compose key does work if you link with the MIT X11 libraries instead of the Solaris X11 libraries. -*** HP/UX 10: Large file support is disabled. -(HP/UX 10 was end-of-lifed in May 1999.) -See the comments in src/s/hpux10-20.h. - *** HP/UX: Emacs is slow using X11R5. This happens if you use the MIT versions of the X libraries--it ------------------------------------------------------------ revno: 109317 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 23:52:13 -0700 message: * configure.ac (opsysfile, S_FILE): Now they are always empty. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-31 06:46:42 +0000 +++ ChangeLog 2012-07-31 06:52:13 +0000 @@ -1,5 +1,7 @@ 2012-07-31 Glenn Morris + * configure.ac (opsysfile, S_FILE): Now they are always empty. + * configure.ac (opsysfile): Forgot to set it to empty on sol2-10 when removing src/s/sol2-6.h yesterday. === modified file 'configure.ac' --- configure.ac 2012-07-31 06:46:42 +0000 +++ configure.ac 2012-07-31 06:52:13 +0000 @@ -365,9 +365,6 @@ * ) srcdir="`(cd ${srcdir}; pwd)`" ;; esac -#### Given the configuration name, set opsysfile to the -#### name of s/*.h file we should use. - ### Canonicalize the configuration name. AC_CANONICAL_HOST @@ -555,8 +552,6 @@ Check `etc/MACHINES' for recognized configuration names.]) fi -opsysfile="s/${opsys}.h" - #### Choose a compiler. @@ -3689,7 +3684,6 @@ case $opsys in aix4-2) - opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) dnl This symbol should be defined on AIX Version 3 ??????? @@ -3701,12 +3695,10 @@ ;; cygwin) - opsysfile= AC_DEFINE(CYGWIN, 1, [Define if the system is Cygwin.]) ;; darwin) - opsysfile= dnl BSD4_3 and BSD4_4 are already defined in sys/param.h. AC_DEFINE(BSD4_2, []) AC_DEFINE(BSD_SYSTEM, []) @@ -3718,7 +3710,6 @@ ;; freebsd) - opsysfile= AC_DEFINE(BSD4_2, []) dnl Hack to avoid calling AC_PREPROC_IFELSE multiple times. dnl Would not be needed with autoconf >= 2.67, where the @@ -3736,20 +3727,17 @@ ;; gnu-linux | gnu-kfreebsd ) - opsysfile= AC_DEFINE(USG, []) AC_DEFINE(GNU_LINUX, [], [Define if ths system is compatible with GNU/Linux.]) ;; hpux*) - opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(HPUX, [], [Define if the system is HPUX.]) ;; irix6-5) - opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(USG5_4, []) @@ -3757,7 +3745,6 @@ ;; sol2*) - opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(USG5_4, []) @@ -3765,7 +3752,6 @@ ;; unixware) - opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(USG5_4, []) @@ -3784,8 +3770,6 @@ using GTK.]) ;; - gnu) opsysfile= ;; - hpux11) dnl See comments in sysdep.c:sys_signal. dnl SA_RESTART resets the timeout of `select' on hpux11. @@ -3806,12 +3790,9 @@ should not call setpgrp.]) ;; - netbsd | openbsd ) opsysfile= ;; - sol2-10) AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes on Solaris.]) - opsysfile= ;; esac @@ -3865,11 +3846,7 @@ AC_SUBST(CFLAGS) ## Used in lwlib/Makefile.in. AC_SUBST(X_TOOLKIT_TYPE) -if test -n "${opsysfile}"; then - S_FILE="\$(srcdir)/${opsysfile}" -else - S_FILE= -fi +S_FILE= AC_SUBST(S_FILE) AC_SUBST(ns_appdir) AC_SUBST(ns_appbindir) @@ -3882,9 +3859,8 @@ [Define to the canonical Emacs configuration name.]) AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", [Define to the options passed to configure.]) -if test -n "$opsysfile"; then - AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", - [Define to the used os dependent file.]) +if test -z "No longer used"; then + AC_DEFINE(config_opsysfile, [], [Define to the used os dependent file.]) fi XMENU_OBJ= @@ -4247,7 +4223,6 @@ Configured for \`${canonical}'. Where should the build process find the source code? ${srcdir} - What operating system file should Emacs use? ${opsysfile:-none} What compiler should emacs be built with? ${CC} ${CFLAGS} Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason} Should Emacs use a relocating allocator for buffers? ${REL_ALLOC} ------------------------------------------------------------ revno: 109316 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 23:46:42 -0700 message: * configure.ac (opsysfile): Forgot to set it to empty on sol2-10 when removing src/s/sol2-6.h yesterday. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-31 06:43:37 +0000 +++ ChangeLog 2012-07-31 06:46:42 +0000 @@ -1,5 +1,8 @@ 2012-07-31 Glenn Morris + * configure.ac (opsysfile): Forgot to set it to empty on sol2-10 + when removing src/s/sol2-6.h yesterday. + * configure.ac (USG5_4): Reintroduce this. (opsysfile): Set to empty on irix6-5, sol2*, and unixware. === modified file 'configure.ac' --- configure.ac 2012-07-31 06:43:37 +0000 +++ configure.ac 2012-07-31 06:46:42 +0000 @@ -3811,7 +3811,7 @@ sol2-10) AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes on Solaris.]) - opsysfile="s/sol2-6.h" + opsysfile= ;; esac ------------------------------------------------------------ revno: 109315 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 23:43:37 -0700 message: Remove src/s/usg5-4-common.h * configure.ac (USG5_4): Reintroduce this. (opsysfile): Set to empty on irix6-5, sol2*, and unixware. * src/conf_post.h [USG5_4]: Move remaining contents of s/usg5-4-common.h here. * src/s/usg5-4-common.h: Remove file. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-31 06:35:08 +0000 +++ ChangeLog 2012-07-31 06:43:37 +0000 @@ -1,5 +1,8 @@ 2012-07-31 Glenn Morris + * configure.ac (USG5_4): Reintroduce this. + (opsysfile): Set to empty on irix6-5, sol2*, and unixware. + * configure.ac (wait3, WRETCODE): Move here from src/s/usg5-4-common.h. * configure.ac (opsysfile): Set to empty on hpux*, darwin; === modified file 'configure.ac' --- configure.ac 2012-07-31 06:35:08 +0000 +++ configure.ac 2012-07-31 06:43:37 +0000 @@ -3685,6 +3685,7 @@ AH_TEMPLATE(BSD_SYSTEM, [Define if the system is compatible with BSD 4.2.]) AH_TEMPLATE(USG, [Define if the system is compatible with System III.]) AH_TEMPLATE(USG5, [Define if the system is compatible with System V.]) +AH_TEMPLATE(USG5_4, [Define if the system is compatible with System V Release 4.]) case $opsys in aix4-2) @@ -3748,23 +3749,26 @@ ;; irix6-5) - opsysfile="s/usg5-4-common.h" + opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) + AC_DEFINE(USG5_4, []) AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.]) ;; sol2*) - opsysfile="s/usg5-4-common.h" + opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) + AC_DEFINE(USG5_4, []) AC_DEFINE(SOLARIS2, [], [Define if the system is Solaris.]) ;; unixware) - opsysfile="s/usg5-4-common.h" + opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) + AC_DEFINE(USG5_4, []) ;; esac === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-31 06:35:08 +0000 +++ src/ChangeLog 2012-07-31 06:43:37 +0000 @@ -10,6 +10,10 @@ * s/usg5-4-common.h (wait3, WRETCODE): Let configure set them. + * conf_post.h [USG5_4]: + Move remaining contents of s/usg5-4-common.h here. + * s/usg5-4-common.h: Remove file. + * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here. * s/irix6-5.h: Remove file. === modified file 'src/conf_post.h' --- src/conf_post.h 2012-07-31 06:19:40 +0000 +++ src/conf_post.h 2012-07-31 06:43:37 +0000 @@ -84,7 +84,23 @@ #endif #undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ +#endif /* IRIX6_5 */ + +#ifdef USG5_4 +/* Get FIONREAD from . Get to get struct tchars. + But get first to make sure ttold.h doesn't interfere. */ +#include + +#ifdef emacs +#include +#include +#include +#include +#include +#include +#include #endif +#endif /* USG5_4 */ /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ === removed file 'src/s/usg5-4-common.h' --- src/s/usg5-4-common.h 2012-07-31 06:35:08 +0000 +++ src/s/usg5-4-common.h 1970-01-01 00:00:00 +0000 @@ -1,35 +0,0 @@ -/* Definitions file for GNU Emacs running on AT&T's System V Release 4 - -Copyright (C) 1987, 1990, 1999-2012 Free Software Foundation, Inc. - -Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org. -Subsequently improved for Dell 2.2 by Eric S. Raymond . - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -/* Get FIONREAD from . Get to get struct tchars. - But get first to make sure ttold.h doesn't interfere. */ -#include - -#ifdef emacs -#include -#include -#include -#include -#include -#include -#include -#endif ------------------------------------------------------------ revno: 109314 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 23:35:08 -0700 message: Move wait3, WRETCODE from src/s to configure * configure.ac (wait3, WRETCODE): Move here from src/s/usg5-4-common.h. * s/usg5-4-common.h (wait3, WRETCODE): Let configure set them. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-31 06:19:40 +0000 +++ ChangeLog 2012-07-31 06:35:08 +0000 @@ -1,5 +1,7 @@ 2012-07-31 Glenn Morris + * configure.ac (wait3, WRETCODE): Move here from src/s/usg5-4-common.h. + * configure.ac (opsysfile): Set to empty on hpux*, darwin; and to s/usg5-4-common.h on irix6-5. === modified file 'configure.ac' --- configure.ac 2012-07-31 06:19:40 +0000 +++ configure.ac 2012-07-31 06:35:08 +0000 @@ -3645,6 +3645,23 @@ ;; esac +dnl Used in process.c. +case $opsys in + irix6-5 | sol2* | unixware ) + dnl It is possible to receive SIGCHLD when there are no children + dnl waiting, because a previous waitsys(2) cleaned up the carcass + dnl of child without clearing the SIGCHLD pending info. So, use a + dnl non-blocking wait3 instead, which maps to waitpid(2) in SysVr4. + AC_DEFINE(wait3(status, options, rusage), + [waitpid ((pid_t) -1, (status), (options))], + [Some platforms redefine this.]) + dnl FIXME this makes no sense, because WRETCODE is only used in + dnl process.c, which includes syswait.h aftet config.h, and the + dnl former unconditionally redefines WRETCODE. + AC_DEFINE(WRETCODE(w), [(w >> 8)], [Some platforms redefine this.]) + ;; +esac + case $opsys in hpux* | sol2* ) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-31 06:19:40 +0000 +++ src/ChangeLog 2012-07-31 06:35:08 +0000 @@ -8,6 +8,8 @@ 2012-07-31 Glenn Morris + * s/usg5-4-common.h (wait3, WRETCODE): Let configure set them. + * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here. * s/irix6-5.h: Remove file. === modified file 'src/s/usg5-4-common.h' --- src/s/usg5-4-common.h 2012-07-30 14:52:08 +0000 +++ src/s/usg5-4-common.h 2012-07-31 06:35:08 +0000 @@ -33,12 +33,3 @@ #include #include #endif - -/* It is possible to receive SIGCHLD when there are no children - waiting, because a previous waitsys(2) cleaned up the carcass of child - without clearing the SIGCHLD pending info. So, use a non-blocking - wait3 instead, which maps to waitpid(2) in SysVr4. */ -#define wait3(status, options, rusage) \ - waitpid ((pid_t) -1, (status), (options)) -#define WRETCODE(w) (w >> 8) - ------------------------------------------------------------ revno: 109313 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 23:19:40 -0700 message: Remove src/s/irix6-5.h * configure.ac (opsysfile): Set to s/usg5-4-common.h on irix6-5. * src/conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here. * src/s/irix6-5.h: Remove file. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-31 01:38:04 +0000 +++ ChangeLog 2012-07-31 06:19:40 +0000 @@ -1,6 +1,7 @@ 2012-07-31 Glenn Morris - * configure.ac (opsysfile): Set to empty on hpux*, darwin. + * configure.ac (opsysfile): Set to empty on hpux*, darwin; + and to s/usg5-4-common.h on irix6-5. 2012-07-30 Glenn Morris === modified file 'configure.ac' --- configure.ac 2012-07-31 01:38:04 +0000 +++ configure.ac 2012-07-31 06:19:40 +0000 @@ -3731,6 +3731,7 @@ ;; irix6-5) + opsysfile="s/usg5-4-common.h" AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.]) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-31 05:56:36 +0000 +++ src/ChangeLog 2012-07-31 06:19:40 +0000 @@ -8,6 +8,9 @@ 2012-07-31 Glenn Morris + * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here. + * s/irix6-5.h: Remove file. + * conf_post.h [DARWIN_OS]: Move remaining contents of s/darwin.h here. * s/darwin.h: Remove file. === modified file 'src/conf_post.h' --- src/conf_post.h 2012-07-31 01:38:04 +0000 +++ src/conf_post.h 2012-07-31 06:19:40 +0000 @@ -78,6 +78,14 @@ #undef random #endif +#ifdef IRIX6_5 +#ifdef emacs +char *_getpty(); +#endif + +#undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ +#endif + /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ /* Turned on June 1996 supposing nobody will mind it. */ === removed file 'src/s/irix6-5.h' --- src/s/irix6-5.h 2012-07-30 14:52:08 +0000 +++ src/s/irix6-5.h 1970-01-01 00:00:00 +0000 @@ -1,26 +0,0 @@ -/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.5. - -Copyright (C) 1999-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -#include "usg5-4-common.h" - -#ifdef emacs -char *_getpty(); -#endif - -#undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ ------------------------------------------------------------ revno: 109312 committer: Jan D. branch nick: trunk timestamp: Tue 2012-07-31 07:56:36 +0200 message: * nsterm.m (openFiles): Fix previous checkin. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-31 05:07:03 +0000 +++ src/ChangeLog 2012-07-31 05:56:36 +0000 @@ -1,3 +1,7 @@ +2012-07-31 Jan Djärv + + * nsterm.m (openFiles): Fix previous checkin. + 2012-07-31 Paul Eggert * indent.c (compute_motion): Remove unused local. === modified file 'src/nsterm.m' --- src/nsterm.m 2012-07-30 20:10:31 +0000 +++ src/nsterm.m 2012-07-31 05:56:36 +0000 @@ -4477,7 +4477,7 @@ /* Don't open files from the command line, Cocoa parses the command line wrong anyway, --option value tries to open value if --option is the last option. */ - if (ns_ignore_open_file) + if (ns_do_open_file) { NSEnumerator *files = [fileList objectEnumerator]; NSString *file; ------------------------------------------------------------ revno: 109311 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-07-30 22:07:03 -0700 message: * indent.c (compute_motion): Remove unused local. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-31 01:38:04 +0000 +++ src/ChangeLog 2012-07-31 05:07:03 +0000 @@ -1,3 +1,7 @@ +2012-07-31 Paul Eggert + + * indent.c (compute_motion): Remove unused local. + 2012-07-31 Glenn Morris * conf_post.h [DARWIN_OS]: Move remaining contents of s/darwin.h here. === modified file 'src/indent.c' --- src/indent.c 2012-06-28 12:29:37 +0000 +++ src/indent.c 2012-07-31 05:07:03 +0000 @@ -1136,7 +1136,6 @@ ptrdiff_t width_run_end = from; ptrdiff_t width_run_width = 0; Lisp_Object *width_table; - Lisp_Object buffer; /* The next buffer pos where we should consult the width run cache. */ ptrdiff_t next_width_run = from; @@ -1156,7 +1155,6 @@ struct composition_it cmp_it; - XSETBUFFER (buffer, current_buffer); XSETWINDOW (window, win); width_run_cache_on_off (); ------------------------------------------------------------ revno: 109310 committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Tue 2012-07-31 00:31:10 -0300 message: * progmodes/python.el (run-python-internal): Disable font lock for internal shells. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-30 19:54:07 +0000 +++ lisp/ChangeLog 2012-07-31 03:31:10 +0000 @@ -1,3 +1,8 @@ +2012-07-31 Fabián Ezequiel Gallina + + * progmodes/python.el (run-python-internal): Disable font lock for + internal shells. + 2012-07-30 Stefan Merten * rst.el: Silence `checkdoc-ispell'. === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2012-07-27 16:42:19 +0000 +++ lisp/progmodes/python.el 2012-07-31 03:31:10 +0000 @@ -1615,11 +1615,12 @@ `inferior-python-mode-hook' (after the `comint-mode-hook' is run). \(Type \\[describe-mode] in the process buffer for a list of commands.)" - (set-process-query-on-exit-flag - (get-buffer-process - (python-shell-make-comint - (python-shell-parse-command) - (python-shell-internal-get-process-name))) nil)) + (let ((python-shell-enable-font-lock nil)) + (set-process-query-on-exit-flag + (get-buffer-process + (python-shell-make-comint + (python-shell-parse-command) + (python-shell-internal-get-process-name))) nil))) (defun python-shell-get-process () "Get inferior Python process for current buffer and return it." ------------------------------------------------------------ revno: 109309 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2012-07-31 01:39:58 +0000 message: gnus.el (gnus-valid-select-methods): Fix custom type diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-07-30 10:13:52 +0000 +++ lisp/gnus/ChangeLog 2012-07-31 01:39:58 +0000 @@ -1,3 +1,7 @@ +2012-07-31 Katsumi Yamaoka + + * gnus.el (gnus-valid-select-methods): Fix custom type. + 2012-07-29 Teodor Zlatanov * auth-source.el (auth-sources, auth-source-backend-parse) === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2012-07-24 22:17:17 +0000 +++ lisp/gnus/gnus.el 2012-07-31 01:39:58 +0000 @@ -1647,12 +1647,13 @@ (const :format "%v " mail) (const :format "%v " none) (const post-mail)) - (checklist :inline t + (checklist :inline t :greedy t (const :format "%v " address) (const :format "%v " prompt-address) (const :format "%v " physical-address) - (const :format "%v " virtual) - (const respool)))) + (const virtual) + (const :format "%v " respool) + (const server-marks)))) :version "24.1") (defun gnus-redefine-select-method-widget () ------------------------------------------------------------ revno: 109308 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 21:38:04 -0400 message: Remove src/s/darwin.h * configure.ac (opsysfile): Set to empty on darwin. * src/conf_post.h [DARWIN_OS]: Move remaining contents of src/s/darwin.h here. * src/s/darwin.h: Remove file. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-31 01:32:19 +0000 +++ ChangeLog 2012-07-31 01:38:04 +0000 @@ -1,6 +1,6 @@ 2012-07-31 Glenn Morris - * configure.ac (opsysfile): Set to empty on hpux*. + * configure.ac (opsysfile): Set to empty on hpux*, darwin. 2012-07-30 Glenn Morris === modified file 'configure.ac' --- configure.ac 2012-07-31 01:32:19 +0000 +++ configure.ac 2012-07-31 01:38:04 +0000 @@ -3688,6 +3688,7 @@ ;; darwin) + opsysfile= dnl BSD4_3 and BSD4_4 are already defined in sys/param.h. AC_DEFINE(BSD4_2, []) AC_DEFINE(BSD_SYSTEM, []) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-31 01:32:19 +0000 +++ src/ChangeLog 2012-07-31 01:38:04 +0000 @@ -1,5 +1,8 @@ 2012-07-31 Glenn Morris + * conf_post.h [DARWIN_OS]: Move remaining contents of s/darwin.h here. + * s/darwin.h: Remove file. + * conf_post.h [HPUX]: Move random, srandom here from s/hpux10-20.h. * s/hpux10-20.h: Remove file, which is now empty. === modified file 'src/conf_post.h' --- src/conf_post.h 2012-07-31 01:32:19 +0000 +++ src/conf_post.h 2012-07-31 01:38:04 +0000 @@ -51,6 +51,22 @@ #endif #endif +#ifdef DARWIN_OS +#ifdef emacs +#define malloc unexec_malloc +#define realloc unexec_realloc +#define free unexec_free +/* Don't use posix_memalign because it is not compatible with unexmacosx.c. */ +#undef HAVE_POSIX_MEMALIGN +#endif +/* The following solves the problem that Emacs hangs when evaluating + (make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile + does not exist. Also, setsid is not allowed in the vfork child's + context as of Darwin 9/Mac OS X 10.5. */ +#undef HAVE_WORKING_VFORK +#define vfork fork +#endif /* DARWIN_OS */ + /* We have to go this route, rather than the old hpux9 approach of renaming the functions via macros. The system's stdlib.h has fully prototyped declarations, which yields a conflicting definition of === removed file 'src/s/darwin.h' --- src/s/darwin.h 2012-07-13 02:34:05 +0000 +++ src/s/darwin.h 1970-01-01 00:00:00 +0000 @@ -1,34 +0,0 @@ -/* System description header file for Darwin (Mac OS X). - -Copyright (C) 2001-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -/* Definitions for how to compile & link. */ -#ifdef emacs -#define malloc unexec_malloc -#define realloc unexec_realloc -#define free unexec_free -/* Don't use posix_memalign because it is not compatible with unexmacosx.c. */ -#undef HAVE_POSIX_MEMALIGN -#endif - -/* The following solves the problem that Emacs hangs when evaluating - (make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile - does not exist. Also, setsid is not allowed in the vfork child's - context as of Darwin 9/Mac OS X 10.5. */ -#undef HAVE_WORKING_VFORK -#define vfork fork ------------------------------------------------------------ revno: 109307 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 21:32:19 -0400 message: Remove src/s/hpux10-20.h * configure.ac (opsysfile): Set to empty on hpux*. * src/conf_post.h [HPUX]: Move random, srandom here from s/hpux10-20.h. * src/s/hpux10-20.h: Remove file, which is now empty. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 21:20:43 +0000 +++ ChangeLog 2012-07-31 01:32:19 +0000 @@ -1,3 +1,7 @@ +2012-07-31 Glenn Morris + + * configure.ac (opsysfile): Set to empty on hpux*. + 2012-07-30 Glenn Morris * configure.ac (AH_BOTTOM): Use an include file, so that the === modified file 'configure.ac' --- configure.ac 2012-07-30 21:20:43 +0000 +++ configure.ac 2012-07-31 01:32:19 +0000 @@ -3723,6 +3723,7 @@ ;; hpux*) + opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(HPUX, [], [Define if the system is HPUX.]) @@ -3773,8 +3774,6 @@ AC_DEFINE(USG_SUBTTY_WORKS, 1, [Define for USG systems where it works to open a pty's tty in the parent process, then close and reopen it in the child.]) - - opsysfile="s/hpux10-20.h" ;; irix6-5) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 21:20:43 +0000 +++ src/ChangeLog 2012-07-31 01:32:19 +0000 @@ -1,3 +1,8 @@ +2012-07-31 Glenn Morris + + * conf_post.h [HPUX]: Move random, srandom here from s/hpux10-20.h. + * s/hpux10-20.h: Remove file, which is now empty. + 2012-07-30 Glenn Morris * conf_post.h: New, split from configure.ac's AH_BOTTOM. === modified file 'src/conf_post.h' --- src/conf_post.h 2012-07-30 21:20:43 +0000 +++ src/conf_post.h 2012-07-31 01:32:19 +0000 @@ -51,6 +51,17 @@ #endif #endif +/* We have to go this route, rather than the old hpux9 approach of + renaming the functions via macros. The system's stdlib.h has fully + prototyped declarations, which yields a conflicting definition of + srand48; it tries to redeclare what was once srandom to be srand48. + So we go with HAVE_LRAND48 being defined. Note we also undef + HAVE_RANDOM via configure. */ +#ifdef HPUX +#undef srandom +#undef random +#endif + /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ /* Turned on June 1996 supposing nobody will mind it. */ === removed file 'src/s/hpux10-20.h' --- src/s/hpux10-20.h 2012-07-14 00:04:10 +0000 +++ src/s/hpux10-20.h 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ -/* System description file for hpux version 10.20. - -Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -/* We have to go this route, rather than hpux9's approach of renaming the - functions via macros. The system's stdlib.h has fully prototyped - declarations, which yields a conflicting definition of srand48; it - tries to redeclare what was once srandom to be srand48. So we go - with HAVE_LRAND48 being defined. - Note we also undef HAVE_RANDOM via configure. */ -#undef srandom -#undef random ------------------------------------------------------------ revno: 109306 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 17:20:43 -0400 message: Use an include file in configure.ac's AH_BOTTOM * configure.ac (AH_BOTTOM): Use an include file, so that the contents do not get processed by autoheader. Eg this prevents undefs being commented out, and is the recommended technique from the autoconf manual. * src/conf_post.h: New, split from configure.ac's AH_BOTTOM. * src/Makefile.in (config_h): Add conf_post.h. * src/makefile.w32-in (CONFIG_H): Add conf_post.h. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 20:34:58 +0000 +++ ChangeLog 2012-07-30 21:20:43 +0000 @@ -1,3 +1,8 @@ +2012-07-30 Glenn Morris + + * configure.ac (AH_BOTTOM): Use an include file, so that the + contents do not get processed by autoheader. + 2012-07-30 Paul Eggert Do not overwrite config.status while executing it (Bug#11214). === modified file 'configure.ac' --- configure.ac 2012-07-30 20:34:58 +0000 +++ configure.ac 2012-07-30 21:20:43 +0000 @@ -4198,108 +4198,7 @@ #define EMACS_CONFIG_H ])dnl -dnl FIXME undefs in here get commented out by autoconf. :( -AH_BOTTOM([ -/* On AIX 3 this must be included before any other include file. */ -#include -#if ! HAVE_ALLOCA -# error "alloca not available on this machine" -#endif - -#ifdef SIGNAL_H_AHB -#undef SIGNAL_H_AHB -#include -#endif - -/* This silences a few compilation warnings on FreeBSD. */ -#ifdef BSD_SYSTEM_AHB -#undef BSD_SYSTEM_AHB -#undef BSD_SYSTEM -#if __FreeBSD__ == 1 -#define BSD_SYSTEM 199103 -#elif __FreeBSD__ == 2 -#define BSD_SYSTEM 199306 -#elif __FreeBSD__ >= 3 -#define BSD_SYSTEM 199506 -#endif -#endif - -/* Define AMPERSAND_FULL_NAME if you use the convention - that & in the full name stands for the login id. */ -/* Turned on June 1996 supposing nobody will mind it. */ -#define AMPERSAND_FULL_NAME - -/* `subprocesses' should be defined if you want to - have code for asynchronous subprocesses - (as used in M-x compile and M-x shell). - Only MSDOS does not support this (it overrides - this in its config_opsysfile below). */ - -#define subprocesses - -/* Include the os dependent file. */ -#ifdef config_opsysfile -# include config_opsysfile -#endif - -/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, - SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ -#ifdef HAVE_NS -#if defined NS_IMPL_GNUSTEP -# define SYSTEM_PURESIZE_EXTRA 30000 -#elif defined DARWIN_OS -# define SYSTEM_PURESIZE_EXTRA 200000 -#endif -#endif - -#ifdef emacs /* Don't do this for lib-src. */ -/* Tell regex.c to use a type compatible with Emacs. */ -#define RE_TRANSLATE_TYPE Lisp_Object -#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C) -#ifdef make_number -/* If make_number is a macro, use it. */ -#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0))) -#else -/* If make_number is a function, avoid it. */ -#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0)) -#endif -#endif - -#include -#include - -#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ -#define NO_INLINE __attribute__((noinline)) -#else -#define NO_INLINE -#endif - -#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) -#define EXTERNALLY_VISIBLE __attribute__((externally_visible)) -#else -#define EXTERNALLY_VISIBLE -#endif - -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -#else -# define ATTRIBUTE_FORMAT(spec) /* empty */ -#endif - -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) -# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) -#else -# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) -#endif - -#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST - -/* Some versions of GNU/Linux define noinline in their headers. */ -#ifdef noinline -#undef noinline -#endif +AH_BOTTOM([#include #endif /* EMACS_CONFIG_H */ === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 20:10:31 +0000 +++ src/ChangeLog 2012-07-30 21:20:43 +0000 @@ -1,3 +1,9 @@ +2012-07-30 Glenn Morris + + * conf_post.h: New, split from configure.ac's AH_BOTTOM. + * Makefile.in (config_h): Add conf_post.h. + * makefile.w32-in (CONFIG_H): Add conf_post.h. + 2012-07-30 Jan Djärv * nsterm.m (ns_do_open_file): New variable. === modified file 'src/Makefile.in' --- src/Makefile.in 2012-07-30 16:20:35 +0000 +++ src/Makefile.in 2012-07-30 21:20:43 +0000 @@ -57,7 +57,7 @@ # Configuration files for .o files to depend on. S_FILE = @S_FILE@ -config_h = config.h $(S_FILE) +config_h = config.h conf_post.h $(S_FILE) bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) === added file 'src/conf_post.h' --- src/conf_post.h 1970-01-01 00:00:00 +0000 +++ src/conf_post.h 2012-07-30 21:20:43 +0000 @@ -0,0 +1,131 @@ +/* conf_post.h --- configure.ac includes this via AH_BOTTOM + +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012 + Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . */ + +/* Commentary: + + Rather than writing this code directly in AH_BOTTOM, we include it + via this file. This is so that it does not get processed by + autoheader. Eg, any undefs here would otherwise be commented out. +*/ + +/* Code: */ + +/* On AIX 3 this must be included before any other include file. */ +#include +#if ! HAVE_ALLOCA +# error "alloca not available on this machine" +#endif + +#ifdef SIGNAL_H_AHB +#undef SIGNAL_H_AHB +#include +#endif + +/* This silences a few compilation warnings on FreeBSD. */ +#ifdef BSD_SYSTEM_AHB +#undef BSD_SYSTEM_AHB +#undef BSD_SYSTEM +#if __FreeBSD__ == 1 +#define BSD_SYSTEM 199103 +#elif __FreeBSD__ == 2 +#define BSD_SYSTEM 199306 +#elif __FreeBSD__ >= 3 +#define BSD_SYSTEM 199506 +#endif +#endif + +/* Define AMPERSAND_FULL_NAME if you use the convention + that & in the full name stands for the login id. */ +/* Turned on June 1996 supposing nobody will mind it. */ +#define AMPERSAND_FULL_NAME + +/* `subprocesses' should be defined if you want to + have code for asynchronous subprocesses + (as used in M-x compile and M-x shell). + Only MSDOS does not support this (it overrides + this in its config_opsysfile below). */ + +#define subprocesses + +/* Include the os dependent file. */ +#ifdef config_opsysfile +# include config_opsysfile +#endif + +/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, + SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ +#ifdef HAVE_NS +#if defined NS_IMPL_GNUSTEP +# define SYSTEM_PURESIZE_EXTRA 30000 +#elif defined DARWIN_OS +# define SYSTEM_PURESIZE_EXTRA 200000 +#endif +#endif + +#ifdef emacs /* Don't do this for lib-src. */ +/* Tell regex.c to use a type compatible with Emacs. */ +#define RE_TRANSLATE_TYPE Lisp_Object +#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C) +#ifdef make_number +/* If make_number is a macro, use it. */ +#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0))) +#else +/* If make_number is a function, avoid it. */ +#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0)) +#endif +#endif + +#include +#include + +#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ +#define NO_INLINE __attribute__((noinline)) +#else +#define NO_INLINE +#endif + +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) +#define EXTERNALLY_VISIBLE __attribute__((externally_visible)) +#else +#define EXTERNALLY_VISIBLE +#endif + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define ATTRIBUTE_FORMAT(spec) /* empty */ +#endif + +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) +# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) +#else +# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) +#endif + +#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST + +/* Some versions of GNU/Linux define noinline in their headers. */ +#ifdef noinline +#undef noinline +#endif + +/* conf_post.h ends here */ === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2012-07-29 17:20:16 +0000 +++ src/makefile.w32-in 2012-07-30 21:20:43 +0000 @@ -406,6 +406,7 @@ MS_W32_H = $(SRC)/s/ms-w32.h \ $(NT_INC)/sys/stat.h CONFIG_H = $(SRC)/config.h \ + $(SRC)/conf_post.h \ $(MS_W32_H) DIR_H = $(NT_INC)/sys/dir.h \ $(SRC)/ndir.h ------------------------------------------------------------ revno: 109305 fixes bug: http://debbugs.gnu.org/11214 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-07-30 13:34:58 -0700 message: Do not overwrite config.status while executing it. * Makefile.in (MAKEFILE_NAME): New macro. ($(MAKEFILE_NAME)): Rename rule from Makefile. * configure.ac (epaths): Set MAKEFILE_NAME to a bogus value, so that GNU 'make' isn't tempted to make the Makefile and then regenerate config.status while config.status is running. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 16:20:35 +0000 +++ ChangeLog 2012-07-30 20:34:58 +0000 @@ -1,5 +1,12 @@ 2012-07-30 Paul Eggert + Do not overwrite config.status while executing it (Bug#11214). + * Makefile.in (MAKEFILE_NAME): New macro. + ($(MAKEFILE_NAME)): Rename rule from Makefile. + * configure.ac (epaths): Set MAKEFILE_NAME to a bogus value, + so that GNU 'make' isn't tempted to make the Makefile and then + regenerate config.status while config.status is running. + Update .PHONY listings in makefiles. * Makefile.in (.PHONY): Add all, ${SUBDIR}, blessmail, epath-force, FRC, install-arch-dep, install-arch-indep, install-doc, === modified file 'Makefile.in' --- Makefile.in 2012-07-30 16:20:35 +0000 +++ Makefile.in 2012-07-30 20:34:58 +0000 @@ -350,7 +350,12 @@ # We used to have one rule per */Makefile.in, but that leads to race # conditions with parallel makes, so let's assume that the time stamp on # ./Makefile is representative of the time stamp on all the other Makefiles. -Makefile: config.status $(srcdir)/src/config.in \ +# +# config.status overrides MAKEFILE_NAME with a bogus name when creating +# src/epaths.h, so that 'make epaths-force' does not recursively invoke +# config.status and overwrite config.status while executing it (Bug#11214). +MAKEFILE_NAME = Makefile +$(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \ $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) ./config.status === modified file 'configure.ac' --- configure.ac 2012-07-30 14:52:08 +0000 +++ configure.ac 2012-07-30 20:34:58 +0000 @@ -4464,7 +4464,7 @@ dnl the use of force in the `epaths-force' rule in Makefile.in. AC_CONFIG_COMMANDS([epaths], [ echo creating src/epaths.h -${MAKE-make} epaths-force +${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force ], [GCC="$GCC" CPPFLAGS="$CPPFLAGS"]) AC_CONFIG_COMMANDS([gdbinit], [ ------------------------------------------------------------ revno: 109304 committer: Jan D. branch nick: trunk timestamp: Mon 2012-07-30 22:10:31 +0200 message: Don't open files from Cocoa-parsed command line. --eval '(whatever)' will open '(whatever)' if --eval is the last option. * src/nsterm.m (ns_do_open_file): New variable. (ns_term_init): Set ns_do_open_file to NO after run returns. (openFile, openTempFile, openFileWithoutUI, openFiles): Open files only if ns_do_open_file. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 18:56:42 +0000 +++ src/ChangeLog 2012-07-30 20:10:31 +0000 @@ -1,3 +1,10 @@ +2012-07-30 Jan Djärv + + * nsterm.m (ns_do_open_file): New variable. + (ns_term_init): Set ns_do_open_file to NO after run returns. + (openFile, openTempFile, openFileWithoutUI, openFiles): Open + files only if ns_do_open_file. + 2012-07-30 Paul Eggert * lisp.h (SWITCH_ENUM_CAST): Remove. All uses removed. === modified file 'src/nsterm.m' --- src/nsterm.m 2012-07-25 17:31:34 +0000 +++ src/nsterm.m 2012-07-30 20:10:31 +0000 @@ -195,6 +195,7 @@ static NSMutableArray *ns_pending_files, *ns_pending_service_names, *ns_pending_service_args; static BOOL inNsSelect = 0; +static BOOL ns_do_open_file = NO; /* Convert modifiers in a NeXTstep event to emacs style modifiers. */ #define NS_FUNCTION_KEY_MASK 0x800000 @@ -4025,7 +4026,7 @@ ns_pending_service_names = [[NSMutableArray alloc] init]; ns_pending_service_args = [[NSMutableArray alloc] init]; - /* Start app and create the main menu, window, view. +/* Start app and create the main menu, window, view. Needs to be here because ns_initialize_display_info () uses AppKit classes. The view will then ask the NSApp to stop and return to Emacs. */ [EmacsApp sharedApplication]; @@ -4205,7 +4206,7 @@ #endif /* MAC OS X menu setup */ [NSApp run]; - + ns_do_open_file = YES; return dpyinfo; } @@ -4446,7 +4447,8 @@ /* Notification from the Workspace to open a file */ - (BOOL)application: sender openFile: (NSString *)file { - [ns_pending_files addObject: file]; + if (ns_do_open_file) + [ns_pending_files addObject: file]; return YES; } @@ -4454,7 +4456,8 @@ /* Open a file as a temporary file */ - (BOOL)application: sender openTempFile: (NSString *)file { - [ns_pending_files addObject: file]; + if (ns_do_open_file) + [ns_pending_files addObject: file]; return YES; } @@ -4462,7 +4465,8 @@ /* Notification from the Workspace to open a file noninteractively (?) */ - (BOOL)application: sender openFileWithoutUI: (NSString *)file { - [ns_pending_files addObject: file]; + if (ns_do_open_file) + [ns_pending_files addObject: file]; return YES; } @@ -4470,11 +4474,17 @@ /* Notification from the Workspace to open multiple files */ - (void)application: sender openFiles: (NSArray *)fileList { - NSEnumerator *files = [fileList objectEnumerator]; - NSString *file; - while ((file = [files nextObject]) != nil) - [ns_pending_files addObject: file]; - + /* Don't open files from the command line, Cocoa parses the command line + wrong anyway, --option value tries to open value if --option is the last + option. */ + if (ns_ignore_open_file) + { + NSEnumerator *files = [fileList objectEnumerator]; + NSString *file; + while ((file = [files nextObject]) != nil) + [ns_pending_files addObject: file]; + } + [self replyToOpenOrPrint: NSApplicationDelegateReplySuccess]; } ------------------------------------------------------------ revno: 109303 committer: Stefan Merten branch nick: trunk timestamp: Mon 2012-07-30 21:54:07 +0200 message: Silence `checkdoc-ispell'. (rst-cvs-header, rst-svn-rev, rst-svn-timestamp) (rst-official-version, rst-official-cvs-rev) (rst-package-emacs-version-alist): Update to upstream V1.3.1. (rst-mode-map): New key binding. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-30 16:20:35 +0000 +++ lisp/ChangeLog 2012-07-30 19:54:07 +0000 @@ -1,3 +1,11 @@ +2012-07-30 Stefan Merten + + * rst.el: Silence `checkdoc-ispell'. + (rst-cvs-header, rst-svn-rev, rst-svn-timestamp) + (rst-official-version, rst-official-cvs-rev) + (rst-package-emacs-version-alist): Update to upstream V1.3.1. + (rst-mode-map): New key binding. + 2012-07-30 Paul Eggert Update .PHONY listings in makefiles. === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2012-06-27 18:36:25 +0000 +++ lisp/textmodes/rst.el 2012-07-30 19:54:07 +0000 @@ -103,6 +103,8 @@ ;;; Code: +;; FIXME: Add proper ";;;###autoload" comments. + ;; FIXME: When 24.1 is common place remove use of `lexical-let' and put "-*- ;; lexical-binding: t -*-" in the first line. @@ -123,7 +125,7 @@ (defun rst-some (seq &optional pred) "Return non-nil if any element of SEQ yields non-nil when PRED is applied. Apply PRED to each element of list SEQ until the first non-nil -result is yielded and return this result. PRED defaults to +result is yielded and return this result. PRED defaults to `identity'." (unless pred (setq pred 'identity)) @@ -171,7 +173,7 @@ ;; Use CVSHeader to really get information from CVS and not other version ;; control systems. (defconst rst-cvs-header - "$CVSHeader: sm/rst_el/rst.el,v 1.287 2012-06-16 09:41:47 stefan Exp $") + "$CVSHeader: sm/rst_el/rst.el,v 1.301 2012-07-30 19:29:46 stefan Exp $") (defconst rst-cvs-rev (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+" " .*" rst-cvs-header "0.0") @@ -185,22 +187,22 @@ ;; Use LastChanged... to really get information from SVN. (defconst rst-svn-rev (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " " - "$LastChangedRevision: 7444 $") + "$LastChangedRevision: 7490 $") "The SVN revision of this file. SVN revision is the upstream (docutils) revision.") (defconst rst-svn-timestamp (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " " - "$LastChangedDate: 2012-06-16 11:41:40 +0200 (Sat, 16 Jun 2012) $") + "$LastChangedDate: 2012-07-30 21:29:33 +0200 (Mon, 30 Jul 2012) $") "The SVN time stamp of this file.") ;; Maintained by the release process. (defconst rst-official-version (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " - "%OfficialVersion: 1.3.0 %") + "%OfficialVersion: 1.3.1 %") "Official version of the package.") (defconst rst-official-cvs-rev (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " - "%Revision: 1.287 %") + "%Revision: 1.301 %") "CVS revision of this file in the official version.") (defconst rst-version @@ -217,7 +219,9 @@ ("1.1.0" . "24.2") ("1.2.0" . "24.2") ("1.2.1" . "24.2") - ("1.3.0" . "24.2"))) + ("1.3.0" . "24.2") + ("1.3.1" . "24.2") + )) (unless (assoc rst-official-version rst-package-emacs-version-alist) (error "Version %s not listed in `rst-package-emacs-version-alist'" @@ -580,10 +584,13 @@ ;; ;; The adjustment function that adorns or rotates a section title. (rst-define-key map [?\C-c ?\C-=] 'rst-adjust [?\C-c ?\C-a t]) - (rst-define-key map [?\C-=] 'rst-adjust) ; (Does not work on the Mac OSX.) + (rst-define-key map [?\C-=] 'rst-adjust) ; Does not work on the Mac OSX and + ; on consoles. ;; \C-c \C-a is the keymap for adornments. (rst-define-key map [?\C-c ?\C-a ?\C-h] 'describe-prefix-bindings) + ;; Another binding which works with all types of input. + (rst-define-key map [?\C-c ?\C-a ?\C-a] 'rst-adjust) ;; Display the hierarchy of adornments implied by the current document ;; contents. (rst-define-key map [?\C-c ?\C-a ?\C-d] 'rst-display-adornments-hierarchy) @@ -3954,7 +3961,9 @@ extension of produced filename, options to the tool (nil or a string)) to be used for converting the document." ;; FIXME: These are not options but symbols which may be referenced by - ;; `rst-compile-*-toolset` below. + ;; `rst-compile-*-toolset` below. The `:validate' keyword of + ;; `defcustom' may help to define this properly in newer Emacs + ;; versions (> 23.1). :type '(alist :options (html latex newlatex pseudoxml xml pdf s5) :key-type symbol :value-type (list :tag "Specification" ------------------------------------------------------------ revno: 109302 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-07-30 11:56:42 -0700 message: * lisp.h (SWITCH_ENUM_CAST): Remove. All uses removed. This no-op macro hasn't been needed for many years. * src/regex.c (SWITCH_ENUM_CAST) [!emacs]: Likewise. diff: === modified file 'admin/CPP-DEFINES' --- admin/CPP-DEFINES 2012-07-17 11:52:00 +0000 +++ admin/CPP-DEFINES 2012-07-30 18:56:42 +0000 @@ -61,8 +61,6 @@ ** Misc macros USER_FULL_NAME If defined, overrides the default pw->pw_gecos for getting at the full user name. Only MSDOS overrides the default. -** Replace, the definition is trivial: SWITCH_ENUM_CAST - ** Defines from src/s/*.h. Some of these might not be used in the code anymore, so they can be removed. The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/s/*.h. === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 18:44:51 +0000 +++ src/ChangeLog 2012-07-30 18:56:42 +0000 @@ -1,5 +1,9 @@ 2012-07-30 Paul Eggert + * lisp.h (SWITCH_ENUM_CAST): Remove. All uses removed. + This no-op macro hasn't been needed for many years. + * src/regex.c (SWITCH_ENUM_CAST) [!emacs]: Likewise. + Export DIRECTORY_SEP, TYPEMASK, VALMASK to GDB. * alloc.c (gdb_make_enums_visible) [USE_LSB_TAG]: Add lsb_bits. * lisp.h (enum lsb_bits) [USE_LSB_TAG]: New enum, for === modified file 'src/alloc.c' --- src/alloc.c 2012-07-30 18:44:51 +0000 +++ src/alloc.c 2012-07-30 18:56:42 +0000 @@ -5926,7 +5926,7 @@ #endif /* not GC_CHECK_MARKED_OBJECTS */ - switch (SWITCH_ENUM_CAST (XTYPE (obj))) + switch (XTYPE (obj)) { case Lisp_String: { === modified file 'src/data.c' --- src/data.c 2012-07-29 22:42:12 +0000 +++ src/data.c 2012-07-30 18:56:42 +0000 @@ -2522,7 +2522,7 @@ ptrdiff_t ok_args; EMACS_INT ok_accum; - switch (SWITCH_ENUM_CAST (code)) + switch (code) { case Alogior: case Alogxor: @@ -2557,7 +2557,7 @@ nargs, args); args[argnum] = val; next = XINT (args[argnum]); - switch (SWITCH_ENUM_CAST (code)) + switch (code) { case Aadd: if (INT_ADD_OVERFLOW (accum, next)) @@ -2643,7 +2643,7 @@ args[argnum] = val; /* runs into a compiler bug. */ next = XINT (args[argnum]); } - switch (SWITCH_ENUM_CAST (code)) + switch (code) { case Aadd: accum += next; === modified file 'src/keyboard.c' --- src/keyboard.c 2012-07-30 06:43:46 +0000 +++ src/keyboard.c 2012-07-30 18:56:42 +0000 @@ -5319,7 +5319,7 @@ { int i; - switch (SWITCH_ENUM_CAST (event->kind)) + switch (event->kind) { /* A simple keystroke. */ case ASCII_KEYSTROKE_EVENT: === modified file 'src/lisp.h' --- src/lisp.h 2012-07-30 18:44:51 +0000 +++ src/lisp.h 2012-07-30 18:56:42 +0000 @@ -3319,8 +3319,6 @@ #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_)) #endif -#define SWITCH_ENUM_CAST(x) (x) - /* Use this to suppress gcc's warnings. */ #ifdef lint === modified file 'src/regex.c' --- src/regex.c 2012-07-29 08:18:29 +0000 +++ src/regex.c 2012-07-30 18:56:42 +0000 @@ -255,8 +255,6 @@ /* Sword must be nonzero for the wordchar pattern commands in re_match_2. */ enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 2 }; -# define SWITCH_ENUM_CAST(x) (x) - /* Dummy macros for non-Emacs environments. */ # define CHAR_CHARSET(c) 0 # define CHARSET_LEADING_CODE_BASE(c) 0 @@ -3913,7 +3911,7 @@ as used for the *? operator. */ re_char *p1 = p; - switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++)) + switch (*p++) { case succeed: return 1; @@ -4088,7 +4086,7 @@ visited. `re_compile' should make sure this is true. */ break; p += j; - switch (SWITCH_ENUM_CAST ((re_opcode_t) *p)) + switch (*p) { case on_failure_jump: case on_failure_keep_string_jump: @@ -4621,7 +4619,7 @@ static re_char * skip_one_char (const re_char *p) { - switch (SWITCH_ENUM_CAST (*p++)) + switch (*p++) { case anychar: break; @@ -4666,7 +4664,7 @@ int mcnt; while (p < pend) { - switch (SWITCH_ENUM_CAST ((re_opcode_t) *p)) + switch (*p) { case start_memory: case stop_memory: @@ -4711,7 +4709,7 @@ op2 = p2 == pend ? succeed : *p2; - switch (SWITCH_ENUM_CAST (op2)) + switch (op2) { case succeed: case endbuf: @@ -4835,7 +4833,7 @@ break; case charset_not: - switch (SWITCH_ENUM_CAST (*p1)) + switch (*p1) { case exactn: case charset: @@ -5313,7 +5311,7 @@ } /* Otherwise match next pattern command. */ - switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++)) + switch (*p++) { /* Ignore these. Used to ignore the n of succeed_n's which currently have n == 0. */ @@ -6235,7 +6233,7 @@ /* A restart point is known. Restore to that state. */ DEBUG_PRINT1 ("\nFAIL:\n"); POP_FAILURE_POINT (str, pat); - switch (SWITCH_ENUM_CAST ((re_opcode_t) *pat++)) + switch (*pat++) { case on_failure_keep_string_jump: assert (str == NULL); === modified file 'src/syntax.c' --- src/syntax.c 2012-07-27 09:24:34 +0000 +++ src/syntax.c 2012-07-30 18:56:42 +0000 @@ -1152,7 +1152,7 @@ insert_string ("\twhich means: "); - switch (SWITCH_ENUM_CAST (code)) + switch (code) { case Swhitespace: insert_string ("whitespace"); break; @@ -2525,7 +2525,7 @@ if (prefix) continue; - switch (SWITCH_ENUM_CAST (code)) + switch (code) { case Sescape: case Scharquote: @@ -2702,7 +2702,7 @@ else if (SYNTAX_FLAGS_PREFIX (syntax)) continue; - switch (SWITCH_ENUM_CAST (code)) + switch (code) { case Sword: case Ssymbol: @@ -3123,7 +3123,7 @@ if (SYNTAX_FLAGS_PREFIX (prev_from_syntax)) continue; - switch (SWITCH_ENUM_CAST (code)) + switch (code) { case Sescape: case Scharquote: === modified file 'src/xdisp.c' --- src/xdisp.c 2012-07-30 06:43:46 +0000 +++ src/xdisp.c 2012-07-30 18:56:42 +0000 @@ -20414,7 +20414,7 @@ depth++; - switch (SWITCH_ENUM_CAST (XTYPE (elt))) + switch (XTYPE (elt)) { case Lisp_String: { ------------------------------------------------------------ revno: 109301 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-07-30 11:44:51 -0700 message: Export DIRECTORY_SEP, TYPEMASK, VALMASK to GDB. * alloc.c (gdb_make_enums_visible) [USE_LSB_TAG]: Add lsb_bits. * lisp.h (enum lsb_bits) [USE_LSB_TAG]: New enum, for gdb_make_enums_visible. (TYPEMASK, VALMASK) [USE_LSB_TAGS]: Now enum constants, not macros. (DIRECTORY_SEP): Now a constant, not a macro. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 17:07:33 +0000 +++ src/ChangeLog 2012-07-30 18:44:51 +0000 @@ -1,3 +1,12 @@ +2012-07-30 Paul Eggert + + Export DIRECTORY_SEP, TYPEMASK, VALMASK to GDB. + * alloc.c (gdb_make_enums_visible) [USE_LSB_TAG]: Add lsb_bits. + * lisp.h (enum lsb_bits) [USE_LSB_TAG]: New enum, for + gdb_make_enums_visible. + (TYPEMASK, VALMASK) [USE_LSB_TAGS]: Now enum constants, not macros. + (DIRECTORY_SEP): Now a constant, not a macro. + 2012-07-30 Eli Zaretskii * w32fns.c (w32_wnd_proc): Pass w32_keyboard_codepage to === modified file 'src/alloc.c' --- src/alloc.c 2012-07-30 05:41:10 +0000 +++ src/alloc.c 2012-07-30 18:44:51 +0000 @@ -6882,4 +6882,7 @@ enum MAX_ALLOCA MAX_ALLOCA; enum More_Lisp_Bits More_Lisp_Bits; enum pvec_type pvec_type; +#if USE_LSB_TAG + enum lsb_bits lsb_bits; +#endif } const EXTERNALLY_VISIBLE gdb_make_enums_visible = {0}; === modified file 'src/lisp.h' --- src/lisp.h 2012-07-30 15:30:40 +0000 +++ src/lisp.h 2012-07-30 18:44:51 +0000 @@ -398,8 +398,11 @@ #if USE_LSB_TAG -static int const VALMASK = -1 << GCTYPEBITS; -#define TYPEMASK ((1 << GCTYPEBITS) - 1) +enum lsb_bits + { + TYPEMASK = (1 << GCTYPEBITS) - 1, + VALMASK = ~ TYPEMASK + }; #define XTYPE(a) ((enum Lisp_Type) (XLI (a) & TYPEMASK)) #define XINT(a) (XLI (a) >> INTTYPEBITS) #define XUINT(a) ((EMACS_UINT) XLI (a) >> INTTYPEBITS) @@ -3301,7 +3304,7 @@ in addition to a device separator. Set the path separator to '/', and don't test for a device separator in IS_ANY_SEP. */ -#define DIRECTORY_SEP '/' +static char const DIRECTORY_SEP = '/'; #ifndef IS_DIRECTORY_SEP #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) #endif ------------------------------------------------------------ revno: 109300 fixes bug: http://debbugs.gnu.org/12082 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-07-30 20:07:33 +0300 message: Fix bug #12082 with input of Meta-non-ASCII-characters on MS-Windows. src/w32fns.c (w32_wnd_proc): Pass w32_keyboard_codepage to w32_kbd_patch_key as the 2nd arg. src/w32term.c : Renamed from keyboard_codepage and now external. All users changed. src/w32term.h: Add declaration of w32_keyboard_codepage. src/w32inevt.c (w32_kbd_patch_key): Accept an additional argument -- the codepage to translate keys to Unicode. If this argument is -1, use the value returned by GetConsoleCP. All callers changed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 16:20:35 +0000 +++ src/ChangeLog 2012-07-30 17:07:33 +0000 @@ -1,3 +1,17 @@ +2012-07-30 Eli Zaretskii + + * w32fns.c (w32_wnd_proc): Pass w32_keyboard_codepage to + w32_kbd_patch_key as the 2nd arg. (Bug#12082) + + * w32term.c : Renamed from + keyboard_codepage and now external. All users changed. + + * w32term.h: Add declaration of w32_keyboard_codepage. + + * w32inevt.c (w32_kbd_patch_key): Accept an additional argument -- + the codepage to translate keys to Unicode. If this argument is + -1, use the value returned by GetConsoleCP. All callers changed. + 2012-07-30 Paul Eggert Update .PHONY listings in makefiles. === modified file 'src/w32fns.c' --- src/w32fns.c 2012-07-29 08:18:29 +0000 +++ src/w32fns.c 2012-07-30 17:07:33 +0000 @@ -2882,7 +2882,7 @@ key.uChar.AsciiChar = 0; key.dwControlKeyState = modifiers; - add = w32_kbd_patch_key (&key); + add = w32_kbd_patch_key (&key, w32_keyboard_codepage); /* 0 means an unrecognized keycode, negative means dead key. Ignore both. */ while (--add >= 0) @@ -2892,7 +2892,7 @@ (hwnd, WM_CHAR, (unsigned char) key.uChar.AsciiChar, lParam, w32_get_key_modifiers (wParam, lParam)); - w32_kbd_patch_key (&key); + w32_kbd_patch_key (&key, w32_keyboard_codepage); } return 0; } === modified file 'src/w32inevt.c' --- src/w32inevt.c 2012-07-29 08:18:29 +0000 +++ src/w32inevt.c 2012-07-30 17:07:33 +0000 @@ -185,9 +185,11 @@ } #endif -/* The return code indicates key code size. */ +/* The return code indicates key code size. cpID is the codepage to + use for translation to Unicode; -1 means use the current console + input codepage. */ int -w32_kbd_patch_key (KEY_EVENT_RECORD *event) +w32_kbd_patch_key (KEY_EVENT_RECORD *event, int cpId) { unsigned int key_code = event->wVirtualKeyCode; unsigned int mods = event->dwControlKeyState; @@ -243,7 +245,11 @@ keystate, buf, 128, 0); if (isdead > 0) { - int cpId = GetConsoleCP (); + /* When we are called from the GUI message processing code, + we are passed the current keyboard codepage, a positive + number, to use below. */ + if (cpId == -1) + cpId = GetConsoleCP (); event->uChar.UnicodeChar = buf[isdead - 1]; isdead = WideCharToMultiByte (cpId, 0, buf, isdead, @@ -442,7 +448,7 @@ base character (ie. translating the base key plus shift modifier). */ else if (event->uChar.AsciiChar == 0) - w32_kbd_patch_key (event); + w32_kbd_patch_key (event, -1); } if (event->uChar.AsciiChar == 0) === modified file 'src/w32term.c' --- src/w32term.c 2012-07-29 08:18:29 +0000 +++ src/w32term.c 2012-07-30 17:07:33 +0000 @@ -155,6 +155,9 @@ int last_scroll_bar_drag_pos; +/* Keyboard code page - may be changed by language-change events. */ +int w32_keyboard_codepage; + /* Mouse movement. */ /* Where the mouse was last time we reported a mouse event. */ @@ -188,9 +191,6 @@ static int input_signal_count; #endif -/* Keyboard code page - may be changed by language-change events. */ -static int keyboard_codepage; - static void x_update_window_end (struct window *, int, int); static void w32_handle_tool_bar_click (struct frame *, struct input_event *); @@ -4235,14 +4235,14 @@ /* lParam contains the input language ID in its low 16 bits. Use it to update our record of the keyboard codepage. */ - keyboard_codepage = codepage_for_locale ((LCID)(msg.msg.lParam - & 0xffff)); + w32_keyboard_codepage = codepage_for_locale ((LCID)(msg.msg.lParam + & 0xffff)); if (f) { inev.kind = LANGUAGE_CHANGE_EVENT; XSETFRAME (inev.frame_or_window, f); - inev.code = keyboard_codepage; + inev.code = w32_keyboard_codepage; inev.modifiers = msg.msg.lParam & 0xffff; } break; @@ -4308,7 +4308,7 @@ { dbcs[0] = dbcs_lead; dbcs_lead = 0; - if (!MultiByteToWideChar (keyboard_codepage, 0, + if (!MultiByteToWideChar (w32_keyboard_codepage, 0, dbcs, 2, &code, 1)) { /* Garbage */ @@ -4318,7 +4318,7 @@ break; } } - else if (IsDBCSLeadByteEx (keyboard_codepage, + else if (IsDBCSLeadByteEx (w32_keyboard_codepage, (BYTE) msg.msg.wParam)) { dbcs_lead = (char) msg.msg.wParam; @@ -4327,7 +4327,7 @@ } else { - if (!MultiByteToWideChar (keyboard_codepage, 0, + if (!MultiByteToWideChar (w32_keyboard_codepage, 0, &dbcs[1], 1, &code, 1)) { /* What to do with garbage? */ @@ -6426,7 +6426,8 @@ { DWORD input_locale_id = (DWORD) GetKeyboardLayout (0); - keyboard_codepage = codepage_for_locale ((LCID) (input_locale_id & 0xffff)); + w32_keyboard_codepage = + codepage_for_locale ((LCID) (input_locale_id & 0xffff)); } /* Create the window thread - it will terminate itself when the app === modified file 'src/w32term.h' --- src/w32term.h 2012-07-29 08:18:29 +0000 +++ src/w32term.h 2012-07-30 17:07:33 +0000 @@ -667,6 +667,9 @@ #define RIGHT_WIN_PRESSED 0x4000 #define APPS_PRESSED 0x2000 +/* The current ANSI input codepage for GUI sessions. */ +extern int w32_keyboard_codepage; + /* When compiling on Windows 9x/ME and NT 3.x, the following are not defined (even though they are supported on 98 and ME. */ #ifndef WM_MOUSELEAVE ------------------------------------------------------------ revno: 109299 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-07-30 09:20:35 -0700 message: Update .PHONY listings in makefiles. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 14:52:08 +0000 +++ ChangeLog 2012-07-30 16:20:35 +0000 @@ -1,3 +1,12 @@ +2012-07-30 Paul Eggert + + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, ${SUBDIR}, blessmail, epath-force, + FRC, install-arch-dep, install-arch-indep, install-doc, + install-info, install-man, install-etc, install-strip, uninstall, + bootstrap-clean, TAGS, tags, info-real, force-info, check-info-dir. + (.RECURSIVE): Remove; hasn't been needed for years. + 2012-07-30 Glenn Morris * configure.ac (SIGNAL_H_AHB): New hack macro. === modified file 'Makefile.in' --- Makefile.in 2012-07-30 07:51:29 +0000 +++ Makefile.in 2012-07-30 16:20:35 +0000 @@ -278,6 +278,8 @@ all: ${SUBDIR} +.PHONY: all ${SUBDIR} blessmail epaths-force FRC + removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' # Generate epaths.h from epaths.in. This target is invoked by `configure'. @@ -307,8 +309,6 @@ src: lib-src FRC -.RECURSIVE: ${SUBDIR} - # We need to build `emacs' in `src' to compile the *.elc files in `lisp' # and `leim'. lisp leim: src @@ -393,12 +393,13 @@ # ==================== Installation ==================== +.PHONY: install install-arch-dep install-arch-indep install-doc install-info +.PHONY: install-man install-etc install-strip uninstall + ## If we let lib-src do its own installation, that means we ## don't have to duplicate the list of utilities to install in ## this Makefile as well. -.PHONY: install - install: all install-arch-indep install-doc install-arch-dep blessmail @true @@ -681,7 +682,7 @@ # ==================== Cleaning up and miscellanea ==================== -.PHONY: mostlyclean clean distclean maintainer-clean extraclean +.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean ### `mostlyclean' ### Like `clean', but may refrain from deleting a few files that people @@ -798,6 +799,7 @@ # The src subdir knows how to do the right thing # even when the build directory and source dir are different. +.PHONY: TAGS tags TAGS tags: lib lib-src src cd src; $(MAKE) $(MFLAGS) tags @@ -812,7 +814,7 @@ dist: cd ${srcdir}; ./make-dist -.PHONY: info dvi dist check html +.PHONY: info dvi dist check html info-real force-info check-info-dir info-real: (cd doc/emacs; $(MAKE) $(MFLAGS) info) === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-07-29 07:16:45 +0000 +++ leim/ChangeLog 2012-07-30 16:20:35 +0000 @@ -1,3 +1,9 @@ +2012-07-30 Paul Eggert + + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, compile-main, clean, mostlyclean, + bootstrap-clean, distclean, maintainer-clean, extraclean. + 2012-07-29 Paul Eggert deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150) === modified file 'leim/Makefile.in' --- leim/Makefile.in 2012-05-22 00:46:40 +0000 +++ leim/Makefile.in 2012-07-30 16:20:35 +0000 @@ -82,6 +82,7 @@ @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $< all: leim-list.el compile-main +.PHONY: all TIT_SOURCES= \ ${srcdir}/CXTERM-DIC/4Corner.tit \ @@ -154,6 +155,7 @@ # Compile all the Elisp files that need it. Beware: it approximates # `no-byte-compile', so watch out for false-positives! +.PHONY: compile-main compile-main: ${TIT_MISC} @($(setwins); \ els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \ @@ -166,6 +168,8 @@ $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done +.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean + clean mostlyclean: rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ leim-list.el changed.tit changed.misc === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-07-29 15:53:31 +0000 +++ lib-src/ChangeLog 2012-07-30 16:20:35 +0000 @@ -1,3 +1,10 @@ +2012-07-30 Paul Eggert + + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, need-blessmail, maybe-blessmail, + install, uninstall, mostlyclean, clean, distclean, + maintainer-clean, extraclean, check, tags. + 2012-07-29 Eli Zaretskii * makefile.w32-in ($(BLD)/profile.$(O)): Depend on stamp_BLD. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2012-06-26 01:05:39 +0000 +++ lib-src/Makefile.in 2012-07-30 16:20:35 +0000 @@ -180,6 +180,8 @@ all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} +.PHONY: all need-blessmail maybe-blessmail + LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM) $(EXE_FILES): ../lib/libgnu.a @@ -231,6 +233,9 @@ done ; \ fi +.PHONY: install uninstall mostlyclean clean distclean maintainer-clean +.PHONY: extraclean check tags + install: $(DESTDIR)${archlibdir} @echo @echo "Installing utilities for users to run." === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-29 23:25:39 +0000 +++ lisp/ChangeLog 2012-07-30 16:20:35 +0000 @@ -1,3 +1,12 @@ +2012-07-30 Paul Eggert + + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, doit, custom-deps, finder-data, + autoloads, update-subdirs, updates, bzr-update, update-authors, + compile-onefile, compile-calc, backup-compiled-files, + compile-after-backup, compile-one-process, mh-autoloads, + bootstrap-clean, distclean, maintainer-clean. + 2012-07-29 Jay Belanger * calc/calc.el (calc-simplify-mode): Make 'alg the default value. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2012-07-06 07:45:23 +0000 +++ lisp/Makefile.in 2012-07-30 16:20:35 +0000 @@ -139,6 +139,8 @@ doit: +.PHONY: all doit custom-deps finder-data autoloads update-subdirs + # custom-deps and finder-data both used to scan _all_ the *.el files. # This could lead to problems in parallel builds if automatically # generated *.el files (eg loaddefs etc) were being changed at the same time. @@ -184,6 +186,8 @@ $(top_srcdir)/build-aux/update-subdirs $$file; \ done; +.PHONY: updates bzr-update update-authors + # Some modes of make-dist use this. updates: update-subdirs autoloads finder-data custom-deps @@ -215,6 +219,7 @@ # src/Makefile.in to rebuild a particular Lisp file, no questions asked. # Use byte-compile-refresh-preloaded to try and work around some of # the most common problems of not bootstrapping from a clean state. +.PHONY: compile-onefile compile-onefile: @echo Compiling $(THEFILE) @# Use byte-compile-refresh-preloaded to try and work around some of @@ -302,6 +307,8 @@ cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(MAKE) $(MFLAGS) compile EMACS=$(EMACS) +.PHONY: compile-calc backup-compiled-files compile-after-backup + compile-calc: for el in $(lisp)/calc/*.el; do \ echo Compiling $$el; \ @@ -334,6 +341,7 @@ # files that use byte-compile-dynamic are updated. # There is no reason to use this rule unless you only have a single # core and CPU time is an issue. +.PHONY: compile-one-process compile-one-process: doit $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc $(emacs) $(BYTE_COMPILE_FLAGS) \ --eval "(batch-byte-recompile-directory 0)" $(lisp) @@ -356,6 +364,7 @@ $(MH_E_DIR)/mh-tool-bar.el $(MH_E_DIR)/mh-utils.el \ $(MH_E_DIR)/mh-xface.el +.PHONY: mh-autoloads mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) $(emacs) -l autoload \ @@ -418,6 +427,8 @@ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(CAL_DIR) +.PHONY: bootstrap-clean distclean maintainer-clean + bootstrap-clean: cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 15:30:40 +0000 +++ src/ChangeLog 2012-07-30 16:20:35 +0000 @@ -1,5 +1,10 @@ 2012-07-30 Paul Eggert + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, mostlyclean, clean, + bootstrap-clean, distclean, maintainer-clean, versioclean, + extraclean, frc. + * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t. This is a bit clearer. Fix some commentary typos. === modified file 'src/Makefile.in' --- src/Makefile.in 2012-07-06 01:29:54 +0000 +++ src/Makefile.in 2012-07-30 16:20:35 +0000 @@ -391,6 +391,7 @@ $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) all: emacs$(EXEEXT) $(OTHER_FILES) +.PHONY: all $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe) @@ -496,6 +497,8 @@ ## If HAVE_NS, some ns-specific rules (for OTHER_FILES) are inserted here. @ns_frag@ +.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean +.PHONY: versioclean extraclean frc mostlyclean: rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a ------------------------------------------------------------ revno: 109298 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-07-30 08:30:40 -0700 message: * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t. This is a bit clearer. Fix some commentary typos. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 14:52:08 +0000 +++ src/ChangeLog 2012-07-30 15:30:40 +0000 @@ -1,3 +1,8 @@ +2012-07-30 Paul Eggert + + * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t. + This is a bit clearer. Fix some commentary typos. + 2012-07-30 Glenn Morris * s/netbsd.h: Let configure include signal.h if needed. @@ -53,7 +58,7 @@ (enum maxargs, enum FLOAT_TO_STRING_BUFSIZE, enum MAX_ALLOCA): New enums, for gdb_make_enums_visible. (GLYPH_MODE_LINE_FACE): Remove; unused. - * alloc.c (STRING_BYTES_MAX): Now a constant, now a macro. + * alloc.c (STRING_BYTES_MAX): Now a constant, not a macro. (gdb_make_enums_visible): Add enum CHARTAB_SIZE_BITS, enum CHAR_TABLE_STANDARD_SLOTS, enum char_bits, enum DEFAULT_HASH_SIZE, enum FLOAT_TO_STRING_BUFSIZE, enum Lisp_Bits, enum Lisp_Compiled, === modified file 'src/lisp.h' --- src/lisp.h 2012-07-30 06:43:46 +0000 +++ src/lisp.h 2012-07-30 15:30:40 +0000 @@ -715,12 +715,12 @@ would expose alloc.c internal details that we'd rather keep private. - This is a macros for use in static initializers, and a constant for + This is a macro for use in static initializers, and a constant for visibility to GDB. The cast to ptrdiff_t ensures that - STRING_BYTES_BOUND is signed. */ + the macro is signed. */ static ptrdiff_t const STRING_BYTES_BOUND = #define STRING_BYTES_BOUND \ - min (MOST_POSITIVE_FIXNUM, (ptrdiff_t) min (SIZE_MAX, PTRDIFF_MAX) - 1) + ((ptrdiff_t) min (MOST_POSITIVE_FIXNUM, min (SIZE_MAX, PTRDIFF_MAX) - 1)) STRING_BYTES_BOUND; /* Mark STR as a unibyte string. */ @@ -1517,7 +1517,7 @@ CHAR_META = 0x8000000, CHAR_MODIFIER_MASK = - (CHAR_ALT | CHAR_SUPER | CHAR_HYPER | CHAR_SHIFT | CHAR_CTL | CHAR_META), + CHAR_ALT | CHAR_SUPER | CHAR_HYPER | CHAR_SHIFT | CHAR_CTL | CHAR_META, /* Actually, the current Emacs uses 22 bits for the character value itself. */ ------------------------------------------------------------ revno: 109297 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 07:52:08 -0700 message: Move TIOCSIGSEND from src/s to configure * configure.ac (TIOCSIGSEND): Move here from src/s. * src/s/usg5-4-common.h (TIOCSIGSEND): Let configure set it. * src/s/irix6-5.h (TIOCSIGSEND): No more need to undefine. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 14:46:48 +0000 +++ ChangeLog 2012-07-30 14:52:08 +0000 @@ -4,7 +4,7 @@ (opsysfile): Set to empty on netbsd, openbsd. (AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined. - * configure.ac (_longjmp, _setjmp): Move here from src/s. + * configure.ac (_longjmp, _setjmp, TIOCSIGSEND): Move here from src/s. 2012-07-30 Jan Djärv === modified file 'configure.ac' --- configure.ac 2012-07-30 14:46:48 +0000 +++ configure.ac 2012-07-30 14:52:08 +0000 @@ -3631,12 +3631,17 @@ esac fi dnl GCC? + case $opsys in sol2* | unixware ) dnl setjmp and longjmp can safely replace _setjmp and _longjmp, dnl but they will run more slowly. AC_DEFINE(_setjmp, setjmp, [Some platforms redefine this.]) AC_DEFINE(_longjmp, longjmp, [Some platforms redefine this.]) + dnl TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY + dnl subprocesses the usual way. But TIOCSIGNAL does work for PTYs, + dnl and this is all we need. + AC_DEFINE(TIOCSIGSEND, TIOCSIGNAL, [Some platforms redefine this.]) ;; esac === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 14:46:48 +0000 +++ src/ChangeLog 2012-07-30 14:52:08 +0000 @@ -3,8 +3,10 @@ * s/netbsd.h: Let configure include signal.h if needed. Remove file, which is now empty. - * s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them. - * s/irix6-5.h (_longjmp, _setjmp): No more need to undefine. + * s/usg5-4-common.h (_longjmp, _setjmp, TIOCSIGSEND): + Let configure set them. + * s/irix6-5.h (_longjmp, _setjmp, TIOCSIGSEND): + No more need to undefine. 2012-07-30 Andreas Schwab === modified file 'src/s/irix6-5.h' --- src/s/irix6-5.h 2012-07-30 14:30:20 +0000 +++ src/s/irix6-5.h 2012-07-30 14:52:08 +0000 @@ -24,6 +24,3 @@ #endif #undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ - -#undef TIOCSIGSEND /* defined in usg5-4-common.h */ - === modified file 'src/s/usg5-4-common.h' --- src/s/usg5-4-common.h 2012-07-30 14:30:20 +0000 +++ src/s/usg5-4-common.h 2012-07-30 14:52:08 +0000 @@ -42,8 +42,3 @@ waitpid ((pid_t) -1, (status), (options)) #define WRETCODE(w) (w >> 8) -/* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY - subprocesses the usual way. But TIOCSIGNAL does work for PTYs, and - this is all we need. */ -#define TIOCSIGSEND TIOCSIGNAL - ------------------------------------------------------------ revno: 109296 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 07:46:48 -0700 message: Empty src/s/netbsd.h and remove the file * configure.ac (SIGNAL_H_AHB): New hack macro. (opsysfile): Set to empty on netbsd, openbsd. (AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined. * src/s/netbsd.h: Let configure include signal.h if needed. Remove file, which is now empty. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 14:30:20 +0000 +++ ChangeLog 2012-07-30 14:46:48 +0000 @@ -1,5 +1,9 @@ 2012-07-30 Glenn Morris + * configure.ac (SIGNAL_H_AHB): New hack macro. + (opsysfile): Set to empty on netbsd, openbsd. + (AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined. + * configure.ac (_longjmp, _setjmp): Move here from src/s. 2012-07-30 Jan Djärv === modified file 'configure.ac' --- configure.ac 2012-07-30 14:30:20 +0000 +++ configure.ac 2012-07-30 14:46:48 +0000 @@ -3641,12 +3641,19 @@ esac -dnl Used in xfaces.c. case $opsys in hpux* | sol2* ) + dnl Used in xfaces.c. AC_DEFINE(XOS_NEEDS_TIME_H, 1, [Compensate for a bug in Xos.h on some systems, where it requires time.h.]) ;; + + netbsd | openbsd ) + dnl Greg A. Woods says we must include signal.h + dnl before syssignal.h is included, to work around interface conflicts + dnl that are handled with CPP __RENAME() macro in signal.h. + AC_DEFINE(SIGNAL_H_AHB, 1, [Define if AH_BOTTOM should include signal.h.]) + ;; esac @@ -3772,7 +3779,7 @@ should not call setpgrp.]) ;; - openbsd) opsysfile="s/netbsd.h" ;; + netbsd | openbsd ) opsysfile= ;; sol2-10) AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes @@ -4186,6 +4193,7 @@ #define EMACS_CONFIG_H ])dnl +dnl FIXME undefs in here get commented out by autoconf. :( AH_BOTTOM([ /* On AIX 3 this must be included before any other include file. */ #include @@ -4193,6 +4201,11 @@ # error "alloca not available on this machine" #endif +#ifdef SIGNAL_H_AHB +#undef SIGNAL_H_AHB +#include +#endif + /* This silences a few compilation warnings on FreeBSD. */ #ifdef BSD_SYSTEM_AHB #undef BSD_SYSTEM_AHB === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 14:30:20 +0000 +++ src/ChangeLog 2012-07-30 14:46:48 +0000 @@ -1,5 +1,8 @@ 2012-07-30 Glenn Morris + * s/netbsd.h: Let configure include signal.h if needed. + Remove file, which is now empty. + * s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them. * s/irix6-5.h (_longjmp, _setjmp): No more need to undefine. === removed file 'src/s/netbsd.h' --- src/s/netbsd.h 2012-07-14 00:04:10 +0000 +++ src/s/netbsd.h 1970-01-01 00:00:00 +0000 @@ -1,24 +0,0 @@ -/* s/ file for netbsd system. - -Copyright (C) 2001-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -/* Greg A. Woods says we must include signal.h - before syssignal.h is included, to work around interface conflicts - that are handled with CPP __RENAME() macro in signal.h. */ -#include - ------------------------------------------------------------ revno: 109295 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 07:30:20 -0700 message: Move _longjmp, _setjmp from src/s to configure * configure.ac (_longjmp, _setjmp): Move here from src/s. * src/s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them. * src/s/irix6-5.h (_longjmp, _setjmp): No more need to undefine. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 07:51:29 +0000 +++ ChangeLog 2012-07-30 14:30:20 +0000 @@ -1,3 +1,7 @@ +2012-07-30 Glenn Morris + + * configure.ac (_longjmp, _setjmp): Move here from src/s. + 2012-07-30 Jan Djärv * Makefile.in (install-arch-indep): Remove sh -x. === modified file 'configure.ac' --- configure.ac 2012-07-30 06:34:22 +0000 +++ configure.ac 2012-07-30 14:30:20 +0000 @@ -3631,6 +3631,15 @@ esac fi dnl GCC? +case $opsys in + sol2* | unixware ) + dnl setjmp and longjmp can safely replace _setjmp and _longjmp, + dnl but they will run more slowly. + AC_DEFINE(_setjmp, setjmp, [Some platforms redefine this.]) + AC_DEFINE(_longjmp, longjmp, [Some platforms redefine this.]) + ;; +esac + dnl Used in xfaces.c. case $opsys in === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 07:45:58 +0000 +++ src/ChangeLog 2012-07-30 14:30:20 +0000 @@ -1,3 +1,8 @@ +2012-07-30 Glenn Morris + + * s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them. + * s/irix6-5.h (_longjmp, _setjmp): No more need to undefine. + 2012-07-30 Andreas Schwab * keymap.c (Fkey_description): Don't remove 0x80 bit from === modified file 'src/s/irix6-5.h' --- src/s/irix6-5.h 2012-07-14 00:04:10 +0000 +++ src/s/irix6-5.h 2012-07-30 14:30:20 +0000 @@ -19,9 +19,6 @@ #include "usg5-4-common.h" -#undef _longjmp /* use system versions, not conservative aliases */ -#undef _setjmp - #ifdef emacs char *_getpty(); #endif === modified file 'src/s/usg5-4-common.h' --- src/s/usg5-4-common.h 2012-07-13 21:45:55 +0000 +++ src/s/usg5-4-common.h 2012-07-30 14:30:20 +0000 @@ -20,11 +20,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* setjmp and longjmp can safely replace _setjmp and _longjmp, - but they will run slower. */ -#define _setjmp setjmp -#define _longjmp longjmp - /* Get FIONREAD from . Get to get struct tchars. But get first to make sure ttold.h doesn't interfere. */ #include ------------------------------------------------------------ revno: 109294 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-07-30 06:17:41 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2012-07-29 10:19:06 +0000 +++ autogen/configure 2012-07-30 10:17:41 +0000 @@ -15179,6 +15179,7 @@ case $opsys in aix4-2) + opsysfile= $as_echo "#define USG /**/" >>confdefs.h $as_echo "#define USG5 /**/" >>confdefs.h @@ -15226,6 +15227,7 @@ ;; freebsd) + opsysfile= $as_echo "#define BSD4_2 /**/" >>confdefs.h @@ -15261,6 +15263,7 @@ ;; gnu-linux | gnu-kfreebsd ) + opsysfile= $as_echo "#define USG /**/" >>confdefs.h @@ -15289,6 +15292,7 @@ ;; sol2*) + opsysfile="s/usg5-4-common.h" $as_echo "#define USG /**/" >>confdefs.h $as_echo "#define USG5 /**/" >>confdefs.h @@ -15299,6 +15303,7 @@ ;; unixware) + opsysfile="s/usg5-4-common.h" $as_echo "#define USG /**/" >>confdefs.h $as_echo "#define USG5 /**/" >>confdefs.h @@ -15316,8 +15321,6 @@ gnu) opsysfile= ;; - gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;; - hpux11) $as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h @@ -23784,7 +23787,7 @@ Configured for \`${canonical}'. Where should the build process find the source code? ${srcdir} - What operating system file should Emacs use? ${opsysfile-none} + What operating system file should Emacs use? ${opsysfile:-none} What compiler should emacs be built with? ${CC} ${CFLAGS} Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason} Should Emacs use a relocating allocator for buffers? ${REL_ALLOC} ------------------------------------------------------------ revno: 109293 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2012-07-30 10:13:52 +0000 message: lisp/gnus/ChangeLog (2012-07-27): Fix author's address e-mail diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-07-29 22:17:54 +0000 +++ lisp/gnus/ChangeLog 2012-07-30 10:13:52 +0000 @@ -10,7 +10,7 @@ (auth-source-macos-keychain-result-append): Fix variable name. (auth-sources, auth-source-macos-keychain-result-append): More fixes. -2012-07-27 Julien Danjou +2012-07-27 Julien Danjou * message.el (fboundp): Add a defalias on `mail-dont-reply-to' for Emacs < 24.1 ------------------------------------------------------------ revno: 109292 committer: Jan D. branch nick: trunk timestamp: Mon 2012-07-30 09:51:29 +0200 message: * Makefile.in (install-arch-indep): Remove sh -x. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-30 06:34:22 +0000 +++ ChangeLog 2012-07-30 07:51:29 +0000 @@ -1,3 +1,7 @@ +2012-07-30 Jan Djärv + + * Makefile.in (install-arch-indep): Remove sh -x. + 2012-07-30 Glenn Morris * configure.ac (opsysfile): Tweak message for null case. === modified file 'Makefile.in' --- Makefile.in 2012-07-29 16:55:02 +0000 +++ Makefile.in 2012-07-30 07:51:29 +0000 @@ -489,7 +489,7 @@ ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} umask 022 ; \ - eval sh -x $(MKDIR_P) \ + eval $(MKDIR_P) \ "'$(DESTDIR)`echo ${locallisppath}|sed \"s,:,' '$(DESTDIR),g\"`'" -set ${COPYDESTS} ; \ unset CDPATH; \ ------------------------------------------------------------ revno: 109291 committer: Andreas Schwab branch nick: emacs timestamp: Mon 2012-07-30 09:45:58 +0200 message: Fixes: debbugs:12090 * keymap.c (Fkey_description): Don't remove 0x80 bit from non-single-byte char when adding meta modifier. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 06:43:46 +0000 +++ src/ChangeLog 2012-07-30 07:45:58 +0000 @@ -1,3 +1,8 @@ +2012-07-30 Andreas Schwab + + * keymap.c (Fkey_description): Don't remove 0x80 bit from + non-single-byte char when adding meta modifier. (Bug#12090) + 2012-07-30 Dmitry Antipov Convert safe_call to use variable number of arguments. === modified file 'src/keymap.c' --- src/keymap.c 2012-07-27 09:24:34 +0000 +++ src/keymap.c 2012-07-30 07:45:58 +0000 @@ -2141,7 +2141,7 @@ continue; } else - XSETINT (key, (XINT (key) | meta_modifier) & ~0x80); + XSETINT (key, XINT (key) | meta_modifier); add_meta = 0; } else if (EQ (key, meta_prefix_char)) ------------------------------------------------------------ revno: 109290 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2012-07-30 10:43:46 +0400 message: Convert safe_call to use variable number of arguments. * xdisp.c (safe_call): Convert to use varargs. Adjust users. (safe_call2): Fix comment. * lisp.h (safe_call): Adjust prototype. * coding.c (encode_coding_object): Change to use safe_call2. * xfaces.c (merge_face_heights): Change to use safe_call1. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-30 06:34:22 +0000 +++ src/ChangeLog 2012-07-30 06:43:46 +0000 @@ -1,3 +1,12 @@ +2012-07-30 Dmitry Antipov + + Convert safe_call to use variable number of arguments. + * xdisp.c (safe_call): Convert to use varargs. Adjust users. + (safe_call2): Fix comment. + * lisp.h (safe_call): Adjust prototype. + * coding.c (encode_coding_object): Change to use safe_call2. + * xfaces.c (merge_face_heights): Change to use safe_call1. + 2012-07-30 Glenn Morris * s/aix4-2.h (sigmask): No need to undefine it, since syssignal.h === modified file 'src/coding.c' --- src/coding.c 2012-07-27 09:24:34 +0000 +++ src/coding.c 2012-07-30 06:43:46 +0000 @@ -7931,15 +7931,12 @@ } { - Lisp_Object args[3]; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; GCPRO5 (coding->src_object, coding->dst_object, src_object, dst_object, old_deactivate_mark); - args[0] = CODING_ATTR_PRE_WRITE (attrs); - args[1] = make_number (BEG); - args[2] = make_number (Z); - safe_call (3, args); + safe_call2 (CODING_ATTR_PRE_WRITE (attrs), + make_number (BEG), make_number (Z)); UNGCPRO; } if (XBUFFER (coding->src_object) != current_buffer) === modified file 'src/composite.c' --- src/composite.c 2012-07-06 05:07:44 +0000 +++ src/composite.c 2012-07-30 06:43:46 +0000 @@ -947,20 +947,12 @@ string); if (NILP (LGSTRING_ID (lgstring))) { - Lisp_Object args[6]; - /* Save point as marker before calling out to lisp. */ if (NILP (string)) record_unwind_protect (restore_point_unwind, build_marker (current_buffer, pt, pt_byte)); - - args[0] = Vauto_composition_function; - args[1] = AREF (rule, 2); - args[2] = pos; - args[3] = make_number (to); - args[4] = font_object; - args[5] = string; - lgstring = safe_call (6, args); + lgstring = safe_call (6, Vauto_composition_function, AREF (rule, 2), + pos, make_number (to), font_object, string); } return unbind_to (count, lgstring); } === modified file 'src/keyboard.c' --- src/keyboard.c 2012-07-26 01:27:33 +0000 +++ src/keyboard.c 2012-07-30 06:43:46 +0000 @@ -2185,14 +2185,7 @@ if (!NILP (help) && !STRINGP (help)) { if (FUNCTIONP (help)) - { - Lisp_Object args[4]; - args[0] = help; - args[1] = window; - args[2] = object; - args[3] = pos; - help = safe_call (4, args); - } + help = safe_call (4, help, window, object, pos); else help = safe_eval (help); === modified file 'src/lisp.h' --- src/lisp.h 2012-07-30 05:41:10 +0000 +++ src/lisp.h 2012-07-30 06:43:46 +0000 @@ -2842,7 +2842,7 @@ ATTRIBUTE_FORMAT_PRINTF (1, 0); extern Lisp_Object un_autoload (Lisp_Object); extern void init_eval_once (void); -extern Lisp_Object safe_call (ptrdiff_t, Lisp_Object *); +extern Lisp_Object safe_call (ptrdiff_t, Lisp_Object, ...); extern Lisp_Object safe_call1 (Lisp_Object, Lisp_Object); extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object); extern void init_eval (void); === modified file 'src/term.c' --- src/term.c 2012-07-08 16:38:43 +0000 +++ src/term.c 2012-07-30 06:43:46 +0000 @@ -2209,11 +2209,10 @@ if (mode != tty->previous_color_mode) { - Lisp_Object funsym = intern ("tty-set-up-initial-frame-faces"); tty->previous_color_mode = mode; tty_setup_colors (tty , mode); /* This recomputes all the faces given the new color definitions. */ - safe_call (1, &funsym); + safe_call (1, intern ("tty-set-up-initial-frame-faces")); } } === modified file 'src/xdisp.c' --- src/xdisp.c 2012-07-28 07:59:34 +0000 +++ src/xdisp.c 2012-07-30 06:43:46 +0000 @@ -2403,16 +2403,12 @@ return Qnil; } - -/* Evaluate SEXPR and return the result, or nil if something went +/* Call function FUNC with the rest of NARGS - 1 arguments + following. Return the result, or nil if something went wrong. Prevent redisplay during the evaluation. */ -/* Call function ARGS[0] with arguments ARGS[1] to ARGS[NARGS - 1]. - Return the result, or nil if something went wrong. Prevent - redisplay during the evaluation. */ - Lisp_Object -safe_call (ptrdiff_t nargs, Lisp_Object *args) +safe_call (ptrdiff_t nargs, Lisp_Object func, ...) { Lisp_Object val; @@ -2420,8 +2416,17 @@ val = Qnil; else { + va_list ap; + ptrdiff_t i; ptrdiff_t count = SPECPDL_INDEX (); struct gcpro gcpro1; + Lisp_Object *args = alloca (nargs * sizeof (Lisp_Object)); + + args[0] = func; + va_start (ap, func); + for (i = 1; i < nargs; i++) + args[i] = va_arg (ap, Lisp_Object); + va_end (ap); GCPRO1 (args[0]); gcpro1.nvars = nargs; @@ -2444,10 +2449,7 @@ Lisp_Object safe_call1 (Lisp_Object fn, Lisp_Object arg) { - Lisp_Object args[2]; - args[0] = fn; - args[1] = arg; - return safe_call (2, args); + return safe_call (2, fn, arg); } static Lisp_Object Qeval; @@ -2458,17 +2460,13 @@ return safe_call1 (Qeval, sexpr); } -/* Call function FN with one argument ARG. +/* Call function FN with two arguments ARG1 and ARG2. Return the result, or nil if something went wrong. */ Lisp_Object safe_call2 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2) { - Lisp_Object args[3]; - args[0] = fn; - args[1] = arg1; - args[2] = arg2; - return safe_call (3, args); + return safe_call (3, fn, arg1, arg2); } === modified file 'src/xfaces.c' --- src/xfaces.c 2012-07-10 08:43:46 +0000 +++ src/xfaces.c 2012-07-30 06:43:46 +0000 @@ -2254,11 +2254,7 @@ { /* Call function with current height as argument. From is the new height. */ - Lisp_Object args[2]; - - args[0] = from; - args[1] = to; - result = safe_call (2, args); + result = safe_call1 (from, to); /* Ensure that if TO was absolute, so is the result. */ if (INTEGERP (to) && !INTEGERP (result))