From 0be2b6a4cd48808975147a0bfb787b9e5fe67aed Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 16 Mar 2013 18:20:21 -0700 Subject: [PATCH] Fixing things up. --- .gitmodules | 6 +- elpa/archives/gnu/archive-contents | 67 ++++++++++++++----- elpa/archives/marmalade/archive-contents | 2 +- init.el | 83 ++++++++++++------------ lisp/init_elpa.el | 72 -------------------- lisp/multi-line-it | 1 + 6 files changed, 94 insertions(+), 137 deletions(-) delete mode 100644 lisp/init_elpa.el create mode 160000 lisp/multi-line-it diff --git a/.gitmodules b/.gitmodules index a10d7382..3b9f8674 100644 --- a/.gitmodules +++ b/.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 diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents index 6ed8bc56..06022606 100644 --- a/elpa/archives/gnu/archive-contents +++ b/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) - nil "Improved JavaScript editing mode" single]) + [(20130307) + ((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])) diff --git a/elpa/archives/marmalade/archive-contents b/elpa/archives/marmalade/archive-contents index 1e374253..f58c117e 100644 --- a/elpa/archives/marmalade/archive-contents +++ b/elpa/archives/marmalade/archive-contents @@ -1 +1 @@ -(1(haml-mode .[(3 0 14)()"Major mode for editing Haml files"single])(clojure-mode .[(1 11 5)()"Major mode for Clojure code"single])(paredit .[(22)()"minor mode for editing parentheses -*- Mode: Emacs-Lisp -*-"single])(sass-mode .[(3 0 14)((haml-mode (3 0 14)))"Major mode for editing Sass files"single])(perspective .[(1 7)()"switch between named \"perspectives\" of the editor"single])(slime .[(20100404 1)()"Superior Lisp Interaction Mode for Emacs"single])(slime-repl .[(20100404)((slime (20100404)))"Read-Eval-Print Loop written in Emacs Lisp"single])(scpaste .[(0 6)((htmlize (1 39)))"Paste to the web via scp."single])(idle-highlight .[(1 0)()"highlight the word the point is on"single])(magit .[(1 1 1)()"Control Git from Emacs."tar])(durendal .[(0 2)((clojure-mode (1 7)) (slime (20100404)) (paredit (22)))"A bucket of tricks for Clojure and Slime."single])(htmlize .[(1 39)()"Convert buffer text and decorations to HTML."single])(furl .[(0 0 2)()"Friendly URL retrieval"single])(marmalade .[(0 0 4)((furl (0 0 2)))"Elisp interface for the Emacs Lisp package server."single])(yari .[(0 5)()"Yet Another RI interface for Emacs"single])(enclose .[(0 0 2)()"Enclose cursor within punctuation pairs"single])(html-script-src .[(0 0 2)()"Insert