GitLab

* lisp/vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
and vc-log-outgoing.
* lisp/vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
and vc-log-outgoing.

* configure.in (unxec): Do not define and substitute.
(UNEXEC_OBJ): New output variable, replaces cpp UNEXEC.

* msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.

* src/s/usg5-4.h (UNEXEC): Remove, move to configure.in.
* src/s/sol2-10.h (UNEXEC):
* src/s/irix6-5.h (UNEXEC):
* src/s/hpux10-20.h (UNEXEC):
* src/s/gnu-linux.h (UNEXEC):
* src/s/darwin.h (UNEXEC):
* src/s/cygwin.h (UNEXEC):
* src/s/bsd-common.h (UNEXEC):
* src/s/aix4-2.h (UNEXEC):
* src/m/alpha.h (UNEXEC): Likewise.
* src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.

* character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove.
* composite.c (composition_reseat_it):
* data.c (Faset):
* fns.c (Ffillarray):
* regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD.
  [!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH.

(Fswitch_to_buffer): Remove unused variable `err'.

(rcirc-handler-366): Always sort nicknames.

(rcirc-sort-nicknames-join): Avoid setq.

(rcirc-nickname<, rcirc-sort-nicknames-join): New funs.
(rcirc-handler-366): Use them.

* src/m/template.h (NO_SOCK_SIGIO): Remove, no longer used.

* nextstep/DEV-NOTES: Remove out-of-date information.

* src/m/hp800.h (alloca) [__NetBSD__ && __GNUC__]: No need to define it,
now that AH_BOTTOM does it.

* src/m/hp800.h (HAVE_ALLOCA):
* src/m/ibms390x.h (HAVE_ALLOCA): Do not define, no longer needed.

* msdos/sed2v2.inp: Do not edit HAVE_ALLOCA.

* admin/CPP-DEFINES: Remove HAVE_ALLOCA.

* configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.

* m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h:
Remove NOT_C_CODE tests, it is always true now.

* nt/config.nt: Remove NOT_C_CODE tests, it is always true now.

* admin/CPP-DEFINES: Remove NOT_C_CODE.

* lisp/emacs-lisp/smie.el (smie-indent-virtual, smie-indent-fixindent)
(smie-indent-comment, smie-indent-after-keyword, smie-indent-keyword)
(smie-indent-close, smie-indent-comment-continue, smie-indent-bob)
(smie-indent-exps): Extract from smie-indent-calculate.
(smie-indent-functions): New var.
(smie-indent-functions): Use them.

(smie-indent-hanging-p): Use smie-bolp.
* test/indent: New dir.

(tramp-gvfs-mount-point): Removed.
(tramp-gvfs-stringify-dbus-message, tramp-gvfs-send-command): New
defuns.
(with-tramp-dbus-call-method): Format trace message.
(tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file):
Implement backup call, when operation on local files fails.  Use
progress reporter.  Flush properties of changed files.
(tramp-gvfs-handle-make-directory): Make more traces.
(tramp-gvfs-url-file-name): Hexify file name in url.
(tramp-gvfs-fuse-file-name): Take also prefix (like dav shares)
into account for the resulting file name.
(tramp-gvfs-handler-askquestion): Return dummy mountpoint, when
the answer is "no".  See `tramp-gvfs-maybe-open-connection'.
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p): Test also for new mountspec
attribute "default_location".  Set "prefix" property.
(tramp-gvfs-mount-spec): Return both prefix and mountspec.
(tramp-gvfs-maybe-open-connection): Test, whether mountpoint
exists.  Raise an error, if not (due to a corresponding answer
"no" in interactive questions, for example).

* src/xsettings.c:
* src/xgselect.c:
* src/nsterm.m:
* src/nsselect.m:
* src/nsimage.m:
* src/nsfont.m:
* src/nsfns.m:
* src/dbusbind.c: Use #include <config.h> instead of "config.h" as all
other files do.

* src/keymap.c: Do not include alloca.h, config.h does that.
* src/sysdep.c: Likewise.  Do not define fwrite, not used.

* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).

(gnus-article-browse-delete-temp-files): Don't make query
 for each temp file when gnus-article-browse-delete-temp is ask.

* lisp/vc-git.el (vc-git-compute-remote): New function.
(vc-git-log-outgoing): Use it instead of hard coding a value.
(vc-git-log-incoming): New function.

* lisp/vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer
to update the state of all buffers in the directory.

`file-directory-p' to the filename part rather than to the whole text.

the HAVE_TERMIO where it belongs.

Fixes: debbugs:6149

Fixes: debbugs:6231

of bug#6305).