Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1496, 1498-1501, 1504-1505)

   - Update from CVS
   - Merge from gnus--devo--0

2008-12-16  Glenn Morris  <rgm@gnu.org>

   * lisp/mm-util.el (mm-charset-override-alist): Declare for compiler.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-566

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b19f68d..568583e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,10 @@
 
        * mml.el (mml-attach-file): Strip text properties from file name.
 
+2008-12-16  Glenn Morris  <rgm@gnu.org>
+
+       * mm-util.el (mm-charset-override-alist): Declare for compiler.
+
 2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs
@@ -1848,7 +1852,7 @@
        group names with backslashes.  Reported by Tassilo Horn
        <tassilo@member.fsf.org>.
 
-2007-12-06  D. Goel  <deego3@gmail.com>
+2007-12-06  Deepak Goel  <deego3@gmail.com>
 
        * gnus-art.el (article-make-date-line):
        * gnus-start.el (gnus-load):
@@ -2545,7 +2549,7 @@
        * mm-util.el (mm-charset-synonym-alist): Alias gbk to cp936.
        Fix comment about "iso8859-1".
 
-2007-10-08   Daiki Ueno  <ueno@unixuser.org>
+2007-10-08  Daiki Ueno  <ueno@unixuser.org>
 
        * mm-decode.el (mm-possibly-verify-or-decrypt): Replace PARTS with the
        ones returned from the verify-function.
@@ -2828,7 +2832,7 @@
        * gnus-sum.el (gnus-select-newsgroup): Decode group name in error msg.
        (gnus-read-move-group-name): Decode group name for completion.
 
-2007-07-31  Ted Zlatanov  <tzz@lifelogs.com>
+2007-07-31  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-srvr.el (gnus-server-close-all-servers): Close servers not only
        in gnus-inserted-opened-servers but also in gnus-server-alist (Katsumi
@@ -8693,7 +8697,7 @@
 
        * gnus-art.el (gnus-article-read-summary-keys): Fix misplaced parens.
 
-2005-04-06  D Goel  <deego@gnufans.org>
+2005-04-06  Deepak Goel  <deego@gnufans.org>
 
        * spam-stat.el (spam-stat-score-buffer): Add a call to a
        user-function allow user modifications of the scores.

diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 97d33b9..757f520 100644 (file)
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -2348,7 +2348,7 @@
        * gnus-sum.el (gnus-summary-reselect-current-group): Supply
        leave-hidden.
 
-2003-05-14  Jonathan Kamens  <jik@kamens.brookline.ma.us>
+2003-05-14  Jonathan I. Kamens  <jik@kamens.brookline.ma.us>
 
        * gnus-sum.el (gnus-summary-exit): Added `leave-hidden'.  (Tiny
        patch.)
@@ -7592,7 +7592,7 @@
        (spam-display-buffer-contents): Remove.
        (spam-bogofilter-score): Merge spam-display-buffer-contents.
 
-2002-10-17  Ted Zlatanov  <tzz@lifelogs.com>
+2002-10-17  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-display-buffer-contents): New function.
        (spam-bogofilter-score): Use spam-display-buffer-contents, patch
@@ -7651,7 +7651,7 @@
 
        * gnus-spec.el (gnus-pad-form): Use gnus-string-width-function.
 
-2002-10-11  Ted Zlatanov  <tzz@lifelogs.com>
+2002-10-11  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-check-ifile): Added ifile as a spam checking
        backend, and spam-use-ifle as the variable to toggle that check.
@@ -7661,7 +7661,7 @@
        * message.el (message-beginning-of-line): New variable.
        (message-beginning-of-line): Use it.
 
-2002-10-11  Ted Zlatanov  <tzz@lifelogs.com>
+2002-10-11  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el: More compilation fixes for BBDB.
 
@@ -7697,7 +7697,7 @@
        (mml2015-unabbrev-trust-alist): New.
        (mml2015-gpg-extract-signature-details): Use it.
 
-2002-10-10  Ted Zlatanov  <tzz@lifelogs.com>
+2002-10-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el: Compilation fixes, spam-check-bbdb function is nil if no
        BBDB installed.
@@ -7891,7 +7891,7 @@
        * gnus-ems.el (gnus-x-splash): Set coding-system-for-read to
        raw-text.
 
-2002-09-30  Ted Zlatanov  <tzz@lifelogs.com>
+2002-09-30  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el: Merged changes from pinard@iro.umontreal.ca (Fran\e,Ag\e(Bois
        Pinard).
@@ -8626,7 +8626,7 @@
        * gnus-sum.el (gnus-summary-insert-new-articles): Count down to
        avoid nreverse.
 
-2002-07-14  Ted Zlatanov  <teodor.zlatanov@divine.com>
+2002-07-14  Teodor Zlatanov  <teodor.zlatanov@divine.com>
 
        * gnus-sum.el (gnus-auto-expirable-marks): Remove `spam'.
        (gnus-summary-mode-line-format-alist): Add %h for number of
@@ -9254,7 +9254,7 @@
        * message.el (message-gen-unsubscribed-mft): Accept a prefix
        argument so CC can be included with C-u C-c C-f C-a.
 
-2002-04-17  Ted Zlatanov  <teodor.zlatanov@divine.com>
+2002-04-17  Teodor Zlatanov  <teodor.zlatanov@divine.com>
 
        * spam.el (spam-whitelist, spam-blacklist, spam-enter-whitelist):
        Improve docstring.

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index ebc42a6..9ef3d37 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -437,6 +437,8 @@ could use `autoload-coding-system' here."
   :group 'mime)
 (put 'mm-charset-eval-alist 'risky-local-variable t)
 
+(defvar mm-charset-override-alist)
+
 ;; Note: this function has to be defined before `mm-charset-override-alist'
 ;; since it will use this function in order to determine its default value
 ;; when loading mm-util.elc.