Mercurial > emacs

changeset 65682:c16795de963a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2005-09-24 Emilio C. Lopes <eclig@gmx.net> * smime.el (smime-sign-buffer, smime-decrypt-buffer): * mm-view.el (mm-view-pkcs7-decrypt): * gnus-sum.el (gnus-summary-limit-to-extra) (gnus-summary-respool-article, gnus-read-move-group-name): * gnus-score.el (gnus-summary-increase-score): * gnus-util.el (gnus-completing-read-with-default): * gnus-art.el (gnus-read-save-file-name) (gnus-summary-save-in-rmail, gnus-summary-save-in-mail) (gnus-summary-save-in-file, gnus-summary-save-body-in-file): * message.el (message-check-news-header-syntax): Follow convention for reading with the minibuffer.
author Romain Francoise <romain@orebokech.com>
date Sat, 24 Sep 2005 13:46:20 +0000
parents 4312387e37c8
children b8bdecc9aa11
files lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/gnus-score.el lisp/gnus/gnus-sum.el lisp/gnus/gnus-util.el lisp/gnus/message.el lisp/gnus/mm-view.el lisp/gnus/smime.el
diffstat 8 files changed, 42 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/ChangeLog	Sat Sep 24 13:46:20 2005 +0000
@@ -1,8 +1,22 @@
+2005-09-24  Emilio C. Lopes  <eclig@gmx.net>
+
+	* smime.el (smime-sign-buffer, smime-decrypt-buffer):
+	* mm-view.el (mm-view-pkcs7-decrypt):
+	* gnus-sum.el (gnus-summary-limit-to-extra)
+	(gnus-summary-respool-article, gnus-read-move-group-name):
+	* gnus-score.el (gnus-summary-increase-score):
+	* gnus-util.el (gnus-completing-read-with-default):
+	* gnus-art.el (gnus-read-save-file-name)
+	(gnus-summary-save-in-rmail, gnus-summary-save-in-mail)
+	(gnus-summary-save-in-file, gnus-summary-save-body-in-file):
+	* message.el (message-check-news-header-syntax):
+	Follow convention for reading with the minibuffer.
+
 2005-09-18  D Goel  <deego@gnufans.org>
 
 	* sieve.el (sieve-help): Fix `message' call: first arg should be a
 	format spec.
-	
+
 2005-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus.el (gnus-group-startup-message): Bind image-load-path.
--- a/lisp/gnus/gnus-art.el	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/gnus-art.el	Sat Sep 24 13:46:20 2005 +0000
@@ -3255,7 +3255,7 @@
 		      ((null split-name)
 		       (read-file-name
 			(concat prompt " (default "
-				(file-name-nondirectory default-name) ") ")
+				(file-name-nondirectory default-name) "): ")
 			(file-name-directory default-name)
 			default-name))
 		      ;; A single group name is returned.
@@ -3265,7 +3265,7 @@
 				      (symbol-value variable)))
 		       (read-file-name
 			(concat prompt " (default "
-				(file-name-nondirectory default-name) ") ")
+				(file-name-nondirectory default-name) "): ")
 			(file-name-directory default-name)
 			default-name))
 		      ;; A single split name was found
@@ -3278,7 +3278,7 @@
 					 ((file-exists-p name) name)
 					 (t gnus-article-save-directory))))
 			 (read-file-name
-			  (concat prompt " (default " name ") ")
+			  (concat prompt " (default " name "): ")
 			  dir name)))
 		      ;; A list of splits was found.
 		      (t
@@ -3289,7 +3289,7 @@
 			   (setq result
 				 (expand-file-name
 				  (read-file-name
-				   (concat prompt " (`M-p' for defaults) ")
+				   (concat prompt " (`M-p' for defaults): ")
 				   gnus-article-save-directory
 				   (car split-name))
 				  gnus-article-save-directory)))
@@ -3323,7 +3323,7 @@
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-		  "Save %s in rmail file:" filename
+		  "Save %s in rmail file" filename
 		  gnus-rmail-save-name gnus-newsgroup-name
 		  gnus-current-headers 'gnus-newsgroup-last-rmail))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3338,7 +3338,7 @@
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-		  "Save %s in Unix mail file:" filename
+		  "Save %s in Unix mail file" filename
 		  gnus-mail-save-name gnus-newsgroup-name
 		  gnus-current-headers 'gnus-newsgroup-last-mail))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3357,7 +3357,7 @@
 Optional argument FILENAME specifies file name.
 Directory to save to is default to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-		  "Save %s in file:" filename
+		  "Save %s in file" filename
 		  gnus-file-save-name gnus-newsgroup-name
 		  gnus-current-headers 'gnus-newsgroup-last-file))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
