diff options
| author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2018-09-30 17:40:35 +0900 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-10-13 11:51:06 +0300 |
| commit | 4824d37041a9647f761c0cad32f2c3c8e367ba96 (patch) | |
| tree | 5d714e615d64583a3e7c18f349e51696a5dec387 /lisp/net/sieve.el | |
| parent | 95f69e7db235ca450a17c5a24680b742dfdf9aae (diff) | |
| download | emacs-4824d37041a9647f761c0cad32f2c3c8e367ba96.tar.gz | |
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
Diffstat (limited to 'lisp/net/sieve.el')
| -rw-r--r-- | lisp/net/sieve.el | 9 |
1 files changed, 6 insertions, 3 deletions
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 |