(mm-codepage-setup): Tweak codepage error. Silence compiler warning.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 98538473b3d282554185879ab77807136ec923f3..ef5add779b872a1af432a534d1ad189f348ad38b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-02  Glenn Morris  <rgm@gnu.org>
+
+       * mm-util.el (mm-codepage-setup): Tweak codepage error.
+       Silence compiler warning.
+
 2008-09-30  Chong Yidong  <cyd@stupidchicken.com>
 
        * mml.el (mml-menu): Don't assume mml2015 is bound.

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 453beae5216fdbcb6a7d53a32ded5688ccd33260..383b1b87916441522bfe8df41918d87f7e798fa5 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -220,8 +220,8 @@ the alias.  Else windows-NUMBER is used."
    (let ((completion-ignore-case t)
         (candidates (if (fboundp 'cp-supported-codepages)
                         (cp-supported-codepages)
-                      ;; Removed in Emacs 23 (unicode), sosignal an error:
-                      (error "`codepage-setup' is obsolete in this Emacs version."))))
+                      ;; Removed in Emacs 23 (unicode), so signal an error:
+                      (error "`codepage-setup' not present in this Emacs version."))))
      (list (completing-read "Setup DOS Codepage: (default 437) " candidates
                            nil t nil nil "437"))))
   (when alias
@@ -230,7 +230,9 @@ the alias.  Else windows-NUMBER is used."
                  (intern (format "windows-%s" number)))))
   (let* ((cp (intern (format "cp%s" number))))
     (unless (mm-coding-system-p cp)
-      (codepage-setup number))
+      (if (fboundp 'codepage-setup)    ; silence compiler
+         (codepage-setup number)
+       (error "`codepage-setup' not present in this Emacs version.")))
     (when (and alias
               ;; Don't add alias if setup of cp failed.
               (mm-coding-system-p cp))