# HG changeset patch # User Kenichi Handa # Date 1273464861 -32400 # Node ID ac3917b1de283ea4d130cfc6fcf7a2bd2563ef1c # Parent 39d09d6f8dbcf59369b616d5e4ecd6df3786ecf1# Parent 4d25cedac124c84ad6629b5f835f42d743169e36 merge trunk diff -r 39d09d6f8dbc -r ac3917b1de28 ChangeLog --- a/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,20 @@ +2010-05-10 Miles Bader + + * configure.in: Get rid of "unix" pre-defined macro when + preprocessing Makefile. (Bug#5857) [Backport from trunk] + +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-05-03 Štěpán Němec (tiny change) + + * INSTALL: Fix typos. + +2010-05-03 Chong Yidong + + * configure.in: Add check for buggy version of GCC (Bug#6031). + 2010-01-31 Juri Linkov * .bzrignore: Add TAGS-LISP. diff -r 39d09d6f8dbc -r ac3917b1de28 INSTALL --- a/INSTALL Fri Apr 23 21:29:11 2010 +0900 +++ b/INSTALL Mon May 10 13:14:21 2010 +0900 @@ -408,7 +408,7 @@ switch to the compiler, and link against libfoo.a and libbar.a libraries in addition to the standard ones. -For some libraries, like Gtk+, fontconfig and ALSA, `configure' use +For some libraries, like Gtk+, fontconfig and ALSA, `configure' uses pkg-config to find where those libraries are installed. If you want pkg-config to look in special directories, you have to set the environment variable PKG_CONFIG_PATH to point to the directories @@ -466,7 +466,7 @@ documentation strings to be in the etc/DOC file (see src/Makefile.in if you wish to figure out how to do that). For all else, use site-init.el. Do not load byte-compiled code which -was build with a non-nil value of `byte-compile-dynamic'. +was built with a non-nil value of `byte-compile-dynamic'. If you set load-path to a different value in site-init.el or site-load.el, Emacs will use *precisely* that value when it starts up @@ -491,7 +491,7 @@ copying it, if you wish; then it automatically uses the sibling directories ../lisp, ../lib-src, ../info. -Or you can "install" the executable and the other Emacs into their +Or you can "install" the executable and the other files into their installed locations, with `make install'. By default, Emacs's files are installed in the following directories: diff -r 39d09d6f8dbc -r ac3917b1de28 README --- a/README Fri Apr 23 21:29:11 2010 +0900 +++ b/README Mon May 10 13:14:21 2010 +0900 @@ -3,7 +3,7 @@ See the end of the file for license conditions. -This directory tree holds version 23.1.96 of GNU Emacs, the extensible, +This directory tree holds version 23.2.50 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff -r 39d09d6f8dbc -r ac3917b1de28 admin/ChangeLog --- a/admin/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/admin/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-14 Juanma Barranquero * quick-install-emacs (PRUNED): Fix typo in message. diff -r 39d09d6f8dbc -r ac3917b1de28 configure --- a/configure Fri Apr 23 21:29:11 2010 +0900 +++ b/configure Mon May 10 13:14:21 2010 +0900 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for emacs 23.1.96. +# Generated by GNU Autoconf 2.62 for emacs 23.2. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='23.1.96' -PACKAGE_STRING='emacs 23.1.96' +PACKAGE_VERSION='23.2' +PACKAGE_STRING='emacs 23.2' PACKAGE_BUGREPORT='' ac_unique_file="src/lisp.h" @@ -1371,7 +1371,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 23.1.96 to adapt to many kinds of systems. +\`configure' configures emacs 23.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1445,7 +1445,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 23.1.96:";; + short | recursive ) echo "Configuration of emacs 23.2:";; esac cat <<\_ACEOF @@ -1588,7 +1588,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 23.1.96 +emacs configure 23.2 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1602,7 +1602,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 23.1.96, which was +It was created by emacs $as_me 23.2, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -25559,6 +25559,16 @@ CFLAGS="$REAL_CFLAGS" CPPFLAGS="$REAL_CPPFLAGS" +## Hack to detect a buggy GCC version. +if test "x$GCC" = xyes \ + && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ + && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \ + && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then + { { $as_echo "$as_me:$LINENO: error: GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." >&5 +$as_echo "$as_me: error: GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." >&2;} + { (exit 1); exit 1; }; } +fi + #### Find out which version of Emacs this is. version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` @@ -26259,7 +26269,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 23.1.96, which was +This file was extended by emacs $as_me 23.2, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26312,7 +26322,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -emacs config.status 23.1.96 +emacs config.status 23.2 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -r 39d09d6f8dbc -r ac3917b1de28 configure.in --- a/configure.in Fri Apr 23 21:29:11 2010 +0900 +++ b/configure.in Mon May 10 13:14:21 2010 +0900 @@ -22,7 +22,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.62) -AC_INIT(emacs, 23.1.96) +AC_INIT(emacs, 23.2.50) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) @@ -2600,6 +2600,14 @@ CFLAGS="$REAL_CFLAGS" CPPFLAGS="$REAL_CPPFLAGS" +## Hack to detect a buggy GCC version. +if test "x$GCC" = xyes \ + && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ + && test x"`echo $CFLAGS | grep '\-O@<:@23@:>@'`" != x \ + && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then + AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'.]) +fi + #### Find out which version of Emacs this is. [version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`] @@ -3064,7 +3072,7 @@ # the C preprocessor to some helpful value like 1, or maybe the empty # string. Needless to say consequent macro substitutions are less # than conducive to the makefile finding the correct directory. -[cpp_undefs="`echo $srcdir $configuration $canonical | +[cpp_undefs="`echo $srcdir $configuration $canonical unix | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"] diff -r 39d09d6f8dbc -r ac3917b1de28 doc/emacs/ChangeLog --- a/doc/emacs/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/emacs/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,23 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-05-07 Chong Yidong + + * building.texi (GDB Graphical Interface): Remove misleading comparison + to an IDE (Bug#6128). + +2010-05-03 Štěpán Němec (tiny change) + + * programs.texi (Man Page): + * misc.texi (Invoking emacsclient): + * mini.texi (Repetition): + * mark.texi (Setting Mark): Fix typos. + +2010-04-25 Chong Yidong + + * misc.texi (Printing): Document htmlfontify-buffer. + 2010-04-21 Glenn Morris * calendar.texi (Displaying the Diary, Format of Diary File): diff -r 39d09d6f8dbc -r ac3917b1de28 doc/emacs/building.texi --- a/doc/emacs/building.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/emacs/building.texi Mon May 10 13:14:21 2010 +0900 @@ -836,12 +836,11 @@ @subsection GDB Graphical Interface The command @code{gdb} starts GDB in a graphical interface, using -Emacs windows for display program state information. In effect, this -makes Emacs into an IDE (interactive development environment). With -it, you do not need to use textual GDB commands; you can control the -debugging session with the mouse. For example, you can click in the -fringe of a source buffer to set a breakpoint there, or on a stack -frame in the stack buffer to select that frame. +Emacs windows for display program state information. With it, you do +not need to use textual GDB commands; you can control the debugging +session with the mouse. For example, you can click in the fringe of a +source buffer to set a breakpoint there, or on a stack frame in the +stack buffer to select that frame. This mode requires telling GDB that its ``screen size'' is unlimited, so it sets the height and width accordingly. For correct diff -r 39d09d6f8dbc -r ac3917b1de28 doc/emacs/emacs.texi --- a/doc/emacs/emacs.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/emacs/emacs.texi Mon May 10 13:14:21 2010 +0900 @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 23.1.96 +@set EMACSVER 23.2.50 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff -r 39d09d6f8dbc -r ac3917b1de28 doc/emacs/mark.texi --- a/doc/emacs/mark.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/emacs/mark.texi Mon May 10 13:14:21 2010 +0900 @@ -80,7 +80,7 @@ character in @acronym{ASCII}; usually, typing @kbd{C-@key{SPC}} on a text terminal gives the character @kbd{C-@@}. This key is also bound to @code{set-mark-command}, so unless you are unlucky enough to have -an text terminal that behaves differently, you might as well think of +a text terminal that behaves differently, you might as well think of @kbd{C-@@} as @kbd{C-@key{SPC}}.}. This sets the mark where point is, and activates it. You can then move point away, leaving the mark behind. diff -r 39d09d6f8dbc -r ac3917b1de28 doc/emacs/mini.texi --- a/doc/emacs/mini.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/emacs/mini.texi Mon May 10 13:14:21 2010 +0900 @@ -601,7 +601,7 @@ unchanged. You can also change the command by editing the Lisp expression before you execute it. The repeated command is added to the front of the command history unless it is identical to the most -recently item. +recent item. Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you can use the minibuffer history commands (@kbd{M-p}, @kbd{M-n}, @kbd{M-r}, diff -r 39d09d6f8dbc -r ac3917b1de28 doc/emacs/misc.texi --- a/doc/emacs/misc.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/emacs/misc.texi Mon May 10 13:14:21 2010 +0900 @@ -1528,7 +1528,7 @@ @kbd{C-x #} (@code{server-edit}) in its buffer. This saves the file and sends a message back to the @command{emacsclient} program, telling it to exit. Programs that use @env{EDITOR} usually wait for the -``editor''---in the case @command{emacsclient}---to exit before doing +``editor''---in this case @command{emacsclient}---to exit before doing something else. You can also call @command{emacsclient} with multiple file name @@ -1701,8 +1701,14 @@ Emacs provides commands for printing hard copies of either an entire buffer or just part of one, with or without page headers. You can invoke the printing commands directly, as detailed in the following -section, or using the @samp{File} menu on the menu bar. See also the -hardcopy commands of Dired (@pxref{Misc File Ops}) and the diary +section, or using the @samp{File} menu on the menu bar. + +@findex htmlfontify-buffer + Aside from the commands described in this section, you can also +``print'' an Emacs buffer to HTML with @kbd{M-x htmlfontify-buffer}. +This command converts the current buffer to a HTML file, replacing +Emacs faces with CSS-based markup. In addition, see the hardcopy +commands of Dired (@pxref{Misc File Ops}) and the diary (@pxref{Displaying the Diary}). @table @kbd diff -r 39d09d6f8dbc -r ac3917b1de28 doc/emacs/programs.texi --- a/doc/emacs/programs.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/emacs/programs.texi Mon May 10 13:14:21 2010 +0900 @@ -1202,7 +1202,7 @@ your machine; the list of available manual pages is computed automatically the first time you invoke @code{woman}. The word at point in the current buffer is used to suggest the default for the -name the manual page. +name of the manual page. With a numeric argument, @kbd{M-x woman} recomputes the list of the manual pages used for completion. This is useful if you add or delete diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispintro/ChangeLog --- a/doc/lispintro/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispintro/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-16 Glenn Morris * emacs-lisp-intro.texi: Fix typo in name of `find-tag' command. diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/ChangeLog --- a/doc/lispref/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,32 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-05-03 Štěpán Němec (tiny change) + + * windows.texi (Textual Scrolling): + * tips.texi (Coding Conventions): + * minibuf.texi (Minibuffer History): + * maps.texi (Standard Keymaps): + * loading.texi (Where Defined): + * edebug.texi (Instrumenting): Fix typos. + +2010-04-25 Chong Yidong + + * keymaps.texi (Menu Bar): Document :advertised-binding property. + + * functions.texi (Obsolete Functions): Document + set-advertised-calling-convention. + + * minibuf.texi (Basic Completion): Document completion-in-region. + (Programmed Completion): Document completion-annotate-function. + + * commands.texi (Reading One Event): Document read-key. + (Distinguish Interactive): Document KIND arg to + called-interactively-p. Delete obsolete interactive-p. + + * elisp.texi (Top): Update node description. + 2010-04-14 Juri Linkov Fix @deffn without category. diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/book-spine.texinfo --- a/doc/lispref/book-spine.texinfo Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/book-spine.texinfo Mon May 10 13:14:21 2010 +0900 @@ -11,7 +11,7 @@ @center @titlefont{GNU Emacs Lisp Reference Manual} @sp 5 @center GNU -@center Emacs Version 23.1.96 +@center Emacs Version 23.2.50 @center for Unix Users @sp 5 diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/commands.texi --- a/doc/lispref/commands.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/commands.texi Mon May 10 13:14:21 2010 +0900 @@ -696,71 +696,67 @@ because it allows callers to say ``treat this call as interactive.'' But you can also do the job by testing @code{called-interactively-p}. -@defun called-interactively-p +@defun called-interactively-p kind This function returns @code{t} when the calling function was called using @code{call-interactively}. -If the containing function was called by Lisp evaluation (or with -@code{apply} or @code{funcall}), then it was not called interactively. +The argument @var{kind} should be either the symbol @code{interactive} +or the symbol @code{any}. If it is @code{interactive}, then +@code{called-interactively-p} returns @code{t} only if the call was +made directly by the user---e.g., if the user typed a key sequence +bound to the calling function, but @emph{not} if the user ran a +keyboard macro that called the function (@pxref{Keyboard Macros}). If +@var{kind} is @code{any}, @code{called-interactively-p} returns +@code{t} for any kind of interactive call, including keyboard macros. + +If in doubt, use @code{any}; the only known proper use of +@code{interactive} is if you need to decide whether to display a +helpful message while a function is running. + +A function is never considered to be called interactively if it was +called via Lisp evaluation (or with @code{apply} or @code{funcall}). @end defun - Here's an example of using @code{called-interactively-p}: +@noindent +Here is an example of using @code{called-interactively-p}: @example @group (defun foo () (interactive) - (when (called-interactively-p) - (message "foo")) - 'haha) - @result{} foo + (when (called-interactively-p 'any) + (message "Interactive!") + 'foo-called-interactively)) @end group @group ;; @r{Type @kbd{M-x foo}.} - @print{} foo + @print{} Interactive! @end group @group (foo) - @result{} haha + @result{} nil @end group @end example - Here is another example that contrasts direct and indirect -calls to @code{called-interactively-p}. +@noindent +Here is another example that contrasts direct and indirect calls to +@code{called-interactively-p}. @example @group (defun bar () (interactive) - (setq foobar (list (foo) (called-interactively-p)))) - @result{} bar + (message "%s" (list (foo) (called-interactively-p 'any)))) @end group @group ;; @r{Type @kbd{M-x bar}.} -;; @r{This does not display a message.} -@end group - -@group -foobar - @result{} (nil t) + @print{} (nil t) @end group @end example - If you want to treat commands run in keyboard macros just like calls -from Lisp programs, test @code{interactive-p} instead of -@code{called-interactively-p}. - -@defun interactive-p -This function returns @code{t} if the containing function (the one -whose code includes the call to @code{interactive-p}) was called in -direct response to user input. This means that it was called with the -function @code{call-interactively}, and that a keyboard macro is -not running, and that Emacs is not running in batch mode. -@end defun - @node Command Loop Info @comment node-name, next, previous, up @section Information from the Command Loop @@ -2309,10 +2305,8 @@ @cindex reading a single event @cindex event, reading only one - The lowest level functions for command input are those that read a -single event. - -None of the three functions below suppresses quitting. + The lowest level functions for command input are @code{read-event}, +@code{read-char}, and @code{read-char-exclusive}. @defun read-event &optional prompt inherit-input-method seconds This function reads and returns the next event of command input, waiting @@ -2409,11 +2403,31 @@ gets a character. The arguments work as in @code{read-event}. @end defun + None of the above functions suppress quitting. + @defvar num-nonmacro-input-events This variable holds the total number of input events received so far from the terminal---not counting those generated by keyboard macros. @end defvar + We emphasize that, unlike @code{read-key-sequence}, the functions +@code{read-event}, @code{read-char}, and @code{read-char-exclusive} do +not perform the translations described in @ref{Translation Keymaps}. +If you wish to read a single key taking these translations into +account, use the function @code{read-key}: + +@defun read-key &optional prompt +This function reads a single key. It is ``intermediate'' between +@code{read-key-sequence} and @code{read-event}. Unlike the former, it +reads a single key, not a key sequence. Unlike the latter, it does +not return a raw event, but decodes and translates the user input +according to @code{input-decode-map}, @code{local-function-key-map}, +and @code{key-translation-map} (@pxref{Translation Keymaps}). + +The argument @var{prompt} is either a string to be displayed in the +echo area as a prompt, or @code{nil}, meaning not to display a prompt. +@end defun + @node Event Mod @subsection Modifying and Translating Input Events diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/edebug.texi --- a/doc/lispref/edebug.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/edebug.texi Mon May 10 13:14:21 2010 +0900 @@ -186,7 +186,7 @@ While Edebug is active, the command @kbd{I} (@code{edebug-instrument-callee}) instruments the definition of the -function or macro called by the list form after point, if is not already +function or macro called by the list form after point, if it is not already instrumented. This is possible only if Edebug knows where to find the source for that function; for this reason, after loading Edebug, @code{eval-region} records the position of every definition it diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/elisp.texi --- a/doc/lispref/elisp.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/elisp.texi Mon May 10 13:14:21 2010 +0900 @@ -8,7 +8,7 @@ @c Please remember to update the edition number in README as well. @c And also the copies in vol1.texi and vol2.texi. @set VERSION 3.0 -@set EMACSVER 23.1.96 +@set EMACSVER 23.2.50 @set DATE July 2009 @c in general, keep the following line commented out, unless doing a @@ -649,7 +649,6 @@ Completion * Basic Completion:: Low-level functions for completing strings. - (These are too low level to use the minibuffer.) * Minibuffer Completion:: Invoking the minibuffer with completion. * Completion Commands:: Minibuffer commands that do completion. * High-Level Completion:: Convenient special cases of completion diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/functions.texi --- a/doc/lispref/functions.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/functions.texi Mon May 10 13:14:21 2010 +0900 @@ -1197,7 +1197,7 @@ @end defun You can define a function as an alias and declare it obsolete at the -same time using the macro @code{define-obsolete-function-alias}. +same time using the macro @code{define-obsolete-function-alias}: @defmac define-obsolete-function-alias obsolete-name current-name &optional when docstring This macro marks the function @var{obsolete-name} obsolete and also @@ -1210,6 +1210,33 @@ @end example @end defmac +In addition, you can mark a certain a particular calling convention +for a function as obsolete: + +@defun set-advertised-calling-convention function signature +This function specifies the argument list @var{signature} as the +correct way to call @var{function}. This causes the Emacs byte +compiler to issue a warning whenever it comes across an Emacs Lisp +program that calls @var{function} any other way (however, it will +still allow the code to be byte compiled). + +For instance, in old versions of Emacs the @code{sit-for} function +accepted three arguments, like this + +@smallexample + (sit-for seconds milliseconds nodisp) +@end smallexample + +However, calling @code{sit-for} this way is considered obsolete +(@pxref{Waiting}). The old calling convention is deprecated like +this: + +@smallexample +(set-advertised-calling-convention + 'sit-for '(seconds &optional nodisp)) +@end smallexample +@end defun + @node Inline Functions @section Inline Functions @cindex inline functions diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/keymaps.texi --- a/doc/lispref/keymaps.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/keymaps.texi Mon May 10 13:14:21 2010 +0900 @@ -2470,9 +2470,13 @@ @cindex menu bar Most window systems allow each frame to have a @dfn{menu bar}---a -permanently displayed menu stretching horizontally across the top of the -frame. The items of the menu bar are the subcommands of the fake -``function key'' @code{menu-bar}, as defined in the active keymaps. +permanently displayed menu stretching horizontally across the top of +the frame. (In order for a frame to display a menu bar, its +@code{menu-bar-lines} parameter must be greater than zero. +@xref{Layout Parameters}.) + + The items of the menu bar are the subcommands of the fake ``function +key'' @code{menu-bar}, as defined in the active keymaps. To add an item to the menu bar, invent a fake ``function key'' of your own (let's call it @var{key}), and make a binding for the key sequence @@ -2490,13 +2494,6 @@ from the keymaps that would be active if @code{overriding-local-map} were @code{nil}. @xref{Active Keymaps}. - In order for a frame to display a menu bar, its @code{menu-bar-lines} -parameter must be greater than zero. Emacs uses just one line for the -menu bar itself; if you specify more than one line, the other lines -serve to separate the menu bar from the windows in the frame. We -recommend 1 or 2 as the value of @code{menu-bar-lines}. @xref{Layout -Parameters}. - Here's an example of setting up a menu bar item: @example @@ -2535,8 +2532,8 @@ @end example @noindent -@code{edit} is the fake function key used by the global map for the -@samp{Edit} menu bar item. The main reason to suppress a global +Here, @code{edit} is the fake function key used by the global map for +the @samp{Edit} menu bar item. The main reason to suppress a global menu bar item is to regain space for mode-specific items. @defvar menu-bar-final-items @@ -2557,6 +2554,23 @@ in the usual case. @end defvar +Next to every menu bar item, Emacs displays a key binding that runs +the same command (if such a key binding exists). This serves as a +convenient hint for users who do not know the key binding. If a +command has multiple bindings, Emacs normally displays the first one +it finds. You can specify one particular key binding by assigning an +@code{:advertised-binding} symbol property to the command. For +instance, the following tells Emacs to show @kbd{C-/} for the +@code{undo} menu item: + +@smallexample +(put 'undo :advertised-binding [?\C-/]) +@end smallexample + +@noindent +If the @code{:advertised-binding} property specifies a key binding +that the command does not actually have, it is ignored. + @node Tool Bar @subsection Tool bars @cindex tool bar diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/loading.texi --- a/doc/lispref/loading.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/loading.texi Mon May 10 13:14:21 2010 +0900 @@ -823,7 +823,7 @@ @code{load-history}. @defvar load-history -This value of this variable is an alist that associates the names of +The value of this variable is an alist that associates the names of loaded library files with the names of the functions and variables they defined, as well as the features they provided or required. diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/locals.texi --- a/doc/lispref/locals.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/locals.texi Mon May 10 13:14:21 2010 +0900 @@ -85,6 +85,9 @@ @item case-fold-search @xref{Searching and Case}. +@item comment-column +@xref{Comments,,, emacs, The GNU Emacs Manual}. + @item ctl-arrow @xref{Usual Display}. @@ -94,9 +97,6 @@ @item cursor-type @xref{Cursor Parameters}. -@item comment-column -@xref{Comments,,, emacs, The GNU Emacs Manual}. - @item default-directory @xref{File Name Expansion}. diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/maps.texi --- a/doc/lispref/maps.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/maps.texi Mon May 10 13:14:21 2010 +0900 @@ -163,7 +163,7 @@ @item key-translation-map A keymap for translating keys. This one overrides ordinary key -bindings, unlike @code{local- function-key-map}. @xref{Translation +bindings, unlike @code{local-function-key-map}. @xref{Translation Keymaps}. @item kmacro-map diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/minibuf.texi --- a/doc/lispref/minibuf.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/minibuf.texi Mon May 10 13:14:21 2010 +0900 @@ -511,7 +511,7 @@ @defopt history-length The value of this variable specifies the maximum length for all history lists that don't specify their own maximum lengths. If the -value is @code{t}, that means there no maximum (don't delete old +value is @code{t}, that means there is no maximum (don't delete old elements). The value of @code{history-length} property of the history list variable's symbol, if set, overrides this variable for that particular history list. @@ -626,7 +626,6 @@ @menu * Basic Completion:: Low-level functions for completing strings. - (These are too low level to use the minibuffer.) * Minibuffer Completion:: Invoking the minibuffer with completion. * Completion Commands:: Minibuffer commands that do completion. * High-Level Completion:: Convenient special cases of completion @@ -640,31 +639,23 @@ @node Basic Completion @subsection Basic Completion Functions - The completion functions @code{try-completion}, -@code{all-completions} and @code{test-completion} have nothing in -themselves to do with minibuffers. We describe them in this chapter -so as to keep them near the higher-level completion features that do -use the minibuffer. - - If you store a completion alist in a variable, you should mark the -variable as ``risky'' with a non-@code{nil} -@code{risky-local-variable} property. + The following completion functions have nothing in themselves to do +with minibuffers. We describe them here to keep them near the +higher-level completion features that do use the minibuffer. @defun try-completion string collection &optional predicate This function returns the longest common substring of all possible completions of @var{string} in @var{collection}. The value of @var{collection} must be a list of strings or symbols, an alist, an -obarray, a hash table, or a function that implements a virtual set of -strings (see below). +obarray, a hash table, or a completion function (@pxref{Programmed +Completion}). Completion compares @var{string} against each of the permissible -completions specified by @var{collection}; if the beginning of the -permissible completion equals @var{string}, it matches. If no permissible -completions match, @code{try-completion} returns @code{nil}. If only -one permissible completion matches, and the match is exact, then -@code{try-completion} returns @code{t}. Otherwise, the value is the -longest initial sequence common to all the permissible completions that -match. +completions specified by @var{collection}. If no permissible +completions match, @code{try-completion} returns @code{nil}. If there +is just one matching completion, and the match is exact, it returns +@code{t}. Otherwise, it returns the longest initial sequence common +to all possible matching completions. If @var{collection} is an alist (@pxref{Association Lists}), the permissible completions are the elements of the alist that are either @@ -688,13 +679,13 @@ If @var{collection} is a hash table, then the keys that are strings are the possible completions. Other keys are ignored. -You can also use a symbol that is a function as @var{collection}. Then -the function is solely responsible for performing completion; +You can also use a symbol that is a function as @var{collection}. +Then the function is solely responsible for performing completion; @code{try-completion} returns whatever this function returns. The function is called with three arguments: @var{string}, @var{predicate} -and @code{nil}. (The reason for the third argument is so that the same +and @code{nil} (the reason for the third argument is so that the same function can be used in @code{all-completions} and do the appropriate -thing in either case.) @xref{Programmed Completion}. +thing in either case). @xref{Programmed Completion}. If the argument @var{predicate} is non-@code{nil}, then it must be a function of one argument, unless @var{collection} is a hash table, in @@ -823,6 +814,10 @@ it returns, @code{test-completion} returns in turn. @end defun +If you store a completion alist in a variable, you should mark the +variable as ``risky'' with a non-@code{nil} +@code{risky-local-variable} property. @xref{File Local Variables}. + @defvar completion-ignore-case If the value of this variable is non-@code{nil}, Emacs does not consider case significant in completion. Note, however, that this @@ -855,6 +850,23 @@ @end smallexample @end defmac +The function @code{completion-in-region} provides a convenient way to +perform completion on an arbitrary stretch of text in an Emacs buffer: + +@defun completion-in-region start end collection &optional predicate +This function completes the text in the current buffer between the +positions @var{start} and @var{end}, using @var{collection}. The +argument @var{collection} has the same meaning as in +@code{try-completion} (@pxref{Basic Completion}). + +This function inserts the completion text directly into the current +buffer. Unlike @code{completing-read} (@pxref{Minibuffer +Completion}), it does not activate the minibuffer. + +For this function to work, point must be somewhere between @var{start} +and @var{end}. +@end defun + @node Minibuffer Completion @subsection Completion and the Minibuffer @cindex minibuffer completion @@ -869,12 +881,12 @@ @var{prompt}, which must be a string. The actual completion is done by passing @var{collection} and -@var{predicate} to the function @code{try-completion}. This happens -in certain commands bound in the local keymaps used for completion. -Some of these commands also call @code{test-completion}. Thus, if -@var{predicate} is non-@code{nil}, it should be compatible with -@var{collection} and @code{completion-ignore-case}. @xref{Definition -of test-completion}. +@var{predicate} to the function @code{try-completion} (@pxref{Basic +Completion}). This happens in certain commands bound in the local +keymaps used for completion. Some of these commands also call +@code{test-completion}. Thus, if @var{predicate} is non-@code{nil}, +it should be compatible with @var{collection} and +@code{completion-ignore-case}. @xref{Definition of test-completion}. The value of the optional argument @var{require-match} determines how the user may exit the minibuffer: @@ -1603,8 +1615,10 @@ Sometimes it is not possible to create an alist or an obarray containing all the intended possible completions. In such a case, you -can supply your own function to compute the completion of a given string. -This is called @dfn{programmed completion}. +can supply your own function to compute the completion of a given +string. This is called @dfn{programmed completion}. Emacs uses +programmed completion when completing file names (@pxref{File Name +Completion}). To use this feature, pass a symbol with a function definition as the @var{collection} argument to @code{completing-read}. The function @@ -1659,9 +1673,6 @@ function. So you must arrange for any function you wish to use for completion to be encapsulated in a symbol. - Emacs uses programmed completion when completing file names. -@xref{File Name Completion}. - @defun completion-table-dynamic function This function is a convenient way to write a function that can act as programmed completion function. The argument @var{function} should be @@ -1671,6 +1682,19 @@ and the interface for programmed completion functions. @end defun +@defvar completion-annotate-function +The value of this variable, if non-@code{nil}, should be a function +for ``annotating'' the entries in the @samp{*Completions*} buffer. +The function should accept a single argument, the completion string +for an entry. It should return an additional string to display next +to that entry in the @samp{*Completions*} buffer, or @code{nil} if no +additional string is to be displayed. + +The function can determine the collection used for the current +completion via the variable @code{minibuffer-completion-table} +(@pxref{Completion Commands}). +@end defvar + @node Yes-or-No Queries @section Yes-or-No Queries @cindex asking the user questions diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/tips.texi --- a/doc/lispref/tips.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/tips.texi Mon May 10 13:14:21 2010 +0900 @@ -90,7 +90,7 @@ If a file requires certain other Lisp programs to be loaded beforehand, then the comments at the beginning of the file should say so. Also, use @code{require} to make sure they are loaded. -x@xref{Named Features}. +@xref{Named Features}. @item If a file @var{foo} uses a macro defined in another file @var{bar}, diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/vol1.texi --- a/doc/lispref/vol1.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/vol1.texi Mon May 10 13:14:21 2010 +0900 @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.1.96 +@set EMACSVER 23.2.50 @set DATE July 2009 @dircategory Emacs diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/vol2.texi --- a/doc/lispref/vol2.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/vol2.texi Mon May 10 13:14:21 2010 +0900 @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.1.96 +@set EMACSVER 23.2.50 @set DATE July 2009 @dircategory Emacs diff -r 39d09d6f8dbc -r ac3917b1de28 doc/lispref/windows.texi --- a/doc/lispref/windows.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/lispref/windows.texi Mon May 10 13:14:21 2010 +0900 @@ -1661,8 +1661,8 @@ @end defopt @defopt scroll-step -This variable is an older variant of @code{scroll-conservatively}. The -difference is that it if its value is @var{n}, that permits scrolling +This variable is an older variant of @code{scroll-conservatively}. +The difference is that if its value is @var{n}, that permits scrolling only by precisely @var{n} lines, not a smaller number. This feature does not work with @code{scroll-margin}. The default value is zero. @end defopt diff -r 39d09d6f8dbc -r ac3917b1de28 doc/man/ChangeLog --- a/doc/man/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/man/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-09 Chong Yidong * emacs.1: Copyedits. Update options -Q, -mm and --daemon. Remove diff -r 39d09d6f8dbc -r ac3917b1de28 doc/man/emacs.1 --- a/doc/man/emacs.1 Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/man/emacs.1 Mon May 10 13:14:21 2010 +0900 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.96" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.50" . . .SH NAME diff -r 39d09d6f8dbc -r ac3917b1de28 doc/misc/ChangeLog --- a/doc/misc/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/misc/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,13 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-05-03 Štěpán Němec (tiny change) + + * url.texi (HTTP language/coding, Customization): + * message.texi (Header Commands, Responses): + * cl.texi (Argument Lists): Fix typos. + 2010-04-18 Chong Yidong * ede.texi (EDE Mode): Refer to init file rather than `.emacs'. Note diff -r 39d09d6f8dbc -r ac3917b1de28 doc/misc/cl.texi --- a/doc/misc/cl.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/misc/cl.texi Mon May 10 13:14:21 2010 +0900 @@ -356,7 +356,7 @@ calls to it may be expanded into in-line code by the byte compiler. This is analogous to the @code{defsubst} form; @code{defsubst*} uses a different method (compiler macros) which -works in all version of Emacs, and also generates somewhat more +works in all versions of Emacs, and also generates somewhat more efficient inline expansions. In particular, @code{defsubst*} arranges for the processing of keyword arguments, default values, etc., to be done at compile-time whenever possible. diff -r 39d09d6f8dbc -r ac3917b1de28 doc/misc/faq.texi --- a/doc/misc/faq.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/misc/faq.texi Mon May 10 13:14:21 2010 +0900 @@ -5,7 +5,7 @@ @c %**end of header @c This is used in many places -@set VER 23.1.96 +@set VER 23.2.50 @c This file is maintained by Romain Francoise . @c Feel free to install changes without prior permission (but I'd diff -r 39d09d6f8dbc -r ac3917b1de28 doc/misc/message.texi --- a/doc/misc/message.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/misc/message.texi Mon May 10 13:14:21 2010 +0900 @@ -659,7 +659,7 @@ @findex message-insert-disposition-notification-to Insert a request for a disposition notification. (@code{message-insert-disposition-notification-to}). -This means that if the recipient support RFC 2298 she might send you a +This means that if the recipient supports RFC 2298 she might send you a notification that she received the message. @item M-x message-insert-importance-high @@ -2387,7 +2387,7 @@ @item wide reply A @dfn{wide reply} is a mail response that includes @emph{all} entities -mentioned in the message you are responded to. All mailboxes from the +mentioned in the message you are responding to. All mailboxes from the following headers will be concatenated to form the outgoing @code{To}/@code{Cc} headers: diff -r 39d09d6f8dbc -r ac3917b1de28 doc/misc/url.texi --- a/doc/misc/url.texi Fri Apr 23 21:29:11 2010 +0900 +++ b/doc/misc/url.texi Mon May 10 13:14:21 2010 +0900 @@ -313,7 +313,7 @@ variables, the value is a string; it can specify a single choice, or it can be a comma-separated list. -Normally this list ordered by descending preference. However, each +Normally, this list is ordered by descending preference. However, each element can be followed by @samp{;q=@var{priority}} to specify its preference level, a decimal number from 0 to 1; e.g., for @code{url-mime-language-string}, @w{@code{"de, en-gb;q=0.8, @@ -1120,11 +1120,11 @@ @defopt url-debug @cindex debugging -Specifies the types of debug messages the library which are logged to +Specifies the types of debug messages which are logged to the @code{*URL-DEBUG*} buffer. @code{t} means log all messages. A number means log all messages and show them with @code{message}. -If may also be a list of the types of messages to be logged. +It may also be a list of the types of messages to be logged. @end defopt @defopt url-personal-mail-address @end defopt diff -r 39d09d6f8dbc -r ac3917b1de28 etc/AUTHORS --- a/etc/AUTHORS Fri Apr 23 21:29:11 2010 +0900 +++ b/etc/AUTHORS Mon May 10 13:14:21 2010 +0900 @@ -92,7 +92,7 @@ Alexander Becher: changed vc-annotate.el -Alexander Klimov: changed man.el +Alexander Klimov: changed calc-graph.el man.el Alexander Kreuzer: changed nnrss.el @@ -167,9 +167,9 @@ Andreas Politz: changed editfns.c elp.el ido.el term.el Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c files.el - coding.c alloc.c process.c print.c editfns.c fileio.c fns.c dired.el + coding.c alloc.c process.c fileio.c print.c editfns.c fns.c dired.el xterm.c keyboard.c simple.el eval.c info.el buffer.c sysdep.c emacs.c - and 483 other files + and 485 other files Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus.el nnslashdot.el gnus-util.el mm-url.el mm-uu.el url-http.el xterm.c @@ -435,8 +435,8 @@ and co-wrote longlines.el and changed xdisp.c simple.el files.el display.texi frames.texi files.texi emacs.texi keyboard.c cus-edit.el faces.el xterm.c - Makefile.in xfaces.c font.c misc.texi startup.el xfns.c image.c - compile.el custom.texi text.texi and 635 other files + Makefile.in misc.texi xfaces.c font.c startup.el xfns.c compile.el + image.c custom.texi configure.in and 635 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -868,7 +868,7 @@ and changed msdos.c makefile.w32-in Makefile.in files.el info.el rmail.el fileio.c mainmake.v2 pc-win.el startup.el config.bat simple.el msdos.h dired.c w32.c frame.c internal.el menu-bar.el process.c INSTALL - xfaces.c and 602 other files + xfaces.c and 603 other files Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el gnus.el @@ -1770,7 +1770,7 @@ and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el and changed coding.c mule-cmds.el mule.el fontset.c charset.c fontset.el xdisp.c xterm.c font.c fileio.c Makefile.in mule-conf.el characters.el - fns.c mule-diag.el ccl.c charset.h ftfont.c xfaces.c coding.h + fns.c mule-diag.el ftfont.c ccl.c charset.h xfaces.c coding.h japanese.el and 377 other files Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el @@ -2951,7 +2951,9 @@ Steinar Bang: changed imap.el -Štěpán Němec: changed subr.el vc-git.el +Štěpán Němec: changed INSTALL cl.texi edebug.texi loading.texi maps.texi + mark.texi message.texi mini.texi minibuf.texi misc.texi programs.texi + subr.el tips.texi url.texi vc-git.el windows.texi Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi ediff-mult.el diff -r 39d09d6f8dbc -r ac3917b1de28 etc/ChangeLog --- a/etc/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/etc/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,11 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-04-27 Chong Yidong + + * PROBLEMS: Document gcc-4.5 bug (Bug#6031). + 2010-04-23 Kenichi Handa * HELLO: Adjust Burmese for Unicode 5.2 encoding. diff -r 39d09d6f8dbc -r ac3917b1de28 etc/NEWS --- a/etc/NEWS Fri Apr 23 21:29:11 2010 +0900 +++ b/etc/NEWS Mon May 10 13:14:21 2010 +0900 @@ -14,97 +14,80 @@ You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. - -Temporary note: - +++ indicates that the appropriate manual has already been updated. - --- means no change in the manuals is called for. -When you add a new item, please add it without either +++ or --- -so we will look at it and add it to the manual. - * Installation Changes in Emacs 23.2 ---- -** New configure options for Emacs developers +** New configure options for Emacs developers. These are not new features; only the configure flags are new. ---- + *** --enable-profiling builds Emacs with profiling enabled. This might not work on all platforms. ---- + *** --enable-checking[=OPTIONS] builds emacs with extra runtime checks. ---- ** `make install' now consistently ignores umask, creating a world-readable install. -+++ ** Emacs compiles with Gconf support, if it is detected. Use the configure option --without-gconf to disable this. This is used by the `font-use-system-font' feature (see below). * Startup Changes in Emacs 23.2 -+++ + ** The command-line option -Q (--quick) also inhibits loading X resources. However, if Emacs is compiled with the Lucid or Motif toolkit, X resource settings for the graphical widgets are still applied. On Windows, the -Q option causes Emacs to ignore Registry settings, but environment variables set on the Registry are still honored. -+++ + *** The new variable `inhibit-x-resources' shows whether X resources were loaded. -+++ ** New command-line option -mm (--maximized) maximizes the initial frame. * Changes in Emacs 23.2 -+++ ** The maximum size of buffers (and the largest fixnum) is doubled. On typical 32bit systems, buffers can now be up to 512MB. ---- ** The default value of `trash-directory' is now nil. This means that `move-file-to-trash' trashes files according to freedesktop.org specifications, the same method used by the Gnome, KDE, and XFCE desktops. (This change has no effect on Windows, which uses `system-move-file-to-trash' for trashing.) -+++ ** The pointer now becomes invisible when typing. Customize `make-pointer-invisible' to disable this feature. ** Font changes -+++ + *** Emacs can use the system default monospaced font in Gnome. To enable this feature, set `font-use-system-font' to non-nil (it is nil by default). If the system default changes, Emacs changes also. This feature requires Gconf support, which is automatically included at compile-time if configure detects the gconf libraries (you can disable this with the configure option --without-gconf). ---- + *** On X11, Emacs reacts to Xft changes made by configuration tools, via the XSETTINGS mechanism. This includes antialias, hinting, hintstyle, RGBA, DPI and lcdfilter changes. -+++ ** Killing a buffer with a running process now asks for confirmation. To remove this query, remove `process-kill-buffer-query-function' from `kill-buffer-query-functions', or set the appropriate process flag with `set-process-query-on-exit-flag'. ** File-local variable changes -+++ + *** Specifying a minor mode as a local variables enables that mode, unconditionally. The previous behavior, toggling the mode, was neither reliable nor generally desirable. -+++ *** There are new commands for adding and removing file-local variables: `add-file-local-variable', `delete-file-local-variable', `add-file-local-variable-prop-line', and `delete-file-local-variable-prop-line'. -+++ *** There are new commands for adding and removing directory-local variables, and copying them to and from file-local variable lists: `add-dir-local-variable', `delete-dir-local-variable', @@ -113,55 +96,63 @@ `copy-file-locals-to-dir-locals'. ** Internationalization changes -+++ + *** Unibyte sessions are now considered obsolete. This refers to the EMACS_UNIBYTE environment variable as well as the --unibyte, --multibyte, --no-multibyte, and --no-unibyte command line arguments. Customizing enable-multibyte-characters and setting default-enable-multibyte-characters are also deprecated. ---- + *** New coding system `utf-8-hfs'. This is suitable for default-file-name-coding-system on Mac OS X; see international/ucs-normalize.el. ---- ** Function arguments in *Help* buffers are now shown in upper-case. Customize `help-downcase-arguments' to t to show them in lower-case. +** New command `async-shell-command', bound globally to `M-&'. +This executes the command asynchronously, similar to calling `M-!' and +manually adding an ampersand to the end of the command. With `M-&', +you don't need the ampersand. The output appears in the buffer +`*Async Shell Command*'. + +** When running in a new enough xterm (newer than version 242), Emacs +asks xterm what the background color is and it sets up faces +accordingly for a dark background if needed (the current default is to +consider the background light). + * Editing Changes in Emacs 23.2 ** Kill-ring and selection changes -+++ + *** If `select-active-regions' is t, any active region automatically becomes the primary selection (for interaction with other window applications). If you enable this, you might want to bind `mouse-yank-primary' to Mouse-2. -+++ + *** When `save-interprogram-paste-before-kill' is non-nil, the kill commands save the interprogram-paste selection into the kill ring before doing anything else. This avoids losing the selection. -+++ + *** When `kill-do-not-save-duplicates' is non-nil, identical subsequent kills are not duplicated in the `kill-ring'. ** Completion changes *** The new command `completion-at-point' provides mode-sensitive completion. -+++ + *** tab-always-indent set to `complete' lets TAB do completion as well. -+++ + *** The new completion-style `initials' is available. For instance, this can complete M-x lch to list-command-history. ---- + *** The new variable `completions-format' determines how completions are displayed in the *Completions* buffer. If you set it to `vertical', completions are sorted vertically in columns. -+++ ** The default value of `blink-matching-paren-distance' is increased. ---- ** M-n provides more default values in the minibuffer for commands that read file names. These include the file name at point (when ffap is loaded without ffap-bindings), the file name on the current line @@ -169,59 +160,44 @@ (for Dired commands that operate on several directories, such as copy, rename, or diff). -+++ ** M-r is bound to the new `move-to-window-line-top-bottom'. This moves point to the window center, top and bottom on successive invocations, in the same spirit as the C-l (recenter-top-bottom) command. -+++ ** The new variable `recenter-positions' determines the default cycling order of C-l (`recenter-top-bottom'). -+++ ** The abbrevs file is now a file named abbrev_defs in user-emacs-directory; but the old location, ~/.abbrev_defs, is used if that file exists. + * Changes in Specialized Modes and Packages in Emacs 23.2 ---- ** The bookmark menu has a narrowing search via bookmark-bmenu-search. -** LaTeX mode now provides completion (via completion-at-point). - ---- -** sym-comp.el is now declared obsolete, superseded by completion-at-point. - ---- -** lucid.el and levents.el are now declared obsolete. - ---- -** pcomplete provides a new command `pcomplete-std-completion' which -is similar to `pcomplete' but using the standard completion UI code. - ** Calc -+++ + *** The Calc settings file is now a file named calc.el in user-emacs-directory; but the old location, ~/.calc.el, is used if that file exists. ---- + *** Graphing commands (`g f' etc.) now work on MS-Windows, if you have the native Windows port of Gnuplot version 3.8 or later installed. ** Calendar and diary -+++ + *** Fancy diary display is now the default. If you prefer the simple display, customize `diary-display-function'. -+++ + *** The diary's fancy display now enables view-mode. ---- + *** The command `calendar-current-date' accepts an optional argument giving an offset from today. ** Desktop ---- + *** The default value for `desktop-buffers-not-to-save' is nil. This means Desktop will try restoring all buffers, when you restart your Emacs session. Also, `desktop-buffers-not-to-save' is only @@ -230,37 +206,50 @@ `desktop-files-not-to-save' instead. ** Dired -+++ + *** The new variable `dired-auto-revert-buffer', if non-nil, causes Dired buffers to be reverted automatically on revisiting them. ** DocView -+++ + *** When `doc-view-continuous' is non-nil, scrolling a line on the page edge advances to the next/previous page. +** Elint + +*** Elint now uses compilation-mode. + +*** Elint can now scan individual files and whole directories, +and can be run in batch mode. + +*** Elint does a more thorough initialization, and recognizes more built-in +functions and variables. Customize `elint-scan-preloaded' if you want +to sacrifice some accuracy for a faster startup. + +*** Elint attempts some basic understanding of featurep and (f)boundp tests. + +*** Customize `elint-ignored-warnings' to suppress some warnings. + ** GDB-UI -+++ *** Toolbar functionality for reverse debugging. Display of STL collections as watch expressions. These features require GDB 7.0 or later. ** Grep -+++ + *** A new command `zrgrep' searches recursively in gzipped files. ** Info -+++ *** The new command `Info-virtual-index' bound to "I" displays a menu of matched topics found in the index. -+++ *** The new command `info-finder' replaces finder.el with a virtual Info manual that generates an Info file which gives the same information through a menu structure. -+++ +** LaTeX mode now provides completion (via completion-at-point). + ** Message mode is now the default mode for composing mail. The default for `mail-user-agent' is now message-user-agent, so the @@ -270,7 +259,6 @@ for several years. It provides several features that are absent in Mail mode, such as MIME handling. ---- *** If the user has not customized mail-user-agent, `compose-mail' checks for Mail mode customizations, and issues a warning if these customizations are found. This alerts users who may otherwise be @@ -278,110 +266,87 @@ To disable this check, set compose-mail-user-agent-warnings to nil. ---- ** The default value of mail-interactive is t, since Emacs 23.1. (This was not announced at the time.) It means that when sending mail, Emacs will wait for the process sending mail to return. If you experience delays when sending mail, you may wish to set this to nil. -+++ ** nXML mode is now the default for editing XML files. +** pcomplete provides a new command `pcomplete-std-completion' which +is similar to `pcomplete' but using the standard completion UI code. + ** Shell (and other comint modes) -+++ + *** M-s is no longer bound to `comint-next-matching-input'. -+++ + *** M-r is now bound to `comint-history-isearch-backward-regexp'. This starts an incremental search of the comint/shell input history. -+++ + *** ansi-color is now enabled by default in Shell mode. To disable it, set ansi-color-for-comint-mode to nil. ** Tramp -+++ + *** New connection methods "rsyncc", "imap" and "imaps". On systems which support GVFS-Fuse, Tramp offers also the new connection methods "dav", "davs", "obex" and "synce". ** VC and related modes -+++ + *** When using C-x v v or C-x v i on a unregistered file that is in a directory not controlled by any VCS, ask the user what VC backend to use to create a repository, create a new repository and register the file. -+++ + *** New command `vc-root-print-log', bound to `C-x v L'. This displays a `*vc-change-log*' buffer showing the history of the version-controlled directory tree as a whole. -+++ + *** New command `vc-root-diff', bound to `C-x v D'. This is similar to `vc-diff', but compares the entire directory tree of the current VC directory with its working revision. -+++ + *** `C-x v l' and `C-x v L' do not show the full log by default. The number of entries shown can be chosen interactively with a prefix argument, or by customizing vc-log-show-limit. The `*vc-change-log*' buffer now contains buttons at the end of the buffer, which can be used to increase the number of entries shown. RCS, SCCS, and CVS do not support this feature. ---- + *** vc-annotate supports annotations through file copies and renames, it displays the old names for the files and it can show logs/diffs for the corresponding lines. Currently only Git and Mercurial take advantage of this feature. ---- + *** The log command in vc-annotate can display a single log entry instead of redisplaying the full log. The RCS, CVS and SCCS VC backends do not support this. ---- + *** When a file is not found, VC will not try to check it out of RCS anymore. -+++ + *** Diff and log operations can be used from Dired buffers. *** vc-git changes ---- **** The short log format for git makes use of the graph display, so it's not supported on git versions earlier than 1.5.6. ---- **** vc-dir uses the --relative option of git, and so requires at least git version 1.5.5. -+++ **** Support for operating with stashes has been added to vc-dir: the stash list is displayed in the *vc-dir* header, stashes can be created, removed, applied and their content displayed. -+++ *** vc-bzr supports operating with shelves: the shelve list is displayed in the *vc-dir* header, shelves can be created, removed and applied. ---- + *** log-edit-strip-single-file-name controls whether or not single filenames are stripped when copying text from the ChangeLog to the *VC-Log* buffer. -** Elint ---- -*** Elint now uses compilation-mode. ---- -*** Elint can now scan individual files and whole directories, -and can be run in batch mode. ---- -*** Elint does a more thorough initialization, and recognizes more built-in -functions and variables. Customize `elint-scan-preloaded' if you want -to sacrifice some accuracy for a faster startup. ---- -*** Elint attempts some basic understanding of featurep and (f)boundp tests. ---- -*** Customize `elint-ignored-warnings' to suppress some warnings. - ** Miscellaneous -+++ -*** The new command `async-shell-command' bound globally to `M-&' executes -the command asynchronously without the need to manually add ampersand to -the end of the command. Its output appears in the buffer `*Async Shell -Command*'. -+++ + *** Interactively `multi-isearch-buffers' and `multi-isearch-buffers-regexp' read buffer names to search, one by one, ended with RET. With a prefix argument, they ask for a regexp, and search in buffers whose names match @@ -389,19 +354,20 @@ `multi-isearch-files-regexp' read file names to search, one by one, ended with RET. With a prefix argument, they ask for a wildcard, and search in file buffers whose file names match the specified wildcard. -+++ + *** Autorevert Tail mode now works also for remote files. -+++ -*** The new built-in commands `su' and `sudo' support Tramp. -That means, they change `default-directory' to the new users value, -and let commands run under that user permissions. It works even when + +*** The new eshell built-in commands `su' and `sudo' support Tramp. +Thus, they change `default-directory' to reflect the new user id, and +let commands run under that user's permissions. This works even when `default-directory' is already remote. Calling the external commands -is possible by `*su' or `*sudo', respectively. ---- -*** When running in a new enough xterm (newer than version 242), Emacs -asks xterm what the background color is and it sets up faces -accordingly for a dark background if needed (the current default is to -consider the background light). +is possible via `*su' or `*sudo', respectively. + +** Obsolete packages + +*** sym-comp.el is now obsolete, superseded by completion-at-point. + +*** lucid.el and levents.el are now obsolete. * New Modes and Packages in Emacs 23.2 @@ -410,7 +376,6 @@ This is a collection of packages to aid with using Emacs as an IDE (integrated development environment): -+++ *** The Semantic package allows the use of parsers to intelligently edit and navigate source code. Parsers for C/C++, Java, Javascript, and several other languages are included by default, and Semantic can @@ -419,7 +384,6 @@ To enable Semantic, use the global minor mode `semantic-mode'. See the Semantic manual for details. -+++ *** EDE (Emacs Development Environment) is a package for managing code projects, including features such as automatic Makefile generation. @@ -430,25 +394,20 @@ code. It is currently used by some parts of Semantic and EDE; in the future, it may be used for code generation features. -+++ *** The EIEIO library implements a subset of the Common Lisp Object System (CLOS). It is used by the other CEDET packages. ---- ** mpc.el is a front end for the Music Player Daemon. Run it with M-x mpc. ** htmlfontify.el turns a fontified Emacs buffer into an HTML page. -+++ ** js.el is a new major mode for JavaScript files. ---- ** imap-hash.el is a new library to address IMAP mailboxes as hashtables. * Incompatible Lisp Changes in Emacs 23.2 -+++ ** The Lisp reader turns integers that are too large/small into floats. For instance, on machines where `536870911' is the largest integer, reading `536870912' gives the floating-point object `536870912.0'. @@ -456,7 +415,6 @@ This change only concerns the Lisp reader; it does not affect how actual integer objects overflow. ---- ** Several obsolete functions removed. The functions have been obsolete since Emacs 19, and are unlikely to be in use: @@ -466,11 +424,9 @@ time-stamp-yyyy-mm-dd, time-stamp-yymmdd, time-stamp-hh:mm:ss, time-stamp-hhmm, baud-rate ---- ** Support for generating Emacs 18 compatible bytecode (by setting the variable `byte-compile-compatibility') has been removed. ---- ** In image-mode.el `image-mode-maybe' is obsolete. Instead, you can either use `image-mode' (which displays an image file as the actual image initially), or `image-mode-as-text' (when you want @@ -484,7 +440,7 @@ * Lisp changes in Emacs 23.2 ---- + ** All the default-FOO variables that hold the default value of the FOO variable, are now declared obsolete. @@ -492,10 +448,10 @@ It reads a single key, but obeys input and escape sequence decoding. ** Frame parameter changes -+++ + *** You can give the `fullscreen' frame parameter the value `maximized'. This maximizes the frame. -+++ + *** The new frame parameter `sticky' makes Emacs frames sticky in virtual desktops. @@ -509,23 +465,23 @@ *** New function `completion-in-region' to use the standard completion facilities on a particular region of text. -+++ + *** The 4th arg to all-completions (aka hide-spaces) is declared obsolete. *** completion-annotate-function specifies how to compute annotations for completions displayed in *Completions*. ** Minibuffer changes ---- + *** read-file-name-predicate is obsolete. It was used to pass the predicate to read-file-name-internal because read-file-name-internal abused its `pred' argument to pass the current directory, but this hack is not needed any more. ** Changes to file-manipulation functions -+++ + *** `delete-directory' has an optional parameter RECURSIVE. -+++ + *** New function `copy-directory', which copies a directory recursively. ** called-interactively-p now takes one argument and replaces interactive-p @@ -540,34 +496,33 @@ of bindings. ** Network and process changes -+++ + *** start-process-shell-command and start-file-process-shell-command now only take a single `command' argument. -+++ + *** The new variable `process-file-side-effects' should be set to nil if a `process-file' call does not change a remote file. This allows file name handlers such as Tramp to optimizations. -+++ + *** make-network-process can now also create `seqpacket' Unix sockets. ** Loading changes ---- + *** eval-next-after-load is obsolete. -+++ + *** New hook `after-load-functions' run after loading an Elisp file. ** Byte compilation changes ---- + *** Changing the file-names generated by byte-compilation by redefining the function `byte-compile-dest-file' before loading bytecomp.el is obsolete. Instead, customize byte-compile-dest-file-function. ---- + *** `byte-compile-warnings' has new members, `constants' and `suspicious'. ** New macro with-silent-modifications to tweak text properties without affecting the buffer's modification state. -+++ ** Hash tables have a new printed representation that is readable. The feature `hashtable-print-readable' identifies this new functionality. @@ -580,17 +535,14 @@ ucs-normalize-HFS-NFD-region, ucs-normalize-HFS-NFD-string, ucs-normalize-HFS-NFC-region, ucs-normalize-HFS-NFC-string. -+++ ** Face aliases can now be marked as obsolete, using the macro `define-obsolete-face-alias'. -+++ ** New function `window-full-height-p', analogous to the full-width version. * Changes in Emacs 23.2 on non-free operating systems ---- ** On MS-Windows, `display-time' now displays the system load average as well as the time, as it does on GNU and Unix. @@ -1398,11 +1350,11 @@ ** Gnus *** The Gnus package has been updated -There are many news features, bug fixes and improvements; see the file +There are many new features, bug fixes and improvements; see the file GNUS-NEWS or the node "No Gnus" in the Gnus manual for details. *** In Emacs 23, Gnus uses Emacs' new internal coding system `utf-8-emacs' for -saving articles drafts and ~/.newsrc.eld. These file may not be read +saving articles, drafts, and ~/.newsrc.eld. These file may not be read correctly in Emacs 22 and below. If you want to Gnus across different Emacs versions, you may set `mm-auto-save-coding-system' to `emacs-mule'. @@ -1455,8 +1407,8 @@ *** `C-h C-h' in Isearch mode displays isearch-specific Help screen, `C-h b' displays all Isearch key bindings, `C-h k' displays the full documentation of the given Isearch key sequence, `C-h m' displays -documentation of Isearch mode. All the rest Help commands exit Isearch mode -and execute their global definitions. +documentation for Isearch mode. All the other Help commands exit +Isearch mode and execute their global definitions. *** When started in the minibuffer, Isearch searches in the minibuffer history. See `Minibuffer changes', above. diff -r 39d09d6f8dbc -r ac3917b1de28 etc/PROBLEMS --- a/etc/PROBLEMS Fri Apr 23 21:29:11 2010 +0900 +++ b/etc/PROBLEMS Mon May 10 13:14:21 2010 +0900 @@ -167,6 +167,17 @@ * Crash bugs +** Emacs crashes when running in a terminal, if compiled with GCC 4.5.0 +This version of GCC is buggy: see + + http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6031 + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 + +You can work around this error in gcc-4.5 by omitting sibling call +optimization. To do this, configure Emacs with + + CFLAGS="-g -O2 -fno-optimize-sibling-calls" ./configure + ** Emacs crashes in x-popup-dialog. This can happen if the dialog widget cannot find the font it wants to diff -r 39d09d6f8dbc -r ac3917b1de28 etc/enriched.doc --- a/etc/enriched.doc Fri Apr 23 21:29:11 2010 +0900 +++ b/etc/enriched.doc Mon May 10 13:14:21 2010 +0900 @@ -219,7 +219,7 @@ paragraph properly filled all the time, without slowing down editing too much. Refill mode is a start at this, but needs - improvment. + improvement. + Refill after yank. [Refill mode does that.] @@ -272,4 +272,4 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see <. diff -r 39d09d6f8dbc -r ac3917b1de28 leim/ChangeLog --- a/leim/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/leim/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-04-06 Chong Yidong * quail/vntelex.el: Fix "af" rule (Bug#5836). diff -r 39d09d6f8dbc -r ac3917b1de28 lib-src/ChangeLog --- a/lib-src/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/lib-src/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,12 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-05-05 Christoph (tiny change) + + * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis + for macros for nmake compatibility. + 2010-04-03 Juanma Barranquero Add stubs for Windows, required after CVE-2010-0825 change. diff -r 39d09d6f8dbc -r ac3917b1de28 lib-src/makefile.w32-in --- a/lib-src/makefile.w32-in Fri Apr 23 21:29:11 2010 +0900 +++ b/lib-src/makefile.w32-in Mon May 10 13:14:21 2010 +0900 @@ -22,7 +22,7 @@ .PHONY: $(ALL) -VERSION = 23.1.96 +VERSION = 23.2.50 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ @@ -195,8 +195,8 @@ $(lispsource)term/pc-win.elc \ $(lispsource)x-dnd.elc \ $(lispsource)term/x-win.elc \ - ${lispsource}emacs-lisp/easymenu.elc \ - ${lispsource}term/ns-win.elc + $(lispsource)emacs-lisp/easymenu.elc \ + $(lispsource)term/ns-win.elc lisp1= \ diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/ChangeLog --- a/lisp/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,72 @@ +2010-05-10 Glenn Morris + + * desktop.el (desktop-save-buffer-p): Don't mistakenly include + all dired buffers, even tramp ones. (Bug#5755) [Backport from trunk] + +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-05-03 Chong Yidong + + * international/mule.el (auto-coding-alist): Only purecopy + car of each item, not the whole list (Bug#6083). + +2010-05-02 Chong Yidong + + * progmodes/js.el (js-mode): Make paragraph variables local before + calling c-setup-paragraph-variables (Bug#6071). + +2010-05-01 Eli Zaretskii + + * composite.el (compose-region, reference-point-alist): Fix typos + in the doc strings. + +2010-04-28 Alexander Klimov (tiny change) + + * calc/calc-graph.el (calc-graph-plot): Use the proper form for + gnuplot's "set" command. + +2010-04-26 Juanma Barranquero + + * abbrev.el (last-abbrev-text): Doc fix. + (abbrev-prefix-mark): Don't escape parenthesis. + +2010-04-24 Andreas Schwab + + * composite.el (find-composition): Doc fix. + +2010-04-24 Juanma Barranquero + + * progmodes/sql.el (sql-electric-stuff): Fix typo in tag. + (sql-oracle-program, sql-sqlite-options) + (sql-query-placeholders-and-send): Doc fixes. + (sql-set-product, sql-interactive-mode): Reflow docstrings. + (sql-imenu-generic-expression, sql-buffer) + (sql-mode-ansi-font-lock-keywords, sql-mode-oracle-font-lock-keywords) + (sql-mode-postgres-font-lock-keywords, sql-mode-ms-font-lock-keywords) + (sql-mode-sybase-font-lock-keywords) + (sql-mode-informix-font-lock-keywords) + (sql-mode-interbase-font-lock-keywords) + (sql-mode-ingres-font-lock-keywords, sql-mode-solid-font-lock-keywords) + (sql-mode-mysql-font-lock-keywords, sql-mode-sqlite-font-lock-keywords) + (sql-mode-db2-font-lock-keywords, sql-mode-font-lock-keywords) + (sql-product-feature, sql-highlight-product) + (comint-line-beginning-position, sql-rename-buffer) + (sql-toggle-pop-to-buffer-after-send-region) + (sql-oracle, sql-sybase, sql-informix, sql-sqlite, sql-mysql, sql-solid) + (sql-ingres, sql-ms, sql-postgres, sql-interbase, sql-db2, sql-linter): + Fix typos in docstrings. + +2010-04-23 Juri Linkov + + * info.el (Info-fontify-node): Put Info-breadcrumbs to the `display' + property instead of `invisible' and `after-string' (bug#5998). + +2010-04-23 Juri Linkov + + * image-mode.el (image-mode-as-text): Fix typo in docstring. + 2010-04-23 Juanma Barranquero * filecache.el (file-cache-add-directory-list) diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/abbrev.el --- a/lisp/abbrev.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/abbrev.el Mon May 10 13:14:21 2010 +0900 @@ -338,7 +338,7 @@ Abbrev to be expanded starts here rather than at beginning of word. This way, you can expand an abbrev with a prefix: insert the prefix, use this command, then insert the abbrev. This command inserts a -temporary hyphen after the prefix \(until the intended abbrev +temporary hyphen after the prefix (until the intended abbrev expansion occurs). If the prefix is itself an abbrev, this command expands it, unless ARG is non-nil. Interactively, ARG is the prefix argument." @@ -460,7 +460,7 @@ (defvar last-abbrev-text nil "The exact text of the last abbrev expanded. -nil if the abbrev has already been unexpanded.") +It is nil if the abbrev has already been unexpanded.") (defvar last-abbrev-location 0 "The location of the start of the last abbrev expanded.") diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/calc/calc-graph.el --- a/lisp/calc/calc-graph.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/calc/calc-graph.el Mon May 10 13:14:21 2010 +0900 @@ -345,7 +345,7 @@ "set xlabel\nset ylabel\nset title\n" "set noclip points\nset clip one\nset clip two\n" "set format \"%g\"\nset tics\nset xtics\nset ytics\n" - "set data style linespoints\n" + "set style data linespoints\n" "set nogrid\nset nokey\nset nopolar\n")) (if (>= ver 3) (insert "set surface\nset nocontour\n" diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/composite.el --- a/lisp/composite.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/composite.el Mon May 10 13:14:21 2010 +0900 @@ -44,7 +44,7 @@ A glyph reference point symbol is to be used to specify a composition rule in COMPONENTS argument to such functions as `compose-region'. -Meanings of glyph reference point codes are as follows: +The meaning of glyph reference point codes is as follows: 0----1----2 <---- ascent 0:tl or top-left | | 1:tc or top-center @@ -212,7 +212,7 @@ this case, TAB element has a special meaning. If the first characer is TAB, the glyphs are displayed with left padding space so that no pixel overlaps with the previous column. If the last -character is TAB, the glyphs are displayed with rigth padding +character is TAB, the glyphs are displayed with right padding space so that no pixel overlaps with the following column. If it is a vector or list, it is a sequence of alternate characters and @@ -222,7 +222,7 @@ A composition rule is a cons of global and new glyph reference point symbols. See the documentation of `reference-point-alist' for more -detail. +details. Optional 4th argument MODIFICATION-FUNC is a function to call to adjust the composition when it gets invalid because of a change of @@ -299,16 +299,16 @@ (compose-string-internal str 0 (length str) components))) (defun find-composition (pos &optional limit string detail-p) - "Return information about a composition at or nearest to buffer position POS. + "Return information about a composition at or near buffer position POS. If the character at POS has `composition' property, the value is a list -of FROM, TO, and VALID-P. +\(FROM TO VALID-P). FROM and TO specify the range of text that has the same `composition' property, VALID-P is t if this composition is valid, and nil if not. If there's no composition at POS, and the optional 2nd argument LIMIT -is non-nil, search for a composition toward LIMIT. +is non-nil, search for a composition toward the position given by LIMIT. If no composition is found, return nil. @@ -316,8 +316,9 @@ composition in; nil means the current buffer. If a valid composition is found and the optional 4th argument DETAIL-P -is non-nil, the return value is a list of FROM, TO, COMPONENTS, -RELATIVE-P, MOD-FUNC, and WIDTH. +is non-nil, the return value is a list of the form + + (FROM TO COMPONENTS RELATIVE-P MOD-FUNC WIDTH) COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. @@ -331,12 +332,12 @@ WIDTH is a number of columns the composition occupies on the screen. -When Automatic Compostion mode is on, this function also finds a +When Automatic Composition mode is on, this function also finds a chunk of text that is automatically composed. If such a chunk is found closer to POS than the position that has `composition' -property, the value is a list of FROM, TO, and a glyph gstring -the specify how the chunk is composed. See the function -`composition-get-gstring' for the format of the glyph string." +property, the value is a list of FROM, TO, and a glyph-string +that specifies how the chunk is to be composed. See the function +`composition-get-gstring' for the format of the glyph-string." (let ((result (find-composition-internal pos limit string detail-p))) (if (and detail-p (> (length result) 3) (nth 2 result) (not (nth 3 result))) ;; This is a valid rule-base composition. diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/desktop.el --- a/lisp/desktop.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/desktop.el Mon May 10 13:14:21 2010 +0900 @@ -1,7 +1,8 @@ ;;; desktop.el --- save partial status of Emacs when killed ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Morten Welinder ;; Keywords: convenience @@ -811,19 +812,23 @@ FILENAME is the visited file name, BUFNAME is the buffer name, and MODE is the major mode. \n\(fn FILENAME BUFNAME MODE)" - (let ((case-fold-search nil)) + (let ((case-fold-search nil) + dired-skip) (and (not (and (stringp desktop-buffers-not-to-save) (not filename) (string-match desktop-buffers-not-to-save bufname))) (not (memq mode desktop-modes-not-to-save)) + ;; FIXME this is broken if desktop-files-not-to-save is nil. (or (and filename (stringp desktop-files-not-to-save) (not (string-match desktop-files-not-to-save filename))) (and (eq mode 'dired-mode) (with-current-buffer bufname - (not (string-match desktop-files-not-to-save - default-directory)))) + (not (setq dired-skip + (string-match desktop-files-not-to-save + default-directory))))) (and (null filename) + (null dired-skip) ; bug#5755 (with-current-buffer bufname desktop-save-buffer)))))) ;; ---------------------------------------------------------------------------- diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/erc/ChangeLog --- a/lisp/erc/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/erc/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-07 Vivek Dasmohapatra * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/image-mode.el --- a/lisp/image-mode.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/image-mode.el Mon May 10 13:14:21 2010 +0900 @@ -390,7 +390,7 @@ to display an image file as the actual image. You can use `image-mode-as-text' in `auto-mode-alist' when you want -to display an image file as text inititally. +to display an image file as text initially. See commands `image-mode' and `image-minor-mode' for more information on these modes." diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/info.el --- a/lisp/info.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/info.el Mon May 10 13:14:21 2010 +0900 @@ -4295,8 +4295,7 @@ (cond ((> Info-breadcrumbs-depth 0) (let ((ov (make-overlay (point-min) (1+ header-end)))) - (overlay-put ov 'invisible t) - (overlay-put ov 'after-string (Info-breadcrumbs)) + (overlay-put ov 'display (Info-breadcrumbs)) (overlay-put ov 'evaporate t))) ((not (bobp)) ;; Hide the punctuation at the end, too. diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/international/mule.el --- a/lisp/international/mule.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/international/mule.el Mon May 10 13:14:21 2010 +0900 @@ -1625,7 +1625,8 @@ (defcustom auto-coding-alist ;; .exe and .EXE are added to support archive-mode looking at DOS ;; self-extracting exe archives. - (purecopy '(("\\.\\(\ + (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) + '(("\\.\\(\ arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|\ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . no-conversion-multibyte) diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/ldefs-boot.el --- a/lisp/ldefs-boot.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/ldefs-boot.el Mon May 10 13:14:21 2010 +0900 @@ -4037,8 +4037,8 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19383 -;;;;;; 49284)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19405 +;;;;;; 51439)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -5979,7 +5979,7 @@ ;;;*** ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff" -;;;;;; "diff.el" (19383 49279)) +;;;;;; "diff.el" (19419 35832)) ;;; Generated autoloads from diff.el (defvar diff-switches (purecopy "-c") "\ @@ -9886,7 +9886,7 @@ ;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively ;;;;;; file-cache-add-directory-using-locate file-cache-add-directory-using-find ;;;;;; file-cache-add-file file-cache-add-directory-list file-cache-add-directory) -;;;;;; "filecache" "filecache.el" (19383 49279)) +;;;;;; "filecache" "filecache.el" (19409 46567)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -9899,8 +9899,8 @@ (autoload 'file-cache-add-directory-list "filecache" "\ Add DIRECTORY-LIST (a list of directory names) to the file cache. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself. +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself. \(fn DIRECTORY-LIST &optional REGEXP)" t nil) @@ -9923,10 +9923,10 @@ (autoload 'file-cache-add-directory-recursively "filecache" "\ Adds DIR and any subdirectories to the file-cache. -This function does not use any external programs +This function does not use any external programs. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself. +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself. \(fn DIR &optional REGEXP)" t nil) @@ -10044,7 +10044,7 @@ ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (19383 49279)) +;;;;;; (19422 11991)) ;;; Generated autoloads from find-dired.el (defvar find-ls-option (if (eq system-type 'berkeley-unix) (purecopy '("-ls" . "-gilsb")) (purecopy '("-exec ls -ld {} \\;" . "-ld"))) "\ @@ -14285,7 +14285,7 @@ ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp ;;;;;; image-file-name-regexps image-file-name-extensions) "image-file" -;;;;;; "image-file.el" (19383 49279)) +;;;;;; "image-file.el" (19422 11991)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -14347,7 +14347,7 @@ ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (19383 49276)) +;;;;;; image-mode) "image-mode" "image-mode.el" (19412 35030)) ;;; Generated autoloads from image-mode.el (push (cons (purecopy "\\.jpe?g\\'") 'image-mode) auto-mode-alist) (push (cons (purecopy "\\.png\\'") 'image-mode) auto-mode-alist) @@ -14382,7 +14382,7 @@ to display an image file as the actual image. You can use `image-mode-as-text' in `auto-mode-alist' when you want -to display an image file as text inititally. +to display an image file as text initially. See commands `image-mode' and `image-minor-mode' for more information on these modes. @@ -14614,7 +14614,7 @@ ;;;;;; Info-goto-emacs-command-node Info-mode info-finder info-apropos ;;;;;; Info-index Info-directory Info-on-current-buffer info-standalone ;;;;;; info-emacs-manual info info-other-window) "info" "info.el" -;;;;;; (19387 20299)) +;;;;;; (19412 35030)) ;;; Generated autoloads from info.el (autoload 'info-other-window "info" "\ @@ -15400,7 +15400,7 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19383 49284)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19421 38445)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16740,7 +16740,7 @@ ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" -;;;;;; "gnus/message.el" (19383 49284)) +;;;;;; "gnus/message.el" (19409 46567)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -25167,8 +25167,8 @@ ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-mode sql-help -;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (19383 -;;;;;; 49282)) +;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (19412 +;;;;;; 35030)) ;;; Generated autoloads from progmodes/sql.el (autoload 'sql-add-product-keywords "sql" "\ @@ -25286,7 +25286,7 @@ defaults, if set. Additional command line parameters can be stored in the list `sql-oracle-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25312,7 +25312,7 @@ `sql-database' as defaults, if set. Additional command line parameters can be stored in the list `sql-sybase-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25336,7 +25336,7 @@ Interpreter used comes from variable `sql-informix-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25364,7 +25364,7 @@ `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-sqlite-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25392,7 +25392,7 @@ `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-mysql-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25417,7 +25417,7 @@ the variables `sql-user', `sql-password', and `sql-server' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25441,7 +25441,7 @@ Interpreter used comes from variable `sql-ingres-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25467,7 +25467,7 @@ as defaults, if set. Additional command line parameters can be stored in the list `sql-ms-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25493,7 +25493,7 @@ Additional command line parameters can be stored in the list `sql-postgres-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25523,7 +25523,7 @@ uses the variables `sql-user', `sql-password', and `sql-database' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -25547,7 +25547,7 @@ Interpreter used comes from variable `sql-db2-program'. There is not automatic login. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. If you use \\[sql-accumulate-and-indent] to send multiline commands to @@ -25585,7 +25585,7 @@ for this to work). If `sql-password' is an empty string, inl will use an empty password. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. \(Type \\[describe-mode] in the SQL buffer for a list of commands.) @@ -29590,7 +29590,7 @@ ;;;*** -;;;### (autoloads nil "vc-hg" "vc-hg.el" (19403 31656)) +;;;### (autoloads nil "vc-hg" "vc-hg.el" (19405 52797)) ;;; Generated autoloads from vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -31971,8 +31971,8 @@ ;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" ;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" ;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el" -;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19405 -;;;;;; 42 652971)) +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19428 +;;;;;; 55161 909254)) ;;;*** diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/mh-e/ChangeLog --- a/lisp/mh-e/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/mh-e/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-03-22 Juanma Barranquero * mh-scan.el (mh-scan-cmd-note-width): Doc fix. diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/org/ChangeLog --- a/lisp/org/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/org/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-15 Chong Yidong * org-freemind.el (org-freemind-from-org-mode-node) diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/progmodes/js.el --- a/lisp/progmodes/js.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/progmodes/js.el Mon May 10 13:14:21 2010 +0900 @@ -3327,6 +3327,13 @@ comment-start-skip "\\(//+\\|/\\*+\\)\\s *") (let ((c-buffer-is-cc-mode t)) + ;; FIXME: These are normally set by `c-basic-common-init'. Should + ;; we call it instead? (Bug#6071) + (make-local-variable 'paragraph-start) + (make-local-variable 'paragraph-separate) + (make-local-variable 'paragraph-ignore-fill-prefix) + (make-local-variable 'adaptive-fill-mode) + (make-local-variable 'adaptive-fill-regexp) (c-setup-paragraph-variables)) (set (make-local-variable 'syntax-begin-function) diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/progmodes/sql.el --- a/lisp/progmodes/sql.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/progmodes/sql.el Mon May 10 13:14:21 2010 +0900 @@ -419,7 +419,7 @@ If set to nil, then you must use \\[comint-send-input] in order to send current input in the SQLi buffer to the process." :type '(choice (const :tag "Nothing" nil) - (const :tag "The semikolon `;'" semicolon) + (const :tag "The semicolon `;'" semicolon) (const :tag "The string `go' by itself" go)) :version "20.8" :group 'SQL) @@ -450,9 +450,9 @@ "Define interesting points in the SQL buffer for `imenu'. This is used to set `imenu-generic-expression' when SQL mode is -entered. Subsequent changes to sql-imenu-generic-expression will not -affect existing SQL buffers because imenu-generic-expression is a -local variable.") +entered. Subsequent changes to `sql-imenu-generic-expression' will +not affect existing SQL buffers because imenu-generic-expression is +a local variable.") ;; history file @@ -516,7 +516,7 @@ Starts `sql-interactive-mode' after doing some setup. -Under NT, \"sqlplus\" usually starts the sqlplus \"GUI\". In order to +On Windows, \"sqlplus\" usually starts the sqlplus \"GUI\". In order to start the sqlplus console, use \"plus33\" or something similar. You will find the file in your Orant\\bin directory. @@ -542,9 +542,7 @@ :group 'SQL) (defcustom sql-sqlite-options nil - "*List of additional options for `sql-sqlite-program'. -The following list of options is reported to make things work -on Windows: \"-C\" \"-t\" \"-f\" \"-n\"." + "*List of additional options for `sql-sqlite-program'." :type '(repeat string) :version "20.8" :group 'SQL) @@ -727,7 +725,7 @@ (defvar sql-buffer nil "Current SQLi buffer. -The global value of sql-buffer is the name of the latest SQLi buffer +The global value of `sql-buffer' is the name of the latest SQLi buffer created. Any SQL buffer created will make a local copy of this value. See `sql-interactive-mode' for more on multiple sessions. If you want to change the SQLi buffer a SQL mode sends its SQL strings to, change @@ -992,8 +990,8 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-ansi-font-lock-keywords. You may want to -add functions and PL/SQL keywords.") +you define your own `sql-mode-ansi-font-lock-keywords'. You may want +to add functions and PL/SQL keywords.") (defvar sql-mode-oracle-font-lock-keywords (let ((oracle-functions (sql-keywords-re @@ -1208,7 +1206,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-oracle-font-lock-keywords. You may want +you define your own `sql-mode-oracle-font-lock-keywords'. You may want to add functions and PL/SQL keywords.") (defvar sql-mode-postgres-font-lock-keywords @@ -1296,7 +1294,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-postgres-font-lock-keywords.") +you define your own `sql-mode-postgres-font-lock-keywords'.") (defvar sql-mode-linter-font-lock-keywords (let ((linter-keywords (sql-keywords-re @@ -1482,7 +1480,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-ms-font-lock-keywords.") +you define your own `sql-mode-ms-font-lock-keywords'.") (defvar sql-mode-sybase-font-lock-keywords nil "Sybase SQL keywords used by font-lock. @@ -1490,7 +1488,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-sybase-font-lock-keywords.") +you define your own `sql-mode-sybase-font-lock-keywords'.") (defvar sql-mode-informix-font-lock-keywords nil "Informix SQL keywords used by font-lock. @@ -1498,7 +1496,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-informix-font-lock-keywords.") +you define your own `sql-mode-informix-font-lock-keywords'.") (defvar sql-mode-interbase-font-lock-keywords nil "Interbase SQL keywords used by font-lock. @@ -1506,7 +1504,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-interbase-font-lock-keywords.") +you define your own `sql-mode-interbase-font-lock-keywords'.") (defvar sql-mode-ingres-font-lock-keywords nil "Ingres SQL keywords used by font-lock. @@ -1514,7 +1512,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-interbase-font-lock-keywords.") +you define your own `sql-mode-interbase-font-lock-keywords'.") (defvar sql-mode-solid-font-lock-keywords nil "Solid SQL keywords used by font-lock. @@ -1522,7 +1520,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-solid-font-lock-keywords.") +you define your own `sql-mode-solid-font-lock-keywords'.") (defvar sql-mode-mysql-font-lock-keywords (let ((mysql-funcs (sql-keywords-re @@ -1599,7 +1597,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-mysql-font-lock-keywords.") +you define your own `sql-mode-mysql-font-lock-keywords'.") (defvar sql-mode-sqlite-font-lock-keywords nil "SQLite SQL keywords used by font-lock. @@ -1607,7 +1605,7 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-sqlite-font-lock-keywords.") +you define your own `sql-mode-sqlite-font-lock-keywords'.") (defvar sql-mode-db2-font-lock-keywords nil "DB2 SQL keywords used by font-lock. @@ -1615,14 +1613,14 @@ This variable is used by `sql-mode' and `sql-interactive-mode'. The regular expressions are created during compilation by calling the function `regexp-opt'. Therefore, take a look at the source before -you define your own sql-mode-db2-font-lock-keywords.") +you define your own `sql-mode-db2-font-lock-keywords'.") (defvar sql-mode-font-lock-keywords nil "SQL keywords used by font-lock. Setting this variable directly no longer has any affect. Use `sql-product' and `sql-add-product-keywords' to control the -highlighting rules in sql-mode.") +highlighting rules in SQL mode.") @@ -1631,7 +1629,7 @@ (defun sql-product-feature (feature &optional product) "Lookup `feature' needed to support the current SQL product. -See \[sql-product-alist] for a list of products and supported features." +See `sql-product-alist' for a list of products and supported features." (plist-get (cdr (assoc (or product sql-product) sql-product-alist)) @@ -1720,8 +1718,7 @@ ;;; Functions to switch highlighting (defun sql-highlight-product () - "Turns on the appropriate font highlighting for the SQL product -selected." + "Turn on the appropriate font highlighting for the SQL product selected." (when (derived-mode-p 'sql-mode) ;; Setup font-lock (sql-product-font-lock nil t) @@ -1730,8 +1727,7 @@ (setq mode-name (concat "SQL[" (prin1-to-string sql-product) "]")))) (defun sql-set-product (product) - "Set `sql-product' to product and enable appropriate -highlighting." + "Set `sql-product' to product and enable appropriate highlighting." (interactive (list (completing-read "Enter SQL product: " (mapcar (lambda (info) (symbol-name (car info))) @@ -1752,7 +1748,7 @@ (if (not (fboundp 'comint-line-beginning-position)) ;; comint-line-beginning-position is defined in Emacs 21 (defun comint-line-beginning-position () - "Returns the buffer position of the beginning of the line, after any prompt. + "Return the buffer position of the beginning of the line, after any prompt. The prompt is assumed to be any text at the beginning of the line matching the regular expression `comint-prompt-regexp', a buffer local variable." (save-excursion (comint-bol nil) (point)))) @@ -1974,7 +1970,7 @@ sql-database))) (defun sql-rename-buffer () - "Renames a SQLi buffer." + "Rename a SQLi buffer." (interactive) (rename-buffer (format "*SQL: %s*" sql-alternate-buffer-name) t)) @@ -2007,8 +2003,8 @@ (insert column) (message "%s" column)))) -;; On NT, SQL*Plus for Oracle turns on full buffering for stdout if it -;; is not attached to a character device; therefore placeholder +;; On Windows, SQL*Plus for Oracle turns on full buffering for stdout +;; if it is not attached to a character device; therefore placeholder ;; replacement by SQL*Plus is fully buffered. The workaround lets ;; Emacs query for the placeholders. @@ -2017,8 +2013,9 @@ (defun sql-query-placeholders-and-send (proc string) "Send to PROC input STRING, maybe replacing placeholders. -Placeholders are words starting with and ampersand like &this. -This function is used for `comint-input-sender' if using `sql-oracle' on NT." +Placeholders are words starting with an ampersand like &this. +This function is used for `comint-input-sender' if using +`sql-oracle' on Windows." (while (string-match "&\\(\\sw+\\)" string) (setq string (replace-match (read-from-minibuffer @@ -2104,7 +2101,7 @@ "Toggle `sql-pop-to-buffer-after-send-region'. If given the optional parameter VALUE, sets -sql-toggle-pop-to-buffer-after-send-region to VALUE." +`sql-toggle-pop-to-buffer-after-send-region' to VALUE." (interactive "P") (if value (setq sql-pop-to-buffer-after-send-region value) @@ -2187,8 +2184,8 @@ "Major mode to use a SQL interpreter interactively. Do not call this function by yourself. The environment must be -initialized by an entry function specific for the SQL interpreter. See -`sql-help' for a list of available entry functions. +initialized by an entry function specific for the SQL interpreter. +See `sql-help' for a list of available entry functions. \\[comint-send-input] after the end of the process' output sends the text from the end of process to the end of the current line. @@ -2360,7 +2357,7 @@ defaults, if set. Additional command line parameters can be stored in the list `sql-oracle-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2392,7 +2389,7 @@ (nconc (list parameter) sql-oracle-options) sql-oracle-options)) (set-buffer (apply 'make-comint "SQL" sql-oracle-program nil parameter)) - ;; SQL*Plus is buffered on WindowsNT; this handles &placeholders. + ;; SQL*Plus is buffered on Windows; this handles &placeholders. (if (eq window-system 'w32) (setq comint-input-sender 'sql-query-placeholders-and-send)))) @@ -2411,7 +2408,7 @@ `sql-database' as defaults, if set. Additional command line parameters can be stored in the list `sql-sybase-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2455,7 +2452,7 @@ Interpreter used comes from variable `sql-informix-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2494,7 +2491,7 @@ `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-sqlite-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2538,7 +2535,7 @@ `sql-server' as defaults, if set. Additional command line parameters can be stored in the list `sql-mysql-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2585,7 +2582,7 @@ the variables `sql-user', `sql-password', and `sql-server' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2627,7 +2624,7 @@ Interpreter used comes from variable `sql-ingres-program'. Login uses the variable `sql-database' as default, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2664,7 +2661,7 @@ as defaults, if set. Additional command line parameters can be stored in the list `sql-ms-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2717,7 +2714,7 @@ Additional command line parameters can be stored in the list `sql-postgres-options'. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2768,7 +2765,7 @@ uses the variables `sql-user', `sql-password', and `sql-database' as defaults, if set. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. To specify a coding system for converting non-ASCII characters @@ -2810,7 +2807,7 @@ Interpreter used comes from variable `sql-db2-program'. There is not automatic login. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. If you use \\[sql-accumulate-and-indent] to send multiline commands to @@ -2859,7 +2856,7 @@ for this to work). If `sql-password' is an empty string, inl will use an empty password. -The buffer is put in sql-interactive-mode, giving commands for sending +The buffer is put in SQL interactive mode, giving commands for sending input. See `sql-interactive-mode'. \(Type \\[describe-mode] in the SQL buffer for a list of commands.)" diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/url/ChangeLog --- a/lisp/url/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/url/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-23 Chong Yidong * url-util.el: Require url-vars (Bug#5459). diff -r 39d09d6f8dbc -r ac3917b1de28 lisp/version.el --- a/lisp/version.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/version.el Mon May 10 13:14:21 2010 +0900 @@ -32,7 +32,7 @@ (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") -(defconst emacs-version "23.1.96" "\ +(defconst emacs-version "23.2.50" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\ diff -r 39d09d6f8dbc -r ac3917b1de28 lwlib/ChangeLog --- a/lwlib/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/lwlib/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2009-10-19 Dan Nicolaescu * xlwmenu.c: diff -r 39d09d6f8dbc -r ac3917b1de28 msdos/ChangeLog --- a/msdos/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/msdos/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-02-19 Eli Zaretskii * INSTALL: Remove a CVS-specific note. Update for latest versions diff -r 39d09d6f8dbc -r ac3917b1de28 nextstep/ChangeLog --- a/nextstep/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/nextstep/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-11 Glenn Morris * Cocoa/Emacs.base/Contents/Info.plist: diff -r 39d09d6f8dbc -r ac3917b1de28 nextstep/Cocoa/Emacs.base/Contents/Info.plist --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist Fri Apr 23 21:29:11 2010 +0900 +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist Mon May 10 13:14:21 2010 +0900 @@ -553,7 +553,7 @@ CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 23.1.96 Copyright (C) 2010 Free Software Foundation, Inc. + Emacs 23.2.50 Copyright (C) 2010 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ APPL CFBundleShortVersionString - 23.1.96 + 23.2.50 CFBundleSignature EMAx diff -r 39d09d6f8dbc -r ac3917b1de28 nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings Fri Apr 23 21:29:11 2010 +0900 +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings Mon May 10 13:14:21 2010 +0900 @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 23.1.96"; -CFBundleGetInfoString = "Emacs version 23.1.96, NS Windowing"; +CFBundleShortVersionString = "Version 23.2.50"; +CFBundleGetInfoString = "Emacs version 23.2.50, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc."; diff -r 39d09d6f8dbc -r ac3917b1de28 nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop Fri Apr 23 21:29:11 2010 +0900 +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop Mon May 10 13:14:21 2010 +0900 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=23.1.96 +Version=23.2.50 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X diff -r 39d09d6f8dbc -r ac3917b1de28 nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist Fri Apr 23 21:29:11 2010 +0900 +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist Mon May 10 13:14:21 2010 +0900 @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "23.1.96"; + ApplicationRelease = "23.2.50"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2010 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 23.1.96, NS Windowing"; + FullVersionID = "Emacs 23.2.50, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff -r 39d09d6f8dbc -r ac3917b1de28 nt/ChangeLog --- a/nt/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/nt/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-01-13 Martin Rudalics * emacsclient.rc: Fix format of "LegalCopyright" value. diff -r 39d09d6f8dbc -r ac3917b1de28 nt/emacs.rc --- a/nt/emacs.rc Fri Apr 23 21:29:11 2010 +0900 +++ b/nt/emacs.rc Mon May 10 13:14:21 2010 +0900 @@ -7,8 +7,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,1,96,0 - PRODUCTVERSION 23,1,96,0 + FILEVERSION 23,2,50,0 + PRODUCTVERSION 23,2,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 1, 96, 0\0" + VALUE "FileVersion", "23, 2, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "23, 1, 96, 0\0" + VALUE "ProductVersion", "23, 2, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff -r 39d09d6f8dbc -r ac3917b1de28 nt/emacsclient.rc --- a/nt/emacsclient.rc Fri Apr 23 21:29:11 2010 +0900 +++ b/nt/emacsclient.rc Mon May 10 13:14:21 2010 +0900 @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,1,96,0 - PRODUCTVERSION 23,1,96,0 + FILEVERSION 23,2,50,0 + PRODUCTVERSION 23,2,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 1, 96, 0\0" + VALUE "FileVersion", "23, 2, 50, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "23, 1, 96, 0\0" + VALUE "ProductVersion", "23, 2, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff -r 39d09d6f8dbc -r ac3917b1de28 oldXMenu/ChangeLog --- a/oldXMenu/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/oldXMenu/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2009-06-21 Chong Yidong * Branch for 23.1. diff -r 39d09d6f8dbc -r ac3917b1de28 src/ChangeLog --- a/src/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/src/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,16 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + +2010-04-30 Andreas Schwab + + * composite.c (autocmp_chars): Save point as marker before calling + auto-composition-function (Bug#5984). + + * lisp.h (restore_point_unwind): Add prototype. + + * fileio.c (restore_point_unwind): Remove static attribute. + 2010-04-23 Kenichi Handa * ftfont.c (M17N_FLT_USE_NEW_FEATURE): Define it if we can use the diff -r 39d09d6f8dbc -r ac3917b1de28 src/composite.c --- a/src/composite.c Fri Apr 23 21:29:11 2010 +0900 +++ b/src/composite.c Mon May 10 13:14:21 2010 +0900 @@ -990,6 +990,14 @@ { Lisp_Object args[6]; + /* Save point as marker before calling out to lisp. */ + if (NILP (string)) + { + Lisp_Object m = Fmake_marker (); + set_marker_both (m, Qnil, pt, pt_byte); + record_unwind_protect (restore_point_unwind, m); + } + args[0] = Vauto_composition_function; args[1] = AREF (elt, 2); args[2] = pos; @@ -998,8 +1006,10 @@ args[5] = string; gstring = safe_call (6, args); } - if (NILP (string)) - TEMP_SET_PT_BOTH (pt, pt_byte); + else if (NILP (string)) + { + TEMP_SET_PT_BOTH (pt, pt_byte); + } return unbind_to (count, gstring); } } diff -r 39d09d6f8dbc -r ac3917b1de28 src/fileio.c --- a/src/fileio.c Fri Apr 23 21:29:11 2010 +0900 +++ b/src/fileio.c Mon May 10 13:14:21 2010 +0900 @@ -302,7 +302,7 @@ /* Restore point, having saved it as a marker. */ -static Lisp_Object +Lisp_Object restore_point_unwind (location) Lisp_Object location; { diff -r 39d09d6f8dbc -r ac3917b1de28 src/lisp.h --- a/src/lisp.h Fri Apr 23 21:29:11 2010 +0900 +++ b/src/lisp.h Mon May 10 13:14:21 2010 +0900 @@ -3018,6 +3018,7 @@ EXFUN (Ffile_executable_p, 1); EXFUN (Fread_file_name, 6); extern Lisp_Object close_file_unwind P_ ((Lisp_Object)); +extern Lisp_Object restore_point_unwind P_ ((Lisp_Object)); extern void report_file_error P_ ((const char *, Lisp_Object)) NO_RETURN; extern int internal_delete_file P_ ((Lisp_Object)); extern void syms_of_fileio P_ ((void)); diff -r 39d09d6f8dbc -r ac3917b1de28 test/ChangeLog --- a/test/ChangeLog Fri Apr 23 21:29:11 2010 +0900 +++ b/test/ChangeLog Mon May 10 13:14:21 2010 +0900 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong + + * Version 23.2 released. + 2010-03-29 Chong Yidong * cedet/semantic-ia-utest.el