Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 101670. ------------------------------------------------------------ revno: 101670 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-09-28 21:25:59 -0700 message: Remove unused variable top_srcdir from doc Makefiles. * doc/emacs/Makefile.in (top_srcdir): Remove unused variable. * doc/misc/Makefile.in (top_srcdir): Remove unused variable. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-09-14 14:41:53 +0000 +++ doc/emacs/ChangeLog 2010-09-29 04:25:59 +0000 @@ -1,3 +1,7 @@ +2010-09-29 Glenn Morris + + * Makefile.in (top_srcdir): Remove unused variable. + 2010-09-14 Glenn Morris * cal-xtra.texi (Fancy Diary Display): Emphasize that sort should be === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2010-01-13 08:35:10 +0000 +++ doc/emacs/Makefile.in 2010-09-29 04:25:59 +0000 @@ -1,7 +1,8 @@ #### Makefile for the Emacs Manual # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -23,7 +24,6 @@ # subdirectory of the source tree. This is # set by the configure script's `--srcdir' option. srcdir=@srcdir@ -top_srcdir=@top_srcdir@ # Tell make where to find source files; this is needed for the makefiles. VPATH=@srcdir@ === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-09-26 23:15:50 +0000 +++ doc/misc/ChangeLog 2010-09-29 04:25:59 +0000 @@ -1,3 +1,7 @@ +2010-09-29 Glenn Morris + + * Makefile.in (top_srcdir): Remove unused variable. + 2010-09-26 Lars Magne Ingebrigtsen * gnus-news.texi: Mention nnimap-inbox. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2010-01-13 08:35:10 +0000 +++ doc/misc/Makefile.in 2010-09-29 04:25:59 +0000 @@ -1,7 +1,8 @@ #### Makefile for documentation other than the Emacs manual. # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -23,7 +24,6 @@ # subdirectory of the source tree. This is # set by the configure script's `--srcdir' option. srcdir=@srcdir@ -top_srcdir=@top_srcdir@ # Tell make where to find source files; this is needed for the makefiles. VPATH=@srcdir@ ------------------------------------------------------------ revno: 101669 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-09-28 21:19:30 -0700 message: Use temp-buffers when not displaying the diary. * lisp/calendar/diary-lib.el (diary-list-entries): Use temp buffers when not displaying the diary. (diary-add-to-list): If no buffer-file-name, fall back to diary-file. * lisp/calendar/appt.el (appt-check): No longer need to kill diary. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-29 04:10:34 +0000 +++ lisp/ChangeLog 2010-09-29 04:19:30 +0000 @@ -1,5 +1,10 @@ 2010-09-29 Glenn Morris + * calendar/diary-lib.el (diary-list-entries): Use temp buffers when + not displaying the diary. + (diary-add-to-list): If no buffer-file-name, fall back to diary-file. + * calendar/appt.el (appt-check): No longer need to kill diary. + * calendar/diary-lib.el (diary-list-entries): Move the "Preparing..." message entirely here. (diary-simple-display, diary-fancy-display): Move "Preparing..." === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2010-09-29 03:54:03 +0000 +++ lisp/calendar/appt.el 2010-09-29 04:19:30 +0000 @@ -257,8 +257,6 @@ (message "%s" string))))) -(defvar diary-selective-display) - (defun appt-check (&optional force) "Check for an appointment and update any reminder display. If optional argument FORCE is non-nil, reparse the diary file for @@ -326,7 +324,7 @@ (mode-line-only (unless full-check appt-now-displayed)) now cur-comp-time appt-comp-time appt-warn-time) (when (or full-check mode-line-only) - (save-excursion + (save-excursion ; FIXME ? ;; Convert current time to minutes after midnight (12.01am = 1). (setq now (decode-time) cur-comp-time (+ (* 60 (nth 2 now)) (nth 1 now))) @@ -337,23 +335,13 @@ (ignore-errors (let ((diary-hook (if (assoc 'appt-make-list diary-hook) diary-hook - (cons 'appt-make-list diary-hook))) - d-buff d-buff2) + (cons 'appt-make-list diary-hook)))) (if appt-display-diary (diary) - (setq d-buff (find-buffer-visiting diary-file)) ;; Not displaying the diary, so we can ignore ;; diary-number-of-entries. Since appt.el only ;; works on a daily basis, no need for more entries. - (diary-list-entries (calendar-current-date) 1 t) - ;; If diary buffer did not exist before this command, kill it. - ;; FIXME does not kill any included diary files. - ;; The real issue is that (diary) should not have - ;; the side effect of visiting all the diary files. - ;; It is not really appt.el's job to clean up this mess... - (and (not d-buff) - (setq d-buff2 (find-buffer-visiting diary-file)) - (kill-buffer d-buff2)))))) + (diary-list-entries (calendar-current-date) 1 t))))) (setq appt-prev-comp-time cur-comp-time appt-mode-string nil appt-display-count nil) === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2010-09-29 04:10:34 +0000 +++ lisp/calendar/diary-lib.el 2010-09-29 04:19:30 +0000 @@ -594,19 +594,20 @@ GLOBCOLOR), where LOCATOR has the form (MARKER FILENAME LITERAL), FILENAME being the file containing the diary entry." (when (and date string) - (if diary-file-name-prefix - (let ((prefix (funcall diary-file-name-prefix-function - (buffer-file-name)))) - (or (string-equal prefix "") - (setq string (format "[%s] %s" prefix string))))) - (and diary-modify-entry-list-string-function - (setq string (funcall diary-modify-entry-list-string-function - string))) - (setq diary-entries-list - (append diary-entries-list - (list (list date string specifier - (list marker (buffer-file-name) literal) - globcolor)))))) + ;; b-f-n is nil if we are visiting an include file in a temp-buffer. + (let ((dfile (or (buffer-file-name) diary-file))) + (if diary-file-name-prefix + (let ((prefix (funcall diary-file-name-prefix-function dfile))) + (or (string-equal prefix "") + (setq string (format "[%s] %s" prefix string))))) + (and diary-modify-entry-list-string-function + (setq string (funcall diary-modify-entry-list-string-function + string))) + (setq diary-entries-list + (append diary-entries-list + (list (list date string specifier + (list marker dfile literal) + globcolor))))))) (define-obsolete-function-alias 'add-to-diary-list 'diary-add-to-list "23.1") @@ -760,65 +761,72 @@ (diary-buffer (find-buffer-visiting diary-file)) ;; Dynamically bound in diary-include-other-diary-files. (d-incp (and (boundp 'diary-including) diary-including)) - diary-entries-list file-glob-attrs) + diary-entries-list file-glob-attrs temp-buff) (unless d-incp (setq diary-included-files nil) (message "Preparing diary...")) - (save-current-buffer - (if (not diary-buffer) - (set-buffer (find-file-noselect diary-file t)) - (set-buffer diary-buffer) - (or (verify-visited-file-modtime diary-buffer) - (revert-buffer t t))) - ;; Setup things like the header-line-format and invisibility-spec. - (if (eq major-mode (default-value 'major-mode)) - (diary-mode) - ;; This kludge is to make customizations to - ;; diary-header-line-flag after diary has been displayed - ;; take effect. Unconditionally calling (diary-mode) - ;; clobbers file local variables. - ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00363.html - ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00404.html - (if (eq major-mode 'diary-mode) - (setq header-line-format (and diary-header-line-flag - diary-header-line-format)))) - ;; d-s-p is passed to the diary display function. - (let ((diary-saved-point (point))) - (save-excursion - (save-restriction - (widen) ; bug#5093 - (setq file-glob-attrs (cadr (diary-pull-attrs nil ""))) - (with-syntax-table diary-syntax-table - (goto-char (point-min)) - (unless list-only - (let ((ol (make-overlay (point-min) (point-max) nil t nil))) - (set (make-local-variable 'diary-selective-display) t) - (overlay-put ol 'invisible 'diary) - (overlay-put ol 'evaporate t))) - (dotimes (idummy number) - (let ((sexp-found (diary-list-sexp-entries date)) - (entry-found (diary-list-entries-2 - date diary-nonmarking-symbol - file-glob-attrs list-only))) - (if diary-list-include-blanks - (or sexp-found entry-found - (diary-add-to-list date "" "" "" ""))) - (setq date - (calendar-gregorian-from-absolute - (1+ (calendar-absolute-from-gregorian date))))))) - (goto-char (point-min)) - (run-hooks 'diary-nongregorian-listing-hook - 'diary-list-entries-hook) - (unless list-only - (if (and diary-display-function - (listp diary-display-function)) - ;; Backwards compatibility. - (run-hooks 'diary-display-function) - (funcall (or diary-display-function - 'diary-simple-display)))) - (run-hooks 'diary-hook) - (or d-incp (message "Preparing diary...done")) - diary-entries-list))))))) + (unwind-protect + (with-current-buffer (or diary-buffer + (if list-only + (setq temp-buff (generate-new-buffer + " *diary-temp*")) + (find-file-noselect diary-file t))) + (if diary-buffer + (or (verify-visited-file-modtime diary-buffer) + (revert-buffer t t))) + (if temp-buff + ;; If including, caller has already verified it is readable. + (insert-file-contents diary-file) + ;; Setup things like the header-line-format and invisibility-spec. + (if (eq major-mode (default-value 'major-mode)) + (diary-mode) + ;; This kludge is to make customizations to + ;; diary-header-line-flag after diary has been displayed + ;; take effect. Unconditionally calling (diary-mode) + ;; clobbers file local variables. + ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00363.html + ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00404.html + (if (eq major-mode 'diary-mode) + (setq header-line-format (and diary-header-line-flag + diary-header-line-format))))) + ;; d-s-p is passed to the diary display function. + (let ((diary-saved-point (point))) + (save-excursion + (save-restriction + (widen) ; bug#5093 + (setq file-glob-attrs (cadr (diary-pull-attrs nil ""))) + (with-syntax-table diary-syntax-table + (goto-char (point-min)) + (unless list-only + (let ((ol (make-overlay (point-min) (point-max) nil t nil))) + (set (make-local-variable 'diary-selective-display) t) + (overlay-put ol 'invisible 'diary) + (overlay-put ol 'evaporate t))) + (dotimes (idummy number) + (let ((sexp-found (diary-list-sexp-entries date)) + (entry-found (diary-list-entries-2 + date diary-nonmarking-symbol + file-glob-attrs list-only))) + (if diary-list-include-blanks + (or sexp-found entry-found + (diary-add-to-list date "" "" "" ""))) + (setq date + (calendar-gregorian-from-absolute + (1+ (calendar-absolute-from-gregorian date))))))) + (goto-char (point-min)) + (run-hooks 'diary-nongregorian-listing-hook + 'diary-list-entries-hook) + (unless list-only + (if (and diary-display-function + (listp diary-display-function)) + ;; Backwards compatibility. + (run-hooks 'diary-display-function) + (funcall (or diary-display-function + 'diary-simple-display)))) + (run-hooks 'diary-hook))))) + (and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff))) + (or d-incp (message "Preparing diary...done")) + diary-entries-list))) (define-obsolete-function-alias 'list-diary-entries 'diary-list-entries "22.1") ------------------------------------------------------------ revno: 101668 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-09-28 21:10:34 -0700 message: Minor diary-lib change. * lisp/calendar/diary-lib.el (diary-list-entries): Move the "Preparing..." message entirely here. (diary-simple-display, diary-fancy-display): Move "Preparing..." messages to diary-list-entries. (diary-include-other-diary-files): Use LIST-ONLY rather than setting diary-display-function. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-29 04:00:50 +0000 +++ lisp/ChangeLog 2010-09-29 04:10:34 +0000 @@ -1,5 +1,12 @@ 2010-09-29 Glenn Morris + * calendar/diary-lib.el (diary-list-entries): Move the + "Preparing..." message entirely here. + (diary-simple-display, diary-fancy-display): Move "Preparing..." + messages to diary-list-entries. + (diary-include-other-diary-files): Use LIST-ONLY rather than setting + diary-display-function. + * calendar/diary-lib.el (diary-include-other-diary-files): Trap some recursive includes. === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2010-09-29 04:00:50 +0000 +++ lisp/calendar/diary-lib.el 2010-09-29 04:10:34 +0000 @@ -700,7 +700,6 @@ (1+ (calendar-absolute-from-gregorian gdate)))))) (goto-char (point-min))) -(defvar diary-including) ; dynamically bound in diary-include-other-diary-files (defvar diary-included-files nil "List of any diary files included in the last call to `diary-list-entries'.") @@ -759,10 +758,12 @@ (let* ((original-date date) ; save for possible use in the hooks (date-string (calendar-date-string date)) (diary-buffer (find-buffer-visiting diary-file)) + ;; Dynamically bound in diary-include-other-diary-files. + (d-incp (and (boundp 'diary-including) diary-including)) diary-entries-list file-glob-attrs) - (or (bound-and-true-p diary-including) - (setq diary-included-files nil)) - (message "Preparing diary...") + (unless d-incp + (setq diary-included-files nil) + (message "Preparing diary...")) (save-current-buffer (if (not diary-buffer) (set-buffer (find-file-noselect diary-file t)) @@ -816,6 +817,7 @@ (funcall (or diary-display-function 'diary-simple-display)))) (run-hooks 'diary-hook) + (or d-incp (message "Preparing diary...done")) diary-entries-list))))))) (define-obsolete-function-alias 'list-diary-entries 'diary-list-entries "22.1") @@ -846,22 +848,18 @@ nil t) (let ((diary-file (match-string-no-properties 1)) (diary-list-entries-hook 'diary-include-other-diary-files) - (diary-display-function 'ignore) (diary-including t) diary-hook diary-list-include-blanks efile) (if (file-exists-p diary-file) (if (file-readable-p diary-file) - (unwind-protect - (if (member (setq efile (expand-file-name diary-file)) - diary-included-files) - (error "Recursive diary include for %s" diary-file) - (setq diary-included-files - (append diary-included-files (list efile)) - diary-entries-list - (append diary-entries-list - (diary-list-entries original-date number)))) - (with-current-buffer (find-buffer-visiting diary-file) - (diary-unhide-everything))) + (if (member (setq efile (expand-file-name diary-file)) + diary-included-files) + (error "Recursive diary include for %s" diary-file) + (setq diary-included-files + (append diary-included-files (list efile)) + diary-entries-list + (append diary-entries-list + (diary-list-entries original-date number t)))) (beep) (message "Can't read included diary file %s" diary-file) (sleep-for 2)) @@ -930,8 +928,7 @@ (let ((window (display-buffer (current-buffer)))) ;; d-s-p is passed from diary-list-entries. (set-window-point window diary-saved-point) - (set-window-start window (point-min)))) - (message "Preparing diary...done")))) + (set-window-start window (point-min))))))) (define-obsolete-function-alias 'simple-diary-display 'diary-simple-display "23.1") @@ -1053,8 +1050,7 @@ (if (eq major-mode 'diary-fancy-display-mode) (run-hooks 'diary-fancy-display-mode-hook) (diary-fancy-display-mode)) - (calendar-set-mode-line date-string) - (message "Preparing diary...done")))) + (calendar-set-mode-line date-string)))) (define-obsolete-function-alias 'fancy-diary-display 'diary-fancy-display "23.1") ------------------------------------------------------------ revno: 101667 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-09-28 21:00:50 -0700 message: Minor diary include improvement. * lisp/calendar/diary-lib.el (diary-include-other-diary-files): Trap some recursive includes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-29 03:54:03 +0000 +++ lisp/ChangeLog 2010-09-29 04:00:50 +0000 @@ -1,5 +1,8 @@ 2010-09-29 Glenn Morris + * calendar/diary-lib.el (diary-include-other-diary-files): + Trap some recursive includes. + * calendar/appt.el (appt-activate): Check diary file. 2010-09-29 Katsumi Yamaoka === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2010-09-15 02:34:39 +0000 +++ lisp/calendar/diary-lib.el 2010-09-29 04:00:50 +0000 @@ -848,16 +848,18 @@ (diary-list-entries-hook 'diary-include-other-diary-files) (diary-display-function 'ignore) (diary-including t) - diary-hook diary-list-include-blanks) + diary-hook diary-list-include-blanks efile) (if (file-exists-p diary-file) (if (file-readable-p diary-file) (unwind-protect - (setq diary-included-files - (append diary-included-files - (list (expand-file-name diary-file))) - diary-entries-list - (append diary-entries-list - (diary-list-entries original-date number))) + (if (member (setq efile (expand-file-name diary-file)) + diary-included-files) + (error "Recursive diary include for %s" diary-file) + (setq diary-included-files + (append diary-included-files (list efile)) + diary-entries-list + (append diary-entries-list + (diary-list-entries original-date number)))) (with-current-buffer (find-buffer-visiting diary-file) (diary-unhide-everything))) (beep) ------------------------------------------------------------ revno: 101666 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-09-28 20:54:03 -0700 message: * lisp/calendar/appt.el (appt-activate): Check diary file. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-29 01:09:50 +0000 +++ lisp/ChangeLog 2010-09-29 03:54:03 +0000 @@ -1,3 +1,7 @@ +2010-09-29 Glenn Morris + + * calendar/appt.el (appt-activate): Check diary file. + 2010-09-29 Katsumi Yamaoka * pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2010-09-28 03:00:09 +0000 +++ lisp/calendar/appt.el 2010-09-29 03:54:03 +0000 @@ -702,6 +702,7 @@ (cancel-timer appt-timer) (setq appt-timer nil)) (when appt-active + (diary-check-diary-file) (add-hook 'write-file-functions 'appt-update-list) (setq appt-timer (run-at-time t 60 'appt-check) global-mode-string ------------------------------------------------------------ revno: 101665 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-09-29 01:09:50 +0000 message: Remove Emacs 21 stuff. mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist, mm-mime-charset): Comment fix. rfc2047.el (rfc2047-syntax-table): Comment fix. utf7.el (utf7-utf-16-coding-system): Comment fix. nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load' rather than `insert-file-contents' and `eval-region'. pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else construction. time-date.el: No need to require cl for Emacs 21. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-28 03:00:09 +0000 +++ lisp/ChangeLog 2010-09-29 01:09:50 +0000 @@ -1,3 +1,10 @@ +2010-09-29 Katsumi Yamaoka + + * pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else + construction. + + * calendar/time-date.el: No need to require cl for Emacs 21. + 2010-09-28 Glenn Morris * calendar/appt.el (appt-check): Minor simplification. === modified file 'lisp/calendar/time-date.el' --- lisp/calendar/time-date.el 2010-09-23 00:30:37 +0000 +++ lisp/calendar/time-date.el 2010-09-29 01:09:50 +0000 @@ -39,9 +39,6 @@ ;;; Code: -;; Only necessary for `declare' when compiling Gnus with Emacs 21. -(eval-when-compile (require 'cl)) - (defmacro with-decoded-time-value (varlist &rest body) "Decode a time value and bind it according to VARLIST, then eval BODY. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-28 12:35:18 +0000 +++ lisp/gnus/ChangeLog 2010-09-29 01:09:50 +0000 @@ -1,3 +1,13 @@ +2010-09-29 Katsumi Yamaoka + + * mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist) + (mm-mime-charset) + * rfc2047.el (rfc2047-syntax-table) + * utf7.el (utf7-utf-16-coding-system): Comment fix. + + * nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load' + rather than `insert-file-contents' and `eval-region'. + 2010-09-28 Katsumi Yamaoka * mail-source.el (mail-source-report-new-mail) === modified file 'lisp/gnus/mm-util.el' --- lisp/gnus/mm-util.el 2010-09-22 06:01:22 +0000 +++ lisp/gnus/mm-util.el 2010-09-29 01:09:50 +0000 @@ -383,8 +383,7 @@ (defcustom mm-codepage-iso-8859-list (list 1250 ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft ;; Outlook users in Czech republic. Use this to allow reading of - ;; their e-mails. cp1250 should be defined by M-x codepage-setup - ;; (Emacs 21). + ;; their e-mails. '(1252 . 1) ;; Windows-1252 is a superset of iso-8859-1 (West ;; Europe). See also `gnus-article-dumbquotes-map'. '(1254 . 9) ;; Windows-1254 is a superset of iso-8859-9 (Turkish). @@ -494,8 +493,8 @@ (defcustom mm-charset-eval-alist (if (featurep 'xemacs) nil ;; I don't know what would be useful for XEmacs. - '(;; Emacs 21 offers 1250 1251 1253 1257. Emacs 22 provides autoloads for - ;; 1250-1258 (i.e. `mm-codepage-setup' does nothing). + '(;; Emacs 22 provides autoloads for 1250-1258 + ;; (i.e. `mm-codepage-setup' does nothing). (windows-1250 . (mm-codepage-setup 1250 t)) (windows-1251 . (mm-codepage-setup 1251 t)) (windows-1253 . (mm-codepage-setup 1253 t)) @@ -966,7 +965,6 @@ (if (eq charset 'unknown) (error "The message contains non-printable characters, please use attachment")) (if (and (fboundp 'coding-system-get) (fboundp 'get-charset-property)) - ;; This exists in Emacs 20. (or (and (mm-preferred-coding-system charset) (or (coding-system-get === modified file 'lisp/gnus/nnrss.el' --- lisp/gnus/nnrss.el 2010-09-24 22:33:34 +0000 +++ lisp/gnus/nnrss.el 2010-09-29 01:09:50 +0000 @@ -561,12 +561,7 @@ (let ((file (nnrss-make-filename "nnrss" server)) (file-name-coding-system nnmail-pathname-coding-system)) (when (file-exists-p file) - ;; In Emacs 21.3 and earlier, `load' doesn't support non-ASCII - ;; file names. So, we use `insert-file-contents' instead. - (mm-with-multibyte-buffer - (let ((coding-system-for-read nnrss-file-coding-system)) - (insert-file-contents file) - (eval-region (point-min) (point-max))))))) + (load file nil t t)))) (defun nnrss-save-server-data (server) (gnus-make-directory nnrss-directory) @@ -590,12 +585,7 @@ (let ((file (nnrss-make-filename group server)) (file-name-coding-system nnmail-pathname-coding-system)) (when (file-exists-p file) - ;; In Emacs 21.3 and earlier, `load' doesn't support non-ASCII - ;; file names. So, we use `insert-file-contents' instead. - (mm-with-multibyte-buffer - (let ((coding-system-for-read nnrss-file-coding-system)) - (insert-file-contents file) - (eval-region (point-min) (point-max)))) + (load file nil t t) (dolist (e nnrss-group-data) (puthash (nth 9 e) t nnrss-group-hashtb) (when (and (car e) (> nnrss-group-min (car e))) === modified file 'lisp/gnus/rfc2047.el' --- lisp/gnus/rfc2047.el 2010-09-20 23:44:05 +0000 +++ lisp/gnus/rfc2047.el 2010-09-29 01:09:50 +0000 @@ -342,8 +342,8 @@ (defconst rfc2047-syntax-table ;; (make-char-table 'syntax-table '(2)) only works in Emacs. (let ((table (make-syntax-table))) - ;; The following is done to work for setting all elements of the table - ;; in Emacs 21-23 and XEmacs; it appears to be the cleanest way. + ;; The following is done to work for setting all elements of the table; + ;; it appears to be the cleanest way. ;; Play safe and don't assume the form of the word syntax entry -- ;; copy it from ?a. (if (fboundp 'set-char-table-range) ; Emacs === modified file 'lisp/gnus/utf7.el' --- lisp/gnus/utf7.el 2010-09-18 10:02:19 +0000 +++ lisp/gnus/utf7.el 2010-09-29 01:09:50 +0000 @@ -78,7 +78,7 @@ (defconst utf7-utf-16-coding-system (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS 'utf-16-be-no-signature) - ((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22 + ((and (mm-coding-system-p 'utf-16-be) ; Emacs ;; Avoid versions with BOM. (= 2 (length (encode-coding-string "a" 'utf-16-be)))) 'utf-16-be) === modified file 'lisp/pgg.el' --- lisp/pgg.el 2010-09-02 00:55:51 +0000 +++ lisp/pgg.el 2010-09-29 01:09:50 +0000 @@ -43,10 +43,8 @@ ;;; (eval-when-compile - ;; Define it as a null macro for Emacs in order to suppress a byte - ;; compile warning that Emacs 21 issues. - (defmacro pgg-run-at-time-1 (time repeat function args) - (when (featurep 'xemacs) + (when (featurep 'xemacs) + (defmacro pgg-run-at-time-1 (time repeat function args) (if (condition-case nil (let ((delete-itimer 'delete-itimer) (itimer-driver-start 'itimer-driver-start) @@ -75,36 +73,36 @@ `(let ((time ,time)) (apply #'start-itimer "pgg-run-at-time" ,function (if time (max time 1e-9) 1e-9) - ,repeat nil t ,args))) - `(let ((time ,time) - (itimers (list nil))) - (setcar - itimers - (apply #'start-itimer "pgg-run-at-time" - (lambda (itimers repeat function &rest args) - (let ((itimer (car itimers))) - (if repeat - (progn - (set-itimer-function - itimer - (lambda (itimer repeat function &rest args) - (set-itimer-restart itimer repeat) - (set-itimer-function itimer function) - (set-itimer-function-arguments itimer args) - (apply function args))) - (set-itimer-function-arguments - itimer - (append (list itimer repeat function) args))) - (set-itimer-function - itimer - (lambda (itimer function &rest args) - (delete-itimer itimer) - (apply function args))) - (set-itimer-function-arguments - itimer - (append (list itimer function) args))))) - 1e-9 (if time (max time 1e-9) 1e-9) - nil t itimers ,repeat ,function ,args)))))) + ,repeat nil t ,args)) + `(let ((time ,time) + (itimers (list nil))) + (setcar + itimers + (apply #'start-itimer "pgg-run-at-time" + (lambda (itimers repeat function &rest args) + (let ((itimer (car itimers))) + (if repeat + (progn + (set-itimer-function + itimer + (lambda (itimer repeat function &rest args) + (set-itimer-restart itimer repeat) + (set-itimer-function itimer function) + (set-itimer-function-arguments itimer args) + (apply function args))) + (set-itimer-function-arguments + itimer + (append (list itimer repeat function) args))) + (set-itimer-function + itimer + (lambda (itimer function &rest args) + (delete-itimer itimer) + (apply function args))) + (set-itimer-function-arguments + itimer + (append (list itimer function) args))))) + 1e-9 (if time (max time 1e-9) 1e-9) + nil t itimers ,repeat ,function ,args))))))) (eval-and-compile (if (featurep 'xemacs) ------------------------------------------------------------ revno: 101664 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2010-09-28 23:55:34 +0200 message: * src/gnutls.c (Fgnutls_boot): Remove unused vars `data' and `srp_cred'. (Fgnutls_boot): Use SDATA. (Fgnutls_handshake): Remove unused var `max_log_level'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-09-27 23:25:27 +0000 +++ src/ChangeLog 2010-09-28 21:55:34 +0000 @@ -1,3 +1,9 @@ +2010-09-28 Stefan Monnier + + * gnutls.c (Fgnutls_boot): Remove unused vars `data' and `srp_cred'. + (Fgnutls_boot): Use SDATA. + (Fgnutls_handshake): Remove unused var `max_log_level'. + 2010-09-27 Michael Albinus * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0". === modified file 'src/gnutls.c' --- src/gnutls.c 2010-09-27 16:44:31 +0000 +++ src/gnutls.c 2010-09-28 21:55:34 +0000 @@ -265,8 +265,6 @@ gnutls_session_t state; gnutls_certificate_credentials_t x509_cred; gnutls_anon_client_credentials_t anon_cred; - gnutls_srp_client_credentials_t srp_cred; - gnutls_datum_t data; Lisp_Object global_init; CHECK_PROCESS (proc); @@ -355,7 +353,7 @@ GNUTLS_LOG (1, max_log_level, "setting the trustfile"); ret = gnutls_certificate_set_x509_trust_file (x509_cred, - XSTRING (trustfile)->data, + SDATA (trustfile), file_format); if (ret < GNUTLS_E_SUCCESS) @@ -367,7 +365,7 @@ GNUTLS_LOG (1, max_log_level, "setting the keyfile"); ret = gnutls_certificate_set_x509_crl_file (x509_cred, - XSTRING (keyfile)->data, + SDATA (keyfile), file_format); if (ret < GNUTLS_E_SUCCESS) @@ -478,7 +476,6 @@ { gnutls_session_t state; int ret; - int max_log_level = XPROCESS (proc)->gnutls_log_level; CHECK_PROCESS (proc); state = XPROCESS (proc)->gnutls_state; @@ -494,6 +491,8 @@ message ("gnutls: handshake: setting the transport pointers to %d/%d", XPROCESS (proc)->infd, XPROCESS (proc)->outfd); + /* FIXME: This can't be right: infd and outfd are integers (file handles) + whereas the function expects args of type gnutls_transport_ptr_t. */ gnutls_transport_set_ptr2 (state, XPROCESS (proc)->infd, XPROCESS (proc)->outfd); ------------------------------------------------------------ revno: 101663 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2010-09-28 12:35:18 +0000 message: Fix comments; remove Emacs 21 stuff. mail-source.el (mail-source-report-new-mail) message.el (message-default-mail-headers) mm-decode.el (mm-valid-image-format-p): Comment fix. mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-28 11:47:12 +0000 +++ lisp/gnus/ChangeLog 2010-09-28 12:35:18 +0000 @@ -1,3 +1,11 @@ +2010-09-28 Katsumi Yamaoka + + * mail-source.el (mail-source-report-new-mail) + * message.el (message-default-mail-headers) + * mm-decode.el (mm-valid-image-format-p): Comment fix. + + * mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit. + 2010-09-28 Julien Danjou * gnus-gravatar.el (gnus-gravatar-insert): Fix search in case === modified file 'lisp/gnus/mail-source.el' --- lisp/gnus/mail-source.el 2010-09-10 00:08:31 +0000 +++ lisp/gnus/mail-source.el 2010-09-28 12:35:18 +0000 @@ -993,7 +993,7 @@ (if on (progn (require 'time) - ;; display-time-mail-function is an Emacs 21 feature. + ;; display-time-mail-function is an Emacs feature. (setq display-time-mail-function #'mail-source-new-mail-p) ;; Set up the main timer. (setq mail-source-report-new-mail-timer === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-09-28 02:13:41 +0000 +++ lisp/gnus/message.el 2010-09-28 12:35:18 +0000 @@ -1158,8 +1158,8 @@ (stringp mail-archive-file-name)) (format "FCC: %s\n" mail-archive-file-name)) ;; Use the value of `mail-default-headers' if available. - ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is - ;; unavailable unless sendmail.el is loaded. + ;; Note: as for XEmacs 21.4 and 21.5, it is unavailable + ;; unless sendmail.el is loaded. (if (boundp 'mail-default-headers) mail-default-headers)) "*A string of header lines to be inserted in outgoing mails." === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2010-09-26 04:03:19 +0000 +++ lisp/gnus/mm-decode.el 2010-09-28 12:35:18 +0000 @@ -1479,7 +1479,7 @@ ;; Handle XEmacs ((fboundp 'valid-image-instantiator-format-p) (valid-image-instantiator-format-p format)) - ;; Handle Emacs 21 + ;; Handle Emacs ((fboundp 'image-type-available-p) (and (display-graphic-p) (image-type-available-p format))) === modified file 'lisp/gnus/mml2015.el' --- lisp/gnus/mml2015.el 2010-09-26 04:03:19 +0000 +++ lisp/gnus/mml2015.el 2010-09-28 12:35:18 +0000 @@ -56,11 +56,7 @@ 'epg) (error)) (progn - (ignore-errors - ;; Avoid the "Recursive load suspected" error - ;; in Emacs 21.1. - (let ((recursive-load-depth-limit 100)) - (require 'pgg))) + (ignore-errors (require 'pgg)) (and (fboundp 'pgg-sign-region) 'pgg)) (progn (ignore-errors ------------------------------------------------------------ revno: 101662 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2010-09-28 11:47:12 +0000 message: Merge changes made in Gnus trunk. gnus-gravatar.el (gnus-gravatar-insert): Fix search backward. gnus-gravatar.el (gnus-gravatar-insert): Fix search in case mail-address contains the same string as real-name. gnus-gravatar.el (gnus-gravatar-insert): More robust search. gnus-ems.el (gnus-put-image): Revert Lars, change and insert non-blank in header, otherwise it'll get stripped. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-28 05:12:21 +0000 +++ lisp/gnus/ChangeLog 2010-09-28 11:47:12 +0000 @@ -1,3 +1,14 @@ +2010-09-28 Julien Danjou + + * gnus-gravatar.el (gnus-gravatar-insert): Fix search in case + mail-address contains the same string as real-name. + + * gnus-ems.el (gnus-put-image): Revert Lars, change and insert + non-blank in header, otherwise it'll get stripped. + + * gnus-gravatar.el (gnus-gravatar-insert): Search backward for + real-name, and then for mail address rather than doing : or , search. + 2010-09-28 Katsumi Yamaoka * nnimap.el (auth-source-forget-user-or-password) === modified file 'lisp/gnus/gnus-ems.el' --- lisp/gnus/gnus-ems.el 2010-09-26 23:01:31 +0000 +++ lisp/gnus/gnus-ems.el 2010-09-28 11:47:12 +0000 @@ -277,7 +277,7 @@ (defun gnus-put-image (glyph &optional string category) (let ((point (point))) - (insert-image glyph (or string " ")) + (insert-image glyph (or string "*")) (put-text-property point (point) 'gnus-image-category category) (unless string (put-text-property (1- (point)) (point) === modified file 'lisp/gnus/gnus-gravatar.el' --- lisp/gnus/gnus-gravatar.el 2010-09-25 12:49:02 +0000 +++ lisp/gnus/gnus-gravatar.el 2010-09-28 11:47:12 +0000 @@ -59,7 +59,7 @@ (gravatar-retrieve (car address) 'gnus-gravatar-insert - (list header (car address) category))))))) + (list header address category))))))) (defun gnus-gravatar-insert (gravatar header address category) "Insert GRAVATAR for ADDRESS in HEADER in current article buffer. @@ -68,24 +68,31 @@ (gnus-with-article-headers (gnus-article-goto-header header) (mail-header-narrow-to-field) - (when (and (search-forward address nil t) - (or (search-backward ", " nil t) - (search-backward ": " nil t))) - (goto-char (1+ (point))) - ;; Do not do anything if there's already a gravatar. This can - ;; happens if the buffer has been regenerated in the mean time, for - ;; example we were fetching someaddress, and then we change to - ;; another mail with the same someaddress. - (unless (memq 'gnus-gravatar (text-properties-at (point))) - (let ((inhibit-read-only t) - (point (point)) - (gravatar (append - gravatar - `(:ascent center :relief ,gnus-gravatar-relief)))) - (gnus-put-image gravatar nil category) - (put-text-property point (point) 'gnus-gravatar address) - (gnus-add-wash-type category) - (gnus-add-image category gravatar))))))) + (let ((real-name (cdr address)) + (mail-address (car address))) + (when (if real-name ; have a realname, go for it! + (and (search-forward real-name nil t) + (search-backward real-name nil t)) + (and (search-forward mail-address nil t) + (search-backward mail-address nil t))) + (goto-char (1- (point))) + ;; If we're on the " quoting the name, go backward + (when (looking-at "\"") + (goto-char (1- (point)))) + ;; Do not do anything if there's already a gravatar. This can + ;; happens if the buffer has been regenerated in the mean time, for + ;; example we were fetching someaddress, and then we change to + ;; another mail with the same someaddress. + (unless (memq 'gnus-gravatar (text-properties-at (point))) + (let ((inhibit-read-only t) + (point (point)) + (gravatar (append + gravatar + `(:ascent center :relief ,gnus-gravatar-relief)))) + (gnus-put-image gravatar nil category) + (put-text-property point (point) 'gnus-gravatar address) + (gnus-add-wash-type category) + (gnus-add-image category gravatar)))))))) ;;;###autoload (defun gnus-treat-from-gravatar () ------------------------------------------------------------ revno: 101661 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2010-09-28 05:12:21 +0000 message: nnimap.el (auth-source-forget-user-or-password, auth-source-user-or-password): Autoload. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-28 02:13:41 +0000 +++ lisp/gnus/ChangeLog 2010-09-28 05:12:21 +0000 @@ -1,5 +1,8 @@ 2010-09-28 Katsumi Yamaoka + * nnimap.el (auth-source-forget-user-or-password) + (auth-source-user-or-password): Autoload. + * message.el (message-from-style, message-interactive) (message-signature): Remove comment. (message-cite-prefix-regexp): Default to mail-citation-prefix-regexp === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-09-27 23:07:47 +0000 +++ lisp/gnus/nnimap.el 2010-09-28 05:12:21 +0000 @@ -40,6 +40,9 @@ (require 'utf7) (require 'parse-time) +(autoload 'auth-source-forget-user-or-password "auth-source") +(autoload 'auth-source-user-or-password "auth-source") + (nnoo-declare nnimap) (defvoo nnimap-address nil