# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1271259222 14400
# Node ID f3e910318160f3f9f757763419080a89edad6ead
# Parent  0ddcd935235c8c0262a5b3f6ae17281bc3feedea
* progmodes/grep.el (grep-compute-defaults): Fix handling of host
default settings (Bug#5928).

diff -r 0ddcd935235c -r f3e910318160 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 13 19:36:48 2010 -0700
+++ b/lisp/ChangeLog	Wed Apr 14 11:33:42 2010 -0400
@@ -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 -r 0ddcd935235c -r f3e910318160 lisp/progmodes/grep.el
--- a/lisp/progmodes/grep.el	Tue Apr 13 19:36:48 2010 -0700
+++ b/lisp/progmodes/grep.el	Wed Apr 14 11:33:42 2010 -0400
@@ -513,8 +513,8 @@
 		       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