[gnus git] branch master updated: n0-13-93-g7412629 =1= Use `eval-when-compile' to load `dropdown-list'
Ted Zlatanov <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 74126299d9f83f10248624ede0f0198f13d54c0f (commit)
from bb1ecd951a7b6bc23d73941533a6da1838f606cc (commit)
- Log -----------------------------------------------------------------
commit 74126299d9f83f10248624ede0f0198f13d54c0f
Author: Ted Zlatanov <[email protected]>
Date: Wed Mar 9 05:16:46 2011 -0600
Use `eval-when-compile' to load `dropdown-list'
* auth-source.el: Use `eval-when-compile' to load `dropdown-list'.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ea13bd..3cf50e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,7 +3,8 @@
* auth-source.el (auth-source-read-char-choice): New function to read a
character choice using `dropdown-list', `read-char-choice', or
`read-char'. It appends "[a/b/c] " to the prompt if the choices were
- '(?a ?b ?c). The `dropdown-list' support is disabled for now.
+ '(?a ?b ?c). The `dropdown-list' support is disabled for now. Use
+ `eval-when-compile' to load `dropdown-list'.
(auth-source-netrc-saver): Use it.
2011-03-08 Teodor Zlatanov <[email protected]>
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 33b9ef9..1088719 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -44,6 +44,7 @@
(require 'gnus-util)
(require 'assoc)
(eval-when-compile (require 'cl))
+(eval-when-compile (require 'dropdown-list nil t))
(eval-and-compile
(or (ignore-errors (require 'eieio))
;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib
@@ -312,7 +313,7 @@ with \"[a/b/c] \" if CHOICES is '\(?a ?b ?c\)."
(while (not (memq k choices))
(setq k (cond
- ((and nil (require 'dropdown-list nil t))
+ ((and nil (featurep 'dropdown-list))
(let* ((blank (fill (copy-sequence prompt) ?.))
(dlc (cons (format "%s %c" prompt (car choices))
(loop for c in (cdr choices)
-----------------------------------------------------------------------
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 | 3 ++-
lisp/auth-source.el | 3 ++-
2 files changed, 4 insertions(+), 2 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