2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41308840b0b..9e27ef462a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/grep.el (grep-compute-defaults):
+        Don't mix up defaults for different connections to the same host.
+
 2008-01-31  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * blank-mode.el: Renamed to whitespace.el.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index e3ddb392582..0c7cb358f4a 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -408,7 +408,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
              (grep-find-use-xargs ,grep-find-use-xargs)
              (grep-highlight-matches ,grep-highlight-matches)))))
   (let* ((host-id
-          (intern (or (file-remote-p default-directory 'host) "localhost")))
+          (intern (or (file-remote-p default-directory) "localhost")))
          (host-defaults (assq host-id grep-host-defaults-alist))
          (defaults (assq nil grep-host-defaults-alist)))
     ;; There are different defaults on different hosts.  They must be