From 3f11ccc4157d61240cb1076d85ea5347500ed461 Mon Sep 17 00:00:00 2001
From: Sebastien Delafond <seb@debian.org>
Date: Wed, 4 Nov 2015 17:32:13 +0000
Subject: [conf/cvelist.el] Tidying up a bit

  * use defvars for font-lock patterns
  * use our mode's own keymap instead of global-set-key
  * add documentation strings

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@37565 e39458fd-73e7-0310-bf30-c45bca0a0e42
---
 conf/cvelist.el | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

(limited to 'conf')

diff --git a/conf/cvelist.el b/conf/cvelist.el
index ccb0126c34..789c671b52 100644
--- a/conf/cvelist.el
+++ b/conf/cvelist.el
@@ -8,29 +8,35 @@
 ;; (setq auto-mode-alist
 ;;     (cons '("list" . debian-cvelist-mode) auto-mode-alist))
 
+(defun debian-cvelist-insert-not-for-us ()
+  "Insert NOT-FOR-US keyword"
+  (interactive)
+  (insert "\tNOT-FOR-US: "))
 
-(setq debian-cvelist-highlights
-      '(("^CVE-[0-9]\\{4\\}-[0-9X]\\{4\\}" . font-lock-function-name-face)
-	("^\tNOTE:" . font-lock-comment-delimiter-face)
-	("^\tTODO:" . font-lock-warning-face)
-	("^\t\\(RESERVED\\|NOT-FOR-US\\|REJECTED\\)" . font-lock-keyword-face)
-	("^CVE-[0-9]\\{4\\}-[0-9X]\\{4\\}" "\\[\\(.*\\)\\]$" nil nil (1 font-lock-variable-name-face))
-	("\\<unfixed\\|undetermined\\>" . font-lock-warning-face)
-	("\\<end-of-life\\|not-affected\\|no-dsa\\>" . font-lock-constant-face)	
-	))
+(defun debian-cvelist-insert-note ()
+  "Insert NOTE comment"
+  (interactive)
+  (insert "\tNOTE: "))
 
-(global-set-key
- (kbd "C-c C-f")
- (lambda ()
-   (interactive)
-   (insert "\tNOT-FOR-US: ")))
+(defvar debian-cvelist-mode-map
+   (let ((map (make-sparse-keymap)))
+     (define-key map (kbd "C-c C-f") 'debian-cvelist-insert-not-for-us)
+     (define-key map (kbd "C-c C-n") 'debian-cvelist-insert-note)
+     map)
+   "Keymap for `debian-cvelist-mode'.")
 
-(global-set-key
- (kbd "C-c C-n")
- (lambda ()
-   (interactive)
-   (insert "\tNOTE: ")))
+(defvar debian-cvelist-font-lock-keywords
+  '(("^CVE-[0-9]\\{4\\}-[0-9X]\\{4\\}" . font-lock-function-name-face)
+    ("^\tNOTE:" . font-lock-comment-delimiter-face)
+    ("^\tTODO:" . font-lock-warning-face)
+    ("^\t\\(RESERVED\\|NOT-FOR-US\\|REJECTED\\)" . font-lock-keyword-face)
+    ("^CVE-[0-9]\\{4\\}-[0-9X]\\{4\\}" "\\[\\(.*\\)\\]$" nil nil (1 font-lock-variable-name-face))
+    ("\\<unfixed\\|undetermined\\>" . font-lock-warning-face)
+    ("\\<end-of-life\\|not-affected\\|no-dsa\\>" . font-lock-constant-face))
+  "Keyword highlighting for `debian-cvelist-mode'")
 
-(define-derived-mode debian-cvelist-mode fundamental-mode
-  (setq font-lock-defaults '(debian-cvelist-highlights))
-  (setq mode-name "debian cvelist"))
+(define-derived-mode debian-cvelist-mode fundamental-mode "debian-cvelist"
+  "A major mode for editing data/CVE/list in the Debian secure-testing repo."
+  (setq-local font-lock-defaults '(debian-cvelist-font-lock-keywords nil)))
+
+(provide 'debian-cvelist)
-- 
cgit v1.2.3