(macro-declaration-function): Move to emacs-lisp/byte-run.el.

2 files changed, 7 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b27d4c83b0..028598c71cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2005-03-14  Lute Kamstra  <lute@gnu.org>
 
+        * subr.el (macro-declaration-function): Move to
+        emacs-lisp/byte-run.el.
+        * emacs-lisp/byte-run.el (macro-declaration-function): Move from
+        subr.el.
+        (dont-compile, eval-when-compile, eval-and-compile): Use declare
+        to specify indentation.
+
         * generic.el (define-generic-mode): Let generic-mode-list be a
         list of strings; test membership with equal.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 4046b915368..8badf7cf777 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -37,27 +37,6 @@ Each element of this list holds the arguments to one call to `defcustom'.")
         (cons arguments custom-declare-variable-list)))
 
 
-(defun macro-declaration-function (macro decl)
-  "Process a declaration found in a macro definition.
-This is set as the value of the variable `macro-declaration-function'.
-MACRO is the name of the macro being defined.
-DECL is a list `(declare ...)' containing the declarations.
-The return value of this function is not used."
-  ;; We can't use `dolist' or `cadr' yet for bootstrapping reasons.
-  (let (d)
-    ;; Ignore the first element of `decl' (it's always `declare').
-    (while (setq decl (cdr decl))
-      (setq d (car decl))
-      (cond ((and (consp d) (eq (car d) 'indent))
-             (put macro 'lisp-indent-function (car (cdr d))))
-            ((and (consp d) (eq (car d) 'debug))
-             (put macro 'edebug-form-spec (car (cdr d))))
-            (t
-             (message "Unknown declaration %s" d))))))
-
-(setq macro-declaration-function 'macro-declaration-function)
-
-
 ;;;; Lisp language features.
 
 (defalias 'not 'null)