[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109138: gnus/{sieve-mode, sieve}.el:
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109138: gnus/{sieve-mode, sieve}.el: Close buffers by default |
Date: |
Wed, 18 Jul 2012 10:38:37 +0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109138
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-18 10:38:37 +0000
message:
gnus/{sieve-mode,sieve}.el: Close buffers by default
modified:
lisp/gnus/ChangeLog
lisp/gnus/sieve-mode.el
lisp/gnus/sieve.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2012-07-17 11:52:00 +0000
+++ b/lisp/gnus/ChangeLog 2012-07-18 10:38:37 +0000
@@ -1,3 +1,12 @@
+2012-07-18 Julien Danjou <address@hidden>
+
+ * sieve-mode.el (sieve-mode-map): Bind C-c C-c to
+ `sieve-upload-and-kill'.
+
+ * sieve.el (sieve-bury-buffer): Remove function.
+ (sieve-manage-mode-map): Map "q" to `kill-buffer'.
+ (sieve-upload-and-kill): New function, mapped to C-c C-c.
+
2012-07-17 Andreas Schwab <address@hidden>
* shr.el (shr-expand-url): Handle URL starting with `//'.
=== modified file 'lisp/gnus/sieve-mode.el'
--- a/lisp/gnus/sieve-mode.el 2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/sieve-mode.el 2012-07-18 10:38:37 +0000
@@ -173,7 +173,7 @@
(defvar sieve-mode-map
(let ((map (make-sparse-keymap)))
(define-key map "\C-c\C-l" 'sieve-upload)
- (define-key map "\C-c\C-c" 'sieve-upload-and-bury)
+ (define-key map "\C-c\C-c" 'sieve-upload-and-kill)
(define-key map "\C-c\C-m" 'sieve-manage)
map)
"Key map used in sieve mode.")
=== modified file 'lisp/gnus/sieve.el'
--- a/lisp/gnus/sieve.el 2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/sieve.el 2012-07-18 10:38:37 +0000
@@ -109,7 +109,7 @@
;; various
(define-key map "?" 'sieve-help)
(define-key map "h" 'sieve-help)
- (define-key map "q" 'sieve-bury-buffer)
+ (define-key map "q" 'kill-buffer)
;; activating
(define-key map "m" 'sieve-activate)
(define-key map "u" 'sieve-deactivate)
@@ -250,29 +250,6 @@
(message "%s" (substitute-command-keys
"`\\[sieve-edit-script]':edit `\\[sieve-activate]':activate
`\\[sieve-deactivate]':deactivate `\\[sieve-remove]':remove"))))
-(defun sieve-bury-buffer (buf &optional mainbuf)
- "Hide the buffer BUF that was temporarily popped up.
-BUF is assumed to be a temporary buffer used from the buffer MAINBUF."
- (interactive (list (current-buffer)))
- (save-current-buffer
- (let ((win (if (eq buf (window-buffer (selected-window))) (selected-window)
- (get-buffer-window buf t))))
- (when win
- (if (window-dedicated-p win)
- (condition-case ()
- (delete-window win)
- (error (iconify-frame (window-frame win))))
- (if (and mainbuf (get-buffer-window mainbuf))
- (delete-window win)))))
- (with-current-buffer buf
- (bury-buffer (unless (and (eq buf (window-buffer (selected-window)))
- (not (window-dedicated-p (selected-window))))
- buf)))
- (when mainbuf
- (let ((mainwin (or (get-buffer-window mainbuf)
- (get-buffer-window mainbuf 'visible))))
- (when mainwin (select-window mainwin))))))
-
;; Create buffer:
(defun sieve-setup-buffer (server port)
@@ -389,6 +366,12 @@
(sieve-upload name)
(bury-buffer))
+;;;###autoload
+(defun sieve-upload-and-kill (&optional name)
+ (interactive)
+ (sieve-upload name)
+ (kill-buffer))
+
(provide 'sieve)
;; sieve.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109138: gnus/{sieve-mode, sieve}.el: Close buffers by default,
Katsumi Yamaoka <=