Add sanity check to not delete marks outside the active range.

[gnus] / lisp / gnus-sum.el

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 2fc1954..c4a7216 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -350,7 +350,7 @@ newsgroups, set the variable to nil in `gnus-select-group-hook'."
   :type '(choice (const :tag "none" nil)
                 (sexp :menu-tag "first" t)))
 
   :type '(choice (const :tag "none" nil)
                 (sexp :menu-tag "first" t)))
 

-(defcustom gnus-auto-select-subject 'unread
+(defcustom gnus-auto-select-subject 'unseen-or-unread

   "*Says what subject to place under point when entering a group.
 
 This variable can either be the symbols `first' (place point on the
   "*Says what subject to place under point when entering a group.
 
 This variable can either be the symbols `first' (place point on the


@@ -361,7 +361,7 @@ the first unseen article), `unseen-or-unread' (place point on the subject
 line of the first unseen article or, if all article have been seen, on the
 subject line of the first unread article), or a function to be called to
 place point on some subject line."
 line of the first unseen article or, if all article have been seen, on the
 subject line of the first unread article), or a function to be called to
 place point on some subject line."

-  :version "22.1"
+  :version "24.1"

   :group 'gnus-group-select
   :type '(choice (const best)
                 (const unread)
   :group 'gnus-group-select
   :type '(choice (const best)
                 (const unread)


@@ -465,9 +465,10 @@ and non-`vertical', do both horizontal and vertical recentering."
   :group 'gnus-summary
   :type 'boolean)
 
   :group 'gnus-summary
   :type 'boolean)
 

-(defcustom gnus-single-article-buffer t
+(defcustom gnus-single-article-buffer nil

   "*If non-nil, display all articles in the same buffer.
 If nil, each group will get its own article buffer."
   "*If non-nil, display all articles in the same buffer.
 If nil, each group will get its own article buffer."

+  :version "24.1"

   :group 'gnus-article-various
   :type 'boolean)
 
   :group 'gnus-article-various
   :type 'boolean)
 


@@ -984,8 +985,7 @@ This hook is not called from the non-updating exit commands like `Q'."
   :group 'gnus-various
   :type 'hook)
 
   :group 'gnus-various
   :type 'hook)
 

-(defcustom gnus-summary-update-hook
-  (list 'gnus-summary-highlight-line)
+(defcustom gnus-summary-update-hook nil

   "*A hook called when a summary line is changed.
 The hook will not be called if `gnus-visual' is nil.
 
   "*A hook called when a summary line is changed.
 The hook will not be called if `gnus-visual' is nil.
 


@@ -2109,6 +2109,7 @@ increase the score of each group you read."
   "d" gnus-article-display-face
   "s" gnus-treat-smiley
   "D" gnus-article-remove-images
   "d" gnus-article-display-face
   "s" gnus-treat-smiley
   "D" gnus-article-remove-images

+  "W" gnus-html-show-images

   "f" gnus-treat-from-picon
   "m" gnus-treat-mail-picon
   "n" gnus-treat-newsgroups-picon)
   "f" gnus-treat-from-picon
   "m" gnus-treat-mail-picon
   "n" gnus-treat-newsgroups-picon)


@@ -3751,6 +3752,7 @@ buffer that was in action when the last article was fetched."
       (error (gnus-message 5 "Error updating the summary line")))
     (when (gnus-visual-p 'summary-highlight 'highlight)
       (forward-line -1)
       (error (gnus-message 5 "Error updating the summary line")))
     (when (gnus-visual-p 'summary-highlight 'highlight)
       (forward-line -1)

+      (gnus-summary-highlight-line)

       (gnus-run-hooks 'gnus-summary-update-hook)
       (forward-line 1))))
 
       (gnus-run-hooks 'gnus-summary-update-hook)
       (forward-line 1))))
 


