# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1074217691 0
# Node ID 7ea1b7196d49af4ed2b26b5ea2dea5c0d692a73e
# Parent  587ca9eaf25ed838537169a0e8c730a8f1f9e14e
*** empty log message ***

diff -r 587ca9eaf25e -r 7ea1b7196d49 etc/NEWS
--- a/etc/NEWS	Fri Jan 16 01:13:41 2004 +0000
+++ b/etc/NEWS	Fri Jan 16 01:48:11 2004 +0000
@@ -1750,6 +1750,10 @@
 
 * 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 -r 587ca9eaf25e -r 7ea1b7196d49 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 16 01:13:41 2004 +0000
+++ b/lisp/ChangeLog	Fri Jan 16 01:48:11 2004 +0000
@@ -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 -r 587ca9eaf25e -r 7ea1b7196d49 lisp/emacs-lisp/cl.el
--- a/lisp/emacs-lisp/cl.el	Fri Jan 16 01:13:41 2004 +0000
+++ b/lisp/emacs-lisp/cl.el	Fri Jan 16 01:48:11 2004 +0000
@@ -579,7 +579,7 @@
   "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 -r 587ca9eaf25e -r 7ea1b7196d49 lispref/ChangeLog
--- a/lispref/ChangeLog	Fri Jan 16 01:13:41 2004 +0000
+++ b/lispref/ChangeLog	Fri Jan 16 01:48:11 2004 +0000
@@ -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 -r 587ca9eaf25e -r 7ea1b7196d49 lispref/edebug.texi
--- a/lispref/edebug.texi	Fri Jan 16 01:13:41 2004 +0000
+++ b/lispref/edebug.texi	Fri Jan 16 01:48:11 2004 +0000
@@ -1381,7 +1381,7 @@
 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