Merge commit 'origin'

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 7bb8214..404233b 100644 (file)
--- 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}
@@ -690,8 +690,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.
 
@@ -742,7 +748,8 @@ doesn't match any of the regular expressions in
   `(progn
      (make-face ',name)
      (defvar ,name ',name)
-     (put ',name 'face-defface-spec ',body)))
+     (put ',name 'face-defface-spec ',body)
+     (face-spec-set ',name ',body nil)))
 
 (mdw-define-face default
   (((type w32)) :family "courier new" :height 85)
@@ -752,6 +759,11 @@ doesn't match any of the regular expressions in
   (((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"))
 (mdw-define-face minibuffer-prompt
@@ -766,9 +778,9 @@ doesn't match any of the regular expressions in
   (t :foreground "black" :background "lightgrey"))
 (mdw-define-face fringe
   (t :foreground "yellow"))
-(mdw-define-face show-paren-match-face
+(mdw-define-face show-paren-match
   (t :background "darkgreen"))
-(mdw-define-face show-paren-mismatch-face
+(mdw-define-face show-paren-mismatch
   (t :background "red"))
 (mdw-define-face highlight
   (t :background "DarkSeaGreen4"))
@@ -790,7 +802,7 @@ doesn't match any of the regular expressions in
 (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
@@ -854,6 +866,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