diff options
| author | Kim F. Storm | 2002-03-21 12:19:02 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2002-03-21 12:19:02 +0000 |
| commit | 37ebddef957500e7990c72786505a92e3bf17816 (patch) | |
| tree | 3c14a43e1919ad86bc0160973b434926624d8059 /src | |
| parent | a0f8590d9d24aec2e17f1aba47dfdceb72f4ec51 (diff) | |
| download | emacs-37ebddef957500e7990c72786505a92e3bf17816.tar.gz emacs-37ebddef957500e7990c72786505a92e3bf17816.zip | |
(Ffeaturep): Allow subfeature to be a list (test using
Fmember rather than Fmemq).
(Fprovide): Check that subfeatures is a list.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fns.c | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -3045,7 +3045,7 @@ SUBFEATURE can be used to check a specific subfeature of FEATURE. */) | |||
| 3045 | CHECK_SYMBOL (feature); | 3045 | CHECK_SYMBOL (feature); |
| 3046 | tem = Fmemq (feature, Vfeatures); | 3046 | tem = Fmemq (feature, Vfeatures); |
| 3047 | if (!NILP (tem) && !NILP (subfeature)) | 3047 | if (!NILP (tem) && !NILP (subfeature)) |
| 3048 | tem = Fmemq (subfeature, Fget (feature, Qsubfeatures)); | 3048 | tem = Fmember (subfeature, Fget (feature, Qsubfeatures)); |
| 3049 | return (NILP (tem)) ? Qnil : Qt; | 3049 | return (NILP (tem)) ? Qnil : Qt; |
| 3050 | } | 3050 | } |
| 3051 | 3051 | ||
| @@ -3058,6 +3058,7 @@ particular subfeatures supported in this version of FEATURE. */) | |||
| 3058 | { | 3058 | { |
| 3059 | register Lisp_Object tem; | 3059 | register Lisp_Object tem; |
| 3060 | CHECK_SYMBOL (feature); | 3060 | CHECK_SYMBOL (feature); |
| 3061 | CHECK_LIST (subfeatures); | ||
| 3061 | if (!NILP (Vautoload_queue)) | 3062 | if (!NILP (Vautoload_queue)) |
| 3062 | Vautoload_queue = Fcons (Fcons (Vfeatures, Qnil), Vautoload_queue); | 3063 | Vautoload_queue = Fcons (Fcons (Vfeatures, Qnil), Vautoload_queue); |
| 3063 | tem = Fmemq (feature, Vfeatures); | 3064 | tem = Fmemq (feature, Vfeatures); |