comparison lisp/loadhist.el @ 5125:b5df3737028a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 01:58:04 -0600
parents bedf3747a6d7
children 39d74978fd32
comparison
equal deleted inserted replaced
5124:623d57b7fbe8 5125:b5df3737028a
44 (defun* symbol-file (sym &optional type) 44 (defun* symbol-file (sym &optional type)
45 "Return the input source from which SYM was loaded. 45 "Return the input source from which SYM was loaded.
46 This is a file name, or nil if the source was a buffer with no associated file. 46 This is a file name, or nil if the source was a buffer with no associated file.
47 47
48 If TYPE is nil or omitted, any kind of definition is acceptable. 48 If TYPE is nil or omitted, any kind of definition is acceptable.
49 If TYPE is `defun', then function, subr, special form or macro definitions 49 If TYPE is `defun', then function, subr, special operator or macro definitions
50 are acceptable. 50 are acceptable.
51 If TYPE is `defvar', then variable definitions are acceptable. 51 If TYPE is `defvar', then variable definitions are acceptable.
52 52
53 `defface' specifies a face definition only, and for the moment, it won't 53 `defface' specifies a face definition only, and for the moment, it won't
54 return faces created with `make-face' or `copy-face', just those created 54 return faces created with `make-face' or `copy-face', just those created
88 ;; Probably a full path name: 88 ;; Probably a full path name:
89 built-in-file 89 built-in-file
90 ;; This is a bit heuristic, but shouldn't realistically be a 90 ;; This is a bit heuristic, but shouldn't realistically be a
91 ;; problem: 91 ;; problem:
92 (if (string-match "\.elc?$" built-in-file) 92 (if (string-match "\.elc?$" built-in-file)
93 (concat lisp-directory built-in-file) 93 (concat (if (file-readable-p source-lisp)
94 source-lisp
95 lisp-directory)
96 built-in-file)
94 (concat source-directory "/src/" built-in-file)))))) 97 (concat source-directory "/src/" built-in-file))))))
95 98
96 (defun feature-symbols (feature) 99 (defun feature-symbols (feature)
97 "Return the file and list of symbols associated with a given FEATURE." 100 "Return the file and list of symbols associated with a given FEATURE."
98 (let ((pair `(provide . ,feature))) 101 (let ((pair `(provide . ,feature)))