Comment changes.

diff --git a/src/ChangeLog b/src/ChangeLog
index d93105c4f060926dad5fec23c9ee4d0c8386d3cc..2b65d7d5491e0caf7e985f2cd015a464238cfb84 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2004-12-27  Richard M. Stallman  <rms@gnu.org>
+
+       * xdisp.c (single_display_spec_string_p): Renamed from
+       single_display_prop_string_p.
+       (single_display_spec_intangible_p): Renamed from
+       single_display_prop_intangible_p.
+       (handle_single_display_spec): Renamed from handle_single_display_prop.
+       Rewritten to be easier to understand.
+
+       * Change in load-history format.  Functions now get (defun . NAME),
+       and variables get just NAME.
+
+       * data.c (Fdefalias): Use (defun . FN_NAME) in LOADHIST_ATTACH.
+
+       * eval.c (Fdefun, Fdefmacro): Use (defun . FN_NAME) in LOADHIST_ATTACH.
+       (Fdefvaralias, Fdefvar, Fdefconst): Use just SYM in LOADHIST_ATTACH.
+       (Qdefvar): Var deleted.
+       (syms_of_eval): Don't initialze it.
+
+       * lread.c (syms_of_lread) <load-history>: Doc fix.
+
 2004-12-27  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xmenu.c (popup_get_selection): Pop down on C-g.

diff --git a/src/lisp.h b/src/lisp.h
index 8081e7c4fe454510df72b1e5d4c07d691e336f20..f6db53f2ff849c3bc43ada6532b69c85b79cb793 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1671,8 +1671,16 @@ extern void defvar_kboard P_ ((char *, int));
 #define DEFVAR_LISP_NOPRO(lname, vname, doc) defvar_lisp_nopro (lname, vname)
 #define DEFVAR_BOOL(lname, vname, doc) defvar_bool (lname, vname)
 #define DEFVAR_INT(lname, vname, doc) defvar_int (lname, vname)
+
+/* TYPE is nil for a general Lisp variable.
+   An integer specifies a type; then only LIsp values
+   with that type code are allowed (except that nil is allowed too).
+   LNAME is the LIsp-level variable name.
+   VNAME is the name of the buffer slot.
+   DOC is a dummy where you write the doc string as a comment.  */
 #define DEFVAR_PER_BUFFER(lname, vname, type, doc)  \
  defvar_per_buffer (lname, vname, type, 0)
+
 #define DEFVAR_KBOARD(lname, vname, doc) \
  defvar_kboard (lname, \
                (int)((char *)(&current_kboard->vname) \