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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c422cdb..7741525 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+       * gnus.el (gnus-meta): Doc fix.
+
+2011-02-19  Chong Yidong  <cyd@stupidchicken.com>
+
+       * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
+       in case it's not yet loaded.
+

 2011-02-19  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"
 2011-02-19  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 2257977..7a069e0 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -274,7 +274,7 @@
 
 (defgroup gnus-meta nil
   "Meta variables controlling major portions of Gnus.
 
 (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)
 
 is restarted, and sometimes reloaded."
   :group 'gnus)
 

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index dd11ff7..c6b4c08 100644 (file)
--- 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
     (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)))
       (save-buffer)))
   (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
     (nnfolder-save-nov)))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 138a3e8..0e979f3 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <tzz@lifelogs.com>
 
        * auth.texi (Help for users): Use :port instead of :protocol for all
 2011-02-17  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * auth.texi (Help for users): Use :port instead of :protocol for all

diff --git a/texi/auth.texi b/texi/auth.texi
index 76c1984..90b16e0 100644 (file)
--- 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
 
 @end quotation
 @end copying
 

-@dircategory Emacs
+@dircategory Emacs lisp libraries

 @direntry
 * Auth-source: (auth).          The Emacs auth-source library.
 @end direntry
 @direntry
 * Auth-source: (auth).          The Emacs auth-source library.
 @end direntry

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 3b6c48a..2f1be06 100644 (file)
--- 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
 
 @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
 @direntry
 * Emacs MIME: (emacs-mime).     Emacs MIME de/composition library.
 @end direntry

diff --git a/texi/gnus.texi b/texi/gnus.texi
index a8c4028..62a4ca9 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -321,7 +321,7 @@ developing GNU and promoting software freedom.''
 @end iflatex
 @end iftex
 
 @end iflatex
 @end iftex
 

-@dircategory Emacs
+@dircategory Emacs network features

 @direntry
 * Gnus: (gnus).                 The newsreader Gnus.
 @end direntry
 @direntry
 * Gnus: (gnus).                 The newsreader Gnus.
 @end direntry

diff --git a/texi/message.texi b/texi/message.texi
index 8c0c116..53b4c53 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -26,7 +26,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
 @end quotation
 @end copying
 

-@dircategory Emacs
+@dircategory Emacs network features

 @direntry
 * Message: (message).           Mail and news composition mode that
                                   goes with Gnus.
 @direntry
 * Message: (message).           Mail and news composition mode that
                                   goes with Gnus.

diff --git a/texi/pgg.texi b/texi/pgg.texi
index ccd0a42..164f262 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
 @end quotation
 @end copying
 

-@dircategory Emacs
+@dircategory Emacs network features

 @direntry
 * PGG: (pgg).                   Emacs interface to various PGP implementations.
 @end direntry
 @direntry
 * PGG: (pgg).                   Emacs interface to various PGP implementations.
 @end direntry

diff --git a/texi/sasl.texi b/texi/sasl.texi
index 263e213..d7ba1f9 100644 (file)
--- 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
 
 @end quotation
 @end copying
 

-@dircategory Emacs
+@dircategory Emacs network features

 @direntry
 * SASL: (sasl).                 The Emacs SASL library.
 @end direntry
 @direntry
 * SASL: (sasl).                 The Emacs SASL library.
 @end direntry

diff --git a/texi/sieve.texi b/texi/sieve.texi
index 2024565..b2a6f18 100644 (file)
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
 @end quotation
 @end copying
 

-@dircategory Emacs
+@dircategory Emacs network features

 @direntry
 * Sieve: (sieve).               Managing Sieve scripts in Emacs.
 @end direntry
 @direntry
 * Sieve: (sieve).               Managing Sieve scripts in Emacs.
 @end direntry