diff options
| author | Juanma Barranquero | 2005-05-06 19:25:10 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2005-05-06 19:25:10 +0000 |
| commit | 5d10503f56a5f7ce208f5378dd0311343cf0d593 (patch) | |
| tree | 29437d2951a479b7d810971f946bf46c959d2f6d | |
| parent | 2c6b25c7660922951c1a654de6737671a089d465 (diff) | |
| download | emacs-5d10503f56a5f7ce208f5378dd0311343cf0d593.tar.gz emacs-5d10503f56a5f7ce208f5378dd0311343cf0d593.zip | |
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
`assoc-string'.
| -rw-r--r-- | lisp/textmodes/po.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index a4ec5d3ac8b..c2e58d7d582 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el | |||
| @@ -80,14 +80,15 @@ Do so according to FILENAME's declared charset." | |||
| 80 | assoc) | 80 | assoc) |
| 81 | (list (cond | 81 | (list (cond |
| 82 | ((setq assoc | 82 | ((setq assoc |
| 83 | (assoc-ignore-case charset | 83 | (assoc-string charset |
| 84 | po-content-type-charset-alist)) | 84 | po-content-type-charset-alist |
| 85 | t)) | ||
| 85 | (cdr assoc)) | 86 | (cdr assoc)) |
| 86 | ((or (setq assoc (assoc-ignore-case charset coding-system-alist)) | 87 | ((or (setq assoc (assoc-string charset coding-system-alist t)) |
| 87 | (setq assoc | 88 | (setq assoc |
| 88 | (assoc-ignore-case (subst-char-in-string ?_ ?- | 89 | (assoc-string (subst-char-in-string ?_ ?- |
| 89 | charset) | 90 | charset) |
| 90 | coding-system-alist))) | 91 | coding-system-alist t))) |
| 91 | (intern (car assoc))) | 92 | (intern (car assoc))) |
| 92 | ;; In principle we should also check the `mime-charset' | 93 | ;; In principle we should also check the `mime-charset' |
| 93 | ;; property of everything in the base coding system | 94 | ;; property of everything in the base coding system |
| @@ -101,10 +102,10 @@ Do so according to FILENAME's declared charset." | |||
| 101 | ;; to require it initially? | 102 | ;; to require it initially? |
| 102 | (require 'code-pages nil t) | 103 | (require 'code-pages nil t) |
| 103 | (if (or | 104 | (if (or |
| 104 | (setq assoc (assoc-ignore-case charset coding-system-alist)) | 105 | (setq assoc (assoc-string charset coding-system-alist t)) |
| 105 | (setq assoc (assoc-ignore-case (subst-char-in-string | 106 | (setq assoc (assoc-string (subst-char-in-string |
| 106 | ?_ ?- charset) | 107 | ?_ ?- charset) |
| 107 | coding-system-alist))) | 108 | coding-system-alist t))) |
| 108 | (intern (car assoc)) | 109 | (intern (car assoc)) |
| 109 | 'raw-text)))))))) | 110 | 'raw-text)))))))) |
| 110 | 111 | ||