aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-07-09 15:24:22 +0000
committerChong Yidong2006-07-09 15:24:22 +0000
commit4b6b279f02b5bacc86b0cf3a4ac730e3f02cbad1 (patch)
treeae0052c64d752f387b1e762b5528c8c8f4b2f109
parent47f97084161acb8906cb69bc628be3fdc0454cc5 (diff)
downloademacs-4b6b279f02b5bacc86b0cf3a4ac730e3f02cbad1.tar.gz
emacs-4b6b279f02b5bacc86b0cf3a4ac730e3f02cbad1.zip
* emacs-lisp/helper.el (Helper-help-scroller): Don't signal error
on non-char events.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/helper.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bae1c4e10de..0760219e14c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-07-09 Chong Yidong <cyd@stupidchicken.com>
2
3 * emacs-lisp/helper.el (Helper-help-scroller): Don't signal error
4 on non-char events.
5
12006-07-09 Romain Francoise <romain@orebokech.com> 62006-07-09 Romain Francoise <romain@orebokech.com>
2 7
3 * progmodes/compile.el (compilation-mode-font-lock-keywords): 8 * progmodes/compile.el (compilation-mode-font-lock-keywords):
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index 3b614be26f4..92eb86ce676 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -77,7 +77,7 @@
77 "Delete scrolls back. Other keys %s" 77 "Delete scrolls back. Other keys %s"
78 "Type anything to %s")) 78 "Type anything to %s"))
79 blurb) 79 blurb)
80 (setq continue (read-char)) 80 (setq continue (read-event))
81 (cond ((and (memq continue '(?\s ?\C-v)) (< state 2)) 81 (cond ((and (memq continue '(?\s ?\C-v)) (< state 2))
82 (scroll-up)) 82 (scroll-up))
83 ((= continue ?\C-l) 83 ((= continue ?\C-l)