procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(sregex-replace-match): Don't call sregex--value-groups.

Browse source 
(sregex-match-end, sregex-match-beginning): Likewise.
(sregex-match-string-no-properties, sregex-match-string): Likewise.
This commit is contained in:
Richard M. Stallman 1998-08-10 02:12:04 +00:00
parent 3f8309db3c
commit 952cad8980
1 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lisp/emacs-lisp/sregex.el
View file

@ -333,10 +333,7 @@ to allow for \"introduced groups\". If the extra argument is omitted
or nil, it defaults to the current value of (sregex-info)." or nil, it defaults to the current value of (sregex-info)."
(replace-match replacement fixedcase literal string (replace-match replacement fixedcase literal string
(and subexp (and subexp
(sregex-backref-num (sregex-backref-num subexp sregex))))
subexp
(sregex--value-groups (or sregex
sregex--current-sregex))))))
(defun sregex-match-string (count &optional in-string sregex) (defun sregex-match-string (count &optional in-string sregex)
"Like `match-string', for a regexp made with `sregex'. "Like `match-string', for a regexp made with `sregex'.
@ -345,10 +342,7 @@ can be obtained with `sregex-info'. The COUNT argument is adjusted to
allow for \"introduced groups\". If the extra argument is omitted or allow for \"introduced groups\". If the extra argument is omitted or
nil, it defaults to the current value of (sregex-info)." nil, it defaults to the current value of (sregex-info)."
(match-string (and count (match-string (and count
(sregex-backref-num (sregex-backref-num count sregex))
count
(sregex--value-groups (or sregex
sregex--current-sregex))))
in-string)) in-string))
(defun sregex-match-string-no-properties (count &optional in-string sregex) (defun sregex-match-string-no-properties (count &optional in-string sregex)
@ -359,10 +353,7 @@ allow for \"introduced groups\". If the extra argument is omitted or
nil, it defaults to the current value of (sregex-info)." nil, it defaults to the current value of (sregex-info)."
(match-string-no-properties (match-string-no-properties
(and count (and count
(sregex-backref-num (sregex-backref-num count sregex))
count
(sregex--value-groups (or sregex
sregex--current-sregex))))
in-string)) in-string))
(defun sregex-match-beginning (count &optional sregex) (defun sregex-match-beginning (count &optional sregex)
@ -371,10 +362,7 @@ This takes one additional optional argument, the `sregex' info, which
can be obtained with `sregex-info'. The COUNT argument is adjusted to can be obtained with `sregex-info'. The COUNT argument is adjusted to
allow for \"introduced groups\". If the extra argument is omitted or allow for \"introduced groups\". If the extra argument is omitted or
nil, it defaults to the current value of (sregex-info)." nil, it defaults to the current value of (sregex-info)."
(match-beginning (sregex-backref-num (match-beginning (sregex-backref-num count sregex)))
count
(sregex--value-groups (or sregex
sregex--current-sregex)))))
(defun sregex-match-end (count &optional sregex) (defun sregex-match-end (count &optional sregex)
"Like `match-end', for a regexp made with `sregex'. "Like `match-end', for a regexp made with `sregex'.
@ -382,10 +370,7 @@ This takes one additional optional argument, the `sregex' info, which
can be obtained with `sregex-info'. The COUNT argument is adjusted to can be obtained with `sregex-info'. The COUNT argument is adjusted to
allow for \"introduced groups\". If the extra argument is omitted or allow for \"introduced groups\". If the extra argument is omitted or
nil, it defaults to the current value of (sregex-info)." nil, it defaults to the current value of (sregex-info)."
(match-end (sregex-backref-num (match-end (sregex-backref-num count sregex)))
count
(sregex--value-groups (or sregex
sregex--current-sregex)))))
(defun sregex-match-data (&optional sregex) (defun sregex-match-data (&optional sregex)
"Like `match-data', for a regexp made with `sregex'. "Like `match-data', for a regexp made with `sregex'.