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

* lisp/emacs-lisp/package.el: Be more careful with the init file

Browse source 
(package--ensure-init-file): Check that user-init-file is set,
exists, is readable, and is writable.  (Bug#20584)
Also expand the docstring.
This commit is contained in:
Artur Malabarba 2015-05-15 10:17:48 +01:00
parent ca6a7774c5
commit b1c23fb940
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/emacs-lisp/package.el
View file

@ -1796,9 +1796,14 @@ using `package-compute-transaction'."
(callback (funcall callback))))
(defun package--ensure-init-file ()
"Ensure that the user's init file calls `package-initialize'."
"Ensure that the user's init file has `package-initialize'.
`package-initialize' doesn't have to be called, as long as it is
present somewhere in the file, even as a comment. If it is not,
add a call to it along with some explanatory comments."
;; Don't mess with the init-file from "emacs -Q".
(when user-init-file
(when (and (stringp user-init-file)
(file-readable-p user-init-file)
(file-writable-p user-init-file))
(let* ((buffer (find-buffer-visiting user-init-file))
(contains-init
(if buffer