/* Markers: examining, setting and deleting.
- Copyright (C) 1985, 1997-1998, 2001-2013 Free Software Foundation,
+ Copyright (C) 1985, 1997-1998, 2001-2016 Free Software Foundation,
Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
} \
}
+static void
+CHECK_MARKER (Lisp_Object x)
+{
+ CHECK_TYPE (MARKERP (x), Qmarkerp, x);
+}
+
/* Return the byte position corresponding to CHARPOS in B. */
ptrdiff_t
}
DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
- doc: /* Return the position MARKER points at, as a character number.
-Returns nil if MARKER points nowhere. */)
+ doc: /* Return the position of MARKER, or nil if it points nowhere. */)
(Lisp_Object marker)
{
CHECK_MARKER (marker);
static struct buffer *
live_buffer (Lisp_Object buffer)
{
- struct buffer *b;
-
- if (NILP (buffer))
- {
- b = current_buffer;
- eassert (BUFFER_LIVE_P (b));
- }
- else
- {
- CHECK_BUFFER (buffer);
- b = XBUFFER (buffer);
- if (!BUFFER_LIVE_P (b))
- b = NULL;
- }
- return b;
+ struct buffer *b = decode_buffer (buffer);
+ return BUFFER_LIVE_P (b) ? b : NULL;
}
/* Internal function to set MARKER in BUFFER at POSITION. Non-zero
register ptrdiff_t charpos, bytepos;
/* Do not use CHECK_NUMBER_COERCE_MARKER because we
- don't want to call buf_charpos_to_bytepos if POSTION
+ don't want to call buf_charpos_to_bytepos if POSITION
is a marker and so we know the bytepos already. */
if (INTEGERP (position))
charpos = XINT (position), bytepos = -1;
}
DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0,
- doc: /* Position MARKER before character number POSITION in BUFFER,
-which defaults to the current buffer. If POSITION is nil,
-makes marker point nowhere so it no longer slows down
+ doc: /* Position MARKER before character number POSITION in BUFFER.
+If BUFFER is omitted or nil, it defaults to the current buffer. If
+POSITION is nil, makes marker point nowhere so it no longer slows down
editing in any buffer. Returns MARKER. */)
(Lisp_Object marker, Lisp_Object position, Lisp_Object buffer)
{