aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPavel Janík2001-10-31 11:06:47 +0000
committerPavel Janík2001-10-31 11:06:47 +0000
commit2e1280f865e818f4faae2eea6030a9ed55997f92 (patch)
tree40ddcd4290ad4c32b5ee39d99a730f40b41bdb44 /src
parent28b927d85e395104dcda8bf7057ea88c05fc810c (diff)
downloademacs-2e1280f865e818f4faae2eea6030a9ed55997f92.tar.gz
emacs-2e1280f865e818f4faae2eea6030a9ed55997f92.zip
Change doc-string comments to `new style' [w/`doc:' keyword].
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/marker.c59
2 files changed, 34 insertions, 30 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 98c2e0d87c5..689de4ccd30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-10-31 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2
3 * marker.c: Change doc-string comments to `new style' [w/`doc:'
4 keyword].
5
12001-10-31 Gerd Moellmann <gerd@gnu.org> 62001-10-31 Gerd Moellmann <gerd@gnu.org>
2 7
3 * fns.c (require_unwind): Return Lisp_Object. 8 * fns.c (require_unwind): Return Lisp_Object.
diff --git a/src/marker.c b/src/marker.c
index 7ef5b2a2bbd..2ba164d2dc4 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -428,9 +428,9 @@ buf_bytepos_to_charpos (b, bytepos)
428/* Operations on markers. */ 428/* Operations on markers. */
429 429
430DEFUN ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0, 430DEFUN ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0,
431 "Return the buffer that MARKER points into, or nil if none.\n\ 431 doc: /* Return the buffer that MARKER points into, or nil if none.
432Returns nil if MARKER points into a dead buffer.") 432Returns nil if MARKER points into a dead buffer. */)
433 (marker) 433 (marker)
434 register Lisp_Object marker; 434 register Lisp_Object marker;
435{ 435{
436 register Lisp_Object buf; 436 register Lisp_Object buf;
@@ -446,8 +446,8 @@ Returns nil if MARKER points into a dead buffer.")
446} 446}
447 447
448DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0, 448DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
449 "Return the position MARKER points at, as a character number.") 449 doc: /* Return the position MARKER points at, as a character number. */)
450 (marker) 450 (marker)
451 Lisp_Object marker; 451 Lisp_Object marker;
452{ 452{
453 CHECK_MARKER (marker, 0); 453 CHECK_MARKER (marker, 0);
@@ -458,12 +458,12 @@ DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
458} 458}
459 459
460DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, 460DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0,
461 "Position MARKER before character number POSITION in BUFFER.\n\ 461 doc: /* Position MARKER before character number POSITION in BUFFER.
462BUFFER defaults to the current buffer.\n\ 462BUFFER defaults to the current buffer.
463If POSITION is nil, makes marker point nowhere.\n\ 463If POSITION is nil, makes marker point nowhere.
464Then it no longer slows down editing in any buffer.\n\ 464Then it no longer slows down editing in any buffer.
465Returns MARKER.") 465Returns MARKER. */)
466 (marker, position, buffer) 466 (marker, position, buffer)
467 Lisp_Object marker, position, buffer; 467 Lisp_Object marker, position, buffer;
468{ 468{
469 register int charno, bytepos; 469 register int charno, bytepos;
@@ -816,12 +816,12 @@ marker_byte_position (marker)
816} 816}
817 817
818DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 1, 2, 0, 818DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 1, 2, 0,
819 "Return a new marker pointing at the same place as MARKER.\n\ 819 doc: /* Return a new marker pointing at the same place as MARKER.
820If argument is a number, makes a new marker pointing\n\ 820If argument is a number, makes a new marker pointing
821at that position in the current buffer.\n\ 821at that position in the current buffer.
822The optional argument TYPE specifies the insertion type of the new marker;\n\ 822The optional argument TYPE specifies the insertion type of the new marker;
823see `marker-insertion-type'.") 823see `marker-insertion-type'. */)
824 (marker, type) 824 (marker, type)
825 register Lisp_Object marker, type; 825 register Lisp_Object marker, type;
826{ 826{
827 register Lisp_Object new; 827 register Lisp_Object new;
@@ -838,9 +838,9 @@ see `marker-insertion-type'.")
838 838
839DEFUN ("marker-insertion-type", Fmarker_insertion_type, 839DEFUN ("marker-insertion-type", Fmarker_insertion_type,
840 Smarker_insertion_type, 1, 1, 0, 840 Smarker_insertion_type, 1, 1, 0,
841 "Return insertion type of MARKER: t if it stays after inserted text.\n\ 841 doc: /* Return insertion type of MARKER: t if it stays after inserted text.
842nil means the marker stays before text inserted there.") 842nil means the marker stays before text inserted there. */)
843 (marker) 843 (marker)
844 register Lisp_Object marker; 844 register Lisp_Object marker;
845{ 845{
846 CHECK_MARKER (marker, 0); 846 CHECK_MARKER (marker, 0);
@@ -849,10 +849,10 @@ nil means the marker stays before text inserted there.")
849 849
850DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type, 850DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type,
851 Sset_marker_insertion_type, 2, 2, 0, 851 Sset_marker_insertion_type, 2, 2, 0,
852 "Set the insertion-type of MARKER to TYPE.\n\ 852 doc: /* Set the insertion-type of MARKER to TYPE.
853If TYPE is t, it means the marker advances when you insert text at it.\n\ 853If TYPE is t, it means the marker advances when you insert text at it.
854If TYPE is nil, it means the marker stays behind when you insert text at it.") 854If TYPE is nil, it means the marker stays behind when you insert text at it. */)
855 (marker, type) 855 (marker, type)
856 Lisp_Object marker, type; 856 Lisp_Object marker, type;
857{ 857{
858 CHECK_MARKER (marker, 0); 858 CHECK_MARKER (marker, 0);
@@ -862,10 +862,10 @@ If TYPE is nil, it means the marker stays behind when you insert text at it.")
862} 862}
863 863
864DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, Sbuffer_has_markers_at, 864DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, Sbuffer_has_markers_at,
865 1, 1, 0, 865 1, 1, 0,
866 "Return t if there are markers pointing at POSITION in the current buffer.") 866 doc: /* Return t if there are markers pointing at POSITION in the current buffer. */)
867 (position) 867 (position)
868 Lisp_Object position; 868 Lisp_Object position;
869{ 869{
870 register Lisp_Object tail; 870 register Lisp_Object tail;
871 register int charno; 871 register int charno;
@@ -898,7 +898,6 @@ syms_of_marker ()
898 defsubr (&Sbuffer_has_markers_at); 898 defsubr (&Sbuffer_has_markers_at);
899 899
900 DEFVAR_BOOL ("byte-debug-flag", &byte_debug_flag, 900 DEFVAR_BOOL ("byte-debug-flag", &byte_debug_flag,
901 "Non-nil enables debugging checks in byte/char position conversions."); 901 doc: /* Non-nil enables debugging checks in byte/char position conversions. */);
902 byte_debug_flag = 0; 902 byte_debug_flag = 0;
903
904} 903}