summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@raeburn.org>2000-03-29 23:24:14 +0000
committerKen Raeburn <raeburn@raeburn.org>2000-03-29 23:24:14 +0000
commitf1b65041e9bbcafb3cf45a825474236044ad36c0 (patch)
tree18b4f81c01d15102f70c7f829e0389180985a94e /src
parentc9b0c1a0e57a4f7783eb03ac2900bf1e1125d6ba (diff)
downloademacs-f1b65041e9bbcafb3cf45a825474236044ad36c0.tar.gz
* scroll.c (CHECK_BOUNDS): Renamed from CHECK.
* emacs.c (main): Fix sense of no-loadup test.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c2
-rw-r--r--src/scroll.c4
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cf1050bb1ea..6bc687b6167 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2000-03-29 Ken Raeburn <raeburn@gnu.org>
+ * scroll.c (CHECK_BOUNDS): Renamed from CHECK.
+
+ * emacs.c (main): Fix sense of no-loadup test.
+
* config.in (ENABLE_CHECKING): Undef.
* lisp.h (struct interval): Replace "parent" field with a union of
diff --git a/src/emacs.c b/src/emacs.c
index 1c4e3d0423a..caca50efa9d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1179,7 +1179,7 @@ main (argc, argv, envp)
}
no_loadup
- = !argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
+ = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
#ifdef HAVE_X_WINDOWS
diff --git a/src/scroll.c b/src/scroll.c
index 727d96442b5..fcb2e0e791a 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -269,7 +269,7 @@ do_scrolling (current_matrix, matrix, window_size, unchanged_at_top)
for (k = 0; k < window_size; ++k)
copy_from[k] = -1;
-#define CHECK \
+#define CHECK_BOUNDS \
do \
{ \
int k; \
@@ -326,7 +326,7 @@ do_scrolling (current_matrix, matrix, window_size, unchanged_at_top)
retained_p[j] = 1;
#if GLYPH_DEBUG
- CHECK;
+ CHECK_BOUNDS;
#endif
}
}