From: Glenn Morris <rgm@gnu.org>
Date: Wed, 28 Nov 2007 08:28:15 +0000 (+0000)
Subject: Diane Murray  <disumu at x3y2z1.net>
X-Git-Tag: emacs-pretest-22.1.90~311
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e05661923e3f7cba7f9e72ddf5073aaec0f9c82b;p=emacs.git

Diane Murray  <disumu at x3y2z1.net>

Don't require w3-fetch and w3-open-local.
(url-dired-find-file): Use `find-file'.  Doc fix.
(url-dired-find-file-mouse, url-dired-minor-mode): Doc fix.
---

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7402de41aab..241746162d5 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-28  Diane Murray  <disumu@x3y2z1.net>
+
+	* url-dired.el: Don't require w3-fetch and w3-open-local.
+	(url-dired-find-file): Use `find-file'.	 Doc fix.
+	(url-dired-find-file-mouse, url-dired-minor-mode): Doc fix.
+
 2007-11-15  Richard Stallman  <rms@gnu.org>
 
 	* url.el (url-retrieve-synchronously): Call delete-process.
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 189628468b7..93c99447555 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(autoload 'w3-fetch "w3")
-(autoload 'w3-open-local "w3")
 (autoload 'dired-get-filename "dired")
 
 (defvar url-dired-minor-mode-map
@@ -41,22 +39,19 @@
 (make-variable-buffer-local 'url-dired-minor-mode)
 
 (defun url-dired-find-file ()
-  "In dired, visit the file or directory named on this line, using Emacs-W3."
+  "In dired, visit the file or directory named on this line."
   (interactive)
   (let ((filename (dired-get-filename)))
-    (cond ((string-match "/\\(.*@.*\\):\\(/.*\\)" filename)
-	   (w3-fetch (concat "file://" (match-string 1 filename) (match-string 2 filename))))
-	  (t
-	   (w3-open-local filename)))))
+    (find-file filename)))
 
 (defun url-dired-find-file-mouse (event)
-  "In dired, visit the file or directory name you click on, using Emacs-W3."
+  "In dired, visit the file or directory name you click on."
   (interactive "@e")
   (mouse-set-point event)
   (url-dired-find-file))
 
 (defun url-dired-minor-mode (&optional arg)
-  "Minor mode for directory browsing with Emacs-W3."
+  "Minor mode for directory browsing."
   (interactive "P")
   (cond
    ((null arg)