Mercurial > hg > xemacs-beta
view src/objects-x-impl.h @ 4647:e4ed58cb0e5b
Fix bugs with #'find-file, 0-length files, & coding-system-for-read specified.
src/ChangeLog addition:
2009-07-11 Aidan Kehoe <kehoea@parhasard.net>
* file-coding.c (undecided_canonicalize_after_coding):
If no data have been seen, or if
coding_stream_canonicalize_after_coding gives nil, pass back
str->codesys, which will be of type undecided (the same as the old
behaviour) but will reflect any CODESYS argument passed to
make_coding_input_stream. See also the change in lisp/code-files.el
lisp/ChangeLog addition:
2009-07-11 Aidan Kehoe <kehoea@parhasard.net>
* code-files.el (insert-file-contents):
Take advantage of more sensible behaviour from
#'insert-file-contents-internal, allowing us to actually follow
the documented coding system behaviour for nonexistent files (that
is, buffer-file-coding-system reflects coding-system-for-read &c.,
not becoming undecided for either zero-length or nonexistent
files).
tests/ChangeLog addition:
2009-07-11 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check for Richard Zidlicky's bug of
http://mid.gmane.org/20090602194123.GA5163@linux-m68k.org; also
check that supplying CODESYS to #'find-file is respected both for
nonexistent files and zero-length existing files.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 11 Jul 2009 16:33:35 +0100 |
| parents | ad2f4ae9895b |
| children | 87175eb65ff4 |
line wrap: on
line source
/* X-specific Lisp objects. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996, 2002 Ben Wing. 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-10-00. */ #ifndef INCLUDED_objects_x_impl_h_ #define INCLUDED_objects_x_impl_h_ #include "objects-impl.h" #include "objects-x.h" #ifdef USE_XFT /* for resource name definitions, etc */ #include "../lwlib/lwlib-fonts.h" #endif #ifdef HAVE_X_WINDOWS /***************************************************************************** Color-Instance ****************************************************************************/ struct x_color_instance_data { XColor color; /* Yes, it looks crazy to have both the XColor and the XftColor, but pragmatically both are used. */ #ifdef USE_XFT XftColor xftColor; #endif char dealloc_on_gc; }; #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data) #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color) #ifdef USE_XFT #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor) #endif #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc) /***************************************************************************** Font-Instance ****************************************************************************/ struct x_font_instance_data { /* X-specific information */ /* Yes, it looks crazy to have both the XFontStruct and the XftFont, but pragmatically both are used (lwlib delegates labels to the widget sets, which internally use XFontStructs). */ XFontStruct * font; #ifdef USE_XFT XftFont *xftFont; #endif }; #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data) #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font) #ifdef USE_XFT #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont) #endif #endif /* HAVE_X_WINDOWS */ #endif /* INCLUDED_objects_x_impl_h_ */