Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103687. ------------------------------------------------------------ revno: 103687 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2011-03-19 04:58:45 +0100 message: Fix typos. diff: === modified file 'ChangeLog' --- ChangeLog 2011-03-13 17:39:04 +0000 +++ ChangeLog 2011-03-19 03:58:45 +0000 @@ -59,7 +59,7 @@ 2011-02-21 Christoph Scholtes - * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on + * lib/makefile.w32-in ($(BLD)/md5.$(O)): Added dependency on $(EMACS_ROOT)/nt/inc/stdint.h. 2011-02-21 Eli Zaretskii @@ -98,7 +98,7 @@ way to test this so I left it alone. * configure: Regenerate. -2011-02-20 Christoph Scholtes +2011-02-20 Christoph Scholtes * lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from src/makefile.w32-in. @@ -961,7 +961,7 @@ 2010-06-28 Jan Djärv - * configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY, + * configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY, check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied by minimum required Gtk+ 2.6). Add checks for functions introduced in Gtk+ 2.14 or newer (bug#6505). === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-03-16 02:13:31 +0000 +++ etc/ChangeLog 2011-03-19 03:58:45 +0000 @@ -24,15 +24,15 @@ 2011-02-17 Ken Manheimer * etc/images/icons/allout-widgets/dark-bg, - etc/images/icons/allout-widgets/light-bg, - encrypted-locked.{xpm,png}, unlocked-encrypted.{xpm,png}: + * etc/images/icons/allout-widgets/light-bg, + * encrypted-locked.{xpm,png}, unlocked-encrypted.{xpm,png}: Reorganize icon directories and files to reconcile against windows short-filename clashes. 2011-02-16 Ken Manheimer * etc/images/icons/allout-widgets-dark-bg, - etc/images/icons/allout-widgets-light-bg: Icons for new + * etc/images/icons/allout-widgets-light-bg: Icons for new allout-widgets.el. * etc/images/icons/README: Include coypright and GPL 3 license for === modified file 'etc/NEWS' --- etc/NEWS 2011-03-16 02:13:31 +0000 +++ etc/NEWS 2011-03-19 03:58:45 +0000 @@ -185,8 +185,8 @@ consider if it is still appropriate to add it in the noninteractive case. ** New scrolling commands `scroll-up-command' and `scroll-down-command' -(bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom -of buffer at first key-press (instead moves to top/bottom of buffer) +(bound to C-v/[next] and M-v/[prior]) do not signal errors at top/bottom +of buffer at first key-press (instead move to top/bottom of buffer) when a new variable `scroll-error-top-bottom' is non-nil. ** New scrolling commands `scroll-up-line' and `scroll-down-line' @@ -365,7 +365,7 @@ ** Archive Mode has basic support to browse 7z archives. ** browse-url has gotten a new variable that is used for mailto: URLs, - `browse-url-mailto-function', which defaults to `browse-url-mail'. +`browse-url-mailto-function', which defaults to `browse-url-mail'. ** Directory local variables can apply to file-less buffers, in certain modes (eg dired, vc-dir, log-edit). For example, adding @@ -702,15 +702,14 @@ programmer-visible consequences. ** Passing a nil argument to a minor mode function now turns the mode - ON unconditionally. +ON unconditionally. ** During startup, Emacs no longer adds entries for `menu-bar-lines' -and `tool-bar-lines' to `default-frame-alist' and -`initial-frame-alist'. With these alist entries omitted, `make-frame' -checks the value of the variable `menu-bar-mode'/`tool-bar-mode' to -determine whether to create a menu-bar or tool-bar, respectively. -If the alist entries are added, they override the value of -`menu-bar-mode'/`tool-bar-mode'. +and `tool-bar-lines' to `default-frame-alist' and `initial-frame-alist'. +With these alist entries omitted, `make-frame' checks the value of the +variable `menu-bar-mode'/`tool-bar-mode' to determine whether to create +a menu-bar or tool-bar, respectively. If the alist entries are added, +they override the value of `menu-bar-mode'/`tool-bar-mode'. ** Regions created by mouse dragging are now normal active regions, similar to the ones created by shift-selection. In previous Emacs @@ -830,13 +829,13 @@ * Changes in Emacs 24.1 on non-free operating systems -** New configure.bat option --enable-checking builds emacs with extra +** New configure.bat option --enable-checking builds Emacs with extra runtime checks. ** New configure.bat option --distfiles to specify files to be -included in binary distribution +included in binary distribution. -** New make target `dist' to create binary distribution for MS Windows +** New make target `dist' to create binary distribution for MS Windows. ---------------------------------------------------------------------- ------------------------------------------------------------ revno: 103686 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2011-03-19 04:22:14 +0100 message: src/makefile.w32-in: Update dependencies. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-17 19:55:40 +0000 +++ src/ChangeLog 2011-03-19 03:22:14 +0000 @@ -1,3 +1,7 @@ +2011-03-19 Juanma Barranquero + + * makefile.w32-in: Update dependencies. + 2011-03-17 Eli Zaretskii * makefile.w32-in ($(BLD)/unexw32.$(O)): Depend on $(SRC)/unexec.h. === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2011-03-17 19:55:40 +0000 +++ src/makefile.w32-in 2011-03-19 03:22:14 +0000 @@ -221,7 +221,7 @@ region-cache.c sound.c atimer.c \ doprnt.c intervals.c textprop.c composite.c SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ - xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o + xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o obj = $(GLOBAL_SOURCES:.c=.o) globals.h: gl-stamp @@ -386,6 +386,7 @@ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -396,7 +397,6 @@ $(SRC)/frame.h \ $(SRC)/intervals.h \ $(SRC)/keyboard.h \ - $(PROCESS_H) \ $(SRC)/puresize.h \ $(SRC)/syssignal.h \ $(SRC)/systime.h \ @@ -484,8 +484,10 @@ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ + $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -497,7 +499,6 @@ $(SRC)/dispextern.h \ $(SRC)/epaths.h \ $(SRC)/frame.h \ - $(PROCESS_H) \ $(SRC)/syssignal.h \ $(SRC)/systime.h \ $(SRC)/systty.h \ @@ -653,16 +654,16 @@ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/dir.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ - $(LISP_H) \ - $(SRC)/atimer.h \ - $(SRC)/blockinput.h \ - $(SRC)/buffer.h \ - $(SRC)/character.h \ - $(SRC)/charset.h \ - $(SRC)/coding.h \ - $(SRC)/commands.h \ - $(SRC)/composite.h \ $(EMACS_ROOT)/lib/filemode.h \ + $(LISP_H) \ + $(SRC)/atimer.h \ + $(SRC)/blockinput.h \ + $(SRC)/buffer.h \ + $(SRC)/character.h \ + $(SRC)/charset.h \ + $(SRC)/coding.h \ + $(SRC)/commands.h \ + $(SRC)/composite.h \ $(SRC)/ndir.h \ $(SRC)/regex.h \ $(SRC)/systime.h @@ -673,6 +674,7 @@ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -687,7 +689,6 @@ $(SRC)/indent.h \ $(SRC)/intervals.h \ $(SRC)/keyboard.h \ - $(PROCESS_H) \ $(SRC)/syssignal.h \ $(SRC)/systime.h \ $(SRC)/termchar.h \ @@ -726,8 +727,8 @@ $(EMACS_ROOT)/nt/inc/pwd.h \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ + $(EMACS_ROOT)/lib/intprops.h \ $(EMACS_ROOT)/lib/strftime.h \ - $(EMACS_ROOT)/lib/intprops.h \ $(LISP_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ @@ -747,8 +748,10 @@ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ + $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -757,15 +760,14 @@ $(SRC)/composite.h \ $(SRC)/dispextern.h \ $(SRC)/frame.h \ - $(SRC)/gnutls.h \ $(SRC)/intervals.h \ $(SRC)/keyboard.h \ $(SRC)/keymap.h \ - $(PROCESS_H) \ $(SRC)/syssignal.h \ $(SRC)/systime.h \ $(SRC)/systty.h \ $(SRC)/termhooks.h \ + $(SRC)/unexec.h \ $(SRC)/w32.h \ $(SRC)/w32gui.h \ $(SRC)/w32heap.h \ @@ -837,6 +839,7 @@ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/langinfo.h \ $(EMACS_ROOT)/nt/inc/nl_types.h \ + $(EMACS_ROOT)/nt/inc/stdint.h \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(EMACS_ROOT)/lib/md5.h \ @@ -1030,6 +1033,7 @@ $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -1044,7 +1048,6 @@ $(SRC)/keyboard.h \ $(SRC)/keymap.h \ $(SRC)/macros.h \ - $(PROCESS_H) \ $(SRC)/puresize.h \ $(SRC)/syntax.h \ $(SRC)/syssignal.h \ @@ -1182,11 +1185,11 @@ $(EMACS_ROOT)/nt/inc/sys/socket.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/coding.h \ $(SRC)/composite.h \ $(SRC)/dispextern.h \ $(SRC)/ndir.h \ - $(PROCESS_H) \ $(SRC)/systime.h \ $(SRC)/w32.h \ $(SRC)/w32gui.h \ @@ -1225,11 +1228,11 @@ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/character.h \ $(SRC)/coding.h \ $(SRC)/composite.h \ $(SRC)/dispextern.h \ - $(PROCESS_H) \ $(SRC)/syssignal.h \ $(SRC)/systime.h \ $(SRC)/syswait.h \ @@ -1261,6 +1264,7 @@ $(EMACS_ROOT)/lib/ftoastr.h \ $(EMACS_ROOT)/lib/intprops.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -1274,7 +1278,6 @@ $(SRC)/frame.h \ $(SRC)/intervals.h \ $(SRC)/keyboard.h \ - $(PROCESS_H) \ $(SRC)/systime.h \ $(SRC)/termchar.h \ $(SRC)/termhooks.h \ @@ -1289,9 +1292,11 @@ $(EMACS_ROOT)/nt/inc/arpa/inet.h \ $(EMACS_ROOT)/nt/inc/netinet/in.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ + $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/socket.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -1302,7 +1307,6 @@ $(SRC)/dispextern.h \ $(SRC)/frame.h \ $(SRC)/keyboard.h \ - $(PROCESS_H) \ $(SRC)/sysselect.h \ $(SRC)/syssignal.h \ $(SRC)/systime.h \ @@ -1415,10 +1419,12 @@ $(EMACS_ROOT)/nt/inc/pwd.h \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ + $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/socket.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(EMACS_ROOT)/lib/ignore-value.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/cm.h \ @@ -1427,7 +1433,6 @@ $(SRC)/dispextern.h \ $(SRC)/frame.h \ $(SRC)/keyboard.h \ - $(PROCESS_H) \ $(SRC)/sysselect.h \ $(SRC)/syssignal.h \ $(SRC)/systime.h \ @@ -1445,6 +1450,7 @@ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ + $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/atimer.h \ @@ -1500,9 +1506,9 @@ $(BLD)/tparam.$(O) : \ $(SRC)/tparam.c \ - $(SRC)/tparam.h \ $(CONFIG_H) \ - $(LISP_H) + $(LISP_H) \ + $(SRC)/tparam.h $(BLD)/undo.$(O) : \ $(SRC)/undo.c \ @@ -1516,8 +1522,8 @@ $(BLD)/unexw32.$(O) : \ $(SRC)/unexw32.c \ + $(CONFIG_H) \ $(SRC)/unexec.h \ - $(CONFIG_H) \ $(SRC)/w32heap.h $(BLD)/vm-limit.$(O) : \ @@ -1557,6 +1563,7 @@ $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -1576,7 +1583,6 @@ $(SRC)/keyboard.h \ $(SRC)/keymap.h \ $(SRC)/macros.h \ - $(PROCESS_H) \ $(SRC)/region-cache.h \ $(SRC)/systime.h \ $(SRC)/termchar.h \ @@ -1668,8 +1674,10 @@ $(SRC)/w32term.c \ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/unistd.h \ + $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ + $(PROCESS_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ $(SRC)/buffer.h \ @@ -1686,7 +1694,6 @@ $(SRC)/intervals.h \ $(SRC)/keyboard.h \ $(SRC)/keymap.h \ - $(PROCESS_H) \ $(SRC)/systime.h \ $(SRC)/systty.h \ $(SRC)/termchar.h \ @@ -1709,7 +1716,6 @@ $(SRC)/charset.h \ $(SRC)/coding.h \ $(SRC)/composite.h \ - $(SRC)/keyboard.h \ $(SRC)/systime.h \ $(SRC)/w32gui.h \ $(SRC)/w32heap.h \ ------------------------------------------------------------ revno: 103685 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2011-03-19 00:48:04 +0000 message: gnus-util.el (gnus-buffer-live-p): Simplify gnus-buffer-live-p. (gnus-buffer-live-p): Check that buffer is not nil. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-18 13:45:04 +0000 +++ lisp/gnus/ChangeLog 2011-03-19 00:48:04 +0000 @@ -1,3 +1,8 @@ +2011-03-18 Julien Danjou + + * gnus-util.el (gnus-buffer-live-p): Simplify gnus-buffer-live-p. + (gnus-buffer-live-p): Check that buffer is not nil. + 2011-03-17 Lars Magne Ingebrigtsen * gnus-art.el: Require mouse, which the build bot seems to say is === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2011-02-17 23:46:18 +0000 +++ lisp/gnus/gnus-util.el 2011-03-19 00:48:04 +0000 @@ -672,11 +672,9 @@ (when (string-match "\\(<[^<]+>\\)[ \t]*\\'" references) (match-string 1 references)))))) -(defun gnus-buffer-live-p (buffer) +(defsubst gnus-buffer-live-p (buffer) "Say whether BUFFER is alive or not." - (and buffer - (get-buffer buffer) - (buffer-name (get-buffer buffer)))) + (and buffer (buffer-live-p (get-buffer buffer)))) (defun gnus-horizontal-recenter () "Recenter the current buffer horizontally." ------------------------------------------------------------ revno: 103684 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2011-03-18 15:52:05 -0400 message: * vc/diff-mode.el (diff-mode-map): Shadow problematic bindings from diff-mode-shared-map. (diff-mode-shared-map): Re-introduce some bindings that were problematic. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-18 13:45:04 +0000 +++ lisp/ChangeLog 2011-03-18 19:52:05 +0000 @@ -1,7 +1,8 @@ -2011-03-17 Lars Magne Ingebrigtsen +2011-03-18 Stefan Monnier - * calendar/time-date.el (format-seconds): Use assoc instead of - assoc-string to avoid warning on XEmacs. + * vc/diff-mode.el (diff-mode-map): Shadow problematic bindings from + diff-mode-shared-map (bug#8284). + (diff-mode-shared-map): Re-introduce some bindings that were problematic. 2011-03-17 Lars Magne Ingebrigtsen === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2011-03-04 08:01:24 +0000 +++ lisp/vc/diff-mode.el 2011-03-18 19:52:05 +0000 @@ -122,8 +122,7 @@ ("\C-m" . diff-goto-source) ([mouse-2] . diff-goto-source) ;; From XEmacs' diff-mode. - ;; Standard M-w is useful, so don't change M-W. - ;;("W" . widen) + ("W" . widen) ;;("." . diff-goto-source) ;display-buffer ;;("f" . diff-goto-source) ;find-file ("o" . diff-goto-source) ;other-window @@ -135,17 +134,21 @@ ;; Not useful if you have to metafy them. ;;(" " . scroll-up) ;;("\177" . scroll-down) - ;; Standard M-a is useful, so don't change M-A. - ;;("A" . diff-ediff-patch) - ;; Standard M-r is useful, so don't change M-r or M-R. - ;;("r" . diff-restrict-view) - ;;("R" . diff-reverse-direction) - ) + ("A" . diff-ediff-patch) + ("r" . diff-restrict-view) + ("R" . diff-reverse-direction)) "Basic keymap for `diff-mode', bound to various prefix keys." :inherit special-mode-map) (easy-mmode-defmap diff-mode-map - `(("\e" . ,diff-mode-shared-map) + `(("\e" . ,(let ((map (make-sparse-keymap))) + ;; We want to inherit most bindings from diff-mode-shared-map, + ;; but not all since they may hide useful M- global + ;; bindings when editing. + (set-keymap-parent map diff-mode-shared-map) + (dolist (key '("A" "r" "R" "g" "q" "W")) + (define-key map key nil)) + map)) ;; From compilation-minor-mode. ("\C-c\C-c" . diff-goto-source) ;; By analogy with the global C-x 4 a binding. ------------------------------------------------------------ revno: 103683 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2011-03-18 13:45:04 +0000 message: Merge changes made in Gnus trunk. message.texi (Various Commands): Document format specs in the ellipsis. time-date.el (format-seconds): Use assoc instead of assoc-string to avoid warning on XEmacs. gnus-art.el: Require mouse, which the build bot seems to say is needed. gravatar.el (gravatar-retrieve-synchronously): Use `url-retrieve' on XEmacs, since it doesn't have url-retrieve-synchronously. time-date.el (format-seconds): Use assoc instead of assoc-string, since assoc-string doesn't exist in XEmacs. gnus-group.el (gnus-group-list-ticked): New function. (gnus-group-make-menu-bar): Provide a menu entry for it. (gnus-group-list-map): Provide a binding for it. shr.el (shr-visit-file): New command. nnimap.el (nnimap-fetch-inbox): Rewrite slightly last patch. nnimap.el (nnimap-fetch-inbox): Don't download bodies on ver4-capable servers. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-03-17 01:30:08 +0000 +++ doc/misc/ChangeLog 2011-03-18 13:45:04 +0000 @@ -2,6 +2,11 @@ * calc.texi (Logarithmic Units): Update the function names. +2011-03-15 Lars Magne Ingebrigtsen + + * message.texi (Various Commands): Document format specs in the + ellipsis. + 2011-03-15 Antoine Levitt * message.texi (Insertion Variables): Document message-cite-style. === modified file 'doc/misc/message.texi' --- doc/misc/message.texi 2011-03-15 22:38:41 +0000 +++ doc/misc/message.texi 2011-03-18 13:45:04 +0000 @@ -1202,6 +1202,10 @@ @code{message-elide-ellipsis}. The default value is to use an ellipsis (@samp{[...]}). +This is a format-spec string, and you can use @samp{%l} to say how +many lines were removed, and @samp{%c} to say how many characters were +removed. + @item C-c M-k @kindex C-c M-k @findex message-kill-address === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-17 02:30:27 +0000 +++ lisp/ChangeLog 2011-03-18 13:45:04 +0000 @@ -1,3 +1,13 @@ +2011-03-17 Lars Magne Ingebrigtsen + + * calendar/time-date.el (format-seconds): Use assoc instead of + assoc-string to avoid warning on XEmacs. + +2011-03-17 Lars Magne Ingebrigtsen + + * calendar/time-date.el (format-seconds): Use assoc instead of + assoc-string, since assoc-string doesn't exist in XEmacs. + 2011-03-17 Juanma Barranquero * custom.el (custom-known-themes): Reflow docstring. === modified file 'lisp/calendar/time-date.el' --- lisp/calendar/time-date.el 2011-01-25 04:08:28 +0000 +++ lisp/calendar/time-date.el 2011-03-18 13:45:04 +0000 @@ -308,13 +308,9 @@ (setq start (match-end 0) spec (match-string 1 string)) (unless (string-equal spec "%") - ;; `assoc-string' is not available in XEmacs. So when compiling - ;; Gnus (`time-date.el' is part of Gnus) with XEmacs, we get - ;; a warning here. But `format-seconds' is not used anywhere in - ;; Gnus so it's not a real problem. --rsteib - (or (setq match (assoc-string spec units t)) + (or (setq match (assoc (downcase spec) units)) (error "Bad format specifier: `%s'" spec)) - (if (assoc-string spec usedunits t) + (if (assoc (downcase spec) usedunits) (error "Multiple instances of specifier: `%s'" spec)) (if (string-equal (car match) "z") (setq zeroflag t) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-17 11:30:27 +0000 +++ lisp/gnus/ChangeLog 2011-03-18 13:45:04 +0000 @@ -1,3 +1,28 @@ +2011-03-17 Lars Magne Ingebrigtsen + + * gnus-art.el: Require mouse, which the build bot seems to say is + needed. + + * gravatar.el (gravatar-retrieve-synchronously): Use `url-retrieve' on + XEmacs, since it doesn't have url-retrieve-synchronously. + +2011-03-17 Antoine Levitt + + * gnus-group.el (gnus-group-list-ticked): New function. + (gnus-group-make-menu-bar): Provide a menu entry for it. + (gnus-group-list-map): Provide a binding for it. + +2011-03-17 Lars Magne Ingebrigtsen + + * shr.el (shr-visit-file): New command. + + * nnimap.el (nnimap-fetch-inbox): Rewrite slightly last patch. + +2011-03-17 Bjørn Mork + + * nnimap.el (nnimap-fetch-inbox): Don't download bodies on ver4-capable + servers. + 2011-03-16 Julien Danjou * mm-uu.el (mm-uu-dissect-text-parts): Only dissect handle that are === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-03-17 11:30:27 +0000 +++ lisp/gnus/gnus-art.el 2011-03-18 13:45:04 +0000 @@ -44,6 +44,7 @@ (require 'wid-edit) (require 'mm-uu) (require 'message) +(require 'mouse) (autoload 'gnus-msg-mail "gnus-msg" nil t) (autoload 'gnus-button-mailto "gnus-msg") === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-03-15 22:38:41 +0000 +++ lisp/gnus/gnus-group.el 2011-03-18 13:45:04 +0000 @@ -697,7 +697,8 @@ "M" gnus-group-list-all-matching "l" gnus-group-list-level "c" gnus-group-list-cached - "?" gnus-group-list-dormant) + "?" gnus-group-list-dormant + "!" gnus-group-list-ticked) (gnus-define-keys (gnus-group-list-limit-map "/" gnus-group-list-map) "k" gnus-group-list-limit @@ -849,7 +850,8 @@ ["List all groups matching..." gnus-group-list-all-matching t] ["List active file" gnus-group-list-active t] ["List groups with cached" gnus-group-list-cached t] - ["List groups with dormant" gnus-group-list-dormant t]) + ["List groups with dormant" gnus-group-list-dormant t] + ["List groups with ticked" gnus-group-list-ticked t]) ("Sort" ["Default sort" gnus-group-sort-groups t] ["Sort by method" gnus-group-sort-groups-by-method t] @@ -4536,6 +4538,28 @@ (goto-char (point-min)) (gnus-group-position-point)) +(defun gnus-group-list-ticked (level &optional lowest) + "List all groups with ticked articles. +If the prefix LEVEL is non-nil, it should be a number that says which +level to cut off listing groups. +If LOWEST, don't list groups with level lower than LOWEST. + +This command may read the active file." + (interactive "P") + (when level + (setq level (prefix-numeric-value level))) + (when (or (not level) (>= level gnus-level-zombie)) + (gnus-cache-open)) + (funcall gnus-group-prepare-function + (or level gnus-level-subscribed) + #'(lambda (info) + (let ((marks (gnus-info-marks info))) + (assq 'tick marks))) + lowest + 'ignore) + (goto-char (point-min)) + (gnus-group-position-point)) + (defun gnus-group-listed-groups () "Return a list of listed groups." (let (point groups) === modified file 'lisp/gnus/gravatar.el' --- lisp/gnus/gravatar.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gravatar.el 2011-03-18 13:45:04 +0000 @@ -129,8 +129,10 @@ "Retrieve MAIL-ADDRESS gravatar and returns it." (let ((url (gravatar-build-url mail-address))) (if (gravatar-cache-expired url) - (with-current-buffer (url-retrieve-synchronously url) - (when gravatar-automatic-caching + (with-current-buffer (if (featurep 'xemacs) + (url-retrieve url) + (url-retrieve-synchronously url)) + (when gravatar-automatic-caching (url-store-in-cache (current-buffer))) (let ((data (gravatar-data->image))) (kill-buffer (current-buffer)) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-03-15 22:38:41 +0000 +++ lisp/gnus/nnimap.el 2011-03-18 13:45:04 +0000 @@ -1762,11 +1762,15 @@ (format "(UID %s%s)" (format (if (nnimap-ver4-p) - "BODY.PEEK[HEADER] BODY.PEEK" + "BODY.PEEK" "RFC822.PEEK")) - (if nnimap-split-download-body-default - "[]" - "[1]"))) + (cond + (nnimap-split-download-body-default + "[]") + ((nnimap-ver4-p) + "[HEADER]") + (t + "[1]")))) t)) (defun nnimap-split-incoming-mail () === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-03-08 14:26:05 +0000 +++ lisp/gnus/shr.el 2011-03-18 13:45:04 +0000 @@ -113,6 +113,15 @@ ;; Public functions and commands. +(defun shr-visit-file (file) + (interactive "fHTML file name: ") + (pop-to-buffer "*html*") + (erase-buffer) + (shr-insert-document + (with-temp-buffer + (insert-file-contents file) + (libxml-parse-html-region (point-min) (point-max))))) + ;;;###autoload (defun shr-insert-document (dom) (setq shr-content-cache nil) ------------------------------------------------------------ revno: 103682 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-03-17 13:18:59 -0700 message: Restore failure returns to unexaix.c, unexcoff.c, unexcw.c diff: === modified file 'src/unexaix.c' --- src/unexaix.c 2011-03-17 18:41:30 +0000 +++ src/unexaix.c 2011-03-17 20:18:59 +0000 @@ -142,6 +142,7 @@ || unrelocate_symbols (new, a_out, a_name, new_name) < 0) { close (new); + return; } close (new); === modified file 'src/unexcoff.c' --- src/unexcoff.c 2011-03-17 18:41:30 +0000 +++ src/unexcoff.c 2011-03-17 20:18:59 +0000 @@ -545,6 +545,7 @@ ) { close (new); + return; } close (new); === modified file 'src/unexcw.c' --- src/unexcw.c 2011-03-17 18:41:30 +0000 +++ src/unexcw.c 2011-03-17 20:18:59 +0000 @@ -263,6 +263,7 @@ { /* can only dump once */ printf ("You can only dump Emacs once on this platform.\n"); + return; } report_sheap_usage (1);