(nnshimbun): Follow changes in nnshimbun.el.

[elisp/gnus.git-] / lisp / gnus-salt.el

diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index 1f881cf..181f9cf 100644 (file)
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -1,5 +1,5 @@
 ;;; gnus-salt.el --- alternate summary mode interfaces for Gnus
 ;;; gnus-salt.el --- alternate summary mode interfaces for Gnus

-;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news

@@ -76,8 +76,7 @@ It accepts the same format specs that `gnus-summary-line-format' does."
     "u" gnus-pick-unmark-article-or-thread
     "." gnus-pick-article-or-thread
     gnus-down-mouse-2 gnus-pick-mouse-pick-region
     "u" gnus-pick-unmark-article-or-thread
     "." gnus-pick-article-or-thread
     gnus-down-mouse-2 gnus-pick-mouse-pick-region

-    "\r" gnus-pick-start-reading
-    ))
+    "\r" gnus-pick-start-reading))

 
 (defun gnus-pick-make-menu-bar ()
   (unless (boundp 'gnus-pick-menu)
 
 (defun gnus-pick-make-menu-bar ()
   (unless (boundp 'gnus-pick-menu)

@@ -131,7 +130,8 @@ It accepts the same format specs that `gnus-summary-line-format' does."
               (set-buffer gnus-summary-buffer)
               gnus-pick-mode))
     (message-add-action
               (set-buffer gnus-summary-buffer)
               gnus-pick-mode))
     (message-add-action

-     '(gnus-configure-windows 'pick t) 'send 'exit 'postpone 'kill)))
+     '(gnus-configure-windows ,gnus-current-window-configuration t)
+     'send 'exit 'postpone 'kill)))

 
 (defvar gnus-pick-line-number 1)
 (defun gnus-pick-line-number ()
 
 (defvar gnus-pick-line-number 1)
 (defun gnus-pick-line-number ()

@@ -162,8 +162,8 @@ If given a prefix, mark all unpicked articles as read."
       (error "No articles have been picked"))))
 
 (defun gnus-pick-goto-article (arg)
       (error "No articles have been picked"))))
 
 (defun gnus-pick-goto-article (arg)

-  "Go to the article number indicated by ARG.  If ARG is an invalid
-article number, then stay on current line."
+  "Go to the article number indicated by ARG.
+If ARG is an invalid article number, then stay on current line."

   (let (pos)
     (save-excursion
       (goto-char (point-min))
   (let (pos)
     (save-excursion
       (goto-char (point-min))

@@ -172,9 +172,9 @@ article number, then stay on current line."
     (if (not pos)
        (gnus-error 2 "No such line: %s" arg)
       (goto-char pos))))
     (if (not pos)
        (gnus-error 2 "No such line: %s" arg)
       (goto-char pos))))

-    
+

 (defun gnus-pick-article (&optional arg)
 (defun gnus-pick-article (&optional arg)

-    "Pick the article on the current line.
+  "Pick the article on the current line.

 If ARG, pick the article on that line instead."
   (interactive "P")
   (when arg
 If ARG, pick the article on that line instead."
   (interactive "P")
   (when arg

@@ -189,9 +189,12 @@ If ARG, pick the article/thread on that line instead."
   (when arg
     (gnus-pick-goto-article arg))
   (if gnus-thread-hide-subtree
   (when arg
     (gnus-pick-goto-article arg))
   (if gnus-thread-hide-subtree

-      (gnus-uu-mark-thread)
+      (progn
+       (save-excursion
+         (gnus-uu-mark-thread))
+       (forward-line 1))

     (gnus-summary-mark-as-processable 1)))
     (gnus-summary-mark-as-processable 1)))

-                 
+

 (defun gnus-pick-unmark-article-or-thread (&optional arg)
   "If gnus-thread-hide-subtree is t, then unmark the thread on current line.
 Otherwise unmark the article on current line.
 (defun gnus-pick-unmark-article-or-thread (&optional arg)
   "If gnus-thread-hide-subtree is t, then unmark the thread on current line.
 Otherwise unmark the article on current line.

@@ -200,9 +203,10 @@ If ARG, unmark thread/article on that line instead."
   (when arg
     (gnus-pick-goto-article arg))
   (if gnus-thread-hide-subtree
   (when arg
     (gnus-pick-goto-article arg))
   (if gnus-thread-hide-subtree

-      (gnus-uu-unmark-thread)
+      (save-excursion
+       (gnus-uu-unmark-thread))

     (gnus-summary-unmark-as-processable 1)))
     (gnus-summary-unmark-as-processable 1)))

-  
+

 (defun gnus-pick-mouse-pick (e)
   (interactive "e")
   (mouse-set-point e)
 (defun gnus-pick-mouse-pick (e)
   (interactive "e")
   (mouse-set-point e)

@@ -219,7 +223,6 @@ This must be bound to a button-down mouse event."
         (start-point (posn-point start-posn))
          (start-line (1+ (count-lines 1 start-point)))
         (start-window (posn-window start-posn))
         (start-point (posn-point start-posn))
          (start-line (1+ (count-lines 1 start-point)))
         (start-window (posn-window start-posn))

-        (start-frame (window-frame start-window))

         (bounds (gnus-window-edges start-window))
         (top (nth 1 bounds))
         (bottom (if (window-minibuffer-p start-window)
         (bounds (gnus-window-edges start-window))
         (top (nth 1 bounds))
         (bottom (if (window-minibuffer-p start-window)

@@ -239,18 +242,16 @@ This must be bound to a button-down mouse event."
     ;; end-of-range is used only in the single-click case.
     ;; It is the place where the drag has reached so far
     ;; (but not outside the window where the drag started).
     ;; end-of-range is used only in the single-click case.
     ;; It is the place where the drag has reached so far
     ;; (but not outside the window where the drag started).

-    (let (event end end-point last-end-point (end-of-range (point)))
+    (let (event end end-point (end-of-range (point)))

       (track-mouse
        (while (progn
       (track-mouse
        (while (progn

-               (setq event (gnus-read-event-char))
+               (setq event (cdr (gnus-read-event-char)))

                (or (mouse-movement-p event)
                    (eq (car-safe event) 'switch-frame)))
         (if (eq (car-safe event) 'switch-frame)
             nil
           (setq end (event-end event)
                 end-point (posn-point end))
                (or (mouse-movement-p event)
                    (eq (car-safe event) 'switch-frame)))
         (if (eq (car-safe event) 'switch-frame)
             nil
           (setq end (event-end event)
                 end-point (posn-point end))

-          (when end-point
-            (setq last-end-point end-point))

 
           (cond
            ;; Are we moving within the original window?
 
           (cond
            ;; Are we moving within the original window?

@@ -324,8 +325,8 @@ This must be bound to a button-down mouse event."
   (setq gnus-binary-mode-map (make-sparse-keymap))
 
   (gnus-define-keys
   (setq gnus-binary-mode-map (make-sparse-keymap))
 
   (gnus-define-keys

-   gnus-binary-mode-map
-   "g" gnus-binary-show-article))
+      gnus-binary-mode-map
+    "g" gnus-binary-show-article))

 
 (defun gnus-binary-make-menu-bar ()
   (unless (boundp 'gnus-binary-menu)
 
 (defun gnus-binary-make-menu-bar ()
   (unless (boundp 'gnus-binary-menu)

@@ -433,6 +434,7 @@ Two predefined functions are available:
 (defvar gnus-selected-tree-overlay nil)
 
 (defvar gnus-tree-displayed-thread nil)
 (defvar gnus-selected-tree-overlay nil)
 
 (defvar gnus-tree-displayed-thread nil)

+(defvar gnus-tree-inhibit nil)

 
 (defvar gnus-tree-mode-map nil)
 (put 'gnus-tree-mode 'mode-class 'special)
 
 (defvar gnus-tree-mode-map nil)
 (put 'gnus-tree-mode 'mode-class 'special)

@@ -441,13 +443,13 @@ Two predefined functions are available:
   (setq gnus-tree-mode-map (make-keymap))
   (suppress-keymap gnus-tree-mode-map)
   (gnus-define-keys
   (setq gnus-tree-mode-map (make-keymap))
   (suppress-keymap gnus-tree-mode-map)
   (gnus-define-keys

-   gnus-tree-mode-map
-   "\r" gnus-tree-select-article
-   gnus-mouse-2 gnus-tree-pick-article
-   "\C-?" gnus-tree-read-summary-keys
-   "h" gnus-tree-show-summary
+      gnus-tree-mode-map
+    "\r" gnus-tree-select-article
+    gnus-mouse-2 gnus-tree-pick-article
+    "\C-?" gnus-tree-read-summary-keys
+    "h" gnus-tree-show-summary

 
 

-   "\C-c\C-i" gnus-info-find-node)
+    "\C-c\C-i" gnus-info-find-node)

 
   (substitute-key-definition
    'undefined 'gnus-tree-read-summary-keys gnus-tree-mode-map))
 
   (substitute-key-definition
    'undefined 'gnus-tree-read-summary-keys gnus-tree-mode-map))

@@ -471,7 +473,7 @@ Two predefined functions are available:
   (setq mode-name "Tree")
   (setq major-mode 'gnus-tree-mode)
   (use-local-map gnus-tree-mode-map)
   (setq mode-name "Tree")
   (setq major-mode 'gnus-tree-mode)
   (use-local-map gnus-tree-mode-map)

-  (buffer-disable-undo (current-buffer))
+  (buffer-disable-undo)

   (setq buffer-read-only t)
   (setq truncate-lines t)
   (save-excursion
   (setq buffer-read-only t)
   (setq truncate-lines t)
   (save-excursion

@@ -483,15 +485,17 @@ Two predefined functions are available:
 (defun gnus-tree-read-summary-keys (&optional arg)
   "Read a summary buffer key sequence and execute it."
   (interactive "P")
 (defun gnus-tree-read-summary-keys (&optional arg)
   "Read a summary buffer key sequence and execute it."
   (interactive "P")

-  (let ((buf (current-buffer))
-       win)
-    (set-buffer gnus-article-buffer)      
-    (gnus-article-read-summary-keys arg nil t)
-    (when (setq win (get-buffer-window buf))
-      (select-window win)
-      (when gnus-selected-tree-overlay
-       (goto-char (or (gnus-overlay-end gnus-selected-tree-overlay) 1)))
-      (gnus-tree-minimize))))
+  (unless gnus-tree-inhibit
+    (let ((buf (current-buffer))
+         (gnus-tree-inhibit t)
+         win)
+      (set-buffer gnus-article-buffer)
+      (gnus-article-read-summary-keys arg nil t)
+      (when (setq win (get-buffer-window buf))
+       (select-window win)
+       (when gnus-selected-tree-overlay
+         (goto-char (or (gnus-overlay-end gnus-selected-tree-overlay) 1)))
+       (gnus-tree-minimize)))))

 
 (defun gnus-tree-show-summary ()
   "Reconfigure windows to show summary buffer."
 
 (defun gnus-tree-show-summary ()
   "Reconfigure windows to show summary buffer."

@@ -522,12 +526,14 @@ Two predefined functions are available:
 
 (defun gnus-tree-article-region (article)
   "Return a cons with BEG and END of the article region."
 
 (defun gnus-tree-article-region (article)
   "Return a cons with BEG and END of the article region."

-  (let ((pos (text-property-any (point-min) (point-max) 'gnus-number article)))
+  (let ((pos (text-property-any
+             (point-min) (point-max) 'gnus-number article)))

     (when pos
       (cons pos (next-single-property-change pos 'gnus-number)))))
 
 (defun gnus-tree-goto-article (article)
     (when pos
       (cons pos (next-single-property-change pos 'gnus-number)))))
 
 (defun gnus-tree-goto-article (article)

-  (let ((pos (text-property-any (point-min) (point-max) 'gnus-number article)))
+  (let ((pos (text-property-any
+             (point-min) (point-max) 'gnus-number article)))

     (when pos
       (goto-char pos))))
 
     (when pos
       (goto-char pos))))
 

@@ -557,9 +563,8 @@ Two predefined functions are available:
 (defun gnus-get-tree-buffer ()
   "Return the tree buffer properly initialized."
   (save-excursion
 (defun gnus-get-tree-buffer ()
   "Return the tree buffer properly initialized."
   (save-excursion

-    (set-buffer (get-buffer-create gnus-tree-buffer))
+    (set-buffer (gnus-get-buffer-create gnus-tree-buffer))

     (unless (eq major-mode 'gnus-tree-mode)
     (unless (eq major-mode 'gnus-tree-mode)

-      (gnus-add-current-to-buffer-list)

       (gnus-tree-mode))
     (current-buffer)))
 
       (gnus-tree-mode))
     (current-buffer)))
 

@@ -706,7 +711,7 @@ Two predefined functions are available:
          (while (progn
                   (forward-line -1)
                   (forward-char col)
          (while (progn
                   (forward-line -1)
                   (forward-char col)

-                  (= (following-char) ? ))
+                  (eq (char-after) ? ))

            (delete-char 1)
            (insert (caddr gnus-tree-parent-child-edges)))
          (goto-char beg)))
            (delete-char 1)
            (insert (caddr gnus-tree-parent-child-edges)))
          (goto-char beg)))

@@ -763,7 +768,8 @@ Two predefined functions are available:
          (setq beg (point))
          (forward-char -1)
          ;; Draw "-" lines leftwards.
          (setq beg (point))
          (forward-char -1)
          ;; Draw "-" lines leftwards.

-         (while (= (char-after (1- (point))) ? )
+         (while (and (> (point) 1)
+                     (eq (char-after (1- (point))) ? ))

            (delete-char -1)
            (insert (car gnus-tree-parent-child-edges))
            (forward-char -1))
            (delete-char -1)
            (insert (car gnus-tree-parent-child-edges))
            (forward-char -1))

@@ -970,7 +976,7 @@ The following commands are available:
   (setq mode-name "Gnus Carpal")
   (setq mode-line-process nil)
   (use-local-map gnus-carpal-mode-map)
   (setq mode-name "Gnus Carpal")
   (setq mode-line-process nil)
   (use-local-map gnus-carpal-mode-map)

-  (buffer-disable-undo (current-buffer))
+  (buffer-disable-undo)

   (setq buffer-read-only t)
   (make-local-variable 'gnus-carpal-attached-buffer)
   (gnus-run-hooks 'gnus-carpal-mode-hook))
   (setq buffer-read-only t)
   (make-local-variable 'gnus-carpal-attached-buffer)
   (gnus-run-hooks 'gnus-carpal-mode-hook))

@@ -980,11 +986,10 @@ The following commands are available:
     (if (get-buffer buffer)
        ()
       (save-excursion
     (if (get-buffer buffer)
        ()
       (save-excursion

-       (set-buffer (get-buffer-create buffer))
+       (set-buffer (gnus-get-buffer-create buffer))

        (gnus-carpal-mode)
        (setq gnus-carpal-attached-buffer
              (intern (format "gnus-%s-buffer" type)))
        (gnus-carpal-mode)
        (setq gnus-carpal-attached-buffer
              (intern (format "gnus-%s-buffer" type)))

-       (gnus-add-current-to-buffer-list)

        (let ((buttons (symbol-value
                        (intern (format "gnus-carpal-%s-buffer-buttons"
                                        type))))
        (let ((buttons (symbol-value
                        (intern (format "gnus-carpal-%s-buffer-buttons"
                                        type))))