X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b200af264adeb1c362508740e601d0b8792a49a5..43036e3a122c0c60f70907bec8dc71c5bca39031:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index cd0ee10..eec1dcf 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -233,7 +233,7 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
 	(dolist (key replacements)
 	  (define-key keymap key binding))))))
 
-(eval-after-load "org"
+(eval-after-load "org-latex"
   '(progn
      (push '("strayman"
 	     "\\documentclass{strayman}
@@ -349,7 +349,6 @@ probably become garbage."
 			  (car alists)
 			  (cdr alists)))))
 
-
 (defun mdw-do-uniquify (done end l rest)
   "A helper function for mdw-uniquify-alist.
 The DONE argument is a list whose first element is `nil'.  It
@@ -690,8 +689,14 @@ case."
   (trap (turn-on-font-lock)))
 
 (eval-after-load 'gtags
-  '(dolist (key '([mouse-2] [mouse-3]))
-     (define-key gtags-mode-map key nil)))
+  '(progn
+     (dolist (key '([mouse-2] [mouse-3]))
+       (define-key gtags-mode-map key nil))
+     (define-key gtags-mode-map [C-S-mouse-2] 'gtags-find-tag-by-event)
+     (define-key gtags-select-mode-map [C-S-mouse-2]
+       'gtags-select-tag-by-event)
+     (dolist (map (list gtags-mode-map gtags-select-mode-map))
+       (define-key map [C-S-mouse-3] 'gtags-pop-stack))))
 
 ;; Backup file handling.
 
@@ -724,7 +729,7 @@ doesn't match any of the regular expressions in
 	       (not (some (lambda (fr)
 			    (message "checking frame %s" frame)
 			    (and (not (eq fr frame))
-				 (string= (frame-parameter frame 'display)
+				 (string= (frame-parameter fr 'display)
 					  frame-display)
 				 (progn "frame %s still uses us" nil)))
 			  (frame-list))))
@@ -743,36 +748,49 @@ doesn't match any of the regular expressions in
      (make-face ',name)
      (defvar ,name ',name)
      (put ',name 'face-defface-spec ',body)
-     ))
+     (face-spec-set ',name ',body nil)))
 
 (mdw-define-face default
   (((type w32)) :family "courier new" :height 85)
   (((type x)) :family "6x13" :height 130)
-  (t :foreground "white" :background "black"))
+  (((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)
   (t :foreground "white" :background "black"))
+(if (>= emacs-major-version 23)
+    (mdw-define-face variable-pitch
+      (((type x)) :family "sans" :height 100))
+  (mdw-define-face variable-pitch
+    (((type x)) :family "helvetica" :height 120)))
 (mdw-define-face region
-  (((type tty)) :background "blue") (t :background "grey30"))
+  (((type tty) (class color)) :background "blue")
+  (((type tty) (class mono)) :inverse-video t)
+  (t :background "grey30"))
 (mdw-define-face minibuffer-prompt
   (t :weight bold))
 (mdw-define-face mode-line
-  (t :foreground "blue" :background "yellow"
-     :box (:line-width 1 :style released-button)))
+  (((class color)) :foreground "blue" :background "yellow"
+		   :box (:line-width 1 :style released-button))
+  (t :inverse-video t))
 (mdw-define-face mode-line-inactive
-  (t :foreground "yellow" :background "blue"
-     :box (:line-width 1 :style released-button)))
+  (((class color)) :foreground "yellow" :background "blue"
+		   :box (:line-width 1 :style released-button))
+  (t :inverse-video t))
 (mdw-define-face scroll-bar
   (t :foreground "black" :background "lightgrey"))
 (mdw-define-face fringe
   (t :foreground "yellow"))
-(mdw-define-face show-paren-match-face
-  (t :background "darkgreen"))
-(mdw-define-face show-paren-mismatch-face
-  (t :background "red"))
+(mdw-define-face show-paren-match
+  (((class color)) :background "darkgreen")
+  (t :underline t))
+(mdw-define-face show-paren-mismatch
+  (((class color)) :background "red")
+  (t :inverse-video t))
 (mdw-define-face highlight
-  (t :background "DarkSeaGreen4"))
+  (((class color)) :background "DarkSeaGreen4")
+  (t :inverse-video t))
 
 (mdw-define-face holiday-face
   (t :background "red"))
@@ -781,36 +799,40 @@ doesn't match any of the regular expressions in
 
 (mdw-define-face comint-highlight-prompt
   (t :weight bold))
-(mdw-define-face comint-highlight-input
-  (t :slant italic))
+(mdw-define-face comint-highlight-input)
 
 (mdw-define-face trailing-whitespace
-  (t :background "red"))
+  (((class color)) :background "red")
+  (t :inverse-video t))
 (mdw-define-face mdw-punct-face
   (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
 (mdw-define-face mdw-number-face
   (t :foreground "yellow"))
 (mdw-define-face font-lock-function-name-face
-  (t :weight bold))
+  (t :slant italic))
 (mdw-define-face font-lock-keyword-face
   (t :weight bold))
 (mdw-define-face font-lock-constant-face
   (t :slant italic))
 (mdw-define-face font-lock-builtin-face
   (t :weight bold))
+(mdw-define-face font-lock-type-face
+  (t :weight bold :slant italic))
 (mdw-define-face font-lock-reference-face
   (t :weight bold))
 (mdw-define-face font-lock-variable-name-face
   (t :slant italic))
 (mdw-define-face font-lock-comment-delimiter-face
-  (default :slant italic)
-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((class mono)) :weight bold)
+  (((type tty) (class color)) :foreground "green")
+  (t :slant italic :foreground "SeaGreen1"))
 (mdw-define-face font-lock-comment-face
-  (default :slant italic)
-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((class mono)) :weight bold)
+  (((type tty) (class color)) :foreground "green")
+  (t :slant italic :foreground "SeaGreen1"))
 (mdw-define-face font-lock-string-face
-  (t :foreground "SkyBlue1"))
-
+  (((class mono)) :weight bold)
+  (((class color)) :foreground "SkyBlue1"))
 (mdw-define-face message-separator
   (t :background "red" :foreground "white" :weight bold))
 (mdw-define-face message-cited-text
@@ -853,6 +875,9 @@ doesn't match any of the regular expressions in
   (t :foreground "red"))
 (mdw-define-face diff-context)
 
+(mdw-define-face erc-input-face
+  (t :foreground "red"))
+
 (mdw-define-face woman-bold
   (t :weight bold))
 (mdw-define-face woman-italic
@@ -1289,6 +1314,39 @@ doesn't match any of the regular expressions in
   "Major mode for editing C# code.")
 
 ;;;--------------------------------------------------------------------------
+;;; Go programming configuration.
+
+(defun mdw-fontify-go ()
+
+  (make-local-variable 'font-lock-keywords)
+  (let ((go-keywords
+	 (mdw-regexps "break" "case" "chan" "const" "continue"
+		      "default" "defer" "else" "fallthrough" "for"
+		      "func" "go" "goto" "if" "import"
+		      "interface" "map" "package" "range" "return"
+		      "select" "struct" "switch" "type" "var")))
+
+    (setq font-lock-keywords
+	  (list
+
+	   ;; Handle the keywords defined above.
+	   (list (concat "\\<\\(" go-keywords "\\)\\>")
+		 '(0 font-lock-keyword-face))
+
+	   ;; Handle numbers too.
+	   ;;
+	   ;; The following isn't quite right, but it's close enough.
+	   (list (concat "\\<\\("
+			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
+			 "[0-9]+\\(\\.[0-9]*\\|\\)"
+			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)")
+		 '(0 mdw-number-face))
+
+	   ;; And anything else is punctuation.
+	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+		 '(0 mdw-punct-face))))))
+
+;;;--------------------------------------------------------------------------
 ;;; Awk programming configuration.
 
 ;; Make Awk indentation nice.
@@ -2237,7 +2295,7 @@ strip numbers instead."
 (setq hs-hide-comments-when-hiding-all nil)
 
 (defadvice hs-hide-all (after hide-first-comment activate)
-  (hs-hide-initial-comment-block))
+  (save-excursion (hs-hide-initial-comment-block)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Shell mode.