Now on revision 107392. ------------------------------------------------------------ revno: 107392 author: Dani Moncayo committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-02-23 02:52:08 -0500 message: * nt/makefile.w32-in (maybe-copy-distfiles-SH): Fix typo. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-02-09 07:48:22 +0000 +++ nt/ChangeLog 2012-02-23 07:52:08 +0000 @@ -1,3 +1,7 @@ +2012-02-23 Dani Moncayo (tiny change) + + * makefile.w32-in (maybe-copy-distfiles-SH): Fix typo. + 2012-02-06 Christoph Scholtes * README.W32: Removed specific version information for libXpm @@ -13,7 +17,7 @@ * makefile.w32-in (maybe-copy-distfiles) (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH) - (create-tmp-dist-dir): Added to make --distfiles optional. + (create-tmp-dist-dir): Add to make --distfiles optional. (dist): Use create-tmp-dist-dir and maybe-copy-distfiles. (Bug#10261) 2012-02-04 Eli Zaretskii @@ -149,8 +153,8 @@ A new ESC_USER_CFLAGS variable is written to config.settings. This variable has the same value as the escusercflags variable. - * gmake.defs, nmake.defs: Added the variable ESC_CFLAGS. This - variable is identical to the CFLAGS variable except that it + * gmake.defs, nmake.defs: Added the variable ESC_CFLAGS. + This variable is identical to the CFLAGS variable except that it includes the new ESC_USER_CFLAGS variable instead of USER_CFLAGS. These changes, along with some changes to src/makefile.w32-in, @@ -195,8 +199,7 @@ 2011-04-28 Eli Zaretskii - * gmake.defs (ARCH): Fix error message in case of unknown - architecture. + * gmake.defs (ARCH): Fix error message in case of unknown architecture. 2011-04-27 Eli Zaretskii @@ -227,8 +230,8 @@ * configure.bat: Modified the code that parses the --cflags and --ldflags options to support parameters that include the = - character as long as they are enclosed in quotes. This - functionality depends on command extensions. Configure.bat now + character as long as they are enclosed in quotes. + This functionality depends on command extensions. Configure.bat now attempts to enable command extensions and displays a warning message if they could not be enabled. If configure.bat could not enable command extensions the old parsing code is used that @@ -756,8 +759,8 @@ Ignore return status. * configure.bat (dontCopy): Rename admin/unidata/Makefile to keep - it out of the way of Windows generated file. Generate - admin/unidata/makefile. + it out of the way of Windows generated file. + Generate admin/unidata/makefile. * makefile.w32-in (unidatagen-nmake, unidatagen-clean-nmake) (unidatagen-CMD, unidatagen-clean-CMD, unidatagen-SH) @@ -956,8 +959,8 @@ * gmake.defs: Export XMFLAGS. - * makefile.w32-in (all-other-dirs-nmake, recompile-nmake): Don't - use $(XMFLAGS) for nmake, as it doesn't support parallelism. + * makefile.w32-in (all-other-dirs-nmake, recompile-nmake): + Don't use $(XMFLAGS) for nmake, as it doesn't support parallelism. 2006-12-22 Eli Zaretskii @@ -1541,8 +1544,8 @@ * README: Update info about compilers. * makefile.w32-in: Use $(MAKETYPE) instead of $(SHELLTYPE) to - select correct rule for invoking make in another directory. Amend - rules accordingly. + select correct rule for invoking make in another directory. + Amend rules accordingly. (clean): Delete $(COMPILER_TEMP_FILES) instead of *.pdb. * nmake.defs (EMACS_ICON_PATH): Delete definition. @@ -1785,7 +1788,7 @@ 1999-01-31 Andrew Innes - * addsection.c (ROUND_UP_DST_AND_ZERO): Renamed from + * addsection.c (ROUND_UP_DST_AND_ZERO): Rename from ROUND_UP_DST. Zeroes the alignment slop. (copy_executable_and_add_section): Update the SizeOfHeaders field properly. @@ -2127,7 +2130,7 @@ 1995-06-09 Geoff Voelker * emacs.bat.in: Renamed from emacs.bat. - (emacs_dir): Renamed from emacs_path. + (emacs_dir): Rename from emacs_path. Definition removed. * addpm.c: New file. @@ -2189,7 +2192,7 @@ 1995-04-09 Geoff Voelker - * makefile.def (INSTALL_DIR): Changed to generic directory. + * makefile.def (INSTALL_DIR): Change to generic directory. * emacs.bat: Added arguments when emacs.exe invoked. === modified file 'nt/makefile.w32-in' --- nt/makefile.w32-in 2012-02-05 20:14:54 +0000 +++ nt/makefile.w32-in 2012-02-23 07:52:08 +0000 @@ -264,7 +264,7 @@ maybe-copy-distfiles-SH: doit @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \ - $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin + $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \ fi create-tmp-dist-dir: ------------------------------------------------------------ revno: 107391 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-02-23 15:28:21 +0800 message: Avoid infloop in next-frame during frame creation. See thread at http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00573.html * src/window.c (inhibit_window_configuration_change_hook): New var. (run_window_configuration_change_hook): Obey it. * src/xfns.c (Fx_create_frame): Avoid window-configuration-change-hook call when setting menu-bar-lines and tool-bar-lines parameters. (unwind_create_frame_1): New helper function. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-02-22 06:03:30 +0000 +++ src/ChangeLog 2012-02-23 07:28:21 +0000 @@ -1,3 +1,12 @@ +2012-02-23 Chong Yidong + + * xfns.c (Fx_create_frame): Avoid window-configuration-change-hook + call when setting menu-bar-lines and tool-bar-lines parameters. + (unwind_create_frame_1): New helper function. + + * window.c (inhibit_window_configuration_change_hook): New var. + (run_window_configuration_change_hook): Obey it. + 2012-02-22 Chong Yidong * xterm.c (x_draw_image_relief): Add missing type check for === modified file 'src/window.c' --- src/window.c 2012-02-12 04:29:50 +0000 +++ src/window.c 2012-02-23 07:28:21 +0000 @@ -122,6 +122,9 @@ /* Hook to run when window config changes. */ static Lisp_Object Qwindow_configuration_change_hook; +/* If non-nil, run_window_configuration_change_hook does nothing. */ +Lisp_Object inhibit_window_configuration_change_hook; + /* Used by the function window_scroll_pixel_based */ static int window_scroll_pixel_based_preserve_x; static int window_scroll_pixel_based_preserve_y; @@ -2894,7 +2897,7 @@ = Fdefault_value (Qwindow_configuration_change_hook); XSETFRAME (frame, f); - if (NILP (Vrun_hooks)) + if (NILP (Vrun_hooks) || !NILP (inhibit_window_configuration_change_hook)) return; /* Use the right buffer. Matters when running the local hooks. */ === modified file 'src/window.h' --- src/window.h 2012-01-19 07:21:25 +0000 +++ src/window.h 2012-02-23 07:28:21 +0000 @@ -810,6 +810,10 @@ extern Lisp_Object Vmouse_event; +/* If non-nil, run_window_configuration_change_hook does nothing. */ + +extern Lisp_Object inhibit_window_configuration_change_hook; + EXFUN (Fnext_window, 3); EXFUN (Fselect_window, 2); EXFUN (Fset_window_buffer, 3); === modified file 'src/xfns.c' --- src/xfns.c 2012-01-19 07:21:25 +0000 +++ src/xfns.c 2012-02-23 07:28:21 +0000 @@ -2949,6 +2949,12 @@ return Qnil; } +static Lisp_Object +unwind_create_frame_1 (Lisp_Object val) +{ + inhibit_window_configuration_change_hook = val; + return Qnil; +} static void x_default_font_parameter (struct frame *f, Lisp_Object parms) @@ -3321,17 +3327,31 @@ happen. */ init_frame_faces (f); - /* The X resources controlling the menu-bar and tool-bar are - processed specially at startup, and reflected in the mode - variables; ignore them here. */ - x_default_parameter (f, parms, Qmenu_bar_lines, - NILP (Vmenu_bar_mode) - ? make_number (0) : make_number (1), - NULL, NULL, RES_TYPE_NUMBER); - x_default_parameter (f, parms, Qtool_bar_lines, - NILP (Vtool_bar_mode) - ? make_number (0) : make_number (1), - NULL, NULL, RES_TYPE_NUMBER); + /* Set the menu-bar-lines and tool-bar-lines parameters. We don't + look up the X resources controlling the menu-bar and tool-bar + here; they are processed specially at startup, and reflected in + the values of the mode variables. + + Avoid calling window-configuration-change-hook; otherwise we + could get an infloop in next_frame since the frame is not yet in + Vframe_list. */ + { + int count2 = SPECPDL_INDEX (); + record_unwind_protect (unwind_create_frame_1, + inhibit_window_configuration_change_hook); + inhibit_window_configuration_change_hook = Qt; + + x_default_parameter (f, parms, Qmenu_bar_lines, + NILP (Vmenu_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + x_default_parameter (f, parms, Qtool_bar_lines, + NILP (Vtool_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + + unbind_to (count2, Qnil); + } x_default_parameter (f, parms, Qbuffer_predicate, Qnil, "bufferPredicate", "BufferPredicate", ------------------------------------------------------------ revno: 107390 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 21:36:08 -0800 message: Read msdog.texi * doc/emacs/msdog.texi (Text and Binary, ls in Lisp, Windows HOME) (Windows Keyboard, Windows Mouse, Windows Processes) (Windows Printing, Windows Misc): Copyedits. (ls in Lisp): Update switches list. * admin/FOR-RELEASE: Related markup. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-23 04:32:18 +0000 +++ admin/FOR-RELEASE 2012-02-23 05:36:08 +0000 @@ -154,7 +154,12 @@ mini.texi misc.texi cyd modes.texi cyd -msdog.texi +msdog.texi rgm (can't actually test any of it though) + It was not obvious to me that the following is true (it could well be though): + + Emacs on Windows automatically determines your default printer and + sets the variable `printer-name' to that printer's name. + msdog-xtra.texi rgm (can't actually test any of it though) mule.texi m-x.texi cyd === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-23 04:32:18 +0000 +++ doc/emacs/ChangeLog 2012-02-23 05:36:08 +0000 @@ -1,5 +1,10 @@ 2012-02-23 Glenn Morris + * msdog.texi (Text and Binary, ls in Lisp, Windows HOME) + (Windows Keyboard, Windows Mouse, Windows Processes) + (Windows Printing, Windows Misc): Copyedits. + (ls in Lisp): Update switches list. + * msdog-xtra.texi (MS-DOS Display): Update list-colors-display xref. Update dos-mode* function names. (MS-DOS Printing, MS-DOS and MULE): Copyedits. === modified file 'doc/emacs/msdog.texi' --- doc/emacs/msdog.texi 2012-02-20 23:50:52 +0000 +++ doc/emacs/msdog.texi 2012-02-23 05:36:08 +0000 @@ -159,7 +159,8 @@ command. For example, to save a buffer with Unix EOL format, type @kbd{C-x @key{RET} f unix @key{RET} C-x C-s}. If you visit a file with DOS EOL conversion, then save it with Unix EOL format, that -effectively converts the file to Unix EOL style, like @code{dos2unix}. +effectively converts the file to Unix EOL style, like the +@code{dos2unix} program. @cindex untranslated file system @findex add-untranslated-filesystem @@ -221,7 +222,7 @@ carriage-return linefeed EOL format, such as @file{CONFIG.SYS}; Emacs always writes those files with Windows-style EOLs. - If a file which belongs to an untranslated file system matches one of + If a file that belongs to an untranslated file system matches one of the file-name patterns in @code{file-name-buffer-file-type-alist}, the EOL conversion is determined by @code{file-name-buffer-file-type-alist}. @@ -263,8 +264,8 @@ @cindex Dired, and MS-Windows/MS-DOS @cindex @code{ls} emulation - Dired normally uses the external program @code{ls} (or its close -work-alike) to produce the directory listing displayed in Dired + Dired normally uses the external program @code{ls} +to produce the directory listing displayed in Dired buffers (@pxref{Dired}). However, MS-Windows and MS-DOS systems don't come with such a program, although several ports of @sc{gnu} @code{ls} are available. Therefore, Emacs on those systems @emph{emulates} @@ -281,8 +282,8 @@ The @code{ls} emulation supports many of the @code{ls} switches, but it doesn't support all of them. Here's the list of the switches it does support: @option{-A}, @option{-a}, @option{-B}, @option{-C}, -@option{-c}, @option{-i}, @option{-G}, @option{-g}, @option{-R}, -@option{-r}, @option{-S}, @option{-s}, @option{-t}, @option{-U}, +@option{-c}, @option{-G}, @option{-g}, @option{-h}, @option{-i}, @option{-n}, +@option{-R}, @option{-r}, @option{-S}, @option{-s}, @option{-t}, @option{-U}, @option{-u}, and @option{-X}. The @option{-F} switch is partially supported (it appends the character that classifies the file, but does not prevent symlink following). @@ -413,9 +414,9 @@ You can override this default value of @code{HOME} by explicitly setting the environment variable @env{HOME} to point to any directory on your system. @env{HOME} can be set either from the command shell -prompt or from the @samp{My Computer}s @samp{Properties} dialog. -@code{HOME} can also be set in the system registry, for details see -@ref{MS-Windows Registry}. +prompt or from @samp{Properties} dialog of @samp{My Computer}. +@code{HOME} can also be set in the system registry, +@pxref{MS-Windows Registry}. For compatibility with older versions of Emacs@footnote{ Older versions of Emacs didn't check the application data directory. @@ -431,9 +432,9 @@ Whatever the final place is, Emacs sets the internal value of the @env{HOME} environment variable to point to it, and it will use that location for other files and directories it normally looks for or -creates in the user's home directory. +creates in your home directory. - You can always find out where Emacs thinks is your home directory's + You can always find out what Emacs thinks is your home directory's location by typing @kbd{C-x d ~/ @key{RET}}. This should present the list of files in the home directory, and show its full name on the first line. Likewise, to visit your init file, type @kbd{C-x C-f @@ -510,7 +511,7 @@ @cindex @kbd{M-@key{TAB}} vs @kbd{Alt-@key{TAB}} (MS-Windows) @cindex @kbd{Alt-@key{TAB}} vs @kbd{M-@key{TAB}} (MS-Windows) For example, @code{(w32-register-hot-key [M-tab])} lets you use -@kbd{M-TAB} normally in Emacs, for instance, to complete the word or +@kbd{M-TAB} normally in Emacs; for instance, to complete the word or symbol at point at top level, or to complete the current search string against previously sought strings during incremental search. @@ -589,7 +590,7 @@ its normal effect: for example, @kbd{@key{Lwindow}} opens the @code{Start} menu, etc.@footnote{ Some combinations of the ``Windows'' keys with other keys are caught -by Windows at low level in a way that Emacs currently cannot prevent. +by Windows at a low level in a way that Emacs currently cannot prevent. For example, @kbd{@key{Lwindow} r} always pops up the Windows @samp{Run} dialog. Customizing the value of @code{w32-phantom-key-code} might help in some cases, though.} @@ -612,7 +613,7 @@ @cindex mouse, and MS-Windows This section describes the Windows-specific variables related to -mouse. +the mouse. @vindex w32-mouse-button-tolerance @cindex simulation of middle mouse button @@ -689,8 +690,8 @@ @vindex w32-quote-process-args The variable @code{w32-quote-process-args} controls how Emacs quotes the process arguments. Non-@code{nil} means quote with the @code{"} -character. If the value is a character, use that character to escape -any quote characters that appear; otherwise chose a suitable escape +character. If the value is a character, Emacs uses that character to escape +any quote characters that appear; otherwise it chooses a suitable escape character based on the type of the program. @ifnottex @@ -723,7 +724,7 @@ If you want to use your local printer, then set the Lisp variable @code{lpr-command} to @code{""} (its default value on Windows) and @code{printer-name} to the name of the printer port---for example, -@code{"PRN"}, the usual local printer port or @code{"LPT2"}, or +@code{"PRN"}, the usual local printer port, or @code{"LPT2"}, or @code{"COM1"} for a serial printer. You can also set @code{printer-name} to a file name, in which case ``printed'' output is actually appended to that file. If you set @code{printer-name} to @@ -738,7 +739,7 @@ obtain a list of servers, and @samp{net view @var{server-name}} to see the names of printers (and directories) shared by that server. Alternatively, click the @samp{Network Neighborhood} icon on your -desktop, and look for machines which share their printers via the +desktop, and look for machines that share their printers via the network. @cindex @samp{net use}, and printing on MS-Windows @@ -797,8 +798,8 @@ Finally, if you do have an @code{lpr} work-alike, you can set the variable @code{lpr-command} to @code{"lpr"}. Then Emacs will use @code{lpr} for printing, as on other systems. (If the name of the -program isn't @code{lpr}, set @code{lpr-command} to specify where to -find it.) The variable @code{lpr-switches} has its standard meaning +program isn't @code{lpr}, set @code{lpr-command} to the appropriate value.) +The variable @code{lpr-switches} has its standard meaning when @code{lpr-command} is not @code{""}. If the variable @code{printer-name} has a string value, it is used as the value for the @code{-P} option to @code{lpr}, as on Unix. @@ -822,7 +823,7 @@ @cindex Ghostscript, use for PostScript printing The default value of the variable @code{ps-lpr-command} is @code{""}, which causes PostScript output to be sent to the printer port specified -by @code{ps-printer-name}, but @code{ps-lpr-command} can also be set to +by @code{ps-printer-name}; but @code{ps-lpr-command} can also be set to the name of a program which will accept PostScript files. Thus, if you have a non-PostScript printer, you can set this variable to the name of a PostScript interpreter program (such as Ghostscript). Any switches @@ -980,7 +981,7 @@ determines whether to make the system caret visible. The default when no screen reader software is in use is @code{nil}, which means Emacs draws its own cursor to indicate the position of point. A -non-@code{nil} value means Emacs will indicate point location by the +non-@code{nil} value means Emacs will indicate point location with the system caret; this facilitates use of screen reader software, and is the default when such software is detected when running Emacs. When this variable is non-@code{nil}, other variables affecting the ------------------------------------------------------------ revno: 107389 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2012-02-22 23:38:29 -0500 message: * lisp/minibuffer.el (completion-table-with-context): Fix inf-loop. Reported by Aaron S. Hawley . diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-23 01:52:35 +0000 +++ lisp/ChangeLog 2012-02-23 04:38:29 +0000 @@ -1,3 +1,8 @@ +2012-02-23 Stefan Monnier + + * minibuffer.el (completion-table-with-context): Fix inf-loop. + Reported by Aaron S. Hawley . + 2012-02-23 Glenn Morris * emacs-lisp/authors.el (authors-aliases, authors-fixed-case) === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2012-02-15 13:45:02 +0000 +++ lisp/minibuffer.el 2012-02-23 04:38:29 +0000 @@ -226,30 +226,31 @@ (defun completion-table-with-context (prefix table string pred action) ;; TODO: add `suffix' maybe? - ;; Notice that `pred' may not be a function in some abusive cases. - (when (functionp pred) - (setq pred - ;; Predicates are called differently depending on the nature of - ;; the completion table :-( - (cond - ((vectorp table) ;Obarray. - (lambda (sym) (funcall pred (concat prefix (symbol-name sym))))) - ((hash-table-p table) - (lambda (s _v) (funcall pred (concat prefix s)))) - ((functionp table) - (lambda (s) (funcall pred (concat prefix s)))) - (t ;Lists and alists. - (lambda (s) - (funcall pred (concat prefix (if (consp s) (car s) s)))))))) - (if (eq (car-safe action) 'boundaries) - (let* ((len (length prefix)) - (bound (completion-boundaries string table pred (cdr action)))) - (list* 'boundaries (+ (car bound) len) (cdr bound))) - (let ((comp (complete-with-action action table string pred))) - (cond - ;; In case of try-completion, add the prefix. - ((stringp comp) (concat prefix comp)) - (t comp))))) + (let ((pred + (if (not (functionp pred)) + ;; Notice that `pred' may not be a function in some abusive cases. + pred + ;; Predicates are called differently depending on the nature of + ;; the completion table :-( + (cond + ((vectorp table) ;Obarray. + (lambda (sym) (funcall pred (concat prefix (symbol-name sym))))) + ((hash-table-p table) + (lambda (s _v) (funcall pred (concat prefix s)))) + ((functionp table) + (lambda (s) (funcall pred (concat prefix s)))) + (t ;Lists and alists. + (lambda (s) + (funcall pred (concat prefix (if (consp s) (car s) s))))))))) + (if (eq (car-safe action) 'boundaries) + (let* ((len (length prefix)) + (bound (completion-boundaries string table pred (cdr action)))) + (list* 'boundaries (+ (car bound) len) (cdr bound))) + (let ((comp (complete-with-action action table string pred))) + (cond + ;; In case of try-completion, add the prefix. + ((stringp comp) (concat prefix comp)) + (t comp)))))) (defun completion-table-with-terminator (terminator table string pred action) "Construct a completion table like TABLE but with an extra TERMINATOR. ------------------------------------------------------------ revno: 107388 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 20:32:18 -0800 message: Checked msdog-xtra.texi * doc/emacs/msdog-xtra.texi (MS-DOS Display): Update list-colors-display xref. Update dos-mode* function names. (MS-DOS Printing, MS-DOS and MULE): Copyedits. (MS-DOS Processes): Add xref to main ls-lisp section. * admin/FOR-RELEASE: Related markup. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-22 08:16:48 +0000 +++ admin/FOR-RELEASE 2012-02-23 04:32:18 +0000 @@ -155,7 +155,7 @@ misc.texi cyd modes.texi cyd msdog.texi -msdog-xtra.texi +msdog-xtra.texi rgm (can't actually test any of it though) mule.texi m-x.texi cyd package.texi cyd === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-23 01:34:59 +0000 +++ doc/emacs/ChangeLog 2012-02-23 04:32:18 +0000 @@ -1,5 +1,10 @@ 2012-02-23 Glenn Morris + * msdog-xtra.texi (MS-DOS Display): Update list-colors-display xref. + Update dos-mode* function names. + (MS-DOS Printing, MS-DOS and MULE): Copyedits. + (MS-DOS Processes): Add xref to main ls-lisp section. + * ack.texi (Acknowledgments): Mention smie. 2012-02-22 Glenn Morris === modified file 'doc/emacs/msdog-xtra.texi' --- doc/emacs/msdog-xtra.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/msdog-xtra.texi 2012-02-23 04:32:18 +0000 @@ -199,10 +199,10 @@ Text mode, and others) by defining the relevant faces to use different colors. Use the @code{list-colors-display} command @iftex -(@pxref{Frame Parameters,,,emacs, the Emacs Manual}) +(@pxref{Colors,,,emacs, the Emacs Manual}) @end iftex @ifnottex -(@pxref{Frame Parameters}) +(@pxref{Colors}) @end ifnottex and the @code{list-faces-display} command @iftex @@ -260,10 +260,10 @@ display more than a single frame at a time. @cindex frame size under MS-DOS -@findex mode4350 -@findex mode25 - The @code{mode4350} command switches the display to 43 or 50 -lines, depending on your hardware; the @code{mode25} command switches +@findex dos-mode4350 +@findex dos-mode25 + The @code{dos-mode4350} command switches the display to 43 or 50 +lines, depending on your hardware; the @code{dos-mode25} command switches to the default 80x25 screen size. By default, Emacs only knows how to set screen sizes of 80 columns by @@ -394,7 +394,7 @@ for details about setting up printing to a networked printer. Some printers expect DOS codepage encoding of non-@acronym{ASCII} text, even -though they are connected to a Windows machine which uses a different +though they are connected to a Windows machine that uses a different encoding for the same locale. For example, in the Latin-1 locale, DOS uses codepage 850 whereas Windows uses codepage 1252. @xref{MS-DOS and MULE}. When you print to such printers from Windows, you can use the @@ -483,7 +483,7 @@ The special features described in the rest of this section mostly pertain to codepages that encode ISO 8859 character sets. - For the codepages which correspond to one of the ISO character sets, + For the codepages that correspond to one of the ISO character sets, Emacs knows the character set based on the codepage number. Emacs automatically creates a coding system to support reading and writing files that use the current codepage, and uses this coding system by @@ -607,9 +607,14 @@ @cindex directory listing on MS-DOS @vindex dired-listing-switches @r{(MS-DOS)} - Dired on MS-DOS uses the @code{ls-lisp} package where other -platforms use the system @code{ls} command. Therefore, Dired on -MS-DOS supports only some of the possible options you can mention in -the @code{dired-listing-switches} variable. The options that work are -@samp{-A}, @samp{-a}, @samp{-c}, @samp{-i}, @samp{-r}, @samp{-S}, -@samp{-s}, @samp{-t}, and @samp{-u}. + Dired on MS-DOS uses the @code{ls-lisp} package +@iftex +(@pxref{ls in Lisp,,,emacs, the Emacs Manual}). +@end iftex +@ifnottex +(@pxref{ls in Lisp}). +@end ifnottex +Therefore, Dired on MS-DOS supports only some of the possible options +you can mention in the @code{dired-listing-switches} variable. The +options that work are @samp{-A}, @samp{-a}, @samp{-c}, @samp{-i}, +@samp{-r}, @samp{-S}, @samp{-s}, @samp{-t}, and @samp{-u}. ------------------------------------------------------------ revno: 107387 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 21:01:58 -0500 message: Reword comment to avoid confusing authors.el diff: === modified file 'lisp/progmodes/prolog.el' --- lisp/progmodes/prolog.el 2012-02-11 22:13:29 +0000 +++ lisp/progmodes/prolog.el 2012-02-23 02:01:58 +0000 @@ -37,7 +37,8 @@ ;; Some ideas and also a few lines of code have been borrowed (not stolen ;-) ;; from Oz.el, the Emacs major mode for the Oz programming language, ;; Copyright (C) 1993 DFKI GmbH, Germany, with permission. -;; Authors: Ralf Scheidhauer and Michael Mehl ([scheidhr|mehl](at)dfki(dot)uni-sb(dot)de) +;; Authored by Ralf Scheidhauer and Michael Mehl +;; ([scheidhr|mehl](at)dfki(dot)uni-sb(dot)de) ;; ;; More ideas and code have been taken from the SICStus debugger mode ;; (http://www.csd.uu.se/~perm/source_debug/index.shtml -- broken link ------------------------------------------------------------ revno: 107386 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 20:58:53 -0500 message: Another authors.el alias diff: === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2012-02-23 01:52:35 +0000 +++ lisp/emacs-lisp/authors.el 2012-02-23 01:58:53 +0000 @@ -121,7 +121,7 @@ ("Marcus G. Daniels" "Marcus Daniels") ("Mark D. Baushke" "Mark D Baushke") ("Marko Kohtala" "Kohtala Marko") - ("Agustín Martín" "Agustin Martin") + ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo") ("Martin Lorentzon" "Martin Lorentzson") ("Matt Swift" "Matthew Swift") ("Maxime Edouard Robert Froumentin" "Max Froumentin") ------------------------------------------------------------ revno: 107385 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 20:52:35 -0500 message: More authors.el additions * lisp/emacs-lisp/authors.el (authors-aliases, authors-fixed-case) (authors-obsolete-files-regexps): Add more entries. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-23 01:33:46 +0000 +++ lisp/ChangeLog 2012-02-23 01:52:35 +0000 @@ -1,6 +1,6 @@ 2012-02-23 Glenn Morris - * emacs-lisp/authors.el (authors-aliases) + * emacs-lisp/authors.el (authors-aliases, authors-fixed-case) (authors-obsolete-files-regexps, authors-ignored-files) (authors-ambiguous-files, authors-renamed-files-alist): Add more entries. === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2012-02-23 01:33:46 +0000 +++ lisp/emacs-lisp/authors.el 2012-02-23 01:52:35 +0000 @@ -81,6 +81,8 @@ ("Gerd Möllmann" "Gerd Moellmann") ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth") ("Hrvoje Nikšić" "Hrvoje Niksic") + ;; lisp/org/ChangeLog 2010-11-11. + (nil "aaa bbb") ;; src/ChangeLog.4, 1994-01-11, since fixed. ;;; (nil "(afs@hplb.hpl.hp.com)") ;; lisp/gnus/ChangeLog.1, 1998-01-15. @@ -186,6 +188,7 @@ matches one of the REGEXPs, use REALNAME instead. If REALNAME is nil, ignore that author.") +;; FIXME seems it would be less fragile to check for O', Mc, etc. (defconst authors-fixed-case '("Bryan O'Sullivan" "Christian von Roques" @@ -194,6 +197,7 @@ "David J. MacKenzie" "David McCabe" "David O'Toole" + "Devon Sean McCullough" "Dominique de Waleffe" "Edward O'Connor" "Exal de Jesus Garcia Carrillo" @@ -206,8 +210,11 @@ "Nelson Jose dos Santos Ferreira" "Peter von der Ahe" "Peter O'Gorman" + "Piet van Oostrum" "Roland McGrath" - "Sean O'Rourke") + "Sean O'Halpin" + "Sean O'Rourke" + "Tijs van Bakel") "List of authors whose names cannot be simply capitalized.") (defvar authors-public-domain-files @@ -235,7 +242,7 @@ "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting "\\.arch-inventory$" ;; TODO lib/? Matches other things? - "m4/" "Emacs.xcodeproj" "charsets" "mapfiles" + "build-aux/" "m4/" "Emacs.xcodeproj" "charsets" "mapfiles" "preferences\\.\\(nib\\|gorm\\)" "vc-\\(rcs\\|cvs\\|sccs\\)-hooks\\.el$") "List of regexps matching obsolete files. ------------------------------------------------------------ revno: 107384 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 20:34:59 -0500 message: * doc/emacs/ack.texi (Acknowledgments): Mention smie. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-22 08:16:48 +0000 +++ doc/emacs/ChangeLog 2012-02-23 01:34:59 +0000 @@ -1,3 +1,7 @@ +2012-02-23 Glenn Morris + + * ack.texi (Acknowledgments): Mention smie. + 2012-02-22 Glenn Morris * macos.texi: Copyedits. Fix @key/@kbd usage. === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2012-02-21 00:26:56 +0000 +++ doc/emacs/ack.texi 2012-02-23 01:34:59 +0000 @@ -833,9 +833,9 @@ conflicts; @file{diff-mode.el}, a mode for viewing and editing context diffs; @file{css-mode.el} for Cascading Style Sheets; @file{bibtex-style.el} for BibTeX Style files; @file{mpc.el}, a -client for the ``Music Player Daemon''; and @file{pcase.el}, -implementing ML-style pattern matching. He integrated the -lexical binding code in Emacs 24. +client for the ``Music Player Daemon''; @file{smie.el}, a generic +indentation engine; and @file{pcase.el}, implementing ML-style pattern +matching. He integrated the lexical binding code in Emacs 24. @item Morioka Tomohiko wrote several packages for MIME support in Gnus and ------------------------------------------------------------ revno: 107383 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 20:33:46 -0500 message: Small authors.el updates * lisp/emacs-lisp/authors.el (authors-aliases) (authors-obsolete-files-regexps, authors-ignored-files) (authors-ambiguous-files, authors-renamed-files-alist): Add more entries. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-23 01:31:39 +0000 +++ lisp/ChangeLog 2012-02-23 01:33:46 +0000 @@ -1,3 +1,10 @@ +2012-02-23 Glenn Morris + + * emacs-lisp/authors.el (authors-aliases) + (authors-obsolete-files-regexps, authors-ignored-files) + (authors-ambiguous-files, authors-renamed-files-alist): + Add more entries. + 2012-02-23 Juri Linkov * isearch.el (isearch-occur): Sync interactive spec with occur's === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2012-02-20 20:23:47 +0000 +++ lisp/emacs-lisp/authors.el 2012-02-23 01:33:46 +0000 @@ -41,17 +41,21 @@ (defconst authors-aliases '( ("Aaron S. Hawley" "Aaron Hawley") + ("Alexandru Harsanyi" "Alex Harsanyi") ("Andrew Csillag" "Drew Csillag") ("Anna M. Bigatti" "Anna Bigatti") ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc." "Barry A. Warsaw, ITB" "Barry Warsaw") + ("Bill Carpenter" "WJ Carpenter") ("Bill Mann" "William F. Mann") ("Bill Rozas" "Guillermo J. Rozas") ("Björn Torkelsson" "Bjorn Torkelsson") ("Brian Fox" "Brian J. Fox") + ("Brian Sniffen" "Brian T. Sniffen") ("Christoph Wedler" "Christoph.Wedler@sap.com") ("Daniel Pfeiffer" "" "") + ("David Abrahams" "Dave Abrahams") ("David De La Harpe Golden" "David Golden") ("David Gillespie" "Dave Gillespie") ("David Kågedal" "David K..edal") @@ -93,6 +97,7 @@ ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen") ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard") ("Johan Bockgård" "Johan Bockgard") + ("John J Foerch" "John Foerch") ("John W. Eaton" "John Eaton") ("Jonathan I. Kamens" "Jonathan Kamens") ("Joseph Arceneaux" "Joe Arceneaux") @@ -110,6 +115,7 @@ ("Kevin Greiner" "Kevin J. Greiner") ("Kim F. Storm" "Kim Storm") ("Kyle Jones" "Kyle E. Jones") + ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen") ("Marcus G. Daniels" "Marcus Daniels") ("Mark D. Baushke" "Mark D Baushke") ("Marko Kohtala" "Kohtala Marko") @@ -125,12 +131,14 @@ ("Michael Sperber" "Michael Sperber \\[Mr. Preprocessor\\]") ("Mikio Nakajima" "Nakajima Mikio") ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") + ("Noorul Islam" "Noorul Islam K M") ("Paul Eggert" "eggert") ("Paul Reilly" "(pmr@legacy.pajato.com)") ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik" "Pavel Janík" "Pavel@Janik.Cz") ("Pavel Kobiakov" "Pavel Kobyakov") ("Per Abrahamsen" "Per Abhiddenware") ("Per Starbäck" "Per Starback") + ("Peter J. Weisberg" "PJ Weisberg") ("Peter S. Galbraith" "Peter Galbraith") ("Peter Runestig" "Peter 'luna' Runestig") ("Peter S. Galbraith" "Peter S Galbraith") @@ -145,16 +153,19 @@ ("Sacha Chua" "Sandra Jean Chua") ("Sam Steingold" "Sam Shteingold") ("Satyaki Das" "Indexed search by Satyaki Das") + ("Sébastien Vauban" "Sebastien Vauban") ;; There are other Stefans. ;;; ("Stefan Monnier" "Stefan") ("Stephen A. Wood" "(saw@cebaf.gov)") ("Steven L. Baur" "SL Baur" "Steven L Baur") ("Stewart M. Clamen" "Stewart Clamen") ("Stuart D. Herring" "Stuart Herring" "Davis Herring") + ("T.V. Raman" "T\\. V\\. Raman") ("Taichi Kawabata" "KAWABATA,? Taichi") ("Takaaki Ota" "Tak Ota") ("Takahashi Naoto" "Naoto Takahashi") ("Teodor Zlatanov" "Ted Zlatanov") + ("Thomas Dye" "Tom Dye") ("Thomas Horsley" "Tom Horsley") ; FIXME ? ("Thomas Wurgler" "Tom Wurgler") ("Tomohiko Morioka" "MORIOKA Tomohiko") @@ -223,11 +234,12 @@ ".*loaddefs.el$" ; not obsolete, but auto-generated "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting "\\.arch-inventory$" + ;; TODO lib/? Matches other things? + "m4/" "Emacs.xcodeproj" "charsets" "mapfiles" "preferences\\.\\(nib\\|gorm\\)" "vc-\\(rcs\\|cvs\\|sccs\\)-hooks\\.el$") "List of regexps matching obsolete files. -Changes to files matching one of the regexps in this list are not -listed.") +Changes to files matching one of the regexps in this list are not listed.") (defconst authors-ignored-files '("external-lisp" @@ -258,7 +270,12 @@ "*.el" ;; Autogen: "cus-load.el" "finder-inf.el" "ldefs-boot.el" + "compile" "config.guess" "config.sub" "depcomp" + ;; Only existed briefly, then renamed: + "images/icons/allout-widgets-dark-bg" + "images/icons/allout-widgets-light-bg" ;; Never had any meaningful changes logged, now deleted: + "unidata/bidimirror.awk" "unidata/biditype.awk" "split-man" "Xkeymap.txt" "ms-7bkermit" "ulimit.hack" "gnu-hp300" "refcard.bit" "ledit.l" "forms.README" "forms-d2.dat" "CXTERM-DIC/PY.tit" "CXTERM-DIC/ZIRANMA.tit" @@ -309,29 +326,47 @@ "complete.el" "cpp.el" "ctxt.el" + "custom.el" + "cyrillic.el" + "czech.el" "debug.el" "dired.el" "el.el" + "eshell.el" + "ethiopic.el" + "f90.el" "files.el" "find.el" "format.el" + "generic.el" + "georgian.el" + "greek.el" "grep.el" + "hebrew.el" "imenu.el" + "indian.el" + "japanese.el" "java.el" + "lao.el" "linux.el" "locate.el" "make.el" "mode.el" "python.el" + "rmailmm.el" "semantic.el" "shell.el" "simple.el" + "slovak.el" "sort.el" "speedbar.el" "srecode.el" "table.el" "texi.el" + "thai.el" + "tibetan.el" "util.el" + "vc-bzr.el" "wisent.el") "List of basenames occurring more than once in the source.") @@ -589,6 +624,7 @@ ("texi/url.txi" . "url.texi") ("edt-user.doc" . "edt.texi") ("DEV-NOTES" . "nextstep") + ("org/COPYRIGHT-AND-LICENSE" . "org/README") ;; Moved to different directories. ("ctags.1" . "ctags.1") ("etags.1" . "etags.1") ------------------------------------------------------------ revno: 107382 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 20:31:39 -0500 message: ChangeLog fixes prompted by M-x authors diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-02-21 00:07:53 +0000 +++ etc/ChangeLog 2012-02-23 01:31:39 +0000 @@ -380,12 +380,12 @@ 2011-02-17 Ken Manheimer - * images/icons/allout-widgets/dark-bg/encrypted-locked.png: - * images/icons/allout-widgets/dark-bg/encrypted-locked.xpm: + * images/icons/allout-widgets/dark-bg/locked-encrypted.png: + * images/icons/allout-widgets/dark-bg/locked-encrypted.xpm: * images/icons/allout-widgets/dark-bg/unlocked-encrypted.png: * images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm: - * images/icons/allout-widgets/light-bg/encrypted-locked.png: - * images/icons/allout-widgets/light-bg/encrypted-locked.xpm: + * images/icons/allout-widgets/light-bg/locked-encrypted.png: + * images/icons/allout-widgets/light-bg/locked-encrypted.xpm: * images/icons/allout-widgets/light-bg/unlocked-encrypted.png: * images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm: Reorganize icon directories and files to reconcile against windows === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-23 00:55:30 +0000 +++ lisp/ChangeLog 2012-02-23 01:31:39 +0000 @@ -13,7 +13,7 @@ 2012-02-22 Alan Mackenzie - * progmodes/cc-modes: revert change #107149 from 2012-02-06. + * progmodes/cc-mode.el: Revert change #107149 from 2012-02-06. 2012-02-22 Glenn Morris @@ -189,7 +189,7 @@ Fix a loop in c-set-fl-decl-start. - * progmodes/cc-engine (c-set-fl-decl-start): Add a check that + * progmodes/cc-engine.el (c-set-fl-decl-start): Add a check that c-backward-syntactic-ws actually moves backwards. 2012-02-13 Leo Liu @@ -1379,10 +1379,10 @@ Add the switch statement to AWK Mode. - * progmodes/cc-awk (awk-font-lock-keywords): Add "switch", "case", + * progmodes/cc-awk.el (awk-font-lock-keywords): Add "switch", "case", "default" to the keywords regexp. - * progmodes/cc-langs (c-label-kwds): Let AWK take the same + * progmodes/cc-langs.el (c-label-kwds): Let AWK take the same expression as the rest. (c-nonlabel-token-key): Allow string literals for AWK. Refactor for the other modes. @@ -6401,7 +6401,7 @@ * comint.el (comint-password-prompt-regexp): Accept "Response" as a password-like phrase. -2011-06-30 Mastake YAMATO +2011-06-30 Masatake YAMATO * progmodes/cc-guess.el: New file. @@ -10709,7 +10709,8 @@ (calc-lu-field-reference): Rename from `calc-logunits-field-reference'. - * calc/calc-help (calc-l-prefix-help): Mention musical note functions. + * calc/calc-help.el (calc-l-prefix-help): + Mention musical note functions. 2011-03-17 Stefan Monnier @@ -10885,7 +10886,7 @@ 2011-03-09 Ken Manheimer - * allout.el Summary: Change so yank of distinctive-bullet items + * allout.el: Change so yank of distinctive-bullet items preserves the existing header prefix, rebulleting it if necessary, rather than replacing it. This is necessary for proper operation of cooperative addons like allout-widgets. === modified file 'lisp/ChangeLog.14' --- lisp/ChangeLog.14 2012-01-19 07:21:25 +0000 +++ lisp/ChangeLog.14 2012-02-23 01:31:39 +0000 @@ -604,7 +604,7 @@ * help-at-pt.el (help-at-pt-kbd-string): Reflow docstring. (scan-buf-previous-region): Fix typo in docstring. -2009-04-14 Edward Wiebe (tiny change) +2009-04-14 Eduard Wiebe (tiny change) * jit-lock.el (jit-lock-stealth-chunk-start): Fix typo in docstring. === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2012-01-19 07:21:25 +0000 +++ lisp/ChangeLog.7 2012-02-23 01:31:39 +0000 @@ -4115,7 +4115,7 @@ * ffap.el (dired-at-point): Add autoload cookie. -1998-04-23 Jens Petersen +1998-04-23 Jens-Ulrik Petersen * ffap.el (dired-at-point-require-prefix): New option. (dired-at-point): New command. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-20 14:25:28 +0000 +++ lisp/gnus/ChangeLog 2012-02-23 01:31:39 +0000 @@ -2094,11 +2094,6 @@ (gnus-registry--split-fancy-with-parent-internal): Fix splitting bugs and provide better messaging. -2011-04-06 David Engster - - * Makefile.in (fail-on-warning): New rule to compile with warnings as - errors. - 2011-04-06 Teodor Zlatanov * gnus-registry.el: Don't use ERT if it's not available. Load it === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2012-02-14 14:00:56 +0000 +++ lisp/org/ChangeLog 2012-02-23 01:31:39 +0000 @@ -440,7 +440,7 @@ 2012-01-03 Michael Brand - * org.el Key bindings: remap the Outline functions from + * org.el (Key bindings): remap the Outline functions from `outline-mode-prefix-map' where possible. 2012-01-03 Christian Moe (tiny change) @@ -539,9 +539,7 @@ (org-odt-styles-dir, org-export-odt-schema-dir): New variables. - * org-odt.el: New file. - - * org-lparse: New file. + * org-odt.el, org-lparse.el: New files. 2012-01-03 Carsten Dominik ------------------------------------------------------------ revno: 107381 committer: Juri Linkov branch nick: trunk timestamp: Thu 2012-02-23 02:55:30 +0200 message: * lisp/replace.el (occur-menu-map): Add menu item for `occur-edit-mode'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-23 00:36:49 +0000 +++ lisp/ChangeLog 2012-02-23 00:55:30 +0000 @@ -3,6 +3,8 @@ * isearch.el (isearch-occur): Sync interactive spec with occur's new feature in `occur-read-primary-args'. Doc fix. (Bug#10705) + * replace.el (occur-menu-map): Add menu item for `occur-edit-mode'. + 2012-02-22 Juri Linkov * international/mule-cmds.el (read-char-by-name): Use \` and \'. === modified file 'lisp/replace.el' --- lisp/replace.el 2012-01-19 07:21:25 +0000 +++ lisp/replace.el 2012-02-23 00:55:30 +0000 @@ -786,6 +786,9 @@ (define-key map [occur-rename-buffer] `(menu-item ,(purecopy "Rename Occur Buffer") occur-rename-buffer :help ,(purecopy "Rename the current *Occur* buffer to *Occur: original-buffer-name*."))) + (define-key map [occur-edit-buffer] + `(menu-item ,(purecopy "Edit Occur Buffer") occur-edit-mode + :help ,(purecopy "Edit the *Occur* buffer and apply changes to the original buffers."))) (define-key map [separator-2] menu-bar-separator) (define-key map [occur-mode-goto-occurrence-other-window] `(menu-item ,(purecopy "Go To Occurrence Other Window") occur-mode-goto-occurrence-other-window ------------------------------------------------------------ revno: 107380 fixes bug(s): http://debbugs.gnu.org/10705 committer: Juri Linkov branch nick: trunk timestamp: Thu 2012-02-23 02:36:49 +0200 message: * lisp/isearch.el (isearch-occur): Sync interactive spec with occur's new feature in `occur-read-primary-args'. Doc fix. * etc/NEWS: Add new "collect" feature of `occur'. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-02-19 04:44:03 +0000 +++ etc/NEWS 2012-02-23 00:36:49 +0000 @@ -965,6 +965,12 @@ ** Occur Edit mode applies edits made in *Occur* buffers to the original buffers. It is bound to "e" in Occur mode. +** When `occur' is called with the prefix argument `C-u' +the matching strings are collected into the `*Occur*' buffer +without line numbers. If there are parenthesized subexpressions +in the specified regexp, `occur' reads replacement text that +may contain \\& and \\N whose convention follows `replace-match'. + +++ ** New global minor mode electric-pair-mode. When enabled, typing an open parenthesis automatically inserts the === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-22 23:35:07 +0000 +++ lisp/ChangeLog 2012-02-23 00:36:49 +0000 @@ -1,3 +1,8 @@ +2012-02-23 Juri Linkov + + * isearch.el (isearch-occur): Sync interactive spec with occur's + new feature in `occur-read-primary-args'. Doc fix. (Bug#10705) + 2012-02-22 Juri Linkov * international/mule-cmds.el (read-char-by-name): Use \` and \'. === modified file 'lisp/isearch.el' --- lisp/isearch.el 2012-02-04 02:10:22 +0000 +++ lisp/isearch.el 2012-02-23 00:36:49 +0000 @@ -1433,16 +1433,38 @@ (isearch-query-replace delimited t)) (defun isearch-occur (regexp &optional nlines) - "Run `occur' with regexp to search from the current search string. -Interactively, REGEXP is the current search regexp or a quoted search -string. NLINES has the same meaning as in `occur'." + "Run `occur' using the last search string as the regexp. +Interactively, REGEXP is constructed using the search string from the +last search command. NLINES has the same meaning as in `occur'. + +If the last search command was a word search, REGEXP is computed from +the search words, ignoring punctuation. If the last search +command was a regular expression search, REGEXP is the regular +expression used in that search. If the last search command searched +for a literal string, REGEXP is constructed by quoting all the special +characters in that string." (interactive - (list - (cond - (isearch-word (word-search-regexp isearch-string)) - (isearch-regexp isearch-string) - (t (regexp-quote isearch-string))) - (if current-prefix-arg (prefix-numeric-value current-prefix-arg)))) + (let* ((perform-collect (consp current-prefix-arg)) + (regexp (cond + (isearch-word (word-search-regexp isearch-string)) + (isearch-regexp isearch-string) + (t (regexp-quote isearch-string))))) + (list regexp + (if perform-collect + ;; Perform collect operation + (if (zerop (regexp-opt-depth regexp)) + ;; No subexpression so collect the entire match. + "\\&" + ;; Get the regexp for collection pattern. + (isearch-done nil t) + (isearch-clean-overlays) + (let ((default (car occur-collect-regexp-history))) + (read-string + (format "Regexp to collect (default %s): " default) + nil 'occur-collect-regexp-history default))) + ;; Otherwise normal occur takes numerical prefix argument. + (when current-prefix-arg + (prefix-numeric-value current-prefix-arg)))))) (let ((case-fold-search isearch-case-fold-search) ;; Set `search-upper-case' to nil to not call ;; `isearch-no-upper-case-p' in `occur-1'. ------------------------------------------------------------ revno: 107379 fixes bug(s): http://debbugs.gnu.org/10857 committer: Juri Linkov branch nick: trunk timestamp: Thu 2012-02-23 01:35:07 +0200 message: * international/mule-cmds.el (read-char-by-name): Use \` and \'. (ucs-insert): Doc fix. Check for hex digits in the string. Don't display `nil' in the error message. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-22 19:34:32 +0000 +++ lisp/ChangeLog 2012-02-22 23:35:07 +0000 @@ -1,3 +1,9 @@ +2012-02-22 Juri Linkov + + * international/mule-cmds.el (read-char-by-name): Use \` and \'. + (ucs-insert): Doc fix. Check for hex digits in the string. + Don't display `nil' in the error message. (Bug#10857) + 2012-02-22 Alan Mackenzie * progmodes/cc-modes: revert change #107149 from 2012-02-06. === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2012-02-10 19:35:28 +0000 +++ lisp/international/mule-cmds.el 2012-02-22 23:35:07 +0000 @@ -2949,9 +2949,9 @@ '(metadata (category . unicode-name)) (complete-with-action action (ucs-names) string pred)))))) (cond - ((string-match-p "^[0-9a-fA-F]+$" input) + ((string-match-p "\\`[0-9a-fA-F]+\\'" input) (string-to-number input 16)) - ((string-match-p "^#" input) + ((string-match-p "\\`#" input) (read input)) (t (cdr (assoc-string input (ucs-names) t)))))) @@ -2967,6 +2967,10 @@ the characters whose names include that substring, not necessarily at the beginning of the name. +This function also accepts a hexadecimal number of Unicode code +point or a number in hash notation, e.g. #o21430 for octal, +#x2318 for hex, or #10r8984 for decimal. + The optional third arg INHERIT (non-nil when called interactively), says to inherit text properties from adjoining text, if those properties are sticky." @@ -2975,9 +2979,12 @@ (prefix-numeric-value current-prefix-arg) t)) (unless count (setq count 1)) - (if (stringp character) + (if (and (stringp character) + (string-match-p "\\`[0-9a-fA-F]+\\'" character)) (setq character (string-to-number character 16))) (cond + ((null character) + (error "Not a Unicode character")) ((not (integerp character)) (error "Not a Unicode character code: %S" character)) ((or (< character 0) (> character #x10FFFF)) ------------------------------------------------------------ revno: 107378 committer: Alan Mackenzie branch nick: trunk timestamp: Wed 2012-02-22 19:34:32 +0000 message: Revert Change #107149. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-22 08:34:02 +0000 +++ lisp/ChangeLog 2012-02-22 19:34:32 +0000 @@ -1,3 +1,7 @@ +2012-02-22 Alan Mackenzie + + * progmodes/cc-modes: revert change #107149 from 2012-02-06. + 2012-02-22 Glenn Morris * ffap.el (ffap-c-path): === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2012-02-13 17:18:07 +0000 +++ lisp/progmodes/cc-mode.el 2012-02-22 19:34:32 +0000 @@ -1156,8 +1156,7 @@ ;; `c-set-fl-decl-start' for the detailed functionality. (cons (c-set-fl-decl-start beg) end)) -(defvar c-standard-font-lock-fontify-region-function - (default-value 'font-lock-fontify-region-function) +(defvar c-standard-font-lock-fontify-region-function nil "Standard value of `font-lock-fontify-region-function'") (defun c-font-lock-fontify-region (beg end &optional verbose) ------------------------------------------------------------ revno: 107377 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-02-22 07:55:46 -0800 message: * src/lisp.h: Improve comment about USE_LSB_TAG. diff: === modified file 'src/lisp.h' --- src/lisp.h 2012-02-20 23:09:58 +0000 +++ src/lisp.h 2012-02-22 15:55:46 +0000 @@ -195,12 +195,25 @@ || defined DARWIN_OS || defined __sun) /* We also need to be able to specify mult-of-8 alignment on static vars. */ # if defined DECL_ALIGN -/* mark_maybe_object assumes that EMACS_INT values are contiguous, - but this is not true on some hosts where EMACS_INT is wider than a pointer, - as they may allocate the halves of an EMACS_INT separately. - On these hosts USE_LSB_TAG is not needed because the top bits of an - EMACS_INT are unused, so define USE_LSB_TAG only on hosts where it - might be useful. */ +/* On hosts where VALBITS is greater than the pointer width in bits, + USE_LSB_TAG is: + + a. unnecessary, because the top bits of an EMACS_INT are unused, + + b. slower, because it typically requires extra masking, and + + c. harmful, because it can create Lisp_Object values that are so scrambled + that mark_maybe_object cannot decipher them. mark_maybe_object assumes + that EMACS_INT values are contiguous, but a host where EMACS_INT is + wider than a pointer might allocate the top half of an EMACS_INT in + (say) a 32-bit word on the stack, putting the bottom half in a 32-bit + register that is saved elsewhere in a jmp_buf. When this happens, + since USE_LSB_TAG is not defined the bottom half alone is a valid + pointer that mark_maybe_pointer can follow; but if USE_LSB_TAG were + defined, the bottom half would not be a valid pointer and neither + mark_maybe_object nor mark_maybe_pointer would follow it. + + So, define USE_LSB_TAG only on hosts where it might be useful. */ # if UINTPTR_MAX >> VALBITS != 0 # define USE_LSB_TAG # endif ------------------------------------------------------------ revno: 107376 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-02-22 17:08:36 +0800 message: * xterm.c (x_draw_image_relief): Fix last fix. diff: === modified file 'src/xterm.c' --- src/xterm.c 2012-02-22 06:03:30 +0000 +++ src/xterm.c 2012-02-22 09:08:36 +0000 @@ -2331,8 +2331,8 @@ && INTEGERP (XCAR (Vtool_bar_button_margin)) && INTEGERP (XCDR (Vtool_bar_button_margin))) { - extra_x = XCAR (Vtool_bar_button_margin); - extra_y = XCDR (Vtool_bar_button_margin); + extra_x = XINT (XCAR (Vtool_bar_button_margin)); + extra_y = XINT (XCDR (Vtool_bar_button_margin)); } else if (INTEGERP (Vtool_bar_button_margin)) extra_x = extra_y = XINT (Vtool_bar_button_margin); ------------------------------------------------------------ revno: 107375 fixes bug(s): http://debbugs.gnu.org/10702 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 00:34:02 -0800 message: Fixes related to /usr/include path on multiarch systems * lisp/ffap.el (ffap-c-path): * lisp/man.el (Man-header-file-path): Handle multiarch. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-22 06:10:03 +0000 +++ lisp/ChangeLog 2012-02-22 08:34:02 +0000 @@ -1,3 +1,8 @@ +2012-02-22 Glenn Morris + + * ffap.el (ffap-c-path): + * man.el (Man-header-file-path): Handle multiarch. (Bug#10702) + 2012-02-22 Chong Yidong * custom.el (load-theme): Doc fix. === modified file 'lisp/ffap.el' --- lisp/ffap.el 2012-01-19 07:21:25 +0000 +++ lisp/ffap.el 2012-02-22 08:34:02 +0000 @@ -850,9 +850,24 @@ (and (not (string-match "\\.el\\'" name)) (ffap-locate-file name '(".el") load-path))) +;; FIXME this duplicates the logic of Man-header-file-path. +;; There should be a single central variable or function for this. +;; See also (bug#10702): +;; cc-search-directories, semantic-c-dependency-system-include-path, +;; semantic-gcc-setup (defvar ffap-c-path - ;; Need smarter defaults here! Suggestions welcome. - '("/usr/include" "/usr/local/include")) + (let ((arch (with-temp-buffer + (when (eq 0 (ignore-errors + (call-process "gcc" nil '(t nil) nil + "-print-multiarch"))) + (goto-char (point-min)) + (buffer-substring (point) (line-end-position))))) + (base '("/usr/include" "/usr/local/include"))) + (if (zerop (length arch)) + base + (append base (list (expand-file-name arch "/usr/include"))))) + "List of directories to search for include files.") + (defun ffap-c-mode (name) (ffap-locate-file name t ffap-c-path)) === modified file 'lisp/man.el' --- lisp/man.el 2012-02-11 22:13:29 +0000 +++ lisp/man.el 2012-02-22 08:34:02 +0000 @@ -215,9 +215,20 @@ (string :tag "Real Section"))) :group 'man) +;; FIXME see comments at ffap-c-path. (defcustom Man-header-file-path - '("/usr/include" "/usr/local/include") + (let ((arch (with-temp-buffer + (when (eq 0 (ignore-errors + (call-process "gcc" nil '(t nil) nil + "-print-multiarch"))) + (goto-char (point-min)) + (buffer-substring (point) (line-end-position))))) + (base '("/usr/include" "/usr/local/include"))) + (if (zerop (length arch)) + base + (append base (list (expand-file-name arch "/usr/include"))))) "C Header file search path used in Man." + :version "24.1" ; add multiarch :type '(repeat string) :group 'man) ------------------------------------------------------------ revno: 107374 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-22 00:16:48 -0800 message: Checked macos.texi (somewhat) * doc/emacs/macos.texi: Copyedits. Fix @key/@kbd usage. (Mac / GNUstep Basics): Don't mention the panels, since the next section covers them. (Mac / GNUstep Customization): Merge some panel info from previous. * admin/FOR-RELEASE: Related markup. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2012-02-21 21:43:51 +0000 +++ admin/FOR-RELEASE 2012-02-22 08:16:48 +0000 @@ -148,7 +148,7 @@ indent.texi cyd killing.texi cyd kmacro.texi cyd -macos.texi +macos.texi rgm (can't actually test any of it though) maintaining.texi cyd mark.texi cyd mini.texi === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-21 21:43:51 +0000 +++ doc/emacs/ChangeLog 2012-02-22 08:16:48 +0000 @@ -1,3 +1,10 @@ +2012-02-22 Glenn Morris + + * macos.texi: Copyedits. Fix @key/@kbd usage. + (Mac / GNUstep Basics): Don't mention the panels, since the next + section covers them. + (Mac / GNUstep Customization): Merge some panel info from previous. + 2012-02-21 Glenn Morris * emerge-xtra.texi (Emerge, Submodes of Emerge, Combining in Emerge): === modified file 'doc/emacs/macos.texi' --- doc/emacs/macos.texi 2012-02-04 21:48:04 +0000 +++ doc/emacs/macos.texi 2012-02-22 08:16:48 +0000 @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2000-2012 Free Software Foundation, Inc. +@c Copyright (C) 2000-2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mac OS / GNUstep, Microsoft Windows, Antinews, Top @appendix Emacs and Mac OS / GNUstep @@ -11,8 +11,8 @@ the GNUstep libraries on GNU/Linux or other operating systems, or on Mac OS X with native window system support. On Mac OS X, Emacs can be built either without window system support, with X11, or with the -Cocoa interface; this section only applies to the Cocoa build. Emacs -does not support earlier versions of Mac OS. +Cocoa interface; this section only applies to the Cocoa build. This +does not support versions of Mac OS X earlier than 10.4. For various historical and technical reasons, Emacs uses the term @samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for @@ -21,7 +21,7 @@ was an application interface released by NeXT Inc during the 1980s, of which Cocoa is a direct descendant. Apart from Cocoa, there is another NeXTstep-style system: GNUstep, which is free software. As of -this writing, the GNUstep support is alpha status (@pxref{GNUstep +this writing, Emacs GNUstep support is alpha status (@pxref{GNUstep Support}), but we hope to improve it in the future. @menu @@ -40,6 +40,7 @@ other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You can change these bindings in the usual way (@pxref{Key Bindings}). +@c FIXME mention ns-alternate-modifier? The variable @code{ns-right-alternate-modifier} controls the behavior of the right @key{alt} and @key{option} keys. These keys behave like the left-hand keys if the value is @code{left} (the @@ -47,30 +48,22 @@ @code{super}, or @code{hyper} makes them behave like the corresponding modifier keys; a value of @code{none} tells Emacs to ignore them. - The standard Mac / GNUstep font and color panels are accessible via -Lisp commands. To use the color panel, drag from it to an Emacs frame -to change the foreground color of the face at that position (if the -@key{shift} key is held down, it changes the background color -instead). To discard the settings, create a new frame and close the -altered one. - - @key{S-Mouse-1} (i.e., clicking the left mouse button while holding -down the @key{Shift} key) adjusts the region to the click position, -just like @key{Mouse-3} (@code{mouse-save-then-kill}); it does not pop -up a menu for changing the default face, as @key{S-Mouse-1} normally + @kbd{S-Mouse-1} adjusts the region to the click position, +just like @kbd{Mouse-3} (@code{mouse-save-then-kill}); it does not pop +up a menu for changing the default face, as @kbd{S-Mouse-1} normally does (@pxref{Text Scale}). This change makes Emacs behave more like other Mac / GNUstep applications. When you open or save files using the menus, or using the -@key{Cmd-o} and @key{Cmd-S} bindings, Emacs uses graphical file +@kbd{Cmd-o} and @kbd{Cmd-S} bindings, Emacs uses graphical file dialogs to read file names. However, if you use the regular Emacs key -sequences, such as @key{C-x C-f}, Emacs uses the minibuffer to read +sequences, such as @kbd{C-x C-f}, Emacs uses the minibuffer to read file names. - On GNUstep, in an X-windows environment you need to use @key{Cmd-c} -instead of one of the @key{C-w} or @key{M-w} commands to transfer text + On GNUstep, in an X-windows environment you need to use @kbd{Cmd-c} +instead of one of the @kbd{C-w} or @kbd{M-w} commands to transfer text to the X primary selection; otherwise, Emacs will use the -``clipboard'' selection. Likewise, @key{Cmd-y} (instead of @key{C-y}) +``clipboard'' selection. Likewise, @kbd{Cmd-y} (instead of @kbd{C-y}) yanks from the X primary selection instead of the kill-ring or clipboard. @@ -100,23 +93,25 @@ @subsection Font and Color Panels -The Font Panel may be accessed with M-x ns-popup-font-panel. It -will set the default font in the frame most recently used or clicked -on. +The standard Mac / GNUstep font and color panels are accessible via +Lisp commands. The Font Panel may be accessed with @kbd{M-x +ns-popup-font-panel}. It will set the default font in the frame most +recently used or clicked on. @c To make the setting permanent, use @samp{Save Options} in the @c Options menu, or run @code{menu-bar-options-save}. -You can bring up a color panel with M-x ns-popup-color-panel. and -drag the color you want over the emacs face you want to change. Normal +You can bring up a color panel with @kbd{M-x ns-popup-color-panel} and +drag the color you want over the Emacs face you want to change. Normal dragging will alter the foreground color. Shift dragging will alter the -background color. +background color. To discard the settings, create a new frame and +close the altered one. @c To make the changes permanent select the "Save Options" @c item in the "Options" menu, or run @code{menu-bar-options-save}. -Useful in this context is the listing of all faces obtained by @key{M-x} -@code{list-faces-display}. +Useful in this context is the listing of all faces obtained by +@kbd{M-x list-faces-display}. @subsection Open files by dragging to an Emacs window @@ -137,7 +132,7 @@ @table @code @item ns-auto-hide-menu-bar Non-nil means the menu-bar is hidden by default, but appears if you -move the mouse pointer over it. (Requires OS X 10.6 or later.) +move the mouse pointer over it. (Requires Mac OS X 10.6 or later.) @end table @@ -162,9 +157,9 @@ buffer is the @samp{*scratch*} buffer, Emacs visits the file in the selected frame. -You can change how Emacs responds to @key{ns-open-file} by changing -the variable @code{ns-pop-up-frames}. Its default value, -@code{'fresh}, is what we have just described. A value of @code{t} +You can change how Emacs responds to a @code{ns-open-file} event by +changing the variable @code{ns-pop-up-frames}. Its default value, +@samp{fresh}, is what we have just described. A value of @code{t} means to always visit the file in a new frame. A value of @code{nil} means to always visit the file in an existing frame. @@ -211,7 +206,7 @@ Emacs also allows users to make use of Nextstep services, via a set of commands whose names begin with @samp{ns-service-} and end with the -name of the service. Type @kbd{M-x ns-service-@key{TAB}@key{TAB}} to +name of the service. Type @kbd{M-x ns-service-@key{TAB}} to see a list of these commands. These functions either operate on marked text (replacing it with the result) or take a string argument and return the result as a string. You can also use the Lisp function @@ -222,6 +217,6 @@ @node GNUstep Support, , Mac / GNUstep Events, Mac OS / GNUstep @section GNUstep Support -Emacs can be built and run under GNUstep, but there are still some +Emacs can be built and run under GNUstep, but there are still issues to be addressed. Interested developers should contact @email{emacs-devel@@gnu.org}. ------------------------------------------------------------ revno: 107373 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-02-22 14:10:03 +0800 message: * lisp/custom.el (load-theme): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-22 04:02:44 +0000 +++ lisp/ChangeLog 2012-02-22 06:10:03 +0000 @@ -1,3 +1,7 @@ +2012-02-22 Chong Yidong + + * custom.el (load-theme): Doc fix. + 2012-02-22 Glenn Morris * dired-x.el (dired-guess-shell-alist-default): === modified file 'lisp/custom.el' --- lisp/custom.el 2012-02-15 04:00:34 +0000 +++ lisp/custom.el 2012-02-22 06:10:03 +0000 @@ -1138,9 +1138,10 @@ The theme file is named THEME-theme.el, in one of the directories specified by `custom-theme-load-path'. -If optional arg NO-CONFIRM is non-nil, and THEME is not -considered safe according to `custom-safe-themes', prompt the -user for confirmation. +If the theme is not considered safe by `custom-safe-themes', +prompt the user for confirmation before loading it. But if +optional arg NO-CONFIRM is non-nil, load the theme without +prompting. Normally, this function also enables THEME; if optional arg NO-ENABLE is non-nil, load the theme but don't enable it. === modified file 'lisp/dired.el' --- lisp/dired.el 2012-02-12 09:51:03 +0000 +++ lisp/dired.el 2012-02-22 06:10:03 +0000 @@ -4196,7 +4196,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) -;;;;;; "dired-x" "dired-x.el" "bc516591d881911d72b58eeed8816576") +;;;;;; "dired-x" "dired-x.el" "2a39a8306a5541c304bc4ab602876f92") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\