Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  adjust notmuch-fcc-dirs and bookmarks
  fix lib name

diff --git a/.emacs.d/config/emacs.org b/.emacs.d/config/emacs.org
index 374229d..2141727 100644 (file)
--- a/.emacs.d/config/emacs.org
+++ b/.emacs.d/config/emacs.org
@@ -2629,19 +2629,19 @@ already had typed.
 
 (add-hook 'auto-complete-mode-hook 'set-auto-complete-as-completion-at-point-function)
 
-(require 'ac-dabbrev)
+;(require 'ac-dabbrev)
 (set-default 'ac-sources
              '(ac-source-imenu
                ac-source-dictionary
                ac-source-words-in-buffer
                ac-source-words-in-same-mode-buffers
-               ac-source-words-in-all-buffer
-               ac-source-dabbrev))
+               ac-source-words-in-all-buffer))
+;               ac-source-dabbrev))
 
 (dolist (mode '(magit-log-edit-mode log-edit-mode org-mode text-mode haml-mode
                 sass-mode yaml-mode csv-mode espresso-mode haskell-mode
                 html-mode nxml-mode sh-mode smarty-mode clojure-mode
-                lisp-mode textile-mode markdown-mode tuareg-mode
+                lisp-mode textile-mode markdown-mode tuareg-mode python-mode
                 js3-mode css-mode less-css-mode sql-mode ielm-mode))
   (add-to-list 'ac-modes mode))
 

diff --git a/.emacs.d/config/linws03.cms.fra.dlh.de.org b/.emacs.d/config/linws03.cms.fra.dlh.de.org
index 51155a9..d24e932 100644 (file)
--- a/.emacs.d/config/linws03.cms.fra.dlh.de.org
+++ b/.emacs.d/config/linws03.cms.fra.dlh.de.org
@@ -7,7 +7,7 @@
 ** cedet, jdee
 Collection of Emacs Development Environment Tools, see [[http://cedet.sourceforge.net/setup.shtml][CEDET]]
 
-#+BEGIN_SRC emacs-lisp-off tangle:no
+#+BEGIN_SRC emacs-lisp-off :tangle no
 ;(load-file "~/.emacs.d/elisp/cedet/common/cedet.el")
 (add-to-list 'load-path "~/.emacs.d/elisp/cedet/common/")
 (require 'cedet)
@@ -68,7 +68,7 @@ Collection of Emacs Development Environment Tools, see [[http://cedet.sourceforg
 ** org-mode
 I want some extra templates for org-capture, which I don't need to
 see at home. (Or want different there).
-#+BEGIN_SRC emacs-lisp tangle:yes
+#+BEGIN_SRC emacs-lisp :tangle yes
 (nconc org-capture-templates
        '(
          ("f" "Firewall request" entry (file+headline "~/org/nsb/dlh.org" "Firewall")
@@ -88,7 +88,7 @@ see at home. (Or want different there).
 
 ** ecb
 Emacs Code Browser, see [[http://ecb.sourceforge.net/][ECB - Emacs Code Browser]]
-#+BEGIN_SRC emacs-lisp tangle:yes
+#+BEGIN_SRC emacs-lisp :tangle no
 (load-file "~/.emacs.d/elisp/ecb/ecb.el")
 (require 'ecb-autoloads)
 #+END_SRC