emacs/lisp/vc, branch scratch/api.el

Bind [?\S-\ ] to previous line command in Dired-like modes.

2015-11-12T20:54:01+00:00

* lisp/arc-mode.el (archive-mode-map):
* lisp/dired.el (dired-mode-map):
* lisp/proced.el (proced-mode-map):
* lisp/vc/vc-dir.el (vc-dir-mode-map):
Bind [?\S-\ ] to previous line command.
(Bug#20790)

Spelling fixes

2015-11-10T18:23:00+00:00

* lisp/net/soap-inspect.el (soap-inspect-xs-simple-type):
Fix misspelling in output.

Merge branch 'project-next'

2015-11-10T00:47:46+00:00

When VC detects a conflict, specify which file

2015-11-09T21:57:29+00:00

* lisp/vc/vc.el (vc-message-unresolved-conflicts): New function.
* lisp/vc/vc-svn.el (vc-svn-find-file-hook):
* lisp/vc/vc-hg.el (vc-hg-find-file-hook):
* lisp/vc/vc-bzr.el (vc-bzr-find-file-hook):
* lisp/vc/vc-git.el (vc-git-find-file-hook): Use above new function
  to display a standard message that specifies the conflicted file.

Before this change, the message VC used for indicating a conflicted
file was just "There are unresolved conflicts in this file" without
naming the file (and this language was duplicated in several places).
After this change, it's "There are unresolved conflicts in file FOO"
(and this language is now centralized in one function in vc.el).

Justification: It's important for the message to name the conflicted
file because the moment when VC realizes a file is conflicted does not
always come interactively.  For example, some people automatically
find a set of Org Mode files on startup, and may keep those .org files
under version control.  If any of the files are conflicted, the user
just sees some messages fly by, and might later check the "*Messages*"
buffer to find out what files were conflicted.  I'm not saying this
happened to me or anything; it's a purely hypothetical example.

Make sure that the ignore file exists

2015-11-09T02:32:36+00:00

* lisp/vc/vc.el (vc-default-ignore-completion-table):
Make sure that the ignore file exists.

* lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.

2015-10-28T18:00:24+00:00

; Revert "Don't declare vc-exec-after anymore"

2015-10-28T00:43:14+00:00

This reverts commit 5e4395544c184d9a8702cf05c7aee9329b0b9482.

(http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02009.html)

Pipe Hg commit descriptions through 'tabindent'

2015-10-28T00:42:51+00:00

* lisp/vc/vc-hg.el (vc-hg-log-format): Pipe commit description
through 'tabindent'.
(vc-hg-log-view-mode): Set tab-width to 2 locally.
(http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02259.html)

Show full commit messages in 'hg log' when appropriate

2015-10-27T12:55:06+00:00

* lisp/vc/vc-hg.el (vc-hg-log-format): New variable.
(vc-hg-print-log, vc-hg-expanded-log-entry): Use it.
(http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02191.html)

Call vc-dir-defresh after stash operations

2015-10-20T19:07:20+00:00

* lisp/vc/vc-git.el (vc-git-stash-apply-at-point)
(vc-git-stash-pop-at-point): Call vc-dir-defresh (bug#13960).

* lisp/vc/vc-dir.el (vc-dir-resynch-file): Expand FNAME as well,
since it can be abbreviated (as returned by vc-find-root).