emacs/lisp/vc, branch scratch/command Emacs is the extensible, customizable, self-documenting real-time display editor. Fix ediff even/odd faces to increase their contrast and readability 2021-02-10T19:38:43+00:00 Juri Linkov 2021-02-10T19:37:47+00:00 6bfdfeed36fab4680c8db90c22da8f6611694186 * lisp/vc/ediff-init.el (ediff-even-diff-A, ediff-even-diff-B) (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A) (ediff-odd-diff-B, ediff-odd-diff-C): Add :distant-foreground "Black" for light background. For dark background add :distant-foreground "White", and use darker shades of grey for background colors (bug#46396). 
* lisp/vc/ediff-init.el (ediff-even-diff-A, ediff-even-diff-B)
(ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
(ediff-odd-diff-B, ediff-odd-diff-C): Add :distant-foreground
"Black" for light background.  For dark background
add :distant-foreground "White", and use darker shades of grey
for background colors (bug#46396).
Refine use of vc-dir faces; apply to all backends 2021-02-10T01:38:15+00:00 Protesilaos Stavrou 2021-02-09T04:49:05+00:00 ff16c897eadab9bebc58bd0ca0fb5c8e1c237a15 * lisp/vc/vc-dir.el (vc-default-dir-printer): Add check for the "ignored" status and make 'vc-dir-status-edited' the default face. Also extend condition for more states that qualify as "warnings". (vc-dir-ignored, vc-dir-status-ignored): Rename face for consistency. * lisp/vc/vc-git.el (vc-git-dir-printer): Use the 'vc-dir-status-edited' as the default for the Git backend. And reference the renamed face. Also stop treating the empty stash differently from other header values. * lisp/vc/vc-bzr.el (vc-bzr-dir-extra-headers): Implement new faces. * lisp/vc/vc-cvs.el (vc-cvs-dir-extra-headers): Same. * lisp/vc/vc-hg.el (vc-hg-dir-extra-headers): Same. * lisp/vc/vc-svn.el (vc-svn-dir-extra-headers): Same. This follows from the discussion in bug#46358. 
* lisp/vc/vc-dir.el (vc-default-dir-printer): Add check for the
"ignored" status and make 'vc-dir-status-edited' the default face.
Also extend condition for more states that qualify as "warnings".

(vc-dir-ignored, vc-dir-status-ignored): Rename face for consistency.

* lisp/vc/vc-git.el (vc-git-dir-printer): Use the
'vc-dir-status-edited' as the default for the Git backend.  And
reference the renamed face.  Also stop treating the empty stash
differently from other header values.

* lisp/vc/vc-bzr.el (vc-bzr-dir-extra-headers): Implement new faces.
* lisp/vc/vc-cvs.el (vc-cvs-dir-extra-headers): Same.
* lisp/vc/vc-hg.el (vc-hg-dir-extra-headers): Same.
* lisp/vc/vc-svn.el (vc-svn-dir-extra-headers): Same.

This follows from the discussion in bug#46358.
Add vc-dir faces; also apply them to vc-git 2021-02-08T06:54:54+00:00 Protesilaos Stavrou 2021-02-08T06:54:54+00:00 9fdc753e1450d1b2eb610ef4fc55460d63688799 * etc/NEWS: Document the new faces. * lisp/vc/vc-dir.el (vc-dir-header, vc-dir-header-value) (vc-dir-directory, vc-dir-file, vc-dir-mark-indicator) (vc-dir-status-warning, vc-dir-status-edited, vc-dir-status-up-to-date) (vc-dir-ignored): Add new faces. * lisp/vc/vc-git.el (vc-git-permissions-as-string, vc-git-dir-printer) (vc-git-dir-extra-headers): Apply new faces (bug#46358). 
* etc/NEWS: Document the new faces.

* lisp/vc/vc-dir.el (vc-dir-header, vc-dir-header-value)
(vc-dir-directory, vc-dir-file, vc-dir-mark-indicator)
(vc-dir-status-warning, vc-dir-status-edited, vc-dir-status-up-to-date)
(vc-dir-ignored): Add new faces.

* lisp/vc/vc-git.el (vc-git-permissions-as-string, vc-git-dir-printer)
(vc-git-dir-extra-headers): Apply new faces (bug#46358).
Prefer setq-local in a few more places 2021-02-07T23:25:16+00:00 Stefan Kangas 2021-02-07T23:25:16+00:00 7d4d577ed14fb2519ea2eaecb11c8ecff658f147 * lisp/calc/calc-embed.el (calc-embedded-make-info): * lisp/calc/calcalg2.el (calcFunc-integ): * lisp/comint.el (comint-mode): * lisp/epa.el (epa--list-keys, epa--show-key): * lisp/epg.el (epg--start): * lisp/vc/ediff-util.el (ediff-activate-mark): Prefer setq-local. 
* lisp/calc/calc-embed.el (calc-embedded-make-info):
* lisp/calc/calcalg2.el (calcFunc-integ):
* lisp/comint.el (comint-mode):
* lisp/epa.el (epa--list-keys, epa--show-key):
* lisp/epg.el (epg--start):
* lisp/vc/ediff-util.el (ediff-activate-mark): Prefer setq-local.
Assume font-lock-mode variable is not void 2021-02-05T00:15:02+00:00 Stefan Kangas 2021-02-05T00:14:17+00:00 bbe88cd82e4bbfd76df06223614ab74d1022c119 * lisp/align.el (align-rules-list): * lisp/cedet/semantic/idle.el (semantic-idle-summary-useful-context-p): * lisp/org/org-table.el (org-table-edit-field): * lisp/org/org.el (org-restart-font-lock): * lisp/progmodes/antlr-mode.el (antlr-language-option-extra): * lisp/progmodes/idlwave.el (idlwave-choose): * lisp/progmodes/sql.el (sql-product-font-lock): * lisp/progmodes/verilog-mode.el (verilog-save-font-no-change-functions, verilog-preprocess): * lisp/vc/cvs-status.el: * lisp/vc/smerge-mode.el (smerge-mode): * lisp/woman.el (woman-decode-buffer): Assume font-lock-mode variable is not void; it is preloaded. 
* lisp/align.el (align-rules-list):
* lisp/cedet/semantic/idle.el
(semantic-idle-summary-useful-context-p):
* lisp/org/org-table.el (org-table-edit-field):
* lisp/org/org.el (org-restart-font-lock):
* lisp/progmodes/antlr-mode.el (antlr-language-option-extra):
* lisp/progmodes/idlwave.el (idlwave-choose):
* lisp/progmodes/sql.el (sql-product-font-lock):
* lisp/progmodes/verilog-mode.el
(verilog-save-font-no-change-functions, verilog-preprocess):
* lisp/vc/cvs-status.el:
* lisp/vc/smerge-mode.el (smerge-mode):
* lisp/woman.el (woman-decode-buffer): Assume font-lock-mode variable
is not void; it is preloaded.
Don't set removed variable facemenu-unlisted-faces 2021-02-04T07:16:33+00:00 Stefan Kangas 2021-02-04T07:16:33+00:00 e4cafc5430615cf282038e26650719654834418c * lisp/vc/ediff-init.el (ediff-hide-face): Redefine as obsolete function alias for 'ignore'; the variable 'facemenu-unlisted-faces' was removed in Emacs 22. Remove all calls. * lisp/mh-e/mh-e.el: Add comment saying that the variable 'facemenu-unlisted-faces' is removed. 
* lisp/vc/ediff-init.el (ediff-hide-face): Redefine as obsolete
function alias for 'ignore'; the variable 'facemenu-unlisted-faces'
was removed in Emacs 22.  Remove all calls.

* lisp/mh-e/mh-e.el: Add comment saying that the variable
'facemenu-unlisted-faces' is removed.
Prefer defvar-local in vc/*.el 2021-01-31T19:08:25+00:00 Stefan Kangas 2021-01-31T15:27:26+00:00 a5885d9d633f0a0e2e23d5d9f48d6b70a6301442 * lisp/vc/ediff-diff.el (ediff-whitespace, ediff-word-1) (ediff-word-2, ediff-word-3, ediff-word-4): * lisp/vc/ediff-init.el (ediff-defvar-local): * lisp/vc/smerge-mode.el (smerge-check-cache): * lisp/vc/vc-bzr.el (vc-bzr-annotation-table): * lisp/vc/vc-dispatcher.el (vc-mode-line-hook): Prefer defvar-local. 
* lisp/vc/ediff-diff.el (ediff-whitespace, ediff-word-1)
(ediff-word-2, ediff-word-3, ediff-word-4):
* lisp/vc/ediff-init.el (ediff-defvar-local):
* lisp/vc/smerge-mode.el (smerge-check-cache):
* lisp/vc/vc-bzr.el (vc-bzr-annotation-table):
* lisp/vc/vc-dispatcher.el (vc-mode-line-hook): Prefer defvar-local.
Recompute mode-lines when marking conflicts resolved 2021-01-31T01:09:19+00:00 Dmitry Gutov 2021-01-31T01:08:38+00:00 0f2d87716a2cb6fae5ea6719763441c448fe7a74 * lisp/vc/vc.el (vc-mark-resolved): Recompute the mode lines of the affected files. 
* lisp/vc/vc.el (vc-mark-resolved):
Recompute the mode lines of the affected files.
Also highlight 'conflict' with the warning face 2021-01-30T13:42:19+00:00 Dmitry Gutov 2021-01-30T13:42:19+00:00 96f20120c97a0a329fff81a0cc3747082a8a2c55 * lisp/vc/vc-git.el (vc-git-dir-printer): Also highlight 'conflict' with the warning face, like vc-default-dir-printer does already. 
* lisp/vc/vc-git.el (vc-git-dir-printer):
Also highlight 'conflict' with the warning face, like
vc-default-dir-printer does already.
Fix vc-hg-rename-file on file names like ~/foo/bar 2021-01-30T07:59:48+00:00 Lars Ingebrigtsen 2021-01-30T07:59:48+00:00 32dc433dbb83a5c38650769dc064c082bf79ee8c * lisp/vc/vc-hg.el (vc-hg-rename-file): Use absolute file names, because hg doesn't like getting file names like "~/foo/bar" (bug#36932). 
* lisp/vc/vc-hg.el (vc-hg-rename-file): Use absolute file names,
because hg doesn't like getting file names like "~/foo/bar"
(bug#36932).