X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/2f238de89cc5399be6840928aedad10cf651e749..040cb5bc369962c947396b293fc4b447532142de:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 9630ab6..497318a 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -124,6 +124,14 @@ library."
   (and (library-exists-p file)
        (autoload symbol file docstring interactivep type)))
 
+(defun mdw-kick-menu-bar (&optional frame)
+  "Regenerate FRAME's menu bar so it doesn't have empty menus."
+  (interactive)
+  (unless frame (setq frame (selected-frame)))
+  (let ((old (frame-parameter frame 'menu-bar-lines)))
+    (set-frame-parameter frame 'menu-bar-lines 0)
+    (set-frame-parameter frame 'menu-bar-lines old)))
+
 ;; Splitting windows.
 
 (unless (fboundp 'scroll-bar-columns)
@@ -637,21 +645,15 @@ This is mainly useful in `auto-fill-mode'.")
 
 ;; Utility functions.
 
-(defun mdw-tabify (s)
-  "Tabify the string S.  This is a horrid hack."
-  (save-excursion
-    (save-match-data
-      (let (start end)
-	(beginning-of-line)
-	(setq start (point-marker))
+(defun mdw-maybe-tabify (s)
+  "Tabify or untabify the string S, according to `indent-tabs-mode'."
+  (let ((tabfun (if indent-tabs-mode #'tabify #'untabify)))
+    (with-temp-buffer
+      (save-match-data
 	(insert s "\n")
-	(setq end (point-marker))
-	(tabify start end)
-	(setq s (buffer-substring start (1- end)))
-	(delete-region start end)
-	(set-marker start nil)
-	(set-marker end nil)
-	s))))
+	(let ((start (point-min)) (end (point-max)))
+	  (funcall tabfun (point-min) (point-max))
+	  (setq s (buffer-substring (point-min) (1- (point-max)))))))))
 
 (defun mdw-examine-fill-prefixes (l)
   "Given a list of dynamic fill prefixes, pick one which matches
@@ -659,9 +661,9 @@ context and return the static fill prefix to use.  Point must be
 at the start of a line, and match data must be saved."
   (cond ((not l) nil)
 	       ((looking-at (car (car l)))
-		(mdw-tabify (apply (function concat)
-				   (mapcar (function mdw-do-prefix-match)
-					   (cdr (car l))))))
+		(mdw-maybe-tabify (apply #'concat
+					 (mapcar #'mdw-do-prefix-match
+						 (cdr (car l))))))
 	       (t (mdw-examine-fill-prefixes (cdr l)))))
 
 (defun mdw-maybe-car (p)
@@ -824,12 +826,12 @@ doesn't match any of the regular expressions in
 
 (mdw-define-face default
   (((type w32)) :family "courier new" :height 85)
-  (((type x)) :family "6x13" :height 130)
+  (((type x)) :family "6x13" :foundry "trad" :height 130)
   (((type color)) :foreground "white" :background "black")
   (t nil))
 (mdw-define-face fixed-pitch
   (((type w32)) :family "courier new" :height 85)
-  (((type x)) :family "6x13" :height 130)
+  (((type x)) :family "6x13" :foundry "trad" :height 130)
   (t :foreground "white" :background "black"))
 (if (>= emacs-major-version 23)
     (mdw-define-face variable-pitch
@@ -861,7 +863,8 @@ doesn't match any of the regular expressions in
   (((class color)) :background "red")
   (t :inverse-video t))
 (mdw-define-face highlight
-  (((class color)) :background "DarkSeaGreen4")
+  (((type x) (class color)) :background "DarkSeaGreen4")
+  (((type tty) (class color)) :background "cyan")
   (t :inverse-video t))
 
 (mdw-define-face holiday-face
@@ -960,7 +963,17 @@ doesn't match any of the regular expressions in
 (mdw-define-face diff-context
   (t nil))
 (mdw-define-face diff-refine-change
-  (t :background "RoyalBlue4"))
+  (((class color) (type x)) :background "RoyalBlue4")
+  (t :underline t))
+
+(mdw-define-face magit-diff-add
+  (t :foreground "green"))
+(mdw-define-face magit-diff-del
+  (t :foreground "red"))
+(mdw-define-face magit-diff-file-header
+  (t :weight bold))
+(mdw-define-face magit-diff-hunk-header
+  (t :foreground "SkyBlue1"))
 
 (mdw-define-face erc-input-face
   (t :foreground "red"))
@@ -970,6 +983,21 @@ doesn't match any of the regular expressions in
 (mdw-define-face woman-italic
   (t :slant italic))
 
+(eval-after-load "rst"
+  '(progn
+     (mdw-define-face rst-level-1-face
+       (t :foreground "SkyBlue1" :weight bold))
+     (mdw-define-face rst-level-2-face
+       (t :foreground "SeaGreen1" :weight bold))
+     (mdw-define-face rst-level-3-face
+       (t :weight bold))
+     (mdw-define-face rst-level-4-face
+       (t :slant italic))
+     (mdw-define-face rst-level-5-face
+       (t :underline t))
+     (mdw-define-face rst-level-6-face
+       ())))
+
 (mdw-define-face p4-depot-added-face
   (t :foreground "green"))
 (mdw-define-face p4-depot-branch-op-face
@@ -989,6 +1017,11 @@ doesn't match any of the regular expressions in
 (mdw-define-face p4-diff-ins-face
   (t :foreground "green"))
 
+(mdw-define-face w3m-anchor-face
+  (t :foreground "SkyBlue1" :underline t))
+(mdw-define-face w3m-arrived-anchor-face
+  (t :foreground "SkyBlue1" :underline t))
+
 (mdw-define-face whizzy-slice-face
   (t :background "grey10"))
 (mdw-define-face whizzy-error-face
@@ -997,9 +1030,15 @@ doesn't match any of the regular expressions in
 ;; Ellipses used to indicate hidden text (and similar).
 (mdw-define-face mdw-ellipsis-face
   (((type tty)) :foreground "blue") (t :foreground "grey60"))
-(let ((dot (make-glyph-code ?. 'mdw-ellipsis-face)))
+(let ((dollar (make-glyph-code ?$ 'mdw-ellipsis-face))
+      (backslash (make-glyph-code ?\ 'mdw-ellipsis-face))
+      (dot (make-glyph-code ?. 'mdw-ellipsis-face))
+      (bar (make-glyph-code ?| mdw-ellipsis-face)))
+  (set-display-table-slot standard-display-table 0 dollar)
+  (set-display-table-slot standard-display-table 1 backslash)
   (set-display-table-slot standard-display-table 4
-			  (vector dot dot dot)))
+			  (vector dot dot dot))
+  (set-display-table-slot standard-display-table 5 bar))
 
 ;;;--------------------------------------------------------------------------
 ;;; C programming configuration.
@@ -1651,12 +1690,12 @@ strip numbers instead."
 	(list
 
 	 ;; Set up the keywords defined above.
-	 (list (concat "\\<\\(" keywords "\\)\\>")
+	 (list (concat "\\_<\\(" keywords "\\)\\_>")
 	       '(0 font-lock-keyword-face))
 
 	 ;; At least numbers are simpler than C.
-	 (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
-		       "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
+	 (list (concat "\\_<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
+		       "\\_<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
 		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)")
 	       '(0 mdw-number-face))
 
@@ -1777,6 +1816,7 @@ strip numbers instead."
 		       "<" arm-assembler-mode-syntax-table)
   (modify-syntax-entry ?\n ">" arm-assembler-mode-syntax-table)
   (modify-syntax-entry ?_ "_" arm-assembler-mode-syntax-table)
+  (modify-syntax-entry ?' "\"'" arm-assembler-mode-syntax-table)
 
   (make-local-variable 'comment-start)
   (setq comment-start ";")
@@ -2179,6 +2219,48 @@ strip numbers instead."
   (run-hooks 'mdw-sgml-mode-hook))
 
 ;;;--------------------------------------------------------------------------
+;;; Configuration files.
+
+(defvar mdw-conf-quote-normal nil
+  "*Control syntax category of quote characters `\"' and `''.
+If this is `t', consider quote characters to be normal
+punctuation, as for `conf-quote-normal'.  If this is `nil' then
+leave quote characters as quotes.  If this is a list, then
+consider the quote characters in the list to be normal
+punctuation.  If this is a single quote character, then consider
+that character only to be normal punctuation.")
+(defun mdw-conf-quote-normal-acceptable-value-p (value)
+  "Is the VALUE is an acceptable value for `mdw-conf-quote-normal'?"
+  (or (booleanp value)
+      (every (lambda (v) (memq v '(?\" ?')))
+	     (if (listp value) value (list value)))))
+(put 'mdw-conf-quote-normal 'safe-local-variable '
+     mdw-conf-quote-normal-acceptable-value-p)
+
+(defun mdw-fix-up-quote ()
+  "Apply the setting of `mdw-conf-quote-normal'."
+  (let ((flag mdw-conf-quote-normal))
+    (cond ((eq flag t)
+	   (conf-quote-normal t))
+	  ((not flag)
+	   nil)
+	  (t
+	   (let ((table (copy-syntax-table (syntax-table))))
+	     (mapc (lambda (ch) (modify-syntax-entry ch "." table))
+		   (if (listp flag) flag (list flag)))
+	     (set-syntax-table table)
+	     (and font-lock-mode (font-lock-fontify-buffer)))))))
+(defun mdw-fix-up-quote-hack ()
+  "Unpleasant hack to call `mdw-fix-up-quote' at the right time.
+Annoyingly, `hack-local-variables' is done after `set-auto-mode'
+so we wouldn't see a local-variable setting of
+`mdw-conf-quote-normal' in `conf-mode-hook'.  Instead, wire
+ourselves onto `hack-local-variables-hook' here, and check the
+setting once it's actually been made."
+  (add-hook 'hack-local-variables-hook 'mdw-fix-up-quote t t))
+(add-hook 'conf-mode-hook 'mdw-fix-up-quote-hack t)
+
+;;;--------------------------------------------------------------------------
 ;;; Shell scripts.
 
 (defun mdw-setup-sh-script-mode ()