# HG changeset patch
# User Ken Raeburn <raeburn@raeburn.org>
# Date 954372254 0
# Node ID f15029804aba6e469f9658fe16855b123e4064a1
# Parent  451721e784a8752ff4498a30f0283a910745e3a4
* scroll.c (CHECK_BOUNDS): Renamed from CHECK.
* emacs.c (main): Fix sense of no-loadup test.

diff -r 451721e784a8 -r f15029804aba src/ChangeLog
Binary file src/ChangeLog has changed
diff -r 451721e784a8 -r f15029804aba src/emacs.c
--- a/src/emacs.c	Wed Mar 29 22:14:34 2000 +0000
+++ b/src/emacs.c	Wed Mar 29 23:24:14 2000 +0000
@@ -1179,7 +1179,7 @@
     }
 
   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 -r 451721e784a8 -r f15029804aba src/scroll.c
--- a/src/scroll.c	Wed Mar 29 22:14:34 2000 +0000
+++ b/src/scroll.c	Wed Mar 29 23:24:14 2000 +0000
@@ -269,7 +269,7 @@
   for (k = 0; k < window_size; ++k)
     copy_from[k] = -1;
 
-#define CHECK								\
+#define CHECK_BOUNDS							\
   do									\
     {									\
       int k;								\
@@ -326,7 +326,7 @@
 	  retained_p[j] = 1;
 
 #if GLYPH_DEBUG
-	  CHECK;
+	  CHECK_BOUNDS;
 #endif
 	}
     }