Mercurial > emacs
changeset 108516:93636843d51b
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Tue, 11 May 2010 12:54:50 +0000 |
| parents | fa6c01b64da2 (current diff) 0eeae12a33a9 (diff) |
| children | c17fcf610133 |
| files | |
| diffstat | 49 files changed, 327 insertions(+), 278 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -1,3 +1,12 @@ +2010-05-11 Glenn Morris <rgm@gnu.org> + + * make-dist (msdos): No more mainmake. + + * configure.in: Generate lib-src/Makefile directly, do not run cpp. + * config.bat: Do not run cpp on lib-src/Makefile.in. + + * config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile. + 2010-05-10 Glenn Morris <rgm@gnu.org> * configure.in (LIBS_SYSTEM): New output variable, replacing cpp. @@ -5864,7 +5873,7 @@ 1994-05-09 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) * configure.in: Remove AC_LANG_C call. Not needed with Autoconf - version > 1.8. + version > 1.8. 1994-05-08 Morten Welinder (terra@diku.dk)
--- a/admin/CPP-DEFINES Mon May 10 12:07:40 2010 +0000 +++ b/admin/CPP-DEFINES Tue May 11 12:54:50 2010 +0000 @@ -55,7 +55,6 @@ HAVE_TERMIO HAVE_TERMIOS INTERRUPT_INPUT -MAIL_USE_FLOCK NARROWPROTO SEPCHAR SIGTYPE @@ -220,6 +219,7 @@ LISP_FLOAT_TYPE LNOFLSH LOCALTIME_CACHE +MAIL_USE_FLOCK MAIL_USE_LOCKF MAIL_USE_POP MAIL_USE_SYSTEM_LOCK @@ -310,7 +310,6 @@ _WINSOCK_H __ELF__ __FreeBSD__ -__FreeBSD_version __GNUC__ __GNU_LIBRARY__ __GNUC_MINOR__
--- a/admin/notes/cpp Mon May 10 12:07:40 2010 +0000 +++ b/admin/notes/cpp Tue May 11 12:54:50 2010 +0000 @@ -1,11 +1,7 @@ ttn 2003-04-09 we use a C preprocesor not only in the normal compilation of .c files -into object files, but also for creating - - src/Makefile - lib-src/Makefile - +into object files, but also for creating src/Makefile. (delimited by comment "start of cpp stuff"). some cpp implementations insert whitespace in between tokens.
--- a/config.bat Mon May 10 12:07:40 2010 +0000 +++ b/config.bat Tue May 11 12:54:50 2010 +0000 @@ -221,16 +221,17 @@ rem ---------------------------------------------------------------------- Echo Configuring the library source directory... cd lib-src -rem Create "makefile" from "makefile.in". -sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c -gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ / /" -e "/^#/d" -e "/^[ ]*$/d" >makefile.new If "%DJGPP_VER%" == "2" goto libsrc-v2 -sed -f ../msdos/sed3.inp <makefile.new >Makefile +sed -f ../msdos/sed3.inp <Makefile.in >Makefile Goto libsrc2 :libsrc-v2 -sed -f ../msdos/sed3v2.inp <makefile.new >Makefile +sed -f ../msdos/sed3v2.inp <Makefile.in >Makefile :libsrc2 -rm -f makefile.new junk.c +if "%X11%" == "" goto libsrc2a +mv Makefile makefile.tmp +sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile +rm -f makefile.tmp +:libsrc2a if "%nodebug%" == "" goto libsrc3 sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile
--- a/configure Mon May 10 12:07:40 2010 +0000 +++ b/configure Tue May 11 12:54:50 2010 +0000 @@ -26690,7 +26690,7 @@ rm -f conftest* -ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile" +ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile" ac_config_commands="$ac_config_commands default" @@ -27289,7 +27289,7 @@ case $ac_config_target in "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; + "lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;; "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;; "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;; @@ -27934,22 +27934,6 @@ CPPFLAGS="$CPPFLAGS -traditional" fi -echo creating lib-src/Makefile -( cd lib-src - rm -f junk.c junk1.c junk2.c - sed -e '/start of cpp stuff/q' \ - < Makefile.c > junk1.c - sed -e '1,/start of cpp stuff/d'\ - -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ - < Makefile.c > junk.c - $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ - sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c - cat junk1.c junk2.c > Makefile.new - rm -f junk.c junk1.c junk2.c - chmod 444 Makefile.new - mv -f Makefile.new Makefile -) - echo creating src/Makefile ( cd src rm -f junk.c junk1.c junk2.c
--- a/configure.in Mon May 10 12:07:40 2010 +0000 +++ b/configure.in Tue May 11 12:54:50 2010 +0000 @@ -3595,7 +3595,7 @@ CPP_NEED_TRADITIONAL=no, CPP_NEED_TRADITIONAL=yes) -AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ +AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \ doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ doc/lispref/Makefile src/Makefile.c:src/Makefile.in \ lwlib/Makefile lisp/Makefile leim/Makefile, [ @@ -3619,22 +3619,6 @@ CPPFLAGS="$CPPFLAGS -traditional" fi -echo creating lib-src/Makefile -( cd lib-src - rm -f junk.c junk1.c junk2.c - sed -e '/start of cpp stuff/q' \ - < Makefile.c > junk1.c - sed -e '1,/start of cpp stuff/d'\ - -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ - < Makefile.c > junk.c - $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ - sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c - cat junk1.c junk2.c > Makefile.new - rm -f junk.c junk1.c junk2.c - chmod 444 Makefile.new - mv -f Makefile.new Makefile -) - echo creating src/Makefile ( cd src rm -f junk.c junk1.c junk2.c
--- a/doc/lispintro/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/doc/lispintro/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -309,11 +309,11 @@ 2006-08-21 Robert J. Chassell <bob@rattlesnake.com> * emacs-lisp-intro.texi: Deleted in directory copy of texinfo.tex - and pointed towards ../man/texinfo.tex so only one file - needs updating. Added comment of what to do when building on own. + and pointed towards ../man/texinfo.tex so only one file + needs updating. Added comment of what to do when building on own. * texinfo.tex: Changed to version 2006-02-13.16 - to enable a DVI build using the more recent versions of TeX. + to enable a DVI build using the more recent versions of TeX. 2006-05-25 David Kastrup <dak@gnu.org>
--- a/doc/misc/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/doc/misc/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -593,7 +593,7 @@ (Agenda commands): Document new bulk commands. (Plain lists): Document new behavior of `org-cycle-include-plain-lists'. - Hyphenation only in TeX. + Hyphenation only in TeX. (Clocking work time): Document the key to update effort estimates. (Clocking work time): Document the clock time display. @@ -1660,7 +1660,7 @@ 2008-06-15 Reiner Steib <Reiner.Steib@gmx.de> * gnus.texi (Mail Source Customization): Correct values of - `mail-source-delete-incoming'. Reported by Tassilo Horn. + `mail-source-delete-incoming'. Reported by Tassilo Horn. (Oort Gnus): Fix version comment for mml-dnd-protocol-alist. 2008-06-14 Reiner Steib <Reiner.Steib@gmx.de>
--- a/etc/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/etc/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -1839,7 +1839,7 @@ 2006-11-05 Slawomir Nowaczyk <slawek@cs.lth.se> * emacs.py (eargs): Provide eldoc message for builtin types. - Make sure eargs always outputs sentinel, to avoid Emacs freeze. + Make sure eargs always outputs sentinel, to avoid Emacs freeze. 2006-10-22 Chong Yidong <cyd@stupidchicken.com> @@ -4646,8 +4646,8 @@ 1990-01-19 David Lawrence (tale@cocoa-puffs) * timer.c, getdate.y (new files) and Makefile: - Sub-process support for run-at-time in timer.el. - Doesn't yet work correctly for USG. + Sub-process support for run-at-time in timer.el. + Doesn't yet work correctly for USG. 1990-01-10 Jim Kingdon (kingdon@pogo)
--- a/lib-src/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/lib-src/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -1,3 +1,16 @@ +2010-05-11 Glenn Morris <rgm@gnu.org> + + * Makefile.in (.m.o): Remove, there are no .m files. + (BASE_CFLAGS): New variable. + (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS. + (check): Update the message. + (update-game-score${EXEEXT}): Do not use $MOVE_FLAGS. + + * Makefile.in: Convert comments to makefile format. + + * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. + (config.h) [MSDOS]: Do not include. + 2010-05-10 Glenn Morris <rgm@gnu.org> * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp.
--- a/lib-src/Makefile.in Mon May 10 12:07:40 2010 +0000 +++ b/lib-src/Makefile.in Tue May 11 12:54:50 2010 +0000 @@ -31,6 +31,7 @@ CC=@CC@ CFLAGS=@CFLAGS@ version=@version@ +## Used in $archlibdir. configuration=@configuration@ EXEEXT=@EXEEXT@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ @@ -127,8 +128,8 @@ # Specify additional -D flags for movemail. Options: # -DMAIL_USE_FLOCK or -DMAIL_USE_LOCKF (use flock or lockf for file locking). # See the comments about locking in movemail.c. Normally the values -# in ../src/[ms]/*.h should be correct and you should not need to do anything. -# If neither flag is set, blessmail is used. +# set by configure should be correct and you should not need to do anything. +# If neither flag is set, you need to use blessmail. MOVE_FLAGS= ## Empty if either MAIL_USE_FLOCK or MAIL_USE_LOCKF, else need-blessmail. @@ -160,40 +161,28 @@ # Those files shared with other GNU utilities need HAVE_CONFIG_H # defined before they know they can take advantage of the information # in ../src/config.h. -ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} -LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS} -CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS} +BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src -# ========================== start of cpp stuff ======================= -/* From here on, comments must be done in C syntax. */ - -#ifdef MSDOS -#include "../src/config.h" -LIBS_SYSTEM = MSDOS_LIBS_SYSTEM -#endif +ALL_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} +LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} +CPP_CFLAGS = ${BASE_CFLAGS} ${CPPFLAGS} ${CFLAGS} LOADLIBES=$(LIBS_SYSTEM) -.SUFFIXES: .m - -/* This is the default compilation command. - But we should never rely on it, because some make version - failed to find it for getopt.o. - Using an explicit command made it work. */ +## This is the default compilation command. +## But we should never rely on it, because some make version failed to +## find it for getopt.o. +## Using an explicit command made it work. .c.o: ${CC} -c ${CPP_CFLAGS} $< -.m.o: - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< - all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} -/* These targets copy the scripts into the build directory -so that they can be run from there in an uninstalled Emacs. -The "-" is prepended because some versions of cp barf when -srcdir is the current directory, and thus the file will be -copied into itself. */ +## These targets copy the scripts into the build directory so that +## they can be run from there in an uninstalled Emacs. +## The "-" is prepended because some versions of cp barf when srcdir +## is the current directory, and thus the file will be copied into itself. rcs2log: $(srcdir)/rcs2log -cp -p $(srcdir)/rcs2log rcs2log @@ -206,16 +195,15 @@ vcdiff: $(srcdir)/vcdiff -cp -p $(srcdir)/vcdiff vcdiff -/* Only used if we need blessmail, but no harm in always defining. - This makes the actual blessmail executable. */ +## Only used if we need blessmail, but no harm in always defining. +## This makes the actual blessmail executable. blessmail: $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el chmod +x blessmail -/* This checks if we need to run blessmail. */ +## This checks if we need to run blessmail. +## Do not charge ahead and do it! Let the installer decide. need-blessmail: blessmail -/* Don\'t charge ahead and do it! Let the installer decide. - ./blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT} */ @if [ `wc -l <blessmail` != 2 ] ; then \ dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \ echo Assuming $$dir is really the mail spool directory, you should; \ @@ -224,11 +212,14 @@ echo Do that after running make install.; \ fi -/* This is the target invoked by the top-level Makefile. */ +## This is the target invoked by the top-level Makefile. maybe-blessmail: $(BLESSMAIL_TARGET) -/* Install the internal utilities. Until they are installed, we can - just run them directly from lib-src. */ +## Install the internal utilities. Until they are installed, we can +## just run them directly from lib-src. +## If the chown/chmod commands fail, that is not a big deal. +## update-game-score will detect at runtime that it is not setuid, +## and handle things accordingly. $(DESTDIR)${archlibdir}: all @echo @echo "Installing utilities run internally by Emacs." @@ -241,9 +232,6 @@ umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \ touch $(DESTDIR)${gamedir}/snake-scores; \ touch $(DESTDIR)${gamedir}/tetris-scores -/* If the following commands fail, that is not a big deal. - update-game-score will detect at runtime that it is not setuid, - and handle things accordingly. */ -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \ chown ${gameuser} $(DESTDIR)${gamedir}; \ chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ @@ -294,24 +282,24 @@ extraclean: maintainer-clean -rm -f *~ \#* -/* Test the contents of the directory. */ +## Test the contents of the directory. check: - @echo "We don't have any tests for GNU Emacs yet." + @echo "We don't have any tests for the lib-src/ directory yet." tags: TAGS TAGS: etags${EXEEXT} etags *.[ch] -/* This verifies that the non-ASCII characters in the file \`testfile\' - have not been clobbered by whatever means were used to copy and - distribute Emacs. If they were clobbered, all the .elc files were - clobbered too. */ +## This verifies that the non-ASCII characters in the file \`testfile\' +## have not been clobbered by whatever means were used to copy and +## distribute Emacs. If they were clobbered, all the .elc files were +## clobbered too. test-distrib${EXEEXT}: ${srcdir}/test-distrib.c $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c ./test-distrib ${srcdir}/testfile -/* We need the following in order to create a <getopt.h> when the system - does not have one that works with the given compiler. */ +## We need the following in order to create a <getopt.h> when the system +## does not have one that works with the given compiler. GETOPT_H = @GETOPT_H@ getopt.h: getopt_.h cp $(srcdir)/getopt_.h $@-t @@ -336,8 +324,8 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse -/* We depend on etags to assure that parallel makes don\'t write two - etags.o files on top of each other. */ +## We depend on etags to assure that parallel makes do not write two +## etags.o files on top of each other. ctags${EXEEXT}: etags${EXEEXT} $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags @@ -360,7 +348,7 @@ movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS) $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail -/* We need to define emacs to get the right version of something (what?). */ +## We need to define emacs to get the right version of something (what?). movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H) $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c @@ -379,8 +367,10 @@ $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) - $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score + $(CC) ${LINK_CFLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" + +## Makefile ends here.
--- a/lisp/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -1,13 +1,40 @@ +2010-05-10 Juri Linkov <juri@jurta.org> + + Remove nodes visited during Isearch from the Info history. + * info.el (Info-isearch-initial-history) + (Info-isearch-initial-history-list): New variables. + (Info-isearch-start): Record initial values of + Info-isearch-initial-history and Info-isearch-initial-history-list. + Add Info-isearch-end to isearch-mode-end-hook. + (Info-isearch-end): New function. + +2010-05-10 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-do-file-attributes-with-stat): Add space in + format string, in order to work around a bug in pdksh. Reported + by Gilles Pion <gpion@lfdj.com>. + (tramp-handle-verify-visited-file-modtime): Do not send a command + when the connection is not established. + (tramp-handle-set-file-times): Simplify the check for utc. + +2010-05-10 Juanma Barranquero <lekktu@gmail.com> + + Fix use of `filter-buffer-substring' (rework previous change). + * emulation/cua-base.el (cua--filter-buffer-noprops): New function. + (cua-repeat-replace-region): + * emulation/cua-rect.el (cua--extract-rectangle, cua-incr-rectangle): + * emulation/cua-gmrk.el (cua-copy-region-to-global-mark) + (cua-cut-region-to-global-mark): Use it. + 2010-05-09 Michael R. Mauger <mmaug@yahoo.com> - * progmodes/sql.el: Version 2.1 - (sql-product-alist): Redesigned structure of product info. - (sql-product, sql-user, sql-server, sql-database): Safe - variables. + * progmodes/sql.el: Version 2.1. + (sql-product-alist): Redesign structure of product info. + (sql-product, sql-user, sql-server, sql-database): Safe variables. (sql-port, sql-port-history): New variables. (sql-interactive-product): New variable. (sql-send-terminator): New variable. - (sql-imenu-generic-expression): Added "Types" imenu entry. + (sql-imenu-generic-expression): Add "Types" imenu entry. (sql-oracle-login-params, sql-sqlite-login-params) (sql-mysql-login-params, sql-solid-login-params) (sql-sybase-login-params, sql-informix-login-params) @@ -15,10 +42,9 @@ (sql-postgres-login-params, sql-interbase-login-params) (sql-db2-login-params, sql-linter-login-params) (sql-oracle-scan-on): New variables. - (sql-mode-map): Added C-c C-i to start interactive mode. - (sql-mode-menu): Updated existing menu entries. - (sql-font-lock-keywords-builder): Compile-time font-lock - optimization. + (sql-mode-map): Add C-c C-i to start interactive mode. + (sql-mode-menu): Update existing menu entries. + (sql-font-lock-keywords-builder): Compile-time font-lock optimization. (sql-mode-oracle-font-lock-keywords) (sql-mode-postgres-font-lock-keywords) (sql-mode-ms-font-lock-keywords) @@ -30,7 +56,7 @@ (sql-mode-mysql-font-lock-keywords) (sql-mode-sqlite-font-lock-keywords) (sql-mode-db2-font-lock-keywords) - (sql-mode-linter-font-lock-keywords): Updated initialization to + (sql-mode-linter-font-lock-keywords): Update initialization to reduce run-time complexity. (sql-add-product, sql-del-product): New functions. (sql-set-product-feature, sql-get-product-feature): New functions. @@ -39,12 +65,12 @@ (sql-highlight-product): Update product API. (sql-help-list-products): New function. (sql-help): Dynamically lists free and non-free products. - (sql-get-login): Corrected bug in handling history and added + (sql-get-login): Correct bug in handling history and added prompt for port. (sql-copy-column): Copy without properties. (sqli-input-sender): Apply filters to SQLi input. - (sql-query-placeholders-and-send): Obey `sql-oracle-scan-on' - setting. Implement as a filter. + (sql-query-placeholders-and-send): Obey `sql-oracle-scan-on' setting. + Implement as a filter. (sql-escape-newlines-filter): Implement as a filter. (sql-remove-tabs-filter): New function. (sql-send-magic-terminator): New function. @@ -59,8 +85,8 @@ (sql-connect-oracle, sql-connect-sybase, sql-connect-informix) (sql-connect-sqlite, sql-connect-mysql, sql-connect-solid) (sql-connect-ingres, sql-connect-ms, sql-connect-postgres) - (sql-connect-interbase, sql-connect-db2, sql-connect-linter): Use - `sql-connect'. + (sql-connect-interbase, sql-connect-db2, sql-connect-linter): + Use `sql-connect'. 2010-05-09 Stefan Monnier <monnier@iro.umontreal.ca> @@ -109,7 +135,7 @@ 2010-05-08 Chong Yidong <cyd@stupidchicken.com> - * international/mule.el (auto-coding-alist): Only purecopy + * 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> @@ -122,7 +148,7 @@ * composite.el (compose-region, reference-point-alist): Fix typos in the doc strings. -2010-05-08 Alexander Klimov <alserkli@inbox.ru> (tiny change) +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. @@ -465,7 +491,7 @@ (ede-dired-add-to-target): Use dolist. 2010-05-01 Toru TSUNEYOSHI <t_tuneyosi@hotmail.com> - Michael Albinus <michael.albinus@gmx.de> + Michael Albinus <michael.albinus@gmx.de> Implement compression for inline methods. @@ -974,7 +1000,7 @@ (calc-hyperbolic): Add "Option" to message, as appropriate. (calc-option, calc-is-option): New functions. - * calc-help.el (calc-full-help): Add `calc-option-help'. + * calc-help.el (calc-full-help): Add `calc-option-help'. (calc-option-prefix-help): New function. * calc-misc.el (calc-help): Add "Option" entry. @@ -1537,7 +1563,7 @@ values. 2010-03-29 Phil Hagelberg <phil@evri.com> - Chong Yidong <cyd@stupidchicken.com> + Chong Yidong <cyd@stupidchicken.com> * subr.el: Extend progress reporters to perform "spinning". (progress-reporter-update, progress-reporter-do-update): @@ -5180,7 +5206,7 @@ * Makefile.in (ELCFILES): Adapt to subword.el move. 2009-11-21 Thierry Volpiatto <thierry.volpiatto@gmail.com> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * bookmark.el (bookmark-bmenu-bookmark-column): Remove var. (bookmark-bmenu-list): Save name on `bookmark-name-prop' text-prop. @@ -9266,7 +9292,7 @@ indent buffer only if called interactively (Bug#4452). 2009-09-19 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> This fixes bug#4197 (merged to bug#865, though not identical). * server.el (server-auth-dir): Add docstring note about FAT32. @@ -10083,7 +10109,7 @@ Don't call substitute-in-file-name on diary-file. 2009-09-03 Eduard Wiebe <usenet@pusto.de> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * mail/footnote.el (footnote-prefix): Make it a defcustom. (footnote-mode-map): Move initialization into the declaration. @@ -11194,7 +11220,7 @@ * progmodes/hideshow.el (hs-special-modes-alist): Add js-mode entry. 2009-08-14 Daniel Colascione <dan.colascione@gmail.com> - Karl Landstrom <karl.landstrom@brgeight.se> + Karl Landstrom <karl.landstrom@brgeight.se> * progmodes/js.el: New file. @@ -12961,7 +12987,7 @@ XZ is the successor to LZMA: <http://tukaani.org/xz/> 2009-06-22 Dmitry Dzhus <dima@sphinx.net.ru> - Nick Roberts <nickrob@snap.net.nz> + Nick Roberts <nickrob@snap.net.nz> * progmodes/gdb-mi.el: Pull further modified changes from Dmitry's repository (http://sphinx.net.ru/hg/gdb-mi/).
--- a/lisp/ChangeLog.1 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.1 Tue May 11 12:54:50 2010 +0000 @@ -990,7 +990,7 @@ * info.el: (Info-select-node): Was searching unboundedly for "execute:". (Info-follow-reference): Was called Info-footnote. - Also, handle presence of spaces and newlines in ref names. + Also, handle presence of spaces and newlines in ref names. (Info-extract-menu-node-name): Handle presence of spaces and newlines in the node name. (Info-menu): Handle presence of spaces and newlines in item @@ -1465,7 +1465,7 @@ 1985-10-28 Richard M. Stallman (rms@prep) * rmail.el, rmailsum.el, rmailkwd.el, rmailmsc.el, - rmailout.el, rmailedit.el: + * rmailout.el, rmailedit.el: Install thoroughly rewritten rmail with many new features. * debug.el (debug, debugger-mode): @@ -3100,7 +3100,7 @@ (also, mail-yank-ignored-headers had a typo) * rmail.el (rmail-get-new-mail, convert-to-babyl-format, ...) - loaddefs.el + * loaddefs.el: Remodularize inbox parsing. Add support(?) for mmdf inboxes. Note that I can't seem to define definitive documentation of what this format is; however the code installed seems to work
--- a/lisp/ChangeLog.12 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.12 Tue May 11 12:54:50 2010 +0000 @@ -32509,7 +32509,7 @@ (bibtex-field-list, bibtex-find-crossref): Fix typos in error messages. 2005-01-24 Dan Nicolaescu <dann@ics.uci.edu> - Juri Linkov <juri@jurta.org> + Juri Linkov <juri@jurta.org> * textmodes/reftex-global.el (reftex-isearch-push-state-function) (reftex-isearch-pop-state-function, reftex-isearch-isearch-search)
--- a/lisp/ChangeLog.13 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.13 Tue May 11 12:54:50 2010 +0000 @@ -721,7 +721,7 @@ char-width-table. Don't make ethiopic and tibetan double column. * textmodes/fill.el (fill-find-break-point-function-table): - Don't set it up in defvar. + Don't set it up in defvar. (fill-nospace-between-words-table): New variable. (fill-delete-newlines): Check fill-nospace-between-words-table instead of charset property nospace-between-words. @@ -1872,8 +1872,8 @@ 2008-02-01 Dave Love <fx@gnu.org> * emacs-lisp/byte-opt.el (side-effect-free-fns): - Add string-make-unibyte string-make-multibyte string-to-multibyte - string-as-multibyte string-as-unibyte. + Add string-make-unibyte string-make-multibyte string-to-multibyte + string-as-multibyte string-as-unibyte. 2008-02-01 Dave Love <fx@gnu.org> @@ -3983,7 +3983,7 @@ * ibuffer.el (ibuffer-mode): Fix typo in previous change. 2008-01-17 Vinicius Jose Latorre <viniciusjl@ig.com.br> - Miles Bader <miles@gnu.org> + Miles Bader <miles@gnu.org> * blank-mode.el: New file. Minor mode to visualize (HARD) SPACE, TAB, NEWLINE. Miles Bader <miles@gnu.org> wrote the original code @@ -5479,7 +5479,7 @@ (verilog-insert-indices): Escape braces in doc strings. 2007-12-08 Michael McNamara <mac@verilog.com> - Wilson Snyder <wsnyder@wsnyder.org> + Wilson Snyder <wsnyder@wsnyder.org> * progmodes/verilog-mode.el: New file. @@ -13484,7 +13484,7 @@ Use native Emacs functions, when appropriate. 2007-08-01 Dan Nicolaescu <dann@ics.uci.edu> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * vc.el: Document new VC operation `extra-menu'.
--- a/lisp/ChangeLog.14 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.14 Tue May 11 12:54:50 2010 +0000 @@ -1029,7 +1029,7 @@ * paren.el (show-paren-function): * simple.el (kill-forward-chars, kill-backward-chars): - Use (+/- (point) N), instead of `forward-point'. + Use (+/- (point) N), instead of `forward-point'. 2009-03-19 Glenn Morris <rgm@gnu.org> @@ -3012,12 +3012,12 @@ Don't activate node nil. (Bug#1569) 2009-01-22 Paul Reilly <pmr@pajato.com> - Henrik Enberg <enberg@printf.se> - Alex Schroeder <alex@gnu.org> - Chong Yidong <cyd@stupidchicken.com> - Richard M Stallman <rms@gnu.org> - Glenn Morris <rgm@gnu.org> - Juanma Barranquero <lekktu@gmail.com> + Henrik Enberg <enberg@printf.se> + Alex Schroeder <alex@gnu.org> + Chong Yidong <cyd@stupidchicken.com> + Richard M Stallman <rms@gnu.org> + Glenn Morris <rgm@gnu.org> + Juanma Barranquero <lekktu@gmail.com> * mail/rmail.el: Code implementing Rmail-mbox functionality. (rmail-attribute-header, rmail-keyword-header) @@ -4310,7 +4310,7 @@ was orderly adjusted, nil otherwise. 2008-12-12 Juanma Barranquero <lekktu@gmail.com> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * server.el (server-sentinel): Uncomment code to delete connection file. (server-start): Save the connection file in the server property list. @@ -4369,7 +4369,7 @@ terminal variable assignment. 2008-12-10 Yukihiro Matsumoto <matz@ruby-lang.org> - Nobuyoshi Nakada <nobu@ruby-lang.org> + Nobuyoshi Nakada <nobu@ruby-lang.org> * progmodes/ruby-mode.el: New file. @@ -5599,7 +5599,7 @@ New aliases, to satisfy `define-derived-mode' expectations. 2008-11-15 Glenn Morris <rgm@gnu.org> - Martin Rudalics <rudalics@gmx.at> + Martin Rudalics <rudalics@gmx.at> * emacs-lisp/find-func.el (find-function-advised-original): New. (find-function-C-source, find-function-noselect): @@ -10308,8 +10308,8 @@ (newsticker--treeview-propertize-tag): Show item title in tooltip. 2008-06-20 Martin Blais <blais@furius.ca> - Stefan Merten <smerten@oekonux.de> - David Goodger <goodger@python.org> + Stefan Merten <smerten@oekonux.de> + David Goodger <goodger@python.org> * textmodes/rst.el: New file. @@ -10627,7 +10627,7 @@ * term/linux.el (terminal-init-linux): Load t-mouse. 2008-06-13 Stefan Monnier <monnier@iro.umontreal.ca> - Drew Adams <drew.adams@oracle.com> + Drew Adams <drew.adams@oracle.com> * info.el (Info-breadcrumbs-depth): New var. (Info-insert-breadcrumbs): New function. @@ -18798,7 +18798,7 @@ for useful options. 2008-03-01 Dan Nicolaescu <dann@ics.uci.edu> - Glenn Morris <rgm@gnu.org> + Glenn Morris <rgm@gnu.org> * emacs-lisp/bytecomp.el (byte-recompile-directory) (byte-compile-file, batch-byte-compile, batch-byte-compile-file):
--- a/lisp/ChangeLog.5 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.5 Tue May 11 12:54:50 2010 +0000 @@ -7051,7 +7051,7 @@ * ediff.el (ediff-toggle-read-only, ediff-patch-file): Check out version controlled files before their buffers are modified. (ediff-local-checkout-flag, ediff-toggle-read-only-function): - New variables. + New variables. * ediff.el (ediff-find-file, ediff-patch-file): Were getting confused by symbolic links. Fixed. @@ -8050,7 +8050,7 @@ 1994-07-23 enami tsugutomo <enami@sys.ptg.sony.co.jp> * lisp/add-log.el (add-log-current-defun): Skip doc string - correctly even if it ends with line that starts space. + correctly even if it ends with line that starts space. 1994-07-22 Ed Reingold <reingold@albert.gnu.ai.mit.edu> @@ -9194,11 +9194,11 @@ * solar.el (solar-sunrise, solar-sunset): Fix doc string. (solar-time-string): Rewritten. (solar-adj-time-for-dst): New function. - (solar-sunrise-sunset, diary-sabbath-candles, - solar-equinoxes-solstices): Revised to use the rewritten and new fcns. + (solar-sunrise-sunset, diary-sabbath-candles) + (solar-equinoxes-solstices): Revised to use the rewritten and new fcns. * calendar.el (solar-holidays): Revised to use the rewritten and - new fcns. + new fcns. * lunar.el (lunar-phase): Revised to use the rewritten and new fcns.
--- a/lisp/ChangeLog.6 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.6 Tue May 11 12:54:50 2010 +0000 @@ -3687,7 +3687,7 @@ When changing the environment, avoid need for setenv. 1996-01-05 Karl Eichwalder <ke@ke.Central.DE> - Karl Fogel <kfogel@floss.red-bean.com> + Karl Fogel <kfogel@floss.red-bean.com> * bookmark.el: "cyclic.com" addresses changed to "red-bean.com". (bookmark-bmenu-mode-map): Don't bind C-k. @@ -5837,7 +5837,7 @@ 1995-10-09 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * etags.el (tags-table-check-computed-list): Map - tags-expand-table-name over lists of included tables. + tags-expand-table-name over lists of included tables. 1995-10-09 Erik Naggum <erik@naggum.no>
--- a/lisp/ChangeLog.7 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.7 Tue May 11 12:54:50 2010 +0000 @@ -2749,7 +2749,7 @@ * abbrev.el: Likewise. 1998-05-26 Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE> - Karl Fogel <kfogel@red-bean.com> + Karl Fogel <kfogel@red-bean.com> * bookmark.el: Changes so bookmark list mode works with Info: (bookmark-jump-noselect): Use an inner save-window-excursion.
--- a/lisp/ChangeLog.9 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/ChangeLog.9 Tue May 11 12:54:50 2010 +0000 @@ -2739,8 +2739,8 @@ 2001-06-27 Francesco Potortì <pot@gnu.org> - * uniquify.el: (uniquify-rationalize-file-buffer-names): - Undo previous change. + * uniquify.el (uniquify-rationalize-file-buffer-names): + Undo previous change. 2001-06-27 Francesco Potortì <pot@gnu.org> @@ -12205,7 +12205,7 @@ 2000-09-05 Stefan Monnier <monnier@cs.yale.edu> - * vc.el: (toplevel): Don't require `dired' at run-time. + * vc.el (toplevel): Don't require `dired' at run-time. (vc-dired-resynch-file): Remove autoload cookie. 2000-09-05 Andre Spiegel <spiegel@gnu.org> @@ -12998,7 +12998,7 @@ `vc-locking-user' semantics. (vc-backend-merge): Remove. - * vc-rcs.el, vc-scc.el: (vc-{sc,r}cs-check{in,out}): Update 'vc-state + * vc-rcs.el, vc-scc.el (vc-{sc,r}cs-check{in,out}): Update 'vc-state rather than 'vc-locking-user. * vc-rcs-hooks.el (vc-rcs-consult-headers): Adapt to new `vc-state'. @@ -15318,8 +15318,8 @@ leading comma nicely. Extended to handle member initializers too. - * cc-engine.el: (c-beginning-of-inheritance-list, - c-guess-basic-syntax): Fixed recognition of inheritance lists + * cc-engine.el (c-beginning-of-inheritance-list) + (c-guess-basic-syntax): Fixed recognition of inheritance lists when the lines begins with a comma. * cc-vars.el (c-offsets-alist): Changed default for @@ -19574,7 +19574,7 @@ (backward-kill-word): Revert addition of * to interactive spec -- it's a feature. - * paragraphs.el: (kill-paragraph, backward-kill-paragraph) + * paragraphs.el (kill-paragraph, backward-kill-paragraph) (backward-kill-sentence, kill-sentence): Likewise. * gud.el (gud-jdb-build-class-source-alist): Prepend space to @@ -19918,7 +19918,7 @@ 2000-02-10 Dave Love <fx@gnu.org> - * wid-edit.el: (widgets) [defgroup]: Remove url link. + * wid-edit.el (widgets) [defgroup]: Remove url link. (widget-color-choice-list, widget-color-history, widget-mouse-help): Deleted. (widget-specify-field, widget-specify-button): Don't use
--- a/lisp/emulation/cua-base.el Mon May 10 12:07:40 2010 +0000 +++ b/lisp/emulation/cua-base.el Tue May 11 12:54:50 2010 +0000 @@ -780,6 +780,10 @@ (setq mark-active nil) (run-hooks 'deactivate-mark-hook))) +(defun cua--filter-buffer-noprops (start end) + (let ((str (filter-buffer-substring start end))) + (set-text-properties 0 (length str) nil str) + str)) ;; The current register prefix (defvar cua--register nil) @@ -1039,10 +1043,7 @@ (setq s (car u)) (setq s (car u) e (cdr u))))))) (cond ((and s e (<= s e) (= s (mark t))) - (setq cua--repeat-replace-text - (filter-buffer-substring s e)) - (set-text-properties 0 (length cua--repeat-replace-text) - nil cua--repeat-replace-text)) + (setq cua--repeat-replace-text (cua--filter-buffer-noprops s e))) ((and (null s) (eq u elt)) ;; nothing inserted (setq cua--repeat-replace-text ""))
--- a/lisp/emulation/cua-gmrk.el Mon May 10 12:07:40 2010 +0000 +++ b/lisp/emulation/cua-gmrk.el Tue May 11 12:54:50 2010 +0000 @@ -137,9 +137,8 @@ (let ((src-buf (current-buffer))) (save-excursion (if (equal (marker-buffer cua--global-mark-marker) src-buf) - (let ((text (filter-buffer-substring start end))) + (let ((text (cua--filter-buffer-noprops start end))) (goto-char (marker-position cua--global-mark-marker)) - (set-text-properties 0 (length text) text) (insert text)) (set-buffer (marker-buffer cua--global-mark-marker)) (goto-char (marker-position cua--global-mark-marker)) @@ -162,11 +161,10 @@ (if (and (< start (marker-position cua--global-mark-marker)) (< (marker-position cua--global-mark-marker) end)) (message "Can't move region into itself") - (let ((text (filter-buffer-substring start end)) + (let ((text (cua--filter-buffer-noprops start end)) (p1 (copy-marker start)) (p2 (copy-marker end))) (goto-char (marker-position cua--global-mark-marker)) - (set-text-properties 0 (length text) text) (insert text) (cua--activate-global-mark) (delete-region (marker-position p1) (marker-position p2))
--- a/lisp/emulation/cua-rect.el Mon May 10 12:07:40 2010 +0000 +++ b/lisp/emulation/cua-rect.el Tue May 11 12:54:50 2010 +0000 @@ -625,7 +625,7 @@ (if (not (cua--rectangle-virtual-edges)) (cua--rectangle-operation nil nil nil nil nil ; do not tabify '(lambda (s e l r) - (setq rect (cons (filter-buffer-substring s e nil t) rect)))) + (setq rect (cons (cua--filter-buffer-noprops s e) rect)))) (cua--rectangle-operation nil 1 nil nil nil ; do not tabify '(lambda (s e l r v) (let ((copy t) (bs 0) (as 0) row) @@ -643,7 +643,7 @@ (setq as (- r (max (current-column) l)) e (point))) (setq row (if (and copy (> e s)) - (filter-buffer-substring s e nil t) + (cua--filter-buffer-noprops s e) "")) (when (> bs 0) (setq row (concat (make-string bs ?\s) row))) @@ -1124,12 +1124,12 @@ '(lambda (s e l r) (cond ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t) - (let* ((txt (filter-buffer-substring (match-beginning 1) (match-end 1) nil t)) + (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) (n (string-to-number txt 16)) (fmt (format "0x%%0%dx" (length txt)))) (replace-match (format fmt (+ n increment))))) ((re-search-forward "\\( *-?[0-9]+\\)" e t) - (let* ((txt (filter-buffer-substring (match-beginning 1) (match-end 1) nil t)) + (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) (prefix (if (= (aref txt 0) ?0) "0" "")) (n (string-to-number txt 10)) (fmt (format "%%%s%dd" prefix (length txt))))
--- a/lisp/erc/ChangeLog.03 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/erc/ChangeLog.03 Tue May 11 12:54:50 2010 +0000 @@ -145,7 +145,7 @@ to delete-if-not. * erc.el 1.580 (erc-update-current-channel-member): - Use erc-downcase when comparing + Use erc-downcase when comparing nick entries. Cleanup indentation. 2003-11-01 Lawrence Mitchell <wence@gmx.li> @@ -171,7 +171,7 @@ 2003-10-24 Mario Lang <mlang@delysid.org> * erc-dcc.el 1.80: From Stephan Stahl <stl@isogmbh.de>: - * (erc-dcc-send-block): Kill buffer if transfer completed correctly. + (erc-dcc-send-block): Kill buffer if transfer completed correctly. 2003-10-22 Mario Lang <mlang@delysid.org>
--- a/lisp/erc/ChangeLog.04 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/erc/ChangeLog.04 Tue May 11 12:54:50 2010 +0000 @@ -72,7 +72,7 @@ 2004-12-24 Jorgen Schaefer <forcer@users.sourceforge.net> * erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit. - Moved some functions from erc.el to erc-goodies.el, and + Moved some functions from erc.el to erc-goodies.el, and transformed them to erc modules in the process. - imenu autoload stuff moved. I don't know why it is here at all. - Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
--- a/lisp/gnus/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/lisp/gnus/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -1,3 +1,15 @@ +2010-05-11 Andreas Seltenreich <seltenreich@gmx.de> + + * gnus-sum.el (gnus-summary-kill-thread): Use gnus-summary-mark-article + instead of g-s-m-a-as-unread to set the expirable mark. (Bug#5284) + +2010-05-11 Katsumi Yamaoka <yamaoka@jpl.org> + + * mm-extern.el (mm-extern-url): Don't use + mm-with-unibyte-current-buffer. + (mm-extern-cache-contents): Use with-current-buffer instead of + save-excursion + set-buffer. + 2010-05-10 Katsumi Yamaoka <yamaoka@jpl.org> * mm-util.el (mm-emacs-mule): Remove.
--- a/lisp/gnus/ChangeLog.1 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/gnus/ChangeLog.1 Tue May 11 12:54:50 2010 +0000 @@ -28,10 +28,10 @@ * gnus-start.el (gnus-slave-save-newsrc): * gnus-uu.el (gnus-uu-tmp-dir, gnus-uu-decode-binhex) - (gnus-uu-decode-binhex-view, gnus-uu-digest-mail-forward) - (gnus-uu-initialize): + (gnus-uu-decode-binhex-view, gnus-uu-digest-mail-forward) + (gnus-uu-initialize): * nnmail.el (nnmail-make-complex-temp-name, nnmail-get-new-mail): - Use make-temp-file. + Use make-temp-file. 1999-09-07 Eli Zaretskii <eliz@gnu.org>
--- a/lisp/gnus/ChangeLog.2 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/gnus/ChangeLog.2 Tue May 11 12:54:50 2010 +0000 @@ -4905,8 +4905,8 @@ 2003-02-08 Michael Welsh Duggan <md5i@cs.cmu.edu> * nnmail.el (nnmail-split-it): If a message ends up matching the - same mailbox more than once, it will cause duplicates to appear - in the mailbox. + same mailbox more than once, it will cause duplicates to appear + in the mailbox. 2003-02-08 Simon Josefsson <jas@extundo.com> @@ -5553,8 +5553,8 @@ 2003-01-13 Jhair Tocancipa Triana <jhair_tocancipa@@gmx.net> * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use - /usr/bin/play as default player. - (gnus-audio-play): Added ARG-DESCRIPTOR to prompt for a file to play. + /usr/bin/play as default player. + (gnus-audio-play): Added ARG-DESCRIPTOR to prompt for a file to play. 2003-01-14 Katsumi Yamaoka <yamaoka@jpl.org> @@ -9034,7 +9034,7 @@ boolean not a string * gnus-group.el (gnus-group-line-format): Add description of %C * gnus-group.el (gnus-group-line-format-alist): Add gnus-tmp-comment - as %C + as %C * gnus-group.el (gnus-group-insert-group-line): Add gnus-tmp-comment. 2002-04-22 Paul Jarc <prj@po.cwru.edu> @@ -11326,7 +11326,7 @@ 2002-01-02 ShengHuo ZHU <zsh@cs.rochester.edu> * gnus-picon.el (gnus-picon-transform-newsgroups): Fix for the case - "Newsgroups: rec.music.beatles.moderated, rec.music.beatles". + "Newsgroups: rec.music.beatles.moderated, rec.music.beatles". 2002-01-03 Steve Youngs <youngs@xemacs.org> @@ -12256,7 +12256,7 @@ (imap-stream-alist): Backslash. * gnus-sum.el (gnus-summary-limit-to-author): Missing arguments. - Thanks to david.goldberg6@verizon.net (David S. Goldberg). + Thanks to david.goldberg6@verizon.net (David S. Goldberg). 2001-11-27 14:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> @@ -12755,7 +12755,7 @@ 2001-10-30 13:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> * gnus-spec.el (gnus-parse-simple-format): Use - buffer-substring-no-properties. + buffer-substring-no-properties. 2001-10-30 Katsumi Yamaoka <yamaoka@jpl.org>
--- a/lisp/gnus/gnus-sum.el Mon May 10 12:07:40 2010 +0000 +++ b/lisp/gnus/gnus-sum.el Tue May 11 12:54:50 2010 +0000 @@ -11508,7 +11508,7 @@ ((> unmark 0) (gnus-summary-mark-article-as-unread gnus-unread-mark)) ((= unmark 0) - (gnus-summary-mark-article-as-unread gnus-expirable-mark)) + (gnus-summary-mark-article nil gnus-expirable-mark)) (t (gnus-summary-mark-article-as-unread gnus-ticked-mark))) (setq articles (cdr articles))))
--- a/lisp/gnus/mm-extern.el Mon May 10 12:07:40 2010 +0000 +++ b/lisp/gnus/mm-extern.el Tue May 11 12:54:50 2010 +0000 @@ -67,9 +67,8 @@ (coding-system-for-read mm-binary-coding-system)) (unless url (error "URL is not specified")) - (mm-with-unibyte-current-buffer - (mm-url-insert-file-contents url)) (mm-disable-multibyte) + (mm-url-insert-file-contents url) (setq buffer-file-name name))) (defun mm-extern-anon-ftp (handle) @@ -125,7 +124,7 @@ (or access-type (error "Couldn't find access type")))) mm-extern-function-alist))) - buf handles) + handles) (unless func (error "Access type (%s) is not supported" access-type)) (mm-with-part handle @@ -136,8 +135,7 @@ (unless (bufferp (car handles)) (mm-destroy-parts handles) (error "Multipart external body is not supported")) - (save-excursion - (set-buffer (setq buf (mm-handle-buffer handles))) + (with-current-buffer (mm-handle-buffer handles) (let (good) (unwind-protect (progn
--- a/lisp/info.el Mon May 10 12:07:40 2010 +0000 +++ b/lisp/info.el Tue May 11 12:54:50 2010 +0000 @@ -266,6 +266,8 @@ :group 'info) (defvar Info-isearch-initial-node nil) +(defvar Info-isearch-initial-history nil) +(defvar Info-isearch-initial-history-list nil) (defcustom Info-mode-hook ;; Try to obey obsolete Info-fontify settings. @@ -1914,7 +1916,27 @@ (setq Info-isearch-initial-node ;; Don't stop at initial node for nonincremental search. ;; Otherwise this variable is set after first search failure. - (and isearch-nonincremental Info-current-node))) + (and isearch-nonincremental Info-current-node)) + (setq Info-isearch-initial-history Info-history + Info-isearch-initial-history-list Info-history-list) + (add-hook 'isearch-mode-end-hook 'Info-isearch-end nil t)) + +(defun Info-isearch-end () + ;; Remove intermediate nodes (visited while searching) + ;; from the history. Add only the last node (where Isearch ended). + (if (> (length Info-history) + (length Info-isearch-initial-history)) + (setq Info-history + (nthcdr (- (length Info-history) + (length Info-isearch-initial-history) + 1) + Info-history))) + (if (> (length Info-history-list) + (length Info-isearch-initial-history-list)) + (setq Info-history-list + (cons (car Info-history-list) + Info-isearch-initial-history-list))) + (remove-hook 'isearch-mode-end-hook 'Info-isearch-end t)) (defun Info-isearch-filter (beg-found found) "Test whether the current search hit is a visible useful text.
--- a/lisp/mh-e/ChangeLog.1 Mon May 10 12:07:40 2010 +0000 +++ b/lisp/mh-e/ChangeLog.1 Tue May 11 12:54:50 2010 +0000 @@ -195,11 +195,11 @@ 2005-05-28 Bill Wohler <wohler@newt.com> - Released MH-E version 7.84. - - * MH-E-NEWS, README: Updated for release 7.84. - - * mh-e.el (Version, mh-version): Updated for release 7.84. + Released MH-E version 7.84. + + * MH-E-NEWS, README: Updated for release 7.84. + + * mh-e.el (Version, mh-version): Updated for release 7.84. 2005-05-28 Bill Wohler <wohler@newt.com> @@ -4396,7 +4396,6 @@ mh-xemacs-toolbar.el: Removed RCS keywords per Emacs conventions (closes SF #680731). - 2003-03-26 Satyaki Das <satyaki@theforce.stanford.edu> * mh-index.el: Fix commentary to mention that mairix is supported @@ -7556,10 +7555,10 @@ the MH pick command to give the user more information when choosing between mh-search-folder and mh-index-folder. - * mh-index.el (mh-index-search): Edited the docstring. Direct the - user to mh-index-program if necessary. - (mh-index-program): Edited this docstring too. Viewing the help - in a *Help* buffer really exposes grammatical flaws. + * mh-index.el (mh-index-search): Edited the docstring. Direct the + user to mh-index-program if necessary. + (mh-index-program): Edited this docstring too. Viewing the help + in a *Help* buffer really exposes grammatical flaws. 2002-11-05 Peter S Galbraith <psg@debian.org> @@ -7839,7 +7838,6 @@ (.PHONY): Added emacs, xemacs, autoloads, custom-loads. Broke up target and moved pieces into their own sections. - 2002-10-30 Peter S Galbraith <psg@debian.org> * mh-utils.el (mh-show-font-lock-keywords): Wrap an @@ -8494,11 +8492,10 @@ 2002-10-22 Mark D. Baushke <mdb@gnu.org> * mh-mime.el (mh-graphical-smileys-flag): Renamed from - mh-graphical-smileys-p. - (mh-display-smileys): Use it. - (mh-graphical-emphasis-flag): Renamed from - mh-graphical-emphasis-p. - (mh-display-emphasis): Use it. This addresses part of SF #627015. + mh-graphical-smileys-p. + (mh-display-smileys): Use it. + (mh-graphical-emphasis-flag): Renamed from mh-graphical-emphasis-p. + (mh-display-emphasis): Use it. This addresses part of SF #627015. 2002-10-22 Satyaki Das <satyaki@theforce.stanford.edu> @@ -9301,7 +9298,7 @@ * mh-mime.el (mh-store-mime-parts-directory): New defcustom. Default directory to use for mh-store-mime-parts. (mh-store-mime-parts): New Command. Store the MIME parts of the - current message. + current message. (mh-store-mime-parts-directory-default): New internal working variable. Default to use for mh-store-mime-parts-directory, set from last use. @@ -9309,7 +9306,6 @@ * mh-e.el (mh-folder-seq-tool-bar-map): Add mh-store-mime-parts to toolbar. - 2002-08-22 Satyaki Das <satyaki@theforce.stanford.edu> * mh-seq.el (mh-thread-generate-scan-lines): In threaded view, @@ -10487,7 +10483,6 @@ (clean): New target that blows away MH-E-OBJ. (dist): Added $(MH-E-OBJ) to tarball. - Attempt to quiet compilation errors to a dull roar. * mh-e.el: Require easymenu, added autoload of info. @@ -10506,7 +10501,6 @@ * mh-comp.el: Require mh-e and easymenu, moved autoloads to top of file. - * Makefile: (EMACS): New constant to hold emacs calling sequence. (install): Renamed to install-emacs. (compile): New target to compile all files.
--- a/lisp/net/tramp.el Mon May 10 12:07:40 2010 +0000 +++ b/lisp/net/tramp.el Tue May 11 12:54:50 2010 +0000 @@ -2867,7 +2867,9 @@ (tramp-send-command-and-read vec (format - "((%s %s || %s -h %s) && %s -c '((\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)" + ;; On Opsware, pdksh (which is the true name of ksh there) doesn't + ;; parse correctly the sequence "((". Therefore, we add a space. + "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)" (tramp-get-file-exists-command vec) (tramp-shell-quote-argument localname) (tramp-get-test-command vec) @@ -2920,12 +2922,14 @@ function directly, unless those two cases are already taken care of." (with-current-buffer buf - ;; There is no file visiting the buffer, or the buffer has no - ;; recorded last modification time. - (if (or (not (buffer-file-name)) - (eq (visited-file-modtime) 0)) - t - (let ((f (buffer-file-name))) + (let ((f (buffer-file-name))) + ;; There is no file visiting the buffer, or the buffer has no + ;; recorded last modification time, or there is no established + ;; connection. + (if (or (not f) + (eq (visited-file-modtime) 0) + (not (tramp-file-name-handler 'file-remote-p f nil 'connected))) + t (with-parsed-tramp-file-name f nil (tramp-flush-file-property v localname) (let* ((attr (file-attributes f)) @@ -2984,16 +2988,11 @@ (let ((time (if (or (null time) (equal time '(0 0))) (current-time) time)) - (utc - ;; With GNU Emacs, `format-time-string' has an - ;; optional parameter UNIVERSAL. This is preferred, - ;; because we could handle the case when the remote - ;; host is located in a different time zone as the - ;; local host. - (and (functionp 'subr-arity) - (subrp (symbol-function 'format-time-string)) - (= 3 (cdr (tramp-compat-funcall - 'subr-arity 'format-time-string)))))) + ;; With GNU Emacs, `format-time-string' has an optional + ;; parameter UNIVERSAL. This is preferred, because we + ;; could handle the case when the remote host is + ;; located in a different time zone as the local host. + (utc (not (featurep 'xemacs)))) (tramp-send-command-and-check v (format "%s touch -t %s %s" (if utc "TZ=UTC; export TZ;" "")
--- a/lisp/org/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/lisp/org/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -127,7 +127,7 @@ (org-ascii-replace-entities): New function. 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> - Ulf Stegemann <ulf@zeitform.de> + Ulf Stegemann <ulf@zeitform.de> * org-entities.el: New file.
--- a/make-dist Mon May 10 12:07:40 2010 +0000 +++ b/make-dist Tue May 11 12:54:50 2010 +0000 @@ -537,7 +537,7 @@ echo "Making links to \`msdos'" (cd msdos ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos - ln is_exec.c sigaction.c mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos + ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos cd ../${tempdir}/msdos rm -f =*)
--- a/msdos/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/msdos/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -1,3 +1,8 @@ +2010-05-11 Glenn Morris <rgm@gnu.org> + + * sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys. + * sed3x.inp: New file. + 2010-05-10 Glenn Morris <rgm@gnu.org> * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty.
--- a/msdos/sed1x.inp Mon May 10 12:07:40 2010 +0000 +++ b/msdos/sed1x.inp Tue May 11 12:54:50 2010 +0000 @@ -5,6 +5,7 @@ s!^ @true *$! @rem! s/DOC/DOC-X/g #/^LIBXMENU *=/s!= *!= ../oldxmenu/! +/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^temacs *:/s!OLDXMENU!LIBXMENU! # arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/msdos/sed3x.inp Tue May 11 12:54:50 2010 +0000 @@ -0,0 +1,5 @@ +# -sed3x.inp------------------------------------------------------------ +# Extra configuration script for lib-src/makefile for DesqView/X +# ---------------------------------------------------------------------- +/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! +
--- a/nt/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/nt/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -112,7 +112,7 @@ * config.nt (HAVE_FACES): Remove, unused. 2008-06-26 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> * nmake.defs (FONT_CFLAGS): * gmake.defs (FONT_CFLAGS): Remove. @@ -128,7 +128,7 @@ * config.nt: Remove reference to UNEXEC_SRC. 2008-06-23 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]: Don't hardcode -gstabs+, use DEBUG_INFO.
--- a/src/ChangeLog Mon May 10 12:07:40 2010 +0000 +++ b/src/ChangeLog Tue May 11 12:54:50 2010 +0000 @@ -1,3 +1,14 @@ +2010-05-11 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. + * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove. + +2010-05-10 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (init_iterator): Don't turn on bidi reordering in + unibyte buffers. See + http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. + 2010-05-10 Glenn Morris <rgm@gnu.org> * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. @@ -731,7 +742,7 @@ (Frename_file): Preserve selinux context when renaming by copy-file. 2010-04-21 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> Don't depend on cm.c or termcap.c on Windows, use stubs. * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O). @@ -8922,7 +8933,7 @@ <after-change-functions>: Reflow docstrings. 2008-08-04 Adrian Robert <Adrian.B.Robert@gmail.com> - Ken Raeburn <raeburn@gnu.org> + Ken Raeburn <raeburn@gnu.org> Dock menu customization, based on a patch by Ken Raeburn, plus some other fixes. @@ -9987,7 +9998,7 @@ batch-compiling for bootstrap). 2008-07-15 Chris Hall <chris@web.workinglinux.com> (tiny change) - YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case -- fix crash due to different init order. @@ -10605,7 +10616,7 @@ (USG_SHARED_LIBRARIES): Remove duplicate definition. 2008-06-26 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (LOCAL_FLAGS): Don't include WINDOWSNT, DOS_NT and _UCHAR_T. @@ -10853,7 +10864,7 @@ the property of LFACE_FONT of LFACE (if any). 2008-06-21 Seiji Zenitani <zenitani@mac.com> - Ryo Yoshitake <ryo@shiftmode.net> + Ryo Yoshitake <ryo@shiftmode.net> * xterm.c (x_set_frame_alpha): Add x_catch_errors for bug#437. @@ -11949,7 +11960,7 @@ * xterm.c (x_set_frame_alpha): Move declarations before statements. 2008-05-21 Seiji Zenitani <zenitani@mac.com> - Ryo Yoshitake <ryo@shiftmode.net> + Ryo Yoshitake <ryo@shiftmode.net> * frame.c (Qalpha): Add a new frame parameter `alpha'. (Vframe_alpha_lower_limit): New variable.
--- a/src/ChangeLog.1 Mon May 10 12:07:40 2010 +0000 +++ b/src/ChangeLog.1 Tue May 11 12:54:50 2010 +0000 @@ -1187,7 +1187,7 @@ prompt. (various): Pass window being displayed as arg to vmotion. (various): Compute starting-hpos arg to compute_motion - using minibuf_prompt_width if in minibuf starting at top. + using minibuf_prompt_width if in minibuf starting at top. * window.c (Fdisplay_buffer & callers): Take second arg, non-nil means do not use selected window @@ -1645,8 +1645,8 @@ Use signal, not sigset, since we simulate signal on all system versions when nec. - * buffer.c (syms_of_buffer, init_buffer_once, - reset_buffer_local_variables): + * buffer.c (syms_of_buffer, init_buffer_once) + (reset_buffer_local_variables): Define default-abbrev-mode, and init new buffers' abbrev-mode from it. Move definition of abbrev-mode here from abbrev.c. @@ -2861,7 +2861,7 @@ * keymap.c, callint.c, minibuf.c, fns.c, commands.h: Rename MinbufLocalMap to Vminibuffer_local_map, etc. Rename minibuf-local-{,-ns,-completion,must-match}map, - and DefLispVar them (document even!). + and DefLispVar them (document even!). => New lisp variables minibuffer-local-map, minibuffer-local-ns-map, minibuffer-local-completion-map, minibuffer-local-must-match-map.
--- a/src/ChangeLog.2 Mon May 10 12:07:40 2010 +0000 +++ b/src/ChangeLog.2 Tue May 11 12:54:50 2010 +0000 @@ -984,7 +984,7 @@ 1988-01-06 Richard Stallman (rms@frosted-flakes) * s-hpux.h: Don't define nomultiplejobs, LDAV_SYMBOL, LIBS_DEBUG - or BROKEN_FIONREAD. + or BROKEN_FIONREAD. * m-hp9000s300.h: Define those four. * s-hpux.h: Define BSTRING, and define bcopy, etc., as macros. @@ -2817,7 +2817,7 @@ 1986-11-26 Richard M. Stallman (rms@prep) * sysdep.c (get_system_name): - Eliminate internal static var in USG case. + Eliminate internal static var in USG case. * lisp.h: New case testing and conversion macros UPPERCASEP, LOWERCASEP, NOCASEP, UPCASE, DOWNCASE. @@ -3852,7 +3852,7 @@ (so now (let ((case-fold-search t))) doesn't force buffer-localness) However, setting a binding will still make it buffer-local. (ie (let ((case-fold-search t)) (setq case-fold-search t)) - will cause case-fold-search be buffer-local even outside the let) + will cause case-fold-search be buffer-local even outside the let) * xfns.c: Preserve studlycaps: "Gnuemacs" => "GNU Emacs" @@ -4452,16 +4452,16 @@ * search.c (Freplace_match): Delete unused some_multiletter_word init. * alloc.c (gc_sweep): Delete unused next initializers. * fns.c (concat): After error on non-int elt for string, - do store the new value from the error handler. + do store the new value from the error handler. * lread.c (read1): Comment out unused end =. * lread.c (read_list): Delete unused tail =. * data.c (Fmake_variable_buffer_local): - If value type is Lisp_Some_Buffer_Local_Value, - change it to Lisp_Buffer_Local_Value permanently. + If value type is Lisp_Some_Buffer_Local_Value, + change it to Lisp_Buffer_Local_Value permanently. * undo.c (record_block): Delete unused cp =. - Don't bother reallocing if n = 0 after first batch. + Don't bother reallocing if n = 0 after first batch. * fileio.c (Fverify_visited_file_modtime): - If CHECK_BUFFER changes buf, use the changed value. + If CHECK_BUFFER changes buf, use the changed value. 1986-07-07 Richard M. Stallman (rms@prep)
--- a/src/ChangeLog.3 Mon May 10 12:07:40 2010 +0000 +++ b/src/ChangeLog.3 Tue May 11 12:54:50 2010 +0000 @@ -14197,7 +14197,7 @@ 1989-12-14 Joseph Arceneaux (jla@spiff) * xfns.c: New variable Vx_no_window_manager. - (Fx_track_pointer): If bufp < 0, abort. + (Fx_track_pointer): If bufp < 0, abort. * xterm.c (XTread_socket): When leaving window, set x_mouse_x and x_mouse_y to -1.
--- a/src/ChangeLog.4 Mon May 10 12:07:40 2010 +0000 +++ b/src/ChangeLog.4 Tue May 11 12:54:50 2010 +0000 @@ -4411,7 +4411,7 @@ * keyboard.c (read_key_sequence): Don't declare first_event; it is no longer used. Change "#if 0" for first_event reading to - "#if defined (GOBBLE_FIRST_EVENT)". + "#if defined (GOBBLE_FIRST_EVENT)". 1993-10-03 Brian J. Fox (bfox@ai.mit.edu)
--- a/src/ChangeLog.5 Mon May 10 12:07:40 2010 +0000 +++ b/src/ChangeLog.5 Tue May 11 12:54:50 2010 +0000 @@ -6107,7 +6107,7 @@ * fileio.c (Fmake_symbolic_link, Ffile_accessible_directory_p, Finsert_file_contents, auto_save_error, Fwrite_region): Likewise. (Fcopy_file, build_annotations, Fdo_auto_save): Delete unused - variables. + variables. 1994-08-23 Richard Stallman <rms@mole.gnu.ai.mit.edu>
--- a/src/ChangeLog.9 Mon May 10 12:07:40 2010 +0000 +++ b/src/ChangeLog.9 Tue May 11 12:54:50 2010 +0000 @@ -3913,7 +3913,7 @@ 2001-01-05 Gerd Moellmann <gerd@gnu.org> * sysdep.c: Don't prototype srandom; it takes an unsigned argument - on some systems, and an unsigned long on others, like FreeBSD 4.1. + on some systems, and an unsigned long on others, like FreeBSD 4.1. 2001-01-04 Gerd Moellmann <gerd@gnu.org> @@ -5161,9 +5161,9 @@ `vertical-line', `mode-line' and `header-line' events. * xdisp.c (try_window_id): Avoid starting to display in the middle - of a character, a TAB for instance. This is easier than to set - up the iterator exactly, and it's not a frequent case, so the - additional effort wouldn't really pay off. + of a character, a TAB for instance. This is easier than to set + up the iterator exactly, and it's not a frequent case, so the + additional effort wouldn't really pay off. 2000-11-26 Andrew Choi <akochoi@i-cable.com> @@ -5196,9 +5196,9 @@ 2000-11-24 Gerd Moellmann <gerd@gnu.org> * xdisp.c (init_from_display_pos): If POS says we're already after - an overlay string ending at POS, make sure to pop the iterator - because it will be in front of that overlay string. When POS is - ZV, we've thereby also ``processed'' overlay strings at ZV. + an overlay string ending at POS, make sure to pop the iterator + because it will be in front of that overlay string. When POS is + ZV, we've thereby also ``processed'' overlay strings at ZV. * xfaces.c (lface_from_face_name): Function comment fix.
--- a/src/Makefile.in Mon May 10 12:07:40 2010 +0000 +++ b/src/Makefile.in Tue May 11 12:54:50 2010 +0000 @@ -322,7 +322,6 @@ #endif #ifdef MSDOS -LIBS_SYSTEM = MSDOS_LIBS_SYSTEM #ifdef HAVE_X_WINDOWS MSDOS_OBJ = dosfns.o msdos.o #else
--- a/src/s/msdos.h Mon May 10 12:07:40 2010 +0000 +++ b/src/s/msdos.h Tue May 11 12:54:50 2010 +0000 @@ -140,9 +140,7 @@ commentary below, in the non-X branch. The 140KB number was measured on GNU/Linux and on MS-WIndows. */ #define SYSTEM_PURESIZE_EXTRA (-170000+140000) -#define MSDOS_LIBS_SYSTEM -lxext -lsys #else -#define MSDOS_LIBS_SYSTEM /* We need a little extra space, see ../../lisp/loadup.el. As of 20091024, DOS-specific files use up 62KB of pure space. But overall, we end up wasting 130KB of pure space, because
--- a/src/xdisp.c Mon May 10 12:07:40 2010 +0000 +++ b/src/xdisp.c Tue May 11 12:54:50 2010 +0000 @@ -2698,8 +2698,12 @@ /* Are multibyte characters enabled in current_buffer? */ it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); - /* Do we need to reorder bidirectional text? */ - it->bidi_p = !NILP (current_buffer->bidi_display_reordering); + /* Do we need to reorder bidirectional text? Not if this is a + unibyte buffer: all single-byte characters are by definition + strong L2R, so no reordering is needed. And bidi.c doesn't + support unibyte buffers anyway. */ + it->bidi_p + = !NILP (current_buffer->bidi_display_reordering) && it->multibyte_p; /* Non-zero if we should highlight the region. */ highlight_region_p