# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1201829912 0
# Node ID 0fa30755c2094e618125e25195dec883ed1e0049
# Parent  5297ed06b207f9fba63a4ec1c2d6749b77888388
(grep-compute-defaults):
Don't mix up defaults for different connections to the same host.

diff -r 5297ed06b207 -r 0fa30755c209 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 01 01:18:05 2008 +0000
+++ b/lisp/ChangeLog	Fri Feb 01 01:38:32 2008 +0000
@@ -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 -r 5297ed06b207 -r 0fa30755c209 lisp/progmodes/grep.el
--- a/lisp/progmodes/grep.el	Fri Feb 01 01:18:05 2008 +0000
+++ b/lisp/progmodes/grep.el	Fri Feb 01 01:38:32 2008 +0000
@@ -408,7 +408,7 @@
 	     (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