[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107971: Fix package.el handling of local variables on first line.

[Chong Yidong]

------------------------------------------------------------
revno: 107971
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-05-05 13:13:27 +0800
message:
  Fix package.el handling of local variables on first line.
  
  * lisp/emacs-lisp/package.el (package-buffer-info): Avoid putting
  local variables into description.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-05 04:18:49 +0000
+++ b/lisp/ChangeLog    2012-05-05 05:13:27 +0000
@@ -1,3 +1,8 @@
+2012-05-05  Chong Yidong  <address@hidden>
+
+       * emacs-lisp/package.el (package-buffer-info): Avoid putting local
+       variables into description.
+
 2012-05-05  Stefan Monnier  <address@hidden>
 
        * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2012-03-12 03:03:16 +0000
+++ b/lisp/emacs-lisp/package.el        2012-05-05 05:13:27 +0000
@@ -943,7 +943,7 @@
 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))