emacs.d: comparison init.el

equal deleted inserted replaced

-:c25a7ccd237a
+:f346d7591eac
 ;;;; General ;;;;
 (add-to-list 'load-path "~/.emacs.d")     ; set default emacs load path
 (setq-default
 ediff-split-window-function
 'split-window-horizontally              ; diff horizontally
 inhibit-splash-screen t                  ; disable splash screen
 truncate-lines t                         ; truncate, not wrap, lines
 indent-tabs-mode nil                     ; only uses spaces for indentation
 split-width-threshold 181                ; min width to split window horizontially
 split-height-threshold 120               ; min width to split window vertically
 (global-set-key (kbd "C-c r") 'recompile) ; recompile
 (subword-mode t)                          ; move by camelCase words
 ;;; Darwin
-(if (string-match "darwin" (emacs-version))
+(setq is-mac (equal system-type 'darwin))
-(progn
+(when is-mac
 (setq-default
 mac-command-modifier 'meta
 ns-pop-up-frames nil
-ispell-program-name "/usr/local/bin/aspell")))
+ispell-program-name "/usr/local/bin/aspell"))
 ;;; Xorg
-(if window-system
+(when window-system
-(progn
+(tool-bar-mode -1)      ; remove tool bar
-(defun get-font ()
+(scroll-bar-mode -1)    ; remove scroll bar
-"Get appropriate font based on system and hostname."
+(menu-bar-mode -1)      ; remove menu bar
-(cond
+(visual-line-mode t)    ; word wrap break on whitespace
-((string-match "darwin" (emacs-version)) "Ubuntu Mono-14")
+(set-frame-font (if is-mac "Ubuntu Mono-14" "Ubuntu Mono-10.5")))
-((string-match "RichardParker"   (system-name)) "Ubuntu Mono-8.5")
-((string-match "HoldenCaulfield" (system-name)) "Ubuntu Mono-10.5")
-((string-match "lhoersten-66113" (system-name)) "Ubuntu Mono-10.5")
-("Ubuntu Mono-10.5")))
-(tool-bar-mode -1)      ; remove tool bar
-(scroll-bar-mode -1)    ; remove scroll bar
-(menu-bar-mode -1)      ; remove menu bar
-(visual-line-mode t)    ; word wrap break on whitespace
-(set-frame-font (get-font))))
-;;; terminal
-(global-set-key (kbd "C-c s") 'eshell) ; start shell
-(defun setup-env ()
-(setenv "TERM" "emacs") ; enable colors
-(setenv "ODBCSYSINI" "/home/lhoersten/myodbc")
-(setenv "ODBCINI" "/home/lhoersten/myodbc/odbc.ini")
-(setenv "PATH" (concat "/usr/local/bin:" (getenv "HOME") "/.cabal/bin:" (getenv "PATH"))))
-(add-hook 'eshell-mode-hook 'setup-env)
-(setup-env)
-(eshell)
 ;;;; Mode-Specific ;;;;
 ;;; text-mode
-(add-hook 'fundamental-mode-hook 'flyspell-mode t)      ; spellcheck text
+(add-hook 'fundamental-mode-hook '(flyspell-mode t))      ; spellcheck text
 (add-hook 'fundamental-mode-hook 'turn-on-auto-fill)    ; autofill text
 ;;; ido-mode
 (ido-mode t)                                            ; file/buffer selector
 (setq-default
 whitespace-style                                       ; whitespace to highlight
 '(trailing lines-tail empty indentation
 space-before-tab space-after-tab))
 ;;; python-mode
-(add-hook 'python-mode-hook (lambda () (setq tab-width 4)))
+(add-hook 'python-mode-hook '(setq tab-width 4))
 ;;; org-mode
 (add-hook
 'org-mode-hook
 (lambda ()
 ;; install packages
 (let ((ensure-installed
 (lambda (name)
 (unless (package-installed-p name) (package-install name))))
-(packages '(ac-js2 auto-complete expand-region
+(packages
-flymake-haskell-multi ghc ghci-completion haskell-mode
+'(ac-js2 auto-complete expand-region
-iy-go-to-char js2-mode multiple-cursors rainbow-delimiters
+flymake-haskell-multi ghc ghci-completion haskell-mode
-rainbow-mode skewer-mode solarized-theme yasnippet
+iy-go-to-char js2-mode multiple-cursors rainbow-delimiters
-zencoding-mode)))
+rainbow-mode skewer-mode solarized-theme yasnippet
+zencoding-mode visual-regexp)))
 (mapc ensure-installed packages))
 ;;; requires
 (require 'c-init)             ; c specific elisp
 (require 'align-with-spaces)  ; use only spaces for alignment
 (require 'iy-go-to-char)
 ;;; auto-config-mode
 (ac-config-default)
+;;; terminal
+(global-set-key (kbd "C-c s") 'eshell) ; start shell
+(exec-path-from-shell-initialize)
+(eshell)
 ;;; uniquify
 (setq
 uniquify-buffer-name-style 'post-forward
 uniquify-separator ":")
 (setq-default yas-snippet-dirs '("~/.emacs.d/snippets"))
 (yas-global-mode t)
 ;;; js2-mode
 (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-(add-hook 'js2-mode-hook 'ac-js2-mode)
+(add-hook 'js2-mode-hook '(ac-js2-mode t))
 (setq-default ac-js2-evaluate-calls t)
 ;;; html-mode
 (add-to-list 'auto-mode-alist '("\\.tpl\\'" . html-mode))
 (add-hook
 (local-set-key (kbd "C-c t") 'mc/mark-sgml-tag-pair)
 (zencoding-mode)
 (rainbow-mode)))
 ;;; css-mode
-(add-hook 'css-mode-hook 'rainbow-mode)
+(add-hook 'css-mode-hook '(rainbow-mode t))
 ;;; coding-modes map
 (mapc
-(lambda (x) (add-hook x
+(lambda (x)
+(add-hook
+x
 (lambda ()
-(linum-mode)
+(linum-mode t)
-(rainbow-delimiters-mode)
+(rainbow-delimiters-mode t)
-(auto-complete-mode))
+(auto-complete-mode t)) t))
-t))
 '(text-mode-hook
 c-mode-common-hook
 python-mode-hook
 haskell-mode-hook
 js2-mode-hook
 ;;; haskell-mode
 (add-hook
 'haskell-mode-hook
 (lambda ()
 (local-set-key (kbd "C-c i") 'haskell-navigate-imports) ; go to imports. prefix to return
-(flymake-haskell-multi-load)
+(flymake-haskell-multi-load t)
-(flymake-mode)
+(flymake-mode t)
-(capitalized-words-mode)
+(capitalized-words-mode t)
 (turn-on-haskell-indent)
 (turn-on-haskell-doc-mode)
 (turn-on-haskell-decl-scan)
-(imenu-add-menubar-index)
+(imenu-add-menubar-index t)
 (setq
 haskell-font-lock-haddock t
 haskell-stylish-on-save t
 haskell-program-name "ghci"
 haskell-indent-offset 4
 ;;; multiple-cursors
 (global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
 (global-set-key (kbd "C->") 'mc/mark-next-like-this)
 (global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
 (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
+;;; visual-regexp
+(global-set-key (kbd "C-M-%") 'vr/query-replace)
+(global-set-key (kbd "M-%") 'vr/replace)

changeset 59	f346d7591eac
parent 58	c25a7ccd237a
child 60	8beb028f936c