Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org

4 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c4595a4f2d7..f5540e0da24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-27  Glenn Morris  <rgm@gnu.org>
 
+        * configure.ac (emacs_broken_SIGIO): No longer set on gnu-kfreebsd.
+
         * configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
         (DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
         * Makefile.in (check-info-dir): Ignore efaq-w32.
diff --git a/configure.ac b/configure.ac
index 55194f5b822..28377457728 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3868,7 +3868,7 @@ emacs_broken_SIGIO=no
 case $opsys in
   dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
   dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
-  hpux* | irix6-5 | openbsd | sol2* | unixware | gnu-kfreebsd )
+  hpux* | irix6-5 | openbsd | sol2* | unixware )
     emacs_broken_SIGIO=yes
     ;;
 
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)))