mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-26 10:49:33 +00:00
Code Issues Releases Activity

Doc and error message fixes.

Browse Source 
(replace-highlight): Use facep, not internal-find-face.
This commit is contained in:
Dave Love 2000-05-21 17:04:47 +00:00
parent 84469aeb4f
commit e730be7fbb
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lisp/replace.el
View File

@ -176,9 +176,11 @@ Fourth and fifth arg START and END specify the region to operate on."
(defun map-query-replace-regexp (regexp to-strings &optional n start end)
"Replace some matches for REGEXP with various strings, in rotation.
The second argument TO-STRINGS contains the replacement strings, separated
by spaces. This command works like `query-replace-regexp' except
that each successive replacement uses the next successive replacement string,
The second argument TO-STRINGS contains the replacement strings,
separated by spaces. Third arg DELIMITED (prefix arg if interactive),
if non-nil, means replace only matches surrounded by word boundaries.
This command works like `query-replace-regexp' except that each
successive replacement uses the next successive replacement string,
wrapping around from the last such string to the first.
In Transient Mark mode, if the mark is active, operate on the contents
@ -397,8 +399,8 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
(make-local-variable 'occur-command-arguments)
(run-hooks 'occur-mode-hook))
;; Handle revert-buffer for *Occur* buffers.
(defun occur-revert-function (ignore1 ignore2)
"Handle revert-buffer for *Occur* buffers."
(let ((args occur-command-arguments ))
(save-excursion
(set-buffer occur-buffer)
@ -446,7 +448,7 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
(setq r (next-single-property-change (point) 'occur-point))
(if r
(goto-char r)
(error "no more matches"))
(error "No more matches"))
(setq n (1- n)))))
@ -464,13 +466,13 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
(setq r (previous-single-property-change (point) 'occur-point))
(if r
(goto-char (- r 1))
(error "no earlier matches"))
(error "No earlier matches"))
(setq n (1- n)))))
(defcustom list-matching-lines-default-context-lines 0
"*Default number of context lines to include around a `list-matching-lines'
match. A negative number means to include that many lines before the match.
"*Default number of context lines included around `list-matching-lines' matches.
A negative number means to include that many lines before the match.
A positive number means to include that many lines both before and after."
:type 'integer
:group 'matching)
@ -478,7 +480,7 @@ A positive number means to include that many lines both before and after."
(defalias 'list-matching-lines 'occur)
(defvar list-matching-lines-face 'bold
"*Face used by M-x list-matching-lines to show the text that matches.
"*Face used by \\[list-matching-lines] to show the text that matches.
If the value is nil, don't highlight the matching portions specially.")
(defun occur (regexp &optional nlines)
@ -755,15 +757,15 @@ The valid answers include `act', `skip', `act-and-show',
(define-key query-replace-map [escape] 'exit-prefix)
(defun replace-match-string-symbols (n)
;; Process a list (and any sub-lists), expanding certain symbols:
;; Symbol Expands To
;; N (match-string N) (where N is a string of digits)
;; #N (string-to-number (match-string N))
;; & (match-string 0)
;; #& (string-to-number (match-string 0))
;;
;; Note that these symbols must be preceeded by a backslash in order to
;; type them.
"Process a list (and any sub-lists), expanding certain symbols.
Symbol Expands To
N (match-string N) (where N is a string of digits)
#N (string-to-number (match-string N))
& (match-string 0)
#& (string-to-number (match-string 0))
Note that these symbols must be preceeded by a backslash in order to
type them."
(while n
(cond
((consp (car n))
@ -1073,7 +1075,7 @@ which will run faster and probably do exactly what you want."
(progn
(setq replace-overlay (make-overlay start end))
(overlay-put replace-overlay 'face
(if (internal-find-face 'query-replace)
(if (facep 'query-replace)
'query-replace 'region))))
(move-overlay replace-overlay start end (current-buffer)))))