--- a/lisp/prim/minibuf.el	Mon Aug 13 10:02:48 2007 +0200
+++ b/lisp/prim/minibuf.el	Mon Aug 13 10:03:52 2007 +0200
@@ -205,8 +205,15 @@
   (interactive)
   (and minibuffer-electric-file-name-behavior
        (eq ?/ (char-before (point)))
+       (not (save-excursion
+	      (goto-char (point-min))
+	      (and (looking-at "^/.+:~?")
+		   (re-search-forward "^/.+:~?[^/]*" nil t)
+		   (progn
+		     (delete-region (point) (point-max))
+		     t))))
        (not (eq (point) (1+ (point-min)))) ; permit `//hostname/path/to/file'
-       (not (eq ?: (char-after (- (point) 2))))	; permit `http://url/goes/here'
+       (not (eq ?: (char-after (- (point) 2)))) ; permit `http://url/goes/here'
        (delete-region (point-min) (point)))
   (insert ?/))