[Emacs-diffs] emacs-24 r117607: * lisp/dired.el (dired-read-regexp): Make obsolete. [Backport]

[Stefan Monnier]

------------------------------------------------------------
revno: 117607
revision-id: address@hidden
parent: address@hidden
author: Glenn Morris <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-10-20 18:39:30 -0400
message:
  * lisp/dired.el (dired-read-regexp): Make obsolete.  [Backport]
  (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-10-20 22:37:04 +0000
+++ b/lisp/ChangeLog    2014-10-20 22:39:30 +0000
@@ -1,3 +1,11 @@
+2014-10-20  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.
+
 2014-10-20  Stefan Monnier  <address@hidden>
 
        * progmodes/python.el (inferior-python-mode): Use add-hook.

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2014-03-29 17:59:36 +0000
+++ b/lisp/dired-aux.el 2014-10-20 22:39:30 +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-10-20 22:39:30 +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-07-21 05:38:17 +0000
+++ b/lisp/dired.el     2014-10-20 22:39:30 +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
@@ -3302,6 +3302,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)
@@ -3312,8 +3313,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
@@ -3328,8 +3330,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
@@ -3359,7 +3362,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)