From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 19 Oct 2000 12:03:08 +0000 (+0000)
Subject: (skip_debugger): Prevent a compiler warning.
X-Git-Tag: emacs-pretest-21.0.90~750
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17401c97e685c7c966f62298451678fbd11e93c4;p=emacs.git

(skip_debugger): Prevent a compiler warning.
(Fcondition_case): Likewise.
(Fbacktrace_frame): Use a null interactive spec.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4711516ba31..69651dc5ce9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-19  Gerd Moellmann  <gerd@gnu.org>
+
+	* eval.c (skip_debugger): Prevent a compiler warning.
+	(Fcondition_case): Likewise.
+	(Fbacktrace_frame): Use a null interactive spec.
+
 2000-10-19  Kenichi Handa  <handa@etl.go.jp>
 
 	* xterm.c (x_find_ccl_program): Check also fontp->full_name.
diff --git a/src/eval.c b/src/eval.c
index 269eb4e95b7..f42ebc6979b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1126,7 +1126,8 @@ See also the function `signal' for more info.")
   Lisp_Object val;
   struct catchtag c;
   struct handler h;
-  register Lisp_Object var, bodyform, handlers;
+  register Lisp_Object bodyform, handlers;
+  volatile Lisp_Object var;
 
   var      = Fcar (args);
   bodyform = Fcar (Fcdr (args));
@@ -1480,8 +1481,8 @@ skip_debugger (conditions, data)
   int first_string = 1;
   Lisp_Object error_message;
 
-  for (tail = Vdebug_ignored_errors; CONSP (tail);
-       tail = XCDR (tail))
+  error_message = Qnil;
+  for (tail = Vdebug_ignored_errors; CONSP (tail); tail = XCDR (tail))
     {
       if (STRINGP (XCAR (tail)))
 	{
@@ -1490,6 +1491,7 @@ skip_debugger (conditions, data)
 	      error_message = Ferror_message_string (data);
 	      first_string = 0;
 	    }
+	  
 	  if (fast_string_match (XCAR (tail), error_message) >= 0)
 	    return 1;
 	}
@@ -1497,8 +1499,7 @@ skip_debugger (conditions, data)
 	{
 	  Lisp_Object contail;
 
-	  for (contail = conditions; CONSP (contail);
-	       contail = XCDR (contail))
+	  for (contail = conditions; CONSP (contail); contail = XCDR (contail))
 	    if (EQ (XCAR (tail), XCAR (contail)))
 	      return 1;
 	}
@@ -3111,7 +3112,7 @@ Output stream used is value of `standard-output'.")
   return Qnil;
 }
 
-DEFUN ("backtrace-frame", Fbacktrace_frame, Sbacktrace_frame, 1, 1, "",
+DEFUN ("backtrace-frame", Fbacktrace_frame, Sbacktrace_frame, 1, 1, NULL,
   "Return the function and arguments NFRAMES up from current execution point.\n\
 If that frame has not evaluated the arguments yet (or is a special form),\n\
 the value is (nil FUNCTION ARG-FORMS...).\n\