(syms_of_xdisp) <blink-cursor-alist>: Doc fix.

2 files changed, 23 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 618bd851dd3..f097754496c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2005-12-11  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (syms_of_xdisp) <blink-cursor-alist>: Doc fix.
+
+        * lisp.h [! NO_UNION_TYPE] (EQ): Use == so args are computed just once.
+
+        * keymap.c (Fset_keymap_parent, store_in_keymap): Use CHECK_IMPURE.
+        (Flookup_key): Doc fix.
+        (syms_of_keymap) <function-key-map>: Doc fix.
+
+        * fns.c (Frequire): Treat evaluating from a source file
+        like loading the file.
+
+        * floatfns.c (Flog): Doc fix.
+
+        * fileio.c (Finsert_file_contents): Set Vdeactivate_mark
+        when we change the buffer.
+
 2005-12-11  Juri Linkov  <juri@jurta.org>
 
         * minibuf.c (display_completion_list_1):
diff --git a/src/xdisp.c b/src/xdisp.c
index 9420114489a..c7d3cf88ecf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23632,7 +23632,11 @@ go back to their normal size.  */);
 Each element has the form (ON-STATE . OFF-STATE).  Whenever the
 `cursor-type' frame-parameter or variable equals ON-STATE,
 comparing using `equal', Emacs uses OFF-STATE to specify
-how to blink it off.  */);
+how to blink it off.  ON-STATE and OFF-STATE are values for
+the `cursor-type' frame parameter.
+
+If a frame's ON-STATE has no entry in this list,
+the frame's other specifications determine how to blink the cursor off.  */);
   Vblink_cursor_alist = Qnil;
 
   DEFVAR_BOOL ("auto-hscroll-mode", &automatic_hscrolling_p,