From: okada <okada>
Date: Sat, 21 Dec 2002 08:20:04 +0000 (+0000)
Subject: 	* wl-news.el.in (wl-news-mode-map): Add new keybind.
X-Git-Tag: merged-trunk-to-elmo-mark-14~78
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=120611dc8a4b3a5d38cbe2455d41362bc45b1066;p=elisp%2Fwanderlust.git

	* wl-news.el.in (wl-news-mode-map): Add new keybind.
	(wl-news): Change message.
	(wl-news-exit): Check buffer.
	(wl-news-force-exit): New function.
	(wl-news-show-all): New function.
	(wl-news-discard-and-exit): Fix.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 14e7ddc..5f177e7 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-21  Kenichi OKADA  <okada@opaopa.org>
+
+	* wl-news.el.in (wl-news-mode-map): Add new keybind.
+	(wl-news): Change message.
+	(wl-news-exit): Check buffer.
+	(wl-news-force-exit): New function.
+	(wl-news-show-all): New function.
+	(wl-news-discard-and-exit): Fix.
+
 2002-12-21  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* wl-vars.el (wl-summary-weekday-name-lang): Set default value
@@ -8,7 +17,7 @@
 
 2002-12-21  Kenichi OKADA  <okada@opaopa.org>
 
-	* wl-news.el.in (wl-news-check): 
+	* wl-news.el.in (wl-news-check): Rewritten.
 	(wl-news-previous-version-load): Change data type.
 	(wl-news-previous-version-save): Change data type.
 	(wl-news-append-news): Add return value.
diff --git a/wl/wl-news.el.in b/wl/wl-news.el.in
index 6a3cab3..ea67451 100644
--- a/wl/wl-news.el.in
+++ b/wl/wl-news.el.in
@@ -178,8 +178,9 @@
 (unless wl-news-mode-map
   (setq wl-news-mode-map (make-sparse-keymap))
   (define-key wl-news-mode-map "q"     'wl-news-exit)
-  (define-key wl-news-mode-map "Q"     'wl-news-discard-and-mail)
+  (define-key wl-news-mode-map "Q"     'wl-news-force-exit)
   (define-key wl-news-mode-map "\C-xk" 'wl-news-exit)
+  (define-key wl-news-mode-map "a"     'wl-news-show-all)
   (define-key wl-news-mode-map "\C-m"  'wl-news-next-line)
   (define-key wl-news-mode-map " "     'wl-news-next-page))
 
@@ -208,9 +209,9 @@
 		  (buffer-disable-undo (current-buffer))
 		  ;; insert news
 		  (let ((buffer-read-only nil))
-		    (insert "--- Wanderlust NEWS ---  press 'q' for exit\n")
-		    (if (wl-news-already-current-p)
-			(insert "                         press 'Q' for discard this message\n\n"))
+		    (insert "--- Wanderlust NEWS ---  press 'a' to show all NEWS\n")
+		    (insert "                         press 'q' to quit\n")
+		    (insert "                         press 'Q' to force quit\n\n")
 		    (while (car lang)
 		      (wl-news-append-news
 		       (car lang) previous-version t)
@@ -231,38 +232,54 @@
   (interactive)
   (scroll-up))
 
+(defun wl-news-show-all ()
+  (interactive)
+  (when (eq major-mode 'wl-news-mode)
+    (kill-buffer (current-buffer))
+    (wl-news t)))
+
 (defun wl-news-exit ()
   (interactive)
-  (if (eq major-mode 'wl-news-mode)
-      (if (not (wl-news-already-current-p))
-	  (wl-news-discard-and-mail)
-	(kill-buffer (current-buffer))
-	(if wl-news-winconf
-	    (set-window-configuration wl-news-winconf)))))
+  (let ((buf))
+    (when (setq buf (get-buffer wl-news-buf-name))
+      (wl-news-discard-and-mail)
+      (kill-buffer buf)
+      (if wl-news-winconf
+	  (set-window-configuration wl-news-winconf)))))
 
 (defun wl-news-discard-and-mail ()
   (interactive)
-  (if (eq major-mode 'wl-news-mode)
-      (let* ((oldest-version (cdr (wl-news-previous-version-load)))
-	     (current-version (product-version (product-find 'wl-version)))
-	     (new-old-version current-version))
-	(if (wl-news-check-news oldest-version wl-news-lang)
-	    (if (y-or-n-p "Do you want to see this message again? ")
-		(progn
-		  (message "Please M-x wl-news if you want to see it.")
-		  (setq new-old-version oldest-version))
-	      (if (y-or-n-p "Do you want this message for a mail? ")
-		  (or (wl-news-send-news oldest-version wl-news-lang)
-		      (error
-		       (format "Cannot append NEWS mail to %s" wl-default-folder))))))
-	(wl-news-previous-version-save
-	 current-version new-old-version)
+  (let* ((oldest-version (cdr (wl-news-previous-version-load)))
+	 (current-version (product-version (product-find 'wl-version)))
+	 (new-old-version current-version))
+    (if (wl-news-check-news oldest-version wl-news-lang)
+	(if (y-or-n-p "Do you want to see this message again? ")
+	    (progn
+	      (message "Please M-x wl-news if you want to see it.")
+	      (setq new-old-version oldest-version))
+	  (if (y-or-n-p "Do you want this message for a mail? ")
+	      (or (wl-news-send-news oldest-version wl-news-lang)
+		  (error
+		   (format "Cannot append NEWS mail to %s" wl-default-folder))))))
+    (wl-news-previous-version-save
+     current-version new-old-version)
 	(kill-buffer (current-buffer))
 	(if wl-news-winconf
-	    (set-window-configuration wl-news-winconf)))))
+	    (set-window-configuration wl-news-winconf))))
+
+(defun wl-news-force-exit ()
+  (interactive)
+  (let ((buf))
+    (when (setq buf (get-buffer wl-news-buf-name))
+      (wl-news-previous-version-save
+       (product-version (product-find 'wl-version))
+       (cdr (wl-news-previous-version-load)))
+      (kill-buffer buf)
+      (if wl-news-winconf
+	  (set-window-configuration wl-news-winconf)))))
 
 
 (require 'product)
 (product-provide (provide 'wl-news) (require 'wl-version))
 
-;;; wl-news.el ends here
+;;; wl-news.el ends here
\ No newline at end of file