From 2d5f47b993b27ab76ffab4df57c8d67a45652550 Mon Sep 17 00:00:00 2001 From: kaoru Date: Sat, 2 Jan 2010 07:25:07 +0000 Subject: [PATCH] * wl.el (wl-plugged-server-indent, wl-plugged-drawing) (wl-plugged-redrawing-switch, wl-plugged-toggle): Use `(string-to-char " ")' instead of `? ', `?\ '. * wl-action.el (wl-summary-print-argument): Ditto. * wl-address.el (wl-complete-field-body): Ditto. * wl-demo.el (wl-demo-insert-image): Ditto. * wl-summary.el (wl-summary-edit-addresses-subr): Ditto. * wl-util.el (wl-ask-folder, wl-set-string-width) (wl-y-or-n-p-with-scroll): Ditto. --- wl/ChangeLog | 10 ++++++++++ wl/wl-action.el | 3 ++- wl/wl-address.el | 2 +- wl/wl-demo.el | 7 ++++--- wl/wl-summary.el | 4 ++-- wl/wl-util.el | 8 ++++---- wl/wl.el | 9 +++++---- 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 5c5a161..c53ab2a 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,15 @@ 2010-01-02 TAKAHASHI Kaoru + * wl.el (wl-plugged-server-indent, wl-plugged-drawing) + (wl-plugged-redrawing-switch, wl-plugged-toggle): Use + `(string-to-char " ")' instead of `? ', `?\ '. + * wl-action.el (wl-summary-print-argument): Ditto. + * wl-address.el (wl-complete-field-body): Ditto. + * wl-demo.el (wl-demo-insert-image): Ditto. + * wl-summary.el (wl-summary-edit-addresses-subr): Ditto. + * wl-util.el (wl-ask-folder, wl-set-string-width) + (wl-y-or-n-p-with-scroll): Ditto. + * wl-addrmgr.el(wl-addrmgr-mark-write): Use `string-to-char' instead of `? '. Use `point-at-bol' and `point-at-eol'. Remove verbose point move. diff --git a/wl/wl-action.el b/wl/wl-action.el index b6e45e9..adf4fdd 100644 --- a/wl/wl-action.el +++ b/wl/wl-action.el @@ -746,7 +746,8 @@ Return number if put mark succeed" (put-text-property rs re 'invisible t)) (when (and width (> (setq padding (- width len c)) 0)) - (setq data (concat (make-string padding ?\ ) data))) + (setq data (concat (make-string padding (string-to-char " ")) + data))) (setq rs (1- re)))) (put-text-property rs re 'wl-summary-action-argument t) (goto-char re) diff --git a/wl/wl-address.el b/wl/wl-address.el index 0e79c29..a0dfc1b 100644 --- a/wl/wl-address.el +++ b/wl/wl-address.el @@ -455,7 +455,7 @@ Matched address lists are append to CL." ((and epand-char (> len 0) (or (char-equal (aref pattern (1- len)) epand-char) - (char-equal (aref pattern (1- len)) ?\ )) + (char-equal (aref pattern (1- len)) (string-to-char " "))) (assoc (substring pattern 0 (1- len)) cl)) (wl-complete-insert start end diff --git a/wl/wl-demo.el b/wl/wl-demo.el index 12c7a8c..60178f6 100644 --- a/wl/wl-demo.el +++ b/wl/wl-demo.el @@ -190,9 +190,10 @@ Return a number of lines that an image occupies in the buffer." file image-type))))) (when (eq 'xbm image-type) (set-glyph-face image 'wl-highlight-logo-face)) - (insert-char ?\ (max 0 (/ (+ (* (- width (glyph-width image)) - (window-width)) width) - (* 2 width)))) + (insert-char (string-to-char " ") + (max 0 (/ (+ (* (- width (glyph-width image)) + (window-width)) width) + (* 2 width)))) (set-extent-end-glyph (make-extent (point) (point)) image) (insert "\n") (/ (+ (* 2 (glyph-height image) (window-height)) height) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index d1c6670..8dceb86 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1450,7 +1450,7 @@ This function is defined by `wl-summary-define-sort-command'." sort-by) the-email) (while (not (or (eq (setq char (read-char)) ?\r) (eq char ?\n) - (eq char ? ) + (eq char (string-to-char " ")) (eq char ?e) (eq char ?c) (eq char ?d))) @@ -1460,7 +1460,7 @@ This function is defined by `wl-summary-define-sort-command'." sort-by) ((or (eq char ?e) (eq char ?\n) (eq char ?\r) - (eq char ? )) + (eq char (string-to-char " "))) ;; Change Addresses (wl-address-add-or-change the-email diff --git a/wl/wl-util.el b/wl/wl-util.el index 15e73ef..d87afc4 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -118,7 +118,7 @@ If HACK-ADDRESSES is t, then the strings are considered to be mail addresses, (string-to-char (format "%s" (this-command-keys)))))) (message "%s" mes-string) (setq key (car (setq keve (wl-read-event-char)))) - (if (or (equal key ?\ ) + (if (or (equal key (string-to-char " ")) (and cmd (equal key cmd))) (progn @@ -163,7 +163,7 @@ even when invalid character is contained." (abs width)))) (let ((paddings (make-string (max 0 (- (abs width) (string-width string))) - (or padding ?\ )))) + (or padding (string-to-char " "))))) (if (< width 0) (concat paddings string) (concat string paddings))))) @@ -180,7 +180,7 @@ even when invalid character is contained." (if (= (current-column) (abs width)) string (let ((paddings (make-string (- (abs width) (current-column)) - (or padding ?\ )))) + (or padding (string-to-char " "))))) (if (< width 0) (concat paddings string) (concat string paddings)))))))) @@ -1115,7 +1115,7 @@ is enclosed by at least one regexp grouping construct." (cdr (wl-read-event-char prompt))) ((?y ?Y) (throw 'done t)) - (?\ + ((string-to-char " ") (if scroll-by-SPC (ignore-errors (scroll-up)) (throw 'done t))) diff --git a/wl/wl.el b/wl/wl.el index e8d1bab..a25bce4 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -222,7 +222,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." wl-plugged-plug-off))) (defun wl-plugged-server-indent () - (make-string wl-plugged-server-indent ? )) + (make-string wl-plugged-server-indent (string-to-char " "))) (defun wl-plugged-set-variables () (setq wl-plugged-sending-queue-alist @@ -379,7 +379,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." ;; port plug (setq line (format "%s[%s]%s" - (make-string wl-plugged-port-indent ? ) + (make-string wl-plugged-port-indent (string-to-char " ")) (wl-plugged-string plugged time) (cond ((stringp port) @@ -419,7 +419,8 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (defun wl-plugged-redrawing-switch (indent switch &optional time) (beginning-of-line) (when (re-search-forward - (format "^%s\\[\\([^]]+\\)\\]" (make-string indent ? ))) + (format "^%s\\[\\([^]]+\\)\\]" + (make-string indent (string-to-char " ")))) (goto-char (match-beginning 1)) (delete-region (match-beginning 1) (match-end 1)) (insert (wl-plugged-string switch time)) @@ -504,7 +505,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (let (variable switch name) (goto-char cur-point) (when (and (not (bobp)) - (not (eq (char-before) ? ))) + (not (eq (char-before) (string-to-char " ")))) (if (re-search-backward " [^ ]+" nil t) (forward-char 1) (re-search-backward "^[^ ]+" nil t))) -- 1.7.10.4