1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
emacs/lisp/vc
Stefan Monnier 184d74ce00 * lisp/vc/smerge-mode.el (smerge-refine-regions): Work in multi-bufs
Rename from smerge-refine-subst.  Allow the `beg's to be markers.
Add autoload cookie.
(smerge--refine-forward): Rename from smerge-refine-forward.
(smerge--refine-chopup-region): Rename from smerge-refine-chopup-region.
Assume that its `beg` arg is a marker.
(smerge--refine-highlight-change): Rename from
smerge-refine-highlight-change.  Remove `buf` arg.
(smerge-refine-subst): Redefine as an obsolete alias.
2017-05-17 15:44:36 -04:00
..
add-log.el Replace change-log-date-face -> change-log-date 2017-03-08 13:32:21 -05:00
compare-w.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
cvs-status.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
diff-mode.el epatch: Save right backups in Git multipatches 2017-03-21 17:25:55 +09:00
diff.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
ediff-diff.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff-help.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff-hook.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
ediff-init.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff-merg.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff-mult.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff-ptch.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff-util.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff-vers.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
ediff-wind.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
ediff.el ediff: use user-error rather than debug-ignored-errors 2017-04-17 20:16:15 -04:00
emerge.el ; Replace "25.2" with "26.1" where appropriate, which is almost everywhere 2016-11-17 22:50:40 -08:00
log-edit.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
log-view.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
pcvs-defs.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
pcvs-info.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
pcvs-parse.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
pcvs-util.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
pcvs.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
smerge-mode.el * lisp/vc/smerge-mode.el (smerge-refine-regions): Work in multi-bufs 2017-05-17 15:44:36 -04:00
vc-annotate.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-bzr.el Replace change-log-date-face -> change-log-date 2017-03-08 13:32:21 -05:00
vc-cvs.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-dav.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-dir.el Add more branch support to vc-dir 2017-02-25 10:46:13 -07:00
vc-dispatcher.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-filewise.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-git.el vc-git-state: Return `ignored' as appropriate with newer Git 2017-05-01 19:54:34 +03:00
vc-hg.el Require cl-lib at runtime in vc-hg 2017-05-04 15:46:51 +03:00
vc-hooks.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-mtn.el Replace change-log-date-face -> change-log-date 2017-03-08 13:32:21 -05:00
vc-rcs.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-sccs.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-src.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-svn.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc.el Add more branch support to vc-dir 2017-02-25 10:46:13 -07:00