X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fsieve-mode.el;h=e4945c9431d63d015a0be3079bcd34387e660abd;hb=10edaa5f14988a7802cada508ab0b60aba35faed;hp=38f133e084a2ad39feb6a80ce912f0eaa88af20e;hpb=94da656837d258f11bc2530efd089f644ab5dc5b;p=gnus

diff --git a/lisp/sieve-mode.el b/lisp/sieve-mode.el
index 38f133e08..e4945c943 100644
--- a/lisp/sieve-mode.el
+++ b/lisp/sieve-mode.el
@@ -1,9 +1,9 @@
 ;;; sieve-mode.el --- Sieve code editing commands for Emacs
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2003 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
@@ -44,13 +44,12 @@
 ;;            version 1.1 change file extension into ".siv" (official one)
 ;;                        added keymap and menubar to hook into sieve-manage
 ;; 2001-10-31 version 1.2 committed to Oort Gnus
-;;
-;; $Id: sieve-mode.el,v 6.1 2001/11/01 00:50:22 jas Exp $
 
 ;;; Code:
 
-(autoload 'sieve-manage "sieve-manage")
-(autoload 'sieve-upload "sieve-manage")
+(autoload 'sieve-manage "sieve")
+(autoload 'sieve-upload "sieve")
+(autoload 'c-mode "cc-mode")
 (require 'easymenu)
 (eval-when-compile
   (require 'font-lock))
@@ -69,7 +68,7 @@
 (defvar sieve-control-commands-face 'sieve-control-commands-face
   "Face name used for Sieve Control Commands.")
 
-(defface sieve-control-commands-face 
+(defface sieve-control-commands-face
   '((((type tty) (class color)) (:foreground "blue" :weight light))
     (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
     (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
@@ -91,7 +90,7 @@
 (defvar sieve-test-commands-face 'sieve-test-commands-face
   "Face name used for Sieve Test Commands.")
 
-(defface sieve-test-commands-face 
+(defface sieve-test-commands-face
   '((((type tty) (class color)) (:foreground "magenta"))
     (((class grayscale) (background light))
      (:foreground "LightGray" :bold t :underline t))
@@ -128,7 +127,7 @@
      (cons (regexp-opt '("address" "allof" "anyof" "exists" "false"
 			 "true" "header" "not" "size" "envelope"))
 	   'sieve-test-commands-face)
-     (cons "\\Sw+:\\sw+" 
+     (cons "\\Sw+:\\sw+"
 	   'sieve-tagged-arguments-face))))
 
 ;; Syntax table
@@ -158,9 +157,10 @@
 
 ;; Key map definition
 
-(defvar sieve-mode-map 
+(defvar sieve-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-c\C-l" 'sieve-upload)
+    (define-key map "\C-c\C-c" 'sieve-upload-and-bury)
     (define-key map "\C-c\C-m" 'sieve-manage)
     map)
   "Key map used in sieve mode.")
@@ -188,7 +188,7 @@ Turning on Sieve mode runs `sieve-mode-hook'."
   (set (make-local-variable 'comment-start-skip) "#+ *")
   (unless (featurep 'xemacs)
     (set (make-local-variable 'font-lock-defaults)
-         '(sieve-font-lock-keywords nil nil ((?_ . "w")))))
+	 '(sieve-font-lock-keywords nil nil ((?_ . "w")))))
   (easy-menu-add-item nil nil sieve-mode-menu))
 
 ;; Menu