@@ -3783,6 +3785,7 @@ buffer that was in action when the last article was fetched."
         'score))
       ;; Do visual highlighting.
       (when (gnus-visual-p 'summary-highlight 'highlight)
         'score))
       ;; Do visual highlighting.
       (when (gnus-visual-p 'summary-highlight 'highlight)

+       (gnus-summary-highlight-line)

        (gnus-run-hooks 'gnus-summary-update-hook)))))
 
 (defvar gnus-tmp-new-adopts nil)
        (gnus-run-hooks 'gnus-summary-update-hook)))))
 
 (defvar gnus-tmp-new-adopts nil)


@@ -5361,7 +5364,9 @@ or a straight list of headers."
                'gnus-number number)
              (when gnus-visual-p
                (forward-line -1)
                'gnus-number number)
              (when gnus-visual-p
                (forward-line -1)

-               (gnus-run-hooks 'gnus-summary-update-hook)
+               (gnus-summary-highlight-line)
+               (when gnus-summary-update-hook
+                 (gnus-run-hooks 'gnus-summary-update-hook))

                (forward-line 1))
 
              (setq gnus-tmp-prev-subject simp-subject)))
                (forward-line 1))
 
              (setq gnus-tmp-prev-subject simp-subject)))


@@ -5499,11 +5504,11 @@ If SELECT-ARTICLES, only select those articles from GROUP."
           (mm-decode-coding-string (gnus-status-message group) charset))))
 
     (unless (gnus-request-group group t)
           (mm-decode-coding-string (gnus-status-message group) charset))))
 
     (unless (gnus-request-group group t)

-       (when (equal major-mode 'gnus-summary-mode)
-         (gnus-kill-buffer (current-buffer)))
-       (error "Couldn't request group %s: %s"
-              (mm-decode-coding-string group charset)
-              (mm-decode-coding-string (gnus-status-message group) charset)))
+      (when (equal major-mode 'gnus-summary-mode)
+       (gnus-kill-buffer (current-buffer)))
+      (error "Couldn't request group %s: %s"
+            (mm-decode-coding-string group charset)
+            (mm-decode-coding-string (gnus-status-message group) charset)))

 
     (when gnus-agent
       (gnus-agent-possibly-alter-active group (gnus-active group) info)
 
     (when gnus-agent
       (gnus-agent-possibly-alter-active group (gnus-active group) info)


@@ -5845,6 +5850,10 @@ If SELECT-ARTICLES, only select those articles from GROUP."
         (types gnus-article-mark-lists)
         marks var articles article mark mark-type
          bgn end)
         (types gnus-article-mark-lists)
         marks var articles article mark mark-type
          bgn end)

+    ;; Hack to avoid adjusting marks for imap.
+    (when (eq (car (gnus-find-method-for-group (gnus-info-group info)))
+             'nnimap)
+      (setq min 1))

 
     (dolist (marks marked-lists)
       (setq mark (car marks)
 
     (dolist (marks marked-lists)
       (setq mark (car marks)


@@ -5967,6 +5976,10 @@ If SELECT-ARTICLES, only select those articles from GROUP."
            (when add
              (push (list add 'add (list (cdr type))) delta-marks))
            (when del
            (when add
              (push (list add 'add (list (cdr type))) delta-marks))
            (when del

+             ;; Don't delete marks from outside the active range.  This
+             ;; shouldn't happen, but is a sanity check.
+             (setq del (gnus-sorted-range-intersection
+                        (gnus-active gnus-newsgroup-name) del))

              (push (list del 'del (list (cdr type))) delta-marks))))
 
        (when list
              (push (list del 'del (list (cdr type))) delta-marks))))
 
        (when list


@@ -6049,9 +6062,7 @@ If WHERE is `summary', the summary mode line format will be used."
          (when (> (length mode-string) max-len)
            (setq mode-string
                  (concat (truncate-string-to-width mode-string (- max-len 3))
          (when (> (length mode-string) max-len)
            (setq mode-string
                  (concat (truncate-string-to-width mode-string (- max-len 3))

-                         "...")))
-         ;; Pad the mode string a bit.
-         (setq mode-string (format (format "%%-%ds" max-len) mode-string))))
+                         "...")))))

       ;; Update the mode line.
       (setq mode-line-buffer-identification
            (gnus-mode-line-buffer-identification (list mode-string)))
       ;; Update the mode line.
       (setq mode-line-buffer-identification
            (gnus-mode-line-buffer-identification (list mode-string)))


@@ -7327,7 +7338,7 @@ in."
 (defun gnus-summary-describe-briefly ()
   "Describe summary mode commands briefly."
   (interactive)
 (defun gnus-summary-describe-briefly ()
   "Describe summary mode commands briefly."
   (interactive)

-  (gnus-message 6 (substitute-command-keys "\\<gnus-summary-mode-map>\\[gnus-summary-next-page]:Select  \\[gnus-summary-next-unread-article]:Forward  \\[gnus-summary-prev-unread-article]:Backward  \\[gnus-summary-exit]:Exit  \\[gnus-info-find-node]:Run Info       \\[gnus-summary-describe-briefly]:This help")))
+  (gnus-message 6 "%s" (substitute-command-keys "\\<gnus-summary-mode-map>\\[gnus-summary-next-page]:Select  \\[gnus-summary-next-unread-article]:Forward  \\[gnus-summary-prev-unread-article]:Backward  \\[gnus-summary-exit]:Exit  \\[gnus-info-find-node]:Run Info  \\[gnus-summary-describe-briefly]:This help")))

 
 ;; Walking around group mode buffer from summary mode.
 
 
 ;; Walking around group mode buffer from summary mode.
 


@@ -7391,7 +7402,7 @@ If prefix argument NO-ARTICLE is non-nil, no article is selected initially."
   "Go to the first subject satisfying any non-nil constraint.
 If UNREAD is non-nil, the article should be unread.
 If UNDOWNLOADED is non-nil, the article should be undownloaded.
   "Go to the first subject satisfying any non-nil constraint.
 If UNREAD is non-nil, the article should be unread.
 If UNDOWNLOADED is non-nil, the article should be undownloaded.

-If UNSEEN is non-nil, the article should be unseen.
+If UNSEEN is non-nil, the article should be unseen as well as unread.

 Returns the article selected or nil if there are no matching articles."
   (interactive "P")
   (cond
 Returns the article selected or nil if there are no matching articles."
   (interactive "P")
   (cond


@@ -7414,7 +7425,8 @@ Returns the article selected or nil if there are no matching articles."
                                  (and undownloaded
                                       (memq num gnus-newsgroup-undownloaded))
                                  (and unseen
                                  (and undownloaded
                                       (memq num gnus-newsgroup-undownloaded))
                                  (and unseen

-                                      (memq num gnus-newsgroup-unseen)))))))
+                                      (memq num gnus-newsgroup-unseen)
+                                     (memq num gnus-newsgroup-unreads)))))))

         (setq data (cdr data)))
       (prog1
           (if data
         (setq data (cdr data)))
       (prog1
           (if data


@@ -7905,8 +7917,8 @@ Return nil if there are no unseen articles."
     (gnus-summary-position-point)))
 
 (defun gnus-summary-first-unseen-or-unread-subject ()
     (gnus-summary-position-point)))
 
 (defun gnus-summary-first-unseen-or-unread-subject ()

-  "Place the point on the subject line of the first unseen article or,
-if all article have been seen, on the subject line of the first unread
+  "Place the point on the subject line of the first unseen and unread article.
+If all article have been seen, on the subject line of the first unread

 article."
   (interactive)
   (prog1
 article."
   (interactive)
   (prog1


@@ -9677,7 +9689,7 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
                              gnus-newsgroup-name))
                (to-method (or select-method
                               (gnus-find-method-for-group to-newsgroup)))
                              gnus-newsgroup-name))
                (to-method (or select-method
                               (gnus-find-method-for-group to-newsgroup)))

-               (move-is-internal (gnus-method-equal from-method to-method)))
+               (move-is-internal (gnus-server-equal from-method to-method)))

           (gnus-request-move-article
            article                     ; Article to move
            gnus-newsgroup-name         ; From newsgroup
           (gnus-request-move-article
            article                     ; Article to move
            gnus-newsgroup-name         ; From newsgroup


@@ -9687,7 +9699,9 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
                  to-newsgroup (list 'quote select-method)
                  (not articles) t)     ; Accept form
            (not articles)              ; Only save nov last time
                  to-newsgroup (list 'quote select-method)
                  (not articles) t)     ; Accept form
            (not articles)              ; Only save nov last time

-           move-is-internal)))         ; is this move internal?
+           (and move-is-internal
+                to-newsgroup           ; Not respooling
+                (gnus-group-real-name to-newsgroup))))) ; Is this move internal?

        ;; Copy the article.
        ((eq action 'copy)
         (with-current-buffer copy-buf
        ;; Copy the article.
        ((eq action 'copy)
         (with-current-buffer copy-buf


@@ -9818,8 +9832,9 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
                  (gnus-add-marked-articles
                   to-group 'expire (list to-article) info))
 
                  (gnus-add-marked-articles
                   to-group 'expire (list to-article) info))
 

-               (gnus-request-set-mark
-                to-group (list (list (list to-article) 'add to-marks))))
+               (when to-marks
+                 (gnus-request-set-mark
+                  to-group (list (list (list to-article) 'add to-marks)))))

 
              (gnus-dribble-enter
               (concat "(gnus-group-set-info '"
 
              (gnus-dribble-enter
               (concat "(gnus-group-set-info '"


@@ -10734,6 +10749,7 @@ If NO-EXPIRE, auto-expiry will be inhibited."
         (t gnus-no-mark))
    'replied)
   (when (gnus-visual-p 'summary-highlight 'highlight)
         (t gnus-no-mark))
    'replied)
   (when (gnus-visual-p 'summary-highlight 'highlight)

+    (gnus-summary-highlight-line)

     (gnus-run-hooks 'gnus-summary-update-hook))
   t)
 
     (gnus-run-hooks 'gnus-summary-update-hook))
   t)
 


@@ -10761,7 +10777,12 @@ If NO-EXPIRE, auto-expiry will be inhibited."
        ;; Go to the right position on the line.
        (goto-char (+ forward (point)))
        ;; Replace the old mark with the new mark.
        ;; Go to the right position on the line.
        (goto-char (+ forward (point)))
        ;; Replace the old mark with the new mark.

-       (subst-char-in-region (point) (1+ (point)) (char-after) mark)
+        (let ((to-insert
+               (mm-subst-char-in-string
+               (char-after) mark
+               (buffer-substring (point) (1+ (point))))))
+          (delete-region (point) (1+ (point)))
+          (insert to-insert))

        ;; Optionally update the marks by some user rule.
        (when (eq type 'unread)
          (gnus-data-set-mark
        ;; Optionally update the marks by some user rule.
        (when (eq type 'unread)
          (gnus-data-set-mark