Merge from emacs-24; up to 2012-12-24T15:56:17Z!eliz@gnu.org

6 files changed, 31 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2737f6284b0..293a554c9f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-05  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install-man): Ignore gzip exit status.
+
 2013-03-03  Glenn Morris  <rgm@gnu.org>
 
         * make-dist: Remove lzma (it's replaced by xz).
diff --git a/Makefile.in b/Makefile.in
index 42b900401f7..b112c6abf11 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -624,6 +624,12 @@ install-info: info
               ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
            done)
 
+## "gzip || true" is because some gzips exit with non-zero status
+## if compression would not reduce the file size.  Eg, the gzip in
+## OpenBSD 4.9 seems to do this (2013/03).  In Emacs, this can
+## only happen with the tiny ctags.1 manpage.  We don't really care if
+## ctags.1 is compressed or not.  "gzip -f" is another option here,
+## but not sure if portable.
 install-man:
         umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
         thisdir=`/bin/pwd`; \
@@ -634,7 +640,7 @@ install-man:
            ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
           ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
           rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
-          ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \
+          ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
         done
 
 ## Install those items from etc/ that need to end up elsewhere.
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 615551225cb..e31c63fd8f6 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,7 +1,7 @@
 2013-03-03  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi (Digression into C): Update example.
-        (defcustom): Fix typo.
+        (defcustom, Simple Extension): Fix typos.
 
 2012-12-22  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index f1f9315747a..43e2539d2f2 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17811,7 +17811,7 @@ emacs -q --no-site-file -eval '(blink-cursor-mode nil)'
 
 @exdent Or nowadays, using an even more sophisticated set of options,
 
-emacs -Q - D
+emacs -Q -D
 @end smallexample
 }:
 
diff --git a/src/ChangeLog b/src/ChangeLog
index b511550624f..23071b03bee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix a build failure on OpenBSD 4.x and MirBSD.
+        * sysdep.c (KERN_PROC, kinfo_proc)
+        [BSD_SYSTEM && (!KERN_PROC || __MirBSD__)]:
+        Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9 and MirBSD.
+        list-system-processes still returns nil, but at least it doesn't crash.
+        Problem reported by Nelson H. F. Beebe in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>.
+
 2013-03-05  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * composite.c (get_composition_id, fill_gstring_header):
diff --git a/src/sysdep.c b/src/sysdep.c
index 606a5b038ca..c4b937183ca 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2543,6 +2543,14 @@ list_system_processes (void)
 
 #elif defined BSD_SYSTEM
 
+/* OpenBSD 4.9 and earlier do not have KERN_PROC.  Approximate it with
+   KERN_PROC2.  MirBSD's KERN_PROC seems to be busted.  */
+# if !defined KERN_PROC || defined __MirBSD__
+#  undef KERN_PROC
+#  define KERN_PROC KERN_PROC2
+#  define kinfo_proc kinfo_proc2
+# endif
+
 Lisp_Object
 list_system_processes (void)
 {