From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 May 2016 01:09:29 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/c3ed7cea0a43ab86c9d3b1627878055844bc8656

Merge from origin/emacs-25

16e5e8e Fix last change to isearch-update (bug#23406)
b755d98 Autoload cursor-sensor-inhibit (bug#23406)
b52ebd4 org-map-entries: Fix org-agenda-prepare-buffers call
86aa409 Followup for last commit in the user manual
7004459 Improve doc string of 'set-goal-column'
ccdaf04 Fix the MSDOS build
ffe701c Remove \= from format string (bug#18190)
1c58fa1 Fix variable-pitch font on MS-Windows
c6077bf Restore follow-scroll-up/down to scrolling by the combined si...
b671e21 Revert unneeded change which harms syntactic parsing.  This f...
48b24c9 Correct indentation of ids in a C++ enum after a protection k...
5c3534f * lisp/window.el (window--process-window-list): No-op if no p...
734fb3a Port dumping to NetBSD with PaX
0255a70 Don't mistake `for' inside a function for a part of array com...

# Conflicts:
#	src/Makefile.in
---

c3ed7cea0a43ab86c9d3b1627878055844bc8656
diff --cc msdos/sed2v2.inp
index 6079aab260,9f4ff83631..d1a6eaba5d
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@@ -64,9 -64,9 +64,9 @@@
  /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
  /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
  /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
- /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
+ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/
  /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/
 -/^#undef VERSION/s/^.*$/#define VERSION "25.0.93"/
 +/^#undef VERSION/s/^.*$/#define VERSION "25.1.50"/
  /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
  /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
  /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --cc src/Makefile.in
index fc9360a5bd,d54670932d..8639effde8
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -541,8 -532,10 +542,10 @@@ emacs$(EXEEXT): temacs$(EXEEXT) 
  ifeq ($(CANNOT_DUMP),yes)
  	ln -f temacs$(EXEEXT) $@
  else
 -	LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
 +	LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
- 	$(PAXCTL_if_present) -zex $@
+   ifneq ($(PAXCTL_dumped),)
+ 	$(PAXCTL_dumped) $@
+   endif
  	ln -f $@ bootstrap-emacs$(EXEEXT)
  endif
  
@@@ -601,13 -592,14 +604,14 @@@ $(LIBEGNU_ARCHIVE): $(config_h
  ## This goes on to affect various things, and the emacs binary fails
  ## to start if Vinstallation_directory has the wrong value.
  temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
 -	         $(lib)/libgnu.a $(EMACSRES) ${charsets} ${charscript}
 +	         $(LIBEGNU_ARCHIVE) $(EMACSRES) ${charsets} ${charscript}
  	$(AM_V_CCLD)$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
 -	  -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
 +	  -o temacs $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES)
  	$(MKDIR_P) $(etc)
  ifneq ($(CANNOT_DUMP),yes)
- 	$(PAXCTL_if_present) -r $@
- 	$(SETFATTR_if_present) -n user.pax.flags -v er $@
+   ifneq ($(PAXCTL_notdumped),)
+ 	$(PAXCTL_notdumped) $@
+   endif
  endif
  
  ## The following oldxmenu-related rules are only (possibly) used if
@@@ -747,8 -737,10 +751,10 @@@ bootstrap-emacs$(EXEEXT): temacs$(EXEEX
  ifeq ($(CANNOT_DUMP),yes)
  	ln -f temacs$(EXEEXT) $@
  else
 -	$(RUN_TEMACS) --batch --load loadup bootstrap
 +	$(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
- 	$(PAXCTL_if_present) -zex emacs$(EXEEXT)
+   ifneq ($(PAXCTL_dumped),)
+ 	$(PAXCTL_dumped) emacs$(EXEEXT)
+   endif
  	mv -f emacs$(EXEEXT) $@
  endif
  	@: Compile some files earlier to speed up further compilation.
diff --cc src/emacs.c
index a7cbb32e14,5c187e76ba..3e0cf59640
--- a/src/emacs.c
+++ b/src/emacs.c
@@@ -54,13 -54,9 +54,14 @@@ along with GNU Emacs.  If not, see <htt
  
  #ifdef MSDOS
  #include <binary-io.h>
+ #include "dosfns.h"
  #endif
  
 +#ifdef HAVE_LIBSYSTEMD
 +# include <systemd/sd-daemon.h>
 +# include <sys/socket.h>
 +#endif
 +
  #ifdef HAVE_WINDOW_SYSTEM
  #include TERM_HEADER
  #endif /* HAVE_WINDOW_SYSTEM */