GitLab

* configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
Merges logic from src/s/* and src/Makefile.in.
(LD_SWITCH_SYSTEM_TEMACS): New output variable.

* src/Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
(LD_SWITCH_SYSTEM_EXTRA): New variable, set by configure.
(TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM and $LD_SWITCH_SYSTEM_EXTRA,
move out of cpp section.
* src/s/freebsd.h (LD_SWITCH_SYSTEM):
* src/s/gnu-linux.h (LD_SWITCH_SYSTEM):
* src/s/netbsd.h (LD_SWITCH_SYSTEM):

* admin/CPP-DEFINES: Remove LD_SWITCH_SYSTEM.

* s/usg5-4.h (LIB_STANDARD):
* s/netbsd.h (START_FILES):
* s/irix6-5.h (LIB_STANDARD):
* s/hpux10-20.h (LIB_STANDARD, START_FILES):
* s/gnu-linux.h (START_FILES, LIB_STANDARD):
* s/freebsd.h (START_FILES):
* s/darwin.h (START_FILES):
* s/cygwin.h (START_FILES):
* s/aix4-2.h (LIB_STANDARD):
* m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in.
* Makefile.in (STARTFILES): Rename to START_FILES, define using
autoconf, not cpp.

Define START_FILES and LIB_STANDARD using autoconf.
* configure.in (START_FILES, LIB_STANDARD): New definitions, moved
here from src/s/*.h.
(HAVE_CRTIN): Remove, inline logic in the netbsd
START_FILES/LIB_STANDARD computation.

* s/hpux10-20.h (NEED_BSDTTY): Remove.
* s/aix4-2.h (NEED_UNISTD_H): Remove.
* systty.h: Simplify conditionals for including <sys/bsdtty.h>,
<sys/ptyio.h> and <unistd.h>.

* s/gnu.h (START_FILES): Remove empty definition.

* configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@.

* Makefile.in (CPP, C_SWITCH_SYSTEM, ALLOCA, LN_S, C_SWITCH_X_SITE)
(LD_SWITCH_X_SITE): Remove unused variables.

* lwlib/Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.

* oldXMenu/Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE)
(STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.

* src/Makefile.in (CPP, LN_S): Remove unused variables.

* msdos/sed1v2.inp, msdos/sed5x.inp: Remove LN_S, unused.

Fixes: debbugs:6080

* eval.c (Fdefvaralias): Remove unintended nested if.
(internal_condition_case_2, internal_condition_case_n): Use ANSI type.

* s/bsd-common.h (BSD_PGRPS): Remove undef.
* s/gnu-linux.h (BSD_PGRPS): Remove.
* term.c (dissociate_if_controlling_tty):
* sysdep.c (narrow_foreground_group, widen_foreground_group)
(init_sys_modes, reset_sys_modes):
* emacs.c (main):
* callproc.c (Fcall_process, child_setup): Remove code depending
on BSD_PGRPS.

* s/usg5-4.h (POSIX_SIGNALS):
* s/netbsd.h (POSIX_SIGNALS):
* s/msdos.h (POSIX_SIGNALS):
* s/ms-w32.h (POSIX_SIGNALS):
* s/hpux11.h (POSIX_SIGNALS):
* s/gnu.h (POSIX_SIGNALS):
* s/gnu-linux.h (POSIX_SIGNALS):
* s/freebsd.h (POSIX_SIGNALS):
* s/darwin.h (POSIX_SIGNALS):
* s/cygwin.h (POSIX_SIGNALS):
* s/aix4-2.h (POSIX_SIGNALS): Remove definition.
* s/unixware.h:
* s/sol2-6.h: Remove comments on POSIX_SIGNALS.
* process.c (create_process):
* syssignal.h:
* sysdep.c (wait_for_termination, init_signals):
* process.c (create_process):
* msdos.c: POSIX_SIGNALS is always defined on all platforms,
remove all code that assumes the contrary.

* configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE as well.
(LD_SWITCH_X_SITE_AUX_RPATH): New output variable.

* nt/config.nt (LD_SWITCH_X_SITE_AUX): Remove.

* src/s/gnu-linux.h (LD_SWITCH_SYSTEM): Use LD_SWITCH_X_SITE_AUX as a shell
variable.
* src/s/netbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH.
* src/s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH instead of
LD_SWITCH_SYSTEM_tmp.
* src/Makefile.in (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH):
New variables, set by configure.

* configure.in (LD_SWITCH_SYSTEM_TEMACS): New output variable.

* src/s/aix4-2.h (LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
* src/s/darwin.h (HEADERPAD_EXTRA, LIBS_NSGUI): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Move to configure.in.
* src/Makefile.in (LD_SWITCH_SYSTEM_TEMACS): New variable, set by configure.
(TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM_TEMACS.

* configure.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM): New output
variables, replacing c_switch_machine, c_switch_system.

* src/s/aix4-2.h (C_SWITCH_SYSTEM):
* src/m/alpha.h (C_SWITCH_MACHINE):
Move to configure.in.
* src/Makefile.in (C_SWITCH_MACHINE, C_SWITCH_SYSTEM):
New variables, set by configure.
(ALL_CFLAGS): Use $C_SWITCH_MACHINE and $C_SWITCH_SYSTEM in place of
$c_switch_machine and $c_switch_system.

* lib-src/Makefile.in: Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@
rather than @c_switch_system@, @c_switch_machine@.

* Makefile.in (ORDINARY_LINK): Remove setting LIB_STANDARD based
on it, not used anymore.

* eval.c (internal_condition_case_n): Rename from
internal_condition_case_2.
(internal_condition_case_2): New function.

* xdisp.c (safe_call): Use internal_condition_case_n.

* fileio.c (Fdelete_file, internal_delete_file): New arg FORCE.
(internal_delete_file, Frename_file): Callers changed.

* buffer.c (Fkill_buffer):
* callproc.c (delete_temp_file): Callers changed (Bug#6070).

* lisp.h: Update prototypes.

* diff.el (diff-sentinel):

* epg.el (epg--make-temp-file, epg-decrypt-string)
(epg-verify-string, epg-sign-string, epg-encrypt-string):

* jka-compr.el (jka-compr-partial-uncompress)
(jka-compr-call-process, jka-compr-write-region, jka-compr-load):

* server.el (server-sentinel): Use delete-file's new FORCE arg
(Bug#6070).

* configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables.

* src/Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.
(LIBXT_OTHER, LIBX_OTHER): New, set by configure.
(LIBXT): Set with configure, not cpp.
(LIBX): Remove.
(LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER.

The FreeBSD is not needed, the default works, Solaris version is
not needed, and the remaining case is not supported by configure.

* xsmfns.c (CHDIR_OPT): New define.
(smc_save_yourself_CB): Add CHDIR_OPT to options to use when
restarting emacs.

* xterm.c (x_connection_closed): Call Fkill_emacs instead of
shut_down_emacs.

* emacs.c (USAGE1): Mention --chdir.
(main): Handle --chdir.
(standard_args): Add --chdir.
(fatal_error_signal): Call Fkill_emacs for SIGTERM and SIGHUP (Bug
#5552).

* cmdargs.texi (Initial Options): Mention --chdir.

* Makefile.in (LD_SWITCH_MACHINE): Remove definition, unused.
(TEMACS_LDFLAGS): Do not use LD_SWITCH_MACHINE.

* configure.in (LD_SWITCH_MACHINE, ld_switch_machine): Remove, unused.
(ac_link): Do not use ld_switch_machine.

* m/iris4d.h (TERMINFO, FIRST_PTY_LETTER): Move definitions ...
* s/irix6-5.h (TERMINFO, FIRST_PTY_LETTER): ... here.

* m/ibmrs6000.inp: Remove file, unused.
* m/ibmrs6000.h (IBMR2AIX): Remove, unused.
(LD_SWITCH_MACHINE): Rename to LD_SWITCH_SYSTEM_TEMACS, and move
definition ...
* s/aix4-2.h (LD_SWITCH_SYSTEM_TEMACS): ... here.

 w32.c (sigemptyset, sigaddset, sigfillset, sigprocmask): New stubs.
 sysdep.c (sys_signal) [WINDOWSNT]: #ifdef away.
 (wait_for_termination) [WINDOWSNT]: Move MS-Windows specific code
 from non-POSIX_SIGNALS section to POSIX_SIGNALS section.
 s/ms-w32.h (POSIX_SIGNALS, struct sigaction, SIG_BLOCK)
 (SIG_SETMASK, SIG_UNBLOCK): Define.

 xdisp.c (set_cursor_from_row): Don't place cursor on the vertical border
 glyph between adjacent windows.
 (try_cursor_movement): Don't assume that row->end == (row+1)->start,
 test for that explicitly.

 xdisp.c (display_line): Fix prepending of truncation glyphs to R2L rows.
 (insert_left_trunc_glyphs): Support addition of left truncation glyphs
 to R2L rows.

 xdisp.c: (extend_face_to_end_of_line): In almost-filled rows, extend only
 if the row is R2L and not continued.

 xdisp.c (find_row_end): New function, refactored from display_line.
 (display_line): Use it.

* configure.in (OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.

* configure: Regenerate.

* src/Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
for clarity.
(OTHER_OBJ): Remove.
(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
(otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.

* configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin.
Elsewhere, maybe include it.
* src/Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable.
(OTHER_OBJ): Define as a separate variable, for clarity.

* configure: Regenerate.

* configure.in (TOOLKIT_LIBW) [HAVE_GTK]: Set to $GTK_LIBS.
(OLDXMENU, LIBXMENU): New output variables.
* src/Makefile.in (OLDXMENU, LIBXMENU) [HAVE_MENUS]:
Set with configure, not cpp.
(LIBW): Remove, replace with $TOOLKIT_LIBW.

* configure.in (OTHER_OBJ): New output variable.
* src/Makefile.in (mallocobj): Remove.
(otherobj): Simplify using @OTHER_OBJ@.

* src/Makefile.in (dispnew.o, frame.o, fringe.o, font.o, fontset.o)
(keyboard.o, window.o, xdisp.o, xfaces.o, menu.o):
Don't bother making nsgui.h dependency platform-specific.