[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99735: * progmodes/grep.el (grep-compute-defaults): Fix handling of host

[Chong Yidong]

------------------------------------------------------------
revno: 99735
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-04-14 11:33:42 -0400
message:
  * progmodes/grep.el (grep-compute-defaults): Fix handling of host
  default settings (Bug#5928).
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-12 15:15:07 +0000
+++ b/lisp/ChangeLog    2010-04-14 15:33:42 +0000
@@ -1,3 +1,8 @@
+2010-04-14  Christoph  <address@hidden>  (tiny change)
+
+       * progmodes/grep.el (grep-compute-defaults): Fix handling of host
+       default settings (Bug#5928).
+
 2010-04-10  Glenn Morris  <address@hidden>
 
        * progmodes/fortran.el (fortran-match-and-skip-declaration):

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2010-01-31 21:47:47 +0000
+++ b/lisp/progmodes/grep.el    2010-04-14 15:33:42 +0000
@@ -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