mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/dired.el (dired-read-regexp): Make obsolete. [Backport]

Browse source 
(dired-mark-files-regexp, dired-mark-files-containing-regexp)
(dired-flag-files-regexp):
* lisp/dired-aux.el (dired-mark-read-regexp):
* lisp/dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
This commit is contained in:
Glenn Morris 2014-10-20 18:39:30 -04:00 • committed by Stefan Monnier
parent c9f7e33c60
commit 3ac4e4c0eb
4 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/dired.el
View file

@ -1,7 +1,7 @@
;;; dired.el --- directory-browsing commands -*- lexical-binding: t -*-
;; Copyright (C) 1985-1986, 1992-1997, 2000-2014 Free Software
;; Foundation, Inc.
;; Copyright (C) 1985-1986, 1992-1997, 2000-2014
;; Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
;; Maintainer: emacs-devel@gnu.org
@ -3302,6 +3302,7 @@ As always, hidden subdirs are not affected."
(defun dired-read-regexp (prompt &optional default history)
"Read a regexp using `read-regexp'."
(declare (obsolete read-regexp "24.5"))
(read-regexp prompt default (or history 'dired-regexp-history)))
(defun dired-mark-files-regexp (regexp &optional marker-char)
@ -3312,8 +3313,9 @@ A prefix argument means to unmark them instead.
REGEXP is an Emacs regexp, not a shell wildcard. Thus, use `\\.o$' for
object files--just `.o' will mark more than you might think."
(interactive
(list (dired-read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
" files (regexp): "))
(list (read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
" files (regexp): ")
nil 'dired-regexp-history)
(if current-prefix-arg ?\040)))
(let ((dired-marker-char (or marker-char dired-marker-char)))
(dired-mark-if
@ -3328,8 +3330,9 @@ object files--just `.o' will mark more than you might think."
A prefix argument means to unmark them instead.
`.' and `..' are never marked."
(interactive
(list (dired-read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
" files containing (regexp): "))
(list (read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
" files containing (regexp): ")
nil 'dired-regexp-history)
(if current-prefix-arg ?\040)))
(let ((dired-marker-char (or marker-char dired-marker-char)))
(dired-mark-if
@ -3359,7 +3362,8 @@ A prefix argument means to unmark them instead.
The match is against the non-directory part of the filename. Use `^'
and `$' to anchor matches. Exclude subdirs by hiding them.
`.' and `..' are never flagged."
(interactive (list (dired-read-regexp "Flag for deletion (regexp): ")))
(interactive (list (read-regexp "Flag for deletion (regexp): "
nil 'dired-regexp-history)))
(dired-mark-files-regexp regexp dired-del-marker))
(defun dired-mark-symlinks (unflag-p)