From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Diane Murray Newsgroups: gmane.emacs.devel Subject: url-dired.el requires w3 Date: Wed, 21 Nov 2007 04:33:13 +0100 Message-ID: <87zlx8p91i.fsf@spargel.x3y2z1.net> NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1195615896 7699 80.91.229.12 (21 Nov 2007 03:31:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 21 Nov 2007 03:31:36 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 21 04:31:42 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IugJR-0004Wc-6z for ged-emacs-devel@m.gmane.org; Wed, 21 Nov 2007 04:31:41 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IugJD-0001uu-7Y for ged-emacs-devel@m.gmane.org; Tue, 20 Nov 2007 22:31:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IugJ9-0001tB-Rk for emacs-devel@gnu.org; Tue, 20 Nov 2007 22:31:23 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IugJ8-0001qw-Gt for emacs-devel@gnu.org; Tue, 20 Nov 2007 22:31:23 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IugJ8-0001qt-A3 for emacs-devel@gnu.org; Tue, 20 Nov 2007 22:31:22 -0500 Original-Received: from mailout11.sul.t-online.de ([194.25.134.85] helo=mailout11.sul.t-online.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IugJ7-0006kA-W9 for emacs-devel@gnu.org; Tue, 20 Nov 2007 22:31:22 -0500 Original-Received: from fwd28.aul.t-online.de by mailout11.aul.t-online.de with smtp id 1IugJ6-0004zn-01; Wed, 21 Nov 2007 04:31:20 +0100 Original-Received: from spargel.x3y2z1.net (bKfE7+ZDQhhpCG4PuMTTUDectM-m28YmIUve8-9rWRfiz1blfD1iHSAnXfxEzigwkH@[84.189.204.158]) by fwd28.aul.t-online.de with esmtp id 1IugJ0-1V1Tma0; Wed, 21 Nov 2007 04:31:14 +0100 X-ID: bKfE7+ZDQhhpCG4PuMTTUDectM-m28YmIUve8-9rWRfiz1blfD1iHSAnXfxEzigwkH@t-dialin.net X-TOI-MSGID: b81fa306-b747-49de-922f-db121a833e48 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:83755 Archived-At: (url-retrieve-synchronously "ftp://ftp.gnu.org/") opens a dired buffer in `url-dired-minor-mode'. Pressing RET on a file there calls `url-dired-find-file', yet url-dired-find-file uses `w3-fetch' and `w3-open-local' which are not part of Emacs. The following patch changes it to use `find-file'. w3 has its own w3-dired.el file, so users of w3 will still have that functionality. * 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. Index: url-dired.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/url/url-dired.el,v retrieving revision 1.10.2.1 diff -u -r1.10.2.1 url-dired.el --- url-dired.el 25 Jul 2007 04:18:22 -0000 1.10.2.1 +++ url-dired.el 21 Nov 2007 03:16:55 -0000 @@ -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)