From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Tue, 14 Jul 2015 21:17:26 +0000 (+0200)
Subject: Merge branch 'master' of git.bundesbrandschatzamt.de:emacsconfig
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=bdd14e732d0c2a16a38a5a9d2b4d74a6ef539d83;p=emacsconfig.git

Merge branch 'master' of git.bundesbrandschatzamt.de:emacsconfig
---

bdd14e732d0c2a16a38a5a9d2b4d74a6ef539d83
diff --cc bba.org
index 40556945,dd91292a..23a0cf66
--- a/bba.org
+++ b/bba.org
@@@ -191,37 -190,42 +192,43 @@@ search the web on your fingertips. C-c 
  
  
  #+BEGIN_SRC emacs-lisp
-     (if (>= emacs-major-version 24)
-         (progn
-           (require 'engine-mode)
+   (if (>= emacs-major-version 24)
+       (progn
+         (require 'engine-mode)
  
 -        (defengine amazon
 -          "http://www.amazon.de/s/ref=nb_sb_noss?url=search-alias%3Daps&filed-keywords=%s"
 -          "a"
 -          )
 +          (defengine amazon
 +            "http://www.amazon.de/s/ref=nb_sb_noss?url=search-alias%3Daps&filed-keywords=%s"
 +            :keybinding "a"
 +            )
  
 -        (defengine bing
 -          "http://www.bing.com/search?q=%s&qs=bs&form=QBLH"
 -          "b"
 -          )
 +          (defengine bing
 +            "http://www.bing.com/search?q=%s&qs=bs&form=QBLH"
 +            :keybinding "b"
 +            )
  
 -        (defengine cfengine
 -          "https://docs.cfengine.com/latest/search.html?q=%s"
 -          "c"
 -          )
++          (defengine cfengine
++            "https://docs.cfengine.com/latest/search.html?q=%s"
++            :keybinding "c"
++            )
+ 
 -        (defengine google-maps
 -          "http://maps.google.com/maps?q=%s"
 -          "m"
 -          )
+ 
 -        (defengine wikipedia
 -          "http://www.wikipedia.org/search-redirect.php?language=en&go=Go&search=%s"
 -          "w"
 -          )
 +          (defengine google-maps
 +            "http://maps.google.com/maps?q=%s"
 +            :keybinding "m"
 +            )
  
 -        (defengine youtube
 -          "http://www.youtube.com/results?aq=f&oq=&search_query=%s"
 -          "y"
 -          )
 -        (engine-mode 1)
 +          (defengine wikipedia
 +            "http://www.wikipedia.org/search-redirect.php?language=en&go=Go&search=%s"
 +            :keybinding "w"
 +            )
 +
 +          (defengine youtube
 +            "http://www.youtube.com/results?aq=f&oq=&search_query=%s"
 +            :keybinding "y"
 +            )
 +          (engine-mode 1)
-           )
-       )
+         )
+     )
  #+END_SRC
  
  *** expand-region