Mercurial > hg > xemacs-beta
view lisp/site-load.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 | 3ecd8885ac67 |
children | e6508b64ee08 91b3aa59f49b |
line wrap: on
line source
;;; site-load.el --- Template file for site-wide XEmacs customization ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: Steven L. Baur <steve@xemacs.org> ;; Keywords: internal ;; This file is part of XEmacs. ;;; Commentary: ;; This is a prototype site-load.el file. ;; The site-load.el mechanism is provided so XEmacs installers can easily ;; dump lisp packages with XEmacs that do not get dumped standardly. ;; The file `site-packages' if it exists should look something like: ;; (setq site-load-packages '( ;; "../lisp/modes/cc-mode.elc" ;; "../lisp/utils/redo.elc" ;; "../lisp/packages/scroll-in-place.elc" ;; ) ;; ) ;; The first line and the last line must be exact. Each of the packages ;; listed must be double quoted, have either an absolute path, or a relative ;; to the build src directory path *and* be bytecompiled prior to the attempt ;; to dump. They also must explicitly have the .elc extension. ;; Because this is a trial implementation and the file is shared with ;; make-docfiles, syntax is strict and unforgiving. So sue me. It ;; is still better than the way it used to be. ;; Also note that site-packages belongs in the top level directory not the ;; lisp directory for use with --srcdir configurations. ;;; Code: (defvar site-load-package-file "../site-packages" "File name containing the list of extra packages to dump with XEmacs.") (defvar site-load-packages nil "A list of .elc files that should be dumped with XEmacs. This variable should be set by `site-load-package-file'.") ;; Load site specific packages for dumping with the XEmacs binary. (when (file-exists-p site-load-package-file) (let ((file)) (load site-load-package-file t t t) ;; The `pureload' macro is provided as a clue that a package is ;; being loaded in preparation of being dumped into XEmacs. (defmacro pureload (file) (list 'prog1 (list 'load file) '(garbage-collect))) (message "Loading site-wide packages for dumping...") (while site-load-packages (setq file (car site-load-packages)) (pureload file) (setq site-load-packages (cdr site-load-packages))) (message "Loading site-wide packages for dumping...done") (fmakunbound 'pureload))) ;; This file is intended for end user additions. ;; Put other initialization here, like setting of language-environment, etc. ;; Perhaps this should really be in the site-init.el. ;;; site-load.el ends here