X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/6cb52f8b2fc7fd42bce655735fd7723fe1d66842..11a169c1888d639143681b7b70b9a9d34b61588b:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index c972adc..503fa37 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)
@@ -824,12 +832,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 +869,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 +969,8 @@ 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 erc-input-face
   (t :foreground "red"))
@@ -997,9 +1007,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.