Index: gui.el =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/lisp/gui.el,v retrieving revision 1.5.2.2 diff -u -r1.5.2.2 gui.el --- gui.el 1999/10/15 10:11:39 1.5.2.2 +++ gui.el 1999/10/19 07:04:14 @@ -100,9 +100,8 @@ is non-nil, ACTION will be called with one argument, USER-DATA." (vector 'button :descriptor string - :width (max (length string) 8) :face 'gui-button-face - :callback (list 'funcall action user-data))) + :callback `(funcall (quote ,action) (quote ,user-data)))) (defun insert-gui-button (button &optional pos buffer) "Insert GUI button BUTTON at POS in BUFFER." Index: wid-edit.el =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/lisp/wid-edit.el,v retrieving revision 1.11.2.6 diff -u -r1.11.2.6 wid-edit.el --- wid-edit.el 1999/07/06 07:33:02 1.11.2.6 +++ wid-edit.el 1999/10/19 07:04:26 @@ -1935,16 +1935,11 @@ (console-on-window-system-p)) (unless gui-glyphs (let* ((gui-button-shadow-thickness 1) - (gui (make-gui-button tag 'widget-gui-action widget))) - (setq - gui-glyphs - (list - (make-glyph `(,(nth 0 (aref gui 1)) [string :data ,text])) - (make-glyph `(,(nth 1 (aref gui 1)) [string :data ,text])) - (make-glyph `(,(nth 2 (aref gui 1)) [string :data ,text])))) + (gui (make-glyph + (make-gui-button tag 'widget-gui-action widget)))) + (setq gui-glyphs gui) (laxputf widget-push-button-cache tag gui-glyphs))) - (widget-glyph-insert-glyph - widget (nth 0 gui-glyphs) (nth 1 gui-glyphs) (nth 2 gui-glyphs))) + (widget-glyph-insert-glyph widget gui-glyphs)) (t (insert text)))))