mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-21 10:24:55 +00:00
Code Issues Releases Activity
117,562 Commits 225 Branches 190 Tags 531 MiB
cebc89eea1
Commit Graph

481 Commits

Author SHA1 Message Date
Glenn Morris
79a90058ec Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org 2014-10-03 08:44:46 -07:00
Dmitry Gutov
c799337f12 Fix vc-svn-ignore 
* lisp/vc/vc-svn.el (vc-svn-ignore-completion-table): Implement.
(vc-svn-ignore): Use it.

Fixes: debbugs:18619
 2014-10-03 17:15:05 +04:00
Stefan Monnier
f0db348816 * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp, 
similarly to Roger's 2010-06-12 change for the remote change.

Fixes: debbugs:18605
 2014-10-02 20:42:28 -04:00
Stefan Monnier
cbdc06f3be Rename 24.5 to 25.1 
Except where we expect to backport the corresponding change.
 2014-09-29 14:14:08 -04:00
Juri Linkov
b8e352d077 * lisp/vc/add-log.el (change-log-next-buffer): Don't create an empty 
buffer "ChangeLog" when the current buffer doesn't match ChangeLog.[0-9].
Return the current buffer if no files match the default pattern
ChangeLog.[0-9].  Signal "end of multi" when file is nil.

Fixes: debbugs:18547
 2014-09-25 23:55:58 +03:00
Glenn Morris
c04714f7c8 Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert@cs.ucla.edu 2014-09-07 23:00:58 -07:00
Stefan Monnier
6ac5571c62 * lisp/vc/vc-dir.el (vc-dir-update): Don't burp in corner case. 2014-09-05 13:37:12 -04:00
Rasmus Pank Roulund
baee695a8b * lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status 
returns nil.

Fixes: debbugs:18391
 2014-09-04 12:34:45 -04:00
Glenn Morris
f330aa150e * vc-git.el: Comments. 2014-08-25 12:48:08 -04:00
Andreas Schwab
52e7a5b99f Handle missing space marker in unified diff during header fixup 
* vc/diff-mode.el (diff-fixup-modifs): Handle empty line in
context of unified diff.
 2014-08-16 21:51:27 +02:00
Eric S. Raymond
b5354531ba Add smerge support to the git back end. 2014-08-13 04:42:33 -04:00
Eric S. Raymond
2cc441ecbf Integrate Rüdiger Sonderfeld's code for detecting conflicted files under git. 2014-08-13 04:05:45 -04:00
Juri Linkov
e024465e2d * lisp/vc/vc-annotate.el (vc-annotate-background-mode): Use `with-demoted-errors' 
instead of `ignore-errors'.

Fixes: debbugs:18189
 2014-08-12 09:51:21 +03:00
Juri Linkov
aa4008091c * lisp/vc/vc-annotate.el (vc-annotate-background-mode): Add :set 
to reevaluate `vc-annotate-color-map'.

Fixes: debbugs:18189
 2014-08-10 02:55:39 +03:00
Glenn Morris
da41ffdd08 Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm@gnu.org 2014-07-28 05:39:09 -04:00
Glenn Morris
c509a535a8 vc-hooks.el: Fix doc typo in previous 2014-07-25 06:05:10 -04:00
Glenn Morris
b61f5e45ec ediff: Replace obsolete toggle-read-only with read-only-mode 
* lisp/vc/ediff-init.el (ediff-toggle-read-only-function):
* lisp/vc/ediff-util.el (ediff-toggle-read-only):
Replace obsolete toggle-read-only with read-only-mode.
 2014-07-25 05:37:07 -04:00
Glenn Morris
59bb37859d More toggle-read-only doc tweaks 
* lisp/files.el (toggle-read-only): Re-add basic doc-string.

* lisp/vc/vc-hooks.el (vc-toggle-read-only): Tweak obsolescence mesage.
 2014-07-25 05:24:53 -04:00
Stefan Monnier
3241dc268e * lisp/vc/vc-bzr.el (vc-bzr-shelve): Make it operate on fileset. 2014-07-20 21:25:59 -04:00
Glenn Morris
02a7e500e8 Merge from emacs-24; up to 2014-06-23T06:25:47Z!rgm@gnu.org 2014-07-16 13:06:12 -04:00
Glenn Morris
be8b1ebb5c Tweak earlier vc-log-edit change 
* lisp/vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer
if it was "empty", or used for a different set of files.

Fixes: debbugs:17884
 2014-07-14 15:29:29 -04:00
Glenn Morris
b39c4d7b33 Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru 2014-07-12 10:53:29 -07:00
Paul Eggert
114ce4b879 Fix bug: C-x v v discarded existing log message. 
* lisp/vc/vc-dispatcher.el (vc-log-edit):
Don't clobber an already-existing log message.

Fixes: debbugs:17884
 2014-07-11 19:24:02 -07:00
Glenn Morris
46b7604ea4 Tweak previous log-edit-changelog-entries change 
* lisp/vc/log-edit.el (log-edit-changelog-entries):
Check for a visited-but-never-saved ChangeLog.
 2014-07-10 14:09:04 -04:00
Stefan Monnier
5d71cc6bfd * lisp/vc/log-edit.el (log-edit-changelog-entries): Don't both visiting 
a non-existing file.

Fixes: debbugs:17970
 2014-07-09 14:54:06 -04:00
Juri Linkov
b89e78fd90 * lisp/vc/vc-annotate.el (vc-annotate-background-mode): New defcustom. 
(vc-annotate-color-map): Use less saturated colors (20%) for
background-mode.
(vc-annotate-very-old-color): Add default value for background-mode.
(vc-annotate-background): Set default value to nil since now text on
the default backgrounds should be legible in light and dark modes.
(vc-annotate-lines): Use `vc-annotate-background-mode'.  Doc fix.

