[gnus git] branch master updated: n0-13-118-g5edabb7 =4= auth-source.el (auth-source-netrc-create): message.el (message-yank-original): Fix use of `case'. ; Merge branch 'master' of https://git.gnus.org/gnus ; Merge branch 'master' of https://git.gnus.org/gnus ; auth-source.el (auth-source-netrc-create): Use usual format for the default in prompts.
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 5edabb7b1f9ba3eec0492c5a9058ec44eb27f816 (commit)
via a622f6af1266efaecc861939ebee123e80ec17e0 (commit)
via dce57d2a474d5bf59a223e4650496204c5412588 (commit)
via 3dd6072ac9ed5d173f0442cde02b59fecfbda08c (commit)
from b6196c1344ff6160161fdc15f2ee491bba6aeefe (commit)
- Log -----------------------------------------------------------------
commit 5edabb7b1f9ba3eec0492c5a9058ec44eb27f816
Author: Stefan Monnier <[email protected]>
Date: Tue Mar 15 22:30:29 2011 +0000
auth-source.el (auth-source-netrc-create):
message.el (message-yank-original): Fix use of `case'.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 721a7d7..3a2a422 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,11 @@
(nnimap-parse-flags): Store HIGHESTMODSEQ as a string, since it may be
too large for 32-bit Emacsen.
+2011-03-15 Stefan Monnier <[email protected]>
+
+ * auth-source.el (auth-source-netrc-create):
+ * message.el (message-yank-original): Fix use of `case'.
+
2011-03-15 Nelson Ferreira <[email protected]> (tiny change)
* gnus-art.el (gnus-article-treat-body-boundary): Fix boundary width on
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 332a8f6..ce483e4 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1140,10 +1140,10 @@ See `auth-source-search' for details on SPEC."
(if (zerop (length add)) "" " ")
;; remap auth-source tokens to netrc
(case r
- ('user "login")
- ('host "machine")
- ('secret "password")
- ('port "port") ; redundant but clearer
+ (user "login")
+ (host "machine")
+ (secret "password")
+ (port "port") ; redundant but clearer
(t (symbol-name r)))
;; the value will be printed in %S format
data))))
diff --git a/lisp/message.el b/lisp/message.el
index 198c5d8..3dc5647 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3800,13 +3800,13 @@ prefix, and don't delete any headers."
(goto-char (mark t))
(insert-before-markers ?\n)
(goto-char pt))))
- (cond
- ((eq 'above message-cite-reply-position)
+ (case message-cite-reply-position
+ (above
(message-goto-body)
(insert body-text)
(insert (if (bolp) "\n" "\n\n"))
(message-goto-body))
- ((eq 'below message-cite-reply-position)
+ (below
(message-goto-signature)))
;; Add a `message-setup-very-last-hook' here?
;; Add `gnus-article-highlight-citation' here?
commit a622f6af1266efaecc861939ebee123e80ec17e0
Merge: dce57d2 b6196c1
Author: Katsumi Yamaoka <[email protected]>
Date: Tue Mar 15 22:25:26 2011 +0000
Merge branch 'master' of https://git.gnus.org/gnus
commit dce57d2a474d5bf59a223e4650496204c5412588
Merge: 3dd6072 a1c3446
Author: Katsumi Yamaoka <[email protected]>
Date: Tue Mar 15 22:19:53 2011 +0000
Merge branch 'master' of https://git.gnus.org/gnus
commit 3dd6072ac9ed5d173f0442cde02b59fecfbda08c
Author: Stefan Monnier <[email protected]>
Date: Tue Mar 15 10:29:49 2011 +0000
auth-source.el (auth-source-netrc-create): Use usual format for the default in prompts.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa4d6c8..59a4b25 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,11 @@
* message.el (message-yank-original): Use cond instead of CL case.
+2011-03-15 Stefan Monnier <[email protected]>
+
+ * auth-source.el (auth-source-netrc-create): Use usual format for the
+ default in prompts.
+
2011-03-14 Katsumi Yamaoka <[email protected]>
* lpath.el: Fbind read-char-choice for XEmacs.
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index dd1b83d..332a8f6 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1103,17 +1103,19 @@ See `auth-source-search' for details on SPEC."
(?h ,(aget printable-defaults 'host))
(?p ,(aget printable-defaults 'port))))))
- ;; store the data, prompting for the password if needed
+ ;; Store the data, prompting for the password if needed.
(setq data
(cond
((and (null data) (eq r 'secret))
- ;; special case prompt for passwords
+ ;; Special case prompt for passwords.
(read-passwd prompt))
((null data)
(when default
- (setq
- prompt
- (concat prompt (format "(default %s) " default))))
+ (setq prompt
+ (if (string-match ": *\\'" prompt)
+ (concat (substring prompt 0 (match-beginning 0))
+ " (default " default "): ")
+ (concat prompt "(default " default ") "))))
(read-string prompt nil nil default))
(t (or data default))))
@@ -1125,7 +1127,7 @@ See `auth-source-search' for details on SPEC."
(lambda () data))
data))))
- ;; when r is not an empty string...
+ ;; When r is not an empty string...
(when (and (stringp data)
(< 0 (length data)))
;; this function is not strictly necessary but I think it
@@ -1183,7 +1185,7 @@ Respects `auth-source-save-behavior'. Uses
;; we want the new data to be found first, so insert at beginning
(goto-char (point-min))
- ;; ask AFTER we've successfully opened the file
+ ;; Ask AFTER we've successfully opened the file.
(let ((prompt (format "Save auth info to file %s? " file))
(done (not (eq auth-source-save-behavior 'ask)))
(bufname "*auth-source Help*")
@@ -1200,6 +1202,8 @@ Respects `auth-source-save-behavior'. Uses
"(N)o and don't ask to save again\n"
"(e)dit the line\n"
"(?) for help as you can see.\n"))
+ ;; Why? Doesn't with-output-to-temp-buffer already do
+ ;; the exact same thing anyway? --Stef
(set-buffer standard-output)
(help-mode))))
(?n (setq add ""
@@ -1213,7 +1217,7 @@ Respects `auth-source-save-behavior'. Uses
(when (get-buffer-window bufname)
(delete-window (get-buffer-window bufname)))
- ;; make sure the info is not saved
+ ;; Make sure the info is not saved.
(when (null auth-source-save-behavior)
(setq add ""))
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 10 ++++++++++
lisp/auth-source.el | 28 ++++++++++++++++------------
lisp/message.el | 6 +++---
3 files changed, 29 insertions(+), 15 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project