From e14b388ad436ef0b50d839b512ba040feb7d556b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 6 Jul 2011 21:46:59 -0400 Subject: [PATCH] Error in next-buffer or previous-buffer if called from minibuffer. * lisp/window.el (next-buffer, previous-buffer): Signal an error if called from a minibuffer window. * lisp/bindings.el: Revert 2011-07-04 change. --- lisp/ChangeLog | 7 +++++++ lisp/bindings.el | 2 -- lisp/mail/rmail.el | 2 +- lisp/window.el | 4 ++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 700a2b1f512..8cdb2cdba42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-07-07 Chong Yidong + + * 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 * 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/mail/rmail.el b/lisp/mail/rmail.el index 02f78635e26..900eedfef84 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4379,7 +4379,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "30ab95e291380f184dff5fa6cde75520") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a7d3e7205efa4e20ca9038c9b260ce83") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ 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) -- 2.39.5