diff options
author | Miles Bader <miles@gnu.org> | 2006-12-07 04:14:14 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-12-07 04:14:14 +0000 |
commit | a0451a715e4ed018a02b825d0eb823424693d1de (patch) | |
tree | d2b10fcc69c333ccc438d7a9ad116fbc1495fc9e /lisp/help-macro.el | |
parent | d324f894beea8b485792c779659e8e20c1cb699d (diff) | |
parent | 12f7728e938fe5bb850ce2928637d1e349919142 (diff) | |
download | emacs-a0451a715e4ed018a02b825d0eb823424693d1de.tar.gz emacs-a0451a715e4ed018a02b825d0eb823424693d1de.tar.bz2 emacs-a0451a715e4ed018a02b825d0eb823424693d1de.zip |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 523-544)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 168-171)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
Diffstat (limited to 'lisp/help-macro.el')
-rw-r--r-- | lisp/help-macro.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/help-macro.el b/lisp/help-macro.el index cc78bd71210..971b97f71bb 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -1,6 +1,6 @@ ;;; help-macro.el --- makes command line help such as help-for-help -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lynn Slater <lrs@indetech.com> @@ -152,7 +152,7 @@ and then returns." (progn (if (eq (car-safe char) 'switch-frame) (handle-switch-frame char)) - (if (memq char '(?\C-v ?\ )) + (if (memq char '(?\C-v ?\s)) (scroll-up)) (if (or (memq char '(?\177 ?\M-v delete backspace)) |