Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1047

3 files changed, 21 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bd3acfda6bb..cba67545dfd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.el (gnus-group-startup-message): Add `find-image' call before
+	image-load-path is let-bound.  Reported by Harald Hanche-Olsen
+	<hanche@math.ntnu.no>.
+
+2008-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-article-describe-bindings): Work for draft group.
+
 2008-02-01  Zhang Wei  <id.brep@gmail.com>
 
 	* rfc2047.el (rfc2047-charset-encoding-alist): Add gbk and GB18030.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index f93a304be46..9efb9a30793 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6398,6 +6398,7 @@ KEY is a string or a vector."
 
 ;;`gnus-agent-mode' in gnus-agent.el will define it.
 (defvar gnus-agent-summary-mode)
+(defvar gnus-draft-mode)
 
 (defun gnus-article-describe-bindings (&optional prefix)
   "Show a list of all defined keys, and their definitions.
@@ -6408,7 +6409,7 @@ then we display only bindings that start with that prefix."
   (let ((keymap (copy-keymap gnus-article-mode-map))
 	(map (copy-keymap gnus-article-send-map))
 	(sumkeys (where-is-internal 'gnus-article-read-summary-keys))
-	agent)
+	agent draft)
     (define-key keymap "S" map)
     (define-key map [t] nil)
     (with-current-buffer gnus-article-current-summary
@@ -6418,10 +6419,13 @@ then we display only bindings that start with that prefix."
 	  (when (setq def (key-binding key))
 	    (define-key keymap key def))))
       (when (boundp 'gnus-agent-summary-mode)
-	(setq agent gnus-agent-summary-mode)))
+	(setq agent gnus-agent-summary-mode))
+      (when (boundp 'gnus-draft-mode)
+	(setq draft gnus-draft-mode)))
     (with-temp-buffer
       (use-local-map keymap)
       (set (make-local-variable 'gnus-agent-summary-mode) agent)
+      (set (make-local-variable 'gnus-draft-mode) draft)
       (describe-bindings prefix))
     (let ((item `((lambda (prefix)
 		    (save-excursion
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 2c6b8f324e1..d32cfb856cc 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1003,6 +1003,11 @@ be set in `.emacs' instead."
    ((and
      (fboundp 'find-image)
      (display-graphic-p)
+     ;; Make sure the library defining `image-load-path' is loaded
+     ;; (`find-image' is autoloaded) (and discard the result).  Else, we may
+     ;; get "defvar ignored because image-load-path is let-bound" when calling
+     ;; `find-image' below.
+     (or (find-image '(nil (:type xpm :file "gnus.xpm"))) t)
      (let* ((data-directory (nnheader-find-etc-directory "images/gnus"))
 	    (image-load-path (cond (data-directory
 				    (list data-directory))