From 91054f8f7c6633efcd39eb883703f09346e0b936 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 11 Sep 2011 04:10:15 +0200 Subject: [PATCH] Doc string clarification. * subr.el (match-string): Mention that the current buffer should be the same as the search was done in. Fixes: debbugs:9282 --- lisp/ChangeLog | 3 +++ lisp/subr.el | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 79dc1996455..8769ce63930 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-09-11 Lars Magne Ingebrigtsen + * subr.el (match-string): Mention that the current buffer should + be the same as the search was done in (bug#9282). + * facemenu.el: Disable the remove-* commands if the mark isn't active (bug#9162). diff --git a/lisp/subr.el b/lisp/subr.el index a2676b1173d..35fac1fe8f2 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3249,7 +3249,9 @@ The value returned is the value of the last form in BODY." NUM specifies which parenthesized expression in the last regexp. Value is nil if NUMth pair didn't match, or there were less than NUM pairs. Zero means the entire text matched by the whole regexp or whole string. -STRING should be given if the last search was by `string-match' on STRING." +STRING should be given if the last search was by `string-match' on STRING. +If STRING is nil, the current buffer should be the same buffer +the search/match was performed in." (if (match-beginning num) (if string (substring string (match-beginning num) (match-end num)) @@ -3260,7 +3262,9 @@ STRING should be given if the last search was by `string-match' on STRING." NUM specifies which parenthesized expression in the last regexp. Value is nil if NUMth pair didn't match, or there were less than NUM pairs. Zero means the entire text matched by the whole regexp or whole string. -STRING should be given if the last search was by `string-match' on STRING." +STRING should be given if the last search was by `string-match' on STRING. +If STRING is nil, the current buffer should be the same buffer +the search/match was performed in." (if (match-beginning num) (if string (substring-no-properties string (match-beginning num) -- 2.39.5