aboutsummaryrefslogtreecommitdiffstats
path: root/src/marker.c
diff options
context:
space:
mode:
authorJim Blandy1992-01-13 21:48:03 +0000
committerJim Blandy1992-01-13 21:48:03 +0000
commitd427b66a664c0e1ffc818dfa5b87b45b4857d2ae (patch)
treea3255be5cf521ab9c44b9fdfd06a0466274be421 /src/marker.c
parentb2c9579f172da05112f29b664de6d8da98c1e813 (diff)
downloademacs-d427b66a664c0e1ffc818dfa5b87b45b4857d2ae.tar.gz
emacs-d427b66a664c0e1ffc818dfa5b87b45b4857d2ae.zip
entered into RCS
Diffstat (limited to 'src/marker.c')
-rw-r--r--src/marker.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/marker.c b/src/marker.c
index d8c0a89819a..6c26e72fae4 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -36,7 +36,7 @@ Returns nil if MARKER points into a dead buffer.")
36 { 36 {
37 XSET (buf, Lisp_Buffer, XMARKER (marker)->buffer); 37 XSET (buf, Lisp_Buffer, XMARKER (marker)->buffer);
38 /* Return marker's buffer only if it is not dead. */ 38 /* Return marker's buffer only if it is not dead. */
39 if (!NULL (XBUFFER (buf)->name)) 39 if (!NILP (XBUFFER (buf)->name))
40 return buf; 40 return buf;
41 } 41 }
42 return Qnil; 42 return Qnil;
@@ -87,7 +87,7 @@ 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 (NULL (pos) 90 if (NILP (pos)
91 || (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer)) 91 || (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer))
92 { 92 {
93 unchain_marker (marker); 93 unchain_marker (marker);
@@ -95,7 +95,7 @@ Returns MARKER.")
95 } 95 }
96 96
97 CHECK_NUMBER_COERCE_MARKER (pos, 1); 97 CHECK_NUMBER_COERCE_MARKER (pos, 1);
98 if (NULL (buffer)) 98 if (NILP (buffer))
99 b = current_buffer; 99 b = current_buffer;
100 else 100 else
101 { 101 {
@@ -144,7 +144,7 @@ set_marker_restricted (marker, pos, buffer)
144 CHECK_MARKER (marker, 0); 144 CHECK_MARKER (marker, 0);
145 /* If position is nil or a marker that points nowhere, 145 /* If position is nil or a marker that points nowhere,
146 make this marker point nowhere. */ 146 make this marker point nowhere. */
147 if (NULL (pos) || 147 if (NILP (pos) ||
148 (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer)) 148 (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer))
149 { 149 {
150 unchain_marker (marker); 150 unchain_marker (marker);
@@ -152,7 +152,7 @@ set_marker_restricted (marker, pos, buffer)
152 } 152 }
153 153
154 CHECK_NUMBER_COERCE_MARKER (pos, 1); 154 CHECK_NUMBER_COERCE_MARKER (pos, 1);
155 if (NULL (buffer)) 155 if (NILP (buffer))
156 b = current_buffer; 156 b = current_buffer;
157 else 157 else
158 { 158 {
@@ -215,7 +215,7 @@ unchain_marker (marker)
215 215
216 if (XMARKER (marker) == XMARKER (tail)) 216 if (XMARKER (marker) == XMARKER (tail))
217 { 217 {
218 if (NULL (prev)) 218 if (NILP (prev))
219 { 219 {
220 b->markers = next; 220 b->markers = next;
221 /* Deleting first marker from the buffer's chain. 221 /* Deleting first marker from the buffer's chain.