From fa8ce97848fd40aea318d32d668d675e8fd8d718 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Tue, 18 Aug 2015 11:12:21 +0200
Subject: [PATCH] emacs 23.1.1 yasnippets make_emacsconfig

- enabled yasnippets for Emacs 23.1.1
- fixed make_emacsconfig.sh
---
 bba.org             |  5 +----
 make_emacsconfig.sh | 19 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 make_emacsconfig.sh

diff --git a/bba.org b/bba.org
index df6cd274..610c4634 100644
--- a/bba.org
+++ b/bba.org
@@ -161,6 +161,7 @@ Keep track of your important stuff!
           (add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/"))
           )
       (progn
+        (add-to-list 'load-path "~/.emacs.d/elpa/cl-lib-0.5")
         (add-to-list 'load-path "~/.emacs.d/elpa/magit-1.2.0")
         (add-to-list 'load-path "~/.emacs.d/elpa/yaml-mode-20141125.37")
         (require 'yaml-mode)
@@ -312,16 +313,12 @@ cannot live without it. I write most of my [[http://www.cfengine.com][CFEngine]]
 snippets. Some help for Perl and even for org-mode.
 
 #+BEGIN_SRC emacs-lisp
-    (if (>= emacs-major-version 24)
-        (progn
           (add-to-list 'load-path
                        "~/.emacs.d/elpa/yasnippet-20150415.244")
           (require 'yasnippet)
           (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
           (yas-global-mode 1)
           (define-key global-map "\C-cy" 'yas/insert-snippet)
-          )
-      )
 #+END_SRC
 * [[https://github.com/flycheck/flycheck][flycheck]]
 
diff --git a/make_emacsconfig.sh b/make_emacsconfig.sh
old mode 100644
new mode 100755
index e7b6b009..c86a3668
--- a/make_emacsconfig.sh
+++ b/make_emacsconfig.sh
@@ -17,23 +17,14 @@ if .emacs and .emacs.d exists fetch git.bundesbrandschatzamt.de emacs config.
 if [ ! -e ${HOME}/.emacs.d ]; then
     git clone http://git.bundesbrandschatzamt.de/emacsconfig.git ${HOME}/.emacs.d
     cat >${HOME}/.emacs <<EOF
-;; This sets up the load path so that we can override it
-;; (package-initialize)
 ;; Override the packages with the git version of Org and other packages
 
-  (setq load-path
-  (append
-  (list (expand-file-name "~/.emacs.d/"))
-  ;;           (expand-file-name "/usr/share/emacs/lisp/")
-  load-path))
+(setq load-path
+(append
+(list (expand-file-name "~/.emacs.d/lisp") (expand-file-name "~/.emacs.d/elpa/org-20150629"))
+load-path))
 
-
-(add-to-list 'load-path "~/.emacs.d/xemacs-packages/lisp/org-8.2.3c")
-
-;; (add-to-list 'load-path "~/elisp/org-mode/contrib/lisp")
-;; Load the rest of the packages
-;; (package-initialize t)
-;; (setq package-enable-at-startup nil)
+(setq org-use-extra-keys t)
 (require 'org)
 (require 'ob-tangle)
 (org-babel-load-file (expand-file-name "~/.emacs.d/bba.org"))
-- 
2.47.3