diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/vc-dir.el | 1 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 6 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index b7eb8b592d1..21bd21e15de 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -255,6 +255,7 @@ See `run-hooks'." (define-key map "l" 'vc-print-log) ;; C-x v l (define-key map "L" 'vc-print-root-log) ;; C-x v L (define-key map "I" 'vc-log-incoming) ;; C-x v I + (define-key map "O" 'vc-log-outgoing) ;; C-x v O ;; More confusing than helpful, probably ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 8a22d747b7d..1a3f1bf2f48 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -972,7 +972,7 @@ If LIMIT is non-nil, show no more than this many entries." (defun vc-git-log-outgoing (buffer remote-location) (interactive) (vc-git-command - buffer 0 nil + buffer 'async nil "log" "--no-color" "--graph" "--decorate" "--date=short" (format "--pretty=tformat:%s" (car vc-git-root-log-format)) @@ -986,7 +986,7 @@ If LIMIT is non-nil, show no more than this many entries." (interactive) (vc-git-command nil 0 nil "fetch") (vc-git-command - buffer 0 nil + buffer 'async nil "log" "--no-color" "--graph" "--decorate" "--date=short" (format "--pretty=tformat:%s" (car vc-git-root-log-format)) @@ -1011,7 +1011,7 @@ If LIMIT is non-nil, show no more than this many entries." (cadr vc-git-root-log-format) "^commit *\\([0-9a-z]+\\)")) ;; Allow expanding short log entries. - (when (eq vc-log-view-type 'short) + (when (memq vc-log-view-type '(short log-outgoing log-incoming)) (setq truncate-lines t) (set (make-local-variable 'log-view-expanded-log-entry-function) 'vc-git-expanded-log-entry)) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index c3088560c11..64e88de60eb 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2378,8 +2378,8 @@ When called interactively with a prefix argument, prompt for REMOTE-LOCATION." (let ((backend (vc-deduce-backend))) (unless backend (error "Buffer is not version controlled")) - (vc-incoming-outgoing-internal backend remote-location "*vc-incoming*" - 'log-incoming))) + (vc-incoming-outgoing-internal backend (or remote-location "") + "*vc-incoming*" 'log-incoming))) ;;;###autoload (defun vc-log-outgoing (&optional remote-location) @@ -2391,8 +2391,8 @@ When called interactively with a prefix argument, prompt for REMOTE-LOCATION." (let ((backend (vc-deduce-backend))) (unless backend (error "Buffer is not version controlled")) - (vc-incoming-outgoing-internal backend remote-location "*vc-outgoing*" - 'log-outgoing))) + (vc-incoming-outgoing-internal backend (or remote-location "") + "*vc-outgoing*" 'log-outgoing))) ;;;###autoload (defun vc-region-history (from to) |