*** empty log message ***

5 files changed, 19 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index aae7f497103..e4a92bd188f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1750,6 +1750,10 @@ configuration files.
 
 * Lisp Changes in Emacs 21.4
 
++++
+** `declare' is now a macro.  This change was made mostly for
+documentation purposes and should have no real effect on Lisp code.
+
 ** The new hook `before-save-hook' is invoked by `basic-save-buffer'
 before saving buffers.  This allows packages to perform various final
 tasks, for example; it can be used by the copyright package to make
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bcef05f4f1f..22cb44249a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-15  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * emacs-lisp/cl.el (declare): Add `fmakunbound' for `declare'.
+        * subr.el (declare): New macro.
+
 2004-01-15  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * progmodes/scheme.el (scheme-font-lock-keywords-2): Add "force".
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index b3e56937c60..b8d9cd5e80c 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -579,7 +579,7 @@ Keywords supported:  :test :test-not :key"
   "Non-nil means don't make CL functions autoload.")
 
 ;;; Autoload the other portions of the package.
-;; We want to replace the basic versions of dolist, dotimes below.
+;; We want to replace the basic versions of dolist, dotimes, declare below.
 (fmakunbound 'dolist)
 (fmakunbound 'dotimes)
 (fmakunbound 'declare)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 78ac60ecb1d..ff39f8d9fba 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-15  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * edebug.texi (Instrumenting Macro Calls): `declare' is not a
+        special form.
+        * macros.texi (Defining Macros): Update description of `declare',
+        which now is a macro.
+        (Wrong Time): Fix typos.
+
 2004-01-14  Luc Teirlinck  <teirllm@auburn.edu>
 
         * compile.texi (Compilation Functions): Expand descriptions of
diff --git a/lispref/edebug.texi b/lispref/edebug.texi
index 68a46a8cb48..5520852c1a3 100644
--- a/lispref/edebug.texi
+++ b/lispref/edebug.texi
@@ -1381,7 +1381,7 @@ all begin with the same symbol, you can usually work around this
 constraint by factoring the symbol out of the alternatives, e.g.,
 @code{["foo" &or [first case] [second case] ...]}.
 
-Most needs are satisfied by these two ways that bactracking is
+Most needs are satisfied by these two ways that backtracking is
 automatically disabled, but occasionally it is useful to explicitly
 disable backtracking by using the @code{gate} specification.  This is
 useful when you know that no higher alternatives could apply.  See the