Mercurial > emacs
changeset 108386:af5739d1d4d4
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 09 May 2010 22:52:44 +0000 |
| parents | 575a2fcd23b7 (current diff) addaf0e91db3 (diff) |
| children | fd328ff8d24c |
| files | |
| diffstat | 117 files changed, 2069 insertions(+), 834 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,30 @@ +2010-05-08 Štěpán Němec <stepnem@gmail.com> (tiny change) + + * INSTALL: Fix typos. + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * configure.in: Add check for buggy version of GCC (Bug#6031). + +2010-05-08 Glenn Morris <rgm@gnu.org> + + * configure.in (HAVE_LIBNCURSES): New local variable. + (TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables, + replacing cpp in src/s/*.h and src/Makefile.in. + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + +2010-05-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * configure.in: Add tests for `isnan' and `copysign'. + +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + * config.bat: Allow for 2 leading `#'s in comments in + src/Makefile.in. + 2010-05-07 Glenn Morris <rgm@gnu.org> * configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
--- a/INSTALL Fri May 07 07:47:33 2010 +0000 +++ b/INSTALL Sun May 09 22:52:44 2010 +0000 @@ -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:
--- a/admin/CPP-DEFINES Fri May 07 07:47:33 2010 +0000 +++ b/admin/CPP-DEFINES Sun May 09 22:52:44 2010 +0000 @@ -216,7 +216,6 @@ KERNEL_FILE LDAV_SYMBOL LIBS_SYSTEM -LIBS_TERMCAP LIBXMU LINKER LINUX_VERSION_CODE @@ -279,10 +278,8 @@ TAB3 TABDLY TERM -TERMINFO TEXT_START THIS_IS_CONFIGURE -THIS_IS_MAKEFILE TIME_WITH_SYS_TIME TIOCSIGSEND TM_IN_SYS_TIME
--- a/admin/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/admin/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-04-01 Eli Zaretskii <eliz@gnu.org> * CPP-DEFINES (__DJGPP__, __GO32__): Remove, no longer used.
--- a/config.bat Fri May 07 07:47:33 2010 +0000 +++ b/config.bat Sun May 09 22:52:44 2010 +0000 @@ -197,7 +197,7 @@ rem Create "makefile" from "makefile.in". rm -f Makefile junk.c -sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c +sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c If "%DJGPP_VER%" == "1" Goto mfV1 gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile goto mfDone
--- a/configure Fri May 07 07:47:33 2010 +0000 +++ b/configure Sun May 09 22:52:44 2010 +0000 @@ -761,6 +761,8 @@ GETLOADAVG_LIBS GETOPT_H GETOPTOBJS +LIBS_TERMCAP +TERMCAP_OBJ LIBHESIOD LIBRESOLV COM_ERRLIB @@ -17634,6 +17636,8 @@ + + for ac_func in gethostname getdomainname dup2 \ rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime setsid \ @@ -17643,7 +17647,7 @@ sendto recvfrom getsockopt setsockopt getsockname getpeername \ gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \ memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign \ -cfmakeraw cfsetspeed +cfmakeraw cfsetspeed isnan copysign do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -21397,7 +21401,7 @@ # That is because we have not set up to link ncurses in lib-src. # It's better to believe a function is not available # than to expect to find it in ncurses. -# Also we need tputs and frieds to be able to build at all. +# Also we need tputs and friends to be able to build at all. have_tputs_et_al=true { $as_echo "$as_me:$LINENO: checking for library containing tputs" >&5 $as_echo_n "checking for library containing tputs... " >&6; } @@ -21503,9 +21507,137 @@ #define HAVE_LIBNCURSES 1 _ACEOF +## FIXME This was the cpp logic, but I am not sure it is right. +## The above test has not necessarily found libncurses. +HAVE_LIBNCURSES=yes + +## Use terminfo instead of termcap? +## Note only system files NOT using terminfo are: +## bsd-common, freebsd < 40000, ms-w32, msdos, netbsd, and +## darwin|gnu without ncurses. +TERMINFO=no +LIBS_TERMCAP= +case "$opsys" in + ## cygwin: Fewer environment variables to go wrong, more terminal types. + ## hpux10-20: Use the system provided termcap(3) library. + ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this + ## is necessary. Otherwise Emacs dumps core when run -nw. + aix4-2|cygwin|hpux*|irix6-5|openbsd|usg5-4|sol2*|unixware) TERMINFO=yes ;; + + ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. + ## The ncurses library has been moved out of the System framework in + ## Mac OS X 10.2. So if configure detects it, set the command-line + ## option to use it. + darwin|gnu*) + ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.) + if test "x$HAVE_LIBNCURSES" = "xyes"; then + TERMINFO=yes + LIBS_TERMCAP="-lncurses" + fi + ;; + + freebsd) + { $as_echo "$as_me:$LINENO: checking whether FreeBSD is new enough to use terminfo" >&5 +$as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; } + if test "${emacs_cv_freebsd_terminfo+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <osreldate.h> +int +main () +{ +#if __FreeBSD_version < 400000 +fail; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + emacs_cv_freebsd_terminfo=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + emacs_cv_freebsd_terminfo=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + + { $as_echo "$as_me:$LINENO: result: $emacs_cv_freebsd_terminfo" >&5 +$as_echo "$emacs_cv_freebsd_terminfo" >&6; } + + if test $emacs_cv_freebsd_terminfo = yes; then + TERMINFO=yes + LIBS_TERMCAP="-lncurses" + else + LIBS_TERMCAP="-ltermcap" + fi + ;; + +esac + +case "$opsys" in + ## hpux: Make sure we get select from libc rather than from libcurses + ## because libcurses on HPUX 10.10 has a broken version of select. + ## We used to use -lc -lcurses, but this may be cleaner. + hpux*|netbsd) LIBS_TERMCAP="-ltermcap" ;; + + openbsd) LIBS_TERMCAP="-lncurses" ;; + + ## Must use system termcap, if we use any termcap. It does special things. + sol2*) test "$TERMINFO" != yes && LIBS_TERMCAP="-ltermcap" ;; +esac + +TERMCAP_OBJ=tparam.o +if test $TERMINFO = yes; then + +cat >>confdefs.h <<\_ACEOF +#define TERMINFO 1 +_ACEOF + + + ## Default used to be -ltermcap. Add a case above if need something else. + test "x$LIBS_TERMCAP" = "x" && LIBS_TERMCAP="-lcurses" + + TERMCAP_OBJ=terminfo.o +fi + + + # Do we have res_init, for detecting changes in /etc/resolv.conf? - resolv=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -26077,6 +26209,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/'`
--- a/configure.in Fri May 07 07:47:33 2010 +0000 +++ b/configure.in Sun May 09 22:52:44 2010 +0000 @@ -1094,7 +1094,7 @@ AC_SUBST(LIB_MATH) AC_SUBST(START_FILES) -dnl This function defintion taken from Gnome 2.0 +dnl This function definition taken from Gnome 2.0 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page dnl also defines GSTUFF_PKG_ERRORS on error @@ -2491,7 +2491,7 @@ sendto recvfrom getsockopt setsockopt getsockname getpeername \ gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \ memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign \ -cfmakeraw cfsetspeed) +cfmakeraw cfsetspeed isnan copysign) AC_CHECK_HEADERS(sys/un.h) @@ -2527,7 +2527,7 @@ # That is because we have not set up to link ncurses in lib-src. # It's better to believe a function is not available # than to expect to find it in ncurses. -# Also we need tputs and frieds to be able to build at all. +# Also we need tputs and friends to be able to build at all. have_tputs_et_al=true AC_SEARCH_LIBS(tputs, [ncurses terminfo termcap], , have_tputs_et_al=false) if test "$have_tputs_et_al" != true; then @@ -2538,9 +2538,82 @@ # Must define this when any termcap library is found. AC_DEFINE(HAVE_LIBNCURSES, 1, [Define to 1 if you have the `ncurses' library (-lncurses).]) +## FIXME This was the cpp logic, but I am not sure it is right. +## The above test has not necessarily found libncurses. +HAVE_LIBNCURSES=yes + +## Use terminfo instead of termcap? +## Note only system files NOT using terminfo are: +## bsd-common, freebsd < 40000, ms-w32, msdos, netbsd, and +## darwin|gnu without ncurses. +TERMINFO=no +LIBS_TERMCAP= +case "$opsys" in + ## cygwin: Fewer environment variables to go wrong, more terminal types. + ## hpux10-20: Use the system provided termcap(3) library. + ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this + ## is necessary. Otherwise Emacs dumps core when run -nw. + aix4-2|cygwin|hpux*|irix6-5|openbsd|usg5-4|sol2*|unixware) TERMINFO=yes ;; + + ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. + ## The ncurses library has been moved out of the System framework in + ## Mac OS X 10.2. So if configure detects it, set the command-line + ## option to use it. + darwin|gnu*) + ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.) + if test "x$HAVE_LIBNCURSES" = "xyes"; then + TERMINFO=yes + LIBS_TERMCAP="-lncurses" + fi + ;; + + freebsd) + AC_MSG_CHECKING([whether FreeBSD is new enough to use terminfo]) + AC_CACHE_VAL(emacs_cv_freebsd_terminfo, + [AC_TRY_LINK([#include <osreldate.h>], +[#if __FreeBSD_version < 400000 +fail; +#endif +], emacs_cv_freebsd_terminfo=yes, emacs_cv_freebsd_terminfo=no)]) + + AC_MSG_RESULT($emacs_cv_freebsd_terminfo) + + if test $emacs_cv_freebsd_terminfo = yes; then + TERMINFO=yes + LIBS_TERMCAP="-lncurses" + else + LIBS_TERMCAP="-ltermcap" + fi + ;; + +esac + +case "$opsys" in + ## hpux: Make sure we get select from libc rather than from libcurses + ## because libcurses on HPUX 10.10 has a broken version of select. + ## We used to use -lc -lcurses, but this may be cleaner. + hpux*|netbsd) LIBS_TERMCAP="-ltermcap" ;; + + openbsd) LIBS_TERMCAP="-lncurses" ;; + + ## Must use system termcap, if we use any termcap. It does special things. + sol2*) test "$TERMINFO" != yes && LIBS_TERMCAP="-ltermcap" ;; +esac + +TERMCAP_OBJ=tparam.o +if test $TERMINFO = yes; then + AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.]) + + ## Default used to be -ltermcap. Add a case above if need something else. + test "x$LIBS_TERMCAP" = "x" && LIBS_TERMCAP="-lcurses" + + TERMCAP_OBJ=terminfo.o +fi +AC_SUBST(LIBS_TERMCAP) +AC_SUBST(TERMCAP_OBJ) + # Do we have res_init, for detecting changes in /etc/resolv.conf? - resolv=no AC_TRY_LINK([#include <netinet/in.h> #include <arpa/nameser.h> @@ -2850,6 +2923,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/'`]
--- a/doc/emacs/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/doc/emacs/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,28 @@ +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * building.texi (GDB Graphical Interface): Remove misleading comparison + to an IDE (Bug#6128). + +2010-05-08 Štěpán Němec <stepnem@gmail.com> (tiny change) + + * programs.texi (Man Page): + * misc.texi (Invoking emacsclient): + * mini.texi (Repetition): + * mark.texi (Setting Mark): Fix typos. + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * misc.texi (Printing): Document htmlfontify-buffer. + +2010-05-08 Glenn Morris <rgm@gnu.org> + + * calendar.texi (Displaying the Diary, Format of Diary File): + Fix external cross-references for TeX format output. + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-02 Jan Djärv <jan.h.d@swipnet.se> * cmdargs.texi (Initial Options): Mention --chdir.
--- a/doc/emacs/building.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/emacs/building.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/emacs/calendar.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/emacs/calendar.texi Sun May 09 22:52:44 2010 +0000 @@ -1082,7 +1082,7 @@ shown either in the buffer or in the mode line, depending on the display method you choose @iftex -(@pxref{Diary Display,, emacs-xtra}). +(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}). @end iftex @ifnottex (@pxref{Diary Display}). @@ -1186,7 +1186,7 @@ This entry will have a different appearance if you use the simple diary display @iftex -(@pxref{Diary Display,, emacs-xtra}). +(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}). @end iftex @ifnottex (@pxref{Diary Display}).
--- a/doc/emacs/mark.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/emacs/mark.texi Sun May 09 22:52:44 2010 +0000 @@ -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.
--- a/doc/emacs/mini.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/emacs/mini.texi Sun May 09 22:52:44 2010 +0000 @@ -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},
--- a/doc/emacs/misc.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/emacs/misc.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/emacs/programs.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/emacs/programs.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispintro/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispintro/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2. @@ -13,8 +17,7 @@ 2009-12-09 David Robinow <drobinow@gmail.com> (tiny change) - * makefile.w32-in: Use parenthesis for macros for nmake - compatibility. + * makefile.w32-in: Use parenthesis for macros for nmake compatibility. 2009-12-03 Glenn Morris <rgm@gnu.org> @@ -72,7 +75,7 @@ 2009-02-22 Karl Berry <karl@gnu.org> - * emacs-lisp-intro.texi (Default Configuration): fix dup word "by by". + * emacs-lisp-intro.texi (Default Configuration): Fix dup word "by by". 2009-02-20 Juanma Barranquero <lekktu@gmail.com>
--- a/doc/lispref/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,38 @@ +2010-05-08 Štěpán Němec <stepnem@gmail.com> (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-05-08 Chong Yidong <cyd@stupidchicken.com> + + * 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-05-08 Eli Zaretskii <eliz@gnu.org> + + * nonascii.texi (Character Properties): + Document unicode-category-table. Add an index entry for Unicode + general category. + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-04-20 Juanma Barranquero <lekktu@gmail.com> * locals.texi (Standard Buffer-Local Variables):
--- a/doc/lispref/commands.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/commands.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispref/edebug.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/edebug.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispref/elisp.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/elisp.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispref/functions.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/functions.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispref/keymaps.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/keymaps.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispref/loading.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/loading.texi Sun May 09 22:52:44 2010 +0000 @@ -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.
--- a/doc/lispref/locals.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/locals.texi Sun May 09 22:52:44 2010 +0000 @@ -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}.
--- a/doc/lispref/maps.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/maps.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispref/minibuf.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/minibuf.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/lispref/nonascii.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/nonascii.texi Sun May 09 22:52:44 2010 +0000 @@ -375,6 +375,7 @@ value is a string consisting of upper-case Latin letters A to Z, digits, spaces, and hyphen @samp{-} characters. +@cindex unicode general category @item general-category This property corresponds to the Unicode @code{General_Category} property. The value is a symbol whose name is a 2-letter abbreviation @@ -501,13 +502,18 @@ @var{propname} for the character @var{char}. @end defun -@defvar char-script-table +@defvar unicode-category-table The value of this variable is a char-table (@pxref{Char-Tables}) that -specifies, for each character, a symbol whose name is the script to -which the character belongs, according to the Unicode Standard -classification of the Unicode code space into script-specific blocks. -This char-table has a single extra slot whose value is the list of all -script symbols. +specifies, for each character, its Unicode @code{General_Category} +property as a symbol. +@end defvar + +@defvar char-script-table +The value of this variable is a char-table that specifies, for each +character, a symbol whose name is the script to which the character +belongs, according to the Unicode Standard classification of the +Unicode code space into script-specific blocks. This char-table has a +single extra slot whose value is the list of all script symbols. @end defvar @defvar char-width-table
--- a/doc/lispref/tips.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/tips.texi Sun May 09 22:52:44 2010 +0000 @@ -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},
--- a/doc/lispref/windows.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/lispref/windows.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/doc/man/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/doc/man/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,11 +1,15 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2. 2010-01-09 Chong Yidong <cyd@stupidchicken.com> - * emacs.1: Copyedits. Update options -Q, -mm and --daemon. Remove - deprecated --unibyte option. + * emacs.1: Copyedits. Update options -Q, -mm and --daemon. + Remove deprecated --unibyte option. 2009-06-21 Chong Yidong <cyd@stupidchicken.com>
--- a/doc/misc/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/doc/misc/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,11 +1,28 @@ +2010-05-08 Štěpán Němec <stepnem@gmail.com> (tiny change) + + * url.texi (HTTP language/coding, Customization): + * message.texi (Header Commands, Responses): + * cl.texi (Argument Lists): Fix typos. + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * ede.texi (EDE Mode): Refer to init file rather than `.emacs'. + Note that Development menu is always available. + (Creating a project): Fix terminology. + (Add/Remove files): Fix typo. + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-01 Daniel E. Doherty <ddoherty03@gmail.com> (tiny change) * calc.texi (Tutorial): Use "^{\prime}" to indicate primes. 2010-05-01 Michael Albinus <michael.albinus@gmx.de> - * tramp.texi (Inline methods, Default Method): Mention - `tramp-inline-compress-start-size'. + * tramp.texi (Inline methods, Default Method): + Mention `tramp-inline-compress-start-size'. 2010-04-18 Teodor Zlatanov <tzz@lifelogs.com>
--- a/doc/misc/cl.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/misc/cl.texi Sun May 09 22:52:44 2010 +0000 @@ -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.
--- a/doc/misc/ede.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/misc/ede.texi Sun May 09 22:52:44 2010 +0000 @@ -129,27 +129,26 @@ @node EDE Mode, Creating a project, EDE Project Concepts, top @chapter @ede{} Mode -@ede{} is implemented as a minor-mode, which augments other modes such +@ede{} is implemented as a minor mode, which augments other modes such as C mode, and Texinfo mode. You can enable @ede{} for all buffers by running the command @code{global-ede-mode}, or by putting this in your -@file{~/.emacs} file: +init file: @example (global-ede-mode t) @end example -When @ede{} is active for a given buffer, the menu item -``Development'' appears. This menu provides several menu items for -high-level @ede{} commands. These menu items, and their corresponding -keybindings, are independent of the type of project you are actually -working on. +Activating @ede{} adds a menu named @samp{Development} to the menu +bar. This menu provides several menu items for high-level @ede{} +commands. These menu items, and their corresponding keybindings, are +independent of the type of project you are actually working on. @node Creating a project, Modifying your project, EDE Mode, top @chapter Creating a project To create a new project, first visit a file that you want to include -in that project. If you have a hierarchy of directories, choose a -file in the topmost directory first. From this buffer, type @kbd{M-x +in that project. If you have a hierarchy of directories, first visit +a file in the topmost directory. From this buffer, type @kbd{M-x ede-new}, or click on the @samp{Create Project} item in the @samp{Development} menu. @@ -220,8 +219,8 @@ @node Add/Remove target, Add/Remove files, Modifying your project, Modifying your project @section Add/Remove target -To create a new target, type @kbd{C-c . t} (@code{M-x ede-new-target}) -or use the @samp{Add Target} menu item in the @samp{Project Options} +To create a new target, type @kbd{C-c . t} (@code{ede-new-target}) or +use the @samp{Add Target} menu item in the @samp{Project Options} submenu. This prompts for a target name, and adds the current buffer to that target. @@ -237,7 +236,7 @@ @section Add/Remove files To add the current file to an existing target, type @kbd{C-c . a} -(@code{ede-add-file}), or or use the @samp{Add File} menu item in the +(@code{ede-add-file}), or use the @samp{Add File} menu item in the @samp{Target Options} submenu. You can add a file to more than one target; this is OK.
--- a/doc/misc/message.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/misc/message.texi Sun May 09 22:52:44 2010 +0000 @@ -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:
--- a/doc/misc/url.texi Fri May 07 07:47:33 2010 +0000 +++ b/doc/misc/url.texi Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/etc/AUTHORS Fri May 07 07:47:33 2010 +0000 +++ b/etc/AUTHORS Sun May 09 22:52:44 2010 +0000 @@ -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 startup.el xfns.c misc.texi image.c - compile.el custom.texi text.texi and 633 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 @@ -1002,7 +1002,7 @@ Florian Weimer: changed message.el gnus.el coding.c gnus-sum.el gnus.texi mm-decode.el mm-util.el -Francesc Rocher: changed startup.el MORE.STUFF cus-start.el gnus.el +Francesc Rocher: changed MORE.STUFF startup.el cus-start.el gnus.el gnus.png gnus.svg macterm.c splash.png splash.svg splash8.xpm w32term.c xdisp.c xterm.c @@ -1131,9 +1131,9 @@ Glenn Morris: wrote check-declare.el and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in - cal-islam.el bytecomp.el calendar.texi cal-bahai.el files.el appt.el - cal-china.el emacs.texi rmailsum.el simple.el startup.el - and 975 other files + cal-islam.el bytecomp.el calendar.texi cal-bahai.el emacs.texi files.el + appt.el cal-china.el rmailsum.el simple.el startup.el + and 976 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -1346,7 +1346,7 @@ and changed gtkutil.c xterm.c xfns.c configure.in xterm.h xmenu.c x-win.el Makefile.in gtkutil.h keyboard.c frame.c frames.texi config.in emacs.c xselect.c xresources.texi startup.el alloc.c cus-start.el - xlwmenu.c process.c and 203 other files + xlwmenu.c frame.h and 203 other files Jan Moringen: co-wrote cpp.el @@ -1635,7 +1635,7 @@ Juanma Barranquero: changed makefile.w32-in subr.el files.el faces.el bs.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c desktop.el buffer.c mule-cmds.el ido.el window.c xdisp.c allout.el - keyboard.c replace.el eval.c and 930 other files + keyboard.c replace.el eval.c and 932 other files Juergen Hoetzel: changed url-handlers.el @@ -1657,7 +1657,7 @@ and changed info.el isearch.el simple.el replace.el dired-aux.el startup.el grep.el compile.el dired.el files.el faces.el display.texi menu-bar.el descr-text.el cus-edit.el bindings.el man.el image-mode.el - ispell.el text.texi dired-x.el and 280 other files + ispell.el text.texi dired-x.el and 281 other files Justin Bogner: changed fortune.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 @@ -1969,7 +1969,7 @@ Magnus Henoch: changed url-http.el ispell.el url.el dbusbind.c dns.el url-gw.el url-parse.el url-proxy.el autoinsert.el cl.texi configure.in cyrillic.el dbus.el gnus.texi hashcash.el log-edit.el message.el - org-latex.el org-table.el process.c rcirc.el and 7 other files + org-latex.el org-table.el process.c rcirc.el and 8 other files Malcolm Purvis: changed spam-stat.el @@ -2432,7 +2432,7 @@ eudc-vars.el eudc.el eudcb-bbdb.el eudcb-ldap.el eudcb-ph.el ldap.el and changed ph.el -Óscar Fuentes: changed emacsclient.c ido.el vc-bzr.el +Óscar Fuentes: changed ido.el emacsclient.c vc-bzr.el P. E. Jareth Hein: changed gnus-util.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 @@ -3080,7 +3082,7 @@ and changed spam.el gnus.el gnus-sum.el gnus.texi nnimap.el netrc.el spam-stat.el gnus-start.el gnus-util.el nnmail.el encrypt.el message.el gnus-encrypt.el mail-source.el assistant.el auth.texi imap.el - nnbabyl.el nnfolder.el nnmbox.el nnmh.el and 48 other files + nnbabyl.el nnfolder.el nnmbox.el nnmh.el and 51 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h
--- a/etc/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/etc/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,20 @@ +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * PROBLEMS: Document gcc-4.5 bug (Bug#6031). + +2010-05-08 Kenichi Handa <handa@m17n.org> + + * HELLO: Adjust Burmese for Unicode 5.2 encoding. + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + * HELLO: Reorder Arabic greetings into logical order (they were + mistakenly changed to visual order by the 2010-03-28 change). + 2010-04-18 Francesc Rocher <rocher@member.fsf.org> * MORE.STUFF: Add a new entry for QWE.
--- a/etc/HELLO Fri May 07 07:47:33 2010 +0000 +++ b/etc/HELLO Sun May 09 22:52:44 2010 +0000 @@ -4,10 +4,10 @@ Europe: ,A!(BHola!, Gr,A|_(B Gott, Hyv,Add(B p,Ad(Biv,Add(B, Tere ,Au(Bhtust, Bon,Cu(Bu Cze,B6f(B!, Dobr,B}(B den, ,L7T`PRabRcYbU(B!, ,FCei\(B ,Fsar(B, $,1J2J0J;J0J@JOJ=J1J0(B Africa: $(3!A!,!>(B - Middle/Near East: ,Hylem(B, ,GecjdY(B ,GeGdqSdG(B + Middle/Near East: ,Hylem(B, ,GGdSqdGe(B ,GYdjce(B South Asia: $,19h9n9x:-9d:'(B, $,15h5n5x6-5d6'(B, $,1?(?.?8?M>u?>?0(B, $,1@H@N@X@m@5@^@P@"(B, $,1;6;A;#;?;,;G(B, $,1AFAzB4AvB=B AqB*(B, $,1<U<C<5<m<5<N<m(B, $,1=h=n=x>-=U=~=p=B(B, $(7"7"!#C!;"E"S"G!;"7"2"[!;"D"["#"G!>(B - South East Asia: $,1\'\f\:\V\4\?\]\:(B, (1JP:R-4U(B, $,1H9H$HYrmH"H<HLH5HL(B, ,TJGQJ4U$CQ:(B, Ch,1`(Bo b,1U(Bn + South East Asia: $,1\'\f\:\V\4\?\]\:(B, (1JP:R-4U(B, $,1H9H$HZHYH"H<HLH5HK(B, ,TJGQJ4U$CQ:(B, Ch,1`(Bo b,1U(Bn East Asia: $ADc:C(B, $(0*/=((B, $B$3$s$K$A$O(B, $(C>H3gGO<<?d(B Misc: E,C6(Bo,C~(Ban,Cx(Bo ,Cf(Biu,C<(Ba,C}(Bde, $,2(3(1('('(5(B, $,1x (B p $,1x((B world $,1s"(B hello p $,2!a(B CJK variety: GB($AT*Fx(B,$A?*7"(B), BIG5($(0&x86(B,$(0DeBv(B), JIS($B855$(B,$B3+H/(B), KSC($(Cj*Q((B,$(CKR[!(B) @@ -16,10 +16,10 @@ LANGUAGE (NATIVE NAME) HELLO ---------------------- ----- Amharic ($,1O M[MmN{(B) $,1M`MKM](B -Arabic $,1ro(B(,GGdYQHjqI(B) ,GecjdY(B ,GeGdqSdG(B +Arabic $,1ro(B(,GGdYQHjqI(B) ,GGdSqdGe(B ,GYdjce(B Bengali ($,17,7>6b727>(B) $,17(7.787M6u7>70(B Braille $,2(3(1('('(5(B -Burmese ($,1H9HYH;H4HYrlH9HL(B) $,1H9H$HYrmH"H<HLH5HL(B +Burmese ($,1H9H\H4HZH9HL(B) $,1H9H$HZHYH"H<HLH5HK(B C printf ("Hello, world!\n"); Czech (,Bh(Be,B9(Btina) Dobr,A}(B den Danish (dansk) Hej / Goddag / Hall,Ax(Bj
--- a/etc/NEWS Fri May 07 07:47:33 2010 +0000 +++ b/etc/NEWS Sun May 09 22:52:44 2010 +0000 @@ -47,10 +47,6 @@ +++ ** Emacs now supports display and editing of bidirectional text. -Warning: This is still very much experimental! The existing support -is minimal, and when it's turned on (see below), many features are -likely to give unexpected results, or break, or even crash! Use at -your own risk! See the node "Bidirectional Editing" in the Emacs Manual for some initial documentation. @@ -69,6 +65,10 @@ bidirectionality" class implementation of the Unicode Bidirectional Algorithm. +Note that some advanced display features, such as overlay strings and +`display' text properties, do not yet work correctly when +bidirectional text is reordered for display. + ** GTK scroll-bars are now placed on the right by default. Use `set-scroll-bar-mode' to change this. @@ -123,8 +123,9 @@ The reason is that this interferes with cua-mode. ** partial-completion-mode is now obsolete. -You can get the same behavior with -(setq completion-styles '(partial-completion initials)). +You can get a comparable behavior with: +(setq completion-styles '(partial-completion initials)) +(setq completion-pcm-complete-word-inserts-delimiters t) ** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags. ** Customize
--- a/etc/NEWS.23 Fri May 07 07:47:33 2010 +0000 +++ b/etc/NEWS.23 Sun May 09 22:52:44 2010 +0000 @@ -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.
--- a/etc/PROBLEMS Fri May 07 07:47:33 2010 +0000 +++ b/etc/PROBLEMS Sun May 09 22:52:44 2010 +0000 @@ -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
--- a/etc/enriched.doc Fri May 07 07:47:33 2010 +0000 +++ b/etc/enriched.doc Sun May 09 22:52:44 2010 +0000 @@ -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 -</indent></indent> <indent>improvment. +</indent></indent> <indent>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 <http://www.gnu.org/licenses/>. + along with this program. If not, see <<http://www.gnu.org/licenses/>.
--- a/leim/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/leim/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-04-06 Chong Yidong <cyd@stupidchicken.com> * quail/vntelex.el: Fix "af" rule (Bug#5836).
--- a/lib-src/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lib-src/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,16 @@ +2010-05-08 Christoph <cschol2112@googlemail.com> (tiny change) + + * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis + for macros for nmake compatibility. + +2010-05-08 Glenn Morris <rgm@gnu.org> + + * Makefile.in (THIS_IS_MAKEFILE): Remove, unused. + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-06 Glenn Morris <rgm@gnu.org> * Makefile.in: Minimize blessmail-related cpp usage.
--- a/lib-src/Makefile.in Fri May 07 07:47:33 2010 +0000 +++ b/lib-src/Makefile.in Sun May 09 22:52:44 2010 +0000 @@ -164,7 +164,6 @@ # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ -#define THIS_IS_MAKEFILE #define NOT_C_CODE #include "../src/config.h"
--- a/lisp/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lisp/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,176 @@ +2010-05-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * minibuffer.el (completion-pcm-complete-word-inserts-delimiters): + New custom variable. + (completion-pcm--string->pattern): Use it. + (completion-pcm--pattern->regex, completion-pcm--pattern->string): + Make it handle any symbol as `any'. + (completion-pcm--merge-completions): Extract common suffix for the new + `prefix' symbol as well. + (completion-substring--all-completions): Use the new `prefix' symbol. + +2010-05-09 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if + not bound. + (tramp-compat-copy-file): Add PRESERVE-SELINUX-CONTEXT. + (tramp-compat-funcall): New defmacro. + (tramp-compat-line-beginning-position) + (tramp-compat-line-end-position) + (tramp-compat-temporary-file-directory) + (tramp-compat-make-temp-file, tramp-compat-file-attributes) + (tramp-compat-copy-file, tramp-compat-copy-directory) + (tramp-compat-delete-file, tramp-compat-delete-directory) + (tramp-compat-number-sequence, tramp-compat-process-running-p) + * net/tramp.el (top, with-progress-reporter) + (tramp-rfn-eshadow-setup-minibuffer) + (tramp-rfn-eshadow-update-overlay, tramp-handle-set-file-times) + (tramp-handle-dired-compress-file, tramp-handle-shell-command) + (tramp-completion-mode-p, tramp-check-for-regexp) + (tramp-open-connection-setup-interactive-shell) + (tramp-compute-multi-hops, tramp-read-passwd, tramp-clear-passwd) + (tramp-time-diff, tramp-coding-system-change-eol-conversion) + (tramp-set-process-query-on-exit-flag, tramp-unload-tramp) + * net/tramp-cmds.el (tramp-cleanup-all-connections) + (tramp-reporter-dump-variable, tramp-load-report-modules) + (tramp-append-tramp-buffers) + * net/tramp-gvfs.el (tramp-gvfs-handle-file-selinux-context): Use it. + + * net/tramp-imap.el (top): Autoload `epg-make-context'. + +2010-05-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/compile.el (compilation-buffer-modtime): Rename from + buffer-modtime. Adjust users. + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * international/mule.el (auto-coding-alist): Only purecopy + car of each item, not the whole list (Bug#6083). + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/js.el (js-mode): Make paragraph variables local before + calling c-setup-paragraph-variables (Bug#6071). + +2010-05-08 Eli Zaretskii <eliz@gnu.org> + + * composite.el (compose-region, reference-point-alist): Fix typos + in the doc strings. + +2010-05-08 Alexander Klimov <alserkli@inbox.ru> (tiny change) + + * calc/calc-graph.el (calc-graph-plot): Use the proper form for + gnuplot's "set" command. + +2010-05-08 Juanma Barranquero <lekktu@gmail.com> + + * abbrev.el (last-abbrev-text): Doc fix. + (abbrev-prefix-mark): Don't escape parenthesis. + +2010-05-08 Andreas Schwab <schwab@linux-m68k.org> + + * composite.el (find-composition): Doc fix. + +2010-05-08 Juanma Barranquero <lekktu@gmail.com> + + * 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-05-08 Juri Linkov <juri@jurta.org> + + * info.el (Info-fontify-node): Put Info-breadcrumbs to the `display' + property instead of `invisible' and `after-string' (bug#5998). + +2010-05-08 Juri Linkov <juri@jurta.org> + + * image-mode.el (image-mode-as-text): Fix typo in docstring. + +2010-05-08 Juanma Barranquero <lekktu@gmail.com> + + * filecache.el (file-cache-add-directory-list) + (file-cache-add-directory-recursively): Fix typos in docstrings. + +2010-05-08 Kenichi Handa <handa@m17n.org> + + * language/indian.el (gurmukhi-composable-pattern): Fix typo. + (gujarati-composable-pattern): Fix typo. + +2010-05-08 Kenichi Handa <handa@m17n.org> + + * language/indian.el (oriya-composable-pattern) + (tamil-composable-pattern, malayalam-composable-pattern): + Add two-part vowels to "v" (vowel sign). + +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * files.el (copy-directory): Handle symlinks (Bug#5982). + +2010-05-08 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC. + (vc-hg-working-revision): Likewise. Use hg parents, not hg parent + (Bug#5846). + +2010-05-08 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string. + + * minibuffer.el (completion-at-point): Doc fix. + +2010-05-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * electric.el (Electric-command-loop): Minor tweak. + + * ebuff-menu.el (electric-buffer-list): Try and make it behave a bit + better with dedicated windows. + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + +2010-05-07 Deniz Dogan <deniz.a.m.dogan@gmail.com> (tiny change) + Stefan Monnier <monnier@iro.umontreal.ca> + + Highlight vendor specific properties. + * textmodes/css-mode.el (css-proprietary-nmstart-re): New var. + (css-proprietary-property): New face. + (css-font-lock-keywords): Use them. + +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + * cus-start.el (all): Add native condition for tool-bar-* symbols. + +2010-05-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * textmodes/dns-mode.el (auto-mode-alist): Add entry for .zone files. + * files.el (auto-mode-alist): Remove redundant entries. + + * files.el (auto-save-mode): Move to simple.el to fix bootstrap. + * simple.el (auto-save-mode): Move from files.el. + * minibuffer.el (completion--common-suffix): Fix copy&paste error. + +2010-05-07 Christian von Roques <roques@mti.ag> (tiny change) + + * lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592). + 2010-05-07 Katsumi Yamaoka <yamaoka@jpl.org> * mail/binhex.el (binhex-decode-region-internal) @@ -23,12 +196,12 @@ 2010-05-06 Michael Albinus <michael.albinus@gmx.de> - * net/tramp.el (top, with-progress-reporter): Use - `symbol-function' inside `funcall'. + * net/tramp.el (top, with-progress-reporter): + Use `symbol-function' inside `funcall'. * net/tramp-compat.el (tramp-compat-file-attributes) - (tramp-compat-delete-file, tramp-compat-delete-directory): Handle - only `wrong-number-of-arguments' error. + (tramp-compat-delete-file, tramp-compat-delete-directory): + Handle only `wrong-number-of-arguments' error. * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Fix typo. (tramp-gvfs-handle-file-selinux-context): Use `symbol-function'
--- a/lisp/abbrev.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/abbrev.el Sun May 09 22:52:44 2010 +0000 @@ -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.")
--- a/lisp/calc/calc-graph.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/calc/calc-graph.el Sun May 09 22:52:44 2010 +0000 @@ -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"
--- a/lisp/cus-start.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/cus-start.el Sun May 09 22:52:44 2010 +0000 @@ -408,6 +408,10 @@ (fboundp 'define-fringe-bitmap)) ((equal "font-use-system-font" (symbol-name symbol)) (featurep 'system-font-setting)) + ;; Conditioned on x-create-frame, because that's + ;; the condition for loadup.el to preload tool-bar.el. + ((string-match "tool-bar-" (symbol-name symbol)) + (fboundp 'x-create-frame)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here!
--- a/lisp/ebuff-menu.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/ebuff-menu.el Sun May 09 22:52:44 2010 +0000 @@ -95,7 +95,7 @@ (cons first last)))))) (set-buffer buffer) (Buffer-menu-mode) - (bury-buffer buffer) + (bury-buffer) ;Get rid of window, if dedicated. (message ""))) (if select (progn (set-buffer buffer)
--- a/lisp/electric.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/electric.el Sun May 09 22:52:44 2010 +0000 @@ -58,12 +58,10 @@ (err nil) (prompt-string prompt)) (while t - (if (not (or (stringp prompt) (eq prompt nil) (eq prompt 'noprompt))) + (if (functionp prompt) (setq prompt-string (funcall prompt))) (if (not (stringp prompt-string)) - (if (eq prompt-string 'noprompt) - (setq prompt-string nil) - (setq prompt-string "->"))) + (setq prompt-string (unless (eq prompt-string 'noprompt) "->"))) (setq cmd (read-key-sequence prompt-string)) (setq last-command-event (aref cmd (1- (length cmd))) this-command (key-binding cmd t)
--- a/lisp/emacs-lisp/lisp.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/emacs-lisp/lisp.el Sun May 09 22:52:44 2010 +0000 @@ -628,11 +628,12 @@ (minibuffer-message "Nothing to complete") (let ((completion-annotate-function (plist-get plist :annotate-function))) - (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) (plist-get plist :predicate)))))) - + (defun lisp-completion-at-point (&optional predicate) + "Function used for `completion-at-point-functions' in `emacs-lisp-mode'." ;; FIXME: the `end' could be after point? (let* ((pos (point)) (beg (with-syntax-table emacs-lisp-mode-syntax-table
--- a/lisp/epg.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/epg.el Sun May 09 22:52:44 2010 +0000 @@ -137,7 +137,8 @@ '((?e . encrypt) (?s . sign) (?c . certify) - (?a . authentication))) + (?a . authentication) + (?D . disabled))) (defvar epg-new-signature-type-alist '((?D . detached)
--- a/lisp/erc/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lisp/erc/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2. @@ -12,8 +16,8 @@ (erc-server-reconnect): Use it to reconnect via old connector (Bug#4958). - * erc.el (erc-determine-parameters): Save - erc-server-connect-function to erc-session-connector. + * erc.el (erc-determine-parameters): + Save erc-server-connect-function to erc-session-connector. 2009-11-03 Stefan Monnier <monnier@iro.umontreal.ca>
--- a/lisp/filecache.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/filecache.el Sun May 09 22:52:44 2010 +0000 @@ -296,8 +296,8 @@ (defun file-cache-add-directory-list (directory-list &optional regexp) "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." (interactive "XAdd files from directory list: ") (mapcar (lambda (dir) (file-cache-add-directory dir regexp)) @@ -370,10 +370,10 @@ ;;;###autoload (defun file-cache-add-directory-recursively (dir &optional regexp) "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." (interactive "DAdd directory: ") (require 'find-lisp) (mapcar
--- a/lisp/files.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/files.el Sun May 09 22:52:44 2010 +0000 @@ -2260,7 +2260,6 @@ ;; /tmp/Re.... or Message ("\\`/tmp/Re" . text-mode) ("/Message[0-9]*\\'" . text-mode) - ("\\.zone\\'" . zone-mode) ;; some news reader is reported to use this ("\\`/tmp/fol/" . text-mode) ("\\.oak\\'" . scheme-mode) @@ -2294,7 +2293,6 @@ ("#\\*mail\\*" . mail-mode) ("\\.g\\'" . antlr-mode) ("\\.ses\\'" . ses-mode) - ("\\.\\(soa\\|zone\\)\\'" . dns-mode) ("\\.docbook\\'" . sgml-mode) ("\\.com\\'" . dcl-mode) ("/config\\.\\(?:bat\\|log\\)\\'" . fundamental-mode) @@ -4755,10 +4753,14 @@ (mapc (lambda (file) (let ((target (expand-file-name - (file-name-nondirectory file) newname))) - (if (file-directory-p file) - (copy-directory file target keep-time parents) - (copy-file file target t keep-time)))) + (file-name-nondirectory file) newname)) + (attrs (file-attributes file))) + (cond ((file-directory-p file) + (copy-directory file target keep-time parents)) + ((stringp (car attrs)) ; Symbolic link + (make-symbolic-link (car attrs) target t)) + (t + (copy-file file target t keep-time))))) ;; We do not want to copy "." and "..". (directory-files directory 'full directory-files-no-dot-files-regexp)) @@ -5150,26 +5152,6 @@ (kill-buffer-ask buffer))))) -(define-minor-mode auto-save-mode - "Toggle auto-saving of contents of current buffer. -With prefix argument ARG, turn auto-saving on if positive, else off." - :variable ((and buffer-auto-save-file-name - ;; If auto-save is off because buffer has shrunk, - ;; then toggling should turn it on. - (>= buffer-saved-size 0)) - . (lambda (val) - (setq buffer-auto-save-file-name - (cond - ((null val) nil) - ((and buffer-file-name auto-save-visited-file-name - (not buffer-read-only)) - buffer-file-name) - (t (make-auto-save-file-name)))))) - ;; If -1 was stored here, to temporarily turn off saving, - ;; turn it back on. - (and (< buffer-saved-size 0) - (setq buffer-saved-size 0))) - (defun rename-auto-save-file () "Adjust current buffer's auto save file name for current conditions. Also rename any existing auto save file, if it was made in this session."
--- a/lisp/gnus/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lisp/gnus/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,8 @@ +2010-05-07 Christian von Roques <roques@mti.ag> (tiny change) + + * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key + (Bug#5592). + 2010-05-07 Julien Danjou <julien@danjou.info> * gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass
--- a/lisp/gnus/mml2015.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/gnus/mml2015.el Sun May 09 22:52:44 2010 +0000 @@ -1021,6 +1021,7 @@ (let ((pointer (epg-key-sub-key-list (car keys)))) (while pointer (if (and (memq usage (epg-sub-key-capability (car pointer))) + (not (memq 'disabled (epg-sub-key-capability (car pointer)))) (not (memq (epg-sub-key-validity (car pointer)) '(revoked expired)))) (throw 'found (car keys)))
--- a/lisp/image-mode.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/image-mode.el Sun May 09 22:52:44 2010 +0000 @@ -392,7 +392,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."
--- a/lisp/info.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/info.el Sun May 09 22:52:44 2010 +0000 @@ -4343,8 +4343,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.
--- a/lisp/international/mule.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/international/mule.el Sun May 09 22:52:44 2010 +0000 @@ -1690,7 +1690,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\\|7z\\|\ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . no-conversion-multibyte)
--- a/lisp/language/indian.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/language/indian.el Sun May 09 22:52:44 2010 +0000 @@ -198,15 +198,14 @@ (defconst gurmukhi-composable-pattern (let ((table - '(("a" . "[\u0A01-\u0A02]") ; SIGN ADAK BINDI .. BINDI - ("A" . "\u0A03]") ; SIGN VISARGA + '(("a" . "[\u0A01-\u0A02\u0A70]") ; SIGN ADAK BINDI .. BINDI, TIPPI + ("A" . "\u0A03") ; SIGN VISARGA ("V" . "[\u0A05-\u0A14]") ; independent vowel ("C" . "[\u0A15-\u0A39\u0A59-\u0A5E]") ; consonant - ("Y" . "[\u0A2F\u0A30\u0A35\u0A39]") ; YA, RA, VA, HA + ("Y" . "[\u0A2F-u0A30\u0A35\u0A39]") ; YA, RA, VA, HA ("n" . "\u0A3C") ; NUKTA ("v" . "[\u0A3E-\u0A4C]") ; vowel sign ("H" . "\u0A4D") ; VIRAMA - ("a" . "\u0A70") ; TIPPI ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ ("X" . "[\u0A00-\u0A7F]")))) ; all coverage @@ -226,7 +225,7 @@ (defconst gujarati-composable-pattern (let ((table '(("a" . "[\u0A81-\u0A82]") ; SIGN CANDRABINDU .. ANUSVARA - ("A" . "\u0A83]") ; SIGN VISARGA + ("A" . "\u0A83") ; SIGN VISARGA ("V" . "[\u0A85-\u0A94\u0AE0-\u0AE1]") ; independent vowel ("C" . "[\u0A95-\u0AB9]") ; consonant ("R" . "\u0AB0") ; RA @@ -258,7 +257,7 @@ ("B" . "[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23-\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38-\u0B39]") ; consonant with below form ("R" . "\u0B30") ; RA ("n" . "\u0B3C") ; NUKTA - ("v" . "[\u0B3E-\u0B44\u0B47\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign + ("v" . "[\u0B3E-\u0B4C\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign ("H" . "\u0B4D") ; VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ @@ -281,7 +280,7 @@ '(("a" . "\u0B82") ; SIGN ANUSVARA ("V" . "[\u0B85-\u0B94]") ; independent vowel ("C" . "[\u0B95-\u0BB9]") ; consonant - ("v" . "[\u0BBE-\u0BC8\u0BD7]") ; vowel sign + ("v" . "[\u0BBE-\u0BCC\u0BD7]") ; vowel sign ("H" . "\u0BCD") ; VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ @@ -351,7 +350,7 @@ ("V" . "[\u0D05-\u0D14\u0D60-\u0D61]") ; independent vowel ("C" . "[\u0D15-\u0D39]") ; consonant ("Y" . "[\u0D2F-\u0D30\u0D32\u0D35]") ; YA, RA, LA, VA - ("v" . "[\u0D3E-\u0D48\u0D57\u0D62-\u0D63]") ; postbase matra + ("v" . "[\u0D3E-\u0D4C\u0D57\u0D62-\u0D63]") ; postbase matra ("H" . "\u0D4D") ; SIGN VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ
--- a/lisp/mh-e/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lisp/mh-e/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> * mh-show.el (mh-showing-mode): Move function to mh-e.el.
--- a/lisp/minibuffer.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/minibuffer.el Sun May 09 22:52:44 2010 +0000 @@ -1169,7 +1169,7 @@ `:predicate' a predicate that completion candidates need to satisfy. `:annotation-function' the value to use for `completion-annotate-function'.") -(defun complete-symbol (&optional arg) +(defun completion-at-point (&optional arg) "Perform completion on the text around point. The completion method is determined by `completion-at-point-functions'. @@ -1193,7 +1193,7 @@ (completion-in-region start end (nth 2 res) (plist-get plist :predicate)))))))) -(defalias 'completion-at-point 'complete-symbol) +(define-obsolete-function-alias 'complete-symbol 'completion-at-point "24.1") ;;; Key bindings. @@ -1769,6 +1769,14 @@ :group 'minibuffer :type 'string) +(defcustom completion-pcm-complete-word-inserts-delimiters nil + "Treat the SPC or - inserted by `minibuffer-complete-word' as delimiters. +Those chars are treated as delimiters iff this variable is non-nil. +I.e. if non-nil, M-x SPC will just insert a \"-\" in the minibuffer, whereas +if nil, it will list all possible commands in *Completions* because none of +the commands start with a \"-\" or a SPC." + :type 'boolean) + (defun completion-pcm--pattern-trivial-p (pattern) (and (stringp (car pattern)) ;; It can be followed by `point' and "" and still be trivial. @@ -1781,7 +1789,7 @@ (defun completion-pcm--string->pattern (string &optional point) "Split STRING into a pattern. A pattern is a list where each element is either a string -or a symbol chosen among `any', `star', `point'." +or a symbol chosen among `any', `star', `point', `prefix'." (if (and point (< point (length string))) (let ((prefix (substring string 0 point)) (suffix (substring string point))) @@ -1794,11 +1802,12 @@ (while (and (setq p (string-match completion-pcm--delim-wild-regex string p)) - ;; If the char was added by minibuffer-complete-word, then - ;; don't treat it as a delimiter, otherwise "M-x SPC" - ;; ends up inserting a "-" rather than listing - ;; all completions. - (not (get-text-property p 'completion-try-word string))) + (or completion-pcm-complete-word-inserts-delimiters + ;; If the char was added by minibuffer-complete-word, + ;; then don't treat it as a delimiter, otherwise + ;; "M-x SPC" ends up inserting a "-" rather than listing + ;; all completions. + (not (get-text-property p 'completion-try-word string)))) ;; Usually, completion-pcm--delim-wild-regex matches a delimiter, ;; meaning that something can be added *before* it, but it can also ;; match a prefix and postfix, in which case something can be added @@ -1824,11 +1833,10 @@ (concat "\\`" (mapconcat (lambda (x) - (case x - ((star any point) - (if (if (consp group) (memq x group) group) - "\\(.*?\\)" ".*?")) - (t (regexp-quote x)))) + (cond + ((stringp x) (regexp-quote x)) + ((if (consp group) (memq x group) group) + "\\(.*?\\)" ".*?"))) pattern "")))) ;; Avoid pathological backtracking. @@ -1992,7 +2000,7 @@ (completion--sreverse (try-completion "" - (mapcar 'completion--sreverse comps)))) + (mapcar 'completion--sreverse strs)))) (defun completion-pcm--merge-completions (strs pattern) "Extract the commonality in STRS, with the help of PATTERN." @@ -2057,9 +2065,9 @@ ;; here any more. (unless unique (push elem res) - (when (memq elem '(star point)) + (when (memq elem '(star point prefix)) ;; Extract common suffix additionally to common prefix. - ;; Only do it for `point' and `star' since for + ;; Only do it for `point', `star', and `prefix' since for ;; `any' it could lead to a merged completion that ;; doesn't itself match the candidates. (let ((suffix (completion--common-suffix comps))) @@ -2074,8 +2082,7 @@ (mapconcat (lambda (x) (cond ((stringp x) x) ((eq x 'star) "*") - ((eq x 'any) "") - ((eq x 'point) ""))) + (t ""))) ;any, point, prefix. pattern "")) @@ -2117,6 +2124,7 @@ (pointpat (or (memq 'point mergedpat) (memq 'any mergedpat) (memq 'star mergedpat) + ;; Not `prefix'. mergedpat)) ;; New pos from the start. (newpos (length (completion-pcm--pattern->string pointpat))) @@ -2147,7 +2155,7 @@ beforepoint afterpoint bounds)) (pattern (if (not (stringp (car basic-pattern))) basic-pattern - (cons 'any basic-pattern))) + (cons 'prefix basic-pattern))) (all (completion-pcm--all-completions prefix pattern table pred))) (list all pattern prefix suffix (car bounds))))
--- a/lisp/net/tramp-cmds.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/net/tramp-cmds.el Sun May 09 22:52:44 2010 +0000 @@ -106,8 +106,7 @@ (setq tramp-locked nil) ;; Flush password cache. - (when (functionp 'password-reset) - (funcall (symbol-function 'password-reset))) + (tramp-compat-funcall 'password-reset) ;; Flush file and connection cache. (clrhash tramp-cache-data) @@ -254,7 +253,7 @@ (base64-encode-string val)))))) ;; Dump variable. - (funcall (symbol-function 'reporter-dump-variable) varsym mailbuf) + (tramp-compat-funcall 'reporter-dump-variable varsym mailbuf) (unless (hash-table-p val) ;; Remove string quotation. @@ -283,10 +282,8 @@ (load "mml" 'noerror)) (require 'message nil 'noerror) (require 'mml nil 'noerror)) - (when (functionp 'message-mode) - (funcall (symbol-function 'message-mode))) - (when (functionp 'mml-mode) - (funcall (symbol-function 'mml-mode) t))) + (tramp-compat-funcall 'message-mode) + (tramp-compat-funcall 'mml-mode t)) (defun tramp-append-tramp-buffers () "Append Tramp buffers and buffer local variables into the bug report." @@ -308,15 +305,14 @@ (erase-buffer) (insert "\n(setq\n") (lisp-indent-line) - (funcall (symbol-function 'reporter-dump-variable) - 'buffer-name (current-buffer)) + (tramp-compat-funcall + 'reporter-dump-variable 'buffer-name (current-buffer)) (dolist (varsym-or-cons-cell (buffer-local-variables buffer)) (let ((varsym (or (car-safe varsym-or-cons-cell) varsym-or-cons-cell))) (when (string-match "tramp" (symbol-name varsym)) - (funcall - (symbol-function 'reporter-dump-variable) - varsym (current-buffer))))) + (tramp-compat-funcall + 'reporter-dump-variable varsym (current-buffer))))) (lisp-indent-line) (insert ")\n")) (insert-buffer-substring elbuf))) @@ -328,7 +324,7 @@ (symbol-value 'mml-mode)) (let ((tramp-buf-regexp "\\*\\(debug \\)?tramp/") - (buffer-list (funcall (symbol-function 'tramp-list-tramp-buffers))) + (buffer-list (tramp-compat-funcall 'tramp-list-tramp-buffers)) (curbuf (current-buffer))) ;; There is at least one Tramp buffer. @@ -376,10 +372,10 @@ use another mail agent (by copying the contents of this buffer) please ensure that the buffers are attached to your email.\n\n") (dolist (buffer buffer-list) - (funcall (symbol-function 'mml-insert-empty-tag) - 'part 'type "text/plain" 'encoding "base64" - 'disposition "attachment" 'buffer buffer - 'description buffer)) + (tramp-compat-funcall + 'mml-insert-empty-tag 'part 'type "text/plain" + 'encoding "base64" 'disposition "attachment" 'buffer buffer + 'description buffer)) (set-buffer-modified-p nil)) ;; Don't send. Delete the message buffer.
--- a/lisp/net/tramp-compat.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/net/tramp-compat.el Sun May 09 22:52:44 2010 +0000 @@ -89,14 +89,25 @@ (unless (boundp 'byte-compile-not-obsolete-var) (defvar byte-compile-not-obsolete-var nil)) (setq byte-compile-not-obsolete-var 'directory-sep-char) - (if (boundp 'byte-compile-not-obsolete-vars) ; Emacs 23.2 - (setq byte-compile-not-obsolete-vars '(directory-sep-char))) + ;; Emacs 23.2. + (unless (boundp 'byte-compile-not-obsolete-vars) + (defvar byte-compile-not-obsolete-vars nil)) + (setq byte-compile-not-obsolete-vars '(directory-sep-char)) ;; `with-temp-message' does not exists in XEmacs. (condition-case nil (with-temp-message (current-message) nil) (error (defmacro with-temp-message (message &rest body) `(progn ,@body)))) + ;; For not existing functions, or functions with a changed argument + ;; list, there are compiler warnings. We want to avoid them in + ;; cases we know what we do. + (defmacro tramp-compat-funcall (function &rest arguments) + (if (featurep 'xemacs) + `(funcall (symbol-function ,function) ,@arguments) + `(when (or (subrp ,function) (functionp ,function)) + (with-no-warnings (funcall ,function ,@arguments))))) + ;; `set-buffer-multibyte' comes from Emacs Leim. (unless (fboundp 'set-buffer-multibyte) (defalias 'set-buffer-multibyte 'ignore)) @@ -182,8 +193,8 @@ own implementation." (cond ((fboundp 'line-beginning-position) - (funcall (symbol-function 'line-beginning-position))) - ((fboundp 'point-at-bol) (funcall (symbol-function 'point-at-bol))) + (tramp-compat-funcall 'line-beginning-position)) + ((fboundp 'point-at-bol) (tramp-compat-funcall 'point-at-bol)) (t (save-excursion (beginning-of-line) (point))))) (defsubst tramp-compat-line-end-position () @@ -191,8 +202,8 @@ Calls `line-end-position' or `point-at-eol' if defined, else own implementation." (cond - ((fboundp 'line-end-position) (funcall (symbol-function 'line-end-position))) - ((fboundp 'point-at-eol) (funcall (symbol-function 'point-at-eol))) + ((fboundp 'line-end-position) (tramp-compat-funcall 'line-end-position)) + ((fboundp 'point-at-eol) (tramp-compat-funcall 'point-at-eol)) (t (save-excursion (end-of-line) (point))))) (defsubst tramp-compat-temporary-file-directory () @@ -201,7 +212,7 @@ this is the function `temp-directory'." (cond ((boundp 'temporary-file-directory) (symbol-value 'temporary-file-directory)) - ((fboundp 'temp-directory) (funcall (symbol-function 'temp-directory))) + ((fboundp 'temp-directory) (tramp-compat-funcall 'temp-directory)) ((let ((d (getenv "TEMP"))) (and d (file-directory-p d))) (file-name-as-directory (getenv "TEMP"))) ((let ((d (getenv "TMP"))) (and d (file-directory-p d))) @@ -227,8 +238,7 @@ result) (if (fboundp 'make-temp-file) (setq result - (funcall - (symbol-function 'make-temp-file) prefix dir-flag extension)) + (tramp-compat-funcall 'make-temp-file prefix dir-flag extension)) ;; We use our own implementation, taken from files.el. (while (condition-case () @@ -261,19 +271,27 @@ ((tramp-tramp-file-p filename) (tramp-file-name-handler 'file-attributes filename id-format)) (t (condition-case nil - (funcall (symbol-function 'file-attributes) filename id-format) + (tramp-compat-funcall 'file-attributes filename id-format) (wrong-number-of-arguments (file-attributes filename)))))) ;; PRESERVE-UID-GID has been introduced with Emacs 23. It does not ;; hurt to ignore it for other (X)Emacs versions. +;; PRESERVE-SELINUX-CONTEXT has been introduced with Emacs 24. (defun tramp-compat-copy-file - (filename newname &optional ok-if-already-exists keep-date preserve-uid-gid) + (filename newname &optional ok-if-already-exists keep-date + preserve-uid-gid preserve-selinux-context) "Like `copy-file' for Tramp files (compat function)." - (if preserve-uid-gid - (funcall - (symbol-function 'copy-file) - filename newname ok-if-already-exists keep-date preserve-uid-gid) - (copy-file filename newname ok-if-already-exists keep-date))) + (cond + (preserve-selinux-context + (tramp-compat-funcall + 'copy-file filename newname ok-if-already-exists keep-date + preserve-uid-gid preserve-selinux-context)) + (preserve-uid-gid + (tramp-compat-funcall + 'copy-file filename newname ok-if-already-exists keep-date + preserve-uid-gid)) + (t + (copy-file filename newname ok-if-already-exists keep-date)))) ;; `copy-directory' is a new function in Emacs 23.2. Implementation ;; is taken from there. @@ -281,8 +299,7 @@ (directory newname &optional keep-time parents) "Make a copy of DIRECTORY (compat function)." (if (fboundp 'copy-directory) - (funcall - (symbol-function 'copy-directory) directory newname keep-time parents) + (tramp-compat-funcall 'copy-directory directory newname keep-time parents) ;; If `default-directory' is a remote directory, make sure we find ;; its `copy-directory' handler. @@ -323,7 +340,7 @@ (if (null force) (delete-file filename) (condition-case nil - (funcall (symbol-function 'delete-file) filename force) + (tramp-compat-funcall 'delete-file filename force) ;; This Emacs version does not support the FORCE flag. Setting ;; `delete-by-moving-to-trash' shall give us the same effect. (wrong-number-of-arguments @@ -341,7 +358,7 @@ (if (null recursive) (delete-directory directory) (condition-case nil - (funcall (symbol-function 'delete-directory) directory recursive) + (tramp-compat-funcall 'delete-directory directory recursive) ;; This Emacs version does not support the RECURSIVE flag. We ;; use the implementation from Emacs 23.2. (wrong-number-of-arguments @@ -360,7 +377,7 @@ (defun tramp-compat-number-sequence (from &optional to inc) "Return a sequence of numbers from FROM to TO as a list (compat function)." (if (or (subrp 'number-sequence) (symbol-file 'number-sequence)) - (funcall (symbol-function 'number-sequence) from to inc) + (tramp-compat-funcall 'number-sequence from to inc) (if (or (not to) (= from to)) (list from) (or inc (setq inc 1)) @@ -390,15 +407,13 @@ (cond ;; GNU Emacs 22 on w32. ((fboundp 'w32-window-exists-p) - (funcall (symbol-function 'w32-window-exists-p) - process-name process-name)) + (tramp-compat-funcall 'w32-window-exists-p process-name process-name)) ;; GNU Emacs 23. ((and (fboundp 'list-system-processes) (fboundp 'process-attributes)) (let (result) - (dolist (pid (funcall (symbol-function 'list-system-processes)) result) - (let ((attributes - (funcall (symbol-function 'process-attributes) pid))) + (dolist (pid (tramp-compat-funcall 'list-system-processes) result) + (let ((attributes (tramp-compat-funcall 'process-attributes pid))) (when (and (string-equal (cdr (assoc 'user attributes)) (user-login-name)) (let ((comm (cdr (assoc 'comm attributes))))
--- a/lisp/net/tramp-gvfs.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/net/tramp-gvfs.el Sun May 09 22:52:44 2010 +0000 @@ -629,8 +629,8 @@ (defun tramp-gvfs-handle-file-selinux-context (filename) "Like `file-selinux-context' for Tramp files." - (funcall (symbol-function 'file-selinux-context) - (tramp-gvfs-fuse-file-name filename))) + (tramp-compat-funcall + 'file-selinux-context (tramp-gvfs-fuse-file-name filename))) (defun tramp-gvfs-handle-file-writable-p (filename) "Like `file-writable-p' for Tramp files."
--- a/lisp/net/tramp-imap.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/net/tramp-imap.el Sun May 09 22:52:44 2010 +0000 @@ -63,6 +63,7 @@ (autoload 'epg-context-set-progress-callback "epg") (autoload 'epg-decrypt-string "epg") (autoload 'epg-encrypt-string "epg") +(autoload 'epg-make-context "epg") (autoload 'imap-hash-get "imap-hash") (autoload 'imap-hash-make "imap-hash") (autoload 'imap-hash-map "imap-hash")
--- a/lisp/net/tramp.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/net/tramp.el Sun May 09 22:52:44 2010 +0000 @@ -145,8 +145,7 @@ ;; this would load dbus.el. (when (and (featurep 'dbusbind) (condition-case nil - (funcall (symbol-function 'dbus-get-unique-name) - :session) + (tramp-compat-funcall 'dbus-get-unique-name :session) (error nil)) (tramp-compat-process-running-p "gvfs-fuse-daemon")) 'tramp-gvfs) @@ -2274,14 +2273,14 @@ ;; introduced in Emacs 24.1. (when (<= ,level tramp-verbose) (condition-case nil - (setq pr (funcall (symbol-function 'make-progress-reporter) ,message) - tm (run-at-time 3 0.1 'progress-reporter-update pr)) + (setq pr (tramp-compat-funcall 'make-progress-reporter ,message) + tm (if pr (run-at-time 3 0.1 'progress-reporter-update pr))) (error nil))) (unwind-protect ;; Execute the body. (progn ,@body) ;; Stop progress reporter. - (if tm (cancel-timer tm)) + (if tm (tramp-compat-funcall 'cancel-timer tm)) (tramp-message ,vec ,level "%s...done" ,message)))) (put 'with-progress-reporter 'lisp-indent-function 3) @@ -2398,15 +2397,16 @@ special handling of `substitute-in-file-name'." (when (symbol-value 'minibuffer-completing-file-name) (setq tramp-rfn-eshadow-overlay - (funcall (symbol-function 'make-overlay) - (funcall (symbol-function 'minibuffer-prompt-end)) - (funcall (symbol-function 'minibuffer-prompt-end)))) + (tramp-compat-funcall + 'make-overlay + (tramp-compat-funcall 'minibuffer-prompt-end) + (tramp-compat-funcall 'minibuffer-prompt-end))) ;; Copy rfn-eshadow-overlay properties. - (let ((props (funcall (symbol-function 'overlay-properties) - (symbol-value 'rfn-eshadow-overlay)))) + (let ((props (tramp-compat-funcall + 'overlay-properties (symbol-value 'rfn-eshadow-overlay)))) (while props - (funcall (symbol-function 'overlay-put) - tramp-rfn-eshadow-overlay (pop props) (pop props)))))) + (tramp-compat-funcall + 'overlay-put tramp-rfn-eshadow-overlay (pop props) (pop props)))))) (when (boundp 'rfn-eshadow-setup-minibuffer-hook) (add-hook 'rfn-eshadow-setup-minibuffer-hook @@ -2425,10 +2425,12 @@ `file-name-shadow-mode'; the minibuffer should have already been set up by `rfn-eshadow-setup-minibuffer'." ;; In remote files name, there is a shadowing just for the local part. - (let ((end (or (funcall (symbol-function 'overlay-end) - (symbol-value 'rfn-eshadow-overlay)) - (funcall (symbol-function 'minibuffer-prompt-end))))) - (when (file-remote-p (buffer-substring-no-properties end (point-max))) + (let ((end (or (tramp-compat-funcall + 'overlay-end (symbol-value 'rfn-eshadow-overlay)) + (tramp-compat-funcall 'minibuffer-prompt-end)))) + (when + (file-remote-p + (tramp-compat-funcall 'buffer-substring-no-properties end (point-max))) (save-excursion (save-restriction (narrow-to-region @@ -2438,8 +2440,9 @@ (point-max)) (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay) (rfn-eshadow-update-overlay-hook nil)) - (move-overlay rfn-eshadow-overlay (point-max) (point-max)) - (funcall (symbol-function 'rfn-eshadow-update-overlay)))))))) + (tramp-compat-funcall + 'move-overlay rfn-eshadow-overlay (point-max) (point-max)) + (tramp-compat-funcall 'rfn-eshadow-update-overlay))))))) (when (boundp 'rfn-eshadow-update-overlay-hook) (add-hook 'rfn-eshadow-update-overlay-hook @@ -2989,9 +2992,8 @@ ;; local host. (and (functionp 'subr-arity) (subrp (symbol-function 'format-time-string)) - (= 3 (cdr (funcall (symbol-function 'subr-arity) - (symbol-function - 'format-time-string))))))) + (= 3 (cdr (tramp-compat-funcall + 'subr-arity 'format-time-string)))))) (tramp-send-command-and-check v (format "%s touch -t %s %s" (if utc "TZ=UTC; export TZ;" "") @@ -4157,8 +4159,8 @@ (tramp-send-command-and-check v (concat (nth 2 suffix) " " (tramp-shell-quote-argument localname)))) - ;; `dired-remove-file' is not defined in XEmacs - (funcall (symbol-function 'dired-remove-file) file) + ;; `dired-remove-file' is not defined in XEmacs. + (tramp-compat-funcall 'dired-remove-file file) (string-match (car suffix) file) (concat (substring file 0 (match-beginning 0)))))) (t @@ -4169,8 +4171,8 @@ (tramp-send-command-and-check v (concat "gzip -f " (tramp-shell-quote-argument localname)))) - ;; `dired-remove-file' is not defined in XEmacs - (funcall (symbol-function 'dired-remove-file) file) + ;; `dired-remove-file' is not defined in XEmacs. + (tramp-compat-funcall 'dired-remove-file file) (cond ((file-exists-p (concat file ".gz")) (concat file ".gz")) ((file-exists-p (concat file ".z")) @@ -4714,8 +4716,7 @@ ;; There's some output, display it. (when (with-current-buffer output-buffer (> (point-max) (point-min))) (if (functionp 'display-message-or-buffer) - (funcall (symbol-function 'display-message-or-buffer) - output-buffer) + (tramp-compat-funcall 'display-message-or-buffer output-buffer) (pop-to-buffer output-buffer)))))))) ;; File Editing. @@ -5638,7 +5639,8 @@ (featurep 'tramp) ;; If it's loaded, we may as well use it. ;; `partial-completion-mode' does not exist in XEmacs. ;; It is obsoleted with Emacs 24.1. - (and (boundp 'partial-completion-mode) partial-completion-mode) + (and (boundp 'partial-completion-mode) + (symbol-value 'partial-completion-mode)) ;; FIXME: These may have been loaded even if the user never ;; intended to use them. (featurep 'ido) @@ -5730,19 +5732,18 @@ ;; `last-input-event' might be nil. (not (null last-input-event)) ;; `last-input-event' may have no character approximation. - (funcall (symbol-function 'event-to-character) last-input-event) + (tramp-compat-funcall 'event-to-character last-input-event) (or ;; ?\t has event-modifier 'control. (equal - (funcall (symbol-function 'event-to-character) - last-input-event) ?\t) + (tramp-compat-funcall 'event-to-character last-input-event) ?\t) (and (not (event-modifiers last-input-event)) (or (equal - (funcall (symbol-function 'event-to-character) - last-input-event) ?\?) + (tramp-compat-funcall 'event-to-character last-input-event) + ?\?) (equal - (funcall (symbol-function 'event-to-character) - last-input-event) ?\ ))))))) + (tramp-compat-funcall 'event-to-character last-input-event) + ?\ ))))))) (defun tramp-connectable-p (filename) "Check, whether it is possible to connect the remote host w/o side-effects. @@ -6777,10 +6778,11 @@ (when (or (not (tramp-get-connection-property proc "check-remote-echo" nil)) ;; Sometimes, the echo string is suppressed on the remote side. (not (string-equal - (substring-no-properties - tramp-echo-mark-marker + (tramp-compat-funcall + 'substring-no-properties tramp-echo-mark-marker 0 (min tramp-echo-mark-marker-length (1- (point-max)))) - (buffer-substring-no-properties + (tramp-compat-funcall + 'buffer-substring-no-properties 1 (min (1+ tramp-echo-mark-marker-length) (point-max)))))) ;; No echo to be handled, now we can look for the regexp. (goto-char (point-min)) @@ -6907,7 +6909,7 @@ (if (featurep 'mule) ;; Use MULE to select the right EOL convention for communicating ;; with the process. - (let* ((cs (or (funcall (symbol-function 'process-coding-system) proc) + (let* ((cs (or (tramp-compat-funcall 'process-coding-system proc) (cons 'undecided 'undecided))) cs-decode cs-encode) (when (symbolp cs) (setq cs (cons cs cs))) @@ -6920,8 +6922,8 @@ (when (search-forward "\r" nil t) (setq cs-decode (tramp-coding-system-change-eol-conversion cs-decode 'dos))) - (funcall (symbol-function 'set-buffer-process-coding-system) - cs-decode cs-encode) + (tramp-compat-funcall + 'set-buffer-process-coding-system cs-decode cs-encode) (tramp-message vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)) ;; Look for ^M and do something useful if found. @@ -6950,7 +6952,7 @@ ;; Keep the debug buffer. (rename-buffer (generate-new-buffer-name tramp-temp-buffer-name) 'unique) - (funcall (symbol-function 'tramp-cleanup-connection) vec) + (tramp-compat-funcall 'tramp-cleanup-connection vec) (if (= (point-min) (point-max)) (kill-buffer nil) (rename-buffer (tramp-debug-buffer-name vec) 'unique)) @@ -7333,7 +7335,7 @@ 'target-alist (vector (tramp-file-name-method hop) (tramp-file-name-user hop) - (funcall (symbol-function 'tramp-gw-open-connection) vec gw hop) nil)) + (tramp-compat-funcall 'tramp-gw-open-connection vec gw hop) nil)) ;; For the password prompt, we need the correct values. ;; Therefore, we must remember the gateway vector. But we ;; cannot do it as connection property, because it shouldn't @@ -8612,16 +8614,17 @@ (and (boundp 'auth-sources) (tramp-get-connection-property v "first-password-request" nil) ;; Try with Tramp's current method. - (funcall (symbol-function 'auth-source-user-or-password) - "password" tramp-current-host tramp-current-method)) + (tramp-compat-funcall + 'auth-source-user-or-password + "password" tramp-current-host tramp-current-method)) ;; Try the password cache. (when (functionp 'password-read) (unless (tramp-get-connection-property v "first-password-request" nil) - (funcall (symbol-function 'password-cache-remove) key)) + (tramp-compat-funcall 'password-cache-remove key)) (let ((password - (funcall (symbol-function 'password-read) pw-prompt key))) - (funcall (symbol-function 'password-cache-add) key password) + (tramp-compat-funcall 'password-read pw-prompt key))) + (tramp-compat-funcall 'password-cache-add key password) password)) ;; Else, get the password interactively. (read-passwd pw-prompt)) @@ -8629,14 +8632,13 @@ (defun tramp-clear-passwd (vec) "Clear password cache for connection related to VEC." - (when (functionp 'password-cache-remove) - (funcall - (symbol-function 'password-cache-remove) - (tramp-make-tramp-file-name - (tramp-file-name-method vec) - (tramp-file-name-user vec) - (tramp-file-name-host vec) - "")))) + (tramp-compat-funcall + 'password-cache-remove + (tramp-make-tramp-file-name + (tramp-file-name-method vec) + (tramp-file-name-user vec) + (tramp-file-name-host vec) + ""))) ;; Snarfed code from time-date.el and parse-time.el @@ -8673,16 +8675,17 @@ ;; Pacify byte-compiler with `symbol-function'. (cond ((and (fboundp 'subtract-time) (fboundp 'float-time)) - (funcall (symbol-function 'float-time) - (funcall (symbol-function 'subtract-time) t1 t2))) + (tramp-compat-funcall + 'float-time (tramp-compat-funcall 'subtract-time t1 t2))) ((and (fboundp 'subtract-time) (fboundp 'time-to-seconds)) - (funcall (symbol-function 'time-to-seconds) - (funcall (symbol-function 'subtract-time) t1 t2))) + (tramp-compat-funcall + 'time-to-seconds (tramp-compat-funcall 'subtract-time t1 t2))) ((fboundp 'itimer-time-difference) - (funcall (symbol-function 'itimer-time-difference) - (if (< (length t1) 3) (append t1 '(0)) t1) - (if (< (length t2) 3) (append t2 '(0)) t2))) + (tramp-compat-funcall + 'itimer-time-difference + (if (< (length t1) 3) (append t1 '(0)) t1) + (if (< (length t2) 3) (append t2 '(0)) t2))) (t (let ((time (tramp-time-subtract t1 t2))) (+ (* (car time) 65536.0) @@ -8693,18 +8696,18 @@ "Return a coding system like CODING-SYSTEM but with given EOL-TYPE. EOL-TYPE can be one of `dos', `unix', or `mac'." (cond ((fboundp 'coding-system-change-eol-conversion) - (funcall (symbol-function 'coding-system-change-eol-conversion) - coding-system eol-type)) + (tramp-compat-funcall + 'coding-system-change-eol-conversion coding-system eol-type)) ((fboundp 'subsidiary-coding-system) - (funcall (symbol-function 'subsidiary-coding-system) - coding-system - (cond ((eq eol-type 'dos) 'crlf) - ((eq eol-type 'unix) 'lf) - ((eq eol-type 'mac) 'cr) - (t - (error "Unknown EOL-TYPE `%s', must be %s" - eol-type - "`dos', `unix', or `mac'"))))) + (tramp-compat-funcall + 'subsidiary-coding-system coding-system + (cond ((eq eol-type 'dos) 'crlf) + ((eq eol-type 'unix) 'lf) + ((eq eol-type 'mac) 'cr) + (t + (error "Unknown EOL-TYPE `%s', must be %s" + eol-type + "`dos', `unix', or `mac'"))))) (t (error "Can't change EOL conversion -- is MULE missing?")))) (defun tramp-set-process-query-on-exit-flag (process flag) @@ -8712,8 +8715,8 @@ If the second argument flag is non-nil, Emacs will query the user before exiting if process is running." (if (fboundp 'set-process-query-on-exit-flag) - (funcall (symbol-function 'set-process-query-on-exit-flag) process flag) - (funcall (symbol-function 'process-kill-without-query) process flag))) + (tramp-compat-funcall 'set-process-query-on-exit-flag process flag) + (tramp-compat-funcall 'process-kill-without-query) process flag)) ;; ------------------------------------------------------------ @@ -8773,8 +8776,7 @@ ;; When Tramp is not loaded yet, its autoloads are still active. (tramp-unload-file-name-handlers) ;; ange-ftp settings must be enabled. - (when (functionp 'tramp-ftp-enable-ange-ftp) - (funcall (symbol-function 'tramp-ftp-enable-ange-ftp))) + (tramp-compat-funcall 'tramp-ftp-enable-ange-ftp) ;; Maybe its not loaded yet. (condition-case nil (unload-feature 'tramp 'force)
--- a/lisp/org/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lisp/org/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-05 Stefan Monnier <monnier@iro.umontreal.ca> * org-table.el (orgtbl-setup): @@ -40,8 +44,7 @@ * org-latex.el (org-export-latex-classes): Update docstring. * org.el (org-format-latex-header): Add cookies to the header. - (org-splice-latex-header): Implement placement according to - cookies. + (org-splice-latex-header): Implement placement according to cookies. 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> @@ -54,8 +57,8 @@ 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> - * org-latex.el (org-export-latex-make-header): Use - `org-splice-latex-header' to build the header. + * org-latex.el (org-export-latex-make-header): + Use `org-splice-latex-header' to build the header. (org-export-latex-classes): Update docstring. * org.el (org-splice-latex-header): New function.
--- a/lisp/progmodes/compile.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/progmodes/compile.el Sun May 09 22:52:44 2010 +0000 @@ -748,9 +748,9 @@ "If non-nil, automatically jump to the next error encountered.") (make-variable-buffer-local 'compilation-auto-jump-to-next) -(defvar buffer-modtime nil +(defvar compilation-buffer-modtime nil "The buffer modification time, for buffers not associated with files.") -(make-variable-buffer-local 'buffer-modtime) +(make-variable-buffer-local 'compilation-buffer-modtime) (defvar compilation-skip-to-next-location t "*If non-nil, skip multiple error messages for the same source location.") @@ -1588,7 +1588,7 @@ mode-name (or name-of-mode "Compilation")) (set (make-local-variable 'page-delimiter) compilation-page-delimiter) - (set (make-local-variable 'buffer-modtime) nil) + (set (make-local-variable 'compilation-buffer-modtime) nil) (compilation-setup) (setq buffer-read-only t) (run-mode-hooks 'compilation-mode-hook)) @@ -1804,7 +1804,7 @@ (unless comint-inhibit-carriage-motion (comint-carriage-motion (process-mark proc) (point))) (set-marker (process-mark proc) (point)) - (set (make-local-variable 'buffer-modtime) (current-time)) + (set (make-local-variable 'compilation-buffer-modtime) (current-time)) (run-hooks 'compilation-filter-hook)) (goto-char pos) (narrow-to-region min max) @@ -1978,7 +1978,7 @@ ;; There may be no timestamp info if the loc is a `fake-loc', ;; but we just checked that the file has been visited before! (equal (nth 4 loc) - (setq timestamp buffer-modtime))) + (setq timestamp compilation-buffer-modtime))) (with-current-buffer (compilation-find-file marker (caar (nth 2 loc)) (cadr (car (nth 2 loc)))) (save-restriction
--- a/lisp/progmodes/js.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/progmodes/js.el Sun May 09 22:52:44 2010 +0000 @@ -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)
--- a/lisp/progmodes/sql.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/progmodes/sql.el Sun May 09 22:52:44 2010 +0000 @@ -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.)"
--- a/lisp/simple.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/simple.el Sun May 09 22:52:44 2010 +0000 @@ -5306,6 +5306,26 @@ otherwise turn it off. When Size Indication mode is enabled, the size of the accessible part of the buffer appears in the mode line." :global t :group 'mode-line) + +(define-minor-mode auto-save-mode + "Toggle auto-saving of contents of current buffer. +With prefix argument ARG, turn auto-saving on if positive, else off." + :variable ((and buffer-auto-save-file-name + ;; If auto-save is off because buffer has shrunk, + ;; then toggling should turn it on. + (>= buffer-saved-size 0)) + . (lambda (val) + (setq buffer-auto-save-file-name + (cond + ((null val) nil) + ((and buffer-file-name auto-save-visited-file-name + (not buffer-read-only)) + buffer-file-name) + (t (make-auto-save-file-name)))))) + ;; If -1 was stored here, to temporarily turn off saving, + ;; turn it back on. + (and (< buffer-saved-size 0) + (setq buffer-saved-size 0))) (defgroup paren-blinking nil "Blinking matching of parens and expressions."
--- a/lisp/textmodes/css-mode.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/textmodes/css-mode.el Sun May 09 22:52:44 2010 +0000 @@ -212,6 +212,8 @@ (defconst css-nmchar-re (concat "\\(?:[-[:alnum:]]\\|" css-escapes-re "\\)")) (defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)")) (defconst css-ident-re (concat css-nmstart-re css-nmchar-re "*")) +(defconst css-proprietary-nmstart-re ;; Vendor-specific properties. + "[-_]\\(?:ms\\|moz\\|o\\|webkit\\|khtml\\)-") (defconst css-name-re (concat css-nmchar-re "+")) (defface css-selector '((t :inherit font-lock-function-name-face)) @@ -220,6 +222,8 @@ (defface css-property '((t :inherit font-lock-variable-name-face)) "Face to use for properties." :group 'css) +(defface css-proprietary-property '((t :inherit (css-property italic))) + "Face to use for vendor-specific properties.") (defvar css-font-lock-keywords `(("!\\s-*important" . font-lock-builtin-face) @@ -251,8 +255,11 @@ ;; No face. nil))) ;; Properties. Again, we don't limit ourselves to css-property-ids. - (,(concat "\\(?:[{;]\\|^\\)[ \t]*\\(" css-ident-re "\\)\\s-*:") - (1 'css-property)))) + (,(concat "\\(?:[{;]\\|^\\)[ \t]*\\(" + "\\(?:\\(" css-proprietary-nmstart-re "\\)\\|" + css-nmstart-re "\\)" css-nmchar-re "*" + "\\)\\s-*:") + (1 (if (match-end 2) 'css-proprietary-property 'css-property))))) (defvar css-font-lock-defaults '(css-font-lock-keywords nil t))
--- a/lisp/textmodes/dns-mode.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/textmodes/dns-mode.el Sun May 09 22:52:44 2010 +0000 @@ -151,6 +151,7 @@ (easy-menu-add dns-mode-menu dns-mode-map)) ;;;###autoload (defalias 'zone-mode 'dns-mode) +;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.zone\\'" . zone-mode))) ;; Tools.
--- a/lisp/url/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lisp/url/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> * url-dired.el (url-dired-minor-mode): Use define-minor-mode. @@ -62,8 +66,8 @@ 2009-09-12 Chong Yidong <cyd@stupidchicken.com> * url-methods.el (url-scheme--registering-proxy): New variable. - (url-scheme-register-proxy, url-scheme-get-property): Avoid - calling url-scheme-register-proxy in an infloop (Bug#4191). + (url-scheme-register-proxy, url-scheme-get-property): + Avoid calling url-scheme-register-proxy in an infloop (Bug#4191). 2009-08-22 Glenn Morris <rgm@gnu.org>
--- a/lisp/vc-hg.el Fri May 07 07:47:33 2010 +0000 +++ b/lisp/vc-hg.el Sun May 09 22:52:44 2010 +0000 @@ -168,12 +168,13 @@ (condition-case nil ;; Ignore all errors. (let ((process-environment - ;; Avoid localization of messages so we can parse the output. - (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") process-environment))) - - (process-file - "hg" nil t nil - "status" "-A" (file-relative-name file))) + ;; Avoid localization of messages so we + ;; can parse the output. + (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=") + process-environment))) + (process-file + "hg" nil t nil + "status" "-A" (file-relative-name file))) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil))))))) @@ -197,7 +198,7 @@ ((status nil) (default-directory (file-name-directory file)) ;; Avoid localization of messages so we can parse the output. - (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") + (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=") process-environment)) (out (with-output-to-string @@ -209,7 +210,7 @@ ;; Ignore all errors. (process-file "hg" nil t nil - "parent" "--template" "{rev}" (file-relative-name file))) + "parents" "--template" "{rev}" (file-relative-name file))) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil)))))))
--- a/lwlib/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/lwlib/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,12 @@ +2010-05-08 Jan Djärv <jan.h.d@swipnet.se> + + * xlwmenu.c (XlwMenuDestroy): Remove XtDestroyWidget on subwidgets + (Bug #6127). + +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-06 Glenn Morris <rgm@gnu.org> * Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables. @@ -23,17 +32,16 @@ XlwMenuRedisplay. (display_menu_item): Replace ws->window with ws->pixmap, remove call to XftDrawRect. - (display_menu): Remove this and that argument. Remove - just_compute_this_one_p. Fill pixmap at start and copy it to window - at end. + (display_menu): Remove this and that argument. + Remove just_compute_this_one_p. Fill pixmap at start and copy it to + window at end. (expose_cb): New function. (make_windows_if_needed): Replace XCreateWindow with XtCreatePopup. - Add eventhandler for expose to expose_cb. Remove creation of - xft_draw. + Add eventhandler for expose to expose_cb. Remove creation of xft_draw. (create_pixmap_for_menu): New function. (remap_menubar): Pop down menus that aren't the same as in old_stack. - Set width, heigh, x, y on widget with XtVaSetValues. Call - create_pixmap_for_menu. + Set width, heigh, x, y on widget with XtVaSetValues. + Call create_pixmap_for_menu. Replace XUnmapWindow with XtPopdown. Remowe two last parameters to display_menu. (map_event_to_widget_value, XlwMenuRedisplay, Key, Select)
--- a/lwlib/xlwmenu.c Fri May 07 07:47:33 2010 +0000 +++ b/lwlib/xlwmenu.c Sun May 09 22:52:44 2010 +0000 @@ -2177,7 +2177,6 @@ { if (mw->menu.windows [i].pixmap != None) XFreePixmap (XtDisplay (mw), mw->menu.windows [i].pixmap); - XtDestroyWidget (mw->menu.windows [i].w); #ifdef HAVE_XFT if (mw->menu.windows [i].xft_draw) XftDrawDestroy (mw->menu.windows [i].xft_draw);
--- a/msdos/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/msdos/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,32 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + +2010-05-08 Glenn Morris <rgm@gnu.org> + + * sed1v2.inp (LIBS_TERMCAP): Edit to empty. + (TERMCAP_OBJ): Edit to tparam.o. + +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + Fix breakage due to autoconfiscation of Makefile.in files. + + * sed3v2.inp (C_SWITCH_MACHINE): Edit to empty. + + * sed1v2.inp (@LIB_MATH@): Edit to -lm. + (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS) + (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH) + (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG) + (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS) + (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM) + (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ) + (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty. + (XMENU_OBJ): Edit to xmenu.o. + (FONT_OBJ): Edit to value used for X on Unix. + (PRE_ALLOC_OBJ): Edit to lastfile.o. + (POST_ALLOC_OBJ): Edit to $(vmlimitobj). + (@unexec@): Edit to unexec.o. + 2010-05-06 Glenn Morris <rgm@gnu.org> * sed1v2.inp, sed5x.inp: Remove LN_S, unused.
--- a/msdos/sed1v2.inp Fri May 07 07:47:33 2010 +0000 +++ b/msdos/sed1v2.inp Sun May 09 22:52:44 2010 +0000 @@ -38,17 +38,55 @@ /^CPPFLAGS *=/s/@[^@\n]*@// /^LDFLAGS *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// +s/@LIB_MATH@/-lm/ /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g } /^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/ -/^GETLOADAVG_LIBS *=/s/@[^@\n]*@// +/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// +/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// +/^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// +/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// +/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// +/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// +/^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// +/^LIBTIFF *=/s/@LIBTIFF@// +/^LIBJPEG *=/s/@LIBJPEG@// +/^LIBPNG *=/s/@LIBPNG@// +/^LIBGIF *=/s/@LIBGIF@// +/^LIBXPM *=/s/@LIBXPM@// +/^XFT_LIBS *=/s/@XFT_LIBS@// +/^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@// +/^DBUS_LIBS *=/s/@DBUS_LIBS@// +/^DBUS_OBJ *=/s/@DBUS_OBJ@// +/^GCONF_CFLAGS *=/s/@GCONF_CFLAGS@// +/^GCONF_LIBS *=/s/@GCONF_LIBS@// +/^GTK_OBJ *=/s/@GTK_OBJ@// +/^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// +/^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/tparam.o/ +/^LIBXMU *=/s/@LIBXMU@// +/^LIBXSM *=/s/@LIBXSM@// +/^LIBXTR6 *=/s/@LIBXTR6@// +/^XOBJ *=/s/@XOBJ@// +/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// +/^WIDGET_OBJ *=/s/@WIDGET_OBJ@// +/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// +/^NS_OBJ *=/s/@NS_OBJ@// +/^NS_SUPPORT *=/s/@NS_SUPPORT@// +/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// +/^GETLOADAVG_LIBS *=/s/@[^@\n]*@// +/^START_FILES *=/s/@START_FILES@// /^OTHER_FILES *=/s/@OTHER_FILES@// +/^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ +/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/ /^EXEEXT *=/s/@EXEEXT@/.exe/ +/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ +/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ +s/@unexec@/unexec.o/g /^version *=/s/@[^@\n]*@// /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
--- a/msdos/sed3v2.inp Fri May 07 07:47:33 2010 +0000 +++ b/msdos/sed3v2.inp Sun May 09 22:52:44 2010 +0000 @@ -36,6 +36,7 @@ /^LIBS_MAIL *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! +/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^LOADLIBES *=/s!=.*$!=! /^ALLOCA *=/s!@ALLOCA@!! /^EXEEXT *=/s!@EXEEXT@!!
--- a/nextstep/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/nextstep/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2.
--- a/nt/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/nt/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,7 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-04 Glenn Morris <rgm@gnu.org> * config.nt (LD_SWITCH_X_SITE_AUX): Remove. @@ -55,8 +59,8 @@ 2009-01-26 Jason Rumney <jasonr@gnu.org> - * emacsclient.rc, emacs.rc: Swap name and description. Remove - Windows versions. + * emacsclient.rc, emacs.rc: Swap name and description. + Remove Windows versions. 2009-01-15 Jason Rumney <jasonr@gnu.org>
--- a/oldXMenu/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/oldXMenu/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,15 +1,19 @@ +2010-05-07 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + 2010-05-06 Glenn Morris <rgm@gnu.org> * Makefile.in (RANLIB): Let configure set it. - (libXMenu11.a): configure sets RANLIB = : on systems without it. + (libXMenu11.a): Configure sets RANLIB = : on systems without it. * Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE) (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables. 2010-05-04 Glenn Morris <rgm@gnu.org> - * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Use - @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@ rather than + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): + Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@ rather than @c_switch_system@, @c_switch_machine@. 2010-04-27 Dan Nicolaescu <dann@ics.uci.edu>
--- a/src/ChangeLog Fri May 07 07:47:33 2010 +0000 +++ b/src/ChangeLog Sun May 09 22:52:44 2010 +0000 @@ -1,3 +1,112 @@ +2010-05-08 Chong Yidong <cyd@stupidchicken.com> + + * Version 23.2 released. + +2010-05-08 Andreas Schwab <schwab@linux-m68k.org> + + * 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-05-08 Kenichi Handa <handa@m17n.org> + + * ftfont.c (M17N_FLT_USE_NEW_FEATURE): Define it if we can use the + new feature of libotf and m17n-flt. + (ftfont_check_otf) [M17N_FLT_USE_NEW_FEATURE]: + Call OTF_check_features even if no specific feature is given. + (PACK_OTF_TAG) [M17N_FLT_USE_NEW_FEATURE]: New macro. + (ftfont_drive_otf) [M17N_FLT_USE_NEW_FEATURE]: Handle the case + that OUT is NULL. Use OTF_drive_gsub_with_log and + OTF_drive_gpos_with_log instead of OTF_drive_gsub and + OTF_drive_gpos. + (ftfont_try_otf) [M17N_FLT_USE_NEW_FEATURE]: New function. + (ftfont_shape_by_flt) [M17N_FLT_USE_NEW_FEATURE]: + Setup mflt_enable_new_feature and mflt_try_otf. + +2010-05-08 Jan Djärv <jan.h.d@swipnet.se> + + * xsettings.c (Ftool_bar_get_system_style): Correct comment. + + * gtkutil.c (xg_pack_tool_bar): Change show_all to show for handle + box and toolbar (Bug #6139). + (xg_create_tool_bar): Remove comment (Bug #6139). + (xg_make_tool_item): Remove gtk_widget_show_all (Bug #6139). + (xg_show_toolbar_item): Add gtk_widget_show for weventbox (Bug #6139). + +2010-05-08 Juanma Barranquero <lekktu@gmail.com> + + * makefile.w32-in ($(BLD)/eval.$(O), $(BLD)/w32fns.$(O)): + Update dependencies. + +2010-05-08 Eli Zaretskii <eliz@gnu.org> + + * fringe.c (update_window_fringes): Set up truncation bitmaps for + R2L lines. + +2010-05-08 Glenn Morris <rgm@gnu.org> + + * Makefile.in (THIS_IS_MAKEFILE): Remove, unused. + + * Makefile.in (LIBS_TERMCAP): Set with configure, not cpp. + (TERMCAP_OBJ): New, set by configure, replacing termcapobj. + (termcapobj): Replace with TERMCAP_OBJ. + (otherobj): Use $TERMCAP_OBJ instead of $termcapobj. + (LIBES): Use LIBS_TERMCAP as a variable. + + * s/freebsd.h (osreldate.h): No longer include, since this file + does not use __FreeBSD_version any more. + + * s/aix4-2.h (TERMINFO): + * s/cygwin.h (TERMINFO): + * s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]: + * s/freebsd.h (TERMINFO, LIBS_TERMCAP): + * s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]: + * s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]: + * s/hpux10-20.h (TERMINFO, LIBS_TERMCAP): + * s/irix6-5.h (TERMINFO): + * s/netbsd.h (LIBS_TERMCAP): + * s/openbsd.h (TERMINFO, LIBS_TERMCAP): + * s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]: + * s/usg5-4.h (TERMINFO): + Move to configure. + +2010-05-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * eval.c (unbind_to): Don't unbind a local binding into the global + binding when the local binding disappeared. Inversely, don't unbind + a global binding into a newly created local binding. + * data.c (set_internal): Make its `buf' arg into a `where' arg so we + can specify the frame to use, when applicable. Adjust callers. + +2010-05-07 Vincent Belaïche <vincent.belaiche@gmail.com> + Stefan Monnier <monnier@iro.umontreal.ca> + + * floatfns.c (Fisnan, Fcopysign, Ffrexp, Fldexp): New functions. + +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + * w32fns.c: Include w32.h. + (Fw32_shell_execute): Decode the error message before passing it + to `error'. (Bug#6126) + + * msdos.c (dos_set_window_size): + * w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)' + instead of `XSYMBOL (foo)->value'. + +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + Fix the MS-DOS build, broken by autoconfiscation. + + * Makefile.in: Don't use Make-style comments past the "start of + cpp stuff" line. + (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ). + + * s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is + edited directly by msdos/sed1v2.inp). + 2010-05-07 Glenn Morris <rgm@gnu.org> * Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
--- a/src/Makefile.in Fri May 07 07:47:33 2010 +0000 +++ b/src/Makefile.in Sun May 09 22:52:44 2010 +0000 @@ -105,6 +105,11 @@ GTK_OBJ=@GTK_OBJ@ +## -ltermcap, or -lncurses, or -lcurses, or "". +LIBS_TERMCAP=@LIBS_TERMCAP@ +## terminfo.o if TERMINFO, else tparam.o. +TERMCAP_OBJ=@TERMCAP_OBJ@ + LIBXMU=@LIBXMU@ LIBXSM=@LIBXSM@ @@ -165,7 +170,6 @@ /* just to be sure the sh is used */ SHELL=/bin/sh -#define THIS_IS_MAKEFILE #define NOT_C_CODE #include "config.h" @@ -240,8 +244,8 @@ $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< #ifdef HAVE_X_WINDOWS -/* This test needs to say in cpp for the time being, since s/ms-w32.h and - s/msdos.h define HAVE_MENUS, possibly overriding configure. */ +/* This test needs to say in cpp for the time being, since s/msdos.h + defines HAVE_MENUS, and does not use the configure script. */ #ifdef HAVE_MENUS OLDXMENU=@OLDXMENU@ LIBXMENU=@LIBXMENU@ @@ -321,9 +325,10 @@ #ifdef MSDOS #ifdef HAVE_X_WINDOWS -MSDOS_OBJ = dosfns.o msdos.o xmenu.o +MSDOS_OBJ = dosfns.o msdos.o +#define LIBS_SYSTEM -lxext -lsys #else -MSDOS_OBJ = dosfns.o msdos.o w16select.o xmenu.o termcap.o +MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o #endif #endif @@ -367,21 +372,6 @@ w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) - -#ifdef TERMINFO -/* Used to be -ltermcap here. If your machine needs that, - define LIBS_TERMCAP in the m/MACHINE.h file. */ -#ifndef LIBS_TERMCAP -#define LIBS_TERMCAP -lcurses -#endif /* LIBS_TERMCAP */ -termcapobj = terminfo.o -#else /* ! defined (TERMINFO) */ -#ifndef LIBS_TERMCAP -#define LIBS_TERMCAP -#endif /* LIBS_TERMCAP */ -termcapobj = tparam.o -#endif /* ! defined (TERMINFO) */ - gmallocobj = rallocobj = vmlimitobj = @@ -397,13 +387,13 @@ vmlimitobj = vm-limit.o #endif /* !SYSTEM_MALLOC */ -## Empty on Cygwin, lastfile.o elsewhere. +/* Empty on Cygwin, lastfile.o elsewhere. */ PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@ -## lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere. +/* lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere. */ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@ /* List of object files that make-docfile should not be told about. */ -otherobj= $(termcapobj) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \ +otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \ $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS) #ifdef HAVE_MOUSE @@ -666,7 +656,7 @@ with GCC, we might need gnulib again after them. */ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ - $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \ + $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM $(LIBS_TERMCAP) \ $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR)
--- a/src/bytecode.c Fri May 07 07:47:33 2010 +0000 +++ b/src/bytecode.c Sun May 09 22:52:44 2010 +0000 @@ -604,7 +604,7 @@ else { BEFORE_POTENTIAL_GC (); - set_internal (sym, val, current_buffer, 0); + set_internal (sym, val, Qnil, 0); AFTER_POTENTIAL_GC (); } }
--- a/src/composite.c Fri May 07 07:47:33 2010 +0000 +++ b/src/composite.c Sun May 09 22:52:44 2010 +0000 @@ -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); } }
--- a/src/config.in Fri May 07 07:47:33 2010 +0000 +++ b/src/config.in Sun May 09 22:52:44 2010 +0000 @@ -135,6 +135,9 @@ /* Define to 1 if you have the <com_err.h> header file. */ #undef HAVE_COM_ERR_H +/* Define to 1 if you have the `copysign' function. */ +#undef HAVE_COPYSIGN + /* Define to 1 if using D-Bus. */ #undef HAVE_DBUS @@ -300,6 +303,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `isnan' function. */ +#undef HAVE_ISNAN + /* Define to 1 if you have the jpeg library (-ljpeg). */ #undef HAVE_JPEG @@ -315,10 +321,10 @@ /* Define to 1 if you have the <kerberos/krb.h> header file. */ #undef HAVE_KERBEROS_KRB_H -/* Define to 1 if `e_text' is a member of `krb5_error'. */ +/* Define to 1 if `e_text' is member of `krb5_error'. */ #undef HAVE_KRB5_ERROR_E_TEXT -/* Define to 1 if `text' is a member of `krb5_error'. */ +/* Define to 1 if `text' is member of `krb5_error'. */ #undef HAVE_KRB5_ERROR_TEXT /* Define to 1 if you have the <krb5.h> header file. */ @@ -606,25 +612,25 @@ /* Define to 1 if you have the `strsignal' function. */ #undef HAVE_STRSIGNAL -/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */ +/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_ADDR -/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */ +/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR -/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */ +/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_FLAGS -/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ +/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_HWADDR -/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */ +/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_NETMASK -/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */ +/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */ #undef HAVE_STRUCT_NLIST_N_UN_N_NAME -/* Define to 1 if `tm_zone' is a member of `struct tm'. */ +/* Define to 1 if `tm_zone' is member of `struct tm'. */ #undef HAVE_STRUCT_TM_TM_ZONE /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */ @@ -847,9 +853,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -884,6 +887,9 @@ /* Process async input synchronously. */ #undef SYNC_INPUT +/* Define to 1 if you use terminfo instead of termcap. */ +#undef TERMINFO + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME @@ -906,28 +912,6 @@ /* Define to 1 if using the Motif X toolkit. */ #undef USE_MOTIF -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - /* Define to 1 if we should use toolkit scroll bars. */ #undef USE_TOOLKIT_SCROLL_BARS @@ -963,6 +947,28 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Define to rpl_ if the getopt replacement functions and variables should be used. */ #undef __GETOPT_PREFIX
--- a/src/data.c Fri May 07 07:47:33 2010 +0000 +++ b/src/data.c Sun May 09 22:52:44 2010 +0000 @@ -1156,7 +1156,7 @@ (symbol, newval) register Lisp_Object symbol, newval; { - set_internal (symbol, newval, current_buffer, 0); + set_internal (symbol, newval, Qnil, 0); return newval; } @@ -1196,29 +1196,25 @@ } /* Store the value NEWVAL into SYMBOL. - If buffer-locality is an issue, BUF specifies which buffer to use. - (0 stands for the current buffer.) + If buffer/frame-locality is an issue, WHERE specifies which context to use. + (nil stands for the current buffer/frame). If BINDFLAG is zero, then if this symbol is supposed to become local in every buffer where it is set, then we make it local. If BINDFLAG is nonzero, we don't do that. */ void -set_internal (symbol, newval, buf, bindflag) - register Lisp_Object symbol, newval; - struct buffer *buf; +set_internal (symbol, newval, where, bindflag) + register Lisp_Object symbol, newval, where; int bindflag; { int voide = EQ (newval, Qunbound); struct Lisp_Symbol *sym; Lisp_Object tem1; - if (buf == 0) - buf = current_buffer; - /* If restoring in a dead buffer, do nothing. */ - if (NILP (buf->name)) - return; + /* if (BUFFERP (where) && NILP (XBUFFER (where)->name)) + return; */ CHECK_SYMBOL (symbol); if (SYMBOL_CONSTANT_P (symbol)) @@ -1241,15 +1237,19 @@ case SYMBOL_LOCALIZED: { struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); - Lisp_Object tmp; XSETBUFFER (tmp, buf); - + if (NILP (where)) + { + if (blv->frame_local) + where = selected_frame; + else + XSETBUFFER (where, current_buffer); + } /* If the current buffer is not the buffer whose binding is loaded, or if there may be frame-local bindings and the frame isn't the right one, or if it's a Lisp_Buffer_Local_Value and the default binding is loaded, the loaded binding may be the wrong one. */ - if (!EQ (blv->where, - blv->frame_local ? selected_frame : tmp) + if (!EQ (blv->where, where) /* Also unload a global binding (if the var is local_if_set). */ || (EQ (blv->valcell, blv->defcell))) { @@ -1261,19 +1261,12 @@ SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd)); /* Find the new binding. */ - { - XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ - if (blv->frame_local) - { - tem1 = Fassq (symbol, XFRAME (selected_frame)->param_alist); - blv->where = selected_frame; - } - else - { - tem1 = Fassq (symbol, buf->local_var_alist); - blv->where = tmp; - } - } + XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ + tem1 = Fassq (symbol, + (blv->frame_local + ? XFRAME (where)->param_alist + : XBUFFER (where)->local_var_alist)); + blv->where = where; blv->found = 1; if (NILP (tem1)) @@ -1303,8 +1296,8 @@ bindings, not for frame-local bindings. */ eassert (!blv->frame_local); tem1 = Fcons (symbol, XCDR (blv->defcell)); - buf->local_var_alist - = Fcons (tem1, buf->local_var_alist); + XBUFFER (where)->local_var_alist + = Fcons (tem1, XBUFFER (where)->local_var_alist); } } @@ -1322,12 +1315,16 @@ buffer-local indicator, not through Lisp_Objfwd, etc. */ blv->fwd = NULL; else - store_symval_forwarding (blv->fwd, newval, buf); + store_symval_forwarding (blv->fwd, newval, + BUFFERP (where) + ? XBUFFER (where) : current_buffer); } break; } case SYMBOL_FORWARDED: { + struct buffer *buf + = BUFFERP (where) ? XBUFFER (where) : current_buffer; union Lisp_Fwd *innercontents = SYMBOL_FWD (sym); if (BUFFER_OBJFWDP (innercontents)) {
--- a/src/eval.c Fri May 07 07:47:33 2010 +0000 +++ b/src/eval.c Sun May 09 22:52:44 2010 +0000 @@ -26,6 +26,7 @@ #include "commands.h" #include "keyboard.h" #include "dispextern.h" +#include "frame.h" /* For XFRAME. */ #if HAVE_X_WINDOWS #include "xterm.h" @@ -786,7 +787,7 @@ so that old-code that affects n_a before the aliasing is setup still works. */ if (NILP (Fboundp (base_variable))) - set_internal (base_variable, find_symbol_value (new_alias), NULL, 1); + set_internal (base_variable, find_symbol_value (new_alias), Qnil, 1); { struct specbinding *p; @@ -3335,7 +3336,7 @@ if (!sym->constant) SET_SYMBOL_VAL (sym, value); else - set_internal (symbol, value, 0, 1); + set_internal (symbol, value, Qnil, 1); break; } case SYMBOL_LOCALIZED: case SYMBOL_FORWARDED: @@ -3395,7 +3396,7 @@ specpdl_ptr->symbol = symbol; specpdl_ptr++; - set_internal (symbol, value, 0, 1); + set_internal (symbol, value, Qnil, 1); break; } default: abort (); @@ -3457,27 +3458,26 @@ if (NILP (where)) Fset_default (symbol, this_binding.old_value); + /* If `where' is non-nil, reset the value in the appropriate + local binding, but only if that binding still exists. */ else if (BUFFERP (where)) - if (!NILP (Flocal_variable_p (symbol, where))) - set_internal (symbol, this_binding.old_value, XBUFFER (where), 1); - /* else if (!NILP (Fbuffer_live_p (where))) - error ("Unbinding local %s to global!", symbol); */ - else - ; - else - set_internal (symbol, this_binding.old_value, NULL, 1); + { + if (BUFFERP (where) + ? !NILP (Flocal_variable_p (symbol, where)) + : !NILP (Fassq (symbol, XFRAME (where)->param_alist))) + set_internal (symbol, this_binding.old_value, where, 1); + } } + /* If variable has a trivial value (no forwarding), we can + just set it. No need to check for constant symbols here, + since that was already done by specbind. */ + else if (XSYMBOL (this_binding.symbol)->redirect == SYMBOL_PLAINVAL) + SET_SYMBOL_VAL (XSYMBOL (this_binding.symbol), + this_binding.old_value); else - { - /* If variable has a trivial value (no forwarding), we can - just set it. No need to check for constant symbols here, - since that was already done by specbind. */ - if (XSYMBOL (this_binding.symbol)->redirect == SYMBOL_PLAINVAL) - SET_SYMBOL_VAL (XSYMBOL (this_binding.symbol), - this_binding.old_value); - else - set_internal (this_binding.symbol, this_binding.old_value, 0, 1); - } + /* NOTE: we only ever come here if make_local_foo was used for + the first time on this var within this let. */ + Fset_default (this_binding.symbol, this_binding.old_value); } if (NILP (Vquit_flag) && !NILP (quitf))
--- a/src/fileio.c Fri May 07 07:47:33 2010 +0000 +++ b/src/fileio.c Sun May 09 22:52:44 2010 +0000 @@ -299,7 +299,7 @@ /* Restore point, having saved it as a marker. */ -static Lisp_Object +Lisp_Object restore_point_unwind (location) Lisp_Object location; {
--- a/src/floatfns.c Fri May 07 07:47:33 2010 +0000 +++ b/src/floatfns.c Sun May 09 22:52:44 2010 +0000 @@ -288,6 +288,70 @@ IN_FLOAT (d = sin (d) / c, "tan", arg); return make_float (d); } + +#if defined HAVE_ISNAN && defined HAVE_COPYSIGN +DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0, + doc: /* Return non nil iff argument X is a NaN. */) + (x) + Lisp_Object x; +{ + CHECK_FLOAT (x); + return isnan (XFLOAT_DATA (x)) ? Qt : Qnil; +} + +DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0, + doc: /* Copy sign of X2 to value of X1, and return the result. +Cause an error if X1 or X2 is not a float. */) + (x1, x2) + Lisp_Object x1, x2; +{ + double f1, f2; + + CHECK_FLOAT (x1); + CHECK_FLOAT (x2); + + f1 = XFLOAT_DATA (x1); + f2 = XFLOAT_DATA (x2); + + return make_float (copysign (f1, f2)); +} + +DEFUN ("frexp", Ffrexp, Sfrexp, 1, 1, 0, + doc: /* Get significand and exponent of a floating point number. +Breaks the floating point number X into its binary significand SGNFCAND +\(a floating point value between 0.5 (included) and 1.0 (excluded)) +and an integral exponent EXP for 2, such that: + + X = SGNFCAND * 2^EXP + +The function returns the cons cell (SGNFCAND . EXP). +If X is zero, both parts (SGNFCAND and EXP) are zero. */) + (x) + Lisp_Object x; +{ + double f = XFLOATINT (x); + + if (f == 0.0) + return Fcons (make_float (0.0), make_number (0)); + else + { + int exp; + double sgnfcand = frexp (f, &exp); + return Fcons (make_float (sgnfcand), make_number (exp)); + } +} + +DEFUN ("ldexp", Fldexp, Sldexp, 1, 2, 0, + doc: /* Construct number X from significand SGNFCAND and exponent EXP. +Returns the floating point value resulting from multiplying SGNFCAND +(the significand) by 2 raised to the power of EXP (the exponent). */) + (sgnfcand, exp) + Lisp_Object sgnfcand, exp; +{ + CHECK_NUMBER (exp); + return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exp))); +} +#endif #if 0 /* Leave these out unless we find there's a reason for them. */ @@ -1017,6 +1081,12 @@ defsubr (&Scos); defsubr (&Ssin); defsubr (&Stan); +#if defined HAVE_ISNAN && defined HAVE_COPYSIGN + defsubr (&Sisnan); + defsubr (&Scopysign); + defsubr (&Sfrexp); + defsubr (&Sldexp); +#endif #if 0 defsubr (&Sacosh); defsubr (&Sasinh);
--- a/src/fringe.c Fri May 07 07:47:33 2010 +0000 +++ b/src/fringe.c Sun May 09 22:52:44 2010 +0000 @@ -1082,7 +1082,8 @@ left = row->left_user_fringe_bitmap; left_face_id = row->left_user_fringe_face_id; } - else if (row->truncated_on_left_p) + else if ((!row->reversed_p && row->truncated_on_left_p) + || (row->reversed_p && row->truncated_on_right_p)) left = LEFT_FRINGE(0, Qtruncation, 0); else if (row->indicate_bob_p && EQ (boundary_top, Qleft)) left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft)) @@ -1110,7 +1111,8 @@ right = row->right_user_fringe_bitmap; right_face_id = row->right_user_fringe_face_id; } - else if (row->truncated_on_right_p) + else if ((!row->reversed_p && row->truncated_on_right_p) + || (row->reversed_p && row->truncated_on_left_p)) right = RIGHT_FRINGE (0, Qtruncation, 0); else if (row->indicate_bob_p && EQ (boundary_top, Qright)) right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
--- a/src/ftfont.c Fri May 07 07:47:33 2010 +0000 +++ b/src/ftfont.c Sun May 09 22:52:44 2010 +0000 @@ -1578,6 +1578,14 @@ #ifdef HAVE_M17N_FLT +#if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \ + && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)) +/* We can use the new feature of libotf and m17n-flt to handle the + character encoding scheme introduced in Unicode 5.1 and 5.2 for + some Agian scripts. */ +#define M17N_FLT_USE_NEW_FEATURE +#endif + struct MFLTFontFT { MFLTFont flt_font; @@ -1696,10 +1704,16 @@ else tags[n] = spec->features[i][n]; } +#ifdef M17N_FLT_USE_NEW_FEATURE + if (OTF_check_features (otf, i == 0, spec->script, spec->langsys, + tags, n - negative) != 1) + return 0; +#else /* not M17N_FLT_USE_NEW_FEATURE */ if (n - negative > 0 && OTF_check_features (otf, i == 0, spec->script, spec->langsys, tags, n - negative) != 1) return 0; +#endif /* not M17N_FLT_USE_NEW_FEATURE */ } return 1; } @@ -1757,6 +1771,356 @@ memset (otf_gstring.glyphs, 0, sizeof (OTF_Glyph) * size); } +#ifdef M17N_FLT_USE_NEW_FEATURE + +/* Pack 32-bit OTF tag (0x7F7F7F7F) into 28-bit (0x0FFFFFFF). */ +#define PACK_OTF_TAG(TAG) \ + ((((TAG) & 0x7F000000) >> 3) \ + | (((TAG) & 0x7F0000) >> 2) \ + | (((TAG) & 0x7F00) >> 1) \ + | ((TAG) & 0x7F)) + +/* Assuming that FONT is an OpenType font, apply OpenType features + specified in SPEC on glyphs between FROM and TO of IN, and record + the lastly applied feature in each glyph of IN. If OUT is not + NULL, append the resulting glyphs to OUT while storing glyph + position adjustment information in ADJUSTMENT. */ + +static int +ftfont_drive_otf (font, spec, in, from, to, out, adjustment) + MFLTFont *font; + MFLTOtfSpec *spec; + MFLTGlyphString *in; + int from, to; + MFLTGlyphString *out; + MFLTGlyphAdjustment *adjustment; +{ + struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font; + FT_Face ft_face = flt_font_ft->ft_face; + OTF *otf = flt_font_ft->otf; + int len = to - from; + int i, j, gidx; + OTF_Glyph *otfg; + char script[5], *langsys = NULL; + char *gsub_features = NULL, *gpos_features = NULL; + OTF_Feature *features; + + if (len == 0) + return from; + OTF_tag_name (spec->script, script); + if (spec->langsys) + { + langsys = alloca (5); + OTF_tag_name (spec->langsys, langsys); + } + for (i = 0; i < 2; i++) + { + char *p; + + if (spec->features[i] && spec->features[i][1] != 0xFFFFFFFF) + { + for (j = 0; spec->features[i][j]; j++); + if (i == 0) + p = gsub_features = alloca (6 * j); + else + p = gpos_features = alloca (6 * j); + for (j = 0; spec->features[i][j]; j++) + { + if (spec->features[i][j] == 0xFFFFFFFF) + *p++ = '*', *p++ = ','; + else + { + OTF_tag_name (spec->features[i][j], p); + p[4] = ','; + p += 5; + } + } + *--p = '\0'; + } + } + + setup_otf_gstring (len); + for (i = 0; i < len; i++) + { + otf_gstring.glyphs[i].c = in->glyphs[from + i].c; + otf_gstring.glyphs[i].glyph_id = in->glyphs[from + i].code; + } + + OTF_drive_gdef (otf, &otf_gstring); + gidx = out ? out->used : from; + + if (gsub_features && out) + { + if (OTF_drive_gsub_with_log (otf, &otf_gstring, script, langsys, + gsub_features) < 0) + goto simple_copy; + if (out->allocated < out->used + otf_gstring.used) + return -2; + features = otf->gsub->FeatureList.Feature; + for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; ) + { + MFLTGlyph *g; + int min_from, max_to; + int j; + int feature_idx = otfg->positioning_type >> 4; + + g = out->glyphs + out->used; + *g = in->glyphs[from + otfg->f.index.from]; + if (g->code != otfg->glyph_id) + { + g->c = 0; + g->code = otfg->glyph_id; + g->measured = 0; + } + out->used++; + min_from = g->from; + max_to = g->to; + if (otfg->f.index.from < otfg->f.index.to) + { + /* OTFG substitutes multiple glyphs in IN. */ + for (j = from + otfg->f.index.from + 1; + j <= from + otfg->f.index.to; j++) + { + if (min_from > in->glyphs[j].from) + min_from = in->glyphs[j].from; + if (max_to < in->glyphs[j].to) + max_to = in->glyphs[j].to; + } + g->from = min_from; + g->to = max_to; + } + if (feature_idx) + { + unsigned int tag = features[feature_idx - 1].FeatureTag; + tag = PACK_OTF_TAG (tag); + g->internal = (g->internal & ~0x1FFFFFFF) | tag; + } + for (i++, otfg++; (i < otf_gstring.used + && otfg->f.index.from == otfg[-1].f.index.from); + i++, otfg++) + { + g = out->glyphs + out->used; + *g = in->glyphs[from + otfg->f.index.to]; + if (g->code != otfg->glyph_id) + { + g->c = 0; + g->code = otfg->glyph_id; + g->measured = 0; + } + feature_idx = otfg->positioning_type >> 4; + if (feature_idx) + { + unsigned int tag = features[feature_idx - 1].FeatureTag; + tag = PACK_OTF_TAG (tag); + g->internal = (g->internal & ~0x1FFFFFFF) | tag; + } + out->used++; + } + } + } + else if (gsub_features) + { + /* Just for checking which features will be applied. */ + if (OTF_drive_gsub_with_log (otf, &otf_gstring, script, langsys, + gsub_features) < 0) + goto simple_copy; + features = otf->gsub->FeatureList.Feature; + for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; i++, + otfg++) + { + int feature_idx = otfg->positioning_type >> 4; + + if (feature_idx) + { + unsigned int tag = features[feature_idx - 1].FeatureTag; + tag = PACK_OTF_TAG (tag); + for (j = otfg->f.index.from; j <= otfg->f.index.to; j++) + { + MFLTGlyph *g = in->glyphs + (from + j); + g->internal = (g->internal & ~0x1FFFFFFF) | tag; + } + } + } + } + else if (out) + { + if (out->allocated < out->used + len) + return -2; + for (i = 0; i < len; i++) + out->glyphs[out->used++] = in->glyphs[from + i]; + } + + if (gpos_features && out) + { + MFLTGlyph *base = NULL, *mark = NULL, *g; + int x_ppem, y_ppem, x_scale, y_scale; + + if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys, + gpos_features) < 0) + return to; + features = otf->gpos->FeatureList.Feature; + x_ppem = ft_face->size->metrics.x_ppem; + y_ppem = ft_face->size->metrics.y_ppem; + x_scale = ft_face->size->metrics.x_scale; + y_scale = ft_face->size->metrics.y_scale; + + for (i = 0, otfg = otf_gstring.glyphs, g = out->glyphs + gidx; + i < otf_gstring.used; i++, otfg++, g++) + { + MFLTGlyph *prev; + int feature_idx = otfg->positioning_type >> 4; + + if (feature_idx) + { + unsigned int tag = features[feature_idx - 1].FeatureTag; + tag = PACK_OTF_TAG (tag); + g->internal = (g->internal & ~0x1FFFFFFF) | tag; + } + + if (! otfg->glyph_id) + continue; + switch (otfg->positioning_type & 0xF) + { + case 0: + break; + case 1: /* Single */ + case 2: /* Pair */ + { + int format = otfg->f.f1.format; + + if (format & OTF_XPlacement) + adjustment[i].xoff + = otfg->f.f1.value->XPlacement * x_scale / 0x10000; + if (format & OTF_XPlaDevice) + adjustment[i].xoff + += DEVICE_DELTA (otfg->f.f1.value->XPlaDevice, x_ppem); + if (format & OTF_YPlacement) + adjustment[i].yoff + = - (otfg->f.f1.value->YPlacement * y_scale / 0x10000); + if (format & OTF_YPlaDevice) + adjustment[i].yoff + -= DEVICE_DELTA (otfg->f.f1.value->YPlaDevice, y_ppem); + if (format & OTF_XAdvance) + adjustment[i].xadv + += otfg->f.f1.value->XAdvance * x_scale / 0x10000; + if (format & OTF_XAdvDevice) + adjustment[i].xadv + += DEVICE_DELTA (otfg->f.f1.value->XAdvDevice, x_ppem); + if (format & OTF_YAdvance) + adjustment[i].yadv + += otfg->f.f1.value->YAdvance * y_scale / 0x10000; + if (format & OTF_YAdvDevice) + adjustment[i].yadv + += DEVICE_DELTA (otfg->f.f1.value->YAdvDevice, y_ppem); + adjustment[i].set = 1; + } + break; + case 3: /* Cursive */ + /* Not yet supported. */ + break; + case 4: /* Mark-to-Base */ + case 5: /* Mark-to-Ligature */ + if (! base) + break; + prev = base; + goto label_adjust_anchor; + default: /* i.e. case 6 Mark-to-Mark */ + if (! mark) + break; + prev = mark; + + label_adjust_anchor: + { + int base_x, base_y, mark_x, mark_y; + int this_from, this_to; + + base_x = otfg->f.f4.base_anchor->XCoordinate * x_scale / 0x10000; + base_y = otfg->f.f4.base_anchor->YCoordinate * y_scale / 0x10000; + mark_x = otfg->f.f4.mark_anchor->XCoordinate * x_scale / 0x10000; + mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 0x10000; + + if (otfg->f.f4.base_anchor->AnchorFormat != 1) + adjust_anchor (ft_face, otfg->f.f4.base_anchor, + prev->code, x_ppem, y_ppem, &base_x, &base_y); + if (otfg->f.f4.mark_anchor->AnchorFormat != 1) + adjust_anchor (ft_face, otfg->f.f4.mark_anchor, g->code, + x_ppem, y_ppem, &mark_x, &mark_y); + adjustment[i].xoff = (base_x - mark_x); + adjustment[i].yoff = - (base_y - mark_y); + adjustment[i].back = (g - prev); + adjustment[i].xadv = 0; + adjustment[i].advance_is_absolute = 1; + adjustment[i].set = 1; + this_from = g->from; + this_to = g->to; + for (j = 0; prev + j < g; j++) + { + if (this_from > prev[j].from) + this_from = prev[j].from; + if (this_to < prev[j].to) + this_to = prev[j].to; + } + for (; prev <= g; prev++) + { + prev->from = this_from; + prev->to = this_to; + } + } + } + if (otfg->GlyphClass == OTF_GlyphClass0) + base = mark = g; + else if (otfg->GlyphClass == OTF_GlyphClassMark) + mark = g; + else + base = g; + } + } + else if (gpos_features) + { + if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys, + gpos_features) < 0) + return to; + features = otf->gpos->FeatureList.Feature; + for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; + i++, otfg++) + if (otfg->positioning_type & 0xF) + { + int feature_idx = otfg->positioning_type >> 4; + + if (feature_idx) + { + unsigned int tag = features[feature_idx - 1].FeatureTag; + tag = PACK_OTF_TAG (tag); + for (j = otfg->f.index.from; j <= otfg->f.index.to; j++) + { + MFLTGlyph *g = in->glyphs + (from + j); + g->internal = (g->internal & ~0x1FFFFFFF) | tag; + } + } + } + } + return to; + + simple_copy: + if (! out) + return to; + if (out->allocated < out->used + len) + return -2; + font->get_metrics (font, in, from, to); + memcpy (out->glyphs + out->used, in->glyphs + from, + sizeof (MFLTGlyph) * len); + out->used += len; + return to; +} + +static int +ftfont_try_otf (MFLTFont *font, MFLTOtfSpec *spec, + MFLTGlyphString *in, int from, int to) +{ + return ftfont_drive_otf (font, spec, in, from, to, NULL, NULL); +} + +#else /* not M17N_FLT_USE_NEW_FEATURE */ static int ftfont_drive_otf (font, spec, in, from, to, out, adjustment) @@ -2011,6 +2375,8 @@ return to; } +#endif /* not M17N_FLT_USE_NEW_FEATURE */ + static MFLTGlyphString gstring; static int m17n_flt_initialized; @@ -2034,6 +2400,10 @@ if (! m17n_flt_initialized) { M17N_INIT (); +#ifdef M17N_FLT_USE_NEW_FEATURE + mflt_enable_new_feature = 1; + mflt_try_otf = ftfont_try_otf; +#endif /* M17N_FLT_USE_NEW_FEATURE */ m17n_flt_initialized = 1; }
--- a/src/gtkutil.c Fri May 07 07:47:33 2010 +0000 +++ b/src/gtkutil.c Sun May 09 22:52:44 2010 +0000 @@ -3778,7 +3778,9 @@ gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget, vbox_pos); - gtk_widget_show_all (x->handlebox_widget); + + gtk_widget_show (x->toolbar_widget); + gtk_widget_show (x->handlebox_widget); } /* Create a tool bar for frame F. */ @@ -3794,13 +3796,6 @@ gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar"); - /* We only have icons, so override any user setting. We could - use the caption property of the toolbar item (see update_frame_tool_bar - below), but some of those strings are long, making the toolbar so - long it does not fit on the screen. The GtkToolbar widget makes every - item equal size, so the longest caption determine the size of every - tool bar item. I think the creators of the GtkToolbar widget - counted on 4 or 5 character long strings. */ gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); gtk_toolbar_set_orientation (GTK_TOOLBAR (x->toolbar_widget), GTK_ORIENTATION_HORIZONTAL); @@ -3877,8 +3872,6 @@ G_CALLBACK (xg_tool_bar_callback), (gpointer) (EMACS_INT) i); - gtk_widget_show_all (GTK_WIDGET (ti)); - g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f); /* Catch expose events to overcome an annoying redraw bug, see @@ -3963,6 +3956,7 @@ else gtk_widget_hide (wlbl); if (show_image) gtk_widget_show (wimage); else gtk_widget_hide (wimage); + gtk_widget_show (GTK_WIDGET (weventbox)); gtk_widget_show (GTK_WIDGET (vb)); gtk_widget_show (GTK_WIDGET (wbutton)); gtk_widget_show (GTK_WIDGET (ti));
--- a/src/lisp.h Fri May 07 07:47:33 2010 +0000 +++ b/src/lisp.h Sun May 09 22:52:44 2010 +0000 @@ -2381,7 +2381,7 @@ Lisp_Object)) NO_RETURN; extern Lisp_Object wrong_type_argument P_ ((Lisp_Object, Lisp_Object)) NO_RETURN; extern Lisp_Object do_symval_forwarding (union Lisp_Fwd *); -extern void set_internal (Lisp_Object, Lisp_Object, struct buffer *, int); +extern void set_internal (Lisp_Object, Lisp_Object, Lisp_Object, int); extern void syms_of_data P_ ((void)); extern void init_data P_ ((void)); extern void swap_in_global_binding P_ ((struct Lisp_Symbol *)); @@ -3059,6 +3059,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, Lisp_Object)); extern void syms_of_fileio P_ ((void));
--- a/src/makefile.w32-in Fri May 07 07:47:33 2010 +0000 +++ b/src/makefile.w32-in Sun May 09 22:52:44 2010 +0000 @@ -697,6 +697,7 @@ $(SRC)/commands.h \ $(SRC)/composite.h \ $(SRC)/dispextern.h \ + $(SRC)/frame.h \ $(SRC)/keyboard.h \ $(SRC)/systime.h \ $(SRC)/w32gui.h @@ -1554,6 +1555,7 @@ $(SRC)/keyboard.h \ $(SRC)/systime.h \ $(SRC)/termhooks.h \ + $(SRC)/w32.h \ $(SRC)/w32font.h \ $(SRC)/w32gui.h \ $(SRC)/w32heap.h \
--- a/src/msdos.c Fri May 07 07:47:33 2010 +0000 +++ b/src/msdos.c Sun May 09 22:52:44 2010 +0000 @@ -528,8 +528,7 @@ /* If the user specified a special video mode for these dimensions, use that mode. */ sprintf (video_name, "screen-dimensions-%dx%d", *rows, *cols); - video_mode = XSYMBOL (Fintern_soft (build_string (video_name), - Qnil))-> value; + video_mode = Fsymbol_value (Fintern_soft (build_string (video_name), Qnil)); if (INTEGERP (video_mode) && (video_mode_value = XINT (video_mode)) > 0)
--- a/src/s/aix4-2.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/aix4-2.h Sun May 09 22:52:44 2010 +0000 @@ -96,11 +96,6 @@ #define LIBS_SYSTEM -lrts -lIM -liconv #endif - -/* Use terminfo instead of termcap. */ - -#define TERMINFO - /* The following definition seems to be needed in AIX version 3.1.6.8. It may not have been needed in certain earlier versions. */ #define HAVE_TCATTR
--- a/src/s/cygwin.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/cygwin.h Sun May 09 22:52:44 2010 +0000 @@ -106,10 +106,6 @@ #define UNEXEC unexcw.o #define LINKER $(CC) -/* Use terminfo instead of termcap. Fewer environment variables to - go wrong, more terminal types. */ -#define TERMINFO - #define HAVE_SOCKETS /* vfork() interacts badly with setsid(), causing ptys to fail to
--- a/src/s/darwin.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/darwin.h Sun May 09 22:52:44 2010 +0000 @@ -179,16 +179,6 @@ #undef HAVE_POSIX_MEMALIGN #endif -/* The ncurses library has been moved out of the System framework in - Mac OS X 10.2. So if ./configure detects it, set the command-line - option to use it. */ -#ifdef HAVE_LIBNCURSES -#define LIBS_TERMCAP -lncurses -/* This prevents crashes when running Emacs in Terminal.app under - 10.2. */ -#define TERMINFO -#endif - /* Link this program just by running cc. */ #define ORDINARY_LINK
--- a/src/s/freebsd.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/freebsd.h Sun May 09 22:52:44 2010 +0000 @@ -22,8 +22,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -#include <osreldate.h> - /* Get most of the stuff from bsd-common */ #include "bsd-common.h" @@ -33,12 +31,6 @@ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) #define LIBS_SYSTEM -lutil -#if __FreeBSD_version < 400000 -#define LIBS_TERMCAP -ltermcap -#else -#define TERMINFO -#define LIBS_TERMCAP -lncurses -#endif #undef LIB_GCC #define LIB_GCC
--- a/src/s/gnu-linux.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/gnu-linux.h Sun May 09 22:52:44 2010 +0000 @@ -180,11 +180,6 @@ #undef LIB_GCC #define LIB_GCC -#ifdef HAVE_LIBNCURSES -#define TERMINFO -#define LIBS_TERMCAP -lncurses -#endif - #define UNEXEC unexelf.o /* This is to work around mysterious gcc failures in some system versions.
--- a/src/s/gnu.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/gnu.h Sun May 09 22:52:44 2010 +0000 @@ -28,13 +28,6 @@ #define SIGNALS_VIA_CHARACTERS -/* Tell Emacs that we are a terminfo based system; disable the use - of local termcap. (GNU uses ncurses.) */ -#ifdef HAVE_LIBNCURSES -#define TERMINFO -#define LIBS_TERMCAP -lncurses -#endif - /* Use mmap directly for allocating larger buffers. */ #ifdef DOUG_LEA_MALLOC #undef REL_ALLOC
--- a/src/s/hpux10-20.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/hpux10-20.h Sun May 09 22:52:44 2010 +0000 @@ -77,9 +77,6 @@ /* Special hacks needed to make Emacs run on this system. */ -/* Use the system provided termcap(3) library */ -#define TERMINFO - /* In hpux, the symbol SIGIO is defined, but the feature doesn't work in the way Emacs needs it to. */ @@ -140,16 +137,10 @@ #define HAVE_XRMSETDATABASE #endif -/* Make sure we get select from libc rather than from libcurses - because libcurses on HPUX 10.10 has a broken version of select. - We used to use -lc -lcurses, but this may be cleaner. */ -#define LIBS_TERMCAP -ltermcap - /* 2000-11-21: Temporarily disable Unix 98 large file support found by configure. It fails on HPUX 11, at least, because it enables header sections which lose when `static' is defined away, as it is on HP-UX. (You get duplicate symbol errors on linking). */ - #undef _FILE_OFFSET_BITS /* Define NO_REMAP if memory segmentation makes it not work well
--- a/src/s/irix6-5.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/irix6-5.h Sun May 09 22:52:44 2010 +0000 @@ -40,13 +40,8 @@ /* Make process_send_signal work by "typing" a signal character on the pty. */ #define SIGNALS_VIA_CHARACTERS -/* Use terminfo instead of termcap. */ - -#define TERMINFO - /* Letter to use in finding device name of first pty, if system supports pty's. 'a' means it is /dev/ptya0 */ - #undef FIRST_PTY_LETTER #define FIRST_PTY_LETTER 'q'
--- a/src/s/msdos.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/msdos.h Sun May 09 22:52:44 2010 +0000 @@ -131,7 +131,7 @@ /* We have (the code to control) a mouse. */ #define HAVE_MOUSE -/* We canuse mouse menus. */ +/* We can use mouse menus. */ #define HAVE_MENUS /* Define one of these for easier conditionals. */ @@ -163,7 +163,5 @@ #define NO_REMAP -#define UNEXEC unexec.o - /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0 (do not change this comment) */
--- a/src/s/netbsd.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/netbsd.h Sun May 09 22:52:44 2010 +0000 @@ -26,8 +26,6 @@ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -#define LIBS_TERMCAP -ltermcap - #undef LIB_GCC #define LIB_GCC
--- a/src/s/openbsd.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/openbsd.h Sun May 09 22:52:44 2010 +0000 @@ -1,13 +1,7 @@ /* System file for openbsd. */ -/* Mostly the same as NetBSD. */ +/* The same as NetBSD. Note there are differences in configure. */ #include "netbsd.h" -/* David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this - is necessary. Otherwise Emacs dumps core when run -nw. */ -#define TERMINFO -#undef LIBS_TERMCAP -#define LIBS_TERMCAP -lncurses - /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2 (do not change this comment) */
--- a/src/s/sol2-6.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/sol2-6.h Sun May 09 22:52:44 2010 +0000 @@ -1,7 +1,7 @@ /* Definitions file for GNU Emacs running on Solaris 2.6. - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -38,16 +38,8 @@ /* inoue@ainet.or.jp says Solaris has a bug related to X11R6-style XIM support. */ - #define INHIBIT_X11R6_XIM -/* Must use the system's termcap, if we use any termcap. - It does special things. */ - -#ifndef TERMINFO -#define LIBS_TERMCAP -ltermcap -#endif - /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock rather than sighold/sigrelse, which appear to be BSD4.1 specific. It may also be appropriate for SVR4.x
--- a/src/s/usg5-4.h Fri May 07 07:47:33 2010 +0000 +++ b/src/s/usg5-4.h Sun May 09 22:52:44 2010 +0000 @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 4 - Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -75,10 +76,6 @@ #define rindex strrchr #endif /* ! defined (HAVE_RINDEX) */ -/* Use terminfo instead of termcap. */ - -#define TERMINFO - /* The docs for system V/386 suggest v.3 has sigpause, so let's give it a try. */
--- a/src/w16select.c Fri May 07 07:47:33 2010 +0000 +++ b/src/w16select.c Sun May 09 22:52:44 2010 +0000 @@ -685,8 +685,8 @@ into the clipboard if we run under Windows, so we cannot check the clipboard alone.) */ if ((EQ (selection, Qnil) || EQ (selection, QPRIMARY)) - && ! NILP (SYMBOL_VALUE (Fintern_soft (build_string ("kill-ring"), - Qnil)))) + && ! NILP (Fsymbol_value (Fintern_soft (build_string ("kill-ring"), + Qnil)))) return Qt; if (EQ (selection, QCLIPBOARD))
--- a/src/w32fns.c Fri May 07 07:47:33 2010 +0000 +++ b/src/w32fns.c Sun May 09 22:52:44 2010 +0000 @@ -47,6 +47,7 @@ #include "systime.h" #include "termhooks.h" #include "w32heap.h" +#include "w32.h" #include "bitmaps/gray.xbm" @@ -6333,6 +6334,7 @@ Lisp_Object operation, document, parameters, show_flag; { Lisp_Object current_dir; + char *errstr; CHECK_STRING (document); @@ -6353,7 +6355,17 @@ XINT (show_flag) : SW_SHOWDEFAULT)) > 32) return Qt; - error ("ShellExecute failed: %s", w32_strerror (0)); + errstr = w32_strerror (0); + /* The error string might be encoded in the locale's encoding. */ + if (!NILP (Vlocale_coding_system)) + { + Lisp_Object decoded = + code_convert_string_norecord (make_unibyte_string (errstr, + strlen (errstr)), + Vlocale_coding_system, 0); + errstr = (char *)SDATA (decoded); + } + error ("ShellExecute failed: %s", errstr); } /* Lookup virtual keycode from string representing the name of a
--- a/src/xsettings.c Fri May 07 07:47:33 2010 +0000 +++ b/src/xsettings.c Sun May 09 22:52:44 2010 +0000 @@ -740,7 +740,7 @@ DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style, 0, 0, 0, doc: /* Get the system tool bar style. -If no system tool bar style is known, return `tool-bar-style' is set to a +If no system tool bar style is known, return `tool-bar-style' if set to a known style. Otherwise return image. */) () {