diff options
| author | Chong Yidong | 2011-07-04 16:45:22 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-07-04 16:45:22 -0400 |
| commit | d66fef2b4522310bcb7d705d59aaf65a84fdd927 (patch) | |
| tree | 80177a9023f3e7c5376e2e13acad00e6b07b985d | |
| parent | 8fa396153bd5d8d3185c56cfbe4462c56451f275 (diff) | |
| download | emacs-d66fef2b4522310bcb7d705d59aaf65a84fdd927.tar.gz emacs-d66fef2b4522310bcb7d705d59aaf65a84fdd927.zip | |
* bindings.el: Ignore next-buffer and previous-buffer in minibuffer-local-map.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/bindings.el | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a3c69ee76d5..278ead6a9b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -5,6 +5,9 @@ | |||
| 5 | 5 | ||
| 6 | 2011-07-04 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-07-04 Chong Yidong <cyd@stupidchicken.com> |
| 7 | 7 | ||
| 8 | * bindings.el: Ignore next-buffer and previous-buffer in | ||
| 9 | minibuffer-local-map. | ||
| 10 | |||
| 8 | * font-lock.el (font-lock-builtin-face): Change light background | 11 | * font-lock.el (font-lock-builtin-face): Change light background |
| 9 | color to dark slate blue (Bug#6693). | 12 | color to dark slate blue (Bug#6693). |
| 10 | 13 | ||
diff --git a/lisp/bindings.el b/lisp/bindings.el index a7b729a1ba3..383223dc0d7 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el | |||
| @@ -806,6 +806,8 @@ if `inhibit-field-text-motion' is non-nil." | |||
| 806 | (define-key map [up] 'previous-history-element) | 806 | (define-key map [up] 'previous-history-element) |
| 807 | (define-key map "\es" 'next-matching-history-element) | 807 | (define-key map "\es" 'next-matching-history-element) |
| 808 | (define-key map "\er" 'previous-matching-history-element) | 808 | (define-key map "\er" 'previous-matching-history-element) |
| 809 | (define-key map [remap next-buffer] 'ignore) | ||
| 810 | (define-key map [remap previous-buffer] 'ignore) | ||
| 809 | ;; Override the global binding (which calls indent-relative via | 811 | ;; Override the global binding (which calls indent-relative via |
| 810 | ;; indent-for-tab-command). The alignment that indent-relative tries to | 812 | ;; indent-for-tab-command). The alignment that indent-relative tries to |
| 811 | ;; do doesn't make much sense here since the prompt messes it up. | 813 | ;; do doesn't make much sense here since the prompt messes it up. |