projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(article-transform-date): Fix infinite recursion.
[gnus]
/
lisp
/
sieve.el
diff --git
a/lisp/sieve.el
b/lisp/sieve.el
index
165bf37
..
31b2665
100644
(file)
--- a/
lisp/sieve.el
+++ b/
lisp/sieve.el
@@
-1,25
+1,23
@@
;;; sieve.el --- Utilities to manage sieve scripts
;;; sieve.el --- Utilities to manage sieve scripts
-;; Copyright (C) 2001
, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
+;; Copyright (C) 2001
-2011
Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; This file is part of GNU Emacs.
;; Author: Simon Josefsson <simon@josefsson.org>
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-245,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)
@@
-290,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."
@@
-322,11
+320,13
@@
Server : " server ":" (or port "2000") "
(insert "\n"))))
(defun sieve-open-server (server &optional port)
(insert "\n"))))
(defun sieve-open-server (server &optional port)
- ;; open server
- (set (make-local-variable 'sieve-manage-buffer)
- (sieve-manage-open server))
- ;; authenticate
- (sieve-manage-authenticate nil nil sieve-manage-buffer))
+ "Open SERVER (on PORT) and authenticate."
+ (with-current-buffer
+ (or ;; open server
+ (set (make-local-variable 'sieve-manage-buffer)
+ (sieve-manage-open server))
+ (error "Error opening server %s" server))
+ (sieve-manage-authenticate)))
(defun sieve-refresh-scriptlist ()
(interactive)
(defun sieve-refresh-scriptlist ()
(interactive)
@@
-382,5
+382,4
@@
Server : " server ":" (or port "2000") "
(provide 'sieve)
(provide 'sieve)
-;;; arch-tag: 7f6a6d94-94e1-4654-ab9a-aee21b9b8a94
;; sieve.el ends here
;; sieve.el ends here