(mm-codepage-setup): If cp-supported-codepages isn't

fbound (Emacs 23 unicode), signal an error.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4c3d36322154d6f0c84a441db2b5271c534d2538..047b0cfafc2f4819387b3d521cd748f673144940 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mm-util.el (mm-codepage-setup): If cp-supported-codepages isn't
+       fbound (Emacs 23 unicode), signal an error.
+
 2008-02-08  Glenn Morris  <rgm@gnu.org>
 
        * gnus-art.el (pgg-display-output-buffer): Declare as function.

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 8a4fd5e6e652d86128ae2fea9873dd85924ce1ef..2f473ff184c43d652470fa0ecf35ae58aee5d9a1 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -219,7 +219,10 @@ non-nil, an alias is created and added to
 the alias.  Else windows-NUMBER is used."
   (interactive
    (let ((completion-ignore-case t)
-        (candidates (cp-supported-codepages)))
+        (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."))))
      (list (completing-read "Setup DOS Codepage: (default 437) " candidates
                            nil t nil nil "437"))))
   (when alias