diff options
| author | Julien Danjou <julien@danjou.info> | 2012-07-18 10:38:37 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-07-18 10:38:37 +0000 |
| commit | a4acb88d3582144556a668c6cc35082e4d6a82f1 (patch) | |
| tree | a304d1057e328f3d76636eeea96c2a1fcd531eca /lisp/gnus/sieve.el | |
| parent | 8dc2e44a7726d04423fac170355e1fd5dc72bc38 (diff) | |
| download | emacs-a4acb88d3582144556a668c6cc35082e4d6a82f1.tar.gz | |
gnus/{sieve-mode,sieve}.el: Close buffers by default
Diffstat (limited to 'lisp/gnus/sieve.el')
| -rw-r--r-- | lisp/gnus/sieve.el | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el index c047a17b303..39b74e5eae0 100644 --- a/lisp/gnus/sieve.el +++ b/lisp/gnus/sieve.el @@ -109,7 +109,7 @@ require \"fileinto\"; ;; 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 @@ Used to bracket operations which move point in the sieve-buffer." (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 @@ Server : " server ":" (or port "2000") " (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 |