@@ -3381,7 +3381,7 @@
 Optional argument FILENAME specifies file name.
 The directory to save in defaults to `gnus-article-save-directory'."
   (setq filename (gnus-read-save-file-name
-		  "Save %s body in file:" filename
+		  "Save %s body in file" filename
 		  gnus-file-save-name gnus-newsgroup-name
 		  gnus-current-headers 'gnus-newsgroup-last-file))
   (gnus-eval-in-buffer-window gnus-save-article-buffer
--- a/lisp/gnus/gnus-score.el	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/gnus-score.el	Sat Sep 24 13:46:20 2005 +0000
@@ -652,7 +652,7 @@
 	       (intern			; need symbol
 		(gnus-completing-read-with-default
 		 (symbol-name (car gnus-extra-headers))	; default response
-		 "Score extra header:"	; prompt
+		 "Score extra header"	; prompt
 		 (mapcar (lambda (x)	; completion list
 			   (cons (symbol-name x) x))
 			 gnus-extra-headers)
--- a/lisp/gnus/gnus-sum.el	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/gnus-sum.el	Sat Sep 24 13:46:20 2005 +0000
@@ -7696,8 +7696,8 @@
 	   (gnus-completing-read-with-default
 	    (symbol-name (car gnus-extra-headers))
 	    (if current-prefix-arg
-		"Exclude extra header:"
-	      "Limit extra header:")
+		"Exclude extra header"
+	      "Limit extra header")
 	    (mapcar (lambda (x)
 		      (cons (symbol-name x) x))
 		    gnus-extra-headers)
@@ -9218,7 +9218,7 @@
 					gnus-newsgroup-name)))))
 		(method
 		 (gnus-completing-read-with-default
-		  methname "What backend do you want to use when respooling?"
+		  methname "Backend to use when respooling"
 		  methods nil t nil 'gnus-mail-method-history))
 		ms)
 	   (cond
@@ -11044,7 +11044,7 @@
   (let* ((split-name (gnus-get-split-value gnus-move-split-methods))
 	 (minibuffer-confirm-incomplete nil) ; XEmacs
 	 (prom
-	  (format "%s %s to:"
+	  (format "%s %s to"
 		  prompt
 		  (if (> (length articles) 1)
 		      (format "these %d articles" (length articles))
--- a/lisp/gnus/gnus-util.el	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/gnus-util.el	Sat Sep 24 13:46:20 2005 +0000
@@ -335,8 +335,8 @@
 (defun gnus-completing-read-with-default (default prompt &rest args)
   ;; Like `completing-read', except that DEFAULT is the default argument.
   (let* ((prompt (if default
-		     (concat prompt " (default " default ") ")
-		   (concat prompt " ")))
+		     (concat prompt " (default " default "): ")
+		   (concat prompt ": ")))
 	 (answer (apply 'completing-read prompt args)))
     (if (or (null answer) (zerop (length answer)))
 	default
--- a/lisp/gnus/message.el	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/message.el	Sat Sep 24 13:46:20 2005 +0000
@@ -4197,7 +4197,7 @@
 		   (zerop
 		    (length
 		     (setq to (completing-read
-			       "Followups to (default: no Followup-To header) "
+			       "Followups to (default no Followup-To header): "
 			       (mapcar #'list
 				       (cons "poster"
 					     (message-tokenize-header
--- a/lisp/gnus/mm-view.el	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/mm-view.el	Sat Sep 24 13:46:20 2005 +0000
@@ -576,9 +576,10 @@
        (cadar smime-keys)
      (smime-get-key-by-email
       (gnus-completing-read-maybe-default
-       (concat "Decipher using which key? "
-	       (if smime-keys (concat "(default " (caar smime-keys) ") ")
-		 ""))
+       (concat "Decipher using key"
+	       (if smime-keys
+		   (concat " (default " (caar smime-keys) "): ")
+		 ": "))
        smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
   (goto-char (point-min))
   (while (search-forward "\r\n" nil t)
--- a/lisp/gnus/smime.el	Sat Sep 24 13:45:50 2005 +0000
+++ b/lisp/gnus/smime.el	Sat Sep 24 13:46:20 2005 +0000
@@ -341,9 +341,10 @@
 		 keyfile
 	       (smime-get-key-with-certs-by-email
 		(completing-read
-		 (concat "Sign using which key? "
-			 (if smime-keys (concat "(default " (caar smime-keys) ") ")
-			   ""))
+		 (concat "Sign using key"
+			 (if smime-keys
+			     (concat " (default " (caar smime-keys) "): ")
+			   ": "))
 		 smime-keys nil nil (car-safe (car-safe smime-keys))))))
       (error "Signing failed"))))
 
@@ -472,9 +473,9 @@
       (or keyfile
 	  (smime-get-key-by-email
 	   (completing-read
-	    (concat "Decipher using which key? "
-		    (if smime-keys (concat "(default " (caar smime-keys) ") ")
-		      ""))
+	    (concat "Decipher using key"
+		    (if smime-keys (concat " (default " (caar smime-keys) "): ")
+		      ": "))
 	    smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
 
 ;; Various operations