[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111940: Merge from emacs-24; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111940: Merge from emacs-24; up to r111320 |
Date: |
Mon, 04 Mar 2013 19:59:35 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111940 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-04 19:59:35 -0800
message:
Merge from emacs-24; up to r111320
modified:
ChangeLog
Makefile.in
doc/lispintro/ChangeLog
doc/lispintro/emacs-lisp-intro.texi
src/ChangeLog
src/sysdep.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-03 02:43:30 +0000
+++ b/ChangeLog 2013-03-05 03:59:35 +0000
@@ -1,3 +1,7 @@
+2013-03-05 Glenn Morris <address@hidden>
+
+ * Makefile.in (install-man): Ignore gzip exit status.
+
2013-03-03 Glenn Morris <address@hidden>
* make-dist: Remove lzma (it's replaced by xz).
=== modified file 'Makefile.in'
--- a/Makefile.in 2013-02-21 22:42:56 +0000
+++ b/Makefile.in 2013-03-05 03:59:35 +0000
@@ -624,6 +624,12 @@
${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_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.
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2013-03-03 02:39:57 +0000
+++ b/doc/lispintro/ChangeLog 2013-03-05 03:59:35 +0000
@@ -1,7 +1,7 @@
2013-03-03 Glenn Morris <address@hidden>
* emacs-lisp-intro.texi (Digression into C): Update example.
- (defcustom): Fix typo.
+ (defcustom, Simple Extension): Fix typos.
2012-12-22 Glenn Morris <address@hidden>
=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi 2013-03-03 02:39:57 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi 2013-03-05 03:59:35 +0000
@@ -17811,7 +17811,7 @@
@exdent Or nowadays, using an even more sophisticated set of options,
-emacs -Q - D
+emacs -Q -D
@end smallexample
}:
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-03-05 01:48:30 +0000
+++ b/src/ChangeLog 2013-03-05 03:59:35 +0000
@@ -1,3 +1,13 @@
+2013-03-05 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
* composite.c (get_composition_id, fill_gstring_header):
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2013-02-13 02:10:36 +0000
+++ b/src/sysdep.c 2013-03-05 03:59:35 +0000
@@ -2543,6 +2543,14 @@
#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)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111940: Merge from emacs-24; up to r111320,
Glenn Morris <=