1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 04:10:27 -08:00
emacs/lisp/vc
Ivan Shmakov 3942821425 Check labels in smerge-mode
* lisp/vc/diff.el (diff-check-labels): Separated out into its own
function (bug#18850)...
(diff-no-select): ... from here.

* lisp/vc/smerge-mode.el (smerge-diff): Use diff-check-labels.
2019-06-25 23:23:01 +02:00
..
add-log.el Go back to "Maintainer: emacs-devel@gnu.org" 2019-05-25 14:25:18 -07:00
compare-w.el Go back to "Maintainer: emacs-devel@gnu.org" 2019-05-25 14:25:18 -07:00
cvs-status.el Merge from origin/emacs-26 2018-12-31 17:57:29 -08:00
diff-mode.el Fix diff-mode face problem when used in terminals (Bug#35695) 2019-05-15 21:00:49 +02:00
diff.el Check labels in smerge-mode 2019-06-25 23:23:01 +02:00
ediff-diff.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-help.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-hook.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-init.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-merg.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-mult.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-ptch.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-util.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-vers.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff-wind.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
ediff.el * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanup 2019-06-21 01:16:54 -04:00
emerge.el
log-edit.el Support amending the last commit using VC-Hg 2019-04-21 00:39:36 +03:00
log-view.el ; Revert "Publicize behavior of log-view-diff at beginning/end of active region" 2019-06-10 03:58:53 +03:00
pcvs-defs.el Update copyright year to 2019 2019-01-01 01:01:13 +00:00
pcvs-info.el Merge from origin/emacs-26 2018-12-31 17:57:29 -08:00
pcvs-parse.el Merge from origin/emacs-26 2018-12-31 17:57:29 -08:00
pcvs-util.el * lisp/emacs-lisp/bytecomp.el (byte-compile-dynamic): Mark obsolete 2019-06-21 10:30:50 -04:00
pcvs.el Merge from origin/emacs-26 2018-12-31 17:57:29 -08:00
smerge-mode.el Check labels in smerge-mode 2019-06-25 23:23:01 +02:00
vc-annotate.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-bzr.el Go back to "Maintainer: emacs-devel@gnu.org" 2019-05-25 14:25:18 -07:00
vc-cvs.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-dav.el Remove Maintainer: when it duplicates Author: 2019-05-26 01:00:15 -07:00
vc-dir.el * lisp/vc/vc-dir.el (vc-dir-search): Avoid eval. 2019-06-20 17:45:52 -04:00
vc-dispatcher.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-filewise.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-git.el Add imenu support to package-menu-mode 2019-06-25 13:10:07 +02:00
vc-hg.el Go back to "Maintainer: emacs-devel@gnu.org" 2019-05-25 14:25:18 -07:00
vc-hooks.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-mtn.el Add standard unmatchable regexp 2019-05-15 18:55:27 +02:00
vc-rcs.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-sccs.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-src.el Update author/maintainer info 2019-05-26 01:00:16 -07:00
vc-svn.el Improve regexp advice again, and unchain ranges 2019-04-02 15:01:34 -07:00
vc.el Update author/maintainer info 2019-05-26 01:00:16 -07:00