lisp/gnus/sieve.el: Rebind q to (sieve-bury-buffer), bind Q to (sieve-manage-quit)

doc/misc/sieve.texi: (Managing Sieve): Fix port in example, fix documentation for keys q and Q
(Standards): Reference RFC5804 as the defining document of the managesieve protocol

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4cae3d0a478f84094a05fc3c902c4b27a2b6a65b..0837c8e06f280c06f8a5471ab01ad1920981c419 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-13  Albert Krewinkel  <tarleb@moltkeplatz.de>
+
+       * sieve.texi: (Managing Sieve): Fix port in example, fix documentation
+       for keys q and Q.
+       (Standards): Reference RFC5804 as the defining document of the
+       managesieve protocol.
+
 2013-06-10  Aidan Gauland  <aidalgol@amuri.net>
 
        * eshell.texi (Input/Output): Expand to cover new visual-command

diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index b84c3047ec1fc85eae5116ffd2b0ce9fc1ef9e17..f69e2b9b948525f0465ced02efd992bc55eb2305 100644 (file)
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -149,7 +149,7 @@ When a server has been successfully contacted, the Manage Sieve buffer
 looks something like:
 
 @example
-Server  : mailserver:2000
+Server  : mailserver:sieve
 
 2 scripts on server, press RET on a script name edits it, or
 press RET on <new script> to create a new script.
@@ -214,6 +214,11 @@ Bury the Manage Sieve buffer without closing the connection.
 @findex sieve-help
 Displays help in the minibuffer.
 
+@item Q
+@kindex Q
+@findex sieve-manage-quit
+Quit Manage Sieve and close the connection.
+
 @end table
 
 @node Examples
@@ -342,7 +347,7 @@ lists the relevant ones.  They can all be fetched from
 @item RFC3028
 Sieve: A Mail Filtering Language.
 
-@item draft-martin-managesieve-03
+@item RFC5804
 A Protocol for Remotely Managing Sieve Scripts
 
 @end table

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 02872e8a35fab3f995e6006bf359841745a8524c..aefb1e8c8a3719624b767b246e704f13dcda118b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-13  Albert Krewinkel  <tarleb@moltkeplatz.de>
+
+       * sieve.el: Rebind q to (sieve-bury-buffer), bind Q to
+       (sieve-manage-quit).
+
 2013-06-14  David Edmondson  <dme@dme.org>  (tiny change)
 
        * mml2015.el (mml2015-maximum-key-image-dimension): New user option to

diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index 2c11c039d562d204161738ad6d0dda91f4670bf2..b3539c5857f51bd7c315fc520d8913cedc1e9da3 100644 (file)
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -125,7 +125,8 @@ require \"fileinto\";
     (define-key map "f" 'sieve-edit-script)
     (define-key map "o" 'sieve-edit-script-other-window)
     (define-key map "r" 'sieve-remove)
-    (define-key map "q" 'sieve-manage-quit)
+    (define-key map "q" 'sieve-bury-buffer)
+    (define-key map "Q" 'sieve-manage-quit)
     (define-key map [(down-mouse-2)] 'sieve-edit-script)
     (define-key map [(down-mouse-3)] 'sieve-manage-mode-menu)
     map)
@@ -149,12 +150,17 @@ require \"fileinto\";
 ;; Commands used in sieve-manage mode:
 
 (defun sieve-manage-quit ()
-  "Quit."
+  "Quit Manage Sieve and close the connection."
   (interactive)
   (sieve-manage-close sieve-manage-buffer)
   (kill-buffer sieve-manage-buffer)
   (kill-buffer (current-buffer)))
 
+(defun sieve-bury-buffer ()
+  "Bury the Manage Sieve buffer without closing the connection."
+  (interactive)
+  (bury-buffer))
+
 (defun sieve-activate (&optional pos)
   (interactive "d")
   (let ((name (sieve-script-at-point)) err)