aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-11-28 08:28:15 +0000
committerGlenn Morris2007-11-28 08:28:15 +0000
commite05661923e3f7cba7f9e72ddf5073aaec0f9c82b (patch)
tree54061669c6bbf2202116e63c14a9322c5cfee42f
parentb55d4a5d1c40e9e15887d32da570ee365d249879 (diff)
downloademacs-e05661923e3f7cba7f9e72ddf5073aaec0f9c82b.tar.gz
emacs-e05661923e3f7cba7f9e72ddf5073aaec0f9c82b.zip
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.
-rw-r--r--lisp/url/ChangeLog6
-rw-r--r--lisp/url/url-dired.el13
2 files changed, 10 insertions, 9 deletions
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 @@
12007-11-28 Diane Murray <disumu@x3y2z1.net>
2
3 * url-dired.el: Don't require w3-fetch and w3-open-local.
4 (url-dired-find-file): Use `find-file'. Doc fix.
5 (url-dired-find-file-mouse, url-dired-minor-mode): Doc fix.
6
12007-11-15 Richard Stallman <rms@gnu.org> 72007-11-15 Richard Stallman <rms@gnu.org>
2 8
3 * url.el (url-retrieve-synchronously): Call delete-process. 9 * 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 @@
24 24
25;;; Code: 25;;; Code:
26 26
27(autoload 'w3-fetch "w3")
28(autoload 'w3-open-local "w3")
29(autoload 'dired-get-filename "dired") 27(autoload 'dired-get-filename "dired")
30 28
31(defvar url-dired-minor-mode-map 29(defvar url-dired-minor-mode-map
@@ -41,22 +39,19 @@
41(make-variable-buffer-local 'url-dired-minor-mode) 39(make-variable-buffer-local 'url-dired-minor-mode)
42 40
43(defun url-dired-find-file () 41(defun url-dired-find-file ()
44 "In dired, visit the file or directory named on this line, using Emacs-W3." 42 "In dired, visit the file or directory named on this line."
45 (interactive) 43 (interactive)
46 (let ((filename (dired-get-filename))) 44 (let ((filename (dired-get-filename)))
47 (cond ((string-match "/\\(.*@.*\\):\\(/.*\\)" filename) 45 (find-file filename)))
48 (w3-fetch (concat "file://" (match-string 1 filename) (match-string 2 filename))))
49 (t
50 (w3-open-local filename)))))
51 46
52(defun url-dired-find-file-mouse (event) 47(defun url-dired-find-file-mouse (event)
53 "In dired, visit the file or directory name you click on, using Emacs-W3." 48 "In dired, visit the file or directory name you click on."
54 (interactive "@e") 49 (interactive "@e")
55 (mouse-set-point event) 50 (mouse-set-point event)
56 (url-dired-find-file)) 51 (url-dired-find-file))
57 52
58(defun url-dired-minor-mode (&optional arg) 53(defun url-dired-minor-mode (&optional arg)
59 "Minor mode for directory browsing with Emacs-W3." 54 "Minor mode for directory browsing."
60 (interactive "P") 55 (interactive "P")
61 (cond 56 (cond
62 ((null arg) 57 ((null arg)