[PATCH] Always check code in (interactive SEXP) for sanity

Applying this patch uncovers at least the following bug for me: Loading cl-macs... While compiling set-face-background-pixmap-file in file /home/aidan/xemacs-21.5-checked-out/lisp/faces.el: ** (image-instance-file-name (face-background-pixmap-instance face)) is a malformed function Wrote /home/aidan/xemacs-21.5-checked-out/lisp/faces.elc I’m sure it will uncover many more in the packages. The issue is that #'call-interactively wants uncompiled code in the sexp for some (not particularly sane, as far as I can tell) reason; the byte compiler up to now has not examined this code for well-formedness. This patch changes that. 2009-05-29 Aidan Kehoe <kehoea(a)parhasard.net&gt; * bytecomp.el (byte-compile-lambda): Even if we are going to store uncompiled interactive forms in the compiled-function object, byte compile (and discard) the code, for the sake of the warnings generated. --- bytecomp.el~ 2009-01-13 14:56:25.000000000 +0000 +++ bytecomp.el 2009-05-29 15:17:59.000000000 +0100 ＠＠ -2507,7 +2507,7 ＠＠ ;; only if it is not the only element of the body. (if (cdr body) (setq body (cdr body)))))) - (int (assq 'interactive body))) + (int (assq 'interactive body)) compiled-int) (dolist (arg arglist) (cond ((not (symbolp arg)) (byte-compile-warn "non-symbol in arglist: %S" arg)) ＠＠ -2526,9 +2526,11 ＠＠ (if (cdr (cdr int)) (byte-compile-warn "malformed interactive spec: %s" (prin1-to-string int))) - ;; If the interactive spec is a call to `list', - ;; don't compile it, because `call-interactively' - ;; looks at the args of `list'. + ;; If the interactive spec is a call to `list', don't + ;; store the compiled form, because `call-interactively' + ;; looks at the args of `list' and treats certain + ;; functions specially. Compiling it is nonetheless + ;; useful for warnings. (let ((form (nth 1 int))) (while (or (eq (car-safe form) 'let) (eq (car-safe form) 'let*) ＠＠ -2536,9 +2538,10 ＠＠ (while (consp (cdr form)) (setq form (cdr form))) (setq form (car form))) + (setq compiled-int + (byte-compile-top-level (nth 1 int))) (or (eq (car-safe form) 'list) - (setq int (list 'interactive - (byte-compile-top-level (nth 1 int))))))) + (setq int (list 'interactive compiled-int))))) ((cdr int) (byte-compile-warn "malformed interactive spec: %s" (prin1-to-string int)))))) -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches