--- mime-w3m-new.el	2020-06-26 20:16:27.730352478 -0400
+++ mime-w3m.el	2020-06-26 20:16:55.325746342 -0400
@@ -1,4 +1,4 @@
-;;; mime-w3m.el --- mime-view content filter for text -*- coding: utf-8; -*-
+;;; mime-w3m.el --- mime-view content filter for text
 
 ;; Copyright (C) 2001-2005, 2009, 2010, 2012, 2013, 2017, 2019
 ;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
@@ -65,7 +65,7 @@
 variable `w3m-safe-url-regexp' will be bound with this value.  You may
 set this value to nil if you consider all the urls to be safe."
   :group 'mime-w3m
-  :type '(choice (regexp :format "%t: %v\n")
+  :type '(choice (regexp :format "%t: %v")
 		 (const :tag "All URLs are safe" nil)))
 
 (defcustom mime-w3m-after-cursor-move-hook
@@ -135,28 +135,6 @@
     (goto-char p)
     (insert "\n")
     (goto-char p)
-<<<<<<< HEAD
-    (mime-w3m-save-background-color
-     (save-restriction
-       (narrow-to-region p p)
-       (mime-insert-text-content entity)
-       (run-hooks 'mime-text-decode-hook)
-       (condition-case err
-	   (let ((w3m-safe-url-regexp mime-w3m-safe-url-regexp)
-		 (w3m-display-inline-images mime-w3m-display-inline-images)
-		 w3m-force-redisplay)
-	     (w3m-region p (point-max)
-			 (and (stringp xref)
-			      (string-match "\\`http://" xref)
-			      xref)
-			 (mime-content-type-parameter
-			  (mime-entity-content-type entity)
-			  "charset"))
-	     (add-text-properties p (point-max)
-				  (list 'keymap w3m-minor-mode-map
-					'text-rendered-by-mime-w3m t)))
-	 (error (w3m--message t 'w3m-error "%s" err)))))))
-=======
     (save-restriction
       (narrow-to-region p p)
       (mime-insert-text-content entity)
@@ -176,11 +154,10 @@
 				 (list 'keymap w3m-minor-mode-map
 				       'text-rendered-by-mime-w3m t)))
 	(error (message "%s" err))))))
->>>>>>> b5ec8774904ac9be0879928283b99ac77c3e2b63
 
 (let (current-load-list)
   (defadvice mime-display-message
-    (after add-emacs-w3m-functions-to-pre/post-command-hook activate compile)
+      (after add-emacs-w3m-functions-to-pre/post-command-hook activate compile)
     "Advised by emacs-w3m.
 Add some emacs-w3m utility functions to pre/post-command-hook."
     (when (featurep 'w3m)