Fix up various bits

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

diff --git a/emacs b/emacs
index 892ed2c3ddf5b86c3121673ad46c335ce80e17d2..5270fa0cc3e25c27e15b13726b58c14e69ba5c2d 100644 (file)
--- a/emacs
+++ b/emacs
@@ -150,7 +150,7 @@
 (setq py-honor-comment-indentation nil)
 
 (add-hook 'sgml-mode-hook '(lambda()(local-set-key "\C-c>" 'sgml-insert-end-tag)))
-(add-hook 'emacs-lisp-mode-hook '(lambda()(local-set-key "\C-j" 'find-function)))
+;(add-hook 'emacs-lisp-mode-hook '(lambda()(local-set-key "\C-j" 'find-function)))
 ;(require 'template)
 ;(add-hook 'c-mode-common-hook 'tmpl-init)
 ;(add-hook 'c-mode-common-hook 'auto-insert-file-header)
@@ -231,7 +231,7 @@
      (tool-bar-mode 0))
  (global-set-key [home] 'beginning-of-buffer)
  (global-set-key [end] 'end-of-buffer)
- (menu-bar-mode nil)
+ (menu-bar-mode 0)
  (setq cursor-in-non-selected-windows nil))
 
 (defun tfheen-complete (&optional x)
@@ -251,7 +251,7 @@
 ; Mode line
 (display-time)
 
-(cw/for-emacs-22
+(cw/for-emacs-22-and-later
  (setq inhibit-splash-screen t)
  (setq inhibit-startup-echo-area-message "tfheen")
 )
@@ -352,8 +352,8 @@
        '(("w" todo
          #("WAITING" 0 7
            (face org-warning)))
-        ("h" tags-todo "hjemme")
-        ("j" tags-todo "jobb")))
+        ("h" tags-todo "@hjemme")
+        ("j" tags-todo "@jobb")))
 
 (add-to-list 'window-size-change-functions
             (lambda (frame) (setq org-tags-column (* -1 (- (frame-width) 10))