X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmm-decode.el;h=327b0e6e86f3abd006419e03d8511133610a0f47;hb=18094baee115e9f9a2f58340b76463e4e88b389d;hp=ae6bb71dfc701a726d9f4fe94419a035f32b9c7d;hpb=d1bef1a8fa9255701fd8eda4eb670c7c31f21c9a;p=gnus

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index ae6bb71df..327b0e6e8 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -31,9 +31,6 @@
 (autoload 'gnus-replace-in-string "gnus-util")
 (autoload 'gnus-read-shell-command "gnus-util")
 
-(autoload 'gnus-overlays-at "gnus")
-(autoload 'gnus-overlay-put "gnus")
-
 (autoload 'mm-inline-partial "mm-partial")
 (autoload 'mm-inline-external-body "mm-extern")
 (autoload 'mm-extern-cache-contents "mm-extern")
@@ -858,7 +855,7 @@ external if displayed external."
 				      (concat
 				       "using external program \""
 				       (format method filename) "\"")
-				    (format
+				    (gnus-format-message
 				     "by calling `%s' on the contents)" method))
 				  "? "))))))
 	    (if external
@@ -1422,7 +1419,7 @@ Return t if meta tag is added or replaced."
 	(goto-char (point-min))
 	(if (re-search-forward "\
 <meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
-text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\([^\"'>]+\\)\\)?[^>]*>" nil t)
+text/\\(\\sw+\\)\\(?:;\\s-*charset=\\([^\"'>]+\\)\\)?[^>]*>" nil t)
 	    (if (and (not force-charset)
 		     (match-beginning 2)
 		     (string-match "\\`html\\'" (match-string 1)))
@@ -1827,7 +1824,7 @@ If RECURSIVE, search recursively."
 	      (not (mm-long-lines-p 76))))))
 
 (declare-function libxml-parse-html-region "xml.c"
-		  (start end &optional base-url))
+		  (start end &optional base-url discard-comments))
 (declare-function shr-insert-document "shr" (dom))
 (defvar shr-blocked-images)
 (defvar shr-use-fonts)
@@ -1915,8 +1912,8 @@ If RECURSIVE, search recursively."
 	 :keymap shr-map
 	 (get-text-property start 'shr-url))
 	(put-text-property start end 'local-map nil)
-	(dolist (overlay (gnus-overlays-at start))
-	  (gnus-overlay-put overlay 'face nil))
+	(dolist (overlay (overlays-at start))
+	  (overlay-put overlay 'face nil))
 	(setq start end)))))
 
 (defun mm-handle-filename (handle)