diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:43 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:43 -0700 |
| commit | 602866264917f0772ceab356e3206a139719d2c5 (patch) | |
| tree | b5ae4aa29442919364d93de63834997ce6696ec7 /lisp/gnus/gnus.el | |
| parent | 5fb3782e95d512ddb9a23e7d713de5980c7c4c2a (diff) | |
| parent | 008b263feeba8951a95bec93ec0a9e263cf230f7 (diff) | |
| download | emacs-602866264917f0772ceab356e3206a139719d2c5.tar.gz | |
Merge from origin/emacs-26
008b263 (origin/emacs-26, emacs-26) * lisp/gnus/gnus.el: Mark autoloa...
daf32f1 Speed up redisplay of HELLO
d8a6d82 Improve documentation of 'safe-local-variable' property
# Conflicts:
# etc/HELLO
Diffstat (limited to 'lisp/gnus/gnus.el')
| -rw-r--r-- | lisp/gnus/gnus.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 1c41e081b76..66e6c57e66b 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -2500,12 +2500,12 @@ are always t.") (let ((interactive (nth 1 (memq ':interactive package)))) (mapcar (lambda (function) - (let (keymap) + (let (type) (when (consp function) - (setq keymap (car (memq 'keymap function))) + (setq type (cadr function)) (setq function (car function))) (unless (fboundp function) - (autoload function (car package) nil interactive keymap)))) + (autoload function (car package) nil interactive type)))) (if (eq (nth 1 package) ':interactive) (nthcdr 3 package) (cdr package))))) @@ -2617,8 +2617,8 @@ are always t.") gnus-list-of-unread-articles gnus-list-of-read-articles gnus-offer-save-summaries gnus-make-thread-indent-array gnus-summary-exit gnus-update-read-articles gnus-summary-last-subject - gnus-summary-skip-intangible gnus-summary-article-number - gnus-data-header gnus-data-find) + (gnus-summary-skip-intangible macro) (gnus-summary-article-number macro) + (gnus-data-header macro) (gnus-data-find macro)) ("gnus-group" gnus-group-insert-group-line gnus-group-quit gnus-group-list-groups gnus-group-first-unread-group gnus-group-set-mode-line gnus-group-set-info gnus-group-save-newsrc |