From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Wed, 29 Jul 2015 14:29:42 +0000 (+0200)
Subject: moved custom.el stuff to bba.org
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=b4e41a2fc057674334165d6cbf5974cb7d38cd3c;p=emacsconfig.git

moved custom.el stuff to bba.org
---

diff --git a/bba.org b/bba.org
index 6c8a382a..4b6654da 100644
--- a/bba.org
+++ b/bba.org
@@ -145,21 +145,22 @@ Keep track of your important stuff!
 * [[http://www.emacswiki.org/emacs/ELPA][ELPA]]
 
 #+BEGIN_SRC emacs-lisp
-  (if (>= emacs-major-version 24)
+    (if (>= emacs-major-version 24)
+        (progn
+          (add-to-list 'load-path "~/.emacs.d/elpa")
+          (add-to-list 'load-path "~/.emacs.d/elpa/popup-20150626.711")
+          (require 'package)
+          (package-initialize)
+          (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
+          (add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/"))
+          )
       (progn
-        (add-to-list 'load-path "~/.emacs.d/elpa")
-        (add-to-list 'load-path "~/.emacs.d/elpa/popup-20150626.711")
-        (require 'package)
-        (package-initialize)
-        (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
+        (add-to-list 'load-path "~/.emacs.d/elpa/magit-20150704.855")
+        (add-to-list 'load-path "~/.emacs.d/elpa/yaml-mode-20141125.37")
+        (require 'yaml-mode)
         )
-    (progn
-      (add-to-list 'load-path "~/.emacs.d/elpa/magit-20150704.855")
-      (add-to-list 'load-path "~/.emacs.d/elpa/yaml-mode-20141125.37")
-      (require 'yaml-mode)
-      )
 
-    )
+      )
 #+END_SRC
 
 * magit