Merge pull request #2835 from stephan-cr/unbreak-non-native-comp

Unbreak el-get-remove-autoloads for Emacs < 28
This commit is contained in:
INA Lintaro 2021-06-13 17:15:52 +09:00 committed by GitHub
commit 04c9da3c3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions

View File

@ -111,7 +111,16 @@ with the named PACKAGE"
(directory-files dir t el-get-autoload-regexp)))
(el-get-load-path package)))
(generated-autoload-file el-get-autoload-file)
(load-names (mapcar (lambda (f) (autoload-file-load-name f el-get-autoload-file))
(load-names
(mapcar
(lambda (f)
(apply #'autoload-file-load-name
;; Starting from Emacs 28 auto-file-load-name
;; needs two parameters, versions before 28 only
;; one.
(if (> emacs-major-version 27)
`(,f ,el-get-autoload-file)
`(,f))))
files))
(recentf-exclude (cons (regexp-quote el-get-autoload-file)
(bound-and-true-p recentf-exclude)))

View File

@ -503,7 +503,7 @@ makes it easier to conditionally splice a command into the list.
(proc (if shell
(start-process-shell-command cname
cbuf
(string-join (cons program args) " "))
(mapconcat #'identity (cons program args) " "))
(apply #'start-process cname cbuf program args))))
;; add the properties to the process, then set the sentinel
(mapc (lambda (x) (process-put proc x (plist-get c x))) c)