[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117790: Replace mode-specific quit function in ibuf
From: |
Christoph Scholtes |
Subject: |
[Emacs-diffs] trunk r117790: Replace mode-specific quit function in ibuffer.el |
Date: |
Sun, 31 Aug 2014 20:44:44 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117790
revision-id: address@hidden
parent: address@hidden
committer: Christoph Scholtes <address@hidden>
branch nick: trunk
timestamp: Sun 2014-08-31 14:44:36 -0600
message:
Replace mode-specific quit function in ibuffer.el
* lisp/ibuffer.el: Replace mode-specific quit function with
`quit-window' via `special-mode'.
(ibuffer-mode-map): Use keybindings from special-mode-map instead
of local overrides.
(ibuffer): Don't store previous windows configuration. Let
`quit-window' handle restoring.
(ibuffer-quit): Remove function. Use `quit-window' instead.
(ibuffer-restore-window-config-on-quit): Remove variable.
(ibuffer-prev-window-config): Remove variable.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/ibuffer.el ibuffer.el-20091113204419-o5vbwnq5f7feedwu-2374
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-08-30 09:21:16 +0000
+++ b/lisp/ChangeLog 2014-08-31 20:44:36 +0000
@@ -1,3 +1,15 @@
+2014-08-31 Christoph Scholtes <address@hidden>
+
+ * ibuffer.el: Replace mode-specific quit function with
+ `quit-window' via `special-mode'.
+ (ibuffer-mode-map): Use keybindings from special-mode-map instead
+ of local overrides.
+ (ibuffer): Don't store previous windows configuration. Let
+ `quit-window' handle restoring.
+ (ibuffer-quit): Remove function. Use `quit-window' instead.
+ (ibuffer-restore-window-config-on-quit): Remove variable.
+ (ibuffer-prev-window-config): Remove variable.
+
2014-08-29 Michael Heerdegen <address@hidden>
* emacs-lisp/easy-mmode.el (define-minor-mode): Use mode function
=== modified file 'lisp/ibuffer.el'
--- a/lisp/ibuffer.el 2014-08-08 14:35:40 +0000
+++ b/lisp/ibuffer.el 2014-08-31 20:44:36 +0000
@@ -540,10 +540,6 @@
(define-key map (kbd "/ X") 'ibuffer-delete-saved-filter-groups)
(define-key map (kbd "/ \\") 'ibuffer-clear-filter-groups)
- (define-key map (kbd "q") 'ibuffer-quit)
- (define-key map (kbd "h") 'describe-mode)
- (define-key map (kbd "?") 'describe-mode)
-
(define-key map (kbd "% n") 'ibuffer-mark-by-name-regexp)
(define-key map (kbd "% m") 'ibuffer-mark-by-mode-regexp)
(define-key map (kbd "% f") 'ibuffer-mark-by-file-name-regexp)
@@ -878,12 +874,6 @@
(define-key map [down-mouse-3] 'ibuffer-mouse-popup-menu)
map))
-(defvar ibuffer-restore-window-config-on-quit nil
- "If non-nil, restore previous window configuration upon exiting `ibuffer'.")
-
-(defvar ibuffer-prev-window-config nil
- "Window configuration before starting Ibuffer.")
-
(defvar ibuffer-did-modification nil)
(defvar ibuffer-compiled-formats nil)
@@ -2298,18 +2288,6 @@
(goto-char (point-min))
(forward-line orig))))
-(defun ibuffer-quit ()
- "Quit this `ibuffer' session.
-Try to restore the previous window configuration if
-`ibuffer-restore-window-config-on-quit' is non-nil."
- (interactive)
- (if ibuffer-restore-window-config-on-quit
- (progn
- (bury-buffer)
- (unless (= (count-windows) 1)
- (set-window-configuration ibuffer-prev-window-config)))
- (bury-buffer)))
-
;;;###autoload
(defun ibuffer-list-buffers (&optional files-only)
"Display a list of buffers, in another window.
@@ -2350,7 +2328,6 @@
(interactive "P")
(when ibuffer-use-other-window
(setq other-window-p t))
- (setq ibuffer-prev-window-config (current-window-configuration))
(let ((buf (get-buffer-create (or name "*Ibuffer*"))))
(if other-window-p
(funcall (if noselect (lambda (buf) (display-buffer buf t))
#'pop-to-buffer) buf)
@@ -2362,8 +2339,7 @@
(select-window (get-buffer-window buf 0))
(or (derived-mode-p 'ibuffer-mode)
(ibuffer-mode))
- (setq ibuffer-restore-window-config-on-quit other-window-p)
- (when shrink
+ (when shrink
(setq ibuffer-shrink-to-minimum-size shrink))
(when qualifiers
(require 'ibuf-ext)
@@ -2501,7 +2477,6 @@
'\\[ibuffer-switch-format]' - Change the current display format.
'\\[forward-line]' - Move point to the next line.
'\\[previous-line]' - Move point to the previous line.
- '\\[ibuffer-quit]' - Bury the Ibuffer buffer.
'\\[describe-mode]' - This help.
'\\[ibuffer-diff-with-file]' - View the differences between this buffer
and its associated file.
@@ -2616,7 +2591,6 @@
(set (make-local-variable 'ibuffer-cached-eliding-string) nil)
(set (make-local-variable 'ibuffer-cached-elide-long-columns) nil)
(set (make-local-variable 'ibuffer-current-format) nil)
- (set (make-local-variable 'ibuffer-restore-window-config-on-quit) nil)
(set (make-local-variable 'ibuffer-did-modification) nil)
(set (make-local-variable 'ibuffer-tmp-hide-regexps) nil)
(set (make-local-variable 'ibuffer-tmp-show-regexps) nil)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117790: Replace mode-specific quit function in ibuffer.el,
Christoph Scholtes <=