From c2df5ef11741398a6465c65d60cdb8a6aec8d160 Mon Sep 17 00:00:00 2001 From: Michael Welsh Duggan Date: Mon, 3 Jan 2011 22:44:00 -0500 Subject: [PATCH] Add sieve-buffer-script-name. --- lisp/ChangeLog | 8 ++++++++ lisp/sieve.el | 15 ++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 075833e..3d93dd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-01-04 Michael Welsh Duggan + + * sieve.el (sieve-buffer-script-name): New variable. + (sieve-edit-script): Set sieve-buffer-script-name to the + name of the sieve script. Use substitute-command-keys. + (sieve-upload): Use sieve-buffer-script-name if set. Use + substitute-command-keys. + 2011-01-02 Lars Magne Ingebrigtsen * mm-view.el (mml-smime): Require. diff --git a/lisp/sieve.el b/lisp/sieve.el index ca181c2..2bc042e 100644 --- a/lisp/sieve.el +++ b/lisp/sieve.el @@ -1,6 +1,7 @@ ;;; sieve.el --- Utilities to manage sieve scripts -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010, 2011 Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -98,6 +99,7 @@ require \"fileinto\"; (defvar sieve-manage-buffer nil) (defvar sieve-buffer-header-end nil) +(defvar sieve-buffer-script-name nil) ;; Sieve-manage mode: @@ -204,7 +206,9 @@ require \"fileinto\"; (switch-to-buffer (get-buffer-create "template.siv")) (insert sieve-template)) (sieve-mode) - (message "Press C-c C-l to upload script to server."))) + (set (make-local-variable 'sieve-buffer-script-name) name) + (message "%s" (substitute-command-keys + "Press \\[sieve-upload] to upload script to server.")))) (defmacro sieve-change-region (&rest body) "Turns off sieve-region before executing BODY, then re-enables it after. @@ -363,14 +367,15 @@ Server : " server ":" (or port "2000") " (defun sieve-upload (&optional name) (interactive) (unless name - (setq name (buffer-name))) + (setq name (or sieve-buffer-script-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)) (if (sieve-manage-ok-p err) - (message (concat - "Sieve upload done. Use `C-c RET' to manage scripts.")) + (message "%s" + (substitute-command-keys + "Sieve upload done. Use \\[sieve-manage] to manage scripts.")) (message "Sieve upload failed: %s" (nth 2 err))))))) ;;;###autoload -- 1.7.2.3