[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/gnus-cloud 0c9487a 12/28: Merge branch 'master' of
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] scratch/gnus-cloud 0c9487a 12/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Mon, 18 Jul 2016 14:04:13 +0000 (UTC) |
branch: scratch/gnus-cloud
commit 0c9487ad78aab57993c4b08e14ddec5aa024c81e
Merge: 23262a8 96bd07a
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
lisp/emacs-lisp/autoload.el | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 6473e31..fbb08fc 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -736,20 +736,22 @@ FILE's modification time."
package--builtin-versions))
(princ "\n")))))
- (goto-char (point-min))
- (while (not (eobp))
- (skip-chars-forward " \t\n\f")
- (cond
- ((looking-at (regexp-quote generate-autoload-cookie))
- ;; If not done yet, figure out where to insert this
text.
- (unless output-start
- (setq output-start (autoload--setup-output
- otherbuf outbuf absfile
load-name)))
- (autoload--print-cookie-text output-start load-name
file))
- ((looking-at ";")
- ;; Don't read the comment.
- (forward-line 1))
- (t
+ ;; Do not insert autoload entries for excluded files.
+ (unless (member absfile autoload-excludes)
+ (goto-char (point-min))
+ (while (not (eobp))
+ (skip-chars-forward " \t\n\f")
+ (cond
+ ((looking-at (regexp-quote
generate-autoload-cookie))
+ ;; If not done yet, figure out where to insert
this text.
+ (unless output-start
+ (setq output-start (autoload--setup-output
+ otherbuf outbuf absfile
load-name)))
+ (autoload--print-cookie-text output-start
load-name file))
+ ((looking-at ";")
+ ;; Don't read the comment.
+ (forward-line 1))
+ (t
;; Avoid (defvar <foo>) by requiring a trailing space.
;; Also, ignore this prefix business
;; for ;;;###tramp-autoload and friends.
@@ -767,8 +769,8 @@ FILE's modification time."
"define-erc-response-handler"
"defun-rcirc-command"))))
(push (match-string 2) defs))
- (forward-sexp 1)
- (forward-line 1))))))
+ (forward-sexp 1)
+ (forward-line 1)))))))
(when (and autoload-compute-prefixes defs)
;; This output needs to always go in the main loaddefs.el,
@@ -1058,9 +1060,7 @@ write its autoloads into the specified file instead."
((not (stringp file)))
((or (not (file-exists-p file))
;; Remove duplicates as well, just in case.
- (member file done)
- ;; If the file is actually excluded.
- (member (expand-file-name file) autoload-excludes))
+ (member file done))
;; Remove the obsolete section.
(setq changed t)
(autoload-remove-section (match-beginning 0)))
@@ -1086,7 +1086,6 @@ write its autoloads into the specified file instead."
(let ((no-autoloads-time (or last-time '(0 0 0 0))) file-time)
(dolist (file files)
(cond
- ((member (expand-file-name file) autoload-excludes) nil)
;; Passing nil as second argument forces
;; autoload-generate-file-autoloads to look for the right
;; spot where to insert each autoloads section.
- [Emacs-diffs] scratch/gnus-cloud 15fda1f 22/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, (continued)
- [Emacs-diffs] scratch/gnus-cloud 15fda1f 22/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 864e344 14/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 548f157 10/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 1aa29cc 19/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud fae4411 16/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud b996f42 27/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 9af4ba0 08/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud e582450 24/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 82fe6fa 17/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 4bc13b7 25/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 0c9487a 12/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Teodor Zlatanov <=
- [Emacs-diffs] scratch/gnus-cloud e6381fa 13/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 8d67982 01/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud ae18a15 21/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 73e10a8 15/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud cbd54d0 28/28: Minor gnus-cloud UI improvements., Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 4eae8f1 20/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud aba6d42 09/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud bef171c 26/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud f5a4b91 05/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18
- [Emacs-diffs] scratch/gnus-cloud 4a92b20 23/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/18