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 @@
+2013-06-17  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * emacs-lisp/package.el (package-load-descriptor): Do not call
+        `emacs-lisp-mode', just use its syntax table.
+
 2013-06-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * 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'.
     (when (file-exists-p pkg-file)
       (with-temp-buffer
         (insert-file-contents pkg-file)
-        (emacs-lisp-mode)
         (goto-char (point-min))
-        (let ((pkg-desc (package-process-define-package
-                         (read (current-buffer)) pkg-file)))
-          (setf (package-desc-dir pkg-desc) pkg-dir))))))
+        (with-syntax-table emacs-lisp-mode-syntax-table
+          (let ((pkg-desc (package-process-define-package
+                           (read (current-buffer)) pkg-file)))
+            (setf (package-desc-dir pkg-desc) pkg-dir)))))))
 
 (defun package-load-all-descriptors ()
   "Load descriptors for installed Emacs Lisp packages.