Support inlining labels, bytecomp.el. lisp/ChangeLog addition: 2011-10-02 Aidan Kehoe <kehoea@parhasard.net> * bytecomp.el (byte-compile-initial-macro-environment): Add #'declare to this, so it doesn't need to rely on #'cl-compiling file to determine when we're byte-compiling. Update #'labels to support declaring labels inline, as Common Lisp requires. * bytecomp.el (byte-compile-function-form): Don't error if FUNCTION is quoting a non-lambda, non-symbol, just return it. * cl-extra.el (cl-macroexpand-all): If a label name has been quoted, expand to the label placeholder quoted with 'function. This allows the byte compiler to distinguish between uses of the placeholder as data and uses in contexts where it should be inlined. * cl-macs.el: * cl-macs.el (cl-do-proclaim): When proclaming something as inline, if it is bound as a label, don't modify the symbol's plist; instead, treat the first element of its placeholder constant vector as a place to store compile information. * cl-macs.el (declare): Leave processing declarations while compiling to the implementation of #'declare in byte-compile-initial-macro-environment. tests/ChangeLog addition: 2011-10-02 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: * automated/lisp-tests.el (+): Test #'labels and inlining.

--- a/lisp/cl-extra.el	Sun Sep 25 16:12:07 2011 +0100
+++ b/lisp/cl-extra.el	Sun Oct 02 15:32:16 2011 +0100
@@ -619,8 +619,11 @@
                      (cl-macroexpand-all (nth 1 (nth 2 (nth 2 found))) env)
                    ;; It's an atom, almost certainly a compiled function;
                    ;; we're using the implementation of labels in
-                   ;; bytecomp.el.
-                  (nth 2 (nth 2 found)))
+                   ;; bytecomp.el. Quote it with FUNCTION so that code can
+                   ;; tell uses as data apart from the uses with funcall,
+                   ;; where it's unquoted. #### We should warn if (car form)
+                   ;; above is quote, rather than function.
+                   (list 'function (nth 2 (nth 2 found))))
 	       form))))
 	((memq (car form) '(defun defmacro))
 	 (list* (car form) (nth 1 form) (cl-macroexpand-body (cddr form) env)))