2004-01-27 Steve Youngs <sryoungs@bigpond.net.au>

[gnus] / lisp / sieve.el

diff --git a/lisp/sieve.el b/lisp/sieve.el
index ad62856..83dd4f3 100644 (file)
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -3,7 +3,7 @@
 
 ;; 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
@@ -131,6 +131,13 @@ 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")
@@ -140,13 +147,6 @@ require \"fileinto\";
 
 (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)
@@ -370,8 +370,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)