X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c5e89bcdf719089bb8ebdc2905db9b69dfed7908..8fd1960cef360c37685f5a1661a69b3daaeddaf9:/dot-emacs.el

diff --git a/dot-emacs.el b/dot-emacs.el
index 25105a9..1d550d3 100644
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -556,10 +556,6 @@ doesn't cope with anything approximating a complicated case."
 	     (t
 	      (local-set-key "\C-m" 'newline-and-indent))))
   (local-set-key [C-return] 'newline)
-  (or (eq major-mode 'asm-mode)
-      (local-set-key [?\;] 'self-insert-command))
-  (local-set-key [?\#] 'self-insert-command)
-  (local-set-key [?\"] 'self-insert-command)
   (setq comment-column 40)
   (auto-fill-mode 1)
   (setq fill-column 77)
@@ -646,7 +642,7 @@ the regular expressions in `mdw-backup-disable-regexps'."
     (comint-highlight-input)
     (font-lock-builtin-face :weight bold)
     (font-lock-type-face :weight bold)
-    (region :background "grey30")
+    (region :background ,(if window-system "grey30" "blue"))
     (isearch :background "palevioletred2")
     (mdw-punct-face :foreground ,(if window-system "burlywood2" "yellow"))
     (mdw-number-face :foreground "yellow")
@@ -703,7 +699,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 (defun mdw-c-style ()
   (c-add-style "[mdw] C and C++ style"
 	       '((c-basic-offset . 2)
-		 (c-tab-always-indent . nil)
 		 (comment-column . 40)
 		 (c-class-key . "class")
 		 (c-offsets-alist (substatement-open . 0)
@@ -720,7 +715,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 
   ;; --- Fiddle with some syntax codes ---
 
-  (modify-syntax-entry ?_ "w")
   (modify-syntax-entry ?* ". 23")
   (modify-syntax-entry ?/ ". 124b")
   (modify-syntax-entry ?\n "> b")
@@ -902,7 +896,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 
   ;; --- Fiddle with some syntax codes ---
 
-  (modify-syntax-entry ?_ "w")
   (modify-syntax-entry ?* ". 23")
   (modify-syntax-entry ?/ ". 14")
 
@@ -959,7 +952,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 (defun mdw-java-style ()
   (c-add-style "[mdw] Java style"
 	       '((c-basic-offset . 2)
-		 (c-tab-always-indent . nil)
 		 (c-offsets-alist (substatement-open . 0)
 				  (label . +)
 				  (case-label . +)
@@ -975,7 +967,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
   ;; --- Other stuff ---
 
   (mdw-java-style)
-  (modify-syntax-entry ?_ "w")
   (setq c-hanging-comment-ender-p nil)
   (setq c-backslash-column 72)
   (setq comment-start "/* ")
@@ -1034,7 +1025,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 (defun mdw-csharp-style ()
   (c-add-style "[mdw] C# style"
 	       '((c-basic-offset . 2)
-		 (c-tab-always-indent . nil)
 		 (c-offsets-alist (substatement-open . 0)
 				  (label . 0)
 				  (case-label . +)
@@ -1050,7 +1040,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
   ;; --- Other stuff ---
 
   (mdw-csharp-style)
-  (modify-syntax-entry ?_ "w")
   (setq c-hanging-comment-ender-p nil)
   (setq c-backslash-column 72)
   (setq comment-start "/* ")
@@ -1122,7 +1111,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 (defun mdw-awk-style ()
   (c-add-style "[mdw] Awk style"
 	       '((c-basic-offset . 2)
-		 (c-tab-always-indent . nil)
 		 (c-offsets-alist (substatement-open . 0)
 				  (statement-cont . 0)
 				  (statement-case-intro . +)))
@@ -1134,7 +1122,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 
   ;; --- Miscellaneous fiddling ---
 
-  (modify-syntax-entry ?_ "w")
   (mdw-awk-style)
   (setq c-backslash-column 72)
   (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
@@ -1183,8 +1170,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 
 ;; --- Perl indentation style ---
 
-(setq cperl-tab-always-indent nil)
-
 (setq cperl-indent-level 2)
 (setq cperl-continued-statement-offset 2)
 (setq cperl-continued-brace-offset 0)
@@ -1198,7 +1183,6 @@ the regular expressions in `mdw-backup-disable-regexps'."
 
   ;; --- Miscellaneous fiddling ---
 
-  (modify-syntax-entry ?_ "w")
   (modify-syntax-entry ?$ "\\")
   (modify-syntax-entry ?$ "\\" font-lock-syntax-table)
   (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
@@ -1256,7 +1240,6 @@ strip numbers instead."
 
   ;; --- Miscellaneous fiddling ---
 
-  (modify-syntax-entry ?_ "w")
   (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
 
   ;; --- Now define fontification things ---
@@ -1423,7 +1406,7 @@ strip numbers instead."
   (local-set-key [?\C-m] 'mdw-rexx-indent-newline-indent)
   (local-set-key [?*] 'mdw-rexx-electric-*)
   (mapcar #'(lambda (ch) (modify-syntax-entry ch "w"))
-	  '(?. ?! ?? ?_ ?# ?@ ?$))
+	  '(?! ?? ?# ?@ ?$))
   (mdw-standard-fill-prefix "\\([ \t]*/?\*[ \t]*\\)")
 
   ;; --- Set up keywords and things for fontification ---
@@ -1433,7 +1416,6 @@ strip numbers instead."
 
   (setq rexx-indent 2)
   (setq rexx-end-indent rexx-indent)
-  (setq rexx-tab-always-indent nil)
   (setq rexx-cont-indent rexx-indent)
 
   (make-local-variable 'font-lock-keywords)
@@ -1486,7 +1468,6 @@ strip numbers instead."
 
   ;; --- Make underscore an honorary letter ---
 
-  (modify-syntax-entry ?_ "w")
   (modify-syntax-entry ?' "w")
 
   ;; --- Set fill prefix ---
@@ -1542,7 +1523,6 @@ strip numbers instead."
 
   ;; --- Fiddle with syntax table to get comments right ---
 
-  (modify-syntax-entry ?_ "w")
   (modify-syntax-entry ?' "\"")
   (modify-syntax-entry ?- ". 123")
   (modify-syntax-entry ?{ ". 1b")
@@ -1749,8 +1729,6 @@ strip numbers instead."
 (defun message-mode-guts ()
   (setq messages-mode-syntax-table (make-syntax-table))
   (set-syntax-table messages-mode-syntax-table)
-  (modify-syntax-entry ?_ "w" messages-mode-syntax-table)
-  (modify-syntax-entry ?- "w" messages-mode-syntax-table)
   (modify-syntax-entry ?0 "w" messages-mode-syntax-table)
   (modify-syntax-entry ?1 "w" messages-mode-syntax-table)
   (modify-syntax-entry ?2 "w" messages-mode-syntax-table)