From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 14 Apr 2010 15:33:42 +0000 (-0400)
Subject: * progmodes/grep.el (grep-compute-defaults): Fix handling of host
X-Git-Tag: emacs-pretest-23.1.96~28
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7860d2e357cbb9347b5843dd1701b6fa3650d2a0;p=emacs.git

* progmodes/grep.el (grep-compute-defaults): Fix handling of host
default settings (Bug#5928).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35198619654..2fddcbf1366 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-14  Christoph  <cschol2112@googlemail.com>  (tiny change)
+
+	* progmodes/grep.el (grep-compute-defaults): Fix handling of host
+	default settings (Bug#5928).
+
 2010-04-10  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/fortran.el (fortran-match-and-skip-declaration):
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index b13a75e3844..de94620c737 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -513,8 +513,8 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
 		       grep-find-template grep-find-use-xargs
 		       grep-highlight-matches))
       (set setting
-	   (or (cadr (assq setting host-defaults))
-	       (cadr (assq setting defaults)))))
+	   (cadr (or (assq setting host-defaults)
+		     (assq setting defaults)))))
 
     (unless (or (not grep-use-null-device) (eq grep-use-null-device t))
       (setq grep-use-null-device