diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-07-31 14:27:28 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-07-31 14:27:28 +0200 |
| commit | 118033294136a8fb3a14347ce190b447dd2ff2fe (patch) | |
| tree | 3d036aa53a16c1283883b0955cbed77be3295310 /lisp/vc/vc.el | |
| parent | edd73bd0d5474b71cbd4261c6a722be8f652bb9a (diff) | |
| parent | ac237334c7672377721e4d27e8ecd6b09d453568 (diff) | |
| download | emacs-118033294136a8fb3a14347ce190b447dd2ff2fe.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'lisp/vc/vc.el')
| -rw-r--r-- | lisp/vc/vc.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index fd0192fad2b..2dcf8f56542 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -220,7 +220,7 @@ ;; ;; - responsible-p (file) ;; -;; Return non-nil if this backend considers itself "responsible" for +;; Return the directory if this backend considers itself "responsible" for ;; FILE, which can also be a directory. This function is used to find ;; out what backend to use for registration of new files and for things ;; like change log generation. The default implementation always @@ -829,7 +829,7 @@ for the backend you use." "Limit the number of items shown by the VC log commands. Zero means unlimited. Not all VC backends are able to support this feature." - :type 'integer) + :type 'natnum) (defcustom vc-allow-async-revert nil "Specifies whether the diff during \\[vc-revert] may be asynchronous. @@ -2659,7 +2659,10 @@ with its diffs (if the underlying VCS supports that)." (error "Directory is not version controlled"))) (setq default-directory rootdir) (vc-print-log-internal backend (list rootdir) revision revision limit - (when with-diff 'with-diff)))) + (when with-diff 'with-diff)) + ;; We're looking at the root, so displaying " from <some-file>" in + ;; the mode line isn't helpful. + (setq vc-parent-buffer-name nil))) ;;;###autoload (defun vc-print-branch-log (branch) |