emacs/lisp/vc, branch scratch/bytecode-speedup Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from origin/emacs-28 2022-01-01T12:03:03+00:00 Eli Zaretskii 2022-01-01T12:03:03+00:00 dcd76bd48df678d8234b904d7b13c997228519a3 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4 
836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
#	lib/cdefs.h
#	lisp/erc/erc-dcc.el
#	lisp/erc/erc-imenu.el
#	lisp/erc/erc-replace.el
#	lisp/image-dired.el
#	lisp/progmodes/xref.el
#	m4/alloca.m4
#	m4/byteswap.m4
#	m4/errno_h.m4
#	m4/getopt.m4
#	m4/gnulib-common.m4
#	m4/inttypes.m4
#	m4/stddef_h.m4
#	m4/stdint.m4
#	m4/sys_socket_h.m4
; Add 2022 to copyright years. 2022-01-01T07:45:51+00:00 Eli Zaretskii 2022-01-01T07:45:51+00:00 19dcb237b5b02b36580294ab309124f346a66024 






Revert "Revert "Fix fontification in diff--font-lock-prettify""
2021-12-29T17:00:52+00:00

Tassilo Horn

2021-12-29T17:00:52+00:00

7715fb3eff59102487e37fba5fc0d421dc8b9a51

This reverts commit 3cadd72673d8095df7eeb8e847db87ae42b5e2f6.





This reverts commit 3cadd72673d8095df7eeb8e847db87ae42b5e2f6.







Revert "Fix fontification in diff--font-lock-prettify"
2021-12-29T17:00:30+00:00

Tassilo Horn

2021-12-29T17:00:30+00:00

3cadd72673d8095df7eeb8e847db87ae42b5e2f6

This reverts commit 1da392d62d1ae743151f7fda83d0725ec6053686.





This reverts commit 1da392d62d1ae743151f7fda83d0725ec6053686.







Fix fontification in diff--font-lock-prettify
2021-12-29T16:25:35+00:00

Matthias Meulien

2021-12-29T16:25:35+00:00

1da392d62d1ae743151f7fda83d0725ec6053686

* lisp/vc/diff-mode.el (diff--font-lock-prettify): Fix
diff--font-lock-prettify on created or deleted files
(bug#52810).





* lisp/vc/diff-mode.el (diff--font-lock-prettify): Fix
diff--font-lock-prettify on created or deleted files
(bug#52810).







* lisp/vc/vc.el (vc-revert): Use generate-new-buffer, not just new buffer name
2021-12-28T08:46:40+00:00

Juri Linkov

2021-12-28T08:45:27+00:00

a17a11df04fcc5e48330e92d6f33f0a40655e5af












Make some variable aliases obsolete
2021-12-20T21:16:24+00:00

Stefan Kangas

2021-12-20T21:12:25+00:00

c167009400f62149a6ab1568ababcfa6ce422467

* lisp/progmodes/make-mode.el (makefile-query-one-target-method):
* lisp/skeleton.el (skeleton-transformation, skeleton-filter):
* lisp/textmodes/artist.el (artist-text-renderer):
* lisp/textmodes/bibtex.el (bibtex-autokey-name-case-convert):
(bibtex-autokey-titleword-case-convert):
* lisp/textmodes/ispell.el (ispell-format-word):
* lisp/textmodes/sgml-mode.el (sgml-transformation):
* lisp/vc/add-log.el (change-log-time-zone-rule): Make variable
aliases obsolete.





* lisp/progmodes/make-mode.el (makefile-query-one-target-method):
* lisp/skeleton.el (skeleton-transformation, skeleton-filter):
* lisp/textmodes/artist.el (artist-text-renderer):
* lisp/textmodes/bibtex.el (bibtex-autokey-name-case-convert):
(bibtex-autokey-titleword-case-convert):
* lisp/textmodes/ispell.el (ispell-format-word):
* lisp/textmodes/sgml-mode.el (sgml-transformation):
* lisp/vc/add-log.el (change-log-time-zone-rule): Make variable
aliases obsolete.







; * lisp/vc/vc-dispatcher.el (vc-command-messages): Doc fix.
2021-12-16T20:01:06+00:00

Eli Zaretskii

2021-12-16T20:01:06+00:00

469fe6a040d6df612c00ea169670c6d8d7e58563












* lisp/vc/vc-dispatcher.el (vc-command-messages): Add choice 'log'.
2021-12-16T19:16:50+00:00

Juri Linkov

2021-12-16T19:16:50+00:00

e726a00381e0f2d8dbfa52a10c82116a8352adf0

(vc-do-command): Don't display messages but only write them to the *Messages*
buffer when vc-command-messages is 'log' (bug#52518).





(vc-do-command): Don't display messages but only write them to the *Messages*
buffer when vc-command-messages is 'log' (bug#52518).







Merge from origin/emacs-28
2021-12-16T05:31:48+00:00

Stefan Kangas

2021-12-16T05:31:48+00:00

e7a6d6a546e7e56e5a721aac86a19473e4303111

1e578267fb Fix control buffer window height in 'ediff-setup-control-b...





1e578267fb Fix control buffer window height in 'ediff-setup-control-b...