[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105004: Error in next-buffer or prev
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105004: Error in next-buffer or previous-buffer if called from minibuffer. |
Date: |
Wed, 06 Jul 2011 21:46:59 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105004
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-06 21:46:59 -0400
message:
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.
modified:
lisp/ChangeLog
lisp/bindings.el
lisp/mail/rmail.el
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-07-06 22:43:46 +0000
+++ b/lisp/ChangeLog 2011-07-07 01:46:59 +0000
@@ -1,3 +1,10 @@
+2011-07-07 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* mail/rmailmm.el (rmail-mime-process): Use markers for buf positions.
=== modified file 'lisp/bindings.el'
--- a/lisp/bindings.el 2011-07-05 15:31:22 +0000
+++ b/lisp/bindings.el 2011-07-07 01:46:59 +0000
@@ -807,8 +807,6 @@
(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.
=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el 2011-06-27 10:23:19 +0000
+++ b/lisp/mail/rmail.el 2011-07-07 01:46:59 +0000
@@ -4379,7 +4379,7 @@
;;;***
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el"
"30ab95e291380f184dff5fa6cde75520")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el"
"a7d3e7205efa4e20ca9038c9b260ce83")
;;; Generated autoloads from rmailmm.el
(autoload 'rmail-mime "rmailmm" "\
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-07-06 02:46:22 +0000
+++ b/lisp/window.el 2011-07-07 01:46:59 +0000
@@ -2819,11 +2819,15 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105004: Error in next-buffer or previous-buffer if called from minibuffer.,
Chong Yidong <=