From 6bba6f8c6311b36deaa289fa83fd8c2e588f5586 Mon Sep 17 00:00:00 2001 From: hmurata Date: Thu, 17 Mar 2005 09:16:56 +0000 Subject: [PATCH] (wl-summary-jump-to-msg): Don't interactive input even if argument `number' is nil. (wl-summary-insert-line): Print action argument if current message has it. --- wl/ChangeLog | 7 +++++++ wl/wl-summary.el | 44 ++++++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index ff40f15..7084b7a 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,10 @@ +2005-03-17 Hiroya Murata + + * wl-summary.el (wl-summary-jump-to-msg): Don't interactive input + even if argument `number' is nil. + (wl-summary-insert-line): Print action argument if current message + has it. + 2005-03-16 Hiroya Murata * wl-draft.el (wl-draft-forward): Call `wl-draft' with number. diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 0d481ef..63bf3c8 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -2138,26 +2138,24 @@ This function is defined for `window-scroll-functions'" (funcall wl-summary-buffer-mode-line-formatter))) (defun wl-summary-jump-to-msg (&optional number beg end) - (interactive "NJump to Number:") - (let ((num (or number - (string-to-int - (read-from-minibuffer "Jump to Message(No.): ")))) - (pos (point)) - regexp) - (setq regexp (concat "\r" (int-to-string num) "[^0-9]")) - (if (and beg end (or (< pos beg) (< end pos))) - (progn - (goto-char beg) - (if (re-search-forward regexp end t) - (progn (backward-char 1) (beginning-of-line) t) - (goto-char pos) - nil)) - (beginning-of-line) - (if (or (and (re-search-forward regexp end t) - (progn (backward-char 1) t)) - (re-search-backward regexp beg t)) - (progn (beginning-of-line) t) - nil)))) + (interactive "NJump to Message (No.): ") + (when number + (let ((pos (point)) + regexp) + (setq regexp (concat "\r" (int-to-string number) "[^0-9]")) + (if (and beg end (or (< pos beg) (< end pos))) + (progn + (goto-char beg) + (if (re-search-forward regexp end t) + (progn (backward-char 1) (beginning-of-line) t) + (goto-char pos) + nil)) + (beginning-of-line) + (if (or (and (re-search-forward regexp end t) + (progn (backward-char 1) t)) + (re-search-backward regexp beg t)) + (progn (beginning-of-line) t) + nil))))) (defun wl-summary-highlight-msgs (msgs) (save-excursion @@ -2610,6 +2608,12 @@ If ARG, without confirm." (save-excursion (end-of-line)(point)) 'mouse-face nil)) (insert line "\n") + (save-excursion + (forward-line -1) + (let* ((number (wl-summary-message-number)) + (mark-info (wl-summary-registered-temp-mark number))) + (when (and mark-info (nth 2 mark-info)) + (wl-summary-print-argument number (nth 2 mark-info))))) (if wl-use-highlight-mouse-line ;; remove 'mouse-face of current line. (put-text-property -- 1.7.10.4