[gnus git] branch master updated: =1= Merge changes made in Emacs trunk.
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 9ab51f6a02081679248af3e1f5be2d2189ff7588 (commit)
from de7be48d498c7d1b46f4e29d817dcb1b8c749fe4 (commit)
- Log -----------------------------------------------------------------
commit 9ab51f6a02081679248af3e1f5be2d2189ff7588
Author: Emacs devel <[email protected]>
Date: Sat Feb 19 23:36:11 2011 +0000
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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-19 Glenn Morris <[email protected]>
+
+ * gnus.el (gnus-meta): Doc fix.
+
+2011-02-19 Chong Yidong <[email protected]>
+
+ * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
+ in case it's not yet loaded.
+
2011-02-19 Lars Ingebrigtsen <[email protected]>
* nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 2257977..7a069e0 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 dd11ff7..c6b4c08 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 138a3e8..0e979f3 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-19 Eli Zaretskii <[email protected]>
+
+ * 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 <[email protected]>
* 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
--- 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 3b6c48a..2f1be06 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 a8c4028..62a4ca9 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 8c0c116..53b4c53 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 ccd0a42..164f262 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 263e213..d7ba1f9 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 2024565..b2a6f18 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
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
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(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project