[gnus git] branch master updated: m0-7-77-gc77e2d8 =3= Merge remote-tracking branch 'tarleb/sieve' ; sieve.texi: Update documentation to reflect recent changes ; sieve.el: Bind Q / q to quit and bury Manage Sieve, respectively

       via  c77e2d8dd9ebe9b2496d0ca06e63fdbfc8f11f37 (commit)
       via  427784ba8ef52bb12ac358c6b9f1ddee254b27fb (commit)
       via  42659353fe6acbd03fb6528373df99dc13f9142c (commit)
      from  4a8b90d0d6c0ca1555511d26772e62dea8862f19 (commit)


- Log -----------------------------------------------------------------
commit c77e2d8dd9ebe9b2496d0ca06e63fdbfc8f11f37
Merge: 4a8b90d 427784b
Author: Julien Danjou <[email protected]>
Date:   Fri Jun 14 09:28:20 2013 +0200

    Merge remote-tracking branch 'tarleb/sieve'
    
    Signed-off-by: Julien Danjou <[email protected]>
    
    Conflicts:
    	lisp/ChangeLog

diff --cc lisp/ChangeLog
index a92df63,d7d2fcf..bd443f2
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,22 -1,8 +1,27 @@@
 +2013-06-14  David Edmondson <[email protected]>  (tiny change)
 +
 +	* mml2015.el (mml2015-maximum-key-image-dimension): New user option to
 +	control the maximum size of photo ID image.
 +	(mml2015-epg-key-image-to-string): Respect it.
 +
 +2013-06-13  Lars Magne Ingebrigtsen  <[email protected]>
 +
 +	* shr.el (shr-tag-table-1): Mark the preliminary table renderings
 +	instead of the final one so that we can more easily distinguish them.
 +
 +	* eww.el (eww-submit): Compute the submission URL correctly.
 +
 +2013-06-13  Stefan Monnier  <[email protected]>
 +
 +	* sieve-manage.el (sieve-manage-open-server): Don't quote lambda.
 +	Use plist-get rather than CL's getf.
 +	(sieve-manage-parse-capability): Avoid CL's remove-if.
 +
+ 2013-06-13  Albert Krewinkel  <[email protected]>
+ 
+ 	* sieve.el: Rebind q to (sieve-bury-buffer), bind Q to
+ 	(sieve-manage-quit).
+ 
  2013-06-13  Lars Magne Ingebrigtsen  <[email protected]>
  
  	* shr.el (shr-expand-url): Expansion should chop off the bits after the

commit 427784ba8ef52bb12ac358c6b9f1ddee254b27fb
Author: Albert Krewinkel <[email protected]>
Date:   Thu Jun 13 18:02:13 2013 +0200

    sieve.texi: Update documentation to reflect recent changes

diff --git a/texi/ChangeLog b/texi/ChangeLog
index c9417f8..d49f289 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-13  Albert Krewinkel  <[email protected]>
+
+	* 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  Glenn Morris  <[email protected]>
 
 	* epa.texi (Cryptographic operations on files): Update epa-decrypt-file.
diff --git a/texi/sieve.texi b/texi/sieve.texi
index 58db598..316dfab 100644
--- a/texi/sieve.texi
+++ b/texi/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

commit 42659353fe6acbd03fb6528373df99dc13f9142c
Author: Albert Krewinkel <[email protected]>
Date:   Thu Jun 13 18:09:50 2013 +0200

    sieve.el: Bind Q / q to quit and bury Manage Sieve, respectively

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index befc688..d7d2fcf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-13  Albert Krewinkel  <[email protected]>
+
+	* sieve.el: Rebind q to (sieve-bury-buffer), bind Q to
+	(sieve-manage-quit).
+
 2013-06-13  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* shr.el (shr-expand-url): Expansion should chop off the bits after the
diff --git a/lisp/sieve.el b/lisp/sieve.el
index 2c11c03..b3539c5 100644
--- a/lisp/sieve.el
+++ b/lisp/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)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    5 +++++
 lisp/sieve.el   |   10 ++++++++--
 texi/ChangeLog  |    7 +++++++
 texi/sieve.texi |    9 +++++++--
 4 files changed, 27 insertions(+), 4 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project