X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5de5db48aebed6598462453f75f39f57c650a6c3..b524cfb560bd79551c34352732d31814c3a9e791:/dot-emacs.el

diff --git a/dot-emacs.el b/dot-emacs.el
index 88bfcab..82d0214 100644
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -313,23 +313,26 @@ get itself into a twist."
 (defadvice write-file (after mdw-autorevert activate)
   (mdw-check-autorevert))
 
-(defun mdwmail-mode ()
+(define-derived-mode  mdwmail-mode mail-mode "[mdw] mail"
   "Major mode for editing news and mail messages from external programs
 Not much right now.  Just support for doing MailCrypt stuff."
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map text-mode-map)
-  (setq local-abbrev-table text-mode-abbrev-table)
-  (setq major-mode 'mdwmail-mode)
-  (setq mode-name "[mdw] mail")
-  (set-buffer-file-coding-system 'utf-8)
-  (make-local-variable 'paragraph-separate)
-  (make-local-variable 'paragraph-start)
-  (setq paragraph-start (concat "[ \t]*[-_][-_][-_]+$\\|^-- \\|-----\\|"
-				paragraph-start))
-  (setq paragraph-separate (concat "[ \t]*[-_][-_][-_]+$\\|^-- \\|-----\\|"
-				   paragraph-separate))
-  (run-hooks 'text-mode-hook 'mdwmail-mode-hook 'mail-setup-hook))
+  :syntax-table nil
+  :abbrev-table nil
+  (run-hooks 'mail-setup-hook))
+
+(define-key mdwmail-mode-map [?\C-c ?\C-c] 'disabled-operation)
+
+(add-hook 'mdwail-mode-hook
+	  (lambda ()
+	    (set-buffer-file-coding-system 'utf-8)
+	    (make-local-variable 'paragraph-separate)
+	    (make-local-variable 'paragraph-start)
+	    (setq paragraph-start
+		  (concat "[ \t]*[-_][-_][-_]+$\\|^-- \\|-----\\|"
+			  paragraph-start))
+	    (setq paragraph-separate
+		  (concat "[ \t]*[-_][-_][-_]+$\\|^-- \\|-----\\|"
+			  paragraph-separate))))
 
 ;; --- How to encrypt in mdwmail ---