Mercurial > emacs
changeset 107944:f3e910318160
* progmodes/grep.el (grep-compute-defaults): Fix handling of host
default settings (Bug#5928).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 14 Apr 2010 11:33:42 -0400 |
| parents | 0ddcd935235c |
| children | cf183258f1db |
| files | lisp/ChangeLog lisp/progmodes/grep.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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