*** empty log message ***

5 files changed, 16 insertions, 8 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index fbfe3b702e7..8b4abb24a21 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1794,7 +1794,7 @@ Optional second arg non-nil means ARG is measured in milliseconds.\n\
   if (!NILP (millisec))
     {
 #ifndef EMACS_HAS_USECS
-      error ("millisecond sit-for not supported on %s", SYSTEM_TYPE);
+      error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE);
 #else
       usec = sec % 1000 * 1000;
       sec /= 1000;
@@ -1913,7 +1913,7 @@ Value is t if waited the full time with no input arriving.")
   if (!NILP (millisec))
     {
 #ifndef EMACS_HAS_USECS
-      error ("millisecond sit-for not supported on %s", SYSTEM_TYPE);
+      error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE);
 #else
       usec = (sec % 1000) * 1000;
       sec /= 1000;
diff --git a/src/eval.c b/src/eval.c
index abe3674a279..f5e0bc2e276 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -520,7 +520,8 @@ You are not required to define a variable in order to use it,\n\
 but the definition can supply documentation and an initial value\n\
 in a way that tags can recognize.\n\n\
 INITVALUE is evaluated, and used to set SYMBOL, only if SYMBOL's value is void.\n\
-If SYMBOL is buffer-local, its default value is initialized in this way.\n\
+If SYMBOL is buffer-local, its default value is what is set;\n\
+ buffer-local values are not affected.\n\
 INITVALUE and DOCSTRING are optional.\n\
 If DOCSTRING starts with *, this variable is identified as a user option.\n\
  This means that M-x set-variable and M-x edit-options recognize it.\n\
@@ -552,7 +553,8 @@ DEFUN ("defconst", Fdefconst, Sdefconst, 2, UNEVALLED, 0,
   "(defconst SYMBOL INITVALUE DOCSTRING): define SYMBOL as a constant variable.\n\
 The intent is that programs do not change this value, but users may.\n\
 Always sets the value of SYMBOL to the result of evalling INITVALUE.\n\
-If SYMBOL is buffer-local, its default value is initialized in this way.\n\
+If SYMBOL is buffer-local, its default value is what is set;\n\
+ buffer-local values are not affected.\n\
 DOCSTRING is optional.\n\
 If DOCSTRING starts with *, this variable is identified as a user option.\n\
  This means that M-x set-variable and M-x edit-options recognize it.\n\n\
diff --git a/src/keyboard.c b/src/keyboard.c
index 910a4b9a77f..22ce74ed963 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -155,7 +155,7 @@ Lisp_Object meta_prefix_char;
 /* Last size recorded for a current buffer which is not a minibuffer.  */
 static int last_non_minibuf_size;
 
-/* Number of idle seconds before an auto-save.  */
+/* Number of idle seconds before an auto-save and garbage collection.  */
 static Lisp_Object Vauto_save_timeout;
 
 /* Total number of times read_char has returned.  */
@@ -3569,7 +3569,9 @@ Zero means disable autosaving due to number of characters typed.");
 
   DEFVAR_LISP ("auto-save-timeout", &Vauto_save_timeout,
     "*Number of seconds idle time before auto-save.\n\
-Zero or nil means disable auto-saving due to idleness.");
+Zero or nil means disable auto-saving due to idleness.\n\
+After auto-saving due to this many seconds of idle time,\n\
+Emacs also does a garbage collection if that seems to be warranted."
   XFASTINT (Vauto_save_timeout) = 30;
 
   DEFVAR_INT ("echo-keystrokes", &echo_keystrokes,
diff --git a/src/print.c b/src/print.c
index 8301ac8ab55..2cd2b9c781e 100644
--- a/src/print.c
+++ b/src/print.c
@@ -942,7 +942,7 @@ or the symbol t (output appears in the minibuffer line).");
 
 #ifdef LISP_FLOAT_TYPE
   DEFVAR_LISP ("float-output-format", &Vfloat_output_format,
-    "The format descriptor string that lisp uses to print floats.\n\
+    "The format descriptor string used to print floats.\n\
 This is a %-spec like those accepted by `printf' in C,\n\
 but with some restrictions.  It must start with the two characters `%.'.\n\
 After that comes an integer precision specification,\n\
diff --git a/src/xfns.c b/src/xfns.c
index 6673ec1716f..c80482c42e2 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3330,6 +3330,7 @@ DEFUN ("x-select-region", Fx_select_region, Sx_select_region, 1, 1, "e",
 }
 #endif
 
+#if 0
 DEFUN ("x-horizontal-line", Fx_horizontal_line, Sx_horizontal_line, 1, 1, "e",
   "")
   (event)
@@ -3421,6 +3422,7 @@ DEFUN ("x-horizontal-line", Fx_horizontal_line, Sx_horizontal_line, 1, 1, "e",
       UNBLOCK_INPUT;
     }
 }
+#endif
 
 /* Offset in buffer of character under the pointer, or 0. */
 int mouse_buffer_offset;
@@ -4304,7 +4306,7 @@ syms_of_xfns ()
   Vx_nontext_pointer_shape = Qnil;
 
   DEFVAR_INT ("x-mode-pointer-shape", &Vx_mode_pointer_shape,
-              "The shape of the pointer when not over text.");
+              "The shape of the pointer when over the mode line.");
   Vx_mode_pointer_shape = Qnil;
 
   DEFVAR_LISP ("x-bar-cursor", &Vbar_cursor,
@@ -4370,7 +4372,9 @@ Values can be the symbols Always, WhenMapped, or NotUseful.");
   defsubr (&Sx_create_screen);
   defsubr (&Sfocus_screen);
   defsubr (&Sunfocus_screen);
+#if 0
   defsubr (&Sx_horizontal_line);
+#endif
   defsubr (&Sx_rebind_key);
   defsubr (&Sx_rebind_keys);
   defsubr (&Sx_open_connection);