whitespace + menu-bar-mode removal

git-svn-id: file:///svn/tfheen/trunk/dotfiles@235 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index 860396d71cb8de691742981b90cd932c8e944338..88c6c09400226e2e2831e6f356be4d4b87fbb9e1 100644 (file)
--- a/emacs
+++ b/emacs
@@ -1,9 +1,18 @@
 ; -*- emacs-lisp -*-
 ;
 
+(message "checking for local setup and loading..")
+(if (file-exists-p "/local/skel/all.emacs")
+    (load "/local/skel/all.emacs" nil t t))
+
 (message "loading .emacs-standard")
 (load "~/.emacs-standard")
 
+(cw/requiring-forms nil 
+  (message "checking for local setup and loading..")
+  (if (file-exists-p "/local/skel/all.emacs")
+      (load "/local/skel/all.emacs" nil t t)))
+
 (setq tfheen-color-preference 'light) ; light or dark
 
 (cw/for-emacs
@@ -35,6 +44,7 @@
       read-mail-command 'gnus)
 
 (add-hook 'text-mode-hook 'turn-on-auto-fill)
+(add-hook 'debian-changelog-mode-hook 'turn-on-auto-fill)
 
 (fset 'yes-or-no-p 'y-or-n-p)
 
@@ -55,7 +65,7 @@
 (global-set-key "\M-n" 'browse-url-at-point)
 (global-set-key (kbd "C-x C-c")
 #'(lambda () (interactive)
-    (if window-system
+    (if (and window-system (string-match "yiwaz" system-name))
         (message "you must be kidding")
       (save-buffers-kill-emacs))))
 
@@ -166,7 +176,7 @@
 
 ;; Multiple mode
 
-(cw/requiring-package 
+(cw/requiring-package
  (mmm-auto)
  (setq mmm-global-mode 'maybe)
  (set-face-background 'mmm-default-submode-face "White"))
@@ -176,7 +186,7 @@
 (cw/requiring-package (tramp)
   (setq tramp-auto-save-directory "/home/tfheen/tmp"
         tramp-default-method "rsync"))
-                            
+
 ;;         (setq tramp-multi-file-name-structure (quote ("\\`/r:\\(\\([a-z0-9]+\\)\\)?\\(\\(%s\\)+\\):\\(.*\\)\\'" 2 3 -1))
 ;;                             tramp-make-tramp-file-format "/r:%m/%u@%h:%p"
 ;;                             tramp-file-name-regexp "\\`/r:"
@@ -193,10 +203,18 @@
      (tool-bar-mode 0))
  (global-set-key [home] 'beginning-of-buffer)
  (global-set-key [end] 'end-of-buffer)
+ (menu-bar-mode nil)
  (setq cursor-in-non-selected-windows nil))
 
+(defun tfheen-complete (&optional x)
+  (interactive)
+  (if (eq major-mode 'jde-mode)
+      (jde-complete-at-point)
+    (hippie-expand x)))
+
 (global-set-key [C-tab] 'dabbrev-expand)
-(global-set-key [M-space] '(lambda() (insert " ")))
+(global-set-key "\M- " 'tfheen-complete)
+
 
 ;(add-hook 'diary-hook 'appt-make-list)
 ;(add-hook 'diary-hook 'appt-make-list)