martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
dae3c4e89b27fa008d029a30cf7bd02fc3fbb6e2
emacs/lisp/vc
History
Stefan Kangas 3e23494394 Merge from origin/emacs-28 
2963de6540 * lisp/vc/vc-git.el (vc-git-mergebase): More meaningful er...
a9148cdee5 ; Fix heading in etc/NEWS
9623342216 ; * etc/NEWS: Move a bookmark related item further down.

# Conflicts:
#	etc/NEWS
2021-11-11 07:17:56 +01:00
..
add-log.el
…
compare-w.el
…
cvs-status.el
Error out on invalid `define-keymap' keywords
2021-10-19 04:50:59 +02:00
diff-mode.el
* lisp/vc/diff-mode.el (diff-setup-buffer-type): Move to diff-setup-whitespace
2021-11-09 10:18:24 +02:00
diff.el
Use format-prompt for many more prompts
2021-10-05 03:44:56 +02:00
ediff-diff.el
…
ediff-help.el
…
ediff-hook.el
…
ediff-init.el
…
ediff-merg.el
…
ediff-mult.el
; Minor stylistic fixes found by checkdoc
2021-10-05 02:06:57 +02:00
ediff-ptch.el
Use format-prompt for many more prompts
2021-10-05 03:44:56 +02:00
ediff-util.el
Merge from origin/emacs-28
2021-10-05 07:50:22 -07:00
ediff-vers.el
…
ediff-wind.el
…
ediff.el
; Fix typos in CONTRIBUTE, ELisp manual, ediff
2021-11-10 01:17:42 +01:00
emerge.el
…
log-edit.el
Convert two easy-mmode-defmap' usages to defvar-keymap'
2021-10-15 14:19:41 +02:00
log-view.el
Use `define-keymap' in log-view.el
2021-10-14 20:11:51 +02:00
pcvs-defs.el
Use define-keymap in pcvs and pcvs-defs.el
2021-10-18 01:27:27 +02:00
pcvs-info.el
…
pcvs-parse.el
…
pcvs-util.el
…
pcvs.el
Fix possible build issue in pcvs.el and diff-mode.el
2021-10-18 09:22:22 +02:00
smerge-mode.el
Fix typo in previous smerge-mode-map change
2021-10-20 11:49:22 +02:00
vc-annotate.el
; Fix some recent fixes to doc strings
2021-09-26 16:50:11 +03:00
vc-bzr.el
…
vc-cvs.el
…
vc-dav.el
…
vc-dir.el
; Fix some recent fixes to doc strings
2021-09-26 16:50:11 +03:00
vc-dispatcher.el
…
vc-filewise.el
…
vc-git.el
* lisp/vc/vc-git.el (vc-git-mergebase): More meaningful error message.
2021-11-10 20:41:19 +02:00
vc-hg.el
Make 'inhibit-changing-match-data' obsolete and adjust callers
2021-10-07 20:46:50 +02:00
vc-hooks.el
Suppress a compilation warning about vc-switch-backend
2021-11-08 00:26:32 +01:00
vc-mtn.el
…
vc-rcs.el
…
vc-sccs.el
…
vc-src.el
…
vc-svn.el
…
vc.el
* lisp/vc/diff-mode.el (diff-setup-buffer-type): Move to diff-setup-whitespace
2021-11-09 10:18:24 +02:00