Mercurial > hg > xemacs-beta
view lisp/custom.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 943eaba38521 |
children | 4a27df428c73 |
line wrap: on
line source
;;; custom.el -- Tools for declaring and initializing options. ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org> ;; Keywords: help, faces, dumped ;; Version: 1.9960-x ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;; 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. ;;; Commentary: ;; This file is dumped with XEmacs. ;; This file only contain the code needed to declare and initialize ;; user options. The code to customize options is autoloaded from ;; `cus-edit.el'. ;; ;; The code implementing face declarations is in `cus-face.el' ;;; Code: ;; it is now safe to put the `provide' anywhere. if an error occurs while ;; loading, all provides (and fsets) will be undone. put it first to ;; prevent require/provide loop with custom and cus-face. (provide 'custom) (eval-when-compile (load "cl-macs" nil t) ;; To elude warnings. (require 'cus-face)) (autoload 'custom-declare-face "cus-face") (autoload 'defun* "cl-macs") (require 'widget) (defvar custom-define-hook nil ;; Customize information for this option is in `cus-edit.el'. "Hook called after defining each customize option.") ;;; The `defcustom' Macro. (defun custom-initialize-default (symbol value) "Initialize SYMBOL with VALUE. This will do nothing if symbol already has a default binding. Otherwise, if symbol has a `saved-value' property, it will evaluate the car of that and used as the default binding for symbol. Otherwise, VALUE will be evaluated and used as the default binding for symbol." (unless (default-boundp symbol) ;; Use the saved value if it exists, otherwise the standard setting. (set-default symbol (if (get symbol 'saved-value) (eval (car (get symbol 'saved-value))) (eval value))))) (defun custom-initialize-set (symbol value) "Initialize SYMBOL with VALUE. Like `custom-initialize-default', but use the function specified by `:set' to initialize SYMBOL." (unless (default-boundp symbol) (funcall (or (get symbol 'custom-set) 'set-default) symbol (if (get symbol 'saved-value) (eval (car (get symbol 'saved-value))) (eval value))))) (defun custom-initialize-reset (symbol value) "Initialize SYMBOL with VALUE. Like `custom-initialize-set', but use the function specified by `:get' to reinitialize SYMBOL if it is already bound." (funcall (or (get symbol 'custom-set) 'set-default) symbol (cond ((default-boundp symbol) (funcall (or (get symbol 'custom-get) 'default-value) symbol)) ((get symbol 'saved-value) (eval (car (get symbol 'saved-value)))) (t (eval value))))) (defun custom-initialize-changed (symbol value) "Initialize SYMBOL with VALUE. Like `custom-initialize-reset', but only use the `:set' function if the not using the standard setting. Otherwise, use the `set-default'." (cond ((default-boundp symbol) (funcall (or (get symbol 'custom-set) 'set-default) symbol (funcall (or (get symbol 'custom-get) 'default-value) symbol))) ((get symbol 'saved-value) (funcall (or (get symbol 'custom-set) 'set-default) symbol (eval (car (get symbol 'saved-value))))) (t (set-default symbol (eval value))))) (defun custom-declare-variable (symbol value doc &rest args) "Like `defcustom', but SYMBOL and VALUE are evaluated as normal arguments." ;; Remember the standard setting. (put symbol 'standard-value (list value)) ;; Maybe this option was rogue in an earlier version. It no longer is. (when (eq (get symbol 'force-value) 'rogue) ;; It no longer is. (put symbol 'force-value nil)) (when doc (put symbol 'variable-documentation doc)) (let ((initialize 'custom-initialize-reset) (requests nil)) (while args (let ((arg (car args))) (setq args (cdr args)) (check-argument-type 'keywordp arg) (let ((keyword arg) (value (car args))) (unless args (signal 'error (list "Keyword is missing an argument" keyword))) (setq args (cdr args)) (cond ((eq keyword :initialize) (setq initialize value)) ((eq keyword :set) (put symbol 'custom-set value)) ((eq keyword :get) (put symbol 'custom-get value)) ((eq keyword :require) (setq requests (cons value requests))) ((eq keyword :type) (put symbol 'custom-type value)) ((eq keyword :options) (if (get symbol 'custom-options) ;; Slow safe code to avoid duplicates. (mapc (lambda (option) (custom-add-option symbol option)) value) ;; Fast code for the common case. (put symbol 'custom-options (copy-sequence value)))) (t (custom-handle-keyword symbol keyword value 'custom-variable)))))) (put symbol 'custom-requests requests) ;; Do the actual initialization. (funcall initialize symbol value)) ;; #### This is a rough equivalent of LOADHIST_ATTACH. However, ;; LOADHIST_ATTACH also checks for `initialized'. (push symbol current-load-list) (run-hooks 'custom-define-hook) symbol) (defmacro defcustom (symbol value doc &rest args) "Declare SYMBOL as a customizable variable that defaults to VALUE. DOC is the variable documentation. Neither SYMBOL nor VALUE needs to be quoted. If SYMBOL is not already bound, initialize it to VALUE. The remaining arguments should have the form [KEYWORD VALUE]... The following KEYWORD's are defined: :type VALUE should be a widget type for editing the symbols value. The default is `sexp'. :options VALUE should be a list of valid members of the widget type. :group VALUE should be a customization group. Add SYMBOL to that group. :initialize VALUE should be a function used to initialize the variable. It takes two arguments, the symbol and value given in the `defcustom' call. The default is `custom-initialize-set' :set VALUE should be a function to set the value of the symbol. It takes two arguments, the symbol to set and the value to give it. The default is `set-default'. :get VALUE should be a function to extract the value of symbol. The function takes one argument, a symbol, and should return the current value for that symbol. The default is `default-value'. :require VALUE should be a feature symbol. Each feature will be required after initialization, of the user have saved this option. Read the section about customization in the Emacs Lisp manual for more information." `(custom-declare-variable (quote ,symbol) (quote ,value) ,doc ,@args)) ;;; The `defface' Macro. (defmacro defface (face spec doc &rest args) "Declare FACE as a customizable face that defaults to SPEC. FACE does not need to be quoted. Third argument DOC is the face documentation. If FACE has been set with `custom-set-face', set the face attributes as specified by that function, otherwise set the face attributes according to SPEC. The remaining arguments should have the form [KEYWORD VALUE]... The following KEYWORDs are defined: :group VALUE should be a customization group. Add FACE to that group. SPEC should be an alist of the form ((DISPLAY ATTS)...). ATTS is a list of face attributes and their values. The possible attributes are defined in the variable `custom-face-attributes'. The ATTS of the first entry in SPEC where the DISPLAY matches the frame should take effect in that frame. DISPLAY can either be the symbol t, which will match all frames, or an alist of the form \((REQ ITEM...)...) For the DISPLAY to match a FRAME, the REQ property of the frame must match one of the ITEM. The following REQ are defined: `type' (the value of `window-system') Should be one of `x', `mswindows', or `tty'. `class' (the frame's color support) Should be one of `color', `grayscale', or `mono'. `background' (what color is used for the background text) Should be one of `light' or `dark'. Read the section about customization in the Emacs Lisp manual for more information." `(custom-declare-face (quote ,face) ,spec ,doc ,@args)) ;;; The `defgroup' Macro. (defun custom-declare-group (symbol members doc &rest args) "Like `defgroup', but SYMBOL is evaluated as a normal argument." (while members (apply 'custom-add-to-group symbol (car members)) (pop members)) (put symbol 'custom-group (nconc members (get symbol 'custom-group))) (when doc (put symbol 'group-documentation doc)) (while args (let ((arg (car args))) (setq args (cdr args)) (check-argument-type 'keywordp arg) (let ((keyword arg) (value (car args))) (unless args (signal 'error (list "Keyword is missing an argument" keyword))) (setq args (cdr args)) (cond ((eq keyword :prefix) (put symbol 'custom-prefix value)) (t (custom-handle-keyword symbol keyword value 'custom-group)))))) (run-hooks 'custom-define-hook) symbol) (defmacro defgroup (symbol members doc &rest args) "Declare SYMBOL as a customization group containing MEMBERS. SYMBOL does not need to be quoted. Third arg DOC is the group documentation. MEMBERS should be an alist of the form ((NAME WIDGET)...) where NAME is a symbol and WIDGET is a widget for editing that symbol. Useful widgets are `custom-variable' for editing variables, `custom-face' for edit faces, and `custom-group' for editing groups. The remaining arguments should have the form [KEYWORD VALUE]... The following KEYWORD's are defined: :group VALUE should be a customization group. Add SYMBOL to that group. Read the section about customization in the Emacs Lisp manual for more information." `(custom-declare-group (quote ,symbol) ,members ,doc ,@args)) (defvar custom-group-hash-table (make-hash-table :size 300 :test 'eq) "Hash-table of non-empty groups.") (defun custom-add-to-group (group option widget) "To existing GROUP add a new OPTION of type WIDGET. If there already is an entry for that option, overwrite it." (let* ((members (get group 'custom-group)) (old (assq option members))) (if old (setcar (cdr old) widget) (put group 'custom-group (nconc members (list (list option widget)))))) (puthash group t custom-group-hash-table)) ;;; Properties. (defun custom-handle-all-keywords (symbol args type) "For customization option SYMBOL, handle keyword arguments ARGS. Third argument TYPE is the custom option type." (while args (let ((arg (car args))) (setq args (cdr args)) (check-argument-type 'keywordp arg) (let ((keyword arg) (value (car args))) (unless args (signal 'error (list "Keyword is missing an argument" keyword))) (setq args (cdr args)) (custom-handle-keyword symbol keyword value type))))) (defun custom-handle-keyword (symbol keyword value type) "For customization option SYMBOL, handle KEYWORD with VALUE. Fourth argument TYPE is the custom option type." (cond ((eq keyword :group) (custom-add-to-group value symbol type)) ((eq keyword :version) (custom-add-version symbol value)) ((eq keyword :link) (custom-add-link symbol value)) ((eq keyword :load) (custom-add-load symbol value)) ((eq keyword :tag) (put symbol 'custom-tag value)) (t (signal 'error (list "Unknown keyword" keyword))))) (defun custom-add-option (symbol option) "To the variable SYMBOL add OPTION. If SYMBOL is a hook variable, OPTION should be a hook member. For other types variables, the effect is undefined." (let ((options (get symbol 'custom-options))) (unless (member option options) (put symbol 'custom-options (cons option options))))) (defun custom-add-link (symbol widget) "To the custom option SYMBOL add the link WIDGET." (let ((links (get symbol 'custom-links))) (unless (member widget links) (put symbol 'custom-links (cons widget links))))) (defun custom-add-version (symbol version) "To the custom option SYMBOL add the version VERSION." (put symbol 'custom-version version)) (defun custom-add-load (symbol load) "To the custom option SYMBOL add the dependency LOAD. LOAD should be either a library file name, or a feature name." (puthash symbol t custom-group-hash-table) (let ((loads (get symbol 'custom-loads))) (unless (member load loads) (put symbol 'custom-loads (cons load loads))))) ;;; deftheme macro (defvar custom-known-themes '(user standard) "Themes that have been defthemed.") ;; #### add strings for group ;; #### during bootstrap we cannot use cl-macs stuff (defun* custom-define-theme (theme feature &optional doc &key short-description immediate variable-reset-string variable-set-string face-set-string face-reset-string &allow-other-keys) (push theme custom-known-themes) (put theme 'theme-feature feature) (put theme 'theme-documentation doc) (if immediate (put theme 'theme-immediate immediate)) (if variable-reset-string (put theme 'theme-variable-reset-string variable-reset-string )) (if variable-set-string (put theme 'theme-variable-set-string variable-set-string )) (if face-reset-string (put theme 'theme-face-reset-string face-reset-string )) (if face-set-string (put theme 'theme-face-set-string face-set-string )) (if short-description (put theme 'theme-short-description short-description ))) (defun custom-make-theme-feature (theme) (intern (concat (symbol-name theme) "-theme"))) (defmacro deftheme (theme &rest body) "(deftheme THEME &optional DOC &key KEYWORDS) Define a theme labeled by SYMBOL THEME. The optional argument DOC is a doc string describing the theme. It is optionally followed by the following keyword arguments :short-description DESC DESC is a short (one line) description of the theme. If not given DOC is used. :immediate FLAG If FLAG is non-nil variables set in this theme are bound immediately when loading the theme. :variable-set-string VARIABLE_-SET-STRING A string used by the UI to indicate that the value takes it setting from this theme. It is passed to FORMAT with the name of the theme a additional argument. If not given, a generic description is used. :variable-reset-string VARIABLE-RESET-STRING As above but used in the case the variable has been forced to the value in this theme. :face-set-string FACE-SET-STRING :face-reset-string FACE-RESET-STRING As above but for faces." (let ((feature (custom-make-theme-feature theme))) `(custom-define-theme (quote ,theme) (quote ,feature) ,@body))) (defsubst custom-theme-p (theme) "Non-nil when THEME has been defined." (memq theme custom-known-themes)) (defsubst custom-check-theme (theme) "Check whether THEME is valid and signal an error if NOT." (unless (custom-theme-p theme) (error "Unknown theme `%s'" theme))) ; #### do we need to deftheme 'user and/or 'standard here to make the ; code in cus-edit cleaner?. ;;; Initializing. (defun custom-push-theme (prop symbol theme mode value) (let ((old (get symbol prop))) (if (eq (car-safe (car-safe old)) theme) (setq old (cdr old))) (put symbol prop (cons (list theme mode value) old)))) (defun custom-set-variables (&rest args) "Initialize variables according to user preferences. The settings are registered as theme `user'. The arguments should be a list where each entry has the form: (SYMBOL VALUE [NOW [REQUEST [COMMENT]]]) The unevaluated VALUE is stored as the saved value for SYMBOL. If NOW is present and non-nil, VALUE is also evaluated and bound as the default value for the SYMBOL. REQUEST is a list of features we must 'require for SYMBOL. COMMENT is a comment string about SYMBOL." (apply 'custom-theme-set-variables 'user args)) (defun custom-theme-set-variables (theme &rest args) "Initialize variables according to settings specified by args. Records the settings as belonging to THEME. See `custom-set-variables' for a description of the arguments ARGS." (custom-check-theme theme) (let ((immediate (get theme 'theme-immediate))) (while args * etc/custom/example-themes/example-theme.el: (let ((entry (car args))) (if (listp entry) (let* ((symbol (nth 0 entry)) (value (nth 1 entry)) (now (nth 2 entry)) (requests (nth 3 entry)) (comment (nth 4 entry)) (set (or (get symbol 'custom-set) 'set-default))) (put symbol 'saved-value (list value)) (custom-push-theme 'theme-value symbol theme 'set value) (put symbol 'saved-variable-comment comment) (cond ((or now immediate) ;; Rogue variable, set it now. (put symbol 'force-value (if now 'rogue 'immediate)) (funcall set symbol (eval value))) ((default-boundp symbol) ;; Something already set this, overwrite it. (funcall set symbol (eval value)))) (and (or now (default-boundp symbol)) (put symbol 'variable-comment comment)) (when requests (put symbol 'custom-requests requests) (mapc 'require requests)) (setq args (cdr args))) ;; Old format, a plist of SYMBOL VALUE pairs. (message "Warning: old format `custom-set-variables'") (ding) (sit-for 2) (let ((symbol (nth 0 args)) (value (nth 1 args))) (put symbol 'saved-value (list value)) (custom-push-theme 'theme-value symbol theme 'set value)) (setq args (cdr (cdr args)))))))) (defvar custom-loaded-themes nil "Themes in the order they are loaded.") (defun custom-theme-loaded-p (theme) "Return non-nil when THEME has been loaded." (memq theme custom-loaded-themes)) (defun provide-theme (theme) "Indicate that this file provides THEME." (custom-check-theme theme) (provide (get theme 'theme-feature)) (push theme custom-loaded-themes)) (defun require-theme (theme &optional soft) "Try to load a theme by requiring its feature." ;; Note we do no check for validity of the theme here. ;; This allows to pull in themes by a file-name convention (require (get theme 'theme-feature (custom-make-theme-feature theme)))) (defun custom-do-theme-reset (theme) ; #### untested! slow! (let (spec-list) (mapatoms (lambda (symbol) (setq spec-list (get symbol 'theme-value)) (when spec-list (setq spec-list (delete-if (lambda (elt) (eq (car elt) theme)) spec-list)) (put symbol 'theme-value spec-list) (custom-theme-reset-internal symbol 'user)) (setq spec-list (get symbol 'theme-face)) (when spec-list (setq spec-list (delete-if (lambda (elt) (eq (car elt) theme)) spec-list)) (put symbol 'theme-face spec-list) (custom-theme-reset-internal-face symbol 'user)))))) (defun custom-theme-load-themes (by-theme &rest body) "Load the themes specified by BODY and record them as required by theme BY-THEME. BODY is a sequence of - a SYMBOL require the theme SYMBOL - a list (reset THEME) Undo all the settings made by THEME. - a list (hidden THEME) require the THEME but hide it from the user." (custom-check-theme by-theme) (dolist (theme body) (cond ((and (consp theme) (eq (car theme) 'reset)) (custom-do-theme-reset (cadr theme))) ((and (consp theme) (eq (car theme) 'hidden)) (require-theme (cadr theme)) (unless (custom-theme-loaded-p (cadr theme)) (put (cadr theme) 'theme-hidden t))) (t (require-theme theme) (remprop theme 'theme-hidden))) (push theme (get by-theme 'theme-loads-themes)))) (defun custom-load-themes (&rest body) "Load themes for the USER theme as specified by BODY. BODY is as with custom-theme-load-themes." (apply #'custom-theme-load-themes 'user body)) (defsubst copy-upto-last (elt list) "Copy all the elements of the list upto the last occurrence of elt." ;; Is it faster to do more work in C than to do less in elisp? (nreverse (cdr (member elt (reverse list))))) (defun custom-theme-value (theme theme-spec-list) "Determine the value for THEME defined by THEME-SPEC-LIST. Returns (list value) if found. Nil otherwise." ;; Note we do _NOT_ signal an error if the theme is unknown ;; it might have gone away without the user knowing. (let ((theme-or-lower (memq theme (cons 'user custom-loaded-themes))) value) (mapc #'(lambda (theme-spec) (when (member (car theme-spec) theme-or-lower) (setq value (cdr theme-spec)) ;; We need to continue because if theme =A and we found ;; B then if the load order is B A C B ;; we actually want the value in C. (setq theme-or-lower (copy-upto-last (car theme-spec) theme-or-lower)) ;; We could should circuit if this is now nil. )) theme-spec-list) (if value (if (eq (car value) 'set) (list (cadr value)) ;; Yet another reset spec. car value = reset (custom-theme-value (cadr value) theme-spec-list))))) (defun custom-theme-variable-value (variable theme) "Return (list value) value of VARIABLE in THEME if the THEME modifies the VARIABLE. Nil otherwise." (custom-theme-value theme (get variable 'theme-value))) (defun custom-theme-reset-internal (symbol to-theme) (let ((value (custom-theme-variable-value symbol to-theme)) was-in-theme) (setq was-in-theme value) (setq value (or value (get symbol 'standard-value))) (when value (put symbol 'saved-value was-in-theme) (if (or (get 'force-value symbol) (default-boundp symbol)) (funcall (get symbol 'custom-set 'set-default) symbol (eval (car value))))) value)) (defun custom-theme-reset-variables (theme &rest args) "Reset the value of the variables to values previously defined. Associate this setting with THEME. ARGS is a list of lists of the form (variable to-theme) This means reset variable to its value in to-theme." (custom-check-theme theme) (mapc #'(lambda (arg) (apply #'custom-theme-reset-internal arg) (custom-push-theme 'theme-value (car arg) theme 'reset (cadr arg))) args)) (defun custom-reset-variables (&rest args) "Reset the value of the variables to values previously defined. Associate this setting with the `user' theme. The ARGS are as in `custom-theme-reset-variables'." (apply #'custom-theme-reset-variables 'user args)) ;;; The End. ;; custom.el ends here