Mercurial > hg > xemacs-beta
view lisp/loadhist.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 16:51:25 -0600 |
parents | bedf3747a6d7 |
children | 39d74978fd32 |
line wrap: on
line source
;;; loadhist.el --- lisp functions for working with feature groups ;; Copyright (C) 1995 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Version: 1.0 ;; Keywords: 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, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: FSF 20.2. ;; #### Sync this file! ;;; Commentary: ;; This file is dumped with XEmacs. ;; These functions exploit the load-history system variable. ;; Entry points include `unload-feature', `symbol-file', and `feature-file'. ;;; Code: ;; load-history is a list of entries that look like this: ;; ("outline" outline-regexp ... (require . wid-edit) ... (provide . outline) ...) ;; XEmacs; this function is in subr.el in GNU, and does not deal with ;; built-in symbols. (defun* symbol-file (sym &optional type) "Return the input source from which SYM was loaded. This is a file name, or nil if the source was a buffer with no associated file. If TYPE is nil or omitted, any kind of definition is acceptable. If TYPE is `defun', then function, subr, special operator or macro definitions are acceptable. If TYPE is `defvar', then variable definitions are acceptable. `defface' specifies a face definition only, and for the moment, it won't return faces created with `make-face' or `copy-face', just those created with `defface' and `custom-declare-face'." (interactive "SFind source file for symbol: ") ; XEmacs (let (built-in-file autoload-cons symbol-details) (cond ((and (eq 'autoload (car-safe (setq autoload-cons (and (fboundp sym) (symbol-function sym))))) (or (and (or (null type) (eq 'defvar type)) (eq (fifth autoload-cons) 'keymap)) (and (or (null type) (eq 'defun type)) (memq (fifth autoload-cons) '(nil macro))))) (return-from symbol-file (locate-library (second autoload-cons)))) ((eq 'defvar type) ;; Load history entries corresponding to variables are just ;; symbols. (dolist (entry load-history) (when (memq sym (cdr entry)) (return-from symbol-file (car entry))))) ((not (null type)) ;; Non-variables have the type stored as the car of the entry. (dolist (entry load-history) (when (and (setq symbol-details (rassq sym (cdr entry))) (eq type (car symbol-details))) (return-from symbol-file (car entry))))) (t ;; If TYPE hasn't been specified, we need to check both for ;; variables and other symbols. (dolist (entry load-history) (when (or (memq sym (cdr entry)) (rassq sym (cdr entry))) (return-from symbol-file (car entry)))))) (when (setq built-in-file (built-in-symbol-file sym type)) (if (equal built-in-file (file-truename built-in-file)) ;; Probably a full path name: built-in-file ;; This is a bit heuristic, but shouldn't realistically be a ;; problem: (if (string-match "\.elc?$" built-in-file) (concat (if (file-readable-p source-lisp) source-lisp lisp-directory) built-in-file) (concat source-directory "/src/" built-in-file)))))) (defun feature-symbols (feature) "Return the file and list of symbols associated with a given FEATURE." (let ((pair `(provide . ,feature))) (dolist (entry load-history) (when (member pair (cdr entry)) (return entry))))) (defun feature-file (feature) "Return the file name from which a given FEATURE was loaded. Actually, return the load argument, if any; this is sometimes the name of a Lisp file without an extension. If the feature came from an eval-buffer on a buffer with no associated file, or an eval-region, return nil." (unless (featurep feature) (error "%s is not a currently loaded feature" (symbol-name feature))) (car (feature-symbols feature))) (defun file-symbols (file) "Return the file and list of symbols associated with FILE. The file name in the returned list is the string used to load the file, and may not be the same string as FILE, but it will be equivalent." (or (assoc file load-history) (assoc (file-name-sans-extension file) load-history) (assoc (concat file ".el") load-history) (assoc (concat file ".elc") load-history))) (defun file-provides (file) "Return the list of features provided by FILE." (let ((provides nil)) (dolist (x (cdr (file-symbols file))) (when (eq (car-safe x) 'provide) (push (cdr x) provides))) provides)) (defun file-requires (file) "Return the list of features required by FILE." (let ((requires nil)) (dolist (x (cdr (file-symbols file))) (when (eq (car-safe x) 'require) (push (cdr x) requires))) requires)) (defun file-dependents (file) "Return the list of loaded libraries that depend on FILE. This can include FILE itself." (let ((provides (file-provides file)) (dependents nil)) (dolist (entry load-history) (dolist (x (cdr entry)) (when (and (eq (car-safe x) 'require) (memq (cdr-safe x) provides)) (push (car entry) dependents)))) dependents)) ;; FSFmacs ;(defun read-feature (prompt) ; "Read a feature name \(string\) from the minibuffer, ;prompting with PROMPT and completing from `features', and ;return the feature \(symbol\)." ; (intern (completing-read prompt ; (mapcar #'(lambda (feature) ; (list (symbol-name feature))) ; features) ; nil t))) ;; ;;;###autoload (defun unload-feature (feature &optional force) "Unload the library that provided FEATURE, restoring all its autoloads. If the feature is required by any other loaded code, and optional FORCE is nil, raise an error." (interactive "SFeature: ") (unless (featurep feature) (error "%s is not a currently loaded feature" (symbol-name feature))) (when (not force) (let* ((file (feature-file feature)) (dependents (delete file (copy-sequence (file-dependents file))))) (when dependents (error "Loaded libraries %s depend on %s" (prin1-to-string dependents) file)))) (let* ((flist (feature-symbols feature)) (file (car flist)) (unloading-module nil)) (flet ((reset-aload (x) (let ((aload (get x 'autoload))) (if aload (fset x (cons 'autoload aload)))))) (mapc #'(lambda (x) (cond ((stringp x) nil) ((consp x) ;; Remove any feature names that this file provided. (if (eq (car x) 'provide) (setq features (delq (cdr x) features)) (if (eq (car x) 'module) (setq unloading-module t)))) ((and (boundp x) (fboundp x)) (makunbound x) (fmakunbound x) (reset-aload x)) ((boundp x) (makunbound x)) ((fboundp x) (fmakunbound x) (reset-aload x)))) (cdr flist))) ;; Delete the load-history element for this file. (let ((elt (assoc file load-history))) (setq load-history (delq elt load-history))) ;; If it is a module, really unload it. (if unloading-module (declare-fboundp (unload-module (symbol-name feature)))))) (provide 'loadhist) ;;; loadhist.el ends here