Make dired-move-to-filename-regexp obsolete

* lisp/dired.el (dired-move-to-filename-regexp): Make Emacs 21
compatibility alias obsolete.

diff --git a/lisp/dired.el b/lisp/dired.el
index 255d79fa42c0ccb71b14b17744ea462486da2bce..fcbecbf3c088bc044c650db518e8b20d18039e6d 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -577,9 +577,6 @@ element, for the listed directory.")
   "Keeps track of which switches to use for inserted subdirectories.
 This is an alist of the form (SUBDIR . SWITCHES).")
 
-(defvaralias 'dired-move-to-filename-regexp
-  'directory-listing-before-filename-regexp)
-
 (defvar dired-subdir-regexp "^. \\(.+\\)\\(:\\)\n"
   "Regexp matching a maybe hidden subdirectory line in `ls -lR' output.
 Subexpression 1 is the subdirectory proper, no trailing colon.
@@ -5040,6 +5037,9 @@ completes."
   ;; Redisplay the tool bar.
   (force-mode-line-update))
 
+(define-obsolete-variable-alias 'dired-move-to-filename-regexp
+  'directory-listing-before-filename-regexp "30.1")
+
 (provide 'dired)
 
 (run-hooks 'dired-load-hook)           ; for your customizations

diff --git a/lisp/files.el b/lisp/files.el
index 69c4a33cdebc3d61a8ed21b2efa74294ce7b0deb..52cf03ee0859b29bc76e9fe4e752e5e9a750694d 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7743,7 +7743,6 @@ If DIR's free space cannot be obtained, this function returns nil."
       (if avail
           (funcall byte-count-to-string-function avail)))))
 
-;; The following expression replaces `dired-move-to-filename-regexp'.
 (defvar directory-listing-before-filename-regexp
   (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
         (l-or-quote "\\([A-Za-z']\\|[^\0-\177]\\)")