diff options
| author | Karoly Lorentey | 2004-11-06 17:52:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-11-06 17:52:02 +0000 |
| commit | 65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb (patch) | |
| tree | 853cf391ca1abda4f4ccd6fe8e7bb43f7c86ee08 /lisp/ehelp.el | |
| parent | e0bc17abe6979d607e8de4684dddb96e53c60065 (diff) | |
| parent | 392cf16dd0ee9358f8af0cd0d8048b822456bbeb (diff) | |
| download | emacs-65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb.tar.gz emacs-65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264
Diffstat (limited to 'lisp/ehelp.el')
| -rw-r--r-- | lisp/ehelp.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ehelp.el b/lisp/ehelp.el index e80c129d3ea..82a8e10301e 100644 --- a/lisp/ehelp.el +++ b/lisp/ehelp.el | |||
| @@ -85,11 +85,11 @@ | |||
| 85 | (define-key map "<" 'beginning-of-buffer) | 85 | (define-key map "<" 'beginning-of-buffer) |
| 86 | (define-key map ">" 'end-of-buffer) | 86 | (define-key map ">" 'end-of-buffer) |
| 87 | ;(define-key map "\C-g" 'electric-help-exit) | 87 | ;(define-key map "\C-g" 'electric-help-exit) |
| 88 | (define-key map "q" 'electric-help-exit) | ||
| 89 | (define-key map "Q" 'electric-help-exit) | 88 | (define-key map "Q" 'electric-help-exit) |
| 89 | (define-key map "q" 'electric-help-exit) | ||
| 90 | ;;a better key than this? | 90 | ;;a better key than this? |
| 91 | (define-key map "r" 'electric-help-retain) | ||
| 92 | (define-key map "R" 'electric-help-retain) | 91 | (define-key map "R" 'electric-help-retain) |
| 92 | (define-key map "r" 'electric-help-retain) | ||
| 93 | (define-key map "\ex" 'electric-help-execute-extended) | 93 | (define-key map "\ex" 'electric-help-execute-extended) |
| 94 | (define-key map "\C-x" 'electric-help-ctrl-x-prefix) | 94 | (define-key map "\C-x" 'electric-help-ctrl-x-prefix) |
| 95 | 95 | ||