diff lisp/subr.el @ 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 6fadd0a2230b
children 2b676dc88c66
line wrap: on
line diff
--- a/lisp/subr.el	Sat Mar 23 05:08:52 2002 +0000
+++ b/lisp/subr.el	Fri Mar 29 04:49:13 2002 +0000
@@ -869,6 +869,93 @@
   "Returns non-nil if SYM names a currently-defined error."
   (and (symbolp sym) (not (null (get sym 'error-conditions)))))
 
+(defun backtrace-in-condition-handler-eliminating-handler (handler-arg-name)
+  "Return a backtrace inside of a condition handler, eliminating the handler.
+This is for use in the condition handler inside of call-with-condition-handler,
+when written like this:
+
+\(call-with-condition-handler
+    #'(lambda (__some_weird_arg__)
+	do the handling ...)
+    #'(lambda ()
+	do the stuff that might cause an error))
+
+Pass in the name (a symbol) of the argument used in the lambda function
+that specifies the handler, and make sure the argument name is unique, and
+this function generates a backtrace and strips off the part above where the
+error occurred (i.e. the handler itself)."
+  (let* ((bt (with-output-to-string (backtrace nil t)))
+	 (bt (save-match-data
+	       ;; Try to eliminate the part of the backtrace
+	       ;; above where the error occurred.
+	       (if (string-match
+		    (concat "bind (\\(?:.* \\)?" (symbol-name handler-arg-name)
+			    "\\(?:.* \\)?)[ \t\n]*\\(?:(lambda \\|#<compiled-function \\)("
+			    (symbol-name handler-arg-name)
+			    ").*\n\\(\\(?:.\\|\n\\)*\\)$")
+		    bt) (match-string 1 bt) bt))))
+    bt))
+
+(put 'with-trapping-errors 'lisp-indent-function 0)
+(defmacro with-trapping-errors (&rest keys-body)
+  "Trap errors in BODY, outputting a warning and a backtrace.
+Usage looks like
+
+\(with-trapping-errors
+    [:operation OPERATION]
+    [:error-form ERROR-FORM]
+    [:no-backtrace NO-BACKTRACE]
+    [:class CLASS]
+    [:level LEVEL]
+    [:resignal RESIGNAL]
+    BODY)
+
+Return value without error is whatever BODY returns.  With error, return
+result of ERROR-FORM (which will be evaluated only when the error actually
+occurs), which defaults to nil.  OPERATION is given in the warning message.
+CLASS and LEVEL are the warning class and level (default to class
+`general', level `warning').  If NO-BACKTRACE is given, no backtrace is
+displayed.  If RESIGNAL is given, the error is resignaled after the warning
+is displayed and the ERROR-FORM is executed."
+  (let ((operation "unknown")
+	(error-form nil)
+	(no-backtrace nil)
+	(class ''general)
+	(level ''warning)
+	(resignal nil))
+    (let* ((keys '(operation error-form no-backtrace class level resignal))
+	   (keys-with-colon
+	    (mapcar #'(lambda (sym)
+			(intern (concat ":" (symbol-name sym)))) keys)))
+      (while (memq (car keys-body) keys-with-colon)
+	(let* ((key-with-colon (pop keys-body))
+	       (key (intern (substring (symbol-name key-with-colon) 1))))
+	  (set key (pop keys-body)))))
+    `(condition-case ,(if resignal '__cte_cc_var__ nil)
+	 (call-with-condition-handler
+	     #'(lambda (__call_trapping_errors_arg__)
+		 (let ((errstr (error-message-string
+				__call_trapping_errors_arg__)))
+		   ,(if no-backtrace
+			`(lwarn ,class ,level
+			   (if (warning-level-<
+				,level
+				display-warning-minimum-level)
+			       "Error in %s: %s"
+			     "Error in %s:\n%s\n")
+			   ,operation errstr)
+		      `(lwarn ,class ,level
+			 "Error in %s: %s\n\nBacktrace follows:\n\n%s"
+			 ,operation errstr
+			 (backtrace-in-condition-handler-eliminating-handler
+			  '__call_trapping_errors_arg__)))))
+	     #'(lambda ()
+		 (progn ,@keys-body)))
+       (error
+	,error-form
+	,@(if resignal '((signal (car __cte_cc_var__) (cdr __cte_cc_var__)))))
+       )))
+
 ;;;; Miscellanea.
 
 ;; This is now in C.