--- a/lisp/prim/minibuf.el	Mon Aug 13 08:50:31 2007 +0200
+++ b/lisp/prim/minibuf.el	Mon Aug 13 08:51:03 2007 +0200
@@ -407,6 +407,7 @@
                                   (if minibuffer-exit-hook
                                       (run-hooks 'minibuffer-exit-hook))
                                   (buffer-string)))
+                    (histval val)
                       (err nil))
                  (if readp
                      (condition-case e
@@ -428,12 +429,12 @@
 		     (let ((list (symbol-value minibuffer-history-variable)))
 		       (or (eq list t)
 			   (null val)
-			   (and list (equal val (car list)))
+			   (and list (equal histval (car list)))
 			   (and (stringp val)
 				minibuffer-history-minimum-string-length
 				(< (length val)
 				   minibuffer-history-minimum-string-length))
-			   (set minibuffer-history-variable (cons val list)))))
+			   (set minibuffer-history-variable (cons histval list)))))
                  (if err (signal (car err) (cdr err)))
                  val))))
       ;; stupid display code requires this for some reason
@@ -1708,9 +1709,7 @@
                ;; complete?
                (if (not orig)
                    nil
-		 (and (file-directory-p string)
-		      ;; So "foo" is ambiguous between "foo/" and "foobar/"
-		      (equal string (file-name-as-directory string)))))
+		 (file-directory-p string)))
               ((eq action 't)
                ;; all completions
                (funcall dirs #'(lambda (n)