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

[Satyaki Das]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Satyaki Das <address@hidden>    06/03/06 05:21:41

Modified files:
        lisp/mh-e      : ChangeLog mh-search.el 

Log message:
        (mh-index-update-single-msg): Fix a bug in the
        handling of duplicate messages.  The test in cond was too strong
        and wasn't catching the case where origin-map was nil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.174&tr2=1.175&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-search.el.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.174 emacs/lisp/mh-e/ChangeLog:1.175
--- emacs/lisp/mh-e/ChangeLog:1.174     Sun Mar  5 20:28:10 2006
+++ emacs/lisp/mh-e/ChangeLog   Mon Mar  6 05:21:41 2006
@@ -1,3 +1,9 @@
+2006-03-05  Satyaki Das  <address@hidden>
+
+       * mh-search.el (mh-index-update-single-msg): Fix a bug in the
+       handling of duplicate messages.  The test in cond was too strong
+       and wasn't catching the case where origin-map was nil.
+
 2006-03-05  Bill Wohler  <address@hidden>
 
        Release MH-E version 7.93.
Index: emacs/lisp/mh-e/mh-search.el
diff -u emacs/lisp/mh-e/mh-search.el:1.9 emacs/lisp/mh-e/mh-search.el:1.10
--- emacs/lisp/mh-e/mh-search.el:1.9    Fri Feb 10 20:04:50 2006
+++ emacs/lisp/mh-e/mh-search.el        Mon Mar  6 05:21:41 2006
@@ -1907,22 +1907,24 @@
 
 This function should only be called in the appropriate index
 folder buffer."
-  (cond ((and origin-map (gethash checksum mh-index-checksum-origin-map))
-         (let* ((intermediate (gethash msg origin-map))
-                (ofolder (car intermediate))
-                (omsg (cdr intermediate)))
-           ;; This is most probably a duplicate. So eliminate it.
-           (call-process "rm" nil nil nil
-                         (format "%s%s/%s" mh-user-path
-                                 (substring mh-current-folder 1) msg))
-           (when (gethash ofolder mh-index-data)
-             (remhash omsg (gethash ofolder mh-index-data)))))
+  (cond ((gethash checksum mh-index-checksum-origin-map)
+         (when origin-map
+           (let* ((intermediate (gethash msg origin-map))
+                  (ofolder (car intermediate))
+                  (omsg (cdr intermediate)))
+             ;; This is most probably a duplicate. So eliminate it.
+             (call-process "rm" nil nil nil
+                           (format "%s%s/%s" mh-user-path
+                                   (substring mh-current-folder 1) msg))
+             (when (gethash ofolder mh-index-data)
+               (remhash omsg (gethash ofolder mh-index-data))))))
         (t
          (setf (gethash msg mh-index-msg-checksum-map) checksum)
-         (when origin-map
+         (when (and origin-map (gethash msg origin-map))
            (setf (gethash checksum mh-index-checksum-origin-map)
                  (gethash msg origin-map))))))
 
+
 (provide 'mh-search)
 
 ;; Local Variables: