X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=d7c020438055bead98f14e194597d198641dddf0;hb=53d367de4501b12100c355561dee9874dc2e9784;hp=175bf7acb290780ab7dfb47ac6736b57334468b7;hpb=279014224bac11d9f9ea4d3a70fa12a1d6580842;p=emacs.git

diff --git a/.emacs b/.emacs
index 175bf7a..d7c0204 100644
--- a/.emacs
+++ b/.emacs
@@ -281,11 +281,13 @@ Argument DESCRIPTION MIME description."
       cperl-auto-newline-after-colon nil
       cperl-continued-statement-offset 4
       cperl-brace-offset -4
+      cperl-continued-brace-offset 0
       cperl-label-offset -4
       cperl-highlight-variables-indiscriminately t
       cperl-electric-lbrace-space nil
-      )
-(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle")))
+      cperl-indent-parens-as-block t
+      cperl-tab-always-indent t)
+;(add-hook 'cperl-mode-hook (lambda () (cperl-set-style "PerlStyle")))
 
 
 
@@ -332,30 +334,47 @@ Argument DESCRIPTION MIME description."
 ;; ) 
 
 (require 'font-latex)
-(add-to-list 'font-latex-match-reference-keywords "fref")
-(add-to-list 'font-latex-match-reference-keywords "Fref")
-(add-to-list 'font-latex-match-reference-keywords "citep")
-(add-to-list 'font-latex-match-reference-keywords "citet")
-(font-latex-match-reference-make)
-(add-to-list 'font-latex-match-function-keywords "DLA")
-(add-to-list 'font-latex-match-function-keywords "RZ")
-(add-to-list 'font-latex-match-function-keywords "OM")
-(add-to-list 'font-latex-match-function-keywords "DL")
-(add-to-list 'font-latex-match-function-keywords "fixme")
-(add-to-list 'font-latex-match-function-keywords "acs")
-(add-to-list 'font-latex-match-function-keywords "acsp")
-(add-to-list 'font-latex-match-function-keywords "ac")
-(add-to-list 'font-latex-match-function-keywords "acp")
-(add-to-list 'font-latex-match-function-keywords "acl")
-(add-to-list 'font-latex-match-function-keywords "aclp")
-(add-to-list 'font-latex-match-function-keywords "acsu")
-(add-to-list 'font-latex-match-function-keywords "aclu")
-(add-to-list 'font-latex-match-function-keywords "acused")
-(font-latex-match-function-make)
+(setq font-latex-match-reference-keywords
+      '(
+        ("fref" "{")
+        ("Fref" "{")
+        ("citep" "{")
+        ("citet" "{")
+        ("acs" "{")
+        ("acsp" "{")
+        ("ac" "{")
+        ("acp" "{")
+        ("acl" "{")
+        ("aclp" "{")
+        ("acsu" "{")
+        ("aclu" "{")
+        ("acused" "{")
+;         ))
+; (setq font-latex-match-warning-keywords
+;       '(
+        ("DLA" "{")
+        ("RZ" "{")
+        ("OM" "{")
+        ("DL" "{")
+        ("fixme" "{")))
+      
 (setq-default TeX-parse-self t)
 (setq-default TeX-auto-save t)
 (setq-default TeX-master nil)
 
+;; this doesn't seem to work; not currently sure why
+; (setq font-latex-user-keyword-classes
+;       '(("my-warning-commands"
+;          (("DLA" "{")
+;           ("RZ" "{")
+;           ("OM" "{")
+;           ("DL" "{")
+;           ("fixme" "{")
+;           )
+;          (:foreground "red" :weight bold :underline (:color foreground-color :style line)))
+;         ))
+
+
 (defun insert-date ()
   "Insert date at point."
   (interactive)
@@ -640,6 +659,97 @@ want to use in the modeline *in lieu of* the original.")
     (setq flymake-mode-line mode-line)
     (force-mode-line-update)))
 
+; fix up tmux xterm keys
+; stolen from http://unix.stackexchange.com/questions/24414/shift-arrow-not-working-in-emacs-within-tmux
+(if (getenv "TMUX")
+    (progn
+      (let ((x 2) (tkey ""))
+        (while (<= x 8)
+          ;; shift
+          (if (= x 2)
+              (setq tkey "S-"))
+          ;; alt
+          (if (= x 3)
+              (setq tkey "M-"))
+          ;; alt + shift
+          (if (= x 4)
+              (setq tkey "M-S-"))
+          ;; ctrl
+          (if (= x 5)
+              (setq tkey "C-"))
+          ;; ctrl + shift
+          (if (= x 6)
+              (setq tkey "C-S-"))
+          ;; ctrl + alt
+          (if (= x 7)
+              (setq tkey "C-M-"))
+          ;; ctrl + alt + shift
+          (if (= x 8)
+              (setq tkey "C-M-S-"))
+          
+          ;; arrows
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d A" x)) (kbd (format "%s<up>" tkey)))
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d B" x)) (kbd (format "%s<down>" tkey)))
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d C" x)) (kbd (format "%s<right>" tkey)))
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d D" x)) (kbd (format "%s<left>" tkey)))
+          ;; home
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d H" x)) (kbd (format "%s<home>" tkey)))
+          ;; end
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d F" x)) (kbd (format "%s<end>" tkey)))
+          ;; page up
+          (define-key key-translation-map (kbd (format "M-[ 5 ; %d ~" x)) (kbd (format "%s<prior>" tkey)))
+          ;; page down
+          (define-key key-translation-map (kbd (format "M-[ 6 ; %d ~" x)) (kbd (format "%s<next>" tkey)))
+          ;; insert
+          (define-key key-translation-map (kbd (format "M-[ 2 ; %d ~" x)) (kbd (format "%s<delete>" tkey)))
+          ;; delete
+          (define-key key-translation-map (kbd (format "M-[ 3 ; %d ~" x)) (kbd (format "%s<delete>" tkey)))
+          ;; f1
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d P" x)) (kbd (format "%s<f1>" tkey)))
+          ;; f2
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d Q" x)) (kbd (format "%s<f2>" tkey)))
+          ;; f3
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d R" x)) (kbd (format "%s<f3>" tkey)))
+          ;; f4
+          (define-key key-translation-map (kbd (format "M-[ 1 ; %d S" x)) (kbd (format "%s<f4>" tkey)))
+          ;; f5
+          (define-key key-translation-map (kbd (format "M-[ 15 ; %d ~" x)) (kbd (format "%s<f5>" tkey)))
+          ;; f6
+          (define-key key-translation-map (kbd (format "M-[ 17 ; %d ~" x)) (kbd (format "%s<f6>" tkey)))
+          ;; f7
+          (define-key key-translation-map (kbd (format "M-[ 18 ; %d ~" x)) (kbd (format "%s<f7>" tkey)))
+          ;; f8
+          (define-key key-translation-map (kbd (format "M-[ 19 ; %d ~" x)) (kbd (format "%s<f8>" tkey)))
+          ;; f9
+          (define-key key-translation-map (kbd (format "M-[ 20 ; %d ~" x)) (kbd (format "%s<f9>" tkey)))
+          ;; f10
+          (define-key key-translation-map (kbd (format "M-[ 21 ; %d ~" x)) (kbd (format "%s<f10>" tkey)))
+          ;; f11
+          (define-key key-translation-map (kbd (format "M-[ 23 ; %d ~" x)) (kbd (format "%s<f11>" tkey)))
+          ;; f12
+          (define-key key-translation-map (kbd (format "M-[ 24 ; %d ~" x)) (kbd (format "%s<f12>" tkey)))
+          ;; f13
+          (define-key key-translation-map (kbd (format "M-[ 25 ; %d ~" x)) (kbd (format "%s<f13>" tkey)))
+          ;; f14
+          (define-key key-translation-map (kbd (format "M-[ 26 ; %d ~" x)) (kbd (format "%s<f14>" tkey)))
+          ;; f15
+          (define-key key-translation-map (kbd (format "M-[ 28 ; %d ~" x)) (kbd (format "%s<f15>" tkey)))
+          ;; f16
+          (define-key key-translation-map (kbd (format "M-[ 29 ; %d ~" x)) (kbd (format "%s<f16>" tkey)))
+          ;; f17
+          (define-key key-translation-map (kbd (format "M-[ 31 ; %d ~" x)) (kbd (format "%s<f17>" tkey)))
+          ;; f18
+          (define-key key-translation-map (kbd (format "M-[ 32 ; %d ~" x)) (kbd (format "%s<f18>" tkey)))
+          ;; f19
+          (define-key key-translation-map (kbd (format "M-[ 33 ; %d ~" x)) (kbd (format "%s<f19>" tkey)))
+          ;; f20
+          (define-key key-translation-map (kbd (format "M-[ 34 ; %d ~" x)) (kbd (format "%s<f20>" tkey)))
+
+          (setq x (+ x 1))
+          ))
+      )
+  )
+
 ; apparently things like to step on C-;, so we'll use a hack from
 ; http://stackoverflow.com/questions/683425/globally-override-key-binding-in-emacs/5340797#5340797 to fix this