From: Juri Linkov <juri@jurta.org>
Date: Fri, 2 Jun 2006 18:17:02 +0000 (+0000)
Subject: (sgml-html-meta-auto-coding-function):
X-Git-Tag: emacs-pretest-22.0.90~2113
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21b28a27fc3d38901cc50feb1ce904712a3a2597;p=emacs.git

(sgml-html-meta-auto-coding-function):
Remove the condition `(search-forward "<html" size t)'.
Replace `\"' with `[\"']?' in `re-search-forward'.
---

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index d9242f7cb5d..e808f4f5d0f 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2284,21 +2284,19 @@ This function is intended to be added to `auto-coding-functions'."
   "If the buffer has an HTML meta tag, use it to determine encoding.
 This function is intended to be added to `auto-coding-functions'."
   (setq size (min (+ (point) size)
-		  ;; Only search forward 10 lines
 		  (save-excursion
 		    ;; Limit the search by the end of the HTML header.
 		    (or (search-forward "</head>" size t)
 			;; In case of no header, search only 10 lines.
 			(forward-line 10))
 		    (point))))
-  (when (and (search-forward "<html" size t)
-	     (re-search-forward "<meta\\s-+http-equiv=\"content-type\"\\s-+content=\"text/\\sw+;\\s-*charset=\\(.+?\\)\"" size t))
-      (let* ((match (match-string 1))
-	     (sym (intern (downcase match))))
-	(if (coding-system-p sym)
-	    sym
-	  (message "Warning: unknown coding system \"%s\"" match)
-	  nil))))
+  (when (re-search-forward "<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*charset=\\(.+?\\)[\"']" size t)
+    (let* ((match (match-string 1))
+	   (sym (intern (downcase match))))
+      (if (coding-system-p sym)
+	  sym
+	(message "Warning: unknown coding system \"%s\"" match)
+	nil))))
 
 ;;;
 (provide 'mule)