projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(shr-tag-li): Get <li> indentation right.
[gnus]
/
lisp
/
sieve.el
diff --git
a/lisp/sieve.el
b/lisp/sieve.el
index
edfd385
..
7b014da
100644
(file)
--- a/
lisp/sieve.el
+++ b/
lisp/sieve.el
@@
-1,24
+1,23
@@
;;; sieve.el --- Utilities to manage sieve scripts
;;; sieve.el --- Utilities to manage sieve scripts
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; 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
+;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-65,6
+64,7
@@
(defgroup sieve nil
"Manage sieve scripts."
(defgroup sieve nil
"Manage sieve scripts."
+ :version "22.1"
:group 'tools)
(defcustom sieve-new-script "<new script>"
:group 'tools)
(defcustom sieve-new-script "<new script>"
@@
-131,22
+131,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))
(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)
(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)
(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)
;; 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
+173,7
@@
require \"fileinto\";
(sieve-refresh-scriptlist)
(if (sieve-manage-ok-p err)
(message "Deactivating scripts...done")
(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)
(defalias 'sieve-deactivate 'sieve-deactivate-all)
@@
-243,7
+243,7
@@
Used to bracket operations which move point in the sieve-buffer."
(if (eq last-command 'sieve-help)
;; would need minor-mode for log-edit-mode
(describe-function 'sieve-mode)
(if (eq last-command 'sieve-help)
;; would need minor-mode for log-edit-mode
(describe-function 'sieve-mode)
- (message (substitute-command-keys
+ (message
"%s"
(substitute-command-keys
"`\\[sieve-edit-script]':edit `\\[sieve-activate]':activate `\\[sieve-deactivate]':deactivate `\\[sieve-remove]':remove"))))
(defun sieve-bury-buffer (buf &optional mainbuf)
"`\\[sieve-edit-script]':edit `\\[sieve-activate]':activate `\\[sieve-deactivate]':deactivate `\\[sieve-remove]':remove"))))
(defun sieve-bury-buffer (buf &optional mainbuf)
@@
-288,15
+288,15
@@
Server : " server ":" (or port "2000") "
(get-char-property (or pos (point)) 'script-name))
(eval-and-compile
(get-char-property (or pos (point)) 'script-name))
(eval-and-compile
- (defalias 'sieve-make-overlay (if (f
boundp 'make-overlay
)
- 'make-
overlay
- 'make-
extent
))
- (defalias 'sieve-overlay-put (if (f
boundp 'overlay-put
)
- '
overlay-put
- '
set-extent-property
))
- (defalias 'sieve-overlays-at (if
(fboundp 'overlays-at
)
- '
overlay
s-at
- '
extent
s-at)))
+ (defalias 'sieve-make-overlay (if (f
eaturep 'xemacs
)
+ 'make-
extent
+ 'make-
overlay
))
+ (defalias 'sieve-overlay-put (if (f
eaturep 'xemacs
)
+ '
set-extent-property
+ '
overlay-put
))
+ (defalias 'sieve-overlays-at (if
(featurep 'xemacs
)
+ '
extent
s-at
+ '
overlay
s-at)))
(defun sieve-highlight (on)
"Turn ON or off highlighting on the current language overlay."
(defun sieve-highlight (on)
"Turn ON or off highlighting on the current language overlay."
@@
-368,7
+368,8
@@
Server : " server ":" (or port "2000") "
(with-current-buffer (get-buffer sieve-buffer)
(setq err (sieve-manage-putscript name script sieve-manage-buffer))
(if (sieve-manage-ok-p 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 (concat
+ "Sieve upload done. Use `C-c RET' to manage scripts."))
(message "Sieve upload failed: %s" (nth 2 err)))))))
;;;###autoload
(message "Sieve upload failed: %s" (nth 2 err)))))))
;;;###autoload