upstream

6 files changed, 58 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2efe3a5e7fe..9d9d564fa15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,31 @@
+2011-09-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * help-mode.el (help-mode): Restore autoload.
+
+2011-09-07  Juri Linkov  <juri@jurta.org>
+
+        * 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  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-regexp-alist): Calculate column positions
+        based on text properties put by `grep-filter' instead of matching
+        escape sequences.
+        (grep-mode): Set buffer-local `compilation-error-screen-columns'
+        to the value of `grep-error-screen-columns' (bug#9438).
+
+2011-09-07  Juri Linkov  <juri@jurta.org>
+
+        * simple.el (next-error-highlight, next-error-highlight-no-select):
+        Doc fix (bug#9432).
+
 2011-09-07  OKAZAKI Tetsurou  <okazaki.tetsurou@gmail.com>  (tiny change)
 
         * progmodes/cc-fonts.el (c-font-lock-enclosing-decls):
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 64c114c993d..5d67a6c4f4c 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -265,6 +265,7 @@ The format is (FUNCTION ARGS...).")
   'help-function 'customize-create-theme
   'help-echo (purecopy "mouse-2, RET: edit this theme file"))
 
+;;;###autoload
 (define-derived-mode help-mode special-mode "Help"
   "Major mode for viewing help text and navigating references in it.
 Entry to this mode runs the normal hook `help-mode-hook'.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 5f99cfe0028..4871c980fb5 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1482,6 +1482,7 @@ Returns the compilation buffer created."
               "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 @@ Returns the compilation buffer created."
         ;; 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))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index de46dc19169..b3f9758bacf 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -344,7 +344,24 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 ;;;###autoload
 (defconst grep-regexp-alist
   '(("^\\(.+?\\)\\(:[ \t]*\\)\\([1-9][0-9]*\\)\\2"
-     1 3)
+     1 3
+     ;; Calculate column positions (col . end-col) of first grep match on a line
+     ((lambda ()
+        (when grep-highlight-matches
+          (let* ((beg (match-end 0))
+                 (end (save-excursion (goto-char beg) (line-end-position)))
+                 (mbeg (text-property-any beg end 'font-lock-face 'match)))
+            (when mbeg
+              (- mbeg beg)))))
+      .
+      (lambda ()
+        (when grep-highlight-matches
+          (let* ((beg (match-end 0))
+                 (end (save-excursion (goto-char beg) (line-end-position)))
+                 (mbeg (text-property-any beg end 'font-lock-face 'match))
+                 (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
+            (when mend
+              (- mend beg)))))))
     ;; Rule to match column numbers is commented out since no known grep
     ;; produces them
     ;; ("^\\(.+?\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?"
@@ -353,17 +370,6 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
     ;; handle weird file names (with colons in them) as well as possible.
     ;; E.g. we use [1-9][0-9]* rather than [0-9]+ so as to accept ":034:" in
     ;; file names.
-    ("^\\(\\(.+?\\):\\([1-9][0-9]*\\):\\).*?\
-\\(\033\\[01;31m\\(?:\033\\[K\\)?\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
-     2 3
-     ;; Calculate column positions (beg . end) of first grep match on a line
-     ((lambda ()
-        (setq compilation-error-screen-columns nil)
-        (- (match-beginning 4) (match-end 1)))
-      .
-      (lambda () (- (match-end 5) (match-end 1)
-               (- (match-end 4) (match-beginning 4)))))
-     nil 1)
     ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))
   "Regexp used to match grep hits.  See `compilation-error-regexp-alist'.")
 
@@ -709,6 +715,8 @@ This function is called from `compilation-filter-hook'."
   (set (make-local-variable 'compilation-process-setup-function)
        'grep-process-setup)
   (set (make-local-variable 'compilation-disable-input) t)
+  (set (make-local-variable 'compilation-error-screen-columns)
+       grep-error-screen-columns)
   (add-hook 'compilation-filter-hook 'grep-filter nil t))
 
 
diff --git a/lisp/simple.el b/lisp/simple.el
index fe46e36fdac..2d4f883f1ed 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -73,7 +73,8 @@ in seconds, or until the next command is executed.
 If t, highlight the locus until the next command is executed, or until
 some other locus replaces it.
 If nil, don't highlight the locus in the source buffer.
-If `fringe-arrow', indicate the locus by the fringe arrow."
+If `fringe-arrow', indicate the locus by the fringe arrow
+indefinitely until some other locus replaces it."
   :type '(choice (number :tag "Highlight for specified time")
                  (const :tag "Semipermanent highlighting" t)
                  (const :tag "No highlighting" nil)
@@ -86,7 +87,8 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
 If number, highlight the locus in `next-error' face for given time in seconds.
 If t, highlight the locus indefinitely until some other locus replaces it.
 If nil, don't highlight the locus in the source buffer.
-If `fringe-arrow', indicate the locus by the fringe arrow."
+If `fringe-arrow', indicate the locus by the fringe arrow
+indefinitely until some other locus replaces it."
   :type '(choice (number :tag "Highlight for specified time")
                  (const :tag "Semipermanent highlighting" t)
                  (const :tag "No highlighting" nil)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index fc42b43c97d..1bb246fea0b 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -988,7 +988,7 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
               (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 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
             (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))