updates

diff --git a/.emacs.d/config/customized.el b/.emacs.d/config/customized.el
index 709109f..caff8d9 100644 (file)
--- a/.emacs.d/config/customized.el
+++ b/.emacs.d/config/customized.el
@@ -392,7 +392,6 @@
      (xloop . "x-loop")
      (deliveredto . "delivered-to"))))
  '(nnmail-treat-duplicates (quote delete))
- '(notmuch-fcc-dirs nil)
  '(notmuch-saved-searches
    (quote
     (("inbox" . "tag:inbox")

diff --git a/.emacs.d/config/emacs.org b/.emacs.d/config/emacs.org
index e6802aa..6bb8f69 100644 (file)
--- a/.emacs.d/config/emacs.org
+++ b/.emacs.d/config/emacs.org
@@ -961,11 +961,20 @@ We want some extra key bindings loaded. In case we haven't loaded dired
 yet, there won't be a keymap to add to, so add our setup function to the
 load hook only. Otherwise just bind the keys.
 #+BEGIN_SRC emacs-lisp :tangle yes
-(if (boundp 'dired-mode-map)
-    ;; we're good to go; just add our bindings
-    (my-dired-init)
-  ;; it's not loaded yet, so add our bindings to the load-hook
-  (add-hook 'dired-load-hook 'my-dired-init))
+(autoload 'wdired-change-to-wdired-mode "wdired")
+(eval-after-load "dired"
+  '(lambda ()
+     (define-key dired-mode-map "r" 'wdired-change-to-wdired-mode)
+     (define-key dired-mode-map
+       [menu-bar immediate wdired-change-to-wdired-mode]
+       '("Edit File Names" . wdired-change-to-wdired-mode))
+     (define-key dired-mode-map [return] 'dired-single-buffer)
+     (define-key dired-mode-map [mouse-1] 'dired-single-buffer-mouse)
+     (define-key dired-mode-map "r" 'wdired-change-to-wdired-mode)
+     (define-key dired-mode-map "^"
+       (function
+        (lambda nil (interactive) (dired-single-buffer ".."))))))
+
 #+END_SRC
 
 A few settings

diff --git a/.emacs.d/config/linws03.cms.fra.dlh.de.org b/.emacs.d/config/linws03.cms.fra.dlh.de.org
index 86b76d8..b9c1042 100644 (file)
--- a/.emacs.d/config/linws03.cms.fra.dlh.de.org
+++ b/.emacs.d/config/linws03.cms.fra.dlh.de.org
@@ -84,7 +84,7 @@ see at home. (Or want different there).
           "* TODO %?\nAdded: %U\n\n \n"
           :clock-in t :clock-resume t :jump-to-captured t :prepend t)
          ("u" "Puppet Todo" entry (file "~/git/puppet/TODO.org")
-          "* TODO %?\nAdded: %U\n\n \n")
+          "* %?\nAdded: %U\n\n \n")
          ))
 #+END_SRC
 

diff --git a/.emacs.d/elisp/local/ganneff.el b/.emacs.d/elisp/local/ganneff.el
index fa3a530..8865d96 100644 (file)
--- a/.emacs.d/elisp/local/ganneff.el
+++ b/.emacs.d/elisp/local/ganneff.el
@@ -10,16 +10,6 @@
 
 ;;; Code:
 
-;;;###autoload
-(defun my-dired-init ()
-  "Bunch of stuff to run for dired when it's loaded."
-  (define-key dired-mode-map [return] 'dired-single-buffer)
-  (define-key dired-mode-map [mouse-1] 'dired-single-buffer-mouse)
-  (define-key dired-mode-map "r" 'wdired-change-to-wdired-mode)
-  (define-key dired-mode-map "^"
-    (function
-     (lambda nil (interactive) (dired-single-buffer "..")))))
-
 ;;;###autoload
 (defun ido-disable-line-trucation () (set (make-local-variable 'truncate-lines) nil))