diff options
| author | Dmitry Gutov | 2013-06-17 10:24:08 +0400 |
|---|---|---|
| committer | Dmitry Gutov | 2013-06-17 10:24:08 +0400 |
| commit | d363bffbedce7027288fbe7f05040e4ff71ff4bc (patch) | |
| tree | 50ef99803e8e2465ebf1335bf9a4f180a6685e1c | |
| parent | 84575e67fc390815f8f9fc8bea095e006f0890c4 (diff) | |
| download | emacs-d363bffbedce7027288fbe7f05040e4ff71ff4bc.tar.gz emacs-d363bffbedce7027288fbe7f05040e4ff71ff4bc.zip | |
* lisp/emacs-lisp/package.el (package-load-descriptor): Do not call
`emacs-lisp-mode', just use its syntax table.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b64bcccacd1..64745559126 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-06-17 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (package-load-descriptor): Do not call | ||
| 4 | `emacs-lisp-mode', just use its syntax table. | ||
| 5 | |||
| 1 | 2013-06-17 Juanma Barranquero <lekktu@gmail.com> | 6 | 2013-06-17 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * progmodes/prog-mode.el (prog-prettify-install): Add `composition' to | 8 | * progmodes/prog-mode.el (prog-prettify-install): Add `composition' to |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 2db422a4d12..cd7852af550 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -419,11 +419,11 @@ This is, approximately, the inverse of `version-to-list'. | |||
| 419 | (when (file-exists-p pkg-file) | 419 | (when (file-exists-p pkg-file) |
| 420 | (with-temp-buffer | 420 | (with-temp-buffer |
| 421 | (insert-file-contents pkg-file) | 421 | (insert-file-contents pkg-file) |
| 422 | (emacs-lisp-mode) | ||
| 423 | (goto-char (point-min)) | 422 | (goto-char (point-min)) |
| 424 | (let ((pkg-desc (package-process-define-package | 423 | (with-syntax-table emacs-lisp-mode-syntax-table |
| 425 | (read (current-buffer)) pkg-file))) | 424 | (let ((pkg-desc (package-process-define-package |
| 426 | (setf (package-desc-dir pkg-desc) pkg-dir)))))) | 425 | (read (current-buffer)) pkg-file))) |
| 426 | (setf (package-desc-dir pkg-desc) pkg-dir))))))) | ||
| 427 | 427 | ||
| 428 | (defun package-load-all-descriptors () | 428 | (defun package-load-all-descriptors () |
| 429 | "Load descriptors for installed Emacs Lisp packages. | 429 | "Load descriptors for installed Emacs Lisp packages. |