Commit 7abaf5cc authored by Stefan Monnier's avatar Stefan Monnier
Browse files

Autoload more carefully from Lisp. Follow aliases for function properties.

* lisp/subr.el (autoloadp): New function.
(symbol-file): Use it.
(function-get): New function.
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Use function-get and
* lisp/emacs-lisp/lisp-mode.el (lisp-font-lock-syntactic-face-function)
* lisp/emacs-lisp/gv.el (gv-get):
* lisp/emacs-lisp/edebug.el (get-edebug-spec, edebug-basic-spec):
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form):
* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-warn):
* lisp/emacs-lisp/autoload.el (make-autoload, autoload-print-form):
Use function-get.
* lisp/emacs-lisp/cl.el: Don't propagate function properties any more.

* src/eval.c (Fautoload_do_load): Rename from do_autoload, export to Lisp,
add argument, tune behavior, and adjust all callers.

* lisp/speedbar.el (speedbar-add-localized-speedbar-support):
* lisp/emacs-lisp/disass.el (disassemble-internal):
* lisp/desktop.el (desktop-load-file):
* lisp/help-fns.el (help-function-arglist, find-lisp-object-file-name)
* lisp/emacs-lisp/find-func.el (find-function-noselect):
* lisp/emacs-lisp/elp.el (elp-instrument-function):
* lisp/emacs-lisp/advice.el (ad-has-proper-definition):
* lisp/apropos.el (apropos-safe-documentation, apropos-macrop):
* lisp/emacs-lisp/debug.el (debug-on-entry):
* lisp/emacs-lisp/cl-macs.el (cl-compiler-macroexpand):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand):
* lisp/calc/calc.el (name): Use autoloadp & autoload-do-load.
parent b1364986
......@@ -498,6 +498,10 @@ still be supported for Emacs 24.x.
* Lisp changes in Emacs 24.2
** New functions `autoloadp' and `autoload-do-load'.
** `function-get' fetches the property of a function, following aliases.
** `toggle-read-only' accepts a second argument specifying whether to
print a message, if called from Lisp.
2012-07-26 Stefan Monnier <>
Autoload from Lisp with more care. Follow aliases when looking for
function properties.
* subr.el (autoloadp): New function.
(symbol-file): Use it.
(function-get): New function.
* emacs-lisp/macroexp.el (macroexp--expand-all): Use function-get and
* emacs-lisp/lisp-mode.el (lisp-font-lock-syntactic-face-function)
* emacs-lisp/gv.el (gv-get):
* emacs-lisp/edebug.el (get-edebug-spec, edebug-basic-spec):
* emacs-lisp/byte-opt.el (byte-optimize-form):
* emacs-lisp/bytecomp.el (byte-compile-arglist-warn):
* emacs-lisp/autoload.el (make-autoload, autoload-print-form):
Use function-get.
* emacs-lisp/cl.el: Don't propagate function properties any more.
* speedbar.el (speedbar-add-localized-speedbar-support):
* emacs-lisp/disass.el (disassemble-internal):
* desktop.el (desktop-load-file):
* help-fns.el (help-function-arglist, find-lisp-object-file-name)
* emacs-lisp/find-func.el (find-function-noselect):
* emacs-lisp/elp.el (elp-instrument-function):
* emacs-lisp/advice.el (ad-has-proper-definition):
* apropos.el (apropos-safe-documentation, apropos-macrop):
* emacs-lisp/debug.el (debug-on-entry):
* emacs-lisp/cl-macs.el (cl-compiler-macroexpand):
* emacs-lisp/byte-opt.el (byte-compile-inline-expand):
* calc/calc.el (name): Use autoloadp & autoload-do-load.
2012-07-25 Alp Aker <>
* international/mule-cmds.el (ucs-insert): Mark it as an obsolete
......@@ -980,7 +980,7 @@ Will return nil instead."
(setq function (if (byte-code-function-p function)
(if (> (length function) 4)
(aref function 4))
(if (eq (car-safe function) 'autoload)
(if (autoloadp function)
(nth 2 function)
(if (eq (car-safe function) 'lambda)
(if (stringp (nth 2 function))
......@@ -1114,7 +1114,7 @@ If non-nil TEXT is a string that will be printed as a heading."
(consp (setq symbol
(symbol-function symbol)))
(or (eq (car symbol) 'macro)
(if (eq (car symbol) 'autoload)
(if (autoloadp symbol)
(memq (nth 4 symbol)
'(macro t))))))
......@@ -914,7 +914,7 @@ Used by `calc-user-invocation'.")
;; Set up the autoloading linkage.
(let ((name (and (fboundp 'calc-dispatch)
(eq (car-safe (symbol-function 'calc-dispatch)) 'autoload)
(autoloadp (symbol-function 'calc-dispatch))
(nth 1 (symbol-function 'calc-dispatch))))
(p load-path))
......@@ -1119,11 +1119,8 @@ directory DIRNAME."
(defun desktop-load-file (function)
"Load the file where auto loaded FUNCTION is defined."
(when function
(let ((fcell (and (fboundp function) (symbol-function function))))
(when (and (listp fcell)
(eq 'autoload (car fcell)))
(load (cadr fcell))))))
(when (fboundp function)
(autoload-do-load (symbol-function function) function)))
;; ----------------------------------------------------------------------------
;; Create a buffer, load its file, set its mode, ...;
......@@ -2542,7 +2542,7 @@ definition (see the code for `documentation')."
For that it has to be fbound with a non-autoload definition."
(and (symbolp function)
(fboundp function)
(not (eq (car-safe (symbol-function function)) 'autoload))))
(not (autoloadp (symbol-function function)))))
;; The following two are necessary for the sake of packages such as
;; ange-ftp which redefine functions via fcell indirection:
......@@ -163,23 +163,23 @@ expression, in which case we want to handle forms differently."
((or `define-generic-mode `define-derived-mode
`define-compilation-mode) nil)
(_ t)))
(body (nthcdr (or (get car 'doc-string-elt) 3) form))
(body (nthcdr (or (function-get car 'doc-string-elt) 3) form))
(doc (if (stringp (car body)) (pop body))))
;; Add the usage form at the end where describe-function-1
;; can recover it.
(when (listp args) (setq doc (help-add-fundoc-usage doc args)))
;; `define-generic-mode' quotes the name, so take care of that
(list 'autoload (if (listp name) name (list 'quote name))
file doc
(or (and (memq car '(define-skeleton define-derived-mode
define-minor-mode)) t)
(eq (car-safe (car body)) 'interactive))
(if macrop (list 'quote 'macro) nil))))
`(autoload ,(if (listp name) name (list 'quote name))
,file ,doc
,(or (and (memq car '(define-skeleton define-derived-mode
define-minor-mode)) t)
(eq (car-safe (car body)) 'interactive))
,(if macrop ''macro nil))))
;; For defclass forms, use `eieio-defclass-autoload'.
((eq car 'defclass)
......@@ -277,7 +277,7 @@ put the output in."
;; Symbols at the toplevel are meaningless.
((symbolp form) nil)
(let ((doc-string-elt (get (car-safe form) 'doc-string-elt))
(let ((doc-string-elt (function-get (car-safe form) 'doc-string-elt))
(outbuf autoload-print-form-outbuf))
(if (and doc-string-elt (stringp (nth doc-string-elt form)))
;; We need to hack the printing because the
......@@ -356,7 +356,7 @@ not be relied upon."
"Insert the section-header line,
which lists the file name and which functions are in it, etc."
(insert generate-autoload-section-header)
(prin1 (list 'autoloads autoloads load-name file time)
(prin1 `(autoloads ,autoloads ,load-name ,file ,time)
(terpri outbuf)
;; Break that line at spaces, to avoid very long lines.
......@@ -249,8 +249,8 @@
(let* ((name (car form))
(localfn (cdr (assq name byte-compile-function-environment)))
(fn (or localfn (and (fboundp name) (symbol-function name)))))
(when (and (consp fn) (eq (car fn) 'autoload))
(load (nth 1 fn))
(when (autoloadp fn)
(autoload-do-load fn)
(setq fn (or (and (fboundp name) (symbol-function name))
(cdr (assq name byte-compile-function-environment)))))
(pcase fn
......@@ -586,10 +586,11 @@
(let (opt new)
(if (and (consp form)
(symbolp (car form))
(or (and for-effect
;; we don't have any of these yet, but we might.
(setq opt (get (car form) 'byte-for-effect-optimizer)))
(setq opt (get (car form) 'byte-optimizer)))
(or ;; (and for-effect
;; ;; We don't have any of these yet, but we might.
;; (setq opt (get (car form)
;; 'byte-for-effect-optimizer)))
(setq opt (function-get (car form) 'byte-optimizer)))
(not (eq form (setq new (funcall opt form)))))
;; (if (equal form new) (error "bogus optimizer -- %s" opt))
......@@ -1355,7 +1355,7 @@ extra args."
nums sig min max)
(when calls
(when (and (symbolp name)
(eq (get name 'byte-optimizer)
(eq (function-get name 'byte-optimizer)
(byte-compile-warn "defsubst `%s' was used before it was defined"
......@@ -2420,8 +2420,8 @@ and then returning foo."
(while (and (symbolp func)
(not (setq handler (get func 'compiler-macro)))
(fboundp func)
(or (not (eq (car-safe (symbol-function func)) 'autoload))
(load (nth 1 (symbol-function func)))))
(or (not (autoloadp (symbol-function func)))
(autoload-do-load (symbol-function func) func)))
(setq func (symbol-function func)))
(and handler
(not (eq form (setq form (apply handler form (cdr form))))))))
......@@ -320,16 +320,7 @@
(let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun)))
(intern (format "cl-%s" fun)))))
(defalias fun new)
;; If `cl-foo' is declare inline, then make `foo' inline as well, and
;; similarly. Same for edebug specifications, indent rules and
;; doc-string position.
;; FIXME: For most of them, we should instead follow aliases
;; where applicable.
(dolist (prop '(byte-optimizer doc-string-elt edebug-form-spec
(if (get new prop)
(put fun prop (get new prop))))))
(defalias fun new)))
;;; Features provided a bit differently in Elisp.
......@@ -805,9 +805,9 @@ Redefining FUNCTION also cancels it."
,(interactive-form (symbol-function function))
(apply ',(symbol-function function)
(when (eq (car-safe (symbol-function function)) 'autoload)
(when (autoloadp (symbol-function function))
;; The function is autoloaded. Load its real definition.
(load (cadr (symbol-function function)) nil noninteractive nil t))
(autoload-do-load (symbol-function function) function))
(when (or (not (consp (symbol-function function)))
(and (eq (car (symbol-function function)) 'macro)
(not (consp (cdr (symbol-function function))))))
......@@ -80,14 +80,10 @@ redefine OBJECT if it is a symbol."
obj (symbol-function obj)))
(if (subrp obj)
(error "Can't disassemble #<subr %s>" name))
(when (and (listp obj) (eq (car obj) 'autoload))
(load (nth 1 obj))
(setq obj (symbol-function name)))
(if (eq (car-safe obj) 'macro) ;handle macros
(setq obj (autoload-do-load obj name))
(if (eq (car-safe obj) 'macro) ;Handle macros.
(setq macro t
obj (cdr obj)))
(when (and (listp obj) (eq (car obj) 'closure))
(error "Don't know how to compile an interpreted closure"))
(if (and (listp obj) (eq (car obj) 'byte-code))
(setq obj (list 'lambda nil obj)))
(if (and (listp obj) (not (eq (car obj) 'lambda)))
......@@ -242,10 +242,13 @@ If the result is non-nil, then break. Errors are ignored."
(defun get-edebug-spec (symbol)
;; Get the spec of symbol resolving all indirection.
(let ((edebug-form-spec (get symbol 'edebug-form-spec))
(while (and (symbolp edebug-form-spec)
(setq indirect (get edebug-form-spec 'edebug-form-spec)))
(let ((edebug-form-spec nil)
(indirect symbol))
(and (symbolp indirect)
(setq indirect
(function-get indirect 'edebug-form-spec 'autoload))))
;; (edebug-trace "indirection: %s" edebug-form-spec)
(setq edebug-form-spec indirect))
......@@ -263,7 +266,7 @@ An extant spec symbol is a symbol that is not a function and has a
(setq spec (cdr spec)))
((symbolp spec)
(unless (functionp spec) (get spec 'edebug-form-spec)))))
(unless (functionp spec) (function-get spec 'edebug-form-spec)))))
;;; Utilities
......@@ -258,7 +258,7 @@ FUNSYM must be a symbol of a defined function."
;; the autoload here, since that could have side effects, and
;; elp-instrument-function is similar (in my mind) to defun-ish
;; type functionality (i.e. it shouldn't execute the function).
(and (eq (car-safe funguts) 'autoload)
(and (autoloadp funguts)
(error "ELP cannot profile autoloaded function: %s" funsym))
;; We cannot profile functions used internally during profiling.
(unless (elp-profilable-p funsym)
......@@ -347,8 +347,7 @@ in `load-path'."
(if aliases
(message "%s" aliases))
(let ((library
(cond ((eq (car-safe def) 'autoload)
(nth 1 def))
(cond ((autoloadp def) (nth 1 def))
((subrp def)
(if lisp-only
(error "%s is a built-in function" function))
......@@ -84,14 +84,7 @@ DO must return an Elisp expression."
(if (symbolp place)
(funcall do place (lambda (v) `(setq ,place ,v)))
(let* ((head (car place))
(gf (get head 'gv-expander)))
;; Autoload the head, if applicable, since that might define
;; `gv-expander'.
(when (and (null gf) (fboundp head)
(eq 'autoload (car-safe (symbol-function head))))
(load (nth 1 (symbol-function head)) 'noerror 'nomsg)
(setq gf (get head 'gv-expander))))
(gf (function-get head 'gv-expander 'autoload)))
(if gf (apply gf do (cdr place))
(let ((me (macroexpand place ;FIXME: expand one step at a time!
;; (append macroexpand-all-environment
......@@ -158,7 +158,8 @@ It has `lisp-mode-abbrev-table' as its parent."
(goto-char listbeg)
(and (looking-at "([ \t\n]*\\(\\(\\sw\\|\\s_\\)+\\)")
(match-string 1)))))
(docelt (and firstsym (get (intern-soft firstsym)
(docelt (and firstsym
(function-get (intern-soft firstsym)
(if (and docelt
;; It's a string in a form that can have a docstring.
......@@ -1135,7 +1136,8 @@ Lisp function does not specify a special indentation."
(let ((function (buffer-substring (point)
(progn (forward-sexp 1) (point))))
(setq method (or (get (intern-soft function) 'lisp-indent-function)
(setq method (or (function-get (intern-soft function)
(get (intern-soft function) 'lisp-indent-hook)))
(cond ((or (eq method 'defun)
(and (null method)
......@@ -185,12 +185,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
;; Macro expand compiler macros. This cannot be delayed to
;; byte-optimize-form because the output of the compiler-macro can
;; use macros.
(let ((handler nil))
(while (and (symbolp func)
(not (setq handler (get func 'compiler-macro)))
(fboundp func))
;; Follow the sequence of aliases.
(setq func (symbol-function func)))
(let ((handler (function-get func 'compiler-macro)))
(if (null handler)
;; No compiler macro. We just expand each argument (for
;; setq/setq-default this works alright because the variable names
......@@ -198,12 +193,9 @@ Assumes the caller has bound `macroexpand-all-environment'."
(macroexp--all-forms form 1)
;; If the handler is not loaded yet, try (auto)loading the
;; function itself, which may in turn load the handler.
(when (and (not (functionp handler))
(fboundp func) (eq (car-safe (symbol-function func))
(unless (functionp handler)
(load (nth 1 (symbol-function func))
'noerror 'nomsg)))
(autoload-do-load (indirect-function func) func)))
(let ((newform (macroexp--compiler-macro handler form)))
(if (eq form newform)
;; The compiler macro did not find anything to do.
......@@ -114,7 +114,8 @@ QPatterns for vectors are not implemented yet.
PRED can take the form
FUNCTION in which case it gets called with one argument.
(FUN ARG1 .. ARGN) in which case it gets called with N+1 arguments.
(FUN ARG1 .. ARGN) in which case it gets called with an N+1'th argument
which is the value being matched.
A PRED of the form FUNCTION is equivalent to one of the form (FUNCTION).
PRED patterns can refer to variables bound earlier in the pattern.
E.g. you can match pairs where the cdr is larger than the car with a pattern
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment