From 4bb22eea77ef7783be02929ebc75ed3521be6d80 Mon Sep 17 00:00:00 2001 Message-Id: <4bb22eea77ef7783be02929ebc75ed3521be6d80.1718293304.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 26 Feb 2009 18:14:14 +0000 Subject: [PATCH] dot-emacs: Fixes to the messages mode. Organization: Straylight/Edgeware From: Mark Wooding In particular, give it the right name, so it doesn't interfere with the Gnus `Message' composer mode. --- dot-emacs.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dot-emacs.el b/dot-emacs.el index d24b364..b2653c5 100644 --- a/dot-emacs.el +++ b/dot-emacs.el @@ -1814,7 +1814,7 @@ (defun mdw-setup-sh-script-mode () ;;;----- Messages-file mode ------------------------------------------------- -(defun message-mode-guts () +(defun messages-mode-guts () (setq messages-mode-syntax-table (make-syntax-table)) (set-syntax-table messages-mode-syntax-table) (modify-syntax-entry ?0 "w" messages-mode-syntax-table) @@ -1833,7 +1833,7 @@ (defun message-mode-guts () (setq indent-line-function 'indent-relative) (mdw-standard-fill-prefix "\\([ \t]*\\(;\\|/?\\*\\)+[ \t]*\\)") (make-local-variable 'font-lock-defaults) - (make-local-variable 'message-mode-keywords) + (make-local-variable 'messages-mode-keywords) (let ((keywords (mdw-regexps "array" "bitmap" "callback" "docs[ \t]+enum" "export" "enum" "fixed-octetstring" "flags" @@ -1842,7 +1842,7 @@ (defun message-mode-guts () "primitive-nullfree" "relaxed[ \t]+enum" "set" "table" "tagged-optional" "union" "variadic" "vector" "version" "version-tag"))) - (setq message-mode-keywords + (setq messages-mode-keywords (list (list (concat "\\<\\(" keywords "\\)\\>:") '(0 font-lock-keyword-face)) @@ -1853,7 +1853,7 @@ (defun message-mode-guts () '("\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" (0 mdw-punct-face))))) (setq font-lock-defaults - '(message-mode-keywords nil nil nil nil)) + '(messages-mode-keywords nil nil nil nil)) (run-hooks 'messages-file-hook)) (defun messages-mode () @@ -1861,7 +1861,7 @@ (defun messages-mode () (fundamental-mode) (setq major-mode 'messages-mode) (setq mode-name "Messages") - (message-mode-guts) + (messages-mode-guts) (modify-syntax-entry ?# "<" messages-mode-syntax-table) (modify-syntax-entry ?\n ">" messages-mode-syntax-table) (setq comment-start "# ") @@ -1874,7 +1874,7 @@ (defun cpp-messages-mode () (fundamental-mode) (setq major-mode 'cpp-messages-mode) (setq mode-name "CPP Messages") - (message-mode-guts) + (messages-mode-guts) (modify-syntax-entry ?* ". 23" messages-mode-syntax-table) (modify-syntax-entry ?/ ". 14" messages-mode-syntax-table) (setq comment-start "/* ") @@ -1883,7 +1883,7 @@ (defun cpp-messages-mode () (mdw-regexps "assert" "define" "elif" "else" "endif" "error" "ident" "if" "ifdef" "ifndef" "import" "include" "line" "pragma" "unassert" "undef" "warning"))) - (setq message-mode-keywords + (setq messages-mode-keywords (append (list (list (concat "^[ \t]*\\#[ \t]*" "\\(include\\|import\\)" "[ \t]*\\(<[^>]+\\(>\\|\\)\\)") @@ -1892,7 +1892,7 @@ (defun cpp-messages-mode () preprocessor-keywords "\\)\\>\\|[0-9]+\\|$\\)\\)") '(1 font-lock-keyword-face))) - message-mode-keywords))) + messages-mode-keywords))) (turn-on-font-lock-if-enabled) (run-hooks 'cpp-messages-mode-hook)) -- [mdw]