updates

diff --git a/.emacs.d/config/emacs.org b/.emacs.d/config/emacs.org
index f7d65e6..91588f0 100644 (file)
--- a/.emacs.d/config/emacs.org
+++ b/.emacs.d/config/emacs.org
@@ -48,8 +48,7 @@ load the loaddefs, so autoload knows where to grab stuff
 
 Always ensure to have a scratch buffer around.
 #+BEGIN_SRC emacs-lisp tangle:yes
-(save-excursion
-    (set-buffer (get-buffer-create "*scratch*"))
+(with-current-buffer (get-buffer-create "*scratch*")
     (lisp-interaction-mode)
     (make-local-variable 'kill-buffer-query-functions)
     (add-hook 'kill-buffer-query-functions 'kill-scratch-buffer))
@@ -382,19 +381,20 @@ Basic settings for emacs integrated shell
      ;; TODO: for some reason requiring this here breaks it, but
      ;; requiring it after an eshell session is started works fine.
      ;; (require 'eshell-vc)
-     (setenv "PAGER" "cat")
+     (after 'eshell-mode
+       (setenv "PAGER" "cat")
+       (add-to-list 'eshell-visual-commands "ssh")
+       (add-to-list 'eshell-visual-commands "tail")
+       (add-to-list 'eshell-command-completions-alist
+                    '("gunzip" "gz\\'"))
+       (add-to-list 'eshell-command-completions-alist
+                    '("tar" "\\(\\.tar|\\.tgz\\|\\.tar\\.gz\\)\\'")))
+
      ; (set-face-attribute 'eshell-prompt nil :foreground "turquoise1")
      (add-hook 'eshell-mode-hook ;; for some reason this needs to be a hook
                '(lambda () (define-key eshell-mode-map "\C-a" 'eshell-bol)))
      (add-hook 'eshell-preoutput-filter-functions
-               'ansi-color-filter-apply)
-     (add-to-list 'eshell-visual-commands "ssh")
-     (add-to-list 'eshell-visual-commands "tail")
-     (add-to-list 'eshell-command-completions-alist
-                  '("gunzip" "gz\\'"))
-     (add-to-list 'eshell-command-completions-alist
-                  '("tar" "\\(\\.tar|\\.tgz\\|\\.tar\\.gz\\)\\'"))))
-
+               'ansi-color-filter-apply)))
 #+END_SRC
 
 *** Isearch related
@@ -2113,7 +2113,9 @@ The following setting adds alphabetical lists like
   ,b. item two
 
 #+BEGIN_SRC emacs-lisp tangle:yes tangle:yes
-(setq org-alphabetical-lists t)
+(if (> emacs-major-version 23)
+    (setq org-list-allow-alphabetical t)
+  (setq org-alphabetical-lists t))
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp tangle:yes :tangle yes

diff --git a/.emacs.d/initjj.org b/.emacs.d/initjj.org
index f664f9b..ad07fb2 100644 (file)
--- a/.emacs.d/initjj.org
+++ b/.emacs.d/initjj.org
@@ -306,8 +306,6 @@ A small wrapper around =eval-after-load=, taken from [[http://milkbox.net/note/s
   (declare (indent defun))
   `(eval-after-load ,mode
      '(progn ,@body)))
-
-
 #+END_SRC
 ** Processing
 First we want to ensure that our cache and backup directories really exist.