entered into RCS

9 files changed, 10 insertions, 23 deletions

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 6c4437a822..1f5f6dca46 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -53,8 +53,6 @@
 ;;; Change list
 ;;; -----------
 
-;;; $Header: /import/kaplan/kaplan/liberte/Edebug/RCS/edebug.el,v 2.5 91/07/25 13:32:53 liberte Exp Locker: liberte $
-;;; $Log:	edebug.el,v $
 ;;; Revision 2.5  91/07/25  13:32:53  liberte
 ;;; Doc string cleanup.
 ;;; If edebug-form-hook is t, evaluate all arguments.
diff --git a/lisp/gnusmail.el b/lisp/gnusmail.el
index 85646ec7ae..b9fe3c0620 100644
--- a/lisp/gnusmail.el
+++ b/lisp/gnusmail.el
@@ -5,8 +5,6 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news
 
-;; $Header: gnusmail.el,v 1.1 90/03/23 13:24:39 umerin Locked $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/gnusmisc.el b/lisp/gnusmisc.el
index f5932d6766..e939036ee5 100644
--- a/lisp/gnusmisc.el
+++ b/lisp/gnusmisc.el
@@ -5,8 +5,6 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news
 
-;; $Header: gnusmisc.el,v 1.2 90/03/23 13:25:04 umerin Locked $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/gnuspost.el b/lisp/gnuspost.el
index a300a66d51..bb436b5501 100644
--- a/lisp/gnuspost.el
+++ b/lisp/gnuspost.el
@@ -5,8 +5,6 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news
 
-;; $Header: gnuspost.el,v 1.2 90/03/23 13:25:16 umerin Locked $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/mh-e.el b/lisp/mh-e.el
index a10df5aa4e..b094934bc4 100644
--- a/lisp/mh-e.el
+++ b/lisp/mh-e.el
@@ -7,7 +7,6 @@
 ;; Keywords: mail
 
 (defvar mh-e-RCS-id)
-(setq mh-e-RCS-id "$Header: /var/home/larus/lib/emacs/RCS/mh-e.el,v 3.1 90/09/28 15:47:58 larus Exp Locker: larus $")
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but without any warranty.  No author or distributor
diff --git a/lisp/netunam.el b/lisp/netunam.el
index fc1177e305..ee755312f9 100644
--- a/lisp/netunam.el
+++ b/lisp/netunam.el
@@ -4,8 +4,6 @@
 
 ;; Author: Chris Hanson <cph@zurich.ai.mit.edu>
 
-;;; $Header: netunam.el,v 1.3 88/12/21 16:32:23 GMT cph Exp $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index bd23a74d9f..3a470f9fa4 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -5,8 +5,6 @@
 ;; Author: Bill Rozas <jinz@prep.ai.mit.edu>
 ;; Keywords: languages, lisp
 
-;;; $Header: scheme.el,v 1.7 88/07/15 20:20:00 GMT cph Exp $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/xscheme.el b/lisp/xscheme.el
index c8ac6ecb12..6d8e3deadf 100644
--- a/lisp/xscheme.el
+++ b/lisp/xscheme.el
@@ -5,8 +5,6 @@
 ;; Maintainer: FSF
 ;; Keywords: languages
 
-;;; $Header: xscheme.el,v 1.26 90/09/11 01:51:20 GMT cph Exp $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/src/lread.c b/src/lread.c
index 279f64a81b..c57192d6a0 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -160,7 +160,11 @@ static Lisp_Object read0 (), read1 (), read_list (), read_vector ();
 
 DEFUN ("read-char", Fread_char, Sread_char, 0, 0, 0,
   "Read a character from the command input (keyboard or macro).\n\
-It is returned as a number.")
+It is returned as a number.\n\
+If the user generates an event which is not a character (i.e. a mouse\n\
+click or function key event), `read-char' signals an error.  If you\n\
+want to read non-character events, or ignore them, call `read-event'\n\
+or `read-char-exclusive' instead.")
   ()
 {
   register Lisp_Object val;
@@ -179,7 +183,6 @@ It is returned as a number.")
   return val;
 }
 
-#ifdef HAVE_X_WINDOWS
 DEFUN ("read-event", Fread_event, Sread_event, 0, 0, 0,
   "Read an event object from the input stream.")
   ()
@@ -189,7 +192,6 @@ DEFUN ("read-event", Fread_event, Sread_event, 0, 0, 0,
   val = read_char (0);
   return val;
 }
-#endif
 
 DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 0, 0,
   "Read a character from the command input (keyboard or macro).\n\
@@ -199,9 +201,11 @@ It is returned as a number.  Non character events are ignored.")
   register Lisp_Object val;
 
 #ifndef standalone
-  val = read_char (0);
-  while (XTYPE (val) != Lisp_Int)
-    val = read_char (0);
+  do
+    {
+      val = read_char (0);
+    }
+  while (XTYPE (val) != Lisp_Int);
 #else
   val = getchar ();
 #endif
@@ -1565,9 +1569,7 @@ syms_of_lread ()
   defsubr (&Seval_region);
   defsubr (&Sread_char);
   defsubr (&Sread_char_exclusive);
-#ifdef HAVE_X_WINDOWS
   defsubr (&Sread_event);
-#endif /* HAVE_X_WINDOWS */
   defsubr (&Sget_file_char);
   defsubr (&Smapatoms);