diff options
| author | stanton <stanton> | 1999-01-29 00:34:29 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-01-29 00:34:29 (GMT) |
| commit | 998addcce72a803065cfee27b0b2766989d01499 (patch) | |
| tree | 8662f91294e6050caa6af79fd634480c5a1eab4d /library | |
| parent | 89aede68cdad0d2c46f898878aaeb6938693dc7b (diff) | |
| download | tk-998addcce72a803065cfee27b0b2766989d01499.zip tk-998addcce72a803065cfee27b0b2766989d01499.tar.gz tk-998addcce72a803065cfee27b0b2766989d01499.tar.bz2 | |
Merged changes from Tk 8.0.5b1
Diffstat (limited to 'library')
| -rw-r--r-- | library/bgerror.tcl | 5 | ||||
| -rw-r--r-- | library/tk.tcl | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/library/bgerror.tcl b/library/bgerror.tcl index a863145..e16b682 100644 --- a/library/bgerror.tcl +++ b/library/bgerror.tcl @@ -4,7 +4,7 @@ # posts a dialog box with the error message and gives the user a chance # to see a more detailed stack trace. # -# RCS: @(#) $Id: bgerror.tcl,v 1.1.4.2 1998/09/30 02:17:29 stanton Exp $ +# RCS: @(#) $Id: bgerror.tcl,v 1.1.4.3 1999/01/29 00:34:33 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -35,7 +35,8 @@ proc bgerror err { # code from the tkerror trial, other ret codes are passed back # to our caller (tcl background error handler) so the called "tkerror" # can still use return -code break, to skip remaining messages - # in the error queue for instance) -- dl + # in the error queue for instance) + set ret [catch {tkerror $err} msg]; if {$ret != 1} {return -code $ret $msg} diff --git a/library/tk.tcl b/library/tk.tcl index bb7c6c6..e88bde1 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,10 +3,11 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.1.4.3 1998/11/25 21:16:33 stanton Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.1.4.4 1999/01/29 00:34:33 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. +# Copyright (c) 1998-1999 Scriptics Corporation. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. |