[gnus git] branch master updated: n0-13-50-g3ccee76 =1= sieve: fix script name when uploading

       via  3ccee76adca8a830cf781e697119b980cd9fcbe1 (commit)
      from  5b15466c9e3335702597014ca6b8c3d7436f7a7f (commit)


- Log -----------------------------------------------------------------
commit 3ccee76adca8a830cf781e697119b980cd9fcbe1
Author: Julien Danjou <[email protected]>
Date:   Mon Feb 28 17:47:44 2011 +0100

    sieve: fix script name when uploading
    
    Signed-off-by: Julien Danjou <[email protected]>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bebba7..c41fbf7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-28  Julien Danjou  <[email protected]>
+
+	* sieve.el (sieve-buffer-script-name): New local variable to store
+	sieve script name.
+	(sieve-edit-script): Store sieve script name.
+	(sieve-upload): Use sieve script name when uploading.
+
 2011-02-27  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* gnus-group.el (gnus-import-other-newsrc-file): New function.
diff --git a/lisp/sieve.el b/lisp/sieve.el
index 31b2665..8cdd717 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -98,6 +98,9 @@ require \"fileinto\";
 
 (defvar sieve-manage-buffer nil)
 (defvar sieve-buffer-header-end nil)
+(defvar sieve-buffer-script-name nil
+  "The real script name of the buffer.")
+(make-local-variable 'sieve-buffer-script-name)
 
 ;; Sieve-manage mode:
 
@@ -204,6 +207,7 @@ require \"fileinto\";
       (switch-to-buffer (get-buffer-create "template.siv"))
       (insert sieve-template))
     (sieve-mode)
+    (setq sieve-buffer-script-name name)
     (message "Press C-c C-l to upload script to server.")))
 
 (defmacro sieve-change-region (&rest body)
@@ -363,12 +367,12 @@ Server  : " server ":" (or port "2000") "
 ;;;###autoload
 (defun sieve-upload (&optional name)
   (interactive)
-  (unless name
-    (setq name (buffer-name)))
   (when (or (get-buffer sieve-buffer) (call-interactively 'sieve-manage))
     (let ((script (buffer-string)) err)
       (with-current-buffer (get-buffer sieve-buffer)
-	(setq err (sieve-manage-putscript name script sieve-manage-buffer))
+	(setq err (sieve-manage-putscript
+                   (or name sieve-buffer-script-name (buffer-name))
+                   script sieve-manage-buffer))
 	(if (sieve-manage-ok-p err)
 	    (message (concat
 		      "Sieve upload done.  Use `C-c RET' to manage scripts."))

-----------------------------------------------------------------------
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 |    7 +++++++
 lisp/sieve.el  |   10 +++++++---
 2 files changed, 14 insertions(+), 3 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