Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

3 files changed, 12 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 576cec2ca82..52c72ec8606 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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"
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 4cbdee53ab4..42acb65ff9f 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -275,7 +275,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/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index dd11ff71dd3..c6b4c0825e3 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/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)))