From: Ken Raeburn <raeburn@raeburn.org>
Date: Wed, 29 Mar 2000 23:24:14 +0000 (+0000)
Subject: * scroll.c (CHECK_BOUNDS): Renamed from CHECK.
X-Git-Tag: emacs-pretest-21.0.90~4418
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b96f9fb741056fac6bc8c2f4d68ec7a08a0a0f94;p=emacs.git

* scroll.c (CHECK_BOUNDS): Renamed from CHECK.
* emacs.c (main): Fix sense of no-loadup test.
---

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
 	}
     }