Merge from emacs--rel--22

[gnu-emacs] / lisp / progmodes / grep.el

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index fd93015ab2c1b5c0e8b2a006da95271c369f54b0..91518641938b65a1aa54c31dfb2ee71b9b8c7d9e 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -770,7 +770,8 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
          ;; even when async processes aren't supported.
          (compilation-start (if (and grep-use-null-device null-device)
                                 (concat command " " null-device)
-                              command) 'grep-mode))
+                              command)
+                            'grep-mode))
        (if (eq next-error-last-buffer (current-buffer))
            (setq default-directory dir))))))