From 632b74efa3523683596a8efbc854824dc819bebf Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 1 Aug 2022 11:35:55 +0200 Subject: [PATCH] Make url-dired.el obsolete (part 2/2) * lisp/obsolete/url-dired.el: Add "Obsolete-since" header. (url-dired-minor-mode-map): Minor fix. * lisp/url/url-file.el (url-dired): Don't require. * etc/NEWS: Announce its obsoletion. --- etc/NEWS | 3 +++ lisp/obsolete/url-dired.el | 3 ++- lisp/url/url-file.el | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 7aff7921f98..67183db2782 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -349,6 +349,9 @@ Use 'abbrev', 'skeleton' or 'tempo' instead. ** The rlogin.el library, and the 'rsh' command are now obsolete. Use something like 'M-x shell RET ssh RET' instead. +--- +** The url-dired.el library is now obsolete. + --- ** The fast-lock.el and lazy-lock.el library have been removed. They have been obsolete since Emacs 22.1. diff --git a/lisp/obsolete/url-dired.el b/lisp/obsolete/url-dired.el index e2c23a8b6d9..40057fb1747 100644 --- a/lisp/obsolete/url-dired.el +++ b/lisp/obsolete/url-dired.el @@ -3,6 +3,7 @@ ;; Copyright (C) 1996-1999, 2004-2022 Free Software Foundation, Inc. ;; Keywords: comm, files +;; Obsolete-since: 29.1 ;; This file is part of GNU Emacs. @@ -27,7 +28,7 @@ (defvar-keymap url-dired-minor-mode-map :doc "Keymap used when browsing directories." - "C-m" #'url-dired-find-file + "RET" #'url-dired-find-file "" #'url-dired-find-file-mouse) (defun url-dired-find-file () diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el index 99e62d9b7a2..1d5a8f505f1 100644 --- a/lisp/url/url-file.el +++ b/lisp/url/url-file.el @@ -26,7 +26,6 @@ (require 'mailcap) (require 'url-vars) (require 'url-parse) -(require 'url-dired) (declare-function mm-disable-multibyte "mm-util" ()) (defvar url-allow-non-local-files nil -- 2.39.2