1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00

* lisp/gnus/mm-util.el (mm-charset-synonym-alist): Move definition before use.

This commit is contained in:
Glenn Morris 2011-06-29 19:53:07 -07:00
parent 28e77c4682
commit ddf6fd30db
2 changed files with 32 additions and 28 deletions

View File

@ -1,3 +1,7 @@
2011-06-30 Glenn Morris <rgm@gnu.org>
* mm-util.el (mm-charset-synonym-alist): Move definition before use.
2011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4

View File

@ -300,34 +300,6 @@ system object in XEmacs."
;; no-MULE XEmacs:
(car (memq cs (mm-get-coding-system-list))))))
(defun mm-codepage-setup (number &optional alias)
"Create a coding system cpNUMBER.
The coding system is created using `codepage-setup'. If ALIAS is
non-nil, an alias is created and added to
`mm-charset-synonym-alist'. If ALIAS is a string, it's used as
the alias. Else windows-NUMBER is used."
(interactive
(let ((completion-ignore-case t)
(candidates (if (fboundp 'cp-supported-codepages)
(cp-supported-codepages)
;; Removed in Emacs 23 (unicode), so signal an error:
(error "`codepage-setup' not present in this Emacs version"))))
(list (gnus-completing-read "Setup DOS Codepage" candidates
t nil nil "437"))))
(when alias
(setq alias (if (stringp alias)
(intern alias)
(intern (format "windows-%s" number)))))
(let* ((cp (intern (format "cp%s" number))))
(unless (mm-coding-system-p cp)
(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))
(add-to-list 'mm-charset-synonym-alist (cons alias cp)))))
(defvar mm-charset-synonym-alist
`(
;; Not in XEmacs, but it's not a proper MIME charset anyhow.
@ -376,6 +348,34 @@ the alias. Else windows-NUMBER is used."
See `mm-codepage-iso-8859-list' and `mm-codepage-ibm-list'.")
(defun mm-codepage-setup (number &optional alias)
"Create a coding system cpNUMBER.
The coding system is created using `codepage-setup'. If ALIAS is
non-nil, an alias is created and added to
`mm-charset-synonym-alist'. If ALIAS is a string, it's used as
the alias. Else windows-NUMBER is used."
(interactive
(let ((completion-ignore-case t)
(candidates (if (fboundp 'cp-supported-codepages)
(cp-supported-codepages)
;; Removed in Emacs 23 (unicode), so signal an error:
(error "`codepage-setup' not present in this Emacs version"))))
(list (gnus-completing-read "Setup DOS Codepage" candidates
t nil nil "437"))))
(when alias
(setq alias (if (stringp alias)
(intern alias)
(intern (format "windows-%s" number)))))
(let* ((cp (intern (format "cp%s" number))))
(unless (mm-coding-system-p cp)
(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))
(add-to-list 'mm-charset-synonym-alist (cons alias cp)))))
(defcustom mm-codepage-iso-8859-list
(list 1250 ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft
;; Outlook users in Czech republic. Use this to allow reading of