Mercurial > hg > xemacs-beta
view etc/recycle2.xpm @ 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 | 7910031dd78a |
children |
line wrap: on
line source
/* XPM */ /* 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/>. */ static char * recycle2_xpm[] = { /* width height ncolors cpp [x_hot y_hot] */ "32 32 4 1 26 23", /* colors */ " s none m none c none", ". s iconColor1 m black c black", "X c #7F7FFFFF0000", "o c #45458B8B0000", /* pixels */ " ", " ............ ", " .XXXXXXXX.oooXX. ", " XXXXXXXX.ooXXXXX. ", " .XXXXXXXX.ooXXXXXX .. ", " .XXXXXXX..XXXXXXXX .o. ", " .XXXXXXXX .XXXXXXXXX. ", " XXXXXXXX. XXXXXXXX. ", " .XXXXXXXX. XXXXXXXX ", " .XXXXX. .XXXXXX. ", " ..XXX ..XXXXXXX ", " ......... .. .XX ", " .XXXXXXX. .XXXX. ", " .XXXXXX. ..XXXXXX. ", " .XXXXXXX. XXXXXXXXX ", " .XXXXXXX. .XXXXXXXX ", " .XXXXXXXXX. .XXXXXXX.", " .XXXXXXX..X. XXXXXXX.", " .XXXXXXX. .. . XXXXXXX.", " .XXXXX. .X .XXXXXX ", " XXXXX .X .XXXX. ", " .XXX........ XX......... ", " .X.ooXXXXXX .XXXXXXXXXo ", " .X.oXoXXXXX .XXXXXXXXXXo ", " XooXXXXXXX XXXXXXXXXXo. ", " .ooXXXXXXX XXXXXXXXXX. ", " ooXXXXXXX .XXXXXXXXo ", " .XXXXXXX .XXXXXo. ", " ....... XX.... ", " .X ", " .X ", " . "};