X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fsieve.el;h=ffaaa07f4645acf021fa5e2bfcf2f871b81be6ab;hb=e405b22c6b46721607c5e6c712a4705c23dee751;hp=ad628561dd49719d02596c8d80aa4dfdbb929561;hpb=4e6ed4bd8e175ab78acf62b8f5e9a8af0e703992;p=gnus

diff --git a/lisp/sieve.el b/lisp/sieve.el
index ad628561d..ffaaa07f4 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -1,9 +1,9 @@
 ;;; sieve.el --- Utilities to manage sieve scripts
-;; Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
-;; This file is not part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -65,6 +65,7 @@
 
 (defgroup sieve nil
   "Manage sieve scripts."
+  :version "22.1"
   :group 'tools)
 
 (defcustom sieve-new-script "<new script>"
@@ -131,22 +132,22 @@ require \"fileinto\";
   (define-key sieve-manage-mode-map [(down-mouse-2)] 'sieve-edit-script)
   (define-key sieve-manage-mode-map [(down-mouse-3)] 'sieve-manage-mode-menu))
 
+(easy-menu-define sieve-manage-mode-menu sieve-manage-mode-map
+  "Sieve Menu."
+  '("Manage Sieve"
+    ["Edit script" sieve-edit-script t]
+    ["Activate script" sieve-activate t]
+    ["Deactivate script" sieve-deactivate t]))
+
 (define-derived-mode sieve-manage-mode fundamental-mode "SIEVE"
   "Mode used for sieve script management."
   (setq mode-name "SIEVE")
   (buffer-disable-undo (current-buffer))
   (setq truncate-lines t)
-  (easy-menu-add-item nil nil sieve-manage-mode-menu))
+  (easy-menu-add sieve-manage-mode-menu sieve-manage-mode-map))
 
 (put 'sieve-manage-mode 'mode-class 'special)
 
-(easy-menu-define sieve-manage-mode-menu sieve-manage-mode-map
-  "Sieve Menu."
-  '("Manage Sieve"
-    ["Edit script" sieve-edit-script t]
-    ["Activate script" sieve-activate t]
-    ["Deactivate script" sieve-deactivate t]))
-
 ;; This is necessary to allow correct handling of \\[cvs-mode-diff-map]
 ;; in substitute-command-keys.
 ;(fset 'sieve-manage-mode-map sieve-manage-mode-map)
@@ -173,7 +174,7 @@ require \"fileinto\";
     (sieve-refresh-scriptlist)
     (if (sieve-manage-ok-p err)
 	(message "Deactivating scripts...done")
-      (message "Deactivating scripts...failed" (nth 2 err)))))
+      (message "Deactivating scripts...failed: %s" (nth 2 err)))))
 
 (defalias 'sieve-deactivate 'sieve-deactivate-all)
 
@@ -370,8 +371,7 @@ Server  : " server ":" (or port "2000") "
 	(if (sieve-manage-ok-p err)
 	    (message (concat
 		      "Sieve upload done.  Use `C-c RET' to manage scripts."))
-	  (message "Sieve upload failed: %s"
-		   (replace-regexp-in-string "[\n\r\t]+" " " (nth 2 err))))))))
+	  (message "Sieve upload failed: %s" (nth 2 err)))))))
 
 ;;;###autoload
 (defun sieve-upload-and-bury (&optional name)
@@ -381,4 +381,5 @@ Server  : " server ":" (or port "2000") "
 
 (provide 'sieve)
 
+;;; arch-tag: 7f6a6d94-94e1-4654-ab9a-aee21b9b8a94
 ;; sieve.el ends here