Mercurial > emacs

changeset 71255:ea0fe02fbe1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(find-auto-coding): Don't handle the short name `char-trans'.
author Kenichi Handa <handa@m17n.org>
date Wed, 07 Jun 2006 01:20:16 +0000
parents db157113b47c
children 824f88e88c32
files lisp/international/mule.el
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/mule.el	Wed Jun 07 01:19:58 2006 +0000
+++ b/lisp/international/mule.el	Wed Jun 07 01:20:16 2006 +0000
@@ -1701,15 +1701,13 @@
 	(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 @@
 			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 @@
 		     (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 @@
 		  (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".