procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert previous accidental commit

Browse source
This commit is contained in:
Glenn Morris 2014-11-04 21:08:12 -08:00
parent 6a278b64f7
commit ddce73d32f
12 changed files with 61 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lisp/emacs-lisp/autoload.el
View file

@ -812,40 +812,14 @@ write its autoloads into the specified file instead."
(setq files (delete file files)))))
;; Elements remaining in FILES have no existing autoload sections yet.
(dolist (file files)
(unless (member (expand-file-name file) autoload-excludes)
;; Passing nil as second argument forces
;; autoload-generate-file-autoloads to look for the right
;; spot where to insert each autoloads section.
(let ((obuf
(autoload-generate-file-autoloads file nil buffer-file-name))
ofile ofound oform opoint)
(when obuf
(push file no-autoloads)
;; Did processing file update some other ofile?
(when (bufferp obuf)
(with-current-buffer obuf
(setq ofile (file-relative-name buffer-file-name)))
;; Did we already scan ofile?
(and (member ofile done)
(not (member ofile no-autoloads))
(save-excursion
(goto-char (point-min))
(while
(and
(not ofound)
(search-forward
generate-autoload-section-header nil t))
(setq opoint (point)
oform (autoload-read-section-header))
(when (setq ofound
(string= ofile (nth 3 oform)))
(delete-region opoint (point))
(autoload-insert-section-header
(current-buffer)
(nth 1 oform)
(nth 2 oform)
(nth 3 oform)
(nth 5 (file-attributes ofile))))))))))))
(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.
((autoload-generate-file-autoloads file nil buffer-file-name)
(push file no-autoloads))))
(when no-autoloads
;; Sort them for better readability.
(setq no-autoloads (sort no-autoloads 'string<))