comparison src/marker.c @ 14082:c6a1708f37d4

(Fset_marker): Harmonize arguments with documentation.
author Erik Naggum <erik@naggum.no>
date Tue, 09 Jan 1996 00:33:13 +0000
parents e518c2be8d7b
children ee40177f6c68
comparison
equal deleted inserted replaced
14081:addc50fc3981 14082:c6a1708f37d4
70 } 70 }
71 return Qnil; 71 return Qnil;
72 } 72 }
73 73
74 DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, 74 DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0,
75 "Position MARKER before character number NUMBER in BUFFER.\n\ 75 "Position MARKER before character number POSITION in BUFFER.\n\
76 BUFFER defaults to the current buffer.\n\ 76 BUFFER defaults to the current buffer.\n\
77 If NUMBER is nil, makes marker point nowhere.\n\ 77 If POSITION is nil, makes marker point nowhere.\n\
78 Then it no longer slows down editing in any buffer.\n\ 78 Then it no longer slows down editing in any buffer.\n\
79 Returns MARKER.") 79 Returns MARKER.")
80 (marker, pos, buffer) 80 (marker, position, buffer)
81 Lisp_Object marker, pos, buffer; 81 Lisp_Object marker, position, buffer;
82 { 82 {
83 register int charno; 83 register int charno;
84 register struct buffer *b; 84 register struct buffer *b;
85 register struct Lisp_Marker *m; 85 register struct Lisp_Marker *m;
86 86
87 CHECK_MARKER (marker, 0); 87 CHECK_MARKER (marker, 0);
88 /* If position is nil or a marker that points nowhere, 88 /* If position is nil or a marker that points nowhere,
89 make this marker point nowhere. */ 89 make this marker point nowhere. */
90 if (NILP (pos) 90 if (NILP (position)
91 || (MARKERP (pos) && !XMARKER (pos)->buffer)) 91 || (MARKERP (position) && !XMARKER (position)->buffer))
92 { 92 {
93 unchain_marker (marker); 93 unchain_marker (marker);
94 return marker; 94 return marker;
95 } 95 }
96 96
97 CHECK_NUMBER_COERCE_MARKER (pos, 1); 97 CHECK_NUMBER_COERCE_MARKER (position, 1);
98 if (NILP (buffer)) 98 if (NILP (buffer))
99 b = current_buffer; 99 b = current_buffer;
100 else 100 else
101 { 101 {
102 CHECK_BUFFER (buffer, 1); 102 CHECK_BUFFER (buffer, 1);
107 unchain_marker (marker); 107 unchain_marker (marker);
108 return marker; 108 return marker;
109 } 109 }
110 } 110 }
111 111
112 charno = XINT (pos); 112 charno = XINT (position);
113 m = XMARKER (marker); 113 m = XMARKER (marker);
114 114
115 if (charno < BUF_BEG (b)) 115 if (charno < BUF_BEG (b))
116 charno = BUF_BEG (b); 116 charno = BUF_BEG (b);
117 if (charno > BUF_Z (b)) 117 if (charno > BUF_Z (b))