summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1994-09-27 02:24:00 +0000
committerKarl Heuer <kwzh@gnu.org>1994-09-27 02:24:00 +0000
commite8e68e490b703faf7b1431b201b8a07ad97007cf (patch)
treec872ced90dd48307a9e62f473bbbeacbe032a86e
parent7510b296e72bf09e34c7a08a92e065518759789c (diff)
downloademacs-e8e68e490b703faf7b1431b201b8a07ad97007cf.tar.gz
(Fset_marker, set_marker_restricted, Fcopy_marker): Use type test macros.
-rw-r--r--src/marker.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/marker.c b/src/marker.c
index fbf48da1c70..a5cc631fcdb 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -88,7 +88,7 @@ Returns MARKER.")
/* If position is nil or a marker that points nowhere,
make this marker point nowhere. */
if (NILP (pos)
- || (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer))
+ || (MARKERP (pos) && !XMARKER (pos)->buffer))
{
unchain_marker (marker);
return marker;
@@ -145,7 +145,7 @@ set_marker_restricted (marker, pos, buffer)
/* If position is nil or a marker that points nowhere,
make this marker point nowhere. */
if (NILP (pos) ||
- (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer))
+ (MARKERP (pos) && !XMARKER (pos)->buffer))
{
unchain_marker (marker);
return marker;
@@ -271,14 +271,11 @@ at that position in the current buffer.")
while (1)
{
- if (XTYPE (marker) == Lisp_Int
- || XTYPE (marker) == Lisp_Marker)
+ if (INTEGERP (marker) || MARKERP (marker))
{
new = Fmake_marker ();
Fset_marker (new, marker,
- ((XTYPE (marker) == Lisp_Marker)
- ? Fmarker_buffer (marker)
- : Qnil));
+ (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil));
return new;
}
else