[Emacs-diffs] trunk r114021: Merge from emacs-24; up to r111403

[Glenn Morris]

------------------------------------------------------------
revno: 114021 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-27 01:01:13 -0700
message:
  Merge from emacs-24; up to r111403
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-27 07:57:39 +0000
+++ b/ChangeLog 2013-08-27 08:01:13 +0000
@@ -1,5 +1,7 @@
 2013-08-27  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'configure.ac'
--- a/configure.ac      2013-08-27 07:57:39 +0000
+++ b/configure.ac      2013-08-27 08:01:13 +0000
@@ -3868,7 +3868,7 @@
 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
     ;;
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-27 02:41:41 +0000
+++ b/lisp/ChangeLog    2013-08-27 08:01:13 +0000
@@ -1,3 +1,7 @@
+2013-08-27  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/package.el (package-buffer-info): Fix message typo.
+
 2013-08-27  Stefan Monnier  <address@hidden>
 
        * progmodes/python.el (python-font-lock-keywords): Don't return nil

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-08-03 02:34:22 +0000
+++ b/lisp/emacs-lisp/package.el        2013-08-27 08:01:13 +0000
@@ -981,7 +981,7 @@
 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)))