From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Sun, 30 Sep 2018 08:40:35 +0000 (+0900)
Subject: Fix sieve-upload when sieve-buffer is nil
X-Git-Tag: emacs-27.0.90~4302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4824d37041a9647f761c0cad32f2c3c8e367ba96;p=emacs.git

Fix sieve-upload when sieve-buffer is nil

* lisp/net/sieve.el (sieve-upload): Don't rely on sieve-buffer being
non-nil.  (Bug#32880)

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/net/sieve.el b/lisp/net/sieve.el
index 1f80ccc1e05..ef7bb5c025c 100644
--- a/lisp/net/sieve.el
+++ b/lisp/net/sieve.el
@@ -345,11 +345,14 @@ Used to bracket operations which move point in the sieve-buffer."
 ;;;###autoload
 (defun sieve-upload (&optional name)
   (interactive)
-  (when (or (get-buffer sieve-buffer) (call-interactively 'sieve-manage))
-    (let ((script (buffer-string)) err)
+  (when (or (get-buffer sieve-buffer)
+            (save-current-buffer (call-interactively 'sieve-manage)))
+    (let ((script (buffer-string))
+          (script-name (file-name-sans-extension (buffer-name)))
+          err)
       (with-current-buffer (get-buffer sieve-buffer)
 	(setq err (sieve-manage-putscript
-                   (or name sieve-buffer-script-name (buffer-name))
+                   (or name sieve-buffer-script-name script-name)
                    script sieve-manage-buffer))
 	(if (sieve-manage-ok-p err)
 	    (message (substitute-command-keys