diff options
| author | Jim Blandy | 1992-01-13 21:48:08 +0000 |
|---|---|---|
| committer | Jim Blandy | 1992-01-13 21:48:08 +0000 |
| commit | 265a9e559da4ac72d154ecd638c51801b3e97847 (patch) | |
| tree | 633e4dc50761c2cd5201a7874e23eee9e51aecea /src/cmds.c | |
| parent | d427b66a664c0e1ffc818dfa5b87b45b4857d2ae (diff) | |
| download | emacs-265a9e559da4ac72d154ecd638c51801b3e97847.tar.gz emacs-265a9e559da4ac72d154ecd638c51801b3e97847.zip | |
*** empty log message ***
Diffstat (limited to 'src/cmds.c')
| -rw-r--r-- | src/cmds.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/cmds.c b/src/cmds.c index 18821e24b06..2a212ad6223 100644 --- a/src/cmds.c +++ b/src/cmds.c | |||
| @@ -33,7 +33,7 @@ On reaching end of buffer, stop and signal error.") | |||
| 33 | (n) | 33 | (n) |
| 34 | Lisp_Object n; | 34 | Lisp_Object n; |
| 35 | { | 35 | { |
| 36 | if (NULL (n)) | 36 | if (NILP (n)) |
| 37 | XFASTINT (n) = 1; | 37 | XFASTINT (n) = 1; |
| 38 | else | 38 | else |
| 39 | CHECK_NUMBER (n, 0); | 39 | CHECK_NUMBER (n, 0); |
| @@ -58,7 +58,7 @@ On attempt to pass beginning or end of buffer, stop and signal error.") | |||
| 58 | (n) | 58 | (n) |
| 59 | Lisp_Object n; | 59 | Lisp_Object n; |
| 60 | { | 60 | { |
| 61 | if (NULL (n)) | 61 | if (NILP (n)) |
| 62 | XFASTINT (n) = 1; | 62 | XFASTINT (n) = 1; |
| 63 | else | 63 | else |
| 64 | CHECK_NUMBER (n, 0); | 64 | CHECK_NUMBER (n, 0); |
| @@ -82,7 +82,7 @@ With positive ARG, a non-empty line at the end counts as one line\n\ | |||
| 82 | int pos; | 82 | int pos; |
| 83 | int count, shortage, negp; | 83 | int count, shortage, negp; |
| 84 | 84 | ||
| 85 | if (NULL (n)) | 85 | if (NILP (n)) |
| 86 | count = 1; | 86 | count = 1; |
| 87 | else | 87 | else |
| 88 | { | 88 | { |
| @@ -109,7 +109,7 @@ If scan reaches end of buffer, stop there without error.") | |||
| 109 | (n) | 109 | (n) |
| 110 | Lisp_Object n; | 110 | Lisp_Object n; |
| 111 | { | 111 | { |
| 112 | if (NULL (n)) | 112 | if (NILP (n)) |
| 113 | XFASTINT (n) = 1; | 113 | XFASTINT (n) = 1; |
| 114 | else | 114 | else |
| 115 | CHECK_NUMBER (n, 0); | 115 | CHECK_NUMBER (n, 0); |
| @@ -129,7 +129,7 @@ If scan reaches end of buffer, stop there without error.") | |||
| 129 | register int pos; | 129 | register int pos; |
| 130 | register int stop; | 130 | register int stop; |
| 131 | 131 | ||
| 132 | if (NULL (n)) | 132 | if (NILP (n)) |
| 133 | XFASTINT (n) = 1; | 133 | XFASTINT (n) = 1; |
| 134 | else | 134 | else |
| 135 | CHECK_NUMBER (n, 0); | 135 | CHECK_NUMBER (n, 0); |
| @@ -155,7 +155,7 @@ ARG was explicitly specified.") | |||
| 155 | { | 155 | { |
| 156 | CHECK_NUMBER (n, 0); | 156 | CHECK_NUMBER (n, 0); |
| 157 | 157 | ||
| 158 | if (NULL (killflag)) | 158 | if (NILP (killflag)) |
| 159 | { | 159 | { |
| 160 | if (XINT (n) < 0) | 160 | if (XINT (n) < 0) |
| 161 | { | 161 | { |
| @@ -225,7 +225,7 @@ In Auto Fill mode, if no numeric arg, break the preceding line if it's long.") | |||
| 225 | 225 | ||
| 226 | arg = Fprefix_numeric_value (arg1); | 226 | arg = Fprefix_numeric_value (arg1); |
| 227 | 227 | ||
| 228 | if (!NULL (current_buffer->read_only)) | 228 | if (!NILP (current_buffer->read_only)) |
| 229 | Fsignal (Qbuffer_read_only, Qnil); | 229 | Fsignal (Qbuffer_read_only, Qnil); |
| 230 | 230 | ||
| 231 | /* Inserting a newline at the end of a line | 231 | /* Inserting a newline at the end of a line |
| @@ -245,7 +245,7 @@ In Auto Fill mode, if no numeric arg, break the preceding line if it's long.") | |||
| 245 | if (flag) | 245 | if (flag) |
| 246 | insert (&c1, 1); | 246 | insert (&c1, 1); |
| 247 | else | 247 | else |
| 248 | internal_self_insert ('\n', !NULL (arg1)); | 248 | internal_self_insert ('\n', !NILP (arg1)); |
| 249 | XFASTINT (arg)--; /* Ok since old and new vals both nonneg */ | 249 | XFASTINT (arg)--; /* Ok since old and new vals both nonneg */ |
| 250 | } | 250 | } |
| 251 | 251 | ||
| @@ -265,10 +265,10 @@ internal_self_insert (c1, noautofill) | |||
| 265 | register enum syntaxcode synt; | 265 | register enum syntaxcode synt; |
| 266 | register int c = c1; | 266 | register int c = c1; |
| 267 | 267 | ||
| 268 | if (!NULL (Vbefore_change_function) || !NULL (Vafter_change_function)) | 268 | if (!NILP (Vbefore_change_function) || !NILP (Vafter_change_function)) |
| 269 | hairy = 1; | 269 | hairy = 1; |
| 270 | 270 | ||
| 271 | if (!NULL (current_buffer->overwrite_mode) | 271 | if (!NILP (current_buffer->overwrite_mode) |
| 272 | && point < ZV | 272 | && point < ZV |
| 273 | && c != '\n' && FETCH_CHAR (point) != '\n' | 273 | && c != '\n' && FETCH_CHAR (point) != '\n' |
| 274 | && (FETCH_CHAR (point) != '\t' | 274 | && (FETCH_CHAR (point) != '\t' |
| @@ -278,18 +278,18 @@ internal_self_insert (c1, noautofill) | |||
| 278 | del_range (point, point + 1); | 278 | del_range (point, point + 1); |
| 279 | hairy = 1; | 279 | hairy = 1; |
| 280 | } | 280 | } |
| 281 | if (!NULL (current_buffer->abbrev_mode) | 281 | if (!NILP (current_buffer->abbrev_mode) |
| 282 | && SYNTAX (c) != Sword | 282 | && SYNTAX (c) != Sword |
| 283 | && NULL (current_buffer->read_only) | 283 | && NILP (current_buffer->read_only) |
| 284 | && point > BEGV && SYNTAX (FETCH_CHAR (point - 1)) == Sword) | 284 | && point > BEGV && SYNTAX (FETCH_CHAR (point - 1)) == Sword) |
| 285 | { | 285 | { |
| 286 | tem = Fexpand_abbrev (); | 286 | tem = Fexpand_abbrev (); |
| 287 | if (!NULL (tem)) | 287 | if (!NILP (tem)) |
| 288 | hairy = 1; | 288 | hairy = 1; |
| 289 | } | 289 | } |
| 290 | if ((c == ' ' || c == '\n') | 290 | if ((c == ' ' || c == '\n') |
| 291 | && !noautofill | 291 | && !noautofill |
| 292 | && !NULL (current_buffer->auto_fill_function) | 292 | && !NILP (current_buffer->auto_fill_function) |
| 293 | && current_column () > XFASTINT (current_buffer->fill_column)) | 293 | && current_column () > XFASTINT (current_buffer->fill_column)) |
| 294 | { | 294 | { |
| 295 | if (c1 != '\n') | 295 | if (c1 != '\n') |
| @@ -303,7 +303,7 @@ internal_self_insert (c1, noautofill) | |||
| 303 | insert (&c1, 1); | 303 | insert (&c1, 1); |
| 304 | synt = SYNTAX (c); | 304 | synt = SYNTAX (c); |
| 305 | if ((synt == Sclose || synt == Smath) | 305 | if ((synt == Sclose || synt == Smath) |
| 306 | && !NULL (Vblink_paren_function) && INTERACTIVE) | 306 | && !NILP (Vblink_paren_function) && INTERACTIVE) |
| 307 | { | 307 | { |
| 308 | call0 (Vblink_paren_function); | 308 | call0 (Vblink_paren_function); |
| 309 | hairy = 1; | 309 | hairy = 1; |