Mercurial > hg > xemacs-beta
view lisp/gtk-glyphs.el @ 4745:0c54de4c4b9d
Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly
src/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
have a symbol in this macro.
(setup_ccl_program): Ensure we're not allocating unreachable
memory in this function; all symbols must have been resolved in a
given CCL program before this function is called.
(find_ccl_program): New function, return a CCL program with all
its symbols resolved if it is valid (possibly allocating memory),
Qnil otherwise.
(get_ccl_program): New function, exported to other files; call
find_ccl_program, and error if it gives nil.
(Fccl_program_p): Call find_ccl_program from this function instead
of implementing the bulk of it here.
(Fccl_execute): Call get_ccl_program instead of implementing the
bulk of it here.
(Fccl_execute_on_string): Ditto.
* mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration,
it hasn't been used in years.
(get_ccl_program): Declare this function.
* mule-coding.c (ccl_putprop): Use get_ccl_program on any
specified encode or decode CCL program property.
(fixed_width_putprop): Ditto.
* mule-charset.c (Fmake_charset): Use get_ccl_program on any
specified ccl-program.
(Fset_charset_ccl_program): Ditto.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 15 Nov 2009 16:53:14 +0000 |
parents | 0784d089fdc9 |
children | 308d34e9f07d |
line wrap: on
line source
;;; gtk-glyphs.el --- Support for glyphs in Gtk ;; Copyright (C) 1994, 1997 Free Software Foundation, Inc. ;; Author: Kirill M. Katsnelson <kkm@kis.ru> ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, internal, dumped ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file contains temporary definitions for 'gtk glyphs. ;; Since there currently is no image support, the glyps are defined ;; TTY-style. This file has to be removed or reworked completely ;; when we have images. ;; This file is dumped with XEmacs. ;;; Code: (progn (if (featurep 'gtk) (set-console-type-image-conversion-list 'gtk `(,@(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2))) ("\\.xbm\\'" [xbm :file nil] 2) ,@(if (featurep 'xpm) '(("\\`/\\* XPM \\*/" [xpm :data nil] 2))) ,@(if (featurep 'xface) '(("\\`X-Face:" [xface :data nil] 2))) ,@(if (featurep 'gif) '(("\\.gif\\'" [gif :file nil] 2) ("\\`GIF8[79]" [gif :data nil] 2))) ,@(if (featurep 'jpeg) '(("\\.jpe?g\\'" [jpeg :file nil] 2))) ;; all of the JFIF-format JPEG's that I've seen begin with ;; the following. I have no idea if this is standard. ,@(if (featurep 'jpeg) '(("\\`\377\330\377\340\000\020JFIF" [jpeg :data nil] 2))) ,@(if (featurep 'png) '(("\\.png\\'" [png :file nil] 2))) ,@(if (featurep 'png) '(("\\`\211PNG" [png :data nil] 2))) ("" [autodetect :data nil] 2)))) (cond ((featurep 'xpm) (set-glyph-image frame-icon-glyph (concat "../etc/" "xemacs-icon3.xpm") 'global 'gtk) (set-glyph-image xemacs-logo (concat "../etc/" (if emacs-beta-version "xemacs-beta.xpm" "xemacs.xpm")) 'global 'gtk)) (t (set-glyph-image xemacs-logo "XEmacs <insert spiffy graphic logo here>" 'global 'gtk))) (set-glyph-image octal-escape-glyph "\\") (set-glyph-image control-arrow-glyph "^") (set-glyph-image invisible-text-glyph " ...") ) ;;; gtk-glyphs.el ends here