diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-04-25 17:28:00 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-04-25 17:28:00 -0400 |
| commit | 935715a5cd5f77bedb00fbc860375924846f9e3b (patch) | |
| tree | 895fe3720426754bacd35e156fa0e92559845141 /lisp/emacs-lisp | |
| parent | 6ac9892fa1ee808092f8f5b968c31f3a021e9fc8 (diff) | |
| download | emacs-935715a5cd5f77bedb00fbc860375924846f9e3b.tar.gz emacs-935715a5cd5f77bedb00fbc860375924846f9e3b.tar.bz2 emacs-935715a5cd5f77bedb00fbc860375924846f9e3b.zip | |
* lisp/emacs-lisp/autoload.el (update-directory-autoloads):
Future-proof against non-time-values.
; Do not merge to master.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index e688d6be725..eb6b746bd80 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 |