summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-06-19 11:30:53 +0000
committerGerd Moellmann <gerd@gnu.org>2001-06-19 11:30:53 +0000
commitfa9090b8f4da448c42a863e5f08dfadd06eb5fc0 (patch)
treeaa727b62f7936860663690fbdf95a7537af291da
parent04d0b662827936c584efabbeaf29ab8bf81267c8 (diff)
downloademacs-fa9090b8f4da448c42a863e5f08dfadd06eb5fc0.tar.gz
(Ffind_composition_internal): Accept ZV
and a string's end position as POS.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/composite.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cf792aaf215..dcaae37ad7e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-19 Gerd Moellmann <gerd@gnu.org>
+
+ * composite.c (Ffind_composition_internal): Accept ZV
+ and a string's end position as POS.
+
2001-06-18 Gerd Moellmann <gerd@gnu.org>
* composite.c (Ffind_composition_internal): Check POS
diff --git a/src/composite.c b/src/composite.c
index 6db705cec4e..c18d8eb749c 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -782,12 +782,12 @@ See `find-composition' for more detail.")
if (!NILP (string))
{
CHECK_STRING (string, 2);
- if (XINT (pos) < 0 || XINT (pos) >= XSTRING (string)->size)
+ if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)
args_out_of_range (string, pos);
}
else
{
- if (XINT (pos) < BEGV || XINT (pos) >= ZV)
+ if (XINT (pos) < BEGV || XINT (pos) > ZV)
args_out_of_range (Fcurrent_buffer (), pos);
}