Fixes: debbugs:17808
 2014-07-08 11:49:18 +03:00
Glenn Morris
2d3c9015c7 Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org 2014-07-02 23:00:53 -07:00
Stefan Monnier
3737a8efcf * lisp/vc/log-edit.el (log-edit-goto-eoh): New function. 
(log-edit--match-first-line): Use it.

Fixes: debbugs:17861
 2014-07-01 11:15:03 -04:00
Glenn Morris
3f4d0f042a * lisp/vc/log-edit.el (log-edit-hook): Add missing :version. 2014-07-01 00:00:46 -07:00
Andreas Schwab
becc9e3c3f * vc/vc-git.el (vc-git-checkin): When operating on the whole tree 
pass "-a".
 2014-06-29 22:48:55 +02:00
Glenn Morris
a27e8c78c0 Doc and comment fixes re "online" help 
* doc/emacs/help.texi (Misc Help):
* doc/emacs/trouble.texi (Checklist):
* doc/lispintro/emacs-lisp-intro.texi (Note for Novices, Finding More)
(Conclusion):
* doc/lispref/help.texi (Help Functions):
* doc/misc/info.texi, doc/misc/mh-e.texi:
* etc/refcards/calccard.tex (section{Getting Help}):
* lisp/cus-edit.el (help):
* lisp/finder.el (finder-known-keywords):
* lisp/help.el (help-for-help-internal):
* lisp/vc/ediff-mult.el (ediff-meta-buffer-verbose-message)
(ediff-redraw-registry-buffer):
* lisp/vc/ediff-ptch.el (ediff-patch-file-internal):
Doc fixes re "online" help.

Fixes: debbugs:17803
 2014-06-28 19:33:50 -07:00
Juri Linkov
382ceb2cdb * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor) 
(ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B)
(ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
(ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
Add `min-colors 88' version with removed black/white foregrounds.

Fixes: debbugs:10181
 2014-06-18 11:54:11 +03:00
Juri Linkov
1a63945352 * lisp/vc/diff-mode.el (diff-changed): Empty face definition 
to use `diff-removed' and `diff-added' on tty as well. 
(diff-context): Use darker color on light background and
lighter color on dark background.

Fixes: debbugs:10181
 2014-06-18 11:48:49 +03:00
Juri Linkov
7c6fc37fa9 * lisp/vc/diff-mode.el (diff-refine-changed): Rename from 
`diff-refine-change' for consistency with `diff-changed'.
(diff-refine-change): Add obsolete face alias. 

* lisp/vc/smerge-mode.el (smerge-refined-changed): Rename from
`smerge-refined-change'.
(smerge-refined-change): Add obsolete face alias.

Fixes: debbugs:10181
 2014-06-18 11:33:57 +03:00
Glenn Morris
36cf8493af Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu 2014-06-07 17:35:27 -07:00
Santiago Payà i Miralta
3112e4002c * lisp/vc/vc-hg.el (vc-hg-create-tag, vc-hg-retrieve-tag): New functions. 
Fixes: debbugs:17586
 2014-06-06 12:38:44 -04:00
Santiago Payà i Miralta
f4be80b783 * lisp/vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and 
vc-hg-command.

Fixes: debbugs:17570
 2014-06-06 12:29:55 -04:00
Santiago Payà i Miralta
90b15d9159 * lisp/vc/vc-hg.el (vc-hg-log-graph): New var. 
(vc-hg-print-log): Use it.
(vc-hg-root-log-format): Include branch name and bookmarks; ignore
graph output.

Fixes: debbugs:17515
 2014-06-06 12:11:53 -04:00
Glenn Morris
015936fba1 Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org 2014-05-25 19:28:09 -07:00
Glenn Morris
293fbc914a * lisp/vc/vc-rcs.el: Comment. 2014-05-20 08:46:21 -07:00
Glenn Morris
abad7b05fa * lisp/vc/emerge.el (emerge-make-temp-file): Simplify. 2014-05-14 10:05:16 -07:00
Glenn Morris
f4da4720df Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se 2014-05-14 10:01:29 -07:00
Glenn Morris
a5d09243e7 Make some pointless/useless emerge.el options obsolete 
* vc/emerge.el (emerge-temp-file-prefix): Make pointless option obsolete.
(emerge-temp-file-mode): Make non-functional option obsolete.
 2014-05-13 23:59:12 -07:00
Glenn Morris
bbbabffe06 Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org 2014-05-11 23:59:30 -07:00
Santiago Payà i Miralta
0add095990 * lisp/vc/vc-hg.el (vc-hg-unregister): New function (tiny change) 
Fixes: debbugs:17454
 2014-05-10 19:01:08 -07:00
Paul Eggert
3e9fa60a5c Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu 2014-05-04 12:37:56 -07:00
Stefan Monnier
e6cf6ca050 * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): 
Use nil rather than `default' for the "default" appearance.
* lisp/vc/ediff-util.el (ediff-inferior-compare-regions)
(ediff-toggle-autorefine, ediff-unselect-difference): Don't use
a misleading `default' value when it's really a boolean.
* lisp/vc/ediff-init.el (ediff-set-overlay-face): Don't set help-echo if the
overlay is not visible.

Fixes: debbugs:17388
 2014-05-02 22:27:46 -04:00
Daniel Colascione
e8a77f2423 Provide function for asking vc about project root 2014-04-20 16:24:04 -07:00
Paul Eggert
290d7ac277 Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca 2014-04-16 12:43:46 -07:00
YAMAMOTO Mitsuharu
a73b9ddac8 Fix application of dolist to a vector (Bug#17257). 
* vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
Use mapc to loop over a vector.
 2014-04-14 11:21:12 +09:00