adjust mail options, dired changes

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/.emacs.d/config/emacs.org b/.emacs.d/config/emacs.org
index 6bb8f69..26f9214 100644 (file)
--- a/.emacs.d/config/emacs.org
+++ b/.emacs.d/config/emacs.org
@@ -951,30 +951,32 @@ I like dired and work a lot with it, but it tends to leave lots of
 windows around.
 dired-single to the rescue.
 #+BEGIN_SRC emacs-lisp :tangle yes
+(require 'dired)
 (autoload 'dired-single-buffer "dired-single" "" t)
 (autoload 'dired-single-buffer-mouse "dired-single" "" t)
 (autoload 'dired-single-magic-buffer "dired-single" "" t)
 (autoload 'dired-single-toggle-buffer-name "dired-single" "" t)
 #+END_SRC
 
+wdired
+#+BEGIN_SRC emacs-lisp :tangle yes
+(autoload 'wdired-change-to-wdired-mode "wdired")
+(setq wdired-allow-to-change-permissions t)
+(define-key dired-mode-map "r" 'wdired-change-to-wdired-mode)
+#+END_SRC
+
 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
-(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 ".."))))))
-
+(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 "^"
+  (function
+   (lambda nil (interactive) (dired-single-buffer ".."))))
 #+END_SRC
 
 A few settings
@@ -986,11 +988,6 @@ A few settings
 (setq dired-recursive-deletes (quote top))
 #+END_SRC
 
-wdired
-#+BEGIN_SRC emacs-lisp :tangle yes
-(setq wdired-allow-to-change-permissions t)
-#+END_SRC
-
 and gnus-dired makes it easy to attach files
 #+BEGIN_SRC emacs-lisp :tangle yes
 (eval-after-load "gnus"

diff --git a/.emacs.d/config/gkar.ganneff.de.org b/.emacs.d/config/gkar.ganneff.de.org
index 7c2516e..1a7d315 100644 (file)
--- a/.emacs.d/config/gkar.ganneff.de.org
+++ b/.emacs.d/config/gkar.ganneff.de.org
@@ -4,13 +4,6 @@
 #+SETUPFILE: ~/.emacs.d/elisp/org-templates/level-0.org
 
 * Machine specific config
-** Mail sending
-[2013-04-23 Di 00:12]
-No need to run an smtpd on this host, my router does that. So use it.
-#+BEGIN_SRC emacs-lisp
-(setq smtpmail-default-smtp-server "lorien")
-(setq smtpmail-smtp-server "lorien")
-#+END_SRC
 ** gnus
 *** Mail access
 First specific point is how I access my mail. I am using gnus, and I
@@ -56,6 +49,7 @@ reason only my desktop uses it.
 (require 'notmuch)
 (add-hook 'gnus-group-mode-hook 'lld-notmuch-shortcut)
 (define-key notmuch-show-mode-map (kbd "C-c C-c") 'lld-notmuch-goto-message-in-gnus)
+(setq notmuch-fcc-dirs nil)
 ;(setq notmuch-fcc-dirs
 ;      (quote
 ;       (("da-manager@debian.org" . ".Sentmail.DAM")