merge trunk

3 files changed, 12 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5dd52709746..42c1686e9d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-06  Kenichi Handa  <handa@m17n.org>
+2011-07-07  Kenichi Handa  <handa@m17n.org>
 
         * international/characters.el (build-unicode-category-table):
         Delete it.
@@ -34,6 +34,13 @@
         * loadup.el: Load international/charprop.el before
         international/characters.
 
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (next-buffer, previous-buffer): Signal an error if
+        called from a minibuffer window.
+
+        * bindings.el: Revert 2011-07-04 change.
+
 2011-07-06  Richard Stallman  <rms@gnu.org>
 
         * mail/rmailmm.el (rmail-mime-process): Use markers for buf positions.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 2f035608528..99d9aa36e35 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -807,8 +807,6 @@ if `inhibit-field-text-motion' is non-nil."
   (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 [remap next-buffer] 'ignore)
-  (define-key map [remap previous-buffer] 'ignore)
   ;; 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.
diff --git a/lisp/window.el b/lisp/window.el
index 2b98630a51e..2c4bf0dcb23 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2819,11 +2819,15 @@ displayed there."
 (defun next-buffer ()
   "In selected window switch to next buffer."
   (interactive)
+  (if (window-minibuffer-p)
+      (error "Cannot switch buffers in minibuffer window"))
   (switch-to-next-buffer))
 
 (defun previous-buffer ()
   "In selected window switch to previous buffer."
   (interactive)
+  (if (window-minibuffer-p)
+      (error "Cannot switch buffers in minibuffer window"))
   (switch-to-prev-buffer))
 
 (defun delete-windows-on (&optional buffer-or-name frame)