[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b074436: * lisp/emacs-lisp/package.el (package--ens
From: |
Artur Malabarba |
Subject: |
[Emacs-diffs] master b074436: * lisp/emacs-lisp/package.el (package--ensure-init-file) |
Date: |
Wed, 09 Sep 2015 11:13:29 +0000 |
branch: master
commit b074436925a0fe8329ef86d0a36238f5c593888c
Author: Phil Sainty <address@hidden>
Commit: Artur Malabarba <address@hidden>
* lisp/emacs-lisp/package.el (package--ensure-init-file)
More robust check for `package-initialize' calls in init file.
This function accepts an optional argument, but calls passing
an argument would not have been detected.
---
lisp/emacs-lisp/package.el | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index b0d2ff9..eb66e8f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1852,12 +1852,12 @@ add a call to it along with some explanatory comments."
(save-restriction
(widen)
(goto-char (point-min))
- (search-forward "(package-initialize)" nil 'noerror))))
+ (re-search-forward "(package-initialize\\_>" nil
'noerror))))
;; Don't visit the file if we don't have to.
(with-temp-buffer
(insert-file-contents user-init-file)
(goto-char (point-min))
- (search-forward "(package-initialize)" nil 'noerror)))))
+ (re-search-forward "(package-initialize\\_>" nil 'noerror)))))
(unless contains-init
(with-current-buffer (or buffer
(let ((delay-mode-hooks t))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b074436: * lisp/emacs-lisp/package.el (package--ensure-init-file),
Artur Malabarba <=