Mercurial > hg > xemacs-beta
changeset 866:613552a02607
[xemacs-hg @ 2002-06-04 17:39:43 by andyp]
fix 21.4 merge problems
| author | andyp |
|---|---|
| date | Tue, 04 Jun 2002 17:40:00 +0000 |
| parents | 987c2a685f39 |
| children | 804517e16990 |
| files | lisp/ChangeLog lisp/startup.el src/ChangeLog src/glyphs-widget.c |
| diffstat | 4 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jun 04 16:45:54 2002 +0000 +++ b/lisp/ChangeLog Tue Jun 04 17:40:00 2002 +0000 @@ -1,3 +1,7 @@ +2002-06-04 Andy Piper <andy@xemacs.org> + + * startup.el (normal-top-level): Fix bad merge. + 2002-06-04 Jerry James <james@eecs.ku.edu> * find-paths.el (paths-find-architecture-directory): Search in
--- a/lisp/startup.el Tue Jun 04 16:45:54 2002 +0000 +++ b/lisp/startup.el Tue Jun 04 17:40:00 2002 +0000 @@ -537,8 +537,11 @@ (startup-load-autoloads) - (unwind-protect - (command-line) + (let (error-data) + (condition-case data + (command-line) + ;; catch non-error signals, especially quit + (t (setq error-data data))) ;; Do this again, in case the init file defined more abbreviations. (setq default-directory (abbreviate-file-name default-directory)) ;; Specify the file for recording all the auto save files of
--- a/src/ChangeLog Tue Jun 04 16:45:54 2002 +0000 +++ b/src/ChangeLog Tue Jun 04 17:40:00 2002 +0000 @@ -1,3 +1,8 @@ +2002-06-04 Andy Piper <andy@xemacs.org> + + * glyphs-widget.c (widget_logical_unit_height): don't try and + determine geometry of nil strings. + 2002-06-03 Andy Piper <andy@xemacs.org> * frame.c (frame_conversion_internal): add conversion appropriate
--- a/src/glyphs-widget.c Tue Jun 04 16:45:54 2002 +0000 +++ b/src/glyphs-widget.c Tue Jun 04 17:40:00 2002 +0000 @@ -295,7 +295,9 @@ widget_logical_unit_height (Lisp_Image_Instance* ii) { return logical_unit_height (NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)) ? - IMAGE_INSTANCE_NAME (ii) + NILP (IMAGE_INSTANCE_NAME (ii)) ? + Fsymbol_name (Qwidget) + : IMAGE_INSTANCE_NAME (ii) : IMAGE_INSTANCE_WIDGET_TEXT (ii), IMAGE_INSTANCE_WIDGET_FACE (ii), IMAGE_INSTANCE_DOMAIN (ii));