diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-08-27 01:01:13 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-08-27 01:01:13 -0700 |
| commit | a0b5606ec769968b10c765f8ff50f312d691ef62 (patch) | |
| tree | 39337815ff4fae5175df229dbd72d770c77c7648 /lisp | |
| parent | 1857cd3f9ef1103d5ea2fcecbb7b2a6a9d6b2aef (diff) | |
| parent | d96ad42239cbf481c292e750aa8b6fd5a19ddb7e (diff) | |
| download | emacs-a0b5606ec769968b10c765f8ff50f312d691ef62.tar.gz emacs-a0b5606ec769968b10c765f8ff50f312d691ef62.tar.bz2 emacs-a0b5606ec769968b10c765f8ff50f312d691ef62.zip | |
Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b8351f11f61..e8e56133d88 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-08-27 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/package.el (package-buffer-info): Fix message typo. + 2013-08-27 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/python.el (python-font-lock-keywords): Don't return nil diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index add73fd4bde..0085074e5be 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -981,7 +981,7 @@ error. If there is a package, narrow the buffer to the file's boundaries." (goto-char (point-min)) (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t) - (error "Packages lacks a file header")) + (error "Package lacks a file header")) (let ((file-name (match-string-no-properties 1)) (desc (match-string-no-properties 2)) (start (line-beginning-position))) |