diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-04-27 11:10:38 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-27 11:10:38 +0800 |
| commit | a8e7d6d783219972c08fd49a3a2afaf26eb139c2 (patch) | |
| tree | 5e86d23d9285389791dc8321d8a8a2ece2247bea /lisp/gnus | |
| parent | b360839071ef6c7a9e917fe57a4aaeb39138e8c0 (diff) | |
| parent | c5bb756916baa63cc663d68d4c24e5ad33a764e8 (diff) | |
| download | emacs-a8e7d6d783219972c08fd49a3a2afaf26eb139c2.tar.gz | |
Merge changes from emacs-24 branch
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index e25ffd933e6..556094ca614 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2012-04-27 Andreas Schwab <schwab@linux-m68k.org> + + * gnus.el (debbugs-gnu): Don't override existing autoload definition. + 2012-04-26 Daiki Ueno <ueno@unixuser.org> * plstore.el (plstore-called-interactively-p): New compat macro copied diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index cc4f2eb1e7a..635bb6fc96f 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -4397,7 +4397,9 @@ prompt the user for the name of an NNTP server to use." (gnus-1 arg dont-connect slave) (gnus-final-warning))) -(autoload 'debbugs-gnu "debbugs-gnu") +(eval-and-compile + (unless (fboundp 'debbugs-gnu) + (autoload 'debbugs-gnu "debbugs-gnu" "List all outstanding Emacs bugs." t))) (defun gnus-list-debbugs () "List all open Gnus bug reports." (interactive) |