Commits

Peter Szilagyi committed cf03cb2 Merge

Merged roll-prod back in.

Comments (0)

Files changed (5)

 03c2cad9c97a7b7c77215ad51c355395e45b5335 2012-09-12-roll-test
 088bb4c77f9001179fcb7079c9ac3b0a902ab401 2012-09-12-roll-test
 6fd664d978f0750c69cb808eebe95703a24ca6d9 2012-10-03-roll-prod
-4eece59cdc95274abe98eb5ff4d73c91901f4047 2012-10-03-roll-test
+c50e54234aa39eada400bfcd2576535f6f4801d7 2012-10-03-roll-prod
 4eece59cdc95274abe98eb5ff4d73c91901f4047 2012-10-03-roll-test
 4143d34932ab7154fc56e10c1bedf2378eeb5dd5 2012-10-03-roll-test
-4143d34932ab7154fc56e10c1bedf2378eeb5dd5 2012-10-03-roll-test
 6a947d72288117856b485aba28c5f32e9b2b633c 2012-10-03-roll-test
+57757d33024ac0d4d9491679ac02e5793037f516 2012-10-16-roll-prod
   rather than REQUIRE, which expects the feature to be provided.
 
 ================================================================================
-2012-10-03 Rolled rev 6fd664d978f0 to production
+2012-10-03 Rolled rev 349c47add51e to production
 ================================================================================
 
 new stuff

elisp/jane-defaults.el

 ;;
 ;; Reasonable defaults for new emacs users
 
-;; This is repeated in both jane-common and jane-defaults.  I don't see a 
+;; This is repeated in both jane-common and jane-defaults.  I don't see a
 ;; better way since either can be loaded from a user's .emacs and we need
 ;; it in the load-path
-(defconst jane-home 
-  (expand-file-name 
-   (concat 
+(defconst jane-home
+  (expand-file-name
+   (concat
     (file-name-directory load-file-name) "..")))
 
 (add-to-list 'load-path (expand-file-name "elisp" jane-home))
 (Jane.dired)
 ;;(Jane.ediff)
 ;;(Jane.edit-with-emacs)
+;;(Jane.evil) ;; Vim compatibility
 ;;(Jane.faces-basic)
 (Jane.faces-dark)
 ;;(Jane.faces-default)
 (Jane.no-clutter)
 ;;(Jane.pages)
 ;;(Jane.perl)
+;;(Jane.rainbow-delimiters)
 ;;(Jane.recentf)
 ;;(Jane.rectangle)
 (Jane.saveplace)

elisp/jane/jane-defaults.el

File contents unchanged.

elisp/jane/jane-micro-features.el

File contents unchanged.