aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Naggum1996-01-09 00:33:13 +0000
committerErik Naggum1996-01-09 00:33:13 +0000
commit9be191c94f5f8756680949d010f0735113ff0dae (patch)
tree32cc9d7155ae60a38623477a90b9cf086fa4684c /src
parent86a3ca5e06b2a62b36f6403ba490c052f274bf28 (diff)
downloademacs-9be191c94f5f8756680949d010f0735113ff0dae.tar.gz
emacs-9be191c94f5f8756680949d010f0735113ff0dae.zip
(Fset_marker): Harmonize arguments with documentation.
Diffstat (limited to 'src')
-rw-r--r--src/marker.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/marker.c b/src/marker.c
index 8aff8a5c7c5..fb97c064cf5 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -72,13 +72,13 @@ DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
72} 72}
73 73
74DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, 74DEFUN ("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\
76BUFFER defaults to the current buffer.\n\ 76BUFFER defaults to the current buffer.\n\
77If NUMBER is nil, makes marker point nowhere.\n\ 77If POSITION is nil, makes marker point nowhere.\n\
78Then it no longer slows down editing in any buffer.\n\ 78Then it no longer slows down editing in any buffer.\n\
79Returns MARKER.") 79Returns 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;
@@ -87,14 +87,14 @@ Returns MARKER.")
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
@@ -109,7 +109,7 @@ Returns 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))