Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 104294. ------------------------------------------------------------ revno: 104294 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-05-19 23:37:13 -0700 message: * systime.h (Time): Define only if emacs is defined. This is to allow ../lib-src/profile.c to be compiled on FreeBSD, where the include path doesn't have X11/X.h by default. See . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-20 00:54:09 +0000 +++ src/ChangeLog 2011-05-20 06:37:13 +0000 @@ -1,3 +1,10 @@ +2011-05-20 Paul Eggert + + * systime.h (Time): Define only if emacs is defined. + This is to allow ../lib-src/profile.c to be compiled on FreeBSD, + where the include path doesn't have X11/X.h by default. See + . + 2011-05-20 Kenichi Handa * composite.c (find_automatic_composition): Fix previous change. === modified file 'src/systime.h' --- src/systime.h 2011-05-12 20:23:33 +0000 +++ src/systime.h 2011-05-20 06:37:13 +0000 @@ -30,10 +30,12 @@ #endif #endif -#ifdef HAVE_X_WINDOWS -# include -#else +#ifdef emacs +# ifdef HAVE_X_WINDOWS +# include +# else typedef unsigned long Time; +# endif #endif #ifdef HAVE_TZNAME ------------------------------------------------------------ revno: 104293 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2011-05-20 01:00:46 +0000 message: gnus-sum.el (gnus-summary-hide-thread): Fix bug where moving to hide the thread moves us backwards and so we loop forever. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-20 00:03:51 +0000 +++ lisp/gnus/ChangeLog 2011-05-20 01:00:46 +0000 @@ -1,3 +1,8 @@ +2011-05-20 Teodor Zlatanov + + * gnus-sum.el (gnus-summary-hide-thread): Fix bug where moving to hide + the thread moves us backwards and so we loop forever. + 2011-05-19 Katsumi Yamaoka * mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-05-16 22:05:15 +0000 +++ lisp/gnus/gnus-sum.el 2011-05-20 01:00:46 +0000 @@ -11569,7 +11569,10 @@ (let ((ol (gnus-make-overlay starteol (point) nil t nil))) (gnus-overlay-put ol 'invisible 'gnus-sum) (gnus-overlay-put ol 'evaporate t))) - (gnus-summary-goto-subject article)) + (gnus-summary-goto-subject article) + (when (> start (point)) + (message "Hiding the thread moved us backwards, aborting!") + (goto-char (point-max)))) (goto-char start) nil)))) ------------------------------------------------------------ revno: 104292 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Fri 2011-05-20 09:58:53 +0900 message: composite.c (find_automatic_composition): Fix previous change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-20 00:41:03 +0000 +++ src/ChangeLog 2011-05-20 00:54:09 +0000 @@ -1,3 +1,7 @@ +2011-05-20 Kenichi Handa + + * composite.c (find_automatic_composition): Fix previous change. + 2011-05-20 Glenn Morris * lisp.mk: New file, split from Makefile.in. === modified file 'src/composite.c' --- src/composite.c 2011-05-18 14:11:50 +0000 +++ src/composite.c 2011-05-20 00:51:38 +0000 @@ -1565,7 +1565,7 @@ if (limit <= pos) /* case (1) */ { do { - if (cur.pos == limit) + if (cur.pos <= limit) return 0; BACKWARD_CHAR (cur, stop); c = STRING_CHAR (cur.p); ------------------------------------------------------------ revno: 104291 author: Nix committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-19 17:51:46 -0700 message: Small break-hardlink-on-save fix. * files.el (basic-save-buffer-2): Fix handling of break-hardlink-on-save with non-existent files. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-19 12:38:39 +0000 +++ lisp/ChangeLog 2011-05-20 00:51:46 +0000 @@ -1,3 +1,8 @@ +2011-05-20 Nix + + * files.el (basic-save-buffer-2): + Fix handling of break-hardlink-on-save with non-existent files. + 2011-05-19 Deniz Dogan * net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil. === modified file 'lisp/files.el' --- lisp/files.el 2011-05-10 02:31:42 +0000 +++ lisp/files.el 2011-05-20 00:51:46 +0000 @@ -4517,6 +4517,7 @@ (dir-writable (file-writable-p dir))) (if (or (and file-precious-flag dir-writable) (and break-hardlink-on-save + (file-exists-p buffer-file-name) (> (file-nlinks buffer-file-name) 1) (or dir-writable (error (concat (format ------------------------------------------------------------ revno: 104290 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-19 20:44:19 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-05-19 06:28:27 +0000 +++ autogen/configure 2011-05-20 00:44:19 +0000 @@ -1234,6 +1234,7 @@ PATH_SEPARATOR SHELL' ac_subst_files='deps_frag +lisp_frag ns_frag' ac_user_opts=' enable_option_checking @@ -9079,6 +9080,10 @@ +lisp_frag=$srcdir/src/lisp.mk + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 $as_echo_n "checking for long file names... " >&6; } if test "${ac_cv_sys_long_file_names+set}" = set; then : ------------------------------------------------------------ revno: 104289 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-19 17:41:03 -0700 message: Remove $shortlisp from src/Makefile.in. * configure.in (lisp_frag): New output file. * src/lisp.mk: New file, split from Makefile.in, and inheriting its copyright years. * src/Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@. (shortlisp): Remove. ($(etc)/DOC): Edit lisp.mk rather than using $shortlisp. * lisp/loadup.el, doc/misc/Makefile.in: Comment changes. diff: === modified file 'ChangeLog' --- ChangeLog 2011-05-19 06:04:16 +0000 +++ ChangeLog 2011-05-20 00:41:03 +0000 @@ -1,3 +1,7 @@ +2011-05-20 Glenn Morris + + * configure.in (lisp_frag): New output file. + 2011-05-19 Glenn Morris * configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT) === modified file 'configure.in' --- configure.in 2011-05-19 06:04:16 +0000 +++ configure.in 2011-05-20 00:41:03 +0000 @@ -1370,6 +1370,10 @@ AC_SUBST_FILE(deps_frag) +lisp_frag=$srcdir/src/lisp.mk +AC_SUBST_FILE(lisp_frag) + + dnl checks for operating system services AC_SYS_LONG_FILE_NAMES === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2011-03-12 18:40:08 +0000 +++ doc/misc/Makefile.in 2011-05-20 00:41:03 +0000 @@ -28,7 +28,7 @@ # Note the other doc Makefiles do not use VPATH anymore, instead # they set infodir to an absolute path. Not doing that here in # case INFO_TARGETS gets too long for some feeble shells. -# (cf src/Makefile.in's shortlisp) +# (cf src/Makefile.in's passing of $lisp to make-docfile) VPATH=@srcdir@ ## Where the output files go. === modified file 'lisp/loadup.el' --- lisp/loadup.el 2011-05-19 06:04:16 +0000 +++ lisp/loadup.el 2011-05-20 00:41:03 +0000 @@ -29,9 +29,8 @@ ;; If you add/remove Lisp files to be loaded here, consider the ;; following issues: -;; i) Any file loaded on any platform should appear in $lisp and -;; $shortlisp in src/Makefile.in. Use the .el or .elc version as -;; appropriate. +;; i) Any file loaded on any platform should appear in $lisp in src/lisp.mk. +;; Use the .el or .elc version as appropriate. ;; This ensures both that the Lisp files are compiled (if necessary) ;; before the emacs executable is dumped, and that they are passed to === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-19 06:04:16 +0000 +++ src/ChangeLog 2011-05-20 00:41:03 +0000 @@ -1,3 +1,10 @@ +2011-05-20 Glenn Morris + + * lisp.mk: New file, split from Makefile.in. + * Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@. + (shortlisp): Remove. + ($(etc)/DOC): Edit lisp.mk rather than using $shortlisp. + 2011-05-19 Glenn Morris * Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT) === modified file 'src/Makefile.in' --- src/Makefile.in 2011-05-19 06:04:16 +0000 +++ src/Makefile.in 2011-05-20 00:41:03 +0000 @@ -358,249 +358,10 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ $(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS) -## This is the list of all Lisp files that might be loaded into the -## dumped Emacs. Some of them are not loaded on all platforms, but -## the DOC file on every platform uses them (because the DOC file is -## supposed to be platform-independent). -## It is arranged like this because it is easier to generate it -## semi-mechanically from loadup.el this way. -## Eg something like: -## sed -e 's/"[ )].*//' -n -e '/(load "/ s/.*load "//p' loadup.el | \ -## grep -vE 'site-|ldefs-boot' -## minus any duplicates. -## Note that you cannot just add a ".elc" extension to every file, -## since some of them are no-byte-compile (eg some language/ ones). -## -## Confusingly, term/internal is not in loadup, but is unconditionally -## loaded by pc-win, which is. -## -## Note that this list should not include lisp files which might not -## be present, like site-load.el and site-init.el; this makefile -## expects them all to be either present or buildable. -## -## Place loaddefs.el first, so it gets generated first, since it is on -## the critical path (relevant in parallel compilations). -lisp= \ - $(lispsource)/loaddefs.el \ - $(lispsource)/loadup.el \ - $(lispsource)/emacs-lisp/byte-run.elc \ - $(lispsource)/emacs-lisp/backquote.elc \ - $(lispsource)/subr.elc \ - $(lispsource)/version.el \ - $(lispsource)/widget.elc \ - $(lispsource)/custom.elc \ - $(lispsource)/emacs-lisp/map-ynp.elc \ - $(lispsource)/cus-start.elc \ - $(lispsource)/international/mule.elc \ - $(lispsource)/international/mule-conf.elc \ - $(lispsource)/env.elc \ - $(lispsource)/format.elc \ - $(lispsource)/bindings.elc \ - $(lispsource)/files.elc \ - $(lispsource)/cus-face.elc \ - $(lispsource)/faces.elc \ - $(lispsource)/button.elc \ - $(lispsource)/startup.elc \ - $(lispsource)/minibuffer.elc \ - $(lispsource)/abbrev.elc \ - $(lispsource)/simple.elc \ - $(lispsource)/help.elc \ - $(lispsource)/jka-cmpr-hook.elc \ - $(lispsource)/epa-hook.elc \ - $(lispsource)/international/mule-cmds.elc \ - $(lispsource)/case-table.elc \ - $(lispsource)/international/characters.elc \ - $(lispsource)/composite.elc \ - $(lispsource)/international/charprop.el \ - $(lispsource)/language/chinese.elc \ - $(lispsource)/language/cyrillic.elc \ - $(lispsource)/language/indian.elc \ - $(lispsource)/language/sinhala.el \ - $(lispsource)/language/english.el \ - $(lispsource)/language/ethiopic.elc \ - $(lispsource)/language/european.elc \ - $(lispsource)/language/czech.el \ - $(lispsource)/language/slovak.el \ - $(lispsource)/language/romanian.el \ - $(lispsource)/language/greek.el \ - $(lispsource)/language/hebrew.elc \ - $(lispsource)/language/japanese.el \ - $(lispsource)/language/korean.el \ - $(lispsource)/language/lao.el \ - $(lispsource)/language/tai-viet.el \ - $(lispsource)/language/thai.el \ - $(lispsource)/language/tibetan.elc \ - $(lispsource)/language/vietnamese.elc \ - $(lispsource)/language/misc-lang.el \ - $(lispsource)/language/utf-8-lang.el \ - $(lispsource)/language/georgian.el \ - $(lispsource)/language/khmer.el \ - $(lispsource)/language/burmese.el \ - $(lispsource)/language/cham.el \ - $(lispsource)/indent.elc \ - $(lispsource)/window.elc \ - $(lispsource)/frame.elc \ - $(lispsource)/term/tty-colors.elc \ - $(lispsource)/font-core.elc \ - $(lispsource)/facemenu.elc \ - $(lispsource)/emacs-lisp/syntax.elc \ - $(lispsource)/font-lock.elc \ - $(lispsource)/jit-lock.elc \ - $(lispsource)/mouse.elc \ - $(lispsource)/scroll-bar.elc \ - $(lispsource)/select.elc \ - $(lispsource)/emacs-lisp/timer.elc \ - $(lispsource)/isearch.elc \ - $(lispsource)/rfn-eshadow.elc \ - $(lispsource)/menu-bar.elc \ - $(lispsource)/paths.el \ - $(lispsource)/emacs-lisp/lisp.elc \ - $(lispsource)/textmodes/page.elc \ - $(lispsource)/register.elc \ - $(lispsource)/textmodes/paragraphs.elc \ - $(lispsource)/emacs-lisp/lisp-mode.elc \ - $(lispsource)/textmodes/text-mode.elc \ - $(lispsource)/textmodes/fill.elc \ - $(lispsource)/replace.elc \ - $(lispsource)/buff-menu.elc \ - $(lispsource)/fringe.elc \ - $(lispsource)/image.elc \ - $(lispsource)/international/fontset.elc \ - $(lispsource)/dnd.elc \ - $(lispsource)/tool-bar.elc \ - $(lispsource)/dynamic-setting.elc \ - $(lispsource)/x-dnd.elc \ - $(lispsource)/term/common-win.elc \ - $(lispsource)/term/x-win.elc \ - $(lispsource)/w32-vars.elc \ - $(lispsource)/term/w32-win.elc \ - $(lispsource)/ls-lisp.elc \ - $(lispsource)/disp-table.elc \ - $(lispsource)/dos-w32.elc \ - $(lispsource)/w32-fns.elc \ - $(lispsource)/dos-fns.elc \ - $(lispsource)/dos-vars.elc \ - $(lispsource)/term/pc-win.elc \ - $(lispsource)/term/internal.elc \ - $(lispsource)/term/ns-win.elc \ - $(lispsource)/mwheel.elc \ - $(lispsource)/emacs-lisp/float-sup.elc \ - $(lispsource)/vc/vc-hooks.elc \ - $(lispsource)/vc/ediff-hook.elc \ - $(lispsource)/tooltip.elc - -## The same as $lisp, but using relative file names. The only reason -## this variable exists is to prevent the make-docfile command-line -## getting too long for some systems. Unfortunately, no-one has any -## idea how long "too long" is. -shortlisp= \ - ../lisp/loaddefs.el \ - ../lisp/loadup.el \ - ../lisp/emacs-lisp/byte-run.elc \ - ../lisp/emacs-lisp/backquote.elc \ - ../lisp/subr.elc \ - ../lisp/version.el \ - ../lisp/widget.elc \ - ../lisp/custom.elc \ - ../lisp/emacs-lisp/map-ynp.elc \ - ../lisp/cus-start.elc \ - ../lisp/international/mule.elc \ - ../lisp/international/mule-conf.elc \ - ../lisp/env.elc \ - ../lisp/format.elc \ - ../lisp/bindings.elc \ - ../lisp/files.elc \ - ../lisp/cus-face.elc \ - ../lisp/faces.elc \ - ../lisp/button.elc \ - ../lisp/startup.elc \ - ../lisp/minibuffer.elc \ - ../lisp/abbrev.elc \ - ../lisp/simple.elc \ - ../lisp/help.elc \ - ../lisp/jka-cmpr-hook.elc \ - ../lisp/epa-hook.elc \ - ../lisp/international/mule-cmds.elc \ - ../lisp/case-table.elc \ - ../lisp/international/characters.elc \ - ../lisp/composite.elc \ - ../lisp/international/charprop.el \ - ../lisp/language/chinese.elc \ - ../lisp/language/cyrillic.elc \ - ../lisp/language/indian.elc \ - ../lisp/language/sinhala.el \ - ../lisp/language/english.el \ - ../lisp/language/ethiopic.elc \ - ../lisp/language/european.elc \ - ../lisp/language/czech.el \ - ../lisp/language/slovak.el \ - ../lisp/language/romanian.el \ - ../lisp/language/greek.el \ - ../lisp/language/hebrew.elc \ - ../lisp/language/japanese.el \ - ../lisp/language/korean.el \ - ../lisp/language/lao.el \ - ../lisp/language/tai-viet.el \ - ../lisp/language/thai.el \ - ../lisp/language/tibetan.elc \ - ../lisp/language/vietnamese.elc \ - ../lisp/language/misc-lang.el \ - ../lisp/language/utf-8-lang.el \ - ../lisp/language/georgian.el \ - ../lisp/language/khmer.el \ - ../lisp/language/burmese.el \ - ../lisp/language/cham.el \ - ../lisp/indent.elc \ - ../lisp/window.elc \ - ../lisp/frame.elc \ - ../lisp/term/tty-colors.elc \ - ../lisp/font-core.elc \ - ../lisp/facemenu.elc \ - ../lisp/emacs-lisp/syntax.elc \ - ../lisp/font-lock.elc \ - ../lisp/jit-lock.elc \ - ../lisp/mouse.elc \ - ../lisp/scroll-bar.elc \ - ../lisp/select.elc \ - ../lisp/emacs-lisp/timer.elc \ - ../lisp/isearch.elc \ - ../lisp/rfn-eshadow.elc \ - ../lisp/menu-bar.elc \ - ../lisp/paths.el \ - ../lisp/emacs-lisp/lisp.elc \ - ../lisp/textmodes/page.elc \ - ../lisp/register.elc \ - ../lisp/textmodes/paragraphs.elc \ - ../lisp/emacs-lisp/lisp-mode.elc \ - ../lisp/textmodes/text-mode.elc \ - ../lisp/textmodes/fill.elc \ - ../lisp/replace.elc \ - ../lisp/buff-menu.elc \ - ../lisp/fringe.elc \ - ../lisp/image.elc \ - ../lisp/international/fontset.elc \ - ../lisp/dnd.elc \ - ../lisp/tool-bar.elc \ - ../lisp/dynamic-setting.elc \ - ../lisp/x-dnd.elc \ - ../lisp/term/common-win.elc \ - ../lisp/term/x-win.elc \ - ../lisp/w32-vars.elc \ - ../lisp/term/w32-win.elc \ - ../lisp/ls-lisp.elc \ - ../lisp/disp-table.elc \ - ../lisp/dos-w32.elc \ - ../lisp/w32-fns.elc \ - ../lisp/dos-fns.elc \ - ../lisp/dos-vars.elc \ - ../lisp/term/pc-win.elc \ - ../lisp/term/internal.elc \ - ../lisp/term/ns-win.elc \ - ../lisp/mwheel.elc \ - ../lisp/emacs-lisp/float-sup.elc \ - ../lisp/vc/vc-hooks.elc \ - ../lisp/vc/ediff-hook.elc \ - ../lisp/tooltip.elc + +## Configure inserts the file lisp.mk at this point, defining $lisp. +@lisp_frag@ + ## Construct full set of libraries to be linked. ## Note that SunOS needs -lm to come before -lc; otherwise, you get @@ -634,21 +395,23 @@ fi ## We run make-docfile twice because the command line may get too long -## on some systems. +## on some systems. The sed command operating on lisp.mk also reduces +## the length of the command line. Unfortunately, no-one has any idea +## exactly how long the maximum safe command line length is on all the +## various systems that Emacs supports. Obviously, the length depends +## on what your value of $srcdir is. If the length restriction goes +## away, lisp.mk can be merged back into this file. +## ## $(SOME_MACHINE_OBJECTS) comes before $(obj) because some files may ## or may not be included in $(obj), but they are always included in ## $(SOME_MACHINE_OBJECTS). Since a file is processed when it is mentioned ## for the first time, this prevents any variation between configurations ## in the contents of the DOC file. -## Most of this Makefile refers to Lisp files via $(lispsource), so -## we also use $(lisp) rather than $(shortlisp) for the dependency since -## the Makefile uses string equality to decide when we talk about identical -## files. Apparently we pass $(shortlisp) rather than $(lisp) to make-docfile -## only in order to reduce the command line length. --Stef +## $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) -rm -f $(etc)/DOC $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC - $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) $(shortlisp) + $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)|../lisp|p' $(srcdir)/lisp.mk` $(libsrc)/make-docfile$(EXEEXT): cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT) === added file 'src/lisp.mk' --- src/lisp.mk 1970-01-01 00:00:00 +0000 +++ src/lisp.mk 2011-05-20 00:41:03 +0000 @@ -0,0 +1,160 @@ +### lisp.mk --- src/Makefile fragment for GNU Emacs + +## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2011 +## Free Software Foundation, Inc. + +## This file is part of GNU Emacs. + +## GNU Emacs is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. + +## GNU Emacs is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with GNU Emacs. If not, see . + +### Commentary: + +## This is the list of all Lisp files that might be loaded into the +## dumped Emacs. Some of them are not loaded on all platforms, but +## the DOC file on every platform uses them (because the DOC file is +## supposed to be platform-independent). +## It is arranged like this because it is easier to generate it +## semi-mechanically from loadup.el this way. +## Eg something like: +## sed -e 's/"[ )].*//' -n -e '/(load "/ s/.*load "//p' loadup.el | \ +## grep -vE 'site-|ldefs-boot' +## minus any duplicates. +## Note that you cannot just add a ".elc" extension to every file, +## since some of them are no-byte-compile (eg some language/ ones). + +## Confusingly, term/internal is not in loadup, but is unconditionally +## loaded by pc-win, which is. + +## Note that this list should not include lisp files which might not +## be present, like site-load.el and site-init.el; this makefile +## expects them all to be either present or buildable. + +## Place loaddefs.el first, so it gets generated first, since it is on +## the critical path (relevant in parallel compilations). + +### Code: + +## NB: This list is parsed by sed in the main src/Makefile. +## Do not change the formatting. +lisp = \ + $(lispsource)/loaddefs.el \ + $(lispsource)/loadup.el \ + $(lispsource)/emacs-lisp/byte-run.elc \ + $(lispsource)/emacs-lisp/backquote.elc \ + $(lispsource)/subr.elc \ + $(lispsource)/version.el \ + $(lispsource)/widget.elc \ + $(lispsource)/custom.elc \ + $(lispsource)/emacs-lisp/map-ynp.elc \ + $(lispsource)/cus-start.elc \ + $(lispsource)/international/mule.elc \ + $(lispsource)/international/mule-conf.elc \ + $(lispsource)/env.elc \ + $(lispsource)/format.elc \ + $(lispsource)/bindings.elc \ + $(lispsource)/files.elc \ + $(lispsource)/cus-face.elc \ + $(lispsource)/faces.elc \ + $(lispsource)/button.elc \ + $(lispsource)/startup.elc \ + $(lispsource)/minibuffer.elc \ + $(lispsource)/abbrev.elc \ + $(lispsource)/simple.elc \ + $(lispsource)/help.elc \ + $(lispsource)/jka-cmpr-hook.elc \ + $(lispsource)/epa-hook.elc \ + $(lispsource)/international/mule-cmds.elc \ + $(lispsource)/case-table.elc \ + $(lispsource)/international/characters.elc \ + $(lispsource)/composite.elc \ + $(lispsource)/international/charprop.el \ + $(lispsource)/language/chinese.elc \ + $(lispsource)/language/cyrillic.elc \ + $(lispsource)/language/indian.elc \ + $(lispsource)/language/sinhala.el \ + $(lispsource)/language/english.el \ + $(lispsource)/language/ethiopic.elc \ + $(lispsource)/language/european.elc \ + $(lispsource)/language/czech.el \ + $(lispsource)/language/slovak.el \ + $(lispsource)/language/romanian.el \ + $(lispsource)/language/greek.el \ + $(lispsource)/language/hebrew.elc \ + $(lispsource)/language/japanese.el \ + $(lispsource)/language/korean.el \ + $(lispsource)/language/lao.el \ + $(lispsource)/language/tai-viet.el \ + $(lispsource)/language/thai.el \ + $(lispsource)/language/tibetan.elc \ + $(lispsource)/language/vietnamese.elc \ + $(lispsource)/language/misc-lang.el \ + $(lispsource)/language/utf-8-lang.el \ + $(lispsource)/language/georgian.el \ + $(lispsource)/language/khmer.el \ + $(lispsource)/language/burmese.el \ + $(lispsource)/language/cham.el \ + $(lispsource)/indent.elc \ + $(lispsource)/window.elc \ + $(lispsource)/frame.elc \ + $(lispsource)/term/tty-colors.elc \ + $(lispsource)/font-core.elc \ + $(lispsource)/facemenu.elc \ + $(lispsource)/emacs-lisp/syntax.elc \ + $(lispsource)/font-lock.elc \ + $(lispsource)/jit-lock.elc \ + $(lispsource)/mouse.elc \ + $(lispsource)/scroll-bar.elc \ + $(lispsource)/select.elc \ + $(lispsource)/emacs-lisp/timer.elc \ + $(lispsource)/isearch.elc \ + $(lispsource)/rfn-eshadow.elc \ + $(lispsource)/menu-bar.elc \ + $(lispsource)/paths.el \ + $(lispsource)/emacs-lisp/lisp.elc \ + $(lispsource)/textmodes/page.elc \ + $(lispsource)/register.elc \ + $(lispsource)/textmodes/paragraphs.elc \ + $(lispsource)/emacs-lisp/lisp-mode.elc \ + $(lispsource)/textmodes/text-mode.elc \ + $(lispsource)/textmodes/fill.elc \ + $(lispsource)/replace.elc \ + $(lispsource)/buff-menu.elc \ + $(lispsource)/fringe.elc \ + $(lispsource)/image.elc \ + $(lispsource)/international/fontset.elc \ + $(lispsource)/dnd.elc \ + $(lispsource)/tool-bar.elc \ + $(lispsource)/dynamic-setting.elc \ + $(lispsource)/x-dnd.elc \ + $(lispsource)/term/common-win.elc \ + $(lispsource)/term/x-win.elc \ + $(lispsource)/w32-vars.elc \ + $(lispsource)/term/w32-win.elc \ + $(lispsource)/ls-lisp.elc \ + $(lispsource)/disp-table.elc \ + $(lispsource)/dos-w32.elc \ + $(lispsource)/w32-fns.elc \ + $(lispsource)/dos-fns.elc \ + $(lispsource)/dos-vars.elc \ + $(lispsource)/term/pc-win.elc \ + $(lispsource)/term/internal.elc \ + $(lispsource)/term/ns-win.elc \ + $(lispsource)/mwheel.elc \ + $(lispsource)/emacs-lisp/float-sup.elc \ + $(lispsource)/vc/vc-hooks.elc \ + $(lispsource)/vc/ediff-hook.elc \ + $(lispsource)/tooltip.elc + + +### lisp.mk ends here ------------------------------------------------------------ revno: 104288 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2011-05-20 00:03:51 +0000 message: mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading whitespace in base64 data lines. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-18 22:16:26 +0000 +++ lisp/gnus/ChangeLog 2011-05-20 00:03:51 +0000 @@ -1,3 +1,8 @@ +2011-05-19 Katsumi Yamaoka + + * mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading + whitespace in base64 data lines. + 2011-05-18 Teodor Zlatanov * gnus-registry.el (gnus-registry-user-format-function-M): === modified file 'lisp/gnus/mm-bodies.el' --- lisp/gnus/mm-bodies.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/mm-bodies.el 2011-05-20 00:03:51 +0000 @@ -197,7 +197,8 @@ (while (re-search-forward "^[\t ]*\r?\n" nil t) (delete-region (match-beginning 0) (match-end 0))) (goto-char (point-max)) - (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t) + (when (re-search-backward "^[\t ]*[A-Za-z0-9+/]+=*[\t ]*$" + nil t) (forward-line)) (point)))) ((memq encoding '(nil 7bit 8bit binary)) ------------------------------------------------------------ revno: 104287 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Thu 2011-05-19 14:38:39 +0200 message: * lisp/net/rcirc.el (rcirc-markup-urls): Check if rcirc-url-regexp is nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-19 07:55:34 +0000 +++ lisp/ChangeLog 2011-05-19 12:38:39 +0000 @@ -1,6 +1,7 @@ 2011-05-19 Deniz Dogan * net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil. + (rcirc-markup-urls): Check if rcirc-url-regexp is nil. 2011-05-19 Glenn Morris === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-05-19 07:55:34 +0000 +++ lisp/net/rcirc.el 2011-05-19 12:38:39 +0000 @@ -2394,7 +2394,8 @@ (rcirc-record-activity (current-buffer) 'nick))))) (defun rcirc-markup-urls (sender response) - (while (re-search-forward rcirc-url-regexp nil t) + (while (and rcirc-url-regexp ;; nil means disable URL catching + (re-search-forward rcirc-url-regexp nil t)) (let ((start (match-beginning 0)) (end (match-end 0))) (rcirc-add-face start end 'rcirc-url) ------------------------------------------------------------ revno: 104286 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Thu 2011-05-19 09:55:34 +0200 message: * lisp/net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-19 06:18:58 +0000 +++ lisp/ChangeLog 2011-05-19 07:55:34 +0000 @@ -1,3 +1,7 @@ +2011-05-19 Deniz Dogan + + * net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil. + 2011-05-19 Glenn Morris * progmodes/f90.el (f90-type-def-re): === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-05-12 02:25:58 +0000 +++ lisp/net/rcirc.el 2011-05-19 07:55:34 +0000 @@ -971,7 +971,7 @@ (set (make-local-variable 'rcirc-current-line) 0) (set (make-local-variable 'rcirc-short-buffer-name) nil) - (set (make-local-variable 'rcirc-urls) t) + (set (make-local-variable 'rcirc-urls) nil) ;; setup for omitting responses (setq buffer-invisibility-spec '()) ------------------------------------------------------------ revno: 104285 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-19 00:23:18 -0700 message: Fix whitespace in previous change. diff: === modified file 'doc/lispref/lists.texi' --- doc/lispref/lists.texi 2011-05-19 06:59:50 +0000 +++ doc/lispref/lists.texi 2011-05-19 07:23:18 +0000 @@ -1267,7 +1267,7 @@ @quotation @b{Common Lisp note:} Common Lisp has functions @code{union} (which avoids duplicate elements) and @code{intersection} for set operations. -Although standard GNU Emacs Lisp does not have them, the @file{cl} +Although standard GNU Emacs Lisp does not have them, the @file{cl} library provides versions. @inforef{Top, Overview, cl}. @end quotation ------------------------------------------------------------ revno: 104284 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-05-18 23:59:50 -0700 message: * doc/lispref/lists.texi (Sets And Lists): Mention cl provides union etc. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-05-19 06:54:27 +0000 +++ doc/lispref/ChangeLog 2011-05-19 06:59:50 +0000 @@ -1,3 +1,7 @@ +2011-05-19 Glenn Morris + + * lists.texi (Sets And Lists): Mention cl provides union etc. + 2011-05-19 Nix * windows.texi (Displaying Buffers): pop-to-buffer is not a command. === modified file 'doc/lispref/lists.texi' --- doc/lispref/lists.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/lists.texi 2011-05-19 06:59:50 +0000 @@ -1266,9 +1266,9 @@ @cindex CL note---lack @code{union}, @code{intersection} @quotation @b{Common Lisp note:} Common Lisp has functions @code{union} (which -avoids duplicate elements) and @code{intersection} for set operations, -but GNU Emacs Lisp does not have them. You can write them in Lisp if -you wish. +avoids duplicate elements) and @code{intersection} for set operations. +Although standard GNU Emacs Lisp does not have them, the @file{cl} +library provides versions. @inforef{Top, Overview, cl}. @end quotation @defun memq object list ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.