mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-04 02:51:31 -08:00
(Fset_marker, set_marker_restricted, Fcopy_marker): Use type test macros.
This commit is contained in:
parent
7510b296e7
commit
e8e68e490b
1 changed files with 4 additions and 7 deletions
11
src/marker.c
11
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue