Fix package.el handling of local variables on first line.

* lisp/emacs-lisp/package.el (package-buffer-info): Avoid putting
local variables into description.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a83c95ec3a60fb8b18c8a24efeaaa45660c9a68..2442582114da064c415cbb7664224d219072061c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-05  Chong Yidong  <cyd@gnu.org>
+
+       * emacs-lisp/package.el (package-buffer-info): Avoid putting local
+       variables into description.
+
 2012-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 5b158eb994fff3488b3a605cc9cb996aef1dff0a..73afdb825093e844ed41ffa23a9d0077ca3ea99b 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -943,7 +943,7 @@ If the buffer does not contain a conforming package, signal an
 error.  If there is a package, narrow the buffer to the file's
 boundaries."
   (goto-char (point-min))
-  (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el --- \\(.*\\)$" nil t)
+  (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
     (error "Packages lacks a file header"))
   (let ((file-name (match-string-no-properties 1))
        (desc      (match-string-no-properties 2))