From: Glenn Morris <rgm@gnu.org>
Date: Fri, 11 Sep 2009 03:39:28 +0000 (+0000)
Subject: (define-compiler-macro): Add a property that records where a macro was
X-Git-Tag: emacs-pretest-23.1.90~1404
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae2fd0421f69f60b6d9cf9ce6a7dd530f841cd7f;p=emacs.git

(define-compiler-macro): Add a property that records where a macro was
defined.
---

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index f0ac3c562a1..1a8f1b18e6e 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2547,8 +2547,22 @@ and then returning foo."
 	 (cons (if (memq '&whole args) (delq '&whole args)
 		 (cons '--cl-whole-arg-- args)) body))
 	(list 'or (list 'get (list 'quote func) '(quote byte-compile))
-	      (list 'put (list 'quote func) '(quote byte-compile)
-		    '(quote cl-byte-compile-compiler-macro)))))
+	      (list 'progn
+		    (list 'put (list 'quote func) '(quote byte-compile)
+			  '(quote cl-byte-compile-compiler-macro))
+		    ;; This is so that describe-function can locate
+		    ;; the macro definition.
+		    (list 'let
+			  (list (list
+				 'file
+				 (or buffer-file-name
+				     (and (boundp 'byte-compile-current-file)
+					  (stringp byte-compile-current-file)
+					  byte-compile-current-file))))
+			  (list 'if 'file
+				(list 'put (list 'quote func)
+				      '(quote compiler-macro-file)
+				      '(file-name-nondirectory file))))))))
 
 ;;;###autoload
 (defun compiler-macroexpand (form)