Commit e14b388a authored by Chong Yidong's avatar Chong Yidong
Browse files

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.
parent 354cf0ba
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.
......
......@@ -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.
......
......@@ -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" "\
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment