X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fsieve.el;h=8d40fa455bdef4272a6a613c2175852a0928e0fe;hb=24f8bdab921a0876873c5d61eb7e7fe38833f64f;hp=8cdd71790ecf4aa0c33d78c6ce285e1dc5443911;hpb=3ccee76adca8a830cf781e697119b980cd9fcbe1;p=gnus diff --git a/lisp/sieve.el b/lisp/sieve.el index 8cdd71790..8d40fa455 100644 --- a/lisp/sieve.el +++ b/lisp/sieve.el @@ -1,6 +1,6 @@ ;;; sieve.el --- Utilities to manage sieve scripts -;; Copyright (C) 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 2001-2015 Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -21,7 +21,7 @@ ;;; Commentary: -;; This file contain utilities to facilate upload, download and +;; This file contain utilities to facilitate upload, download and ;; general management of sieve scripts. Currently only the ;; Managesieve protocol is supported (using sieve-manage.el), but when ;; (useful) alternatives become available, they might be supported as @@ -104,36 +104,34 @@ require \"fileinto\"; ;; Sieve-manage mode: -(defvar sieve-manage-mode-map nil +(defvar sieve-manage-mode-map + (let ((map (make-sparse-keymap))) + ;; various + (define-key map "?" 'sieve-help) + (define-key map "h" 'sieve-help) + ;; activating + (define-key map "m" 'sieve-activate) + (define-key map "u" 'sieve-deactivate) + (define-key map "\M-\C-?" 'sieve-deactivate-all) + ;; navigation keys + (define-key map "\C-p" 'sieve-prev-line) + (define-key map [up] 'sieve-prev-line) + (define-key map "\C-n" 'sieve-next-line) + (define-key map [down] 'sieve-next-line) + (define-key map " " 'sieve-next-line) + (define-key map "n" 'sieve-next-line) + (define-key map "p" 'sieve-prev-line) + (define-key map "\C-m" 'sieve-edit-script) + (define-key map "f" 'sieve-edit-script) + (define-key map "o" 'sieve-edit-script-other-window) + (define-key map "r" 'sieve-remove) + (define-key map "q" 'sieve-bury-buffer) + (define-key map "Q" 'sieve-manage-quit) + (define-key map [(down-mouse-2)] 'sieve-edit-script) + (define-key map [(down-mouse-3)] 'sieve-manage-mode-menu) + map) "Keymap for `sieve-manage-mode'.") -(if sieve-manage-mode-map - () - (setq sieve-manage-mode-map (make-sparse-keymap)) - (suppress-keymap sieve-manage-mode-map) - ;; various - (define-key sieve-manage-mode-map "?" 'sieve-help) - (define-key sieve-manage-mode-map "h" 'sieve-help) - (define-key sieve-manage-mode-map "q" 'sieve-bury-buffer) - ;; activating - (define-key sieve-manage-mode-map "m" 'sieve-activate) - (define-key sieve-manage-mode-map "u" 'sieve-deactivate) - (define-key sieve-manage-mode-map "\M-\C-?" 'sieve-deactivate-all) - ;; navigation keys - (define-key sieve-manage-mode-map "\C-p" 'sieve-prev-line) - (define-key sieve-manage-mode-map [up] 'sieve-prev-line) - (define-key sieve-manage-mode-map "\C-n" 'sieve-next-line) - (define-key sieve-manage-mode-map [down] 'sieve-next-line) - (define-key sieve-manage-mode-map " " 'sieve-next-line) - (define-key sieve-manage-mode-map "n" 'sieve-next-line) - (define-key sieve-manage-mode-map "p" 'sieve-prev-line) - (define-key sieve-manage-mode-map "\C-m" 'sieve-edit-script) - (define-key sieve-manage-mode-map "f" 'sieve-edit-script) - (define-key sieve-manage-mode-map "o" 'sieve-edit-script-other-window) - (define-key sieve-manage-mode-map "r" 'sieve-remove) - (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" @@ -141,21 +139,28 @@ require \"fileinto\"; ["Activate script" sieve-activate t] ["Deactivate script" sieve-deactivate t])) -(define-derived-mode sieve-manage-mode fundamental-mode "SIEVE" +(define-derived-mode sieve-manage-mode fundamental-mode "Sieve-manage" "Mode used for sieve script management." - (setq mode-name "SIEVE") (buffer-disable-undo (current-buffer)) (setq truncate-lines t) (easy-menu-add sieve-manage-mode-menu sieve-manage-mode-map)) (put 'sieve-manage-mode 'mode-class 'special) -;; 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) - ;; Commands used in sieve-manage mode: +(defun sieve-manage-quit () + "Quit Manage Sieve and close the connection." + (interactive) + (sieve-manage-close sieve-manage-buffer) + (kill-buffer sieve-manage-buffer) + (kill-buffer (current-buffer))) + +(defun sieve-bury-buffer () + "Bury the Manage Sieve buffer without closing the connection." + (interactive) + (bury-buffer)) + (defun sieve-activate (&optional pos) (interactive "d") (let ((name (sieve-script-at-point)) err) @@ -208,7 +213,10 @@ require \"fileinto\"; (insert sieve-template)) (sieve-mode) (setq sieve-buffer-script-name name) - (message "Press C-c C-l to upload script to server."))) + (goto-char (point-min)) + (message + (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. @@ -250,39 +258,15 @@ Used to bracket operations which move point in the sieve-buffer." (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) - "Hide the buffer BUF that was temporarily popped up. -BUF is assumed to be a temporary buffer used from the buffer MAINBUF." - (interactive (list (current-buffer))) - (save-current-buffer - (let ((win (if (eq buf (window-buffer (selected-window))) (selected-window) - (get-buffer-window buf t)))) - (when win - (if (window-dedicated-p win) - (condition-case () - (delete-window win) - (error (iconify-frame (window-frame win)))) - (if (and mainbuf (get-buffer-window mainbuf)) - (delete-window win))))) - (with-current-buffer buf - (bury-buffer (unless (and (eq buf (window-buffer (selected-window))) - (not (window-dedicated-p (selected-window)))) - buf))) - (when mainbuf - (let ((mainwin (or (get-buffer-window mainbuf) - (get-buffer-window mainbuf 'visible)))) - (when mainwin (select-window mainwin)))))) - ;; Create buffer: (defun sieve-setup-buffer (server port) (setq buffer-read-only nil) (erase-buffer) (buffer-disable-undo) - (insert "\ -Server : " server ":" (or port "2000") " - -") + (let* ((port (or port sieve-manage-default-port)) + (header (format "Server : %s:%s\n\n" server port))) + (insert header)) (set (make-local-variable 'sieve-buffer-header-end) (point-max))) @@ -291,21 +275,9 @@ Server : " server ":" (or port "2000") " (interactive "d") (get-char-property (or pos (point)) 'script-name)) -(eval-and-compile - (defalias 'sieve-make-overlay (if (featurep 'xemacs) - 'make-extent - 'make-overlay)) - (defalias 'sieve-overlay-put (if (featurep 'xemacs) - 'set-extent-property - 'overlay-put)) - (defalias 'sieve-overlays-at (if (featurep 'xemacs) - 'extents-at - 'overlays-at))) - (defun sieve-highlight (on) "Turn ON or off highlighting on the current language overlay." - (sieve-overlay-put (car (sieve-overlays-at (point))) - 'face (if on 'highlight 'default))) + (overlay-put (car (overlays-at (point))) 'face (if on 'highlight 'default))) (defun sieve-insert-scripts (scripts) "Format and insert LANGUAGE-LIST strings into current buffer at point." @@ -316,11 +288,11 @@ Server : " server ":" (or port "2000") " (if (consp script) (insert (format " ACTIVE %s" (cdr script))) (insert (format " %s" script))) - (setq ext (sieve-make-overlay p (point))) - (sieve-overlay-put ext 'mouse-face 'highlight) - (sieve-overlay-put ext 'script-name (if (consp script) - (cdr script) - script)) + (setq ext (make-overlay p (point))) + (overlay-put ext 'mouse-face 'highlight) + (overlay-put ext 'script-name (if (consp script) + (cdr script) + script)) (insert "\n")))) (defun sieve-open-server (server &optional port) @@ -328,7 +300,7 @@ Server : " server ":" (or port "2000") " (with-current-buffer (or ;; open server (set (make-local-variable 'sieve-manage-buffer) - (sieve-manage-open server)) + (sieve-manage-open server port)) (error "Error opening server %s" server)) (sieve-manage-authenticate))) @@ -341,13 +313,18 @@ Server : " server ":" (or port "2000") " ;; get list of script names and print them (let ((scripts (sieve-manage-listscripts sieve-manage-buffer))) (if (null scripts) - (insert (format (concat "No scripts on server, press RET on %s to " - "create a new script.\n") sieve-new-script)) - (insert (format (concat "%d script%s on server, press RET on a script " - "name edits it, or\npress RET on %s to create " - "a new script.\n") (length scripts) - (if (eq (length scripts) 1) "" "s") - sieve-new-script))) + (insert + (substitute-command-keys + (format + "No scripts on server, press \\[sieve-edit-script] on %s to create a new script.\n" + sieve-new-script))) + (insert + (substitute-command-keys + (format (concat "%d script%s on server, press \\[sieve-edit-script] on a script " + "name edits it, or\npress \\[sieve-edit-script] on %s to create " + "a new script.\n") (length scripts) + (if (eq (length scripts) 1) "" "s") + sieve-new-script)))) (save-excursion (sieve-insert-scripts (list sieve-new-script)) (sieve-insert-scripts scripts))) @@ -374,8 +351,8 @@ Server : " server ":" (or port "2000") " (or name sieve-buffer-script-name (buffer-name)) script sieve-manage-buffer)) (if (sieve-manage-ok-p err) - (message (concat - "Sieve upload done. Use `C-c RET' to manage scripts.")) + (message (substitute-command-keys + "Sieve upload done. Use \\[sieve-manage] to manage scripts.")) (message "Sieve upload failed: %s" (nth 2 err))))))) ;;;###autoload @@ -384,6 +361,12 @@ Server : " server ":" (or port "2000") " (sieve-upload name) (bury-buffer)) +;;;###autoload +(defun sieve-upload-and-kill (&optional name) + (interactive) + (sieve-upload name) + (kill-buffer)) + (provide 'sieve) ;; sieve.el ends here