GitLab

* emacs-lisp/authors.el (authors-obsolete-files-regexps):
Ignore VCS-ignore files, and deleted nextstep preferences files.
(authors-ignored-files): Ignore deleted cedet test files, and "*.el".
(authors-ambiguous-files): New list.
(authors-valid-file-names): Add some deleted files.
(authors-renamed-files-alist): Add font-setting.el, edt-user.doc.
(authors-disambiguate-file-name): New function.  (Bug#5501)
(authors-canonical-file-name): Doc fix.
Don't warn about obsolete files.
(authors-canonical-file-name, authors-scan-el):
Use authors-disambiguate-file-name.

* Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused.

* s/freebsd.h (C_SWITCH_SYSTEM):
* s/hpux10-20.h (C_SWITCH_X_SYSTEM, LD_SWITCH_X_DEFAULT):
* s/netbsd.h (C_SWITCH_SYSTEM):
* s/openbsd.h (LD_SWITCH_X_DEFAULT): Remove, configure takes care
of these.

* m/intel386.h (CRT0_DUMMIES): Remove, inline value in the only
user: ecrt0.c.
(SOLARIS2): Remove LOAD_AVE_TYPE, LOAD_AVE_CVT, LIBS_MACHINE, unused.
(USG5_4): Move LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE definitions to
the only user: s/unixware.h.
* ecrt0.c: Remove #ifndef static.  Inline CRT0_DUMMIES definition
from m/intel386.h.
* s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Definitions
moved here from m/intel386.h.

 xdisp.c (set_iterator_to_next, next_element_from_composition):
 After advancing IT past the composition, resync the bidi iterator
 with IT's position.

 xdisp.c (set_iterator_to_next, next_element_from_composition): After
 advancing IT past the composition, resync the bidi iterator with 
 IT's position.  (Bug#5977)

(TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS.

* emacs-lisp/bytecomp.el (byte-compile-set-default): New function.
(byte-compile-setq-default): Optimize for the
single-var case and don't call byte-compile-form in this case to avoid
inf-loop with byte-compile-set-default.

* yenc.el (yenc-decode-region): Don't let-bind a read-only variable.

 xdisp.c (pop_it): When the stack is popped after displaying
 from a string, bidi-iterate to exit from the text portion covered
 by the `display' property or overlay.  (Bug#5988, bug#5920)

 xdisp.c (pop_it): When the stack is popped after displaying
 from a string, bidi-iterate to exit from the text portion covered
 by the `display' property or overlay.  (Bug#5988, bug#5920)

* net/tramp.el (tramp-file-name-handler-alist): Add
`file-selinux-context' and `set-file-selinux-context'.
(tramp-handle-file-selinux-context)
(tramp-handle-set-file-selinux-context): New defuns.
(tramp-handle-copy-file, tramp-do-copy-or-rename-file): Handle
PRESERVE-SELINUX-CONTEXT.

* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Add
`file-selinux-context' and `set-file-selinux-context'.
(tramp-gvfs-handle-file-selinux-context)
(tramp-gvfs-handle-set-file-selinux-context): New defuns.
(tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT.

* net/ange-ftp.el (ange-ftp-copy-file):
* net/tramp-fish.el (tramp-fish-handle-copy-file):
* net/tramp-imap.el (tramp-imap-handle-copy-file):
* net/tramp-smb.el (tramp-smb-handle-copy-file): Add
PRESERVE-SELINUX-CONTEXT.

(LD_SWITCH_MACHINE_TEMACS): Remove, configure sets nocombreloc.

* s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove.

* s/hpux10-20.h (START_FILES): Explicitly define here instead of
relying on Makefile.in to define it.
* s/cygwin.h (START_FILES): Likewise.
* Makefile.in (STARTFILES): Remove conditional code, not needed anymore.

* s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS, C_SWITCH_X_SYSTEM)
(LIB_MOTIF): Remove, configure takes care of this.
(NOT_USING_MOTIF): Remove, unused.
* xrdb.c: Remove #if 0-ed #include.
(SYSV): Remove conditional for old SysV.
* sysdep.c (closedir): Remove conditional code for Solaris,
Solaris has closedir.

* xsettings.c (read_and_apply_settings): Check if current_font is
  NULL before strcmp (Bug#6001).

* net/tramp.el (with-connection-property, tramp-completion-mode-p)
(tramp-action-process-alive, tramp-action-out-of-band)
(tramp-check-for-regexp, tramp-file-name-p, tramp-equal-remote)
(tramp-exists-file-name-handler): Fix docstring.
(with-progress-reporter): New defmacro.
(tramp-do-copy-or-rename-file, tramp-handle-dired-compress-file)
(tramp-maybe-open-connection): Use it.

* net/tramp.el (tramp-detect-ssh-controlmaster): New defun.
(tramp-default-method): Use it.

parameter `preserve-selinux-context'.
(tramp-file-name-for-operation): Add `set-file-selinux-context'.

Otherwise the check to prevent repeated insertion of optional headers
is a no-op.  By Andreas Seltenreich <seltenreich@gmx.de>.

Ensure, that non remote files are still checked.  Oops.

* configure.in: Revert last change.

* icomplete.el (icomplete-completions): Use `non-essential'.

* net/tramp.el (tramp-connectable-p): New defun.
(tramp-handle-expand-file-name)
(tramp-completion-handle-file-name-all-completions)
(tramp-completion-handle-file-name-completion): Use it.

* m/hp800.h (NO_REMAP, VIRT_ADDR_VARIES, DATA_SEG_BITS)
(DATA_START, TEXT_START, LOAD_AVE_TYPE, LOAD_AVE_CVT)
(LDAV_SYMBOL, index, rindex): Move definitions only used in HP-UX ...
* s/hpux10-20.h: ... to the only user, here.