diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-08-04 16:18:11 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-08-04 16:18:11 -0400 |
| commit | 671d5c16547d16bef2efa056705bd35b5feacc29 (patch) | |
| tree | 4bc2c3774ce9914f21508d0e2a83e25504dbc1db /lisp/apropos.el | |
| parent | e443729d658ee2b9e0f55bbbb90241819bf516a6 (diff) | |
| download | emacs-671d5c16547d16bef2efa056705bd35b5feacc29.tar.gz | |
* lisp/subr.el (macrop): New function.
(text-clone--maintaining): New var.
(text-clone--maintain): Rename from text-clone-maintain. Use it
instead of inhibit-modification-hooks.
* lisp/emacs-lisp/nadvice.el (advice--normalize): For aliases to macros, use
a proxy, so as handle autoloads and redefinitions of the target.
(advice--defalias-fset, advice-remove): Use advice--symbol-function.
* lisp/emacs-lisp/pcase.el (pcase-mutually-exclusive-predicates):
Remove bogus (arrayp . stringp) pair. Add entries for `vectorp'.
(pcase--mutually-exclusive-p): New function.
(pcase--split-consp): Use it.
(pcase--split-pred): Use it. Optimize the case where `pat' is a qpat
mutually exclusive with the current predicate.
* test/automated/advice-tests.el (advice-tests-nadvice): Test removal
before definition.
(advice-tests-macroaliases): New test.
* lisp/emacs-lisp/edebug.el (edebug-lookup-function): Remove function.
(edebug-macrop): Remove. Use `macrop' instead.
* lisp/emacs-lisp/advice.el (ad-subr-p): Remove. Use `subrp' instead.
(ad-macro-p):
* lisp/eshell/esh-cmd.el (eshell-macrop):
* lisp/apropos.el (apropos-macrop): Remove. Use `macrop' instead.
Diffstat (limited to 'lisp/apropos.el')
| -rw-r--r-- | lisp/apropos.el | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el index 000d2d87d05..7a1a6f6a75a 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -1121,7 +1121,7 @@ If non-nil TEXT is a string that will be printed as a heading." (apropos-print-doc 2 (if (commandp symbol) 'apropos-command - (if (apropos-macrop symbol) + (if (macrop symbol) 'apropos-macro 'apropos-function)) (not nosubst)) @@ -1139,17 +1139,6 @@ If non-nil TEXT is a string that will be printed as a heading." (prog1 apropos-accumulator (setq apropos-accumulator ()))) ; permit gc -(defun apropos-macrop (symbol) - "Return t if SYMBOL is a Lisp macro." - (and (fboundp symbol) - (consp (setq symbol - (symbol-function symbol))) - (or (eq (car symbol) 'macro) - (if (autoloadp symbol) - (memq (nth 4 symbol) - '(macro t)))))) - - (defun apropos-print-doc (i type do-keys) (let ((doc (nth i apropos-item))) (when (stringp doc) |