emacs/lisp/vc, branch scratch/substitute-command-keys

Avoid infloop in which-function-mode when a vc file has changed

2020-10-17T08:29:15+00:00

* lisp/vc/diff-mode.el (diff-find-source-location): Avoid warnings
when called from which-function-mode and the file has changed
(bug#42818).

diff-update-on-the-fly doc string clarification

2020-10-16T06:46:07+00:00

* lisp/vc/diff-mode.el (diff-update-on-the-fly): Mention what the
nil value does (bug#43297).

Restore vc-revision-other-window buffer-changing behaviour

2020-10-16T06:36:21+00:00

* lisp/vc/vc.el (vc-revision-other-window): This function used to
change the current buffer, but this was changed in the previous
patch for indirect buffer support.  Ensure that it still does
this, because this is what the callers expect (bug#44026).

Use the full name of the null byte/character, not its abbreviation

2020-10-05T18:19:59+00:00

* lisp/subr.el (inhibit-nul-byte-detection): Make it an obsolete alias.
* src/coding.c (setup_coding_system): Use original name.
(detect_coding): Rename nul_byte_found => null_byte_found.
(detect_coding_system): Use original name.
Rename nul_byte_found => null_byte_found.
(Fdefine_coding_system_internal): Use original name.
(syms_of_coding): Rename inhibit-nul-byte-detection to
inhibit-null-byte-detection.
* src/w16select.c (get_clipboard_data): Rename nul_char to null_char.
* src/json.c (check_string_without_embedded_nulls): Rename from
check_string_without_embedded_nuls.
(Fjson_parse_string): Adjust accordingly.
* src/coding.h (enum define_coding_undecided_arg_index)
(enum coding_attr_index): Rename ...nul_byte... to ...null_byte....
* lisp/info.el (info-insert-file-contents, Info-insert-dir):
* lisp/international/mule.el (define-coding-system):
* lisp/vc/vc-git.el (vc-git--call):
* doc/lispref/nonascii.texi (Lisp and Coding Systems): Use original name.

Improve support for using vc commands in indirect buffers

2020-10-05T06:50:16+00:00

* lisp/vc/vc.el (vc-deduce-fileset-1): New defun.
(vc-deduce-fileset): Adapt.
(vc-maybe-buffer-sync): New defun.
(vc-diff): Adapt.
(vc-ediff): Adapt.
(vc-root-diff): Adapt.
(vc-revision-other-window): Adapt (bug#40967).

Merge from origin/emacs-27

2020-10-02T16:38:24+00:00

78eacf31e8 ; Fix many typos in symbols in docs and comments
d5d12707d6 * doc/misc/flymake.texi (Using Flymake): Fix a typo.  (Bug...

# Conflicts:
#	lisp/allout.el
#	lisp/progmodes/ebrowse.el

; Fix many typos in symbols in docs and comments

2020-10-02T11:29:45+00:00

Don't have vc-git-stash-list bug out on the .git directory

2020-09-20T10:12:41+00:00

* lisp/vc/vc-git.el (vc-git-stash-list): Don't bug out when
running on the .git directory itself (bug#39285).

Save and restore point in ewoc-invalidate

2020-09-18T15:53:32+00:00

* lisp/emacs-lisp/ewoc.el (ewoc--refresh-node): Save and restore point line
and column offset.
(eowc-map) (ewoc--invalidate) (ewoc-set-hf): Don't use save-excursion
* lisp/vc/vc-dir.el (vc-dir-update): Don't save/restore point on calling
'ewoc-invalidate'.

Remove pointless use of intern

2020-09-17T09:13:54+00:00

* lisp/mwheel.el (mouse-wheel-left-event)
(mouse-wheel-right-event): Replace use of intern with quoted
symbol.
* lisp/profiler.el (profiler-calltree-build-unified): Likewise.
* lisp/vc/ediff-util.el (ediff-debug-info): Likewise.