[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116849: Make dired-read-regexp obsolete
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r116849: Make dired-read-regexp obsolete |
Date: |
Sat, 22 Mar 2014 23:56:26 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116849
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-03-22 16:56:19 -0700
message:
Make dired-read-regexp obsolete
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/dired-aux.el diredaux.el-20091113204419-o5vbwnq5f7feedwu-484
lisp/dired-x.el diredx.el-20091113204419-o5vbwnq5f7feedwu-649
lisp/dired.el dired.el-20091113204419-o5vbwnq5f7feedwu-482
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-03-22 23:47:20 +0000
+++ b/lisp/ChangeLog 2014-03-22 23:56:19 +0000
@@ -1,5 +1,11 @@
2014-03-22 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2014-02-10 01:34:22 +0000
+++ b/lisp/dired-aux.el 2014-03-22 23:56:19 +0000
@@ -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 <address@hidden>.
;; Maintainer: address@hidden
@@ -1921,8 +1921,9 @@
(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: "))))
=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el 2014-01-12 10:29:59 +0000
+++ b/lisp/dired-x.el 2014-03-22 23:56:19 +0000
@@ -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 <address@hidden>
;; Lawrence R. Dodd <address@hidden>
@@ -556,8 +555,9 @@
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
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2014-03-18 13:22:01 +0000
+++ b/lisp/dired.el 2014-03-22 23:56:19 +0000
@@ -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 <address@hidden>
;; Maintainer: address@hidden
@@ -3286,6 +3286,7 @@
(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 @@
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 @@
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 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116849: Make dired-read-regexp obsolete,
Glenn Morris <=