diff src/eval.c @ 793:e38acbeb1cae

[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 943eaba38521
children a5954632b187
line wrap: on
line diff
--- a/src/eval.c	Sat Mar 23 05:08:52 2002 +0000
+++ b/src/eval.c	Fri Mar 29 04:49:13 2002 +0000
@@ -1,7 +1,7 @@
 /* Evaluator for XEmacs Lisp interpreter.
    Copyright (C) 1985-1987, 1992-1994 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 2000, 2001 Ben Wing.
+   Copyright (C) 2000, 2001, 2002 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -141,6 +141,15 @@
    See call_with_suspended_errors(). */
 Lisp_Object Vcurrent_warning_class;
 
+/* Current warning level when warnings occur, or nil for no warnings.
+   Only meaningful when Vcurrent_error_state is non-nil.
+   See call_with_suspended_errors(). */
+Lisp_Object Vcurrent_warning_level;
+
+/* Minimum level at which warnings are logged.  Below this, they're ignored
+   entirely -- not even generated. */
+Lisp_Object Vlog_warning_minimum_level;
+
 /* Special catch tag used in call_with_suspended_errors(). */
 Lisp_Object Qunbound_suspended_errors_tag;
 
@@ -1170,7 +1179,7 @@
     ((INTP (documentation) && XINT (documentation) < 0) ||
 
      (STRINGP (documentation) &&
-      (string_byte (XSTRING (documentation), 0) == '*')) ||
+      (XSTRING_BYTE (documentation, 0) == '*')) ||
 
      /* If (STRING . INTEGER), a negative integer means a user variable. */
      (CONSP (documentation)
@@ -1422,7 +1431,7 @@
 #ifdef DEFEND_AGAINST_THROW_RECURSION
   /* die if we recurse more than is reasonable */
   if (++throw_level > 20)
-    abort();
+    abort ();
 #endif
 
   /* If bomb_out_p is t, this is being called from Fsignal as a
@@ -2103,8 +2112,8 @@
   GCPRO1 (data);
   if (!NILP (Vcurrent_error_state))
     {
-      if (!NILP (Vcurrent_warning_class))
-	warn_when_safe_lispobj (Vcurrent_warning_class, Qwarning,
+      if (!NILP (Vcurrent_warning_class) && !NILP (Vcurrent_warning_level))
+	warn_when_safe_lispobj (Vcurrent_warning_class, Vcurrent_warning_level,
 				Fcons (error_symbol, data));
       Fthrow (Qunbound_suspended_errors_tag, Qnil);
       abort (); /* Better not get here! */
@@ -2148,6 +2157,13 @@
 }
 
 static Lisp_Object
+restore_current_warning_level (Lisp_Object warning_level)
+{
+  Vcurrent_warning_level = warning_level;
+  return Qnil;
+}
+
+static Lisp_Object
 restore_current_error_state (Lisp_Object error_state)
 {
   Vcurrent_error_state = error_state;
@@ -2159,17 +2175,16 @@
 {
   Lisp_Object val;
   Lisp_Object *kludgy_args = (Lisp_Object *) get_opaque_ptr (opaque_arg);
-  Lisp_Object no_error = kludgy_args[2];
   int speccount = specpdl_depth ();
 
-  if (!EQ (Vcurrent_error_state, no_error))
+  if (NILP (Vcurrent_error_state))
     {
       record_unwind_protect (restore_current_error_state,
 			     Vcurrent_error_state);
-      Vcurrent_error_state = no_error;
+      Vcurrent_error_state = Qt;
     }
   PRIMITIVE_FUNCALL (val, get_opaque_ptr (kludgy_args[0]),
-		     kludgy_args + 3, XINT (kludgy_args[1]));
+		     kludgy_args + 2, XINT (kludgy_args[1]));
   return unbind_to_1 (speccount, val);
 }
 
@@ -2195,38 +2210,31 @@
 {
   va_list vargs;
   int speccount;
-  Lisp_Object kludgy_args[23];
-  Lisp_Object *args = kludgy_args + 3;
+  Lisp_Object kludgy_args[22];
+  Lisp_Object *args = kludgy_args + 2;
   int i;
-  Lisp_Object no_error;
 
   assert (SYMBOLP (class)); /* sanity-check */
   assert (!NILP (class));
   assert (nargs >= 0 && nargs < 20);
 
-  /* ERROR_ME means don't trap errors. (However, if errors are
-     already trapped, we leave them trapped.)
-
-     Otherwise, we trap errors, and trap warnings if ERROR_ME_WARN.
-
-     If ERROR_ME_NOT, it causes no warnings even if warnings
-     were previously enabled.  However, we never change the
-     warning class from one to another. */
-  if (!ERRB_EQ (errb, ERROR_ME))
-    {
-      if (ERRB_EQ (errb, ERROR_ME_NOT)) /* person wants no warnings */
-	class = Qnil;
-      errb = ERROR_ME_NOT;
-      no_error = Qt;
-    }
-  else
-    no_error = Qnil;
-
   va_start (vargs, nargs);
   for (i = 0; i < nargs; i++)
     args[i] = va_arg (vargs, Lisp_Object);
   va_end (vargs);
 
+  /* ERROR_ME means don't trap errors. (However, if errors are
+     already trapped, we leave them trapped.)
+
+     Otherwise, we trap errors, and display as warnings if ERROR_ME_WARN.
+
+     If ERROR_ME_NOT, we silently fail.
+     
+     If ERROR_ME_DEBUG_WARN, we display a warning, but at warning level to
+     `debug'.  Normally these disappear, but can be seen if we changed
+     log-warning-minimum-level.
+     */
+
   /* If error-checking is not disabled, just call the function.
      It's important not to override disabled error-checking with
      enabled error-checking. */
@@ -2239,17 +2247,23 @@
     }
 
   speccount = specpdl_depth ();
-  if (NILP (class) || NILP (Vcurrent_warning_class))
+  if (NILP (Vcurrent_warning_class))
     {
-      /* If we're currently calling for no warnings, then make it so.
-	 If we're currently calling for warnings and we weren't
-	 previously, then set our warning class; otherwise, leave
-	 the existing one alone. */
+      /* Don't change the existing class.
+	 #### Should we be consing the two together? */
       record_unwind_protect (restore_current_warning_class,
 			     Vcurrent_warning_class);
       Vcurrent_warning_class = class;
     }
 
+  record_unwind_protect (restore_current_warning_level,
+			 Vcurrent_warning_level);
+  Vcurrent_warning_level =
+    (ERRB_EQ (errb, ERROR_ME_NOT) ? Qnil :
+     ERRB_EQ (errb, ERROR_ME_DEBUG_WARN) ? Qdebug :
+     Qwarning);
+  
+
   {
     int threw;
     Lisp_Object the_retval;
@@ -2260,7 +2274,6 @@
     GCPRO2 (opaque1, opaque2);
     kludgy_args[0] = opaque2;
     kludgy_args[1] = make_int (nargs);
-    kludgy_args[2] = no_error;
     the_retval = internal_catch (Qunbound_suspended_errors_tag,
 				 call_with_suspended_errors_1,
 				 opaque1, &threw);
@@ -2286,6 +2299,8 @@
 {
   if (ERRB_EQ (errb, ERROR_ME_NOT))
     return;
+  else if (ERRB_EQ (errb, ERROR_ME_DEBUG_WARN))
+    warn_when_safe_lispobj (class, Qdebug, Fcons (sig, data));
   else if (ERRB_EQ (errb, ERROR_ME_WARN))
     warn_when_safe_lispobj (class, Qwarning, Fcons (sig, data));
   else
@@ -2302,6 +2317,11 @@
 {
   if (ERRB_EQ (errb, ERROR_ME_NOT))
     return Qnil;
+  else if (ERRB_EQ (errb, ERROR_ME_DEBUG_WARN))
+    {
+      warn_when_safe_lispobj (class, Qdebug, Fcons (sig, data));
+      return Qnil;
+    }
   else if (ERRB_EQ (errb, ERROR_ME_WARN))
     {
       warn_when_safe_lispobj (class, Qwarning, Fcons (sig, data));
@@ -4502,7 +4522,7 @@
   Lisp_Object opaque;
   struct gcpro gcpro1, gcpro2;
 
-  XSETBUFFER (buffer, buf);
+  buffer = wrap_buffer (buf);
 
   specbind (Qinhibit_quit, Qt);
   /* begin_gc_forbidden(); Currently no reason to do this; */
@@ -5267,6 +5287,12 @@
 warn_when_safe_lispobj (Lisp_Object class, Lisp_Object level,
 			Lisp_Object obj)
 {
+  /* Don't even generate debug warnings if they're going to be discarded,
+     to avoid excessive consing. */
+  if (EQ (level, Qdebug) && !NILP (Vlog_warning_minimum_level) &&
+      !EQ (Vlog_warning_minimum_level, Qdebug))
+    return;
+  
   obj = list1 (list3 (class, level, obj));
   if (NILP (Vpending_warnings))
     Vpending_warnings = Vpending_warnings_tail = obj;
@@ -5290,6 +5316,12 @@
   Lisp_Object obj;
   va_list args;
 
+  /* Don't even generate debug warnings if they're going to be discarded,
+     to avoid excessive consing. */
+  if (EQ (level, Qdebug) && !NILP (Vlog_warning_minimum_level) &&
+      !EQ (Vlog_warning_minimum_level, Qdebug))
+    return;
+  
   va_start (args, fmt);
   obj = emacs_vsprintf_string (CGETTEXT (fmt), args);
   va_end (args);
@@ -5529,6 +5561,9 @@
   dump_add_root_object (&Vpending_warnings_tail);
   Vpending_warnings_tail = Qnil;
 
+  DEFVAR_LISP ("log-warning-minimum-level", &Vlog_warning_minimum_level);
+  Vlog_warning_minimum_level = Qinfo;
+
   staticpro (&Vautoload_queue);
   Vautoload_queue = Qnil;
 
@@ -5537,6 +5572,9 @@
   staticpro (&Vcurrent_warning_class);
   Vcurrent_warning_class = Qnil;
 
+  staticpro (&Vcurrent_warning_level);
+  Vcurrent_warning_level = Qnil;
+
   staticpro (&Vcurrent_error_state);
   Vcurrent_error_state = Qnil; /* errors as normal */
 }