Package: w3m-el
Version: 1.4.3-2
Severity: wishlist
Tags: patch

shimbun/mew-shimbun fails (void-variable mew-mark-multi) when using
Mew 4.2 (upstream stable release of Mew). The attached patch (from
upstream CVS) prevents this problem.

Thanks,
-- 
Tatsuya Kinoshita
--- w3m-el-1.4.3/shimbun/mew-shimbun.el
+++ emacs-w3m/shimbun/mew-shimbun.el
@@ -166,13 +166,17 @@
   :group 'mew-shimbun
   :type '(string :size 0))
 
-(defcustom mew-shimbun-mark-re-retrieve mew-mark-multi
+(defcustom mew-shimbun-mark-re-retrieve (or (and (boundp 'mew-mark-multi)
+                                                mew-mark-multi)
+                                           mew-mark-review)
   "*Shimbun re-retrieve mark."
   :group 'shimbun
   :group 'mew-shimbun
   :type 'character)
 
-(defcustom mew-shimbun-mark-unseen mew-mark-review
+(defcustom mew-shimbun-mark-unseen (or (and (boundp 'mew-mark-unread)
+                                           mew-mark-unread)
+                                      mew-mark-review)
   "*Shimbun unseen mark."
   :group 'shimbun
   :group 'mew-shimbun
@@ -834,7 +838,8 @@
       (with-current-buffer fld
        (goto-char (point-min))
        (when (mew-shimbun-jump-msg msg)
-         (mew-mark-put-mark mew-shimbun-mark-unseen))))
+         (mew-mark-put-mark mew-shimbun-mark-unseen))
+       (forward-line)))
     ;; for summary redraw
     (sit-for 0.01)))
 
@@ -1033,8 +1038,9 @@
   "`Shimbun unseen mark' support advices."
   (interactive)
   (when mew-shimbun-use-unseen
-    (defadvice mew-summary-cursor-postscript (before shimbun-unseen activate)
-      (mew-shimbun-unseen-remove-advice))
+    (unless (boundp 'mew-mark-unread)
+      (defadvice mew-summary-cursor-postscript (before shimbun-unseen activate)
+       (mew-shimbun-unseen-remove-advice)))
 
     (when mew-shimbun-use-unseen-cache-save
       ;; "C-cC-q"

Attachment: pgp9wlnHSRCvB.pgp
Description: PGP signature

Reply via email to