aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kastrup2005-02-19 18:54:17 +0000
committerDavid Kastrup2005-02-19 18:54:17 +0000
commitc761fd554a208d5f10467d2a484f866c49f5d685 (patch)
tree7799c767ce7a2f4d146cb11e450c2a85404da1c6
parent7ca4e8a10ff3b58f2af5a0a67f0f71190f3a569f (diff)
downloademacs-c761fd554a208d5f10467d2a484f866c49f5d685.tar.gz
emacs-c761fd554a208d5f10467d2a484f866c49f5d685.zip
(subregexp-context-p): Fix garbled doc string by adding
quoting.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el8
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4dc87bb39a..fe1947e1247 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-02-19 David Kastrup <dak@gnu.org>
2
3 * subr.el (subregexp-context-p): Fix garbled doc string by adding
4 quoting.
5
12005-02-19 Jay Belanger <belanger@truman.edu> 62005-02-19 Jay Belanger <belanger@truman.edu>
2 7
3 * calc/calc-math.el (calc-arctan, calc-tanh, calc-arctanh): 8 * calc/calc-math.el (calc-arctan, calc-tanh, calc-arctanh):
diff --git a/lisp/subr.el b/lisp/subr.el
index 3d1a7203dd0..252154c7b0f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2221,10 +2221,10 @@ and replace a sub-expression, e.g.
2221(defun subregexp-context-p (regexp pos &optional start) 2221(defun subregexp-context-p (regexp pos &optional start)
2222 "Return non-nil if POS is in a normal subregexp context in REGEXP. 2222 "Return non-nil if POS is in a normal subregexp context in REGEXP.
2223A subregexp context is one where a sub-regexp can appear. 2223A subregexp context is one where a sub-regexp can appear.
2224A non-subregexp context is for example within brackets, or within a repetition 2224A non-subregexp context is for example within brackets, or within a
2225bounds operator \\{..\\}, or right after a \\. 2225repetition bounds operator `\\=\\{...\\}', or right after a `\\'.
2226If START is non-nil, it should be a position in REGEXP, smaller than POS, 2226If START is non-nil, it should be a position in REGEXP, smaller
2227and known to be in a subregexp context." 2227than POS, and known to be in a subregexp context."
2228 ;; Here's one possible implementation, with the great benefit that it 2228 ;; Here's one possible implementation, with the great benefit that it
2229 ;; reuses the regexp-matcher's own parser, so it understands all the 2229 ;; reuses the regexp-matcher's own parser, so it understands all the
2230 ;; details of the syntax. A disadvantage is that it needs to match the 2230 ;; details of the syntax. A disadvantage is that it needs to match the