diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-01-15 07:50:22 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-01-15 07:50:22 -0800 |
| commit | d672ad60e34b4e1dcb28f91d15f1e286acf2f94f (patch) | |
| tree | 5d17911717db0469bed838cbda7c0adf9638e31b /lisp/vc/vc-git.el | |
| parent | e31287e704a539ebef777d92e4d06d4b1d912b2a (diff) | |
| parent | 0e936f18f8738fbe3809784f5ec6feb27c6bb24e (diff) | |
| download | emacs-d672ad60e34b4e1dcb28f91d15f1e286acf2f94f.tar.gz | |
Merge from origin/emacs-27
0e936f18f8 (origin/emacs-27) Fix build failure with --with-cairo --wi...
c34f7e884b Add new node "Package Statuses" to manual
fdee034ac8 * lisp/isearch.el: Fix corner cases of isearch-lazy-count.
7b14329d86 ; * lisp/simple.el (messages-buffer): Doc fix. (Bug#39124)
7ec66a59e3 Document spacing issues with Xft for some fonts
08cd247fbd ; * etc/NEWS: Fix typo.
d645628e3c Always use lexical-binding in lisp-interaction-mode (bug#3...
c42198f78c ; *etc/NEWS: Fix typo.
0ed9cfa7dc vc-dir: ensure we don't use a pager with git
37e0d00c14 Improve ERC's matching of nicks and URLs (bug#38257)
d47b157969 Handle tab-bar clicks on a GPM-capable console.
e4791f3f8e ;* etc/TODO: Update.
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 37bc53b3850..2caa287bce2 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1785,13 +1785,12 @@ The difference to vc-do-command is that this function always invokes (process-environment (append `("GIT_DIR" - "PAGER=" ;; Avoid repository locking during background operations ;; (bug#21559). ,@(when revert-buffer-in-progress-p '("GIT_OPTIONAL_LOCKS=0"))) process-environment))) - (apply 'process-file vc-git-program nil buffer nil command args))) + (apply 'process-file vc-git-program nil buffer nil "--no-pager" command args))) (defun vc-git--out-ok (command &rest args) (zerop (apply 'vc-git--call '(t nil) command args))) |