[mew-dist 22239] prompt-string style

[Tatsuya Kinoshita]

ミニバッファに表示されるプロンプトについて、Emacs標準の動作と同じ
ように、`:'の直前に不要なスペースを置かないよう統一しました。

-- 
木下達也
-------------- next part --------------

 This patch is written by Tatsuya Kinoshita.  Copyright is disclaimed.

--- mew.orig/contrib/mew-nmz.el
+++ mew/contrib/mew-nmz.el
@@ -848,7 +848,7 @@
     (setq mew-input-complete-function (function mew-nmz-pick-pattern))
     (let ((keymap (copy-keymap mew-input-map)) pattern)
       (define-key keymap " " nil)
-      (setq pattern (read-from-minibuffer "Namazu pick pattern : "
+      (setq pattern (read-from-minibuffer "Namazu pick pattern: "
 					  mew-nmz-pick-default-field
 					  keymap
 					  nil
--- mew.orig/mew-attach.el
+++ mew/mew-attach.el
@@ -310,7 +310,7 @@
       (while (or (null frompath)
 		 (file-directory-p (file-chase-links frompath)))
 	(setq frompath (mew-draft-input-file-name
-			(concat (mew-capitalize action) " from : ") default)))
+			(concat (mew-capitalize action) " from: ") default)))
       (while (or (null efile)
 		 (file-exists-p (expand-file-name efile attachdir)))
 	(setq tofile (mew-input-string 
--- mew.orig/mew-draft.el
+++ mew/mew-draft.el
@@ -774,7 +774,7 @@
   (let* ((services (mew-pcdb-services))
 	 (alist (mapcar (lambda (x) (cons (symbol-name x) x)) services))
 	 str)
-    (setq str (completing-read "Input privacy services : " alist nil t))
+    (setq str (completing-read "Input privacy services: " alist nil t))
     (when (stringp str)
       (mew-tinfo-set-privacy-type (cdr (assoc str alist)))
       (mew-tinfo-set-privacy-err nil)))
--- mew.orig/mew-ext.el
+++ mew/mew-ext.el
@@ -195,7 +195,7 @@
     (setq ret (list (list "site" mew-ext-host)))
     (setq mew-ext-user (read-string (format "User name at %s: " mew-ext-host)
 				    (mew-user)))
-    (setq path (mew-input-rfile "Filename :"))
+    (setq path (mew-input-rfile "Filename:"))
     (setq file (file-name-nondirectory path))
     (setq dir (file-name-directory path))
     (if (and dir (string-match mew-home dir))
@@ -227,7 +227,7 @@
 		       (car mew-ext-ftp-server-list)))
 	path dir file ret)
     (setq ret (list (list "site" mew-ext-host)))
-    (setq path (mew-input-rfile "Filename :"))
+    (setq path (mew-input-rfile "Filename:"))
     (setq file (file-name-nondirectory path))
     (setq dir (file-name-directory path))
     (if (and dir (string-match mew-home dir))
--- mew.orig/mew-func.el
+++ mew/mew-func.el
@@ -705,9 +705,9 @@
 	(setq maxfile (int-to-string max))
 	(setq maxpath (mew-expand-folder folder maxfile)))
       (while (file-exists-p maxpath)
-	(setq maxfile (read-string (format "%s/%s exists. Input a message number : " max folder)))
+	(setq maxfile (read-string (format "%s/%s exists. Input a message number: " max folder)))
 	(while (not (string-match mew-regex-message-files maxfile))
-	  (setq maxfile (read-string "Input NUMBER : ")))
+	  (setq maxfile (read-string "Input NUMBER: ")))
 	(setq maxpath (mew-expand-folder folder maxfile)))
       (if num-only
 	  maxfile
--- mew.orig/mew-minibuf.el
+++ mew/mew-minibuf.el
@@ -540,7 +540,7 @@
   (let* ((mew-input-complete-function 'mew-complete-sort-key)
 	 (mew-input-exit-minibuffer-function 'mew-input-sort-key-check)
 	 (field:mode (read-from-minibuffer
-		      (format "Sort by (%s)? : " key)
+		      (format "Sort by (%s)?: " key)
 		      ""
 		      mew-input-map
 		      nil 
@@ -673,7 +673,7 @@
 
 (defun mew-input-directory-name (&optional default)
   (let ((dir (expand-file-name
-	      (read-file-name "Directory : " default default t))))
+	      (read-file-name "Directory: " default default t))))
     (if (file-directory-p dir)
 	dir
       (mew-warn "%s is not directory" dir)
@@ -739,8 +739,8 @@
 
 (defun mew-input-general (prompt alist &optional require-match initial)
   (let* ((completion-ignore-case t)
-	 (question (if initial (format "%s (%s) : " prompt initial)
-		     (format "(%s) : " prompt)))
+	 (question (if initial (format "%s (%s): " prompt initial)
+		     (format "(%s): " prompt)))
 	 (value (completing-read question alist nil require-match nil)))
     (if (and initial (string= value "")) initial value)))
 
@@ -814,11 +814,11 @@
   (let ((ociea cursor-in-echo-area) char)
     (unwind-protect
 	(progn
-	  (message "Input mark : ")
+	  (message "Input mark: ")
 	  (setq cursor-in-echo-area t)
 	  (setq char (read-char))
 	  (unless (char-equal char ?\r)
-	    (message "Input mark : %s" (char-to-string char))))
+	    (message "Input mark: %s" (char-to-string char))))
       (setq cursor-in-echo-area ociea))
     (cond
      ((char-equal char ?\r) char)
--- mew.orig/mew-pgp.el
+++ mew/mew-pgp.el
@@ -280,7 +280,7 @@
   (interactive)
   (setq mew-prog-pgp
 	(completing-read
-	 "PGP name : "
+	 "PGP name: "
 	 (mapcar 'list (list mew-prog-pgp2 mew-prog-pgp5 mew-prog-gpg))
 	 nil t))
   (mew-pgp-setup))
@@ -726,7 +726,7 @@
   (if (null mew-pgp-ver)
       (message "%s does not exist" mew-prog-pgp)
     (if (and ask-singer (string-match "signature" (symbol-name type)))
-	(mew-draft-make-message type (car (mew-input-address "Who's key? : ")))
+	(mew-draft-make-message type (car (mew-input-address "Who's key?: ")))
       (mew-draft-make-message type))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- mew.orig/mew-summary4.el
+++ mew/mew-summary4.el
@@ -121,7 +121,7 @@
 the message is then displayed."
   (interactive)
   (let ((here (point)))
-    (unless msg (setq msg (read-string "Message No. : " "")))
+    (unless msg (setq msg (read-string "Message No.: " "")))
     (cond 
      ((string= msg "") ())
      ((eq msg t) ;; xxx