aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/bindings.el
diff options
context:
space:
mode:
authorKaroly Lorentey <[email protected]>2006-07-29 09:59:12 +0000
committerKaroly Lorentey <[email protected]>2006-07-29 09:59:12 +0000
commit251bc578cc636223d618d06cf2a2bb7d07db9cce (patch)
tree58e1c6b0a35bb4a77e6cb77876e4bc6a9d3f2ab2 /lisp/bindings.el
parent99715bbc447eb633e45ffa23b87284771ce3ac74 (diff)
parent0ed0527cb02180a50f6744086ce3a487740c73e4 (diff)
Merged from [email protected]
Patches applied: * [email protected]/emacs--devo--0--patch-351 Update from CVS * [email protected]/emacs--devo--0--patch-352 Update from CVS * [email protected]/emacs--devo--0--patch-353 Merge from gnus--rel--5.10 * [email protected]/emacs--devo--0--patch-354 Update from CVS * [email protected]/emacs--devo--0--patch-355 Update from CVS * [email protected]/emacs--devo--0--patch-356 Update from CVS * [email protected]/emacs--devo--0--patch-357 Merge from gnus--rel--5.10 * [email protected]/emacs--devo--0--patch-358 Update from CVS * [email protected]/emacs--devo--0--patch-359 Update from CVS * [email protected]/emacs--devo--0--patch-360 Update from CVS * [email protected]/emacs--devo--0--patch-361 Update from CVS * [email protected]/emacs--devo--0--patch-362 Update from CVS * [email protected]/emacs--devo--0--patch-363 Update from CVS * [email protected]/emacs--devo--0--patch-364 Update from CVS * [email protected]/emacs--devo--0--patch-365 Update from CVS * [email protected]/emacs--devo--0--patch-366 Update from CVS * [email protected]/emacs--devo--0--patch-367 Merge from gnus--rel--5.10 * [email protected]/emacs--devo--0--patch-368 Update from CVS * [email protected]/emacs--devo--0--patch-369 Update from CVS * [email protected]/emacs--devo--0--patch-370 Update from CVS * [email protected]/gnus--rel--5.10--patch-115 Update from CVS * [email protected]/gnus--rel--5.10--patch-116 Update from CVS * [email protected]/gnus--rel--5.10--patch-117 Update from CVS * [email protected]/gnus--rel--5.10--patch-118 Merge from emacs--devo--0 * [email protected]/gnus--rel--5.10--patch-119 Update from CVS * [email protected]/gnus--rel--5.10--patch-120 Update from CVS git-archimport-id: [email protected]/emacs--multi-tty--0--patch-573
Diffstat (limited to 'lisp/bindings.el')
-rw-r--r--lisp/bindings.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 639ee2dabb..fc66d36b41 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -683,7 +683,11 @@ language you are using."
(define-key map [prior] 'previous-history-element)
(define-key map [up] 'previous-history-element)
(define-key map "\es" 'next-matching-history-element)
- (define-key map "\er" 'previous-matching-history-element))
+ (define-key map "\er" 'previous-matching-history-element)
+ ;; Override the global binding (which calls indent-relative via
+ ;; indent-for-tab-command). The alignment that indent-relative tries to
+ ;; do doesn't make much sense here since the prompt messes it up.
+ (define-key map "\t" 'self-insert-command))
(define-key global-map "\C-u" 'universal-argument)
(let ((i ?0))