[librep] Revert "let string-match and string-looking at return Qnil"
- From: Christopher Bratusek <chrisb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librep] Revert "let string-match and string-looking at return Qnil"
- Date: Sun, 29 Aug 2010 10:11:16 +0000 (UTC)
commit 3f3e522a30a96b3b4a7d0a46553615984eaa33e9
Author: Christopher Roy Bratusek <zanghar freenet de>
Date: Sun Aug 29 12:10:52 2010 +0200
Revert "let string-match and string-looking at return Qnil"
This reverts commit 9171c2cd3d01b91678d54cbbfab257b95f94164b.
Conflicts:
src/find.c
src/find.c | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
---
diff --git a/src/find.c b/src/find.c
index 5e88038..6f9ec6f 100644
--- a/src/find.c
+++ b/src/find.c
@@ -280,16 +280,8 @@ still case-significant.
{
rep_regexp *prog;
long xstart;
- if(rep_STRINGP(re) && rep_STRINGP(str))
- {
- rep_DECLARE1(re, rep_STRINGP);
- rep_DECLARE2(str, rep_STRINGP);
- }
- else
- {
- fprintf (stderr, " ** only strings are allowed to be passed to `string-match'.");
- return Qnil;
- }
+ rep_DECLARE1(re, rep_STRINGP);
+ rep_DECLARE2(str, rep_STRINGP);
rep_DECLARE3_OPT(start, rep_INTP);
xstart = rep_INTP(start) ? rep_INT(start) : 0;
prog = rep_compile_regexp(re);
@@ -320,16 +312,8 @@ Updates the match data.
{
rep_regexp *prog;
long xstart;
- if(rep_STRINGP(re) && rep_STRINGP(string))
- {
- rep_DECLARE1(re, rep_STRINGP);
- rep_DECLARE2(string, rep_STRINGP);
- }
- else
- {
- fprintf (stderr, " ** only strings are allowed to be passed to `string-looking-at'.");
- return Qnil;
- }
+ rep_DECLARE1(re, rep_STRINGP);
+ rep_DECLARE2(string, rep_STRINGP);
rep_DECLARE3_OPT(start, rep_INTP);
xstart = rep_INTP(start) ? rep_INT(start) : 0;
prog = rep_compile_regexp(re);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]