diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-03-23 10:40:00 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-03-23 10:40:00 +0000 |
| commit | 76acbdc50490034f233bc78d14a7cd5717d9432e (patch) | |
| tree | 9b46877d371dad83ff6cdad30cd69df2a050de7d /src/textprop.c | |
| parent | 335fcf6c2f6ae8990d8c62589cfb3558c3f38bc0 (diff) | |
| parent | 8725c7925ef1ce95efb1f50d48d17f437e9c46a4 (diff) | |
| download | emacs-76acbdc50490034f233bc78d14a7cd5717d9432e.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 192-203)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-192
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-193
Use gdb-ui breakpoint faces on ttys too
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-194
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-195
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-196
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-197
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-198
Tweak gdb-ui breakpoint faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-199
Tweak gdb-ui breakpoint faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-200
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-201
Tweak info/.arch-inventory to identify info/.cvsignore as source
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-202
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-203
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-316
Diffstat (limited to 'src/textprop.c')
| -rw-r--r-- | src/textprop.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/textprop.c b/src/textprop.c index 317f8fa6aa3..e6dd411dcc5 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -729,7 +729,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) temp = Fnext_overlay_change (position); if (! NILP (limit)) { - CHECK_NUMBER (limit); + CHECK_NUMBER_COERCE_MARKER (limit); if (XINT (limit) < XINT (temp)) temp = limit; } @@ -754,7 +754,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) temp = Fprevious_overlay_change (position); if (! NILP (limit)) { - CHECK_NUMBER (limit); + CHECK_NUMBER_COERCE_MARKER (limit); if (XINT (limit) > XINT (temp)) temp = limit; } @@ -787,7 +787,10 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) if (NILP (limit)) position = make_number (SCHARS (object)); else - position = limit; + { + CHECK_NUMBER (limit); + position = limit; + } } } else @@ -804,6 +807,8 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) Fset_buffer (object); } + CHECK_NUMBER_COERCE_MARKER (position); + initial_value = Fget_char_property (position, prop, object); if (NILP (limit)) @@ -856,7 +861,10 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) if (NILP (limit)) position = make_number (SCHARS (object)); else - position = limit; + { + CHECK_NUMBER (limit); + position = limit; + } } } else @@ -872,6 +880,8 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) Fset_buffer (object); } + CHECK_NUMBER_COERCE_MARKER (position); + if (NILP (limit)) XSETFASTINT (limit, BUF_BEGV (current_buffer)); else |