diff options
| author | Kenichi Handa <handa@m17n.org> | 2006-06-07 01:20:16 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2006-06-07 01:20:16 +0000 |
| commit | 36e0285064805bbeda924947399b988501c76cd9 (patch) | |
| tree | 852e30cfe236d834e1309cc0dd1c81b2e44e4e69 /lisp/international/mule.el | |
| parent | 0091c67e78d06e67e5deab9e08c2e9e30102200f (diff) | |
| download | emacs-36e0285064805bbeda924947399b988501c76cd9.tar.gz | |
(find-auto-coding): Don't handle the short name `char-trans'.
Diffstat (limited to 'lisp/international/mule.el')
| -rw-r--r-- | lisp/international/mule.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index c0b330a1af3..a248a449166 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1701,15 +1701,13 @@ If nothing is specified, the return value is nil." (setq head-found (or (search-forward "coding:" head-end t) (search-forward "unibyte:" head-end t) (search-forward "enable-character-translation:" - head-end t) - (search-forward "char-trans:" head-end t))) + head-end t))) (if (and head-found (> head-found tail-start)) ;; Head and tail are overlapped. (setq tail-found head-found) (goto-char tail-start) (setq tail-found (or (search-forward "coding:" tail-end t) (search-forward "unibyte:" tail-end t) - (search-forward "char-trans:" tail-end t) (search-forward "enable-character-translation:" tail-end t)))) @@ -1731,9 +1729,9 @@ If nothing is specified, the return value is nil." head-end t)) (setq coding-system (intern (match-string 2)))) (when (re-search-forward - "\\(.*;\\)?[ \t]*\\(enable-character-translation\\|char-trans\\):[ \t]*\\([^ ;]+\\)" + "\\(.*;\\)?[ \t]*enable-character-translation:[ \t]*\\([^ ;]+\\)" head-end t) - (setq char-trans (match-string 3))))) + (setq char-trans (match-string 2))))) ;; If no coding: tag in the head, check the tail. ;; Here we must pay attention to the case that the end-of-line @@ -1764,7 +1762,7 @@ If nothing is specified, the return value is nil." (re-char-trans (concat "[\r\n]" prefix - "[ \t]*\\(enable-character-translation\\|char-trans\\)[ \t]*:[ \t]*\\([^ \t\r\n]+\\)[ \t]*" + "[ \t]*enable-character-translation[ \t]*:[ \t]*\\([^ \t\r\n]+\\)[ \t]*" suffix "[\r\n]")) (re-end (concat "[\r\n]" prefix "[ \t]*End *:[ \t]*" suffix @@ -1782,7 +1780,7 @@ If nothing is specified, the return value is nil." (setq coding-system (intern (match-string 1)))) (when (and (not char-trans) (re-search-forward re-char-trans tail-end t)) - (setq char-trans (match-string 2)))))) + (setq char-trans (match-string 1)))))) (if coding-system ;; If the coding-system name ends with "!", remove it and ;; set char-trans to "nil". |