[gnus git] branch master updated: n0-13-53-gbcd6173 =3= Enhance mode declaration ; sieve: fix keymap declaration ; sieve: use substitute-command-keys in various places
Julien Danjou <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via bcd61738a232a58e48d27b04a5899d3acf0b9e53 (commit)
via 01c211faea248b5d9e35f3662670bb8d12b9b137 (commit)
via cfa8f825809369a013820b5160a809001ece9e6a (commit)
from 3ccee76adca8a830cf781e697119b980cd9fcbe1 (commit)
- Log -----------------------------------------------------------------
commit bcd61738a232a58e48d27b04a5899d3acf0b9e53
Author: Julien Danjou <[email protected]>
Date: Mon Feb 28 21:03:48 2011 +0100
Enhance mode declaration
Signed-off-by: Julien Danjou <[email protected]>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf2b683..96801c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,9 @@
(sieve-edit-script): Use substitute-command-keys.
(sieve-refresh-scriptlist): Use substitute-command-keys.
(sieve-manage-mode-map): Define keymap properly.
+ (sieve-manage-mode): Do not set mode name manually, change mode-name to
+ (sieve-refresh-scriptlist): Use substitute-command-keys."Sieve-manage".
+ Remove commented code about cvs.
2011-02-27 Lars Magne Ingebrigtsen <[email protected]>
diff --git a/lisp/sieve.el b/lisp/sieve.el
index c9b3378..fde5d8e 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -138,19 +138,14 @@ 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-activate (&optional pos)
commit 01c211faea248b5d9e35f3662670bb8d12b9b137
Author: Julien Danjou <[email protected]>
Date: Mon Feb 28 21:01:42 2011 +0100
sieve: fix keymap declaration
Signed-off-by: Julien Danjou <[email protected]>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0712ab5..bf2b683 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,7 @@
(sieve-upload): Use substitute-command-keys.
(sieve-edit-script): Use substitute-command-keys.
(sieve-refresh-scriptlist): Use substitute-command-keys.
+ (sieve-manage-mode-map): Define keymap properly.
2011-02-27 Lars Magne Ingebrigtsen <[email protected]>
diff --git a/lisp/sieve.el b/lisp/sieve.el
index 0ba9910..c9b3378 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -104,35 +104,32 @@ require \"fileinto\";
;; Sieve-manage mode:
-(defvar sieve-manage-mode-map nil
- "Keymap for `sieve-manage-mode'.")
-
-(if sieve-manage-mode-map
- ()
- (setq sieve-manage-mode-map (make-sparse-keymap))
- (suppress-keymap sieve-manage-mode-map)
+(defvar sieve-manage-mode-map
+ (let ((map (make-sparse-keymap)))
;; 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)
+ (define-key map "?" 'sieve-help)
+ (define-key map "h" 'sieve-help)
+ (define-key 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)
+ (define-key map "m" 'sieve-activate)
+ (define-key map "u" 'sieve-deactivate)
+ (define-key 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))
+ (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 [(down-mouse-2)] 'sieve-edit-script)
+ (define-key map [(down-mouse-3)] 'sieve-manage-mode-menu)
+ map)
+ "Keymap for `sieve-manage-mode'.")
(easy-menu-define sieve-manage-mode-menu sieve-manage-mode-map
"Sieve Menu."
commit cfa8f825809369a013820b5160a809001ece9e6a
Author: Julien Danjou <[email protected]>
Date: Mon Feb 28 20:53:55 2011 +0100
sieve: use substitute-command-keys in various places
Signed-off-by: Julien Danjou <[email protected]>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c41fbf7..0712ab5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,9 @@
sieve script name.
(sieve-edit-script): Store sieve script name.
(sieve-upload): Use sieve script name when uploading.
+ (sieve-upload): Use substitute-command-keys.
+ (sieve-edit-script): Use substitute-command-keys.
+ (sieve-refresh-scriptlist): Use substitute-command-keys.
2011-02-27 Lars Magne Ingebrigtsen <[email protected]>
diff --git a/lisp/sieve.el b/lisp/sieve.el
index 8cdd717..0ba9910 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -208,7 +208,9 @@ require \"fileinto\";
(insert sieve-template))
(sieve-mode)
(setq sieve-buffer-script-name name)
- (message "Press C-c C-l to upload script to server.")))
+ (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.
@@ -341,13 +343,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 "
+ (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)))
+ sieve-new-script))))
(save-excursion
(sieve-insert-scripts (list sieve-new-script))
(sieve-insert-scripts scripts)))
@@ -374,8 +381,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
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 7 ++++
lisp/sieve.el | 87 +++++++++++++++++++++++++++----------------------------
2 files changed, 50 insertions(+), 44 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project