procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2013-03-04 19:59:35 -08:00
commit 28b6b84d4e
6 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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).

8
Makefile.in
View file

@ -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.

2
doc/lispintro/ChangeLog
View file

@ -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>

2
doc/lispintro/emacs-lisp-intro.texi
View file

@ -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
}:

10
src/ChangeLog
View file

@ -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):

8
src/sysdep.c
View file

@ -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)
{