[Mew-dist 13427] Re: b41

[Kazu Yamamoto ( 山本和彦 )]

Please try this. I have not tested so much.

--Kazu

Index: mew-summary.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-summary.el,v
retrieving revision 1.301
retrieving revision 1.302
diff -c -r1.301 -r1.302
*** mew-summary.el	2000/06/28 14:58:35	1.301
--- mew-summary.el	2000/06/29 05:52:41	1.302
***************
*** 699,753 ****
  current message or part. Even if it is already displayed, this
  function displays it again getting gack to the beginning."
    (interactive "P")
!   (mew-summary-msg-or-part
!    (let* ((fld (mew-summary-folder-name))
! 	  (msg (mew-summary-message-number))
! 	  (fld-msg (cons fld msg))
! 	  (ofld-msg (mew-current-get 'message))
! 	  (part (mew-syntax-nums))
! 	  (opart (mew-current-get 'part))
! 	  (buf (buffer-name))
! 	  (win (selected-window))
!           (displayed (and (get-buffer (mew-buffer-message))
!                           (get-buffer-window (mew-buffer-message))))
! 	  (read-through (interactive-p))
! 	  ;; read-through is meaningless if FORCE is t.
!           next prefetch)
!      (unwind-protect
! 	 (progn
! 	   (mew-summary-toggle-disp-msg 'on)
! 	   (mew-window-configure buf 'message)
! 	   ;; messge buffer
! 	   (cond
! 	    (msg
  	     (cond
! 	      ((or (null ofld-msg)
! 		   (not (equal fld-msg ofld-msg))
! 		   opart force)
! 	       (mew-summary-display-message fld msg buf force)
! 	       (setq prefetch t))
! 	      ;; If called internally, never match below
! 	      ((not displayed)
! 	       ()) ;; keep the page
! 	      (read-through
! 	       (if (mew-message-next-page)
! 		   (setq next t)))))
! 	    (part
! 	     (cond
! 	      ((or (null opart) (not (equal opart part)) force)
! 	       (mew-summary-display-part 
! 		(mew-cache-decode-syntax (mew-cache-hit ofld-msg)) part))
! 	      ;; If called internally, never match below
! 	      (read-through
! 	       (if (mew-message-next-page)
! 		   (setq next t)))))))
!        (select-window win)
!        ;; summary buffer
!        (mew-summary-recenter)
!        (mew-highlight-cursor-line)
!        (if prefetch (mew-summary-cache-prefetch))
!        (set-buffer-modified-p nil)
!        (if next (mew-summary-display-after mew-summary-show-direction))))))
  
  (defun mew-summary-display-message (fld msg buf force
  				    &optional suppress-display)
--- 699,755 ----
  current message or part. Even if it is already displayed, this
  function displays it again getting gack to the beginning."
    (interactive "P")
!   (if (not (or force mew-summary-buffer-disp-msg (interactive-p)))
!       ()
!     (mew-summary-msg-or-part
!      (let* ((fld (mew-summary-folder-name))
! 	    (msg (mew-summary-message-number))
! 	    (fld-msg (cons fld msg))
! 	    (ofld-msg (mew-current-get 'message))
! 	    (part (mew-syntax-nums))
! 	    (opart (mew-current-get 'part))
! 	    (buf (buffer-name))
! 	    (win (selected-window))
! 	    (displayed (and (get-buffer (mew-buffer-message))
! 			    (get-buffer-window (mew-buffer-message))))
! 	    (read-through (interactive-p))
! 	    ;; read-through is meaningless if FORCE is t.
! 	    next prefetch)
!        (unwind-protect
! 	   (progn
! 	     (mew-summary-toggle-disp-msg 'on)
! 	     (mew-window-configure buf 'message)
! 	     ;; messge buffer
  	     (cond
! 	      (msg
! 	       (cond
! 		((or (null ofld-msg)
! 		     (not (equal fld-msg ofld-msg))
! 		     opart force)
! 		 (mew-summary-display-message fld msg buf force)
! 		 (setq prefetch t))
! 		;; If called internally, never match below
! 		((not displayed)
! 		 ());; keep the page
! 		(read-through
! 		 (if (mew-message-next-page)
! 		     (setq next t)))))
! 	      (part
! 	       (cond
! 		((or (null opart) (not (equal opart part)) force)
! 		 (mew-summary-display-part 
! 		  (mew-cache-decode-syntax (mew-cache-hit ofld-msg)) part))
! 		;; If called internally, never match below
! 		(read-through
! 		 (if (mew-message-next-page)
! 		     (setq next t)))))))
! 	 (select-window win)
! 	 ;; summary buffer
! 	 (mew-summary-recenter)
! 	 (mew-highlight-cursor-line)
! 	 (if prefetch (mew-summary-cache-prefetch))
! 	 (set-buffer-modified-p nil)
! 	 (if next (mew-summary-display-after mew-summary-show-direction)))))))
  
  (defun mew-summary-display-message (fld msg buf force
  				    &optional suppress-display)
***************
*** 794,800 ****
  	       (if toolarge
  		   (message
  		    (substitute-command-keys
! 		     "Too large, this message was truncated. To see the entire message, type '\\[universal-argument] \\<mew-summary-mode-map>\\[mew-summary-display]'"))))
  	   (error
  	    (if mew-decode-error 
  		(message mew-decode-error)))))
--- 796,802 ----
  	       (if toolarge
  		   (message
  		    (substitute-command-keys
! 		     "Too large, truncated. To see the entire message, type '\\[universal-argument] \\<mew-summary-mode-map>\\[mew-summary-display]'"))))
  	   (error
  	    (if mew-decode-error 
  		(message mew-decode-error)))))