diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-04-14 11:33:42 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-04-14 11:33:42 -0400 |
| commit | 7860d2e357cbb9347b5843dd1701b6fa3650d2a0 (patch) | |
| tree | a72749624cc7779a0a689d807d020267d7091121 /lisp | |
| parent | f1b95f0a0d36f1e998599c979f794046093e37c7 (diff) | |
| download | emacs-7860d2e357cbb9347b5843dd1701b6fa3650d2a0.tar.gz | |
* progmodes/grep.el (grep-compute-defaults): Fix handling of host
default settings (Bug#5928).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 4 |
2 files changed, 7 insertions, 2 deletions
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 |