diff options
| author | Glenn Morris | 2014-02-13 22:59:24 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-02-13 22:59:24 -0800 |
| commit | b2bf2a254fba3ec86fb763a95289f51251428ac4 (patch) | |
| tree | 1a623d1ad69e6ddb80baa754555fb216caa08383 | |
| parent | 48c4f9b124a17b4056e0b93f490befb09947f410 (diff) | |
| download | emacs-b2bf2a254fba3ec86fb763a95289f51251428ac4.tar.gz emacs-b2bf2a254fba3ec86fb763a95289f51251428ac4.zip | |
Mention read-regexp in doc of functions that use it
* lisp/dired.el (dired-read-regexp):
* lisp/faces.el (list-faces-display):
* lisp/misearch.el (multi-isearch-read-matching-buffers)
(multi-isearch-read-matching-files):
* lisp/play/cookie1.el (cookie-apropos):
* lisp/progmodes/grep.el (grep-read-regexp): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/dired.el | 1 | ||||
| -rw-r--r-- | lisp/faces.el | 2 | ||||
| -rw-r--r-- | lisp/misearch.el | 7 | ||||
| -rw-r--r-- | lisp/play/cookie1.el | 1 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 2 |
6 files changed, 16 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c6498210524..21eeff7bffe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2014-02-14 Glenn Morris <rgm@gnu.org> | 1 | 2014-02-14 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * dired.el (dired-read-regexp): | ||
| 4 | * faces.el (list-faces-display): | ||
| 5 | * misearch.el (multi-isearch-read-matching-buffers) | ||
| 6 | (multi-isearch-read-matching-files): | ||
| 7 | * play/cookie1.el (cookie-apropos): | ||
| 8 | * progmodes/grep.el (grep-read-regexp): Doc fixes. | ||
| 9 | |||
| 3 | * textmodes/remember.el (remember): Use frameset-to-register | 10 | * textmodes/remember.el (remember): Use frameset-to-register |
| 4 | rather than frame-configuration-to-register. | 11 | rather than frame-configuration-to-register. |
| 5 | 12 | ||
diff --git a/lisp/dired.el b/lisp/dired.el index faa39ab5d6c..b1b22a6a99a 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -3284,6 +3284,7 @@ As always, hidden subdirs are not affected." | |||
| 3284 | "History list of regular expressions used in Dired commands.") | 3284 | "History list of regular expressions used in Dired commands.") |
| 3285 | 3285 | ||
| 3286 | (defun dired-read-regexp (prompt &optional default history) | 3286 | (defun dired-read-regexp (prompt &optional default history) |
| 3287 | "Read a regexp using `read-regexp'." | ||
| 3287 | (read-regexp prompt default (or history 'dired-regexp-history))) | 3288 | (read-regexp prompt default (or history 'dired-regexp-history))) |
| 3288 | 3289 | ||
| 3289 | (defun dired-mark-files-regexp (regexp &optional marker-char) | 3290 | (defun dired-mark-files-regexp (regexp &optional marker-char) |
diff --git a/lisp/faces.el b/lisp/faces.el index ed36522afb1..3394c721f04 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1260,7 +1260,7 @@ The sample text is a string that comes from the variable | |||
| 1260 | 1260 | ||
| 1261 | If REGEXP is non-nil, list only those faces with names matching | 1261 | If REGEXP is non-nil, list only those faces with names matching |
| 1262 | this regular expression. When called interactively with a prefix | 1262 | this regular expression. When called interactively with a prefix |
| 1263 | arg, prompt for a regular expression." | 1263 | argument, prompt for a regular expression using `read-regexp'." |
| 1264 | (interactive (list (and current-prefix-arg | 1264 | (interactive (list (and current-prefix-arg |
| 1265 | (read-regexp "List faces matching regexp")))) | 1265 | (read-regexp "List faces matching regexp")))) |
| 1266 | (let ((all-faces (zerop (length regexp))) | 1266 | (let ((all-faces (zerop (length regexp))) |
diff --git a/lisp/misearch.el b/lisp/misearch.el index af3b1b45b2b..64ea40b7a1d 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el | |||
| @@ -239,7 +239,8 @@ set in `multi-isearch-buffers' or `multi-isearch-buffers-regexp'." | |||
| 239 | (nreverse bufs))) | 239 | (nreverse bufs))) |
| 240 | 240 | ||
| 241 | (defun multi-isearch-read-matching-buffers () | 241 | (defun multi-isearch-read-matching-buffers () |
| 242 | "Return a list of buffers whose names match specified regexp." | 242 | "Return a list of buffers whose names match specified regexp. |
| 243 | Uses `read-regexp' to read the regexp." | ||
| 243 | ;; Most code from `multi-occur-in-matching-buffers' | 244 | ;; Most code from `multi-occur-in-matching-buffers' |
| 244 | ;; and `kill-matching-buffers'. | 245 | ;; and `kill-matching-buffers'. |
| 245 | (let ((bufregexp | 246 | (let ((bufregexp |
| @@ -322,8 +323,10 @@ Every next/previous file in the defined sequence is visited by | |||
| 322 | (add-to-list 'files file)) | 323 | (add-to-list 'files file)) |
| 323 | (nreverse files))) | 324 | (nreverse files))) |
| 324 | 325 | ||
| 326 | ;; A regexp is not the same thing as a file glob - does this matter? | ||
| 325 | (defun multi-isearch-read-matching-files () | 327 | (defun multi-isearch-read-matching-files () |
| 326 | "Return a list of files whose names match specified wildcard." | 328 | "Return a list of files whose names match specified wildcard. |
| 329 | Uses `read-regexp' to read the wildcard." | ||
| 327 | ;; Most wildcard code from `find-file-noselect'. | 330 | ;; Most wildcard code from `find-file-noselect'. |
| 328 | (let ((filename (read-regexp "Search in files whose names match wildcard"))) | 331 | (let ((filename (read-regexp "Search in files whose names match wildcard"))) |
| 329 | (when (and filename | 332 | (when (and filename |
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el index 38619b1d26a..4d49fca7568 100644 --- a/lisp/play/cookie1.el +++ b/lisp/play/cookie1.el | |||
| @@ -187,6 +187,7 @@ Argument REQUIRE-MATCH non-nil forces a matching cookie." | |||
| 187 | 187 | ||
| 188 | (defun cookie-apropos (regexp phrase-file &optional display) | 188 | (defun cookie-apropos (regexp phrase-file &optional display) |
| 189 | "Return a list of all entries matching REGEXP from PHRASE-FILE. | 189 | "Return a list of all entries matching REGEXP from PHRASE-FILE. |
| 190 | Interactively, uses `read-regexp' to read REGEXP. | ||
| 190 | Interactively, PHRASE-FILE defaults to `cookie-file', unless that | 191 | Interactively, PHRASE-FILE defaults to `cookie-file', unless that |
| 191 | is nil or a prefix argument is used. | 192 | is nil or a prefix argument is used. |
| 192 | If called interactively, or if DISPLAY is non-nil, display a list of matches." | 193 | If called interactively, or if DISPLAY is non-nil, display a list of matches." |
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 3c7f936446f..99629450c1b 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el | |||
| @@ -819,7 +819,7 @@ substitution string. Note dynamic scoping of variables.") | |||
| 819 | t t command)))))) | 819 | t t command)))))) |
| 820 | 820 | ||
| 821 | (defun grep-read-regexp () | 821 | (defun grep-read-regexp () |
| 822 | "Read regexp arg for interactive grep." | 822 | "Read regexp arg for interactive grep using `read-regexp'." |
| 823 | (read-regexp "Search for" 'grep-tag-default 'grep-regexp-history)) | 823 | (read-regexp "Search for" 'grep-tag-default 'grep-regexp-history)) |
| 824 | 824 | ||
| 825 | (defun grep-read-files (regexp) | 825 | (defun grep-read-files (regexp) |