From 9ab51f6a02081679248af3e1f5be2d2189ff7588 Mon Sep 17 00:00:00 2001 From: Emacs devel Date: Sat, 19 Feb 2011 23:36:11 +0000 Subject: [PATCH] Merge changes made in Emacs trunk. auth.texi: Sync @dircategory with Emacs/info/dir. emacs-mime.texi: Sync @dircategory with Emacs/info/dir. gnus.texi: Sync @dircategory with Emacs/info/dir. message.texi: Sync @dircategory with Emacs/info/dir. pgg.texi: Sync @dircategory with Emacs/info/dir. sasl.texi: Sync @dircategory with Emacs/info/dir. sieve.texi: Sync @dircategory with Emacs/info/dir. gnus.el (gnus-meta): Doc fix. nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update, in case it's not yet loaded. --- lisp/ChangeLog | 9 +++++++++ lisp/gnus.el | 2 +- lisp/nnfolder.el | 4 ++-- texi/ChangeLog | 10 ++++++++++ texi/auth.texi | 2 +- texi/emacs-mime.texi | 2 +- texi/gnus.texi | 2 +- texi/message.texi | 2 +- texi/pgg.texi | 2 +- texi/sasl.texi | 2 +- texi/sieve.texi | 2 +- 11 files changed, 29 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c422cdba3..774152535 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2011-02-19 Glenn Morris + + * gnus.el (gnus-meta): Doc fix. + +2011-02-19 Chong Yidong + + * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update, + in case it's not yet loaded. + 2011-02-19 Lars Ingebrigtsen * nnimap.el (nnimap-parse-copied-articles): Allow for " OK" diff --git a/lisp/gnus.el b/lisp/gnus.el index 22579778f..7a069e0b3 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -274,7 +274,7 @@ (defgroup gnus-meta nil "Meta variables controlling major portions of Gnus. -In general, modifying these variables does not take affect until Gnus +In general, modifying these variables does not take effect until Gnus is restarted, and sometimes reloaded." :group 'gnus) diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index dd11ff71d..c6b4c0825 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -1090,8 +1090,8 @@ This command does not work if you use short group names." (gnus-make-directory (file-name-directory (buffer-file-name))) (let ((coding-system-for-write (or nnfolder-file-coding-system-for-write - nnfolder-file-coding-system)) - (copyright-update nil)) + nnfolder-file-coding-system))) + (set (make-local-variable 'copyright-update) nil) (save-buffer))) (unless (or gnus-nov-is-evil nnfolder-nov-is-evil) (nnfolder-save-nov))) diff --git a/texi/ChangeLog b/texi/ChangeLog index 138a3e8db..0e979f364 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,13 @@ +2011-02-19 Eli Zaretskii + + * auth.texi: Sync @dircategory with Emacs/info/dir. + * emacs-mime.texi: Sync @dircategory with Emacs/info/dir. + * gnus.texi: Sync @dircategory with Emacs/info/dir. + * message.texi: Sync @dircategory with Emacs/info/dir. + * pgg.texi: Sync @dircategory with Emacs/info/dir. + * sasl.texi: Sync @dircategory with Emacs/info/dir. + * sieve.texi: Sync @dircategory with Emacs/info/dir. + 2011-02-17 Teodor Zlatanov * auth.texi (Help for users): Use :port instead of :protocol for all diff --git a/texi/auth.texi b/texi/auth.texi index 76c1984ee..90b16e090 100644 --- a/texi/auth.texi +++ b/texi/auth.texi @@ -32,7 +32,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Auth-source: (auth). The Emacs auth-source library. @end direntry diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index 3b6c48a9d..2f1be06f2 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -30,7 +30,7 @@ developing GNU and promoting software freedom.'' @c Node ``Interface Functions'' uses Latin-1 characters @documentencoding ISO-8859-1 -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Emacs MIME: (emacs-mime). Emacs MIME de/composition library. @end direntry diff --git a/texi/gnus.texi b/texi/gnus.texi index a8c402801..62a4ca971 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -321,7 +321,7 @@ developing GNU and promoting software freedom.'' @end iflatex @end iftex -@dircategory Emacs +@dircategory Emacs network features @direntry * Gnus: (gnus). The newsreader Gnus. @end direntry diff --git a/texi/message.texi b/texi/message.texi index 8c0c11659..53b4c53d2 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -26,7 +26,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Message: (message). Mail and news composition mode that goes with Gnus. diff --git a/texi/pgg.texi b/texi/pgg.texi index ccd0a423a..164f262db 100644 --- a/texi/pgg.texi +++ b/texi/pgg.texi @@ -27,7 +27,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * PGG: (pgg). Emacs interface to various PGP implementations. @end direntry diff --git a/texi/sasl.texi b/texi/sasl.texi index 263e21304..d7ba1f94f 100644 --- a/texi/sasl.texi +++ b/texi/sasl.texi @@ -33,7 +33,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * SASL: (sasl). The Emacs SASL library. @end direntry diff --git a/texi/sieve.texi b/texi/sieve.texi index 202456588..b2a6f1846 100644 --- a/texi/sieve.texi +++ b/texi/sieve.texi @@ -27,7 +27,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Sieve: (sieve). Managing Sieve scripts in Emacs. @end direntry -- 2.25.1