updated emacs config

added browse module for the kill ring
added sml-modline to hide scrollbar
added dir-locals menu for directory local settings (from .dir-locals.el)

1 files changed, 33 insertions, 4 deletions

diff --git a/emacs b/emacs
index c1c94e1..05064b0 100644
--- a/emacs
+++ b/emacs
@@ -13,6 +13,10 @@
  '(auto-insert-mode t)
  '(auto-insert-query nil)
  '(backward-delete-char-untabify-method nil)
+ '(browse-kill-ring-depropertize nil)
+ '(browse-kill-ring-display-duplicates nil)
+ '(browse-kill-ring-highlight-current-entry nil)
+ '(browse-kill-ring-highlight-inserted-item nil)
  '(bubblet-high-score 286 t)
  '(bubblet-high-stats (quote (47 131)) t)
  '(bubblet-num-games 1 t)
@@ -28,6 +32,7 @@
  '(compilation-skip-threshold 2)
  '(confirm-kill-emacs (quote y-or-n-p))
  '(cua-delete-selection nil)
+ '(cua-mode t nil (cua-base))
  '(cua-rectangle-mark-key [134217760])
  '(cua-remap-control-v nil)
  '(cua-remap-control-z nil)
@@ -37,6 +42,7 @@
  '(delphi-case-label-indent 2)
  '(delphi-indent-level 2)
  '(delphi-tab-always-indents nil)
+ '(dir-locals-mode t)
  '(display-time-24hr-format t)
  '(display-time-day-and-date t)
  '(display-time-interval 60)
@@ -121,8 +127,12 @@
  '(scroll-step 0)
  '(scroll-up-aggressively nil)
  '(server-mode t)
+ '(show-paren-mode t)
  '(show-trailing-whitespace t)
  '(sieve-manage-default-user "alexander@sulfrian.net")
+ '(sml-modeline-borders (quote ("" . " ")))
+ '(sml-modeline-len 12)
+ '(sml-modeline-numbers (quote percentage))
  '(smooth-scroll-margin 2)
  '(speedbar-directory-button-trim-method (quote trim))
  '(speedbar-frame-parameters (quote ((minibuffer) (width . 30) (height . 60) (border-width . 0) (menu-bar-lines . 0) (tool-bar-lines . 0) (unsplittable . t) (left-fringe . 0))))
@@ -150,7 +160,6 @@
  '(tooltip-use-echo-area nil)
  '(tooltip-x-offset 10)
  '(tooltip-y-offset 10)
- '(transient-mark-mode t)
  '(truncate-lines nil)
  '(truncate-partial-width-windows nil)
  '(uniquify-buffer-name-style (quote post-forward-angle-brackets) nil (uniquify))
@@ -179,7 +188,7 @@
   ;; If you edit it by hand, you could mess it up, so be careful.
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
- '(default ((t (:stipple nil :background "black" :foreground "grey90" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 92 :width normal :family "xos4-terminus"))))
+ '(default ((t (:stipple nil :background "black" :foreground "grey90" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 120 :width normal :foundry "xos4" :family "terminus"))))
  '(border ((t (:background "gray50"))))
  '(custom-face-tag ((t (:weight bold))))
  '(custom-group-tag ((((min-colors 88) (class color) (background light)) (:foreground "blue1" :weight bold))))
@@ -211,6 +220,8 @@
  '(region ((((class color) (min-colors 88) (background dark)) (:inverse-video t))))
  '(scroll-bar ((t (:background "black" :foreground "gray25"))))
  '(shadow ((((class color grayscale) (min-colors 88) (background dark)) (:foreground "grey50"))))
+ '(sml-modeline-end-face ((t (:inherit modeline))))
+ '(sml-modeline-vis-face ((t (:background "gray30"))))
  '(tooltip ((((class color)) (:background "lightyellow" :foreground "black" :height 0.5))))
  '(variable-pitch ((t (:family "terminus"))))
  '(vhdl-font-lock-attribute-face ((((class color) (background light)) (:foreground "Orchid"))))
@@ -277,7 +288,7 @@
 
 ; c/c++-mode stuff
 (setq indent-tabs-mode t)
-(setq tab-width 8)
+;(setq tab-width 8)
 (setq c-default-style "linux")
 (c-set-offset 'arglist-cont-nonempty '(c-lineup-arglist-tabs-only c-lineup-gcc-asm-reg))
 
@@ -289,7 +300,8 @@
              (modify-syntax-entry ?_ "w")       ; now '_' is not considered a word-delimiter
 	     (c-set-style "linux")              ; set indentation style
 	     (define-key c-mode-base-map (kbd "M-o") 'eassist-switch-h-cpp)
-	     (define-key c-mode-base-map (kbd "M-m") 'eassist-list-methods)))
+	     (define-key c-mode-base-map (kbd "M-m") 'eassist-list-methods)
+	     (define-key c-mode-base-map (kbd "C-o") 'semantic-complete-jump-local)))
 
 (global-set-key [C-return] 'dabbrev-expand)
 (define-key esc-map [C-return] 'dabbrev-completion)
@@ -482,3 +494,20 @@
 
 ;; magit-status (bind if available on <f5>)
 (when (fboundp 'magit-status) (global-set-key (kbd "<f5>") 'magit-status))
+
+;; dir-locals
+(require 'dir-locals)
+
+;; use sml-modeline if available
+(if (require 'sml-modeline nil 'noerror)
+  (progn
+    (sml-modeline-mode 1)                   ;; show buffer pos in the mode line
+    (scroll-bar-mode -1))                   ;; turn off the scrollbar
+  (scroll-bar-mode 1)                       ;; otherwise, show a scrollbar...
+  (set-scroll-bar-mode 'right))             ;; ... on the right
+
+;; browse-kill-ring
+(when (require 'browse-kill-ring nil 'noerror)
+  (progn (browse-kill-ring-default-keybindings)
+	(global-set-key "\C-cy" '(lambda () (interactive)
+				   (popup-menu 'yank-menu)))))