added linum-mode

2 files changed, 16 insertions, 3 deletions

diff --git a/emacs b/emacs
index e130530..4892ed4 100644
--- a/emacs
+++ b/emacs
@@ -75,6 +75,7 @@
  '(jit-lock-defer-time 0.1)
  '(jit-lock-stealth-nice 0.1)
  '(jit-lock-stealth-time nil)
+ '(linum-format (lambda (line) (propertize (format (let ((w (length (number-to-string (count-lines (point-min) (point-max)))))) (concat " %" (number-to-string w) "d ")) line) (quote face) (quote linum))))
  '(make-backup-files nil)
  '(mark-holidays-in-calendar t)
  '(mouse-1-click-in-non-selected-windows nil)
@@ -94,6 +95,7 @@
  '(scroll-bar-mode (quote right))
  '(server-mode t)
  '(show-trailing-whitespace t)
+ '(sieve-manage-default-user "alexander@sulfrian.net")
  '(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))))
  '(speedbar-frame-plist (quote (minibuffer nil width 30 height 60 border-width 0 internal-border-width 0 unsplittable t default-toolbar-visible-p nil has-modeline-p nil menubar-visible-p nil default-gutter-visible-p nil)))
@@ -166,6 +168,7 @@
  '(isearch ((((class color) (min-colors 88) (background dark)) (:background "yellow3" :foreground "black" :weight bold))))
  '(italic ((((supports :underline t)) (:underline t))))
  '(link ((((class color) (min-colors 88) (background dark)) (:foreground "cyan1" :underline t))))
+ '(linum ((t (:background "gray10" :foreground "gray50" :box nil :overline nil :underline nil :slant normal :weight normal :height 0.75 :width normal))))
  '(menu ((t nil)))
  '(mode-line ((t (:box (:line-width 1 :color "grey75")))))
  '(mode-line-highlight ((((class color) (min-colors 88)) (:box (:line-width 2 :color "grey40" :style released-button)))))
@@ -203,7 +206,7 @@
 (setq semanticdb-default-save-directory "~/.emacs.d/semantic")
 (setq ispell-extra-args '("-Tlatin15"
 			  "-d" "/usr/lib/ispell/german"
-			  "-w" "äöüÄÖÜß"))
+			  "-w" "äöüÄÖÜß"))
 
 (setq locale-coding-system 'utf-8)
 (set-terminal-coding-system 'utf-8)
@@ -341,6 +344,11 @@
 		   'imenu--create-delphi-index)
 	     (imenu-add-menubar-index)))
 
+(defun delphi-method-jump ()
+  (cond ((save-excursion (delphi-in-class-definition)) (delphi-go-to-method-implementation))
+	('t (delphi-go-to-method-definition)))
+)
+
 (defun delphi-go-to-method-definition ()
   "Move cursor to method definition of current edited method"
   (interactive)
@@ -352,8 +360,9 @@
   (let
       ((class (match-string 2))
        (method (match-string 3)))
-       (re-search-backward (concat class " *= *class"))
-       (re-search-forward method)))
+    (message "%s %s" class method)
+    (re-search-backward (concat class " *= *class"))
+    (re-search-forward method)))
 
 
 (defun delphi-go-to-method-implementation ()
@@ -571,3 +580,7 @@
 
 ; magit
 (require 'magit)
+
+; linum (generic & *scratch*)
+(add-hook 'find-file-hook (lambda () (linum-mode 1)))
+(add-hook 'lisp-interaction-mode-hook (lambda () (linum-mode 1)))
diff --git a/emacs.elc b/emacs.elc
index 8905f91..0829cba 100644
--- a/emacs.elc
+++ b/emacs.elc