diff options
| author | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-14 21:58:25 +0800 |
|---|---|---|
| committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-08-14 21:58:25 +0800 |
| commit | 7510a061cbcec1b0d0f255448c9bf81638004cdb (patch) | |
| tree | 58f9209fcc4b77b4593d7d0878e20d25f761ee70 | |
| parent | 4ce82fb8d9232e123d9e58b00851b775d1586646 (diff) | |
| download | emacs-7510a061cbcec1b0d0f255448c9bf81638004cdb.tar.gz | |
* src/marker.c (set_marker): Reformat documentation.
| -rw-r--r-- | doc/lispref/markers.texi | 3 | ||||
| -rw-r--r-- | doc/lispref/positions.texi | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/marker.c | 6 |
4 files changed, 11 insertions, 4 deletions
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index cae14ab9a78..05c3fc56fd4 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -279,6 +279,8 @@ This function returns the position that @var{marker} points to, or This function returns the buffer that @var{marker} points into, or @code{nil} if it points nowhere. +@c FIXME: The `buffer' argument of `set-marker' already defaults to +@c the current buffer, why use `(current-buffer)' explicitly here? @example @group (setq m (make-marker)) @@ -384,6 +386,7 @@ This is another name for @code{set-marker}. @node The Mark @section The Mark @cindex mark, the +@c @cindex the mark? @cindex mark ring Each buffer has a special marker, which is designated @dfn{the diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 5cb1a851a5b..8a883061b93 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -805,7 +805,7 @@ thousands of times in the Lisp sources of Emacs. buffer, use @code{save-current-buffer} or @code{with-current-buffer} instead (@pxref{Current Buffer}). If you need to save or restore window configurations, see the forms described in @ref{Window -Configurations} and in @ref{Frame Configurations}. +Configurations} and in @ref{Frame Configurations}. @c frameset? @defspec save-excursion body@dots{} @cindex mark excursion diff --git a/src/ChangeLog b/src/ChangeLog index 548ae5ab2c0..8a3186b85f2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,6 +6,10 @@ * decompress.c (unwind_decompress): Always restore point. +2013-08-14 Xue Fuqiao <xfq.free@gmail.com> + + * marker.c (set_marker): Reformat documentation. + 2013-08-14 Paul Eggert <eggert@cs.ucla.edu> * xdisp.c (cursor_type_changed): Now static. diff --git a/src/marker.c b/src/marker.c index 6c50def51a3..2f91bdf9727 100644 --- a/src/marker.c +++ b/src/marker.c @@ -534,9 +534,9 @@ set_marker_internal (Lisp_Object marker, Lisp_Object position, } 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) { |