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

diff --cc ChangeLog
index 2737f62,fd524c6..293a554
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,50 -1,8 +1,54 @@@
 -2013-02-14  Paul Eggert  <eggert@cs.ucla.edu>
+ 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).
 +
 +2013-03-01  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Merge from gnulib, incorporating:
 +      2013-02-21 putenv: port better to native Windows
 +      2013-02-18 extern-inline: avoid compilation error with HP-UX cc
 +      2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv
 +
 +2013-02-28  Ken Brown  <kbrown@cornell.edu>
 +
 +      * configure.ac (HAVE_DATA_START): Fix test.  (Bug#13818)
 +
 +2013-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Simplify data_start configuration (Bug#13783).
 +      * configure.ac (CRT_DIR, LIB_STANDARD, START_FILES, DATA_START)
 +      (LD_FIRSTFLAG, ORDINARY_LINK, LIB_GCC): Remove.
 +      (AC_CHECK_HEADERS_ONCE): Remove sys/resource.h, as it's
 +      not always needed.
 +      (HAVE_DATA_START): New macro.
 +
 +2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 +
 +      * lisp/eshell/em-cmpl.el: Corrected "context-related help"
 +      keybinding in commentary.
 +
 +2013-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Parallelize documentation builds.
 +      This speeds up building of documentation on multiprocessor
 +      platforms, and is motivated by Texinfo 5.0, which is much slower.
 +      Add a toplevel rule 'make docs' to make all the documentation.
 +      * .bzrignore: Add .dvi, .html, .ps.
 +      * Makefile.in (DVIS, HTMLS, INFOS, PSS, DOCS): New macros.
 +      ($(DOCS), docs, vi, html, pdf, ps): New rules.
 +      (info-real): Depend on $(INFOS) rather than doing it sequentially.
 +      (dvi): Depend on $(DVIS) rather than doing it sequentially.
 +
 +2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 +
 +      * doc/misc/eshell.texi: Added documentation for Eshell insert
 +      output redirection operator, >>>.
 +
 +2013-02-15  Paul Eggert  <eggert@cs.ucla.edu>
  
        Fix AIX port (Bug#13650).
        * configure.ac (DATA_START, DATA_SEG_BITS): Set to 0x20000000 on AIX.

diff --cc Makefile.in
Simple merge

diff --cc doc/lispintro/ChangeLog
Simple merge

diff --cc doc/lispintro/emacs-lisp-intro.texi
Simple merge

diff --cc src/ChangeLog
index b511550,91dc8b6..23071b0
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,53 -1,13 +1,63 @@@
+ 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):
 +      Use make_uninit_vector where appropriate.
 +      * font.c (Ffont_get_glyphs, build_style_table): Likewise.
 +      * xselect.c (clean_local_selection_data): Likewise.
 +
 +2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Fix misuse of ImageMagick that caused core dump (Bug#13846).
 +      * image.c (imagemagick_load_image): Calculate height and width
 +      after flattening the image, not before.
 +
 +2013-03-04  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW.
 +      * ftfont.c (ftfont_shape_by_flt): Likewise.
 +      * w32uniscribe.c (uniscribe_shape): Likewise.
 +
 +2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
 +      The old approach, which fell back on DIR/.#FILE.0 through
 +      DIR/.#FILE.9, had race conditions that could not be easily fixed.
 +      If DIR/.#FILE is a non-symlink file, Emacs now does not create a
 +      lock file for DIR/FILE; that is, DIR/FILE is no longer partly
 +      protected by a lock if DIR/.#FILE is a non-symlink file ("partly"
 +      because the locking mechanism was never reliable in that case).
 +      This patch fixes this and other bugs discovered by a code
 +      inspection that was prompted by
 +      <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00531.html>.
 +      Also, this patch switches to .#-FILE (not .#FILE) on MS-Windows,
 +      to avoid interoperability problems between the MS-Windows and
 +      non-MS-Windows implementations.  MS-Windows and non-MS-Windows
 +      instances of Emacs now ignore each others' locks.
 +      * filelock.c (defined_WINDOWSNT): New constant.
 +      (MAKE_LOCK_NAME, fill_in_lock_file_name):
 +      Don't create DIR/.#FILE.0 through DIR/.#FILE.9.  Instead, create
 +      DIR/.#FILE symlinks on non-MS-Windows hosts, and DIR/.#-FILE
 +      regular files on MS-Windows hosts.
 +      (MAKE_LOCK_NAME, unlock_file, Ffile_locked_p):
 +      Use SAFE_ALLOCA to avoid problems with long file names.
 +      (MAX_LFINFO): Now a local constant, not a global macro.
 +      (IS_LOCK_FILE): Remove.
 +      (lock_file_1): Don't inspect errno if symlink call succeeds;
 +      that's not portable.
 +      (lock_file): Document that this function can return if lock
 +      creation fails.
 +      (lock_file): Don't access freed storage.
 +
  2013-03-02  Andreas Schwab  <schwab@linux-m68k.org>
  
        * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren.  (Bug#13734)

diff --cc src/sysdep.c
Simple merge