From 3292cda093d45703dd7adcbf612000796397855d Mon Sep 17 00:00:00 2001 From: kaoru Date: Mon, 4 Jan 2010 09:25:47 +0000 Subject: [PATCH] * wl-addrmgr.el (wl-addrmgr-replace-field): Use `point-at-bol'. * wl-action.el (wl-summary-remove-argument): Explicit `point-at-bol'. * wl-summary.el (wl-summary-narrow-to-region) (wl-summary-insert-line): Use `point-at-bol', `point-at-eol'. --- wl/ChangeLog | 5 +++++ wl/wl-action.el | 2 +- wl/wl-addrmgr.el | 8 +++----- wl/wl-summary.el | 14 ++++++-------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 0af5c31..9fdcd15 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,10 @@ 2010-01-04 TAKAHASHI Kaoru + * wl-addrmgr.el (wl-addrmgr-replace-field): Use `point-at-bol'. + * wl-action.el (wl-summary-remove-argument): Explicit `point-at-bol'. + * wl-summary.el (wl-summary-narrow-to-region) + (wl-summary-insert-line): Use `point-at-bol', `point-at-eol'. + * wl.el (wl-plugged-sending-queue-status): Use `number-to-string' instead of `int-to-string'. * wl-dnd.el (wl-dnd-start-drag): Ditto. diff --git a/wl/wl-action.el b/wl/wl-action.el index adf4fdd..223abe5 100644 --- a/wl/wl-action.el +++ b/wl/wl-action.el @@ -603,8 +603,8 @@ Return number if put mark succeed" (buffer-read-only nil) (buf (current-buffer)) sol eol rs re) + (setq sol (point-at-bol)) (beginning-of-line) - (setq sol (point)) (search-forward "\r") (forward-char -1) (setq eol (point)) diff --git a/wl/wl-addrmgr.el b/wl/wl-addrmgr.el index a25f695..72e6c96 100644 --- a/wl/wl-addrmgr.el +++ b/wl/wl-addrmgr.el @@ -662,12 +662,10 @@ Return nil if no ADDRESS exists." (while (re-search-forward (concat "^" (regexp-quote field) ":") nil t) ;; delete field (progn - (save-excursion - (beginning-of-line) - (setq beg (point))) + (setq beg (point-at-bol)) (re-search-forward "^[^ \t]" nil 'move) - (beginning-of-line) - (delete-region beg (point)))) + (delete-region beg (point-at-bol)) + (beginning-of-line))) (when content ;; add field to top. (goto-char (point-min)) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 734da7d..a11dd16 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1627,12 +1627,12 @@ If ARG is non-nil, checking is omitted." (narrow-to-region (save-excursion (goto-char beg) - (beginning-of-line) - (point)) + (point-at-bol)) (save-excursion (goto-char end) - (if (eq (current-column) 0) (beginning-of-line) (end-of-line)) - (point)))) + (if (= (current-column) 0) + (point-at-bol) + (point-at-eol))))) (defun wl-summary-prefetch-region-no-mark (beg end &optional prefetch-marks) (interactive "r") @@ -2588,8 +2588,7 @@ If ARG, without confirm." (if wl-use-highlight-mouse-line ;; remove 'mouse-face of current line. (put-text-property - (save-excursion (beginning-of-line)(point)) - (save-excursion (end-of-line)(point)) + (point-at-bol) (point-at-eol) 'mouse-face nil)) (insert line "\n") (save-excursion @@ -2601,8 +2600,7 @@ If ARG, without confirm." (if wl-use-highlight-mouse-line ;; remove 'mouse-face of current line. (put-text-property - (save-excursion (beginning-of-line)(point)) - (save-excursion (end-of-line)(point)) + (point-at-bol) (point-at-eol) 'mouse-face nil)) (elmo-progress-notify 'wl-summary-insert-line) (ignore-errors -- 1.7.10.4