skip avy if we're not in emacs25

[lib.git] / emacs_el / configuration / don-configuration.org

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 7f0ea1d18d7cab26fec3a2ca965844abbc2a16cc..6265a5b3e969cd683e3e7f71d916132e82cdba1f 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -32,6 +32,7 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
     ;; add /etc/ssl/ca-global/ca-certificates.crt so that we can
     ;; download packages when we're on Debian hosts which chop down the
     ;; list of available certificates
+    (require 'gnutls)
     (add-to-list 'gnutls-trustfiles "/etc/ssl/ca-global/ca-certificates.crt")
     (setq package-enable-at-startup nil)
     (setq package--init-file-ensured t)
@@ -106,13 +107,14 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
 * Variables
 ** Safe Local Variables
 #+BEGIN_SRC emacs-lisp
-  (setq safe-local-variable-values 
-        (quote ((auto-save-default)
-                (make-backup-files)
-                (cperl-indent-level . 4)
-                (indent-level . 4)
-                (indent-tabs-mode . f)
-                )))
+(setq safe-local-variable-values
+      (quote ((auto-save-default)
+              (make-backup-files)
+              (cperl-indent-level . 4)
+              (indent-level . 4)
+              (indent-tabs-mode . f)
+              (vcl-indent-level . 4)
+              )))
 #+END_SRC
 * Memory
 #+BEGIN_SRC emacs-lisp
@@ -308,6 +310,7 @@ value, scrolling continues until there is no more output.
 *** Avy
 #+BEGIN_SRC emacs-lisp
   (use-package avy
+    :if (>= emacs-major-version 25)
     :ensure t
     :bind (("C-c C-<SPC>" . avy-goto-word-or-subword-1)
            ("C-c j j" . avy-goto-word-or-subword-1)
@@ -680,6 +683,13 @@ value, scrolling continues until there is no more output.
     (setq ediff-window-setup-function 'ediff-setup-windows-plain)
   )
 #+END_SRC
+** Do the Right Thing Indenting
+Attempts to automatically identify the right indentation for a file
+#+BEGIN_SRC emacs-lisp
+(use-package dtrt-indent
+  :ensure t
+)  
+#+END_SRC
 ** VCL --editing varnish configuration files
 #+BEGIN_SRC emacs-lisp
   (use-package vcl-mode
@@ -1692,6 +1702,16 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   ;           (lambda ()
   ;             (add-hook 'before-save-hook 'my/org-add-ids-to-headlines-in-file nil 'local)))
 #+END_SRC
+** Org ID locations
+#+BEGIN_SRC emacs-lisp
+(use-package find-lisp
+  :ensure t)
+(setq org-agenda-text-search-extra-files
+      (append '(agenda-archives)
+              (find-lisp-find-files "~/projects/org-notes" "\.org$")
+              (find-lisp-find-files "~/projects/org-notes" "\.org_archive$")
+              ))
+#+END_SRC
 ** Keywords (TODO)
 #+BEGIN_SRC emacs-lisp
   (setq org-todo-keywords
@@ -1902,29 +1922,31 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 #+END_SRC
 ** General Org Babel Configuration
 #+BEGIN_SRC emacs-lisp
-  ;; org babel support
-  (org-babel-do-load-languages
-   'org-babel-load-languages
-   '((emacs-lisp . t )
-     (R . t)
-     (latex . t)
-     (ditaa . t)
-     (dot . t)
-     ))
-  ;; use graphviz-dot for dot things
-  (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot))
-  ;; org-babel-by-backend
-  (defmacro org-babel-by-backend (&rest body)
-     `(case (if (boundp 'backend) 
-                (org-export-backend-name backend)
-              nil) ,@body))
-
-  (defun my/fix-inline-images ()
-    (when org-inline-image-overlays
-      (org-redisplay-inline-images)))
-
-  (add-hook 'org-babel-after-execute-hook
-             'my/fix-inline-images)
+;; org babel support
+(org-babel-do-load-languages
+ 'org-babel-load-languages
+ '((emacs-lisp . t )
+   (R . t)
+   (latex . t)
+   (ditaa . t)
+   (dot . t)
+   ))
+;; use graphviz-dot for dot things
+(add-to-list 'org-src-lang-modes '("dot" . graphviz-dot))
+;; do not indent begin_src blocks
+(setq org-edit-src-content-indentation 0)
+;; org-babel-by-backend
+(defmacro org-babel-by-backend (&rest body)
+   `(case (if (boundp 'backend) 
+              (org-export-backend-name backend)
+            nil) ,@body))
+
+(defun my/fix-inline-images ()
+  (when org-inline-image-overlays
+    (org-redisplay-inline-images)))
+
+(add-hook 'org-babel-after-execute-hook
+           'my/fix-inline-images)
 
 #+END_SRC
 ** LaTeX configuration