Fixing things up.

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "lisp/flymake-cursor"]
 	path = lisp/flymake-cursor
 	url = git@github.com:illusori/emacs-flymake-cursor.git
-[submodule "lisp/multi-line-it"]
-	path = lisp/multi-line-it
-	url = git@github.com:IvanMalison/multi-line-it.git
 [submodule "lisp/yasnippet"]
 	path = lisp/yasnippet
 	url = git@github.com:capitaomorte/yasnippet.git
@@ -13,3 +10,6 @@
 [submodule "lisp/rainbow-delimiters"]
 	path = lisp/rainbow-delimiters
 	url = git@github.com:jlr/rainbow-delimiters.git
+[submodule "lisp/multi-line-it"]
+	path = lisp/multi-line-it
+	url = git@github.com:IvanMalison/multi-line-it.git

elpa/archives/gnu/archive-contents

@@ -1,16 +1,19 @@
 (1
+ (ack .
+      [(0 9)
+       nil "Interface to ack, a source code search tool" tar])
  (adaptive-wrap .
-		[(0 1)
+		[(0 2)
 		 nil "Smart line-wrapping with wrap-prefix" single])
  (all .
       [(1 0)
        nil "Edit all lines matching a given regexp" single])
- (ampc .
-       [(0 2)
-	nil "Asynchronous Music Player Controller" single])
  (auctex .
 	 [(11 86)
 	  nil "Integrated environment for *TeX*" tar])
+ (cl-lib .
+	 [(0 2)
+	  nil "Properly prefixed CL functions and macros" single])
  (coffee-mode .
 	      [(0 4 1)
 	       nil "Major mode for CoffeeScript files" tar])
@@ -18,13 +21,13 @@
 	  [(0 5)
 	   nil "Flexible inline text and code completion" tar])
  (csv-mode .
-	   [(1 0)
+	   [(1 1)
 	    nil "Major mode for editing comma/char separated values" single])
  (debbugs .
-	  [(0 3)
+	  [(0 4)
 	   nil "SOAP library to access debbugs servers" tar])
  (dict-tree .
-	    [(0 12 7)
+	    [(0 12 8)
 	     ((trie
 	       (0 2 5))
 	      (tNFA
@@ -35,6 +38,9 @@
  (djvu .
        [(0 5)
 	nil "Edit and view Djvu files via djvused" single])
+ (docbook .
+	  [(0 1)
+	   nil "Info-like viewer for DocBook" single])
  (ediprolog .
 	    [(1 0)
 	     nil "Emacs Does Interactive Prolog" single])
@@ -47,6 +53,9 @@
  (f90-interface-browser .
 			[(1 1)
 			 nil "Parse and browse f90 interfaces" single])
+ (ggtags .
+	 [(0 6)
+	  nil "GNU Global source code tagging system" single])
  (heap .
        [(0 3)
 	nil "Heap (a.k.a. priority queue) data structure" single])
@@ -54,11 +63,16 @@
 	 [(2 4)
 	  nil "Incremental occur" single])
  (jgraph-mode .
-	      [(0 0)
+	      [(1 0)
 	       nil "Major mode for Jgraph files" single])
  (js2-mode .
-	   [(20090814)
+	   [(20130307)
-	    nil "Improved JavaScript editing mode" single])
+	    ((emacs
+	      (24 1)))
+	    "Improved JavaScript editing mode" single])
+ (lex .
+      [(1 0)
+       nil "Lexical analyser construction" single])
  (lmc .
       [(1 0)
        nil "Little Man Computer in Elisp" single])
@@ -69,7 +83,7 @@
 	    [(0 2 0)
 	     nil "Mark chars fitting certain characteristics" single])
  (memory-usage .
-	       [(0 1)
+	       [(0 2)
 		nil "Analyze the memory usage of Emacs in various ways" single])
  (minimap .
 	  [(1 0)
@@ -81,13 +95,19 @@
 	     [(0 1)
 	      nil "Minor mode to edit files via hex-dump format" single])
  (nlinum .
-	 [(1 0)
+	 [(1 1)
 	  nil "Show line numbers in the margin" single])
+ (notes-mode .
+	     [(1 30)
+	      nil "Organizing on-line note-taking" tar])
+ (num3-mode .
+	    [(1 1)
+	     nil "highlight groups of digits in long numbers" single])
  (oauth2 .
 	 [(0 8)
 	  nil "OAuth 2.0 Authorization Protocol" single])
  (org .
-      [(20120903)
+      [(20130311)
        nil "Outline-based notes management and organizer" tar])
  (quarter-plane .
 		[(0 1)
@@ -96,7 +116,7 @@
 	[(0 1)
 	 nil "Queue data structure" single])
  (rainbow-mode .
-	       [(0 2)
+	       [(0 7)
 		nil "Colorize color names in buffers" single])
  (register-list .
 		[(0 1)
@@ -107,6 +127,15 @@
  (sisu-mode .
 	    [(3 0 3)
 	     nil "Major mode for SiSU markup text" single])
+ (smart-operator .
+		 [(4 0)
+		  nil "Insert operators with surrounding spaces smartly" single])
+ (sml-mode .
+	   [(6 4)
+	    nil "Major mode for editing (Standard) ML" single])
+ (sokoban .
+	  [(1 0 4)
+	   nil "Sokoban game for emacs" tar])
  (svg-clock .
 	    [(0 4)
 	     nil "Analog clock using Scalable Vector Graphics" single])
@@ -116,14 +145,14 @@
 	  (0 1)))
 	"Tagged non-deterministic finite-state automata" single])
  (trie .
-       [(0 2 5)
+       [(0 2 6)
 	((tNFA
 	  (0 1 1))
 	 (heap
 	  (0 3)))
 	"Trie data structure" single])
  (undo-tree .
-	    [(0 5 3)
+	    [(0 6 3)
 	     nil "Treat undo history as a tree" single])
  (uni-confusables .
 		  [(0 1)
@@ -136,5 +165,7 @@
 	      nil "Resize windows interactively" single])
  (xclip .
 	[(1 0)
-	 nil "Emacs Interface to XClip" single]))
+	 nil "Emacs Interface to XClip" single])
-
+ (yasnippet .
+	    [(0 8 0)
+	     nil "A template system for Emacs" tar]))

init.el

@@ -15,9 +15,8 @@
 
 (let ((default-directory "~/.emacs.d/lisp/"))
       (normal-top-level-add-subdirs-to-load-path))
-(add-to-list 'load-path "~/.emacs.d/elpa")
+(let ((default-directory "~/.emacs.d/elpa/"))
-
+      (normal-top-level-add-subdirs-to-load-path))
-(message load-path)
 
 ;; =============================================================================
 ;;                                                         General Emacs Options
@@ -52,22 +51,50 @@
 (defun change-major-mode-hook () (modify-syntax-entry ?_ "_"))
 (setq c-subword-mode t)
 
+(require 'package)
+(require 'whitespace)
+(require 'rainbow-delimiters)
+
+;; =============================================================================
+;;                                                                       Flymake
+;; =============================================================================
+
+(require 'flymake)
+(require 'flymake-cursor)
+
+;; Customize flymake colors.
+(custom-set-faces
+ '(flymake-errline ((((class color)) (:background "DarkViolet"))))
+ '(flymake-warnline ((((class color)) (:underline "Orange")))))
+
+(defun flymake-pylint-init ()
+  (let* ((temp-file (flymake-init-create-temp-buffer-copy
+                    'flymake-create-temp-inplace))
+        (local-file (file-relative-name
+                     temp-file
+                     (file-name-directory buffer-file-name))))
+   (list "pyflakes" (list local-file))))
+
+(add-to-list 'flymake-allowed-file-name-masks '("\\.py\\'" flymake-pylint-init))
+
+; Load flymake on non-temp buffers
+(add-hook 'python-mode-hook
+	  (lambda () (unless (eq buffer-file-name nil) (flymake-mode 1))))
+
 ;; =============================================================================
 ;;                                                                        Python
 ;; =============================================================================
 
-;; Emacs for python.
+(require 'python-mode)
-(load-file "~/.emacs.d/emacs-for-python/epy-init.el")
 
 ;; Multi-lining for python.
-;;(require 'multi-line-it)
+(require 'multi-line-it)
 
-;; Set tabs to be four spaces wide in python mode.
+(defun yelp-tabs ()
-(add-hook 'python-mode-hook
+  (setq tab-width 4,
-      (lambda ()
+        indent-tabs-mode t
-        (setq indent-tabs-mode t)
+        py-smart-indentation nil
-        (setq tab-width 4)
+        python-indent 4))
-        (setq python-indent 4)))
 
 ;; =============================================================================
 ;;                                                           Custom Key Bindings
@@ -98,33 +125,3 @@
 (add-to-list 'package-archives
 	     '("marmalade" . "http://marmalade-repo.org/packages/")) 
 (package-initialize)
-
-;; =============================================================================
-;;                                                                       Flymake
-;; =============================================================================
-
-(require 'flymake)
-(require 'flymake-cursor)
-
-;; Customize flymake colors.
-(custom-set-faces
- '(flymake-errline ((((class color)) (:background "DarkViolet"))))
- '(flymake-warnline ((((class color)) (:underline "Orange")))))
-
-(defun flymake-pylint-init ()
-  (let* ((temp-file (flymake-init-create-temp-buffer-copy
-                    'flymake-create-temp-inplace))
-        (local-file (file-relative-name
-                     temp-file
-                     (file-name-directory buffer-file-name))))
-   (list "pyflakes" (list local-file))))
-
-(add-to-list 'flymake-allowed-file-name-masks '("\\.py\\'" flymake-pylint-init))
-
-; Load flymake on non-temp buffers
-(add-hook 'python-mode-hook
-	  (lambda () (unless (eq buffer-file-name nil) (flymake-mode 1))))
-
-(require 'yasnippet)
-(require 'whitespace)
-(require 'rainbow-delimiters)

lisp/init_elpa.el

@@ -1,72 +0,0 @@
-;; -------------------------------------------------------------------------
-;; File: init-elpa.el - initialize the Emacs Lisp Package Archive (ELPA) 
-;;                      see http://tromey.com/elpa/  
-;;                      Install a base set of packages automatically.         
-;;
-;; Copyright (c) 2010 Sebastien Varrette <Sebastien.Varrette@uni.lu>
-;;               http://varrette.gforge.uni.lu
-;; 
-;;          _       _ _             _                        _ 
-;;         (_)_ __ (_) |_       ___| |_ __   __ _        ___| |
-;;         | | '_ \| | __|____ / _ \ | '_ \ / _` |      / _ \ |
-;;         | | | | | | ||_____|  __/ | |_) | (_| |  _  |  __/ |
-;;         |_|_| |_|_|\__|     \___|_| .__/ \__,_| (_)  \___|_|
-;;                                   |_|                       
-;; 
-;; More information about Emacs Lisp: 
-;;              http://www.emacswiki.org/emacs/EmacsLisp
-;; -------------------------------------------------------------------------
-;; This file is NOT part of GNU Emacs.
-;;
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;; -------------------------------------------------------------------------
-;; Directly Inspired by Emacs Starter Kit 
-;; see http://github.com/technomancy/emacs-starter-kit/blob/master/
-
-
-;; Adapt to suit you needs
-(defvar starter-kit-packages (list 'magit 'mo-git-blame 'python-mode)
-  "Libraries that should be installed by default.")
-
-
-
-(defun starter-kit-elpa-install ()
-  "Install all starter-kit packages that aren't installed."
-  (interactive)
-  (dolist (package starter-kit-packages)
-    (unless (or (member package package-activated-list)
-                (functionp package))
-      (message "Installing %s" (symbol-name package))
-      (package-install package))))
-
-(defun esk-online? ()
-  (if (and (functionp 'network-interface-list)
-           (network-interface-list))
-      (some (lambda (iface) (unless (equal "lo" (car iface))
-                              (member 'up (first (last (network-interface-info
-                                                        (car iface)))))))
-            (network-interface-list))
-    t))
-
-;; On your first run, this should pull in all the base packages.
-(when (esk-online?)
-  (unless package-archive-contents (package-refresh-contents))
-  (starter-kit-elpa-install))
-
-;; Workaround for an ELPA bug that people are reporting but I've been
-;; unable to reproduce:
-(autoload 'paredit-mode "paredit")
-
-
-(provide 'init-elpa)

lisp/multi-line-it

@@ -0,0 +1 @@
+Subproject commit da2e474ec816c0f22037becc355d339899ddc1dd