From: teranisi <teranisi>
Date: Tue, 30 Apr 2002 01:03:54 +0000 (+0000)
Subject: * wl-message.el (wl-message-redisplay): Ignore errors while
X-Git-Tag: elmo-mark-root~192
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1b8d79ceb86c8e12d267133c551861dece7d80d0;p=elisp%2Fwanderlust.git

* wl-message.el (wl-message-redisplay): Ignore errors while
wl-message-redisplay-hook.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 2040370..7600124 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-30  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-message.el (wl-message-redisplay): Ignore errors while
+	wl-message-redisplay-hook.
+
 2002-04-27  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* wl-draft.el (wl-draft-mimic-kill-buffer): Don't save draft.
diff --git a/wl/wl-message.el b/wl/wl-message.el
index 8df8c87..7e32690 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -441,25 +441,21 @@ Returns non-nil if bottom of message."
     ;; highlight body
 ;    (when wl-highlight-body-too
 ;      (wl-highlight-body))
-    (condition-case ()
-	(wl-message-narrow-to-page)
-      (error nil)); ignore errors.
+    (ignore-errors (wl-message-narrow-to-page))
     (setq cache-used (cdr cache-used))
     (goto-char (point-min))
     (when (re-search-forward "^$" nil t)
       (wl-message-add-buttons-to-header (point-min) (point))
       (wl-message-add-buttons-to-body (point) (point-max)))
     (goto-char (point-min))
-    (unwind-protect
-	(save-excursion
-	  (run-hooks 'wl-message-redisplay-hook))
-      ;; go back to summary mode
-      (set-buffer-modified-p nil)
-      (setq buffer-read-only t)
-      (set-buffer summary-buf)
-      (setq summary-win (get-buffer-window summary-buf))
-      (if (window-live-p summary-win)
-	  (select-window summary-win)))
+    (ignore-errors (run-hooks 'wl-message-redisplay-hook))
+    ;; go back to summary mode
+    (set-buffer-modified-p nil)
+    (setq buffer-read-only t)
+    (set-buffer summary-buf)
+    (setq summary-win (get-buffer-window summary-buf))
+    (if (window-live-p summary-win)
+	(select-window summary-win))
     cache-used))
 
 ;; Use message buffer cache.