diff options
| author | Stefan Monnier | 2010-08-30 14:47:49 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-08-30 14:47:49 +0200 |
| commit | cd196f125640597cb91f3f66ae2608c6923044fa (patch) | |
| tree | c4f8e4d63ec616a51ef03b1ea750ae0a305c17b6 /src | |
| parent | 598451ed0679d066568983c8d66d3fc29b354813 (diff) | |
| download | emacs-cd196f125640597cb91f3f66ae2608c6923044fa.tar.gz emacs-cd196f125640597cb91f3f66ae2608c6923044fa.zip | |
* src/marker.c (Fcopy_marker): Make the first arg optional.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/marker.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4e4f96786d9..fe97d576b9c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-08-30 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * marker.c (Fcopy_marker): Make the first arg optional. | ||
| 4 | |||
| 1 | 2010-08-30 Kenichi Handa <handa@m17n.org> | 5 | 2010-08-30 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * composite.c (composition_update_it): Fix computing of | 7 | * composite.c (composition_update_it): Fix computing of |
diff --git a/src/marker.c b/src/marker.c index 911d2e57706..b5ea80562df 100644 --- a/src/marker.c +++ b/src/marker.c | |||
| @@ -806,16 +806,18 @@ marker_byte_position (Lisp_Object marker) | |||
| 806 | return i; | 806 | return i; |
| 807 | } | 807 | } |
| 808 | 808 | ||
| 809 | DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 1, 2, 0, | 809 | DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 0, 2, 0, |
| 810 | doc: /* Return a new marker pointing at the same place as MARKER. | 810 | doc: /* Return a new marker pointing at the same place as MARKER. |
| 811 | If argument is a number, makes a new marker pointing | 811 | If argument is a number, makes a new marker pointing |
| 812 | at that position in the current buffer. | 812 | at that position in the current buffer. |
| 813 | If MARKER is not specified, the new marker does not point anywhere. | ||
| 813 | The optional argument TYPE specifies the insertion type of the new marker; | 814 | The optional argument TYPE specifies the insertion type of the new marker; |
| 814 | see `marker-insertion-type'. */) | 815 | see `marker-insertion-type'. */) |
| 815 | (register Lisp_Object marker, Lisp_Object type) | 816 | (register Lisp_Object marker, Lisp_Object type) |
| 816 | { | 817 | { |
| 817 | register Lisp_Object new; | 818 | register Lisp_Object new; |
| 818 | 819 | ||
| 820 | if (!NILP (marker)) | ||
| 819 | CHECK_TYPE (INTEGERP (marker) || MARKERP (marker), Qinteger_or_marker_p, marker); | 821 | CHECK_TYPE (INTEGERP (marker) || MARKERP (marker), Qinteger_or_marker_p, marker); |
| 820 | 822 | ||
| 821 | new = Fmake_marker (); | 823 | new = Fmake_marker (); |