;;; replace.el --- replace commands for Emacs.
-;; Copyright (C) 1985, 86, 87, 92, 94, 96, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 87, 92, 94, 96, 1997, 2000
+;; Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
(setq to (read-from-minibuffer (format "%s %s with: " string from)
nil nil nil
query-replace-to-history-variable from t))
- (list from to current-prefix-arg)))
+ (if (and transient-mark-mode mark-active)
+ (list from to current-prefix-arg (region-beginning) (region-end))
+ (list from to current-prefix-arg nil nil))))
-(defun query-replace (from-string to-string &optional arg)
+(defun query-replace (from-string to-string &optional delimited start end)
"Replace some occurrences of FROM-STRING with TO-STRING.
As each match is found, the user must type a character saying
what to do with it. For directions, type \\[help-command] at that time.
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
only matches surrounded by word boundaries.
+Fourth and fifth arg START and END specify the region to operate on.
To customize possible responses, change the \"bindings\" in `query-replace-map'."
(interactive (query-replace-read-args "Query replace" nil))
- (perform-replace from-string to-string t nil arg))
+ (perform-replace from-string to-string start end t nil delimited))
(define-key esc-map "%" 'query-replace)
-(defun query-replace-regexp (regexp to-string &optional arg)
+(defun query-replace-regexp (regexp to-string &optional delimited start end)
"Replace some things after point matching REGEXP with TO-STRING.
As each match is found, the user must type a character saying
what to do with it. For directions, type \\[help-command] at that time.
Preserves case in each replacement if `case-replace' and `case-fold-search'
are non-nil and REGEXP has no uppercase letters.
+
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
only matches surrounded by word boundaries.
+Fourth and fifth arg START and END specify the region to operate on.
+
In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP,
and `\\=\\N' (where N is a digit) stands for
whatever what matched the Nth `\\(...\\)' in REGEXP."
(interactive (query-replace-read-args "Query replace regexp" t))
- (perform-replace regexp to-string t t arg))
+ (perform-replace regexp to-string start end t t delimited))
(define-key esc-map [?\C-%] 'query-replace-regexp)
-(defun query-replace-regexp-eval (regexp to-expr &optional arg)
+(defun query-replace-regexp-eval (regexp to-expr &optional delimited start end)
"Replace some things after point matching REGEXP with the result of TO-EXPR.
As each match is found, the user must type a character saying
what to do with it. For directions, type \\[help-command] at that time.
Preserves case in each replacement if `case-replace' and `case-fold-search'
are non-nil and REGEXP has no uppercase letters.
+
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
-only matches surrounded by word boundaries."
+only matches surrounded by word boundaries.
+Fourth and fifth arg START and END specify the region to operate on."
(interactive
- (let (from to)
+ (let (from to start end)
+ (when (and transient-mark-mode mark-active)
+ (setq start (region-beginning)
+ end (region-end)))
(if query-replace-interactive
(setq from (car regexp-search-ring))
(setq from (read-from-minibuffer "Query replace regexp: "
;; We make TO a list because replace-match-string-symbols requires one,
;; and the user might enter a single token.
(replace-match-string-symbols to)
- (list from (car to) current-prefix-arg)))
- (perform-replace regexp (cons 'replace-eval-replacement to-expr) t t arg))
+ (list from (car to) start end current-prefix-arg)))
+ (perform-replace regexp (cons 'replace-eval-replacement to-expr)
+ start end t t delimited))
-(defun map-query-replace-regexp (regexp to-strings &optional arg)
+(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
regexp is used as REGEXP--you don't have to specify it with the minibuffer.
A prefix argument N says to use each replacement string N times
-before rotating to the next."
+before rotating to the next.
+Fourth and fifth arg START and END specify the region to operate on."
(interactive
- (let (from to)
+ (let (from to start end)
+ (when (and transient-mark-mode mark-active)
+ (setq start (region-beginning)
+ end (region-end)))
(setq from (if query-replace-interactive
(car regexp-search-ring)
(read-from-minibuffer "Map query replace (regexp): "
from)
nil nil nil
'query-replace-history from t))
- (list from to current-prefix-arg)))
+ (list from to start end current-prefix-arg)))
(let (replacements)
(if (listp to-strings)
(setq replacements to-strings)
(1+ (string-match " " to-strings))))
(setq replacements (append replacements (list to-strings))
to-strings ""))))
- (perform-replace regexp replacements t t nil arg)))
+ (perform-replace regexp replacements start end t t nil n)))
-(defun replace-string (from-string to-string &optional delimited)
+(defun replace-string (from-string to-string &optional delimited start end)
"Replace occurrences of FROM-STRING with TO-STRING.
Preserve case in each match if `case-replace' and `case-fold-search'
are non-nil and FROM-STRING has no uppercase letters.
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
only matches surrounded by word boundaries.
+Fourth and fifth arg START and END specify the region to operate on.
If `query-replace-interactive' is non-nil, the last incremental search
string is used as FROM-STRING--you don't have to specify it with the
\(You may need a more complex loop if FROM-STRING can match the null string
and TO-STRING is also null.)"
(interactive (query-replace-read-args "Replace string" nil))
- (perform-replace from-string to-string nil nil delimited))
+ (perform-replace from-string to-string start end nil nil delimited))
-(defun replace-regexp (regexp to-string &optional delimited)
+(defun replace-regexp (regexp to-string &optional delimited start end)
"Replace things after point matching REGEXP with TO-STRING.
Preserve case in each match if `case-replace' and `case-fold-search'
are non-nil and REGEXP has no uppercase letters.
+
+In Transient Mark mode, if the mark is active, operate on the contents
+of the region. Otherwise, operate from point to the end of the buffer.
+
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
only matches surrounded by word boundaries.
+Fourth and fifth arg START and END specify the region to operate on.
+
In TO-STRING, `\\&' stands for whatever matched the whole of REGEXP,
and `\\=\\N' (where N is a digit) stands for
whatever what matched the Nth `\\(...\\)' in REGEXP.
-In Transient Mark mode, if the mark is active, operate on the contents
-of the region. Otherwise, operate from point to the end of the buffer.
-
If `query-replace-interactive' is non-nil, the last incremental search
regexp is used as REGEXP--you don't have to specify it with the minibuffer.
(replace-match TO-STRING nil nil))
which will run faster and will not set the mark or print anything."
(interactive (query-replace-read-args "Replace regexp" t))
- (perform-replace regexp to-string nil t delimited))
+ (perform-replace regexp to-string start end nil t delimited))
\f
(defvar regexp-history nil
"History list for some commands that read regular expressions.")
(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)
(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)))))
(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)))))
\f
(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)
(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)
(setq input default))
input)
current-prefix-arg))
- (let ((nlines (if nlines
- (prefix-numeric-value nlines)
- list-matching-lines-default-context-lines))
- (first t)
- ;;flag to prevent printing separator for first match
- (occur-num-matches 0)
- (buffer (current-buffer))
- (dir default-directory)
- (linenum 1)
- (prevpos
- ;;position of most recent match
- (point-min))
- (case-fold-search (and case-fold-search
- (isearch-no-upper-case-p regexp t)))
- (final-context-start
- ;; Marker to the start of context immediately following
- ;; the matched text in *Occur*.
- (make-marker)))
+ (let* ((nlines (if nlines
+ (prefix-numeric-value nlines)
+ list-matching-lines-default-context-lines))
+ (current-tab-width tab-width)
+ ;; Minimum width of line number plus trailing colon.
+ (min-line-number-width 6)
+ ;; Actual width of line number prefix. Choose a width that's
+ ;; a multiple of `tab-width' in the original buffer so that
+ ;; lines in *Occur* appear right.
+ (line-number-width (* (/ (- (+ min-line-number-width
+ tab-width)
+ 1)
+ tab-width)
+ tab-width))
+ ;; Format string for line numbers.
+ (line-number-format (format "%%%dd" line-number-width))
+ (empty (make-string line-number-width ?\ ))
+ (first t)
+ ;;flag to prevent printing separator for first match
+ (occur-num-matches 0)
+ (buffer (current-buffer))
+ (dir default-directory)
+ (linenum 1)
+ (prevpos
+ ;;position of most recent match
+ (point-min))
+ (case-fold-search (and case-fold-search
+ (isearch-no-upper-case-p regexp t)))
+ (final-context-start
+ ;; Marker to the start of context immediately following
+ ;; the matched text in *Occur*.
+ (make-marker)))
;;; (save-excursion
;;; (beginning-of-line)
;;; (setq linenum (1+ (count-lines (point-min) (point))))
(setq linenum (+ linenum (count-lines prevpos (point)))))
(setq prevpos (point))
(goto-char (match-end 0))
- (let* ((start
- ;;start point of text in source buffer to be put
- ;;into *Occur*
- (save-excursion
+ (let* (;;start point of text in source buffer to be put
+ ;;into *Occur*
+ (start (save-excursion
(goto-char (match-beginning 0))
(forward-line (if (< nlines 0)
nlines
(- nlines)))
(point)))
- (end
;; end point of text in source buffer to be put
;; into *Occur*
- (save-excursion
- (goto-char (match-end 0))
- (if (> nlines 0)
- (forward-line (1+ nlines))
- (forward-line 1))
- (point)))
- (match-beg
+ (end (save-excursion
+ (goto-char (match-end 0))
+ (if (> nlines 0)
+ (forward-line (1+ nlines))
+ (forward-line 1))
+ (point)))
;; Amount of context before matching text
- (- (match-beginning 0) start))
- (match-len
+ (match-beg (- (match-beginning 0) start))
;; Length of matching text
- (- (match-end 0) (match-beginning 0)))
- (tag (format "%5d" linenum))
- (empty (make-string (length tag) ?\ ))
- tem
+ (match-len (- (match-end 0) (match-beginning 0)))
+ (tag (format line-number-format linenum))
+ tem
insertion-start
;; Number of lines of context to show for current match.
- occur-marker
+ occur-marker
;; Marker pointing to end of match in source buffer.
(text-beg
;; Marker pointing to start of text for one
;; match in *Occur*.
(make-marker))
- (text-end
+ (text-end
;; Marker pointing to end of text for one match
;; in *Occur*.
- (make-marker))
- )
+ (make-marker)))
(save-excursion
(setq occur-marker (make-marker))
(set-marker occur-marker (point))
(or first (zerop nlines)
(insert "--------\n"))
(setq first nil)
+ (save-excursion
+ (set-buffer "*Occur*")
+ (setq tab-width current-tab-width))
;; Insert matching text including context lines from
;; source buffer into *Occur*
(with-current-buffer buffer
(eq (char-before end) ?\n)))
(insert "\n"))
- (set-marker final-context-start
+ (set-marker final-context-start
(+ (- (point) (- end (match-end 0)))
(if (save-excursion
(set-buffer buffer)
(let ((this-linenum linenum))
(while (< (point) final-context-start)
(if (null tag)
- (setq tag (format "%5d" this-linenum)))
+ (setq tag (format line-number-format this-linenum)))
(insert tag ?:)
(forward-line 1)
(setq tag nil)
C-w to delete match and recursive edit,
C-l to clear the screen, redisplay, and offer same replacement again,
! to replace all remaining matches with no more questions,
-^ to move point back to previous match."
+^ to move point back to previous match,
+E to edit the replacement string"
"Help message while in query-replace")
(defvar query-replace-map (make-sparse-keymap)
(define-key query-replace-map "n" 'skip)
(define-key query-replace-map "Y" 'act)
(define-key query-replace-map "N" 'skip)
+(define-key query-replace-map "e" 'edit-replacement)
+(define-key query-replace-map "E" 'edit-replacement)
(define-key query-replace-map "," 'act-and-show)
(define-key query-replace-map "q" 'exit)
(define-key query-replace-map "\r" 'exit)
(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))
(aset data 2 (if (consp next) next (aref data 3))))))
(car (aref data 2)))
-(defun perform-replace (from-string replacements
+(defun perform-replace (from-string replacements start end
query-flag regexp-flag delimited-flag
&optional repeat-count map)
"Subroutine of `query-replace'. Its complexity handles interactive queries.
"Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) "))))
;; If region is active, in Transient Mark mode, operate on region.
- (if (and transient-mark-mode mark-active)
- (progn
- (setq limit (copy-marker (region-end)))
- (goto-char (region-beginning))
- (deactivate-mark)))
+ (when start
+ (setq limit (copy-marker (max start end)))
+ (goto-char (min start end))
+ (deactivate-mark))
;; REPLACEMENTS is either a string, a list of strings, or a cons cell
;; containing a function and its first argument. The function is
(progn (goto-char (nth 1 match-again))
match-again)
(and (or match-again
- (progn
- (forward-char 1)
- (not (eobp))))
+ ;; MATCH-AGAIN non-nil means we
+ ;; accept an adjacent match. If
+ ;; we don't, move one char to the
+ ;; right. This takes us a
+ ;; character too far at the end,
+ ;; but this is undone after the
+ ;; while-loop.
+ (progn (forward-char 1) (not (eobp))))
(funcall search-function search-string limit t)
;; For speed, use only integers and
;; reuse the list used last time.
(if (and regexp-flag nonempty-match)
(setq match-again (and (looking-at search-string)
(match-data)))))
+
+ ;; Edit replacement.
+ ((eq def 'edit-replacement)
+ (setq next-replacement
+ (read-input "Edit replacement string: "
+ next-replacement))
+ (or replaced
+ (replace-match next-replacement nocasify literal))
+ (setq done t))
+
((eq def 'delete-and-edit)
(delete-region (match-beginning 0) (match-end 0))
(set-match-data
(cons (cons (point)
(or replaced (match-data t)))
stack)))))
+
+ ;; The code preventing adjacent regexp matches in the condition
+ ;; of the while-loop above will haven taken us one character
+ ;; beyond the last replacement. Undo that.
+ (when (and regexp-flag (not match-again) (> replace-count 0))
+ (backward-char 1))
+
(replace-dehighlight))
(or unread-command-events
(message "Replaced %d occurrence%s"
(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)))))