Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'maint'

  • Loading branch information...
commit fb1471fe22ac08cd548405ab0869f2093390d575 2 parents 7d55579 + 9178b1c
@tarsius tarsius authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 magit.el
View
6 magit.el
@@ -5184,14 +5184,14 @@ environment (potentially empty)."
(when gpg-sign '("-S")))))))))
;; shouldn't we kill that buffer altogether?
(erase-buffer)
+ ;; potentially the local environment has been altered with settings that
+ ;; were specific to this commit. Let's revert it
+ (kill-local-variable 'process-environment)
(let ((magit-buf magit-buffer-internal))
(bury-buffer)
(set-buffer magit-buf))
(when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
(delete-file (concat (magit-git-dir) "MERGE_MSG")))
- ;; potentially the local environment has been altered with settings that
- ;; were specific to this commit. Let's revert it
- (kill-local-variable 'process-environment)
(magit-update-vc-modeline default-directory)
(when magit-pre-log-edit-window-configuration
(set-window-configuration magit-pre-log-edit-window-configuration)
Please sign in to comment.
Something went wrong with that request. Please try again.