[Emacs-diffs] /srv/bzr/emacs/trunk r105678: * lisp/progmodes/compile.el (compilation-start): Let-bind `thisenv' to

[Juri Linkov]

------------------------------------------------------------
revno: 105678
fixes bug(s): http://debbugs.gnu.org/8340
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2011-09-07 15:17:54 +0300
message:
  * lisp/progmodes/compile.el (compilation-start): Let-bind `thisenv' to
  `compilation-environment'.  Set buffer-local
  `compilation-environment' to `thisenv' later after (funcall mode).
  (Bug#8340)
  
  * lisp/vc/vc-git.el (vc-git-grep): Remove --no-color.  (Bug#9408)
  (vc-git-grep): Prepend "PAGER=" to `compilation-environment'
  instead of replacing its value.  (Bug#8340)
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el
  lisp/vc/vc-git.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-07 12:00:52 +0000
+++ b/lisp/ChangeLog    2011-09-07 12:17:54 +0000
@@ -1,5 +1,16 @@
 2011-09-07  Juri Linkov  <address@hidden>
 
+       * progmodes/compile.el (compilation-start): Let-bind `thisenv' to
+       `compilation-environment'.  Set buffer-local
+       `compilation-environment' to `thisenv' later after (funcall mode).
+       (Bug#8340)
+
+       * vc/vc-git.el (vc-git-grep): Remove --no-color.  (Bug#9408)
+       (vc-git-grep): Prepend "PAGER=" to `compilation-environment'
+       instead of replacing its value.  (Bug#8340)
+
+2011-09-07  Juri Linkov  <address@hidden>
+
        * progmodes/grep.el (grep-regexp-alist): Calculate column positions
        based on text properties put by `grep-filter' instead of matching
        escape sequences.

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-09-02 16:38:40 +0000
+++ b/lisp/progmodes/compile.el 2011-09-07 12:17:54 +0000
@@ -1482,6 +1482,7 @@
              "compilation"
            (replace-regexp-in-string "-mode\\'" "" (symbol-name mode))))
         (thisdir default-directory)
+        (thisenv compilation-environment)
         outwin outbuf)
     (with-current-buffer
        (setq outbuf
@@ -1528,8 +1529,9 @@
         ;; Remember the original dir, so we can use it when we recompile.
         ;; default-directory' can't be used reliably for that because it may be
         ;; affected by the special handling of "cd ...;".
-        ;; NB: must be fone after (funcall mode) as that resets local variables
+        ;; NB: must be done after (funcall mode) as that resets local variables
         (set (make-local-variable 'compilation-directory) thisdir)
+       (set (make-local-variable 'compilation-environment) thisenv)
        (if highlight-regexp
            (set (make-local-variable 'compilation-highlight-regexp)
                 highlight-regexp))

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2011-09-01 07:29:56 +0000
+++ b/lisp/vc/vc-git.el 2011-09-07 12:17:54 +0000
@@ -988,7 +988,7 @@
              (setq command nil))
        (setq dir (file-name-as-directory (expand-file-name dir)))
        (setq command
-             (grep-expand-template "git grep --no-color -n -e <R> -- <F>"
+             (grep-expand-template "git grep -n -e <R> -- <F>"
                                     regexp files))
        (when command
          (if (equal current-prefix-arg '(4))
@@ -998,7 +998,7 @@
            (add-to-history 'grep-history command))))
       (when command
        (let ((default-directory dir)
-             (compilation-environment '("PAGER=")))
+             (compilation-environment (cons "PAGER=" compilation-environment)))
          ;; Setting process-setup-function makes exit-message-function work
          ;; even when async processes aren't supported.
          (compilation-start command 'grep-mode))