diff options
Diffstat (limited to 'lisp/progmodes/grep.el')
| -rw-r--r-- | lisp/progmodes/grep.el | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index c8a0dc449df..1e152c6d751 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -246,6 +246,7 @@ See `compilation-error-screen-columns'" (let ((map (make-sparse-keymap))) (set-keymap-parent map compilation-minor-mode-map) (define-key map " " 'scroll-up-command) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map "\^?" 'scroll-down-command) (define-key map "\C-c\C-f" 'next-error-follow-minor-mode) @@ -359,7 +360,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (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))) + (mbeg (text-property-any beg end 'font-lock-face grep-match-face))) (when mbeg (- mbeg beg))))) . @@ -367,7 +368,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (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)) + (mbeg (text-property-any beg end 'font-lock-face grep-match-face)) (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg))))))) @@ -586,7 +587,7 @@ This function is called from `compilation-filter-hook'." 'exec-plus) ((and (grep-probe find-program `(nil nil nil ,null-device "-print0")) - (grep-probe xargs-program `(nil nil nil "-0" "-e" "echo"))) + (grep-probe xargs-program `(nil nil nil "-0" "echo"))) 'gnu) (t 'exec)))) @@ -596,7 +597,7 @@ This function is called from `compilation-filter-hook'." ;; Windows shells need the program file name ;; after the pipe symbol be quoted if they use ;; forward slashes as directory separators. - (format "%s . -type f -print0 | \"%s\" -0 -e %s" + (format "%s . -type f -print0 | \"%s\" -0 %s" find-program xargs-program grep-command)) ((memq grep-find-use-xargs '(exec exec-plus)) (let ((cmd0 (format "%s . -type f -exec %s" @@ -621,7 +622,7 @@ This function is called from `compilation-filter-hook'." (format "%s " null-device) ""))) (cond ((eq grep-find-use-xargs 'gnu) - (format "%s . <X> -type f <F> -print0 | \"%s\" -0 -e %s" + (format "%s . <X> -type f <F> -print0 | \"%s\" -0 %s" find-program xargs-program gcmd)) ((eq grep-find-use-xargs 'exec) (format "%s . <X> -type f <F> -exec %s {} %s%s" @@ -992,14 +993,17 @@ to specify a command to run." (compilation-start regexp 'grep-mode)) (setq dir (file-name-as-directory (expand-file-name dir))) (require 'find-dired) ; for `find-name-arg' + ;; In Tramp, there could be problems if the command line is too + ;; long. We escape it, therefore. (let ((command (grep-expand-template grep-find-template regexp (concat (shell-quote-argument "(") " " find-name-arg " " - (mapconcat #'shell-quote-argument - (split-string files) - (concat " -o " find-name-arg " ")) + (mapconcat + #'shell-quote-argument + (split-string files) + (concat "\\\n" " -o " find-name-arg " ")) " " (shell-quote-argument ")")) dir @@ -1020,7 +1024,7 @@ to specify a command to run." (concat "*/" (cdr ignore))))))) grep-find-ignored-directories - " -o -path ") + "\\\n -o -path ") " " (shell-quote-argument ")") " -prune -o ")) @@ -1038,7 +1042,7 @@ to specify a command to run." (shell-quote-argument (cdr ignore)))))) grep-find-ignored-files - " -o -name ") + "\\\n -o -name ") " " (shell-quote-argument ")") " -prune -o ")))))) |