add stuff to build org mode and enable helm configuration

diff --git a/emacs_el/configuration/Makefile b/emacs_el/configuration/Makefile
index fad2b3df27193d99047ed05b2df5de6bf0ebbe52..74f73bc4c1b55dfbd3220242c45080590cd13eff 100644 (file)
--- a/emacs_el/configuration/Makefile
+++ b/emacs_el/configuration/Makefile
@@ -4,18 +4,24 @@
 WHICH_EMACS:=$(shell which emacs >/dev/null 2>&1 || echo "fail")
 
 ELC_FILES=
+EL_FILES=
+ORG_EL_FILES=
 ifeq ($(strip $(WHICH_EMACS)),)
-ELC_FILES=$(patsubst %.el,%.elc,$(wildcard *.el)) $(patsubsts %.org,%.elc,$(wildcard *.el))
+ORG_EL_FILES=$(patsubst %.org,%.el,$(wildcard *.org))
+EL_FILES=$(sort $(wildcard *.el) $(ORG_EL_FILES))
+ELC_FILES=$(patsubst %.el,%.elc,$(EL_FILES))
 endif
 
+LIB_PATH=-L . -L .. -L ../helm
+
 all: $(ELC_FILES)
 
 EMACS=emacs
 
-%.elc: %.el
-       $(EMACS) -q -no-site-file -L . -L .. --no-site-file -batch -f batch-byte-compile $<;
+$(ELC_FILES): %.elc: %.el
+       $(EMACS) -batch -q -no-site-file $(LIB_PATH) --no-site-file --eval '(byte-recompile-directory "." 0)'
 
-%.el: %.org
+$(ORG_EL_FILES): %.el: %.org
        $(EMACS) -batch -q -no-site-file --visit $< --funcall org-babel-tangle
 
 

diff --git a/emacs_el/configuration/don-helm.org b/emacs_el/configuration/don-helm.org
new file mode 100644 (file)
index 0000000..b5df56b
--- /dev/null
+++ b/emacs_el/configuration/don-helm.org
@@ -0,0 +1,35 @@
+#+TITLE: Helm Configuration
+#+AUTHOR: Don Armstrong
+
+* Introduction
+** requires
+Require helm-config
+
+
+#+BEGIN_SRC emacs-lisp  :tangle don-helm.el
+  (add-to-list 'load-path "~/lib/emacs_el/helm/")
+  (require 'helm-config)
+#+END_SRC
+
+* Configuration
+
+#+BEGIN_SRC emacs-lisp  :tangle don-helm.el
+  (helm-mode 1)
+  (define-key global-map [remap find-file] 'helm-find-files)
+  (define-key global-map [remap occur] 'helm-occur)
+  (define-key global-map [remap list-buffers] 'helm-buffers-list)
+  (define-key global-map [remap dabbrev-expand] 'helm-dabbrev)
+  (global-set-key (kbd "M-x") 'helm-M-x)
+  (unless (boundp 'completion-in-region-function)
+    (define-key lisp-interaction-mode-map [remap completion-at-point] 'helm-lisp-completion-at-point)
+    (define-key emacs-lisp-mode-map       [remap completion-at-point] 'helm-lisp-completion-at-point))
+  (add-hook 'kill-emacs-hook #'(lambda () (and (file-exists-p "$TMP") (delete-file "$TMP"))))
+#+END_SRC
+
+
+* END
+
+#+BEGIN_SRC emacs-lisp  :tangle don-helm.el
+  (provide 'don-helm)
+#+END_SRC
+

diff --git a/emacs_el/configuration/org-mode-configuration.el b/emacs_el/configuration/org-mode-configuration.el
index 05d30514a88d336c7180da73157f3232dfd35c20..3dbb8f2021672d06baee17bc2abfc0d9e69f006c 100644 (file)
--- a/emacs_el/configuration/org-mode-configuration.el
+++ b/emacs_el/configuration/org-mode-configuration.el
@@ -286,16 +286,16 @@ do not already have one."
 ; Allow refile to create parent tasks with confirmation
 (setq org-refile-allow-creating-parent-nodes (quote confirm))
 
-; Use IDO for both buffer and file completion and ido-everywhere to t
-(setq org-completion-use-ido t)
-(setq ido-everywhere t)
-(setq ido-max-directory-size 100000)
-(ido-mode (quote both))
-; Use the current window when visiting files and buffers with ido
-(setq ido-default-file-method 'selected-window)
-(setq ido-default-buffer-method 'selected-window)
-; Use the current window for indirect buffer display
-(setq org-indirect-buffer-display 'current-window)
+; ; Use IDO for both buffer and file completion and ido-everywhere to t
+; (setq org-completion-use-ido t)
+; (setq ido-everywhere t)
+; (setq ido-max-directory-size 100000)
+; (ido-mode (quote both))
+; ; Use the current window when visiting files and buffers with ido
+; (setq ido-default-file-method 'selected-window)
+; (setq ido-default-buffer-method 'selected-window)
+; ; Use the current window for indirect buffer display
+; (setq org-indirect-buffer-display 'current-window)
 
 
 ;;;; Refile settings