(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL)

(DEFVAR_INT, DEFVAR_PER_BUFFER, DEFVAR_KBOARD):
Remove `DOC_STRINGS_IN_COMMENTS' cases.

diff --git a/src/ChangeLog b/src/ChangeLog
index 97be71da5423dd7a24b5dcbaebcf1ba8860095f4..33f49a390bd7456bdba2553551cb5d84f0abebb6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-22  Miles Bader  <miles@gnu.org>
+
+       * lisp.h (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL)
+       (DEFVAR_INT, DEFVAR_PER_BUFFER, DEFVAR_KBOARD):
+       Remove `DOC_STRINGS_IN_COMMENTS' cases.
+
 2001-10-21  Jason Rumney  <jasonr@gnu.org>
 
        * w32term.c (x_erase_phys_cursor): Remove inverse_p again.

diff --git a/src/lisp.h b/src/lisp.h
index cba2349b581a33902797fa1b6c98446d3ca1e68d..f913fe1998e4cec16c3688dfb0748f3a461b858b 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1622,21 +1622,6 @@ extern void defvar_kboard P_ ((char *, int));
 /* Macros we use to define forwarded Lisp variables.
    These are used in the syms_of_FILENAME functions.  */
 
-#ifdef DOC_STRINGS_IN_COMMENTS
-
-#define DEFVAR_LISP(lname, vname) defvar_lisp (lname, vname)
-#define DEFVAR_LISP_NOPRO(lname, vname) defvar_lisp_nopro (lname, vname)
-#define DEFVAR_BOOL(lname, vname) defvar_bool (lname, vname)
-#define DEFVAR_INT(lname, vname) defvar_int (lname, vname)
-#define DEFVAR_PER_BUFFER(lname, vname, type)  \
- defvar_per_buffer (lname, vname, type, 0)
-#define DEFVAR_KBOARD(lname, vname) \
- defvar_kboard (lname, \
-               (int)((char *)(&current_kboard->vname) \
-                     - (char *)current_kboard))
-
-#else /* not DOC_STRINGS_IN_COMMENTS  */
-
 #define DEFVAR_LISP(lname, vname, doc) defvar_lisp (lname, vname)
 #define DEFVAR_LISP_NOPRO(lname, vname, doc) defvar_lisp_nopro (lname, vname)
 #define DEFVAR_BOOL(lname, vname, doc) defvar_bool (lname, vname)
@@ -1648,8 +1633,6 @@ extern void defvar_kboard P_ ((char *, int));
                (int)((char *)(&current_kboard->vname) \
                      - (char *)current_kboard))
 
-#endif /* not DOC_STRINGS_IN_COMMENTS */
-
 
 \f
 /* Structure for recording Lisp call stack for backtrace purposes.  */