* lisp/help-fns.el (help-fns--compiler-macro): If the handler function is

named, then put a link to it.
* lisp/help-mode.el (help-function-cmacro): Adjust regexp for cl-lib names.
* lisp/emacs-lisp/cl-macs.el (cl--compiler-macro-typep): New function.
(cl-typep): Use it.
(cl-eval-when): Simplify debug spec.
(cl-define-compiler-macro): Use eval-and-compile.  Give a name to the
compiler-macro function instead of setting `compiler-macro-file'.

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index b5aca1a4445..b56adc2a4a9 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -204,7 +204,7 @@ The format is (FUNCTION ARGS...).")
                        (message "Unable to find location in file"))))
   'help-echo (purecopy "mouse-2, RET: find function's definition"))
 
-(define-button-type 'help-function-cmacro
+(define-button-type 'help-function-cmacro ; FIXME: Obsolete since 24.4.
   :supertype 'help-xref
   'help-function (lambda (fun file)
                    (setq file (locate-library file t))
@@ -213,7 +213,7 @@ The format is (FUNCTION ARGS...).")
                          (pop-to-buffer (find-file-noselect file))
                          (goto-char (point-min))
                          (if (re-search-forward
-                              (format "^[ \t]*(define-compiler-macro[ \t]+%s"
+                              (format "^[ \t]*(\\(cl-\\)?define-compiler-macro[ \t]+%s"
                                       (regexp-quote (symbol-name fun))) nil t)
                              (forward-line 0)
                            (message "Unable to find location in file")))