procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make dired-read-regexp obsolete

Browse source 
It's not worth having such a trivial wrapper for read-regexp.

* lisp/dired.el (dired-read-regexp): Make obsolete.
(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-03-22 16:56:19 -07:00
parent 00156f9549
commit 5dbc324473
4 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,5 +1,11 @@
2014-03-22 Glenn Morris <rgm@gnu.org>
* dired.el (dired-read-regexp): Make obsolete.
(dired-mark-files-regexp, dired-mark-files-containing-regexp)
(dired-flag-files-regexp):
* dired-aux.el (dired-mark-read-regexp):
* dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
* startup.el (fancy-startup-text):
* help.el (describe-gnu-project): Visit online info about GNU project.

9
lisp/dired-aux.el
View file

@ -1,7 +1,7 @@
;;; dired-aux.el --- less commonly used parts of dired
;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2014 Free Software
;; Foundation, Inc.
;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2014
;; Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
;; Maintainer: emacs-devel@gnu.org
@ -1921,8 +1921,9 @@ Type SPC or `y' to %s one match, DEL or `n' to skip to next,
(arg
(if whole-name nil current-prefix-arg))
(regexp
(dired-read-regexp
(concat (if whole-name "Abs. " "") operation " from (regexp): ")))
(read-regexp
(concat (if whole-name "Abs. " "") operation " from (regexp): ")
nil 'dired-regexp-history))
(newname
(read-string
(concat (if whole-name "Abs. " "") operation " " regexp " to: "))))

8
lisp/dired-x.el
View file

@ -1,7 +1,6 @@
;;; dired-x.el --- extra Dired functionality -*- lexical-binding:t -*-
;; Copyright (C) 1993-1994, 1997, 2001-2014 Free Software Foundation,
;; Inc.
;; Copyright (C) 1993-1994, 1997, 2001-2014 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
;; Lawrence R. Dodd <dodd@roebling.poly.edu>
@ -556,8 +555,9 @@ interactively, prompt for REGEXP.
With prefix argument, unflag all those files.
Optional fourth argument LOCALP is as in `dired-get-filename'."
(interactive
(list (dired-read-regexp
"Mark unmarked files matching regexp (default all): ")
(list (read-regexp
"Mark unmarked files matching regexp (default all): "
nil 'dired-regexp-history)
nil current-prefix-arg nil))
(let ((dired-marker-char (if unflag-p ?\s dired-marker-char)))
(dired-mark-if

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
@ -3286,6 +3286,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)
@ -3296,8 +3297,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
@ -3312,8 +3314,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
@ -3343,7 +3346,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)