Merge from emacs--rel--22

[gnu-emacs] / lisp / emacs-lisp / helper.el

diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index 574694654bf077926d9a4e26822f52be8a47a616..a5459a5db83502315a53f65b80b198dc72d2d42b 100644 (file)
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -1,6 +1,7 @@
 ;;; helper.el --- utility help package supporting help in electric modes
 
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -10,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -76,8 +77,8 @@
                   "Delete scrolls back. Other keys %s"
                   "Type anything to %s"))
            blurb)
-         (setq continue (read-char))
-         (cond ((and (memq continue '(?\ ?\C-v)) (< state 2))
+         (setq continue (read-event))
+         (cond ((and (memq continue '(?\s ?\C-v)) (< state 2))
                 (scroll-up))
                ((= continue ?\C-l)
                 (recenter))
@@ -157,4 +158,5 @@
 
 (provide 'helper)
 
+;;; arch-tag: a0984577-d3e9-4124-ae0d-c46fe740f6a9
 ;;; helper.el ends here