Mercurial > hg > xemacs-beta
view src/toolbar-x.c @ 5916:1152e0091f8c
Avoid confusion about ELC vs. source file encoding, #'load, #'load-internal.
lisp/ChangeLog addition:
2015-06-03 Aidan Kehoe <kehoea@parhasard.net>
* code-files.el (load):
Revise this to respect load-ignore-out-of-date-elc-files, rather
than leaving that to #'load-internal. Avoids a corner case where
the source and the compiled file have different, incompatible
encodings.
Move the call to #'substitute-in-file-name here.
No longer check for a zero-length filename, since #'load-internal
no longer chokes on same and errors correctly.
src/ChangeLog addition:
2015-06-03 Aidan Kehoe <kehoea@parhasard.net>
* lread.c (Fload_internal):
Delegate calling the handler and #'substitute-in-file-name to #'load.
Error correctly with a zero-length file name, instead of giving a
bus error on my machine.
Delegate the check for out-of-date ELC files to #'load,
avoiding a bug where the encoding of the ELC file and the source
file differed.
* lread.c (PRINT_LOADING_MESSAGE_1):
This is simplified, now we no longer have to talk about
out-of-date ELC files.
tests/ChangeLog addition:
2015-06-03 Aidan Kehoe <kehoea@parhasard.net>
* automated/file-tests.el:
Gross sanity check for #'load and #'load-internal with a
zero-length FILE, something that crashed until today.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 03 Jun 2015 20:13:07 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* toolbar implementation -- X interface. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 1996 Ben Wing. Copyright (C) 1996 Chuck Thompson. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */ #include <config.h> #include "lisp.h" #include "faces.h" #include "frame-impl.h" #include "toolbar.h" #include "window.h" #include "toolbar-xlike.h" #include "console-x-impl.h" #include "glyphs-x.h" #include "fontcolor-x.h" #include "EmacsFrame.h" #include "EmacsFrameP.h" /* We should really create a 'xlike' console type and fill it with ** all the shared code. We would then just use ** CONSOLE_INHERITS_METHOD(x,xlike,blah) */ #define x_output_frame_toolbars xlike_output_frame_toolbars #define x_output_toolbar_button xlike_output_toolbar_button #define x_redraw_exposed_toolbars xlike_redraw_exposed_toolbars #define x_redraw_frame_toolbars xlike_redraw_frame_toolbars #define x_clear_frame_toolbars xlike_clear_frame_toolbars static void x_initialize_frame_toolbars (struct frame *f) { EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); if (ef->emacs_frame.toolbar_shadow_thickness < MINIMUM_SHADOW_THICKNESS) Xt_SET_VALUE (FRAME_X_TEXT_WIDGET (f), XtNtoolBarShadowThickness, MINIMUM_SHADOW_THICKNESS); } /* This only calls one function but we go ahead and create this in case we ever do decide that we need to do more work. */ static void x_free_frame_toolbars (struct frame *UNUSED (unused)) { } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_toolbar_x (void) { CONSOLE_HAS_METHOD (x, output_frame_toolbars); CONSOLE_HAS_METHOD (x, clear_frame_toolbars); CONSOLE_HAS_METHOD (x, initialize_frame_toolbars); CONSOLE_HAS_METHOD (x, free_frame_toolbars); CONSOLE_HAS_METHOD (x, output_toolbar_button); CONSOLE_HAS_METHOD (x, redraw_exposed_toolbars); CONSOLE_HAS_METHOD (x, redraw_frame_toolbars); }