1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 12:40:49 -08:00
emacs/lisp/vc
Glenn Morris a0c7157a16 Merge from origin/emacs-26
c787a49 (origin/emacs-26) * lisp/vc/vc-git.el (vc-git-print-log): Res...
b654791 * doc/emacs/misc.texi (Interactive Shell): Refer to node "Min...
f1102d2 Yet another round of fixing the Emacs manual
76b5a68 * etc/NEWS: Expunge the solecism "allow(s)" + infinitive
b4ff8cc Two minor fixes in Antinews
aafcd12 * etc/NEWS: Rename image-dired-thumb-job-limit
a893924 * lisp/simple.el (async-shell-command, shell-command): Fix gr...
699081f Fix deferred display of async shell-command buffers
d2d5e54 Mention remote file name completion in Emacs manual
f589f5a Yest another round of manual copyedits
1ed4089 Update xdisp.c commentary
e23de39 Fix Bug#30324
e1a9dc0 Recognize Org as builtin package (bug#30310)

Conflicts:
	etc/NEWS
2018-02-05 07:50:22 -08:00
..
add-log.el * lisp/vc/add-log.el (change-log-next-buffer): Check file for nil. 2018-01-21 23:48:32 +02:00
compare-w.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
cvs-status.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
diff-mode.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
diff.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-diff.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-help.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-hook.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-init.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-merg.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-mult.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-ptch.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-util.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-vers.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
ediff-wind.el Merge from origin/emacs-26 2018-01-01 01:13:04 -08:00
ediff.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
emerge.el Fixes for defcustoms, prompted by cus-test-opts 2017-12-13 15:29:24 -05:00
log-edit.el Merge from origin/emacs-26 2018-01-01 01:13:04 -08:00
log-view.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
pcvs-defs.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
pcvs-info.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
pcvs-parse.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
pcvs-util.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
pcvs.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
smerge-mode.el Remove some more face aliases obsolete since 22.1 2018-01-10 15:47:33 -05:00
vc-annotate.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-bzr.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-cvs.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-dav.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-dir.el Merge from origin/emacs-26 2018-01-01 01:13:04 -08:00
vc-dispatcher.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-filewise.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-git.el Merge from origin/emacs-26 2018-02-05 07:50:22 -08:00
vc-hg.el * lisp/vc/vc-hg.el, lisp/vc/vc-git.el: Flush the 'vc-functions' cache. 2018-01-18 20:11:34 -05:00
vc-hooks.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-mtn.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-rcs.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-sccs.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-src.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc-svn.el Update copyright year to 2018 2018-01-01 00:57:59 -08:00
vc.el Merge from origin/emacs-26 2018-01-18 17:17:05 -08:00