X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5f454d3e0c3c1fbc179aedcedcfe4ee191f171c2..737620637836266467b4de02ac53befc28166246:/el/dot-emacs.el?ds=inline

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index d883666..9de062a 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -102,6 +102,15 @@ This may be at the expense of cool features.")
 		    (concat "(" (buffer-string) ")")))))))
   (cdr (assq sym mdw-config)))
 
+;; Width configuration.
+
+(defvar mdw-column-width
+  (string-to-number (or (mdw-config 'emacs-width) "77"))
+  "Width of Emacs columns.")
+(defvar mdw-text-width mdw-column-width
+  "Expected width of text within columns.")
+(put 'mdw-text-width 'safe-local-variable 'integerp)
+
 ;; Local variables hacking.
 
 (defun run-local-vars-mode-hook ()
@@ -196,8 +205,8 @@ fringes is not taken out of the allowance for WIDTH, unlike
   (interactive "P")
   (setq width (cond (width (prefix-numeric-value width))
 		    ((and window-system (mdw-emacs-version-p 22))
-		     77)
-		    (t 78)))
+		     mdw-column-width)
+		    (t (1+ mdw-column-width))))
   (let* ((win (selected-window))
 	 (sb-width (mdw-horizontal-window-overhead))
 	 (c (/ (+ (window-width) sb-width)
@@ -981,7 +990,7 @@ case."
   (setq page-delimiter "\f\\|^.*-\\{6\\}.*$")
   (setq comment-column 40)
   (auto-fill-mode 1)
-  (setq fill-column 77)
+  (setq fill-column mdw-text-width)
   (and (fboundp 'gtags-mode)
        (gtags-mode))
   (if (fboundp 'hs-minor-mode)
@@ -991,6 +1000,7 @@ case."
   (trap (turn-on-font-lock)))
 
 (defun mdw-post-local-vars-misc-mode-config ()
+  (setq whitespace-line-column mdw-text-width)
   (when (and mdw-do-misc-mode-hacking
 	     (not buffer-read-only))
     (setq show-trailing-whitespace t)
@@ -1239,7 +1249,7 @@ doesn't match any of the regular expressions in
   (t :inverse-video t))
 (mdw-define-face whitespace-line
   (((class color)) :background "darkred")
-  (t :inverse-video :t))
+  (t :inverse-video t))
 (mdw-define-face mdw-punct-face
   (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
 (mdw-define-face mdw-number-face
@@ -1533,7 +1543,7 @@ set."
 		   (inextern-lang . [0])
 		   (label . 0)
 		   (case-label . +)
-		   (access-label . -)
+		   (access-label . -2)
 		   (inclass . +)
 		   (inline-open . ++)
 		   (statement-cont . +)
@@ -2579,6 +2589,7 @@ strip numbers instead."
   (modify-syntax-entry ?. "w")
   (modify-syntax-entry ?\n ">")
   (setf fill-prefix nil)
+  (local-set-key ";" 'self-insert-command)
   (mdw-standard-fill-prefix "\\([ \t]*;+[ \t]*\\)"))
 
 (defun mdw-asm-set-comment ()