procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/subr.el (function-get): Refine `autoload' arg so it can also

Browse source 
autoload functions for gv.el.
* lisp/emacs-lisp/edebug.el (get-edebug-spec): Adjust so it only
autoloads macros.

Fixes: debbugs:12191
This commit is contained in:
Stefan Monnier 2012-08-13 17:23:09 -04:00
parent ca06f160f4
commit 3c98c96295
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,5 +1,10 @@
2012-08-13 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (function-get): Refine `autoload' arg so it can also
autoload functions for gv.el (bug#12191).
* emacs-lisp/edebug.el (get-edebug-spec): Adjust so it only
autoloads macros.
* color.el (color-xyz-to-lab, color-lab-to-xyz, color-cie-de2000):
Prefer pcase-let over destructuring-bind.
* vc/diff-mode.el (diff-remove-trailing-whitespace): Same.

2
lisp/emacs-lisp/edebug.el
View file

@ -248,7 +248,7 @@ If the result is non-nil, then break. Errors are ignored."
(progn
(and (symbolp indirect)
(setq indirect
(function-get indirect 'edebug-form-spec 'autoload))))
(function-get indirect 'edebug-form-spec 'macro))))
;; (edebug-trace "indirection: %s" edebug-form-spec)
(setq edebug-form-spec indirect))
edebug-form-spec

10
lisp/subr.el
View file

@ -2785,15 +2785,19 @@ form."
(defun function-get (f prop &optional autoload)
"Return the value of property PROP of function F.
If AUTOLOAD is non-nil and F is an autoloaded macro, try to autoload
the macro in the hope that it will set PROP."
If AUTOLOAD is non-nil and F is autoloaded, try to autoload it
in the hope that it will set PROP. If AUTOLOAD is `macro', only do it
if it's an autoloaded macro."
(let ((val nil))
(while (and (symbolp f)
(null (setq val (get f prop)))
(fboundp f))
(let ((fundef (symbol-function f)))
(if (and autoload (autoloadp fundef)
(not (equal fundef (autoload-do-load fundef f 'macro))))
(not (equal fundef
(autoload-do-load fundef f
(if (eq autoload 'macro)
'macro)))))
nil ;Re-try `get' on the same `f'.
(setq f fundef))))
val))