diff options
| author | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
| commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
| tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /src/marker.c | |
| parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
| parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
| download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip | |
Merge from mainline.
Diffstat (limited to 'src/marker.c')
| -rw-r--r-- | src/marker.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, | |||
| 534 | } | 534 | } |
| 535 | 535 | ||
| 536 | DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, | 536 | DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, |
| 537 | doc: /* Position MARKER before character number POSITION in BUFFER, | 537 | doc: /* Position MARKER before character number POSITION in BUFFER. |
| 538 | which defaults to the current buffer. If POSITION is nil, | 538 | If BUFFER is omitted or nil, it defaults to the current buffer. If |
| 539 | makes marker point nowhere so it no longer slows down | 539 | POSITION is nil, makes marker point nowhere so it no longer slows down |
| 540 | editing in any buffer. Returns MARKER. */) | 540 | editing in any buffer. Returns MARKER. */) |
| 541 | (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer) | 541 | (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer) |
| 542 | { | 542 | { |