From eeb73b8692f4b642838c750035cc43ba24b3ab35 Mon Sep 17 00:00:00 2001 From: Henrik Enberg Date: Mon, 30 Jan 2006 11:31:22 +0000 Subject: [PATCH] (rmail-next-labeled-message): Don't call rmail-maybe-set-message-counters. Use with-current-buffer. --- lisp/mail/ChangeLog | 10 +++++++++ lisp/mail/rmailkwd.el | 47 +++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog index 71ffb0f9562..4767387341d 100644 --- a/lisp/mail/ChangeLog +++ b/lisp/mail/ChangeLog @@ -1,3 +1,13 @@ +2006-01-30 Henrik Enberg + + * rmailkwd.el (rmail-next-labeled-message): Don't call + rmail-maybe-set-message-counters. Use with-current-buffer. + + * rmailhdr.el (rmail-header-hide-headers): Simplify. + (rmail-header-get-limit): Wrap in a save-excursion. + (rmail-header-display-state): Renamed from + rmail-header-display-mode. + 2006-01-29 Henrik Enberg * rmailsum.el (rmail-summary-show-message): Reformat. diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el index ae6ab26f9b6..da96390f7f3 100644 --- a/lisp/mail/rmailkwd.el +++ b/lisp/mail/rmailkwd.el @@ -203,33 +203,32 @@ LABELS should be a comma-separated list of label names. If LABELS is empty, the last set of labels specified is used. With prefix argument N moves forward N messages with these labels." (interactive "p\nsMove to next msg with labels: ") - (if (string= labels "") - (setq labels rmail-last-multi-labels)) - (or labels - (error "No labels to find have been specified previously")) - (set-buffer rmail-buffer) - (setq rmail-last-multi-labels labels) - (rmail-maybe-set-message-counters) - (let ((lastwin rmail-current-message) - (current rmail-current-message) - (regexp (concat ", ?\\(" - (mail-comma-list-regexp labels) - "\\),"))) - (save-restriction - (widen) - (while (and (> n 0) (< current rmail-total-messages)) - (setq current (1+ current)) - (if (rmail-message-labels-p current regexp) + (when (string= labels "") + (setq labels rmail-last-multi-labels)) + (unless labels + (error "No labels to find have been specified previously")) + (with-current-buffer rmail-buffer + (setq rmail-last-multi-labels labels) + (let ((lastwin rmail-current-message) + (current rmail-current-message) + (regexp (concat ", ?\\(" + (mail-comma-list-regexp labels) + "\\),"))) + (save-restriction + (widen) + (while (and (> n 0) (< current rmail-total-messages)) + (setq current (1+ current)) + (when (rmail-message-labels-p current regexp) (setq lastwin current n (1- n)))) - (while (and (< n 0) (> current 1)) - (setq current (1- current)) - (if (rmail-message-labels-p current regexp) + (while (and (< n 0) (> current 1)) + (setq current (1- current)) + (when (rmail-message-labels-p current regexp) (setq lastwin current n (1+ n))))) - (rmail-show-message lastwin) - (if (< n 0) + (rmail-show-message lastwin) + (when (< n 0) (message "No previous message with labels %s" labels)) - (if (> n 0) - (message "No following message with labels %s" labels)))) + (when (> n 0) + (message "No following message with labels %s" labels))))) ;;; arch-tag: b26b3392-99ca-4e1d-933a-dab59b04e9a8 ;;; rmailkwd.el ends here -- 2.39.5