[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 935715a: * lisp/emacs-lisp/autoload.el (update-di
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-25 935715a: * lisp/emacs-lisp/autoload.el (update-directory-autoloads): |
Date: |
Mon, 25 Apr 2016 21:28:19 +0000 |
branch: emacs-25
commit 935715a5cd5f77bedb00fbc860375924846f9e3b
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* lisp/emacs-lisp/autoload.el (update-directory-autoloads):
Future-proof against non-time-values.
; Do not merge to master.
---
lisp/emacs-lisp/autoload.el | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index e688d6b..eb6b746 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -800,13 +800,14 @@ write its autoloads into the specified file instead."
;; Remove the obsolete section.
(autoload-remove-section (match-beginning 0))
(setq last-time (nth 4 form))
- (dolist (file file)
- (let ((file-time (nth 5 (file-attributes file))))
- (when (and file-time
- (not (time-less-p last-time file-time)))
- ;; file unchanged
- (push file no-autoloads)
- (setq files (delete file files))))))
+ (when (listp last-time)
+ (dolist (file file)
+ (let ((file-time (nth 5 (file-attributes file))))
+ (when (and file-time
+ (not (time-less-p last-time file-time)))
+ ;; file unchanged
+ (push file no-autoloads)
+ (setq files (delete file files)))))))
((not (stringp file)))
((or (not (file-exists-p file))
;; Remove duplicates as well, just in case.
@@ -815,8 +816,9 @@ write its autoloads into the specified file instead."
(member (expand-file-name file) autoload-excludes))
;; Remove the obsolete section.
(autoload-remove-section (match-beginning 0)))
- ((not (time-less-p (nth 4 form)
- (nth 5 (file-attributes file))))
+ ((and (listp (nth 4 form))
+ (not (time-less-p (nth 4 form)
+ (nth 5 (file-attributes file)))))
;; File hasn't changed.
nil)
(t
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 935715a: * lisp/emacs-lisp/autoload.el (update-directory-autoloads):,
Glenn Morris <=