[Emacs-commit] emacs/lisp/mh-e ChangeLog mh-init.el mh-utils.el

[Satyaki Das]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Satyaki Das <address@hidden>    05/10/16 20:42:39

Modified files:
        lisp/mh-e      : ChangeLog mh-init.el mh-utils.el 

Log message:
        * mh-init.el (mh-image-load-path): Remove use of pushnew since it
        causes a compiler warning.
        
        * mh-utils.el (mh-display-msg): Do MIME cleanup before inserting
        the message to be viewed (closes SF #1306141).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-init.el.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-utils.el.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.40 emacs/lisp/mh-e/ChangeLog:1.41
--- emacs/lisp/mh-e/ChangeLog:1.40      Sun Oct 16 09:31:45 2005
+++ emacs/lisp/mh-e/ChangeLog   Sun Oct 16 20:42:38 2005
@@ -1,3 +1,11 @@
+2005-10-16  Satyaki Das  <address@hidden>
+
+       * mh-init.el (mh-image-load-path): Remove use of pushnew since it
+       causes a compiler warning.
+
+       * mh-utils.el (mh-display-msg): Do MIME cleanup before inserting
+       the message to be viewed (closes SF #1306141).
+
 2005-10-16  Masatake YAMATO  <address@hidden>
 
        * mh-comp.el (mh-complete-word): Pass the common
Index: emacs/lisp/mh-e/mh-init.el
diff -u emacs/lisp/mh-e/mh-init.el:1.10 emacs/lisp/mh-e/mh-init.el:1.11
--- emacs/lisp/mh-e/mh-init.el:1.10     Sun Oct 16 03:24:54 2005
+++ emacs/lisp/mh-e/mh-init.el  Sun Oct 16 20:42:39 2005
@@ -337,7 +337,8 @@
              (error "Can not find image directory %s"
                     mh-image-load-path))
             ((boundp 'image-load-path)
-             (pushnew mh-image-load-path image-load-path))
+             (unless (member mh-image-load-path image-load-path)
+               (push mh-image-load-path image-load-path)))
             ((not (member mh-image-load-path load-path))
              (push mh-image-load-path load-path))))
     (setq mh-image-load-path-called-flag t)))
Index: emacs/lisp/mh-e/mh-utils.el
diff -u emacs/lisp/mh-e/mh-utils.el:1.15 emacs/lisp/mh-e/mh-utils.el:1.16
--- emacs/lisp/mh-e/mh-utils.el:1.15    Fri Oct 14 17:15:39 2005
+++ emacs/lisp/mh-e/mh-utils.el Sun Oct 16 20:42:39 2005
@@ -1718,6 +1718,8 @@
       (cond ((not (equal msg-filename buffer-file-name))
              (mh-unvisit-file)
              (setq buffer-read-only nil)
+             ;; Cleanup old mime handles
+             (mh-mime-cleanup)
              (erase-buffer)
              ;; Changing contents, so this hook needs to be reinitialized.
              ;; pgp.el uses this.
@@ -1729,8 +1731,6 @@
                                              (list "-form" formfile))
                                          msg-filename)
                (insert-file-contents-literally msg-filename))
-             ;; Cleanup old mime handles
-             (mh-mime-cleanup)
              ;; Use mm to display buffer
              (when (and mh-decode-mime-flag (not formfile))
                (mh-add-missing-mime-version-header)