* elmo-imap4.el (elmo-imap4-folder-list-range): Fix indent (only cosmetic fix).

[elisp/wanderlust.git] / wl / wl-news.el.in

diff --git a/wl/wl-news.el.in b/wl/wl-news.el.in
index f485014..d3803cb 100644 (file)
--- a/wl/wl-news.el.in
+++ b/wl/wl-news.el.in
@@ -44,7 +44,8 @@
   (if (and (boundp 'current-language-environment)
           (string-equal "Japanese"
                         (symbol-value 'current-language-environment)))
-      '("ja" "en") '("en" "ja")))
+      '("ja" "en") '("en" "ja"))
+       "The list of languages to show NEWS. (order sensitive)")
 
 (defun wl-news-check ()
   (let* ((updated (not (wl-news-already-current-p))))
@@ -67,41 +68,33 @@
 ;;; -*- news-list-end -*-
 
 (defun wl-news-previous-version-load ()
-  (save-excursion
+  (with-temp-buffer
     (let ((filename (expand-file-name
                     wl-news-version-file-name
                     elmo-msgdb-directory))
-         (tmp-buffer (get-buffer-create " *wl-news-version-tmp*"))
          insert-file-contents-pre-hook
          insert-file-contents-post-hook
          ret-val)
       (if (not (file-readable-p filename))
          (cons wl-news-default-previous-version
                wl-news-default-previous-version)
-       (set-buffer tmp-buffer)
        (insert-file-contents filename)
-       (setq ret-val
-             (condition-case nil
-                 (read (current-buffer))
-               (error nil nil)))
-       (kill-buffer tmp-buffer)
-       ret-val))))
+       (condition-case nil
+           (read (current-buffer))
+         (error nil nil))))))
 
 (defun wl-news-previous-version-save (current-version previous-version)
-  (save-excursion
+  (with-temp-buffer
     (let ((filename (expand-file-name
                     wl-news-version-file-name
                     elmo-msgdb-directory))
-         (tmp-buffer (get-buffer-create " *wl-news-version-tmp*")))
-      (set-buffer tmp-buffer)
-      (erase-buffer)
-      (prin1 (cons current-version previous-version) tmp-buffer)
-      (princ "\n" tmp-buffer)
+         print-length print-level)
+      (prin1 (cons current-version previous-version) (current-buffer))
+      (princ "\n" (current-buffer))
       (if (file-writable-p filename)
          (write-region (point-min) (point-max)
                        filename nil 'no-msg)
-       (message "%s is not writable." filename))
-      (kill-buffer tmp-buffer))))
+       (message "%s is not writable." filename)))))
 
 (defun wl-news-append-news (lang previous-version &optional no-mime-tag)
   (require 'wl-mime)
@@ -138,7 +131,7 @@
         (product-version (product-find 'wl-version))
         (car (wl-news-previous-version-load)))))
 
-(defun wl-news-send-news (version news-lang)
+(defun wl-news-send-news (version news-lang folder)
   (require 'wl-draft)
   (let ((lang (if (listp wl-news-lang)
                  wl-news-lang
@@ -171,7 +164,7 @@
            (and (elmo-folder-writable-p
                  (wl-folder-get-elmo-folder folder))
                 (elmo-folder-append-buffer
-                 (wl-folder-get-elmo-folder folder) t)))
+                 (wl-folder-get-elmo-folder folder))))
       (wl-draft-hide send-buffer)
       (wl-draft-delete send-buffer))
     ret))
@@ -192,15 +185,18 @@
   (define-key wl-news-mode-map "a"     'wl-news-show-all)
   (define-key wl-news-mode-map "m"     'wl-news-append-to-folder)
   (define-key wl-news-mode-map "\C-m"  'wl-news-next-line)
-  (define-key wl-news-mode-map " "     'wl-news-next-page))
-
-(defun wl-news-mode ()
+  (define-key wl-news-mode-map " "     'wl-news-next-page)
+  (define-key wl-news-mode-map "\177"  'wl-news-previous-page)
+  ;; re-bind commands of outline-mode
+  (define-key wl-news-mode-map "n"     'outline-next-visible-heading)
+  (define-key wl-news-mode-map "p"     'outline-previous-visible-heading)
+  (define-key wl-news-mode-map "u"     'outline-up-heading)
+  (define-key wl-news-mode-map "N"     'outline-forward-same-level)
+  (define-key wl-news-mode-map "P"     'outline-backward-same-level))
+
+(require 'derived)
+(define-derived-mode wl-news-mode outline-mode "NEWS"
   "Mode for Wanderlust NEWS(.ja)."
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map wl-news-mode-map)
-  (setq major-mode 'wl-news-mode)
-  (setq mode-name "NEWS")
   (setq buffer-read-only t))
 
 (defun wl-news (&optional arg)
@@ -244,6 +240,10 @@
   (interactive)
   (scroll-up))
 
+(defun wl-news-previous-page ()
+  (interactive)
+  (scroll-down))
+
 (defun wl-news-show-all ()
   (interactive)
   (when (eq major-mode 'wl-news-mode)
@@ -283,9 +283,8 @@
                            wl-default-folder)))
            (setq folder
                  (wl-summary-read-folder wl-default-folder "to append ")))
-       (or (wl-news-send-news wl-news-buffer-oldest-version wl-news-lang)
-           (error
-            (format "Cannot append NEWS mail to %s" folder))))))
+       (or (wl-news-send-news wl-news-buffer-oldest-version wl-news-lang folder)
+           (error "Cannot append NEWS mail to %s" folder)))))
 
 (defun wl-news-force-exit ()
   (interactive)
@@ -302,4 +301,8 @@
 (require 'product)
 (product-provide (provide 'wl-news) (require 'wl-version))
 
+\f
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
 ;;; wl-news.el ends here