Commits

Anonymous committed f12a345

* Update

Comments (0)

Files changed (6)

files/emacs-lisp-mode.el

   (when (and (save-excursion
                (forward-char)
                (backward-sexp)
-               (member (car (sexp-at-point)) my-emacs-lisp-open-line-list))
+               (when (listp (sexp-at-point))
+                 (memq (car (sexp-at-point)) my-emacs-lisp-open-line-list)))
              (thing-at-point 'sexp)
              (eq (following-char) ?\)))
     (newline)
+(require 'ibuffer)
 ;; filter groups
 (setq ibuffer-saved-filter-groups
       (quote (("default"
       w32-rwindow-modifier 'super ; Right Windows key
       w32-apps-modifier 'hyper) ; Menu key
 
+;;; stupid terminal key sequence remapping
+(define-key key-translation-map [return] [?\r])
+(define-key key-translation-map [?\C-\m] [(control m-key)])
+(define-key function-key-map [return] nil)
+(define-key function-key-map [?\r] nil)
+
+(define-key key-translation-map [tab] [?\t])
+(define-key key-translation-map [?\C-\i] [(control i-key)])
+(define-key function-key-map [tab] nil)
+(define-key function-key-map [?\t] nil)
+
+(define-key key-translation-map [escape] [?\e])
+(define-key input-decode-map [?\C-\[] [(control left_bracket)])
+(define-key function-key-map [escape] nil)
+(define-key function-key-map [?\e] nil)
+
 ;; Url & Browsing
 (global-set-key (kbd "C-c C-w") 'browse-url-at-point)
 (global-set-key (kbd "C-c w") 'browse-url)
 (global-set-key (kbd "C-c p") 'my-scroll-down)
 
 ;; deleting stuff
-(keyboard-translate ?\C-i ?\H-i)
-(global-set-key (kbd "H-i") 'backward-kill-word)
+(global-set-key (kbd "C-<i-key>") 'backward-kill-word)
 
 ;; keys for specific modes
 (defun add-html-binding ()

files/smartparens.el

 (define-key sp-keymap (kbd "C-M-<delete>") 'sp-splice-sexp-killing-forward)
 (define-key sp-keymap (kbd "C-M-<backspace>") 'sp-splice-sexp-killing-backward)
 
-(define-key input-decode-map (kbd "C-[") (kbd "H-["))
-(define-key sp-keymap (kbd "C-]") 'sp-select-next-thing)
-(define-key sp-keymap (kbd "H-[") 'sp-select-previous-thing)
+(define-key sp-keymap (kbd "C-]") 'sp-select-next-thing-exchange)
+(define-key sp-keymap (kbd "C-<left_bracket>") 'sp-select-previous-thing)
+(define-key sp-keymap (kbd "C-M-]") 'sp-select-next-thing)
 
 ;;; add new pairs
 (sp-add-pair "*" "*")

files/yasnippet.el

 
 (setq yas-prompt-functions '(yas-ido-prompt))
 
+(defun my-yas-startup ()
+  ;; stupid yasnippet :/ we define <tab> behaviour elsewhere
+  (define-key yas-minor-mode-map [(tab)] nil)
+  (define-key yas-minor-mode-map (kbd "TAB") nil))
+
 ;; Replace yasnippets's TAB
-(add-hook 'yas-minor-mode-hook
-          (lambda () (define-key yas-minor-mode-map
-                       (kbd "TAB") 'smart-tab))) ; was yas/expand
+(add-hook 'yas-minor-mode-hook 'my-yas-startup) ; was yas/expand
  '(background-mode dark)
  '(blink-cursor-mode nil)
  '(blink-matching-paren nil)
+ '(bmkp-last-as-first-bookmark-file "~\\.emacs.d\\bookmarks")
  '(calc-settings-file "~\\.emacs.d\\my-calc.el")
  '(column-number-mode t)
  '(cursor-color "#839496")