From a9a5265cf4247234f8fae3fe1cc2f79b837d4815 Mon Sep 17 00:00:00 2001 From: teranisi Date: Thu, 24 Jul 2003 03:59:17 +0000 Subject: [PATCH] * wl-action.el (wl-summary-set-mark): Changed terminology refile-destination -> action-argument. (wl-summary-unset-mark): Ditto. (wl-summary-remove-argument): Ditto. (wl-summary-print-argument): Ditto. * wl-thread.el (wl-thread-update-line-on-buffer-sub): Ditto. (wl-thread-remove-argument-region): Ditto. (wl-thread-print-argument-region): Ditto. (wl-thread-close): Ditto. (wl-thread-open): Ditto. * wl-highlight.el (wl-highlight-action-argument-face): Ditto. (wl-highlight-refile-destination-face is abolished) (wl-highlight-action-argument-string): Ditto. (wl-highlight-summary-current-line): Highlight action argument. --- wl/ChangeLog | 17 +++++++++++++++++ wl/wl-action.el | 22 +++++++++++----------- wl/wl-highlight.el | 20 +++++++++++++++----- wl/wl-thread.el | 20 ++++++++++---------- 4 files changed, 53 insertions(+), 26 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index fb2802c..5432bfa 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,22 @@ 2003-07-24 Yuuichi Teranishi + * wl-action.el (wl-summary-set-mark): Changed terminology + refile-destination -> action-argument. + (wl-summary-unset-mark): Ditto. + (wl-summary-remove-argument): Ditto. + (wl-summary-print-argument): Ditto. + + * wl-thread.el (wl-thread-update-line-on-buffer-sub): Ditto. + (wl-thread-remove-argument-region): Ditto. + (wl-thread-print-argument-region): Ditto. + (wl-thread-close): Ditto. + (wl-thread-open): Ditto. + + * wl-highlight.el (wl-highlight-action-argument-face): Ditto. + (wl-highlight-refile-destination-face is abolished) + (wl-highlight-action-argument-string): Ditto. + (wl-highlight-summary-current-line): Highlight action argument. + * wl-highlight.el (wl-highlight-summary-deleted-face): Changed default color for light backgrounds. (wl-highlight-summary-answered-face): Ditto. diff --git a/wl/wl-action.el b/wl/wl-action.el index d45aa43..e954bf3 100644 --- a/wl/wl-action.el +++ b/wl/wl-action.el @@ -84,7 +84,7 @@ Return number if put mark succeed" (when wl-summary-highlight (wl-highlight-summary-current-line)) (when data - (wl-summary-print-destination number data))) + (wl-summary-print-argument number data))) ;; Set action. (funcall (wl-summary-action-set-function action) number @@ -226,7 +226,7 @@ Return number if put mark succeed" (when wl-summary-highlight (wl-highlight-summary-current-line)) (when (wl-summary-action-argument-function action) - (wl-summary-remove-destination))) + (wl-summary-remove-argument))) (set-buffer-modified-p nil)) ;; Remove from temporal mark structure. (wl-summary-unregister-target-mark number) @@ -627,7 +627,7 @@ Return number if put mark succeed" (message "Resending message to %s...done" address))) ;;; -(defun wl-summary-remove-destination () +(defun wl-summary-remove-argument () (save-excursion (let ((inhibit-read-only t) (buffer-read-only nil) @@ -638,11 +638,11 @@ Return number if put mark succeed" (search-forward "\r") (forward-char -1) (setq eol (point)) - (setq rs (next-single-property-change sol 'wl-summary-destination + (setq rs (next-single-property-change sol 'wl-summary-action-argument buf eol)) - (setq re (next-single-property-change rs 'wl-summary-destination + (setq re (next-single-property-change rs 'wl-summary-action-argument buf eol)) - (put-text-property rs re 'wl-summary-destination nil) + (put-text-property rs re 'wl-summary-action-argument nil) (put-text-property rs re 'invisible nil) (goto-char re) (delete-char (- eol re))))) @@ -739,10 +739,10 @@ Return number if put mark succeed" fld)))) fld)) -(defun wl-summary-print-destination (msg-num folder) - "Print refile destination on line." +(defun wl-summary-print-argument (msg-num folder) + "Print action argument on line." (when folder - (wl-summary-remove-destination) + (wl-summary-remove-argument) (save-excursion (let ((inhibit-read-only t) (folder (copy-sequence folder)) @@ -763,9 +763,9 @@ Return number if put mark succeed" (setq rs (point)) (when wl-summary-width (put-text-property rs re 'invisible t)) - (put-text-property rs re 'wl-summary-destination t) + (put-text-property rs re 'wl-summary-action-argument t) (goto-char re) - (wl-highlight-refile-destination-string folder) + (wl-highlight-action-argument-string folder) (insert folder) (set-buffer-modified-p nil)))))) diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el index 32a894d..ef60fbf 100644 --- a/wl/wl-highlight.el +++ b/wl/wl-highlight.el @@ -621,14 +621,14 @@ "Face used for displaying demo." :group 'wl-faces) -(wl-defface wl-highlight-refile-destination-face +(wl-defface wl-highlight-action-argument-face '((((class color) (background dark)) (:foreground "pink")) (((class color) (background light)) (:foreground "red"))) - "Face used for displaying refile destination." + "Face used for displaying action argument." :group 'wl-summary-faces :group 'wl-faces) @@ -869,7 +869,8 @@ (setq status-mark (wl-summary-persistent-mark)) (setq temp-mark (wl-summary-temp-mark)) (when (setq action (assoc temp-mark wl-summary-mark-action-list)) - (setq fsymbol (nth 5 action))) + (setq fsymbol (nth 5 action)) + (setq dest (nth 2 action))) (if (not fsymbol) (cond ((and (string= temp-mark wl-summary-score-over-mark) @@ -904,6 +905,15 @@ (setq fsymbol 'wl-highlight-summary-thread-top-face) (setq fsymbol 'wl-highlight-summary-normal-face))))) (put-text-property bol eol 'face fsymbol) + (when dest + (put-text-property (next-single-property-change + (next-single-property-change + bol 'wl-summary-action-argument + nil eol) + 'wl-summary-action-argument nil eol) + eol + 'face + 'wl-highlight-action-argument-face)) (if wl-use-highlight-mouse-line (put-text-property bol eol 'mouse-face 'highlight)) @@ -964,9 +974,9 @@ Variables used: (overlay-put ov 'wl-momentary-overlay t)) (forward-line 1))))) -(defun wl-highlight-refile-destination-string (string) +(defun wl-highlight-action-argument-string (string) (put-text-property 0 (length string) 'face - 'wl-highlight-refile-destination-face + 'wl-highlight-action-argument-face string)) (defun wl-highlight-summary-all () diff --git a/wl/wl-thread.el b/wl/wl-thread.el index 4442cd2..5fe83ab 100644 --- a/wl/wl-thread.el +++ b/wl/wl-thread.el @@ -402,8 +402,8 @@ ENTITY is returned." (wl-thread-make-indent-string entity) (wl-thread-entity-get-linked entity))) (if dest-pair - (wl-summary-print-destination (car dest-pair) - (cdr dest-pair))))) + (wl-summary-print-argument (car dest-pair) + (cdr dest-pair))))) ;; insert thread (moving thread) (if (not (setq invisible-top (wl-thread-entity-parent-invisible-p entity))) @@ -888,16 +888,16 @@ Message is inserted to the summary buffer." (forward-line 1)) (beginning-of-line))) -(defun wl-thread-remove-destination-region (beg end) +(defun wl-thread-remove-argument-region (beg end) (save-excursion (save-restriction (narrow-to-region beg end) (goto-char (point-min)) (while (not (eobp)) - (wl-summary-remove-destination) + (wl-summary-remove-argument) (forward-line 1))))) -(defun wl-thread-print-destination-region (beg end) +(defun wl-thread-print-argument-region (beg end) (if wl-summary-buffer-temp-mark-list (save-excursion (save-restriction @@ -910,7 +910,7 @@ Message is inserted to the summary buffer." (wl-summary-registered-temp-mark num)) (nth 2 temp-mark) (setq pair (cons (nth 0 temp-mark)(nth 2 temp-mark)))) - (wl-summary-print-destination (car pair) (cdr pair)))) + (wl-summary-print-argument (car pair) (cdr pair)))) (forward-line 1)))))) (defsubst wl-thread-get-children-msgs (msg &optional visible-only) @@ -976,8 +976,8 @@ Message is inserted to the summary buffer." (beginning-of-line) (setq beg (point)) (wl-thread-goto-bottom-of-sub-thread) - (wl-thread-remove-destination-region beg - (point)) + (wl-thread-remove-argument-region beg + (point)) (forward-char -1) ;; needed for mouse-face. (delete-region beg (point)) (wl-thread-insert-entity (- depth 1) @@ -986,7 +986,7 @@ Message is inserted to the summary buffer." (nth 3 entity)) nil) (delete-char 1) ; delete '\n' - (wl-thread-print-destination-region beg (point)))) + (wl-thread-print-argument-region beg (point)))) (defun wl-thread-open (entity) (let (depth beg) @@ -1001,7 +1001,7 @@ Message is inserted to the summary buffer." (wl-thread-get-entity (nth 3 entity)) nil) (delete-char 1) ; delete '\n' - (wl-thread-print-destination-region beg (point)))) + (wl-thread-print-argument-region beg (point)))) (defun wl-thread-open-close (&optional force-open) (interactive "P") -- 1.7.10.4