diff --git a/.gitignore b/.gitignore
index 48ef436b2..604bc7aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *~*
 *#*
-
+*-history
 .smex-items
 places
\ No newline at end of file
diff --git a/elpa/Save-visited-files-readme.txt b/elpa/Save-visited-files-readme.txt
new file mode 100644
index 000000000..44ff71312
--- /dev/null
+++ b/elpa/Save-visited-files-readme.txt
@@ -0,0 +1,40 @@
+;;; Commentary:
+
+;; save-visited-files is a lightweight version of Desktop.el that
+;; only save the files you have open(currently).  This was created because I
+;; couldn't ever get Desktop to work and wanted to persist open files across
+;; sessions.  This file is the result.
+
+;;; Installation:
+
+;; To install, put this file somewhere in your load-path and add the following
+;; to your .emacs file:
+;;
+;; (require 'save-visited-files)
+;; (turn-on-save-visited-files-mode)
+;;
+;; This will load the set of saved files on startup, as well as updating this
+;; list whenever the auto-save-timer is run.  This does not wait to save on
+;; closing emacs because I wanted it to be useful even if emacs crashed.  To
+;; save the visited files at any time, you can call M-x save-visited-files-save.
+;; M-x save-visited-files-restore will open all files saved this way.  To turn
+;; off the saving of files, you need to run (turn-off-save-visited-files-mode)
+
+;; Changelog:
+;; 1.2
+;;  * Changed default value of save-visited-files-location to ~/.emacs.d/emacs-visisted-files
+;;  * Improvements/rewriting by Jonathan Kotta
+;;  ** Checks save-visited-files-location is writable, and gives a message if not
+;;  ** Changed to use define-minor-mode
+;;  ** Moved (setq save-visited-files-already-restored t) to the end of
+;;  ** save-visited-files-restore from save-visited-files-mode.
+;;  ** Doesn't print a message in the echo area every time it saves the file list.
+;; 1.1
+;;  * Improvements/rewriting by Ryan Thomson
+;;  ** Use auto-save-hook instead of a periodic timer
+;;  ** More consistent naming conventions
+;;  ** Customization ability via M-x customize-group save-visited-files
+;;  ** Better handling of the temp buffer
+;; 1.0
+;;  * Initial Release
+
diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents
index 9e6d8c95f..78f93ebe5 100644
--- a/elpa/archives/gnu/archive-contents
+++ b/elpa/archives/gnu/archive-contents
@@ -2,19 +2,28 @@
  (ack .
       [(1 3)
        nil "Interface to ack-like source code search tools" tar
-       ((:url . "https://github.com/leoliu/ack-el"))])
+       ((:keywords "tools" "processes" "convenience")
+	(:url . "https://github.com/leoliu/ack-el"))])
+ (ada-mode .
+	   [(5 0)
+	    ((wisi
+	      (1 0)))
+	    "major-mode for editing Ada sources" tar
+	    ((:url . "http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html"))])
  (adaptive-wrap .
 		[(0 5)
 		 nil "Smart line-wrapping with wrap-prefix" single
-		 ((:url . "http://elpa.gnu.org/packages/adaptive-wrap.html"))])
+		 ((:url . "http://elpa.gnu.org/packages/adaptive-wrap.html")
+		  (:keywords))])
  (adjust-parens .
-		[(1 3)
+		[(3 0)
 		 nil "Indent and dedent Lisp code, automatically adjust close parens" tar
 		 ((:url . "http://elpa.gnu.org/packages/adjust-parens.html"))])
  (all .
       [(1 0)
        nil "Edit all lines matching a given regexp" single
-       ((:url . "http://elpa.gnu.org/packages/all.html"))])
+       ((:url . "http://elpa.gnu.org/packages/all.html")
+	(:keywords "matching"))])
  (auctex .
 	 [(11 87 2)
 	  nil "Integrated environment for *TeX*" tar
@@ -22,23 +31,28 @@
  (cl-lib .
 	 [(0 3)
 	  nil "Properly prefixed CL functions and macros" single
-	  ((:url . "http://elpa.gnu.org/packages/cl-lib.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/cl-lib.html")
+	   (:keywords))])
  (coffee-mode .
 	      [(0 4 1 1)
 	       nil "Major mode for CoffeeScript files" single
-	       ((:url . "http://github.com/defunkt/coffee-mode"))])
+	       ((:url . "http://github.com/defunkt/coffee-mode")
+		(:keywords "CoffeeScript major mode"))])
  (company .
 	  [(0 6 12)
 	   nil "Modular in-buffer completion framework" tar
-	   ((:url . "http://company-mode.github.io/"))])
+	   ((:keywords "abbrev" "convenience" "matching")
+	    (:url . "http://company-mode.github.io/"))])
  (csv-mode .
 	   [(1 2)
 	    nil "Major mode for editing comma/char separated values" single
-	    ((:url . "http://centaur.maths.qmul.ac.uk/Emacs/"))])
+	    ((:url . "http://centaur.maths.qmul.ac.uk/Emacs/")
+	     (:keywords "convenience"))])
  (debbugs .
 	  [(0 5)
 	   nil "SOAP library to access debbugs servers" tar
-	   ((:url . "http://elpa.gnu.org/packages/debbugs.html"))])
+	   ((:keywords "comm" "hypermedia")
+	    (:url . "http://elpa.gnu.org/packages/debbugs.html"))])
  (dict-tree .
 	    [(0 12 8)
 	     ((trie
@@ -48,13 +62,15 @@
 	      (heap
 	       (0 3)))
 	     "Dictionary data structure" single
-	     ((:url . "http://www.dr-qubit.org/emacs.php"))])
+	     ((:url . "http://www.dr-qubit.org/emacs.php")
+	      (:keywords "extensions" "matching" "data structures"))])
  (diff-hl .
 	  [(1 5 1)
 	   ((cl-lib
 	     (0 2)))
 	   "Highlight uncommitted changes" tar
-	   ((:url . "https://github.com/dgutov/diff-hl"))])
+	   ((:keywords "vc" "diff")
+	    (:url . "https://github.com/dgutov/diff-hl"))])
  (dismal .
 	 [(1 5)
 	  ((cl-lib
@@ -64,57 +80,77 @@
  (djvu .
        [(0 5)
 	nil "Edit and view Djvu files via djvused" single
-	((:url . "http://elpa.gnu.org/packages/djvu.html"))])
+	((:url . "http://elpa.gnu.org/packages/djvu.html")
+	 (:keywords "files" "wp"))])
  (docbook .
 	  [(0 1)
 	   nil "Info-like viewer for DocBook" single
-	   ((:url . "http://elpa.gnu.org/packages/docbook.html"))])
+	   ((:url . "http://elpa.gnu.org/packages/docbook.html")
+	    (:keywords "docs" "help"))])
  (ediprolog .
 	    [(1 0)
 	     nil "Emacs Does Interactive Prolog" single
-	     ((:url . "http://elpa.gnu.org/packages/ediprolog.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/ediprolog.html")
+	      (:keywords "languages" "processes"))])
  (eldoc-eval .
 	     [(0 1)
 	      nil "Enable eldoc support when minibuffer is in use." single
-	      ((:url . "http://elpa.gnu.org/packages/eldoc-eval.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/eldoc-eval.html")
+	       (:keywords))])
  (enwc .
        [(1 0)
 	nil "The Emacs Network Client" tar
-	((:url . "http://elpa.gnu.org/packages/enwc.html"))])
+	((:keywords "enwc" "network" "wicd" "manager" "nm")
+	 (:url . "http://elpa.gnu.org/packages/enwc.html"))])
  (epoch-view .
 	     [(0 0 1)
 	      nil "Minor mode to visualize epoch timestamps" single
-	      ((:url . "http://elpa.gnu.org/packages/epoch-view.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/epoch-view.html")
+	       (:keywords "data" "timestamp" "epoch" "unix"))])
  (f90-interface-browser .
 			[(1 1)
 			 nil "Parse and browse f90 interfaces" single
-			 ((:url . "http://github.com/wence-/f90-iface/"))])
+			 ((:url . "http://github.com/wence-/f90-iface/")
+			  (:keywords))])
+ (flylisp .
+	  [(0 2)
+	   nil "Color unbalanced parentheses and parentheses inconsistent with indentation" single
+	   ((:url . "http://elpa.gnu.org/packages/flylisp.html")
+	    (:keywords))])
  (ggtags .
-	 [(0 7 5)
-	  nil "GNU Global source code tagging system" single
-	  ((:url . "https://github.com/leoliu/ggtags"))])
+	 [(0 7 8)
+	  ((emacs
+	    (24)))
+	  "emacs frontend to GNU Global source code tagging system" single
+	  ((:url . "https://github.com/leoliu/ggtags")
+	   (:keywords "tools" "convenience"))])
  (heap .
        [(0 3)
 	nil "Heap (a.k.a. priority queue) data structure" single
-	((:url . "http://www.dr-qubit.org/emacs.php"))])
+	((:url . "http://www.dr-qubit.org/emacs.php")
+	 (:keywords "extensions" "data structures" "heap" "priority queue"))])
  (ioccur .
 	 [(2 4)
 	  nil "Incremental occur" single
-	  ((:url . "http://elpa.gnu.org/packages/ioccur.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/ioccur.html")
+	   (:keywords))])
  (jgraph-mode .
 	      [(1 0)
 	       nil "Major mode for Jgraph files" single
-	       ((:url . "http://elpa.gnu.org/packages/jgraph-mode.html"))])
+	       ((:url . "http://elpa.gnu.org/packages/jgraph-mode.html")
+		(:keywords "tex" "wp"))])
  (js2-mode .
 	   [(20131106)
 	    ((emacs
 	      (24 1)))
 	    "Improved JavaScript editing mode" tar
-	    ((:url . "https://github.com/mooz/js2-mode/"))])
+	    ((:keywords "languages" "javascript")
+	     (:url . "https://github.com/mooz/js2-mode/"))])
  (jumpc .
 	[(3 0)
 	 nil "jump to previous insertion points" single
-	 ((:url . "http://elpa.gnu.org/packages/jumpc.html"))])
+	 ((:url . "http://elpa.gnu.org/packages/jumpc.html")
+	  (:keywords))])
  (lex .
       [(1 1)
        nil "Lexical analyser construction" tar
@@ -122,35 +158,43 @@
  (lmc .
       [(1 2)
        nil "Little Man Computer in Elisp" single
-       ((:url . "http://elpa.gnu.org/packages/lmc.html"))])
+       ((:url . "http://elpa.gnu.org/packages/lmc.html")
+	(:keywords))])
  (load-dir .
 	   [(0 0 3)
 	    nil "Load all Emacs Lisp files in a given directory" single
-	    ((:url . "http://elpa.gnu.org/packages/load-dir.html"))])
+	    ((:url . "http://elpa.gnu.org/packages/load-dir.html")
+	     (:keywords "lisp" "files" "convenience"))])
  (markchars .
 	    [(0 2 0)
 	     nil "Mark chars fitting certain characteristics" single
-	     ((:url . "http://elpa.gnu.org/packages/markchars.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/markchars.html")
+	      (:keywords))])
  (memory-usage .
 	       [(0 2)
 		nil "Analyze the memory usage of Emacs in various ways" single
-		((:url . "http://elpa.gnu.org/packages/memory-usage.html"))])
+		((:url . "http://elpa.gnu.org/packages/memory-usage.html")
+		 (:keywords "maint"))])
  (minimap .
 	  [(1 0)
 	   nil "Sidebar showing a \"mini-map\" of a buffer" single
-	   ((:url . "http://elpa.gnu.org/packages/minimap.html"))])
+	   ((:url . "http://elpa.gnu.org/packages/minimap.html")
+	    (:keywords))])
  (muse .
        [(3 20)
 	nil "Authoring and publishing tool for Emacs" tar
-	((:url . "http://mwolson.org/projects/EmacsMuse.html"))])
+	((:keywords "hypermedia")
+	 (:url . "http://mwolson.org/projects/EmacsMuse.html"))])
  (nhexl-mode .
 	     [(0 1)
 	      nil "Minor mode to edit files via hex-dump format" single
-	      ((:url . "http://elpa.gnu.org/packages/nhexl-mode.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/nhexl-mode.html")
+	       (:keywords "data"))])
  (nlinum .
 	 [(1 1)
 	  nil "Show line numbers in the margin" single
-	  ((:url . "http://elpa.gnu.org/packages/nlinum.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/nlinum.html")
+	   (:keywords "convenience"))])
  (notes-mode .
 	     [(1 30)
 	      nil "Indexing system for on-line note-taking" tar
@@ -158,67 +202,81 @@
  (num3-mode .
 	    [(1 1)
 	     nil "highlight groups of digits in long numbers" single
-	     ((:url . "http://elpa.gnu.org/packages/num3-mode.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/num3-mode.html")
+	      (:keywords))])
  (oauth2 .
 	 [(0 9)
 	  nil "OAuth 2.0 Authorization Protocol" single
-	  ((:url . "http://elpa.gnu.org/packages/oauth2.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/oauth2.html")
+	   (:keywords "comm"))])
  (omn-mode .
 	   [(1 0)
 	    nil "Support for OWL Manchester Notation" single
-	    ((:url . "http://elpa.gnu.org/packages/omn-mode.html"))])
+	    ((:url . "http://elpa.gnu.org/packages/omn-mode.html")
+	     (:keywords))])
  (org .
-      [(20131112)
+      [(20131223)
        nil "Outline-based notes management and organizer" tar nil])
  (quarter-plane .
 		[(0 1)
 		 nil "Minor mode for quarter-plane style editing" single
-		 ((:url . "http://elpa.gnu.org/packages/quarter-plane.html"))])
+		 ((:url . "http://elpa.gnu.org/packages/quarter-plane.html")
+		  (:keywords "convenience wp"))])
  (queue .
 	[(0 1)
 	 nil "Queue data structure" single
-	 ((:url . "http://www.dr-qubit.org/emacs.php"))])
+	 ((:url . "http://www.dr-qubit.org/emacs.php")
+	  (:keywords "extensions" "data structures" "queue"))])
  (rainbow-mode .
 	       [(0 9)
 		nil "Colorize color names in buffers" single
-		((:url . "http://elpa.gnu.org/packages/rainbow-mode.html"))])
+		((:url . "http://elpa.gnu.org/packages/rainbow-mode.html")
+		 (:keywords "faces"))])
  (register-list .
 		[(0 1)
 		 nil "Interactively list/edit registers" single
-		 ((:url . "http://elpa.gnu.org/packages/register-list.html"))])
+		 ((:url . "http://elpa.gnu.org/packages/register-list.html")
+		  (:keywords "register"))])
  (shen-mode .
 	    [(0 1)
 	     nil "A major mode for editing shen source code" tar
-	     ((:url . "http://elpa.gnu.org/packages/shen-mode.html"))])
+	     ((:keywords "languages" "shen")
+	      (:url . "http://elpa.gnu.org/packages/shen-mode.html"))])
  (sisu-mode .
 	    [(3 0 3)
 	     nil "Major mode for SiSU markup text" single
-	     ((:url . "http://elpa.gnu.org/packages/sisu-mode.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/sisu-mode.html")
+	      (:keywords "text" "processes" "tools"))])
  (smart-operator .
 		 [(4 0)
 		  nil "Insert operators with surrounding spaces smartly" single
-		  ((:url . "http://xwl.appspot.com/ref/smart-operator.el"))])
+		  ((:url . "http://xwl.appspot.com/ref/smart-operator.el")
+		   (:keywords))])
  (sml-mode .
 	   [(6 4)
 	    nil "Major mode for editing (Standard) ML" single
-	    ((:url . "http://elpa.gnu.org/packages/sml-mode.html"))])
+	    ((:url . "http://elpa.gnu.org/packages/sml-mode.html")
+	     (:keywords "SML"))])
  (sokoban .
 	  [(1 0 4)
 	   nil "Sokoban game for emacs" tar nil])
  (svg-clock .
 	    [(0 5)
 	     nil "Analog clock using Scalable Vector Graphics" single
-	     ((:url . "http://elpa.gnu.org/packages/svg-clock.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/svg-clock.html")
+	      (:keywords "demo" "svg" "clock"))])
  (tNFA .
        [(0 1 1)
 	((queue
 	  (0 1)))
 	"Tagged non-deterministic finite-state automata" single
-	((:url . "http://www.dr-qubit.org/emacs.php"))])
+	((:url . "http://www.dr-qubit.org/emacs.php")
+	 (:keywords "extensions" "matching" "data structures"))])
  (temp-buffer-browse .
 		     [(1 1)
 		      nil "temp buffer browse mode" single
-		      ((:url . "http://elpa.gnu.org/packages/temp-buffer-browse.html"))])
+		      ((:url . "http://elpa.gnu.org/packages/temp-buffer-browse.html")
+		       (:keywords "convenience"))])
  (trie .
        [(0 2 6)
 	((tNFA
@@ -226,35 +284,49 @@
 	 (heap
 	  (0 3)))
 	"Trie data structure" single
-	((:url . "http://www.dr-qubit.org/emacs.php"))])
+	((:url . "http://www.dr-qubit.org/emacs.php")
+	 (:keywords "extensions" "matching" "data structures"))])
  (undo-tree .
-	    [(0 6 3)
+	    [(0 6 5)
 	     nil "Treat undo history as a tree" single
-	     ((:url . "http://www.dr-qubit.org/emacs.php"))])
+	     ((:url . "http://www.dr-qubit.org/emacs.php")
+	      (:keywords "convenience" "files" "undo" "redo" "history" "tree"))])
  (uni-confusables .
 		  [(0 1)
 		   nil "Unicode confusables table" tar nil])
  (vlf .
-      [(0 9 1)
+      [(1 2)
        nil "View Large Files" single
-       ((:url . "https://github.com/m00natic/vlfi"))])
+       ((:url . "https://github.com/m00natic/vlfi")
+	(:keywords "large files" "utilities"))])
  (w3 .
      [(4 0 49)
       nil "Fully customizable, largely undocumented web browser for Emacs" tar
-      ((:url . "http://elpa.gnu.org/packages/w3.html"))])
+      ((:keywords "faces" "help" "comm" "news" "mail" "processes" "mouse" "hypermedia")
+       (:url . "http://elpa.gnu.org/packages/w3.html"))])
  (websocket .
 	    [(1 1)
 	     nil "Emacs WebSocket client and server" tar
-	     ((:url . "http://elpa.gnu.org/packages/websocket.html"))])
+	     ((:keywords "Communication" "Websocket" "Server")
+	      (:url . "http://elpa.gnu.org/packages/websocket.html"))])
  (windresize .
 	     [(0 1)
 	      nil "Resize windows interactively" single
-	      ((:url . "http://elpa.gnu.org/packages/windresize.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/windresize.html")
+	       (:keywords "window"))])
+ (wisi .
+       [(1 0)
+	((cl-lib
+	  (0)))
+	"Utilities for implementing an indentation/navigation engine using a generalized LALR parser" tar
+	((:url . "http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html"))])
  (xclip .
 	[(1 3)
 	 nil "use xclip to copy&paste" single
-	 ((:url . "http://elpa.gnu.org/packages/xclip.html"))])
+	 ((:url . "http://elpa.gnu.org/packages/xclip.html")
+	  (:keywords "convenience" "tools"))])
  (yasnippet .
 	    [(0 8 0)
 	     nil "Yet another snippet extension for Emacs." tar
-	     ((:url . "http://github.com/capitaomorte/yasnippet"))]))
+	     ((:keywords "convenience" "emulation")
+	      (:url . "http://github.com/capitaomorte/yasnippet"))]))
diff --git a/elpa/archives/marmalade/archive-contents b/elpa/archives/marmalade/archive-contents
index 8f75773c0..f381f7159 100644
--- a/elpa/archives/marmalade/archive-contents
+++ b/elpa/archives/marmalade/archive-contents
@@ -1 +1 @@
-(1(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 9)()"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 2 0)()"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 6)()"Yet Another RI interface for Emacs"single])(enclose .[(0 0 2)()"Enclose cursor within punctuation pairs"single])(html-script-src .[(0 0 2)()"Insert <script src=\"..\"> for popular JavaScript libraries"single])(mactag .[(0 0 1)()"Mode for automatically handle multiple tags files with Mactag rubygem"single])(undo-tree .[(0 3 1)()"Treat undo history as a tree"single])(diminish .[(0 44)()"Diminished modes are minor modes with no modeline display"single])(notify .[(2010 8 20)()"notification front-end"single])(keywiz .[(1 4)()"Emacs key sequence quiz"single])(descbinds-anything .[(1 5)((anything (1 287)))"Yet Another `describe-bindings' with `anything'."single])(scrolloff .[(1 0)()"This mode ofers vim-like scrolloff function"single])(el-init .[(20130416)()"Loader for configuration files"tar])(autopair .[(0 3)()"Automagically pair braces and quotes like TextMate"single])(highlight-parentheses .[(1 0 1)()"highlight surrounding parentheses"single])(anything .[(1 287)()"open anything / QuickSilver-like candidate-selection framework"single])(anything-config .[(0 4 1)()"Predefined configurations for `anything.el'"single])(anything-match-plugin .[(1 27)()"Humane match plug-in for anything"single])(closure-template-html-mode .[(0 1)()"highlighting for google closure templates"single])(gist .[(1 1 1)((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0)))"Emacs integration for gist.github.com"single])(highlight-symbol .[(1 1)()"automatic and manual symbol highlighting"single])(color-theme-twilight .[(0 1)()"Twilight Colour Theme for Emacs."single])(browse-kill-ring .[(1 3 1)()"interactively insert items from kill-ring -*- coding: utf-8 -*-"single])(buffer-move .[(0 4)()"swap buffers between windows"single])(dired-single .[(1 7 0)()"reuse the current dired buffer to visit another directory"single])(php-mode .[(1 5 0)()"major mode for editing PHP code"single])(c-eldoc .[(0 5)()"helpful description of the arguments to C functions"single])(full-ack .[(0 2 3)()"a front-end for ack"single])(find-file-in-project .[(3 2)()"Find files in a project quickly."single])(project .[(1 0)()"Keep track of the current project"single])(goto-last-change .[(1 2)()"Move point through buffer-undo-list positions -*-unibyte: t; coding: iso-8859-1;-*-"single])(http-twiddle .[(1 0)()"send & twiddle & resend HTTP requests"single])(mac-key-mode .[(2010 1 3)()"provide mac-style key bindings on Carbon Emacs"single])(flymake-cursor .[(1 0 2)((flymake (0 3)))"Show flymake messages in the minibuffer after delay"tar])(multi-term .[(0 8 8)()"Managing multiple terminal buffers in Emacs."single])(parenface .[(1 1)()"Provide a face for parens in lisp modes."single])(gnuplot .[(0 6 0)()"drive gnuplot from within emacs"single])(speck .[(2010 5 25)()"minor mode for spell checking"single])(hexrgb .[(21 0)()"Functions to manipulate colors, including RGB hex strings."single])(icomplete+ .[(21 0)()"Extensions to `icomplete.el'."single])(lacarte .[(22 0)()"Execute menu items as commands, with completion."single])(synonyms .[(1 0)()"Look up synonyms for a word or phrase in a thesaurus."single])(ecb .[(2 40)()"Emacs Code Browser"tar])(predictive .[(0 19 5)()"Predictive Mode (Contains Dependencies)"tar])(rw-hunspell .[(0 2)()"special functions for Hunspell in ispell.el"single])(rw-ispell .[(0 1)()"additional functions for ispell.el"single])(rw-language-and-country-codes .[(0 1)()"Language & Country Codes"single])(yas-jit .[(0 8 3)()"Loads Yasnippets on demand (makes start up faster)"single])(ntcmd .[(1 0)()"major mode for editing cmd scripts"single])(org-table-comment .[(0 2)()" Org table comment modes."single])(anything-extension .[(0 2)()"Extension functions for anything.el"single])(powershell .[(0 2 1)()"run powershell as an inferior shell in emacs"single])(cdlatex .[(4 0)()"Fast input methods for LaTeX environments and math"single])(anything-R .[(0 1 2010)()"anything-sources and some utilities for GNU R."single])(anything-el-swank-fuzzy .[(0 1 2009)()"anything-sources for el-swank-fuzzy.el"single])(anything-ipython .[(0 1 2009)()" Ipython anything"single])(color-file-completion .[(1 0 1)()"add colors to file completion"single])(color-theme-emacs-revert-theme .[(0 1)()"Color-theme revert to emacs colors"single])(anything-complete .[(1 86)()"completion with anything"single])(anything-obsolete .[(0 1)()"obsolete functions of anything"single])(ipython .[(2927)()"Adds support for IPython to python-mode.el"single])(el-swank-fuzzy .[(0 1)()"fuzzy symbol completion."single])(fold-dwim .[(1 2)()"Unified user interface for Emacs folding modes"single])(fold-dwim-org .[(0 2)((fold-dwim (1 2)))"Fold DWIM bound to org key-strokes."single])(fuzzy-match .[(1 4)()"fuzzy matching"single])(w32-browser .[(21 0)()"Run Windows application associated with a file."single])(crosshairs .[(22 0)()"Highlight the current line and column."single])(csv-mode .[(1 50)()"major mode for editing comma-separated value files"single])(vline .[(1 10)()"show vertical line (column highlighting) mode."single])(hl-line+ .[(22 0)()"Extensions to hl-line.el."single])(col-highlight .[(22 0)((vline (1 10)))"Highlight the current column."single])(color-theme-vim-insert-mode .[(0 1)()"Color theme VIM insert mode"single])(cursor-chg .[(20 1)()"Change cursor dynamically, depending on the context."single])(cygwin-mount .[(2001)()"Teach EMACS about cygwin styles and mount points."single])(header2 .[(21 0)()"Support for creation and update of file headers."single])(lib-requires .[(21 0)()"Commands to list Emacs Lisp library dependencies."single])(linum-off .[(0 1)()"Provides an interface for turning line-numbering off"single])(pos-tip .[(0 4 5)()"Show tooltip at point -*- coding: utf-8 -*-"single])(key-choices .[(0 201)((color-theme-vim-insert-mode (0 1)) (color-theme-emacs-revert-theme (0 1)))"Key Choices -- Also Viper has different colors in different modes"single])(tabbar .[(2 0 1)()"Display a tab bar in the header line  -*-no-byte-compile: t; -*-"single])(elein .[(0 2 2)()"running leiningen commands from emacs"single])(sumatra-forward .[(2008 10 8)()"Provides Sumatra Forward search"single])(org-outlook .[(0 3)()"Outlook org"single])(slime-fuzzy .[(20100404)((slime (20100404)))"Fuzzy symbol completion for Slime"single])(color-theme-complexity .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(starter-kit .[(2 0 3)((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 1)) (ido-ubiquitous (0 3)) (magit (0 8 1)))"Saner defaults and goodies."tar])(starter-kit-lisp .[(2 0 3)((starter-kit (2 0 2)) (elisp-slime-nav (0 1)))"Saner defaults and goodies for lisp languages"single])(starter-kit-js .[(2 0 1)((starter-kit (2 0 1)))"Saner defaults and goodies for Javascript"single])(starter-kit-ruby .[(2 0 3)((inf-ruby (2 2 3)) (starter-kit (2 0 1)))"Saner defaults and goodies for Ruby"single])(geben .[(0 26)()"A remote debugging environment for Emacs."tar])(maxframe .[(0 5 1)()"maximize the emacs frame based on display size"single])(mode-compile .[(2 29)()" Smart command for compiling files"single])(swank-cdt .[(1 0 1)()"swank-cdt helper functions"single])(find-file-in-git-repo .[(0 1 2)()"Utility to find files in a git repo"single])(idle-highlight-mode .[(1 1 2)()"highlight the word the point is on"single])(smex .[(2 1)()"M-x interface with Ido-style fuzzy matching."single])(protobuf-mode .[(0 3)()"major mode for editing protocol buffers."single])(haskell-mode .[(13 7)()"A Haskell editing mode"tar])(znc .[(0 0 2)((cl (2 2)) (erc (5 3)))"ZNC + ERC "single])(slime-clj .[(0 1 5)()"slime extensions for swank-clj"single])(go-mode .[(12869)()"Major mode for the Go programming language."tar])(scala-mode .[(0 0 2)()"Scala major mode"tar])(json .[(1 2)()"JavaScript Object Notation parser / generator"single])(magit-simple-keys .[(1 0 0)((magit (1 0 0)))"simple keybindings for Magit"single])(rainbow-delimiters .[(1 3 4)()"Highlight nested parens, brackets, braces a different color at each depth."single])(nyan-mode .[(0 1)()"Nyan Cat shows position in current buffer in mode-line."single])(anything-git .[(1 1 1)()"Show git files in anything"single])(xml-gen .[(0 4)()"A DSL for generating XML."single])(jump .[(2 3)((findr (0 7)) (inflections (1 1)))"build functions which contextually jump between files"single])(dotassoc .[(0 0 1)()"dot access embedded alists"single])(rcirc-ssh .[(0 0 7)((kv (0 0 3)))"do irc over ssh sessions -*- lexical-binding: t -*-"single])(weather-metno .[(20121023)()"Weather data from met.no in Emacs"tar])(systemtap-mode .[(0 2)()"A mode for SystemTap"single])(mocker .[(0 3 0)((eieio (1 3)) (el-x (0 2 4)))"mocking framework for emacs"single])(kpm-list .[(1 0)()"An emacs buffer list that tries to intelligently group together buffers."single])(weechat .[(0 2)((s (1 3 1)) (cl-lib (0 2)) (emacs (24)) (tracking (1 2)))"Chat via WeeChat's relay protocol in Emacs"tar])(batch-mode .[(1 0)()"major mode for editing ESRI batch scrips"single])(osx-pseudo-daemon .[(1 0)()"Daemon mode that plays nice with OSX."single])(switch-window .[(0 9)()"A *visual* way to choose a window to switch to"single])(yaml-mode .[(0 0 9)()"Major mode for editing YAML files"single])(prolog .[(1 22)()"major mode for editing and running Prolog (and Mercury) code"single])(graphviz-dot-mode .[(0 3 7)()"Mode for the dot-language used by graphviz (att)."single])(perlcritic .[(1 10)()"minor mode for Perl::Critic integration"single])(gh .[(0 7 2)((eieio (1 3)) (pcache (0 2 3)) (logito (0 1)))"A GitHub library for Emacs"tar])(vala-mode .[(0 1)()"Vala mode derived mode"single])(alpha .[(1 0)()"increase frame transparency"single])(color-theme-ir-black .[(1 0 1)((color-theme (6 6 1)))"pastel color theme "single])(calfw-gcal .[(0 0 1)()"edit Google calendar for calfw.el."single])(python .[(20120402)()"Python's flying circus support for Emacs"single])(htmlfontify .[(0 21)()"htmlise a buffer/source tree with optional hyperlinks"single])(oddmuse .[(20090222)()"edit pages on an Oddmuse wiki"single])(wgrep .[(2 1 3)()"Writable grep buffer and apply the changes to files"single])(langtool .[(1 2 1)()"Grammar check utility using LanguageTool"single])(starter-kit-bindings .[(2 0 2)((starter-kit (2 0 2)))"Saner defaults and goodies: bindings"single])(hl-sentence .[(2)()"highlight a sentence based on customizable face"single])(color-theme-eclipse .[(0 0 2)((color-theme (6 6 1)))"Eclipse color theme for GNU Emacs."single])(bm .[(1 53)()"Visible bookmarks in buffer."single])(color-theme-railscasts .[(0 0 2)((color-theme (6 6 1)))"Railscasts color theme for GNU Emacs."single])(color-theme-tango .[(0 0 2)((color-theme (6 6 1)))"Tango palette color theme for GNU Emacs."single])(color-theme-github .[(0 0 3)((color-theme (6 6 1)))"Github color theme for GNU Emacs."single])(color-theme-dpaste .[(0 0 1)((color-theme (6 6 1)))"Dpaste color theme for GNU Emacs."single])(nose .[(0 1 1)()"Easy Python test running in Emacs"single])(dpaste .[(0 2)()"Emacs integration for dpaste.com"single])(offlineimap .[(0 1)()"Run OfflineIMAP from Emacs"single])(scss-mode .[(0 5 0)()"Major mode for editing SCSS files"single])(highlight-indentation .[(0 5 0)()"Function for highlighting indentation"single])(feature-mode .[(0 4)()"Major mode for editing Gherkin (i.e. Cucumber) user stories"tar])(dired-details .[(1 3 1)()"make file details hide-able in dired"single])(dired-details+ .[(1 0)()"Enhancements to library `dired-details+.el'."single])(python-pep8 .[(1 1)()"minor mode for running `pep8'"single])(python-pylint .[(1 1)()"minor mode for running `pylint'"single])(workgroups .[(0 2 0)()"workgroups for windows (for Emacs)"single])(closure-lint-mode .[(0 1)()"minor mode for the Closure Linter"single])(httpd .[(1 0 1)()"HTTP/1.0 web server for emacs"single])(pep8 .[(1 2)()"run the python pep8 checker putting hits in a grep buffer"single])(cppcheck .[(1 0)()"run cppcheck putting hits in a grep buffer"single])(grin .[(1 0)()"run grin and grind (python replacements for grep and find) putting hits in a grep buffer"single])(pyflakes .[(1 0)()"run the python pyflakes checker putting hits in a grep buffer"single])(pylint .[(1 0)()"run the python pylint checker putting hits in a grep buffer"single])(fastnav .[(1 0 7)()"Fast navigation and editing routines."single])(confluence .[(1 6)((xml-rpc (1 6 7)))"Confluence major mode"tar])(tuareg .[(2 0 5)((caml (3 12 0 1)))"OCaml mode for Emacs."tar])(pp-c-l .[(1 0)()"Display Control-l characters in a pretty way"single])(js-comint .[(0 0 1)()"Run javascript in an inferior process window."single])(magithub .[(0 2)((magit (0 8)) (json (1 2)))"Magit extensions for using GitHub"single])(smart-operator .[(1 9 20110812)()"Insert operators with surrounding spaces smartly"single])(org-magit .[(0 2 0)((magit (0 8)) (org (6 1)))"basic support for magit links"single])(whole-line-or-region .[(1 3 1)()"operate on current line if region undefined"single])(ido-ubiquitous .[(2 9)((emacs (24 1)))"Use ido (nearly) everywhere."single])(bigint .[(1 0 0)()"A simple bigint package for emacs"single])(dizzee .[(0 1 1)()"A more pleasant way to manage your project's subprocesses in Emacs."tar])(color-theme-dg .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(gimme .[(2 1)()"The XMMS2 interface we all love! Check out http://gimmeplayer.org for more info."tar])(deft .[(0 3)()"quickly browse, filter, and edit plain text notes"single])(pony-mode .[(0 2)()"Minor mode for working with Django Projects"tar])(clojurescript-mode .[(0 5)()"Major mode for ClojureScript code"single])(fsvn .[(0 9 13)()"Another frontend of subversion."tar])(starter-kit-eshell .[(2 0 3)()"Saner defaults and goodies: eshell tweaks"single])(yasnippet-bundle .[(0 6 1)()"Yet another snippet extension (Auto compiled bundle)"single])(yasnippet .[(0 6 1)()"Yasnippet template engine"tar])(ido-yes-or-no .[(1 1)((ido (0)))"Use Ido to answer yes-or-no questions"single])(caml .[(3 12 0 1)()"OCaml code editing commands for Emacs"tar])(dtrt-indent .[(0 2 0)()"Adapt to foreign indentation offsets"single])(windsize .[(0 1)()"Simple, intuitive window resizing"single])(textmate .[(5)()"TextMate minor mode for Emacs"single])(xml-rpc .[(1 6 8)()"An elisp implementation of clientside XML-RPC"single])(coffee-mode .[(0 3 0)()"Major mode to edit CoffeeScript files in Emacs"single])(sr-speedbar .[(0 1 8)()"Same frame speedbar"single])(desktop .[(0 1)()"save partial status of Emacs when killed"single])(evil-numbers .[(0 3)()"increment/decrement numbers like in vim"single])(lolcode-mode .[(0 2)()"Major mode for editing LOLCODE"single])(dedicated .[(1 0 0)()"A very simple minor mode for dedicated buffers"single])(csharp-mode .[(0 8 6)()"C# mode derived mode"single])(color-theme-actress .[(0 2 2)((color-theme (6 6 1)))"A dark color theme for GNU Emacs."single])(ghc .[(1 10 2)((haskell-mode (2 8 0)))"Happy Haskell programming on Emacs"tar])(org-email .[(1 0)()"use org for an email database -*- lexical-binding: t -*-"single])(ahg .[(0 99)()"Alberto's Emacs interface for Mercurial (Hg)"single])(lua-mode .[(20110428)()"a major-mode for editing Lua scripts"single])(vc-darcs .[(1 12)()"a VC backend for darcs"single])(elisp-cache .[(1 15)()"Faster emacs startup through byte-compiling."single])(scratch .[(20110708)()"Mode-specific scratch buffers"single])(hl-sexp .[(1 0 0)()"highlight the current sexp"single])(dsvn .[(922257)()"Subversion interface"single])(crontab-mode .[(1 2)()"Mode for editing crontab files"single])(popwin .[(0 4)()"Popup Window Manager."single])(session .[(2 2 1)()"use variables, registers and buffer places across sessions"single])(smart-tab .[(0 3)()"Intelligent tab completion and indentation."single])(ac-ja .[(0 0 1)()"auto-complete-mode source for Japanese "single])(rcirc-notify .[(0 6)()"libnotify popups"single])(jira .[(0 3 3)()"Connect to JIRA issue tracking software"single])(color-theme-blackboard .[(0 0 2)((color-theme (6 6 1)))"Blackboard Colour Theme for Emacs."single])(color-theme-wombat .[(0 0 1)((color-theme (6 6 1)))"The wombat color theme for Emacs."single])(color-theme-wombat+ .[(0 0 2)((color-theme (6 6 1)))"wombat with improvements and many more faces"single])(color-theme-active .[(0 0 1)((color-theme (6 6 1)))"Active theme inspired by jEdit theme of the same name"single])(color-theme-colorful-obsolescence .[(0 0 1)((color-theme (6 6 1)))"Colorful Obsolescence theme designed for partially transparent windows"single])(apache-mode .[(2 0)()"major mode for editing Apache configuration files"single])(highline .[(7 2 2)()"minor mode to highlight current line in buffer"single])(mic-paren .[(3 8)()"advanced highlighting of matching parentheses"single])(pytest .[(0 2 1)()"Easy Python test running in Emacs"single])(wikidoc .[(0 8 1)()"use elisp doc strings to make other documentation"single])(regex-tool .[(1 2)()"A regular expression evaluation tool for programmers"single])(tabkey2 .[(1 40)()"Use second tab key pressed for what you want"single])(ioccur .[(0 2)()"Incremental occur."single])(javadoc-help .[(1 0)()"Javadoc-Help.  Look up Java class on online javadocs in browser."single])(macro-math .[(1 0)()"in-buffer mathematical operations"single])(winpoint .[(1 4)()"Remember buffer positions per-window, not per buffer"single])(scheme-complete .[(0 8 2)()"Smart tab completion for Emacs"single])(flymake-jshint .[(1 0)()"making flymake work with JSHint"single])(doc-mode .[(0 2)()"convenient editing of in-code documentation"single])(gccsense .[(0 2)()"GCCSense client for Emacs"single])(p4 .[(11 0)()"Perforce-Emacs Integration Library"single])(pager .[(2 0)()"windows-scroll commands"single])(pastebin .[(0 1)()"A simple interface to the www.pastebin.com webservice"single])(cache .[(0 1)()"implementation of a hash table whose key-value pairs expire"single])(command-frequency .[(1 1)()"Track command frequencies"single])(guess-offset .[(0 1 1)()"Automatically determine c-basic-offset"single])(loccur .[(1 1 1)()"Perform an occur-like folding in current buffer"single])(recursive-narrow .[(1 0)()"narrow-to-region that operates recursively"single])(member-function .[(0 3 1)()"expand member functions for C++ classes"single])(window-number .[(1 0 1)()"Jump to a window by number"single])(gtags .[(3 3)()"gtags facility for Emacs"single])(pymacs .[(0 25)()"Interface between Emacs Lisp and Python"single])(pysmell .[(0 7 2)()"Complete python code using heuristic static analysis"single])(eieio .[(1 4)()"Enhanced Implememntation of Emacs Interpreted Objects"tar])(rudel .[(0 3)((eieio (1 4)))"A collaborative editing framework for Emacs"tar])(jabber .[(0 8 90)()"A Jabber client for Emacs."tar])(citrus-mode .[(0 0 2)()"Major mode for editing Citrus files"single])(lineno .[(0 1)()"Alternate mode to display line numbers."single])(emacsd-tile .[(0 1)()"tiling windows for emacs"single])(iy-go-to-char .[(1 0)()"Go to next CHAR which is similar to \"f\" in vim"single])(jenkins-watch .[(1 2)()"Watch continuous integration build status -*- indent-tabs-mode: t; tab-width: 8 -*-"single])(peepopen .[(0 1 0)()"Graphical file chooser for Emacs on Mac OS X."single])(levenshtein .[(1 0)()"Edit distance between two strings."single])(gopher .[(0 0 2)()"easily access and navigate Gopher servers"single])(clojure-project-mode .[(1 0)((project-mode (1 0)))"Extends project-mode for Clojure projects"single])(ruby-block .[(0 0 11)()"highlight matching block"single])(pretty-lambdada .[(22 0)()"Show the word `lambda' as the Greek letter."single])(rect-mark .[(1 4)()"Mark a rectangle of text with highlighting."single])(evernote-mode .[(0 41)()"Evernote client for Emacs"tar])(centered-cursor-mode .[(0 5 1)()"cursor stays vertically centered"single])(elixir-mode .[(1 0 0)()"Major mode for editing Elixir files"single])(wget .[(1 94)()"Emacs-wget is an interface program of GNU wget on Emacs."tar])(mldonkey .[(0 0 4)()"Multi-networks peer-to-peer client."tar])(sml-modeline .[(0 5)()"Show position in a scrollbar like way in mode-line"single])(mwe-log-commands .[(20041106)()"log keyboard commands to buffer"single])(move-text .[(1 0)()"Move current line or region with M-up or M-down."single])(hippie-expand-slime .[(0 1)()"Hook slime's completion into hippie-expand"single])(boxquote .[(1 23)()"Quote text with a semi-box."single])(gnugo .[(2 2 12)()"Play a game of Go against gnugo"single])(project-mode .[(1 0)((levenshtein (1 0)))"Define code projects. Full-text search, etc."single])(n3-mode .[(20071215)()"mode for Notation 3"single])(org2blog .[(0 5)((org (7 7)) (xml-rpc (1 6 8)))"Blog from Org mode to wordpress"tar])(pcache .[(0 2 3)((eieio (1 3)))"persistent caching for Emacs"single])(idle-require .[(1 0)()"load elisp libraries while Emacs is idle"single])(find-things-fast .[(20111123)()"An emacs mode to find things fast and move around in a project quickly"tar])(color-theme-gruber-darker .[(1)((color-theme (6 6 1)))"Gruber Darker color theme for Emacs by Jason Blevins"single])(dna-mode .[(1 44)()"a major mode for editing dna sequences"single])(perl-myvar .[(1 25)()"Declare lexicaly scoped vars as my()."single])(nlet .[(1 10)()"schemes 'named let' for emacs."single])(ssh-config-mode .[(1 13)()"Mode for fontification of ~/.ssh/config"single])(win-switch .[(1 0 8)()"fast, dynamic bindings for window-switching/resizing"single])(j-mode .[(0 3)()"Major mode for editing J programs"single])(nginx-mode .[(1 1)()"major mode for editing nginx config files"single])(vimgolf .[(0 9 2)()"VimGolf interface for the One True Editor"single])(flymake-csslint .[(1 1 0)((flymake (0 3)))"making flymake work with CSSLint"tar])(typing .[(1 1 4)()"A game for fast typers, inspired by The Typing Of The Dead."single])(zenburn-theme .[(2 1)()"A low contrast color theme for Emacs."single])(solarized-theme .[(1 0 0)()"The Solarized color theme, ported to Emacs."tar])(etags-select .[(1 13)()"Select from multiple tags"single])(etags-table .[(1 1)()"Set tags table(s) based on current file"single])(tintin-mode .[(1 0 0)()"Mayor mode for editing tintin++ scripts"single])(org-cua-dwim .[(0 5)()"Org-mode and Cua mode compatibility layer"single])(otp .[(1 0)()"a one-time password creator"single])(bookmark+ .[(20111214)()"Bookmark Plus"tar])(sentence-highlight .[(0 1)()"highlight the current sentence"single])(smartrep .[(0 0 3)()"Support sequential operation which omitted prefix keys."single])(tabula-rasa-mode .[(0 1 0)()"Distraction free writing mode"single])(abl-mode .[(0 9 0)()"Python TDD minor mode"single])(grails-mode .[(0 1)()"minor-mode that adds some Grails project management to a grails project"single])(inf-groovy .[(2 0)()"minor-mode that adds some Grails project management to a grails project"single])(tidy .[(2 12)()"Interface to the HTML Tidy program"single])(httpcode .[(0 1)()"explains the meaning of an HTTP status code"single])(d-mode .[(2 0 4)()"D Programming Language mode for (X)Emacs"tar])(git-commit .[(0 1)()"Major mode for editing git commit messages"single])(color-theme-library .[(0 0 10)((color-theme (6 6 1)))"The real color theme functions"single])(sauron .[(0 8)()"Track (erc/org/dbus/...) events and react to them."tar])(rcirc-ucomplete .[(1 0 1)()"Unambiguous non-cycling completion for rcirc"single])(cl-format .[(1 1)()"CL format routine."tar])(color-theme-cobalt .[(0 0 2)((color-theme (6 6 1)))"Cobalt Color Theme for Emacs"single])(refheap .[(0 0 3)()"A library for pasting to https://refheap.com"single])(ctags-update .[(0 1 2)()"auto update TAGS in parent directory using exuberant-ctags -*- coding:utf-8 -*-"single])(peep-open .[(0 0 2)()"PeepOpen plugin for emacs."single])(org-mime .[(20120112)()"org html export for text/html MIME emails"single])(eh-basic .[(0 0 2)((starter-kit (2 0 2)) (browse-kill-ring (1 3 1)))"tuamshu's emacs basic configure"tar])(eh-gnus .[(0 0 6)()"tuamshu's gnus configure"tar])(eh-functions .[(0 0 1)((starter-kit (2 0 2)))"tuamshu's emacs functions"tar])(eh-keybindings .[(0 0 1)((eh-functions (0 0 1)) (starter-kit-bindings (2 0 2)))"tuamshu's emacs keybindings"tar])(magit-gh-pulls .[(0 3)((gh (0 4 3)) (magit (1 1 0)))"GitHub pull requests extension for Magit"single])(highlight-80+ .[(1 0)()"highlight characters beyond column 80"single])(jump-char .[(0 1)()"navigation by char"single])(color-theme-molokai .[(0 1)()"Molokai color theme by Lloyd"single])(pointback .[(0 2)()"Restore window points when returning to buffers"single])(uci-mode .[(1 0 0)()"Major mode for UCI configuration files"single])(erlang .[(2 4 1)()"Major modes for editing and running Erlang"single])(thumb-through .[(0 3)()"Plain text reader of HTML documents"single])(unbound .[(0 1)()"find convenient unbound keystrokes"single])(ido-better-flex .[(0 0 2)()"A better flex (fuzzy) algorithm for Ido."single])(popup .[(0 5)()"Visual Popup User Interface"single])(fancy-mode .[(0 1)()"Major mode for programming with the Fancy language."single])(haxe-mode .[(0 3 1)()"An Emacs major mode for haXe"single])(expand-region .[(0 8 0)()"Increase selected region by semantic units."tar])(ack-and-a-half .[(1 2 0)()"Yet another front-end for ack"single])(test-case-mode .[(0 1 8)()"unit test front-end"single])(multi-eshell .[(0 0 1)()"makes it easier to use multiple shells within emacs"single])(mo-git-blame .[(0 1 0)()"An interactive, iterative 'git blame' mode for Emacs"single])(slime-js .[(0 0 1)((slime-repl (20100404)) (slime (20100404)))"Slime extension for swank-js."single])(smooth-scroll .[(1 2)()"Minor mode for smooth scrolling and in-place scrolling."single])(xlicense .[(1 1)()"Insert pre-defined license text"tar])(flymake-d .[(0 1)()"A flymake handler for d-mode files"single])(flymake-tuareg .[(0 1)()"A flymake handler for tuareg-mode files"tar])(track-closed-files .[(0 1)()"Keep track of recently closed files"single])(color-theme-monokai .[(0 0 5)((color-theme (6 5 5)))"Monokai Color Theme for Emacs."single])(drupal-mode .[(0 2 0)((php-mode (1 5 0)))"Advanced minor mode for Drupal development"tar])(screen-lines .[(0 55)()"a minor mode for screen-line-based point motion"single])(ctypes .[(1 2)()"Enhanced Font lock support for custom defined types."single])(moinmoin-mode .[(1 0)((screen-lines (0 55)))"a major mode to edit MoinMoin wiki pages"single])(pc-mode .[(0 1)()"major mode for editing PC code,"single])(mediawiki .[(2 2 3)()"mediawiki frontend"single])(workspaces .[(0 1)()"Workspaces for Emacsen "single])(pivotal-tracker .[(1 2 0)()"Interact with Pivotal Tracker through its API"single])(sublime .[(0 0 7)((coffee-mode (0 3 0)) (find-file-in-project (3 0)) (haml-mode (3 0 14)) (ido-ubiquitous (1 0)) (less-css-mode (0 6)) (magit (1 1 1)) (markdown-mode (1 8 1)) (monokai-theme (0 0 6)) (paredit (22)) (sass-mode (3 0 14)) (smex (1 1 2)) (yaml-mode (0 0 7)) (yasnippet (0 6 1)))"REQUIRES EMACS 24 - Sublime Text 2 Emulation for Emacs"tar])(logito .[(0 1)((eieio (1 3)))"logging library for Emacs"single])(jade-mode .[(0 1)()"Major mode for editing jade templates."single])(stylus-mode .[(0 1)()"Major mode for editing stylus templates."single])(sws-mode .[(0 1)()"SWS mode"single])(javap .[(8)()"Javap major mode"single])(javap-mode .[(9)()"Javap major mode"single])(anything-show-completion .[(20091119)()"Show selection in buffer for anything completion"single])(pastels-on-dark-theme .[(0 3)()"Pastels on Dark theme for Emacs 24"single])(color-theme-solarized .[(20120301)()"Solarized themes for Emacs"tar])(deferred .[(0 3 1)()"Simple asynchronous functions for emacs lisp"single])(concurrent .[(0 3 1)((deferred (0 3 1)))"Concurrent utility functions for emacs lisp"single])(epc .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)))"A RPC stack for the Emacs Lisp"single])(edbi .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)) (epc (0 1 1)))"Emacs Database Interface"tar])(color-theme .[(6 5 5)()"install color themes"single])(cacoo .[(2 1 2)((concurrent (0 3 1)))"Minor mode for Cacoo : http://cacoo.com"tar])(imgur .[(0 1)((anything (1 287)))"imgur client for Emacs"single])(tango-2-theme .[(1 0 0)()"Tango 2 color theme for GNU Emacs 24"single])(puppet-mode .[(0 2)()"A simple mode for editing puppet manifests"single])(po.foo .[(3 0 20)((haml-mode (3 0 20)))"Sass major mode"single])(po.elscreen .[(1 4 6)()" Screen for Emacsen(this is not original)"single])(po-elscreen .[(1 4 6)()" Screen for Emacsen(this is not original. original is http://www.morishima.net/~naoto/elscreen-en/?lang=en)"single])(quack .[(0 42)()"enhanced support for editing and running Scheme code"single])(dired+ .[(21 2)()"Extensions to Dired."single])(emstar .[(1 4)()"Casual game, like a brainy Pac-Man"tar])(igrep .[(2 113)()"An improved interface to `grep` and `find`"single])(cljdoc .[(0 1 0)()"eldoc mode for clojure"single])(real-auto-save .[(0 3)()"enable real auto save"single])(fuzzy .[(0 1)()"Fuzzy Matching"single])(auto-complete .[(1 4)((popup (0 5)))"Auto Completion for GNU Emacs"tar])(bitlbee .[(1 0)()"Help get Bitlbee (http://www.bitlbee.org) up and running"single])(lorem-ipsum .[(0 1)()"Insert dummy pseudo Latin text."single])(typopunct .[(1 0)()"Automatic typographical punctuation marks"single])(twittering-mode .[(2 0 0)()"Major mode for Twitter"single])(flymake-phpcs .[(1 0 5)((flymake (0 3)))"Flymake handler for PHP to invoke PHP-CodeSniffer"tar])(flex-autopair .[(0 3)()"Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable."single])(color-theme-dawn-night .[(1 0)()"color theme of dawn and night."single])(weather .[(2012 3 27 2)()"Get weather reports via worldweatheronline.com"single])(flymake-perlcritic .[(1 0 3)((flymake (0 3)))"Flymake handler for Perl to invoke Perl::Critic"tar])(jsshell-bundle .[(2012 4 7)()"JSShell generated bundle"single])(rfringe .[(1 0 1)()"indicate relative locations in the fringe"single])(flyphpcs .[(1 0 1)()"Flymake for PHP via PHP-CodeSniffer"single])(defaultcontent .[(1 4)()"a templating tool. Fill new files with default content."single])(flymake-for-jslint-for-wsh .[(1 3 0)((flymake (0 3)))"use flymake with js code, on Windows"single])(tfs .[(0 2 7)()"MS Team Foundation Server commands for Emacs."single])(dropdown-list .[(1 45)()"Drop-down menu interface"single])(thesaurus .[(2012 4 7)()"replace a word with a synonym looked up in a web service."single])(fly-jshint-wsh .[(2 0 3)((flymake (0 3)))"use flymake with jshint on js code, on Windows"single])(watch-buffer .[(1 0 1)()"run a shell command when saving a buffer"single])(smarter-compile .[(2012 4 9)()"a smarter wrapper for `compile'"single])(hungry-delete .[(1 0)()"hungry delete minor mode"single])(align-cljlet .[(0 3)((clojure-mode (1 11 5)))"Space align various Clojure forms "single])(idomenu .[(0 1)()"imenu tag selection with ido"single])(drag-stuff .[(0 0 4)()"Drag stuff (lines, words, region, etc...) around"single])(w32-registry .[(2012 4 6)()"read the registry from elisp"single])(jsshell .[(2012 4 7)()"Run a javascript command interpreter in emacs on Windows."single])(shadchen .[(1 0)()"pattern matching for elisp"single])(cycbuf .[(0 5 0)()"Cycle buffers code by Martin Pohlack, inspired by"single])(yascroll .[(0 2 0)()"Yet Another Scroll Bar Mode"single])(anything-exuberant-ctags .[(0 1 2)()"Exuberant ctags anything.el interface"single])(ess .[(5 14)()"Edit and interact with statistical programs like R, S-Plus, SAS, Stata and JAGS"tar])(anything-git-goto .[(0 1 0)()"Quick listing of:"single])(twilight-theme .[(1 0 0)()"Twilight theme for GNU Emacs 24 (deftheme)"single])(jtags .[(0 97)()"enhanced tags functionality for Java development"single])(jtags-extras .[(0 3 0)()"jtags related functionality for Java development"single])(phantomjs .[(0 0 11)()"Control phantomjs from Emacs			"tar])(oz .[(16513)()"Major mode for editing Oz programs"tar])(load-theme-buffer-local .[(0 0 2)()"Install emacs24 color themes by buffer."single])(color-theme-buffer-local .[(0 0 2)()"Install color-themes by buffer."single])(elisp-depend .[(1 0 2)()"Parse depend libraries of elisp file."single])(key-chord .[(0 5 20080915)()"map pairs of simultaneously pressed keys to commands"single])(shell-here .[(1 1)()"Open a shell relative to the working directory"single])(symbols-mode .[(0 3)()"List symbols of object files"single])(handlebars-mode .[(1 3)()"A major mode for editing Handlebars files."single])(dircmp .[(1)()"Compare and sync directories."single])(ascii .[(3 1)()"ASCII code display."single])(frame-tag .[(0 1 0)()"Minor mode that assigns a unique number to each frame for easy switching"single])(org-blog .[(1 18 1 1)()"create and publish a blog with org-mode"single])(ruby-tools .[(0 1 0)()"Collection of handy functions for ruby-mode"single])(unfill .[(0 1)()"The inverse of fill-paragraph and fill-region"single])(modeline-posn .[(22 0)()"Set up `mode-line-position'."single])(mark-multiple .[(1 0)()"A library that sorta lets you mark several regions at once"single])(mark-more-like-this .[(1 0)()"Mark additional regions in buffer matching current region."single])(openwith .[(20120531)()"Open files with external programs"single])(isearch+ .[(21 0)()"Extensions to `isearch.el'."single])(mouse+ .[(21 0)()"Extensions to `mouse.el'."single])(zencoding-mode .[(0 5 1)()"Unfold CSS-selector-like expressions to markup"single])(smart-mode-line .[(1 7 1)()"A color coded smart mode-line."single])(flymake .[(0 4 16)()"a universal on-the-fly syntax checker"single])(slime-ritz .[(0 6 0)()"slime extensions for ritz"single])(r-autoyas .[(0 28)()"Provides automatically created yasnippets for R function argument lists."single])(key-combo .[(1 5 1)()"map key sequence to commands"single])(ujelly-theme .[(1 0 35)()"Ujelly theme for GNU Emacs 24 (deftheme)"single])(guru-mode .[(0 1)()"Become an Emacs guru"single])(zen-and-art-theme .[(1 0 1)()"zen and art color theme for GNU Emacs 24"single])(save-visited-files .[(1 3)()"save opened files across sessions"single])(git-auto-commit-mode .[(4 2 2)()"Emacs Minor mode to automatically commit and push"single])(haste .[(1)((json (1 2)))"Emacs client for hastebin (http://hastebin.com/about.md)"single])(my-packages .[(0 1 0)()"Package Initialization."single])(zen-mode .[(20120627)()"remove/restore Emacs distractions quickly"tar])(heroku .[(1 1 0)()"Interface to Heroku apps."single])(repository-root .[(1 0 4)()"deduce the repository root directory for a given file"single])(grep-a-lot .[(1 0 7)()"manages multiple search results buffers for grep.el"single])(grep-o-matic .[(1 0 6)()"auto grep word under cursor"single])(el-spec .[(0 2)()"ruby's rspec like syntax test frame work"single])(wc-mode .[(1 1)()"Running word count with goals (minor mode)"single])(legalese .[(1 0)()"Add legalese to your program files"single])(scad-mode .[(90 0)()"SCAD mode derived mode"single])(android-mode .[(0 2 5)()"Minor mode for Android application development"single])(ttl-mode .[(0 1)()"mode for Turtle(RDF)"single])(zeitgeist .[(0 1)()"integrates Emacs with Zeitgeist."single])(dispass .[(1 1 2)()"Emacs wrapper for DisPass"single])(writegood-mode .[(1 2)()"Polish up poor writing on the fly"single])(nrepl .[(0 2 0)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 1)))"Client for Clojure nREPL"single])(fill-column-indicator .[(1 85)()"Graphically indicate the fill column"single])(shell-switcher .[(0 1 5 1)()"Easily switch between shell buffers, like with alt+tab."tar])(github-theme .[(0 0 3)()"Github color theme for GNU Emacs 24"single])(sokoban .[(1 23)()"Play the Sokoban game in emacs"single])(package-store .[(0 3)()"a package cache"single])(python-mode .[(6 0 10)()"Python major mode"tar])(code-headers .[(0 7)()"Navigate code with headers embedded in comments.  -*- mode: Emacs-Lisp; lexical-binding: t; -*"single])(dix .[(0 1 0)()"minor mode for editing Apertium XML dictionary files"single])(tron-theme .[(12)()"A theme loosely based on Tron: Legacy colors"single])(no-easy-keys .[(1 0 2)()"Learn the proper Emacs movement keys"single])(makefile-runner .[(1 1 2)()"Searches for Makefile and fetches targets"single])(elnode .[(0 9 9 7 6)((web (0 1 4)) (dash (1 1 0)) (noflet (0 0 7)) (s (1 5 0)) (creole (0 8 14)) (fakir (0 1 6)) (db (0 0 5)) (kv (0 0 17)))"The Emacs webserver."tar])(midje-mode .[(0 1 2)((slime (1 0)) (clojure-mode (1 0)))"Minor mode for running Midje tests in emacs, see: https://github.com/dnaumov/midje-mode"tar])(gnusnotes .[(0 9 2)()"Adding per-message notes in gnus summary buffer"single])(rinari .[(2 10)((ruby-mode (1 0)) (inf-ruby (2 2 1)) (ruby-compilation (0 8)) (jump (2 0)))"Rinari Is Not A Rails IDE"single])(web .[(0 3 7)()"useful HTTP client -*- lexical-binding: t -*-"single])(eredis .[(0 5 0)()"eredis, a Redis client in emacs lisp"single])(multi-project .[(0 0 8)()"Easily work with multiple projects."single])(egison-mode .[(0 1 4)()"Egison editing mode"single])(mongo .[(0 5)()"A MongoDB client."tar])(cm-mode .[(0 1 0)()"Wrapper for CodeMirror-style Emacs modes"single])(ruby-test-mode .[(1 7)((ruby-mode (1 0)))"Minor mode for Behaviour and Test Driven"single])(marmalade-test .[(0 0 1)()"A test tarball package."tar])(ruby-mode .[(1 1)()"ruby-mode package"tar])(hjkl-mode .[(0 1)((key-chord (0 5)))"import some vim's key bindings"tar])(edit-list .[(0 4)()"edit a single list"single])(persistent-soft .[(0 8 8)((pcache (0 2 3)) (list-utils (0 4 2)))"Persistent storage, returning nil on failure"single])(hippie-namespace .[(0 5 8)()"Special treatment for namespace prefixes in hippie-expand"single])(nav-flash .[(1 1 0)()"Briefly highlight the current line"single])(ucs-utils .[(0 7 6)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utilities for Unicode characters"single])(back-button .[(0 6 6)((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Visual navigation through mark rings"single])(nsis-mode .[(0 44)()"NSIS-mode"single])(window-end-visible .[(0 1 0)()"Find the last visible point in a window"single])(unicode-enbox .[(0 1 4)((string-utils (0 3 2)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Surround a string with box-drawing characters"single])(dynamic-fonts .[(0 6 4)((font-utils (0 7 0)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Set faces based on available fonts"single])(minimal-session-saver .[(0 6 2)()"Very lean session saver"single])(unicode-progress-reporter .[(0 5 4)((emacs (24 1 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Progress-reporter with fancy characters"single])(mongo-elnode .[(0 5 0)((mongo (0 5)) (elnode (0 9 9)))"elnode adapter for mongo-el"single])(eimp .[(1 4 0)()"Emacs Image Manipulation Package"single])(org-presie .[(0 0 5)((framesize (0 0 1)) (eimp (1 4 0)) (org (7 8 9)))"simple presentation with an org file"single])(ido-load-library .[(0 2 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Load-library alternative using ido-completing-read"single])(ac-nrepl .[(0 21)((cider (0 1)) (auto-complete (1 4)))"auto-complete sources for Clojure using nrepl completions"single])(applescript-mode .[(1 1)()"major mode for editing AppleScript source"single])(ssh .[(1 2)()"Support for remote logins using ssh."single])(nrepl-ritz .[(0 6 0)((nrepl (0 1 5)))"nrepl extensions for ritz"single])(doctags .[(0 1)()"Generation of tags documentation in Doxygen syntax"single])(buffer-utils .[(0 1 0)()"Buffer-manipulation utility functions"single])(lisp-editing .[(0 0 5)()"lisp editing tools"single])(exec-path-from-shell .[(1 6)()"Get environment variables such as $PATH from the shell"single])(go-play .[(0 0 1)()"Paste to play.golang.org"single])(yagist .[(0 8 6)((json (1 2 0)))"Yet Another Emacs integration for gist.github.com"single])(margo .[(2012 9 18)((web (0 1 8)) (json (1 2)))"Client for MarGo, providing Go utilities"single])(shoes-off .[(0 1 8)((kv (0 0 5)) (anaphora (0 0 4)))"irc bouncer"single])(multiple-cursors .[(1 2 1)()"Multiple cursors for Emacs."tar])(eshell-manual .[(0 0 2)()"An updated manual for Eshell."tar])(plantuml-mode .[(0 2)()"Major mode for plantuml"single])(hackernews .[(0 1)((json (1 2)))"Access the hackernews aggregator from Emacs"tar])(esk .[(0 1)()"Emacs Search Kit - An easy way to find files and/or strings in a project"tar])(hide-comnt .[(40)()"Hide/show comments in code."tar])(pretty-mode-plus .[(1 0)()"Redisplay parts of the buffer as pretty symbols."tar])(s .[(1 8 0)()"The long lost Emacs string manipulation library."single])(git-commit-mode .[(0 13)()"Major mode for editing git commit messages -*- lexical-binding: t; -*-"single])(db .[(0 0 6)((kv (0 0 11)))"A database for EmacsLisp  -*- lexical-binding: t -*-"single])(notmuch-labeler .[(0 1)()"Improves notmuch way of displaying labels through fonts, pictures, and hyperlinks."tar])(gitignore-mode .[(0 1)()"Major mode for editing .gitconfig files"single])(save-packages .[(0 20121012)()"save and restore installed packages"single])(cmake-project .[(0 6)()"Integrates CMake build process with Emacs"single])(combinators .[(0 0 1)()"-*- lexical-binding: t; -*-"single])(livescript-mode .[(0 0 1)()"Major mode for LiveScript files in Emacs"single])(visible-color-code .[(0 0 1)()"color code strings in current buffer, this elisp show you one as real color."single])(dash .[(2 3 0)()"A modern list library for Emacs"single])(seclusion-mode .[(1 1 1)()"Edit in seclusion. A Dark Room mode."single])(pde .[(0 2 16)()"Perl Development Environment"tar])(tt-mode .[(20121117 2045)()"Emacs major mode for editing Template Toolkit files."tar])(pod-mode .[(20121117 2120)()"Major mode for editing .pod-files."tar])(ercn .[(1 0 2)()"Flexible ERC notifications"single])(bufshow .[(0 1 0)()"A simple presentation tool for Emacs."tar])(parenface-plus .[(1 1)()"Provide a face for parens in lispy modes."tar])(el-x .[(0 2 4)((cl-lib (0 2)))"Emacs-lisp extensions."tar])(json-mode .[(1 1 0)()"Major mode for editing JSON files"single])(buffer-stack .[(1 5)()"Enhanced intelligent switch-to-other-buffer replacement."single])(gnomenm .[(0 0 3)()"Emacs interface to Gnome nmcli command"single])(sequence .[(0 0 1)()"makes sequences of numbers -*- lexical-binding: t -*-"single])(rvm .[(1 3 0)()"Emacs integration for rvm"single])(soothe-theme .[(0 3 16)((emacs (24 1)))"a dark colorful theme for Emacs24."single])(macro-utils .[(1 0)()"Utilities for writing macros."single])(toml-mode .[(0 1 3)()"Mojor mode for editing TOML files"single])(cryptol-mode .[(0 0 2)()"Cryptol major mode for Emacs"single])(proc-net .[(0 0 1)()"network process tools"single])(drupal-spell .[(0 2 2)()"Aspell extra dictionary for Drupal"tar])(thread-dump .[(1 0)()"java thread dump viewer"single])(bitly .[(1 0)()"Shorten URLs using the bitly.com shortener service"single])(color-theme-heroku .[(1 0 0)()"Heroku color theme"single])(github-browse-file .[(0 2 1)()"View the file you're editing on GitHub"single])(lispyscript-mode .[(0 3 0)()"Major mode for LispyScript code."single])(toxi-theme .[(0 1 0)()"REQUIRES EMACS 24"single])(helm-ag .[(0 4)((helm (1 0)))"the silver search with helm interface"single])(perlbrew .[(0 1)((cl (0)))"basic support for perlbrew environments"single])(monokai-theme .[(0 0 10)()"REQUIRES EMACS 24: Monokai Color Theme for Emacs."single])(theme-park-mode .[(0 1 2)()"Take your themes for a ride!"single])(handlebars-sgml-mode .[(0 1 0)()"Add Handlebars contextual indenting support to sgml-mode"single])(issue-tracker .[(0 0 1)()"Poor man's issue tracker"tar])(ido-gnus .[(0 4)((gnus (5 13)))"Access gnus groups or servers using ido"single])(command-t .[(0 0 1)((find-file-in-project (3 2)) (popwin (0 4)))"Finds file in project using fuzzy search."single])(hide-lines .[(20130623 1701)()"Commands for hiding lines based on a regexp"single])(assemblage-theme .[(20130715 621)()"a dark theme for Emacs 24"single])(parenface1.1 .[(1 1)()"Provide a face for parens in lisp modes."single])(rings .[(1 0 1)()"Buffer rings. Like tabs, but better."single])(discord .[(0 5)()"Discordian dates for calendar"single])(zone-matrix .[(0 0 1)()"Matrix themed Zone mode"tar])(anzu .[(0 22)()"Show number of matches in mode-line while searching"single])(org-readme .[(20130322 926)((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0)))"Integrates Readme.org and Commentary/Change-logs."single])(yaoddmuse .[(0 1 1)()"Yet another oddmuse for Emacs"single])(unicode-fonts .[(0 3 8)((font-utils (0 7 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Configure Unicode fonts"single])(button-lock .[(1 0 0)()"Clickable text defined by regular expression"single])(wiki-nav .[(1 0 0)((button-lock (1 0 0)) (nav-flash (1 0 0)))"Simple file navigation using [[WikiStrings]]"single])(unicode-whitespace .[(0 2 4)((ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"teach whitespace-mode about fancy characters"single])(ecb-snapshot .[(20120830)()"Emacs Code Browser CVS snapshot"tar])(pabbrev .[(3 1)()"Predictive abbreviation expansion"single])(ignoramus .[(0 7 0)()"Ignore backups, build files, et al."single])(flyspell-lazy .[(0 6 6)()"Improve flyspell responsiveness using idle timers"single])(browse-url-dwim .[(0 6 6)((string-utils (0 3 2)))"Context-sensitive external browse URL or Internet search"single])(fixmee .[(0 8 4)((button-lock (1 0 0)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 3 2)) (tabulated-list (0)))"Quickly navigate to FIXME notices in code"single])(kv .[(0 0 17)()"key/value data structure functions"single])(less-css-mode .[(0 17)()"Major mode for editing LESS CSS files (lesscss.org)"single])(oauth .[(1 0 3)()"An Emacs oauth client. See https://github.com/psanford/emacs-oauth/"tar])(tumblesocks .[(0 0 7)((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1)))"An Emacs tumblr client."tar])(uuid .[(0 0 3)()"UUID's for EmacsLisp"single])(mustache-mode .[(1 2)()"A major mode for editing Mustache files."single])(erc-hl-nicks .[(1 3 1)()"ERC nick highlighter that ignores uniquifying chars when colorizing"single])(pcmpl-args .[(0 1 1)()"Enhanced shell command completion    -*- lexical-binding: t -*-"single])(el-autoyas .[(0 5)()"Automatically create Emacs-Lisp Yasnippets"single])(anaphora .[(1 0 0)()"anaphoric macros providing implicit temp variables"single])(textmate-to-yas .[(0 21)()"Import Textmate macros into yasnippet syntax"single])(ghci-completion .[(0 1 3)()"Completion for GHCi commands in inferior-haskell buffers -*- lexical-binding: t; -*-"single])(slim-mode .[(1 1)()"Major mode for editing Slim files"single])(google-translate .[(0 4)()"Emacs interface to Google Translate"single])(list-utils .[(0 4 2)()"List-manipulation utility functions"single])(pcre2el .[(1 5)((cl-lib (0 3)))"parse, convert, and font-lock PCRE, Emacs and rx regexps"single])(font-utils .[(0 7 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utility functions for working with fonts"single])(rcirc-robots .[(0 0 7)((kv (0 0 8)) (anaphora (0 0 5)))"robots based on rcirc irc -*- lexical-binding: t -*-"single])(org-ehtml .[(0 20131014)((elnode (20130416 1626)) (org-plus-contrib (20131007)))"Export Org-mode files as editable web pages"tar])(geiser .[(0 4)()"GNU Emacs and Scheme talk to each other"tar])(virtualenv .[(1 2)()"Virtualenv for Python  -*- coding: utf-8 -*-"single])(sprintly-mode .[(0 0 4)((furl (0 0 2)))"Major mode for dealing with sprint.ly"single])(text-language .[(0 20121008)()"tracking, setting, guessing language of text"single])(color-theme-sanityinc-solarized .[(2 25)()"A version of Ethan Schoonover's Solarized themes"tar])(typo .[(1 1)()"Minor mode for typographic editing"single])(ws-trim .[(1 4)()"Tools and minor mode to trim whitespace on text lines"single])(flymake-checkers .[(0 2)()"Flymake reloaded with useful checkers"single])(hardhat .[(0 4 2)((ignoramus (0 7 0)))"Protect against clobbering user-writable files"single])(string-utils .[(0 3 2)((list-utils (0 4 2)))"String-manipulation utilities"single])(smooth-scrolling .[(1 0 1)()"Make emacs scroll smoothly"single])(flymake-go .[(2013 3 14)((flymake (0 4 13)))"A flymake handler for go-mode files"single])(gitty .[(1 0)()"vc-mode extension for fast git interaction"single])(mote-mode .[(1 0 0)((ruby-mode (1 1)))"Mote minor mode"single])(hideshowvis .[(0 5)()"Add markers to the fringe for regions foldable by hideshow.el"single])(inflections .[(1 1)()"convert english words between singular and plural"single])(findr .[(0 7)()"Breadth-first file-finding facility for (X)Emacs"single])(smart-forward .[(1 0 0)((expand-region (0 8 0)))"Semantic navigatioin"single])(osx-browse .[(0 8 8)((string-utils (0 3 2)) (browse-url-dwim (0 6 6)))"Web browsing helpers for OS X"single])(cljsbuild-mode .[(0 2 0)()"A minor mode for the ClojureScript 'lein cljsbuild' command"single])(vector-utils .[(0 1 2)()"Vector-manipulation utility functions"single])(config-block .[(0 0 1)()"config-block is utility for individual settings (e.g. .emacs)."single])(namakemono .[(0 0 1)()"utility function set for namakemono"single])(bang .[(0 1 0)()"A modern list library for Emacs"single])(roy-mode .[(0 1 0)()"Roy major mode"single])(pcsv .[(1 3 3)()"Parser of csv -*- lexical-binding: t -*-"single])(wgrep-ack .[(0 1 1)((wgrep (2 1 1)))"Writable ack-and-a-half buffer and apply the changes to files"single])(flymake-lua .[(1 0)()"Flymake for Lua"single])(rcirc-color .[(0 2)()"color nicks"single])(inform-mode .[(1 6 2)()"Major mode for Inform 6 interactive fiction code"single])(expectations-mode .[(0 0 4)((nrepl (0 1 5)) (clojure-mode (1 11)))"Minor mode for expectations tests"single])(octomacs .[(0 0 1)()"Octopress interface for Emacs"single])(highlight .[(21 0)()"Highlighting commands."single])(region-list-edit .[(20100530 808)()"Add/delete a region into/from a region list, such as ‘((4 . 7) (11 . 15) (17 . 17) (20 . 25))."single])(zjl-hl .[(20121028 1901)((highlight (21 0)) (region-list-edit (20100530 808)))"Highlight variable and function call and others in c/emacs, make life easy."single])(simp .[(0 2 0)()"Simple project definition, chiefly for project file finding and grepping."tar])(truthy .[(0 2 8)((list-utils (0 4 2)))"Test the content of a value"single])(syntactic-sugar .[(0 9 4)()"Effect-free forms such as if/then/else"single])(elpakit .[(1 0 7)((anaphora (0 0 6)) (dash (1 0 3)))"package archive builder"single])(bug-reference-github .[(0 2 0)()"Automatically set `bug-reference-url-format' in Github repositories."single])(color-theme-sanityinc-tomorrow .[(1 10)()"A version of Chris Kempson's various Tomorrow themes"tar])(macrostep .[(0 6)()"interactive macro stepper for Emacs Lisp"single])(qsimpleq-theme .[(0 1 3)()"Based on solarized color theme for Emacs."single])(flymake-easy .[(0 9)()"Helpers for easily building flymake checkers"single])(flymake-ruby .[(0 8)((flymake-easy (0 1)))"A flymake handler for ruby-mode files"single])(flymake-shell .[(0 8)((flymake-easy (0 1)))"A flymake syntax-checker for shell scripts"single])(flymake-coffee .[(0 12)((flymake-easy (0 1)))"A flymake handler for coffee script"single])(flymake-php .[(0 5)((flymake-easy (0 1)))"A flymake handler for php-mode files"single])(flymake-sass .[(0 6)((flymake-easy (0 1)))"Flymake handler for sass files"single])(flymake-css .[(0 3)((flymake-easy (0 1)))"Flymake support for css using csslint"single])(flymake-haml .[(0 7)((flymake-easy (0 1)))"A flymake handler for haml files"single])(flymake-jslint .[(0 10)((flymake-easy (0 1)))"A flymake handler for javascript using jslint"single])(ess-smart-underscore .[(0 79)()"Ess Smart Underscore"single])(skinny .[(0 0 3)((elnode (0 9 9 6 1)) (creole (0 8 17)))"a blog engine with elnode -*- lexical-binding: t -*-"single])(auto-indent-mode .[(0 115)()"Auto indent Minor mode"single])(pyvirtualenv .[(1 1)()"Python Pyvirtualenv support"single])(find-file-in-repository .[(1 3)()"Quickly find files in a git, mercurial or other repository"single])(paredit-menu .[(1 0)()"Adds a menu to paredit.el as memory aid"single])(elpy .[(1 2 1)((auto-complete (1 4)) (find-file-in-project (3 2)) (fuzzy (0 1)) (highlight-indentation (0 5 0)) (idomenu (0 1)) (iedit (0 97)) (nose (0 1 1)) (virtualenv (1 2)) (yasnippet (0 8 0)))"Emacs Python Development Environment"tar])(ace-jump-mode .[(2 0 0 0)()"a quick cursor location minor mode for emacs -*- coding: utf-8-unix -*-"single])(osx-location .[(0 2)()"Watch and respond to changes in geographical location on OS X"tar])(elpa-audit .[(0 4)()"Handy functions for inspecting and comparing package archives"single])(multi-web-mode .[(0 1)()"multiple major mode support for web editing"single])(flycheck .[(0 14 1)((s (1 6 0)) (dash (1 6 0)) (f (0 5 0)) (cl-lib (0 1)) (emacs (24 1)))"On-the-fly syntax checking (Flymake done right)"tar])(chicken-scheme .[(1 0 6)()"Scheme-mode extensions for Chicken Scheme"single])(minimap .[(1 0)()"Sidebar showing a \"mini-map\" of a buffer"single])(session-manager .[(0 5)()"Support for the Gnome Session Manager"single])(ctable .[(0 1 1)()"Table component for Emacs Lisp"single])(grr .[(1 0 0)()"Simple Growl notifications for Emacs and Mac OS X"single])(simpleclip .[(1 0 0)()"Simplified access to the system clipboard"single])(esxml .[(0 3 0)((db (0 0 1)))"Handle HTML with lists."tar])(cpputils-cmake .[(0 4 0)()"Easy real time C++ syntax check and intellisense if you use CMake."tar])(lcs .[(1 1)()"find out the longest common sequence"single])(tracking .[(1 3)((shorten (0 2)))"Buffer modification tracking"single])(lui .[(1 2)((tracking (1 3)))"Linewise User Interface"tar])(circe .[(1 2)((lui (1 2)) (lcs (1 1)))"Client for IRC in Emacs"tar])(iedit .[(0 97)()"Edit multiple regions in the same way simultaneously."tar])(let-recur .[(0 0 5)()"Simplified implementation of recur -*- lexical-binding:t -*-"single])(wgrep-helm .[(0 1 0)((wgrep (2 1 1)))"Writable helm-grep-mode buffer and apply the changes to files"single])(otter-mode .[(1 2)()"Major mode for source files of the Otter automated theorem prover"single])(sql-indent .[(1 10)()"indentation of SQL statements"single])(maildir .[(0 0 20)((kv (0 0 17)))"Simple maildir based MUA."tar])(huskie .[(0 0 2)((anaphora (0 0 6)))"chainsaw powered logging"single])(color-theme-x .[(1 3)()"convert color themes to X11 resource settings"single])(gplusify .[(1 0)()"Add Google Plus markup to a piece of code"single])(diatheke .[(1 0)()"A minor mode using the diatheke command-line Bible tool"single])(inf-ruby .[(2 3 2)()"Run a Ruby process in a buffer"single])(extend-dnd .[(0 5)()"R drag and Drop"single])(wxwidgets-help .[(0 0 3)()"Look up wxWidgets API by using local html manual."tar])(sudden-death .[(0 2)()"Totsuzen-no-Shi"single])(fold-this .[(0 1 0)()"Just fold this region please"single])(dart-mode .[(0 9)()"Major mode for editing Dart files"single])(subshell-proc .[(0 2)()"Functions for working with comints"single])(pg .[(0 12)()"Emacs Lisp interface to the PostgreSQL RDBMS"single])(db-pg .[(0 0 3)((pg (0 12)) (db (0 0 6)))"A PostgreSQL adapter for emacs-db"single])(hippie-expand-haskell .[(0 0 1)()"Hippie expand try function using ghc's completion function."single])(slamhound .[(2 0 0)()"Rip Clojure namespaces apart and rebuild them."single])(clojure-mode .[(2 1 0)()"Major mode for Clojure code"single])(clojure-test-mode .[(2 1 0)((clojure-mode (1 7)) (nrepl (0 1 7)))"Minor mode for Clojure tests"single])(late-night-theme .[(0 0)()"Late Night theme for Emacs 24"single])(creole-mode .[(0 0 5)()"a markup mode for creole"single])(evil-paredit .[(0 0 1)((evil (0 0 0)) (paredit (1)))"Paredit support for evil keybindings"single])(websocket .[(1 0)()"Emacs WebSocket client and server"single])(evil-nerd-commenter .[(1 2 4)()"Comment/uncomment lines efficiently. Like Nerd Commenter in Vim"tar])(projectile .[(0 9 2)((s (1 0 0)) (dash (1 0 0)))"Manage and navigate projects in Emacs easily"single])(keyfreq .[(0 0 3)((json (1 2)))"track command frequencies"single])(robe .[(0 7 6)((inf-ruby (2 3 0)))"Code navigation, documentation lookup and completion for Ruby"tar])(dropbox .[(0 9 1)((json (1 2)) (oauth (1 0 3)))"Emacs backend for dropbox"single])(simple-mode-line .[(0 3)()"Simplified Mode Line for Emacs 24"single])(pov-mode .[(3 3)()"Major mode for editing POV-Ray scene files."tar])(creole .[(1 0 3)((noflet (0 0 3)) (kv (0 0 17)))"A parser for the Creole Wiki language"single])(tup-mode .[(1 2)()"Major mode for editing files for Tup"single])(bbcode-mode .[(1 1 0)()"Major mode for writing BBCode markup"single])(markup-faces .[(1 0 0)()"collection of faces for markup language modes"single])(flymake-json .[(0 1)((flymake-easy (0 1)))"A flymake handler for json using jsonlint"single])(adoc-mode .[(0 6 2)((markup-faces (1 0 0)))"a major-mode for editing AsciiDoc files in Emacs"single])(hardcore-mode .[(1 0 0)()"Disable arrow keys + optionally backspace and return"single])(spotify .[(0 2)()"Control the spotify application from emacs"single])(hlinum .[(1 0)()"Extension for linum.el to highlight current line number"single])(aes .[(0 5)()"Implementation of AES"single])(kwin .[(0 1)()"communcate with the KWin window manager"single])(clj-refactor .[(0 2 0)((s (1 3 1)) (dash (1 0 3)) (yasnippet (0 6 1)))"A collection of clojure refactoring functions"single])(nemerle .[(0 2)()"major mode for editing nemerle programs"single])(markdown-mode .[(1 9)()"Emacs Major mode for Markdown-formatted text files"single])(nimrod-mode .[(0 1 5)((auto-complete (1 4)))"A major mode for the Nimrod programming language"single])(rbenv .[(0 0 3)()"Emacs integration for rbenv"single])(evil .[(1 0 7)((undo-tree (0 5 1)))"Extensible Vi layer for Emacs."tar])(world-time-mode .[(0 0 2)()"show whole days of world-time diffs"single])(inline-crypt .[(0 1 4)()"Simple inline encryption via openssl"tar])(tagedit .[(1 4 0)((s (1 3 1)) (dash (1 0 3)))"Some paredit-like features for html-mode"single])(vertica .[(0 1 0)((sql (3 0)))"Vertica SQL mode extension"single])(hive .[(0 1 1)((sql (3 0)))"Hive SQL mode extension"single])(smart-window .[(0 6)()"vim-like window controlling plugin"single])(requirejs-mode .[(1 1)()"Improved AMD module management"single])(gruber-darker-theme .[(0 6)()"Gruber Darker color theme for Emacs 24."single])(rust-mode .[(0 1 0)((cm-mode (0 1 0)))"A major emacs mode for editing Rust source code"single])(framesize .[(0 0 5)((key-chord (0 5 20080915)))"change the size of frames in Emacs"single])(deep-thought-theme .[(0 1 1)()"Emacs 24 theme with the Answer to The Ultimate Question"single])(image-dired+ .[(0 6 0)()"Image-dired extensions"single])(erefactor .[(0 6 10)()"Emacs-Lisp refactoring utilities"single])(generate-autoloads .[(0 0 10)()"A package to help you lazy-load everything"single])(lisp-infection .[(0 0 10)()"Commands to *enhance* S-exp editing"single])(backtrace-mode .[(0 0 10)()"A better way to browse /var/log/messages files"single])(tabulated-list .[(0)()"generic major mode for tabulated lists."single])(package .[(1 0)((tabulated-list (0)))"Simple package system for Emacs"single])(ert .[(0)()"Emacs Lisp Regression Testing"single])(nurumacs .[(3 4 1)()"smooth-scrolling and minimap"single])(mark-tools .[(0 3)()"Some simple tools to access the mark-ring in Emacs"single])(todotxt .[(0 2 3)()"A major mode for editing todo.txt files"single])(git-gutter .[(0 42)()"Port of Sublime Text plugin GitGutter"single])(vimrc-mode .[(0 3 1)()"Major mode for vimrc files"single])(control-lock .[(1 1 2)()"Like caps-lock, but for your control key.  Give your pinky a rest!"single])(fic-ext-mode .[(0 1)()"Show FIXME/TODO/BUG(...) in special face only in comments and strings"single])(cups .[(0 1)()"CUPS features for Emacs"single])(vcard .[(0 1)()"vcard parsing and display routines"single])(babcore .[(0 0 5)()"Core Emacs configuration. This should be the minimum in every emacs config."single])(edebug-x .[(1 2)((dash (1 1 0)))"Extensions for Edebug"single])(loop .[(1 1)()"friendly imperative loop structures"single])(tex-smart-umlauts .[(1 2 0)()"Smart umlaut conversion for TeX."single])(ht .[(0 8)()"The missing hash table library for Emacs"single])(haml-mode .[(3 1 3)((ruby-mode (1 0)))"Major mode for editing Haml files"single])(flymake-hlint .[(0 2)((flymake-easy (0 1)))"A flymake handler for haskell-mode files using hlint"single])(django-theme .[(1 3 0)()"Custom face theme for Emacs"single])(pinboard .[(0 0 1)()"get stuff from pinboard -*- lexical-binding: t -*-"single])(isea .[(0 0 2)((elpakit (0 0 18)))"interactive server eval at mode, a comint for a daemonized emacs -*- lexical-binding: t -*-"single])(wrap-region .[(0 7 1)()"Wrap text with punctation or tag"single])(lexbind-mode .[(0 8)()"Puts the value of lexical-binding in the mode line"single])(auto-highlight-symbol .[(1 55)()"Automatic highlighting current symbol minor mode"single])(dot-mode .[(1 12)()"minor mode to repeat typing or commands"single])(main-line .[(1 2 8)()"modeline replacement forked from an early version of powerline.el"single])(show-css .[(1 1)()"Show the css of the html attribute the cursor is on"single])(supergenpass .[(0 1)()"SuperGenPass for Emacs"single])(with-namespace .[(1 1)()"Poor-man's namespaces for elisp"single])(flymake-haskell-multi .[(0 3)((flymake-easy (0 1)))"Syntax-check haskell-mode using both ghc and hlint"tar])(sackspace .[(0 8 2)()"A better backspace"single])(volatile-highlights .[(1 10)()"Minor mode for visual feedback on some operations."single])(everything .[(0 1 5)()"Bridge to MS Windows desktop-search engine Everything"single])(grapnel .[(0 5 3)()"HTTP request lib with flexible callback dispatch"single])(tumble .[(1 5)()"an Tumblr mode for Emacs"single])(rubyinterpol .[(0 1)()"Ruby-like String Interpolation for format"single])(smartparens .[(1 6 1)((cl-lib (0 1)) (dash (2 3 0)))"Automatic insertion, wrapping and paredit-like navigation with user defined pairs."tar])(latest-clojars .[(0 3)()"Clojure dependency resolver"single])(helm-gtags .[(0 9 2)((helm (1 0)))"GNU GLOBAL helm interface"single])(quickrun .[(1 8 4)()"Run commands quickly"single])(git-gutter-fringe .[(0 12)((git-gutter (0 42)) (fringe-helper (0 1 1)))"Fringe version of git-gutter.el"single])(center-text .[(0 8)()"Center the text in a fixed-width column"single])(ert-x .[(0)((ert (0)))"Staging area for experimental extensions to ERT"single])(clj-mode .[(0 9)()"basic Major mode (clj) for Clojure code"single])(ruby-hash-syntax .[(0 3)()"Toggle ruby hash syntax between classic and 1.9 styles"single])(psgml .[(1 4 1)()"Lennart Staflin's Psgml package, with Elisp syntax and sgml-validate fixed for Emacsen >=24."tar])(swarmhacker .[(0 0 1)()"simple swarm chat"single])(theme-changer .[(2 1 0)()"Sunrise/Sunset Theme Changer for Emacs"single])(ttrss .[(1 7 5)((emacs (23 1)))"Tiny Tiny RSS elisp bindings"single])(emacs-droid .[(0 0 0)()"Android application development tools for Emacs"single])(sea-before-storm-theme .[(0 3)()"Sea Before Storm color theme for Emacs 24"single])(flymake-python-pyflakes .[(0 8)((flymake-easy (0 8)))"A flymake handler for python-mode files using pyflakes (or flake8)"single])(ibuffer-vc .[(0 7)((cl-lib (0 2)))"Group ibuffer's list by VC project, or show VC status"single])(letcheck .[(0 2)()"Check the erroneous assignments in let forms"single])(clippy .[(1 0)((pos-tip (1 0)))"Show tooltip with function documentation at point"single])(wacspace .[(0 4 1)((dash (1 2 0)) (cl-lib (0 2)))"The WACky WorkSPACE manager for emACS"tar])(kanban .[(0 1 2)()"Parse org-todo headlines to use org-tables as Kanban tables"single])(flymake-elixir .[(0 5)()"A flymake handler for elixir-mode .ex files.     "single])(surround .[(0 1)()"emulate surround.vim from Vim"single])(marmalade-service .[(2 0 9)((dash (1 1 0)) (s (1 6 0)) (elnode (0 9 9 6 10)))"The Marmalade package store service."tar])(wcheck-mode .[(2013 6 25)()"General interface for text checkers"tar])(rubocop .[(0 3)((dash (1 0 0)))"An Emacs interface for RuboCop"single])(indent-guide .[(1 0 1)()"show vertical lines to guide indentation"single])(suomalainen-kalenteri .[(2013 4 18)()"Finnish national and Christian holidays for calendar"tar])(simplezen .[(0 1 1)()"A simple subset of zencoding-mode for Emacs."single])(company-cmake .[(0 1)((company (0 6 8)))"company-mode completion back-end for CMake"single])(groovy-mode .[(201203310931)()"Groovy mode derived mode"single])(ruby-compilation .[(0 17)((inf-ruby (2 2 1)))"run a ruby process in a compilation buffer"single])(better-defaults .[(0 1 2)()"Fixing weird quirks and poor defaults"single])(gather .[(1 0 4)()"Gather string in buffer."single])(typing-practice .[(0 1)()"Typing practice"single])(ag .[(0 32)()"A front-end for ag ('the silver searcher'), the C ack replacement."single])(helm-projectile .[(0 9 2)((helm (1 4 0)) (projectile (0 9 2)))"Helm integration for Projectile"single])(r5rs .[(1 0)()"Browse documentation from the R5RS Revised5 Report"single])(paredit-everywhere .[(0 3)((paredit (22)))"Enable some paredit features in non-lisp buffers"single])(region-bindings-mode .[(0 1)()"Enable custom bindings when mark is active."single])(string-edit .[(0 1 0)((dash (1 2 0)))"Avoid escape nightmares by editing string in separate buffer"single])(flycheck-color-mode-line .[(0 2)((flycheck (0 13)) (dash (1 2)) (emacs (24 1)))"Change mode line color with Flycheck status -*- lexical-binding: t -*-"single])(angular-snippets .[(0 2 3)((s (1 4 0)) (dash (1 2 0)))"Yasnippets for AngularJS"tar])(command-stats .[(0 1)()"Track frequency of commands executed in emacs"single])(stripe-buffer .[(0 2 2)((cl-lib (1 0)))"Use a different background for even and odd lines"single])(sparql-mode .[(0 7 2)()"Edit and interactively evaluate SPARQL queries."single])(butler .[(0 1 3)((web (0 3 7)))"Client for Jenkins"single])(colour-region .[(0 4)()"Toggle regions of the buffer with different text snippets"single])(org-dotemacs .[(0 3)((org (7 9 3)) (cl-lib (1 0)))"Store your emacs config as an org file, and choose which bits to load."single])(fm .[(20130612 1)()"follow mode for compilation/output buffers"single])(bs-ext .[(0 2)()"Extensions to emacs buffer-selection library (bs.el)"single])(look-mode .[(1 0)()"quick file viewer for image and text file browsing"single])(look-dired .[(0 1)((look-mode (1 0)))"Extensions to look-mode for dired buffers"single])(dired-dups .[(0 3)()"Find duplicate files and display them in a dired buffer"single])(nzenburn-theme .[(20130513)()"A low contrast color theme for Emacs."single])(noflet .[(0 0 10)()"locally override functions"single])(simple-call-tree+ .[(1 3)()"Extensions to simple-call-tree"single])(eviews .[(0 1)()"Major-mode for editing eviews program files"single])(bbdb-ext .[(0 1)((bbdb (2 36)))"Extra commands for BBDB"single])(bar-cursor .[(1 1)()"package used to switch block cursor to a bar"single])(s-buffer .[(0 0 4)((s (1 6 0)) (noflet (0 0 3)))"s operations for buffers"single])(nodejs-repl .[(0 0 2 1)()"Run Node.js REPL"single])(evil-leader .[(0 4 1)((evil (0)))"let there be <leader>"single])(fuzzy-format .[(0 1 1)()"select indent-tabs-mode and format code automatically."single])(psvn .[(1 1 1)()"Subversion interface for emacs"single])(javarun .[(0 1 1)()"Minor mode for quick development of Java programs"single])(slough .[(0 1)((nrepl (0 1 7)) (smartparens (1 4 3)))"package for slough - this is for a secret TW thing"single])(express .[(0 6 0)((string-utils (0 3 2)))"Alternatives to `message'"single])(elisp-slime-nav .[(0 6)((cl-lib (0 2)))"Make M-. and M-, work in elisp like they do in slime"single])(fullscreen-mode .[(0 0 1)()"fullscreen window support for Emacs"single])(current-story .[(0 1 0)()"Track and insert current Pivotal Tracker"single])(kmacro-decision .[(1 5)((el-x (1 0)) (jb-misc-macros (0 2)))"Add conditional branching to keyboard macros"single])(jedi .[(0 1 2)((epc (0 1 0)) (auto-complete (1 4)))"Python auto-completion for Emacs"tar])(request .[(0 2 0)()"Compatible layer for URL request in Emacs"single])(request-deferred .[(0 2 0)((deferred (0 3 1)) (request (0 2 0)))"Wrap request.el by deferred"single])(show-marks .[(0 4)((fm (1 0)))"Navigate and visualize the mark-ring"single])(irfc .[(0 5 6)()"Interface for IETF RFC document."single])(apt-utils-ido .[(0 2)((apt-utils (1 212)))"Ido commands for apt-utils"single])(apt-utils .[(1 212)()"Emacs interface to APT (Debian package management)"single])(emms-mark-ext .[(0 3)((emms (3 0)))"Extra functions for emms-mark-mode and emms-tag-edit-mode"single])(emamux .[(0 1)()"Interact with tmux"single])(mustache .[(0 20)((ht (0 9)) (s (1 3 0)) (dash (1 2 0)))"a mustache templating library in emacs lisp"tar])(esup .[(0 3)()"the Emacs StartUp Profiler (ESUP)"single])(subatomic-enhanced-theme .[(20130226 2229)()"Nice looking emacs 24 theme"single])(highlight-escape-sequences .[(0 1)()"Highlight escape sequences -*- lexical-binding: t -*-"single])(jinja2-mode .[(0 1)()"A major mode for jinja2"single])(mode-icons .[(0 1 0)()"Show icons for modes"tar])(shorten .[(0 2)()"component-wise string shortener"single])(fakir .[(0 1 7)((noflet (0 0 3)) (dash (1 3 2)))"fakeing bits of Emacs -*- lexical-binding: t -*-"single])(desktop-registry .[(1 1 0)()"Keep a central registry of desktop files -*- lexical-binding: t -*-"single])(tabbar-ruler .[(0 40)((tabbar (2 0 1)))"Pretty tabbar, autohide, use both tabbar/ruler"single])(org-journal .[(1 4 6)()"a simple org-mode based journaling mode"single])(editorconfig .[(0 2)()"EditorConfig Emacs extension"single])(flymake-less .[(0 3)((less-css-mode (0 15)))"Flymake handler for LESS stylesheets (lesscss.org)"single])(sawfish .[(1 32)()"Sawfish mode."single])(ob-sml .[(0 1)((sml-mode (6 4)))"org-babel functions for template evaluation"single])(dired-efap .[(0 8)()"Edit Filename At Point in a dired buffer"single])(occur-x .[(0 1 1)()"Extra functionality for occur"single])(php-extras .[(1 0 0 20130923)((php-mode (1 5 0)))"Extra features for `php-mode'"tar])(rspec-mode .[(1 7)((ruby-mode (1 0)))"Enhance ruby-mode for RSpec"single])(syslog-mode .[(2 2)((hide-lines (20130623)))"Major-mode for viewing log files"single])(jb-misc-macros .[(0 4)((macro-utils (1 0)))"Miscellaneous macros"single])(man-commands .[(1 1)()"Add interactive commands for every manpages installed in your computer."single])(cloud-to-butt-erc .[(1 0 0)()"Replace 'the cloud' with 'my butt'"single])(pager-default-keybindings .[(1 1)()"Add the default keybindings suggested for pager.el"single])(hook-utils .[(1 0)()"Add a few utility functions for manipulating hooks"single])(occur-default-current-word .[(1 0)()"Have M-x occur default to the word at point"single])(scratch-persist .[(1 1)()"persist the scratch buffer across sessions"single])(company-inf-ruby .[(0 2)((company (0 6 10)) (inf-ruby (2 2 7)))"company-mode completion back-end for inf-ruby"single])(debian-changelog-mode .[(1 96)()"major mode for Debian changelog files."single])(sourcetalk .[(1 1 0)((request (0 2 0)))"SourceTalk (http://sourcetalk.net) plugin for Emacs"single])(chm-view .[(0 2 2)()"View CHM file."single])(org-trello .[(0 2 2)((org (8 0 7)) (dash (1 5 0)) (request (0 2 0)) (cl-lib (0 3 0)) (json (1 2)) (elnode (0 9 9 7 6)) (esxml (0 3 0)) (s (1 7 0)) (kv (0 0 17)))"Org minor mode to synchronize with trello"tar])(remember-theme .[(20130807 1251)()"Remembers the last theme in use and re-loads for the next session."single])(parscope .[(0 1 0)()"Minor mode for showing the current scope in Lisp-like languages."single])(grizzl .[(0 1 1)((cl-lib (0 1)))"Fuzzy Search Library & Completing Read"tar])(flx .[(0 1)()"fuzzy matching with good sorting"single])(flx-ido .[(0 2)((flx (0 1)))"flx integration for ido"single])(parenface-reversion .[(1 2)()"Provide a face for parens in lisp modes."single])(git-gutter-fringe+ .[(0 0 2)((git-gutter+ (0 1)) (fringe-helper (20130519 1641)))"Fringe version of git-gutter+.el"single])(fringe-helper .[(1 0 1)()"helper functions for fringe bitmaps"single])(org-protocol-jekyll .[(0 1)()"Jekyll's handler for org-protocol"single])(gandalf-theme .[(0 1)()"Gandalf color theme"single])(processing-mode .[(1 2 1)()"Major mode for Processing 2.0"single])(gitconfig .[(1 0 0)()"Emacs lisp interface to work with git-config variables"single])(processing-snippets .[(1 0 0)((yasnippet (0 8 0)))"Snippets for the Processing major mode"tar])(modtime-skip-mode .[(0 9)()"Minor mode for disabling modtime and supersession checks on files."single])(web-mode .[(7 0 50)()"major mode for editing html templates"single])(nrepl-decompile .[(0 0 1)((nrepl (0 1 7)) (javap-mode (9)))"decompilation extension for nrepl.el"single])(fit-frame .[(0)()"Resize a frame.  In particular, fit a frame to its buffers."single])(pickup .[(0 0 3)()"pickup file. "single])(cubicle-mode .[(0 1)()"Cubicle major mode for emacs"single])(py-import-check .[(0 2)()"Finds the unused python imports using importchecker"single])(palimpsest .[(0 8)()"Various deletion strategies when editing"single])(flymake-puppet .[(1 0 0)((flymake-easy (0 9)))"An Emacs flymake handler for syntax-checking puppet using puppet-lint"single])(sparkline .[(0 3 0)()"Make sparkline images from a list of numbers"single])(wedge-ws .[(0 1 2)()"Wedge whitespace between columns in text"tar])(emmet-mode .[(1 0 5)()"Unofficial Emmet's support for emacs"single])(helm-delicious .[(1 3)()"helm extensions for delicious bookmarks"single])(ample-theme .[(0 2 4)()"Calm Dark Theme for Emacs "single])(frame-restore .[(0 4)((dash (1 2)) (f (0 11)) (emacs (24 1)))"Restore Emacs frame -*- lexical-binding: t; -*-"single])(tsql .[(1 0)()"customizes sql.el for T-SQL"single])(wisp-mode .[(0 1 2)()"Major mode for editing wisp: Whitespace-to-Lisp"single])(heroku-theme .[(1 1 0)()"Heroku color theme"single])(god-mode .[(2 7 3)()"God-like command entering minor mode"single])(helm-recoll .[(20130905 2330)((helm (1 5 4)))"helm interface for the recoll desktop search tool."single])(magit-tramp .[(0 1 0)((magit (1 2 0)))"git method for TRAMP"single])(aok .[(0 1)()"various useful ways to do `multi-occur'"single])(pkg-info .[(0 4)((dash (1 6 0)) (epl (0 4)))"Information about packages       -*- lexical-binding: t; -*-"single])(dash-functional .[(1 0 0)((dash (2 0 0)) (emacs (24)))"Collection of useful combinators for Emacs Lisp  -*- lexical-binding: t -*-"single])(flycheck-cask .[(0 1)((flycheck (0 14)) (dash (2 0 0)) (f (0 6 0)))"Cask support in Flycheck -*- lexical-binding: t; -*-"single])(openstack-cgit-browse-file .[(0 2)()"Browse the current file in OpenStack cgit"single])(tronesque-theme .[(1 3)()"Color Theme based on Tron universe."single])(smtpmail-multi .[(0 6)()"Use different smtp servers for sending mail"single])(figlet .[(289)()"banner generator"single])(smart-whitespace-comment-fixup .[(1 0)()"Enables advice around yanking/killing lines that auto-indents and formats properly"single])(insert-shebang .[(0 9 2)()"Inserts shebang line automatically"tar])(tox .[(0 1)()"Launch current python test with tox."single])(winpoint-ignore-dired .[(1 1)((winpoint (1 0)))"Have winpoint ignore dired-mode buffers"single])(comint-better-defaults .[(1 0)()"better defaults for comint-derived modes"single])(waher-theme .[(20130917 7)((emacs (24 1)))"Emacs 24 theme based on waher for st2 by dduckster"single])(gerrit-download .[(0 2)((magit (20130828 1540)))"Show gerrit reviews in a diff buffer."single])(multi .[(2 0 1)((emacs (24)))"Clojure-style multi-methods for emacs lisp -*- lexical-binding: t -*-"single])(evil-indent-textobject .[(0 2)((evil (0)))"evil textobjects based on indentation"single])(git-gutter+ .[(0 1)((git-commit-mode (1 0)))"Manage Git hunks straight from the buffer"single])(helm-helm-commands .[(0 2)((helm (1 5 4)))"List all helm commands with helm"single])(paste-kde .[(0 5)((web (0 3 6)))"paste text to KDE's pastebin service"single])(jujube-theme .[(0 1)()"Pastel theme loosely based on jellybeans"single])(purple-haze-theme .[(20130930 36)((emacs (24 0)))"an overtly purple color theme for Emacs24."single])(clues-theme .[(20130908 801)((emacs (24 0)))"an Emacs 24 theme which may well be fully awesome..."single])(wonderland .[(0 1 1)((dash (2 0 0)) (dash-functional (1 0 0)) (multi (2 0 0)) (emacs (24)))"declarative configuration for Emacsen -*- lexical-binding: t -*-"single])(simple-httpd .[(1 4 4)()"pure elisp HTTP server"single])(elfeed .[(1 0 1)((emacs (24 1)))"an Emacs web feed reader"tar])(elfeed-web .[(1 0 1)((simple-httpd (1 4 3)) (elfeed (1 0 1)) (emacs (24 1)))"web interface to Elfeed"tar])(skewer-mode .[(1 5 3)((simple-httpd (1 4 0)) (js2-mode (20090723)))"live browser JavaScript, CSS, and HTML interaction"tar])(shell-pop .[(0 2)()"helps you to use shell easily on Emacs. Only one key action to work."single])(page-break-lines .[(0 8)()"Display ugly ^L page breaks as tidy horizontal lines"single])(awk-it .[(0 77)()"Run AWK interactively on region!"single])(f .[(0 11 0)((s (1 7 0)) (dash (2 2 0)))"Modern API for working with files and directories"single])(hl-spotlight .[(0)()"Extension of hl-line.el to spotlight current few lines."single])(highlight-current-line .[(0 57)()"highlight line where the cursor is."single])(whitespace-cleanup-mode .[(0 8)()"Intelligently call whitespace-cleanup on save"single])(isgd .[(20130927)()"Shorten URLs using the isgd.com shortener service"single])(java-file-create .[(1 0)()"automatically insert contents of empty java files"single])(ac-geiser .[(0 1)((geiser (0 5)) (auto-complete (1 4)))"Auto-complete backend for geiser"tar])(iasm-mode .[(0 1)()"interactive assembly major mode."single])(ample-zen-theme .[(0 1)()"AmpleZen Theme for Emacs 24"single])(tommyh-theme .[(1 2)()"A bright, bold-colored theme for emacs."single])(ac-slime .[(0 5)()"An auto-complete source using slime completions"single])(pbcopy .[(0 1 0)()"OS X clipboard integration for Emacs"single])(timestamper .[(0 1 0)()"A minor mode for easy timelogging"single])(tbemail .[(0 2)()"Provide syntax highlighting for email editing via"single])(evil-matchit .[(0 0 7)()"Vim matchit ported into Emacs (requires EVIL)"tar])(ruby-end .[(0 3 1)()"Automatic insertion of end blocks for Ruby"single])(dpaste_de .[(0 2)((web (0 3 7)))"Emacs mode to paste to dpaste.de"single])(skewer-less .[(0 2)((skewer-mode (1 5 3)))"Skewer support for live LESS stylesheet updates"single])(sensitive .[(1 0 1)((emacs (24)) (sequences (0 1 0)))"A dead simple way to load sensitive information"single])(sequences .[(0 1 0)((emacs (24)))"Ports of some Clojure sequence functions."single])(epl .[(0 4)((cl-lib (0 3)))"Emacs Package Library -*- lexical-binding: t; -*-"single])(magit-find-file .[(1 0 4)((magit (1 2 0)))"completing-read over all files in Git"single])(list-register .[(2 2)()"List register"single])(project-explorer .[(0 9)((cl-lib (0 3)) (es-lib (0 3)))"A project explorer sidebar -*- lexical-binding: t -*-"single])(charmap .[(0 0 1)()"Unicode table for Emacs"single])(latex-preview-pane .[(20131020)()"Makes LaTeX editing less painful by providing a updatable preview pane"tar])(latest-clojure-libraries .[(0 5)()"Clojure dependency resolver"single])(proxy-mode .[(0 9)()"Provides proxy minor mode."single])(elixir-mix .[(0 2 4)()"Emacs integration for Elixir's mix"single])(lyskom .[(20131008)()"LysKOM elisp client."single])(cider .[(0 3 1)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 3)))"Clojure IDE and REPL"tar])(relax .[(0 2)((json (1 2)))"For browsing and interacting with CouchDB"single])(flatland-theme .[(0 1 2)()"A simple theme for Emacs."single])(immutant-server .[(1 0 0)()"Run your Immutant server in Emacs"single])(ac-inf-ruby .[(0 4)((inf-ruby (2 3 2)) (auto-complete (1 4)))"Enable auto-complete in inf-ruby sessions"single])(json-snatcher .[(1 0)()"Grabs the path to JSON values in a JSON file."single])(nrepl-discover .[(0 0 1)()"Client to load commands from nrepl server"single])(cmake-mode .[(20110824)()"major-mode for editing CMake sources"single])(ido-vertical-mode .[(0 1 1)()"Makes ido-mode display vertically."single]))
\ No newline at end of file
+(1(haml-mode .[(3 1 3)((ruby-mode (1 0)))"Major mode for editing Haml files"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 9)()"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 2 0)()"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 7)()"Yet Another RI interface for Emacs"single])(html-script-src .[(0 0 2)()"Insert <script src=\"..\"> for popular JavaScript libraries"single])(enclose .[(0 0 2)()"Enclose cursor within punctuation pairs"single])(mactag .[(0 0 1)()"Mode for automatically handle multiple tags files with Mactag rubygem"single])(undo-tree .[(0 3 1)()"Treat undo history as a tree"single])(diminish .[(0 44)()"Diminished modes are minor modes with no modeline display"single])(notify .[(2010 8 20)()"notification front-end"single])(keywiz .[(1 4)()"Emacs key sequence quiz"single])(descbinds-anything .[(1 5)((anything (1 287)))"Yet Another `describe-bindings' with `anything'."single])(autopair .[(0 3)()"Automagically pair braces and quotes like TextMate"single])(highlight-parentheses .[(1 0 1)()"highlight surrounding parentheses"single])(rvm .[(1 3 0)()"Emacs integration for rvm"single])(anything .[(1 287)()"open anything / QuickSilver-like candidate-selection framework"single])(anything-config .[(0 4 1)()"Predefined configurations for `anything.el'"single])(anything-match-plugin .[(1 27)()"Humane match plug-in for anything"single])(closure-template-html-mode .[(0 1)()"highlighting for google closure templates"single])(gist .[(1 1 1)((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0)))"Emacs integration for gist.github.com"single])(highlight-symbol .[(1 1)()"automatic and manual symbol highlighting"single])(color-theme-twilight .[(0 1)()"Twilight Colour Theme for Emacs."single])(browse-kill-ring .[(1 3 1)()"interactively insert items from kill-ring -*- coding: utf-8 -*-"single])(buffer-move .[(0 4)()"swap buffers between windows"single])(dired-single .[(1 7 0)()"reuse the current dired buffer to visit another directory"single])(php-mode .[(1 5 0)()"major mode for editing PHP code"single])(c-eldoc .[(0 5)()"helpful description of the arguments to C functions"single])(full-ack .[(0 2 3)()"a front-end for ack"single])(find-file-in-project .[(3 2)()"Find files in a project quickly."single])(project .[(1 0)()"Keep track of the current project"single])(goto-last-change .[(1 2)()"Move point through buffer-undo-list positions -*-unibyte: t; coding: iso-8859-1;-*-"single])(http-twiddle .[(1 0)()"send & twiddle & resend HTTP requests"single])(mac-key-mode .[(2010 1 3)()"provide mac-style key bindings on Carbon Emacs"single])(flymake-cursor .[(1 0 2)((flymake (0 3)))"Show flymake messages in the minibuffer after delay"tar])(multi-term .[(0 8 8)()"Managing multiple terminal buffers in Emacs."single])(parenface .[(1 1)()"Provide a face for parens in lisp modes."single])(gnuplot .[(0 6 0)()"drive gnuplot from within emacs"single])(auto-indent-mode .[(0 123)()"Auto indent Minor mode"single])(nsis-mode .[(0 44)()"NSIS-mode"single])(ecb .[(2 40)()"Emacs Code Browser"tar])(speck .[(2010 5 25)()"minor mode for spell checking"single])(hexrgb .[(21 0)()"Functions to manipulate colors, including RGB hex strings."single])(icomplete+ .[(21 0)()"Extensions to `icomplete.el'."single])(lacarte .[(22 0)()"Execute menu items as commands, with completion."single])(synonyms .[(1 0)()"Look up synonyms for a word or phrase in a thesaurus."single])(predictive .[(0 19 5)()"Predictive Mode (Contains Dependencies)"tar])(rw-hunspell .[(0 2)()"special functions for Hunspell in ispell.el"single])(rw-ispell .[(0 1)()"additional functions for ispell.el"single])(rw-language-and-country-codes .[(0 1)()"Language & Country Codes"single])(yas-jit .[(0 8 3)()"Loads Yasnippets on demand (makes start up faster)"single])(textmate-to-yas .[(0 21)()"Import Textmate macros into yasnippet syntax"single])(ntcmd .[(1 0)()"major mode for editing cmd scripts"single])(org-table-comment .[(0 2)()" Org table comment modes."single])(anything-extension .[(0 2)()"Extension functions for anything.el"single])(powershell .[(0 2 1)()"run powershell as an inferior shell in emacs"single])(cdlatex .[(4 0)()"Fast input methods for LaTeX environments and math"single])(anything-R .[(0 1 2010)()"anything-sources and some utilities for GNU R."single])(anything-el-swank-fuzzy .[(0 1 2009)()"anything-sources for el-swank-fuzzy.el"single])(anything-ipython .[(0 1 2009)()" Ipython anything"single])(color-file-completion .[(1 0 1)()"add colors to file completion"single])(color-theme-emacs-revert-theme .[(0 1)()"Color-theme revert to emacs colors"single])(anything-complete .[(1 86)()"completion with anything"single])(anything-obsolete .[(0 1)()"obsolete functions of anything"single])(ipython .[(2927)()"Adds support for IPython to python-mode.el"single])(el-swank-fuzzy .[(0 1)()"fuzzy symbol completion."single])(fold-dwim .[(1 2)()"Unified user interface for Emacs folding modes"single])(fold-dwim-org .[(0 5)((fold-dwim (1 2)))"Fold DWIM bound to org key-strokes."single])(fuzzy-match .[(1 4)()"fuzzy matching"single])(w32-browser .[(21 0)()"Run Windows application associated with a file."single])(crosshairs .[(22 0)()"Highlight the current line and column."single])(csv-mode .[(1 50)()"major mode for editing comma-separated value files"single])(vline .[(1 10)()"show vertical line (column highlighting) mode."single])(hl-line+ .[(22 0)()"Extensions to hl-line.el."single])(col-highlight .[(22 0)((vline (1 10)))"Highlight the current column."single])(color-theme-vim-insert-mode .[(0 1)()"Color theme VIM insert mode"single])(cursor-chg .[(20 1)()"Change cursor dynamically, depending on the context."single])(cygwin-mount .[(2001)()"Teach EMACS about cygwin styles and mount points."single])(header2 .[(21 0)()"Support for creation and update of file headers."single])(lib-requires .[(21 0)()"Commands to list Emacs Lisp library dependencies."single])(linum-off .[(0 1)()"Provides an interface for turning line-numbering off"single])(pos-tip .[(0 4 5)()"Show tooltip at point -*- coding: utf-8 -*-"single])(key-choices .[(0 201)((color-theme-vim-insert-mode (0 1)) (color-theme-emacs-revert-theme (0 1)))"Key Choices -- Also Viper has different colors in different modes"single])(tabbar .[(2 0 1)()"Display a tab bar in the header line  -*-no-byte-compile: t; -*-"single])(tabbar-ruler .[(0 40)((tabbar (2 0 1)))"Pretty tabbar, autohide, use both tabbar/ruler"single])(android-mode .[(0 2 5)()"Minor mode for Android application development"single])(elein .[(0 2 2)()"running leiningen commands from emacs"single])(sumatra-forward .[(2008 10 8)()"Provides Sumatra Forward search"single])(org-outlook .[(0 3)()"Outlook org"single])(clojure-test-mode .[(3 0 0)((clojure-mode (1 7)) (cider (0 4 0)))"Minor mode for Clojure tests"single])(slime-fuzzy .[(20100404)((slime (20100404)))"Fuzzy symbol completion for Slime"single])(r-autoyas .[(0 28)()"Provides automatically created yasnippets for R function argument lists."single])(color-theme-complexity .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(starter-kit .[(2 0 3)((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 1)) (ido-ubiquitous (0 3)) (magit (0 8 1)))"Saner defaults and goodies."tar])(starter-kit-lisp .[(2 0 3)((starter-kit (2 0 2)) (elisp-slime-nav (0 1)))"Saner defaults and goodies for lisp languages"single])(starter-kit-js .[(2 0 1)((starter-kit (2 0 1)))"Saner defaults and goodies for Javascript"single])(starter-kit-ruby .[(2 0 3)((inf-ruby (2 2 3)) (starter-kit (2 0 1)))"Saner defaults and goodies for Ruby"single])(geben .[(0 26)()"A remote debugging environment for Emacs."tar])(maxframe .[(0 5 1)()"maximize the emacs frame based on display size"single])(mode-compile .[(2 29)()" Smart command for compiling files"single])(swank-cdt .[(1 0 1)()"swank-cdt helper functions"single])(find-file-in-git-repo .[(0 1 2)()"Utility to find files in a git repo"single])(idle-highlight-mode .[(1 1 2)()"highlight the word the point is on"single])(inf-ruby .[(2 3 2)()"Run a Ruby process in a buffer"single])(smex .[(2 1)()"M-x interface with Ido-style fuzzy matching."single])(protobuf-mode .[(0 3)()"major mode for editing protocol buffers."single])(haskell-mode .[(13 7)()"A Haskell editing mode"tar])(znc .[(0 0 2)((cl (2 2)) (erc (5 3)))"ZNC + ERC "single])(slime-clj .[(0 1 5)()"slime extensions for swank-clj"single])(scala-mode .[(0 0 2)()"Scala major mode"tar])(keyfreq .[(0 0 3)((json (1 2)))"track command frequencies"single])(json .[(1 2)()"JavaScript Object Notation parser / generator"single])(magit-simple-keys .[(1 0 0)((magit (1 0 0)))"simple keybindings for Magit"single])(rainbow-delimiters .[(1 3 4)()"Highlight nested parens, brackets, braces a different color at each depth."single])(switch-window .[(0 9)()"A *visual* way to choose a window to switch to"single])(yaml-mode .[(0 0 9)()"Major mode for editing YAML files"single])(prolog .[(1 22)()"major mode for editing and running Prolog (and Mercury) code"single])(graphviz-dot-mode .[(0 3 7)()"Mode for the dot-language used by graphviz (att)."single])(perlcritic .[(1 10)()"minor mode for Perl::Critic integration"single])(button-lock .[(1 0 0)()"Clickable text defined by regular expression"single])(wiki-nav .[(1 0 0)((button-lock (1 0 0)) (nav-flash (1 0 0)))"Simple file navigation using [[WikiStrings]]"single])(gh .[(0 8 0)((eieio (1 3)) (pcache (0 2 4)) (logito (0 1)))"A GitHub library for Emacs"tar])(vala-mode .[(0 1)()"Vala mode derived mode"single])(fill-column-indicator .[(1 85)()"Graphically indicate the fill column"single])(alpha .[(1 0)()"increase frame transparency"single])(color-theme-ir-black .[(1 0 1)((color-theme (6 6 1)))"pastel color theme "single])(calfw-gcal .[(0 0 1)()"edit Google calendar for calfw.el."single])(python .[(20120402)()"Python's flying circus support for Emacs"single])(htmlfontify .[(0 21)()"htmlise a buffer/source tree with optional hyperlinks"single])(oddmuse .[(20090222)()"edit pages on an Oddmuse wiki"single])(wgrep .[(2 1 3)()"Writable grep buffer and apply the changes to files"single])(langtool .[(1 2 1)()"Grammar check utility using LanguageTool"single])(pcsv .[(1 3 3)()"Parser of csv -*- lexical-binding: t -*-"single])(gather .[(1 0 4)()"Gather string in buffer."single])(erefactor .[(0 6 10)()"Emacs-Lisp refactoring utilities"single])(starter-kit-bindings .[(2 0 2)((starter-kit (2 0 2)))"Saner defaults and goodies: bindings"single])(slime-ritz .[(0 6 0)()"slime extensions for ritz"single])(hl-sentence .[(2)()"highlight a sentence based on customizable face"single])(mustache-mode .[(1 2)()"A major mode for editing Mustache files."single])(color-theme-eclipse .[(0 0 2)((color-theme (6 6 1)))"Eclipse color theme for GNU Emacs."single])(bm .[(1 53)()"Visible bookmarks in buffer."single])(color-theme-railscasts .[(0 0 2)((color-theme (6 6 1)))"Railscasts color theme for GNU Emacs."single])(color-theme-tango .[(0 0 2)((color-theme (6 6 1)))"Tango palette color theme for GNU Emacs."single])(color-theme-github .[(0 0 3)((color-theme (6 6 1)))"Github color theme for GNU Emacs."single])(color-theme-dpaste .[(0 0 1)((color-theme (6 6 1)))"Dpaste color theme for GNU Emacs."single])(nose .[(0 1 1)()"Easy Python test running in Emacs"single])(dpaste .[(0 2)()"Emacs integration for dpaste.com"single])(offlineimap .[(0 1)()"Run OfflineIMAP from Emacs"single])(virtualenv .[(1 2)()"Virtualenv for Python  -*- coding: utf-8 -*-"single])(scss-mode .[(0 5 0)()"Major mode for editing SCSS files"single])(highlight-indentation .[(0 5 0)()"Function for highlighting indentation"single])(feature-mode .[(0 4)()"Major mode for editing Gherkin (i.e. Cucumber) user stories"tar])(dired-details .[(1 3 1)()"make file details hide-able in dired"single])(dired-details+ .[(1 0)()"Enhancements to library `dired-details+.el'."single])(python-pep8 .[(1 1)()"minor mode for running `pep8'"single])(python-pylint .[(1 1)()"minor mode for running `pylint'"single])(workgroups .[(0 2 0)()"workgroups for windows (for Emacs)"single])(closure-lint-mode .[(0 1)()"minor mode for the Closure Linter"single])(ruby-test-mode .[(1 7)((ruby-mode (1 0)))"Minor mode for Behaviour and Test Driven"single])(httpd .[(1 0 1)()"HTTP/1.0 web server for emacs"single])(pep8 .[(1 2)()"run the python pep8 checker putting hits in a grep buffer"single])(cppcheck .[(1 0)()"run cppcheck putting hits in a grep buffer"single])(grin .[(1 0)()"run grin and grind (python replacements for grep and find) putting hits in a grep buffer"single])(pyflakes .[(1 0)()"run the python pyflakes checker putting hits in a grep buffer"single])(pylint .[(1 0)()"run the python pylint checker putting hits in a grep buffer"single])(midje-mode .[(0 1 2)((slime (1 0)) (clojure-mode (1 0)))"Minor mode for running Midje tests in emacs, see: https://github.com/dnaumov/midje-mode"tar])(python-mode .[(6 0 10)()"Python major mode"tar])(fastnav .[(1 0 7)()"Fast navigation and editing routines."single])(confluence .[(1 6)((xml-rpc (1 6 7)))"Confluence major mode"tar])(tuareg .[(2 0 5)((caml (3 12 0 1)))"OCaml mode for Emacs."tar])(pp-c-l .[(1 0)()"Display Control-l characters in a pretty way"single])(js-comint .[(0 0 1)()"Run javascript in an inferior process window."single])(magithub .[(0 2)((magit (0 8)) (json (1 2)))"Magit extensions for using GitHub"single])(cmake-mode .[(20110824)()"major-mode for editing CMake sources"single])(smart-operator .[(1 9 20110812)()"Insert operators with surrounding spaces smartly"single])(less-css-mode .[(0 17)()"Major mode for editing LESS CSS files (lesscss.org)"single])(ibuffer-vc .[(0 7)((cl-lib (0 2)))"Group ibuffer's list by VC project, or show VC status"single])(color-theme-sanityinc-solarized .[(2 25)()"A version of Ethan Schoonover's Solarized themes"tar])(elisp-slime-nav .[(0 6)((cl-lib (0 2)))"Make M-. and M-, work in elisp like they do in slime"single])(erc-hl-nicks .[(1 3 1)()"ERC nick highlighter that ignores uniquifying chars when colorizing"single])(multi-project .[(0 0 14)()"Easily work with multiple projects."single])(org-magit .[(0 2 0)((magit (0 8)) (org (6 1)))"basic support for magit links"single])(whole-line-or-region .[(1 3 1)()"operate on current line if region undefined"single])(ido-ubiquitous .[(2 9)((emacs (24 1)))"Use ido (nearly) everywhere."single])(bigint .[(1 0 0)()"A simple bigint package for emacs"single])(dizzee .[(0 1 1)()"A more pleasant way to manage your project's subprocesses in Emacs."tar])(color-theme-dg .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(gimme .[(2 1)()"The XMMS2 interface we all love! Check out http://gimmeplayer.org for more info."tar])(deft .[(0 3)()"quickly browse, filter, and edit plain text notes"single])(pony-mode .[(0 2)()"Minor mode for working with Django Projects"tar])(clojurescript-mode .[(0 5)()"Major mode for ClojureScript code"single])(flymake-ruby .[(0 8)((flymake-easy (0 1)))"A flymake handler for ruby-mode files"single])(django-theme .[(1 3 0)()"Custom face theme for Emacs"single])(fsvn .[(0 9 13)()"Another frontend of subversion."tar])(starter-kit-eshell .[(2 0 3)()"Saner defaults and goodies: eshell tweaks"single])(yasnippet-bundle .[(0 6 1)()"Yet another snippet extension (Auto compiled bundle)"single])(yasnippet .[(0 6 1)()"Yasnippet template engine"tar])(flymake-coffee .[(0 12)((flymake-easy (0 1)))"A flymake handler for coffee script"single])(flymake-haml .[(0 7)((flymake-easy (0 1)))"A flymake handler for haml files"single])(markdown-mode .[(2 0)()"Emacs Major mode for Markdown-formatted text files"single])(ido-yes-or-no .[(1 1)((ido (0)))"Use Ido to answer yes-or-no questions"single])(caml .[(3 12 0 1)()"OCaml code editing commands for Emacs"tar])(dtrt-indent .[(0 2 0)()"Adapt to foreign indentation offsets"single])(windsize .[(0 1)()"Simple, intuitive window resizing"single])(jira .[(0 3 3)()"Connect to JIRA issue tracking software"single])(textmate .[(5)()"TextMate minor mode for Emacs"single])(xml-rpc .[(1 6 8)()"An elisp implementation of clientside XML-RPC"single])(coffee-mode .[(0 3 0)()"Major mode to edit CoffeeScript files in Emacs"single])(sr-speedbar .[(0 1 8)()"Same frame speedbar"single])(desktop .[(0 1)()"save partial status of Emacs when killed"single])(evil-numbers .[(0 3)()"increment/decrement numbers like in vim"single])(lolcode-mode .[(0 2)()"Major mode for editing LOLCODE"single])(projectile .[(0 10 0)((s (1 6 0)) (dash (1 5 0)) (pkg-info (0 4)))"Manage and navigate projects in Emacs easily"single])(dedicated .[(1 0 0)()"A very simple minor mode for dedicated buffers"single])(csharp-mode .[(0 8 6)()"C# mode derived mode"single])(color-theme-actress .[(0 2 2)((color-theme (6 6 1)))"A dark color theme for GNU Emacs."single])(ghc .[(1 10 2)((haskell-mode (2 8 0)))"Happy Haskell programming on Emacs"tar])(org-email .[(1 0)()"use org for an email database -*- lexical-binding: t -*-"single])(ahg .[(0 99)()"Alberto's Emacs interface for Mercurial (Hg)"single])(elnode .[(0 9 9 7 6)((web (0 1 4)) (dash (1 1 0)) (noflet (0 0 7)) (s (1 5 0)) (creole (0 8 14)) (fakir (0 1 6)) (db (0 0 5)) (kv (0 0 17)))"The Emacs webserver."tar])(lua-mode .[(20110428)()"a major-mode for editing Lua scripts"single])(ac-slime .[(0 5)()"An auto-complete source using slime completions"single])(vc-darcs .[(1 12)()"a VC backend for darcs"single])(elisp-cache .[(1 15)()"Faster emacs startup through byte-compiling."single])(scratch .[(20110708)()"Mode-specific scratch buffers"single])(hl-sexp .[(1 0 0)()"highlight the current sexp"single])(dsvn .[(922257)()"Subversion interface"single])(crontab-mode .[(1 2)()"Mode for editing crontab files"single])(popwin .[(0 4)()"Popup Window Manager."single])(session .[(2 2 1)()"use variables, registers and buffer places across sessions"single])(smart-tab .[(0 3)()"Intelligent tab completion and indentation."single])(flymake-shell .[(0 8)((flymake-easy (0 1)))"A flymake syntax-checker for shell scripts"single])(ac-ja .[(0 0 1)()"auto-complete-mode source for Japanese "single])(rcirc-notify .[(0 6)()"libnotify popups"single])(flymake-jslint .[(0 10)((flymake-easy (0 1)))"A flymake handler for javascript using jslint"single])(dart-mode .[(0 9)()"Major mode for editing Dart files"single])(color-theme-blackboard .[(0 0 2)((color-theme (6 6 1)))"Blackboard Colour Theme for Emacs."single])(color-theme-wombat .[(0 0 1)((color-theme (6 6 1)))"The wombat color theme for Emacs."single])(color-theme-wombat+ .[(0 0 2)((color-theme (6 6 1)))"wombat with improvements and many more faces"single])(color-theme-active .[(0 0 1)((color-theme (6 6 1)))"Active theme inspired by jEdit theme of the same name"single])(color-theme-colorful-obsolescence .[(0 0 1)((color-theme (6 6 1)))"Colorful Obsolescence theme designed for partially transparent windows"single])(apache-mode .[(2 0)()"major mode for editing Apache configuration files"single])(highline .[(7 2 2)()"minor mode to highlight current line in buffer"single])(mic-paren .[(3 8)()"advanced highlighting of matching parentheses"single])(pytest .[(0 2 1)()"Easy Python test running in Emacs"single])(wikidoc .[(0 8 1)()"use elisp doc strings to make other documentation"single])(flymake-sass .[(0 6)((flymake-easy (0 1)))"Flymake handler for sass files"single])(regex-tool .[(1 2)()"A regular expression evaluation tool for programmers"single])(tabkey2 .[(1 40)()"Use second tab key pressed for what you want"single])(save-visited-files .[(1 3)()"save opened files across sessions"single])(ioccur .[(0 2)()"Incremental occur."single])(javadoc-help .[(1 0)()"Javadoc-Help.  Look up Java class on online javadocs in browser."single])(macro-math .[(1 0)()"in-buffer mathematical operations"single])(winpoint .[(1 4)()"Remember buffer positions per-window, not per buffer"single])(scheme-complete .[(0 8 2)()"Smart tab completion for Emacs"single])(ruby-compilation .[(0 17)((inf-ruby (2 2 1)))"run a ruby process in a compilation buffer"single])(rinari .[(2 10)((ruby-mode (1 0)) (inf-ruby (2 2 1)) (ruby-compilation (0 8)) (jump (2 0)))"Rinari Is Not A Rails IDE"single])(flymake-php .[(0 5)((flymake-easy (0 1)))"A flymake handler for php-mode files"single])(flymake-jshint .[(1 0)()"making flymake work with JSHint"single])(doc-mode .[(0 2)()"convenient editing of in-code documentation"single])(gccsense .[(0 2)()"GCCSense client for Emacs"single])(p4 .[(11 0)()"Perforce-Emacs Integration Library"single])(pager .[(2 0)()"windows-scroll commands"single])(pastebin .[(0 1)()"A simple interface to the www.pastebin.com webservice"single])(cache .[(0 1)()"implementation of a hash table whose key-value pairs expire"single])(command-frequency .[(1 1)()"Track command frequencies"single])(guess-offset .[(0 1 1)()"Automatically determine c-basic-offset"single])(loccur .[(1 1 1)()"Perform an occur-like folding in current buffer"single])(recursive-narrow .[(1 0)()"narrow-to-region that operates recursively"single])(member-function .[(0 3 1)()"expand member functions for C++ classes"single])(window-number .[(1 0 1)()"Jump to a window by number"single])(gtags .[(3 3)()"gtags facility for Emacs"single])(pymacs .[(0 25)()"Interface between Emacs Lisp and Python"single])(pysmell .[(0 7 2)()"Complete python code using heuristic static analysis"single])(eieio .[(1 4)()"Enhanced Implememntation of Emacs Interpreted Objects"tar])(rudel .[(0 3)((eieio (1 4)))"A collaborative editing framework for Emacs"tar])(jabber .[(0 8 90)()"A Jabber client for Emacs."tar])(citrus-mode .[(0 0 2)()"Major mode for editing Citrus files"single])(lineno .[(0 1)()"Alternate mode to display line numbers."single])(emacsd-tile .[(0 1)()"tiling windows for emacs"single])(iy-go-to-char .[(1 0)()"Go to next CHAR which is similar to \"f\" in vim"single])(creole .[(1 0 3)((noflet (0 0 3)) (kv (0 0 17)))"A parser for the Creole Wiki language"single])(jenkins-watch .[(1 2)()"Watch continuous integration build status -*- indent-tabs-mode: t; tab-width: 8 -*-"single])(peepopen .[(0 1 0)()"Graphical file chooser for Emacs on Mac OS X."single])(levenshtein .[(1 0)()"Edit distance between two strings."single])(gopher .[(0 0 2)()"easily access and navigate Gopher servers"single])(clojure-project-mode .[(1 0)((project-mode (1 0)))"Extends project-mode for Clojure projects"single])(ruby-block .[(0 0 11)()"highlight matching block"single])(pretty-lambdada .[(22 0)()"Show the word `lambda' as the Greek letter."single])(rect-mark .[(1 4)()"Mark a rectangle of text with highlighting."single])(evernote-mode .[(0 41)()"Evernote client for Emacs"tar])(centered-cursor-mode .[(0 5 1)()"cursor stays vertically centered"single])(elixir-mode .[(1 0 0)()"Major mode for editing Elixir files"single])(wget .[(1 94)()"Emacs-wget is an interface program of GNU wget on Emacs."tar])(mldonkey .[(0 0 4)()"Multi-networks peer-to-peer client."tar])(sml-modeline .[(0 5)()"Show position in a scrollbar like way in mode-line"single])(mwe-log-commands .[(20041106)()"log keyboard commands to buffer"single])(move-text .[(1 0)()"Move current line or region with M-up or M-down."single])(hippie-expand-slime .[(0 1)()"Hook slime's completion into hippie-expand"single])(boxquote .[(1 23)()"Quote text with a semi-box."single])(gnugo .[(2 2 12)()"Play a game of Go against gnugo"single])(project-mode .[(1 0)((levenshtein (1 0)))"Define code projects. Full-text search, etc."single])(n3-mode .[(20071215)()"mode for Notation 3"single])(wcheck-mode .[(2013 6 25)()"General interface for text checkers"tar])(el-autoyas .[(0 5)()"Automatically create Emacs-Lisp Yasnippets"single])(org2blog .[(0 5)((org (7 7)) (xml-rpc (1 6 8)))"Blog from Org mode to wordpress"tar])(pcache .[(0 2 4)((eieio (1 3)))"persistent caching for Emacs"single])(mocker .[(0 3 0)((eieio (1 3)) (el-x (0 2 4)))"mocking framework for emacs"single])(idle-require .[(1 0)()"load elisp libraries while Emacs is idle"single])(find-things-fast .[(20111123)()"An emacs mode to find things fast and move around in a project quickly"tar])(color-theme-gruber-darker .[(1)((color-theme (6 6 1)))"Gruber Darker color theme for Emacs by Jason Blevins"single])(dna-mode .[(1 44)()"a major mode for editing dna sequences"single])(perl-myvar .[(1 25)()"Declare lexicaly scoped vars as my()."single])(nlet .[(1 10)()"schemes 'named let' for emacs."single])(ssh-config-mode .[(1 13)()"Mode for fontification of ~/.ssh/config"single])(win-switch .[(1 0 8)()"fast, dynamic bindings for window-switching/resizing"single])(j-mode .[(0 3)()"Major mode for editing J programs"single])(key-combo .[(1 5 1)()"map key sequence to commands"single])(nginx-mode .[(1 1)()"major mode for editing nginx config files"single])(vimgolf .[(0 9 2)()"VimGolf interface for the One True Editor"single])(flymake-csslint .[(1 1 0)((flymake (0 3)))"making flymake work with CSSLint"tar])(typing .[(1 1 4)()"A game for fast typers, inspired by The Typing Of The Dead."single])(zenburn-theme .[(2 1)()"A low contrast color theme for Emacs."single])(solarized-theme .[(1 0 0)()"The Solarized color theme, ported to Emacs."tar])(etags-select .[(1 13)()"Select from multiple tags"single])(etags-table .[(1 1)()"Set tags table(s) based on current file"single])(flymake-css .[(0 3)((flymake-easy (0 1)))"Flymake support for css using csslint"single])(tintin-mode .[(1 0 0)()"Mayor mode for editing tintin++ scripts"single])(org-cua-dwim .[(0 5)()"Org-mode and Cua mode compatibility layer"single])(otp .[(1 0)()"a one-time password creator"single])(bookmark+ .[(20111214)()"Bookmark Plus"tar])(sentence-highlight .[(0 1)()"highlight the current sentence"single])(smartrep .[(0 0 3)()"Support sequential operation which omitted prefix keys."single])(tabula-rasa-mode .[(0 1 0)()"Distraction free writing mode"single])(abl-mode .[(0 9 0)()"Python TDD minor mode"single])(grails-mode .[(0 1)()"minor-mode that adds some Grails project management to a grails project"single])(inf-groovy .[(2 0)()"minor-mode that adds some Grails project management to a grails project"single])(tidy .[(2 12)()"Interface to the HTML Tidy program"single])(simp .[(0 2 0)()"Simple project definition, chiefly for project file finding and grepping."tar])(httpcode .[(0 1)()"explains the meaning of an HTTP status code"single])(d-mode .[(2 0 4)()"D Programming Language mode for (X)Emacs"tar])(git-commit .[(0 1)()"Major mode for editing git commit messages"single])(color-theme-library .[(0 0 10)((color-theme (6 6 1)))"The real color theme functions"single])(sauron .[(0 8)()"Track (erc/org/dbus/...) events and react to them."tar])(quickrun .[(1 8 4)()"Run commands quickly"single])(rcirc-color .[(0 2)()"color nicks"single])(rcirc-ucomplete .[(1 0 1)()"Unambiguous non-cycling completion for rcirc"single])(color-theme-sanityinc-tomorrow .[(1 10)()"A version of Chris Kempson's various Tomorrow themes"tar])(cl-format .[(1 1)()"CL format routine."tar])(color-theme-cobalt .[(0 0 2)((color-theme (6 6 1)))"Cobalt Color Theme for Emacs"single])(refheap .[(0 0 3)()"A library for pasting to https://refheap.com"single])(ctags-update .[(0 1 2)()"auto update TAGS in parent directory using exuberant-ctags -*- coding:utf-8 -*-"single])(peep-open .[(0 0 2)()"PeepOpen plugin for emacs."single])(org-mime .[(20120112)()"org html export for text/html MIME emails"single])(eh-basic .[(0 0 2)((starter-kit (2 0 2)) (browse-kill-ring (1 3 1)))"tuamshu's emacs basic configure"tar])(eh-gnus .[(0 0 6)()"tuamshu's gnus configure"tar])(eh-functions .[(0 0 1)((starter-kit (2 0 2)))"tuamshu's emacs functions"tar])(eh-keybindings .[(0 0 1)((eh-functions (0 0 1)) (starter-kit-bindings (2 0 2)))"tuamshu's emacs keybindings"tar])(magit-gh-pulls .[(0 3)((gh (0 4 3)) (magit (1 1 0)))"GitHub pull requests extension for Magit"single])(highlight-80+ .[(1 0)()"highlight characters beyond column 80"single])(jump-char .[(0 1)()"navigation by char"single])(color-theme-molokai .[(0 1)()"Molokai color theme by Lloyd"single])(pointback .[(0 2)()"Restore window points when returning to buffers"single])(uci-mode .[(1 0 0)()"Major mode for UCI configuration files"single])(erlang .[(2 4 1)()"Major modes for editing and running Erlang"single])(thumb-through .[(0 3)()"Plain text reader of HTML documents"single])(unbound .[(0 1)()"find convenient unbound keystrokes"single])(ido-better-flex .[(0 0 2)()"A better flex (fuzzy) algorithm for Ido."single])(slim-mode .[(1 1)()"Major mode for editing Slim files"single])(flymake .[(0 4 16)()"a universal on-the-fly syntax checker"single])(popup .[(0 5)()"Visual Popup User Interface"single])(fancy-mode .[(0 1)()"Major mode for programming with the Fancy language."single])(haxe-mode .[(0 3 1)()"An Emacs major mode for haXe"single])(expand-region .[(0 8 0)()"Increase selected region by semantic units."tar])(ack-and-a-half .[(1 2 0)()"Yet another front-end for ack"single])(test-case-mode .[(0 1 8)()"unit test front-end"single])(multi-eshell .[(0 0 1)()"makes it easier to use multiple shells within emacs"single])(mo-git-blame .[(0 1 0)()"An interactive, iterative 'git blame' mode for Emacs"single])(slime-js .[(0 0 1)((slime-repl (20100404)) (slime (20100404)))"Slime extension for swank-js."single])(volatile-highlights .[(1 10)()"Minor mode for visual feedback on some operations."single])(smooth-scroll .[(1 2)()"Minor mode for smooth scrolling and in-place scrolling."single])(xlicense .[(1 1)()"Insert pre-defined license text"tar])(flymake-d .[(0 1)()"A flymake handler for d-mode files"single])(flymake-tuareg .[(0 1)()"A flymake handler for tuareg-mode files"tar])(track-closed-files .[(0 1)()"Keep track of recently closed files"single])(color-theme-monokai .[(0 0 5)((color-theme (6 5 5)))"Monokai Color Theme for Emacs."single])(drupal-mode .[(0 3 1)((php-mode (1 5 0)))"Advanced minor mode for Drupal development"tar])(screen-lines .[(0 55)()"a minor mode for screen-line-based point motion"single])(ctypes .[(1 2)()"Enhanced Font lock support for custom defined types."single])(moinmoin-mode .[(1 0)((screen-lines (0 55)))"a major mode to edit MoinMoin wiki pages"single])(pc-mode .[(0 1)()"major mode for editing PC code,"single])(mediawiki .[(2 2 3)()"mediawiki frontend"single])(workspaces .[(0 1)()"Workspaces for Emacsen "single])(pivotal-tracker .[(1 2 0)()"Interact with Pivotal Tracker through its API"single])(tron-theme .[(12)()"A theme loosely based on Tron: Legacy colors"single])(sublime .[(0 0 7)((coffee-mode (0 3 0)) (find-file-in-project (3 0)) (haml-mode (3 0 14)) (ido-ubiquitous (1 0)) (less-css-mode (0 6)) (magit (1 1 1)) (markdown-mode (1 8 1)) (monokai-theme (0 0 6)) (paredit (22)) (sass-mode (3 0 14)) (smex (1 1 2)) (yaml-mode (0 0 7)) (yasnippet (0 6 1)))"REQUIRES EMACS 24 - Sublime Text 2 Emulation for Emacs"tar])(logito .[(0 1)((eieio (1 3)))"logging library for Emacs"single])(jade-mode .[(0 1)()"Major mode for editing jade templates."single])(stylus-mode .[(0 1)()"Major mode for editing stylus templates."single])(sws-mode .[(0 1)()"SWS mode"single])(ess-smart-underscore .[(0 79)()"Ess Smart Underscore"single])(ghci-completion .[(0 1 3)()"Completion for GHCi commands in inferior-haskell buffers -*- lexical-binding: t; -*-"single])(google-translate .[(0 5)()"Emacs interface to Google Translate"single])(javap .[(8)()"Javap major mode"single])(javap-mode .[(9)()"Javap major mode"single])(anything-show-completion .[(20091119)()"Show selection in buffer for anything completion"single])(pastels-on-dark-theme .[(0 3)()"Pastels on Dark theme for Emacs 24"single])(color-theme-solarized .[(20120301)()"Solarized themes for Emacs"tar])(image-dired+ .[(0 6 0)()"Image-dired extensions"single])(deferred .[(0 3 1)()"Simple asynchronous functions for emacs lisp"single])(concurrent .[(0 3 1)((deferred (0 3 1)))"Concurrent utility functions for emacs lisp"single])(ctable .[(0 1 1)()"Table component for Emacs Lisp"single])(epc .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)))"A RPC stack for the Emacs Lisp"single])(edbi .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)) (epc (0 1 1)))"Emacs Database Interface"tar])(color-theme .[(6 5 5)()"install color themes"single])(cacoo .[(2 1 2)((concurrent (0 3 1)))"Minor mode for Cacoo : http://cacoo.com"tar])(imgur .[(0 1)((anything (1 287)))"imgur client for Emacs"single])(tango-2-theme .[(1 0 0)()"Tango 2 color theme for GNU Emacs 24"single])(po.foo .[(3 0 20)((haml-mode (3 0 20)))"Sass major mode"single])(po.elscreen .[(1 4 6)()" Screen for Emacsen(this is not original)"single])(po-elscreen .[(1 4 6)()" Screen for Emacsen(this is not original. original is http://www.morishima.net/~naoto/elscreen-en/?lang=en)"single])(quack .[(0 42)()"enhanced support for editing and running Scheme code"single])(dired+ .[(21 2)()"Extensions to Dired."single])(evil-leader .[(0 4 1)((evil (0)))"let there be <leader>"single])(rspec-mode .[(1 7)((ruby-mode (1 0)))"Enhance ruby-mode for RSpec"single])(fakir .[(0 1 7)((noflet (0 0 3)) (dash (1 3 2)))"fakeing bits of Emacs -*- lexical-binding: t -*-"single])(emstar .[(1 4)()"Casual game, like a brainy Pac-Man"tar])(igrep .[(2 113)()"An improved interface to `grep` and `find`"single])(cljdoc .[(0 1 0)()"eldoc mode for clojure"single])(real-auto-save .[(0 3)()"enable real auto save"single])(monokai-theme .[(0 0 10)()"REQUIRES EMACS 24: Monokai Color Theme for Emacs."single])(wrap-region .[(0 7 1)()"Wrap text with punctation or tag"single])(fuzzy .[(0 1)()"Fuzzy Matching"single])(auto-complete .[(1 4)((popup (0 5)))"Auto Completion for GNU Emacs"tar])(bitlbee .[(1 0)()"Help get Bitlbee (http://www.bitlbee.org) up and running"single])(lorem-ipsum .[(0 1)()"Insert dummy pseudo Latin text."single])(typopunct .[(1 0)()"Automatic typographical punctuation marks"single])(twittering-mode .[(2 0 0)()"Major mode for Twitter"single])(flymake-phpcs .[(1 0 5)((flymake (0 3)))"Flymake handler for PHP to invoke PHP-CodeSniffer"tar])(flex-autopair .[(0 3)()"Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable."single])(color-theme-dawn-night .[(1 0)()"color theme of dawn and night."single])(weather .[(2012 3 27 2)()"Get weather reports via worldweatheronline.com"single])(flymake-perlcritic .[(1 0 3)((flymake (0 3)))"Flymake handler for Perl to invoke Perl::Critic"tar])(jsshell-bundle .[(2012 4 7)()"JSShell generated bundle"single])(rfringe .[(1 0 1)()"indicate relative locations in the fringe"single])(flyphpcs .[(1 0 1)()"Flymake for PHP via PHP-CodeSniffer"single])(defaultcontent .[(1 4)()"a templating tool. Fill new files with default content."single])(flymake-for-jslint-for-wsh .[(1 3 0)((flymake (0 3)))"use flymake with js code, on Windows"single])(tfs .[(0 2 7)()"MS Team Foundation Server commands for Emacs."single])(dropdown-list .[(1 45)()"Drop-down menu interface"single])(thesaurus .[(2012 4 7)()"replace a word with a synonym looked up in a web service."single])(fly-jshint-wsh .[(2 0 3)((flymake (0 3)))"use flymake with jshint on js code, on Windows"single])(watch-buffer .[(1 0 1)()"run a shell command when saving a buffer"single])(smarter-compile .[(2012 4 9)()"a smarter wrapper for `compile'"single])(hungry-delete .[(1 0)()"hungry delete minor mode"single])(align-cljlet .[(0 3)((clojure-mode (1 11 5)))"Space align various Clojure forms "single])(idomenu .[(0 1)()"imenu tag selection with ido"single])(drag-stuff .[(0 0 4)()"Drag stuff (lines, words, region, etc...) around"single])(w32-registry .[(2012 4 6)()"read the registry from elisp"single])(jsshell .[(2012 4 7)()"Run a javascript command interpreter in emacs on Windows."single])(shadchen .[(1 0)()"pattern matching for elisp"single])(cycbuf .[(0 5 0)()"Cycle buffers code by Martin Pohlack, inspired by"single])(yascroll .[(0 2 0)()"Yet Another Scroll Bar Mode"single])(anything-exuberant-ctags .[(0 1 2)()"Exuberant ctags anything.el interface"single])(ess .[(5 14)()"Edit and interact with statistical programs like R, S-Plus, SAS, Stata and JAGS"tar])(anything-git-goto .[(0 1 0)()"Quick listing of:"single])(expectations-mode .[(0 0 4)((nrepl (0 1 5)) (clojure-mode (1 11)))"Minor mode for expectations tests"single])(twilight-theme .[(1 0 0)()"Twilight theme for GNU Emacs 24 (deftheme)"single])(jtags .[(0 97)()"enhanced tags functionality for Java development"single])(jtags-extras .[(0 3 0)()"jtags related functionality for Java development"single])(phantomjs .[(0 0 11)()"Control phantomjs from Emacs			"tar])(oz .[(16513)()"Major mode for editing Oz programs"tar])(load-theme-buffer-local .[(0 0 2)()"Install emacs24 color themes by buffer."single])(color-theme-buffer-local .[(0 0 2)()"Install color-themes by buffer."single])(elisp-depend .[(1 0 2)()"Parse depend libraries of elisp file."single])(key-chord .[(0 5 20080915)()"map pairs of simultaneously pressed keys to commands"single])(shell-here .[(1 1)()"Open a shell relative to the working directory"single])(symbols-mode .[(0 3)()"List symbols of object files"single])(handlebars-mode .[(1 3)()"A major mode for editing Handlebars files."single])(dircmp .[(1)()"Compare and sync directories."single])(ascii .[(3 1)()"ASCII code display."single])(frame-tag .[(0 1 0)()"Minor mode that assigns a unique number to each frame for easy switching"single])(org-blog .[(1 18 1 1)()"create and publish a blog with org-mode"single])(ruby-tools .[(0 1 0)()"Collection of handy functions for ruby-mode"single])(unfill .[(0 1)()"The inverse of fill-paragraph and fill-region"single])(modeline-posn .[(22 0)()"Set up `mode-line-position'."single])(mark-multiple .[(1 0)()"A library that sorta lets you mark several regions at once"single])(mark-more-like-this .[(1 0)()"Mark additional regions in buffer matching current region."single])(openwith .[(20120531)()"Open files with external programs"single])(isearch+ .[(21 0)()"Extensions to `isearch.el'."single])(mouse+ .[(21 0)()"Extensions to `mouse.el'."single])(zencoding-mode .[(0 5 1)()"Unfold CSS-selector-like expressions to markup"single])(smart-mode-line .[(1 7 1)()"A color coded smart mode-line."single])(nyan-mode .[(0 1)()"Nyan Cat shows position in current buffer in mode-line."single])(ujelly-theme .[(1 0 35)()"Ujelly theme for GNU Emacs 24 (deftheme)"single])(guru-mode .[(0 1)()"Become an Emacs guru"single])(zen-and-art-theme .[(1 0 1)()"zen and art color theme for GNU Emacs 24"single])(git-auto-commit-mode .[(4 2 2)()"Emacs Minor mode to automatically commit and push"single])(haste .[(1)((json (1 2)))"Emacs client for hastebin (http://hastebin.com/about.md)"single])(my-packages .[(0 1 0)()"Package Initialization."single])(zen-mode .[(20120627)()"remove/restore Emacs distractions quickly"tar])(heroku .[(1 1 0)()"Interface to Heroku apps."single])(php-extras .[(1 0 0 20130923)((php-mode (1 5 0)))"Extra features for `php-mode'"tar])(repository-root .[(1 0 4)()"deduce the repository root directory for a given file"single])(grep-a-lot .[(1 0 7)()"manages multiple search results buffers for grep.el"single])(grep-o-matic .[(1 0 6)()"auto grep word under cursor"single])(el-spec .[(0 2)()"ruby's rspec like syntax test frame work"single])(wc-mode .[(1 3)()"Running word count with goals (minor mode)"single])(legalese .[(1 0)()"Add legalese to your program files"single])(scad-mode .[(90 0)()"SCAD mode derived mode"single])(ttl-mode .[(0 1)()"mode for Turtle(RDF)"single])(zeitgeist .[(0 1)()"integrates Emacs with Zeitgeist."single])(anything-git .[(1 1 1)()"Show git files in anything"single])(dispass .[(1 1 2)()"Emacs wrapper for DisPass"single])(writegood-mode .[(20130406 2316)()"Polish up poor writing on the fly"single])(nrepl .[(0 2 0)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 1)))"Client for Clojure nREPL"single])(shell-switcher .[(0 1 5 1)()"Easily switch between shell buffers, like with alt+tab."tar])(github-theme .[(0 0 3)()"Github color theme for GNU Emacs 24"single])(sokoban .[(1 23)()"Play the Sokoban game in emacs"single])(package-store .[(0 3)()"a package cache"single])(code-headers .[(0 7)()"Navigate code with headers embedded in comments.  -*- mode: Emacs-Lisp; lexical-binding: t; -*"single])(dix .[(0 1 0)()"minor mode for editing Apertium XML dictionary files"single])(no-easy-keys .[(1 0 2)()"Learn the proper Emacs movement keys"single])(makefile-runner .[(1 1 2)()"Searches for Makefile and fetches targets"single])(gnusnotes .[(0 9 2)()"Adding per-message notes in gnus summary buffer"single])(web .[(0 3 7)()"useful HTTP client -*- lexical-binding: t -*-"single])(eredis .[(0 5 0)()"eredis, a Redis client in emacs lisp"single])(org-readme .[(20130322 926)((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0)))"Integrates Readme.org and Commentary/Change-logs."single])(egison-mode .[(0 1 4)()"Egison editing mode"single])(mongo .[(0 5)()"A MongoDB client."tar])(cm-mode .[(0 1 0)()"Wrapper for CodeMirror-style Emacs modes"single])(marmalade-test .[(0 0 1)()"A test tarball package."tar])(ruby-mode .[(1 1)()"ruby-mode package"tar])(hjkl-mode .[(0 1)((key-chord (0 5)))"import some vim's key bindings"tar])(edit-list .[(0 4)()"edit a single list"single])(persistent-soft .[(0 8 8)((pcache (0 2 3)) (list-utils (0 4 2)))"Persistent storage, returning nil on failure"single])(hippie-namespace .[(0 5 8)()"Special treatment for namespace prefixes in hippie-expand"single])(nav-flash .[(1 1 0)()"Briefly highlight the current line"single])(ucs-utils .[(0 7 6)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utilities for Unicode characters"single])(back-button .[(0 6 6)((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Visual navigation through mark rings"single])(xml-gen .[(0 4)()"A DSL for generating XML."single])(yaoddmuse .[(0 1 1)()"Yet another oddmuse for Emacs"single])(window-end-visible .[(0 1 0)()"Find the last visible point in a window"single])(string-utils .[(0 3 2)((list-utils (0 4 2)))"String-manipulation utilities"single])(unicode-enbox .[(0 1 4)((string-utils (0 3 2)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Surround a string with box-drawing characters"single])(dynamic-fonts .[(0 6 4)((font-utils (0 7 0)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Set faces based on available fonts"single])(minimal-session-saver .[(0 6 2)()"Very lean session saver"single])(unicode-progress-reporter .[(0 5 4)((emacs (24 1 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Progress-reporter with fancy characters"single])(unicode-fonts .[(0 3 8)((font-utils (0 7 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Configure Unicode fonts"single])(jump .[(2 3)((findr (0 7)) (inflections (1 1)))"build functions which contextually jump between files"single])(mongo-elnode .[(0 5 0)((mongo (0 5)) (elnode (0 9 9)))"elnode adapter for mongo-el"single])(dotassoc .[(0 0 1)()"dot access embedded alists"single])(eimp .[(1 4 0)()"Emacs Image Manipulation Package"single])(org-presie .[(0 0 5)((framesize (0 0 1)) (eimp (1 4 0)) (org (7 8 9)))"simple presentation with an org file"single])(ido-load-library .[(0 2 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Load-library alternative using ido-completing-read"single])(esxml .[(0 3 0)((db (0 0 1)))"Handle HTML with lists."tar])(ac-nrepl .[(0 21)((cider (0 1)) (auto-complete (1 4)))"auto-complete sources for Clojure using nrepl completions"single])(unicode-whitespace .[(0 2 4)((ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"teach whitespace-mode about fancy characters"single])(ecb-snapshot .[(20120830)()"Emacs Code Browser CVS snapshot"tar])(pabbrev .[(3 1)()"Predictive abbreviation expansion"single])(applescript-mode .[(1 1)()"major mode for editing AppleScript source"single])(ssh .[(1 2)()"Support for remote logins using ssh."single])(nrepl-ritz .[(0 6 0)((nrepl (0 1 5)))"nrepl extensions for ritz"single])(doctags .[(0 1)()"Generation of tags documentation in Doxygen syntax"single])(ignoramus .[(0 7 0)()"Ignore backups, build files, et al."single])(flyspell-lazy .[(0 6 6)()"Improve flyspell responsiveness using idle timers"single])(buffer-utils .[(0 1 0)()"Buffer-manipulation utility functions"single])(browse-url-dwim .[(0 6 6)((string-utils (0 3 2)))"Context-sensitive external browse URL or Internet search"single])(fixmee .[(0 8 4)((button-lock (1 0 0)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 3 2)) (tabulated-list (0)))"Quickly navigate to FIXME notices in code"single])(kv .[(0 0 17)()"key/value data structure functions"single])(lisp-editing .[(0 0 5)()"lisp editing tools"single])(oauth .[(1 0 3)()"An Emacs oauth client. See https://github.com/psanford/emacs-oauth/"tar])(tumblesocks .[(0 0 7)((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1)))"An Emacs tumblr client."tar])(uuid .[(0 0 3)()"UUID's for EmacsLisp"single])(pcmpl-args .[(0 1 1)()"Enhanced shell command completion    -*- lexical-binding: t -*-"single])(anaphora .[(1 0 0)()"anaphoric macros providing implicit temp variables"single])(exec-path-from-shell .[(1 6)()"Get environment variables such as $PATH from the shell"single])(rcirc-ssh .[(0 0 7)((kv (0 0 3)))"do irc over ssh sessions -*- lexical-binding: t -*-"single])(go-play .[(0 0 1)()"Paste to play.golang.org"single])(yagist .[(0 8 6)((json (1 2 0)))"Yet Another Emacs integration for gist.github.com"single])(list-utils .[(0 4 2)()"List-manipulation utility functions"single])(margo .[(2012 9 18)((web (0 1 8)) (json (1 2)))"Client for MarGo, providing Go utilities"single])(shoes-off .[(0 1 8)((kv (0 0 5)) (anaphora (0 0 4)))"irc bouncer"single])(multiple-cursors .[(1 3 0)()"Multiple cursors for Emacs."tar])(pcre2el .[(1 5)((cl-lib (0 3)))"parse, convert, and font-lock PCRE, Emacs and rx regexps"single])(eshell-manual .[(0 0 2)()"An updated manual for Eshell."tar])(font-utils .[(0 7 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utility functions for working with fonts"single])(rcirc-robots .[(0 0 7)((kv (0 0 8)) (anaphora (0 0 5)))"robots based on rcirc irc -*- lexical-binding: t -*-"single])(plantuml-mode .[(0 2)()"Major mode for plantuml"single])(hackernews .[(0 1)((json (1 2)))"Access the hackernews aggregator from Emacs"tar])(org-ehtml .[(0 20131014)((elnode (20130416 1626)) (org-plus-contrib (20131007)))"Export Org-mode files as editable web pages"tar])(esk .[(0 1)()"Emacs Search Kit - An easy way to find files and/or strings in a project"tar])(hide-comnt .[(40)()"Hide/show comments in code."tar])(pretty-mode-plus .[(1 0)()"Redisplay parts of the buffer as pretty symbols."tar])(s .[(1 9 0)()"The long lost Emacs string manipulation library."single])(sprintly-mode .[(0 0 4)((furl (0 0 2)))"Major mode for dealing with sprint.ly"single])(git-commit-mode .[(0 13)()"Major mode for editing git commit messages -*- lexical-binding: t; -*-"single])(db .[(0 0 6)((kv (0 0 11)))"A database for EmacsLisp  -*- lexical-binding: t -*-"single])(notmuch-labeler .[(0 1)()"Improves notmuch way of displaying labels through fonts, pictures, and hyperlinks."tar])(text-language .[(0 20121008)()"tracking, setting, guessing language of text"single])(gitignore-mode .[(0 1)()"Major mode for editing .gitconfig files"single])(typo .[(1 1)()"Minor mode for typographic editing"single])(ws-trim .[(1 4)()"Tools and minor mode to trim whitespace on text lines"single])(flymake-checkers .[(0 2)()"Flymake reloaded with useful checkers"single])(hardhat .[(0 4 2)((ignoramus (0 7 0)))"Protect against clobbering user-writable files"single])(save-packages .[(0 20121012)()"save and restore installed packages"single])(smooth-scrolling .[(1 0 1)()"Make emacs scroll smoothly"single])(flymake-go .[(2013 3 14)((flymake (0 4 13)))"A flymake handler for go-mode files"single])(cmake-project .[(0 7)()"Integrates CMake build process with Emacs"single])(combinators .[(0 0 1)()"-*- lexical-binding: t; -*-"single])(gitty .[(1 0)()"vc-mode extension for fast git interaction"single])(mote-mode .[(1 0 0)((ruby-mode (1 1)))"Mote minor mode"single])(hideshowvis .[(0 5)()"Add markers to the fringe for regions foldable by hideshow.el"single])(inflections .[(1 1)()"convert english words between singular and plural"single])(findr .[(0 7)()"Breadth-first file-finding facility for (X)Emacs"single])(livescript-mode .[(0 0 1)()"Major mode for LiveScript files in Emacs"single])(smart-forward .[(1 0 0)((expand-region (0 8 0)))"Semantic navigatioin"single])(osx-browse .[(0 8 8)((string-utils (0 3 2)) (browse-url-dwim (0 6 6)))"Web browsing helpers for OS X"single])(cljsbuild-mode .[(0 2 0)()"A minor mode for the ClojureScript 'lein cljsbuild' command"single])(vector-utils .[(0 1 2)()"Vector-manipulation utility functions"single])(config-block .[(0 0 1)()"config-block is utility for individual settings (e.g. .emacs)."single])(visible-color-code .[(0 0 1)()"color code strings in current buffer, this elisp show you one as real color."single])(namakemono .[(0 0 1)()"utility function set for namakemono"single])(bang .[(0 1 0)()"A modern list library for Emacs"single])(roy-mode .[(0 1 0)()"Roy major mode"single])(wgrep-ack .[(0 1 1)((wgrep (2 1 1)))"Writable ack-and-a-half buffer and apply the changes to files"single])(flymake-lua .[(1 0)()"Flymake for Lua"single])(dash .[(2 4 0)()"A modern list library for Emacs"single])(inform-mode .[(1 6 2)()"Major mode for Inform 6 interactive fiction code"single])(weather-metno .[(20121023)()"Weather data from met.no in Emacs"tar])(octomacs .[(0 0 1)()"Octopress interface for Emacs"single])(highlight .[(21 0)()"Highlighting commands."single])(region-list-edit .[(20100530 808)()"Add/delete a region into/from a region list, such as ‘((4 . 7) (11 . 15) (17 . 17) (20 . 25))."single])(zjl-hl .[(20121028 1901)((highlight (21 0)) (region-list-edit (20100530 808)))"Highlight variable and function call and others in c/emacs, make life easy."single])(truthy .[(0 2 8)((list-utils (0 4 2)))"Test the content of a value"single])(syntactic-sugar .[(0 9 4)()"Effect-free forms such as if/then/else"single])(elpakit .[(1 0 7)((anaphora (0 0 6)) (dash (1 0 3)))"package archive builder"single])(bug-reference-github .[(0 2 0)()"Automatically set `bug-reference-url-format' in Github repositories."single])(macrostep .[(0 6)()"interactive macro stepper for Emacs Lisp"single])(qsimpleq-theme .[(0 1 3)()"Based on solarized color theme for Emacs."single])(flymake-easy .[(0 9)()"Helpers for easily building flymake checkers"single])(seclusion-mode .[(1 1 1)()"Edit in seclusion. A Dark Room mode."single])(skinny .[(0 0 3)((elnode (0 9 9 6 1)) (creole (0 8 17)))"a blog engine with elnode -*- lexical-binding: t -*-"single])(flymake-python-pyflakes .[(0 9)((flymake-easy (0 8)))"A flymake handler for python-mode files using pyflakes (or flake8)"single])(pyvirtualenv .[(1 1)()"Python Pyvirtualenv support"single])(find-file-in-repository .[(1 3)()"Quickly find files in a git, mercurial or other repository"single])(page-break-lines .[(0 8)()"Display ugly ^L page breaks as tidy horizontal lines"single])(paredit-menu .[(1 0)()"Adds a menu to paredit.el as memory aid"single])(elpy .[(1 2 1)((auto-complete (1 4)) (find-file-in-project (3 2)) (fuzzy (0 1)) (highlight-indentation (0 5 0)) (idomenu (0 1)) (iedit (0 97)) (nose (0 1 1)) (virtualenv (1 2)) (yasnippet (0 8 0)))"Emacs Python Development Environment"tar])(ace-jump-mode .[(2 0 0 0)()"a quick cursor location minor mode for emacs -*- coding: utf-8-unix -*-"single])(osx-location .[(0 2)()"Watch and respond to changes in geographical location on OS X"tar])(elpa-audit .[(0 4)()"Handy functions for inspecting and comparing package archives"single])(pde .[(0 2 16)()"Perl Development Environment"tar])(tt-mode .[(20121117 2045)()"Emacs major mode for editing Template Toolkit files."tar])(pod-mode .[(20121117 2120)()"Major mode for editing .pod-files."tar])(multi-web-mode .[(0 1)()"multiple major mode support for web editing"single])(flycheck .[(0 15)((s (1 6 0)) (dash (2 0 0)) (f (0 6 0)) (pkg-info (0 4)) (cl-lib (0 3)) (emacs (24 1)))"On-the-fly syntax checking (Flymake done right)"tar])(chicken-scheme .[(1 1 0)()"Scheme-mode extensions for Chicken Scheme"single])(minimap .[(1 0)()"Sidebar showing a \"mini-map\" of a buffer"single])(session-manager .[(0 5)()"Support for the Gnome Session Manager"single])(ercn .[(1 0 2)()"Flexible ERC notifications"single])(grr .[(1 0 0)()"Simple Growl notifications for Emacs and Mac OS X"single])(simpleclip .[(1 0 0)()"Simplified access to the system clipboard"single])(bufshow .[(0 1 0)()"A simple presentation tool for Emacs."tar])(cpputils-cmake .[(0 4 0)()"Easy real time C++ syntax check and intellisense if you use CMake."tar])(lcs .[(1 1)()"find out the longest common sequence"single])(tracking .[(1 4)((shorten (0 3)))"Buffer modification tracking"single])(lui .[(1 3)((tracking (1 4)))"Linewise User Interface"tar])(circe .[(1 3)((lui (1 3)) (lcs (1 1)))"Client for IRC in Emacs"tar])(iedit .[(0 97)()"Edit multiple regions in the same way simultaneously."tar])(let-recur .[(0 0 5)()"Simplified implementation of recur -*- lexical-binding:t -*-"single])(wgrep-helm .[(0 1 0)((wgrep (2 1 1)))"Writable helm-grep-mode buffer and apply the changes to files"single])(otter-mode .[(1 2)()"Major mode for source files of the Otter automated theorem prover"single])(sql-indent .[(1 10)()"indentation of SQL statements"single])(parenface-plus .[(1 1)()"Provide a face for parens in lispy modes."tar])(maildir .[(0 0 20)((kv (0 0 17)))"Simple maildir based MUA."tar])(huskie .[(0 0 2)((anaphora (0 0 6)))"chainsaw powered logging"single])(color-theme-x .[(1 3)()"convert color themes to X11 resource settings"single])(systemtap-mode .[(0 2)()"A mode for SystemTap"single])(gplusify .[(1 0)()"Add Google Plus markup to a piece of code"single])(diatheke .[(1 0)()"A minor mode using the diatheke command-line Bible tool"single])(extend-dnd .[(0 5)()"R drag and Drop"single])(wxwidgets-help .[(0 0 3)()"Look up wxWidgets API by using local html manual."tar])(sudden-death .[(0 2)()"Totsuzen-no-Shi"single])(fold-this .[(0 1 0)()"Just fold this region please"single])(subshell-proc .[(0 2)()"Functions for working with comints"single])(pg .[(0 12)()"Emacs Lisp interface to the PostgreSQL RDBMS"single])(db-pg .[(0 0 3)((pg (0 12)) (db (0 0 6)))"A PostgreSQL adapter for emacs-db"single])(el-x .[(0 2 4)((cl-lib (0 2)))"Emacs-lisp extensions."tar])(hippie-expand-haskell .[(0 0 1)()"Hippie expand try function using ghc's completion function."single])(slamhound .[(2 0 0)()"Rip Clojure namespaces apart and rebuild them."single])(late-night-theme .[(0 0)()"Late Night theme for Emacs 24"single])(json-mode .[(1 1 0)()"Major mode for editing JSON files"single])(creole-mode .[(0 0 5)()"a markup mode for creole"single])(evil-paredit .[(0 0 1)((evil (0 0 0)) (paredit (1)))"Paredit support for evil keybindings"single])(websocket .[(1 0)()"Emacs WebSocket client and server"single])(evil-nerd-commenter .[(1 2 7)()"Comment/uncomment lines efficiently. Like Nerd Commenter in Vim"tar])(robe .[(0 7 7)((inf-ruby (2 3 0)))"Code navigation, documentation lookup and completion for Ruby"tar])(dropbox .[(0 9 1)((json (1 2)) (oauth (1 0 3)))"Emacs backend for dropbox"single])(simple-mode-line .[(0 3)()"Simplified Mode Line for Emacs 24"single])(pov-mode .[(3 3)()"Major mode for editing POV-Ray scene files."tar])(tup-mode .[(1 2)()"Major mode for editing files for Tup"single])(bbcode-mode .[(1 1 0)()"Major mode for writing BBCode markup"single])(markup-faces .[(1 0 0)()"collection of faces for markup language modes"single])(flymake-json .[(0 1)((flymake-easy (0 1)))"A flymake handler for json using jsonlint"single])(adoc-mode .[(0 6 2)((markup-faces (1 0 0)))"a major-mode for editing AsciiDoc files in Emacs"single])(hardcore-mode .[(1 0 0)()"Disable arrow keys + optionally backspace and return"single])(spotify .[(0 2)()"Control the spotify application from emacs"single])(buffer-stack .[(1 5)()"Enhanced intelligent switch-to-other-buffer replacement."single])(hlinum .[(1 0)()"Extension for linum.el to highlight current line number"single])(aes .[(0 5)()"Implementation of AES"single])(kpm-list .[(1 0)()"An emacs buffer list that tries to intelligently group together buffers."single])(kwin .[(0 1)()"communcate with the KWin window manager"single])(clj-refactor .[(0 4 2)((s (1 8 0)) (dash (2 4 0)) (yasnippet (0 6 1)) (paredit (22)) (multiple-cursors (1 2 2)))"A collection of clojure refactoring functions"single])(nemerle .[(0 2)()"major mode for editing nemerle programs"single])(ag .[(0 36)()"A front-end for ag ('the silver searcher'), the C ack replacement."single])(nimrod-mode .[(0 1 5)((auto-complete (1 4)))"A major mode for the Nimrod programming language"single])(gnomenm .[(0 0 3)()"Emacs interface to Gnome nmcli command"single])(sequence .[(0 0 1)()"makes sequences of numbers -*- lexical-binding: t -*-"single])(rbenv .[(0 0 3)()"Emacs integration for rbenv"single])(evil .[(1 0 8)((undo-tree (0 6 3)) (goto-last-change (1 2)))"Extensible Vi layer for Emacs."tar])(world-time-mode .[(0 0 2)()"show whole days of world-time diffs"single])(inline-crypt .[(0 1 4)()"Simple inline encryption via openssl"tar])(tagedit .[(1 4 0)((s (1 3 1)) (dash (1 0 3)))"Some paredit-like features for html-mode"single])(vertica .[(0 1 0)((sql (3 0)))"Vertica SQL mode extension"single])(hive .[(0 1 1)((sql (3 0)))"Hive SQL mode extension"single])(smart-window .[(0 6)()"vim-like window controlling plugin"single])(requirejs-mode .[(1 1)()"Improved AMD module management"single])(soothe-theme .[(0 3 16)((emacs (24 1)))"a dark colorful theme for Emacs24."single])(purple-haze-theme .[(20130930 36)((emacs (24 0)))"an overtly purple color theme for Emacs24."single])(gruber-darker-theme .[(0 6)()"Gruber Darker color theme for Emacs 24."single])(rust-mode .[(0 1 0)((cm-mode (0 1 0)))"A major emacs mode for editing Rust source code"single])(framesize .[(0 0 5)((key-chord (0 5 20080915)))"change the size of frames in Emacs"single])(deep-thought-theme .[(0 1 1)()"Emacs 24 theme with the Answer to The Ultimate Question"single])(generate-autoloads .[(0 0 10)()"A package to help you lazy-load everything"single])(lisp-infection .[(0 0 10)()"Commands to *enhance* S-exp editing"single])(backtrace-mode .[(0 0 10)()"A better way to browse /var/log/messages files"single])(tabulated-list .[(0)()"generic major mode for tabulated lists."single])(package .[(1 0)((tabulated-list (0)))"Simple package system for Emacs"single])(ert .[(0)()"Emacs Lisp Regression Testing"single])(macro-utils .[(1 0)()"Utilities for writing macros."single])(nurumacs .[(3 4 1)()"smooth-scrolling and minimap"single])(mark-tools .[(0 3)()"Some simple tools to access the mark-ring in Emacs"single])(weechat .[(0 2)((s (1 3 1)) (cl-lib (0 2)) (emacs (24)) (tracking (1 2)))"Chat via WeeChat's relay protocol in Emacs"tar])(todotxt .[(0 2 3)()"A major mode for editing todo.txt files"single])(toml-mode .[(0 1 3)()"Mojor mode for editing TOML files"single])(git-gutter .[(0 42)()"Port of Sublime Text plugin GitGutter"single])(vimrc-mode .[(0 3 1)()"Major mode for vimrc files"single])(control-lock .[(1 1 2)()"Like caps-lock, but for your control key.  Give your pinky a rest!"single])(fic-ext-mode .[(0 1)()"Show FIXME/TODO/BUG(...) in special face only in comments and strings"single])(cups .[(0 1)()"CUPS features for Emacs"single])(vcard .[(0 1)()"vcard parsing and display routines"single])(babcore .[(0 0 5)()"Core Emacs configuration. This should be the minimum in every emacs config."single])(edebug-x .[(1 2)((dash (1 1 0)))"Extensions for Edebug"single])(cryptol-mode .[(0 0 2)()"Cryptol major mode for Emacs"single])(loop .[(1 1)()"friendly imperative loop structures"single])(tex-smart-umlauts .[(1 2 0)()"Smart umlaut conversion for TeX."single])(ht .[(1 5)()"The missing hash table library for Emacs"single])(flymake-hlint .[(0 2)((flymake-easy (0 1)))"A flymake handler for haskell-mode files using hlint"single])(pinboard .[(0 0 1)()"get stuff from pinboard -*- lexical-binding: t -*-"single])(isea .[(0 0 2)((elpakit (0 0 18)))"interactive server eval at mode, a comint for a daemonized emacs -*- lexical-binding: t -*-"single])(lexbind-mode .[(0 8)()"Puts the value of lexical-binding in the mode line"single])(auto-highlight-symbol .[(1 55)()"Automatic highlighting current symbol minor mode"single])(dot-mode .[(1 12)()"minor mode to repeat typing or commands"single])(paste-kde .[(0 5 1)((web (0 3 6)))"paste text to KDE's pastebin service"single])(sackspace .[(0 8 2)()"A better backspace"single])(main-line .[(1 2 8)()"modeline replacement forked from an early version of powerline.el"single])(show-css .[(1 1)()"Show the css of the html attribute the cursor is on"single])(supergenpass .[(0 1)()"SuperGenPass for Emacs"single])(with-namespace .[(1 1)()"Poor-man's namespaces for elisp"single])(flymake-haskell-multi .[(0 3)((flymake-easy (0 1)))"Syntax-check haskell-mode using both ghc and hlint"tar])(proc-net .[(0 0 1)()"network process tools"single])(drupal-spell .[(0 2 2)()"Aspell extra dictionary for Drupal"tar])(everything .[(0 1 5)()"Bridge to MS Windows desktop-search engine Everything"single])(thread-dump .[(1 0)()"java thread dump viewer"single])(bitly .[(1 0)()"Shorten URLs using the bitly.com shortener service"single])(grapnel .[(0 5 3)()"HTTP request lib with flexible callback dispatch"single])(tumble .[(1 5)()"an Tumblr mode for Emacs"single])(batch-mode .[(1 0)()"major mode for editing ESRI batch scrips"single])(rubyinterpol .[(0 1)()"Ruby-like String Interpolation for format"single])(smartparens .[(1 6 1)((cl-lib (0 1)) (dash (2 3 0)))"Automatic insertion, wrapping and paredit-like navigation with user defined pairs."tar])(latest-clojars .[(0 3)()"Clojure dependency resolver"single])(helm-gtags .[(0 9 2)((helm (1 0)))"GNU GLOBAL helm interface"single])(git-gutter-fringe .[(0 12)((git-gutter (0 42)) (fringe-helper (0 1 1)))"Fringe version of git-gutter.el"single])(center-text .[(0 8)()"Center the text in a fixed-width column"single])(ert-x .[(0)((ert (0)))"Staging area for experimental extensions to ERT"single])(clj-mode .[(0 9)()"basic Major mode (clj) for Clojure code"single])(color-theme-heroku .[(1 0 0)()"Heroku color theme"single])(ruby-hash-syntax .[(0 3)()"Toggle ruby hash syntax between classic and 1.9 styles"single])(psgml .[(1 4 1)()"Lennart Staflin's Psgml package, with Elisp syntax and sgml-validate fixed for Emacsen >=24."tar])(swarmhacker .[(0 0 1)()"simple swarm chat"single])(theme-changer .[(2 1 0)()"Sunrise/Sunset Theme Changer for Emacs"single])(ttrss .[(1 7 5)((emacs (23 1)))"Tiny Tiny RSS elisp bindings"single])(emacs-droid .[(0 0 0)()"Android application development tools for Emacs"single])(github-browse-file .[(0 2 1)()"View the file you're editing on GitHub"single])(sea-before-storm-theme .[(0 3)()"Sea Before Storm color theme for Emacs 24"single])(letcheck .[(0 2)()"Check the erroneous assignments in let forms"single])(clippy .[(1 0)((pos-tip (1 0)))"Show tooltip with function documentation at point"single])(wacspace .[(0 4 1)((dash (1 2 0)) (cl-lib (0 2)))"The WACky WorkSPACE manager for emACS"tar])(kanban .[(0 1 2)()"Parse org-todo headlines to use org-tables as Kanban tables"single])(flymake-elixir .[(0 5)()"A flymake handler for elixir-mode .ex files.     "single])(surround .[(0 1)()"emulate surround.vim from Vim"single])(marmalade-service .[(2 0 9)((dash (1 1 0)) (s (1 6 0)) (elnode (0 9 9 6 10)))"The Marmalade package store service."tar])(suomalainen-kalenteri .[(2013 4 18)()"Finnish national and Christian holidays for calendar"tar])(rubocop .[(0 3)((dash (1 0 0)))"An Emacs interface for RuboCop"single])(lispyscript-mode .[(0 3 0)()"Major mode for LispyScript code."single])(indent-guide .[(1 0 1)()"show vertical lines to guide indentation"single])(toxi-theme .[(0 1 0)()"REQUIRES EMACS 24"single])(simplezen .[(0 1 1)()"A simple subset of zencoding-mode for Emacs."single])(company-cmake .[(0 1)((company (0 6 8)))"company-mode completion back-end for CMake"single])(helm-ag .[(0 4)((helm (1 0)))"the silver search with helm interface"single])(better-defaults .[(0 1 2)()"Fixing weird quirks and poor defaults"single])(typing-practice .[(0 1)()"Typing practice"single])(helm-projectile .[(0 10 0)((helm (1 4 0)) (projectile (0 10 0)))"Helm integration for Projectile"single])(perlbrew .[(0 1)((cl (0)))"basic support for perlbrew environments"single])(paredit-everywhere .[(0 3)((paredit (22)))"Enable some paredit features in non-lisp buffers"single])(string-edit .[(0 1 0)((dash (1 2 0)))"Avoid escape nightmares by editing string in separate buffer"single])(flycheck-color-mode-line .[(0 3)((flycheck (0 15)) (dash (1 2)) (emacs (24 1)))"Change mode line color with Flycheck status -*- lexical-binding: t -*-"single])(angular-snippets .[(0 2 3)((s (1 4 0)) (dash (1 2 0)))"Yasnippets for AngularJS"tar])(command-stats .[(0 1)()"Track frequency of commands executed in emacs"single])(stripe-buffer .[(0 2 2)((cl-lib (1 0)))"Use a different background for even and odd lines"single])(sparql-mode .[(0 7 2)()"Edit and interactively evaluate SPARQL queries."single])(butler .[(0 2 0)((deferred (3 1)) (json (1 2)))"Emacs client for Jenkins"tar])(theme-park-mode .[(0 1 2)()"Take your themes for a ride!"single])(colour-region .[(0 4)()"Toggle regions of the buffer with different text snippets"single])(org-dotemacs .[(0 3)((org (7 9 3)) (cl-lib (1 0)))"Store your emacs config as an org file, and choose which bits to load."single])(fm .[(20130612 1)()"follow mode for compilation/output buffers"single])(bs-ext .[(0 2)()"Extensions to emacs buffer-selection library (bs.el)"single])(look-mode .[(1 0)()"quick file viewer for image and text file browsing"single])(look-dired .[(0 1)((look-mode (1 0)))"Extensions to look-mode for dired buffers"single])(dired-dups .[(0 3)()"Find duplicate files and display them in a dired buffer"single])(nzenburn-theme .[(20130513)()"A low contrast color theme for Emacs."single])(noflet .[(0 0 10)()"locally override functions"single])(simple-call-tree+ .[(1 3)()"Extensions to simple-call-tree"single])(eviews .[(0 1)()"Major-mode for editing eviews program files"single])(bbdb-ext .[(0 1)((bbdb (2 36)))"Extra commands for BBDB"single])(bar-cursor .[(1 1)()"package used to switch block cursor to a bar"single])(s-buffer .[(0 0 4)((s (1 6 0)) (noflet (0 0 3)))"s operations for buffers"single])(nodejs-repl .[(0 0 2 1)()"Run Node.js REPL"single])(fuzzy-format .[(0 1 1)()"select indent-tabs-mode and format code automatically."single])(psvn .[(1 1 1)()"Subversion interface for emacs"single])(javarun .[(0 1 1)()"Minor mode for quick development of Java programs"single])(slough .[(0 1)((nrepl (0 1 7)) (smartparens (1 4 3)))"package for slough - this is for a secret TW thing"single])(express .[(0 6 0)((string-utils (0 3 2)))"Alternatives to `message'"single])(fullscreen-mode .[(0 0 1)()"fullscreen window support for Emacs"single])(current-story .[(0 1 0)()"Track and insert current Pivotal Tracker"single])(kmacro-decision .[(1 5)((el-x (1 0)) (jb-misc-macros (0 2)))"Add conditional branching to keyboard macros"single])(jedi .[(0 1 2)((epc (0 1 0)) (auto-complete (1 4)))"Python auto-completion for Emacs"tar])(request .[(0 2 0)()"Compatible layer for URL request in Emacs"single])(request-deferred .[(0 2 0)((deferred (0 3 1)) (request (0 2 0)))"Wrap request.el by deferred"single])(show-marks .[(0 4)((fm (1 0)))"Navigate and visualize the mark-ring"single])(irfc .[(0 5 6)()"Interface for IETF RFC document."single])(apt-utils-ido .[(0 2)((apt-utils (1 212)))"Ido commands for apt-utils"single])(apt-utils .[(1 212)()"Emacs interface to APT (Debian package management)"single])(emms-mark-ext .[(0 3)((emms (3 0)))"Extra functions for emms-mark-mode and emms-tag-edit-mode"single])(emamux .[(0 1)()"Interact with tmux"single])(mustache .[(0 20)((ht (0 9)) (s (1 3 0)) (dash (1 2 0)))"a mustache templating library in emacs lisp"tar])(esup .[(0 3)()"the Emacs StartUp Profiler (ESUP)"single])(subatomic-enhanced-theme .[(20130226 2229)()"Nice looking emacs 24 theme"single])(highlight-escape-sequences .[(0 1)()"Highlight escape sequences -*- lexical-binding: t -*-"single])(mode-icons .[(0 1 0)()"Show icons for modes"tar])(shorten .[(0 3)()"component-wise string shortener"single])(desktop-registry .[(1 1 0)()"Keep a central registry of desktop files -*- lexical-binding: t -*-"single])(org-journal .[(1 4 6)()"a simple org-mode based journaling mode"single])(editorconfig .[(0 2)()"EditorConfig Emacs extension"single])(handlebars-sgml-mode .[(0 1 0)()"Add Handlebars contextual indenting support to sgml-mode"single])(flymake-less .[(0 3)((less-css-mode (0 15)))"Flymake handler for LESS stylesheets (lesscss.org)"single])(sawfish .[(1 32)()"Sawfish mode."single])(ob-sml .[(0 1)((sml-mode (6 4)))"org-babel functions for template evaluation"single])(dired-efap .[(0 8)()"Edit Filename At Point in a dired buffer"single])(occur-x .[(0 1 1)()"Extra functionality for occur"single])(scrolloff .[(1 0)()"This mode ofers vim-like scrolloff function"single])(issue-tracker .[(0 0 1)()"Poor man's issue tracker"tar])(ido-gnus .[(0 4)((gnus (5 13)))"Access gnus groups or servers using ido"single])(command-t .[(0 0 1)((find-file-in-project (3 2)) (popwin (0 4)))"Finds file in project using fuzzy search."single])(hide-lines .[(20130623 1701)()"Commands for hiding lines based on a regexp"single])(syslog-mode .[(2 2)((hide-lines (20130623)))"Major-mode for viewing log files"single])(jb-misc-macros .[(0 4)((macro-utils (1 0)))"Miscellaneous macros"single])(man-commands .[(1 1)()"Add interactive commands for every manpages installed in your computer."single])(cloud-to-butt-erc .[(1 0 0)()"Replace 'the cloud' with 'my butt'"single])(pager-default-keybindings .[(1 1)()"Add the default keybindings suggested for pager.el"single])(hook-utils .[(1 0)()"Add a few utility functions for manipulating hooks"single])(occur-default-current-word .[(1 0)()"Have M-x occur default to the word at point"single])(scratch-persist .[(1 1)()"persist the scratch buffer across sessions"single])(company-inf-ruby .[(0 2)((company (0 6 10)) (inf-ruby (2 2 7)))"company-mode completion back-end for inf-ruby"single])(frame-restore .[(0 4)((dash (1 2)) (f (0 11)) (emacs (24 1)))"Restore Emacs frame -*- lexical-binding: t; -*-"single])(debian-changelog-mode .[(1 96)()"major mode for Debian changelog files."single])(sourcetalk .[(1 1 0)((request (0 2 0)))"SourceTalk (http://sourcetalk.net) plugin for Emacs"single])(chm-view .[(0 2 2)()"View CHM file."single])(org-trello .[(0 2 6)((org (8 0 7)) (dash (1 5 0)) (request (0 2 0)) (cl-lib (0 3 0)) (json (1 2)) (elnode (0 9 9 7 6)) (esxml (0 3 0)) (s (1 7 0)) (kv (0 0 17)))"Org minor mode to synchronize with trello"tar])(clues-theme .[(20130908 801)((emacs (24 0)))"an Emacs 24 theme which may well be fully awesome..."single])(remember-theme .[(20131215 441)()"Remembers the last theme in use and re-loads for the next session."single])(assemblage-theme .[(20130715 621)()"a dark theme for Emacs 24"single])(parscope .[(0 1 0)()"Minor mode for showing the current scope in Lisp-like languages."single])(grizzl .[(0 1 1)((cl-lib (0 1)))"Fuzzy Search Library & Completing Read"tar])(flx .[(0 1)()"fuzzy matching with good sorting"single])(flx-ido .[(0 2)((flx (0 1)))"flx integration for ido"single])(parenface1.1 .[(1 1)()"Provide a face for parens in lisp modes."single])(git-gutter-fringe+ .[(0 0 2)((git-gutter+ (0 1)) (fringe-helper (20130519 1641)))"Fringe version of git-gutter+.el"single])(fringe-helper .[(1 0 1)()"helper functions for fringe bitmaps"single])(org-protocol-jekyll .[(0 1)()"Jekyll's handler for org-protocol"single])(gandalf-theme .[(0 1)()"Gandalf color theme"single])(processing-mode .[(1 2 1)()"Major mode for Processing 2.0"single])(gitconfig .[(1 0 0)()"Emacs lisp interface to work with git-config variables"single])(processing-snippets .[(1 0 0)((yasnippet (0 8 0)))"Snippets for the Processing major mode"tar])(rings .[(1 0 1)()"Buffer rings. Like tabs, but better."single])(modtime-skip-mode .[(0 9)()"Minor mode for disabling modtime and supersession checks on files."single])(web-mode .[(7 0 79)()"major mode for editing html templates"single])(nrepl-decompile .[(0 0 1)((nrepl (0 1 7)) (javap-mode (9)))"decompilation extension for nrepl.el"single])(pickup .[(0 0 3)()"pickup file. "single])(cubicle-mode .[(0 1)()"Cubicle major mode for emacs"single])(py-import-check .[(0 2)()"Finds the unused python imports using importchecker"single])(palimpsest .[(0 8)()"Various deletion strategies when editing"single])(flymake-puppet .[(1 0 0)((flymake-easy (0 9)))"An Emacs flymake handler for syntax-checking puppet using puppet-lint"single])(sparkline .[(0 3 0)()"Make sparkline images from a list of numbers"single])(wedge-ws .[(0 1 2)()"Wedge whitespace between columns in text"tar])(emmet-mode .[(1 0 5)()"Unofficial Emmet's support for emacs"single])(helm-delicious .[(1 3)()"helm extensions for delicious bookmarks"single])(tsql .[(1 0)()"customizes sql.el for T-SQL"single])(wisp-mode .[(0 1 2)()"Major mode for editing wisp: Whitespace-to-Lisp"single])(heroku-theme .[(1 1 0)()"Heroku color theme"single])(god-mode .[(2 10 1)()"God-like command entering minor mode"single])(helm-recoll .[(20130905 2330)((helm (1 5 4)))"helm interface for the recoll desktop search tool."single])(tronesque-theme .[(1 3)()"Color Theme based on Tron universe."single])(magit-tramp .[(0 1 0)((magit (1 2 0)))"git method for TRAMP"single])(aok .[(0 1)()"various useful ways to do `multi-occur'"single])(discord .[(0 5)()"Discordian dates for calendar"single])(pkg-info .[(0 4)((dash (1 6 0)) (epl (0 4)))"Information about packages       -*- lexical-binding: t; -*-"single])(dash-functional .[(1 0 0)((dash (2 0 0)) (emacs (24)))"Collection of useful combinators for Emacs Lisp  -*- lexical-binding: t -*-"single])(flycheck-cask .[(0 1)((flycheck (0 14)) (dash (2 0 0)) (f (0 6 0)))"Cask support in Flycheck -*- lexical-binding: t; -*-"single])(openstack-cgit-browse-file .[(0 2)()"Browse the current file in OpenStack cgit"single])(smtpmail-multi .[(0 6)()"Use different smtp servers for sending mail"single])(figlet .[(289)()"banner generator"single])(smart-whitespace-comment-fixup .[(1 0)()"Enables advice around yanking/killing lines that auto-indents and formats properly"single])(insert-shebang .[(0 9 2)()"Inserts shebang line automatically"tar])(tox .[(0 1)()"Launch current python test with tox."single])(winpoint-ignore-dired .[(1 1)((winpoint (1 0)))"Have winpoint ignore dired-mode buffers"single])(comint-better-defaults .[(1 0)()"better defaults for comint-derived modes"single])(waher-theme .[(20130917 7)((emacs (24 1)))"Emacs 24 theme based on waher for st2 by dduckster"single])(gerrit-download .[(0 2)((magit (20130828 1540)))"Show gerrit reviews in a diff buffer."single])(multi .[(2 0 1)((emacs (24)))"Clojure-style multi-methods for emacs lisp -*- lexical-binding: t -*-"single])(evil-indent-textobject .[(0 2)((evil (0)))"evil textobjects based on indentation"single])(git-gutter+ .[(0 1)((git-commit-mode (1 0)))"Manage Git hunks straight from the buffer"single])(helm-helm-commands .[(0 2)((helm (1 5 4)))"List all helm commands with helm"single])(jujube-theme .[(0 1)()"Pastel theme loosely based on jellybeans"single])(wonderland .[(0 1 1)((dash (2 0 0)) (dash-functional (1 0 0)) (multi (2 0 0)) (emacs (24)))"declarative configuration for Emacsen -*- lexical-binding: t -*-"single])(simple-httpd .[(1 4 4)()"pure elisp HTTP server"single])(elfeed .[(1 0 1)((emacs (24 1)))"an Emacs web feed reader"tar])(elfeed-web .[(1 0 1)((simple-httpd (1 4 3)) (elfeed (1 0 1)) (emacs (24 1)))"web interface to Elfeed"tar])(skewer-mode .[(1 5 3)((simple-httpd (1 4 0)) (js2-mode (20090723)))"live browser JavaScript, CSS, and HTML interaction"tar])(zone-matrix .[(0 0 1)()"Matrix themed Zone mode"tar])(shell-pop .[(0 3)()"helps you to use shell easily on Emacs. Only one key action to work."single])(awk-it .[(0 77)()"Run AWK interactively on region!"single])(osx-pseudo-daemon .[(1 0)()"Daemon mode that plays nice with OSX."single])(f .[(0 11 0)((s (1 7 0)) (dash (2 2 0)))"Modern API for working with files and directories"single])(whitespace-cleanup-mode .[(0 8)()"Intelligently call whitespace-cleanup on save"single])(isgd .[(20130927)()"Shorten URLs using the isgd.com shortener service"single])(java-file-create .[(1 0)()"automatically insert contents of empty java files"single])(ac-geiser .[(0 1)((geiser (0 5)) (auto-complete (1 4)))"Auto-complete backend for geiser"tar])(iasm-mode .[(0 1)()"interactive assembly major mode."single])(ample-zen-theme .[(0 2)()"AmpleZen Theme for Emacs 24"single])(tommyh-theme .[(1 2)()"A bright, bold-colored theme for emacs."single])(pbcopy .[(0 1 0)()"OS X clipboard integration for Emacs"single])(timestamper .[(0 1 0)()"A minor mode for easy timelogging"single])(tbemail .[(0 2)()"Provide syntax highlighting for email editing via"single])(evil-matchit .[(1 2 4)()"Vim matchit ported into Emacs (requires EVIL)"tar])(ruby-end .[(0 3 1)()"Automatic insertion of end blocks for Ruby"single])(dpaste_de .[(0 2)((web (0 3 7)))"Emacs mode to paste to dpaste.de"single])(skewer-less .[(0 2)((skewer-mode (1 5 3)))"Skewer support for live LESS stylesheet updates"single])(sensitive .[(1 0 1)((emacs (24)) (sequences (0 1 0)))"A dead simple way to load sensitive information"single])(sequences .[(0 1 0)((emacs (24)))"Ports of some Clojure sequence functions."single])(epl .[(0 4)((cl-lib (0 3)))"Emacs Package Library -*- lexical-binding: t; -*-"single])(magit-find-file .[(1 0 4)((magit (1 2 0)))"completing-read over all files in Git"single])(anzu .[(0 22)()"Show number of matches in mode-line while searching"single])(list-register .[(2 2)()"List register"single])(project-explorer .[(0 10 1)((cl-lib (0 3)) (es-lib (0 3)))"A project explorer sidebar -*- lexical-binding: t -*-"single])(charmap .[(0 0 1)()"Unicode table for Emacs"single])(latex-preview-pane .[(20131020)()"Makes LaTeX editing less painful by providing a updatable preview pane"tar])(latest-clojure-libraries .[(0 5)()"Clojure dependency resolver"single])(proxy-mode .[(0 9)()"Provides proxy minor mode."single])(lyskom .[(20131008)()"LysKOM elisp client."single])(el-init .[(20130416)()"Loader for configuration files"tar])(relax .[(0 2)((json (1 2)))"For browsing and interacting with CouchDB"single])(immutant-server .[(1 0 0)()"Run your Immutant server in Emacs"single])(ac-inf-ruby .[(0 4)((inf-ruby (2 3 2)) (auto-complete (1 4)))"Enable auto-complete in inf-ruby sessions"single])(json-snatcher .[(1 0)()"Grabs the path to JSON values in a JSON file."single])(nrepl-discover .[(0 0 1)()"Client to load commands from nrepl server"single])(ido-vertical-mode .[(0 1 1)()"Makes ido-mode display vertically."single])(minitest .[(0 5)((dash (1 0 0)))"An Emacs mode for ruby minitest files"single])(livid-mode .[(0 1 0)((skewer-mode (1 5 3)) (s (1 8 0)))"Live browser eval of JavaScript every time a buffer changes"single])(bert .[(0 1)()"BERT serialization library for Emacs"single])(ariadne .[(0 1)((bert (0 1)))"Ariadne plugin for Emacs"single])(prognth .[(1 0)()"Extend prog1 to arbitrary index"single])(free-keys .[(0 1)((cl-lib (0 3)))"Show free keybindings for modkeys or prefixes"single])(troncle .[(0 1 2)((nrepl (0 2 0)))"Emacs convenience functions for tracing clojure code"single])(tdd-status-mode-line .[(0 1 2)()"TDD status on the mode-line"single])(elixir-mix .[(0 3 0)()"Emacs integration for Elixir's mix"single])(zeal-at-point .[(0 0 3)()"Search the word at point with Zeal"single])(flycheck-hdevtools .[(0 2)((flycheck (0 15)))"A flycheck checker for Haskell using hdevtools"single])(ix .[(0 7)((grapnel (0 5 3)))"Emacs client for http://ix.io pastebin"single])(column-enforce-mode .[(1 0 3)()"Highlight text that extends beyond a  column"single])(pinboard-api .[(0 1)()"Rudimentary http://pinboard.in integration"single])(flycheck-ledger .[(0 2)((flycheck (0 15)))"Flycheck integration for ledger files"single])(gvpr-mode .[(0 1 0)()"A major mode offering basic syntax coloring for gvpr scripts."single])(telepathy .[(0 1)()"Access Telepathy from Emacs"single])(org-gnome .[(0 1)((notify (2010 8 20)) (telepathy (0 1)))"Orgmode integration with the GNOME desktop"single])(flymake-racket .[(0 40)((flymake-easy (0 1)))"A flymake handler for scheme-mode files"single])(dakrone-theme .[(0 0 2)()"dakrone's custom dark theme"single])(cider .[(0 4 0)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 3)))"Clojure Integrated Development Environment and REPL"tar])(geiser .[(0 5)()"GNU Emacs and Scheme talk to each other"tar])(puppet-mode .[(0 2)()"A simple mode for editing puppet manifests"single])(groovy-mode .[(20131129)()"Groovy mode derived mode"single])(ido-select-window .[(0 1 0)()"Select a window using ido and buffer names."tar])(bubbleberry-theme .[(0 1 2)((emacs (24 1)))"A theme based on LightTable for Emacs24"single])(go-mode .[(20131222)()"Major mode for the Go programming language"single])(gnus-summary-ext .[(0 1)((macro-utils (1 0)))"Extra limit and process mark commands for the gnus summary buffer"single])(clojure-mode .[(2 1 1)()"Major mode for Clojure code"single])(goto-chg .[(1 6)()"goto last change"single]))
\ No newline at end of file
diff --git a/elpa/archives/melpa/archive-contents b/elpa/archives/melpa/archive-contents
new file mode 100644
index 000000000..9f21aa941
--- /dev/null
+++ b/elpa/archives/melpa/archive-contents
@@ -0,0 +1,2 @@
+
+(1 (zotelo . [(20130428 604) nil "Manage Zotero collections from emacs" single]) (zossima . [(20121123 1635) ((inf-ruby (2 2 3))) "Ruby from Emacs" tar]) (zoom-frm . [(20131227 212) ((frame-fns (0)) (frame-cmds (0))) "Commands to zoom frame font size." single]) (znc . [(20130811 2058) ((cl-lib (0 2)) (erc (5 3))) "ZNC + ERC" single]) (zlc . [(20130427 43) nil "Provides zsh like completion system to Emacs" single]) (zencoding-mode . [(20111230 2020) nil "Unfold CSS-selector-like expressions to markup" single]) (zenburn-theme . [(20131228 1447) nil "A low contrast color theme for Emacs." single]) (zen-and-art-theme . [(20120622 737) nil "zen and art color theme for GNU Emacs 24" single]) (zeitgeist . [(20120211 1210) nil "No description available." single]) (zeal-at-point . [(20131210 503) nil "Search the word at point with Zeal" single]) (yaxception . [(20130430 1527) nil "provide framework about exception like Java for elisp" single]) (yasnippet . [(20131224 143) nil "Yet another snippet extension for Emacs." tar]) (yascroll . [(20130320 1134) nil "Yet Another Scroll Bar Mode" single]) (yari . [(20131207 511) nil "Yet Another RI interface for Emacs" single]) (yard-mode . [(20130402 1727) nil "Minor mode for Ruby YARD comments" single]) (yaoddmuse . [(20130225 1711) nil "Yet another oddmuse for Emacs" single]) (yaml-mode . [(20130310 2101) nil "Major mode for editing YAML files" single]) (yalinum . [(20130217 243) nil "yet another display line numbers." single]) (yagist . [(20131025 140) ((json (1 2 0))) "Yet Another Emacs integration for gist.github.com" single]) (xterm-frobs . [(20091211 1555) nil "manipulate xterm when running emacs in tty mode" single]) (xmlgen . [(20130219 219) nil "A DSL for generating XML." single]) (xml-rpc . [(20130423 1356) nil "An elisp implementation of clientside XML-RPC" single]) (xcscope . [(20131102 1402) nil "cscope interface for (X)Emacs" single]) (x-dict . [(20091203 1023) nil "emacs interface for several online dictionaries" single]) (writeroom-mode . [(20130315 1207) nil "Minor mode for distraction-free writing" tar]) (writegood-mode . [(20130408 718) nil "Polish up poor writing on the fly" single]) (wrap-region . [(20130528 2228) ((dash (1 0 3))) "Wrap text with punctation or tag" single]) (world-time-mode . [(20130331 1829) nil "show whole days of world-time diffs" single]) (workgroups2 . [(20131224 657) nil "New workspaces for Emacs" tar]) (workgroups . [(20110726 941) nil "workgroups for windows (for Emacs)" single]) (wonderland . [(20130912 1819) ((dash (2 0 0)) (dash-functional (1 0 0)) (multi (2 0 0)) (emacs (24))) "declarative configuration for Emacsen" single]) (with-namespace . [(20130407 1122) ((dash (1 1 0)) (loop (1 1))) "interoperable elisp namespaces" single]) (wisp-mode . [(20130828 720) ((clojure-mode (0))) "Major mode for Wisp code." single]) (winpoint . [(20131023 1013) nil "Remember buffer positions per-window, not per buffer" single]) (windsize . [(20110728 1336) nil "Simple, intuitive window resizing" single]) (window-numbering . [(20130902 930) nil "Numbered window shortcuts" single]) (window-number . [(20100803 1327) nil "Select windows by numbers" single]) (window-layout . [(20130805 1854) nil "window layout manager" single]) (window-jump . [(20130224 114) nil "Move left/right/up/down through your windows." single]) (window-end-visible . [(20131106 706) nil "Find the last visible point in a window" single]) (window+ . [(20131227 211) nil "Extensions to `window.el'." single]) (win-switch . [(20130202 937) nil "fast, dynamic bindings for window-switching/resizing" single]) (wimpy-del . [(20131227 211) nil "Require confirmation for large region deletion." single]) (wiki-nav . [(20131106 706) ((button-lock (1 0 0)) (nav-flash (1 0 0))) "Simple file navigation using [[WikiStrings]]" single]) (wiki . [(20120807 1458) nil "hypertext authoring the WikiWay" single]) (widget-mvc . [(20130430 757) nil "MVC framework for the emacs widgets" single]) (wide-n . [(20131227 210) nil "Cycle among buffer restrictions" single]) (wide-column . [(20120814 112) nil "Calls functions dependant on column position." single]) (wid-edit+ . [(20131227 210) nil "Extensions to standard library `wid-edit.el'." single]) (whole-line-or-region . [(20110901 130) nil "operate on current line if region undefined" single]) (whitespace-cleanup-mode . [(20131205 1117) nil "Intelligently call whitespace-cleanup on save" single]) (wgrep-helm . [(20121201 530) ((wgrep (2 1 1))) "Writable helm-grep-mode buffer and apply the changes to files" single]) (wgrep-ag . [(20131209 659) ((wgrep (2 1 5))) "Writable ag buffer and apply the changes to files" single]) (wgrep-ack . [(20121201 530) ((wgrep (2 1 1))) "Writable ack-and-a-half buffer and apply the changes to files" single]) (wgrep . [(20131209 659) nil "Writable grep buffer and apply the changes to files" single]) (weechat . [(20131117 358) ((s (1 3 1)) (cl-lib (0 2)) (emacs (24)) (tracking (1 2))) "Chat via WeeChat's relay protocol in Emacs" tar]) (wedge-ws . [(20130930 647) nil "Wedge whitespace between columns in text" single]) (websocket . [(20131224 618) nil "Emacs WebSocket client and server" single]) (weblogger . [(20110926 918) ((xml-rpc (1 6 8))) "Weblog maintenance via XML-RPC APIs" single]) (web-mode . [(20131228 1439) nil "major mode for editing html templates" tar]) (web-beautify . [(20131118 226) nil "Format HTML, CSS and JavaScript/JSON by js-beautify" single]) (web . [(20130827 512) nil "useful HTTP client" single]) (weather-metno . [(20131228 1128) ((emacs (24))) "Weather data from met.no in Emacs" tar]) (wcheck-mode . [(20130613 808) nil "General interface for text checkers" single]) (wc-mode . [(20120531 1344) nil "show wc-like information in status bar" single]) (watch-buffer . [(20120331 1344) nil "run a shell command when saving a buffer" single]) (wakatime-mode . [(20131223 617) nil "Automatic time tracking extension based on WakaTime" single]) (wacspace . [(20130726 1007) ((dash (1 2 0)) (cl-lib (0 2))) "The WACky WorkSPACE manager for emACS" tar]) (w3m . [(20131203 1429) nil "an Emacs interface to w3m" tar]) (w32browser-dlgopen . [(20131227 209) nil "Use w32browser with standard Windows Open File box." single]) (w32-browser . [(20131227 208) nil "Run Windows application associated with a file." single]) (volatile-highlights . [(20130321 641) nil "Minor mode for visual feedback on some operations." single]) (vline . [(20120108 1245) nil "show vertical line (column highlighting) mode." single]) (vlf . [(20131217 1404) nil "View Large Files" single]) (vkill . [(20091203 1022) nil "view and kill Unix processes from within Emacs" single]) (visual-regexp-steroids . [(20131217 854) ((visual-regexp (0 5))) "Extends visual-regexp to support other regexp engines" tar]) (visual-regexp . [(20131217 857) ((cl-lib (0 2))) "A regexp/replace command for Emacs with interactive visual feedback" single]) (visible-mark . [(20080221 651) nil "Make marks visible." single]) (virtualenvwrapper . [(20131120 1008) ((dash (1 5 0)) (s (1 6 1))) "a modern virtualenv tool for Emacs" single]) (virtualenv . [(20120930 1034) nil "Virtualenv for Python" single]) (vimrc-mode . [(20130228 1244) nil "Major mode for vimrc files" single]) (vimgolf . [(20120228 550) nil "VimGolf interface for the One True Editor" single]) (vim-region . [(20131214 747) nil "Select region as vim" single]) (viewer . [(20130314 2337) nil "View-mode extension" single]) (vertica . [(20131217 711) ((sql (3 0))) "Vertica SQL mode extension" single]) (vector-utils . [(20131106 706) nil "Vector-manipulation utility functions" single]) (vcomp . [(20121231 248) nil "compare version strings" single]) (vcl-mode . [(20121129 1314) nil "Syntax highlighting for Varnish Command Language" single]) (vc-osc . [(20120910 211) nil "non-resident support for osc version-control" single]) (vc-darcs . [(20090617 1105) nil "a VC backend for darcs" single]) (vc-check-status . [(20130814 522) nil "Warn you when quitting emacs and leaving repo dirty." tar]) (vagrant . [(20130808 618) nil "Manage a vagrant box from emacs" single]) (uuid . [(20120910 151) nil "UUID's for EmacsLisp" single]) (use-package . [(20131216 954) ((bind-key (1 0)) (diminish (0 44))) "A use-package declaration for simplifying your .emacs" single]) (usage-memo . [(20110722 1551) nil "integration of Emacs help system and memo" single]) (url-shortener . [(20131218 353) nil "shorten long url and expand tinyurl" single]) (unicode-whitespace . [(20131122 1001) ((ucs-utils (0 7 6)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "teach whitespace-mode about fancy characters" single]) (unicode-progress-reporter . [(20131106 706) ((emacs (24 1 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Progress-reporter with fancy characters" single]) (unicode-fonts . [(20131122 1001) ((font-utils (0 7 0)) (ucs-utils (0 7 6)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Configure Unicode fonts" single]) (unicode-enbox . [(20131122 1000) ((string-utils (0 3 2)) (ucs-utils (0 7 6)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Surround a string with box-drawing characters" single]) (unfill . [(20131103 213) nil "The inverse of fill-paragraph and fill-region" single]) (undohist . [(20110331 1623) nil "Persistent Undo History for GNU Emacs" single]) (undo-tree . [(20131118 1744) nil "Treat undo history as a tree" single]) (underwater-theme . [(20131117 1602) nil "A gentle, deep blue color theme" single]) (uncrustify-mode . [(20130707 659) nil "Minor mode to automatically uncrustify." single]) (ukrainian-holidays . [(20130720 649) nil "Ukrainian holidays for Emacs calendar." single]) (ujelly-theme . [(20131211 1552) nil "Ujelly theme for GNU Emacs 24 (deftheme)" single]) (ucs-utils . [(20131122 1636) ((persistent-soft (0 8 8)) (pcache (0 2 3)) (list-utils (0 4 2))) "Utilities for Unicode characters" tar]) (ucs-cmds . [(20131227 204) nil "Macro to create commands that insert Unicode chars." single]) (typo . [(20130323 340) nil "Minor mode for typographic editing" single]) (typing . [(20121026 2118) nil "The Typing Of Emacs" single]) (twittering-mode . [(20131211 1017) nil "Major mode for Twitter" single]) (twilight-theme . [(20120412 603) nil "Twilight theme for GNU Emacs 24 (deftheme)" single]) (twilight-bright-theme . [(20130605 143) nil "A Emacs 24 faces port of the TextMate theme" single]) (twilight-anti-bright-theme . [(20120713 316) nil "A soothing Emacs 24 light-on-dark theme" single]) (twig-mode . [(20130220 1050) nil "A major mode for twig" single]) (tup-mode . [(20131009 2213) nil "Major mode for editing files for Tup" single]) (tumblesocks . [(20131104 1917) ((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1))) "An Emacs tumblr client." tar]) (tumble . [(20130327 1007) ((http-post-simple (0))) "an Tumblr mode for Emacs" single]) (tuareg . [(20131112 447) ((caml (3 12 0 1))) "OCaml mode for Emacs." tar]) (ttrss . [(20130409 1049) ((emacs (23 1))) "Tiny Tiny RSS elisp bindings" single]) (tt-mode . [(20130804 410) nil "Emacs major mode for editing Template Toolkit files." single]) (tss . [(20131120 906) ((auto-complete (1 4 0)) (json-mode (1 1 0)) (log4e (0 2 0)) (yaxception (0 1))) "provide a interface for auto-complete.el/flymake.el on typescript-mode." tar]) (truthy . [(20131106 706) ((list-utils (0 4 2))) "Test the content of a value" single]) (tronesque-theme . [(20130822 1536) nil "Color Theme based on Tron universe." single]) (trident-mode . [(20130726 1207) ((emacs (24)) (slime (20130526)) (skewer-mode (1 5 0)) (dash (1 0 3))) "Live Parenscript interaction" single]) (tree-mode . [(20121207 1538) nil "A mode to manage tree widgets" single]) (tracwiki-mode . [(20131026 2205) ((xml-rpc (1 6 8))) "Emacs Major mode for working with Trac" single]) (tracking . [(20131201 620) ((shorten (0 1))) "Buffer modification tracking" single]) (toxi-theme . [(20130418 1239) ((emacs (24))) "A dark color theme by toxi" single]) (tox . [(20130925 731) nil "Launch current python test with tox" single]) (top-mode . [(20130605 1739) nil "run \"top\" from emacs" single]) (tool-bar+ . [(20131227 203) nil "Extensions to standard library tool-bar.el" single]) (tommyh-theme . [(20131004 1630) nil "A bright, bold-colored theme for emacs" single]) (toml-mode . [(20130302 748) nil "Mojor mode for editing TOML files" single]) (toml . [(20130903 555) nil "TOML (Tom's Obvious, Minimal Language) parser" single]) (tomatinho . [(20130824 943) nil "Tomatinho" tar]) (todotxt . [(20130527 851) nil "A major mode for editing todo.txt files" single]) (todochiku . [(20120202 2005) nil "A mode for interfacing with Growl, Snarl, and the like." single]) (tmmofl . [(20121025 401) nil "Calls functions dependant on font lock highlighting at point" single]) (tiny . [(20131224 433) nil "Quickly generate linear ranges in Emacs" single]) (time-ext . [(20130130 2151) nil "more function for time/date" single]) (tidy . [(20111222 1756) nil "Interface to the HTML Tidy program" single]) (thumb-through . [(20120118 2134) nil "Plain text reader of HTML documents" single]) (thumb-frm . [(20131227 201) ((frame-fns (0)) (frame-cmds (0))) "Commands for thumbnail frames." single]) (thrift . [(20130910 912) nil "Major mode for Apache Thrift files" single]) (thread-dump . [(20130323 1025) nil "Java thread dump viewer" single]) (thingopt . [(20120717 826) nil "Thing at Point optional utilities" single]) (thingatpt+ . [(20131227 200) nil "Extensions to `thingatpt.el'." single]) (thing-cmds . [(20131227 159) ((hide-comnt (0))) "Commands that use things, as defined by `thingatpt.el'." single]) (thesaurus . [(20121125 1937) nil "replace a word with a synonym looked up in a web service." single]) (theme-changer . [(20130725 1919) nil "Sunrise/Sunset Theme Changer for Emacs" single]) (tfs . [(20120508 1820) nil "MS Team Foundation Server commands for Emacs." single]) (textmate-to-yas . [(20130509 854) nil "Import Textmate macros into yasnippet syntax" tar]) (textmate . [(20110816 1446) nil "TextMate minor mode for Emacs" single]) (textile-mode . [(20120721 1258) nil "Textile markup editing major mode" single]) (tex-smart-umlauts . [(20131210 2346) nil "Smart umlaut conversion for TeX." single]) (test-simple . [(20130710 826) nil "Simple Unit Test Framework for Emacs Lisp" single]) (test-case-mode . [(20131223 556) nil "unit test front-end" single]) (tern-auto-complete . [(20130809 229) ((tern (0 0 1)) (auto-complete (1 4)) (emacs (24))) "Tern Completion by auto-complete.el" single]) (tern . [(20130828 716) ((json (1 2)) (emacs (24))) "Tern-powered JavaScript integration" single]) (telepathy . [(20131209 458) nil "Access Telepathy from Emacs" single]) (tea-time . [(20120331 120) nil "Simple timer package, useful to make perfect tea." single]) (tdd-status-mode-line . [(20131123 916) nil "TDD status on the mode-line" single]) (tc . [(20131028 149) nil "a Japanese input method with T-Code on Emacs" tar]) (tangotango-theme . [(20130827 321) nil "Tango Palette color theme for Emacs 24." single]) (tango-2-theme . [(20120312 1325) nil "Tango 2 color theme for GNU Emacs 24" single]) (tagedit . [(20130816 510) ((s (1 3 1)) (dash (1 0 3))) "Some paredit-like features for html-mode" single]) (tabulated-list . [(20120406 1351) nil "generic major mode for tabulated lists." single]) (tabbar-ruler . [(20130701 2153) ((tabbar (2 0 1))) "Pretty tabbar, autohide, use both tabbar/ruler" tar]) (tabbar . [(20131106 1524) nil "No description available." tar]) (systemtap-mode . [(20121209 1510) nil "A mode for SystemTap" single]) (syslog-mode . [(20131020 1702) ((hide-lines (20130623))) "Major-mode for viewing log files" single]) (syntactic-sugar . [(20131106 706) nil "Effect-free forms such as if/then/else" single]) (synonyms . [(20131227 159) nil "Look up synonyms for a word or phrase in a thesaurus." single]) (sws-mode . [(20120802 1052) nil "(S)ignificant (W)hite(S)pace mode" single]) (switch-window . [(20130914 640) nil "A *visual* way to choose a window to switch to" single]) (swbuff-x . [(20130607 1014) ((swbuff (19991231 1800))) "Modifications to David Ponce's swbuff" single]) (swbuff . [(20041012 718) nil "Quick switch between Emacs buffers." single]) (svg-mode-line-themes . [(20130922 1230) ((xmlgen (0 4))) "SVG-based themes for mode-line" tar]) (surround . [(20130927 737) nil "emulate surround.vim from Vim" single]) (supergenpass . [(20130328 2248) nil "SuperGenPass for Emacs" single]) (suomalainen-kalenteri . [(20130414 635) nil "Finnish holidays for Emacs calendar." single]) (sunny-day-theme . [(20131203 1250) nil "Emacs24 theme with a light background." single]) (summarye . [(20130328 1027) nil "list up matched strings from a buffer, and display them in summary buffer" single]) (sudo-ext . [(20130130 2151) nil "sudo support" single]) (sudden-death . [(20121218 549) nil "Totsuzen-no-Shi" single]) (subshell-proc . [(20130122 1322) nil "Functions for working with comints" single]) (sublimity . [(20131111 2311) nil "smooth-scrolling and minimap, like sublime editor" tar]) (sublime-themes . [(20131203 623) nil "A collection of themes based on Sublime Text" tar]) (subatomic256-theme . [(20130620 1910) nil "Fork of subatomic-theme for terminals." single]) (subatomic-theme . [(20131011 1048) nil "Nice looking emacs 24 theme" single]) (stylus-mode . [(20120802 1052) ((sws-mode (0))) "Major mode for editing .jade files" single]) (stupid-indent-mode . [(20130816 1354) nil "Plain stupid indentation minor mode" single]) (stumpwm-mode . [(20111113 431) nil "special lisp mode for evaluating code into running stumpwm" single]) (stripe-buffer . [(20131010 1526) ((cl-lib (1 0))) "Use a different background for even and odd lines" single]) (strings . [(20131227 158) nil "Miscellaneous string functions." single]) (string-utils . [(20131106 706) ((list-utils (0 4 2))) "String-manipulation utilities" single]) (string-edit . [(20130815 2115) ((dash (1 2 0))) "Avoid escape nightmares by editing string in separate buffer" single]) (sticky . [(20101130 252) nil "Sticky key for capital letters" single]) (stem . [(20131102 409) nil "Routines for stemming" single]) (starter-kit-ruby . [(20120202 1132) ((inf-ruby (2 2 3)) (starter-kit (2 0 1))) "Saner defaults and goodies for Ruby" single]) (starter-kit-perl . [(20120202 1132) nil "Some helpful Perl code" single]) (starter-kit-lisp . [(20120504 1225) ((starter-kit (2 0 2)) (elisp-slime-nav (0 1))) "Saner defaults and goodies for lisp languages" single]) (starter-kit-js . [(20111009 2054) ((starter-kit (2 0 1))) "Saner defaults and goodies for Javascript" single]) (starter-kit-eshell . [(20121001 1714) nil "Saner defaults and goodies: eshell tweaks" single]) (starter-kit-bindings . [(20120101 1955) ((starter-kit (2 0 2))) "Saner defaults and goodies: bindings" single]) (starter-kit . [(20130904 1547) ((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 2)) (ido-ubiquitous (0 3)) (magit (0 8 1))) "Saner defaults and goodies." tar]) (stan-mode . [(20131007 2012) nil "Major mode for editing STAN files" tar]) (ssh-config-mode . [(20120513 2233) nil "Mode for fontification of ~/.ssh/config" single]) (ssh . [(20120904 1342) nil "Support for remote logins using ssh." single]) (sr-speedbar . [(20131207 2049) nil "Same frame speedbar" single]) (sqlite . [(20131226 619) nil "use sqlite via elisp" single]) (sql-indent . [(20090325 2254) nil "indentation of SQL statements" single]) (sprintly-mode . [(20121005 2234) ((furl (0 0 2))) "Major mode for dealing with sprint.ly" single]) (spotify . [(20130520 258) nil "Control the spotify application from emacs" single]) (splitter . [(20130705 50) nil "Manage window splits" single]) (sphinx-frontend . [(20131223 329) nil "Launch build process for rst documents via sphinx." single]) (speechd-el . [(20130828 1209) nil "Client to speech synthesizers and Braille displays." tar]) (sparql-mode . [(20131129 226) nil "Edit and interactively evaluate SPARQL queries." single]) (sparkline . [(20130803 542) nil "Make sparkline images from a list of numbers" single]) (spaces . [(20130610 49) nil "Create and switch between named window configurations." single]) (sourcetalk . [(20130908 957) ((request (0 2 0))) "SourceTalk (http://sourcetalk.net) plugin for Emacs" single]) (soundcloud . [(20131210 1103) ((emms (20131016)) (json (1 2)) (deferred (0 3 1)) (string-utils (0 3 2))) "a SoundCloud client for Emacs" single]) (soothe-theme . [(20130805 0) ((emacs (24 1))) "a dark colorful theme for Emacs24." single]) (solarized-theme . [(20131221 1216) nil "The Solarized color theme, ported to Emacs." tar]) (soft-stone-theme . [(20131227 701) ((emacs (24))) "Emacs 24 theme with a light background." single]) (soft-morning-theme . [(20131211 1342) nil "Emacs24 theme with a light background." single]) (soft-charcoal-theme . [(20130924 1206) nil "Dark charcoal theme with soft colors" single]) (snippet . [(20130210 1515) nil "Insert snippets of text into a buffer" single]) (smotitah . [(20131127 152) nil "Modular emacs configuration framework" tar]) (smooth-scrolling . [(20131219 2039) nil "Make emacs scroll smoothly" single]) (smooth-scroll . [(20130321 2114) nil "Minor mode for smooth scrolling and in-place scrolling." single]) (smex . [(20131210 700) nil "M-x interface with Ido-style fuzzy matching." single]) (smarty-mode . [(20100703 458) nil "major mode for editing smarty templates" single]) (smartscan . [(20131213 632) nil "Jumps between other symbols found at point" single]) (smartrep . [(20130316 1716) nil "Support sequential operation which omitted prefix keys." single]) (smartparens . [(20131227 423) ((cl-lib (0 3)) (dash (2 4 0))) "Automatic insertion, wrapping and paredit-like navigation with user defined pairs." tar]) (smart-window . [(20130214 1142) nil "vim-like window controlling plugin" single]) (smart-tabs-mode . [(20130718 939) nil "Intelligently indent with tabs, align with spaces!" single]) (smart-tab . [(20130317 1157) nil "Intelligent tab completion and indentation." single]) (smart-operator . [(20051013 1756) nil "Beautify the operators in codes" single]) (smart-newline . [(20131207 1940) nil "Provide smart newline for one keybind." single]) (smart-mode-line . [(20131217 1354) ((emacs (24 3)) (dash (2 2 0))) "A color coded smart mode-line." single]) (smart-forward . [(20130205 452) ((expand-region (0 8 0))) "Semantic navigatioin" single]) (smart-compile . [(20130917 347) nil "an interface to `compile'" single]) (slime-ritz . [(20130218 1537) nil "slime extensions for ritz" single]) (slime . [(20131116 2359) nil "Superior Lisp Interaction Mode for Emacs" tar]) (slim-mode . [(20131202 2302) nil "Major mode for editing Slim files" single]) (slideview . [(20130512 2142) nil "File slideshow" single]) (slamhound . [(20131107 927) nil "Rip Clojure namespaces apart and rebuild them." single]) (skewer-mode . [(20131117 808) ((simple-httpd (1 4 0)) (js2-mode (20090723)) (emacs (24))) "live browser JavaScript, CSS, and HTML interaction" tar]) (skewer-less . [(20131015 622) ((skewer-mode (1 5 3))) "Skewer support for live LESS stylesheet updates" single]) (simplezen . [(20130421 300) ((s (1 4 0)) (dash (1 1 0))) "A simple subset of zencoding-mode for Emacs." single]) (simplenote . [(20130416 1502) nil "Interact with simple-note.appspot.com" single]) (simpleclip . [(20131106 706) nil "Simplified access to the system clipboard" single]) (simple-httpd . [(20130908 1304) nil "pure elisp HTTP server" single]) (simple-call-tree . [(20130330 940) nil "analyze source code based on font-lock text-properties" single]) (simple-call-tree+ . [(20131009 1412) nil "Extensions to simple-call-tree" single]) (simple+ . [(20131227 154) ((strings (0))) "Extensions to standard library `simple.el'." single]) (simp . [(20130602 1301) nil "Simple project definition, chiefly for file finding, and grepping" tar]) (sicp . [(20121014 1314) nil "No description available." tar]) (shut-up . [(20131225 658) nil "Shut up would you!" single]) (show-marks . [(20130805 749) ((fm (1 0))) "Navigate and visualize the mark-ring" single]) (show-css . [(20130605 1524) nil "Show the css of the html attribute the cursor is on" tar]) (shorten . [(20131201 620) nil "component-wise string shortener" single]) (shimbun . [(20120718 2038) nil "interfacing with web newspapers" tar]) (shift-text . [(20130831 955) ((cl-lib (1 0)) (es-lib (0 3))) "Move the region in 4 directions, in a way similar to Eclipse's" single]) (shell-switcher . [(20130711 933) nil "Provide fast switching between shell buffers" tar]) (shell-pop . [(20131223 1828) nil "helps you to use shell easily on Emacs. Only one key action to work." single]) (shell-history . [(20100504 850) nil "integration with shell history" single]) (shell-here . [(20120807 1913) nil "Open a shell relative to the working directory" single]) (shell-command . [(20090621 1332) nil "enables tab-completion for `shell-command'" single]) (session . [(20120510 1700) nil "use variables, registers and buffer places across sessions" single]) (servant . [(20131021 355) ((s (1 8 0)) (dash (2 2 0)) (f (0 11 0)) (ansi (0 3 0)) (commander (0 5 0)) (elnode (0 9 9 7 6)) (epl (0 2))) "ELPA server written in Emacs Lisp" tar]) (sequential-command . [(20100504 855) nil "Many commands into one command" tar]) (sequences . [(20130908 1122) ((emacs (24))) "Ports of some Clojure sequence functions." single]) (sentence-highlight . [(20121026 1450) nil "highlight the current sentence" single]) (sensitive . [(20131015 635) ((emacs (24)) (sequences (0 1 0))) "A dead simple way to load sensitive information" single]) (second-sel . [(20131227 151) nil "Secondary selection commands" single]) (scss-mode . [(20130105 1411) nil "Major mode for editing SCSS files" single]) (screenshot . [(20120509 1105) nil "Take a screenshot in Emacs" single]) (scratch-pop . [(20131108 330) nil "popup \"scratch\"es" single]) (scratch-palette . [(20131108 329) nil "save scratch notes on each file" single]) (scratch-log . [(20120130 1521) nil "Utility for *scratch* buffer." single]) (scratch . [(20120830 1028) nil "Mode-specific scratch buffers" tar]) (scpaste . [(20110617 1856) ((htmlfontify (0 21))) "Paste to the web via scp." single]) (sclang-snippets . [(20130513 51) ((yasnippet (0 8 0))) "Snippets for the SuperCollider Emacs mode" tar]) (sclang-extensions . [(20131117 1439) ((auto-complete (1 4 0)) (s (1 3 1)) (dash (1 2 0)) (emacs (24 1))) "Extensions for the SuperCollider Emacs mode." tar]) (scion . [(20130315 555) nil "Haskell Minor Mode for Interacting with the Scion Library" single]) (scheme-here . [(20131105 338) nil "cmuscheme extension for multiple inferior processes" single]) (scheme-complete . [(20130220 403) nil "Smart tab completion for Scheme in Emacs" single]) (scf-mode . [(20111202 707) nil "shorten file-names in compilation type buffers" single]) (scala-mode2 . [(20131115 2347) nil "Major mode for editing Scala >= 2.9" tar]) (scala-mode . [(20131018 1325) nil "Major mode for editing Scala code." tar]) (sbt-mode . [(20131123 129) ((scala-mode2 (0 22))) "Major mode for sbt >= 0.12 with scala >= 2.9" tar]) (savekill . [(20130130 2151) nil "Save kill ring to disk" single]) (save-visited-files . [(20131224 1528) nil "save opened files across sessions" single]) (save-sexp . [(20130106 642) nil "save variables in files using setter forms like `setq'" tar]) (save-load-path . [(20131228 1952) nil "save load-path and reuse it to test" single]) (sauron . [(20130818 1134) nil "Track (erc/org/dbus/...) events and react to them." tar]) (sass-mode . [(20120224 1117) ((haml-mode (3 0 15))) "Major mode for editing Sass files" single]) (sackspace . [(20130719 256) nil "A better backspace" single]) (s-buffer . [(20130605 1424) ((s (1 6 0)) (noflet (0 0 3))) "s operations for buffers" single]) (s . [(20131223 944) nil "The long lost Emacs string manipulation library." single]) (rvm . [(20131217 324) nil "Emacs integration for rvm" single]) (rust-mode . [(20131214 1941) nil "A major emacs mode for editing Rust source code" single]) (runner . [(20131021 1409) nil "Improved \"open with\" suggestions for dired" single]) (ruby-tools . [(20131121 605) nil "Collection of handy functions for ruby-mode." tar]) (ruby-test-mode . [(20131205 209) ((ruby-mode (1 0))) "Minor mode for Behaviour and Test Driven" single]) (ruby-refactor . [(20130810 543) ((ruby-mode (1 2))) "A minor mode which presents various Ruby refactoring helpers." single]) (ruby-interpolation . [(20131112 852) nil "Ruby string interpolation helpers" single]) (ruby-hash-syntax . [(20131113 1032) nil "Toggle ruby hash syntax between classic and 1.9 styles" single]) (ruby-end . [(20131016 37) nil "Automatic insertion of end blocks for Ruby" single]) (ruby-electric . [(20131217 33) nil "Minor mode for electrically editing ruby code" single]) (ruby-dev . [(20130811 151) nil "Interactive developement environment for Ruby." tar]) (ruby-compilation . [(20130429 611) ((inf-ruby (2 2 1))) "run a ruby process in a compilation buffer" single]) (ruby-block . [(20131211 331) nil "highlight matching block" single]) (ruby-additional . [(20131030 2113) ((emacs (24 3)) (ruby-mode (1 2))) "ruby-mode extensions yet to be merged into Emacs" tar]) (rubocop . [(20131101 1142) ((dash (1 0 0))) "An Emacs interface for RuboCop" single]) (rspec-mode . [(20131127 1747) ((ruby-mode (1 0))) "Enhance ruby-mode for RSpec" tar]) (rsense . [(20100510 2105) nil "RSense client for Emacs" single]) (rpm-spec-mode . [(20130922 2348) nil "RPM spec file editing commands for Emacs/XEmacs" single]) (roy-mode . [(20121208 358) nil "Roy major mode" single]) (robe . [(20131228 424) ((inf-ruby (2 3 0))) "Code navigation, documentation lookup and completion for Ruby" tar]) (rnc-mode . [(20121227 1502) nil "A major mode for editing RELAX NG Compact syntax." single]) (rings . [(20130721 1905) nil "Buffer rings. Like tabs, but better." single]) (rinari . [(20131117 737) ((ruby-mode (1 0)) (inf-ruby (2 2 5)) (ruby-compilation (0 16)) (jump (2 0))) "Rinari Is Not A Rails IDE" single]) (rhtml-mode . [(20130422 611) nil "major mode for editing RHTML files" tar]) (rfringe . [(20110405 1520) nil "display the relative location of the region, in the fringe." single]) (revive . [(20121022 411) nil "Resume Emacs" single]) (reverse-theme . [(20130402 312) nil "Reverse theme for Emacs" single]) (restclient . [(20131204 607) nil "An interactive HTTP client for Emacs" tar]) (requirejs-mode . [(20130215 1304) nil "Improved AMD module management" single]) (request . [(20130526 1015) nil "Compatible layer for URL request in Emacs" tar]) (req-package . [(20131229 316) ((use-package (1 0))) "A use-package wrapper for package runtime dependencies management" single]) (replace-from-region . [(20130918 308) nil "Replace commands whose query is from region" single]) (replace+ . [(20131227 149) nil "Extensions to `replace.el'." single]) (repl-toggle . [(20131218 412) ((fullframe (0 0 1))) "Switch to/from repl buffer for current major-mode" single]) (relax . [(20131029 1434) ((json (1 2))) "For browsing and interacting with CouchDB" single]) (region-bindings-mode . [(20130430 1447) nil "Enable custom bindings when mark is active." single]) (regex-tool . [(20131104 1434) nil "A regular expression evaluation tool for programmers" single]) (regex-dsl . [(20100124 228) nil "lisp syntax for regexps" single]) (refheap . [(20131209 912) ((json (1 2))) "A library for pasting to https://refheap.com" single]) (redshank . [(20120510 1230) nil "No description available." tar]) (redo+ . [(20131117 1151) nil "Redo/undo system for Emacs" single]) (recursive-narrow . [(20111019 1608) nil "narrow-to-region that operates recursively" single]) (rect+ . [(20130811 1744) nil "Extensions to rect.el" single]) (recentf-ext . [(20130130 2150) nil "Recentf extensions" single]) (rebox2 . [(20121113 500) nil "Handling of comment boxes in various styles." single]) (realgud . [(20131222 249) nil "A modular front-end for interacting with external debuggers" tar]) (readline-complete . [(20120705 243) nil "offers completions in shell mode" single]) (rdp . [(20120928 1854) nil "Recursive Descent Parser library" single]) (rcirc-notify . [(20131101 1505) nil "No description available." single]) (rcirc-groups . [(20131223 404) nil "an emacs buffer in rcirc-groups major mode" single]) (rbenv . [(20130807 7) nil "Emacs integration for rbenv" single]) (rase . [(20120928 1345) nil "Run At Sun Event daemon" single]) (rainbow-delimiters . [(20131015 404) nil "Highlight nested parens, brackets, braces a different color at each depth." single]) (railgun . [(20121016 2257) nil "No description available." single]) (racket-mode . [(20131227 900) nil "Major mode for Racket language." tar]) (quickrun . [(20131206 1613) nil "Run commands quickly" single]) (quickref . [(20130113 1500) ((dash (1 0 3)) (s (1 0 0))) "Display relevant notes-to-self in the echo area" single]) (quick-buffer-switch . [(20130303 1629) nil "Quick switch to file or dir buffers." single]) (qml-mode . [(20130417 744) nil "Major mode for editing QT Declarative (QML) code." single]) (python-magic . [(20120505 1355) nil "outline mode extension for python mode" single]) (python-info . [(20130916 620) nil "Python info manual for Emacs" tar]) (python-environment . [(20130624 339) ((deferred (0 3 1))) "virtualenv API for Emacs Lisp" tar]) (python-django . [(20131214 1841) nil "A Jazzy package for managing Django projects" single]) (python-cell . [(20131029 1616) nil "Support for MATLAB-like cells in python mode" single]) (pylint . [(20121112 435) nil "minor mode for running `pylint'" single]) (pydoc-info . [(20110301 34) nil "Better Python support for info-lookup-symbol." tar]) (py-import-check . [(20130802 411) nil "Finds the unused python imports using importchecker" single]) (purty-mode . [(20131004 1559) nil "Safely pretty-print greek letters, mathematical symbols, or anything else." single]) (purple-haze-theme . [(20130929 1751) ((emacs (24 0))) "an overtly purple color theme for Emacs24." single]) (puppetfile-mode . [(20131017 833) nil "Syntax highlighting for Puppetfiles" single]) (puppet-mode . [(20130819 1046) nil "Major mode for Puppet manifests" single]) (psvn . [(20120401 1440) nil "Subversion interface for emacs" single]) (protobuf-mode . [(20091217 1755) nil "major mode for editing protocol buffers." single]) (projmake-mode . [(20130614 335) nil "Project oriented automatic builder and error highlighter, flymake for projects" tar]) (projector . [(20131121 804) ((alert (1 1))) "Lightweight library for managing project/repository-aware shell and command buffers" single]) (projectile-rails . [(20131223 1234) ((projectile (1 0 0 -3)) (inflections (1 1)) (inf-ruby (2 2 6))) "Minor mode for Rails projects based on projectile-mode" single]) (projectile . [(20131218 1425) ((s (1 6 0)) (dash (1 5 0)) (pkg-info (0 4))) "Manage and navigate projects in Emacs easily" single]) (project-persist . [(20131030 1208) nil "A minor mode to allow loading and saving of project settings." tar]) (project-local-variables . [(20080502 1652) nil "Set project-local variables from a file." single]) (project-explorer . [(20131124 831) ((cl-lib (0 3)) (es-lib (0 3))) "A project explorer sidebar" single]) (prognth . [(20130920 1059) nil "Extend prog1 to arbitrary index" single]) (prodigy . [(20131227 925) ((s (1 8 0)) (dash (2 4 0)) (f (0 14 0)) (emacs (24))) "Manage external services from within Emacs" single]) (processing-snippets . [(20130718 1152) ((yasnippet (0 8 0))) "Snippets for processing-mode" tar]) (processing-mode . [(20130912 1336) nil "Major mode for Processing 2.0" single]) (proc-net . [(20130321 1712) nil "network process tools" single]) (pretty-symbols . [(20131125 26) nil "Draw tokens as Unicode glyphs." single]) (pretty-mode . [(20131118 2248) nil "Redisplay parts of the buffer as pretty symbols." single]) (pretty-lambdada . [(20131227 148) nil "Show the word `lambda' as the Greek letter." single]) (pp-c-l . [(20131227 147) nil "Display Control-l characters in a pretty way" single]) (pp+ . [(20131227 147) nil "Extensions to `pp.el'." single]) (powershell-mode . [(20100203 258) nil "Mode for editing Powershell scripts" single]) (powershell . [(20130824 1206) nil "run powershell as an inferior shell in emacs" single]) (powerline . [(20131126 1817) ((cl-lib (0 2))) "Rewrite of Powerline" tar]) (pov-mode . [(20120825 716) nil "Major mode for editing POV-Ray scene files." tar]) (pos-tip . [(20121128 615) nil "Show tooltip at point" single]) (popwin . [(20130329 435) nil "Popup Window Manager." single]) (popup-switcher . [(20131220 514) ((popup (0 5 0))) "switch to other buffers and files via popup." single]) (popup-kill-ring . [(20131020 1154) ((popup (0 4)) (pos-tip (0 4))) "interactively insert item from kill-ring" single]) (popup . [(20130901 2255) nil "Visual Popup User Interface" single]) (pophint . [(20130914 753) ((popup (0 5 0)) (log4e (0 2 0)) (yaxception (0 1))) "Provide navigation using pop-up tips, like Firefox's Vimperator Hint Mode" tar]) (pony-mode . [(20131211 809) nil "Minor mode for working with Django Projects" tar]) (pomodoro . [(20130117 1935) nil "A timer for the Pomodoro Technique" single]) (pointback . [(20100210 752) nil "Restore window points when returning to buffers" single]) (point-undo . [(20100504 829) nil "undo/redo position" single]) (plsense . [(20130919 1912) ((auto-complete (1 4 0)) (log4e (0 2 0)) (yaxception (0 1))) "provide interface for PlSense that is a development tool for Perl." single]) (plenv . [(20130706 2316) nil "A plenv wrapper for Emacs" single]) (plantuml-mode . [(20131031 1632) ((auto-complete (1 4))) "Major mode for plantuml" single]) (pkgbuild-mode . [(20130816 120) nil "Interface to the ArchLinux package manager" single]) (pkg-info . [(20131101 408) ((dash (1 6 0)) (epl (0 4))) "Information about packages" single]) (pivotal-tracker . [(20130319 1933) nil "Interact with Pivotal Tracker through its API" single]) (pinot . [(20130918 1054) nil "Emacs interface to pinot-search" tar]) (pinboard-api . [(20131207 1124) nil "Rudimentary http://pinboard.in integration" single]) (pig-snippets . [(20130912 2324) ((yasnippet (0 8 0))) "Snippets for pig-mode" tar]) (pig-mode . [(20130912 2324) nil "Major mode for Pig files" single]) (pier-mode . [(20131021 840) ((magit (1 2 0))) "Emacs Major mode for Pier-formatted text files" single]) (pianobar . [(20120128 1301) nil "thin wrapper for Pianobar, a Pandora Radio client" single]) (php-mode . [(20131203 1308) nil "Major mode for editing PHP code" single]) (php-eldoc . [(20130328 826) nil "eldoc backend for php" tar]) (php-boris . [(20130527 121) nil "Run boris php REPL" single]) (php-auto-yasnippets . [(20131212 350) ((php-mode (1 11)) (yasnippet (0 8 0))) "Creates snippets for PHP functions" tar]) (php+-mode . [(20121129 1252) nil "A better PHP mode with Zend Framework 1 support." tar]) (phoenix-dark-pink-theme . [(20130905 941) nil "Port of the Sublime Text 2 theme of the same name" single]) (phoenix-dark-mono-theme . [(20130306 1215) nil "Monochromatic version of the Phoenix theme" single]) (phi-search-mc . [(20131010 358) ((phi-search (2 0 0)) (multiple-cursors (1 2 1))) "multiple-cursors extension for phi-search" single]) (phi-search . [(20131207 730) nil "another incremental search command, compatible with \"multiple-cursors\"" tar]) (phi-rectangle . [(20131028 2106) nil "another rectangle-mark command (rewrite of rect-mark)" single]) (ph . [(20130312 1137) ((emacs (24 3))) "A global minor mode for managing multiple projects." tar]) (pgdevenv . [(20130527 257) nil "Manage your PostgreSQL development envs" tar]) (pg . [(20130731 1442) nil "Emacs Lisp interface to the PostgreSQL RDBMS" single]) (perspective . [(20131004 1658) nil "switch between named \"perspectives\" of the editor" single]) (persp-mode . [(20131205 1259) ((workgroups (0 2 0))) "\"perspectives\" + save/load + shared among frames - bugs." single]) (persistent-soft . [(20131106 706) ((pcache (0 2 3)) (list-utils (0 4 2))) "Persistent storage, returning nil on failure" single]) (perlbrew . [(20130127 324) nil "A perlbrew wrapper for Emacs" single]) (perl-completion . [(20090527 2336) nil "No description available." single]) (peg . [(20130320 158) nil "Parsing Expression Grammars in Emacs Lisp" single]) (peek-mode . [(20130620 1246) ((elnode (0 9 8 1))) "Serve buffers live over HTTP with elnode backend" tar]) (pcsv . [(20131110 750) nil "Parser of csv" single]) (pcre2el . [(20130620 1810) ((cl-lib (0 3))) "parse, convert, and font-lock PCRE, Emacs and rx regexps" single]) (pcmpl-git . [(20130408 951) nil "pcomplete for git" tar]) (pcmpl-args . [(20120911 2224) nil "Enhanced shell command completion" single]) (pcache . [(20131201 1159) ((eieio (1 3))) "persistent caching for Emacs" single]) (path-headerline-mode . [(20130912 1519) nil "Displaying file path on headerline." single]) (pastels-on-dark-theme . [(20120304 1022) nil "Pastels on Dark theme for Emacs 24" single]) (pastehub . [(20130509 830) nil "A client for the PasteHub cloud service" single]) (pastebin . [(20101125 1955) nil "A simple interface to the www.pastebin.com webservice" single]) (paste-kde . [(20131210 1703) ((web (0 3 6))) "paste text to KDE's pastebin service" single]) (password-vault . [(20131105 1703) ((cl-lib (0 2)) (emacs (24))) "A Password manager for Emacs." single]) (parse-csv . [(20131107 200) nil "Parse strings with CSV fields into s-expressions" single]) (parenface . [(20091203 1017) nil "Provide a face for parens in lisp modes." single]) (paren-face . [(20131209 800) nil "a face for parentheses in lisp modes" single]) (paredit-menu . [(20130923 1254) nil "Adds a menu to paredit.el as memory aid" single]) (paredit-everywhere . [(20131010 318) ((paredit (22))) "Enable some paredit features in non-lisp buffers" single]) (paredit . [(20130722 624) nil "minor mode for editing parentheses" single]) (pangu-spacing . [(20131228 733) nil "Minor-mode to add space between Chinese and English characters." single]) (pandoc-mode . [(20131206 1846) nil "Minor mode for interacting with Pandoc" tar]) (pallet . [(20131117 525) ((cask (0 5 0))) "A package management tool for Emacs, using Cask." tar]) (palimpsest . [(20130731 821) nil "Various deletion strategies when editing" single]) (palette . [(20131227 146) ((hexrgb (0))) "Color palette useful with RGB, HSV, and color names" single]) (pager-default-keybindings . [(20130719 1357) ((pager (1 0))) "Add the default keybindings suggested for pager.el" single]) (pager . [(20100330 1131) nil "windows-scroll commands" single]) (page-break-lines . [(20130917 804) nil "Display ugly ^L page breaks as tidy horizontal lines" single]) (packed . [(20130907 744) ((cl-lib (0 2)) (magit (1 1 1))) "Package manager agnostic Emacs Lisp package utilities" tar]) (package-build . [(20131228 423) ((cl-lib (0 2))) "Tools for assembling a package archive" tar]) (package+ . [(20131010 1412) nil "Extensions for the package library." single]) (pabbrev . [(20130923 1257) nil "Predictive abbreviation expansion" single]) (p4 . [(20131014 1044) nil "Simple Perforce-Emacs Integration" single]) (ox-twiki . [(20131125 108) ((org (8))) "org Twiki and Foswiki export" single]) (ox-tiddly . [(20131124 804) ((org (8))) "org TiddlyWiki exporter" single]) (ox-reveal . [(20131111 1703) ((org (8 0))) "reveal.js Presentation Back-End for Org Export Engine" single]) (ox-html5slide . [(20131227 2206) ((org (8 0))) "Export org-mode to HTML5 slide." single]) (outshine . [(20131008 1033) nil "outline with outshine outshines outline" single]) (outorg . [(20131023 335) nil "Org-style comment editing" single]) (outlined-elisp-mode . [(20131108 327) nil "outline-minor-mode settings for emacs lisp" single]) (outline-magic . [(20130813 1333) nil "outline mode extensions for Emacs" single]) (otter-mode . [(20121202 903) nil "Major mode for source files of the Otter automated theorem prover" single]) (osx-pseudo-daemon . [(20131026 1730) nil "Daemon mode that plays nice with OSX." single]) (osx-plist . [(20101130 448) nil "Apple plist file parser" single]) (osx-location . [(20130907 133) nil "Watch and respond to changes in geographical location on OS X" tar]) (osx-browse . [(20131106 706) ((string-utils (0 3 2)) (browse-url-dwim (0 6 6))) "Web browsing helpers for OS X" single]) (orglue . [(20130912 1842) ((org (8 1)) (epic (0 1)) (org-mac-link (1 2))) "more functionality to org-mode." tar]) (orglink . [(20131209 1844) ((dash (1 3 2)) (org (8 0))) "use Org Mode links in other modes" single]) (org2blog . [(20130707 323) ((org (7 8)) (xml-rpc (1 6 8)) (metaweblog (0 1))) "Blog from Org mode to wordpress" tar]) (org-trello . [(20131124 1343) ((org (8 0 7)) (dash (1 5 0)) (request (0 2 0)) (cl-lib (0 3 0)) (json (1 2)) (elnode (0 9 9 7 6)) (esxml (0 3 0)) (s (1 7 0)) (kv (0 0 17))) "Org minor mode to synchronize with trello" tar]) (org-toodledo . [(20130928 1132) nil "Toodledo integration for Emacs Org mode" tar]) (org-screenshot . [(20131102 1715) ((org (7))) "screenshots integrated with org attachment dirs" single]) (org-readme . [(20130508 705) ((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0))) "Integrates Readme.org and Commentary/Change-logs." tar]) (org-protocol-jekyll . [(20130810 1450) nil "Jekyll's handler for org-protocol" single]) (org-present . [(20130426 1155) ((org (7))) "Minimalist presentation minor-mode for Emacs org-mode." single]) (org-pomodoro . [(20131117 35) ((alert (0 5 10))) "Pomodoro implementation for org-mode." tar]) (org-pandoc . [(20130729 1850) nil "Export from Org using Pandoc" tar]) (org-page . [(20131214 2328) ((ht (1 5)) (mustache (0 22)) (htmlize (1 47)) (org (8 0)) (dash (2 0 0))) "a static site generator based on org mode" tar]) (org-outlook . [(20121212 1458) nil "Outlook org" tar]) (org-octopress . [(20130809 1754) ((org (8 0)) (orglue (0 1)) (ctable (0 1 1))) "Compose octopress articles using org-mode." tar]) (org-mobile-sync . [(20131118 1116) ((emacs (24 3 50)) (org (8 0))) "automatically sync org-mobile on changes" single]) (org-magit . [(20120820 1156) ((magit (0 8)) (org (6 1))) "basic support for magit links" single]) (org-mac-link . [(20131222 19) nil "Grab links and url from various mac" single]) (org-mac-iCal . [(20130418 900) nil "Imports events from iCal.app to the Emacs diary" single]) (org-journal . [(20131111 648) nil "a simple org-mode based journaling mode" single]) (org-jira . [(20130427 616) nil "Syncing between Jira and Org-mode." tar]) (org-jekyll . [(20130508 239) ((org (8 0))) "Export jekyll-ready posts form org-mode entries" single]) (org-gnome . [(20131209 537) ((notify (2010 8 20)) (telepathy (0 1))) "Orgmode integration with the GNOME desktop" single]) (org-fstree . [(20090723 819) nil "include a filesystem subtree into an org file" single]) (org-elisp-help . [(20130423 1545) ((cl-lib (0 2)) (org (8 0))) "org links to emacs-lisp documentation" single]) (org-dotemacs . [(20130908 1756) ((org (7 9 3)) (cl-lib (1 0))) "Store your emacs config as an org file, and choose which bits to load." single]) (org-cua-dwim . [(20120202 2134) nil "Org-mode and Cua mode compatibility layer" single]) (org-context . [(20130903 1458) ((org (7))) "Contextual capture and agenda commands for Org-mode" single]) (org-bullets . [(20131106 1108) nil "Show bullets in org-mode as UTF-8 characters" single]) (org-agenda-property . [(20131007 1013) ((emacs (24 2))) "Display org properties in the agenda buffer." single]) (openwith . [(20120531 1436) nil "Open files with external programs" single]) (openstack-cgit-browse-file . [(20130819 227) nil "Browse the current file in OpenStack cgit" single]) (open-junk-file . [(20130131 720) nil "Open a junk (memo) file to try-and-error" single]) (oneonone . [(20131227 143) ((hexrgb (0))) "Frame configuration that uses one frame per window." single]) (on-screen . [(20131212 1954) nil "guide your eyes while scrolling" single]) (omnisharp . [(20131203 647) ((json (1 2)) (dash (1 8 0)) (popup (0 5)) (auto-complete (1 4)) (flycheck (0 13))) "Omnicompletion (intellisense) and more for C#" single]) (offlineimap . [(20130331 741) nil "Run OfflineIMAP from Emacs" single]) (octomacs . [(20130919 1915) nil "Octopress interface for Emacs" single]) (occur-x . [(20130610 643) nil "Extra functionality for occur" single]) (occidental-theme . [(20130312 1258) nil "Custom theme for faces based on Adwaita" single]) (obsidian-theme . [(20130920 937) nil "port of the eclipse obsidian theme" single]) (object-registry . [(20130521 1213) ((cl-lib (0 2))) "OBSOLETE track data items by various instance slots" single]) (ob-translate . [(20130718 729) ((google-translate (0 4)) (org (8))) "Translation of text blocks in org-mode." single]) (ob-sml . [(20130829 1143) ((sml-mode (6 4))) "org-babel functions for template evaluation" single]) (ob-mongo . [(20130718 732) ((org (8))) "Execute mongodb queries within org-mode blocks." single]) (ob-browser . [(20130724 902) ((org (8))) "Translation of text blocks in org-mode." tar]) (oauth . [(20130127 1751) nil "Oauth library." tar]) (o-blog . [(20130904 1426) nil "Org-blog exporter" tar]) (nyan-prompt . [(20130721 311) nil "Nyan Cat on the eshell prompt." tar]) (nyan-mode . [(20120710 2200) nil "Nyan Cat shows position in current buffer in mode-line." tar]) (nvm . [(20131219 805) ((s (1 8 0)) (dash (2 4 0)) (f (0 14 0))) "Manage Node versions within Emacs" single]) (nummm-mode . [(20131117 214) nil "Display the number of minor modes instead of their names" single]) (number-font-lock-mode . [(20131027 913) ((emacs (24))) "Syntax highlighting of numeric literals" single]) (nsis-mode . [(20130723 1928) nil "NSIS-mode" tar]) (nrepl-ritz . [(20130516 1039) ((nrepl (0 1 7)) (fringe-helper (0 1 1))) "nrepl extensions for ritz" single]) (nrepl-eval-sexp-fu . [(20131015 513) nil "No description available." single]) (novice+ . [(20131227 143) nil "Extensions to `novice.el'." single]) (notmuch . [(20131209 1152) nil "No description available." tar]) (nose . [(20110804 619) nil "Easy Python test running in Emacs" single]) (noflet . [(20130901 922) nil "locally override functions" single]) (nodejs-repl . [(20130520 842) nil "Run Node.js REPL" single]) (noctilux-theme . [(20131019 31) nil "Dark theme inspired by LightTable" tar]) (nimrod-mode . [(20110125 1504) nil "A major mode for the Nimrod programming language" single]) (nginx-mode . [(20131223 44) nil "major mode for editing nginx config files" single]) (nexus . [(20130829 722) nil "REST Client for Nexus Maven Repository servers" tar]) (never-comment . [(20131228 1518) nil "Never blocks are comment" single]) (nemerle . [(20130328 746) nil "major mode for editing nemerle programs" single]) (nclip . [(20130617 1315) nil "Network (HTTP) Clipboard" tar]) (ncl-mode . [(20130527 1545) nil "Major Mode for editing NCL scripts and other goodies" tar]) (navi-mode . [(20131001 1125) nil "major-mode for easy buffer-navigation" single]) (nav-flash . [(20131106 706) nil "Briefly highlight the current line" single]) (nav . [(20120507 7) nil "Emacs mode for filesystem navigation" tar]) (naquadah-theme . [(20131210 1123) nil "A theme based on Tango color set" single]) (nanowrimo . [(20131130 2140) nil "Track progress for nanowrimo" single]) (namespaces . [(20130326 1550) nil "An implementation of namespaces for Elisp, with an emphasis on immutabilty." single]) (naked . [(20131227 142) nil "Provide for naked key descriptions: no angle brackets." single]) (n3-mode . [(20130116 1429) nil "mode for Notation 3" single]) (mysql2sqlite . [(20120514 731) nil "Convert mysql databases into sqlite databases." single]) (mykie . [(20131228 1057) nil "Command multiplexer: Register multiple functions to a keybind" single]) (mwe-log-commands . [(20100703 541) nil "log keyboard commands to buffer" single]) (mvn . [(20131227 2312) nil "helpers for compiling with maven" single]) (muttrc-mode . [(20090804 2252) nil "Major mode to edit muttrc under Emacs" single]) (mustang-theme . [(20130920 939) nil "port of vim's mustang theme" single]) (mustache-mode . [(20111003 1103) nil "A major mode for editing Mustache files." single]) (mustache . [(20131117 1407) ((ht (0 9)) (s (1 3 0)) (dash (1 2 0))) "a mustache templating library in emacs lisp" tar]) (multiple-cursors . [(20131215 1047) nil "Multiple cursors for Emacs." tar]) (multifiles . [(20130615 1433) nil "View and edit parts of multiple files in one buffer" single]) (multi-web-mode . [(20130823 2054) nil "multiple major mode support for web editing" tar]) (multi-term . [(20130108 2305) nil "Managing multiple terminal buffers in Emacs." single]) (multi-project . [(20131222 1308) nil "Easily work with multiple projects." single]) (multi-eshell . [(20120608 1835) nil "Create and manage multiple shells within Emacs" single]) (multi . [(20131013 844) ((emacs (24))) "Clojure-style multi-methods for emacs lisp" single]) (mu4e-maildirs-extension . [(20131223 1051) nil "Show mu4e maildirs summary in mu4e-main-view" single]) (move-text . [(20130506 1826) nil "Move current line or region with M-up or M-down." single]) (mouse3 . [(20131227 142) nil "Customizable behavior for `mouse-3'." single]) (mouse-slider-mode . [(20130609 826) nil "scale numbers dragged under the mouse" single]) (mouse+ . [(20131227 141) nil "Extensions to `mouse.el'." single]) (motion-mode . [(20131104 908) ((flymake-easy (0 7)) (flymake-cursor (1 0 2))) "major mode for RubyMotion enviroment" tar]) (mote-mode . [(20121014 2119) ((ruby-mode (1 1))) "Mote minor mode" single]) (morlock . [(20131211 821) nil "more font-lock keywords for elisp" single]) (monokai-theme . [(20131027 127) nil "A fruity color theme for Emacs." single]) (monky . [(20130513 513) nil "Control Hg from Emacs." tar]) (mongo . [(20120904 2005) nil "MongoDB driver for Emacs Lisp" tar]) (molokai-theme . [(20130828 0) nil "molokai theme with Emacs theme engine" single]) (moe-theme . [(20131223 2054) nil "A colorful eye-candy theme. Moe, moe, kyun!" tar]) (modtime-skip-mode . [(20130723 2222) nil "Minor mode for disabling modtime and supersession checks on files." single]) (modeline-posn . [(20131227 140) nil "Set up `mode-line-position'." single]) (mode-line-debug . [(20121207 744) nil "show status of `debug-on-error' in the mode-line" single]) (mode-icons . [(20130602 548) nil "Show icons for modes" tar]) (mocker . [(20131006 934) ((eieio (1 3)) (el-x (0 2 4))) "mocking framework for emacs" single]) (mo-vi-ment-mode . [(20131028 2333) nil "Provide vi-like cursor movement that's easy on the fingers" single]) (mo-git-blame . [(20131218 1407) nil "An interactive, iterative 'git blame' mode for Emacs" single]) (mmm-mode . [(20131027 1439) nil "Allow Multiple Major Modes in a buffer" tar]) (mmm-mako . [(20121019 2351) ((mmm-mode (0 4 8))) "MMM submode class for Mako Templates" single]) (misc-fns . [(20131227 139) nil "Miscellaneous non-interactive functions." single]) (misc-cmds . [(20131227 138) nil "Miscellaneous commands (interactive functions)." single]) (minor-mode-hack . [(20130212 1228) nil "Change priority of minor-mode keymaps" single]) (minitest . [(20131217 735) ((dash (1 0 0))) "An Emacs mode for ruby minitest files" single]) (minimal-session-saver . [(20131106 706) nil "Very lean session saver" single]) (minibuffer-cua . [(20130906 434) nil "Make CUA mode's S-up/S-down work in minibuffer" single]) (minibuffer-complete-cycle . [(20130813 945) nil "Cycle through the *Completions* buffer" single]) (migemo . [(20130310 712) nil "Japanese incremental search through dynamic pattern expansion" single]) (midje-test-mode . [(20131208 914) ((clojure-mode (1 7)) (cider (0 3 0))) "Minor mode for midje" single]) (midje-mode . [(20131019 1357) ((cider (0 1 4)) (clojure-mode (1 0))) "Minor mode for running Midje tests in emacs" tar]) (mic-paren . [(20120716 1647) nil "advanced highlighting of matching parentheses" single]) (mew . [(20131120 457) nil "Messaging in the Emacs World" tar]) (metaweblog . [(20130707 431) ((xml-rpc (1 6 8))) "An emacs library to access metaweblog based weblogs" tar]) (menu-bar+ . [(20131227 137) nil "Extensions to `menu-bar.el'." single]) (mentor . [(20130519 1540) ((xml-rpc (1 6 9))) "Frontend for the rTorrent bittorrent client" tar]) (memoize . [(20130421 1234) nil "Memoization functions" single]) (melpa-upstream-visit . [(20130720 333) ((s (1 6 0))) "A set of kludges to visit a melpa-hosted package's homepage" single]) (melpa . [(20130815 2147) nil "special handling for the MELPA repository" single]) (mediawiki . [(20130223 1141) nil "mediawiki frontend" single]) (mc-extras . [(20130909 27) ((multiple-cursors (1 2 1))) "Extra functions for multiple-cursors mode." tar]) (mb-depth+ . [(20131227 137) nil "Indicate minibuffer-depth in prompt" single]) (maxframe . [(20120725 639) nil "maximize the emacs frame based on display size" single]) (maude-mode . [(20130604 725) nil "Emacs mode for the programming language Maude" single]) (math-symbols . [(20130910 31) ((helm (1 0))) "Math Symbol Input methods and conversion tools" tar]) (markup-faces . [(20130117 246) nil "collection of faces for markup language modes" single]) (markup . [(20130207 1309) nil "Simple markup generation helpers." single]) (markdown-mode . [(20131210 700) nil "Emacs Major mode for Markdown-formatted text files" single]) (markdown-mode+ . [(20120829 510) ((markdown-mode (20111229))) "extra functions for markdown-mode" tar]) (mark-tools . [(20130614 325) nil "Some simple tools to access the mark-ring in Emacs" single]) (mark-multiple . [(20121118 754) nil "Sorta lets you mark several regions at once." tar]) (map-regexp . [(20130522 1403) ((cl-lib (0 2))) "map over matches of a regular expression" single]) (map-progress . [(20120927 939) nil "mapping macros that report progress" tar]) (man-commands . [(20130627 1653) nil "Add interactive commands for every manpages installed in your computer." single]) (mallard-snippets . [(20131023 1151) ((yasnippet (0 8 0)) (mallard-mode (0 1 1))) "Yasnippets for Mallard" tar]) (mallard-mode . [(20131203 2025) nil "Major mode for editing Mallard files" tar]) (malabar-mode . [(20131227 2018) ((fringe-helper (1 0 1)) (cl-lib (0 3))) "A better Java mode for Emacs" tar]) (makey . [(20131221 1612) ((cl-lib (0 2))) "interactive commandline mode" single]) (main-line . [(20130404 1904) nil "modeline replacement forked from an early version of powerline.el" single]) (magit-tramp . [(20131224 1023) ((magit (1 2 0))) "git method for TRAMP" tar]) (magit-topgit . [(20131224 1700) ((cl-lib (0 3)) (magit (1 3 0))) "topgit plug-in for Magit" single]) (magit-svn . [(20131210 1547) ((cl-lib (0 3)) (magit (1 3 0))) "git-svn plug-in for Magit" single]) (magit-stgit . [(20131224 1700) ((cl-lib (0 3)) (magit (1 3 0))) "StGit plug-in for Magit" single]) (magit-push-remote . [(20130905 1635) ((magit (1 3 0))) "Push remote support for Magit." tar]) (magit-log-edit . [(20131220 757) ((cl-lib (0 3)) (magit (1 3 0))) "[SEMI-OBSOLETE] major mode for editing Git commit messages" single]) (magit-gh-pulls . [(20130405 928) ((gh (0 4 3)) (magit (1 1 0))) "GitHub pull requests extension for Magit" single]) (magit-find-file . [(20130915 423) ((magit (1 2 0))) "completing-read over all files in Git" single]) (magit-filenotify . [(20131018 255) ((magit (1 3 0))) "Refresh status buffer when git tree changes" single]) (magit-commit-training-wheels . [(20130730 1121) nil "Advice for magit-log-edit-commit" single]) (magit . [(20131226 2100) ((cl-lib (0 3)) (git-commit-mode (0 14 0)) (git-rebase-mode (0 14 0))) "control Git from Emacs" tar]) (mag-menu . [(20130224 56) ((splitter (0 1 0))) "Intuitive keyboard-centric menu system" single]) (macrostep . [(20131219 1002) nil "interactive macro stepper for Emacs Lisp" single]) (macros+ . [(20131227 136) nil "Extensions to `macros.el'." single]) (macro-math . [(20130328 904) nil "in-buffer mathematical operations" single]) (lusty-explorer . [(20130407 1056) nil "Dynamic filesystem explorer and buffer switcher" single]) (lui . [(20131201 620) ((tracking (0))) "Linewise User Interface" tar]) (lua-mode . [(20131018 2259) nil "a major-mode for editing Lua scripts" single]) (love-minor-mode . [(20130429 1459) ((lua-mode (20130419))) "Minor mode for working on L\303\226VE projects" single]) (lorem-ipsum . [(20051013 1756) nil "Insert dummy pseudo Latin text." single]) (loop . [(20130309 805) nil "friendly imperative loop structures" single]) (look-mode . [(20130824 1206) nil "quick file viewer for image and text file browsing" single]) (look-dired . [(20130511 1624) ((look-mode (1 0))) "Extensions to look-mode for dired buffers" single]) (lolcode-mode . [(20111002 147) nil "Major mode for editing LOLCODE" single]) (logito . [(20120225 1255) ((eieio (1 3))) "logging library for Emacs" single]) (logalimacs . [(20131021 1129) ((popwin (0 6 2)) (popup (0 5 0)) (stem (20130120))) "Front-end to logaling-command for Ruby gems" single]) (log4j-mode . [(20101016 822) nil "major mode for viewing log files" single]) (log4e . [(20130514 912) nil "provide logging framework for elisp" single]) (loccur . [(20131022 219) nil "Performs an occur-like folding in current buffer." single]) (loc-changes . [(20130723 1930) nil "Helps users and programs keep track of positions even after buffer changes." single]) (load-theme-buffer-local . [(20120702 1336) nil "Install emacs24 color themes by buffer." single]) (load-relative . [(20130410 249) nil "relative file load (within a multi-file Emacs package)" single]) (livid-mode . [(20131116 544) ((skewer-mode (1 5 3)) (s (1 8 0))) "Live browser eval of JavaScript every time a buffer changes" single]) (livescript-mode . [(20131206 2300) nil "Major mode for editing LiveScript files" single]) (lively . [(20120728 1413) nil "Interactively updating text" single]) (litable . [(20131017 1400) ((dash (1 1 0))) "dynamic evaluation replacement with emacs" single]) (list-utils . [(20131106 706) nil "List-manipulation utility functions" single]) (list-register . [(20130824 1200) nil "List register" single]) (list-processes+ . [(20131117 1935) nil "Add process management to `list-processes'" single]) (list-packages-ext . [(20130927 908) ((s (1 6 0)) (ht (1 5 0)) (persistent-soft (0 8 6))) "Extras for list-packages" single]) (lispyscript-mode . [(20130828 719) nil "Major mode for LispyScript code." single]) (lispxmp . [(20130824 1207) nil "Automagic emacs lisp code annotation" single]) (linum-relative . [(20131210 2053) nil "display relative line number in emacs." single]) (linphone . [(20130524 409) nil "Emacs interface to Linphone" tar]) (link . [(20131005 526) nil "Hypertext links in text buffers" single]) (lib-requires . [(20131227 130) nil "Commands to list Emacs Lisp library dependencies." single]) (lexbind-mode . [(20130327 1801) nil "Puts the value of lexical-binding in the mode line" single]) (levenshtein . [(20051013 1756) nil "Edit distance between two strings." single]) (leuven-theme . [(20131219 1216) nil "Awesome Emacs color theme on white background" single]) (letcheck . [(20130213 1605) nil "Check the erroneous assignments in let forms" single]) (less-css-mode . [(20131001 836) nil "Major mode for editing LESS CSS files (lesscss.org)" single]) (lemon-mode . [(20130216 504) nil "A major mode for editing lemon grammar files" single]) (lein . [(20130406 1312) ((nrepl (0 1 7))) "Eshell interface to Leiningen" single]) (legalese . [(20100119 2148) nil "Add legalese to your program files" single]) (ledger-mode . [(20131228 1611) nil "Helper code for use with the \"ledger\" command-line tool" tar]) (lcs . [(20121201 555) nil "find out the longest common sequence" single]) (launch . [(20130619 1504) nil "launch files with OS-standard associated applications." single]) (latex-pretty-symbols . [(20111011 546) nil "Display many latex symbols as their unicode counterparts" single]) (latex-extra . [(20131201 1453) ((auctex (11 86 1))) "Adds several useful functionalities to LaTeX-mode." single]) (latest-clojure-libraries . [(20131023 543) nil "Clojure dependency resolver" single]) (langtool . [(20130920 407) nil "Grammar check utility using LanguageTool" single]) (langdoc . [(20130605 1631) ((cl-lib (0 2))) "Help to define help document mode for various languages" single]) (lang-refactor-perl . [(20131122 1327) nil "Simple refactorings, primarily for Perl" single]) (lacarte . [(20131227 130) nil "Execute menu items as commands, with completion." single]) (kwin . [(20130206 2231) nil "communcate with the KWin window manager" single]) (kv . [(20130818 337) nil "key/value data structure functions" single]) (know-your-http-well . [(20131125 1540) nil "Look up the meaning of HTTP headers, methods, relations, status codes" tar]) (kmacro-decision . [(20130919 826) ((el-x (1 0)) (jb-misc-macros (0 2))) "Add conditional branching to keyboard macros" single]) (kivy-mode . [(20130712 546) nil "Emacs major mode for editing Kivy files" single]) (kite . [(20130201 1138) ((json (1 2)) (websocket (0 93 1))) "WebKit inspector front-end" tar]) (killer . [(20120808 422) nil "kill and delete text" single]) (kill-ring-search . [(20110605 844) nil "incremental search for the kill ring" tar]) (kibit-mode . [(20131108 1341) nil "No description available." tar]) (keymap-utils . [(20130427 1026) ((cl-lib (0 2))) "keymap utilities" single]) (keyfreq . [(20131109 926) nil "track command frequencies" single]) (keydef . [(20090428 1231) nil "a simpler way to define keys, with kbd syntax" single]) (keychain-environment . [(20121026 1246) nil "load keychain environment variables" single]) (key-combo . [(20131205 1338) nil "map key sequence to commands" tar]) (key-chord . [(20080915 2156) nil "map pairs of simultaneously pressed keys to commands" single]) (kanban . [(20130815 48) nil "Parse org-todo headlines to use org-tables as Kanban tables" single]) (kaesar-mode . [(20130911 745) ((kaesar (0 1 4))) "Encrypt/Decrypt buffer by AES with password." single]) (kaesar-file . [(20130912 212) ((kaesar (0 1 1))) "Encrypt/Decrypt file by AES with password." single]) (kaesar . [(20130914 1709) nil "Another AES algorithm encrypt/decrypt string with password." single]) (jump-to-line . [(20130122 853) nil "Jump to line number at point." single]) (jump-char . [(20130529 1652) nil "navigation by char" single]) (jump . [(20130702 33) ((findr (0 7)) (inflections (1 1))) "build functions which contextually jump between files" single]) (jumblr . [(20131005 1810) ((s (1 8 0)) (dash (2 2 0))) "an anagram game for emacs" tar]) (jtags . [(20111208 1022) nil "enhanced tags functionality for Java development" tar]) (jsx-mode . [(20130908 1024) nil "major mode for JSX" single]) (jss . [(20130508 723) ((emacs (24 1)) (websocket (0)) (js2-mode (0))) "An emacs interface to webkit and mozilla debuggers" tar]) (json-snatcher . [(20131110 1107) ((emacs (24))) "Grabs the path to JSON values in a JSON file" single]) (json-mode . [(20131016 1225) nil "Major mode for editing JSON files" single]) (js3-mode . [(20130904 1444) nil "An improved JavaScript editing mode" tar]) (js2-refactor . [(20131221 501) ((js2-mode (20101228)) (multiple-cursors (1 0 0)) (dash (1 0 0)) (s (1 0 0)) (yasnippet (20130218))) "A JavaScript refactoring library for emacs." tar]) (js2-mode . [(20131221 1908) ((emacs (24 1))) "Improved JavaScript editing mode" tar]) (js-doc . [(20131215 519) nil "Insert JsDoc style comment easily" single]) (js-comint . [(20080530 757) nil "Run javascript in an inferior process window." single]) (jquery-doc . [(20131223 845) nil "jQuery api documentation interface for emacs" tar]) (jknav . [(20121006 1325) nil "Automatically enable j/k keys for line-based navigation" single]) (jira . [(20131210 1822) nil "Connect to JIRA issue tracking software" single]) (jinja2-mode . [(20120827 203) nil "A major mode for jinja2" single]) (jenkins-watch . [(20121004 1626) nil "Watch continuous integration build status" single]) (jedi-direx . [(20130525 1039) ((jedi (0 1 2)) (direx (0 1 -3))) "Tree style source code viewer for Python buffer" single]) (jedi . [(20130714 1228) ((epc (0 1 0)) (auto-complete (1 4))) "Python auto-completion for Emacs" tar]) (javap-mode . [(20120223 1408) nil "Javap major mode" single]) (javadoc-lookup . [(20130618 1736) nil "Javadoc Emacs integration with Maven" tar]) (jaunte . [(20130413 219) nil "Emacs Hit a Hint" single]) (japanlaw . [(20131109 224) ((revive (20121022 1311))) "Japan law from law.e-gov.go.jp" single]) (japanese-holidays . [(20130928 949) ((cl-lib (0 3))) "calendar functions for the Japanese calendar" single]) (jade-mode . [(20131018 1010) ((sws-mode (0))) "Major mode for editing .jade files" single]) (jabber . [(20131130 425) nil "A Jabber client for Emacs." tar]) (j-mode . [(20131224 1309) nil "Major mode for editing J programs" tar]) (iy-go-to-char . [(20130901 729) nil "Go to next CHAR which is similar to \"f\" and \"t\" in vim" single]) (ix . [(20131027 929) ((grapnel (0 5 3))) "Emacs client for http://ix.io pastebin" single]) (itail . [(20130102 1159) nil "An interactive tail mode" single]) (isgd . [(20130927 657) nil "Shorten URLs using the isgd.com shortener service" single]) (isend-mode . [(20130419 258) nil "Interactively send parts of an Emacs buffer to an interpreter" single]) (isearch-symbol-at-point . [(20130728 1521) nil "Use isearch to search for the symbol at point" single]) (isearch-prop . [(20131227 127) nil "Search text-property or overlay-property contexts." single]) (isearch+ . [(20131226 1952) nil "Extensions to `isearch.el' (incremental search)." single]) (irfc . [(20130824 1207) nil "Interface for IETF RFC document." single]) (ir-black-theme . [(20130302 2355) nil "Port of ir-black theme" single]) (iplayer . [(20131228 956) nil "Browse and download BBC TV/radio shows" single]) (interval-tree . [(20130325 707) ((dash (1 1 0))) "Interval tree data structure for 1D range queries" single]) (interaction-log . [(20131106 1757) nil "exhaustive log of interactions with Emacs" single]) (instapaper . [(20130104 621) nil "add URLs to instapaper from emacs" single]) (insfactor . [(20131115 2359) nil "No description available." single]) (insert-shebang . [(20131130 1237) nil "Insert shebang line automatically." single]) (inlineR . [(20120520 732) nil "insert Tag for inline image of R graphics" single]) (inline-crypt . [(20130409 507) nil "Simple inline encryption via openssl" tar]) (inkpot-theme . [(20120505 708) nil "port of vim's inkpot theme" single]) (initsplit . [(20120630 944) nil "code to split customizations into different files" single]) (init-loader . [(20130217 1910) nil "Loader for configuration files" single]) (inform7-mode . [(20131009 2354) ((sws-mode (0 1))) "Major mode for editing Inform 7 source files" single]) (info+ . [(20131226 1951) nil "Extensions to `info.el'." single]) (inflections . [(20121016 157) nil "convert english words between singular and plural" single]) (inf-ruby . [(20131222 1633) nil "Run a Ruby process in a buffer" single]) (inf-php . [(20130414 21) ((php-mode (1 5 0))) "Run a php interactive shell in a buffer" single]) (inf-mongo . [(20131216 228) nil "Run a MongoDB shell process in a buffer" single]) (indent-guide . [(20131227 1854) nil "show vertical lines to guide indentation" single]) (import-popwin . [(20130819 1929) ((popwin (0 6))) "popwin buffer near by import statements with popwin" single]) (impatient-mode . [(20131109 1329) ((simple-httpd (1 4 0)) (htmlize (1 40))) "Serve buffers live over HTTP" tar]) (imenu-anywhere . [(20131210 1130) nil "ido/helm imenu tag selection across all buffers with the same mode" single]) (imenu+ . [(20131226 1948) nil "Extensions to `imenu.el'." single]) (image-dired+ . [(20130604 2309) nil "Image-dired extensions" single]) (image+ . [(20130221 820) nil "Image manupulation extensions for Emacs" single]) (igrep . [(20130824 1207) nil "An improved interface to `grep` and `find`" single]) (ignoramus . [(20131125 1146) nil "Ignore backups, build files, et al." single]) (iflipb . [(20130331 1108) nil "interactively flip between recently visited buffers" single]) (iedit . [(20131021 116) nil "Edit multiple regions in the same way simultaneously." tar]) (idris-mode . [(20131221 1125) nil "Major mode for editing Idris code" tar]) (idomenu . [(20111122 1048) nil "imenu tag selection a la ido" single]) (ido-vertical-mode . [(20131209 938) nil "Makes ido-mode display vertically." single]) (ido-ubiquitous . [(20131009 1047) ((emacs (24 1))) "Use ido (nearly) everywhere." single]) (ido-sort-mtime . [(20131117 530) nil "Sort Ido's file list by modification time" single]) (ido-select-window . [(20131220 1247) ((emacs (24 1))) "Select a window using ido and buffer names" single]) (ido-load-library . [(20131106 706) ((persistent-soft (0 8 8)) (pcache (0 2 3))) "Load-library alternative using ido-completing-read" single]) (ido-hacks . [(20130411 1859) nil "Put more IDO in your IDO" single]) (ido-gnus . [(20130726 1010) ((gnus (5 13))) "Access gnus groups or servers using ido" single]) (ido-complete-space-or-hyphen . [(20130228 208) nil "Complete SPACE or HYPHEN when type SPACE in ido" single]) (ido-at-point . [(20131221 1344) ((emacs (24))) "ido-style completion-at-point" single]) (idle-require . [(20090715 1503) nil "load elisp libraries while Emacs is idle" single]) (idle-highlight-mode . [(20120920 948) nil "highlight the word the point is on" single]) (identica-mode . [(20130204 1453) nil "Major mode API client for status.net open microblogging" tar]) (icomplete+ . [(20131228 51) nil "Extensions to `icomplete.el'." single]) (icicles . [(20131227 2224) nil "Minibuffer input completion and cycling." tar]) (ibuffer-vc . [(20130924 608) ((cl-lib (0 2))) "Group ibuffer's list by VC project, or show VC status" single]) (ibuffer-git . [(20110508 31) nil "show git status in ibuffer column" single]) (iasm-mode . [(20131004 1644) nil "interactive assembly major mode." tar]) (hy-mode . [(20131122 839) nil "Major mode for Hy code" single]) (hungry-delete . [(20120128 1153) nil "hungry delete minor mode" single]) (httpcode . [(20121001 2045) nil "explains the meaning of an HTTP status code" single]) (http-twiddle . [(20121117 812) nil "send & twiddle & resend HTTP requests" single]) (http-post-simple . [(20131011 358) nil "HTTP POST requests using the url library" single]) (htmlize . [(20130207 1202) nil "Convert buffer text and decorations to HTML." single]) (html-to-markdown . [(20131212 1441) nil "HTML to Markdown converter written in Emacs-lisp." single]) (html-script-src . [(20120403 1115) nil "Insert <script src=\"..\"> for popular JavaScript libraries" single]) (ht . [(20131217 610) nil "The missing hash table library for Emacs" single]) (hlinum . [(20130615 834) ((cl-lib (0 2))) "Extension for linum.el to highlight current line number" single]) (hl-todo . [(20130503 1859) nil "highlight TODO keywords in comments" single]) (hl-spotlight . [(20131226 1913) nil "Extension of hl-line.el to spotlight current few lines." single]) (hl-sexp . [(20101130 443) nil "highlight the current sexp" single]) (hl-sentence . [(20110815 954) nil "highlight a sentence based on customizable face" single]) (hl-line+ . [(20131226 1913) nil "Extensions to hl-line.el." single]) (hl-defined . [(20131226 1912) nil "Highlight defined or undefined symbols in Emacs-Lisp." single]) (hive . [(20131217 712) ((sql (3 0))) "Hive SQL mode extension" single]) (historyf . [(20131203 22) nil "file history library like browser" single]) (hippie-namespace . [(20131106 706) nil "Special treatment for namespace prefixes in hippie-expand" single]) (hippie-expand-slime . [(20130907 132) nil "Hook slime's completion into hippie-expand" single]) (hippie-exp-ext . [(20130824 1207) nil "Extension of hippie-expand" single]) (highlight-unique-symbol . [(20130611 2242) ((deferred (0 3 2))) "highlight symbols which not appear in the repository" single]) (highlight-symbol . [(20131103 1336) nil "automatic and manual symbol highlighting" tar]) (highlight-parentheses . [(20130523 852) nil "highlight surrounding parentheses" tar]) (highlight-indentation . [(20131207 835) nil "Minor modes for highlighting indentation" single]) (highlight-escape-sequences . [(20130531 1512) nil "Highlight escape sequences" single]) (highlight-current-line . [(20051013 1756) nil "highlight line where the cursor is." single]) (highlight-cl . [(20091012 1730) nil "Highlighting `cl' functions." single]) (highlight-chars . [(20131226 1906) nil "Highlight specified sets of characters, including whitespace." single]) (highlight . [(20131226 1911) nil "Highlighting commands." single]) (hide-lines . [(20130824 1207) nil "Commands for hiding lines based on a regexp" single]) (hide-comnt . [(20131227 116) nil "Hide/show comments in code." single]) (hi2 . [(20130925 558) nil "indentation module for Haskell Mode" single]) (hexrgb . [(20131226 1855) nil "Functions to manipulate colors, including RGB hex strings." single]) (heroku-theme . [(20130809 2143) nil "Heroku color theme" single]) (heroku . [(20120629 1113) nil "Interface to Heroku apps." single]) (hemisu-theme . [(20130508 1144) nil "Hemisu for Emacs." tar]) (help-mode+ . [(20131226 1855) nil "Extensions to `help-mode.el'" single]) (help-fns+ . [(20131226 1854) nil "Extensions to `help-fns.el'." single]) (help+ . [(20131226 1852) nil "Extensions to `help.el'." single]) (helm-themes . [(20130905 731) ((helm (1 0))) "Color theme selection with helm interface" single]) (helm-swoop . [(20131215 1002) ((helm (1 0)) (emacs (24))) "Efficiently hopping squeezed lines powered by helm interface" tar]) (helm-spotify . [(20131014 1421) ((helm (0 0 0)) (multi (2 0 0))) "Control Spotify with Helm." single]) (helm-spaces . [(20130605 900) ((helm (1 0)) (spaces (0 1 0))) "helm sources for spaces" single]) (helm-sheet . [(20130630 539) ((helm (1 0))) "helm sources for sheet" single]) (helm-rubygems-local . [(20130711 1811) ((helm (1 5 3))) "Installed local rubygems find-file for helm" single]) (helm-recoll . [(20130905 1822) ((helm (1 5 4))) "helm interface for the recoll desktop search tool." single]) (helm-rb . [(20131123 839) ((helm (1 0)) (helm-ag-r (20131123))) "Search Ruby's method by ag and display helm" tar]) (helm-rails . [(20130424 819) ((helm (1 5 1)) (inflections (1 1))) "Helm extension for Rails projects." single]) (helm-pydoc . [(20131204 756) ((helm (1 0))) "pydoc with helm interface" tar]) (helm-projectile . [(20131209 505) ((helm (1 4 0)) (projectile (0 10 0))) "Helm integration for Projectile" single]) (helm-project-persist . [(20130601 1328) ((helm (1 5 2)) (project-persist (0 1 4))) "Helm integration for project-persist package" single]) (helm-orgcard . [(20130608 430) ((helm (1 5 2))) "browse the orgcard by helm" single]) (helm-open-github . [(20131117 2013) ((helm (1 0)) (gh (1 0))) "Utilities of Opening Github Page" single]) (helm-migemo . [(20130820 440) ((helm (1 5 3)) (migemo (1 9))) "Migemo plug-in for helm" single]) (helm-ls-hg . [(20131121 52) nil "List hg files in hg project." single]) (helm-ls-git . [(20131213 110) nil "list git files." single]) (helm-j-cheatsheet . [(20131228 441) ((helm (1 5 3))) "Quick J reference for Emacs" single]) (helm-helm-commands . [(20130902 1048) ((helm (1 5 4))) "List all helm commands with helm" single]) (helm-hatena-bookmark . [(20131128 557) ((helm (1 5 6))) "Hatena::Bookmark helm.el interface" single]) (helm-gtags . [(20131226 711) ((helm (1 5 6))) "GNU GLOBAL helm interface" single]) (helm-go-package . [(20130929 804) ((helm (1 0)) (go-mode (9)) (deferred (0 3 2))) "helm sources for Go programming language's package" single]) (helm-github-stars . [(20131123 817) ((helm (1 5 5))) "Helm integration for your starred repositories on github" single]) (helm-git-grep . [(20131118 437) ((helm (1 0))) "helm for git grep, an incremental git-grep(1)" single]) (helm-git . [(20120630 1403) nil "Helm extension for Git." single]) (helm-gist . [(20120819 1735) ((helm (20120811)) (gist (1 0 1))) "helm-sources and some utilities for gist." single]) (helm-flymake . [(20130716 2244) ((helm (1 0))) "helm interface for flymake" single]) (helm-flycheck . [(20131226 427) ((dash (2 4 0)) (flycheck (0 15)) (helm (1 5 7))) "Show flycheck errors with helm" single]) (helm-emmet . [(20131013 2329) ((helm (1 0)) (emmet-mode (1 0 2))) "helm sources for emmet-mode's snippets" single]) (helm-dired-recent-dirs . [(20131228 614) ((helm (1 0))) "Show recent dirs with helm.el support." single]) (helm-dictionary . [(20131212 410) ((helm (1 5 5))) "Helm source for looking up dictionaries" single]) (helm-descbinds . [(20131102 901) ((helm (1 5))) "Yet Another `describe-bindings' with `helm'." single]) (helm-dash . [(20131228 815) ((sqlite (0 1)) (helm (0 0 0))) "Helm extension to search dash docsets" single]) (helm-css-scss . [(20131110 1830) ((helm (1 0)) (emacs (24))) "CSS/SCSS selector with helm interface" single]) (helm-company . [(20131112 804) ((helm (1 0)) (company (0 6 12))) "Helm interface for company-mode" single]) (helm-cmd-t . [(20131030 1241) nil "cmd-t style completion" tar]) (helm-c-yasnippet . [(20131126 2333) nil "helm source for yasnippet.el" single]) (helm-bm . [(20131224 705) ((bm (1 0)) (cl-lib (0 3)) (helm (1 5 7)) (s (1 8 0))) "helm sources for bm.el" single]) (helm-backup . [(20131227 409) ((helm (1 5 5)) (s (1 8 0))) "Backup each file change using git" single]) (helm-anything . [(20131217 1832) ((helm (20130406)) (anything (20120101))) "Bridge between anything and helm" single]) (helm-ag-r . [(20131123 731) ((helm (1 0))) "Search something by ag and display by helm" single]) (helm-ag . [(20131125 1834) ((helm (1 5 6))) "the silver search with helm interface" single]) (helm-ack . [(20131102 155) ((helm (1 0))) "Ack command with helm interface" single]) (helm-R . [(20120819 1714) ((helm (20120517)) (ess (20120509))) "helm-sources and some utilities for GNU R." single]) (helm . [(20131228 2313) nil "Helm is an Emacs incremental and narrowing framework" tar]) (header2 . [(20131226 1851) nil "Support for creation and update of file headers." single]) (header-button . [(20130110 851) nil "clickable buttons in header lines" single]) (haxe-mode . [(20131004 142) nil "An Emacs major mode for Haxe" single]) (haste . [(20131203 1340) ((json (1 2))) "Emacs client for hastebin (http://hastebin.com/about.md)" single]) (haskell-mode . [(20131222 350) nil "A Haskell editing mode" tar]) (hardhat . [(20131125 1143) ((ignoramus (0 7 0))) "Protect against clobbering user-writable files" single]) (hardcore-mode . [(20111204 2216) nil "Disable arrow keys + optionally backspace and return" single]) (handlebars-sgml-mode . [(20130623 1633) nil "Add Handlebars contextual indenting support to sgml-mode" single]) (handlebars-mode . [(20131122 1406) nil "A major mode for editing Handlebars files." single]) (hamlet-mode . [(20131207 2324) ((cl-lib (0 3)) (dash (2 3 0)) (s (1 7 0))) "Hamlet editing mode" single]) (haml-mode . [(20131015 306) ((ruby-mode (1 0))) "Major mode for editing Haml files" single]) (ham-mode . [(20131209 656) ((html-to-markdown (1 2)) (markdown-mode (2 0))) "Html As Markdown. Transparently edit an html file using markdown." single]) (hackernews . [(20131018 2207) ((json (1 2))) "Access the hackernews aggregator from Emacs" tar]) (gvpr-mode . [(20131208 918) nil "A major mode offering basic syntax coloring for gvpr scripts." single]) (guru-mode . [(20121016 452) nil "Become an Emacs guru" single]) (guide-key . [(20131214 1140) ((popwin (0 3 0))) "Guide the following key bindings automatically and dynamically" single]) (gruvbox-theme . [(20131228 1041) nil "A retro-groove colour theme for Emacs" single]) (gruber-darker-theme . [(20131126 1805) nil "Gruber Darker color theme for Emacs 24." single]) (groovy-mode . [(20131129 409) nil "Groovy mode derived mode" tar]) (grizzl . [(20130810 202) ((cl-lib (0 1))) "Fuzzy Search Library & Completing Read" tar]) (grin . [(20110805 2358) nil "run grin and grind (python replacements for grep and find) putting hits in a grep buffer" single]) (grep-a-lot . [(20131006 647) nil "manages multiple search results buffers for grep.el" single]) (grep+ . [(20131226 1851) nil "Extensions to standard library `grep.el'." single]) (grass-mode . [(20131208 1404) ((cl-lib (0 2))) "Provides Emacs modes for interacting with the GRASS GIS program" single]) (grapnel . [(20131001 834) nil "HTTP request lib with flexible callback dispatch" single]) (graphviz-dot-mode . [(20120821 1441) nil "Mode for the dot-language used by graphviz (att)." single]) (graphene . [(20131203 1152) ((auto-complete (20131121)) (flycheck (20131129)) (smartparens (20131123)) (web-mode (20131125)) (smex (20130707)) (sr-speedbar (20130309)) (project-persist (20131030)) (exec-path-from-shell (20131002)) (scss-mode (20121203)) (markdown-mode (20131005)) (feature-mode (20130714))) "Friendly Emacs defaults." tar]) (grandshell-theme . [(20131228 343) nil "Dark color theme for Emacs > 24 with intensive colors." tar]) (gplusify . [(20121211 522) nil "Add Google Plus markup to a piece of code" single]) (goto-last-change . [(20121115 1014) nil "Move point through buffer-undo-list positions" single]) (goto-chg . [(20131228 1459) nil "goto last change" single]) (gore-mode . [(20131027 2227) nil "Simple mode for gore, a command-line evaluator for golang." single]) (google-weather . [(20110930 155) nil "Fetch Google Weather forecasts." tar]) (google-translate . [(20131124 1319) nil "Emacs interface to Google Translate" single]) (google-this . [(20131031 315) nil "A set of functions and bindings to google under point." single]) (google-maps . [(20130412 230) nil "Access Google Maps from Emacs" tar]) (google-contacts . [(20130430 820) ((oauth2 (0 7))) "Support for Google Contacts in Emacs" tar]) (google-c-style . [(20130412 1415) nil "Google's C/C++ style for c-mode" single]) (golden-ratio . [(20130921 144) nil "Automatic resizing of Emacs windows to the golden ratio" single]) (god-mode . [(20131223 149) nil "God-like command entering minor mode" single]) (go-snippets . [(20130821 844) ((yasnippet (0 8 0))) "Yasnippets for go" tar]) (go-play . [(20120914 1248) nil "Paste to play.golang.org" single]) (go-mode . [(20131112 1935) nil "Major mode for the Go programming language" tar]) (go-errcheck . [(20130308 857) nil "errcheck integration for go-mode" single]) (go-eldoc . [(20131216 511) ((go-mode (0))) "eldoc for go-mode" single]) (go-direx . [(20130808 624) ((direx (0 1 -3))) "Tree style source code viewer for Go language" single]) (go-autocomplete . [(20130809 151) ((auto-complete (1 4 0))) "auto-complete-mode backend for go-mode" single]) (gnus-summary-ext . [(20131222 2021) ((macro-utils (1 0))) "Extra limit and process mark commands for the gnus summary buffer" single]) (gnus-spotlight . [(20130901 1435) nil "Search mail with Spotlight" single]) (gnus-alias . [(20130824 1206) nil "an alternative to gnus-posting-styles" single]) (gnuplot-mode . [(20131203 2159) nil "Major mode for editing gnuplot scripts" single]) (gnuplot . [(20130206 1701) nil "drive gnuplot from within emacs" tar]) (gmail-message-mode . [(20131213 1156) ((ham-mode (1 0))) "A major-mode for editing gmail messages using markdown syntax." single]) (glsl-mode . [(20130815 1435) nil "major mode for Open GLSL shader files" single]) (gitty . [(20121014 742) nil "vc-mode extension for fast git interaction" single]) (gitignore-mode . [(20131222 833) nil "Major mode for editing .gitignore files" single]) (github-browse-file . [(20130515 1247) nil "View the file you're editing on GitHub" single]) (gitconfig-mode . [(20131221 230) nil "Major mode for editing .gitconfig files" single]) (gitconfig . [(20130718 235) nil "Emacs lisp interface to work with git-config variables" single]) (gitattributes-mode . [(20131221 220) nil "Major mode for editing .gitattributes files" single]) (git-rebase-mode . [(20131223 1820) nil "Major mode for editing git rebase files" single]) (git-messenger . [(20130717 1459) ((popup (0 5 0))) "Port of gitmessenger.vim" single]) (git-gutter-fringe . [(20131117 635) ((git-gutter (0 42)) (fringe-helper (0 1 1))) "Fringe version of git-gutter.el" single]) (git-gutter-fringe+ . [(20130902 229) ((git-gutter+ (0 1)) (fringe-helper (20130519 1641))) "Fringe version of git-gutter+.el" single]) (git-gutter . [(20131002 256) nil "Port of Sublime Text plugin GitGutter" single]) (git-gutter+ . [(20130918 435) ((git-commit-mode (1 0))) "Manage Git hunks straight from the buffer" single]) (git-dwim . [(20130130 2150) nil "Context-aware git commands such as branch handling" single]) (git-commit-training-wheels-mode . [(20131121 544) ((git-commit-mode (0 14 0))) "Helps you craft well formed commit messages with git-commit-mode" single]) (git-commit-mode . [(20131124 1840) nil "Major mode for editing git commit messages" single]) (git-blame . [(20110509 926) nil "Minor mode for incremental blame for Git" single]) (git-auto-commit-mode . [(20131007 1423) nil "Emacs Minor mode to automatically commit and push" single]) (git-annex . [(20131119 1445) nil "Mode for easy editing of git-annex'd files" single]) (git . [(20130915 32) ((s (1 7 0)) (dash (2 2 0)) (f (0 10 0))) "An Elisp API for programmatically using Git" single]) (gist . [(20131109 2155) ((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0))) "Emacs integration for gist.github.com" single]) (ghci-completion . [(20130310 836) ((emacs (24 1))) "Completion for GHCi commands in inferior-haskell buffers" single]) (ghc . [(20131217 2253) nil "Sub mode for Haskell mode" tar]) (gh . [(20131223 2140) ((eieio (1 3)) (pcache (0 2 4)) (logito (0 1))) "A GitHub library for Emacs" tar]) (ggtags . [(20131221 36) ((emacs (24))) "emacs frontend to GNU Global source code tagging system" single]) (ggo-mode . [(20130524 443) nil "Gengetopt major mode" single]) (genrnc . [(20130711 2251) ((deferred (0 3 1)) (log4e (0 2 0)) (yaxception (0 1))) "generate RELAX NG Compact Schema from RELAX NG Schema, XML Schema and DTD." tar]) (geiser . [(20131208 1817) nil "GNU Emacs and Scheme talk to each other" tar]) (gedit-mode . [(20131117 55) ((tabbar (0)) (sr-speedbar (0)) (shell-pop (0)) (move-text (0)) (whole-line-or-region (0))) "Emulate the look & feel of GEdit in Emacs" single]) (geben . [(20100330 343) nil "DBGp protocol frontend, a script debugger" tar]) (gather . [(20130422 1550) nil "Gather string in buffer." single]) (gap-mode . [(20131212 2130) nil "Major mode for editing files in the GAP programing language." tar]) (gandalf-theme . [(20130809 247) nil "Gandalf color theme" single]) (fyure . [(20130216 514) nil "An interface to fix Japanese hyoki-yure" tar]) (fwb-cmds . [(20131209 1600) nil "misc frame, window and buffer commands" single]) (fuzzy-match . [(20131226 1850) nil "fuzzy matching" single]) (fuzzy-format . [(20130824 1200) nil "select indent-tabs-mode and format code automatically." single]) (fuzzy . [(20131025 2343) nil "Fuzzy Matching" single]) (furl . [(20110112 1707) nil "Friendly URL retrieval" single]) (fullscreen-mode . [(20130524 956) nil "fullscreen window support for Emacs" single]) (fullframe . [(20131219 652) nil "Generalized automatic execution in a single frame" single]) (full-ack . [(20130423 1304) nil "a front-end for ack" tar]) (fuel . [(20131212 824) ((cl-lib (0 2)) (emacs (24 2))) "Major mode for the Factor programming language." tar]) (fsharp-mode . [(20131108 1322) ((auto-complete (1 4)) (popup (0 5)) (pos-tip (0 4 5)) (s (1 3 1)) (dash (1 1 0))) "F# mode for Emacs" tar]) (fringe-helper . [(20130519 741) nil "helper functions for fringe bitmaps" tar]) (free-keys . [(20131222 740) ((cl-lib (0 3))) "Show free keybindings for modkeys or prefixes" single]) (framesize . [(20131017 1432) ((key-chord (0 5 20080915))) "change the size of frames in Emacs" single]) (framemove . [(20130328 1133) nil "directional frame selection routines" single]) (frame-tag . [(20120527 136) nil "Minor mode that assigns a unique number to each frame for easy switching" single]) (frame-restore . [(20130922 735) ((dash (1 2)) (f (0 11)) (emacs (24 1))) "Restore Emacs frame" single]) (frame-fns . [(20131226 1849) nil "Non-interactive frame and window functions." single]) (frame-cmds . [(20131226 1849) nil "Frame and window commands (interactive functions)." single]) (foreign-regexp . [(20130618 321) nil "search and replace by foreign regexp." tar]) (font-utils . [(20131106 706) ((persistent-soft (0 8 8)) (pcache (0 2 3))) "Utility functions for working with fonts" single]) (font-lock-menus . [(20131226 1847) nil "Font-lock menus: enhanced `font-menus.el'" single]) (font-lock+ . [(20131226 1846) nil "Enhancements to standard library `font-lock.el'." single]) (fold-this . [(20131113 247) nil "Just fold this region please" single]) (fold-dwim-org . [(20131203 551) ((fold-dwim (1 2))) "Fold DWIM bound to org key-strokes." single]) (fold-dwim . [(20120926 336) nil "No description available." single]) (fm . [(20130126 1618) nil "follow mode for compilation/output buffers" single]) (flyspell-lazy . [(20131106 706) nil "Improve flyspell responsiveness using idle timers" single]) (flymake-yaml . [(20130423 848) ((flymake-easy (0 1))) "A flymake handler for YAML" single]) (flymake-shell . [(20121104 1100) ((flymake-easy (0 1))) "A flymake syntax-checker for shell scripts" single]) (flymake-sass . [(20121218 12) ((flymake-easy (0 1))) "Flymake handler for sass and scss files" single]) (flymake-rust . [(20131020 345) ((flymake-easy (0 1))) "A flymake handler for rust-mode files" single]) (flymake-ruby . [(20121104 1059) ((flymake-easy (0 1))) "A flymake handler for ruby-mode files" single]) (flymake-racket . [(20131209 2157) ((flymake-easy (0 1))) "A flymake handler for scheme-mode files" single]) (flymake-python-pyflakes . [(20131127 6) ((flymake-easy (0 8))) "A flymake handler for python-mode files using pyflakes (or flake8)" single]) (flymake-puppet . [(20130731 2203) ((flymake-easy (0 9))) "An Emacs flymake handler for syntax-checking puppet using puppet-lint" single]) (flymake-php . [(20121104 1102) ((flymake-easy (0 1))) "A flymake handler for php-mode files" single]) (flymake-perlcritic . [(20120328 114) ((flymake (0 3))) "Flymake handler for Perl to invoke Perl::Critic" tar]) (flymake-lua . [(20130329 310) nil "Flymake for Lua" single]) (flymake-json . [(20130423 2357) ((flymake-easy (0 1))) "A flymake handler for json using jsonlint" single]) (flymake-jslint . [(20130613 202) ((flymake-easy (0 1))) "A flymake handler for javascript using jslint" single]) (flymake-jshint . [(20130610 257) ((flymake-easy (0 1))) "making flymake work with JSHint" single]) (flymake-hlint . [(20130309 145) ((flymake-easy (0 1))) "A flymake handler for haskell-mode files using hlint" single]) (flymake-haskell-multi . [(20130620 422) ((flymake-easy (0 1))) "Syntax-check haskell-mode using both ghc and hlint" tar]) (flymake-haml . [(20130324 351) ((flymake-easy (0 1))) "A flymake handler for haml files" single]) (flymake-go . [(20130314 741) ((flymake (0 4 13))) "A flymake handler for go-mode files" single]) (flymake-gjshint . [(20130327 532) nil "A flymake handler for javascript using both jshint and gjslint" single]) (flymake-elixir . [(20130810 717) nil "A flymake handler for elixir-mode .ex files." single]) (flymake-easy . [(20130907 131) nil "Helpers for easily building flymake checkers" single]) (flymake-cursor . [(20130822 1032) nil "displays flymake error msg in minibuffer after delay" single]) (flymake-css . [(20121104 1104) ((flymake-easy (0 1))) "Flymake support for css using csslint" single]) (flymake-coffee . [(20130828 258) ((flymake-easy (0 1))) "A flymake handler for coffee script" single]) (flycheck-tip . [(20131025 320) ((flycheck (0 13)) (dash (1 2)) (emacs (24 1)) (popup (0 5 0))) "show flycheck's error by popup-tip" single]) (flycheck-ledger . [(20131218 324) ((flycheck (0 15))) "Flycheck integration for ledger files" single]) (flycheck-hdevtools . [(20131130 1105) ((flycheck (0 15))) "A flycheck checker for Haskell using hdevtools" single]) (flycheck-d-unittest . [(20131017 1652) ((flycheck (0 14)) (dash (1 4 0))) "Add D unittest support to flycheck" single]) (flycheck-color-mode-line . [(20131125 2138) ((flycheck (0 15)) (dash (1 2)) (emacs (24 1))) "Change mode line color with Flycheck status" single]) (flycheck-cask . [(20130818 253) ((flycheck (0 14)) (dash (2 0 0)) (f (0 6 0))) "Cask support in Flycheck" single]) (flycheck . [(20131224 546) ((s (1 6 0)) (dash (2 0 0)) (f (0 6 0)) (pkg-info (0 4)) (cl-lib (0 3)) (emacs (24 1))) "On-the-fly syntax checking (Flymake done right)" tar]) (flx-ido . [(20131030 1243) ((flx (0 1)) (cl-lib (0 3))) "flx integration for ido" single]) (flx . [(20130728 820) ((cl-lib (0 3))) "fuzzy matching with good sorting" single]) (floobits . [(20131223 1310) ((json (1 2)) (highlight (0))) "Floobits plugin for real-time collaborative editing" tar]) (fliptext . [(20131114 218) nil "Input method for flipping characters upside down" single]) (flex-isearch . [(20130508 1503) nil "Flex matching (like ido) in isearch." single]) (flex-autopair . [(20120809 518) nil "Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable." single]) (flatland-theme . [(20131204 858) nil "A simple theme for Emacs based on the Flatland theme for Sublime Text" single]) (flash-region . [(20130923 1117) nil "Flash a region" single]) (fixmee . [(20131106 706) ((button-lock (1 0 0)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 3 2)) (tabulated-list (0))) "Quickly navigate to FIXME notices in code" single]) (fit-frame . [(20131226 1844) nil "Resize a frame.  In particular, fit a frame to its buffers." single]) (fiplr . [(20130810 141) ((grizzl (0 1 0)) (cl-lib (0 1))) "Fuzzy Search for Files in Projects" tar]) (findr . [(20130824 1207) nil "Breadth-first file-finding facility for (X)Emacs" single]) (finder+ . [(20131226 1844) nil "Extensions to standard library finder.el" single]) (find-things-fast . [(20120920 1804) nil "Find things fast, leveraging the power of git" single]) (find-file-in-repository . [(20130221 511) nil "Quickly find files in a git, mercurial or other repository" single]) (find-file-in-project . [(20120716 1655) nil "Find files in a project quickly." single]) (fill-column-indicator . [(20130807 619) nil "Graphically indicate the fill column" tar]) (filesets+ . [(20131226 1842) nil "Extensions to `filesets.el'." single]) (files+ . [(20131226 1841) nil "Enhancements of standard library `files.el'." single]) (figlet . [(20120601 1315) nil "Annoy people with big, ascii art text" single]) (fic-mode . [(20130824 1158) nil "Show FIXME/TODO/BUG/KLUDGE in special face only in comments and strings" single]) (fetch . [(20131130 2330) nil "Fetch and unpack resources" single]) (feature-mode . [(20130714 1319) nil "Major mode for editing Gherkin (i.e. Cucumber) user stories" tar]) (fastnav . [(20120211 657) nil "Fast navigation and editing routines." single]) (fasm-mode . [(20131029 611) nil "Fasm major mode" single]) (fasd . [(20130831 1003) ((grizzl (0))) "Emacs integration for the command-line productivity booster `fasd'" single]) (fakir . [(20130711 1322) ((noflet (0 0 8)) (dash (1 3 2))) "fakeing bits of Emacs" single]) (fakespace . [(20120817 1706) nil "fake namespaces with defpackage" single]) (factlog . [(20130209 1740) ((deferred (0 3 1))) "File activity logger" single]) (faces+ . [(20131226 1840) nil "Extensions to `faces.el'." single]) (facemenu+ . [(20131226 1839) nil "Extensions to `facemenu.el'." single]) (face-remap+ . [(20131226 1839) nil "Extensions to standard library `face-remap.el'." single]) (f . [(20131225 721) ((s (1 7 0)) (dash (2 2 0))) "Modern API for working with files and directories" single]) (ez-query-replace . [(20130925 1014) ((dash (1 2 0))) "A helpful query-replace." single]) (eyedropper . [(20131226 1838) ((hexrgb (0))) "Pick foreground and background colors at cursor or pointer." single]) (extend-dnd . [(20130328 1034) nil "R drag and Drop" tar]) (express . [(20131106 706) ((string-utils (0 3 2))) "Alternatives to `message'" single]) (expand-region . [(20131111 329) nil "Increase selected region by semantic units." tar]) (exec-path-from-shell . [(20131205 1210) nil "Get environment variables such as $PATH from the shell" single]) (evm . [(20131201 619) ((dash (2 3 0)) (f (0 13 0))) "Emacs Version Manager" single]) (evil-visualstar . [(20130925 1114) ((evil (0))) "Starts a * or # search from the visual selection" single]) (evil-tabs . [(20131011 433) ((evil (0 0 0)) (elscreen (0 0 0))) "Integrating Vim-style tabs for Evil mode users." single]) (evil-paredit . [(20130408 47) ((evil (0 0 0)) (paredit (1))) "Paredit support for evil keybindings" single]) (evil-numbers . [(20121108 1738) nil "increment/decrement numbers like in vim" single]) (evil-nerd-commenter . [(20131225 2138) nil "Comment/uncomment lines efficiently. Like Nerd Commenter in Vim" tar]) (evil-matchit . [(20131220 609) nil "Vim matchit ported into Emacs (requires EVIL)" tar]) (evil-leader . [(20130921 454) ((evil (0))) "let there be <leader>" single]) (evil-indent-textobject . [(20130831 1519) ((evil (0))) "evil textobjects based on indentation" single]) (evil . [(20131227 724) ((undo-tree (0 6 3)) (goto-last-change (1 2))) "Extensible Vi layer for Emacs." tar]) (ethan-wspace . [(20130518 708) nil "whitespace customizations for emacs" single]) (etags-table . [(20130824 1157) nil "Set tags table(s) based on current file" single]) (esxml . [(20130512 1547) ((kv (0 0 5))) "Library for working with xml via esxml and sxml" single]) (esup . [(20130607 1350) nil "the Emacs StartUp Profiler (ESUP)" single]) (ess-R-object-popup . [(20130302 336) ((popup (20130117 1954)) (ess (20130225 1754))) "popup description of R object" single]) (ess-R-data-view . [(20130509 458) ((ctable (20130313 1743)) (popup (20130324 1305)) (ess (20130225 1754))) "Data viewer for GNU R" single]) (ess . [(20131207 1141) nil "No description available." tar]) (espuds . [(20131026 1121) ((s (1 7 0)) (dash (2 2 0)) (noflet (0 0 10)) (f (0 12 1))) "Ecukes step definitions" single]) (espresso-theme . [(20130228 2348) nil "Espresso Tutti Colori port for Emacs" single]) (esh-help . [(20130908 1850) ((dash (1 4 0))) "Add some help functions and support for Eshell" single]) (esh-buf-stack . [(20130620 754) nil "Add a buffer stack feature to Eshell" single]) (escreen . [(20091203 1013) nil "emacs window session manager" single]) (es-lib . [(20131029 107) ((cl-lib (0 3))) "A collection of emacs utilities" tar]) (ert-runner . [(20131219 905) ((s (1 6 1)) (dash (1 8 0)) (f (0 10 0)) (commander (0 2 0)) (ansi (0 1 0))) "Opinionated Ert testing workflow" tar]) (ert-expectations . [(20130824 1200) nil "The simplest unit test framework in the world" single]) (erlang . [(20131025 6) nil "Erlang major mode" tar]) (ergoemacs-mode . [(20131223 839) nil "Emacs mode based on common modern software interface and ergonomics." tar]) (erefactor . [(20130521 238) nil "Emacs-Lisp refactoring utilities" single]) (eredis . [(20120808 2007) nil "eredis, a Redis client in emacs lisp" single]) (ercn . [(20121230 1013) nil "Flexible ERC notifications" single]) (erc-tweet . [(20130618 1301) ((erc (5 3))) "shows text of a tweet when an url is posted in erc buffers" single]) (erc-track-score . [(20130328 515) nil "Add score support to tracked channel buffers" single]) (erc-terminal-notifier . [(20131028 343) nil "OSX notifications via the terminal-notifier gem for Emacs ERC." single]) (erc-image . [(20131125 1151) ((erc (5 3))) "Show received image urls in the ERC buffer" single]) (erc-hl-nicks . [(20130114 1348) nil "ERC nick highlighter that ignores uniquifying chars when colorizing" single]) (eproject . [(20130220 1109) nil "assign files to projects, programatically" tar]) (epl . [(20131101 405) ((cl-lib (0 3))) "Emacs Package Library" single]) (epic . [(20130319 2340) ((htmlize (1 47))) "Evernote Picker" tar]) (epc . [(20130803 2228) ((concurrent (0 3 1)) (ctable (0 1 2))) "A RPC stack for the Emacs Lisp" tar]) (ensime . [(20131030 1503) ((s (1 3 0)) (dash (1 0 3)) (popup (0 5 0)) (auto-complete (1 4 0)) (scala-mode2 (0 21))) "ENhanced Scala Interaction Mode for Emacs" tar]) (enotify . [(20130407 648) nil "A networked notification system for emacs" tar]) (enh-ruby-mode . [(20131129 1833) nil "Major mode for editing Ruby files" tar]) (enclose . [(20121008 914) nil "Enclose cursor within punctuation pairs." tar]) (emr . [(20130619 316) ((s (1 3 1)) (dash (1 2 0)) (cl-lib (0 2)) (popup (0 5 0)) (emacs (24 1)) (list-utils (0 3 0)) (redshank (1 0 0)) (paredit (24 0 0)) (projectile (0 9 1))) "Emacs refactoring system." tar]) (emms-soundcloud . [(20131221 345) ((emms (20131016)) (json (1 2))) "EMMS source for Soundcloud audio sharing platform" single]) (emms-mark-ext . [(20130528 2027) ((emms (3 0))) "Extra functions for emms-mark-mode and emms-tag-edit-mode" single]) (emms-info-mediainfo . [(20131223 500) ((emms (0))) "Info-method for EMMS using medianfo" single]) (emms . [(20131016 932) nil "The Emacs Multimedia System" tar]) (emmet-mode . [(20130915 1708) nil "Unofficial Emmet's support for emacs" single]) (emamux-ruby-test . [(20130812 939) ((emamux (0 1)) (projectile (0 9 1))) "Ruby test with emamux" single]) (emamux . [(20130331 753) nil "Interact with tmux" single]) (emagician-fix-spell-memory . [(20130415 1244) nil "Simple hack into ispell to fix (muscle) memory problems" single]) (emacsc . [(20131027 225) nil "helper for emacsc(1)" tar]) (emacs-setup . [(20120727 726) nil "Package for maintaining your emacs configuration. Clean up your .emacs!" tar]) (emacs-eclim . [(20131021 1136) ((json (1 2))) "An interface to the Eclipse IDE." tar]) (elx . [(20131209 922) ((emacs (24 3 50))) "extract information from Emacs Lisp libraries" single]) (elscreen-mew . [(20131201 36) ((elscreen (20120413 1107))) "ElScreen Add-On for Mew" single]) (elscreen . [(20120413 807) nil "Emacs window session manager" single]) (elpy . [(20131109 1120) ((auto-complete (1 4)) (find-file-in-project (3 2)) (fuzzy (0 1)) (highlight-indentation (0 5 0)) (idomenu (0 1)) (iedit (0 97)) (nose (0 1 1)) (virtualenv (1 2)) (yasnippet (0 8 0))) "Emacs Python Development Environment" tar]) (elpa-audit . [(20130514 409) nil "Handy functions for inspecting and comparing package archives" single]) (elnode . [(20130416 826) ((web (0 1 4)) (creole (0 8 14)) (fakir (0 0 14)) (db (0 0 5)) (kv (0 0 15))) "The Emacs webserver." tar]) (elmine . [(20130330 1300) nil "Redmine API access via elisp." single]) (elixir-yasnippets . [(20130908 1930) ((yasnippet (0 8 0))) "Yasnippets for Elixir" tar]) (elixir-mode . [(20131126 924) nil "Major mode for editing Elixir files" tar]) (elixir-mix . [(20131126 4) nil "Emacs integration for Elixir's mix" single]) (elisp-slime-nav . [(20130612 446) ((cl-lib (0 2))) "Make M-. and M-, work in elisp like they do in slime" single]) (elisp-sandbox . [(20131116 1042) nil "Evaluate EmacsLisp expressions in a sandbox" single]) (elisp-depend . [(20120427 123) nil "Parse depend libraries of elisp file." single]) (elhome . [(20131202 1108) ((initsplit (20120630))) "A framework for a \"home\" Emacs configuration" tar]) (elfeed-web . [(20130908 1434) ((simple-httpd (1 4 3)) (elfeed (1 0 1)) (emacs (24 1))) "web interface to Elfeed" tar]) (elfeed . [(20131220 1720) ((emacs (24 1))) "an Emacs Atom/RSS feed reader" tar]) (elein . [(20120120 316) nil "running leiningen commands from emacs" single]) (electric-case . [(20130620 154) nil "insert camelCase, snake_case words without \"Shift\"ing" single]) (eldoc-extension . [(20130824 1156) nil "Some extension for eldoc" single]) (eldoc-eval . [(20131108 612) nil "Enable eldoc support when minibuffer is in use." single]) (el-x . [(20131006 923) nil "main entry point for el-x package" tar]) (el-swank-fuzzy . [(20130824 1157) nil "fuzzy symbol completion." single]) (el-spy . [(20131226 1208) nil "Mocking framework for Emacs lisp. It also support spy, proxy." single]) (el-spice . [(20131105 1211) ((thingatpt+ (0))) "Extra spice for emacs lisp programming" tar]) (el-spec . [(20121018 4) nil "ruby's rspec like syntax test frame work" single]) (el-mock . [(20130806 1348) nil "Tiny Mock and Stub framework in Emacs Lisp" single]) (el-autoyas . [(20120918 617) nil "Automatically create Emacs-Lisp Yasnippets" tar]) (ein . [(20130711 104) ((websocket (0 9)) (request (0 2)) (auto-complete (1 4))) "Emacs IPython Notebook" tar]) (eimp . [(20091025 922) nil "Emacs Image Manipulation Package" single]) (egison-mode . [(20131118 1726) nil "Egison editing mode" single]) (egg . [(20130701 1725) nil "Emacs Got Git - Emacs interface to Git" tar]) (efire . [(20130811 1649) ((circe (1 2))) "Use campfire from Emacs" single]) (editorconfig . [(20131024 119) nil "EditorConfig Emacs extension" single]) (edit-server-htmlize . [(20130329 1548) ((edit-server (1 9))) "(de)HTMLization hooks for edit-server.el" single]) (edit-server . [(20131229 441) nil "server that responds to edit requests from Chrome" single]) (edit-list . [(20100930 743) nil "edit a single list" single]) (edit-color-stamp . [(20130529 1033) ((es-lib (0 2)) (cl-lib (1 0))) "Edit a hex color stamp, using a QT or the internal color picker" tar]) (edebug-x . [(20130615 2155) nil "Extensions for Edebug" single]) (edbi . [(20130809 556) ((concurrent (0 3 1)) (ctable (0 1 2)) (epc (0 1 1))) "Emacs Database Interface" tar]) (ecukes . [(20131225 758) ((f (0 11 0)) (s (1 8 0)) (dash (2 2 0)) (ansi (0 3 0)) (espuds (0 2 2)) (commander (0 5 1))) "Cucumber for Emacs." tar]) (ecb . [(20131116 1319) nil "a code browser for Emacs" tar]) (ebib . [(20131206 1914) nil "a BibTeX database manager" tar]) (easy-kill . [(20131212 156) ((emacs (24))) "kill things easily" single]) (easy-after-load . [(20121224 1849) nil "eval-after-load for all files in a directory" single]) (e2wm-svg-clock . [(20130303 1326) ((e2wm (20130225 1602)) (svg-clock (0 4))) "e2wm plugin for svg-clock" single]) (e2wm-bookmark . [(20120811 2350) ((e2wm (1 2))) "Bookmark plugin for e2wm.el" single]) (e2wm-R . [(20130505 2208) ((e2wm (20130225 1602)) (inlineR (20120520 2332)) (ess (20130225 1754))) "some e2wm plugin and perspective for GNU R" single]) (e2wm . [(20130909 2314) ((window-layout (1 2))) "simple window manager for emacs" tar]) (dynamic-fonts . [(20131106 706) ((font-utils (0 7 0)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Set faces based on available fonts" single]) (dylan-mode . [(20131020 1953) nil "Major mode for editing Dylan programs." tar]) (duplicate-thing . [(20120515 948) nil "Duplicate current line & selection" single]) (dummy-h-mode . [(20130824 1159) nil "switch major mode to c-/c++-/objc-mode on .h file" single]) (dsvn . [(20130120 1257) nil "Subversion interface" single]) (drupal-spell . [(20130520 955) nil "Aspell extra dictionary for Drupal" tar]) (drupal-mode . [(20131209 3) ((php-mode (1 5 0))) "Advanced minor mode for Drupal development" tar]) (dropdown-list . [(20120329 1636) nil "Drop-down menu interface" single]) (dropbox . [(20130513 1537) ((json (1 2)) (oauth (1 0 3))) "Emacs backend for dropbox" single]) (drill-instructor-AZIK-force . [(20120907 1817) ((popup (0 5))) "Support AZIK input" tar]) (drag-stuff . [(20130412 212) nil "Drag stuff (lines, words, region, etc...) around" tar]) (dpaste_de . [(20131015 525) ((web (0 3 7))) "Emacs mode to paste to dpaste.de" single]) (dpaste . [(20120823 1136) nil "Emacs integration for dpaste.com" single]) (dot-mode . [(20100803 1208) nil "Minor mode to repeat typing or commands" single]) (doremi-mac . [(20131226 1835) nil "A macro for defining Do Re Mi commands." single]) (doremi-frm . [(20131226 1834) ((doremi (0)) (faces+ (0)) (frame-fns (0)) (hexrgb (0))) "Incrementally adjust face attributes and frame parameters." single]) (doremi-cmd . [(20131226 1833) ((doremi (0))) "Miscellaneous Do Re Mi commands" single]) (doremi . [(20131226 1835) nil "Do Re Mi: Incremental change using arrow keys or mouse wheel." single]) (dom . [(20091224 1827) nil "DOM implementation" single]) (dollaro . [(20130620 1325) ((s (1 6 0))) "simple text templates" single]) (dockerfile-mode . [(20131118 620) nil "Major mode for editing Docker's Dockerfiles" single]) (docbook-snippets . [(20130716 1849) ((yasnippet (0 8 0))) "Yasnippets for DocBook" tar]) (dna-mode . [(20130821 1105) nil "a major mode for editing dna sequences" tar]) (dkmisc . [(20131110 315) ((emacs (24 1))) "Miscellaneous functions required by dk* packages." tar]) (dklrt . [(20131110 541) ((dkmisc (0 50)) (ledger-mode (20130908 1357)) (emacs (24 1))) "Ledger Recurring Transactions." tar]) (dkdo . [(20131110 319) ((dkmisc (0 50)) (emacs (24 1))) "Do List major mode based on org-mode." tar]) (django-theme . [(20131022 202) nil "Custom face theme for Emacs" single]) (dizzee . [(20111009 616) nil "A more pleasant way to manage your project's subprocesses in Emacs." tar]) (dispass . [(20130525 434) nil "Emacs wrapper for DisPass" single]) (disk . [(20081128 1506) nil "simplified find-file, revert-file, save-buffer interface" single]) (discover . [(20131226 1534) ((makey (0 2))) "discover more of Emacs" single]) (disaster . [(20130509 1055) nil "Disassemble C/C++ code under cursor in Emacs" single]) (direx . [(20130930 1224) nil "Simple Directory Explorer" tar]) (dired-toggle-sudo . [(20131022 626) nil "Browse directory with sudo privileges." single]) (dired-toggle . [(20131023 110) nil "provide a simple way to toggle dired buffer for current directory" single]) (dired-sort-menu . [(20130824 1207) nil "provide menu/dialogue for dired sort options" single]) (dired-sort-menu+ . [(20131226 1833) ((dired-sort-menu (0))) "Extensions to `dired-sort-menu.el'" single]) (dired-single . [(20130824 1200) nil "Reuse the current dired buffer to visit another directory" single]) (dired-efap . [(20131121 209) nil "Edit Filename At Point in a dired buffer" single]) (dired-dups . [(20130527 1425) nil "Find duplicate files and display them in a dired buffer" single]) (dired-details . [(20130824 1158) nil "make file details hide-able in dired" single]) (dired-details+ . [(20131226 1832) ((dired-details (0))) "Enhancements to library `dired-details+.el'." single]) (dired+ . [(20131226 1831) nil "Extensions to Dired." single]) (dircmp . [(20130806 1157) nil "Compare and sync directories." tar]) (diminish . [(20091203 1012) nil "Diminished modes are minor modes with no modeline display" single]) (dim-autoload . [(20131019 120) nil "dim complete autoload cookie lines" single]) (diff-hl . [(20131114 53) ((cl-lib (0 2))) "Highlight uncommitted changes" tar]) (dictionary . [(20131005 526) ((connection (1 10)) (link (1 10))) "Client for rfc2229 dictionary servers" single]) (dic-lookup-w3m . [(20121101 1033) ((w3m (20120723 324)) (stem (20120826))) "look up dictionaries on the Internet" tar]) (desktop-registry . [(20130807 1327) nil "Keep a central registry of desktop files" single]) (delim-kill . [(20100516 2320) nil "Kill text between delimiters." single]) (deft . [(20131027 757) nil "quickly browse, filter, and edit plain text notes" single]) (deferred . [(20130930 607) nil "Simple asynchronous functions for emacs lisp" single]) (dedukti-mode . [(20131114 1216) nil "Major mode for Dedukti files" single]) (dedicated . [(20090428 1231) nil "A very simple minor mode for dedicated buffers" single]) (debpaste . [(20131226 732) ((xml-rpc (1 6 7))) "Interface for getting/posting/deleting pastes from paste.debian.net" single]) (db-pg . [(20130131 1102) ((pg (0 12)) (db (0 0 6))) "A PostgreSQL adapter for emacs-db" single]) (db . [(20130125 1029) ((kv (0 0 11))) "A database for EmacsLisp" single]) (dayone . [(20131117 255) ((uuid (0 0 3)) (mustache (0 22)) (ht (1 5))) "Utility script for Day One" tar]) (datomic-snippets . [(20130707 1315) ((s (1 4 0)) (dash (1 2 0)) (yasnippet (0 6 1))) "Yasnippets for Datomic" tar]) (dash-functional . [(20130831 1340) ((dash (2 0 0)) (emacs (24))) "Collection of useful combinators for Emacs Lisp" single]) (dash-at-point . [(20131218 1724) nil "Search the word at point with Dash" single]) (dash . [(20131223 933) nil "A modern list library for Emacs" single]) (dart-mode . [(20130906 1244) nil "Major mode for editing Dart files" single]) (darcsum . [(20131103 1031) nil "a pcl-cvs like interface for managing darcs patches" tar]) (dakrone-theme . [(20131212 1159) nil "dakrone's custom dark theme" single]) (d-mode . [(20130909 150) nil "D Programming Language mode for (X)Emacs" single]) (cycbuf . [(20131203 1237) nil "Cycle buffers, inspired by swbuff.el, swbuff-x.el, and bs.el" single]) (cyberpunk-theme . [(20131205 1256) nil "Cyberpunk Color Theme" single]) (cus-edit+ . [(20131226 1825) nil "Enhancements to `cus-edit.el'." single]) (cursor-test . [(20131207 932) ((emacs (24))) "testing library for cursor position in emacs." single]) (cursor-chg . [(20131226 1824) nil "Change cursor dynamically, depending on the context." single]) (cucumber-goto-step . [(20131209 2119) ((pcre2el (1 5))) "Jump to cucumber step definition" single]) (ctags-update . [(20131125 743) nil "(auto) update TAGS in parent directory using exuberant-ctags" single]) (ctags . [(20110911 304) nil "Exuberant Ctags utilities for Emacs" single]) (ctable . [(20131202 2114) nil "Table component for Emacs Lisp" single]) (csv-nav . [(20130407 1820) nil "navigate and edit CSV files" single]) (cssh . [(20120823 1241) nil "clusterssh implementation for emacs" single]) (css-eldoc . [(20130902 135) nil "an eldoc-mode plugin for CSS source code" tar]) (csharp-mode . [(20130824 1200) nil "C# mode derived mode" single]) (cryptol-mode . [(20131010 1354) nil "Cryptol major mode for Emacs" single]) (crosshairs . [(20131226 1823) ((hl-line+ (0)) (col-highlight (0)) (vline (0))) "Highlight the current line and column." single]) (crontab-mode . [(20090510 1355) nil "Mode for editing crontab files" single]) (creole-mode . [(20130721 1750) nil "a markup mode for creole" single]) (creole . [(20130802 122) ((noflet (0 0 3)) (kv (0 0 17))) "A parser for the Creole Wiki language" single]) (crappy-jsp-mode . [(20121117 956) nil "A pretty crappy major-mode for jsp." single]) (crab . [(20130609 958) ((websocket (1 0)) (json (1 2))) "WebSocket server to remotely control a browser" single]) (cperl-mode . [(20131022 1349) nil "Perl code editing commands for Emacs" single]) (control-mode . [(20131010 2052) nil "A \"control\" mode, similar to vim's \"normal\" mode" single]) (connection . [(20131005 526) nil "TCP-based client connection" single]) (conkeror-minor-mode . [(20131218 334) nil "Mode for editing conkeror javascript files." single]) (confluence . [(20130814 535) ((xml-rpc (1 6 4))) "Emacs mode for interacting with confluence wikis" tar]) (concurrent . [(20130914 536) ((deferred (0 3 1))) "Concurrent utility functions for emacs lisp" single]) (company-jedi . [(20131224 405) ((company (0 6 12))) "Jedi backend for company-mode" tar]) (company-inf-ruby . [(20130630 1130) ((company (0 6 10)) (inf-ruby (2 2 7))) "company-mode completion back-end for inf-ruby" single]) (company-go . [(20131120 5) ((company (0 6 12))) "company-mode backend for Go (using gocode)" single]) (company . [(20131223 610) nil "Modular in-buffer completion framework" tar]) (commander . [(20131229 244) ((s (1 6 0)) (dash (2 0 0)) (cl-lib (0 3)) (f (0 6 1))) "Emacs command line parser" single]) (command-log-mode . [(20120329 629) nil "log keyboard commands to buffer" single]) (column-marker . [(20121128 843) nil "Highlight certain character columns" single]) (column-enforce-mode . [(20131209 956) nil "Highlight text that extends beyond a  column" single]) (colorsarenice-theme . [(20131128 1106) ((emacs (24))) "A color theme." tar]) (color-theme-solarized . [(20130307 1350) ((color-theme (6 5 5))) "Solarized themes for Emacs" tar]) (color-theme-sanityinc-tomorrow . [(20131204 1113) nil "A version of Chris Kempson's various Tomorrow themes" tar]) (color-theme-sanityinc-solarized . [(20131204 1112) nil "A version of Ethan Schoonover's Solarized themes" tar]) (color-theme-buffer-local . [(20120702 1336) nil "Install color-themes by buffer." single]) (color-theme-approximate . [(20130328 1933) nil "Makes Emacs theme works on terminal transparently" single]) (color-theme . [(20080305 34) nil "install color themes" tar]) (color-moccur . [(20120811 527) nil "multi-buffer occur (grep) mode" single]) (col-highlight . [(20131226 1817) ((vline (0))) "Highlight the current column." single]) (coffee-mode . [(20131226 1919) ((emacs (24 1))) "Major mode to edit CoffeeScript files in Emacs" single]) (coffee-fof . [(20131012 530) ((coffee-mode (0 4 1))) "A coffee-mode configuration for `ff-find-other-file'." single]) (cn-outline . [(20100321 914) nil "No description available." single]) (cmds-menu . [(20131226 1816) nil "`Recent Commands' submenu for the menu-bar `Tools' menu." single]) (cm-mode . [(20130306 6) nil "Minor mode for CriticMarkup" single]) (clues-theme . [(20130908 101) ((emacs (24 0))) "an Emacs 24 theme which may well be fully awesome..." single]) (cloud-to-butt-erc . [(20130627 1608) nil "Replace 'the cloud' with 'my butt'" single]) (closure-lint-mode . [(20101118 1324) nil "minor mode for the Closure Linter" single]) (clojure-test-mode . [(20131227 805) ((clojure-mode (1 7)) (cider (0 4 0))) "Minor mode for Clojure tests" single]) (clojure-snippets . [(20130403 1146) ((yasnippet (0 8 0))) "Yasnippets for clojure" tar]) (clojure-mode . [(20131227 1044) nil "Major mode for Clojure code" single]) (clojure-cheatsheet . [(20131213 9) ((helm (1 5 3)) (cider (0 1 8))) "The Clojure Cheatsheet for Emacs" single]) (cljsbuild-mode . [(20130110 732) nil "A minor mode for the ClojureScript 'lein cljsbuild' command" single]) (clj-refactor . [(20131217 216) ((s (1 8 0)) (dash (2 4 0)) (yasnippet (0 6 1)) (paredit (22)) (multiple-cursors (1 2 2))) "A collection of clojure refactoring functions" single]) (clips-mode . [(20131012 1401) nil "Major mode for editing CLIPS code and REPL" tar]) (clippy . [(20131210 258) ((pos-tip (1 0))) "Show tooltip with function documentation at point" single]) (clevercss . [(20131228 1755) nil "A major mode for editing CleverCSS files" single]) (cl-lib-highlight . [(20131019 751) ((cl-lib (0 3))) "full cl-lib font-lock highlighting" single]) (circe . [(20131210 409) ((lui (0)) (lcs (0))) "Client for IRC in Emacs" tar]) (cider-tracing . [(20131018 738) ((cider (0 3 0)) (clojure-mode (2 1 0))) "Tracing extension for CIDER" single]) (cider-decompile . [(20131116 1002) ((cider (0 3 0)) (javap-mode (9))) "decompilation extension for cider" single]) (cider . [(20131221 1231) ((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 4))) "Clojure Integrated Development Environment and REPL" tar]) (chruby . [(20131212 556) nil "Emacs integration for chruby" single]) (chm-view . [(20110616 1719) nil "View CHM file." single]) (chicken-scheme . [(20131116 1228) nil "Scheme-mode extensions for Chicken Scheme" single]) (charmap . [(20131019 2158) nil "Unicode table for Emacs" single]) (change-inner . [(20130208 1130) ((expand-region (0 7))) "Change contents based on semantic units" single]) (cg . [(20131210 455) nil "major mode for editing Constraint Grammar files" single]) (cfengine-code-style . [(20131209 411) nil "C code style for CFEngine project." single]) (centered-cursor-mode . [(20131121 1237) nil "cursor stays vertically centered" single]) (cedit . [(20131224 1929) nil "paredit-like commands for c-like languages" single]) (cask . [(20131225 628) ((s (1 8 0)) (dash (2 2 0)) (f (0 10 0)) (epl (0 0 1))) "Cask: Emacs dependency management made easy" tar]) (capture . [(20130828 944) nil "screencasting with \"avconv\" or \"ffmpeg\"" tar]) (caml . [(20130904 812) nil "No description available." tar]) (calmer-forest-theme . [(20130925 2210) nil "Darkish theme with green/orange tint" single]) (calfw-gcal . [(20120111 200) nil "edit Google calendar for calfw.el." tar]) (calfw . [(20131026 400) nil "Calendar view framework on Emacs" tar]) (cacoo . [(20120319 1659) ((concurrent (0 3 1))) "Minor mode for Cacoo : http://cacoo.com" tar]) (cache . [(20111019 1600) nil "implementation of a hash table whose key-value pairs expire" single]) (c-eldoc . [(20130821 1146) nil "helpful description of the arguments to C functions" single]) (button-lock . [(20131106 706) nil "Clickable text defined by regular expression" single]) (butler . [(20131221 946) ((deferred (3 1)) (json (1 2))) "Emacs client for Jenkins" tar]) (busybee-theme . [(20130920 942) nil "port of vim's mustang theme" single]) (buster-snippets . [(20130714 540) nil "Yasnippets for the Buster javascript testing framework" tar]) (buster-mode . [(20121219 522) nil "Minor mode to speed up development when writing tests with Buster.js" single]) (bundler . [(20131213 357) ((inf-ruby (2 1))) "Interact with Bundler from Emacs" single]) (bug-reference-github . [(20131202 1303) nil "Automatically set `bug-reference-url-format' in Github repositories." tar]) (bufshow . [(20130711 1039) ((emacs (24 1))) "A simple presentation tool for Emacs." single]) (buffer-utils . [(20131106 706) nil "Buffer-manipulation utility functions" single]) (buffer-stack . [(20101223 1020) nil "Enhanced intelligent switch-to-other-buffer replacement." single]) (buffer-move . [(20130923 1653) nil "Swap buffers without typing C-x b on each window" single]) (buffer-buttons . [(20131127 946) nil "Define, save, and load code-safe buttons in files for emacs" single]) (bubbleberry-theme . [(20131223 349) ((emacs (24 1))) "A theme based on LightTable for Emacs24" single]) (bs-ext . [(20130824 1159) nil "Extensions to emacs buffer-selection library (bs.el)" single]) (browse-url-dwim . [(20131106 706) ((string-utils (0 3 2))) "Context-sensitive external browse URL or Internet search" single]) (browse-kill-ring . [(20131116 2113) nil "interactively insert items from kill-ring" single]) (bpe . [(20131227 2120) nil "Blog from Org mode to Blogger" single]) (boxquote . [(20081011 1326) nil "Quote text with a semi-box." single]) (bookmark+ . [(20131226 1812) nil "Bookmark+: extensions to standard library `bookmark.el'." tar]) (bm . [(20131214 1405) nil "Visible bookmarks in buffer." single]) (blank-mode . [(20130824 1159) nil "minor mode to visualize TAB, (HARD) SPACE, NEWLINE" single]) (bitly . [(20130503 149) nil "Shorten URLs using the bitly.com shortener service" single]) (bitlbee . [(20130328 1018) nil "Help get Bitlbee (http://www.bitlbee.org) up and running." single]) (birds-of-paradise-plus-theme . [(20130419 1429) nil "A brown/orange light-on-dark theme for Emacs 24 (deftheme)." single]) (bind-key . [(20131012 1138) nil "A simple way to manage personal keybindings" single]) (bibslurp . [(20130904 1053) ((s (1 6 0)) (dash (1 5 0))) "retrieve BibTeX entries from NASA ADS" single]) (bibretrieve . [(20131013 1132) ((auctex (11 87)) (emacs (24 3))) "Retrieving BibTeX entries from the web" tar]) (bf-mode . [(20130403 742) nil "Browse file persistently on dired" single]) (better-defaults . [(20130422 1322) nil "Fixing weird quirks and poor defaults" single]) (bert . [(20131117 214) nil "BERT serialization library for Emacs" single]) (bdo . [(20130910 126) nil "Do things to a browser page from Emacs. BETA!" tar]) (bbdb2erc . [(20130606 2329) ((bbdb (3 0))) "make bbdb show if pal is online with ERC, click i to chat" single]) (bbdb-vcard . [(20130605 1139) ((bbdb (3 0))) "vCard import/export for BBDB" tar]) (bbdb-ext . [(20130513 1152) ((bbdb (2 36))) "Extra commands for BBDB" single]) (bbdb . [(20131116 930) nil "The Insidious Big Brother Database for GNU Emacs" tar]) (bbcode-mode . [(20130227 1137) nil "Major mode for writing BBCode markup" single]) (batch-mode . [(20130824 1158) nil "major mode for editing ESRI batch scrips" single]) (bash-completion . [(20130526 544) nil "BASH completion for the shell buffer" tar]) (base16-theme . [(20130413 1655) nil "No description available." tar]) (backup-walker . [(20130720 816) nil "quickly traverse all backups of a file" single]) (backup-each-save . [(20130704 1432) nil "backup each savepoint of a file" single]) (backtrace-mode . [(20130223 1154) nil "A better way to browse /var/log/messages files" single]) (back-button . [(20131122 959) ((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Visual navigation through mark rings" single]) (babel . [(20131228 754) nil "interface to web translation services such as Babelfish" single]) (awk-it . [(20130917 1848) nil "Run AWK interactively on region!" single]) (autopair . [(20131206 1059) ((cl-lib (0 3))) "Automagically pair braces and quotes like TextMate" single]) (automargin . [(20131112 14) nil "add margins to windows not-splitted, and center them" single]) (autofit-frame . [(20131226 1804) ((fit-frame (0))) "Automatically resize one-window frames to fit" single]) (auto-yasnippet . [(20131002 129) ((yasnippet (0 8 0))) "Quickly create disposable yasnippets" single]) (auto-shell-command . [(20130404 923) ((deferred (20130312)) (popwin (20130329))) "Run the shell command asynchronously that you specified when you save the file." single]) (auto-save-buffers-enhanced . [(20130607 1949) nil "Automatically save buffers in a decent way" single]) (auto-install . [(20130824 1206) nil "Auto install elisp file" single]) (auto-indent-mode . [(20131220 1220) nil "Auto indent Minor mode" tar]) (auto-dim-other-buffers . [(20130429 1126) nil "Visually makes non-current buffers less prominent" single]) (auto-dictionary . [(20130628 253) nil "automatic dictionary switcher for flyspell" tar]) (auto-complete-nxml . [(20130917 2019) ((auto-complete (1 4))) "do completion by auto-complete.el on nXML-mode" single]) (auto-complete-clang-async . [(20130526 814) nil "Auto Completion source for clang for GNU Emacs" single]) (auto-complete-clang . [(20120614 610) nil "Auto Completion source for clang for GNU Emacs" single]) (auto-complete-c-headers . [(20131215 506) ((auto-complete (1 4))) "An auto-complete source for C/C++ header files" single]) (auto-complete . [(20131128 233) ((popup (0 5 0))) "Auto Completion for GNU Emacs" tar]) (auto-compile . [(20131106 631) ((cl-lib (0 2)) (packed (0 3 4))) "automatically compile Emacs Lisp libraries" single]) (auto-capitalize . [(20131014 505) nil "Automatically capitalize (or upcase) words" single]) (auto-auto-indent . [(20131106 1103) ((es-lib (0 1)) (cl-lib (1 0))) "Indents code as you type" single]) (auto-async-byte-compile . [(20130824 1158) nil "Automatically byte-compile when saved" single]) (audio-notes-mode . [(20130909 146) nil "Play audio notes synced from somewhere else." single]) (auctex-lua . [(20130818 1120) nil "Lua editing support for AUCTeX" single]) (auctex-latexmk . [(20131108 2133) ((auctex (11 87))) "Add LatexMk support to AUCTeX" single]) (async . [(20131117 2035) nil "Asynchronous processing in Emacs" tar]) (ascope . [(20130824 1158) nil "Another cscope interface for emacs" single]) (ascii . [(20130824 1200) nil "ASCII code display." single]) (ariadne . [(20131117 911) ((bert (0 1))) "Ariadne plugin for Emacs" single]) (arduino-mode . [(20120212 719) nil "Major mode for the Arduino language" single]) (archive-region . [(20130824 1207) nil "Move region to archive file instead of killing" single]) (apt-utils-ido . [(20130527 1345) ((apt-utils (1 212))) "Ido commands for apt-utils" single]) (apt-utils . [(20130824 1200) nil "Emacs interface to APT (Debian package management)" single]) (apropos-fn+var . [(20131226 1803) nil "Apropos for functions and variables" single]) (applescript-mode . [(20090320 2332) nil "major mode for editing AppleScript source" single]) (apples-mode . [(20110120 2018) nil "Major mode for editing and executing AppleScript code" tar]) (apache-mode . [(20080905 553) nil "major mode for editing Apache configuration files" single]) (aok . [(20130824 1127) nil "various useful ways to do `multi-occur'" single]) (anzu . [(20131119 1848) nil "Show number of matches in mode-line while searching" single]) (anything-git-grep . [(20130608 1940) ((anything (1 3 9))) "anything for git grep" tar]) (anything-git-files . [(20130609 243) ((anything (1 3 9))) "anything for git files" single]) (anything . [(20130605 1746) nil "open anything / QuickSilver-like candidate-selection framework" tar]) (anyins . [(20131229 241) nil "Insert content at multiple places from shell command or kill-ring" single]) (anti-zenburn-theme . [(20131228 1348) nil "Low-contrast Zenburn-inverted theme" single]) (ant . [(20131227 2307) nil "helpers for compiling with ant" single]) (ansi . [(20130827 753) ((s (1 6 1)) (dash (1 5 0))) "Turn string into ansi strings" single]) (annoying-arrows-mode . [(20130515 1000) nil "Ring the bell if using arrows too much" single]) (angular-snippets . [(20131125 314) ((s (1 4 0)) (dash (1 2 0))) "Yasnippets for AngularJS" tar]) (angry-police-captain . [(20120829 552) nil "Show quote from http://theangrypolicecaptain.com in the minibuffer" single]) (android-mode . [(20131104 748) nil "Minor mode for Android application development" single]) (anaphora . [(20131022 450) nil "anaphoric macros providing implicit temp variables" single]) (ample-zen-theme . [(20131129 440) nil "AmpleZen Theme for Emacs 24" single]) (ample-theme . [(20131208 2116) nil "Calm Dark Theme for Emacs" single]) (all-ext . [(20130824 1206) ((all (1 0))) "Extension of M-x all" single]) (align-cljlet . [(20131016 2356) ((clojure-mode (1 11 5))) "Space align various Clojure forms" single]) (alert . [(20130510 20) nil "Growl-style notification system for Emacs" single]) (alect-themes . [(20131229 151) nil "4 configurable color themes for Emacs 24" tar]) (airplay . [(20130212 426) ((request (20130110 2144)) (simple-httpd (1 4 1)) (deferred (0 3 1))) "Airplay bindings to Emacs" tar]) (ahg . [(20131121 558) nil "Alberto's Emacs interface for Mercurial (Hg)" single]) (ag . [(20131220 643) nil "A front-end for ag ('the silver searcher'), the C ack replacement." single]) (afternoon-theme . [(20131225 24) ((emacs (24 1))) "Dark color theme with a deep blue background" single]) (aes . [(20130120 1913) nil "Implementation of AES" single]) (adoc-mode . [(20130917 0) ((markup-faces (1 0 0))) "a major-mode for editing AsciiDoc files in Emacs" single]) (actionscript-mode . [(20130328 838) nil "A simple mode for editing Actionscript 3 files" single]) (ack-menu . [(20130312 131) ((mag-menu (0 1 0))) "A menu-based front-end for ack" tar]) (ack-and-a-half . [(20130815 1917) nil "Yet another front-end for ack" single]) (achievements . [(20131111 2351) ((keyfreq (0 0 3))) "Achievements for emacs usage." tar]) (ace-jump-mode . [(20130719 2053) nil "a quick cursor location minor mode for emacs" single]) (ace-jump-buffer . [(20131221 759) ((ace-jump-mode (1 0)) (dash (2 4 0))) "fast buffer switching extension to `ace-jump-mode'" single]) (ac-slime . [(20131005 326) nil "An auto-complete source using slime completions" single]) (ac-octave . [(20131228 538) ((auto-complete (1 4 0))) "An auto-complete source for Octave" single]) (ac-nrepl . [(20131031 346) ((cider (0 1)) (auto-complete (1 4))) "auto-complete sources for Clojure using nrepl completions" single]) (ac-math . [(20131003 1604) ((auto-complete (1 4))) "Auto-complete sources for input of mathematical symbols and latex tags" single]) (ac-js2 . [(20131112 403) ((js2-mode (20090723)) (skewer-mode (1 4))) "Auto-complete source for Js2-mode, with navigation" tar]) (ac-ispell . [(20131124 2044) ((auto-complete (1 4))) "ispell completion source for auto-complete" single]) (ac-inf-ruby . [(20131115 350) ((inf-ruby (2 3 2)) (auto-complete (1 4))) "Enable auto-complete in inf-ruby sessions" single]) (ac-helm . [(20131224 647) ((helm (20130328)) (auto-complete (1 4 0)) (popup (0 5 0))) "Helm interface for auto-complete" single]) (ac-geiser . [(20130928 2347) ((geiser (0 5)) (auto-complete (1 4))) "Auto-complete backend for geiser" tar]) (ac-etags . [(20131127 311) ((auto-complete (1 4))) "etags/ctags completion source for auto-complete" single]) (ac-emmet . [(20131015 858) ((emmet-mode (1 0 2)) (auto-complete (1 4))) "auto-complete sources for emmet-mode's snippets" single]) (ac-dabbrev . [(20130906 518) nil "auto-complete.el source for dabbrev" single]) (ac-c-headers . [(20131015 2339) nil "auto-complete source for C headers" single]) (abl-mode . [(20131205 445) nil "Python TDD minor mode" tar]) (abc-mode . [(20130607 717) nil "Major mode for editing abc music files" single]) (4clojure . [(20131014 1507) ((json (1 2)) (request (0 2 0))) "Open and evaluate 4clojure.com questions" single]))
diff --git a/elpa/auto-complete-1.4/auto-complete-autoloads.el b/elpa/auto-complete-1.4/auto-complete-autoloads.el
index 8f0b63486..ce322acf1 100644
--- a/elpa/auto-complete-1.4/auto-complete-autoloads.el
+++ b/elpa/auto-complete-1.4/auto-complete-autoloads.el
@@ -3,8 +3,11 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("auto-complete-config.el" "auto-complete-pkg.el"
-;;;;;;  "auto-complete.el") (21031 23311 211584 0))
+;;;### (autoloads nil nil ("../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-autoloads.el"
+;;;;;;  "../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-config.el"
+;;;;;;  "../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-pkg.el"
+;;;;;;  "../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete.el")
+;;;;;;  (21102 24455 619326 0))
 
 ;;;***
 
diff --git a/elpa/auto-complete-1.4/auto-complete-config.elc b/elpa/auto-complete-1.4/auto-complete-config.elc
index 66ed1eb0e..eb2ba599d 100644
Binary files a/elpa/auto-complete-1.4/auto-complete-config.elc and b/elpa/auto-complete-1.4/auto-complete-config.elc differ
diff --git a/elpa/auto-complete-1.4/auto-complete-pkg.elc b/elpa/auto-complete-1.4/auto-complete-pkg.elc
index 8d0696c0f..0da54964d 100644
Binary files a/elpa/auto-complete-1.4/auto-complete-pkg.elc and b/elpa/auto-complete-1.4/auto-complete-pkg.elc differ
diff --git a/elpa/auto-complete-1.4/auto-complete.elc b/elpa/auto-complete-1.4/auto-complete.elc
index 80da1da06..05eef8c74 100644
Binary files a/elpa/auto-complete-1.4/auto-complete.elc and b/elpa/auto-complete-1.4/auto-complete.elc differ
diff --git a/elpa/cider-20131221.1231/cider-autoloads.el b/elpa/cider-20131221.1231/cider-autoloads.el
new file mode 100644
index 000000000..8e962ef09
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-autoloads.el
@@ -0,0 +1,86 @@
+;;; cider-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (cider cider-jack-in) "cider" "cider.el" (21184
+;;;;;;  20187))
+;;; Generated autoloads from cider.el
+
+(autoload 'cider-jack-in "cider" "\
+Start a nREPL server for the current project and connect to it.
+If PROMPT-PROJECT is t, then prompt for the project for which to
+start the server.
+
+\(fn &optional PROMPT-PROJECT)" t nil)
+
+(autoload 'cider "cider" "\
+Connect to an nREPL server identified by HOST and PORT.
+
+\(fn HOST PORT)" t nil)
+
+(eval-after-load 'clojure-mode '(progn (define-key clojure-mode-map (kbd "C-c M-j") 'cider-jack-in) (define-key clojure-mode-map (kbd "C-c M-c") 'cider)))
+
+;;;***
+
+;;;### (autoloads (cider-macroexpand-all cider-macroexpand-1) "cider-macroexpansion"
+;;;;;;  "cider-macroexpansion.el" (21184 20187))
+;;; Generated autoloads from cider-macroexpansion.el
+
+(autoload 'cider-macroexpand-1 "cider-macroexpansion" "\
+Invoke 'macroexpand-1' on the expression at point.
+If invoked with a PREFIX argument, use 'macroexpand' instead of
+'macroexpand-1'.
+
+\(fn &optional PREFIX)" t nil)
+
+(autoload 'cider-macroexpand-all "cider-macroexpansion" "\
+Invoke 'clojure.walk/macroexpand-all' on the expression at point.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cider-mode) "cider-mode" "cider-mode.el" (21184
+;;;;;;  20187))
+;;; Generated autoloads from cider-mode.el
+
+(autoload 'cider-mode "cider-mode" "\
+Minor mode for REPL interaction from a Clojure buffer.
+
+\\{cider-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (cider-selector) "cider-selector" "cider-selector.el"
+;;;;;;  (21184 20187))
+;;; Generated autoloads from cider-selector.el
+
+(autoload 'cider-selector "cider-selector" "\
+Select a new buffer by type, indicated by a single character.
+The user is prompted for a single character indicating the method by
+which to choose a new buffer.  The `?' character describes then
+available methods.  OTHER-WINDOW provides an optional target.
+
+See `def-cider-selector-method' for defining new methods.
+
+\(fn &optional OTHER-WINDOW)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("cider-client.el" "cider-eldoc.el" "cider-interaction.el"
+;;;;;;  "cider-pkg.el" "cider-repl.el" "cider-util.el" "cider-version.el"
+;;;;;;  "nrepl-client.el") (21184 20188 56838))
+
+;;;***
+
+(provide 'cider-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; cider-autoloads.el ends here
diff --git a/elpa/cider-20131221.1231/cider-client.el b/elpa/cider-20131221.1231/cider-client.el
new file mode 100644
index 000000000..6371231d4
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-client.el
@@ -0,0 +1,172 @@
+;;; cider-client.el --- A layer of abstraction above the actual client code.
+
+;; Copyright © 2013 Bozhidar Batsov
+;;
+;; Author: Bozhidar Batsov <bozhidar@batsov.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; A layer of abstraction above the actual client code.
+
+;;; Code:
+
+(require 'nrepl-client)
+
+;;; Words of inspiration
+(defun cider-user-first-name ()
+  "Find the current user's first name."
+  (let ((name (if (string= (user-full-name) "")
+                  (user-login-name)
+                (user-full-name))))
+    (string-match "^[^ ]*" name)
+    (capitalize (match-string 0 name))))
+
+(defvar cider-words-of-inspiration
+  `("The best way to predict the future is to invent it. -Alan Kay"
+    "A point of view is worth 80 IQ points. -Alan Kay"
+    "Lisp isn't a language, it's a building material. -Alan Kay"
+    "Simple things should be simple, complex things should be possible. -Alan Kay"
+    "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. -Bill Gates"
+    "Controlling complexity is the essence of computer programming. -Brian Kernighan"
+    "The unavoidable price of reliability is simplicity. -C.A.R. Hoare"
+    "You're bound to be unhappy if you optimize everything. -Donald Knuth"
+    "Simplicity is prerequisite for reliability. -Edsger W. Dijkstra"
+    "Deleted code is debugged code. -Jeff Sickel"
+    "The key to performance is elegance, not battalions of special cases. -Jon Bentley and Doug McIlroy"
+    "First, solve the problem. Then, write the code. -John Johnson"
+    "Simplicity is the ultimate sophistication. -Leonardo da Vinci"
+    "Programming is not about typing... it's about thinking. -Rich Hickey"
+    "Design is about pulling things apart. -Rich Hickey"
+    "Programmers know the benefits of everything and the tradeoffs of nothing. -Rich Hickey"
+    "Code never lies, comments sometimes do. -Ron Jeffries"
+    "The true delight is in the finding out rather than in the knowing.  -Isaac Asimov"
+    "Take this REPL, fellow hacker, and may it serve you well."
+    "Let the hacking commence!"
+    "Hacks and glory await!"
+    "Hack and be merry!"
+    "Your hacking starts... NOW!"
+    "May the Source be with you!"
+    "May the Source shine upon thy REPL!"
+    "Code long and prosper!"
+    "Happy hacking!"
+    "Backend is up, REPL is operational!"
+    "Your imagination is the only limit to what you can do with this REPL!"
+    "This REPL is yours to command!"
+    "Fame is but a hack away!"
+    ,(format "%s, this could be the start of a beautiful program."
+             (cider-user-first-name)))
+  "Scientifically-proven optimal words of hackerish encouragement.")
+
+(defun cider-random-words-of-inspiration ()
+  "Select a random entry from `cider-words-of-inspiration'."
+  (eval (nth (random (length cider-words-of-inspiration))
+             cider-words-of-inspiration)))
+
+(defun cider-display-connected-message ()
+  "Message displayed on successful connection."
+  (message "Connected.  %s" (cider-random-words-of-inspiration)))
+
+(add-hook 'nrepl-connected-hook 'cider-display-connected-message)
+
+;;; Evaluation helpers
+(defun cider-ns-form-p (form)
+  "Check if FORM is an ns form."
+  (string-match "^[[:space:]]*\(ns\\([[:space:]]*$\\|[[:space:]]+\\)" form))
+
+(defun cider-eval (input callback &optional ns session)
+  "Send the request INPUT and register the CALLBACK as the response handler.
+NS & SESSION specify the context in which to evaluate the request."
+  ;; namespace forms are always evaluated in the "user" namespace
+  (let ((ns (if (cider-ns-form-p input)
+                "user"
+              ns)))
+    ;; prevent forms from being evaluated in the wrong or a non-existing namespace
+    (when (and ns
+               (derived-mode-p 'clojure-mode)
+               (not (string= ns nrepl-buffer-ns))
+               (not (cider-ns-form-p input)))
+      (cider-eval-ns-form))
+    (nrepl-send-string input callback ns session)))
+
+(defun cider-tooling-eval (input callback &optional ns)
+  "Send the request INPUT and register the CALLBACK as the response handler.
+NS specifies the namespace in which to evaluate the request."
+  ;; namespace forms are always evaluated in the "user" namespace
+  (cider-eval input callback ns (nrepl-current-tooling-session)))
+
+(defun cider-eval-sync (input &optional ns session)
+  "Send the INPUT to the backend synchronously.
+NS & SESSION specify the evaluation context."
+  (nrepl-send-string-sync input ns session))
+
+(defun cider-eval-and-get-value (input &optional ns session)
+  "Send the INPUT to the backend synchronously and return the value.
+NS & SESSION specify the evaluation context."
+  (cider-get-value (cider-eval-sync input ns session)))
+
+(defun cider-tooling-eval-sync (input &optional ns)
+  "Send the INPUT to the backend using a tooling session synchronously.
+NS specifies the namespace in which to evaluate the request."
+  (cider-eval-sync input ns (nrepl-current-tooling-session)))
+
+(defun cider-get-raw-value (eval-result)
+  "Get the raw value (as string) from EVAL-RESULT."
+  (plist-get eval-result :value))
+
+(defun cider-get-value (eval-result)
+  "Get the value from EVAL-RESULT."
+  (read (cider-get-raw-value eval-result)))
+
+(defun cider-send-op (op attributes handler)
+  "Send the specified OP with ATTRIBUTES and response HANDLER."
+  (let ((buffer (current-buffer)))
+    (nrepl-send-request (append
+                         (list "op" op
+                               "session" (nrepl-current-session)
+                               "ns" nrepl-buffer-ns)
+                         attributes)
+                        handler)))
+
+(defun cider-send-load-file (file-contents file-path file-name)
+  "Perform the nREPL \"load-file\" op.
+FILE-CONTENTS, FILE-PATH and FILE-NAME are details of the file to be
+loaded."
+  (let ((buffer (current-buffer)))
+    (nrepl-send-request (list "op" "load-file"
+                              "session" (nrepl-current-session)
+                              "file" file-contents
+                              "file-path" file-path
+                              "file-name" file-name)
+                        (cider-load-file-handler buffer))))
+
+(defun cider-interrupt ()
+  "Interrupt any pending evaluations."
+  (interactive)
+  (let ((pending-request-ids (cider-util--hash-keys nrepl-pending-requests)))
+    (dolist (request-id pending-request-ids)
+      (nrepl-send-interrupt request-id (cider-interrupt-handler (current-buffer))))))
+
+(defun cider-current-repl-buffer ()
+  "The current REPL buffer."
+  (when (nrepl-current-connection-buffer)
+    (buffer-local-value 'nrepl-repl-buffer
+                        (get-buffer (nrepl-current-connection-buffer)))))
+
+(provide 'cider-client)
+
+;;; cider-client.el ends here
diff --git a/elpa/cider-20131221.1231/cider-eldoc.el b/elpa/cider-20131221.1231/cider-eldoc.el
new file mode 100644
index 000000000..a2c8c9d0f
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-eldoc.el
@@ -0,0 +1,119 @@
+;;; cider-eldoc.el --- eldoc support for Clojure
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; eldoc support for Clojure.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-interaction) ; for cider-symbol-at-point
+
+(require 'eldoc)
+(require 'dash)
+
+(defvar cider-extra-eldoc-commands '("cider-complete" "yas/expand")
+  "Extra commands to be added to eldoc's safe commands list.")
+
+(defun cider-eldoc-format-thing (thing)
+  "Format the eldoc THING."
+  (propertize thing 'face 'font-lock-function-name-face))
+
+(defun cider-highlight-args (arglist pos)
+  "Format the the function ARGLIST for eldoc.
+POS is the index of the currently highlighted argument."
+  (let* ((rest-pos (cider--find-rest-args-position arglist))
+         (i 0))
+    (mapconcat
+     (lambda (arg)
+       (let ((argstr (format "%s" arg)))
+         (if (eq arg '&)
+             argstr
+           (prog1
+               (if (or (= (1+ i) pos)
+                       (and rest-pos (> (+ 1 i) rest-pos)
+                            (> pos rest-pos)))
+                   (propertize argstr 'face
+                               'eldoc-highlight-function-argument)
+                 argstr)
+             (setq i (1+ i)))))) arglist " ")))
+
+(defun cider--find-rest-args-position (arglist)
+  "Find the position of & in the ARGLIST vector."
+  (-elem-index '& (append arglist ())))
+
+(defun cider-highlight-arglist (arglist pos)
+  "Format the ARGLIST for eldoc.
+POS is the index of the argument to highlight."
+  (concat "[" (cider-highlight-args arglist pos) "]"))
+
+(defun cider-eldoc-format-arglist (arglist pos)
+  "Format all the ARGLIST for eldoc.
+POS is the index of current argument."
+  (concat "("
+          (mapconcat (lambda (args) (cider-highlight-arglist args pos))
+                     (read arglist) " ") ")"))
+
+(defun cider-eldoc-info-in-current-sexp ()
+  "Return a list of the current sexp and the current argument index."
+  (save-excursion
+    (let ((argument-index (1- (eldoc-beginning-of-sexp))))
+      ;; If we are at the beginning of function name, this will be -1.
+      (when (< argument-index 0)
+        (setq argument-index 0))
+      ;; Don't do anything if current word is inside a string.
+      (if (= (or (char-after (1- (point))) 0) ?\")
+          nil
+        (list (cider-symbol-at-point) argument-index)))))
+
+(defun cider-eldoc ()
+  "Backend function for eldoc to show argument list in the echo area."
+  (when (cider-connected-p)
+    (let* ((info (cider-eldoc-info-in-current-sexp))
+           (thing (car info))
+           (pos (cadr info))
+           (form (format "(try
+                           (:arglists
+                            (clojure.core/meta
+                             (clojure.core/resolve
+                              (clojure.core/read-string \"%s\"))))
+                           (catch Throwable t nil))" thing))
+           (value (when thing
+                    (cider-get-raw-value (cider-tooling-eval-sync form nrepl-buffer-ns)))))
+      (unless (string= value "nil")
+        (format "%s: %s"
+                (cider-eldoc-format-thing thing)
+                (cider-eldoc-format-arglist value pos))))))
+
+(defun cider-turn-on-eldoc-mode ()
+  "Turn on eldoc mode in the current buffer."
+  (setq-local eldoc-documentation-function 'cider-eldoc)
+  (apply 'eldoc-add-command cider-extra-eldoc-commands)
+  (turn-on-eldoc-mode))
+
+(provide 'cider-eldoc)
+;;; cider-eldoc ends here
diff --git a/elpa/cider-20131221.1231/cider-interaction.el b/elpa/cider-20131221.1231/cider-interaction.el
new file mode 100644
index 000000000..230bf6f4f
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-interaction.el
@@ -0,0 +1,1211 @@
+;;; cider-interaction.el --- IDE for Clojure
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Provides an Emacs Lisp client to connect to Clojure nREPL servers.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-util)
+
+(require 'clojure-mode)
+(require 'dash)
+(require 'thingatpt)
+(require 'etags)
+(require 'arc-mode)
+(require 'ansi-color)
+(require 'cl-lib)
+(require 'compile)
+(require 'tramp)
+
+(defconst cider-error-buffer "*cider-error*")
+(defconst cider-doc-buffer "*cider-doc*")
+(defconst cider-src-buffer "*cider-src*")
+(defconst cider-result-buffer "*cider-result*")
+
+(defcustom cider-use-local-resources t
+  "Use local resources under HOME if possible."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-popup-stacktraces t
+  "Non-nil means pop-up error stacktraces for evaluation errors.
+Nil means show only an error message in the minibuffer.  See also
+`cider-repl-popup-stacktraces', which overrides this setting
+for REPL buffers."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-popup-on-error t
+  "When `cider-popup-on-error' is set to t, stacktraces will be displayed.
+When set to nil, stactraces will not be displayed, but will be available
+in the `cider-error-buffer', which defaults to *cider-error*."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-auto-select-error-buffer nil
+  "Controls whether to auto-select the error popup buffer."
+  :type 'boolean
+  :group 'cider)
+
+(defface cider-error-highlight-face
+  '((((supports :underline (:style wave)))
+     (:underline (:style wave :color "red") :inherit unspecified))
+    (t (:inherit font-lock-warning-face :underline t)))
+  "Face used to highlight compilation errors in Clojure buffers."
+  :group 'cider)
+
+(defface cider-warning-highlight-face
+  '((((supports :underline (:style wave)))
+     (:underline (:style wave :color "yellow") :inherit unspecified))
+    (t (:inherit font-lock-warning-face :underline (:color "yellow"))))
+  "Face used to highlight compilation warnings in Clojure buffers."
+  :group 'cider)
+
+;;; Connection info
+(defun cider--clojure-version ()
+  "Retrieve the underlying connection's Clojure version."
+  (cider-eval-and-get-value "(clojure-version)"))
+
+(defun cider--backend-version ()
+  "Retrieve the underlying connection's nREPL version."
+  (cider-eval-and-get-value "(:version-string clojure.tools.nrepl/version)"))
+
+(defun cider--connection-info (nrepl-connection-buffer)
+  "Return info about NREPL-CONNECTION-BUFFER.
+
+Info contains project name, current REPL namespace, host:port endpoint and Clojure version."
+  (with-current-buffer (get-buffer nrepl-connection-buffer)
+    (format "Active nREPL connection: %s:%s, %s:%s (Clojure %s, nREPL %s)"
+            (or (nrepl--project-name nrepl-project-dir) "<no project>")
+            nrepl-buffer-ns
+            (car nrepl-endpoint)
+            (cadr nrepl-endpoint)
+            (cider--clojure-version)
+            (cider--backend-version))))
+
+(defun cider-display-current-connection-info ()
+  "Display information about the current connection."
+  (interactive)
+  (message (cider--connection-info (nrepl-current-connection-buffer))))
+
+(defun cider-rotate-connection ()
+  "Rotate and display the current nREPL connection."
+  (interactive)
+  (setq nrepl-connection-list
+        (append (cdr nrepl-connection-list)
+                (list (car nrepl-connection-list))))
+  (message (cider--connection-info (car nrepl-connection-list))))
+
+;;; Switching between REPL & source buffers
+(make-variable-buffer-local
+ (defvar cider-last-clojure-buffer nil
+   "A buffer-local variable holding the last Clojure source buffer.
+`cider-switch-to-last-clojure-buffer' uses this variable to jump
+back to last Clojure source buffer."))
+
+(defvar cider-current-clojure-buffer nil
+  "This variable holds current buffer temporarily when connecting to a REPL.
+It is set to current buffer when `nrepl' or `cider-jack-in' is called.
+After the REPL buffer is created, the value of this variable is used
+to call `cider-remember-clojure-buffer'.")
+
+(defun cider-remember-clojure-buffer (buffer)
+  "Try to remember the BUFFER from which the user jumps.
+The BUFFER needs to be a Clojure buffer and current major mode needs
+to be `cider-repl-mode'.  The user can use `cider-switch-to-last-clojure-buffer'
+to jump back to the last Clojure source buffer."
+  (when (and buffer
+             (with-current-buffer buffer
+               (derived-mode-p 'clojure-mode))
+             (derived-mode-p 'cider-repl-mode))
+    (setq cider-last-clojure-buffer buffer)))
+
+(defun cider-switch-to-repl-buffer (&optional arg)
+  "Select the REPL buffer, when possible in an existing window.
+
+Hint: You can use `display-buffer-reuse-frames' and
+`special-display-buffer-names' to customize the frame in which
+the buffer should appear.
+
+With a prefix ARG sets the name of the REPL buffer to the one
+of the current source file."
+  (interactive "P")
+  (if (not (cider-connected-p))
+      (message "No active nREPL connection.")
+    (let ((buffer (current-buffer)))
+      (when arg
+        (cider-repl-set-ns (cider-current-ns)))
+      (pop-to-buffer (cider-find-or-create-repl-buffer))
+      (cider-remember-clojure-buffer buffer)
+      (goto-char (point-max)))))
+
+(defun cider-switch-to-relevant-repl-buffer (arg)
+  "Select the REPL buffer, when possible in an existing window.
+The buffer chosen is based on the file open in the current buffer.
+
+Hint: You can use `display-buffer-reuse-frames' and
+`special-display-buffer-names' to customize the frame in which
+the buffer should appear.
+
+With a prefix ARG sets the name of the REPL buffer to the one
+of the current source file.
+
+With a second prefix ARG the chosen REPL buffer is based on a
+supplied project directory."
+  (interactive "P")
+  (if (not (cider-connected-p))
+      (message "No active nREPL connection.")
+    (let ((project-directory
+           (or (when arg
+                 (ido-read-directory-name "Project: "))
+               (nrepl-project-directory-for (nrepl-current-dir)))))
+      (if project-directory
+          (let ((buf (car (-filter
+                           (lambda (conn)
+                             (let ((conn-proj-dir (with-current-buffer (get-buffer conn)
+                                                    nrepl-project-dir)))
+                               (when conn-proj-dir
+                                 (equal (file-truename project-directory)
+                                        (file-truename conn-proj-dir)))))
+                           nrepl-connection-list))))
+            (if buf
+                (setq nrepl-connection-list
+                      (cons buf (delq buf nrepl-connection-list)))
+              (message "No relevant nREPL connection found. Switching to default connection.")))
+        (message "No project directory found. Switching to default nREPL connection.")))
+    (cider-switch-to-repl-buffer '())))
+
+(defun cider-switch-to-last-clojure-buffer ()
+  "Switch to the last Clojure buffer.
+The default keybinding for this command is
+the same as `cider-switch-to-repl-buffer',
+so that it is very convenient to jump between a
+Clojure buffer and the REPL buffer."
+  (interactive)
+  (if (and (derived-mode-p 'cider-repl-mode)
+           (buffer-live-p cider-last-clojure-buffer))
+      (pop-to-buffer cider-last-clojure-buffer)
+    (message "Don't know the original Clojure buffer")))
+
+(defun cider-find-and-clear-repl-buffer ()
+  "Find the current REPL buffer and clear it.
+Returns to the buffer in which the command was invoked."
+  (interactive)
+  (let ((origin-buffer (current-buffer)))
+    (switch-to-buffer (cider-current-repl-buffer))
+    (cider-repl-clear-buffer)
+    (switch-to-buffer origin-buffer)))
+
+;;; Minibuffer eval
+(defvar cider-minibuffer-history '()
+  "History list of expressions read from the minibuffer.")
+
+(defvar cider-minibuffer-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map minibuffer-local-map)
+    (define-key map "TAB" 'complete-symbol)
+    (define-key map "M-TAB" 'complete-symbol)
+    map)
+  "Minibuffer keymap used for reading Clojure expressions.")
+
+(defun cider-read-from-minibuffer (prompt &optional initial-value history)
+  "Read a string from the minibuffer, prompting with PROMPT.
+If INITIAL-VALUE is non-nil, it is inserted into the minibuffer before
+reading input."
+  (minibuffer-with-setup-hook
+      (lambda ()
+        (add-hook 'completion-at-point-functions
+                  #'cider-complete-at-point nil t)
+        (run-hooks 'eval-expression-minibuffer-setup-hook))
+    (read-from-minibuffer prompt initial-value
+                          cider-minibuffer-map nil
+                          'cider-minibuffer-history)))
+
+(defun cider-read-and-eval ()
+  "Read a sexp from the minibuffer and output its result to the echo area."
+  (interactive)
+  (cider-interactive-eval (cider-read-from-minibuffer "CIDER Eval: ")))
+
+;;; Eval
+(defun cider-eval-region (start end)
+  "Evaluate the region.
+The two arguments START and END are character positions;
+they can be in either order."
+  (interactive "r")
+  (cider-interactive-eval (buffer-substring-no-properties start end)))
+
+(defun cider-eval-buffer ()
+  "Evaluate the current buffer."
+  (interactive)
+  (cider-eval-region (point-min) (point-max)))
+
+(defun cider-defun-at-point ()
+  "Return the text of the top-level sexp at point."
+  (apply #'buffer-substring-no-properties
+         (cider--region-for-defun-at-point)))
+
+(defun cider--region-for-defun-at-point ()
+  "Return the start and end position of defun at point."
+  (save-excursion
+    (save-match-data
+      (end-of-defun)
+      (let ((end (point)))
+        (beginning-of-defun)
+        (list (point) end)))))
+
+(defun cider-eval-defun-at-point (&optional prefix)
+  "Evaluate the current toplevel form, and print result in the minibuffer.
+With a PREFIX argument, print the result in the current buffer."
+  (interactive "P")
+  (let ((form (cider-defun-at-point)))
+    (if prefix
+        (cider-interactive-eval-print form)
+      (cider-interactive-eval form))))
+
+(define-obsolete-function-alias
+  'cider-eval-expression-at-point
+  'cider-eval-defun-at-point)
+
+(defun cider-eval-ns-form ()
+  "Evaluate the current buffer's namespace form."
+  (interactive)
+  (when (clojure-find-ns)
+    (save-excursion
+      (goto-char (match-beginning 0))
+      (cider-eval-defun-at-point))))
+
+(defun cider-bounds-of-sexp-at-point ()
+  "Return the bounds sexp at point as a pair (or nil)."
+  (or (and (equal (char-after) ?\()
+           (member (char-before) '(?\' ?\, ?\@))
+           ;; hide stuff before ( to avoid quirks with '( etc.
+           (save-restriction
+             (narrow-to-region (point) (point-max))
+             (bounds-of-thing-at-point 'sexp)))
+      (bounds-of-thing-at-point 'sexp)))
+
+(defun cider-symbol-at-point ()
+  "Return the name of the symbol at point, otherwise nil."
+  (let ((str (substring-no-properties (or (thing-at-point 'symbol) ""))))
+    (and str
+         (not (equal str (concat (cider-find-ns) "> ")))
+         (not (equal str ""))
+         (substring-no-properties str))))
+
+(defun cider-sexp-at-point ()
+  "Return the sexp at point as a string, otherwise nil."
+  (let ((bounds (cider-bounds-of-sexp-at-point)))
+    (if bounds
+        (buffer-substring-no-properties (car bounds)
+                                        (cdr bounds)))))
+
+(defun cider-sexp-at-point-with-bounds ()
+  "Return a list containing the sexp at point and its bounds."
+  (let ((bounds (cider-bounds-of-sexp-at-point)))
+    (if bounds
+        (let ((start (car bounds))
+              (end (cdr bounds)))
+          (list (buffer-substring-no-properties start end)
+                (cons (set-marker (make-marker) start)
+                      (set-marker (make-marker) end)))))))
+
+(defun cider-last-sexp ()
+  "Return the last sexp."
+  (buffer-substring-no-properties
+   (save-excursion (backward-sexp) (point))
+   (point)))
+
+;;;
+(defun cider-tramp-prefix ()
+  "Top element on `find-tag-marker-ring' used to determine Clojure host."
+  (let ((jump-origin (buffer-file-name
+                      (marker-buffer
+                       (ring-ref find-tag-marker-ring 0)))))
+    (when (tramp-tramp-file-p jump-origin)
+      (let ((vec (tramp-dissect-file-name jump-origin)))
+        (tramp-make-tramp-file-name (tramp-file-name-method vec)
+                                    (tramp-file-name-user vec)
+                                    (tramp-file-name-host vec)
+                                    nil)))))
+
+(defun cider-home-prefix-adjustment (resource)
+  "System-dependent HOME location will be adjusted in RESOURCE.
+Removes any leading slash if on Windows."
+  (save-match-data
+    (cond ((string-match "^\\/\\(Users\\|home\\)\\/\\w+\\(\\/.+\\)" resource)
+           (concat (getenv "HOME") (match-string 2 resource)))
+          ((and (eq system-type 'windows-nt)
+                (string-match "^/" resource)
+                (not (tramp-tramp-file-p resource)))
+           (substring resource 1))
+          (t
+           resource))))
+
+(defun cider-emacs-or-clojure-side-adjustment (resource)
+  "Fix the RESOURCE path depending on `cider-use-local-resources`."
+  (let ((resource         (cider-home-prefix-adjustment resource))
+        (clojure-side-res (concat (cider-tramp-prefix) resource))
+        (emacs-side-res   resource))
+    (cond ((equal resource "") resource)
+          ((and cider-use-local-resources
+                (file-exists-p emacs-side-res))
+           emacs-side-res)
+          ((file-exists-p clojure-side-res)
+           clojure-side-res)
+          (t
+           resource))))
+
+(defun cider-find-file (filename)
+  "Switch to a buffer visiting FILENAME.
+Adjusts for HOME location using `cider-home-prefix-adjustment'.
+Uses `find-file'."
+  (find-file (cider-emacs-or-clojure-side-adjustment filename)))
+
+(defun cider-find-resource (resource)
+  "Find and display RESOURCE."
+  (cond ((string-match "^file:\\(.+\\)" resource)
+         (cider-find-file (match-string 1 resource)))
+        ((string-match "^\\(jar\\|zip\\):file:\\(.+\\)!/\\(.+\\)" resource)
+         (let* ((jar (match-string 2 resource))
+                (path (match-string 3 resource))
+                (buffer-already-open (get-buffer (file-name-nondirectory jar))))
+           (cider-find-file jar)
+           (goto-char (point-min))
+           (search-forward path)
+           (let ((opened-buffer (current-buffer)))
+             (archive-extract)
+             (unless buffer-already-open
+               (kill-buffer opened-buffer)))))
+        (t (error "Unknown resource path %s" resource))))
+
+(defun cider-jump-to-def-for (location)
+  "Jump to LOCATION's definition in the source code."
+  ;; ugh; elisp destructuring doesn't work for vectors
+  (let ((resource (aref location 0))
+        (path (aref location 1))
+        (line (aref location 2)))
+    (if (and path (file-exists-p path))
+        (find-file path)
+      (cider-find-resource resource))
+    (goto-char (point-min))
+    (forward-line (1- line))))
+
+(defun cider-jump-to-def-handler (buffer)
+  "Create a handler for jump-to-def in BUFFER."
+  ;; TODO: got to be a simpler way to do this
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (with-current-buffer buffer
+                                   (ring-insert find-tag-marker-ring (point-marker)))
+                                 (cider-jump-to-def-for
+                                  (car (read-from-string value))))
+                               (lambda (buffer out) (message out))
+                               (lambda (buffer err) (message err))
+                               nil))
+
+(defun cider-jump-to-def (var)
+  "Jump to the definition of the VAR at point."
+  (let ((form (format "(let [ns-symbol    '%s
+                             ns-var       '%s
+                             ns-file      (clojure.core/comp :file
+                                                             clojure.core/meta
+                                                             clojure.core/second
+                                                             clojure.core/first
+                                                             clojure.core/ns-publics)
+                             resource-str (clojure.core/comp clojure.core/str
+                                                             clojure.java.io/resource
+                                                             ns-file)
+                             file-str     (clojure.core/comp clojure.core/str
+                                                             clojure.java.io/file
+                                                             ns-file)]
+                         (cond ((clojure.core/ns-aliases ns-symbol) ns-var)
+                               (let [resolved-ns ((clojure.core/ns-aliases ns-symbol) ns-var)]
+                                 [(resource-str resolved-ns)
+                                  (file-str resolved-ns)
+                                  1])
+
+                               (find-ns ns-var)
+                               [(resource-str ns-var)
+                                (file-str ns-var)
+                                1]
+
+                               (clojure.core/ns-resolve ns-symbol ns-var)
+                               ((clojure.core/juxt
+                                 (clojure.core/comp clojure.core/str
+                                                    clojure.java.io/resource
+                                                    :file)
+                                 (clojure.core/comp clojure.core/str
+                                                    clojure.java.io/file
+                                                    :file)
+                                 :line)
+                                (clojure.core/meta (clojure.core/ns-resolve ns-symbol ns-var)))))"
+                      (cider-current-ns) var)))
+    (cider-tooling-eval form
+                        (cider-jump-to-def-handler (current-buffer))
+                        nrepl-buffer-ns)))
+
+(defun cider-jump (query)
+  "Jump to the definition of QUERY."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-jump-to-def query))
+
+(defalias 'cider-jump-back 'pop-tag-mark)
+
+(defun cider-completion-complete-core-fn (str)
+  "Return a list of completions for STR using complete.core/completions."
+  (cider-eval-and-get-value
+   (format "(clojure.core/require 'complete.core) (complete.core/completions \"%s\" *ns*)" str)
+   nrepl-buffer-ns
+   (nrepl-current-tooling-session)))
+
+(defun cider-completion-complete-op-fn (str)
+  "Return a list of completions for STR using the nREPL \"complete\" op."
+  (let ((strlst (plist-get
+                 (nrepl-send-request-sync
+                  (list "op" "complete"
+                        "session" (nrepl-current-tooling-session)
+                        "ns" nrepl-buffer-ns
+                        "symbol" str))
+                 :value)))
+    (when strlst
+      (car strlst))))
+
+(defun cider-dispatch-complete-symbol (str)
+  "Return a list of completions for STR.
+Dispatch to the nREPL \"complete\" op if supported,
+otherwise dispatch to internal completion function."
+  (if (nrepl-op-supported-p "complete")
+      (cider-completion-complete-op-fn str)
+    (cider-completion-complete-core-fn str)))
+
+(defun cider-complete-at-point ()
+  "Complete the symbol at point."
+  (let ((sap (symbol-at-point)))
+    (when (and sap (not (in-string-p)))
+      (let ((bounds (bounds-of-thing-at-point 'symbol)))
+        (list (car bounds) (cdr bounds)
+              (completion-table-dynamic #'cider-dispatch-complete-symbol))))))
+
+
+;;; JavaDoc Browsing
+;;; Assumes local-paths are accessible in the VM.
+(defvar cider-javadoc-local-paths nil
+  "List of paths to directories with Javadoc.")
+
+(defun cider-javadoc-op (symbol-name)
+  "Invoke the nREPL \"javadoc\" op on SYMBOL-NAME."
+  (cider-send-op
+   "javadoc"
+   `("symbol" ,symbol-name "ns" ,nrepl-buffer-ns
+     "local-paths" ,(mapconcat #'identity cider-javadoc-local-paths " "))
+   (nrepl-make-response-handler
+    (current-buffer)
+    (lambda (buffer url)
+      (if url
+          (browse-url url)
+        (error "No javadoc url for %s" symbol-name)))
+    nil nil nil)))
+
+(defun cider-javadoc-handler (symbol-name)
+  "Invoke the nREPL \"javadoc\" op on SYMBOL-NAME if available."
+  (when symbol-name
+    (let ((bounds (bounds-of-thing-at-point 'symbol)))
+      (if (nrepl-op-supported-p "javadoc")
+          (cider-javadoc-op symbol-name)
+        (message "No Javadoc middleware available")))))
+
+(defun cider-javadoc (query)
+  "Browse Javadoc on the Java class QUERY at point."
+  (interactive "P")
+  (cider-read-symbol-name "Javadoc for: " 'cider-javadoc-handler query))
+
+(defun cider-stdin-handler (buffer)
+  "Make a stdin response handler for BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (cider-repl-emit-result buffer value t))
+                               (lambda (buffer out)
+                                 (cider-repl-emit-output buffer out t))
+                               (lambda (buffer err)
+                                 (cider-repl-emit-output buffer err t))
+                               nil))
+
+(defun cider-insert-eval-handler (buffer)
+  "Make a nREPL evaluation handler for the BUFFER.
+The handler simply inserts the result value in BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (with-current-buffer buffer
+                                   (insert value)))
+                               (lambda (buffer out)
+                                 (cider-repl-emit-interactive-output out))
+                               (lambda (buffer err)
+                                 (message "%s" err)
+                                 (cider-highlight-compilation-errors
+                                  buffer err))
+                               '()))
+
+(defun cider-interactive-eval-handler (buffer)
+  "Make an interactive eval handler for BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (message "%s" value))
+                               (lambda (buffer value)
+                                 (cider-repl-emit-interactive-output value))
+                               (lambda (buffer err)
+                                 (message "%s" err)
+                                 (cider-highlight-compilation-errors
+                                  buffer err))
+                               '()))
+
+(defun cider-load-file-handler (buffer)
+  "Make a load file handler for BUFFER."
+  (let (current-ns (cider-current-ns))
+    (nrepl-make-response-handler buffer
+                                 (lambda (buffer value)
+                                   (message "%s" value)
+                                   (with-current-buffer buffer
+                                     (setq nrepl-buffer-ns (clojure-find-ns))
+                                     (run-hooks 'cider-file-loaded-hook)))
+                                 (lambda (buffer value)
+                                   (cider-repl-emit-interactive-output value))
+                                 (lambda (buffer err)
+                                   (message "%s" err)
+                                   (cider-highlight-compilation-errors
+                                    buffer err))
+                                 '()
+                                 (lambda (buffer ex root-ex session)
+                                   (let ((cider-popup-on-error nil))
+                                     (funcall nrepl-err-handler
+                                              buffer ex root-ex session))))))
+
+(defun cider-interactive-eval-print-handler (buffer)
+  "Make a handler for evaluating and printing result in BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (with-current-buffer buffer
+                                   (insert (format "%s" value))))
+                               '()
+                               (lambda (buffer err)
+                                 (message "%s" err))
+                               '()))
+
+(defun cider-popup-eval-print-handler (buffer)
+  "Make a handler for evaluating and printing result in popup BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               '()
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               '()))
+
+(defun cider-popup-eval-out-handler (buffer)
+  "Make a handler for evaluating and printing stdout/stderr in popup BUFFER."
+  (nrepl-make-response-handler buffer
+                               '()
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               '()))
+
+(defun cider-visit-error-buffer ()
+  "Visit the `cider-error-buffer' (usually *cider-error*) if it exists."
+  (interactive)
+  (let ((buffer (get-buffer cider-error-buffer)))
+    (when buffer
+      (cider-popup-buffer-display buffer))))
+
+(defun cider-find-property (property &optional backward)
+  "Find the next text region which has the specified PROPERTY.
+If BACKWARD is t, then search backward.
+Returns the position at which PROPERTY was found, or nil if not found."
+  (let ((p (if backward
+              (previous-single-char-property-change (point) property)
+             (next-single-char-property-change (point) property))))
+    (when (and (not (= p (point-min))) (not (= p (point-max))))
+      p)))
+
+(defun cider-jump-to-compilation-error (&optional arg reset)
+  "Jump to the line causing the current compilation error.
+
+ARG and RESET are ignored, as there is only ever one compilation error.
+They exist for compatibility with `next-error'."
+  (interactive)
+  (cl-labels ((goto-next-note-boundary
+               ()
+               (let ((p (or (cider-find-property 'cider-note-p)
+                            (cider-find-property 'cider-note-p t))))
+                 (when p
+                   (goto-char p)
+                   (message (get-char-property p 'cider-note))))))
+    ;; if we're already on a compilation error, first jump to the end of
+    ;; it, so that we find the next error.
+    (when (get-char-property (point) 'cider-note-p)
+      (goto-next-note-boundary))
+    (goto-next-note-boundary)))
+
+(defun cider-default-err-handler (buffer ex root-ex session)
+  "Make an error handler for BUFFER, EX, ROOT-EX and SESSION."
+  ;; TODO: use ex and root-ex as fallback values to display when pst/print-stack-trace-not-found
+  (let ((replp (with-current-buffer buffer (derived-mode-p 'cider-repl-mode))))
+    (if (or (and cider-repl-popup-stacktraces replp)
+            (and cider-popup-stacktraces (not replp)))
+      (lexical-let ((cider-popup-on-error cider-popup-on-error))
+        (with-current-buffer buffer
+          (cider-eval "(if-let [pst+ (clojure.core/resolve 'clj-stacktrace.repl/pst+)]
+                        (pst+ *e) (clojure.stacktrace/print-stack-trace *e))"
+                      (nrepl-make-response-handler
+                       (cider-make-popup-buffer cider-error-buffer)
+                       nil
+                       (lambda (buffer value)
+                         (cider-emit-into-color-buffer buffer value)
+                         (when cider-popup-on-error
+                           (cider-popup-buffer-display buffer cider-auto-select-error-buffer)))
+                       nil nil) nil session))
+        (with-current-buffer cider-error-buffer
+          (compilation-minor-mode +1))))))
+
+(defvar cider-compilation-regexp
+  '("\\(?:.*\\(warning, \\)\\|.*?\\(, compiling\\):(\\)\\([^:]*\\):\\([[:digit:]]+\\)\\(?::\\([[:digit:]]+\\)\\)?\\(\\(?: - \\(.*\\)\\)\\|)\\)" 3 4 5 (1))
+  "Specifications for matching errors and warnings in Clojure stacktraces.
+See `compilation-error-regexp-alist' for help on their format.")
+
+(add-to-list 'compilation-error-regexp-alist-alist
+             (cons 'cider cider-compilation-regexp))
+(add-to-list 'compilation-error-regexp-alist 'cider)
+
+(defun cider-extract-error-info (regexp message)
+  "Extract error information with REGEXP against MESSAGE."
+  (let ((file (nth 1 regexp))
+        (line (nth 2 regexp))
+        (col (nth 3 regexp))
+        (type (nth 4 regexp))
+        (pat (car regexp)))
+    (when (string-match pat message)
+      ;; special processing for type (1.2) style
+      (setq type (if (consp type)
+                     (or (and (car type) (match-end (car type)) 1)
+                         (and (cdr type) (match-end (cdr type)) 0)
+                         2)))
+      (list
+       (when file
+         (let ((val (match-string-no-properties file message)))
+           (unless (string= val "NO_SOURCE_PATH") val)))
+       (when line (string-to-number (match-string-no-properties line message)))
+       (when col
+         (let ((val (match-string-no-properties col message)))
+           (when val (string-to-number val))))
+       (aref [cider-warning-highlight-face
+              cider-warning-highlight-face
+              cider-error-highlight-face]
+             (or type 2))
+       message))))
+
+(defun cider-highlight-compilation-errors (buffer message)
+  "Highlight compilation error line in BUFFER, using MESSAGE."
+  (with-current-buffer buffer
+    (let ((info (cider-extract-error-info cider-compilation-regexp message)))
+      (when info
+        (let ((file (nth 0 info))
+              (line (nth 1 info))
+              (col (nth 2 info))
+              (face (nth 3 info))
+              (note (nth 4 info)))
+          (save-excursion
+            ;; when we don't have a filename the line number
+            ;; is relative to form start
+            (if file
+                (goto-char (point-min)) ; start of file
+              (beginning-of-defun))
+            (forward-line (1- line))
+            ;; if have column, highlight sexp at that point otherwise whole line.
+            (move-to-column (or col 0))
+            (let ((begin (progn (if col (backward-up-list) (back-to-indentation)) (point)))
+                  (end (progn (if col (forward-sexp) (move-end-of-line nil)) (point))))
+              (let ((overlay (make-overlay begin end)))
+                (overlay-put overlay 'cider-note-p t)
+                (overlay-put overlay 'face face)
+                (overlay-put overlay 'cider-note note)
+                (overlay-put overlay 'help-echo note)))))))))
+
+(defun cider-need-input (buffer)
+  "Handle an need-input request from BUFFER."
+  (with-current-buffer buffer
+    (nrepl-send-stdin (concat (read-from-minibuffer "Stdin: ") "\n")
+                      (cider-stdin-handler buffer))))
+
+
+;;;; Popup buffers
+(define-minor-mode cider-popup-buffer-mode
+  "Mode for CIDER popup buffers"
+  nil
+  (" cider-tmp")
+  '(("q" .  cider-popup-buffer-quit-function)))
+
+(make-variable-buffer-local
+ (defvar cider-popup-buffer-quit-function 'cider-popup-buffer-quit
+   "The function that is used to quit a temporary popup buffer."))
+
+(defun cider-popup-buffer-quit-function (&optional kill-buffer-p)
+  "Wrapper to invoke the function `cider-popup-buffer-quit-function'.
+KILL-BUFFER-P is passed along."
+  (interactive)
+  (funcall cider-popup-buffer-quit-function kill-buffer-p))
+
+(defun cider-popup-buffer (name &optional select)
+  "Create new popup buffer called NAME.
+If SELECT is non-nil, select the newly created window"
+  (with-current-buffer (cider-make-popup-buffer name)
+    (setq buffer-read-only t)
+    (cider-popup-buffer-display (current-buffer) select)))
+
+(defun cider-popup-buffer-display (popup-buffer &optional select)
+  "Display POPUP-BUFFER.
+If SELECT is non-nil, select the newly created window"
+  (with-current-buffer popup-buffer
+    (let ((new-window (display-buffer (current-buffer))))
+      (set-window-point new-window (point))
+      (when select
+        (select-window new-window))
+      (current-buffer))))
+
+(defun cider-popup-buffer-quit (&optional kill-buffer-p)
+  "Quit the current (temp) window and bury its buffer using `quit-window'.
+If prefix argument KILL-BUFFER-P is non-nil, kill the buffer instead of burying it."
+  (interactive)
+  (quit-window kill-buffer-p (selected-window)))
+
+(defun cider-make-popup-buffer (name)
+  "Create a temporary buffer called NAME."
+  (with-current-buffer (get-buffer-create name)
+    (kill-all-local-variables)
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (set-syntax-table clojure-mode-syntax-table)
+    (cider-popup-buffer-mode 1)
+    (current-buffer)))
+
+(defun cider-emit-into-popup-buffer (buffer value)
+  "Emit into BUFFER the provided VALUE."
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t)
+          (buffer-undo-list t))
+      (insert (format "%s" value))
+      (indent-sexp)
+      (font-lock-fontify-buffer))))
+
+(defun cider-emit-into-color-buffer (buffer value)
+  "Emit into color BUFFER the provided VALUE."
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t)
+          (buffer-undo-list t))
+      (goto-char (point-max))
+      (insert (format "%s" value))
+      (ansi-color-apply-on-region (point-min) (point-max)))
+    (goto-char (point-min))))
+
+;;; Namespace handling
+(defun cider-find-ns ()
+  "Return the ns of the current buffer.
+
+For Clojure buffers the ns is extracted from the ns header.  If
+it's missing \"user\" is used as fallback."
+  (cond
+   ((derived-mode-p 'clojure-mode)
+    (or (save-restriction
+          (widen)
+          (clojure-find-ns))
+        "user"))
+   ((derived-mode-p 'cider-repl-mode)
+    nrepl-buffer-ns)))
+
+(defun cider-current-ns ()
+  "Return the ns in the current context.
+If `nrepl-buffer-ns' has a value then return that, otherwise
+search for and read a `ns' form."
+  (let ((ns nrepl-buffer-ns))
+    (or (and (string= ns "user")
+             (cider-find-ns))
+        ns)))
+
+
+;;; Evaluation
+(defun cider-popup-eval-print (form)
+  "Evaluate the given FORM and print value in current buffer."
+  (let ((buffer (current-buffer)))
+    (cider-eval form
+                (cider-popup-eval-print-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-interactive-eval-print (form)
+  "Evaluate the given FORM and print value in current buffer."
+  (let ((buffer (current-buffer)))
+    (cider-eval form
+                (cider-interactive-eval-print-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-interactive-eval (form)
+  "Evaluate the given FORM and print value in minibuffer."
+  (remove-overlays (point-min) (point-max) 'cider-note-p t)
+  (let ((buffer (current-buffer)))
+    (cider-eval form
+                (cider-interactive-eval-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-interactive-eval-to-repl (form)
+  "Evaluate the given FORM and print it's value in REPL buffer."
+  (let ((buffer (cider-current-repl-buffer)))
+    (cider-eval form
+                (cider-insert-eval-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-eval-last-sexp (&optional prefix)
+  "Evaluate the expression preceding point.
+If invoked with a PREFIX argument, print the result in the current buffer."
+  (interactive "P")
+  (if prefix
+      (cider-interactive-eval-print (cider-last-sexp))
+    (cider-interactive-eval (cider-last-sexp))))
+
+(define-obsolete-function-alias
+  'cider-eval-last-expression
+  'cider-eval-last-sexp)
+
+(defun cider-eval-last-sexp-and-replace ()
+  "Evaluate the expression preceding point and replace it with its result."
+  (interactive)
+  (let ((last-sexp (cider-last-sexp)))
+    ;; we have to be sure the evaluation won't result in an error
+    (cider-eval-and-get-value last-sexp)
+    ;; seems like the sexp is valid, so we can safely kill it
+    (backward-kill-sexp)
+    (cider-interactive-eval-print last-sexp)))
+
+(defun cider-eval-last-sexp-to-repl (&optional prefix)
+  "Evaluate the expression preceding point and insert its result in the REPL.
+If invoked with a PREFIX argument, switch to the REPL buffer."
+  (interactive "P")
+  (cider-interactive-eval-to-repl (cider-last-sexp))
+  (when prefix
+    (cider-switch-to-repl-buffer)))
+
+(defun cider-eval-print-last-sexp ()
+  "Evaluate the expression preceding point.
+Print its value into the current buffer"
+  (interactive)
+  (cider-interactive-eval-print (cider-last-sexp)))
+
+(defun cider-pprint-eval-last-sexp ()
+  "Evaluate the expression preceding point and pprint its value in a popup buffer."
+  (interactive)
+  (let ((form (cider-last-sexp))
+        (result-buffer (cider-popup-buffer cider-result-buffer nil)))
+    (cider-tooling-eval (format "(clojure.pprint/pprint %s)" form)
+                        (cider-popup-eval-out-handler result-buffer)
+                        (cider-current-ns))))
+
+(defun cider-insert-last-sexp-in-repl (&optional arg)
+  "Insert the expression preceding point in the REPL buffer.
+If invoked with a prefix ARG eval the expression after inserting it."
+  (interactive "P")
+  (let ((form (cider-last-sexp))
+        (start-pos (point)))
+    (with-current-buffer (cider-current-repl-buffer)
+      (insert form)
+      (indent-region start-pos (point))
+      (when arg
+        (cider-repl-return))))
+  (cider-switch-to-repl-buffer))
+
+(defun cider-ping ()
+  "Check that communication with the server works."
+  (interactive)
+  (message "%s" (cider-eval-and-get-value "\"PONG\"")))
+
+(defun clojure-enable-cider ()
+  "Turn on CIDER mode (see command `cider-mode').
+Useful in hooks."
+  (cider-mode 1)
+  (setq next-error-function 'cider-jump-to-compilation-error))
+
+(defun clojure-disable-cider ()
+  "Turn off CIDER mode (see command `cider-mode').
+Useful in hooks."
+  (cider-mode -1))
+
+(defun cider-connected-p ()
+  "Return t if CIDER is currently connected, nil otherwise."
+  (condition-case nil
+      (nrepl-current-connection-buffer)
+    (error nil)))
+
+(defun cider-enable-on-existing-clojure-buffers ()
+  "Enable interaction mode on existing Clojure buffers.
+See command `cider-mode'."
+  (interactive)
+  (add-hook 'clojure-mode-hook 'clojure-enable-cider)
+  (dolist (buffer (cider-util--clojure-buffers))
+    (with-current-buffer buffer
+      (clojure-enable-cider))))
+
+(defun cider-disable-on-existing-clojure-buffers ()
+  "Disable `cider-mode' on existing Clojure buffers.
+See command `cider-mode'."
+  (interactive)
+  (dolist (buffer (cider-util--clojure-buffers))
+    (with-current-buffer buffer
+      (setq nrepl-buffer-ns "user")
+      (clojure-disable-cider))))
+
+(defun cider-possibly-disable-on-existing-clojure-buffers ()
+  "If not connected, disable `cider-mode' on existing Clojure buffers."
+  (unless (cider-connected-p)
+    (cider-disable-on-existing-clojure-buffers)))
+
+;; this is horrible, but with async callbacks we can't rely on dynamic scope
+(defvar cider-ido-ns nil)
+(defvar cider-ido-var-callback nil)
+
+(defun cider-ido-form (ns)
+  "Construct a Clojure form for ido read using NS."
+  `(concat (if (find-ns (symbol ,ns))
+               (map name (concat (keys (ns-interns (symbol ,ns)))
+                                 (keys (ns-refers (symbol ,ns))))))
+           (if (not= "" ,ns) [".."])
+           (->> (all-ns)
+             (map (fn [n]
+                      (re-find (re-pattern (str "^" (if (not= ,ns "")
+                                                        (str ,ns "\\."))
+                                                "[^\\.]+"))
+                               (str n))))
+             (filter identity)
+             (map (fn [n] (str n "/")))
+             (into (hash-set)))))
+
+(defun cider-ido-up-ns (ns)
+  "Perform up using NS."
+  (mapconcat 'identity (butlast (split-string ns "\\.")) "."))
+
+(defun cider-ido-var-select (selected targets)
+  "Peform ido select using SELECTED and TARGETS."
+  ;; TODO: immediate RET gives "" as selected for some reason
+  ;; this is an OK workaround though
+  (cond ((equal "" selected)
+         (cider-ido-var-select (car targets) targets))
+        ((equal "/" (substring selected -1)) ; selected a namespace
+         (cider-ido-read-var (substring selected 0 -1) cider-ido-var-callback))
+        ((equal ".." selected)
+         (cider-ido-read-var (cider-ido-up-ns cider-ido-ns) cider-ido-var-callback))
+        ;; non ido variable selection techniques don't return qualified symbols, so this shouldn't either
+        (t (funcall cider-ido-var-callback selected))))
+
+(defun cider-ido-read-sym-handler (label ido-select buffer)
+  "Create an ido read var handler with IDO-SELECT for BUFFER."
+  (lexical-let ((ido-select ido-select)
+                (label label))
+    (nrepl-make-response-handler buffer
+                                 (lambda (buffer value)
+                                   ;; make sure to eval the callback in the buffer that the symbol was requested from so we get the right namespace
+                                   (with-current-buffer buffer
+                                     (let* ((targets (car (read-from-string value)))
+                                            (selected (ido-completing-read label targets nil t)))
+                                       (funcall ido-select selected targets))))
+                                 nil nil nil)))
+
+(defun cider-ido-read-var (ns ido-callback)
+  "Perform ido read var in NS using IDO-CALLBACK."
+  ;; Have to be stateful =(
+  (setq cider-ido-ns ns)
+  (setq cider-ido-var-callback ido-callback)
+  (cider-tooling-eval (prin1-to-string (cider-ido-form cider-ido-ns))
+                      (cider-ido-read-sym-handler "Var:" 'cider-ido-var-select (current-buffer))
+                      nrepl-buffer-ns))
+
+(defun cider-ido-fns-form (ns)
+  "Construct a Clojure form for reading fns using supplied NS."
+  (format "(let [fn-pred (fn [[k v]] (and (fn? (.get v))
+                                     (not (re-find #\"clojure.\" (str v)))))]
+              (sort
+                (map (comp name key)
+                     (filter fn-pred
+                         (concat
+                           (ns-interns '%s)
+                           (ns-refers '%s))))))" ns ns))
+
+(defun cider-ido-fn-callback (f targets)
+  (with-current-buffer (cider-current-repl-buffer)
+    (cider-repl--replace-input (format "(%s)" f))
+    (goto-char (- (point-max) 1))))
+
+(defun cider-load-fn-into-repl-buffer ()
+  "Browse functions available in current repl buffer using ido.
+Once selected, the name of the fn will appear in the repl buffer in parens
+ready to call."
+  (interactive)
+  (cider-tooling-eval (cider-ido-fns-form (cider-current-ns))
+                      (cider-ido-read-sym-handler (format "Fn: %s/" nrepl-buffer-ns)
+                                                  'cider-ido-fn-callback (current-buffer))
+                      nrepl-buffer-ns))
+
+(defun cider-read-symbol-name (prompt callback &optional query)
+  "Either read a symbol name using PROMPT or choose the one at point.
+Use CALLBACK as the ido read var callback.
+The user is prompted with PROMPT if a prefix argument is in effect,
+if there is no symbol at point, or if QUERY is non-nil."
+  (let ((symbol-name (cider-symbol-at-point)))
+    (cond ((not (or current-prefix-arg query (not symbol-name)))
+           (funcall callback symbol-name))
+          (ido-mode (cider-ido-read-var nrepl-buffer-ns callback))
+          (t (funcall callback (read-from-minibuffer prompt symbol-name))))))
+
+(defun cider-doc-handler (symbol)
+  "Create a handler to lookup documentation for SYMBOL."
+  (let ((form (format "(clojure.repl/doc %s)" symbol))
+        (doc-buffer (cider-popup-buffer cider-doc-buffer t)))
+    (cider-tooling-eval form
+                        (cider-popup-eval-out-handler doc-buffer)
+                        nrepl-buffer-ns)))
+
+(defun cider-doc (query)
+  "Open a window with the docstring for the given QUERY.
+Defaults to the symbol at point.  With prefix arg or no symbol
+under point, prompts for a var."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-doc-handler query))
+
+(defun cider-src-handler (symbol)
+  "Create a handler to lookup source for SYMBOL."
+  (let ((form (format "(clojure.repl/source %s)" symbol))
+        (src-buffer (cider-popup-buffer cider-src-buffer t)))
+    (with-current-buffer src-buffer
+      (clojure-mode)
+      (cider-popup-buffer-mode +1))
+    (cider-tooling-eval form
+                        (cider-popup-eval-out-handler src-buffer)
+                        nrepl-buffer-ns)))
+
+(defun cider-src (query)
+  "Open a window with the source for the given QUERY.
+Defaults to the symbol at point.  With prefix arg or no symbol
+under point, prompts for a var."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-src-handler query))
+
+;; TODO: implement reloading ns
+(defun cider-eval-load-file (form)
+  "Load FORM."
+  (let ((buffer (current-buffer)))
+    (cider-eval form (cider-interactive-eval-handler buffer))))
+
+(defun cider-file-string (file)
+  "Read the contents of a FILE and return as a string."
+  (with-current-buffer (find-file-noselect file)
+    (buffer-string)))
+
+(defun cider-load-file-op (filename)
+  "Send \"load-file\" op for FILENAME."
+  (cider-send-load-file (cider-file-string filename)
+                        filename
+                        (file-name-nondirectory filename)))
+
+(defun cider-load-file (filename)
+  "Load the Clojure file FILENAME."
+  (interactive (list
+                (read-file-name "Load file: " nil nil
+                                nil (if (buffer-file-name)
+                                        (file-name-nondirectory
+                                         (buffer-file-name))))))
+  (remove-overlays (point-min) (point-max) 'cider-note-p t)
+  (cider-load-file-op filename)
+  (message "Loading %s..." filename))
+
+(defun cider-load-current-buffer ()
+  "Load current buffer's file."
+  (interactive)
+  (check-parens)
+  (unless buffer-file-name
+    (error "Buffer %s is not associated with a file" (buffer-name)))
+  (when (and (buffer-modified-p)
+             (y-or-n-p (format "Save file %s? " (buffer-file-name))))
+    (save-buffer))
+  (cider-load-file (buffer-file-name)))
+
+;;; interrupt evaluation
+(defun cider-interrupt-handler (buffer)
+  "Create an interrupt response handler for BUFFER."
+  (nrepl-make-response-handler buffer nil nil nil nil))
+
+;;; quiting
+(defun cider--close-buffer (buffer)
+  "Close the BUFFER and kill its associated process (if any)."
+  (when (get-buffer-process buffer)
+    (delete-process (get-buffer-process buffer)))
+  (when (get-buffer buffer)
+    (kill-buffer buffer)))
+
+(defvar cider-ancilliary-buffers
+  (list cider-error-buffer
+        cider-doc-buffer
+        cider-src-buffer
+        nrepl-event-buffer-name))
+
+(defun cider-close-ancilliary-buffers ()
+  "Close buffers that are shared across connections."
+  (interactive)
+  (dolist (buf-name cider-ancilliary-buffers)
+    (cider--close-buffer buf-name)))
+
+(defun cider-quit ()
+  "Quit CIDER.
+
+Quitting closes all active nREPL connections and kills all CIDER buffers."
+  (interactive)
+  (when (y-or-n-p "Are you sure you want to quit CIDER? ")
+    (dolist (connection nrepl-connection-list)
+      (when connection
+        (nrepl-close connection)))
+    (message "All active nREPL connections were closed")
+    (cider-close-ancilliary-buffers)))
+
+(defun cider-restart (&optional prompt-project)
+  "Quit CIDER and restart it.
+If PROMPT-PROJECT is t, then prompt for the project in which to
+restart the server."
+  (interactive)
+  (cider-quit)
+  (cider-jack-in current-prefix-arg))
+
+(add-hook 'nrepl-connected-hook 'cider-enable-on-existing-clojure-buffers)
+(add-hook 'nrepl-disconnected-hook
+          'cider-possibly-disable-on-existing-clojure-buffers)
+
+(provide 'cider-interaction)
+;;; cider-interaction.el ends here
diff --git a/elpa/cider-20131221.1231/cider-macroexpansion.el b/elpa/cider-20131221.1231/cider-macroexpansion.el
new file mode 100644
index 000000000..7620090da
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-macroexpansion.el
@@ -0,0 +1,165 @@
+;;; cider-macroexpansion.el --- Macro expansion support
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Macro expansion support.
+
+;;; Code:
+
+(require 'cider-mode)
+
+(defconst cider-macroexpansion-buffer "*cider-macroexpansion*")
+
+(push cider-macroexpansion-buffer cider-ancilliary-buffers)
+
+(defun cider-macroexpand-undo (&optional arg)
+  "Undo the last macroexpansion, using `undo-only'.
+ARG is passed along to `undo-only'."
+  (interactive)
+  (let ((inhibit-read-only t))
+    (undo-only arg)))
+
+(defvar cider-last-macroexpand-expression nil
+  "Specify the last macroexpansion preformed.
+This variable specifies both what was expanded and the expander.")
+
+(defun cider-macroexpand-form (expander expr)
+  "Macroexpand, using EXPANDER, the given EXPR."
+  (format
+   "(clojure.pprint/write (%s '%s) :suppress-namespaces false :dispatch clojure.pprint/code-dispatch)"
+   expander expr))
+
+(defun cider-macroexpand-expr (expander expr &optional buffer)
+  "Macroexpand, use EXPANDER, the given EXPR from BUFFER."
+  (let* ((form (cider-macroexpand-form expander expr))
+         (expansion (plist-get (cider-eval-sync form nrepl-buffer-ns) :stdout)))
+    (setq cider-last-macroexpand-expression form)
+    (cider-initialize-macroexpansion-buffer expansion nrepl-buffer-ns)))
+
+(defun cider-macroexpand-expr-inplace (expander)
+  "Substitute the current form at point with its macroexpansion using EXPANDER."
+  (interactive)
+  (let ((form-with-bounds (cider-sexp-at-point-with-bounds)))
+    (if form-with-bounds
+        (destructuring-bind (expr bounds) form-with-bounds
+          (let* ((form (cider-macroexpand-form expander expr))
+                 (expansion (plist-get (cider-eval-sync form nrepl-buffer-ns) :stdout)))
+            (cider-redraw-macroexpansion-buffer
+             expansion (current-buffer) (car bounds) (cdr bounds) (point)))))))
+
+(defun cider-macroexpand-again ()
+  "Repeat the last macroexpansion."
+  (interactive)
+  (let ((expansion
+         (plist-get (cider-eval-sync cider-last-macroexpand-expression nrepl-buffer-ns) :stdout)))
+    (cider-initialize-macroexpansion-buffer expansion nrepl-buffer-ns)))
+
+;;;###autoload
+(defun cider-macroexpand-1 (&optional prefix)
+  "Invoke 'macroexpand-1' on the expression at point.
+If invoked with a PREFIX argument, use 'macroexpand' instead of
+'macroexpand-1'."
+  (interactive "P")
+  (let ((expander (if prefix 'macroexpand 'macroexpand-1)))
+    (cider-macroexpand-expr expander (cider-sexp-at-point))))
+
+(defun cider-macroexpand-1-inplace (&optional prefix)
+  "Perform inplace 'macroexpand-1' on the expression at point.
+If invoked with a PREFIX argument, use 'macroexpand' instead of
+'macroexpand-1'."
+  (interactive "P")
+  (let ((expander (if prefix 'macroexpand 'macroexpand-1)))
+    (cider-macroexpand-expr-inplace expander)))
+
+;;;###autoload
+(defun cider-macroexpand-all ()
+  "Invoke 'clojure.walk/macroexpand-all' on the expression at point."
+  (interactive)
+  (cider-macroexpand-expr
+   'clojure.walk/macroexpand-all (cider-sexp-at-point)))
+
+(defun cider-macroexpand-all-inplace ()
+  "Perform inplace 'clojure.walk/macroexpand-all' on the expression at point."
+  (interactive)
+  (cider-macroexpand-expr-inplace 'clojure.walk/macroexpand-all))
+
+(defun cider-initialize-macroexpansion-buffer (expansion ns)
+  "Create a new Macroexpansion buffer with EXPANSION and namespace NS."
+  (pop-to-buffer (cider-create-macroexpansion-buffer))
+  (setq nrepl-buffer-ns ns)
+  (setq buffer-undo-list nil)
+  (let ((inhibit-read-only t)
+        (buffer-undo-list t))
+    (erase-buffer)
+    (insert (format "%s" expansion))
+    (goto-char (point-min))
+    (font-lock-fontify-buffer)))
+
+(defun cider-redraw-macroexpansion-buffer (expansion buffer start end current-point)
+  "Redraw the macroexpansion with new EXPANSION.
+Text in BUFFER from START to END is replaced with new expansion,
+and point is placed at CURRENT-POINT."
+  (with-current-buffer buffer
+    (let ((buffer-read-only nil))
+      (goto-char start)
+      (delete-region start end)
+      (insert (format "%s" expansion))
+      (goto-char start)
+      (indent-sexp)
+      (goto-char current-point))))
+
+(defun cider-create-macroexpansion-buffer ()
+  "Create a new macroexpansion buffer."
+  (with-current-buffer (cider-popup-buffer cider-macroexpansion-buffer t)
+    (clojure-mode)
+    (clojure-disable-cider)
+    (cider-macroexpansion-minor-mode 1)
+    (current-buffer)))
+
+(defvar cider-macroexpansion-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "g") 'cider-macroexpand-again)
+    (define-key map (kbd "q") 'cider-popup-buffer-quit-function)
+    (cl-labels ((redefine-key (from to)
+                              (dolist (mapping (where-is-internal from cider-mode-map))
+                                (define-key map mapping to))))
+      (redefine-key 'cider-macroexpand-1 'cider-macroexpand-1-inplace)
+      (redefine-key 'cider-macroexpand-all 'cider-macroexpand-all-inplace)
+      (redefine-key 'advertised-undo 'cider-macroexpand-undo)
+      (redefine-key 'undo 'cider-macroexpand-undo))
+    map))
+
+(define-minor-mode cider-macroexpansion-minor-mode
+  "Minor mode for nrepl macroexpansion.
+
+\\{cider-macroexpansion-minor-mode-map}"
+  nil
+  " Macroexpand"
+  cider-macroexpansion-minor-mode-map)
+
+(provide 'cider-macroexpansion)
+;;; cider-macroexpansion.el ends here
diff --git a/elpa/cider-20131221.1231/cider-mode.el b/elpa/cider-20131221.1231/cider-mode.el
new file mode 100644
index 000000000..32b09c0b7
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-mode.el
@@ -0,0 +1,123 @@
+;;; cider-mode.el --- Minor mode for REPL interactions
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Minor mode for REPL interactions.
+
+;;; Code:
+
+(require 'cider-interaction)
+
+(defvar cider-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "M-.") 'cider-jump)
+    (define-key map (kbd "M-,") 'cider-jump-back)
+    (define-key map (kbd "M-TAB") 'complete-symbol)
+    (define-key map (kbd "C-M-x") 'cider-eval-defun-at-point)
+    (define-key map (kbd "C-c C-c") 'cider-eval-defun-at-point)
+    (define-key map (kbd "C-x C-e") 'cider-eval-last-sexp)
+    (define-key map (kbd "C-c C-e") 'cider-eval-last-sexp)
+    (define-key map (kbd "C-c C-w") 'cider-eval-last-sexp-and-replace)
+    (define-key map (kbd "C-c M-e") 'cider-eval-last-sexp-to-repl)
+    (define-key map (kbd "C-c M-p") 'cider-insert-last-sexp-in-repl)
+    (define-key map (kbd "C-c C-p") 'cider-pprint-eval-last-sexp)
+    (define-key map (kbd "C-c C-r") 'cider-eval-region)
+    (define-key map (kbd "C-c C-n") 'cider-eval-ns-form)
+    (define-key map (kbd "C-c M-:") 'cider-read-and-eval)
+    (define-key map (kbd "C-c C-m") 'cider-macroexpand-1)
+    (define-key map (kbd "C-c M-m") 'cider-macroexpand-all)
+    (define-key map (kbd "C-c M-n") 'cider-repl-set-ns)
+    (define-key map (kbd "C-c C-d") 'cider-doc)
+    (define-key map (kbd "C-c C-s") 'cider-src)
+    (define-key map (kbd "C-c C-z") 'cider-switch-to-repl-buffer)
+    (define-key map (kbd "C-c C-Z") 'cider-switch-to-relevant-repl-buffer)
+    (define-key map (kbd "C-c M-o") 'cider-find-and-clear-repl-buffer)
+    (define-key map (kbd "C-c C-k") 'cider-load-current-buffer)
+    (define-key map (kbd "C-c C-l") 'cider-load-file)
+    (define-key map (kbd "C-c C-b") 'cider-interrupt)
+    (define-key map (kbd "C-c C-j") 'cider-javadoc)
+    (define-key map (kbd "C-c M-s") 'cider-selector)
+    (define-key map (kbd "C-c M-r") 'cider-rotate-connection)
+    (define-key map (kbd "C-c M-d") 'cider-display-current-connection-info)
+    (define-key map (kbd "C-c C-q") 'cider-quit)
+    map))
+
+;;;###autoload
+(define-minor-mode cider-mode
+  "Minor mode for REPL interaction from a Clojure buffer.
+
+\\{cider-mode-map}"
+  nil
+  " cider"
+  cider-mode-map
+  (make-local-variable 'completion-at-point-functions)
+  (add-to-list 'completion-at-point-functions
+               'cider-complete-at-point))
+
+(easy-menu-define cider-mode-menu cider-mode-map
+  "Menu for CIDER mode"
+  '("CIDER"
+    ["Jump" cider-jump]
+    ["Jump back" cider-jump-back]
+    "--"
+    ["Complete symbol" complete-symbol]
+    "--"
+    ["Eval top-level sexp at point" cider-eval-defun-at-point]
+    ["Eval last sexp" cider-eval-last-sexp]
+    ["Eval last sexp in popup buffer" cider-pprint-eval-last-sexp]
+    ["Eval last sexp to REPL buffer" cider-eval-last-sexp-to-repl]
+    ["Eval last sexp and replace it with its result" cider-eval-last-sexp-and-replace]
+    ["Eval region" cider-eval-region]
+    ["Eval ns form" cider-eval-ns-form]
+    ["Insert last sexp in REPL" cider-insert-last-sexp-in-repl]
+    "--"
+    ["Load current buffer" cider-load-current-buffer]
+    ["Load file" cider-load-file]
+    "--"
+    ["Macroexpand-1 last expression" cider-macroexpand-1]
+    ["Macroexpand-all last expression" cider-macroexpand-all]
+    "--"
+    ["Display documentation" cider-doc]
+    ["Display source" cider-src]
+    ["Display JavaDoc" cider-javadoc]
+    "--"
+    ["Set ns" cider-repl-set-ns]
+    ["Switch to REPL" cider-switch-to-repl-buffer]
+    ["Switch to Relevant REPL" cider-switch-to-relevant-repl-buffer]
+    ["Toggle REPL Pretty Print" cider-pretty-toggle]
+    ["Clear REPL" cider-find-and-clear-repl-buffer]
+    ["Interrupt" cider-interrupt]
+    ["Quit" cider-quit]
+    ["Restart" cider-restart]
+    "--"
+    ["Display current nREPL connection" cider-display-current-connection-info]
+    ["Rotate current nREPL connection" cider-rotate-connection]
+    "--"
+    ["Version info" cider-version]))
+
+(provide 'cider-mode)
+;;; cider-mode.el ends here
diff --git a/elpa/cider-20131221.1231/cider-pkg.el b/elpa/cider-20131221.1231/cider-pkg.el
new file mode 100644
index 000000000..867de7311
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-pkg.el
@@ -0,0 +1,5 @@
+(define-package "cider" "20131221.1231" "Clojure Integrated Development Environment and REPL"
+  '((clojure-mode "2.0.0")
+    (cl-lib "0.3")
+    (dash "2.1.0")
+    (pkg-info "0.4")))
diff --git a/elpa/cider-20131221.1231/cider-pkg.elc b/elpa/cider-20131221.1231/cider-pkg.elc
new file mode 100644
index 000000000..dda6ce10e
Binary files /dev/null and b/elpa/cider-20131221.1231/cider-pkg.elc differ
diff --git a/elpa/cider-20131221.1231/cider-repl.el b/elpa/cider-20131221.1231/cider-repl.el
new file mode 100644
index 000000000..d39c474d7
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-repl.el
@@ -0,0 +1,1064 @@
+;;; cider-repl.el --- REPL interactions
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; REPL interactions.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-interaction)
+(require 'cider-version)
+(require 'cider-eldoc) ; for cider-turn-on-eldoc-mode
+
+(require 'clojure-mode)
+(require 'easymenu)
+
+(eval-when-compile
+  (defvar paredit-version)
+  (defvar paredit-space-for-delimiter-predicates))
+
+(defgroup cider-repl nil
+  "Interaction with the REPL."
+  :prefix "cider-repl-"
+  :group 'cider)
+
+(defface cider-repl-prompt-face
+  '((t (:inherit font-lock-keyword-face)))
+  "Face for the prompt in the REPL buffer."
+  :group 'cider-repl)
+
+(defface cider-repl-output-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for output in the REPL buffer."
+  :group 'cider-repl)
+
+(defface cider-repl-input-face
+  '((t (:bold t)))
+  "Face for previous input in the REPL buffer."
+  :group 'cider-repl)
+
+(defface cider-repl-result-face
+  '((t ()))
+  "Face for the result of an evaluation in the REPL buffer."
+  :group 'cider-repl)
+
+(defcustom cider-repl-popup-stacktraces nil
+  "Non-nil means pop-up error stacktraces in the REPL buffer.
+Nil means show only an error message in the minibuffer.  This variable
+overrides `cider-popup-stacktraces' in REPL buffers."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-pop-to-buffer-on-connect t
+  "Controls whether to pop to the REPL buffer on connect.
+
+When set to nil the buffer will only be created."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-display-in-current-window nil
+  "Controls whether the REPL buffer is displayed in the current window."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-use-pretty-printing nil
+  "Control whether the results in REPL are pretty-printed or not.
+The `cider-toggle-pretty-printing' command can be used to interactively
+change the setting's value."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-print-length nil
+  "Non-nil means limit the number of objects printed in REPL to this value.
+This is implemented by setting the value of the Clojure var
+*print-length*.  The `cider-repl-toggle-print-length-limiting'
+command can be used to interactively change whether this setting
+is enforced or not."
+  :type 'integer
+  :group 'cider-repl)
+
+(defcustom cider-repl-tab-command 'cider-repl-indent-and-complete-symbol
+  "Select the command to be invoked by the TAB key.
+The default option is `cider-repl-indent-and-complete-symbol'.  If
+you'd like to use the default Emacs behavior use
+`indent-for-tab-command'."
+  :type 'symbol
+  :group 'cider-repl)
+
+(defcustom cider-lein-command
+  "lein"
+  "The command used to execute leiningen 2.x."
+  :type 'string
+  :group 'cider-repl)
+
+(defcustom cider-server-command
+  (if (or (locate-file cider-lein-command exec-path)
+          (locate-file (format "%s.bat" cider-lein-command) exec-path))
+      (format "%s repl :headless" cider-lein-command)
+    (format "echo \"%s repl :headless\" | eval $SHELL -l" cider-lein-command))
+  "The command used to start the nREPL via command `cider-jack-in'.
+For a remote nREPL server lein must be in your PATH.  The remote
+proc is launched via sh rather than bash, so it might be necessary
+to specific the full path to it.  Localhost is assumed."
+  :type 'string
+  :group 'cider-repl)
+
+;;;; REPL buffer local variables
+(defvar cider-repl-input-start-mark)
+
+(defvar cider-repl-prompt-start-mark)
+
+(defvar cider-repl-old-input-counter 0
+  "Counter used to generate unique `cider-old-input' properties.
+This property value must be unique to avoid having adjacent inputs be
+joined together.")
+
+(defvar cider-repl-input-history '()
+  "History list of strings read from the nREPL buffer.")
+
+(defvar cider-repl-input-history-items-added 0
+  "Variable counting the items added in the current session.")
+
+(defvar cider-repl-output-start nil
+  "Marker for the start of output.")
+
+(defvar cider-repl-output-end nil
+  "Marker for the end of output.")
+
+(nrepl-make-variables-buffer-local
+ 'cider-repl-input-start-mark
+ 'cider-repl-prompt-start-mark
+ 'cider-repl-old-input-counter
+ 'cider-repl-input-history
+ 'cider-repl-input-history-items-added
+ 'cider-repl-output-start
+ 'cider-repl-output-end)
+
+(defun cider-repl-tab ()
+  "Invoked on TAB keystrokes in `cider-repl-mode' buffers."
+  (interactive)
+  (funcall cider-repl-tab-command))
+
+(defun cider-repl-reset-markers ()
+  "Reset all REPL markers."
+  (dolist (markname '(cider-repl-output-start
+                      cider-repl-output-end
+                      cider-repl-prompt-start-mark
+                      cider-repl-input-start-mark))
+    (set markname (make-marker))
+    (set-marker (symbol-value markname) (point))))
+
+(defmacro cider-propertize-region (props &rest body)
+  "Add PROPS to all text inserted by executing BODY.
+More precisely, PROPS are added to the region between the point's
+positions before and after executing BODY."
+  (let ((start (make-symbol "start-pos")))
+    `(let ((,start (point)))
+       (prog1 (progn ,@body)
+         (add-text-properties ,start (point) ,props)))))
+
+(put 'cider-propertize-region 'lisp-indent-function 1)
+
+;;; REPL init
+(defun cider-repl-buffer-name ()
+  "Generate a REPL buffer name based on current connection buffer."
+  (with-current-buffer (get-buffer (nrepl-current-connection-buffer))
+    (nrepl-buffer-name nrepl-repl-buffer-name-template)))
+
+(defun cider-create-repl-buffer (process)
+  "Create a REPL buffer for PROCESS."
+  (cider-init-repl-buffer
+   process
+   (let ((buffer-name (cider-repl-buffer-name)))
+     (if cider-repl-display-in-current-window
+         (add-to-list 'same-window-buffer-names buffer-name))
+     (if cider-repl-pop-to-buffer-on-connect
+         (pop-to-buffer buffer-name)
+       (generate-new-buffer buffer-name))
+     buffer-name)))
+
+(defun cider-make-repl (process)
+  "Make a REPL for the connection PROCESS."
+  (let ((connection-buffer (process-buffer process))
+        (repl-buffer (cider-create-repl-buffer process)))
+    (with-current-buffer repl-buffer
+      (setq nrepl-connection-buffer (buffer-name connection-buffer)))
+    (with-current-buffer connection-buffer
+      (setq nrepl-repl-buffer (buffer-name repl-buffer)))))
+
+(defun cider-repl--banner ()
+  "Generate the welcome REPL buffer banner."
+  (format "; CIDER %s (Clojure %s, nREPL %s)"
+          (cider-version)
+          (cider--clojure-version)
+          (cider--backend-version)))
+
+(defun cider-repl--insert-banner-and-prompt (ns)
+  "Insert REPL banner and REPL prompt, taking into account NS."
+  (when (zerop (buffer-size))
+    (insert (propertize (cider-repl--banner) 'face 'font-lock-comment-face)))
+  (goto-char (point-max))
+  (cider-repl--mark-output-start)
+  (cider-repl--mark-input-start)
+  (cider-repl--insert-prompt ns))
+
+(defun cider-init-repl-buffer (connection buffer &optional noprompt)
+  "Initialize the REPL for CONNECTION in BUFFER.
+Insert a banner, unless NOPROMPT is non-nil."
+  (with-current-buffer buffer
+    (unless (eq major-mode 'cider-repl-mode)
+      (cider-repl-mode))
+    ;; use the same requires by default as clojure.main does
+    (cider-eval-sync nrepl-repl-requires-sexp)
+    (when cider-repl-print-length
+      (cider-repl-set-print-length cider-repl-print-length))
+    (cider-repl-reset-markers)
+    ;; honor :init-ns from lein's :repl-options on startup
+    (setq nrepl-buffer-ns (cider-eval-and-get-value "(str *ns*)"))
+    (unless noprompt
+      (cider-repl--insert-banner-and-prompt nrepl-buffer-ns))
+    (cider-remember-clojure-buffer cider-current-clojure-buffer)
+    (current-buffer)))
+
+(defun cider-find-or-create-repl-buffer ()
+  "Return the REPL buffer, create it if necessary."
+  (let ((buffer (cider-current-repl-buffer)))
+        (if (null buffer)
+                (error "No active nREPL connection")
+          (let ((buffer (get-buffer buffer)))
+                (or (when (buffer-live-p buffer) buffer)
+                        (let ((buffer (nrepl-current-connection-buffer)))
+                          (if (null buffer)
+                                  (error "No active nREPL connection")
+                                (cider-init-repl-buffer
+                                 (get-process buffer)
+                                 (get-buffer-create
+                                  (cider-repl-buffer-name))))))))))
+
+;;; REPL interaction
+(defun cider-property-bounds (prop)
+  "Return the the positions of the previous and next change to PROP.
+PROP is the name of a text property."
+  (assert (get-text-property (point) prop))
+  (let ((end (next-single-char-property-change (point) prop)))
+    (list (previous-single-char-property-change end prop) end)))
+
+(defun cider-repl--in-input-area-p ()
+  "Return t if in input area."
+  (<= cider-repl-input-start-mark (point)))
+
+(defun cider-repl--current-input (&optional until-point-p)
+  "Return the current input as string.
+The input is the region from after the last prompt to the end of
+buffer.  If UNTIL-POINT-P is non-nil, the input is until the current
+point."
+  (buffer-substring-no-properties cider-repl-input-start-mark
+                                  (if until-point-p
+                                      (point)
+                                    (point-max))))
+
+(defun cider-repl-previous-prompt ()
+  "Move backward to the previous prompt."
+  (interactive)
+  (cider-repl--find-prompt t))
+
+(defun cider-repl-next-prompt ()
+  "Move forward to the next prompt."
+  (interactive)
+  (cider-repl--find-prompt))
+
+(defun cider-repl--find-prompt (&optional backward)
+  "Find the next prompt.
+If BACKWARD is non-nil look backward."
+  (let ((origin (point))
+        (prop 'cider-prompt))
+    (while (progn
+             (cider-search-property-change prop backward)
+             (not (or (cider-end-of-proprange-p prop) (bobp) (eobp)))))
+    (unless (cider-end-of-proprange-p prop)
+      (goto-char origin))))
+
+(defun cider-search-property-change (prop &optional backward)
+  "Search forward for a property change to PROP.
+If BACKWARD is non-nil search backward."
+  (cond (backward
+         (goto-char (previous-single-char-property-change (point) prop)))
+        (t
+         (goto-char (next-single-char-property-change (point) prop)))))
+
+(defun cider-end-of-proprange-p (property)
+  "Return t if at the the end of a property range for PROPERTY."
+  (and (get-char-property (max 1 (1- (point))) property)
+       (not (get-char-property (point) property))))
+
+(defun cider-repl--mark-input-start ()
+  "Mark the input start."
+  (set-marker cider-repl-input-start-mark (point) (current-buffer)))
+
+(defun cider-repl--mark-output-start ()
+  "Mark the output start."
+  (set-marker cider-repl-output-start (point))
+  (set-marker cider-repl-output-end (point)))
+
+(defun cider-repl--mark-output-end ()
+  "Mark the output end."
+  (add-text-properties cider-repl-output-start cider-repl-output-end
+                       '(face cider-repl-output-face
+                              rear-nonsticky (face))))
+
+(defun cider-repl--same-line-p (pos1 pos2)
+  "Return t if buffer positions POS1 and POS2 are on the same line."
+  (save-excursion (goto-char (min pos1 pos2))
+                  (<= (max pos1 pos2) (line-end-position))))
+
+(defun cider-repl--bol-internal ()
+  "Go to the beginning of line or the prompt."
+  (cond ((and (>= (point) cider-repl-input-start-mark)
+              (cider-repl--same-line-p (point) cider-repl-input-start-mark))
+         (goto-char cider-repl-input-start-mark))
+        (t (beginning-of-line 1))))
+
+(defun cider-repl-bol ()
+  "Go to the beginning of line or the prompt."
+  (interactive)
+  (deactivate-mark)
+  (cider-repl--bol-internal))
+
+(defun cider-repl-bol-mark ()
+  "Set the mark and go to the beginning of line or the prompt."
+  (interactive)
+  (unless mark-active
+    (set-mark (point)))
+  (cider-repl--bol-internal))
+
+(defun cider-repl--at-prompt-start-p ()
+  "Return t if point is at the start of prompt.
+This will not work on non-current prompts."
+  (= (point) cider-repl-input-start-mark))
+
+(defun cider-repl--show-maximum-output ()
+  "Put the end of the buffer at the bottom of the window."
+  (when (eobp)
+    (let ((win (get-buffer-window (current-buffer))))
+      (when win
+        (with-selected-window win
+          (set-window-point win (point-max))
+          (recenter -1))))))
+
+(defmacro cider-save-marker (marker &rest body)
+  "Save MARKER and execute BODY."
+  (let ((pos (make-symbol "pos")))
+    `(let ((,pos (marker-position ,marker)))
+       (prog1 (progn . ,body)
+         (set-marker ,marker ,pos)))))
+
+(put 'cider-save-marker 'lisp-indent-function 1)
+
+(defun cider-repl--insert-prompt (namespace)
+  "Insert the prompt (before markers!), taking into account NAMESPACE.
+Set point after the prompt.
+Return the position of the prompt beginning."
+  (goto-char cider-repl-input-start-mark)
+  (cider-save-marker cider-repl-output-start
+    (cider-save-marker cider-repl-output-end
+      (unless (bolp) (insert-before-markers "\n"))
+      (let ((prompt-start (point))
+            (prompt (format "%s> " namespace)))
+        (cider-propertize-region
+            '(face cider-repl-prompt-face read-only t intangible t
+                   cider-prompt t
+                   rear-nonsticky (cider-prompt read-only face intangible))
+          (insert-before-markers prompt))
+        (set-marker cider-repl-prompt-start-mark prompt-start)
+        prompt-start))))
+
+(defun cider-repl-emit-output-at-pos (buffer string position &optional bol)
+  "Using BUFFER, insert STRING at POSITION and mark it as output.
+If BOL is non-nil insert at the beginning of line."
+  (with-current-buffer buffer
+    (save-excursion
+      (cider-save-marker cider-repl-output-start
+        (cider-save-marker cider-repl-output-end
+          (goto-char position)
+          ;; TODO: Review the need for bol
+          (when (and bol (not (bolp))) (insert-before-markers "\n"))
+          (cider-propertize-region `(face cider-repl-output-face
+                                          rear-nonsticky (face))
+            (insert-before-markers string)
+            (when (and (= (point) cider-repl-prompt-start-mark)
+                       (not (bolp)))
+              (insert-before-markers "\n")
+              (set-marker cider-repl-output-end (1- (point))))))))
+    (cider-repl--show-maximum-output)))
+
+(defun cider-repl-emit-interactive-output (string)
+  "Emit STRING as interactive output."
+  (with-current-buffer (cider-current-repl-buffer)
+    (let ((pos (1- (cider-repl--input-line-beginning-position))))
+      (cider-repl-emit-output-at-pos (current-buffer) string pos t)
+      (ansi-color-apply-on-region pos (point-max)))))
+
+(defun cider-repl-emit-output (buffer string &optional bol)
+  "Using BUFFER, emit STRING.
+If BOL is non-nil, emit at the beginning of the line."
+  (with-current-buffer buffer
+    (let ((pos (1- (cider-repl--input-line-beginning-position))))
+      (cider-repl-emit-output-at-pos buffer string cider-repl-input-start-mark bol)
+      (ansi-color-apply-on-region pos (point-max)))))
+
+(defun cider-repl-emit-prompt (buffer)
+  "Emit the REPL prompt into BUFFER."
+  (with-current-buffer buffer
+    (save-excursion
+      (cider-save-marker cider-repl-output-start
+        (cider-save-marker cider-repl-output-end
+          (cider-repl--insert-prompt nrepl-buffer-ns))))
+    (cider-repl--show-maximum-output)))
+
+(defun cider-repl-emit-result (buffer string &optional bol)
+  "Emit into BUFFER the result STRING and mark it as an evaluation result.
+If BOL is non-nil insert at the beginning of the line."
+  (with-current-buffer buffer
+    (save-excursion
+      (cider-save-marker cider-repl-output-start
+        (cider-save-marker cider-repl-output-end
+          (goto-char cider-repl-input-start-mark)
+          (when (and bol (not (bolp))) (insert-before-markers "\n"))
+          (cider-propertize-region `(face cider-repl-result-face
+                                          rear-nonsticky (face))
+            (insert-before-markers string)))))
+    (cider-repl--show-maximum-output)))
+
+(defun cider-repl-newline-and-indent ()
+  "Insert a newline, then indent the next line.
+Restrict the buffer from the prompt for indentation, to avoid being
+confused by strange characters (like unmatched quotes) appearing
+earlier in the buffer."
+  (interactive)
+  (save-restriction
+    (narrow-to-region cider-repl-prompt-start-mark (point-max))
+    (insert "\n")
+    (lisp-indent-line)))
+
+(defun cider-repl-indent-and-complete-symbol ()
+  "Indent the current line and perform symbol completion.
+First indent the line.  If indenting doesn't move point, complete
+the symbol."
+  (interactive)
+  (let ((pos (point)))
+    (lisp-indent-line)
+    (when (= pos (point))
+      (if (save-excursion (re-search-backward "[^() \n\t\r]+\\=" nil t))
+          (completion-at-point)))))
+
+(defun cider-repl-kill-input ()
+  "Kill all text from the prompt to point."
+  (interactive)
+  (cond ((< (marker-position cider-repl-input-start-mark) (point))
+         (kill-region cider-repl-input-start-mark (point)))
+        ((= (point) (marker-position cider-repl-input-start-mark))
+         (cider-repl-delete-current-input))))
+
+(defun cider-repl--input-complete-p (start end)
+  "Return t if the region from START to END is a complete sexp."
+  (save-excursion
+    (goto-char start)
+    (cond ((looking-at "\\s *[@'`#]?[(\"]")
+           (ignore-errors
+             (save-restriction
+               (narrow-to-region start end)
+               ;; Keep stepping over blanks and sexps until the end of
+               ;; buffer is reached or an error occurs. Tolerate extra
+               ;; close parens.
+               (loop do (skip-chars-forward " \t\r\n)")
+                     until (eobp)
+                     do (forward-sexp))
+               t)))
+          (t t))))
+
+(defun cider-repl-handler (buffer)
+  "Make a nREPL evaluation handler for the REPL BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (cider-repl-emit-result buffer value t))
+                               (lambda (buffer out)
+                                 (cider-repl-emit-output buffer out))
+                               (lambda (buffer err)
+                                 (cider-repl-emit-output buffer err))
+                               (lambda (buffer)
+                                 (cider-repl-emit-prompt buffer))))
+
+(defun cider-repl--send-input (&optional newline)
+  "Go to the end of the input and send the current input.
+If NEWLINE is true then add a newline at the end of the input."
+  (unless (cider-repl--in-input-area-p)
+    (error "No input at point"))
+  (goto-char (point-max))
+  (let ((end (point)))             ; end of input, without the newline
+    (cider-repl--add-to-input-history (buffer-substring cider-repl-input-start-mark end))
+    (when newline
+      (insert "\n")
+      (cider-repl--show-maximum-output))
+    (let ((inhibit-modification-hooks t))
+      (add-text-properties cider-repl-input-start-mark
+                           (point)
+                           `(cider-old-input
+                             ,(incf cider-repl-old-input-counter))))
+    (let ((overlay (make-overlay cider-repl-input-start-mark end)))
+      ;; These properties are on an overlay so that they won't be taken
+      ;; by kill/yank.
+      (overlay-put overlay 'read-only t)
+      (overlay-put overlay 'face 'cider-repl-input-face)))
+  (let* ((input (cider-repl--current-input))
+         (form (if (and (not (string-match "\\`[ \t\r\n]*\\'" input)) cider-repl-use-pretty-printing)
+                   (format "(clojure.pprint/pprint %s)" input) input)))
+    (goto-char (point-max))
+    (cider-repl--mark-input-start)
+    (cider-repl--mark-output-start)
+    (cider-eval form (cider-repl-handler (current-buffer)) nrepl-buffer-ns)))
+
+(defun cider-repl-return (&optional end-of-input)
+  "Evaluate the current input string, or insert a newline.
+Send the current input ony if a whole expression has been entered,
+i.e. the parenthesis are matched.
+When END-OF-INPUT is non-nil, send the input even if the parentheses
+are not balanced."
+  (interactive "P")
+  (cond
+   (end-of-input
+    (cider-repl--send-input))
+   ((and (get-text-property (point) 'cider-old-input)
+         (< (point) cider-repl-input-start-mark))
+    (cider-repl--grab-old-input end-of-input)
+    (cider-repl--recenter-if-needed))
+   ((cider-repl--input-complete-p cider-repl-input-start-mark (point-max))
+    (cider-repl--send-input t))
+   (t
+    (cider-repl-newline-and-indent)
+    (message "[input not complete]"))))
+
+(defun cider-repl--recenter-if-needed ()
+  "Make sure that the point is visible."
+  (unless (pos-visible-in-window-p (point-max))
+    (save-excursion
+      (goto-char (point-max))
+      (recenter -1))))
+
+(defun cider-repl--grab-old-input (replace)
+  "Resend the old REPL input at point.
+If REPLACE is non-nil the current input is replaced with the old
+input; otherwise the new input is appended.  The old input has the
+text property `cider-old-input'."
+  (multiple-value-bind (beg end) (cider-property-bounds 'cider-old-input)
+    (let ((old-input (buffer-substring beg end)) ;;preserve
+          ;;properties, they will be removed later
+          (offset (- (point) beg)))
+      ;; Append the old input or replace the current input
+      (cond (replace (goto-char cider-repl-input-start-mark))
+            (t (goto-char (point-max))
+               (unless (eq (char-before) ?\ )
+                 (insert " "))))
+      (delete-region (point) (point-max))
+      (save-excursion
+        (insert old-input)
+        (when (equal (char-before) ?\n)
+          (delete-char -1)))
+      (forward-char offset))))
+
+(defun cider-repl-closing-return ()
+  "Evaluate the current input string after closing all open lists."
+  (interactive)
+  (goto-char (point-max))
+  (save-restriction
+    (narrow-to-region cider-repl-input-start-mark (point))
+    (while (ignore-errors (save-excursion (backward-up-list 1)) t)
+      (insert ")")))
+  (cider-repl-return))
+
+(defun cider-repl-toggle-pretty-printing ()
+  "Toggle pretty-printing in the REPL."
+  (interactive)
+  (setq cider-repl-use-pretty-printing (not cider-repl-use-pretty-printing))
+  (message "Pretty printing in nREPL %s."
+           (if cider-repl-use-pretty-printing "enabled" "disabled")))
+
+(defun cider-repl-set-print-length (print-length)
+  "Set the clojure var *print-length* to PRINT-LENGTH."
+  (let* ((form (format "(set! *print-length* %d)"
+                       print-length)))
+    (cider-eval-sync form)))
+
+(defun cider-repl-toggle-print-length-limiting ()
+  "Toggle the enforcement of `cider-repl-print-length'."
+  (interactive)
+  (when (integerp cider-repl-print-length)
+    (let* ((form (format "(set! *print-length* (if *print-length* nil %d))"
+                         cider-repl-print-length))
+           (print-length (cider-eval-and-get-value form)))
+      (if print-length
+          (message "*print-length* limited to %d" print-length)
+        (message "*print-length* unlimited")))))
+
+(defvar cider-repl-clear-buffer-hook)
+
+(defun cider-repl-clear-buffer ()
+  "Delete the output generated by the Clojure process."
+  (interactive)
+  (let ((inhibit-read-only t))
+    (delete-region (point-min) cider-repl-prompt-start-mark)
+    (delete-region cider-repl-output-start cider-repl-output-end)
+    (when (< (point) cider-repl-input-start-mark)
+      (goto-char cider-repl-input-start-mark))
+    (recenter t))
+  (run-hooks 'cider-repl-clear-buffer-hook))
+
+(defun cider-repl--input-line-beginning-position ()
+  "Return the position of the beginning of input."
+  (save-excursion
+    (goto-char cider-repl-input-start-mark)
+    (line-beginning-position)))
+
+(defun cider-repl-clear-output ()
+  "Delete the output inserted since the last input."
+  (interactive)
+  (let ((start (save-excursion
+                 (cider-repl-previous-prompt)
+                 (ignore-errors (forward-sexp))
+                 (forward-line)
+                 (point)))
+        (end (1- (cider-repl--input-line-beginning-position))))
+    (when (< start end)
+      (let ((inhibit-read-only t))
+        (delete-region start end)
+        (save-excursion
+          (goto-char start)
+          (insert
+           (propertize ";;; output cleared" 'face 'font-lock-comment-face)))))))
+
+(defun cider--all-ns ()
+  "Get a list of the available namespaces."
+  (cider-eval-and-get-value
+   "(clojure.core/map clojure.core/str (clojure.core/all-ns))"))
+
+(defun cider-repl-set-ns (ns)
+  "Switch the namespace of the REPL buffer to NS.
+
+If invoked in a REPL buffer the command will prompt you for the name of the
+namespace to switch to."
+  (interactive (list (if (derived-mode-p 'cider-repl-mode)
+                         (completing-read "Switch to namespace: "
+                                          (cider--all-ns))
+                       (cider-current-ns))))
+  (if ns
+      (with-current-buffer (cider-current-repl-buffer)
+        (cider-eval
+         (format "(in-ns '%s)" ns)
+         (cider-repl-handler (current-buffer))))
+    (error "Cannot determine the current namespace")))
+
+;;;;; History
+
+(defcustom cider-repl-wrap-history nil
+  "T to wrap history around when the end is reached."
+  :type 'boolean
+  :group 'cider-repl)
+
+(define-obsolete-variable-alias 'cider-wrap-history 'cider-repl-wrap-history)
+
+;; These two vars contain the state of the last history search.  We
+;; only use them if `last-command' was `cider-repl--history-replace',
+;; otherwise we reinitialize them.
+
+(defvar cider-repl-input-history-position -1
+  "Newer items have smaller indices.")
+
+(defvar cider-repl-history-pattern nil
+  "The regexp most recently used for finding input history.")
+
+(defun cider-repl--add-to-input-history (string)
+  "Add STRING to the input history.
+Empty strings and duplicates are ignored."
+  (unless (or (equal string "")
+              (equal string (car cider-repl-input-history)))
+    (push string cider-repl-input-history)
+    (incf cider-repl-input-history-items-added)))
+
+(defun cider-repl-delete-current-input ()
+  "Delete all text after the prompt."
+  (goto-char (point-max))
+  (delete-region cider-repl-input-start-mark (point-max)))
+
+(defun cider-repl--replace-input (string)
+  "Replace the current REPL input with STRING."
+  (cider-repl-delete-current-input)
+  (insert-and-inherit string))
+
+(defun cider-repl--position-in-history (start-pos direction regexp)
+  "Return the position of the history item starting at START-POS.
+Search in DIRECTION for REGEXP.
+Return -1 resp the length of the history if no item matches."
+  ;; Loop through the history list looking for a matching line
+  (let* ((step (ecase direction
+                 (forward -1)
+                 (backward 1)))
+         (history cider-repl-input-history)
+         (len (length history)))
+    (loop for pos = (+ start-pos step) then (+ pos step)
+          if (< pos 0) return -1
+          if (<= len pos) return len
+          if (string-match regexp (nth pos history)) return pos)))
+
+(defun cider-repl--history-replace (direction &optional regexp)
+  "Replace the current input with the next line in DIRECTION.
+DIRECTION is 'forward' or 'backward' (in the history list).
+If REGEXP is non-nil, only lines matching REGEXP are considered."
+  (setq cider-repl-history-pattern regexp)
+  (let* ((min-pos -1)
+         (max-pos (length cider-repl-input-history))
+         (pos0 (cond ((cider-history-search-in-progress-p)
+                      cider-repl-input-history-position)
+                     (t min-pos)))
+         (pos (cider-repl--position-in-history pos0 direction (or regexp "")))
+         (msg nil))
+    (cond ((and (< min-pos pos) (< pos max-pos))
+           (cider-repl--replace-input (nth pos cider-repl-input-history))
+           (setq msg (format "History item: %d" pos)))
+          ((not cider-repl-wrap-history)
+           (setq msg (cond ((= pos min-pos) "End of history")
+                           ((= pos max-pos) "Beginning of history"))))
+          (cider-repl-wrap-history
+           (setq pos (if (= pos min-pos) max-pos min-pos))
+           (setq msg "Wrapped history")))
+    (when (or (<= pos min-pos) (<= max-pos pos))
+      (when regexp
+        (setq msg (concat msg "; no matching item"))))
+    (message "%s%s" msg (cond ((not regexp) "")
+                              (t (format "; current regexp: %s" regexp))))
+    (setq cider-repl-input-history-position pos)
+    (setq this-command 'cider-repl--history-replace)))
+
+(defun cider-history-search-in-progress-p ()
+  "Return t if a current history search is in progress."
+  (eq last-command 'cider-repl--history-replace))
+
+(defun cider-terminate-history-search ()
+  "Terminate the current history search."
+  (setq last-command this-command))
+
+(defun cider-repl-previous-input ()
+  "Cycle backwards through input history.
+If the `last-command' was a history navigation command use the
+same search pattern for this command.
+Otherwise use the current input as search pattern."
+  (interactive)
+  (cider-repl--history-replace 'backward (cider-repl-history-pattern t)))
+
+(defun cider-repl-next-input ()
+  "Cycle forwards through input history.
+See `cider-previous-input'."
+  (interactive)
+  (cider-repl--history-replace 'forward (cider-repl-history-pattern t)))
+
+(defun cider-repl-forward-input ()
+  "Cycle forwards through input history."
+  (interactive)
+  (cider-repl--history-replace 'forward (cider-repl-history-pattern)))
+
+(defun cider-repl-backward-input ()
+  "Cycle backwards through input history."
+  (interactive)
+  (cider-repl--history-replace 'backward (cider-repl-history-pattern)))
+
+(defun cider-repl-previous-matching-input (regexp)
+  "Find the previous input matching REGEXP."
+  (interactive "sPrevious element matching (regexp): ")
+  (cider-terminate-history-search)
+  (cider-repl--history-replace 'backward regexp))
+
+(defun cider-repl-next-matching-input (regexp)
+  "Find then next input matching REGEXP."
+  (interactive "sNext element matching (regexp): ")
+  (cider-terminate-history-search)
+  (cider-repl--history-replace 'forward regexp))
+
+(defun cider-repl-history-pattern (&optional use-current-input)
+  "Return the regexp for the navigation commands.
+If USE-CURRENT-INPUT is non-nil, use the current input."
+  (cond ((cider-history-search-in-progress-p)
+         cider-repl-history-pattern)
+        (use-current-input
+         (assert (<= cider-repl-input-start-mark (point)))
+         (let ((str (cider-repl--current-input t)))
+           (cond ((string-match "^[ \n]*$" str) nil)
+                 (t (concat "^" (regexp-quote str))))))
+        (t nil)))
+
+;;; persistent history
+(defcustom cider-repl-history-size 500
+  "The maximum number of items to keep in the REPL history."
+  :type 'integer
+  :safe 'integerp
+  :group 'cider-repl-mode)
+
+(define-obsolete-variable-alias 'cider-history-size 'cider-repl-history-size)
+
+(defcustom cider-repl-history-file nil
+  "File to save the persistent REPL history to."
+  :type 'string
+  :safe 'stringp
+  :group 'cider-repl-mode)
+
+(define-obsolete-variable-alias 'cider-history-file 'cider-repl-history-file)
+
+(defun cider-repl--history-read-filename ()
+  "Ask the user which file to use, defaulting `cider-repl-history-file'."
+  (read-file-name "Use CIDER REPL history file: "
+                  cider-repl-history-file))
+
+(defun cider-repl--history-read (filename)
+  "Read history from FILENAME and return it.
+It does not yet set the input history."
+  (if (file-readable-p filename)
+      (with-temp-buffer
+        (insert-file-contents filename)
+        (read (current-buffer)))
+    '()))
+
+(defun cider-repl-history-load (&optional filename)
+  "Load history from FILENAME into current session.
+FILENAME defaults to the value of `cider-repl-history-file' but user
+defined filenames can be used to read special history files.
+
+The value of `cider-repl-input-history' is set by this function."
+  (interactive (list (cider-repl--history-read-filename)))
+  (let ((f (or filename cider-repl-history-file)))
+    ;; TODO: probably need to set cider-repl-input-history-position as well.
+    ;; in a fresh connection the newest item in the list is currently
+    ;; not available.  After sending one input, everything seems to work.
+    (setq cider-repl-input-history (cider-repl--history-read f))))
+
+(defun cider-repl--history-write (filename)
+  "Write history to FILENAME.
+Currently coding system for writing the contents is hardwired to
+utf-8-unix."
+  (let* ((mhist (cider-repl--histories-merge cider-repl-input-history
+                                             cider-repl-input-history-items-added
+                                             (cider-repl--history-read filename)))
+         ;; newest items are at the beginning of the list, thus 0
+         (hist (cl-subseq mhist 0 (min (length mhist) cider-repl-history-size))))
+    (unless (file-writable-p filename)
+      (error (format "History file not writable: %s" filename)))
+    (let ((print-length nil) (print-level nil))
+      (with-temp-file filename
+        ;; TODO: really set cs for output
+        ;; TODO: does cs need to be customizable?
+        (insert ";; -*- coding: utf-8-unix -*-\n")
+        (insert ";; Automatically written history of CIDER REPL session\n")
+        (insert ";; Edit at your own risk\n\n")
+        (prin1 (mapcar #'substring-no-properties hist) (current-buffer))))))
+
+(defun cider-repl-history-save (&optional filename)
+  "Save the current REPL input history to FILENAME.
+FILENAME defaults to the value of `cider-repl-history-file'."
+  (interactive (list (cider-repl--history-read-filename)))
+  (let* ((file (or filename cider-repl-history-file)))
+    (cider-repl--history-write file)))
+
+(defun cider-repl-history-just-save ()
+  "Just save the history to `cider-repl-history-file'.
+This function is meant to be used in hooks to avoid lambda
+constructs."
+  (cider-repl-history-save cider-repl-history-file))
+
+;; SLIME has different semantics and will not save any duplicates.
+;; we keep track of how many items were added to the history in the
+;; current session in `cider-repl--add-to-input-history' and merge only the
+;; new items with the current history found in the file, which may
+;; have been changed in the meantime by another session.
+(defun cider-repl--histories-merge (session-hist n-added-items file-hist)
+  "Merge histories from SESSION-HIST adding N-ADDED-ITEMS into FILE-HIST."
+  (append (cl-subseq session-hist 0 n-added-items)
+          file-hist))
+
+;;; REPL shortcuts
+(defcustom cider-repl-shortcut-dispatch-char ?\,
+  "Character used to distinguish REPL commands from Lisp forms."
+  :type '(character)
+  :group 'cider-repl)
+
+(defvar cider-repl-shortcuts (make-hash-table :test 'equal))
+
+(defun cider-repl-add-shortcut (name handler)
+  "Add a REPL shortcut command, defined by NAME and HANDLER."
+  (puthash name handler cider-repl-shortcuts))
+
+(cider-repl-add-shortcut "hasta la vista" 'cider-quit)
+(cider-repl-add-shortcut "version" 'cider-version)
+(cider-repl-add-shortcut "conn-info" 'cider-display-current-connection-info)
+(cider-repl-add-shortcut "conn-rotate" 'cider-rotate-connection)
+(cider-repl-add-shortcut "clear" 'cider-repl-clear-buffer)
+(cider-repl-add-shortcut "ns" 'cider-repl-set-ns)
+
+(defun cider-repl--available-shortcuts ()
+  "Return the available REPL shortcuts."
+  (cider-util--hash-keys cider-repl-shortcuts))
+
+(defun cider-repl-handle-shortcut ()
+  "Execute a REPL shortcut."
+  (interactive)
+  (if (> (point) cider-repl-input-start-mark)
+      (insert (string cider-repl-shortcut-dispatch-char))
+    (let ((command (completing-read "Command: "
+                                   (cider-repl--available-shortcuts))))
+     (if (not (equal command ""))
+         (call-interactively (gethash command cider-repl-shortcuts))
+       (error "No command selected")))))
+
+
+;;;;; CIDER REPL mode
+
+;;; Prevent paredit from inserting some inappropriate spaces.
+;;; C.f. clojure-mode.el
+(defun cider-space-for-delimiter-p (endp delim)
+  "Hook for paredit's `paredit-space-for-delimiter-predicates'.
+
+Decides if paredit should insert a space after/before (if/unless
+ENDP) DELIM."
+  (if (derived-mode-p 'cider-repl-mode)
+      (save-excursion
+        (backward-char)
+        (if (and (or (char-equal delim ?\()
+                     (char-equal delim ?\")
+                     (char-equal delim ?{))
+                 (not endp))
+            (if (char-equal (char-after) ?#)
+                (and (not (bobp))
+                     (or (char-equal ?w (char-syntax (char-before)))
+                         (char-equal ?_ (char-syntax (char-before)))))
+              t)
+          t))
+    t))
+
+(defvar cider-repl-mode-hook nil
+  "Hook executed when entering `cider-repl-mode'.")
+
+(defvar cider-repl-mode-syntax-table
+  (copy-syntax-table clojure-mode-syntax-table))
+
+(defvar cider-repl-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map clojure-mode-map)
+    (define-key map (kbd "M-.") 'cider-jump)
+    (define-key map (kbd "M-,") 'cider-jump-back)
+    (define-key map (kbd "RET") 'cider-repl-return)
+    (define-key map (kbd "TAB") 'cider-repl-tab)
+    (define-key map (kbd "C-<return>") 'cider-repl-closing-return)
+    (define-key map (kbd "C-j") 'cider-repl-newline-and-indent)
+    (define-key map (kbd "C-c C-d") 'cider-doc)
+    (define-key map (kbd "C-c C-s") 'cider-src)
+    (define-key map (kbd "C-c C-o") 'cider-repl-clear-output)
+    (define-key map (kbd "C-c M-o") 'cider-repl-clear-buffer)
+    (define-key map (kbd "C-c M-n") 'cider-repl-set-ns)
+    (define-key map (kbd "C-c C-u") 'cider-repl-kill-input)
+    (define-key map (kbd "C-a") 'cider-repl-bol)
+    (define-key map (kbd "C-S-a") 'cider-repl-bol-mark)
+    (define-key map [home] 'cider-repl-bol)
+    (define-key map [S-home] 'cider-repl-bol-mark)
+    (define-key map (kbd "C-<up>") 'cider-repl-backward-input)
+    (define-key map (kbd "C-<down>") 'cider-repl-forward-input)
+    (define-key map (kbd "M-p") 'cider-repl-previous-input)
+    (define-key map (kbd "M-n") 'cider-repl-next-input)
+    (define-key map (kbd "M-r") 'cider-repl-previous-matching-input)
+    (define-key map (kbd "M-s") 'cider-repl-next-matching-input)
+    (define-key map (kbd "C-c C-n") 'cider-repl-next-prompt)
+    (define-key map (kbd "C-c C-p") 'cider-repl-previous-prompt)
+    (define-key map (kbd "C-c C-b") 'cider-interrupt)
+    (define-key map (kbd "C-c C-c") 'cider-interrupt)
+    (define-key map (kbd "C-c C-j") 'cider-javadoc)
+    (define-key map (kbd "C-c C-m") 'cider-macroexpand-1)
+    (define-key map (kbd "C-c M-m") 'cider-macroexpand-all)
+    (define-key map (kbd "C-c C-z") 'cider-switch-to-last-clojure-buffer)
+    (define-key map (kbd "C-c M-s") 'cider-selector)
+    (define-key map (kbd "C-c M-r") 'cider-rotate-connection)
+    (define-key map (kbd "C-c M-d") 'cider-display-current-connection-info)
+    (define-key map (kbd "C-c M-f") 'cider-load-fn-into-repl-buffer)
+    (define-key map (kbd "C-c C-q") 'cider-quit)
+    (define-key map (string cider-repl-shortcut-dispatch-char) 'cider-repl-handle-shortcut)
+    map))
+
+(define-derived-mode cider-repl-mode fundamental-mode "REPL"
+  "Major mode for Clojure REPL interactions.
+
+\\{cider-repl-mode-map}"
+  (setq-local lisp-indent-function 'clojure-indent-function)
+  (setq-local indent-line-function 'lisp-indent-line)
+  (make-local-variable 'completion-at-point-functions)
+  (add-to-list 'completion-at-point-functions
+               'cider-complete-at-point)
+  (set-syntax-table cider-repl-mode-syntax-table)
+  (cider-turn-on-eldoc-mode)
+  (if (fboundp 'hack-dir-local-variables-non-file-buffer)
+      (hack-dir-local-variables-non-file-buffer))
+  (when cider-repl-history-file
+    (cider-repl-history-load cider-repl-history-file)
+    (add-hook 'kill-buffer-hook 'cider-repl-history-just-save t t)
+    (add-hook 'kill-emacs-hook 'cider-repl-history-just-save))
+  (add-hook 'paredit-mode-hook
+            (lambda ()
+              (when (>= paredit-version 21)
+                (define-key cider-repl-mode-map "{" 'paredit-open-curly)
+                (define-key cider-repl-mode-map "}" 'paredit-close-curly)
+                (add-to-list 'paredit-space-for-delimiter-predicates
+                             'cider-space-for-delimiter-p)))))
+
+(easy-menu-define cider-repl-mode-menu cider-repl-mode-map
+  "Menu for CIDER's REPL mode"
+  '("REPL"
+    ["Jump" cider-jump]
+    ["Jump back" cider-jump-back]
+    "--"
+    ["Complete symbol" complete-symbol]
+    "--"
+    ["Display documentation" cider-doc]
+    ["Display source" cider-src]
+    ["Display JavaDoc" cider-javadoc]
+    "--"
+    ["Set REPL ns" cider-repl-set-ns]
+    ["Toggle pretty printing of results" cider-repl-toggle-pretty-printing]
+    ["Clear output" cider-repl-clear-output]
+    ["Clear buffer" cider-repl-clear-buffer]
+    ["Kill input" cider-repl-kill-input]
+    ["Interrupt" cider-interrupt]
+    ["Quit" cider-quit]
+    ["Restart" cider-restart]
+    "--"
+    ["Version info" cider-version]))
+
+
+(provide 'cider-repl)
+;;; cider-repl.el ends here
diff --git a/elpa/cider-20131221.1231/cider-selector.el b/elpa/cider-20131221.1231/cider-selector.el
new file mode 100644
index 000000000..0e02cdb61
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-selector.el
@@ -0,0 +1,155 @@
+;;; cider-selector.el --- Buffer selection command inspired by SLIME's selector
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Buffer selection command inspired by SLIME's selector.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-interaction)
+(require 'cider-repl) ; for cider-find-or-create-repl-buffer
+
+(defconst cider-selector-help-buffer "*Selector Help*"
+  "The name of the selector's help buffer.")
+
+(defvar cider-selector-methods nil
+  "List of buffer-selection methods for the `cider-selector' command.
+Each element is a list (KEY DESCRIPTION FUNCTION).
+DESCRIPTION is a one-line description of what the key selects.")
+
+(defvar cider-selector-other-window nil
+  "If non-nil use `switch-to-buffer-other-window'.")
+
+(defun cider--recently-visited-buffer (mode)
+  "Return the most recently visited buffer whose `major-mode' is MODE.
+Only considers buffers that are not already visible."
+  (loop for buffer in (buffer-list)
+        when (and (with-current-buffer buffer (eq major-mode mode))
+                  (not (string-match "^ " (buffer-name buffer)))
+                  (null (get-buffer-window buffer 'visible)))
+        return buffer
+        finally (error "Can't find unshown buffer in %S" mode)))
+
+;;;###autoload
+(defun cider-selector (&optional other-window)
+  "Select a new buffer by type, indicated by a single character.
+The user is prompted for a single character indicating the method by
+which to choose a new buffer.  The `?' character describes then
+available methods.  OTHER-WINDOW provides an optional target.
+
+See `def-cider-selector-method' for defining new methods."
+  (interactive)
+  (message "Select [%s]: "
+           (apply #'string (mapcar #'car cider-selector-methods)))
+  (let* ((cider-selector-other-window other-window)
+         (ch (save-window-excursion
+               (select-window (minibuffer-window))
+               (read-char)))
+         (method (cl-find ch cider-selector-methods :key #'car)))
+    (cond (method
+           (funcall (cl-caddr method)))
+          (t
+           (message "No method for character: ?\\%c" ch)
+           (ding)
+           (sleep-for 1)
+           (discard-input)
+           (cider-selector)))))
+
+(defmacro def-cider-selector-method (key description &rest body)
+  "Define a new `cider-select' buffer selection method.
+
+KEY is the key the user will enter to choose this method.
+
+DESCRIPTION is a one-line sentence describing how the method
+selects a buffer.
+
+BODY is a series of forms which are evaluated when the selector
+is chosen.  The returned buffer is selected with
+`switch-to-buffer'."
+  (let ((method `(lambda ()
+                   (let ((buffer (progn ,@body)))
+                     (cond ((not (get-buffer buffer))
+                            (message "No such buffer: %S" buffer)
+                            (ding))
+                           ((get-buffer-window buffer)
+                            (select-window (get-buffer-window buffer)))
+                           (cider-selector-other-window
+                            (switch-to-buffer-other-window buffer))
+                           (t
+                            (switch-to-buffer buffer)))))))
+    `(setq cider-selector-methods
+           (cl-sort (cons (list ,key ,description ,method)
+                          (cl-remove ,key cider-selector-methods :key #'car))
+                  #'< :key #'car))))
+
+(def-cider-selector-method ?? "Selector help buffer."
+  (ignore-errors (kill-buffer cider-selector-help-buffer))
+  (with-current-buffer (get-buffer-create cider-selector-help-buffer)
+    (insert "CIDER Selector Methods:\n\n")
+    (loop for (key line nil) in cider-selector-methods
+          do (insert (format "%c:\t%s\n" key line)))
+    (goto-char (point-min))
+    (help-mode)
+    (display-buffer (current-buffer) t))
+  (cider-selector)
+  (current-buffer))
+
+(pushnew (list ?4 "Select in other window" (lambda () (cider-selector t)))
+         cider-selector-methods :key #'car)
+
+(def-cider-selector-method ?c
+  "Most recently visited clojure-mode buffer."
+  (cider--recently-visited-buffer 'clojure-mode))
+
+(def-cider-selector-method ?e
+  "Most recently visited emacs-lisp-mode buffer."
+  (cider--recently-visited-buffer 'emacs-lisp-mode))
+
+(def-cider-selector-method ?q "Abort."
+  (top-level))
+
+(def-cider-selector-method ?r
+  "Current REPL buffer."
+  (cider-find-or-create-repl-buffer))
+
+(def-cider-selector-method ?n
+  "Connections browser buffer."
+  (nrepl-connection-browser)
+  nrepl--connection-browser-buffer-name)
+
+(def-cider-selector-method ?v
+  "*nrepl-events* buffer."
+  nrepl-event-buffer-name)
+
+(def-cider-selector-method ?s
+ "Cycle to the next CIDER connection's REPL."
+ (cider-rotate-connection)
+ (cider-find-or-create-repl-buffer))
+
+(provide 'cider-selector)
+;;; cider-selector.el ends here
diff --git a/elpa/cider-20131221.1231/cider-util.el b/elpa/cider-20131221.1231/cider-util.el
new file mode 100644
index 000000000..e6fe66a6d
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-util.el
@@ -0,0 +1,57 @@
+;;; cider-util.el --- Common utility functions that don't belong anywhere else
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Common utility functions that don't belong anywhere else
+
+;;; Code:
+
+(require 'dash)
+
+;;; Compatibility
+(eval-and-compile
+  ;; `setq-local' for Emacs 24.2 and below
+  (unless (fboundp 'setq-local)
+    (defmacro setq-local (var val)
+      "Set variable VAR to value VAL in current buffer."
+      `(set (make-local-variable ',var) ,val))))
+
+(defun cider-util--hash-keys (hashtable)
+  "Return a list of keys in HASHTABLE."
+  (let ((keys '()))
+    (maphash (lambda (k v) (setq keys (cons k keys))) hashtable)
+    keys))
+
+(defun cider-util--clojure-buffers ()
+  "Return a list of all existing `clojure-mode' buffers."
+  (-filter
+   (lambda (buffer) (with-current-buffer buffer (derived-mode-p 'clojure-mode)))
+   (buffer-list)))
+
+(provide 'cider-util)
+
+;;; cider-util.el ends here
diff --git a/elpa/cider-20131221.1231/cider-util.elc b/elpa/cider-20131221.1231/cider-util.elc
new file mode 100644
index 000000000..3d7965ace
Binary files /dev/null and b/elpa/cider-20131221.1231/cider-util.elc differ
diff --git a/elpa/cider-20131221.1231/cider-version.el b/elpa/cider-20131221.1231/cider-version.el
new file mode 100644
index 000000000..f7b7d0695
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-version.el
@@ -0,0 +1,78 @@
+;;; cider-version.el --- Version information utilities
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Contains several functions for extracting and displaying version information.
+
+;;; Code:
+
+(require 'pkg-info)
+
+(defun cider--library-version ()
+  "Get the version in the CIDER library header."
+  (-when-let (version (pkg-info-library-version 'cider))
+    (pkg-info-format-version version)))
+
+(defun cider--package-version ()
+  "Get the package version of CIDER.
+
+This is the version number of the installed CIDER package.
+Returns nil if CIDER was not installed via package.el."
+  (condition-case nil
+      (-when-let (version (pkg-info-package-version 'cider))
+        (pkg-info-format-version version))
+    (error nil)))
+
+(defun cider-version (&optional show-version)
+  "Get the CIDER version as string.
+
+If called interactively or if SHOW-VERSION is non-nil, show the
+version in the echo area and the messages buffer.
+
+The returned string includes both, the version from package.el
+and the library version, if both a present and different.
+
+If the version number could not be determined, signal an error,
+if called interactively, or if SHOW-VERSION is non-nil, otherwise
+just return nil."
+  (interactive (list (not (or executing-kbd-macro noninteractive))))
+  (let* ((lib-version (cider--library-version))
+         (pkg-version (cider--package-version))
+         (version (cond
+                   ((and lib-version pkg-version
+                         (not (string= lib-version pkg-version)))
+                    (format "%s (package: %s)" lib-version pkg-version))
+                   ((or pkg-version lib-version)
+                    (format "%s" (or pkg-version lib-version))))))
+    (when show-version
+      (unless version
+        (error "Could not find out CIDER version"))
+      (message "CIDER version: %s" version))
+    version))
+
+(provide 'cider-version)
+;;; cider-version.el ends here
diff --git a/elpa/cider-20131221.1231/cider-version.elc b/elpa/cider-20131221.1231/cider-version.elc
new file mode 100644
index 000000000..05cd794c8
Binary files /dev/null and b/elpa/cider-20131221.1231/cider-version.elc differ
diff --git a/elpa/cider-20131221.1231/cider.el b/elpa/cider-20131221.1231/cider.el
new file mode 100644
index 000000000..78e752e79
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider.el
@@ -0,0 +1,111 @@
+;;; cider.el --- Clojure Integrated Development Environment and REPL
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+;; URL: http://www.github.com/clojure-emacs/cider
+;; Version: 0.5.0-cvs
+;; Package-Requires: ((clojure-mode "2.0.0") (cl-lib "0.3") (dash "2.1.0") (pkg-info "0.4"))
+;; Keywords: languages, clojure, cider
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Provides a Clojure IDE and REPL for Emacs, built on top of nREPL.
+
+;;; Installation:
+
+;; Available as a package in marmalade-repo.org and melpa.milkbox.net.
+
+;; (add-to-list 'package-archives
+;;              '("marmalade" . "http://marmalade-repo.org/packages/"))
+;;
+;; or
+;;
+;; (add-to-list 'package-archives
+;;              '("melpa" . "http://melpa.milkbox.net/packages/") t)
+;;
+;; M-x package-install cider
+
+;;; Usage:
+
+;; M-x cider-jack-in
+
+;;; Code:
+
+(defgroup cider nil
+  "Clojure Integrated Development Environment and REPL."
+  :prefix "cider-"
+  :group 'applications)
+
+(require 'cider-client)
+(require 'cider-version)
+(require 'cider-interaction)
+(require 'cider-eldoc)
+(require 'cider-repl)
+(require 'cider-mode)
+
+;;;###autoload
+(defun cider-jack-in (&optional prompt-project)
+  "Start a nREPL server for the current project and connect to it.
+If PROMPT-PROJECT is t, then prompt for the project for which to
+start the server."
+  (interactive "P")
+  (setq cider-current-clojure-buffer (current-buffer))
+  (let* ((project (when prompt-project
+                    (ido-read-directory-name "Project: ")))
+         (project-dir (nrepl-project-directory-for
+                       (or project (nrepl-current-dir)))))
+    (when (nrepl-check-for-repl-buffer nil project-dir)
+      (let* ((nrepl-project-dir project-dir)
+             (cmd (if project
+                      (format "cd %s && %s" project cider-server-command)
+                    cider-server-command))
+             (process (start-process-shell-command
+                       "nrepl-server"
+                       (generate-new-buffer-name (nrepl-server-buffer-name))
+                       cmd)))
+        (set-process-filter process 'nrepl-server-filter)
+        (set-process-sentinel process 'nrepl-server-sentinel)
+        (set-process-coding-system process 'utf-8-unix 'utf-8-unix)
+        (with-current-buffer (process-buffer process)
+          (setq nrepl-project-dir project-dir))
+        (message "Starting nREPL server...")))))
+
+;;;###autoload
+(defun cider (host port)
+  "Connect to an nREPL server identified by HOST and PORT."
+  (interactive (list (read-string "Host: " (nrepl-current-host) nil (nrepl-current-host))
+                     (string-to-number (let ((port (nrepl-default-port)))
+                                         (read-string "Port: " port nil port)))))
+  (setq cider-current-clojure-buffer (current-buffer))
+  (when (nrepl-check-for-repl-buffer `(,host ,port) nil)
+    (nrepl-connect host port)))
+
+;;;###autoload
+(eval-after-load 'clojure-mode
+  '(progn
+     (define-key clojure-mode-map (kbd "C-c M-j") 'cider-jack-in)
+     (define-key clojure-mode-map (kbd "C-c M-c") 'cider)))
+
+(provide 'cider)
+;;; cider.el ends here
diff --git a/elpa/cider-20131221.1231/nrepl-client.el b/elpa/cider-20131221.1231/nrepl-client.el
new file mode 100644
index 000000000..a3a89a5f3
--- /dev/null
+++ b/elpa/cider-20131221.1231/nrepl-client.el
@@ -0,0 +1,892 @@
+;;; nrepl-client.el --- Client for Clojure nREPL
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; 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/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Provides an Emacs Lisp client to connect to Clojure nREPL servers.
+
+;;; Code:
+(require 'clojure-mode)
+(require 'dash)
+(require 'thingatpt)
+(require 'etags)
+(require 'ansi-color)
+(require 'ewoc)
+(require 'cl-lib)
+(require 'cider-util)
+
+
+(defgroup nrepl nil
+  "Interaction with the Clojure nREPL Server."
+  :prefix "nrepl-"
+  :group 'applications)
+
+(defcustom nrepl-buffer-name-separator " "
+  "Used in constructing the REPL buffer name.
+The `nrepl-buffer-name-separator' separates `nrepl' from the project name."
+  :type '(string)
+  :group 'nrepl)
+
+(defcustom nrepl-buffer-name-show-port nil
+  "Show the connection port in the nrepl REPL buffer name, if set to t."
+  :type 'boolean
+  :group 'nrepl)
+
+(defcustom nrepl-connected-hook nil
+  "List of functions to call when connecting to the nREPL server."
+  :type 'hook
+  :group 'nrepl)
+
+(defcustom nrepl-disconnected-hook nil
+  "List of functions to call when disconnected from the nREPL server."
+  :type 'hook
+  :group 'nrepl)
+
+(defcustom nrepl-file-loaded-hook nil
+  "List of functions to call when a load file has completed."
+  :type 'hook
+  :group 'nrepl)
+
+(defcustom nrepl-host "127.0.0.1"
+  "The default hostname (or IP address) to connect to."
+  :type 'string
+  :group 'nrepl)
+
+(defcustom nrepl-port nil
+  "The default port to connect to."
+  :type 'string
+  :group 'nrepl)
+
+(defvar nrepl-repl-requires-sexp "(clojure.core/apply clojure.core/require '[[clojure.repl :refer (source apropos dir pst doc find-doc)] [clojure.java.javadoc :refer (javadoc)] [clojure.pprint :refer (pp pprint)]])"
+  "Things to require in the tooling session and the REPL buffer.")
+
+(defvar nrepl-connection-buffer nil)
+(defvar nrepl-server-buffer nil)
+(defvar nrepl-repl-buffer nil)
+(defvar nrepl-endpoint nil)
+(defvar nrepl-project-dir nil)
+
+(defconst nrepl-repl-buffer-name-template "*cider-repl%s*")
+(defconst nrepl-connection-buffer-name-template "*nrepl-connection%s*")
+(defconst nrepl-server-buffer-name-template "*nrepl-server%s*")
+
+(defcustom nrepl-hide-special-buffers nil
+  "Control the display of some special buffers in buffer switching commands.
+When true some special buffers like the connection and the server
+buffer will be hidden.")
+
+(defun nrepl-apply-hide-special-buffers (buffer-name)
+  "Apply a prefix to BUFFER-NAME that will hide the buffer."
+  (concat (if nrepl-hide-special-buffers " " "") buffer-name))
+
+(defun nrepl-buffer-name (buffer-name-template)
+  "Generate a buffer name using BUFFER-NAME-TEMPLATE.
+
+The name will include the project name if available.  The name will
+also include the connection port if `nrepl-buffer-name-show-port' is true."
+  (generate-new-buffer-name
+   (let ((project-name (nrepl--project-name nrepl-project-dir))
+         (nrepl-proj-port (cadr nrepl-endpoint)))
+     (format
+      buffer-name-template
+      (concat (if project-name
+                  (format "%s%s" nrepl-buffer-name-separator project-name) "")
+              (if (and nrepl-proj-port nrepl-buffer-name-show-port)
+                  (format ":%s" nrepl-proj-port) ""))))))
+
+(defun nrepl-connection-buffer-name ()
+  "Return the name of the connection buffer."
+  (nrepl-apply-hide-special-buffers
+   (nrepl-buffer-name nrepl-connection-buffer-name-template)))
+
+(defun nrepl-server-buffer-name ()
+  "Return the name of the server buffer."
+  (nrepl-apply-hide-special-buffers
+   (nrepl-buffer-name nrepl-server-buffer-name-template)))
+
+;; buffer local declarations
+(defvar nrepl-session nil
+  "Current nREPL session id.")
+
+(defvar nrepl-tooling-session nil
+  "Current nREPL tooling session id.
+To be used for tooling calls (i.e. completion, eldoc, etc)")
+
+(defvar nrepl-request-counter 0
+  "Continuation serial number counter.")
+
+(defvar nrepl-pending-requests (make-hash-table :test 'equal))
+
+(defvar nrepl-completed-requests (make-hash-table :test 'equal))
+
+(defvar nrepl-buffer-ns "user"
+  "Current Clojure namespace of this buffer.")
+
+(defvar nrepl-sync-response nil
+  "Result of the last sync request.")
+
+(defvar nrepl-err-handler 'cider-default-err-handler
+  "Evaluation error handler.")
+
+(defvar nrepl-ops nil
+  "Available nREPL server ops (from describe).")
+
+(defun nrepl-make-variables-buffer-local (&rest variables)
+  "Make all VARIABLES buffer local."
+  (mapcar #'make-variable-buffer-local variables))
+
+(nrepl-make-variables-buffer-local
+ 'nrepl-connection-buffer
+ 'nrepl-repl-buffer
+ 'nrepl-server-buffer
+ 'nrepl-endpoint
+ 'nrepl-project-dir
+ 'nrepl-ops
+ 'nrepl-session
+ 'nrepl-tooling-session
+ 'nrepl-request-counter
+ 'nrepl-pending-requests
+ 'nrepl-completed-requests
+ 'nrepl-done-requests
+ 'nrepl-buffer-ns
+ 'nrepl-sync-response)
+
+;;; Bencode
+;;; Adapted from http://www.emacswiki.org/emacs-en/bencode.el
+;;; and modified to work with utf-8
+(defun nrepl-bdecode-buffer ()
+  "Decode a bencoded string in the current buffer starting at point."
+  (cond ((looking-at "i\\([0-9]+\\)e")
+         (goto-char (match-end 0))
+         (string-to-number (match-string 1)))
+        ((looking-at "\\([0-9]+\\):")
+         (goto-char (match-end 0))
+         (let ((start (point))
+               (end (byte-to-position (+ (position-bytes (point))
+                                         (string-to-number (match-string 1))))))
+           (goto-char end)
+           (buffer-substring-no-properties start end)))
+        ((looking-at "l")
+         (goto-char (match-end 0))
+         (let (result item)
+           (while (setq item (nrepl-bdecode-buffer))
+             (setq result (cons item result)))
+           (nreverse result)))
+        ((looking-at "d")
+         (goto-char (match-end 0))
+         (let (dict key item)
+           (while (setq item (nrepl-bdecode-buffer))
+             (if key
+                 (setq dict (cons (cons key item) dict)
+                       key nil)
+               (unless (stringp item)
+                 (error "Dictionary keys have to be strings: %s" item))
+               (setq key item)))
+           (cons 'dict (nreverse dict))))
+        ((looking-at "e")
+         (goto-char (match-end 0))
+         nil)
+        (t
+         (error "Cannot decode object: %d" (point)))))
+
+(defun nrepl-decode (str)
+  "Decode bencoded STR."
+  (with-temp-buffer
+    (save-excursion
+      (insert str))
+    (let ((result '()))
+      (while (not (eobp))
+        (setq result (cons (nrepl-bdecode-buffer) result)))
+      (nreverse result))))
+
+(defun nrepl-netstring (string)
+  "Encode STRING in bencode."
+  (let ((size (string-bytes string)))
+    (format "%s:%s" size string)))
+
+(defun nrepl-bencode (message)
+  "Encode with bencode MESSAGE."
+  (concat "d" (apply 'concat (mapcar 'nrepl-netstring message)) "e"))
+
+;;; Response handlers
+(defmacro nrepl-dbind-response (response keys &rest body)
+  "Destructure an nREPL RESPONSE dict.
+Bind the value of the provided KEYS and execute BODY."
+  `(let ,(loop for key in keys
+               collect `(,key (cdr (assoc ,(format "%s" key) ,response))))
+     ,@body))
+
+(put 'nrepl-dbind-response 'lisp-indent-function 2)
+
+(defun nrepl-make-response-handler
+ (buffer value-handler stdout-handler stderr-handler done-handler
+         &optional eval-error-handler)
+  "Make a response handler for BUFFER.
+Uses the specified VALUE-HANDLER, STDOUT-HANDLER, STDERR-HANDLER,
+DONE-HANDLER, and EVAL-ERROR-HANDLER as appropriate."
+  (lexical-let ((buffer buffer)
+                (value-handler value-handler)
+                (stdout-handler stdout-handler)
+                (stderr-handler stderr-handler)
+                (done-handler done-handler)
+                (eval-error-handler eval-error-handler))
+    (lambda (response)
+      (nrepl-dbind-response response (value ns out err status id ex root-ex
+                                            session)
+        (cond (value
+               (with-current-buffer buffer
+                 (if ns
+                     (setq nrepl-buffer-ns ns)))
+               (if value-handler
+                   (funcall value-handler buffer value)))
+              (out
+               (if stdout-handler
+                   (funcall stdout-handler buffer out)))
+              (err
+               (if stderr-handler
+                   (funcall stderr-handler buffer err)))
+              (status
+               (if (member "interrupted" status)
+                   (message "Evaluation interrupted."))
+               (if (member "eval-error" status)
+                   (funcall (or eval-error-handler nrepl-err-handler)
+                            buffer ex root-ex session))
+               (if (member "namespace-not-found" status)
+                   (message "Namespace not found."))
+               (if (member "need-input" status)
+                   (cider-need-input buffer))
+               (if (member "done" status)
+                   (progn
+                     (puthash id (gethash id nrepl-pending-requests) nrepl-completed-requests)
+                     (remhash id nrepl-pending-requests)
+                     (if done-handler
+                         (funcall done-handler buffer))))))))))
+
+;;; communication
+(defun nrepl-default-handler (response)
+  "Default handler which is invoked when no handler is found.
+Handles message contained in RESPONSE."
+  (nrepl-dbind-response response (out value)
+    (cond
+     (out
+      (cider-repl-emit-interactive-output out)))))
+
+(defun nrepl-dispatch (response)
+  "Dispatch the RESPONSE to associated callback.
+
+First we check the list of pending requests for the callback to invoke
+and afterwards we check the completed requests as well, since responses
+could be received even for requests with status \"done\"."
+  (nrepl-log-event response)
+  (nrepl-dbind-response response (id)
+    (let ((callback (or (gethash id nrepl-pending-requests)
+                        (gethash id nrepl-completed-requests))))
+      (if callback
+          (funcall callback response)
+        (nrepl-default-handler response)))))
+
+(defun nrepl-net-decode ()
+  "Decode the data in the current buffer.
+Remove the processed data from the buffer if the decode successful."
+  (let* ((start (point-min))
+         (end (point-max))
+         (data (buffer-substring start end)))
+    (prog1
+        (nrepl-decode data)
+      (delete-region start end))))
+
+(defun nrepl-net-process-input (process)
+  "Handle all complete messages from PROCESS.
+Assume that any error during decoding indicates an incomplete message."
+  (with-current-buffer (process-buffer process)
+    (let ((nrepl-connection-dispatch (current-buffer)))
+      (ignore-errors
+        (while (> (buffer-size) 1)
+          (let ((responses (nrepl-net-decode)))
+            (dolist (response responses)
+              (nrepl-dispatch response))))))))
+
+(defun nrepl-net-filter (process string)
+  "Decode the message(s) from PROCESS contained in STRING and dispatch."
+  (with-current-buffer (process-buffer process)
+    (goto-char (point-max))
+    (insert string))
+  (nrepl-net-process-input process))
+
+(defun nrepl-sentinel (process message)
+  "Handle sentinel events from PROCESS.
+Display MESSAGE and if the process is closed kill the
+process buffer and run the hook `nrepl-disconnected-hook'."
+  (message "nREPL connection closed: %s" message)
+  (if (equal (process-status process) 'closed)
+      (progn
+        (with-current-buffer (process-buffer process)
+          (when (get-buffer nrepl-repl-buffer)
+            (kill-buffer nrepl-repl-buffer))
+          (kill-buffer (current-buffer)))
+        (run-hooks 'nrepl-disconnected-hook))))
+
+(defun nrepl-write-message (process message)
+  "Send the PROCESS the MESSAGE."
+  (process-send-string process message))
+
+;;; Log nREPL events
+
+(defcustom nrepl-log-events nil
+  "Log protocol events to the *nrepl-events* buffer."
+  :type 'boolean
+  :group 'nrepl)
+
+(defconst nrepl-event-buffer-name "*nrepl-events*"
+  "Event buffer for nREPL message logging.")
+
+(defconst nrepl-event-buffer-max-size 50000
+  "Maximum size for the nREPL event buffer.
+Defaults to 50000 characters, which should be an insignificant
+memory burdon, while providing reasonable history.")
+
+(defconst nrepl-event-buffer-reduce-denominator 4
+  "Divisor by which to reduce event buffer size.
+When the maximum size for the nREPL event buffer is exceed, the
+size of the buffer is reduced by one over this value.  Defaults
+to 4, so that 1/4 of the buffer is removed, which should ensure
+the buffer's maximum is reasonably utilised, while limiting the
+number of buffer shrinking operations.")
+
+(defun nrepl-log-event (msg)
+  "Log the given MSG to the buffer given by `nrepl-event-buffer-name'.
+The default buffer name is *nrepl-events*."
+  (when nrepl-log-events
+    (with-current-buffer (nrepl-events-buffer)
+      (when (> (buffer-size) nrepl-event-buffer-max-size)
+        (goto-char (/ (buffer-size) nrepl-event-buffer-reduce-denominator))
+        (re-search-forward "^(" nil t)
+        (delete-region (point-min) (- (point) 1)))
+      (goto-char (point-max))
+      (pp msg (current-buffer)))))
+
+(defun nrepl-events-buffer ()
+  "Return or create the buffer given by `nrepl-event-buffer-name'.
+The default buffer name is *nrepl-events*."
+  (or (get-buffer nrepl-event-buffer-name)
+      (let ((buffer (get-buffer-create nrepl-event-buffer-name)))
+        (with-current-buffer buffer
+          (buffer-disable-undo)
+          (setq-local comment-start ";")
+          (setq-local comment-end ""))
+        buffer)))
+
+(defun nrepl-log-events (&optional disable)
+  "Turn on event logging to *nrepl-events*.
+With a prefix argument DISABLE, turn it off."
+  (interactive "P")
+  (setq nrepl-log-events (not disable)))
+
+
+;;; Connections
+
+;;; A connection is the communication between the nrepl.el client and an nrepl
+;;; server.
+
+(defvar nrepl-connection-dispatch nil
+  "Bound to the connection a message was received on.
+This is bound for the duration of the handling of that message")
+
+(defvar nrepl-connection-list nil
+  "A list of connections.")
+
+
+(defun nrepl-current-host ()
+  (if (and (stringp buffer-file-name)
+           (file-remote-p buffer-file-name))
+      tramp-current-host nrepl-host))
+
+(defun nrepl-make-connection-buffer ()
+  "Create an nREPL connection buffer."
+  (let ((buffer (generate-new-buffer (nrepl-connection-buffer-name))))
+    (with-current-buffer buffer
+      (buffer-disable-undo)
+      (setq-local kill-buffer-query-functions nil))
+    buffer))
+
+(defun nrepl-current-connection-buffer ()
+  "The connection to use for nREPL interaction."
+  (or nrepl-connection-dispatch
+      nrepl-connection-buffer
+      (car (nrepl-connection-buffers))
+      (error "No nREPL connection")))
+
+(defun nrepl-connection-buffers ()
+  "Clean up dead buffers from the `nrepl-connection-list'.
+Return the connection list."
+  (nrepl--connection-list-purge)
+  nrepl-connection-list)
+
+(defun nrepl--connection-list-purge ()
+  "Clean up dead buffers from the `nrepl-connection-list'."
+  (setq nrepl-connection-list
+        (-remove (lambda (buffer)
+                   (not (buffer-live-p (get-buffer buffer))))
+                 nrepl-connection-list)))
+
+(defun nrepl-make-repl-connection-default (connection-buffer)
+  "Make the nREPL CONNECTION-BUFFER the default connection.
+Moves CONNECITON-BUFFER to the front of `nrepl-connection-list'."
+  (interactive (list nrepl-connection-buffer))
+  (if connection-buffer
+      ;; maintain the connection list in most recently used order
+      (let ((buf-name (buffer-name (get-buffer connection-buffer))))
+        (setq nrepl-connection-list
+              (cons buf-name (delq buf-name nrepl-connection-list)))
+        (nrepl--connections-refresh))
+    (message "Not in an nREPL REPL buffer.")))
+
+(defun nrepl--close-connection-buffer (connection-buffer)
+  "Closes CONNECTION-BUFFER, removing it from `nrepl-connection-list'.
+Also closes associated REPL and server buffers."
+  (let ((nrepl-connection-dispatch connection-buffer))
+     (let ((buffer (get-buffer connection-buffer)))
+       (setq nrepl-connection-list
+             (delq (buffer-name buffer) nrepl-connection-list))
+       (when (buffer-live-p buffer)
+         (dolist (buf-name `(,(buffer-local-value 'nrepl-repl-buffer buffer)
+                             ,(buffer-local-value 'nrepl-server-buffer buffer)
+                             ,buffer))
+           (when buf-name
+             (cider--close-buffer buf-name)))))))
+
+;;; Connection browser
+(defvar nrepl-connections-buffer-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "d" 'nrepl-connections-make-default)
+    (define-key map "g" 'nrepl-connection-browser)
+    (define-key map (kbd "C-k") 'nrepl-connections-close-connection)
+    (define-key map (kbd "RET") 'nrepl-connections-goto-connection)
+    map))
+
+(define-derived-mode nrepl-connections-buffer-mode cider-popup-buffer-mode
+  "nREPL-Connections"
+  "nREPL Connections Buffer Mode.
+\\{nrepl-connections-buffer-mode-map}
+\\{cider-popup-buffer-mode-map}"
+  (setq-local truncate-lines t))
+
+(defvar nrepl--connection-ewoc)
+(defconst nrepl--connection-browser-buffer-name "*nrepl-connections*")
+
+(defun nrepl-connection-browser ()
+  "Open a browser buffer for nREPL connections."
+  (interactive)
+  (let ((buffer (get-buffer nrepl--connection-browser-buffer-name)))
+    (if buffer
+        (progn
+          (nrepl--connections-refresh-buffer buffer)
+          (unless (get-buffer-window buffer)
+            (select-window (display-buffer buffer))))
+      (nrepl--setup-connection-browser))))
+
+(defun nrepl--connections-refresh ()
+  "Refresh the connections buffer, if the buffer exists.
+The connections buffer is determined by
+`nrepl--connection-browser-buffer-name'"
+  (let ((buffer (get-buffer nrepl--connection-browser-buffer-name)))
+    (when buffer
+      (nrepl--connections-refresh-buffer buffer))))
+
+(defun nrepl--connections-refresh-buffer (buffer)
+  "Refresh the connections BUFFER."
+  (nrepl--update-connections-display
+   (buffer-local-value 'nrepl--connection-ewoc buffer)
+   nrepl-connection-list))
+
+(defun nrepl--setup-connection-browser ()
+  "Create a browser buffer for nREPL connections."
+  (with-current-buffer (get-buffer-create nrepl--connection-browser-buffer-name)
+    (let ((ewoc (ewoc-create
+                         'nrepl--connection-pp
+                         "  Host              Port   Project\n")))
+      (setq-local nrepl--connection-ewoc ewoc)
+      (nrepl--update-connections-display ewoc nrepl-connection-list)
+      (setq buffer-read-only t)
+      (nrepl-connections-buffer-mode)
+      (display-buffer (current-buffer)))))
+
+(defun nrepl--connection-pp (connection)
+  "Print an nREPL CONNECTION to the current buffer."
+  (let* ((buffer-read-only nil)
+                 (buffer (get-buffer connection))
+                 (endpoint (buffer-local-value 'nrepl-endpoint buffer)))
+    (insert
+     (format "%s %-16s %5s   %s"
+             (if (equal connection (car nrepl-connection-list)) "*" " ")
+             (car endpoint)
+             (prin1-to-string (cadr endpoint))
+             (or (nrepl--project-name
+                  (buffer-local-value 'nrepl-project-dir buffer))
+                 "")))))
+
+(defun nrepl--project-name (path)
+  "Extracts a project name from PATH, possibly nil.
+The project name is the final component of PATH if not nil."
+  (when path
+    (file-name-nondirectory (directory-file-name path))))
+
+(defun nrepl--update-connections-display (ewoc connections)
+  "Update the connections EWOC to show CONNECTIONS."
+  (ewoc-filter ewoc (lambda (n) (member n connections)))
+  (let ((existing))
+    (ewoc-map (lambda (n) (setq existing (cons n existing))) ewoc)
+    (let ((added (-difference connections existing)))
+      (mapc (apply-partially 'ewoc-enter-last ewoc) added)
+      (save-excursion (ewoc-refresh ewoc)))))
+
+(defun nrepl--ewoc-apply-at-point (f)
+  "Apply function F to the ewoc node at point.
+F is a function of two arguments, the ewoc and the data at point."
+  (let* ((ewoc nrepl--connection-ewoc)
+                 (node (and ewoc (ewoc-locate ewoc))))
+    (when node
+      (funcall f ewoc (ewoc-data node)))))
+
+(defun nrepl-connections-make-default ()
+  "Make default the connection at point in the connection browser."
+  (interactive)
+  (save-excursion
+    (nrepl--ewoc-apply-at-point #'nrepl--connections-make-default)))
+
+(defun nrepl--connections-make-default (ewoc data)
+  "Make the connection in EWOC specified by DATA default.
+Refreshes EWOC."
+  (interactive)
+  (nrepl-make-repl-connection-default data)
+  (ewoc-refresh ewoc))
+
+(defun nrepl-connections-close-connection ()
+  "Close connection at point in the connection browser."
+  (interactive)
+  (nrepl--ewoc-apply-at-point #'nrepl--connections-close-connection))
+
+(defun nrepl--connections-close-connection (ewoc data)
+  "Close the connection in EWOC specified by DATA."
+  (nrepl-close (get-buffer data))
+  (nrepl--update-connections-display ewoc nrepl-connection-list))
+
+(defun nrepl-connections-goto-connection ()
+  "Goto connection at point in the connection browser."
+  (interactive)
+  (nrepl--ewoc-apply-at-point #'nrepl--connections-goto-connection))
+
+(defun nrepl--connections-goto-connection (ewoc data)
+  "Goto the REPL for the connection in EWOC specified by DATA."
+  (let ((buffer (buffer-local-value 'nrepl-repl-buffer (get-buffer data))))
+    (when buffer
+      (select-window (display-buffer buffer)))))
+
+;;; server messages
+
+(defun nrepl-current-session ()
+  "Return the current session."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    nrepl-session))
+
+(defun nrepl-current-tooling-session ()
+  "Return the current tooling session."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    nrepl-tooling-session))
+
+(defun nrepl-next-request-id ()
+  "Return the next request id."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (number-to-string (incf nrepl-request-counter))))
+
+(defun nrepl-send-request (request callback)
+  "Send REQUEST and register response handler CALLBACK."
+  (let* ((request-id (nrepl-next-request-id))
+         (request (append (list "id" request-id) request))
+         (message (nrepl-bencode request)))
+    (nrepl-log-event request)
+    (puthash request-id callback nrepl-pending-requests)
+    (nrepl-write-message (nrepl-current-connection-buffer) message)))
+
+(defun nrepl-create-client-session (callback)
+  "Sent a request to create a new client session.
+Response will be handled by CALLBACK."
+  (nrepl-send-request '("op" "clone")
+                      callback))
+
+(defun nrepl-send-stdin (input callback)
+  "Send a stdin message with INPUT.
+Register CALLBACK as the response handler."
+  (nrepl-send-request (list "op" "stdin"
+                            "stdin" input
+                            "session" (nrepl-current-session))
+                      callback))
+
+(defun nrepl-send-interrupt (pending-request-id callback)
+  "Send an interrupt message for PENDING-REQUEST-ID.
+Register CALLBACK as the response handler."
+  (nrepl-send-request (list "op" "interrupt"
+                            "session" (nrepl-current-session)
+                            "interrupt-id" pending-request-id)
+                      callback))
+
+(defun nrepl-eval-request (input &optional ns session)
+  "Send a request to eval INPUT.
+If NS is non-nil, include it in the request.
+Use SESSION if it is non-nil, otherwise use the current session."
+  (append (if ns (list "ns" ns))
+          (list
+           "op" "eval"
+           "session" (or session (nrepl-current-session))
+           "code" input)))
+
+(defun nrepl-send-string (input callback &optional ns session)
+  "Send the request INPUT and register the CALLBACK as the response handler.
+See command `nrepl-eval-request' for details on how NS and SESSION are processed."
+  (nrepl-send-request (nrepl-eval-request input ns session) callback))
+
+(defun nrepl-sync-request-handler (buffer)
+  "Make a synchronous request handler for BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (setq nrepl-sync-response
+                                       (plist-put nrepl-sync-response :value value)))
+                               (lambda (buffer out)
+                                 (let ((so-far (plist-get nrepl-sync-response :stdout)))
+                                   (setq nrepl-sync-response
+                                         (plist-put nrepl-sync-response
+                                                    :stdout (concat so-far out)))))
+                               (lambda (buffer err)
+                                 (let ((so-far (plist-get nrepl-sync-response :stderr)))
+                                   (setq nrepl-sync-response
+                                         (plist-put nrepl-sync-response
+                                                    :stderr (concat so-far err)))))
+                               (lambda (buffer)
+                                 (setq nrepl-sync-response
+                                       (plist-put nrepl-sync-response :done t)))))
+
+(defun nrepl-send-request-sync (request)
+  "Send REQUEST to the backend synchronously (discouraged).
+The result is a plist with keys :value, :stderr and :stdout."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (setq nrepl-sync-response nil)
+    (nrepl-send-request request (nrepl-sync-request-handler (current-buffer)))
+    (while (or (null nrepl-sync-response)
+               (null (plist-get nrepl-sync-response :done)))
+      (accept-process-output nil 0.005))
+    nrepl-sync-response))
+
+(defun nrepl-send-string-sync (input &optional ns session)
+  "Send the INPUT to the backend synchronously.
+See command `nrepl-eval-request' for details about how NS and SESSION
+are processed."
+  (nrepl-send-request-sync (nrepl-eval-request input ns session)))
+
+;;; server
+(defun nrepl-server-filter (process output)
+  "Process nREPL server output from PROCESS contained in OUTPUT."
+  (with-current-buffer (process-buffer process)
+    (save-excursion
+      (goto-char (point-max))
+      (insert output)))
+  (when (string-match "nREPL server started on port \\([0-9]+\\)" output)
+    (let ((port (string-to-number (match-string 1 output))))
+      (message (format "nREPL server started on %s" port))
+      (with-current-buffer (process-buffer process)
+        (let ((nrepl-process (nrepl-connect "localhost" port)))
+          (setq nrepl-connection-buffer
+                (buffer-name (process-buffer nrepl-process)))
+          (with-current-buffer (process-buffer nrepl-process)
+            (setq nrepl-server-buffer
+                  (buffer-name (process-buffer process))
+                  nrepl-project-dir
+                  (buffer-local-value
+                   'nrepl-project-dir (process-buffer process)))))))))
+
+(defun nrepl-server-sentinel (process event)
+  "Handle nREPL server PROCESS EVENT."
+  (let* ((b (process-buffer process))
+         (connection-buffer (buffer-local-value 'nrepl-connection-buffer b))
+         (problem (if (and b (buffer-live-p b))
+                      (with-current-buffer b
+                        (buffer-substring (point-min) (point-max)))
+                    "")))
+    (when b
+      (kill-buffer b))
+    (cond
+     ((string-match "^killed" event)
+      nil)
+     ((string-match "^hangup" event)
+      (when connection-buffer
+        (nrepl-close connection-buffer)))
+     ((string-match "Wrong number of arguments to repl task" problem)
+      (error "Leiningen 2.x is required by nREPL.el"))
+     (t (error "Could not start nREPL server: %s" problem)))))
+
+(defun nrepl-current-dir ()
+  "Return the directory of the current buffer."
+  (let ((file-name (buffer-file-name (current-buffer))))
+    (or (when file-name
+          (file-name-directory file-name))
+        list-buffers-directory)))
+
+(defun nrepl-project-directory-for (dir-name)
+  "Return the project directory for the specified DIR-NAME."
+  (when dir-name
+    (locate-dominating-file dir-name "project.clj")))
+
+(defun nrepl-check-for-repl-buffer (endpoint project-directory)
+  "Check whether a matching connection buffer already exists.
+Looks for buffers where `nrepl-endpoint' matches ENDPOINT,
+or `nrepl-project-dir' matches PROJECT-DIRECTORY.
+If so ask the user for confirmation."
+  (if (cl-find-if
+       (lambda (buffer)
+         (let ((buffer (get-buffer buffer)))
+           (or (and endpoint
+                    (equal endpoint
+                           (buffer-local-value 'nrepl-endpoint buffer)))
+               (and project-directory
+                    (equal project-directory
+                           (buffer-local-value 'nrepl-project-dir buffer))))))
+       (nrepl-connection-buffers))
+      (y-or-n-p
+       "An nREPL connection buffer already exists.  Do you really want to create a new one? ")
+    t))
+
+(defun nrepl-close (connection-buffer)
+  "Close the nrepl connection for CONNECTION-BUFFER."
+  (interactive (list (nrepl-current-connection-buffer)))
+  (nrepl--close-connection-buffer connection-buffer)
+  (run-hooks 'nrepl-disconnected-hook)
+  (nrepl--connections-refresh))
+
+;;; client
+(defun nrepl-op-supported-p (op)
+  "Return t iff the given operation OP is supported by nREPL server."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (if (and nrepl-ops (assoc op nrepl-ops))
+        t)))
+
+(defun nrepl-describe-handler (process-buffer)
+  "Return a handler to describe into PROCESS-BUFFER."
+  (lexical-let ((buffer process-buffer))
+    (lambda (response)
+      (nrepl-dbind-response response (ops)
+        (cond (ops
+               (with-current-buffer buffer
+                 (setq nrepl-ops ops))))))))
+
+(defun nrepl-describe-session (process)
+  "Peform describe for the given server PROCESS."
+  (let ((buffer (process-buffer process)))
+    (nrepl-send-request (list "op" "describe")
+                        (nrepl-describe-handler buffer))))
+
+(defun nrepl-setup-default-namespaces (process)
+  "Setup default namespaces for PROCESS."
+  (let ((buffer (process-buffer process)))
+    (with-current-buffer buffer
+      (nrepl-send-string
+       nrepl-repl-requires-sexp
+       (nrepl-make-response-handler
+        buffer nil
+        (lambda (buffer out) (message out))
+        (lambda (buffer err) (message err))
+        nil)
+       nrepl-buffer-ns
+       nrepl-tooling-session))))
+
+(defun nrepl-new-tooling-session-handler (process)
+  "Create a new tooling session handler for PROCESS."
+  (lexical-let ((process process))
+    (lambda (response)
+      (nrepl-dbind-response response (id new-session)
+        (cond (new-session
+               (with-current-buffer (process-buffer process)
+                 (setq nrepl-tooling-session new-session)
+                 (remhash id nrepl-pending-requests)
+                 (nrepl-setup-default-namespaces process))))))))
+
+(defun nrepl-new-session-handler (process no-repl-p)
+  "Create a new session handler for PROCESS.
+When NO-REPL-P is truthy, suppress creation of a REPL buffer."
+  (lexical-let ((process process)
+                (no-repl-p no-repl-p))
+    (lambda (response)
+      (nrepl-dbind-response response (id new-session)
+        (remhash id nrepl-pending-requests)
+        (cond (new-session
+               (lexical-let ((connection-buffer (process-buffer process)))
+                 (setq nrepl-session new-session
+                       nrepl-connection-buffer connection-buffer)
+                 (unless no-repl-p
+                   (cider-make-repl process)
+                   (nrepl-make-repl-connection-default connection-buffer))
+                 (run-hooks 'nrepl-connected-hook))))))))
+
+(defun nrepl-init-client-sessions (process no-repl-p)
+  "Initialize client sessions for PROCESS.
+When NO-REPL-P is truthy, suppress creation of a REPL buffer."
+  (nrepl-create-client-session (nrepl-new-session-handler process no-repl-p))
+  (nrepl-create-client-session (nrepl-new-tooling-session-handler process)))
+
+(defun nrepl-connect (host port &optional no-repl-p)
+  "Connect to a running nREPL server running on HOST and PORT.
+When NO-REPL-P is truthy, suppress creation of a REPL buffer."
+  (message "Connecting to nREPL on %s:%s..." host port)
+  (let* ((nrepl-endpoint `(,host ,port))
+         (process (open-network-stream "nrepl"
+                                       (nrepl-make-connection-buffer) host
+                                       port)))
+    (set-process-filter process 'nrepl-net-filter)
+    (set-process-sentinel process 'nrepl-sentinel)
+    (set-process-coding-system process 'utf-8-unix 'utf-8-unix)
+    (with-current-buffer (process-buffer process)
+      (setq nrepl-endpoint `(,host ,port)))
+    (let ((nrepl-connection-dispatch (buffer-name (process-buffer process))))
+      (nrepl-init-client-sessions process no-repl-p)
+      (nrepl-describe-session process))
+    process))
+
+(defun nrepl--port-from-file (file)
+  "Attempts to read port from a file named by FILE."
+  (let* ((dir (nrepl-project-directory-for (nrepl-current-dir)))
+         (f (expand-file-name file dir)))
+    (when (file-exists-p f)
+      (with-temp-buffer
+        (insert-file-contents f)
+        (buffer-string)))))
+
+(defun nrepl-default-port ()
+  "Attempt to read port from .nrepl-port or target/repl-port.
+Falls back to `nrepl-port' if not found."
+  (or (nrepl--port-from-file ".nrepl-port")
+      (nrepl--port-from-file "target/repl-port")
+      nrepl-port))
+
+(provide 'nrepl-client)
+;;; nrepl-client.el ends here
diff --git a/elpa/cl-lib-0.3/cl-lib-autoloads.el b/elpa/cl-lib-0.3/cl-lib-autoloads.el
index 621a7c328..7bc29b5a9 100644
--- a/elpa/cl-lib-0.3/cl-lib-autoloads.el
+++ b/elpa/cl-lib-0.3/cl-lib-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("cl-lib-pkg.el" "cl-lib.el") (21124 57424
-;;;;;;  300260))
+;;;### (autoloads nil nil ("cl-lib-pkg.el" "cl-lib.el") (21016 60933
+;;;;;;  954335))
 
 ;;;***
 
diff --git a/elpa/cl-lib-0.3/cl-lib-pkg.elc b/elpa/cl-lib-0.3/cl-lib-pkg.elc
index 406e667f6..005eecc0d 100644
Binary files a/elpa/cl-lib-0.3/cl-lib-pkg.elc and b/elpa/cl-lib-0.3/cl-lib-pkg.elc differ
diff --git a/elpa/cl-lib-0.3/cl-lib.elc b/elpa/cl-lib-0.3/cl-lib.elc
index f4c19e0a0..2fa851b51 100644
Binary files a/elpa/cl-lib-0.3/cl-lib.elc and b/elpa/cl-lib-0.3/cl-lib.elc differ
diff --git a/elpa/clojure-mode-2.1.0/clojure-mode-pkg.el b/elpa/clojure-mode-2.1.0/clojure-mode-pkg.el
deleted file mode 100644
index 08a51aff3..000000000
--- a/elpa/clojure-mode-2.1.0/clojure-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "clojure-mode" "2.1.0" "Major mode for Clojure code" (quote nil))
diff --git a/elpa/clojure-mode-2.1.0/clojure-mode.elc b/elpa/clojure-mode-2.1.0/clojure-mode.elc
deleted file mode 100644
index 8959f0e31..000000000
Binary files a/elpa/clojure-mode-2.1.0/clojure-mode.elc and /dev/null differ
diff --git a/elpa/clojure-mode-2.1.0/clojure-mode-autoloads.el b/elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
similarity index 76%
rename from elpa/clojure-mode-2.1.0/clojure-mode-autoloads.el
rename to elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
index 9e9a22859..cbb749e23 100644
--- a/elpa/clojure-mode-2.1.0/clojure-mode-autoloads.el
+++ b/elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads (clojure-mode) "clojure-mode" "clojure-mode.el"
-;;;;;;  (21031 23292 0 0))
+;;;;;;  (21184 20178))
 ;;; Generated autoloads from clojure-mode.el
 
 (autoload 'clojure-mode "clojure-mode" "\
@@ -21,11 +21,11 @@ if that value is non-nil.
 
 \(fn)" t nil)
 
-(put 'clojure-test-ns-segment-position 'safe-local-variable 'integerp)
+(add-to-list 'auto-mode-alist '("\\.clj[sx]?\\'" . clojure-mode))
 
-(put 'clojure-mode-load-command 'safe-local-variable 'stringp)
+(add-to-list 'auto-mode-alist '("\\.dtm\\'" . clojure-mode))
 
-(add-to-list 'auto-mode-alist '("\\.clj\\'" . clojure-mode))
+(add-to-list 'auto-mode-alist '("\\.edn\\'" . clojure-mode))
 
 (add-to-list 'interpreter-mode-alist '("jark" . clojure-mode))
 
@@ -33,8 +33,7 @@ if that value is non-nil.
 
 ;;;***
 
-;;;### (autoloads nil nil ("clojure-mode-pkg.el") (21031 23292 849530
-;;;;;;  0))
+;;;### (autoloads nil nil ("clojure-mode-pkg.el") (21184 20178 859650))
 
 ;;;***
 
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el
new file mode 100644
index 000000000..eebb5c9d0
--- /dev/null
+++ b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "clojure-mode" "20131227.1044" "Major mode for Clojure code" (quote nil))
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc
new file mode 100644
index 000000000..dc4b76150
Binary files /dev/null and b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc differ
diff --git a/elpa/clojure-mode-2.1.0/clojure-mode.el b/elpa/clojure-mode-20131227.1044/clojure-mode.el
similarity index 71%
rename from elpa/clojure-mode-2.1.0/clojure-mode.el
rename to elpa/clojure-mode-20131227.1044/clojure-mode.el
index 83f59c681..27967f20b 100644
--- a/elpa/clojure-mode-2.1.0/clojure-mode.el
+++ b/elpa/clojure-mode-20131227.1044/clojure-mode.el
@@ -1,12 +1,13 @@
 ;;; clojure-mode.el --- Major mode for Clojure code
 
-;; Copyright © 2007-2013 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
+;; Copyright © 2007-2013 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
 ;;
-;; Authors: Jeffrey Chu <jochu0@gmail.com>
-;;          Lennart Staflin <lenst@lysator.liu.se>
-;;          Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://github.com/technomancy/clojure-mode
-;; Version: 2.1.0
+;; Author: Jeffrey Chu <jochu0@gmail.com>
+;;         Lennart Staflin <lenst@lysator.liu.se>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;; URL: http://github.com/clojure-emacs/clojure-mode
+;; Version: 20131227.1044
+;; X-Original-Version: 2.1.1
 ;; Keywords: languages, lisp
 
 ;; This file is not part of GNU Emacs.
@@ -14,20 +15,20 @@
 ;;; Commentary:
 
 ;; Provides font-lock, indentation, and navigation for the Clojure
-;; language. (http://clojure.org)
+;; programming language (http://clojure.org).
 
 ;; Users of older Emacs (pre-22) should get version 1.4:
-;; http://github.com/technomancy/clojure-mode/tree/1.4
+;; http://github.com/clojure-emacs/clojure-mode/tree/1.4
 
 ;; Slime integration has been removed; see the 1.x releases if you need it.
 
-;; Using clojure-mode with paredit is highly recommended. Use paredit
+;; Using clojure-mode with paredit is highly recommended.  Use paredit
 ;; as you would with any other minor mode; for instance:
 ;;
 ;;   ;; require or autoload paredit-mode
 ;;   (add-hook 'clojure-mode-hook 'paredit-mode)
 
-;; See nREPL.el (http://github.com/kingtim/nrepl.el) for
+;; See CIDER (http://github.com/clojure-emacs/cider) for
 ;; better interaction with subprocesses via nREPL.
 
 ;;; License:
@@ -49,10 +50,20 @@
 
 ;;; Code:
 
+
+;;; Compatibility
+(eval-and-compile
+  ;; `setq-local' for Emacs 24.2 and below
+  (unless (fboundp 'setq-local)
+    (defmacro setq-local (var val)
+      "Set variable VAR to value VAL in current buffer."
+      `(set (make-local-variable ',var) ,val))))
+
 (eval-when-compile
   (defvar calculate-lisp-indent-last-sexp)
   (defvar font-lock-beg)
   (defvar font-lock-end)
+  (defvar paredit-space-for-delimiter-predicates)
   (defvar paredit-version)
   (defvar paredit-mode))
 
@@ -60,6 +71,7 @@
 (require 'tramp)
 (require 'inf-lisp)
 (require 'imenu)
+(require 'easymenu)
 
 (declare-function clojure-test-jump-to-implementation  "clojure-test-mode.el")
 
@@ -89,7 +101,7 @@
        (1 font-lock-keyword-face)
        (2 font-lock-function-name-face nil t))
 
-      (,(concat "(\\(\\(?:[a-z\.-]+/\\)?def\[a-z\]*-?\\)"
+      (,(concat "(\\(\\(?:[a-z\.-]+/\\)?def\[a-z\-\]*-?\\)"
                 ;; Function declarations.
                 "\\>"
                 ;; Any whitespace
@@ -140,7 +152,7 @@
         ">=" "accessor" "aclone"
         "agent" "agent-errors" "aget" "alength" "alias"
         "all-ns" "alter" "alter-meta!" "alter-var-root" "amap"
-        "ancestors" "and" "apply" "areduce" "array-map"
+        "ancestors" "and" "apply" "areduce" "array-map" "as->"
         "aset" "aset-boolean" "aset-byte" "aset-char" "aset-double"
         "aset-float" "aset-int" "aset-long" "aset-short" "assert"
         "assoc" "assoc!" "assoc-in" "associative?" "atom"
@@ -155,7 +167,7 @@
         "chunk-next" "chunk-rest" "chunked-seq?" "class" "class?"
         "clear-agent-errors" "clojure-version" "coll?" "comment" "commute"
         "comp" "comparator" "compare" "compare-and-set!" "compile"
-        "complement" "concat" "cond" "condp" "conj"
+        "complement" "concat" "cond" "condp" "cond->" "cond->>" "conj"
         "conj!" "cons" "constantly" "construct-proxy" "contains?"
         "count" "counted?" "create-ns" "create-struct" "cycle"
         "dec" "decimal?" "declare" "definline" "defmacro"
@@ -167,8 +179,8 @@
         "doto" "double" "double-array" "doubles" "drop"
         "drop-last" "drop-while" "empty" "empty?" "ensure"
         "enumeration-seq" "eval" "even?" "every?"
-        "extend" "extend-protocol" "extend-type" "extends?" "extenders"
-        "false?" "ffirst" "file-seq" "filter" "find" "find-doc"
+        "extend" "extend-protocol" "extend-type" "extends?" "extenders" "ex-info" "ex-data"
+        "false?" "ffirst" "file-seq" "filter" "filterv" "find" "find-doc"
         "find-ns" "find-var" "first" "flatten" "float" "float-array"
         "float?" "floats" "flush" "fn" "fn?"
         "fnext" "for" "force" "format" "future"
@@ -185,7 +197,7 @@
         "line-seq" "list" "list*" "list?" "load"
         "load-file" "load-reader" "load-string" "loaded-libs" "locking"
         "long" "long-array" "longs" "loop" "macroexpand"
-        "macroexpand-1" "make-array" "make-hierarchy" "map" "map?"
+        "macroexpand-1" "make-array" "make-hierarchy" "map" "mapv" "map?"
         "map-indexed" "mapcat" "max" "max-key" "memfn" "memoize"
         "merge" "merge-with" "meta" "method-sig" "methods"
         "min" "min-key" "mod" "name" "namespace"
@@ -205,16 +217,17 @@
         "pvalues" "quot" "rand" "rand-int" "range"
         "ratio?" "rational?" "rationalize" "re-find" "re-groups"
         "re-matcher" "re-matches" "re-pattern" "re-seq" "read"
-        "read-line" "read-string" "reify" "reduce" "ref" "ref-history-count"
+        "read-line" "read-string" "reify" "reduce" "reduce-kv" "ref" "ref-history-count"
         "ref-max-history" "ref-min-history" "ref-set" "refer" "refer-clojure"
         "release-pending-sends" "rem" "remove" "remove-method" "remove-ns"
         "repeat" "repeatedly" "replace" "replicate"
         "require" "reset!" "reset-meta!" "resolve" "rest"
         "resultset-seq" "reverse" "reversible?" "rseq" "rsubseq"
-        "satisfies?" "second" "select-keys" "send" "send-off" "seq"
+        "satisfies?" "second" "select-keys" "send" "send-off" "send-via" "seq"
         "seq?" "seque" "sequence" "sequential?" "set"
+        "set-agent-send-executor!" "set-agent-send-off-executor!"
         "set-validator!" "set?" "short" "short-array" "shorts"
-        "shutdown-agents" "slurp" "some" "sort" "sort-by"
+        "shutdown-agents" "slurp" "some" "some->" "some->>" "sort" "sort-by"
         "sorted-map" "sorted-map-by" "sorted-set" "sorted-set-by" "sorted?"
         "special-form-anchor" "special-symbol?" "spit" "split-at" "split-with" "str"
         "stream?" "string?" "struct" "struct-map" "subs"
@@ -229,7 +242,8 @@
         "var?" "vary-meta" "vec" "vector" "vector?"
         "when" "when-first" "when-let" "when-not" "while"
         "with-bindings" "with-bindings*" "with-in-str" "with-loading-context" "with-local-vars"
-        "with-meta" "with-open" "with-out-str" "with-precision" "xml-seq" "zipmap"
+        "with-meta" "with-open" "with-out-str" "with-precision"
+        "with-redefs" "with-redefs-fn" "xml-seq" "zero?" "zipmap"
         ) t)
          "\\>")
        1 font-lock-builtin-face)
@@ -272,57 +286,86 @@
         "rightmost" "rights" "root" "seq-zip" "up"
         ) t)
          "\\>")
-       1 font-lock-type-face)
+       1 font-lock-builtin-face)
       ;; Constant values (keywords), including as metadata e.g. ^:static
-      ("\\<^?:\\(\\sw\\|#\\)+\\>" 0 font-lock-constant-face)
-      ;; Meta type annotation #^Type or ^Type
-      ("#?^\\sw+" 0 font-lock-preprocessor-face)
-      ("\\<io\\!\\>" 0 font-lock-warning-face)
+      ("\\<^?:\\(\\sw\\|\\s_\\)+\\(\\>\\|\\_>\\)" 0 font-lock-constant-face)
+      ;; Meta type hint #^Type or ^Type
+      ("\\(#?^\\)\\(\\(\\sw\\|\\s_\\)+\\)"
+       (1 font-lock-preprocessor-face)
+       (2 font-lock-type-face))
 
       ;;Java interop highlighting
       ("\\<\\.-?[a-z][a-zA-Z0-9]*\\>" 0 font-lock-preprocessor-face) ;; .foo .barBaz .qux01 .-flibble .-flibbleWobble
       ("\\<[A-Z][a-zA-Z0-9_]*[a-zA-Z0-9/$_]+\\>" 0 font-lock-preprocessor-face) ;; Foo Bar$Baz Qux_ World_OpenUDP
       ("\\<[a-zA-Z]+\\.[a-zA-Z0-9._]*[A-Z]+[a-zA-Z0-9/.$]*\\>" 0 font-lock-preprocessor-face) ;; Foo/Bar foo.bar.Baz foo.Bar/baz
       ("[a-z]*[A-Z]+[a-z][a-zA-Z0-9$]*\\>" 0 font-lock-preprocessor-face) ;; fooBar
-      ("\\<[A-Z][a-zA-Z0-9$]*\\.\\>" 0 font-lock-preprocessor-face))) ;; Foo. BarBaz. Qux$Quux. Corge9.
-
-
+      ("\\<[A-Z][a-zA-Z0-9$]*\\.\\>" 0 font-lock-type-face) ;; Foo. BarBaz. Qux$Quux. Corge9.
+      ;; Highlight grouping constructs in regular expressions
+      (clojure-mode-font-lock-regexp-groups
+       (1 'font-lock-regexp-grouping-construct prepend))))
   "Default expressions to highlight in Clojure mode.")
 
-(defgroup clojure-mode nil
+(defgroup clojure nil
   "A mode for Clojure"
-  :prefix "clojure-mode-"
-  :group 'applications)
+  :prefix "clojure-"
+  :group 'languages
+  :link '(url-link :tag "Github" "https://github.com/clojure-emacs/clojure-mode")
+  :link '(emacs-commentary-link :tag "Commentary" "clojure-mode"))
 
-(defcustom clojure-mode-font-lock-comment-sexp nil
+(defcustom clojure-font-lock-comment-sexp nil
   "Set to non-nil in order to enable font-lock of (comment...)
-forms. This option is experimental. Changing this will require a
+forms.  This option is experimental.  Changing this will require a
 restart (ie. M-x clojure-mode) of existing clojure mode buffers."
   :type 'boolean
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'booleanp)
 
-(defcustom clojure-mode-load-command  "(clojure.core/load-file \"%s\")\n"
+(defcustom clojure-load-command  "(clojure.core/load-file \"%s\")\n"
   "*Format-string for building a Clojure expression to load a file.
 This format string should use `%s' to substitute a file name
 and should result in a Clojure expression that will command the inferior
 Clojure to load that file."
   :type 'string
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'stringp)
 
-(defcustom clojure-mode-inf-lisp-command "lein repl"
+(defcustom clojure-inf-lisp-command "lein repl"
   "The command used by `inferior-lisp-program'."
   :type 'string
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'stringp)
+
+(defcustom clojure-defun-style-default-indent nil
+  "Default indenting of function and macro forms using defun rules unless
+otherwise defined via `put-clojure-indent`, `define-clojure-indent`, etc."
+  :type 'boolean
+  :group 'clojure
+  :safe 'booleanp)
 
-(defcustom clojure-mode-use-backtracking-indent t
+(defcustom clojure-use-backtracking-indent t
   "Set to non-nil to enable backtracking/context sensitive indentation."
   :type 'boolean
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'booleanp)
 
 (defcustom clojure-max-backtracking 3
   "Maximum amount to backtrack up a list to check for context."
   :type 'integer
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'integerp)
+
+(defcustom clojure-omit-space-between-tag-and-delimiters (list ?\[ ?\{)
+  "List of opening delimiter characters allowed to appear
+immediately after a reader literal tag with no space, as
+in :db/id[:db.part/user]"
+  :type '(set (const :tag "[" ?\[)
+              (const :tag "{" ?\{)
+              (const :tag "(" ?\()
+              (const :tag "\"" ?\"))
+  :group 'clojure
+  :safe (lambda (value)
+          (and (listp value)
+               (every 'characterp value))))
 
 (defvar clojure-mode-map
   (let ((map (make-sparse-keymap)))
@@ -335,8 +378,24 @@ Clojure to load that file."
     (define-key map (kbd "C-c C-t") 'clojure-jump-between-tests-and-code)
     (define-key map (kbd "C-c C-z") 'clojure-display-inferior-lisp-buffer)
     (define-key map (kbd "C-c M-q") 'clojure-fill-docstring)
+    (define-key map (kbd "C-:") 'clojure-toggle-keyword-string)
     map)
-  "Keymap for Clojure mode. Inherits from `lisp-mode-shared-map'.")
+  "Keymap for Clojure mode.  Inherits from `lisp-mode-shared-map'.")
+
+(easy-menu-define clojure-mode-menu clojure-mode-map
+  "Menu for Clojure mode."
+  '("Clojure"
+    ["Eval Function Definition" lisp-eval-defun]
+    ["Eval Last Sexp" lisp-eval-last-sexp]
+    ["Eval Region" lisp-eval-region]
+    "--"
+    ["Run Inferior Lisp" clojure-display-inferior-lisp-buffer]
+    ["Display Inferior Lisp Buffer" clojure-display-inferior-lisp-buffer]
+    ["Load File" clojure-load-file]
+    "--"
+    ["Toggle between string & keyword" clojure-toggle-keyword-string]
+    ["Fill Docstring" clojure-fill-docstring]
+    ["Jump Between Test and Code" clojure-jump-between-tests-and-code]))
 
 (defvar clojure-mode-syntax-table
   (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
@@ -349,13 +408,10 @@ Clojure to load that file."
     (modify-syntax-entry ?\[ "(]" table)
     (modify-syntax-entry ?\] ")[" table)
     (modify-syntax-entry ?^ "'" table)
+    ;; Make hash a usual word character
+    (modify-syntax-entry ?# "_ p" table)
     table))
 
-(defvar clojure-mode-abbrev-table nil
-  "Abbrev table used in clojure-mode buffers.")
-
-(define-abbrev-table 'clojure-mode-abbrev-table ())
-
 (defvar clojure-prev-l/c-dir/file nil
   "Record last directory and file used in loading or compiling.
 This holds a cons cell of the form `(DIRECTORY . FILE)'
@@ -370,7 +426,7 @@ numbers count from the end:
   leiningen.compile -> leiningen.test.compile (uses 1)
   clojure.http.client -> clojure.http.test.client (uses -1)")
 
-(defvar clojure-mode-version "2.1.0"
+(defconst clojure-mode-version "2.1.0"
   "The current version of `clojure-mode'.")
 
 (defun clojure-mode-display-version ()
@@ -382,6 +438,40 @@ numbers count from the end:
 (defalias 'clojure-parent-mode
   (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
 
+(defun clojure-space-for-delimiter-p (endp delim)
+  "Prevent paredit from inserting unneeded spaces."
+  (if (derived-mode-p 'clojure-mode)
+      (save-excursion
+        (backward-char)
+        (if (and (or (char-equal delim ?\()
+                     (char-equal delim ?\")
+                     (char-equal delim ?{))
+                 (not endp))
+            (if (char-equal (char-after) ?#)
+                (and (not (bobp))
+                     (or (char-equal ?w (char-syntax (char-before)))
+                         (char-equal ?_ (char-syntax (char-before)))))
+              t)
+          t))
+    t))
+
+(defun clojure-no-space-after-tag (endp delimiter)
+  "Do not insert a space between a reader-literal tag and an
+  opening delimiter in the list
+  clojure-omit-space-between-tag-and-delimiters. Allows you to
+  write things like #db/id[:db.part/user] without inserting a
+  space between the tag and the opening bracket."
+  (if endp
+      t
+    (or (not (member delimiter clojure-omit-space-between-tag-and-delimiters))
+        (save-excursion
+          (let ((orig-point (point)))
+            (not (and (re-search-backward
+                       "#\\([a-zA-Z0-9._-]+/\\)?[a-zA-Z0-9._-]+"
+                       (line-beginning-position)
+                       t)
+                      (= orig-point (match-end 0)))))))))
+
 ;;;###autoload
 (define-derived-mode clojure-mode clojure-parent-mode "Clojure"
   "Major mode for editing Clojure code - similar to Lisp mode.
@@ -394,29 +484,31 @@ or to switch back to an existing one.
 
 Entry to this mode calls the value of `clojure-mode-hook'
 if that value is non-nil."
-  (set (make-local-variable 'imenu-create-index-function)
-       (lambda ()
-         (imenu--generic-function '((nil clojure-match-next-def 0)))))
-  (set (make-local-variable 'indent-tabs-mode) nil)
+  (setq-local imenu-create-index-function
+              (lambda ()
+                (imenu--generic-function '((nil clojure-match-next-def 0)))))
+  (setq-local indent-tabs-mode nil)
   (lisp-mode-variables nil)
-  (set (make-local-variable 'comment-start-skip)
-       "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
-  (set (make-local-variable 'lisp-indent-function)
-       'clojure-indent-function)
+  (setq-local comment-start-skip
+              "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
+  (setq-local lisp-indent-function 'clojure-indent-function)
   (when (< emacs-major-version 24)
-    (set (make-local-variable 'forward-sexp-function)
-         'clojure-forward-sexp))
-  (set (make-local-variable 'lisp-doc-string-elt-property)
-       'clojure-doc-string-elt)
-  (set (make-local-variable 'inferior-lisp-program) clojure-mode-inf-lisp-command)
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+    (setq-local forward-sexp-function 'clojure-forward-sexp))
+  (setq-local lisp-doc-string-elt-property 'clojure-doc-string-elt)
+  (setq-local inferior-lisp-program clojure-inf-lisp-command)
+  (setq-local parse-sexp-ignore-comments t)
 
   (clojure-mode-font-lock-setup)
+  (setq-local open-paren-in-column-0-is-defun-start nil)
   (add-hook 'paredit-mode-hook
             (lambda ()
               (when (>= paredit-version 21)
                 (define-key clojure-mode-map "{" 'paredit-open-curly)
-                (define-key clojure-mode-map "}" 'paredit-close-curly)))))
+                (define-key clojure-mode-map "}" 'paredit-close-curly)
+                (add-to-list 'paredit-space-for-delimiter-predicates
+                             'clojure-space-for-delimiter-p)
+                (add-to-list 'paredit-space-for-delimiter-predicates
+                             'clojure-no-space-after-tag)))))
 
 (defun clojure-display-inferior-lisp-buffer ()
   "Display a buffer bound to `inferior-lisp-buffer'."
@@ -426,7 +518,7 @@ if that value is non-nil."
       (run-lisp inferior-lisp-program)))
 
 (defun clojure-load-file (file-name)
-  "Load a Lisp file into the inferior Lisp process."
+  "Load a Clojure file FILE-NAME into the inferior Clojure process."
   (interactive (comint-get-source "Load Clojure file: "
                                   clojure-prev-l/c-dir/file
                                   '(clojure-mode) t))
@@ -434,7 +526,7 @@ if that value is non-nil."
   (setq clojure-prev-l/c-dir/file (cons (file-name-directory file-name)
                                         (file-name-nondirectory file-name)))
   (comint-send-string (inferior-lisp-proc)
-                      (format clojure-mode-load-command file-name))
+                      (format clojure-load-command file-name))
   (switch-to-lisp t))
 
 
@@ -442,28 +534,39 @@ if that value is non-nil."
 (defun clojure-match-next-def ()
   "Scans the buffer backwards for the next top-level definition.
 Called by `imenu--generic-function'."
-  (when (re-search-backward "^\\s *(def\\S *[ \n\t]+" nil t)
+  (when (re-search-backward "^(def\sw*" nil t)
     (save-excursion
-      (goto-char (match-end 0))
-      (when (looking-at "#?\\^")
-        (let (forward-sexp-function) ; using the built-in one
-          (forward-sexp)))           ; skip the metadata
-      (re-search-forward "[^ \n\t)]+"))))
+      (let (found?
+            (start (point)))
+        (down-list)
+        (forward-sexp)
+        (while (not found?)
+          (forward-sexp)
+          (or (if (char-equal ?[ (char-after (point)))
+                              (backward-sexp))
+                  (if (char-equal ?) (char-after (point)))
+                (backward-sexp)))
+          (destructuring-bind (def-beg . def-end) (bounds-of-thing-at-point 'sexp)
+            (if (char-equal ?^ (char-after def-beg))
+                (progn (forward-sexp) (backward-sexp))
+              (setq found? t)
+              (set-match-data (list def-beg def-end)))))
+        (goto-char start)))))
 
 (defun clojure-mode-font-lock-setup ()
   "Configures font-lock for editing Clojure code."
   (interactive)
-  (set (make-local-variable 'font-lock-multiline) t)
+  (setq-local font-lock-multiline t)
   (add-to-list 'font-lock-extend-region-functions
                'clojure-font-lock-extend-region-def t)
 
-  (when clojure-mode-font-lock-comment-sexp
+  (when clojure-font-lock-comment-sexp
     (add-to-list 'font-lock-extend-region-functions
                  'clojure-font-lock-extend-region-comment t)
     (make-local-variable 'clojure-font-lock-keywords)
     (add-to-list 'clojure-font-lock-keywords
                  'clojure-font-lock-mark-comment t)
-    (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil))
+    (setq-local open-paren-in-column-0-is-defun-start nil))
 
   (setq font-lock-defaults
         '(clojure-font-lock-keywords    ; keywords
@@ -476,9 +579,9 @@ Called by `imenu--generic-function'."
 
 (defun clojure-font-lock-def-at-point (point)
   "Find the position range between the top-most def* and the
-fourth element afterwards. Note that this means there's no
-gaurantee of proper font locking in def* forms that are not at
-top-level."
+fourth element afterwards using POINT.  Note that this means there's no
+guarantee of proper font locking in def* forms that are not at
+top level."
   (goto-char point)
   (condition-case nil
       (beginning-of-defun)
@@ -517,19 +620,54 @@ elements of a def* forms."
                   changed t)))))
     changed))
 
+(defun clojure-mode-font-lock-regexp-groups (bound)
+  "Highlight grouping constructs in regular expression.
+
+BOUND denotes the maximum number of characters (relative to the point) to check."
+  (catch 'found
+    (while (re-search-forward (concat
+                               ;; A group may start using several alternatives:
+                               "\\(\\(?:"
+                               ;; 1. (? special groups
+                               "(\\?\\(?:"
+                               ;; a) non-capturing group (?:X)
+                               ;; b) independent non-capturing group (?>X)
+                               ;; c) zero-width positive lookahead (?=X)
+                               ;; d) zero-width negative lookahead (?!X)
+                               "[:=!>]\\|"
+                               ;; e) zero-width positive lookbehind (?<=X)
+                               ;; f) zero-width negative lookbehind (?<!X)
+                               "<[=!]\\|"
+                               ;; g) named capturing group (?<name>X)
+                               "<[[:alnum:]]+>"
+                               "\\)\\|" ;; end of special groups
+                               ;; 2. normal capturing groups (
+                               ;; 3. we also highlight alternative
+                               ;; separarators |, and closing parens )
+                               "[|()]"
+                               "\\)\\)") bound t)
+      (let ((face (get-text-property (1- (point)) 'face)))
+        (when (and (or (and (listp face)
+                            (memq 'font-lock-string-face face))
+                       (eq 'font-lock-string-face face))
+                   (clojure-string-start t))
+          (throw 'found t))))))
+
 (defun clojure-find-block-comment-start (limit)
-  "Search for (comment...) or #_ style block comments and put
-  point at the beginning of the expression."
+  "Search for (comment...) or #_ style block comments.
+Places point at the beginning of the expression.
+
+LIMIT denotes the maximum number of characters (relative to the point) to check."
   (let ((pos (re-search-forward "\\((comment\\>\\|#_\\)" limit t)))
     (when pos
       (forward-char (- (length (match-string 1))))
       pos)))
 
 (defun clojure-font-lock-extend-region-comment ()
-  "Move fontification boundaries to always contain
-  entire (comment ..) and #_ sexp. Does not work if you have a
-  white-space between ( and comment, but that is omitted to make
-  this run faster."
+  "Move fontification boundaries to always contain entire (comment ..) and #_ sexp.
+
+Does not work if you have a  whitespace between ( and comment, but that is omitted to make
+this run faster."
   (let ((changed nil))
     (goto-char font-lock-beg)
     (condition-case nil (beginning-of-defun) (error nil))
@@ -545,7 +683,9 @@ elements of a def* forms."
     changed))
 
 (defun clojure-font-lock-mark-comment (limit)
-  "Marks all (comment ..) and #_ forms with font-lock-comment-face."
+  "Mark all (comment ..) and #_ forms with `font-lock-comment-face'.
+
+LIMIT denotes the maximum number of characters (relative to the point) to check."
   (let (pos)
     (while (and (< (point) limit)
                 (setq pos (clojure-find-block-comment-start limit)))
@@ -644,6 +784,10 @@ This function also returns nil meaning don't specify the indentation."
                (goto-char open-paren)
                (1+ (current-column)))
               ((or (eq method 'defun)
+                   (and clojure-defun-style-default-indent
+                        ;; largely to preserve useful alignment of :require, etc in ns
+                        (not (string-match "^:" function))
+                        (not method))
                    (and (null method)
                         (> (length function) 3)
                         (string-match "\\`\\(?:\\S +/\\)?\\(def\\|with-\\)"
@@ -655,13 +799,14 @@ This function also returns nil meaning don't specify the indentation."
                                      indent-point normal-indent))
               (method
                (funcall method indent-point state))
-              (clojure-mode-use-backtracking-indent
+              (clojure-use-backtracking-indent
                (clojure-backtracking-indent
                 indent-point state normal-indent)))))))
 
 (defun clojure-backtracking-indent (indent-point state normal-indent)
-  "Experimental backtracking support. Will upwards in an sexp to
-check for contextual indenting."
+  "Experimental backtracking support.
+
+Will upwards in an sexp to check for contextual indenting."
   (let (indent (path) (depth 0))
     (goto-char (elt state 1))
     (while (and (not indent)
@@ -736,7 +881,7 @@ get emacs to indent your own macros the same as it does the
 built-ins like with-open. To set manually from lisp code,
 use (put-clojure-indent 'some-symbol 'defun)."
   :type '(repeat symbol)
-  :group 'clojure-mode
+  :group 'clojure
   :set 'add-custom-clojure-indents)
 
 (define-clojure-indent
@@ -797,6 +942,7 @@ use (put-clojure-indent 'some-symbol 'defun)."
   ;; clojure.test
   (testing 1)
   (deftest 'defun)
+  (are 1)
   (use-fixtures 'defun))
 
 
@@ -807,14 +953,23 @@ use (put-clojure-indent 'some-symbol 'defun)."
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun clojure-string-start ()
-  "Return the position of the \" that begins the string at point."
-  (save-excursion
-    (save-match-data
-      ;; Find a quote that appears immediately after whitespace,
-      ;; beginning of line, or an open paren, brace, or bracket
-      (re-search-backward "\\(\\s-\\|^\\|(\\|\\[\\|{\\)\\(\"\\)")
-      (match-beginning 2))))
+(defun clojure-string-start (&optional regex)
+  "Return the position of the \" that begins the string at point.
+If REGEX is non-nil, return the position of the # that begins
+the regex at point.  If point is not inside a string or regex,
+return nil."
+  (when (nth 3 (syntax-ppss)) ;; Are we really in a string?
+    (save-excursion
+      (save-match-data
+        ;; Find a quote that appears immediately after whitespace,
+        ;; beginning of line, hash, or an open paren, brace, or bracket
+        (re-search-backward "\\(\\s-\\|^\\|#\\|(\\|\\[\\|{\\)\\(\"\\)")
+        (let ((beg (match-beginning 2)))
+          (when beg
+            (if regex
+                (and (char-equal ?# (char-before beg)) (1- beg))
+              (when (not (char-equal ?# (char-before beg)))
+                beg))))))))
 
 (defun clojure-char-at-point ()
   "Return the char at point or nil if at buffer end."
@@ -861,14 +1016,42 @@ returned."
   (forward-char)
   (set-mark (clojure-string-end)))
 
-(defun clojure-fill-docstring (&optional argument)
+(defun clojure-toggle-keyword-string ()
+  "Convert the string or keyword at (point) from string->keyword or keyword->string."
+  (interactive)
+  (let* ((original-point (point)))
+    (while (and (> (point) 1)
+                (not (equal "\"" (buffer-substring-no-properties (point) (+ 1 (point)))))
+                (not (equal ":" (buffer-substring-no-properties (point) (+ 1 (point))))))
+      (backward-char))
+    (cond
+     ((equal 1 (point))
+      (message "beginning of file reached, this was probably a mistake."))
+     ((equal "\"" (buffer-substring-no-properties (point) (+ 1 (point))))
+      (insert ":" (substring (clojure-delete-and-extract-sexp) 1 -1)))
+     ((equal ":" (buffer-substring-no-properties (point) (+ 1 (point))))
+      (insert "\"" (substring (clojure-delete-and-extract-sexp) 1) "\"")))
+    (goto-char original-point)))
+
+(defun clojure-delete-and-extract-sexp ()
+  "Delete the sexp and return it."
+  (interactive)
+  (let* ((begin (point)))
+    (forward-sexp)
+    (let* ((result (buffer-substring-no-properties begin (point))))
+      (delete-region begin (point))
+      result)))
+
+(defvar clojure-docstring-indent-level 2)
+
+(defun clojure-fill-docstring ()
   "Fill the definition that the point is on appropriate for Clojure.
 
-  Fills so that every paragraph has a minimum of two initial spaces,
-  with the exception of the first line. Fill margins are taken from
-  paragraph start, so a paragraph that begins with four spaces will
-  remain indented by four spaces after refilling."
-  (interactive "P")
+Fills so that every paragraph has a minimum of two initial spaces,
+with the exception of the first line.  Fill margins are taken from
+paragraph start, so a paragraph that begins with four spaces will
+remain indented by four spaces after refilling."
+  (interactive)
   (if (and (fboundp 'paredit-in-string-p) paredit-mode)
       (unless (paredit-in-string-p)
         (error "Must be inside a string")))
@@ -877,25 +1060,28 @@ returned."
   (let ((old-point (point)))
     (save-restriction
       (save-excursion
-        (let* ((string-region (clojure-docstring-start+end-points))
-               (string-start (1+ (car string-region)))
+        (let* ((clojure-fill-column fill-column)
+               (string-region (clojure-docstring-start+end-points))
+               (string-start (car string-region))
                (string-end (cdr string-region))
-               (string (buffer-substring-no-properties (1+ (car string-region))
-                                                       (cdr string-region))))
+               (string (buffer-substring-no-properties string-start
+                                                       string-end)))
           (delete-region string-start string-end)
           (insert
            (with-temp-buffer
              (insert string)
-             (let ((left-margin 2))
+             (let ((left-margin clojure-docstring-indent-level))
                (delete-trailing-whitespace)
+               (setq fill-column clojure-fill-column)
                (fill-region (point-min) (point-max))
-               (buffer-substring-no-properties (+ 2 (point-min)) (point-max))))))))
+               (buffer-substring-no-properties (+ clojure-docstring-indent-level (point-min)) (point-max))))))))
     (goto-char old-point)))
 
 
 
 (defconst clojure-namespace-name-regex
   (rx line-start
+      (zero-or-more whitespace)
       "("
       (zero-or-one (group (regexp "clojure.core/")))
       (zero-or-one (submatch "in-"))
@@ -939,21 +1125,30 @@ returned."
 
 
 (defun clojure-expected-ns ()
-  "Returns the namespace name that the file should have."
+  "Return the namespace name that the file should have."
   (let* ((project-dir (file-truename
                        (locate-dominating-file default-directory
                                                "project.clj")))
-         (relative (substring (file-truename (buffer-file-name)) (length project-dir) -4)))
+         (relative (substring (file-truename (buffer-file-name))
+                              (length project-dir)
+                              (- (length (file-name-extension (buffer-file-name) t))))))
     (replace-regexp-in-string
      "_" "-" (mapconcat 'identity (cdr (split-string relative "/")) "."))))
 
+(defun clojure-insert-ns-form-at-point ()
+  "Insert a namespace form at point."
+  (interactive)
+  (insert (format "(ns %s)" (clojure-expected-ns))))
+
 (defun clojure-insert-ns-form ()
+  "Insert a namespace form at the beginning of the buffer."
   (interactive)
   (goto-char (point-min))
-  (insert (format "(ns %s)" (clojure-expected-ns))))
+  (clojure-insert-ns-form-at-point))
 
 (defun clojure-update-ns ()
-  "Updates the namespace of the current buffer. Useful if a file has been renamed."
+  "Update the namespace of the current buffer.
+Useful if a file has been renamed."
   (interactive)
   (let ((nsname (clojure-expected-ns)))
     (when nsname
@@ -965,6 +1160,7 @@ returned."
               (error "Namespace not found"))))))))
 
 (defun clojure-find-ns ()
+  "Find the namespace of the current Clojure buffer."
   (let ((regexp clojure-namespace-name-regex))
     (save-restriction
       (save-excursion
@@ -972,18 +1168,23 @@ returned."
         (when (re-search-forward regexp nil t)
           (match-string-no-properties 4))))))
 
-(defalias 'clojure-find-package 'clojure-find-ns)
+(define-obsolete-function-alias 'clojure-find-package 'clojure-find-ns)
 
 ;; Test navigation:
 (defun clojure-in-tests-p ()
+  "Check whether the current file is a test file.
+
+Two checks are made - whether the namespace of the file has the
+word test in it and whether the file lives under the test/ directory."
   (or (string-match-p "test\." (clojure-find-ns))
       (string-match-p "/test" (buffer-file-name))))
 
 (defun clojure-underscores-for-hyphens (namespace)
+  "Replace all hyphens in NAMESPACE with underscores."
   (replace-regexp-in-string "-" "_" namespace))
 
 (defun clojure-test-for (namespace)
-  "Returns the path of the test file for the given namespace."
+  "Return the path of the test file for the given NAMESPACE."
   (let* ((namespace (clojure-underscores-for-hyphens namespace))
          (segments (split-string namespace "\\.")))
     (format "%stest/%s_test.clj"
@@ -992,15 +1193,18 @@ returned."
             (mapconcat 'identity segments "/"))))
 
 (defvar clojure-test-for-fn 'clojure-test-for
-  "Var pointing to the function that will return the full path of the
-Clojure test file for the given namespace.")
+  "The function that will return the full path of the Clojure test file for the given namespace.")
 
 (defun clojure-jump-to-test ()
   "Jump from implementation file to test."
   (interactive)
   (find-file (funcall clojure-test-for-fn (clojure-find-ns))))
 
+(make-obsolete 'clojure-jump-to-test
+               "use projectile or toggle.el instead." "2.1.1")
+
 (defun clojure-jump-between-tests-and-code ()
+  "Jump between implementation and related test file."
   (interactive)
   (if (clojure-in-tests-p)
       (clojure-test-jump-to-implementation)
@@ -1008,10 +1212,9 @@ Clojure test file for the given namespace.")
 
 ;;;###autoload
 (progn
-  (put 'clojure-test-ns-segment-position 'safe-local-variable 'integerp)
-  (put 'clojure-mode-load-command 'safe-local-variable 'stringp)
-
-  (add-to-list 'auto-mode-alist '("\\.clj\\'" . clojure-mode))
+  (add-to-list 'auto-mode-alist '("\\.clj[sx]?\\'" . clojure-mode))
+  (add-to-list 'auto-mode-alist '("\\.dtm\\'" . clojure-mode))
+  (add-to-list 'auto-mode-alist '("\\.edn\\'" . clojure-mode))
   (add-to-list 'interpreter-mode-alist '("jark" . clojure-mode))
   (add-to-list 'interpreter-mode-alist '("cake" . clojure-mode)))
 
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode.elc b/elpa/clojure-mode-20131227.1044/clojure-mode.elc
new file mode 100644
index 000000000..b60d097e0
Binary files /dev/null and b/elpa/clojure-mode-20131227.1044/clojure-mode.elc differ
diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.el b/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.el
deleted file mode 100644
index 7902a228a..000000000
--- a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "clojure-test-mode" "2.1.0" "Minor mode for Clojure tests" (quote ((clojure-mode "1.7") (nrepl "0.1.7"))))
diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode.elc b/elpa/clojure-test-mode-2.1.0/clojure-test-mode.elc
deleted file mode 100644
index b766238e8..000000000
Binary files a/elpa/clojure-test-mode-2.1.0/clojure-test-mode.elc and /dev/null differ
diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-autoloads.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
similarity index 56%
rename from elpa/clojure-test-mode-2.1.0/clojure-test-mode-autoloads.el
rename to elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
index 69c8c694e..92cb91055 100644
--- a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-autoloads.el
+++ b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads (clojure-test-mode) "clojure-test-mode" "clojure-test-mode.el"
-;;;;;;  (21031 23301 0 0))
+;;;### (autoloads (clojure-find-clojure-test clojure-test-mode) "clojure-test-mode"
+;;;;;;  "clojure-test-mode.el" (21184 20189))
 ;;; Generated autoloads from clojure-test-mode.el
 
 (autoload 'clojure-test-mode "clojure-test-mode" "\
@@ -14,16 +14,20 @@ A minor mode for running Clojure tests.
 
 \(fn &optional ARG)" t nil)
 
+(autoload 'clojure-find-clojure-test "clojure-test-mode" "\
+
+
+\(fn)" nil nil)
+
 (defun clojure-test-maybe-enable nil "\
-Enable clojure-test-mode if the current buffer contains a namespace
-with a \"test.\" bit on it." (let ((ns (clojure-find-package))) (when (and ns (string-match "test\\(\\.\\|$\\)" ns)) (save-window-excursion (clojure-test-mode t)))))
+Enable clojure-test-mode if the current buffer contains a \"clojure.test\" bit in it." (when (clojure-find-clojure-test) (save-window-excursion (clojure-test-mode t))))
 
 (add-hook 'clojure-mode-hook 'clojure-test-maybe-enable)
 
 ;;;***
 
-;;;### (autoloads nil nil ("clojure-test-mode-pkg.el") (21031 23301
-;;;;;;  774339 0))
+;;;### (autoloads nil nil ("clojure-test-mode-pkg.el") (21184 20189
+;;;;;;  750997))
 
 ;;;***
 
diff --git a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el
new file mode 100644
index 000000000..5b4e2f9ea
--- /dev/null
+++ b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "clojure-test-mode" "20131227.805" "Minor mode for Clojure tests" (quote ((clojure-mode "1.7") (cider "0.4.0"))))
diff --git a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.elc b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.elc
new file mode 100644
index 000000000..37d2ef2b3
Binary files /dev/null and b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.elc differ
diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
similarity index 93%
rename from elpa/clojure-test-mode-2.1.0/clojure-test-mode.el
rename to elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
index 6d39c6779..127578b2a 100644
--- a/elpa/clojure-test-mode-2.1.0/clojure-test-mode.el
+++ b/elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
@@ -1,12 +1,13 @@
 ;;; clojure-test-mode.el --- Minor mode for Clojure tests
 
-;; Copyright © 2009-2011 Phil Hagelberg
+;; Copyright © 2009-2011 Phil Hagelberg
 
 ;; Author: Phil Hagelberg <technomancy@gmail.com>
 ;; URL: http://emacswiki.org/cgi-bin/wiki/ClojureTestMode
-;; Version: 2.1.0
+;; Version: 20131227.805
+;; X-Original-Version: 3.0.0
 ;; Keywords: languages, lisp, test
-;; Package-Requires: ((clojure-mode "1.7") (nrepl "0.1.7"))
+;; Package-Requires: ((clojure-mode "1.7") (cider "0.4.0"))
 
 ;; This file is not part of GNU Emacs.
 
@@ -95,6 +96,11 @@
 ;; 2.0.0 2012-12-29
 ;;  * Replace slime with nrepl.el
 
+;; 3.0.0 2013-12-27
+;;  * Replace nrepl.el with cider
+;;  * Improve clojure-test-maybe-enable heuristic
+;;  * Obsolete clojure-test-jump-to-implementation in favour of other libs
+
 ;;; TODO:
 
 ;; * Prefix arg to jump-to-impl should open in other window
@@ -109,14 +115,8 @@
 (require 'cl)
 (require 'clojure-mode)
 (require 'which-func)
-(require 'nrepl)
-
-(declare-function nrepl-repl-buffer            "nrepl.el")
-(declare-function nrepl-make-response-handler  "nrepl.el")
-(declare-function nrepl-send-string            "nrepl.el")
-(declare-function nrepl-current-ns             "nrepl.el")
-(declare-function nrepl-current-tooling-session "nrepl.el")
-(declare-function nrepl-current-connection-buffer "nrepl.el")
+(require 'nrepl-client)
+(require 'cider-interaction)
 
 ;; Faces
 
@@ -160,9 +160,6 @@
 
 ;; Support Functions
 
-(defun clojure-test-nrepl-connected-p ()
-  (nrepl-current-connection-buffer))
-
 (defun clojure-test-make-handler (callback)
   (lexical-let ((buffer (current-buffer))
                 (callback callback))
@@ -170,20 +167,20 @@
                                  (lambda (buffer value)
                                    (funcall callback buffer value))
                                  (lambda (buffer value)
-                                   (nrepl-emit-interactive-output value))
+                                   (cider-repl-emit-interactive-output value))
                                  (lambda (buffer err)
-                                   (nrepl-emit-interactive-output err))
+                                   (cider-repl-emit-interactive-output err))
                                  '())))
 
 (defun clojure-test-eval (string &optional handler)
   (nrepl-send-string string
                      (clojure-test-make-handler (or handler #'identity))
-                     (or (nrepl-current-ns) "user")
+                     (or (cider-current-ns) "user")
                      (nrepl-current-tooling-session)))
 
 (defun clojure-test-load-reporting ()
   "Redefine the test-is report function to store results in metadata."
-  (when (clojure-test-nrepl-connected-p)
+  (when (cider-connected-p)
     (nrepl-send-string-sync
      "(ns clojure.test.mode
         (:use [clojure.test :only [file-position *testing-vars* *test-out*
@@ -239,7 +236,7 @@
             (clojure-test-mode-test-one-var ns test-name))
           (do-report {:type :end-test-ns, :ns ns-obj}))
         (do-report (assoc @*report-counters* :type :summary))))"
-     (or (nrepl-current-ns) "user")
+     (or (cider-current-ns) "user")
      (nrepl-current-tooling-session))))
 
 (defun clojure-test-get-results (buffer result)
@@ -295,6 +292,7 @@
         (overlay-put overlay 'face (if (equal event :fail)
                                        'clojure-test-failure-face
                                      'clojure-test-error-face))
+        (overlay-put overlay 'help-echo message)
         (overlay-put overlay 'message message)
         (overlay-put overlay 'actual pp-actual)))))
 
@@ -352,7 +350,7 @@ Clojure src file for the given test namespace.")
   (save-some-buffers nil (lambda () (equal major-mode 'clojure-mode)))
   (message "Testing...")
   (if (not (clojure-in-tests-p))
-      (nrepl-load-file (buffer-file-name)))
+      (cider-load-file (buffer-file-name)))
   (save-window-excursion
     (if (not (clojure-in-tests-p))
         (clojure-jump-to-test))
@@ -460,7 +458,7 @@ Clojure src file for the given test namespace.")
                          (clojure-find-ns))))
     (nrepl-send-string-sync command)))
 
-(defun clojure-test-clear (&optional callback)
+(defun clojure-test-clear ()
   "Remove overlays and clear stored results."
   (interactive)
   (remove-overlays)
@@ -493,7 +491,10 @@ Clojure src file for the given test namespace.")
   "Jump from test file to implementation."
   (interactive)
   (find-file (funcall clojure-test-implementation-for-fn
-                      (clojure-find-package))))
+                      (clojure-find-ns))))
+
+(make-obsolete 'clojure-test-jump-to-implementation
+               "use projectile or toggle.el instead." "3.0.0")
 
 (defvar clojure-test-mode-map
   (let ((map (make-sparse-keymap)))
@@ -516,20 +517,31 @@ Clojure src file for the given test namespace.")
 
 \\{clojure-test-mode-map}"
   nil " Test" clojure-test-mode-map
-  (when (clojure-test-nrepl-connected-p)
+  (when (cider-connected-p)
     (clojure-test-load-reporting)))
 
 (add-hook 'nrepl-connected-hook 'clojure-test-load-reporting)
 
+(defconst clojure-test-regex
+  (rx "clojure.test"))
+
+;;;###autoload
+(defun clojure-find-clojure-test ()
+  (let ((regexp clojure-test-regex))
+    (save-restriction
+      (save-excursion
+        (save-match-data
+          (goto-char (point-min))
+          (when (re-search-forward regexp nil t)
+            (match-string-no-properties 0)))))))
+
 ;;;###autoload
 (progn
   (defun clojure-test-maybe-enable ()
-    "Enable clojure-test-mode if the current buffer contains a namespace
-with a \"test.\" bit on it."
-    (let ((ns (clojure-find-package))) ; defined in clojure-mode.el
-      (when (and ns (string-match "test\\(\\.\\|$\\)" ns))
-        (save-window-excursion
-          (clojure-test-mode t)))))
+    "Enable clojure-test-mode if the current buffer contains a \"clojure.test\" bit in it."
+    (when (clojure-find-clojure-test)
+      (save-window-excursion
+        (clojure-test-mode t))))
 
   (add-hook 'clojure-mode-hook 'clojure-test-maybe-enable))
 
diff --git a/elpa/dash-2.1.0/dash-autoloads.el b/elpa/dash-2.1.0/dash-autoloads.el
new file mode 100644
index 000000000..f055b0ccf
--- /dev/null
+++ b/elpa/dash-2.1.0/dash-autoloads.el
@@ -0,0 +1,18 @@
+;;; dash-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil nil ("dash-pkg.el" "dash.el") (21077 32433
+;;;;;;  641771 0))
+
+;;;***
+
+(provide 'dash-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; dash-autoloads.el ends here
diff --git a/elpa/dash-2.1.0/dash-pkg.el b/elpa/dash-2.1.0/dash-pkg.el
new file mode 100644
index 000000000..823fdf14e
--- /dev/null
+++ b/elpa/dash-2.1.0/dash-pkg.el
@@ -0,0 +1 @@
+(define-package "dash" "2.1.0" "A modern list library for Emacs" (quote nil))
diff --git a/elpa/dash-2.1.0/dash.el b/elpa/dash-2.1.0/dash.el
new file mode 100644
index 000000000..9e803c6db
--- /dev/null
+++ b/elpa/dash-2.1.0/dash.el
@@ -0,0 +1,1125 @@
+;;; dash.el --- A modern list library for Emacs
+
+;; Copyright (C) 2012 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 2.1.0
+;; Keywords: lists
+
+;; 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/>.
+
+;;; Commentary:
+
+;; A modern list api for Emacs.
+;;
+;; See documentation on https://github.com/magnars/dash.el#functions
+
+;;; Code:
+
+(defmacro !cons (car cdr)
+  "Destructive: Sets CDR to the cons of CAR and CDR."
+  `(setq ,cdr (cons ,car ,cdr)))
+
+(defmacro !cdr (list)
+  "Destructive: Sets LIST to the cdr of LIST."
+  `(setq ,list (cdr ,list)))
+
+(defmacro --each (list &rest body)
+  "Anaphoric form of `-each'."
+  (declare (debug t))
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list)
+           (it-index 0))
+       (while ,l
+         (let ((it (car ,l)))
+           ,@body)
+         (setq it-index (1+ it-index))
+         (!cdr ,l)))))
+
+(put '--each 'lisp-indent-function 1)
+
+(defun -each (list fn)
+  "Calls FN with every item in LIST. Returns nil, used for side-effects only."
+  (--each list (funcall fn it)))
+
+(defmacro --each-while (list pred &rest body)
+  "Anaphoric form of `-each-while'."
+  (let ((l (make-symbol "list"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,c t))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred) (setq ,c nil) ,@body))
+         (!cdr ,l)))))
+
+(put '--each-while 'lisp-indent-function 2)
+
+(defun -each-while (list pred fn)
+  "Calls FN with every item in LIST while (PRED item) is non-nil.
+Returns nil, used for side-effects only."
+  (--each-while list (funcall pred it) (funcall fn it)))
+
+(defmacro --dotimes (num &rest body)
+  "Repeatedly executes BODY (presumably for side-effects) with `it` bound to integers from 0 through n-1."
+  `(let ((it 0))
+     (while (< it ,num)
+       ,@body
+       (setq it (1+ it)))))
+
+(put '--dotimes 'lisp-indent-function 1)
+
+(defun -dotimes (num fn)
+  "Repeatedly calls FN (presumably for side-effects) passing in integers from 0 through n-1."
+  (--dotimes num (funcall fn it)))
+
+(defun -map (fn list)
+  "Returns a new list consisting of the result of applying FN to the items in LIST."
+  (mapcar fn list))
+
+(defmacro --map (form list)
+  "Anaphoric form of `-map'."
+  (declare (debug t))
+  `(mapcar (lambda (it) ,form) ,list))
+
+(defmacro --reduce-from (form initial-value list)
+  "Anaphoric form of `-reduce-from'."
+  `(let ((acc ,initial-value))
+     (--each ,list (setq acc ,form))
+     acc))
+
+(defun -reduce-from (fn initial-value list)
+  "Returns the result of applying FN to INITIAL-VALUE and the
+first item in LIST, then applying FN to that result and the 2nd
+item, etc. If LIST contains no items, returns INITIAL-VALUE and
+FN is not called.
+
+In the anaphoric form `--reduce-from', the accumulated value is
+exposed as `acc`."
+  (--reduce-from (funcall fn acc it) initial-value list))
+
+(defmacro --reduce (form list)
+  "Anaphoric form of `-reduce'."
+  (let ((lv (make-symbol "list-value")))
+    `(let ((,lv ,list))
+       (if ,lv
+           (--reduce-from ,form (car ,lv) (cdr ,lv))
+         (let (acc it) ,form)))))
+
+(defun -reduce (fn list)
+  "Returns the result of applying FN to the first 2 items in LIST,
+then applying FN to that result and the 3rd item, etc. If LIST
+contains no items, FN must accept no arguments as well, and
+reduce returns the result of calling FN with no arguments. If
+LIST has only 1 item, it is returned and FN is not called.
+
+In the anaphoric form `--reduce', the accumulated value is
+exposed as `acc`."
+  (if list
+      (-reduce-from fn (car list) (cdr list))
+    (funcall fn)))
+
+(defun -reduce-r-from (fn initial-value list)
+  "Replace conses with FN, nil with INITIAL-VALUE and evaluate
+the resulting expression. If LIST is empty, INITIAL-VALUE is
+returned and FN is not called.
+
+Note: this function works the same as `-reduce-from' but the
+operation associates from right instead of from left."
+  (if (not list) initial-value
+    (funcall fn (car list) (-reduce-r-from fn initial-value (cdr list)))))
+
+(defmacro --reduce-r-from (form initial-value list)
+  "Anaphoric version of `-reduce-r-from'."
+  `(-reduce-r-from (lambda (&optional it acc) ,form) ,initial-value ,list))
+
+(defun -reduce-r (fn list)
+  "Replace conses with FN and evaluate the resulting expression.
+The final nil is ignored. If LIST contains no items, FN must
+accept no arguments as well, and reduce returns the result of
+calling FN with no arguments. If LIST has only 1 item, it is
+returned and FN is not called.
+
+The first argument of FN is the new item, the second is the
+accumulated value.
+
+Note: this function works the same as `-reduce' but the operation
+associates from right instead of from left."
+  (cond
+   ((not list) (funcall fn))
+   ((not (cdr list)) (car list))
+   (t (funcall fn (car list) (-reduce-r fn (cdr list))))))
+
+(defmacro --reduce-r (form list)
+  "Anaphoric version of `-reduce-r'."
+  `(-reduce-r (lambda (&optional it acc) ,form) ,list))
+
+(defmacro --filter (form list)
+  "Anaphoric form of `-filter'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (when ,form (!cons it ,r)))
+       (nreverse ,r))))
+
+(defun -filter (pred list)
+  "Returns a new list of the items in LIST for which PRED returns a non-nil value.
+
+Alias: `-select'"
+  (--filter (funcall pred it) list))
+
+(defalias '-select '-filter)
+(defalias '--select '--filter)
+
+(defmacro --remove (form list)
+  "Anaphoric form of `-remove'."
+  (declare (debug t))
+  `(--filter (not ,form) ,list))
+
+(defun -remove (pred list)
+  "Returns a new list of the items in LIST for which PRED returns nil.
+
+Alias: `-reject'"
+  (--remove (funcall pred it) list))
+
+(defalias '-reject '-remove)
+(defalias '--reject '--remove)
+
+(defmacro --keep (form list)
+  "Anaphoric form of `-keep'."
+  (let ((r (make-symbol "result"))
+        (m (make-symbol "mapped")))
+    `(let (,r)
+       (--each ,list (let ((,m ,form)) (when ,m (!cons ,m ,r))))
+       (nreverse ,r))))
+
+(defun -keep (fn list)
+  "Returns a new list of the non-nil results of applying FN to the items in LIST."
+  (--keep (funcall fn it) list))
+
+(defmacro --map-when (pred rep list)
+  "Anaphoric form of `-map-when'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (!cons (if ,pred ,rep it) ,r))
+       (nreverse ,r))))
+
+(defmacro --map-indexed (form list)
+  "Anaphoric form of `-map-indexed'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list
+         (!cons ,form ,r))
+       (nreverse ,r))))
+
+(defun -map-indexed (fn list)
+  "Returns a new list consisting of the result of (FN index item) for each item in LIST.
+
+In the anaphoric form `--map-indexed', the index is exposed as `it-index`."
+  (--map-indexed (funcall fn it-index it) list))
+
+(defun -map-when (pred rep list)
+  "Returns a new list where the elements in LIST that does not match the PRED function
+are unchanged, and where the elements in LIST that do match the PRED function are mapped
+through the REP function."
+  (--map-when (funcall pred it) (funcall rep it) list))
+
+(defalias '--replace-where '--map-when)
+(defalias '-replace-where '-map-when)
+
+(defun -flatten (l)
+  "Takes a nested list L and returns its contents as a single, flat list."
+  (if (and (listp l) (listp (cdr l)))
+      (-mapcat '-flatten l)
+    (list l)))
+
+(defun -concat (&rest lists)
+  "Returns a new list with the concatenation of the elements in the supplied LISTS."
+  (apply 'append lists))
+
+(defmacro --mapcat (form list)
+  "Anaphoric form of `-mapcat'."
+  (declare (debug t))
+  `(apply 'append (--map ,form ,list)))
+
+(defun -mapcat (fn list)
+  "Returns the concatenation of the result of mapping FN over LIST.
+Thus function FN should return a list."
+  (--mapcat (funcall fn it) list))
+
+(defun -cons* (&rest args)
+  "Makes a new list from the elements of ARGS.
+
+The last 2 members of ARGS are used as the final cons of the
+result so if the final member of ARGS is not a list the result is
+a dotted list."
+  (let (res)
+    (--each
+        args
+      (cond
+       ((not res)
+        (setq res it))
+       ((consp res)
+        (setcdr res (cons (cdr res) it)))
+       (t
+        (setq res (cons res it)))))
+    res))
+
+(defmacro --first (form list)
+  "Anaphoric form of `-first'."
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each-while ,list (not ,n)
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -first (pred list)
+  "Returns the first x in LIST where (PRED x) is non-nil, else nil.
+
+To get the first item in the list no questions asked, use `car'."
+  (--first (funcall pred it) list))
+
+(defmacro --last (form list)
+  "Anaphoric form of `-last'."
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each ,list
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -last (pred list)
+  "Return the last x in LIST where (PRED x) is non-nil, else nil."
+  (--last (funcall pred it) list))
+
+(defalias '-first-item 'car
+  "Returns the first item of LIST, or nil on an empty list.")
+
+(defun -last-item (list)
+  "Returns the first item of LIST, or nil on an empty list."
+  (car (last list)))
+
+(defmacro --count (pred list)
+  "Anaphoric form of `-count'."
+  (let ((r (make-symbol "result")))
+    `(let ((,r 0))
+       (--each ,list (when ,pred (setq ,r (1+ ,r))))
+       ,r)))
+
+(defun -count (pred list)
+  "Counts the number of items in LIST where (PRED item) is non-nil."
+  (--count (funcall pred it) list))
+
+(defun ---truthy? (val)
+  (not (null val)))
+
+(defmacro --any? (form list)
+  "Anaphoric form of `-any?'."
+  `(---truthy? (--first ,form ,list)))
+
+(defun -any? (pred list)
+  "Returns t if (PRED x) is non-nil for any x in LIST, else nil.
+
+Alias: `-some?'"
+  (--any? (funcall pred it) list))
+
+(defalias '-some? '-any?)
+(defalias '--some? '--any?)
+
+(defalias '-any-p '-any?)
+(defalias '--any-p '--any?)
+(defalias '-some-p '-any?)
+(defalias '--some-p '--any?)
+
+(defmacro --all? (form list)
+  "Anaphoric form of `-all?'."
+  (let ((a (make-symbol "all")))
+    `(let ((,a t))
+       (--each-while ,list ,a (setq ,a ,form))
+       (---truthy? ,a))))
+
+(defun -all? (pred list)
+  "Returns t if (PRED x) is non-nil for all x in LIST, else nil.
+
+Alias: `-every?'"
+  (--all? (funcall pred it) list))
+
+(defalias '-every? '-all?)
+(defalias '--every? '--all?)
+
+(defalias '-all-p '-all?)
+(defalias '--all-p '--all?)
+(defalias '-every-p '-all?)
+(defalias '--every-p '--all?)
+
+(defmacro --none? (form list)
+  "Anaphoric form of `-none?'."
+  `(--all? (not ,form) ,list))
+
+(defun -none? (pred list)
+  "Returns t if (PRED x) is nil for all x in LIST, else nil."
+  (--none? (funcall pred it) list))
+
+(defalias '-none-p '-none?)
+(defalias '--none-p '--none?)
+
+(defmacro --only-some? (form list)
+  "Anaphoric form of `-only-some?'."
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each-while ,list (not (and ,y ,n))
+         (if ,form (setq ,y t) (setq ,n t)))
+       (---truthy? (and ,y ,n)))))
+
+(defun -only-some? (pred list)
+  "Returns `t` if there is a mix of items in LIST that matches and does not match PRED.
+Returns `nil` both if all items match the predicate, and if none of the items match the predicate."
+  (--only-some? (funcall pred it) list))
+
+(defalias '-only-some-p '-only-some?)
+(defalias '--only-some-p '--only-some?)
+
+(defun -slice (list from &optional to)
+  "Return copy of LIST, starting from index FROM to index TO.
+FROM or TO may be negative."
+  (let ((length (length list))
+        (new-list nil)
+        (index 0))
+    ;; to defaults to the end of the list
+    (setq to (or to length))
+    ;; handle negative indices
+    (when (< from 0)
+      (setq from (mod from length)))
+    (when (< to 0)
+      (setq to (mod to length)))
+
+    ;; iterate through the list, keeping the elements we want
+    (while (< index to)
+      (when (>= index from)
+        (!cons (car list) new-list))
+      (!cdr list)
+      (setq index (1+ index)))
+    (nreverse new-list)))
+
+(defun -take (n list)
+  "Returns a new list of the first N items in LIST, or all items if there are fewer than N."
+  (let (result)
+    (--dotimes n
+      (when list
+        (!cons (car list) result)
+        (!cdr list)))
+    (nreverse result)))
+
+(defun -drop (n list)
+  "Returns the tail of LIST without the first N items."
+  (--dotimes n (!cdr list))
+  list)
+
+(defmacro --take-while (form list)
+  "Anaphoric form of `-take-while'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each-while ,list ,form (!cons it ,r))
+       (nreverse ,r))))
+
+(defun -take-while (pred list)
+  "Returns a new list of successive items from LIST while (PRED item) returns a non-nil value."
+  (--take-while (funcall pred it) list))
+
+(defmacro --drop-while (form list)
+  "Anaphoric form of `-drop-while'."
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list))
+       (while (and ,l (let ((it (car ,l))) ,form))
+         (!cdr ,l))
+       ,l)))
+
+(defun -drop-while (pred list)
+  "Returns the tail of LIST starting from the first item for which (PRED item) returns nil."
+  (--drop-while (funcall pred it) list))
+
+(defun -split-at (n list)
+  "Returns a list of ((-take N LIST) (-drop N LIST)), in no more than one pass through the list."
+  (let (result)
+    (--dotimes n
+      (when list
+        (!cons (car list) result)
+        (!cdr list)))
+    (list (nreverse result) list)))
+
+(defun -rotate (n list)
+  "Rotate LIST N places to the right.  With N negative, rotate to the left.
+The time complexity is O(n)."
+  (if (> n 0)
+      (append (last list n) (butlast list n))
+    (append (-drop (- n) list) (-take (- n) list))))
+
+(defun -insert-at (n x list)
+  "Returns a list with X inserted into LIST at position N."
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cadr split-list)))))
+
+(defmacro --split-with (pred list)
+  "Anaphoric form of `-split-with'."
+  (let ((l (make-symbol "list"))
+        (r (make-symbol "result"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,r nil)
+           (,c t))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred)
+               (setq ,c nil)
+             (!cons it ,r)
+             (!cdr ,l))))
+       (list (nreverse ,r) ,l))))
+
+(defun -split-with (pred list)
+  "Returns a list of ((-take-while PRED LIST) (-drop-while PRED LIST)), in no more than one pass through the list."
+  (--split-with (funcall pred it) list))
+
+(defmacro --separate (form list)
+  "Anaphoric form of `-separate'."
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each ,list (if ,form (!cons it ,y) (!cons it ,n)))
+       (list (nreverse ,y) (nreverse ,n)))))
+
+(defun -separate (pred list)
+  "Returns a list of ((-filter PRED LIST) (-remove PRED LIST)), in one pass through the list."
+  (--separate (funcall pred it) list))
+
+(defun ---partition-all-in-steps-reversed (n step list)
+  "Private: Used by -partition-all-in-steps and -partition-in-steps."
+  (when (< step 1)
+    (error "Step must be a positive number, or you're looking at some juicy infinite loops."))
+  (let ((result nil)
+        (len 0))
+    (while list
+      (!cons (-take n list) result)
+      (setq list (-drop step list)))
+    result))
+
+(defun -partition-all-in-steps (n step list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
+The last groups may contain less than N items."
+  (nreverse (---partition-all-in-steps-reversed n step list)))
+
+(defun -partition-in-steps (n step list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
+If there are not enough items to make the last group N-sized,
+those items are discarded."
+  (let ((result (---partition-all-in-steps-reversed n step list)))
+    (while (and result (< (length (car result)) n))
+      (!cdr result))
+    (nreverse result)))
+
+(defun -partition-all (n list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists.
+The last group may contain less than N items."
+  (-partition-all-in-steps n n list))
+
+(defun -partition (n list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists.
+If there are not enough items to make the last group N-sized,
+those items are discarded."
+  (-partition-in-steps n n list))
+
+(defmacro --partition-by (form list)
+  "Anaphoric form of `-partition-by'."
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (v (make-symbol "value"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,v ,form)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (unless (equal ,v ,n)
+                 (!cons (nreverse ,s) ,r)
+                 (setq ,s nil)
+                 (setq ,v ,n))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by (fn list)
+  "Applies FN to each item in LIST, splitting it each time FN returns a new value."
+  (--partition-by (funcall fn it) list))
+
+(defmacro --partition-by-header (form list)
+  "Anaphoric form of `-partition-by-header'."
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (h (make-symbol "header-value"))
+        (b (make-symbol "seen-body?"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,h ,form)
+                (,b nil)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (if (equal ,h ,n)
+                   (when ,b
+                     (!cons (nreverse ,s) ,r)
+                     (setq ,s nil)
+                     (setq ,b nil))
+                 (setq ,b t))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by-header (fn list)
+  "Applies FN to the first item in LIST. That is the header
+  value. Applies FN to each item in LIST, splitting it each time
+  FN returns the header value, but only after seeing at least one
+  other value (the body)."
+  (--partition-by-header (funcall fn it) list))
+
+(defmacro --group-by (form list)
+  "Anaphoric form of `-group-by'."
+  (let ((l (make-symbol "list"))
+        (v (make-symbol "value"))
+        (k (make-symbol "key"))
+        (r (make-symbol "result")))
+    `(let ((,l ,list)
+           ,r)
+       ;; Convert `list' to an alist and store it in `r'.
+       (while ,l
+         (let* ((,v (car ,l))
+                (it ,v)
+                (,k ,form)
+                (kv (assoc ,k ,r)))
+           (if kv
+               (setcdr kv (cons ,v (cdr kv)))
+             (push (list ,k ,v) ,r))
+           (setq ,l (cdr ,l))))
+       ;; Reverse lists in each group.
+       (let ((rest ,r))
+         (while rest
+           (let ((kv (car rest)))
+             (setcdr kv (nreverse (cdr kv))))
+           (setq rest (cdr rest))))
+       ;; Reverse order of keys.
+       (nreverse ,r))))
+
+(defun -group-by (fn list)
+  "Separate LIST into an alist whose keys are FN applied to the
+elements of LIST.  Keys are compared by `equal'."
+  (--group-by (funcall fn it) list))
+
+(defun -interpose (sep list)
+  "Returns a new list of all elements in LIST separated by SEP."
+  (let (result)
+    (when list
+      (!cons (car list) result)
+      (!cdr list))
+    (while list
+      (setq result (cons (car list) (cons sep result)))
+      (!cdr list))
+    (nreverse result)))
+
+(defun -interleave (&rest lists)
+  "Returns a new list of the first item in each list, then the second etc."
+  (let (result)
+    (while (-none? 'null lists)
+      (--each lists (!cons (car it) result))
+      (setq lists (-map 'cdr lists)))
+    (nreverse result)))
+
+(defmacro --zip-with (form list1 list2)
+  "Anaphoric form of `-zip-with'.
+
+The elements in list1 is bound as `it`, the elements in list2 as `other`."
+  (let ((r (make-symbol "result"))
+        (l1 (make-symbol "list1"))
+        (l2 (make-symbol "list2")))
+    `(let ((,r nil)
+           (,l1 ,list1)
+           (,l2 ,list2))
+       (while (and ,l1 ,l2)
+         (let ((it (car ,l1))
+               (other (car ,l2)))
+           (!cons ,form ,r)
+           (!cdr ,l1)
+           (!cdr ,l2)))
+       (nreverse ,r))))
+
+(defun -zip-with (fn list1 list2)
+  "Zip the two lists LIST1 and LIST2 using a function FN.  This
+function is applied pairwise taking as first argument element of
+LIST1 and as second argument element of LIST2 at corresponding
+position.
+
+The anaphoric form `--zip-with' binds the elements from LIST1 as `it`,
+and the elements from LIST2 as `other`."
+  (--zip-with (funcall fn it other) list1 list2))
+
+(defun -zip (list1 list2)
+  "Zip the two lists together.  Return the list where elements
+are cons pairs with car being element from LIST1 and cdr being
+element from LIST2.  The length of the returned list is the
+length of the shorter one."
+  (-zip-with 'cons list1 list2))
+
+(defun -partial (fn &rest args)
+  "Takes a function FN and fewer than the normal arguments to FN,
+and returns a fn that takes a variable number of additional ARGS.
+When called, the returned function calls FN with ARGS first and
+then additional args."
+  (apply 'apply-partially fn args))
+
+(defun -elem-index (elem list)
+  "Return the index of the first element in the given LIST which
+is equal to the query element ELEM, or nil if there is no
+such element."
+  (car (-elem-indices elem list)))
+
+(defun -elem-indices (elem list)
+  "Return the indices of all elements in LIST equal to the query
+element ELEM, in ascending order."
+  (-find-indices (-partial 'equal elem) list))
+
+(defun -find-indices (pred list)
+  "Take a predicate PRED and a LIST and return the index of the
+first element in the list satisfying the predicate, or nil if
+there is no such element."
+  (let ((i 0))
+    (apply 'append (--map-indexed (when (funcall pred it) (list it-index)) list))))
+
+(defmacro --find-indices (form list)
+  "Anaphoric version of `-find-indices'."
+  `(-find-indices (lambda (it) ,form) ,list))
+
+(defun -find-index (pred list)
+  "Return the indices of all elements in LIST satisfying the
+predicate PRED, in ascending order."
+  (car (-find-indices pred list)))
+
+(defmacro --find-index (form list)
+  "Anaphoric version of `-find-index'."
+  `(-find-index (lambda (it) ,form) ,list))
+
+(defun -select-by-indices (indices list)
+  "Return a list whose elements are elements from LIST selected
+as `(nth i list)` for all i from INDICES."
+  (let (r)
+    (--each indices
+      (!cons (nth it list) r))
+    (nreverse r)))
+
+(defun -grade-up (comparator list)
+  "Grades elements of LIST using COMPARATOR relation, yielding a
+permutation vector such that applying this permutation to LIST
+sorts it in ascending order."
+  ;; ugly hack to "fix" lack of lexical scope
+  (let ((comp `(lambda (it other) (funcall ',comparator (car it) (car other)))))
+    (->> (--map-indexed (cons it it-index) list)
+      (-sort comp)
+      (-map 'cdr))))
+
+(defun -grade-down (comparator list)
+  "Grades elements of LIST using COMPARATOR relation, yielding a
+permutation vector such that applying this permutation to LIST
+sorts it in descending order."
+  ;; ugly hack to "fix" lack of lexical scope
+  (let ((comp `(lambda (it other) (funcall ',comparator (car other) (car it)))))
+    (->> (--map-indexed (cons it it-index) list)
+      (-sort comp)
+      (-map 'cdr))))
+
+(defmacro -> (x &optional form &rest more)
+  "Threads the expr through the forms. Inserts X as the second
+item in the first form, making a list of it if it is not a list
+already. If there are more forms, inserts the first form as the
+second item in second form, etc."
+  (cond
+   ((null form) x)
+   ((null more) (if (listp form)
+                    `(,(car form) ,x ,@(cdr form))
+                  (list form x)))
+   (:else `(-> (-> ,x ,form) ,@more))))
+
+(defmacro ->> (x form &rest more)
+  "Threads the expr through the forms. Inserts X as the last item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, inserts the first form as the
+last item in second form, etc."
+  (if (null more)
+      (if (listp form)
+          `(,(car form) ,@(cdr form) ,x)
+        (list form x))
+    `(->> (->> ,x ,form) ,@more)))
+
+(defmacro --> (x form &rest more)
+  "Threads the expr through the forms. Inserts X at the position
+signified by the token `it' in the first form. If there are more
+forms, inserts the first form at the position signified by `it'
+in in second form, etc."
+  (if (null more)
+      (if (listp form)
+          (--map-when (eq it 'it) x form)
+        (list form x))
+    `(--> (--> ,x ,form) ,@more)))
+
+(put '-> 'lisp-indent-function 1)
+(put '->> 'lisp-indent-function 1)
+(put '--> 'lisp-indent-function 1)
+
+(defmacro -when-let (var-val &rest body)
+  "If VAL evaluates to non-nil, bind it to VAR and execute body.
+VAR-VAL should be a (VAR VAL) pair."
+  (let ((var (car var-val))
+        (val (cadr var-val)))
+    `(let ((,var ,val))
+       (when ,var
+         ,@body))))
+
+(defmacro -when-let* (vars-vals &rest body)
+  "If all VALS evaluate to true, bind them to their corresponding
+  VARS and execute body. VARS-VALS should be a list of (VAR VAL)
+  pairs (corresponding to bindings of `let*')."
+  (if (= (length vars-vals) 1)
+      `(-when-let ,(car vars-vals)
+         ,@body)
+    `(-when-let ,(car vars-vals)
+       (-when-let* ,(cdr vars-vals)
+         ,@body))))
+
+(defmacro --when-let (val &rest body)
+  "If VAL evaluates to non-nil, bind it to `it' and execute
+body."
+  `(let ((it ,val))
+     (when it
+       ,@body)))
+
+(defmacro -if-let (var-val then &optional else)
+  "If VAL evaluates to non-nil, bind it to VAR and do THEN,
+otherwise do ELSE. VAR-VAL should be a (VAR VAL) pair."
+  (let ((var (car var-val))
+        (val (cadr var-val)))
+    `(let ((,var ,val))
+       (if ,var ,then ,else))))
+
+(defmacro -if-let* (vars-vals then &optional else)
+  "If all VALS evaluate to true, bind them to their corresponding
+  VARS and do THEN, otherwise do ELSE. VARS-VALS should be a list
+  of (VAR VAL) pairs (corresponding to the bindings of `let*')."
+  (let ((first-pair (car vars-vals))
+        (rest (cdr vars-vals)))
+    (if (= (length vars-vals) 1)
+        `(-if-let ,first-pair ,then ,else)
+      `(-if-let ,first-pair
+         (-if-let* ,rest ,then ,else)
+         ,else))))
+
+(defmacro --if-let (val then &optional else)
+  "If VAL evaluates to non-nil, bind it to `it' and do THEN,
+otherwise do ELSE."
+  `(let ((it ,val))
+     (if it ,then ,else)))
+
+(put '-when-let 'lisp-indent-function 1)
+(put '-when-let* 'lisp-indent-function 1)
+(put '--when-let 'lisp-indent-function 1)
+(put '-if-let 'lisp-indent-function 1)
+(put '-if-let* 'lisp-indent-function 1)
+(put '--if-let 'lisp-indent-function 1)
+
+(defun -distinct (list)
+  "Return a new list with all duplicates removed.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil.
+
+Alias: `-uniq'"
+  (let (result)
+    (--each list (unless (-contains? result it) (!cons it result)))
+    (nreverse result)))
+
+(defun -union (list list2)
+  "Return a new list containing the elements of LIST1 and elements of LIST2 that are not in LIST1.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (let (result)
+    (--each list (!cons it result))
+    (--each list2 (unless (-contains? result it) (!cons it result)))
+    (nreverse result)))
+
+(defalias '-uniq '-distinct)
+
+(defun -intersection (list list2)
+  "Return a new list containing only the elements that are members of both LIST and LIST2.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (--filter (-contains? list2 it) list))
+
+(defun -difference (list list2)
+  "Return a new list with only the members of LIST that are not in LIST2.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (--filter (not (-contains? list2 it)) list))
+
+(defvar -compare-fn nil
+  "Tests for equality use this function or `equal' if this is nil.
+It should only be set using dynamic scope with a let, like:
+(let ((-compare-fn =)) (-union numbers1 numbers2 numbers3)")
+
+(defun -contains? (list element)
+  "Return whether LIST contains ELEMENT.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (not
+   (null
+    (cond
+     ((null -compare-fn)    (member element list))
+     ((eq -compare-fn 'eq)  (memq element list))
+     ((eq -compare-fn 'eql) (memql element list))
+     (t
+      (let ((lst list))
+        (while (and lst
+                    (not (funcall -compare-fn element (car lst))))
+          (setq lst (cdr lst)))
+        lst))))))
+
+(defalias '-contains-p '-contains?)
+
+(defun -sort (comparator list)
+  "Sort LIST, stably, comparing elements using COMPARATOR.
+Returns the sorted list.  LIST is NOT modified by side effects.
+COMPARATOR is called with two elements of LIST, and should return non-nil
+if the first element should sort before the second."
+  (sort (copy-sequence list) comparator))
+
+(defmacro --sort (form list)
+  "Anaphoric form of `-sort'."
+  (declare (debug t))
+  `(-sort (lambda (it other) ,form) ,list))
+
+(defun -repeat (n x)
+  "Return a list with X repeated N times.
+Returns nil if N is less than 1."
+  (let (ret)
+    (--dotimes n (!cons x ret))
+    ret))
+
+(defun -sum (list)
+  "Return the sum of LIST."
+  (apply '+ list))
+
+(defun -product (list)
+  "Return the product of LIST."
+  (apply '* list))
+
+(defun -max (list)
+  "Return the largest value from LIST of numbers or markers."
+  (apply 'max list))
+
+(defun -min (list)
+  "Return the smallest value from LIST of numbers or markers."
+  (apply 'min list))
+
+(defun -max-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the greatest element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (--reduce (if (funcall comparator it acc) it acc) list))
+
+(defun -min-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the least element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (--reduce (if (funcall comparator it acc) acc it) list))
+
+(defmacro --max-by (form list)
+  "Anaphoric version of `-max-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  `(-max-by (lambda (it other) ,form) ,list))
+
+(defmacro --min-by (form list)
+  "Anaphoric version of `-min-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  `(-min-by (lambda (it other) ,form) ,list))
+
+(eval-after-load "lisp-mode"
+  '(progn
+     (let ((new-keywords '(
+                           "--each"
+                           "-each"
+                           "--each-while"
+                           "-each-while"
+                           "--dotimes"
+                           "-dotimes"
+                           "-map"
+                           "--map"
+                           "--reduce-from"
+                           "-reduce-from"
+                           "--reduce"
+                           "-reduce"
+                           "--reduce-r-from"
+                           "-reduce-r-from"
+                           "--reduce-r"
+                           "-reduce-r"
+                           "--filter"
+                           "-filter"
+                           "-select"
+                           "--select"
+                           "--remove"
+                           "-remove"
+                           "-reject"
+                           "--reject"
+                           "--keep"
+                           "-keep"
+                           "-flatten"
+                           "-concat"
+                           "--mapcat"
+                           "-mapcat"
+                           "--first"
+                           "-first"
+                           "--any?"
+                           "-any?"
+                           "-some?"
+                           "--some?"
+                           "-any-p"
+                           "--any-p"
+                           "-some-p"
+                           "--some-p"
+                           "--all?"
+                           "-all?"
+                           "-every?"
+                           "--every?"
+                           "-all-p"
+                           "--all-p"
+                           "-every-p"
+                           "--every-p"
+                           "--none?"
+                           "-none?"
+                           "-none-p"
+                           "--none-p"
+                           "-only-some?"
+                           "--only-some?"
+                           "-only-some-p"
+                           "--only-some-p"
+                           "-take"
+                           "-drop"
+                           "--take-while"
+                           "-take-while"
+                           "--drop-while"
+                           "-drop-while"
+                           "-split-at"
+                           "-rotate"
+                           "-insert-at"
+                           "--split-with"
+                           "-split-with"
+                           "-partition"
+                           "-partition-in-steps"
+                           "-partition-all"
+                           "-partition-all-in-steps"
+                           "-interpose"
+                           "-interleave"
+                           "--zip-with"
+                           "-zip-with"
+                           "-zip"
+                           "--map-indexed"
+                           "-map-indexed"
+                           "--map-when"
+                           "-map-when"
+                           "--replace-where"
+                           "-replace-where"
+                           "-partial"
+                           "-rpartial"
+                           "-juxt"
+                           "-applify"
+                           "-on"
+                           "-flip"
+                           "-const"
+                           "-cut"
+                           "-orfn"
+                           "-andfn"
+                           "-elem-index"
+                           "-elem-indices"
+                           "-find-indices"
+                           "--find-indices"
+                           "-find-index"
+                           "--find-index"
+                           "-select-by-indices"
+                           "-grade-up"
+                           "-grade-down"
+                           "->"
+                           "->>"
+                           "-->"
+                           "-when-let"
+                           "-when-let*"
+                           "--when-let"
+                           "-if-let"
+                           "-if-let*"
+                           "--if-let"
+                           "-union"
+                           "-distinct"
+                           "-intersection"
+                           "-difference"
+                           "-contains?"
+                           "-contains-p"
+                           "-repeat"
+                           "-cons*"
+                           "-sum"
+                           "-product"
+                           "-min"
+                           "-min-by"
+                           "--min-by"
+                           "-max"
+                           "-max-by"
+                           "--max-by"
+                           ))
+           (special-variables '(
+                                "it"
+                                "it-index"
+                                "acc"
+                                "other"
+                                )))
+       (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "\\<" (regexp-opt special-variables 'paren) "\\>")
+                                                   1 font-lock-variable-name-face)) 'append)
+       (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "(\\s-*" (regexp-opt new-keywords 'paren) "\\>")
+                                                   1 font-lock-keyword-face)) 'append))
+     (--each (buffer-list)
+       (with-current-buffer it
+         (when (and (eq major-mode 'emacs-lisp-mode)
+                    (boundp 'font-lock-mode)
+                    font-lock-mode)
+           (font-lock-refresh-defaults))))))
+
+(provide 'dash)
+;;; dash.el ends here
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el
new file mode 100644
index 000000000..9f9b20fc0
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el
@@ -0,0 +1,38 @@
+;;; elisp-slime-nav-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (elisp-slime-nav-find-elisp-thing-at-point elisp-slime-nav-mode)
+;;;;;;  "elisp-slime-nav" "elisp-slime-nav.el" (20184 56040))
+;;; Generated autoloads from elisp-slime-nav.el
+
+(autoload 'elisp-slime-nav-mode "elisp-slime-nav" "\
+Enable Slime-style navigation of elisp symbols using M-. and M-,
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'elisp-slime-nav-find-elisp-thing-at-point "elisp-slime-nav" "\
+Jump to the elisp thing at point, be it a function,variable, library or face.
+
+With a prefix arg, prompt for the symbol to jump to.
+
+Argument SYM-NAME thing to find.
+
+\(fn SYM-NAME)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("elisp-slime-nav-pkg.el") (20184 56040
+;;;;;;  300769))
+
+;;;***
+
+(provide 'elisp-slime-nav-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; elisp-slime-nav-autoloads.el ends here
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el
new file mode 100644
index 000000000..92a54aba1
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el
@@ -0,0 +1 @@
+(define-package "elisp-slime-nav" "0.2" "Make M-. and M-, work in elisp like they do in slime" (quote nil))
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.elc b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.elc
similarity index 60%
rename from elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.elc
rename to elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.elc
index 5cd05de43..57dd13536 100644
Binary files a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.elc and b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.elc differ
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el
new file mode 100644
index 000000000..7e76e5dfb
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el
@@ -0,0 +1,81 @@
+
+;;; elisp-slime-nav.el --- Make M-. and M-, work in elisp like they do in slime
+;;
+;; Author: Steve Purcell <steve@sanityinc.com>
+;; Keywords: navigation slime elisp emacs-lisp
+;; URL: https://github.com/purcell/elisp-slime-nav
+;; Version: 0.2
+;;
+;;; Commentary
+;;
+;; This package provides Slime's convenient "M-." and "M-," navigation
+;; in `emacs-lisp-mode'.
+;;
+;; Additionally, C-u M-. will prompt for the symbol to which to jump.
+;;
+;; Usage:
+;;
+;;   (require 'elisp-slime-nav)
+;;   (add-hook 'emacs-lisp-mode-hook (lambda () (elisp-slime-nav-mode t)))
+;;
+;; Known issues:
+;;
+;;   When navigating into Emacs' C source, "M-," will not be bound to
+;;   the same command, but "M-*" will typically do the trick.
+;;
+;;; Code
+(defvar elisp-slime-nav-mode-map (make-keymap))
+
+;;;###autoload
+(define-minor-mode elisp-slime-nav-mode
+  "Enable Slime-style navigation of elisp symbols using M-. and M-,"
+  nil " SliNav" elisp-slime-nav-mode-map)
+
+(require 'etags)
+
+
+(defun elisp-slime-nav--all-navigable-symbol-names ()
+  "Return a list of strings for the symbols to which navigation is possible."
+  (loop for x being the symbols
+        if (or (fboundp x) (boundp x) (symbol-plist x) (facep x))
+        collect (symbol-name x)))
+
+;;;###autoload
+(defun elisp-slime-nav-find-elisp-thing-at-point (sym-name)
+  "Jump to the elisp thing at point, be it a function,variable, library or face.
+
+With a prefix arg, prompt for the symbol to jump to.
+
+Argument SYM-NAME thing to find."
+  (interactive
+   (list
+    (let* ((sym-at-point (symbol-at-point))
+           (at-point (and sym-at-point (symbol-name sym-at-point))))
+      (if current-prefix-arg
+          (completing-read "Symbol: "
+                           (elisp-slime-nav--all-navigable-symbol-names)
+                           nil t at-point)
+        at-point))))
+  (when sym-name
+    (let ((sym (intern sym-name)))
+      (message "search for %s" (pp-to-string sym))
+      (ring-insert find-tag-marker-ring (point-marker))
+      (cond
+       ((fboundp sym) (find-function sym))
+       ((boundp sym) (find-variable sym))
+       ((or (featurep sym) (locate-library sym-name))
+        (find-library sym-name))
+       ((facep sym)
+        (find-face-definition sym))
+       (:else
+        (progn
+          (pop-tag-mark)
+          (error "Don't know how to find '%s'" sym)))))))
+
+
+(define-key elisp-slime-nav-mode-map (kbd "M-.") 'elisp-slime-nav-find-elisp-thing-at-point)
+(define-key elisp-slime-nav-mode-map (kbd "M-,") 'pop-tag-mark)
+
+
+(provide 'elisp-slime-nav)
+;;; elisp-slime-nav.el ends here
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc
new file mode 100644
index 000000000..0929a286b
Binary files /dev/null and b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc differ
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-autoloads.el b/elpa/elisp-slime-nav-0.6/elisp-slime-nav-autoloads.el
deleted file mode 100644
index 2a4bf4dc2..000000000
--- a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-autoloads.el
+++ /dev/null
@@ -1,51 +0,0 @@
-;;; elisp-slime-nav-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads (elisp-slime-nav-describe-elisp-thing-at-point
-;;;;;;  elisp-slime-nav-find-elisp-thing-at-point turn-on-elisp-slime-nav-mode
-;;;;;;  elisp-slime-nav-mode) "elisp-slime-nav" "elisp-slime-nav.el"
-;;;;;;  (21031 23287 0 0))
-;;; Generated autoloads from elisp-slime-nav.el
-
-(autoload 'elisp-slime-nav-mode "elisp-slime-nav" "\
-Enable Slime-style navigation of elisp symbols using M-. and M-,
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-elisp-slime-nav-mode "elisp-slime-nav" "\
-Explicitly enable `elisp-slime-nav-mode'.
-
-\(fn)" nil nil)
-
-(autoload 'elisp-slime-nav-find-elisp-thing-at-point "elisp-slime-nav" "\
-Jump to the elisp thing at point, be it a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find.
-
-\(fn SYM-NAME)" t nil)
-
-(autoload 'elisp-slime-nav-describe-elisp-thing-at-point "elisp-slime-nav" "\
-Display the full documentation of the elisp thing at point.
-The named subject may be a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find.
-
-\(fn SYM-NAME)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("elisp-slime-nav-pkg.el") (21031 23287
-;;;;;;  452073 0))
-
-;;;***
-
-(provide 'elisp-slime-nav-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; elisp-slime-nav-autoloads.el ends here
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.el b/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.el
deleted file mode 100644
index 2d60624b0..000000000
--- a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "elisp-slime-nav" "0.6" "Make M-. and M-, work in elisp like they do in slime" (quote ((cl-lib "0.2"))))
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav.el b/elpa/elisp-slime-nav-0.6/elisp-slime-nav.el
deleted file mode 100644
index 3629a15de..000000000
--- a/elpa/elisp-slime-nav-0.6/elisp-slime-nav.el
+++ /dev/null
@@ -1,109 +0,0 @@
-
-;;; elisp-slime-nav.el --- Make M-. and M-, work in elisp like they do in slime
-;;
-;; Author: Steve Purcell <steve@sanityinc.com>
-;; Keywords: navigation slime elisp emacs-lisp
-;; URL: https://github.com/purcell/elisp-slime-nav
-;; Version: 0.6
-;; Package-Requires: ((cl-lib "0.2"))
-;;
-;;; Commentary:
-;;
-;; This package provides Slime's convenient "M-." and "M-," navigation
-;; in `emacs-lisp-mode', together with an elisp equivalent of
-;; `slime-describe-symbol', bound by default to `C-c C-d d`.
-;;
-;; When the main functions are given a prefix argument, they will
-;; prompt for the symbol upon which to operate.
-;;
-;; Usage:
-;;
-;; Enable the package in elisp and ielm modes as follows:
-;;
-;;   (require 'elisp-slime-nav) ;; optional if installed via package.el
-;;   (dolist (hook '(emacs-lisp-mode-hook ielm-mode-hook))
-;;     (add-hook hook 'turn-on-elisp-slime-nav-mode))
-;;
-;; Known issues:
-;;
-;;   When navigating into Emacs' C source, "M-," will not be bound to
-;;   the same command, but "M-*" will typically do the trick.
-;;
-;;; Code:
-
-(eval-when-compile (require 'cl-lib))
-(require 'etags)
-(require 'help-mode)
-
-(defvar elisp-slime-nav-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "M-.")         'elisp-slime-nav-find-elisp-thing-at-point)
-    (define-key map (kbd "M-,")         'pop-tag-mark)
-    (define-key map (kbd "C-c C-d d")   'elisp-slime-nav-describe-elisp-thing-at-point)
-    (define-key map (kbd "C-c C-d C-d") 'elisp-slime-nav-describe-elisp-thing-at-point)
-    map))
-
-;;;###autoload
-(define-minor-mode elisp-slime-nav-mode
-  "Enable Slime-style navigation of elisp symbols using M-. and M-,"
-  nil " SliNav" elisp-slime-nav-mode-map)
-
-;;;###autoload
-(defun turn-on-elisp-slime-nav-mode ()
-  "Explicitly enable `elisp-slime-nav-mode'."
-  (elisp-slime-nav-mode 1))
-
-(defun elisp-slime-nav--all-navigable-symbol-names ()
-  "Return a list of strings for the symbols to which navigation is possible."
-  (cl-loop for x being the symbols
-           if (or (fboundp x) (boundp x) (symbol-plist x) (facep x))
-           collect (symbol-name x)))
-
-(defun elisp-slime-nav--read-symbol-at-point ()
-  "Return the symbol at point as a string.
-If `current-prefix-arg' is not nil, the user is prompted for the symbol."
-  (let* ((sym-at-point (symbol-at-point))
-           (at-point (and sym-at-point (symbol-name sym-at-point))))
-      (if current-prefix-arg
-          (completing-read "Symbol: "
-                           (elisp-slime-nav--all-navigable-symbol-names)
-                           nil t at-point)
-        at-point)))
-
-;;;###autoload
-(defun elisp-slime-nav-find-elisp-thing-at-point (sym-name)
-  "Jump to the elisp thing at point, be it a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find."
-  (interactive (list (elisp-slime-nav--read-symbol-at-point)))
-  (when sym-name
-    (let ((sym (intern sym-name)))
-      (message "Searching for %s..." (pp-to-string sym))
-      (ring-insert find-tag-marker-ring (point-marker))
-      (cond
-       ((fboundp sym) (find-function sym))
-       ((boundp sym) (find-variable sym))
-       ((or (featurep sym) (locate-library sym-name))
-        (find-library sym-name))
-       ((facep sym)
-        (find-face-definition sym))
-       (:else
-        (progn
-          (pop-tag-mark)
-          (error "Don't know how to find '%s'" sym)))))))
-
-;;;###autoload
-(defun elisp-slime-nav-describe-elisp-thing-at-point (sym-name)
-  "Display the full documentation of the elisp thing at point.
-The named subject may be a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find."
-  (interactive (list (elisp-slime-nav--read-symbol-at-point)))
-  (help-xref-interned (intern sym-name)))
-
-
-(provide 'elisp-slime-nav)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-;;; elisp-slime-nav.el ends here
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav.elc b/elpa/elisp-slime-nav-0.6/elisp-slime-nav.elc
deleted file mode 100644
index 9ce448514..000000000
Binary files a/elpa/elisp-slime-nav-0.6/elisp-slime-nav.elc and /dev/null differ
diff --git a/elpa/epl-0.4/epl-pkg.el b/elpa/epl-0.4/epl-pkg.el
deleted file mode 100644
index cd4214488..000000000
--- a/elpa/epl-0.4/epl-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "epl" "0.4" "Emacs Package Library -*- lexical-binding: t; -*-" (quote ((cl-lib "0.3"))))
diff --git a/elpa/epl-0.4/epl-autoloads.el b/elpa/epl-20131101.405/epl-autoloads.el
similarity index 78%
rename from elpa/epl-0.4/epl-autoloads.el
rename to elpa/epl-20131101.405/epl-autoloads.el
index 97d23c51b..308a221c2 100644
--- a/elpa/epl-0.4/epl-autoloads.el
+++ b/elpa/epl-20131101.405/epl-autoloads.el
@@ -3,7 +3,7 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("epl-pkg.el" "epl.el") (21124 57414 901749))
+;;;### (autoloads nil nil ("epl-pkg.el" "epl.el") (21184 20185 12190))
 
 ;;;***
 
diff --git a/elpa/epl-20131101.405/epl-pkg.el b/elpa/epl-20131101.405/epl-pkg.el
new file mode 100644
index 000000000..f3b8d5ecd
--- /dev/null
+++ b/elpa/epl-20131101.405/epl-pkg.el
@@ -0,0 +1 @@
+(define-package "epl" "20131101.405" "Emacs Package Library" (quote ((cl-lib "0.3"))))
diff --git a/elpa/epl-0.4/epl-pkg.elc b/elpa/epl-20131101.405/epl-pkg.elc
similarity index 64%
rename from elpa/epl-0.4/epl-pkg.elc
rename to elpa/epl-20131101.405/epl-pkg.elc
index 3ac6822db..677d17581 100644
Binary files a/elpa/epl-0.4/epl-pkg.elc and b/elpa/epl-20131101.405/epl-pkg.elc differ
diff --git a/elpa/epl-0.4/epl.el b/elpa/epl-20131101.405/epl.el
similarity index 99%
rename from elpa/epl-0.4/epl.el
rename to elpa/epl-20131101.405/epl.el
index 121dbe5a3..5ccca2dfe 100644
--- a/elpa/epl-0.4/epl.el
+++ b/elpa/epl-20131101.405/epl.el
@@ -5,7 +5,8 @@
 ;; Author: Sebastian Wiesner <lunaryorn@gmail.com>
 ;; Maintainer: Johan Andersson <johan.rejeep@gmail.com>
 ;;     Sebastian Wiesner <lunaryorn@gmail.com>
-;; Version: 0.4
+;; Version: 20131101.405
+;; X-Original-Version: 0.5-cvs
 ;; Package-Requires: ((cl-lib "0.3"))
 ;; Keywords: convenience
 ;; URL: http://github.com/cask/epl
diff --git a/elpa/epl-20131101.405/epl.elc b/elpa/epl-20131101.405/epl.elc
new file mode 100644
index 000000000..9bc99ce2b
Binary files /dev/null and b/elpa/epl-20131101.405/epl.elc differ
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el b/elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
similarity index 90%
rename from elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el
rename to elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
index e02fd1b4f..4a517d883 100644
--- a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el
+++ b/elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads (find-file-in-project) "find-file-in-project" "find-file-in-project.el"
-;;;;;;  (21031 23279 0 0))
+;;;;;;  (20166 22148))
 ;;; Generated autoloads from find-file-in-project.el
 
 (autoload 'find-file-in-project "find-file-in-project" "\
@@ -32,8 +32,8 @@ setting the variable `ffip-project-root'.
 
 ;;;***
 
-;;;### (autoloads nil nil ("find-file-in-project-pkg.el") (21031
-;;;;;;  23279 264879 0))
+;;;### (autoloads nil nil ("find-file-in-project-pkg.el") (20166
+;;;;;;  22148 967146))
 
 ;;;***
 
diff --git a/elpa/find-file-in-project-3.0/find-file-in-project-pkg.el b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.el
new file mode 100644
index 000000000..87214941a
--- /dev/null
+++ b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.el
@@ -0,0 +1 @@
+(define-package "find-file-in-project" "3.0" "Find files in a project quickly." (quote nil))
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-pkg.elc b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.elc
similarity index 70%
rename from elpa/find-file-in-project-3.2/find-file-in-project-pkg.elc
rename to elpa/find-file-in-project-3.0/find-file-in-project-pkg.elc
index bb63f4d4e..712bbcb5c 100644
Binary files a/elpa/find-file-in-project-3.2/find-file-in-project-pkg.elc and b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.elc differ
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project.el b/elpa/find-file-in-project-3.0/find-file-in-project.el
similarity index 78%
rename from elpa/find-file-in-project-3.2/find-file-in-project.el
rename to elpa/find-file-in-project-3.0/find-file-in-project.el
index fcbd050c7..795e547e8 100644
--- a/elpa/find-file-in-project-3.2/find-file-in-project.el
+++ b/elpa/find-file-in-project-3.0/find-file-in-project.el
@@ -1,12 +1,13 @@
+
 ;;; find-file-in-project.el --- Find files in a project quickly.
 
-;; Copyright (C) 2006-2009, 2011-2012
+;; Copyright (C) 2006-2009, 2011
 ;;   Phil Hagelberg, Doug Alcorn, and Will Farrington
 
 ;; Author: Phil Hagelberg, Doug Alcorn, and Will Farrington
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/FindFileInProject
 ;; Git: git://github.com/technomancy/find-file-in-project.git
-;; Version: 3.2
+;; Version: 3.0
 ;; Created: 2008-03-18
 ;; Keywords: project, convenience
 ;; EmacsWiki: FindFileInProject
@@ -63,7 +64,7 @@
 (defvar ffip-project-file ".git"
   "The file that should be used to define a project root.
 
-May be set using .dir-locals.el. Checks each entry if set to a list.")
+May be set using .dir-locals.el.")
 
 (defvar ffip-patterns
   '("*.html" "*.org" "*.txt" "*.md" "*.el" "*.clj" "*.py" "*.rb" "*.js" "*.pl"
@@ -86,26 +87,20 @@ This overrides variable `ffip-project-root' when set.")
 (defvar ffip-limit 512
   "Limit results to this many files.")
 
-(defvar ffip-full-paths nil
-  "If non-nil, show fully project-relative paths.")
-
 (defun ffip-project-root ()
   "Return the root of the project."
   (let ((project-root (or ffip-project-root
                           (if (functionp ffip-project-root-function)
                               (funcall ffip-project-root-function)
-                            (if (listp ffip-project-file)
-                                (some (apply-partially 'locate-dominating-file
-                                                       default-directory)
-                                      ffip-project-file)
-                              (locate-dominating-file default-directory
-                                                      ffip-project-file))))))
+                            (locate-dominating-file default-directory
+                                                    ffip-project-file)))))
     (or project-root
         (progn (message "No project was defined for the current file.")
                nil))))
 
 (defun ffip-uniqueify (file-cons)
   "Set the car of FILE-CONS to include the directory name plus the file name."
+  ;; TODO: see if we can use uniquify.el
   (setcar file-cons
           (concat (cadr (reverse (split-string (cdr file-cons) "/"))) "/"
                   (car file-cons))))
@@ -120,24 +115,23 @@ This overrides variable `ffip-project-root' when set.")
 
 Files with duplicate filenames are suffixed with the name of the
 directory they are found in so that they are unique."
-  (let ((file-alist nil)
-        (root (expand-file-name (or ffip-project-root (ffip-project-root)
-                                    (error "No project root found")))))
+  (let ((file-alist nil))
     (mapcar (lambda (file)
-              (if ffip-full-paths
-                  (cons (substring (expand-file-name file) (length root))
-                        (expand-file-name file))
-                (let ((file-cons (cons (file-name-nondirectory file)
-                                       (expand-file-name file))))
-                  (when (assoc (car file-cons) file-alist)
-                    (ffip-uniqueify (assoc (car file-cons) file-alist))
-                    (ffip-uniqueify file-cons))
-                  (add-to-list 'file-alist file-cons)
-                  file-cons)))
+              (let ((file-cons (cons (file-name-nondirectory file)
+                                     (expand-file-name file))))
+                (when (assoc (car file-cons) file-alist)
+                  (ffip-uniqueify (assoc (car file-cons) file-alist))
+                  (ffip-uniqueify file-cons))
+                (add-to-list 'file-alist file-cons)
+                file-cons))
             (split-string (shell-command-to-string
                            (format "find %s -type f \\( %s \\) %s | head -n %s"
-                                   root (ffip-join-patterns)
-                                   ffip-find-options ffip-limit))))))
+                                   (or ffip-project-root
+                                       (ffip-project-root)
+                                       (error "No project root found"))
+                                   (ffip-join-patterns)
+                                   ffip-find-options
+                                   ffip-limit))))))
 
 ;;;###autoload
 (defun find-file-in-project ()
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project.elc b/elpa/find-file-in-project-3.0/find-file-in-project.elc
similarity index 60%
rename from elpa/find-file-in-project-3.2/find-file-in-project.elc
rename to elpa/find-file-in-project-3.0/find-file-in-project.elc
index eec8f7fd2..16b1b8bb8 100644
Binary files a/elpa/find-file-in-project-3.2/find-file-in-project.elc and b/elpa/find-file-in-project-3.0/find-file-in-project.elc differ
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el~ b/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el~
deleted file mode 100644
index a3cd25c61..000000000
--- a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; find-file-in-project-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'find-file-in-project-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; find-file-in-project-autoloads.el ends here
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-pkg.el b/elpa/find-file-in-project-3.2/find-file-in-project-pkg.el
deleted file mode 100644
index 35a311fec..000000000
--- a/elpa/find-file-in-project-3.2/find-file-in-project-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "find-file-in-project" "3.2" "Find files in a project quickly." (quote nil))
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el b/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el
new file mode 100644
index 000000000..b30b27926
--- /dev/null
+++ b/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el
@@ -0,0 +1,18 @@
+;;; highlight-indentation-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil nil ("highlight-indentation-pkg.el" "highlight-indentation.el")
+;;;;;;  (20794 33002 979251))
+
+;;;***
+
+(provide 'highlight-indentation-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; highlight-indentation-autoloads.el ends here
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el b/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el
new file mode 100644
index 000000000..dec836ad9
--- /dev/null
+++ b/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el
@@ -0,0 +1 @@
+(define-package "highlight-indentation" "0.5.0" "Function for highlighting indentation" (quote nil))
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.elc b/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.elc
new file mode 100644
index 000000000..1491b2671
Binary files /dev/null and b/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.elc differ
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation.el b/elpa/highlight-indentation-0.5.0/highlight-indentation.el
new file mode 100644
index 000000000..bc3d61016
--- /dev/null
+++ b/elpa/highlight-indentation-0.5.0/highlight-indentation.el
@@ -0,0 +1,71 @@
+;;; highlight-indentation.el --- Function for highlighting indentation
+;; Author: Anton Johansson <anton.johansson@gmail.com> - http://antonj.se
+;; Created: Dec 15 23:42:04 2010
+;; Version: 0.5.0
+;; URL: https://github.com/antonj/Highlight-Indentation-for-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 2 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.
+;;
+;;; Commentary:
+;; Customize `highlight-indent-face' to suit your theme.
+
+;;; Code:
+
+(defface highlight-indent-face
+  ;; Fringe has non intrusive color in most color-themes
+  '((t :inherit fringe))
+  "Basic face for highlighting indentation guides."
+  :group 'basic-faces)
+
+;; Used buffer-local to toggle on-off
+(setq-default highlight-indent-active nil)
+;; Needed to to remove font-lock-keywords
+(setq-default highlight-indent-offset 4)
+
+(defun highlight-indentation (&optional indent-width)
+  "Toggle highlight indentation.
+Optional argument INDENT-WIDTH specifies which indentation
+level (spaces only) should be highlighted, if omitted
+indent-width will be guessed from current major-mode"
+  (interactive "P")
+  (when (not highlight-indent-active)
+    (set (make-local-variable 'highlight-indent-offset)
+         (if indent-width
+             indent-width
+           ;; Set indentation offset according to major mode
+           (cond ((eq major-mode 'python-mode)
+                  (if (boundp 'python-indent)
+                      python-indent
+                    py-indent-offset))
+                 ((eq major-mode 'ruby-mode)
+                  ruby-indent-level)
+                 ((eq major-mode 'nxml-mode)
+                  nxml-child-indent)
+                 ((local-variable-p 'c-basic-offset)
+                  c-basic-offset)
+                 (t
+                  (default-value 'highlight-indent-offset))))))
+  (let ((re (format "\\( \\) \\{%s\\}" (- highlight-indent-offset 1))))
+    (if highlight-indent-active
+        (progn ;; Toggle off
+          (set (make-local-variable 'highlight-indent-active) nil)
+          (font-lock-remove-keywords nil `((,re (1 'highlight-indent-face))))
+          (message "highlight-indentation OFF"))
+      (progn ;; Toggle on
+        (set (make-local-variable 'highlight-indent-active) t)
+        (font-lock-add-keywords nil `((,re (1 'highlight-indent-face))))
+        (message (format "highlight-indentation with indent-width %s"
+                         highlight-indent-offset))))
+    (font-lock-fontify-buffer)))
+
+(provide 'highlight-indentation)
+
+;;; highlight-indentation.el ends here
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation.elc b/elpa/highlight-indentation-0.5.0/highlight-indentation.elc
new file mode 100644
index 000000000..1aaa80bd2
Binary files /dev/null and b/elpa/highlight-indentation-0.5.0/highlight-indentation.elc differ
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
index 968938ff8..15c89e8e0 100644
--- a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
+++ b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads (idle-highlight-mode) "idle-highlight-mode" "idle-highlight-mode.el"
-;;;;;;  (21031 23280 0 0))
+;;;;;;  (20166 22149))
 ;;; Generated autoloads from idle-highlight-mode.el
 
 (autoload 'idle-highlight-mode "idle-highlight-mode" "\
@@ -14,8 +14,8 @@ Idle-Highlight Minor Mode
 
 ;;;***
 
-;;;### (autoloads nil nil ("idle-highlight-mode-pkg.el") (21031 23280
-;;;;;;  195148 0))
+;;;### (autoloads nil nil ("idle-highlight-mode-pkg.el") (20166 22149
+;;;;;;  568029))
 
 ;;;***
 
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el~ b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el~
deleted file mode 100644
index 038380155..000000000
--- a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; idle-highlight-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'idle-highlight-mode-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; idle-highlight-mode-autoloads.el ends here
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.elc b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.elc
index 047d410b2..52cba8f67 100644
Binary files a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.elc and b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.elc differ
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc
index 9c61efacc..7ae0cd238 100644
Binary files a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc and b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc differ
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el
new file mode 100644
index 000000000..acc3c2798
--- /dev/null
+++ b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el
@@ -0,0 +1,70 @@
+;;; ido-ubiquitous-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (ido-ubiquitous-function-exceptions ido-ubiquitous-command-exceptions
+;;;;;;  ido-ubiquitous ido-ubiquitous) "ido-ubiquitous" "ido-ubiquitous.el"
+;;;;;;  (20166 22146))
+;;; Generated autoloads from ido-ubiquitous.el
+
+(let ((loads (get 'ido-ubiquitous 'custom-loads))) (if (member '"ido-ubiquitous" loads) nil (put 'ido-ubiquitous 'custom-loads (cons '"ido-ubiquitous" loads))))
+
+(defvar ido-ubiquitous nil "\
+Non-nil if Ido-Ubiquitous mode is enabled.
+See the command `ido-ubiquitous' for a description of this minor mode.")
+
+(custom-autoload 'ido-ubiquitous "ido-ubiquitous" nil)
+
+(autoload 'ido-ubiquitous "ido-ubiquitous" "\
+Use `ido-completing-read' instead of `completing-read' almost everywhere.
+
+  This mode has no effect unles `ido-mode' is also enabled.
+
+  If this mode causes problems for a function, you can force the
+  function to use the original completing read by using the macro
+  `ido-ubiquitous-disable-in'. For example, if a
+  function `foo' cannot work with ido-style completion, evaluate
+  the following (for example by putting it in your .emacs file):
+
+    (ido-ubiquitous-disable-in foo)
+
+\(fn &optional ARG)" t nil)
+
+(defvar ido-ubiquitous-command-exceptions 'nil "\
+List of commands that should not be affected by `ido-ubiquitous'.
+
+Even when `ido-ubiquitous' mode is enabled, these commands will
+continue to use `completing-read' instead of
+`ido-completing-read'.
+
+Only *interactive* commands should go here. To disable
+ido-ubiquitous in non-interactive functions, customize
+`ido-ubiquitous-function-exceptions'.")
+
+(custom-autoload 'ido-ubiquitous-command-exceptions "ido-ubiquitous" t)
+
+(defvar ido-ubiquitous-function-exceptions '(grep-read-files) "\
+List of functions in which to disable ido-ubiquitous.
+
+Certain functions, such as `read-file-name', always have
+ido-ubiquitous disabled, and cannot be added here. (They are
+effectively permanently part of this list already.)")
+
+(custom-autoload 'ido-ubiquitous-function-exceptions "ido-ubiquitous" nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("ido-ubiquitous-pkg.el") (20166 22146
+;;;;;;  727855))
+
+;;;***
+
+(provide 'ido-ubiquitous-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; ido-ubiquitous-autoloads.el ends here
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el
new file mode 100644
index 000000000..6575d4ca0
--- /dev/null
+++ b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el
@@ -0,0 +1 @@
+(define-package "ido-ubiquitous" "0.7" "Use ido (nearly) everywhere." (quote nil))
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc
new file mode 100644
index 000000000..c68d5dddd
Binary files /dev/null and b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc differ
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el
new file mode 100644
index 000000000..679cc447d
--- /dev/null
+++ b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el
@@ -0,0 +1,199 @@
+
+;;; ido-ubiquitous.el --- Use ido (nearly) everywhere.
+
+;; Author: Ryan C. Thompson
+;; URL: https://github.com/DarwinAwardWinner/ido-ubiquitous
+;; Version: 0.7
+;; Created: 2011-09-01
+;; Keywords: convenience
+;; EmacsWiki: InteractivelyDoThings
+
+;; This file is NOT part of GNU Emacs.
+
+;;; Commentary:
+
+;; You may have seen the `ido-everywhere' variable in ido.el and got
+;; excited that you could use ido completion for everything. Then you
+;; were probably disappointed when you realized that it only applied
+;; to *file names* and nothing else. Well, ido-ubiquitous is here to
+;; fulfill the original promise and let you use ido completion for
+;; (almost) any command that uses `completing-read' to offer you a
+;; choice of several alternatives.
+
+;; This even works in M-x, but for that, you might prefer the "smex"
+;; package instead.
+
+;;; License:
+
+;; 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, 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+(require 'ido)
+
+;;;###autoload
+(defgroup ido-ubiquitous nil
+  "Use ido for (almost) all completion."
+  :group 'ido)
+
+;;;###autoload
+(define-minor-mode ido-ubiquitous
+  "Use `ido-completing-read' instead of `completing-read' almost everywhere.
+
+  This mode has no effect unles `ido-mode' is also enabled.
+
+  If this mode causes problems for a function, you can force the
+  function to use the original completing read by using the macro
+  `ido-ubiquitous-disable-in'. For example, if a
+  function `foo' cannot work with ido-style completion, evaluate
+  the following (for example by putting it in your .emacs file):
+
+    (ido-ubiquitous-disable-in foo)"
+
+  nil
+  :global t
+  :group 'ido-ubiquitous)
+
+;;;###autoload
+(defcustom ido-ubiquitous-command-exceptions '()
+  "List of commands that should not be affected by `ido-ubiquitous'.
+
+Even when `ido-ubiquitous' mode is enabled, these commands will
+continue to use `completing-read' instead of
+`ido-completing-read'.
+
+Only *interactive* commands should go here. To disable
+ido-ubiquitous in non-interactive functions, customize
+`ido-ubiquitous-function-exceptions'."
+  :type '(repeat (symbol :tag "Command"))
+  :group 'ido-ubiquitous)
+
+(define-obsolete-variable-alias 'ido-ubiquitous-exceptions
+  'ido-ubiquitous-command-exceptions "0.4")
+
+(defadvice completing-read (around ido-ubiquitous activate)
+  (if (or (not ido-mode)
+          (not ido-ubiquitous)
+          (memq this-command ido-ubiquitous-command-exceptions)
+          ;; Avoid infinite recursion from ido calling completing-read
+          (boundp 'ido-cur-item))
+      ad-do-it
+    (let ((allcomp (all-completions "" collection predicate)))
+      ;; Only use ido completion if there are actually any completions
+      ;; to offer.
+      (if allcomp
+          (setq ad-return-value
+                (ido-completing-read prompt allcomp
+                                     nil require-match initial-input hist def))
+        ad-do-it))))
+
+(defmacro ido-ubiquitous-disable-in (func)
+  "Disable ido-ubiquitous in FUNC."
+  (let ((docstring
+         (format "Disable ido-ubiquitous in %s" func)))
+    `(defadvice ,func (around disable-ido-ubiquitous activate)
+       ,docstring
+       (let (ido-ubiquitous) ad-do-it))))
+
+(define-obsolete-function-alias
+  'disable-ido-ubiquitous-in
+  'ido-ubiquitous-disable-in
+  "0.4")
+
+(defmacro ido-ubiquitous-enable-in (func)
+  "Re-enable ido-ubiquitous in FUNC.
+
+  This reverses the effect of `ido-ubiquitous-disable-in'."
+  ;; In my experience, simply using `ad-remove-advice' or
+  ;; `ad-disable-advice' doesn't work correctly (in Emacs 23).
+  ;; Instead, I've found that one must redefine the advice under the
+  ;; same name ("disable-ido-ubiquitous") to simply call the original
+  ;; function with no modifications. This has the same effect
+  ;; (disables the advice), but is presumably less efficient.
+  (let ((docstring
+         (format "DO NOT disable ido-ubiquitous in %s" func)))
+    `(defadvice ,func (around disable-ido-ubiquitous activate)
+       ,docstring
+       ad-do-it)))
+
+(define-obsolete-function-alias
+  'enable-ido-ubiquitous-in
+  'ido-ubiquitous-enable-in
+  "0.4")
+
+;; Always disable ido-ubiquitous in `find-file' and similar functions,
+;; because they are not supposed to use ido.
+(defvar ido-ubiquitous-permanent-function-exceptions
+  '(read-file-name)
+  "Functions in which ido-ubiquitous should always be disabled.
+
+If you want to disable ido in a specific function or command, do
+not modify this variable. Instead, try `M-x customize-group
+ido-ubiquitous..")
+
+(dolist (func ido-ubiquitous-permanent-function-exceptions)
+  (eval `(ido-ubiquitous-disable-in ,func)))
+
+(defun ido-ubiquitous--set-difference (list1 list2)
+  "Replacement for `set-difference' from `cl'."
+  (apply #'nconc
+         (mapcar (lambda (elt) (unless (memq elt list2) (list elt)))
+                 list1)))
+
+(defun ido-ubiquitous-set-function-exceptions (sym newval)
+  (let* ((oldval (when (boundp sym) (eval sym))))
+    ;; Filter out permanent fixtures
+    (setq oldval (ido-ubiquitous--set-difference oldval ido-ubiquitous-permanent-function-exceptions))
+    (setq newval (ido-ubiquitous--set-difference newval ido-ubiquitous-permanent-function-exceptions))
+    ;; Re-enable ido-ubiquitous on all old functions, in case they
+    ;; were removed from the list.
+    (dolist (oldfun oldval)
+      (eval `(ido-ubiquitous-enable-in ,oldfun)))
+    ;; Set the new value
+    (set-default sym newval)
+    ;; Disable ido-ubiquitous on all new functions
+    (dolist (newfun newval)
+      (eval `(ido-ubiquitous-disable-in ,newfun)))))
+
+;;;###autoload
+(defcustom ido-ubiquitous-function-exceptions
+  '(grep-read-files)
+  "List of functions in which to disable ido-ubiquitous.
+
+Certain functions, such as `read-file-name', always have
+ido-ubiquitous disabled, and cannot be added here. (They are
+effectively permanently part of this list already.)"
+  :group 'ido-ubiquitous
+  :type '(repeat :tag "Functions"
+                 (symbol :tag "Function"))
+  :set 'ido-ubiquitous-set-function-exceptions)
+
+(defadvice ido-exit-minibuffer (around required-allow-empty-string activate)
+  "Emulate a quirk of `completing-read'.
+
+Apparently, `completing-read' used to request the default item by
+returning an empty string when RET was pressed with an empty input.
+This forces `ido-completing-read' to do the same (instead of returning
+the first choice in the list).
+
+This has no effect when ido is completing buffers or files."
+  (if (and (eq ido-cur-item 'list)
+           ido-require-match
+           (string= ido-text ""))
+      (ido-select-text)
+    ad-do-it))
+
+(provide 'ido-ubiquitous) ;;; ido-ubiquitous.el ends here
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc
new file mode 100644
index 000000000..b695c899b
Binary files /dev/null and b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc differ
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el b/elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el
deleted file mode 100644
index b4dc3b05b..000000000
--- a/elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el
+++ /dev/null
@@ -1,85 +0,0 @@
-;;; inf-ruby-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads (inf-ruby-console-default inf-ruby-console-gem
-;;;;;;  inf-ruby-console-rails inf-ruby-console-auto inf-ruby-switch-setup
-;;;;;;  run-ruby inf-ruby inf-ruby-minor-mode inf-ruby-setup-keybindings)
-;;;;;;  "inf-ruby" "inf-ruby.el" (21031 23290 0 0))
-;;; Generated autoloads from inf-ruby.el
-
-(autoload 'inf-ruby-setup-keybindings "inf-ruby" "\
-Hook up `inf-ruby-minor-mode' to each of `ruby-source-modes'.
-
-\(fn)" nil nil)
-
-(autoload 'inf-ruby-minor-mode "inf-ruby" "\
-Minor mode for interacting with the inferior process buffer.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'inf-ruby "inf-ruby" "\
-Run an inferior Ruby process in a buffer.
-With prefix argument, prompts for which Ruby implementation
-\(from the list `inf-ruby-implementations') to use. Runs the
-hooks `inf-ruby-mode-hook' (after the `comint-mode-hook' is
-run).
-
-\(fn &optional IMPL)" t nil)
-
-(autoload 'run-ruby "inf-ruby" "\
-Run an inferior Ruby process, input and output via buffer *ruby*.
-If there is a process already running in `*ruby*', switch to that buffer.
-With argument, allows you to edit the command line (default is value
-of `ruby-program-name').  Runs the hooks `inferior-ruby-mode-hook'
-\(after the `comint-mode-hook' is run).
-\(Type \\[describe-mode] in the process buffer for a list of commands.)
-
-\(fn &optional COMMAND NAME)" t nil)
-
-(autoload 'inf-ruby-switch-setup "inf-ruby" "\
-Modify `rspec-compilation-mode' and `ruby-compilation-mode'
-keymaps to bind `inf-ruby-switch-from-compilation' to `!-x C-q'.
-
-\(fn)" nil nil)
-
-(autoload 'inf-ruby-console-auto "inf-ruby" "\
-Automatically determine the appropriate Ruby console command
-and the directory to run it from.
-
-\(fn)" t nil)
-
-(autoload 'inf-ruby-console-rails "inf-ruby" "\
-Run Rails console in DIR.
-
-\(fn DIR)" t nil)
-
-(autoload 'inf-ruby-console-gem "inf-ruby" "\
-Run IRB console for the gem in DIR.
-The main module should be loaded automatically. If DIR contains a
-Gemfile, it should use the `gemspec' instruction.
-
-\(fn DIR)" t nil)
-
-(autoload 'inf-ruby-console-default "inf-ruby" "\
-Run racksh, custom console.rb, or just IRB, in DIR.
-
-\(fn DIR)" t nil)
- (inf-ruby-setup-keybindings)
-
-;;;***
-
-;;;### (autoloads nil nil ("inf-ruby-pkg.el") (21031 23290 158755
-;;;;;;  0))
-
-;;;***
-
-(provide 'inf-ruby-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; inf-ruby-autoloads.el ends here
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby-pkg.el b/elpa/inf-ruby-2.3.0/inf-ruby-pkg.el
deleted file mode 100644
index dd9bfb4b2..000000000
--- a/elpa/inf-ruby-2.3.0/inf-ruby-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "inf-ruby" "2.3.0" "Run a ruby process in a buffer" (quote nil))
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby.el b/elpa/inf-ruby-2.3.0/inf-ruby.el
deleted file mode 100644
index 176918876..000000000
--- a/elpa/inf-ruby-2.3.0/inf-ruby.el
+++ /dev/null
@@ -1,541 +0,0 @@
-;;; inf-ruby.el --- Run a ruby process in a buffer
-
-;; Copyright (C) 1999-2008 Yukihiro Matsumoto, Nobuyoshi Nakada
-
-;; Author: Yukihiro Matsumoto
-;;         Nobuyoshi Nakada
-;;         Cornelius Mika <cornelius.mika@gmail.com>
-;;         Dmitry Gutov <dgutov@yandex.ru>
-;;         Kyle Hargraves <pd@krh.me>
-;; URL: http://github.com/nonsequitur/inf-ruby
-;; Created: 8 April 1998
-;; Keywords: languages ruby
-;; Version: 2.3.0
-
-;;; Commentary:
-;;
-;; inf-ruby.el provides a REPL buffer connected to an IRB subprocess.
-;;
-;; If you're installing manually, you'll need to:
-;; * drop the file somewhere on your load path (perhaps ~/.emacs.d)
-;; * Add the following lines to your .emacs file:
-;;
-;;    (autoload 'inf-ruby "inf-ruby" "Run an inferior Ruby process" t)
-;;    (autoload 'inf-ruby-setup-keybindings "inf-ruby" "" t)
-;;    (eval-after-load 'ruby-mode
-;;      '(add-hook 'ruby-mode-hook 'inf-ruby-setup-keybindings))
-;;
-;; Additionally, consider adding
-;;
-;;    (inf-ruby-switch-setup)
-;;
-;; to your init file to easily switch from common Ruby compilation
-;; modes to interact with a debugger.
-
-(require 'comint)
-(require 'compile)
-(require 'ruby-mode)
-
-(defvar inf-ruby-default-implementation "ruby"
-  "Which Ruby implementation to use if none is specified.")
-
-(defconst inf-ruby-prompt-format
-  (concat
-   (mapconcat
-    #'identity
-    '("\\(^%s> *\\)"                      ; Simple
-      "\\(^(rdb:1) *\\)"                  ; Debugger
-      "\\(^\\(irb([^)]+)"                 ; IRB default
-      "\\([[0-9]+] \\)?[Pp]ry ?([^)]+)"   ; Pry
-      "\\(jruby-\\|JRUBY-\\)?[1-9]\\.[0-9]\\.[0-9]+\\(-?p?[0-9]+\\)?" ; RVM
-      "^rbx-head\\)")                     ; RVM continued
-    "\\|")
-   ;; Statement and nesting counters, common to the last four.
-   " ?[0-9:]* ?%s *\\)")
-  "Format string for the prompt regexp pattern.
-Two placeholders: first char in the Simple prompt, and the last
-graphical char in all other prompts.")
-
-(defvar inf-ruby-first-prompt-pattern (format inf-ruby-prompt-format ">" ">")
-  "First prompt regex pattern of Ruby interpreter.")
-
-(defvar inf-ruby-prompt-pattern (format inf-ruby-prompt-format "[?>]" "[\]>*\"'/`]")
-  "Prompt regex pattern of Ruby interpreter.")
-
-(defvar inf-ruby-mode-hook nil
-  "Hook for customizing inf-ruby mode.")
-
-(defvar inf-ruby-mode-map
-  (let ((map (copy-keymap comint-mode-map)))
-    (define-key map (kbd "C-c C-l") 'ruby-load-file)
-    (define-key map (kbd "C-x C-e") 'ruby-send-last-sexp)
-    (define-key map (kbd "TAB") 'inf-ruby-complete)
-    map)
-  "Mode map for inf-ruby-mode")
-
-(defvar inf-ruby-implementations
-  '(("ruby"     . "irb --prompt default -r irb/completion")
-    ("jruby"    . "jruby -S irb --prompt default -r irb/completion")
-    ("rubinius" . "rbx -r irb/completion")
-    ("yarv"     . "irb1.9 -r irb/completion")
-    ("macruby"  . "macirb -r irb/completion"))
-  "An alist of ruby implementations to irb executable names.")
-
-(defvar ruby-source-modes '(ruby-mode enh-ruby-mode)
-  "Used to determine if a buffer contains Ruby source code.
-If it's loaded into a buffer that is in one of these major modes, it's
-considered a ruby source file by `ruby-load-file'.
-Used by these commands to determine defaults.")
-
-(defvar ruby-prev-l/c-dir/file nil
-  "Caches the last (directory . file) pair.
-Caches the last pair used in the last ruby-load-file command.
-Used for determining the default in the
-next one.")
-
-(defvar inf-ruby-at-top-level-prompt-p t)
-
-(defconst inf-ruby-error-regexp-alist
-  '(("SyntaxError: \\(?:compile error\n\\)?\\([^\(].*\\):\\([1-9][0-9]*\\):" 1 2)
-    ("^\tfrom \\([^\(].*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?$" 1 2)))
-
-;;;###autoload
-(defun inf-ruby-setup-keybindings ()
-  "Hook up `inf-ruby-minor-mode' to each of `ruby-source-modes'."
-  (dolist (mode ruby-source-modes)
-    (add-hook (intern (format "%s-hook" mode)) 'inf-ruby-minor-mode)))
-
-(defvar inf-ruby-minor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-M-x") 'ruby-send-definition)
-    (define-key map (kbd "C-x C-e") 'ruby-send-last-sexp)
-    (define-key map (kbd "C-c C-b") 'ruby-send-block)
-    (define-key map (kbd "C-c M-b") 'ruby-send-block-and-go)
-    (define-key map (kbd "C-c C-x") 'ruby-send-definition)
-    (define-key map (kbd "C-c M-x") 'ruby-send-definition-and-go)
-    (define-key map (kbd "C-c C-r") 'ruby-send-region)
-    (define-key map (kbd "C-c M-r") 'ruby-send-region-and-go)
-    (define-key map (kbd "C-c C-z") 'ruby-switch-to-inf)
-    (define-key map (kbd "C-c C-l") 'ruby-load-file)
-    (define-key map (kbd "C-c C-s") 'inf-ruby)
-    map))
-
-;;;###autoload
-(define-minor-mode inf-ruby-minor-mode
-  "Minor mode for interacting with the inferior process buffer."
-  :lighter "" :keymap inf-ruby-minor-mode-map)
-
-(defvar inf-ruby-buffer nil "Current irb process buffer.")
-
-(defun inf-ruby-mode ()
-  "Major mode for interacting with an inferior Ruby (irb) process.
-
-The following commands are available:
-\\{inf-ruby-mode-map}
-
-A Ruby process can be fired up with M-x inf-ruby.
-
-Customization: When entered, this mode runs `comint-mode-hook' and
-`inf-ruby-mode-hook' (in that order).
-
-You can send text to the inferior ruby process from other buffers containing
-Ruby source.
-
-    `ruby-switch-to-inf' switches the current buffer to the ruby process buffer.
-    `ruby-send-definition' sends the current definition to the ruby process.
-    `ruby-send-region' sends the current region to the ruby process.
-    `ruby-send-definition-and-go' and `ruby-send-region-and-go'
-        switch to the ruby process buffer after sending their text.
-
-Commands:
-Return after the end of the process' output sends the text from the
-    end of process to point.
-Return before the end of the process' output copies the sexp ending at point
-    to the end of the process' output, and sends it.
-Delete converts tabs to spaces as it moves back.
-Tab indents for ruby; with argument, shifts rest
-    of expression rigidly with the current line.
-C-M-q does Tab on each line starting within following expression.
-Paragraphs are separated only by blank lines.  # start comments.
-If you accidentally suspend your process, use \\[comint-continue-subjob]
-to continue it."
-  (interactive)
-  (comint-mode)
-  (setq comint-prompt-regexp inf-ruby-prompt-pattern)
-  (ruby-mode-variables)
-  (setq major-mode 'inf-ruby-mode)
-  (setq mode-name "Inf-Ruby")
-  (setq mode-line-process '(":%s"))
-  (use-local-map inf-ruby-mode-map)
-  (add-hook 'comint-output-filter-functions 'inf-ruby-output-filter nil t)
-  (setq comint-get-old-input (function inf-ruby-get-old-input))
-  (make-local-variable 'compilation-error-regexp-alist)
-  (setq compilation-error-regexp-alist inf-ruby-error-regexp-alist)
-  (when (eq system-type 'windows-nt)
-    (setq comint-process-echoes t))
-  (compilation-shell-minor-mode t)
-  (run-hooks 'inf-ruby-mode-hook))
-
-(defun inf-ruby-output-filter (output)
-  "Check if the current prompt is a top-level prompt"
-  (unless (zerop (length output))
-    (setq inf-ruby-at-top-level-prompt-p
-          (string-match inf-ruby-first-prompt-pattern
-                        (car (last (split-string output "\n")))))))
-
-;; adapted from replace-in-string in XEmacs (subr.el)
-(defun inf-ruby-remove-in-string (str regexp)
-  "Remove all matches in STR for REGEXP and returns the new string."
-  (let ((rtn-str "") (start 0) match prev-start)
-    (while (setq match (string-match regexp str start))
-      (setq prev-start start
-            start (match-end 0)
-            rtn-str (concat rtn-str (substring str prev-start match))))
-    (concat rtn-str (substring str start))))
-
-(defun inf-ruby-get-old-input ()
-  "Snarf the sexp ending at point"
-  (save-excursion
-    (let ((end (point)))
-      (re-search-backward inf-ruby-first-prompt-pattern)
-      (inf-ruby-remove-in-string (buffer-substring (point) end)
-                                 inf-ruby-prompt-pattern))))
-
-;;;###autoload
-(defun inf-ruby (&optional impl)
-  "Run an inferior Ruby process in a buffer.
-With prefix argument, prompts for which Ruby implementation
-\(from the list `inf-ruby-implementations') to use. Runs the
-hooks `inf-ruby-mode-hook' \(after the `comint-mode-hook' is
-run)."
-
-  (interactive (list (if current-prefix-arg
-                         (completing-read "Ruby Implementation: "
-                                          (mapc #'car inf-ruby-implementations))
-                       inf-ruby-default-implementation)))
-  (setq impl (or impl "ruby"))
-
-  (let ((command (cdr (assoc impl inf-ruby-implementations))))
-    (run-ruby command impl)))
-
-;;;###autoload
-(defun run-ruby (&optional command name)
-  "Run an inferior Ruby process, input and output via buffer *ruby*.
-If there is a process already running in `*ruby*', switch to that buffer.
-With argument, allows you to edit the command line (default is value
-of `ruby-program-name').  Runs the hooks `inferior-ruby-mode-hook'
-\(after the `comint-mode-hook' is run).
-\(Type \\[describe-mode] in the process buffer for a list of commands.)"
-
-  (interactive)
-  (setq command (or command (cdr (assoc inf-ruby-default-implementation
-                                        inf-ruby-implementations))))
-  (setq name (or name "ruby"))
-
-  (if (not (comint-check-proc inf-ruby-buffer))
-      (let ((commandlist (split-string-and-unquote command)))
-        (set-buffer (apply 'make-comint name (car commandlist)
-                           nil (cdr commandlist)))
-        (inf-ruby-mode)))
-  (pop-to-buffer (setq inf-ruby-buffer (format "*%s*" name))))
-
-(defun inf-ruby-proc ()
-  "Returns the current IRB process. See variable inf-ruby-buffer."
-  (or (get-buffer-process (if (eq major-mode 'inf-ruby-mode)
-                              (current-buffer)
-                            inf-ruby-buffer))
-      (error "No current process. See variable inf-ruby-buffer")))
-
-;; These commands are added to the ruby-mode keymap:
-
-(defconst ruby-send-terminator "--inf-ruby-%x-%d-%d-%d--"
-  "Template for irb here document terminator.
-Must not contain ruby meta characters.")
-
-(defconst inf-ruby-eval-binding "IRB.conf[:MAIN_CONTEXT].workspace.binding")
-
-(defconst ruby-eval-separator "")
-
-(defun ruby-send-region (start end)
-  "Send the current region to the inferior Ruby process."
-  (interactive "r")
-  (let (term (file (or buffer-file-name (buffer-name))) line)
-    (save-excursion
-      (save-restriction
-        (widen)
-        (goto-char start)
-        (setq line (+ start (forward-line (- start)) 1))
-        (goto-char start)
-        (while (progn
-                 (setq term (apply 'format ruby-send-terminator (random) (current-time)))
-                 (re-search-forward (concat "^" (regexp-quote term) "$") end t)))))
-    ;; compilation-parse-errors parses from second line.
-    (save-excursion
-      (let ((m (process-mark (inf-ruby-proc))))
-        (set-buffer (marker-buffer m))
-        (goto-char m)
-        (insert ruby-eval-separator "\n")
-        (set-marker m (point))))
-    (comint-send-string (inf-ruby-proc) (format "eval <<'%s', %s, %S, %d\n"
-                                                term inf-ruby-eval-binding
-                                                file line))
-    (comint-send-region (inf-ruby-proc) start end)
-    (comint-send-string (inf-ruby-proc) (concat "\n" term "\n"))))
-
-(defun ruby-send-definition ()
-  "Send the current definition to the inferior Ruby process."
-  (interactive)
-  (save-excursion
-    (ruby-end-of-defun)
-    (let ((end (point)))
-      (ruby-beginning-of-defun)
-      (ruby-send-region (point) end))))
-
-(defun ruby-send-last-sexp ()
-  "Send the previous sexp to the inferior Ruby process."
-  (interactive)
-  (ruby-send-region (save-excursion (ruby-backward-sexp) (point)) (point)))
-
-(defun ruby-send-block ()
-  "Send the current block to the inferior Ruby process."
-  (interactive)
-  (save-excursion
-    (ruby-end-of-block)
-    (end-of-line)
-    (let ((end (point)))
-      (ruby-beginning-of-block)
-      (ruby-send-region (point) end))))
-
-(defun ruby-switch-to-inf (eob-p)
-  "Switch to the ruby process buffer.
-With argument, positions cursor at end of buffer."
-  (interactive "P")
-  (if (get-buffer inf-ruby-buffer)
-      (pop-to-buffer inf-ruby-buffer)
-    (error "No current process buffer. See variable inf-ruby-buffer."))
-  (cond (eob-p
-         (push-mark)
-         (goto-char (point-max)))))
-
-(defun ruby-send-region-and-go (start end)
-  "Send the current region to the inferior Ruby process.
-Then switch to the process buffer."
-  (interactive "r")
-  (ruby-send-region start end)
-  (ruby-switch-to-inf t))
-
-(defun ruby-send-definition-and-go ()
-  "Send the current definition to the inferior Ruby.
-Then switch to the process buffer."
-  (interactive)
-  (ruby-send-definition)
-  (ruby-switch-to-inf t))
-
-(defun ruby-send-block-and-go ()
-  "Send the current block to the inferior Ruby.
-Then switch to the process buffer."
-  (interactive)
-  (ruby-send-block)
-  (ruby-switch-to-inf t))
-
-(defun ruby-load-file (file-name)
-  "Load a Ruby file into the inferior Ruby process."
-  (interactive (comint-get-source "Load Ruby file: " ruby-prev-l/c-dir/file
-                                  ruby-source-modes t)) ;; T because LOAD needs an exact name
-  (comint-check-source file-name) ; Check to see if buffer needs saved.
-  (setq ruby-prev-l/c-dir/file (cons (file-name-directory    file-name)
-                                     (file-name-nondirectory file-name)))
-  (comint-send-string (inf-ruby-proc) (concat "(load \""
-                                              file-name
-                                              "\"\)\n")))
-
-(defun ruby-escape-single-quoted (str)
-  (replace-regexp-in-string "'" "\\\\'"
-    (replace-regexp-in-string "\n" "\\\\n"
-      (replace-regexp-in-string "\\\\" "\\\\\\\\" str))))
-
-(defsubst inf-ruby-fix-completions-on-windows (completions)
-  "On Windows, the string received by `accept-process-output'
-starts with the last line that was sent to the Ruby process.
-The reason for this is unknown. Remove this line from `completions'."
-  (if (eq system-type 'windows-nt)
-      (cdr completions)
-    completions))
-
-(defun inf-ruby-completions (expr)
-  "Return a list of completions for the Ruby expression starting with EXPR."
-  (let* ((proc (inf-ruby-proc))
-         (line (buffer-substring (save-excursion (beginning-of-thing 'line))
-                                 (point)))
-	 (comint-filt (process-filter proc))
-	 (kept "") completions)
-    (set-process-filter proc (lambda (proc string) (setq kept (concat kept string))))
-    (process-send-string
-     proc
-     (format (concat "if defined?(Pry.config) then "
-                     "completor = Pry.config.completer"
-                     ".build_completion_proc(binding, defined?(_pry_) ? _pry_ : Pry.new)"
-                     " elsif defined?(Bond.agent) && Bond.started? then "
-                     "completor = Bond.agent"
-                     " elsif defined?(IRB::InputCompletor::CompletionProc) then "
-                     "completor = IRB::InputCompletor::CompletionProc "
-                     "end and "
-                     "puts completor.call('%s', '%s').compact\n")
-             (ruby-escape-single-quoted expr)
-             (ruby-escape-single-quoted line)))
-    (while (and (not (string-match inf-ruby-prompt-pattern kept))
-                (accept-process-output proc 2)))
-    (setq completions (butlast (split-string kept "\r?\n") 2))
-    (setq completions (inf-ruby-fix-completions-on-windows completions))
-    (set-process-filter proc comint-filt)
-    completions))
-
-(defconst inf-ruby-ruby-expr-break-chars " \t\n\"\'`><,;|&{(")
-
-(defun inf-ruby-completion-bounds-of-expr-at-point ()
-  (save-excursion
-    (let ((end (point)))
-      (skip-chars-backward (concat "^" inf-ruby-ruby-expr-break-chars))
-      (cons (point) end))))
-
-(defun inf-ruby-completion-expr-at-point ()
-  (let ((bounds (inf-ruby-completion-bounds-of-expr-at-point)))
-    (buffer-substring (car bounds) (cdr bounds))))
-
-(defun inf-ruby-completion-at-point ()
-  (if inf-ruby-at-top-level-prompt-p
-      (let* ((expr (inf-ruby-completion-expr-at-point))
-             (completions (inf-ruby-completions expr)))
-        (if completions
-            (if (= (length completions) 1)
-                (car completions)
-              (completing-read "possible completions: "
-                               completions nil t expr))))
-    (message "Completion aborted: Not at a top-level prompt")
-    nil))
-
-(defun inf-ruby-complete (command)
-  "Complete the Ruby code at point.
-Uses the first one available of Pry, Bond and the default IRB
-completion."
-  (interactive (list (inf-ruby-completion-at-point)))
-  (when command
-    (let ((bounds (inf-ruby-completion-bounds-of-expr-at-point)))
-      (delete-region (car bounds) (cdr bounds)))
-    (insert command)))
-
-(defun inf-ruby-complete-or-tab (&optional command)
-  "Either complete the ruby code at point or call
-`indent-for-tab-command' if no completion is available."
-  (interactive (list (inf-ruby-completion-at-point)))
-  (if (not command)
-      (call-interactively 'indent-for-tab-command)
-    (inf-ruby-complete command)))
-
-(defun inf-ruby-switch-from-compilation ()
-  "Make the buffer writable and switch to `inf-ruby-mode'.
-Recommended for use when the program being executed enters
-interactive mode, i.e. hits a debugger breakpoint."
-  (interactive)
-  (setq buffer-read-only nil)
-  (buffer-enable-undo)
-  (inf-ruby-mode)
-  (let ((proc (get-buffer-process (current-buffer))))
-    (set-process-filter proc 'comint-output-filter)
-    (when (looking-back inf-ruby-prompt-pattern (line-beginning-position))
-      (let ((line (match-string 0)))
-        (delete-region (match-beginning 0) (point))
-        (comint-output-filter proc line)))))
-
-;;;###autoload
-(defun inf-ruby-switch-setup ()
-  "Modify `rspec-compilation-mode' and `ruby-compilation-mode'
-keymaps to bind `inf-ruby-switch-from-compilation' to `!-x C-q'."
-  (eval-after-load 'rspec-mode
-    '(define-key rspec-compilation-mode-map (kbd "C-x C-q")
-       'inf-ruby-switch-from-compilation))
-  (eval-after-load 'ruby-compilation
-    '(define-key ruby-compilation-mode-map (kbd "C-x C-q")
-       'inf-ruby-switch-from-compilation)))
-
-(defvar inf-ruby-console-patterns-alist
-  '(("config/application.rb" . rails)
-    ("*.gemspec" . gem)
-    ("Gemfile" . default))
-  "Mapping from file name patterns to name symbols.
-`inf-ruby-console-auto' walks up from the current directory until
-one of the patterns matches, then calls `inf-ruby-console-NAME',
-passing it the found directory.")
-
-(defun inf-ruby-console-match (dir)
-  (catch 'type
-    (dolist (pair inf-ruby-console-patterns-alist)
-      (let ((default-directory dir))
-        (when (file-expand-wildcards (car pair))
-          (throw 'type (cdr pair)))))))
-
-;;;###autoload
-(defun inf-ruby-console-auto ()
-  "Automatically determine the appropriate Ruby console command
-and the directory to run it from."
-  (interactive)
-  (let* ((dir (locate-dominating-file default-directory
-                                      #'inf-ruby-console-match))
-         (type (inf-ruby-console-match dir))
-         (fun (intern (format "inf-ruby-console-%s" type))))
-    (unless type (error "No matching directory found"))
-    (funcall fun dir)))
-
-;;;###autoload
-(defun inf-ruby-console-rails (dir)
-  "Run Rails console in DIR."
-  (interactive "D")
-  (let ((default-directory dir))
-    (run-ruby "rails console" "rails")))
-
-;;;###autoload
-(defun inf-ruby-console-gem (dir)
-  "Run IRB console for the gem in DIR.
-The main module should be loaded automatically. If DIR contains a
-Gemfile, it should use the `gemspec' instruction."
-  (interactive "D")
-  (let ((default-directory dir))
-    (if (file-exists-p "Gemfile")
-        (run-ruby "bundle exec irb" "gem")
-      (unless (file-exists-p "lib")
-        (error "The directory must contain a 'lib' subdirectory"))
-      (let (files)
-        (dolist (item (directory-files "lib"))
-          (unless (file-directory-p item)
-            (setq files (cons item files))))
-        (run-ruby (concat "irb -I lib"
-                          ;; If there are several files under 'lib'
-                          ;; (unlikely), load them all.
-                          (mapconcat
-                           (lambda (file)
-                             (concat " -r " (file-name-sans-extension file)))
-                           files
-                           ""))
-                  "gem")))))
-
-;;;###autoload
-(defun inf-ruby-console-default (dir)
-  "Run racksh, custom console.rb, or just IRB, in DIR."
-  (interactive "D")
-  (let ((default-directory dir))
-    (unless (file-exists-p "Gemfile")
-      (error "The directory must contain a Gemfile"))
-    (cond
-     ((with-temp-buffer
-        (insert-file-contents "Gemfile")
-        (re-search-forward "[\"']racksh[\"']" nil t))
-      (run-ruby "bundle exec racksh" "racksh"))
-     ((file-exists-p "console.rb")
-      (run-ruby "ruby console.rb" "console.rb"))
-     (t
-      (run-ruby "bundle exec irb")))))
-
-;;;###autoload (inf-ruby-setup-keybindings)
-
-(provide 'inf-ruby)
-;;; inf-ruby.el ends here
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby.elc b/elpa/inf-ruby-2.3.0/inf-ruby.elc
deleted file mode 100644
index 8256b6a24..000000000
Binary files a/elpa/inf-ruby-2.3.0/inf-ruby.elc and /dev/null differ
diff --git a/elpa/magit-1.0.0/50magit.el b/elpa/magit-1.0.0/50magit.el
new file mode 100644
index 000000000..b04034db0
--- /dev/null
+++ b/elpa/magit-1.0.0/50magit.el
@@ -0,0 +1,3 @@
+;;; Autoloads for magit
+
+(autoload 'magit-status "magit" nil t)
diff --git a/elpa/magit-1.2.0/magit-pkg.elc b/elpa/magit-1.0.0/50magit.elc
similarity index 64%
rename from elpa/magit-1.2.0/magit-pkg.elc
rename to elpa/magit-1.0.0/50magit.elc
index b8ce200d4..8a38ba6ac 100644
Binary files a/elpa/magit-1.2.0/magit-pkg.elc and b/elpa/magit-1.0.0/50magit.elc differ
diff --git a/elpa/magit-1.0.0/Makefile b/elpa/magit-1.0.0/Makefile
new file mode 100644
index 000000000..274c5d952
--- /dev/null
+++ b/elpa/magit-1.0.0/Makefile
@@ -0,0 +1,47 @@
+VERSION=1.0.0
+EMACS=emacs
+PREFIX=/usr/local
+ELS=magit.el magit-svn.el magit-topgit.el magit-key-mode.el
+ELCS=$(ELS:.el=.elc)
+DIST_FILES=$(ELS) Makefile magit.texi README.md magit.spec.in magit-pkg.el.in 50magit.el
+
+.PHONY=install
+
+BATCH=$(EMACS) -batch -q -no-site-file -eval \
+  "(setq load-path (cons (expand-file-name \".\") load-path))"
+
+%.elc: %.el
+	$(BATCH) --eval '(byte-compile-file "$<")'
+
+all: $(ELCS) magit.info magit.spec magit-pkg.el
+
+magit.spec: magit.spec.in
+	sed -e s/@VERSION@/$(VERSION)/ < $< > $@
+
+magit-pkg.el: magit-pkg.el.in
+	sed -e s/@VERSION@/$(VERSION)/ < $< > $@
+
+magit.elc:
+magit-key-mode.elc:
+magit-svn.elc:
+magit-topgit.elc:
+magit.info:
+
+# yuck - this needs cleaning up a bit...
+dist: $(DIST_FILES)
+	mkdir -p magit-$(VERSION)
+	cp $(DIST_FILES) magit-$(VERSION)
+	tar -cvzf magit-$(VERSION).tar.gz magit-$(VERSION)
+	rm -rf magit-$(VERSION)
+
+install: all
+	mkdir -p $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+	install -m 644 $(ELS) $(ELCS) $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+	mkdir -p $(DESTDIR)/$(PREFIX)/share/info
+	install -m 644 magit.info $(DESTDIR)/$(PREFIX)/share/info
+	install-info --info-dir=$(DESTDIR)/$(PREFIX)/share/info $(DESTDIR)/$(PREFIX)/share/info/magit.info
+	mkdir -p $(DESTDIR)/etc/emacs/site-start.d
+	install -m 644 50magit.el $(DESTDIR)/etc/emacs/site-start.d/50magit.el
+
+clean:
+	rm -fr magit-pkg.el magit.spec magit.info $(ELCS) *.tar.gz magit-$(VERSION)
diff --git a/elpa/magit-1.0.0/README.md b/elpa/magit-1.0.0/README.md
new file mode 100644
index 000000000..47bdf7043
--- /dev/null
+++ b/elpa/magit-1.0.0/README.md
@@ -0,0 +1,76 @@
+It's Magit!  A Emacs mode for Git.
+==================================
+
+Magit is an interface to Git for Emacs. Unlike Emacs's native
+[version control support][vc], Magit can take advantage of Git's
+native features without breaking compatibility with other systems.
+
+To get started see the [Magit User Manual][manual] or perhaps the
+[cheatsheet][cheatsheet] if you're in a hurry. There's also an
+excellent [Magit screencast][screencast] by Alex Vollmer which
+demonstrates some of the major features.
+
+Installing
+----------
+
+Download the latest tarball from [the github download page][download],
+then Magit can be installed with the popular recipe of:
+
+make && sudo make install
+
+This will put magit.el into `/usr/local/share/emacs/site-lisp`, where
+Emacs should be able to find it.  Then add
+
+    (require 'magit)
+
+to your `.emacs` file.
+
+Magit also now supports extensions:
+
+### git-svn
+
+`(require 'magit-svn)` - integrates with git-svn. Hit 'N' to see your
+options.
+
+### git-topgit
+
+`(require 'magit-topgit)` - integrates with topgit.
+
+Getting started
+---------------
+
+To get started with Magit, open any file in a Git repository in Emacs
+and run `M-x magit-status`.  Read the short help for magit-mode (`C-h
+m` in the Magit buffer), make some changes to your files, and try to
+commit them.
+
+Learning more
+-------------
+
+The [Magit User Manual][manual] describes things with more words than
+the online help.  You can read it in Emacs with `C-u C-h i
+magit.info`, or [on the web][manual].
+
+If you have any questions, please use [the mailing list][google group]
+at Google Groups.
+
+Magit's website is currently hosted [on GitHub][website].
+
+Development
+-----------
+
+Magit was started by Marius Vollmer. Phil Jackson is the lead
+developer. For a full list of contributors have a look at `magit.el`
+in the source distribution.
+
+Magit's canonical source repository is currently
+[hosted on GitHub][development].
+
+[vc]: http://www.gnu.org/software/emacs/manual/html_node/emacs/Version-Control.html#Version-Control
+[website]: http://philjackson.github.com/magit
+[development]: http://github.com/philjackson/magit
+[manual]: http://philjackson.github.com/magit/magit.html
+[cheatsheet]: http://daemianmack.com/magit-cheatsheet.html
+[screencast]: http://vimeo.com/2871241
+[download]: http://github.com/philjackson/magit/downloads
+[google group]: http://groups.google.com/group/magit/
diff --git a/elpa/magit-1.0.0/magit-autoloads.el b/elpa/magit-1.0.0/magit-autoloads.el
new file mode 100644
index 000000000..f1a90aa7a
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-autoloads.el
@@ -0,0 +1,28 @@
+;;; magit-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (magit-status) "magit" "magit.el" (20166 22135))
+;;; Generated autoloads from magit.el
+
+(autoload 'magit-status "magit" "\
+
+
+\(fn DIR)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("50magit.el" "magit-key-mode.el" "magit-pkg.el"
+;;;;;;  "magit-svn.el" "magit-topgit.el") (20166 22135 600465))
+
+;;;***
+
+(provide 'magit-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; magit-autoloads.el ends here
diff --git a/elpa/magit-1.2.0/magit-key-mode.el b/elpa/magit-1.0.0/magit-key-mode.el
similarity index 66%
rename from elpa/magit-1.2.0/magit-key-mode.el
rename to elpa/magit-1.0.0/magit-key-mode.el
index 2fcf2964c..21d523690 100644
--- a/elpa/magit-1.2.0/magit-key-mode.el
+++ b/elpa/magit-1.0.0/magit-key-mode.el
@@ -1,6 +1,4 @@
-(require 'magit)
-
-(eval-when-compile (require 'cl))
+(require 'assoc)
 
 (defvar magit-key-mode-key-maps '()
   "This will be filled lazily with proper `define-key' built
@@ -22,10 +20,10 @@
   '((logging
      (man-page "git-log")
      (actions
-      ("l" "Short" magit-log)
+      ("l" "Short" magit-display-log)
       ("L" "Long" magit-log-long)
       ("h" "Reflog" magit-reflog)
-      ("rl" "Ranged short" magit-log-ranged)
+      ("rl" "Ranged short" magit-display-log-ranged)
       ("rL" "Ranged long" magit-log-long-ranged)
       ("rh" "Ranged reflog" magit-reflog-ranged))
      (switches
@@ -57,9 +55,7 @@
      (actions
       ("f" "Current" magit-fetch-current)
       ("a" "All" magit-remote-update)
-      ("o" "Other" magit-fetch))
-     (switches
-      ("-p" "Prune" "--prune")))
+      ("o" "Other" magit-fetch)))
 
     (pushing
      (man-page "git-push")
@@ -68,8 +64,7 @@
       ("t" "Push tags" magit-push-tags))
      (switches
       ("-f" "Force" "--force")
-      ("-d" "Dry run" "-n")
-      ("-u" "Set upstream" "-u")))
+      ("-d" "Dry run" "-n")))
 
     (pulling
      (man-page "git-pull")
@@ -81,20 +76,12 @@
     (branching
      (man-page "git-branch")
      (actions
-      ("v" "Branch manager" magit-branch-manager)
-      ("c" "Create" magit-create-branch)
-      ("r" "Rename" magit-move-branch)
-      ("k" "Delete" magit-delete-branch)
+      ("v" "Branch manager" magit-show-branches)
+      ("n" "New" magit-create-branch)
+      ("m" "Move" magit-move-branch)
+      ("d" "Delete" magit-delete-branch)
       ("b" "Checkout" magit-checkout)))
 
-    (remoting
-     (man-page "git-remote")
-     (actions
-      ("v" "Branch manager" magit-branch-manager)
-      ("a" "Add" magit-add-remote)
-      ("r" "Rename" magit-rename-remote)
-      ("k" "Remove" magit-remove-remote)))
-
     (tagging
      (man-page "git-tag")
      (actions
@@ -109,20 +96,19 @@
       ("z" "Save" magit-stash)
       ("s" "Snapshot" magit-stash-snapshot))
      (switches
-      ("-k" "Keep index" "--keep-index")
-      ("-u" "Include untracked files" "--include-untracked")
-      ("-a" "Include all files" "--all")))
+      ("-k" "Keep index" "--keep-index")))
 
     (merging
      (man-page "git-merge")
      (actions
-      ("m" "Merge" magit-manual-merge))
+      ("m" "Merge" magit-merge))
      (switches
       ("-ff" "Fast-forward only" "--ff-only")
       ("-nf" "No fast-forward" "--no-ff")
+      ("-nc" "No commit" "--no-commit")
       ("-sq" "Squash" "--squash"))
      (arguments
-      ("-st" "Strategy" "--strategy=" read-from-minibuffer)))
+      ("-st" "Strategy" "--strategy" read-from-minibuffer)))
 
     (rewriting
      (actions
@@ -139,19 +125,7 @@
       ("u" "Update" magit-submodule-update)
       ("b" "Both update and init" magit-submodule-update-init)
       ("i" "Init" magit-submodule-init)
-      ("s" "Sync" magit-submodule-sync)))
-
-    (bisecting
-     (man-page "git-bisect")
-     (actions
-      ("b" "Bad" magit-bisect-bad)
-      ("g" "Good" magit-bisect-good)
-      ("k" "Skip" magit-bisect-skip)
-      ("l" "Log" magit-bisect-log)
-      ("r" "Reset" magit-bisect-reset)
-      ("s" "Start" magit-bisect-start)
-      ("u" "Run" magit-bisect-run)
-      ("v" "Visualize" magit-bisect-visualize))))
+      ("s" "Sync" magit-submodule-sync))))
   "Holds the key, help, function mapping for the log-mode. If you
   modify this make sure you reset `magit-key-mode-key-maps' to
   nil.")
@@ -176,7 +150,7 @@ and put in its place an empty one of the same name."
   (when (assoc group magit-key-mode-groups)
     (magit-key-mode-delete-group group))
   (setq magit-key-mode-groups
-        (cons (list group (list 'actions)) magit-key-mode-groups)))
+        (cons (list group '(actions)) magit-key-mode-groups)))
 
 (defun magit-key-mode-key-defined-p (for-group key)
   "If KEY is defined as any of switch, argument or action within
@@ -227,22 +201,15 @@ the group FOR-GROUP."
   "Provide help for a key (which the user is prompted for) within
 FOR-GROUP."
   (let* ((opts (magit-key-mode-options-for-group for-group))
-         (man-page (cadr (assoc 'man-page opts)))
-         (seq (read-key-sequence
-               (format "Enter command prefix%s: "
-                       (if man-page
-                         (format ", `?' for man `%s'" man-page)
-                         ""))))
+         (seq (read-key-sequence "Enter command prefix: "))
          (actions (cdr (assoc 'actions opts))))
-    (cond
-      ;; if it is an action popup the help for the to-be-run function
-      ((assoc seq actions) (describe-function (nth 2 (assoc seq actions))))
-      ;; if there is "?" show a man page if there is one
-      ((equal seq "?")
-       (if man-page
-         (man man-page)
-         (error "No man page associated with `%s'" for-group)))
-      (t (error "No help associated with `%s'" seq)))))
+    ;; is it an action? If so popup the help for the to-be-run
+    ;; function
+    (if (assoc seq actions)
+        (describe-function (nth 2 (assoc seq actions)))
+      ;; otherwise give the user a man page
+      (man (or (cadr (assoc 'man-page opts))
+               (error "No help associated with %s" seq))))))
 
 (defun magit-key-mode-exec-at-point ()
   "Run action/args/option at point."
@@ -251,17 +218,6 @@ FOR-GROUP."
                   (error "Nothing at point to do.")))
          (def (lookup-key (current-local-map) key)))
     (call-interactively def)))
-(defun magit-key-mode-jump-to-next-exec ()
-  "Jump to the next action/args/option point."
-  (interactive)
-  (let* ((oldp (point))
-         (old  (get-text-property oldp 'key-group-executor))
-         (p    (if (= oldp (point-max)) (point-min) (1+ oldp))))
-    (while (let ((new (get-text-property p 'key-group-executor)))
-             (and (not (= p oldp)) (or (not new) (eq new old))))
-      (setq p (if (= p (point-max)) (point-min) (1+ p))))
-    (goto-char p)
-    (skip-chars-forward " ")))
 
 (defun magit-key-mode-build-keymap (for-group)
   "Construct a normal looking keymap for the key mode to use and
@@ -269,53 +225,42 @@ put it in magit-key-mode-key-maps for fast lookup."
   (let* ((options (magit-key-mode-options-for-group for-group))
          (actions (cdr (assoc 'actions options)))
          (switches (cdr (assoc 'switches options)))
-         (arguments (cdr (assoc 'arguments options)))
-         (map (make-sparse-keymap)))
-    (suppress-keymap map 'nodigits)
-    ;; ret dwim
-    (define-key map (kbd "RET") 'magit-key-mode-exec-at-point)
-    ;; tab jumps to the next "button"
-    (define-key map (kbd "TAB") 'magit-key-mode-jump-to-next-exec)
-
-    ;; all maps should `quit' with `C-g' or `q'
-    (define-key map (kbd "C-g") `(lambda ()
-                                   (interactive)
-                                   (magit-key-mode-command nil)))
-    (define-key map (kbd "q")   `(lambda ()
-                                   (interactive)
-                                   (magit-key-mode-command nil)))
-    ;; run help
-    (define-key map (kbd "?") `(lambda ()
-                                 (interactive)
-                                 (magit-key-mode-help ',for-group)))
-
-    (flet ((defkey (k action)
-             (when (and (lookup-key map (car k))
-                        (not (numberp (lookup-key map (car k)))))
-               (message "Warning: overriding binding for `%s' in %S"
-                        (car k) for-group)
-               (ding)
-               (sit-for 2))
-             (define-key map (car k)
-               `(lambda () (interactive) ,action))))
+         (arguments (cdr (assoc 'arguments options))))
+    (let ((map (make-sparse-keymap)))
+      ;; ret dwim
+      (define-key map (kbd "RET") 'magit-key-mode-exec-at-point)
+
+      ;; all maps should 'quit' with C-g
+      (define-key map (kbd "C-g") (lambda ()
+                                    (interactive)
+                                    (magit-key-mode-command nil)))
+      ;; run help
+      (define-key map (kbd "?") `(lambda ()
+                                  (interactive)
+                                  (magit-key-mode-help ',for-group)))
+
       (when actions
         (dolist (k actions)
-          (defkey k `(magit-key-mode-command ',(nth 2 k)))))
+          (define-key map (car k) `(lambda ()
+                                     (interactive)
+                                     (magit-key-mode-command ',(nth 2 k))))))
       (when switches
         (dolist (k switches)
-          (defkey k `(magit-key-mode-add-option ',for-group ,(nth 2 k)))))
+          (define-key map (car k) `(lambda ()
+                                     (interactive)
+                                     (magit-key-mode-add-option
+                                      ',for-group
+                                      ,(nth 2 k))))))
       (when arguments
         (dolist (k arguments)
-          (defkey k `(magit-key-mode-add-argument
-                      ',for-group ,(nth 2 k) ',(nth 3 k))))))
-
-    (push (cons for-group map) magit-key-mode-key-maps)
-    map))
-
-(defvar magit-key-mode-prefix nil
-  "For internal use.  Holds the prefix argument to the command
-that brought up the key-mode window, so it can be used by the
-command that's eventually invoked.")
+          (define-key map (car k) `(lambda ()
+                                     (interactive)
+                                     (magit-key-mode-add-argument
+                                      ',for-group
+                                      ,(nth 2 k)
+                                      ',(nth 3 k))))))
+      (aput 'magit-key-mode-key-maps for-group map)
+      map)))
 
 (defun magit-key-mode-command (func)
   (let ((args '()))
@@ -323,8 +268,7 @@ command that's eventually invoked.")
     (maphash (lambda (k v)
                (push (concat k (shell-quote-argument v)) args))
              magit-key-mode-current-args)
-    (let ((magit-custom-options (append args magit-key-mode-current-options))
-          (current-prefix-arg (or current-prefix-arg magit-key-mode-prefix)))
+    (let ((magit-custom-options (append args magit-key-mode-current-options)))
       (set-window-configuration magit-log-mode-window-conf)
       (when func
         (call-interactively func))
@@ -381,7 +325,6 @@ highlighted before the description."
     (set (make-local-variable
           'magit-key-mode-current-args)
          (make-hash-table))
-    (set (make-local-variable 'magit-key-mode-prefix) current-prefix-arg)
     (magit-key-mode-redraw for-group))
   (message
    (concat
@@ -396,25 +339,20 @@ highlighted before the description."
 (defun magit-key-mode-redraw (for-group)
   "(re)draw the magit key buffer."
   (let ((buffer-read-only nil)
-        (old-point (point))
-        (is-first (zerop (buffer-size)))
-        (actions-p nil))
+        (old-point (point)))
     (erase-buffer)
     (make-local-variable 'font-lock-defaults)
     (use-local-map (magit-key-mode-get-key-map for-group))
-    (setq actions-p (magit-key-mode-draw for-group))
+    (magit-key-mode-draw for-group)
     (delete-trailing-whitespace)
     (setq mode-name "magit-key-mode" major-mode 'magit-key-mode)
-    (if (and is-first actions-p)
-      (progn (goto-char actions-p)
-             (magit-key-mode-jump-to-next-exec))
-      (goto-char old-point)))
+    (goto-char old-point))
   (setq buffer-read-only t)
   (fit-window-to-buffer))
 
 (defun magit-key-mode-draw-header (header)
   "Draw a header with the correct face."
-  (insert (propertize header 'face 'font-lock-keyword-face) "\n"))
+  (insert (propertize header 'face 'font-lock-keyword-face)))
 
 (defvar magit-key-mode-args-in-cols nil
   "When true, draw arguments in columns as with switches and
@@ -422,47 +360,64 @@ highlighted before the description."
 
 (defun magit-key-mode-draw-args (args)
   "Draw the args part of the menu."
-  (magit-key-mode-draw-buttons
-   "Args"
-   args
-   (lambda (x)
-     (format "(%s) %s"
-             (nth 2 x)
-             (propertize (gethash (nth 2 x) magit-key-mode-current-args "")
-                         'face 'widget-field)))
-   (not magit-key-mode-args-in-cols)))
+  (when args
+    (let ((strs (mapcar
+                 (lambda (argument)
+                   (propertize
+                    (format " %s: %s (%s) %s"
+                            (propertize
+                             (car argument)
+                             'face 'font-lock-builtin-face)
+                            (nth 1 argument)
+                            (nth 2 argument)
+                            (propertize
+                             (gethash (nth 2 argument)
+                                      magit-key-mode-current-args
+                                      "")
+                             'face 'widget-field))
+                    'key-group-executor (car argument)))
+                 args)))
+      (magit-key-mode-draw-header "Args\n")
+      (magit-key-mode-draw-in-cols strs (not magit-key-mode-args-in-cols)))))
 
 (defun magit-key-mode-draw-switches (switches)
   "Draw the switches part of the menu."
-  (magit-key-mode-draw-buttons
-   "Switches"
-   switches
-   (lambda (x)
-     (format "(%s)" (let ((s (nth 2 x)))
-                      (if (member s magit-key-mode-current-options)
-                        (propertize s 'face 'font-lock-warning-face)
-                        s))))))
+  (when switches
+    (let ((switch-strs (mapcar
+                        (lambda (s)
+                          (let ((option (nth 2 s)))
+                            (propertize
+                             (format " %s: %s (%s)"
+                                     (propertize (car s)
+                                                 'face 'font-lock-builtin-face)
+                                     (nth 1 s)
+                                     (if (member option magit-key-mode-current-options)
+                                         (propertize
+                                          option
+                                          'face 'font-lock-warning-face)
+                                       option))
+                             'key-group-executor (car s))))
+                        switches)))
+      (magit-key-mode-draw-header "Switches\n")
+      (magit-key-mode-draw-in-cols switch-strs))))
 
 (defun magit-key-mode-draw-actions (actions)
   "Draw the actions part of the menu."
-  (magit-key-mode-draw-buttons "Actions" actions nil))
-
-(defun magit-key-mode-draw-buttons (section xs maker
-                                    &optional one-col-each)
-  (when xs
-    (magit-key-mode-draw-header section)
-    (magit-key-mode-draw-in-cols
-     (mapcar (lambda (x)
-               (let* ((head (propertize (car x) 'face 'font-lock-builtin-face))
-                      (desc (nth 1 x))
-                      (more (and maker (funcall maker x)))
-                      (text (format " %s: %s%s%s"
-                                    head desc (if more " " "") (or more ""))))
-                 (propertize text 'key-group-executor (car x))))
-             xs)
-     one-col-each)))
-
-(defun magit-key-mode-draw-in-cols (strings one-col-each)
+  (when actions
+    (let ((action-strs (mapcar
+                        (lambda (a)
+                          (propertize
+                           (format
+                            " %s: %s"
+                            (propertize (car a)
+                                        'face 'font-lock-builtin-face)
+                            (nth 1 a))
+                           'key-group-executor (car a)))
+                       actions)))
+    (magit-key-mode-draw-header "Actions\n")
+    (magit-key-mode-draw-in-cols action-strs))))
+
+(defun magit-key-mode-draw-in-cols (strings &optional one-col-each)
   "Given a list of strings, print in columns (using `insert'). If
 ONE-COL-EACH is true then don't columify, but rather, draw each
 item on one line."
@@ -483,20 +438,15 @@ item on one line."
   (insert "\n"))
 
 (defun magit-key-mode-draw (for-group)
-  "Function used to draw actions, switches and parameters.
-
-Returns the point before the actions part, if any."
+  "Function used to draw actions, switches and parameters."
   (let* ((options (magit-key-mode-options-for-group for-group))
          (switches (cdr (assoc 'switches options)))
          (arguments (cdr (assoc 'arguments options)))
-         (actions (cdr (assoc 'actions options)))
-         (p nil))
+         (actions (cdr (assoc 'actions options))))
     (magit-key-mode-draw-switches switches)
     (magit-key-mode-draw-args arguments)
-    (when actions (setq p (point-marker)))
     (magit-key-mode-draw-actions actions)
-    (insert "\n")
-    p))
+    (insert "\n")))
 
 (defun magit-key-mode-de-generate (group)
   "Unbind the function for GROUP."
diff --git a/elpa/magit-1.0.0/magit-key-mode.elc b/elpa/magit-1.0.0/magit-key-mode.elc
new file mode 100644
index 000000000..0ae053edf
Binary files /dev/null and b/elpa/magit-1.0.0/magit-key-mode.elc differ
diff --git a/elpa/magit-1.0.0/magit-pkg.el b/elpa/magit-1.0.0/magit-pkg.el
new file mode 100644
index 000000000..edb7ee7ea
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-pkg.el
@@ -0,0 +1 @@
+(define-package "magit" "1.0.0" "Control Git from Emacs.")
diff --git a/elpa/magit-1.0.0/magit-pkg.el.in b/elpa/magit-1.0.0/magit-pkg.el.in
new file mode 100644
index 000000000..59335e594
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-pkg.el.in
@@ -0,0 +1 @@
+(define-package "magit" "@VERSION@" "Control Git from Emacs.")
diff --git a/elpa/smex-2.1/smex-pkg.elc b/elpa/magit-1.0.0/magit-pkg.elc
similarity index 62%
rename from elpa/smex-2.1/smex-pkg.elc
rename to elpa/magit-1.0.0/magit-pkg.elc
index 5efd7d2d1..39c7e7a3d 100644
Binary files a/elpa/smex-2.1/smex-pkg.elc and b/elpa/magit-1.0.0/magit-pkg.elc differ
diff --git a/elpa/magit-1.2.0/magit-svn.el b/elpa/magit-1.0.0/magit-svn.el
similarity index 71%
rename from elpa/magit-1.2.0/magit-svn.el
rename to elpa/magit-1.0.0/magit-svn.el
index d08c048d7..ebf55768a 100644
--- a/elpa/magit-1.2.0/magit-svn.el
+++ b/elpa/magit-1.0.0/magit-svn.el
@@ -1,11 +1,11 @@
 ;;; magit-svn.el --- git-svn plug-in for Magit
 
+;; Copyright (C) 2008, 2009  Marius Vollmer
+;; Copyright (C) 2008  Linh Dang
 ;; Copyright (C) 2008  Alex Ott
+;; Copyright (C) 2008  Marcin Bachry
 ;; Copyright (C) 2009  Alexey Voinov
 ;; Copyright (C) 2009  John Wiegley
-;; Copyright (C) 2008  Linh Dang
-;; Copyright (C) 2008  Marcin Bachry
-;; Copyright (C) 2008, 2009  Marius Vollmer
 ;; Copyright (C) 2010  Yann Hodique
 ;;
 ;; Magit is free software; you can redistribute it and/or modify it
@@ -63,23 +63,11 @@
   (magit-run-git-async "svn" "dcommit"))
 
 (defun magit-svn-enabled ()
-  (not (null (magit-svn-get-ref-info t))))
-
-(defun magit-svn-expand-braces-in-branches (branch)
-  (if (not (string-match "\\(.+\\){\\(.+,.+\\)}\\(.*\\):\\(.*\\)\\\*" branch))
-      (list branch)
-    (let ((prefix (match-string 1 branch))
-          (suffix (match-string 3 branch))
-          (rhs (match-string 4 branch))
-          (pieces (split-string (match-string 2 branch) ",")))
-      (mapcar (lambda (p) (concat prefix p suffix ":" rhs p)) pieces))))
+  (not (null (magit-svn-get-ref-info))))
 
 (defun magit-svn-get-local-ref (url)
-  (let* ((branches (cons (magit-get "svn-remote" "svn" "fetch")
+  (let ((branches (cons (magit-get "svn-remote" "svn" "fetch")
                         (magit-get-all "svn-remote" "svn" "branches")))
-         (branches (apply 'nconc
-                          (mapcar 'magit-svn-expand-braces-in-branches
-                                  branches)))
         (base-url (magit-get "svn-remote" "svn" "url"))
         (result nil))
     (while branches
@@ -87,7 +75,6 @@
              (src (replace-regexp-in-string "\\*" "\\\\(.*\\\\)" (car pats)))
              (dst (replace-regexp-in-string "\\*" "\\\\1" (cadr pats)))
              (base-url (replace-regexp-in-string "\\+" "\\\\+" base-url))
-             (base-url (replace-regexp-in-string "//.+@" "//" base-url))
              (pat1 (concat "^" src "$"))
              (pat2 (cond ((equal src "") (concat "^" base-url "$"))
                          (t (concat "^" base-url "/" src "$")))))
@@ -128,8 +115,7 @@ If USE-CACHE is non-nil then return the value of `magit-get-svn-ref-info-cache'.
                  ;; the way that git-svn does it.
                  (cons 'local-ref
                        (with-temp-buffer
-                         (insert (or (magit-git-string "log" "--first-parent"
-                                                       "--grep" "git-svn" "-1")
+                         (insert (or (magit-git-string "log" "--first-parent")
                                      ""))
                          (goto-char (point-min))
                          (cond ((re-search-forward "git-svn-id: \\(.+/.+?\\)@\\([0-9]+\\)" nil t)
@@ -149,20 +135,18 @@ If USE-CACHE is non nil, use the cached information."
     (cdr (assoc 'local-ref info))))
 
 (magit-define-inserter svn-unpulled (&optional use-cache)
-  (when (magit-svn-enabled)
-    (apply #'magit-git-section
-           'svn-unpulled "Unpulled commits (SVN):" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "HEAD..%s" (magit-svn-get-ref use-cache)))))))
+  (when (magit-svn-get-ref-info t)
+    (magit-git-section 'svn-unpulled
+                       "Unpulled commits (SVN):" 'magit-wash-log
+                       "log" "--pretty=format:* %H %s"
+                       (format "HEAD..%s" (magit-svn-get-ref use-cache)))))
 
 (magit-define-inserter svn-unpushed (&optional use-cache)
-  (when (magit-svn-enabled)
-    (apply #'magit-git-section
-           'svn-unpushed "Unpushed commits (SVN):" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "%s..HEAD" (magit-svn-get-ref use-cache)))))))
+  (when (magit-svn-get-ref-info t)
+    (magit-git-section 'svn-unpushed
+                       "Unpushed commits (SVN):" 'magit-wash-log
+                       "log" "--pretty=format:* %H %s"
+                       (format "%s..HEAD" (magit-svn-get-ref use-cache)))))
 
 (magit-define-section-jumper svn-unpushed  "Unpushed commits (SVN)")
 
@@ -182,7 +166,6 @@ If USE-CACHE is non nil, use the cached information."
   nil
   "Git SVN extension menu"
   '("Git SVN"
-    :visible magit-svn-mode
     ["Create branch" magit-svn-create-branch (magit-svn-enabled)]
     ["Rebase" magit-svn-rebase (magit-svn-enabled)]
     ["Fetch" magit-svn-remote-update (magit-svn-enabled)]
@@ -192,6 +175,14 @@ If USE-CACHE is non nil, use the cached information."
                     '("Extensions")
                     magit-svn-extension-menu)
 
+(add-hook 'magit-after-insert-unpulled-commits-hook
+          (lambda () (magit-insert-svn-unpulled t)))
+
+(add-hook 'magit-after-insert-unpushed-commits-hook
+          (lambda () (magit-insert-svn-unpushed t)))
+
+(add-hook 'magit-remote-string-hook 'magit-svn-remote-string)
+
 ;; add the group and its keys
 (progn
   ;; (re-)create the group
@@ -206,35 +197,7 @@ If USE-CACHE is non nil, use the cached information."
   ;; generate and bind the menu popup function
   (magit-key-mode-generate 'svn))
 
-(defvar magit-svn-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "N") 'magit-key-mode-popup-svn)
-    map))
-
-;;;###autoload
-(define-minor-mode magit-svn-mode "SVN support for Magit"
-  :lighter " SVN" :require 'magit-svn :keymap 'magit-svn-mode-map
-  (or (derived-mode-p 'magit-mode)
-      (error "This mode only makes sense with magit"))
-  (let ((unpulled-hook (lambda () (magit-insert-svn-unpulled t)))
-        (unpushed-hook (lambda () (magit-insert-svn-unpushed t)))
-        (remote-hook 'magit-svn-remote-string))
-    (if magit-svn-mode
-        (progn
-          (add-hook 'magit-after-insert-unpulled-commits-hook unpulled-hook nil t)
-          (add-hook 'magit-after-insert-unpushed-commits-hook unpushed-hook nil t)
-          (add-hook 'magit-remote-string-hook remote-hook nil t))
-      (progn
-        (remove-hook 'magit-after-insert-unpulled-commits-hook unpulled-hook t)
-        (remove-hook 'magit-after-insert-unpushed-commits-hook unpushed-hook t)
-        (remove-hook 'magit-remote-string-hook remote-hook t)))
-    (when (called-interactively-p 'any)
-      (magit-refresh))))
-
-;;;###autoload
-(defun turn-on-magit-svn ()
-  "Unconditionally turn on `magit-svn-mode'."
-  (magit-svn-mode 1))
+(define-key magit-mode-map (kbd "N") 'magit-key-mode-popup-svn)
 
 (provide 'magit-svn)
 ;;; magit-svn.el ends here
diff --git a/elpa/magit-1.0.0/magit-svn.elc b/elpa/magit-1.0.0/magit-svn.elc
new file mode 100644
index 000000000..db50b5c58
Binary files /dev/null and b/elpa/magit-1.0.0/magit-svn.elc differ
diff --git a/elpa/magit-1.0.0/magit-topgit.el b/elpa/magit-1.0.0/magit-topgit.el
new file mode 100644
index 000000000..c4e320084
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-topgit.el
@@ -0,0 +1,88 @@
+;;; magit-topgit.el --- topgit plug-in for Magit
+
+;; Copyright (C) 2010  Nathan Weizenbaum
+;; Copyright (C) 2010  Yann Hodique
+;;
+;; Magit 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, or (at your option)
+;; any later version.
+;;
+;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This plug-in provides topgit functionality as a separate component of Magit
+
+;;; Code:
+
+(require 'magit)
+(eval-when-compile
+  (require 'cl))
+
+(defcustom magit-topgit-executable "tg"
+  "The name of the TopGit executable."
+  :group 'magit
+  :type 'string)
+
+;;; Topic branches (using topgit)
+
+(defun magit-topgit-create-branch (branch parent)
+  (when (zerop (or (string-match "t/" branch) -1))
+    (magit-run* (list magit-topgit-executable "create"
+                      branch (magit-rev-to-git parent))
+                nil nil nil t)
+    t))
+
+(defun magit-topgit-pull ()
+  (when (file-exists-p ".topdeps")
+    (magit-run* (list magit-topgit-executable "update")
+                nil nil nil t)
+    t))
+
+(defun magit-topgit-wash-topic ()
+  (if (search-forward-regexp "^..\\(t/\\S-+\\)\\s-+\\(\\S-+\\)\\s-+\\(\\S-+\\)"
+                             (line-end-position) t)
+      (let ((topic (match-string 1)))
+        (delete-region (match-beginning 2) (match-end 2))
+        (goto-char (line-beginning-position))
+        (delete-char 4)
+        (insert "\t")
+        (goto-char (line-beginning-position))
+        (magit-with-section topic 'topic
+          (magit-set-section-info topic)
+          (forward-line)))
+    (delete-region (line-beginning-position) (1+ (line-end-position))))
+  t)
+
+(defun magit-topgit-wash-topics ()
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-topgit-wash-topic)))
+
+(magit-define-inserter topics ()
+  (magit-git-section 'topics
+                     "Topics:" 'magit-topgit-wash-topics
+                     "branch" "-v"))
+
+(magit-add-action (item info "discard")
+  ((topic)
+   (when (yes-or-no-p "Discard topic? ")
+     (magit-run* (list magit-topgit-executable "delete" "-f" info)
+                 nil nil nil t))))
+
+(magit-add-action (item info "visit")
+  ((topic)
+   (magit-checkout info)))
+
+(add-hook 'magit-after-insert-stashes-hook 'magit-insert-topics)
+(add-hook 'magit-create-branch-command-hook 'magit-topgit-create-branch)
+(add-hook 'magit-pull-command-hook 'magit-topgit-pull)
+
+(provide 'magit-topgit)
+;;; magit-topgit.el ends here
diff --git a/elpa/magit-1.0.0/magit-topgit.elc b/elpa/magit-1.0.0/magit-topgit.elc
new file mode 100644
index 000000000..43949ae57
Binary files /dev/null and b/elpa/magit-1.0.0/magit-topgit.elc differ
diff --git a/elpa/magit-1.0.0/magit.el b/elpa/magit-1.0.0/magit.el
new file mode 100644
index 000000000..01442d672
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.el
@@ -0,0 +1,4746 @@
+;;; magit.el -- control Git from Emacs.
+
+;; Copyright (C) 2010 Aaron Culich.
+;; Copyright (C) 2010 Alan Falloon.
+;; Copyright (C) 2008, 2010 Alex Ott.
+;; Copyright (C) 2008, 2009, 2010 Alexey Voinov.
+;; Copyright (C) 2010 Ben Walton.
+;; Copyright (C) 2010 Chris Bernard.
+;; Copyright (C) 2010 Christian Kluge.
+;; Copyright (C) 2008 Daniel Farina.
+;; Copyright (C) 2010 David Abrahams.
+;; Copyright (C) 2009 David Wallin.
+;; Copyright (C) 2009, 2010 Hannu Koivisto.
+;; Copyright (C) 2009 Ian Eure.
+;; Copyright (C) 2009 Jesse Alama.
+;; Copyright (C) 2009 John Wiegley.
+;; Copyright (C) 2010 Leo.
+;; Copyright (C) 2008, 2009 Marcin Bachry.
+;; Copyright (C) 2008, 2009 Marius Vollmer.
+;; Copyright (C) 2010 Mark Hepburn.
+;; Copyright (C) 2010 Moritz Bunkus.
+;; Copyright (C) 2010 Nathan Weizenbaum.
+;; Copyright (C) 2010 Oscar Fuentes.
+;; Copyright (C) 2009 Pavel Holejsovsky.
+;; Copyright (C) 2009, 2010 Phil Jackson.
+;; Copyright (C) 2010 Philip Weaver.
+;; Copyright (C) 2010 Ramkumar Ramachandra.
+;; Copyright (C) 2010 Remco van 't Veer.
+;; Copyright (C) 2009 René Stadler.
+;; Copyright (C) 2010 Robin Green.
+;; Copyright (C) 2010 Roger Crew.
+;; Copyright (C) 2009, 2010, 2011 Rémi Vanicat.
+;; Copyright (C) 2010 Sean Bryant.
+;; Copyright (C) 2009 Steve Purcell.
+;; Copyright (C) 2010 Timo Juhani Lindfors.
+;; Copyright (C) 2010 Yann Hodique.
+;; Copyright (C) 2010 oscar.
+;; Copyright (C) 2010 Ævar Arnfjörð Bjarmason.
+;; Copyright (C) 2010 Óscar Fuentes.
+
+;; Original Author: Marius Vollmer <marius.vollmer@nokia.com>
+;; Lead developer: Phil Jackson <phil@shellarchive.co.uk>
+;; Version: 1.0.0
+;; Keywords: tools
+
+;;
+;; Magit 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, or (at your option)
+;; any later version.
+;;
+;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Invoking the magit-status function will show a buffer with the
+;; status of the current git repository and its working tree.  That
+;; buffer offers key bindings for manipulating the status in simple
+;; ways.
+;;
+;; The status buffer mainly shows the difference between the working
+;; tree and the index, and the difference between the index and the
+;; current HEAD.  You can add individual hunks from the working tree
+;; to the index, and you can commit the index.
+;;
+;; See the Magit User Manual for more information.
+
+;;; Code:
+
+;; magit core
+(require 'magit-key-mode)
+
+(eval-when-compile (require 'cl))
+(require 'log-edit)
+(require 'easymenu)
+(require 'diff-mode)
+
+;; Silences byte-compiler warnings
+(eval-when-compile  (require 'view))
+(eval-when-compile (require 'iswitchb))
+
+;;; Code:
+(defgroup magit nil
+  "Controlling Git from Emacs."
+  :prefix "magit-"
+  :group 'tools)
+
+(defcustom magit-git-executable "git"
+  "The name of the Git executable."
+  :group 'magit
+  :type 'string)
+
+(defcustom magit-git-standard-options '("--no-pager")
+  "Standard options when running Git."
+  :group 'magit
+  :type '(repeat string))
+
+(defcustom magit-repo-dirs nil
+  "Directories containing Git repositories.
+Magit will look into these directories for Git repositories and
+offer them as choices for `magit-status'."
+  :group 'magit
+  :type '(repeat string))
+
+(defcustom magit-repo-dirs-depth 3
+  "The maximum depth to look for Git repos.
+When looking for a Git repository below the directories in `magit-repo-dirs',
+Magit will only descend this many levels deep."
+  :group 'magit
+  :type 'integer)
+
+(defcustom magit-save-some-buffers t
+  "Non-nil means that \\[magit-status] will save modified buffers before running.
+Setting this to t will ask which buffers to save, setting it to 'dontask will
+save all modified buffers without asking."
+  :group 'magit
+  :type '(choice (const :tag "Never" nil)
+		 (const :tag "Ask" t)
+		 (const :tag "Save without asking" dontask)))
+
+(defcustom magit-save-some-buffers-predicate
+  'magit-save-buffers-predicate-tree-only
+  "Specifies a predicate function on \\[magit-save-some-buffers] to determine which
+   unsaved buffers should be prompted for saving."
+
+  :group 'magit
+  :type '(radio (function-item magit-save-buffers-predicate-tree-only)
+                (function-item magit-save-buffers-predicate-all)
+		(function :tag "Other")))
+
+(defcustom magit-commit-all-when-nothing-staged 'ask
+  "Determines what \\[magit-log-edit] does when nothing is staged.
+Setting this to nil will make it do nothing, setting it to t will
+arrange things so that the actual commit command will use the \"--all\" option,
+setting it to 'ask will first ask for confirmation whether to do this,
+and setting it to 'ask-stage will cause all changes to be staged,
+after a confirmation."
+  :group 'magit
+  :type '(choice (const :tag "No" nil)
+		 (const :tag "Always" t)
+		 (const :tag "Ask" ask)
+		 (const :tag "Ask to stage everything" ask-stage)))
+
+(defcustom magit-commit-signoff nil
+  "When performing git commit adds --signoff."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-log-cutoff-length 100
+  "The maximum number of commits to show in the log and whazzup buffers."
+  :group 'magit
+  :type 'integer)
+
+(defcustom magit-log-infinite-length 99999
+  "Number of log used to show as maximum for `magit-log-cutoff-length'."
+  :group 'magit
+  :type 'integer)
+
+(defcustom magit-process-popup-time -1
+  "Popup the process buffer if a command takes longer than this many seconds."
+  :group 'magit
+  :type '(choice (const :tag "Never" -1)
+		 (const :tag "Immediately" 0)
+		 (integer :tag "After this many seconds")))
+
+(defcustom magit-revert-item-confirm t
+  "Require acknowledgment before reverting an item."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-log-edit-confirm-cancellation nil
+  "Require acknowledgment before canceling the log edit buffer."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-remote-ref-format 'branch-then-remote
+  "What format to use for autocompleting refs, in pariticular for remotes.
+
+Autocompletion is used by functions like `magit-checkout',
+`magit-interactive-rebase' and others which offer branch name
+completion.
+
+The value 'name-then-remote means remotes will be of the
+form \"name (remote)\", while the value 'remote-slash-name
+means that they'll be of the form \"remote/name\". I.e. something that's
+listed as \"remotes/upstream/next\" by \"git branch -l -a\"
+will be \"upstream/next\"."
+  :group 'magit
+  :type '(choice (const :tag "name (remote)" branch-then-remote)
+                 (const :tag "remote/name" remote-slash-branch)))
+
+(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
+  "Connection type used for the git process.
+
+nil mean pipe, it is usually faster and more efficient, and work on cygwin.
+t mean pty, it enable magit to prompt for passphrase when needed."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-completing-read-function 'magit-builtin-completing-read
+  "Function to be called when requesting input from the user."
+  :group 'magit
+  :type '(radio (function-item magit-iswitchb-completing-read)
+		(function-item magit-builtin-completing-read)
+		(function :tag "Other")))
+
+(defgroup magit-faces nil
+  "Customize the appearance of Magit"
+  :prefix "magit-"
+  :group 'faces
+  :group 'magit)
+
+(defface magit-header
+  '((t))
+  "Face for generic header lines.
+
+Many Magit faces inherit from this one by default."
+  :group 'magit-faces)
+
+(defface magit-section-title
+  '((t :weight bold :inherit magit-header))
+  "Face for section titles."
+  :group 'magit-faces)
+
+(defface magit-branch
+  '((t :weight bold :inherit magit-header))
+  "Face for the current branch."
+  :group 'magit-faces)
+
+(defface magit-diff-file-header
+  '((t :inherit magit-header))
+  "Face for diff file header lines."
+  :group 'magit-faces)
+
+(defface magit-diff-hunk-header
+  '((t :slant italic :inherit magit-header))
+  "Face for diff hunk header lines."
+  :group 'magit-faces)
+
+(defface magit-diff-add
+  '((((class color) (background light))
+     :foreground "blue1")
+    (((class color) (background dark))
+     :foreground "white"))
+  "Face for lines in a diff that have been added."
+  :group 'magit-faces)
+
+(defface magit-diff-none
+  '((t))
+  "Face for lines in a diff that are unchanged."
+  :group 'magit-faces)
+
+(defface magit-diff-del
+  '((((class color) (background light))
+     :foreground "red")
+    (((class color) (background dark))
+     :foreground "OrangeRed"))
+  "Face for lines in a diff that have been deleted."
+  :group 'magit-faces)
+
+(defface magit-log-graph
+  '((((class color) (background light))
+     :foreground "grey11")
+    (((class color) (background dark))
+     :foreground "grey80"))
+  "Face for the graph element of the log output."
+  :group 'magit-faces)
+
+(defface magit-log-sha1
+  '((((class color) (background light))
+     :foreground "firebrick")
+    (((class color) (background dark))
+     :foreground "tomato"))
+  "Face for the sha1 element of the log output."
+  :group 'magit-faces)
+
+(defface magit-log-message
+  '((t))
+  "Face for the message element of the log output."
+  :group 'magit-faces)
+
+(defface magit-item-highlight
+  '((((class color) (background light))
+     :background "gray95")
+    (((class color) (background dark))
+     :background "dim gray"))
+  "Face for highlighting the current item."
+  :group 'magit-faces)
+
+(defface magit-item-mark
+  '((((class color) (background light))
+     :foreground "red")
+    (((class color) (background dark))
+     :foreground "orange"))
+  "Face for highlighting marked item."
+  :group 'magit-faces)
+
+(defface magit-log-tag-label
+  '((((class color) (background light))
+     :background "LightGoldenRod")
+    (((class color) (background dark))
+     :background "DarkGoldenRod"))
+  "Face for git tag labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-log-head-label-bisect-good
+  '((((class color) (background light))
+     :box t
+     :background "light green"
+     :foreground "dark olive green")
+    (((class color) (background dark))
+     :box t
+     :background "light green"
+     :foreground "dark olive green"))
+  "Face for good bisect refs"
+  :group 'magit-faces)
+
+(defface magit-log-head-label-bisect-bad
+  '((((class color) (background light))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4")
+    (((class color) (background dark))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4"))
+  "Face for bad bisect refs"
+  :group 'magit-faces)
+
+(defface magit-log-head-label-remote
+  '((((class color) (background light))
+     :box t
+     :background "Grey85"
+     :foreground "OliveDrab4")
+    (((class color) (background dark))
+     :box t
+     :background "Grey11"
+     :foreground "DarkSeaGreen2"))
+  "Face for remote branch head labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-log-head-label-tags
+  '((((class color) (background light))
+     :box t
+     :background "LemonChiffon1"
+     :foreground "goldenrod4")
+    (((class color) (background dark))
+     :box t
+     :background "LemonChiffon1"
+     :foreground "goldenrod4"))
+  "Face for tag labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-log-head-label-patches
+  '((((class color) (background light))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4")
+    (((class color) (background dark))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4"))
+  "Face for Stacked Git patches"
+  :group 'magit-faces)
+
+(defvar magit-custom-options '()
+  "List of custom options to pass git. Do not customise this.")
+
+(defvar magit-read-rev-history nil
+  "The history of inputs to `magit-read-rev'.")
+
+(defvar magit-omit-untracked-dir-contents nil
+  "When non-nil magit will only list an untracked directory, not its contents.")
+
+(defface magit-log-head-label-local
+  '((((class color) (background light))
+     :box t
+     :background "Grey85"
+     :foreground "LightSkyBlue4")
+    (((class color) (background dark))
+     :box t
+     :background "Grey13"
+     :foreground "LightSkyBlue1"))
+  "Face for local branch head labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-menu-selected-option
+  '((((class color) (background light))
+     :foreground "red")
+    (((class color) (background dark))
+     :foreground "orange"))
+  "Face for selected options on magit's menu"
+  :group 'magit-faces)
+
+(defvar magit-mode-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map t)
+    (define-key map (kbd "n") 'magit-goto-next-section)
+    (define-key map (kbd "p") 'magit-goto-previous-section)
+    (define-key map (kbd "TAB") 'magit-toggle-section)
+    (define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
+    (define-key map (kbd "1") 'magit-show-level-1)
+    (define-key map (kbd "2") 'magit-show-level-2)
+    (define-key map (kbd "3") 'magit-show-level-3)
+    (define-key map (kbd "4") 'magit-show-level-4)
+    (define-key map (kbd "M-1") 'magit-show-level-1-all)
+    (define-key map (kbd "M-2") 'magit-show-level-2-all)
+    (define-key map (kbd "M-3") 'magit-show-level-3-all)
+    (define-key map (kbd "M-4") 'magit-show-level-4-all)
+    (define-key map (kbd "M-h") 'magit-show-only-files)
+    (define-key map (kbd "M-H") 'magit-show-only-files-all)
+    (define-key map (kbd "M-s") 'magit-show-level-4)
+    (define-key map (kbd "M-S") 'magit-show-level-4-all)
+    (define-key map (kbd "<M-left>") 'magit-goto-parent-section)
+    (define-key map (kbd "g") 'magit-refresh)
+    (define-key map (kbd "G") 'magit-refresh-all)
+    (define-key map (kbd "?") 'magit-describe-item)
+    (define-key map (kbd "!") 'magit-key-mode-popup-running)
+    (define-key map (kbd ":") 'magit-git-command)
+    (define-key map (kbd "C-x 4 a") 'magit-add-change-log-entry-other-window)
+    (define-key map (kbd "RET") 'magit-visit-item)
+    (define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
+    (define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
+    (define-key map (kbd "C-w") 'magit-copy-item-as-kill)
+    (define-key map (kbd "R") 'magit-rebase-step)
+    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
+    (define-key map (kbd "r") 'magit-key-mode-popup-rewriting)
+    (define-key map (kbd "P") 'magit-key-mode-popup-pushing)
+    (define-key map (kbd "f") 'magit-key-mode-popup-fetching)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "F") 'magit-key-mode-popup-pulling)
+    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
+    (define-key map (kbd "$") 'magit-display-process)
+    (define-key map (kbd "c") 'magit-log-edit)
+    (define-key map (kbd "E") 'magit-interactive-rebase)
+    (define-key map (kbd "w") 'magit-wazzup)
+    (define-key map (kbd "q") 'quit-window)
+    map))
+
+(defvar magit-commit-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    map))
+
+(defvar magit-status-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
+    (define-key map (kbd "+") 'magit-diff-larger-hunks)
+    (define-key map (kbd "0") 'magit-diff-default-hunks)
+    (define-key map (kbd "s") 'magit-stage-item)
+    (define-key map (kbd "S") 'magit-stage-all)
+    (define-key map (kbd "u") 'magit-unstage-item)
+    (define-key map (kbd "U") 'magit-unstage-all)
+    (define-key map (kbd "i") 'magit-ignore-item)
+    (define-key map (kbd "I") 'magit-ignore-item-locally)
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
+    (define-key map (kbd "M") 'magit-key-mode-popup-submodule)
+    (define-key map (kbd "k") 'magit-discard-item)
+    (define-key map (kbd "e") 'magit-interactive-resolve-item)
+    (define-key map (kbd "C") 'magit-add-log)
+    (define-key map (kbd "x") 'magit-reset-head)
+    (define-key map (kbd "X") 'magit-reset-working-tree)
+    (define-key map (kbd "z") 'magit-key-mode-popup-stashing)
+    map))
+
+(defvar magit-stash-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
+    (define-key map (kbd "+") 'magit-diff-larger-hunks)
+    (define-key map (kbd "0") 'magit-diff-default-hunks)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    map))
+
+(defvar magit-log-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
+    (define-key map (kbd "x") 'magit-reset-head)
+    (define-key map (kbd "e") 'magit-log-show-more-entries)
+    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
+    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
+    map))
+
+(defvar magit-reflog-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "x") 'magit-reset-head)
+    map))
+
+(defvar magit-diff-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
+    (define-key map (kbd "+") 'magit-diff-larger-hunks)
+    (define-key map (kbd "0") 'magit-diff-default-hunks)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    map))
+
+(defvar magit-wazzup-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
+    (define-key map (kbd "x") 'magit-reset-head)
+    (define-key map (kbd "i") 'magit-ignore-item)
+    map))
+
+(defvar magit-show-branches-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "RET") 'magit-branches-window-checkout)
+    (define-key map (kbd "b") 'magit-branches-window-checkout)
+    (define-key map (kbd "k") 'magit-remove-branch)
+    (define-key map (kbd "K") 'magit-remove-branch-in-remote-repo)
+    (define-key map (kbd "$") 'magit-display-process)
+    (define-key map (kbd "q") 'magit-quit-branches-window)
+    (define-key map (kbd "g") 'magit-show-branches)
+    (define-key map (kbd "v") 'magit-show-branches)
+    (define-key map (kbd "T") 'magit-change-what-branch-tracks)
+    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
+    (define-key map (kbd "n") 'next-line)
+    (define-key map (kbd "p") 'previous-line)
+    map))
+
+(defvar magit-bug-report-url
+  "http://github.com/philjackson/magit/issues")
+
+(defun magit-bug-report (str)
+  (message (concat
+            "Unknown error: %s\nPlease, with as much "
+            "information as possible, file a bug at %s")
+           str magit-bug-report-url))
+
+(defun magit-buffer-switch (buf)
+  (if (string-match "magit" (buffer-name))
+      (switch-to-buffer buf)
+      (pop-to-buffer buf)))
+
+;;; Macros
+
+(defmacro magit-with-refresh (&rest body)
+  (declare (indent 0))
+  `(magit-refresh-wrapper (lambda () ,@body)))
+
+(eval-when-compile
+  (when (< emacs-major-version 23)
+    (defvar line-move-visual nil)))
+
+;;; Compatibilities
+
+(if (functionp 'start-file-process)
+    (defalias 'magit-start-process 'start-file-process)
+    (defalias 'magit-start-process 'start-process))
+
+;;; Utilities
+
+(defvar magit-submode nil)
+(make-variable-buffer-local 'magit-submode)
+(put 'magit-submode 'permanent-local t)
+
+(defun magit-iswitchb-completing-read (prompt choices &optional predicate require-match
+                                       initial-input hist def)
+  "iswitchb-based completing-read almost-replacement."
+  (require 'iswitchb)
+  (let ((iswitchb-make-buflist-hook
+         (lambda ()
+           (setq iswitchb-temp-buflist (if (consp (first choices))
+                                           (mapcar #'car choices)
+                                         choices)))))
+    (iswitchb-read-buffer prompt (or initial-input def) require-match)))
+
+(defun magit-builtin-completing-read (prompt choices &optional predicate require-match
+                                      initial-input hist def)
+  "Magit wrapper for standard completing-read function."
+  (completing-read (if (and def (> (length prompt) 2)
+                            (string-equal ": " (substring prompt -2)))
+                       (format "%s (default %s): " (substring prompt 0 -2) def)
+                     prompt)
+                   choices predicate require-match initial-input hist def))
+
+(defun magit-completing-read (prompt choices &optional predicate require-match
+                              initial-input hist def)
+  (funcall magit-completing-read-function prompt choices predicate require-match
+           initial-input hist def))
+
+(defun magit-use-region-p ()
+  (if (fboundp 'use-region-p)
+      (use-region-p)
+    (and transient-mark-mode mark-active)))
+
+(defun magit-goto-line (line)
+  "Like `goto-line' but doesn't set the mark."
+  (save-restriction
+    (widen)
+    (goto-char 1)
+    (forward-line (1- line))))
+
+(defun magit-trim-line (str)
+  (if (string= str "")
+      nil
+    (if (equal (elt str (- (length str) 1)) ?\n)
+	(substring str 0 (- (length str) 1))
+      str)))
+
+(defun magit-split-lines (str)
+  (if (string= str "")
+      nil
+    (let ((lines (nreverse (split-string str "\n"))))
+      (if (string= (car lines) "")
+	  (setq lines (cdr lines)))
+      (nreverse lines))))
+
+(defun magit-git-insert (args)
+  (apply #'process-file
+	 magit-git-executable
+	 nil (list t nil) nil
+	 (append magit-git-standard-options args)))
+
+(defun magit-git-output (args)
+  (with-output-to-string
+    (with-current-buffer
+        standard-output
+      (magit-git-insert args))))
+
+(defun magit-git-string (&rest args)
+  (magit-trim-line (magit-git-output args)))
+
+(defun magit-git-lines (&rest args)
+  (magit-split-lines (magit-git-output args)))
+
+(defun magit-git-exit-code (&rest args)
+  (apply #'process-file magit-git-executable nil nil nil
+	 (append magit-git-standard-options args)))
+
+(defun magit-file-lines (file)
+  (when (file-exists-p file)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (let ((rev (nreverse (split-string (buffer-string) "\n"))))
+	(nreverse (if (equal (car rev) "")
+		      (cdr rev)
+		    rev))))))
+
+(defun magit-write-file-lines (file lines)
+  (with-temp-buffer
+    (dolist (l lines)
+      (insert l "\n"))
+    (write-file file)))
+
+(defun magit-concat-with-delim (delim seqs)
+  (cond ((null seqs)
+	 nil)
+	((null (cdr seqs))
+	 (car seqs))
+	(t
+	 (concat (car seqs) delim (magit-concat-with-delim delim (cdr seqs))))))
+
+(defun magit-get (&rest keys)
+  (magit-git-string "config" (magit-concat-with-delim "." keys)))
+
+(defun magit-get-all (&rest keys)
+  (magit-git-lines "config" "--get-all" (magit-concat-with-delim "." keys)))
+
+(defun magit-set (val &rest keys)
+  (if val
+      (magit-git-string "config" (magit-concat-with-delim "." keys) val)
+    (magit-git-string "config" "--unset" (magit-concat-with-delim "." keys))))
+
+(defun magit-remove-conflicts (alist)
+  (let ((dict (make-hash-table :test 'equal))
+	(result nil))
+    (dolist (a alist)
+      (puthash (car a) (cons (cdr a) (gethash (car a) dict))
+	       dict))
+    (maphash (lambda (key value)
+	       (if (= (length value) 1)
+		   (push (cons key (car value)) result)
+		 (let ((sub (magit-remove-conflicts
+			     (mapcar (lambda (entry)
+				       (let ((dir (directory-file-name
+						   (substring entry 0 (- (length key))))))
+					 (cons (concat (file-name-nondirectory dir) "/" key)
+					       entry)))
+				     value))))
+		   (setq result (append result sub)))))
+	     dict)
+    result))
+
+(defun magit-git-repo-p (dir)
+  (file-exists-p (expand-file-name ".git" dir)))
+
+(defun magit-no-commit-p ()
+  "return non-nil if there is no commit in the current git repository"
+  (not (magit-git-string
+        "rev-list" "HEAD" "--max-count=1")))
+
+(defun magit-list-repos* (dir level)
+  (if (magit-git-repo-p dir)
+      (list dir)
+    (apply #'append
+	   (mapcar (lambda (entry)
+		     (unless (or (string= (substring entry -3) "/..")
+				 (string= (substring entry -2) "/."))
+		       (magit-list-repos* entry (+ level 1))))
+		   (and (file-directory-p dir)
+			(< level magit-repo-dirs-depth)
+			(directory-files dir t nil t))))))
+
+(defun magit-list-repos (dirs)
+  (magit-remove-conflicts
+   (apply #'append
+	  (mapcar (lambda (dir)
+		    (mapcar #'(lambda (repo)
+				(cons (file-name-nondirectory repo)
+				      repo))
+			    (magit-list-repos* dir 0)))
+		  dirs))))
+
+(defun magit-get-top-dir (cwd)
+  (let ((cwd (expand-file-name (file-truename cwd))))
+    (when (file-directory-p cwd)
+      (let* ((default-directory (file-name-as-directory cwd))
+             (cdup (magit-git-string "rev-parse" "--show-cdup")))
+        (when cdup
+          (file-name-as-directory (expand-file-name cdup cwd)))))))
+
+(defun magit-get-ref (ref)
+  (magit-git-string "symbolic-ref" "-q" ref))
+
+(defun magit-get-current-branch ()
+  (let* ((head (magit-get-ref "HEAD"))
+	 (pos (and head (string-match "^refs/heads/" head))))
+    (if pos
+	(substring head 11)
+      nil)))
+
+(defun magit-get-remote (branch)
+  "Return the name of the remote for BRANCH.
+If branch is nil or it has no remote, but a remote named
+\"origin\" exists, return that. Otherwise, return nil."
+  (let ((remote (or (and branch (magit-get "branch" branch "remote"))
+                    (and (magit-get "remote" "origin" "url") "origin"))))
+    (if (string= remote "") nil remote)))
+
+(defun magit-get-current-remote ()
+  "Return the name of the remote for the current branch.
+If there is no current branch, or no remote for that branch,
+but a remote named \"origin\" is configured, return that.
+Otherwise, return nil."
+  (magit-get-remote (magit-get-current-branch)))
+
+(defun magit-ref-exists-p (ref)
+  (= (magit-git-exit-code "show-ref" "--verify" ref) 0))
+
+(defun magit-read-top-dir (rawp)
+  (if (and (not rawp) magit-repo-dirs)
+      (let* ((repos (magit-list-repos magit-repo-dirs))
+	     (reply (magit-completing-read "Git repository: "
+                                           (magit-list-repos magit-repo-dirs))))
+	(file-name-as-directory
+	 (cdr (assoc reply repos))))
+    (file-name-as-directory
+     (read-directory-name "Git repository: "
+			  (or (magit-get-top-dir default-directory)
+			      default-directory)))))
+
+(defun magit-rev-parse (ref)
+  "Return the SHA hash for REF."
+  (magit-git-string "rev-parse" ref))
+
+(defun magit-ref-ambiguous-p (ref)
+  "Return whether or not REF is ambiguous."
+  ;; If REF is ambiguous, rev-parse just prints errors,
+  ;; so magit-git-string returns nil.
+  (not (magit-git-string "rev-parse" "--abbrev-ref" ref)))
+
+(defun magit-name-rev (rev)
+  "Return a human-readable name for REV.
+Unlike git name-rev, this will remove tags/ and remotes/ prefixes
+if that can be done unambiguously.  In addition, it will filter
+out revs involving HEAD."
+  (when rev
+    (let ((name (magit-git-string "name-rev" "--no-undefined" "--name-only" rev)))
+      ;; There doesn't seem to be a way of filtering HEAD out from name-rev,
+      ;; so we have to do it manually.
+      ;; HEAD-based names are too transient to allow.
+      (when (and (stringp name)
+                 (string-match "^\\(.*\\<HEAD\\)\\([~^].*\\|$\\)" name))
+        (let ((head-ref (match-string 1 name))
+              (modifier (match-string 2 name)))
+          ;; Sometimes when name-rev gives a HEAD-based name,
+          ;; rev-parse will give an actual branch or remote name.
+          (setq name (concat (magit-git-string "rev-parse" "--abbrev-ref" head-ref)
+                             modifier))
+          ;; If rev-parse doesn't give us what we want, just use the SHA.
+          (when (or (null name) (string-match-p "\\<HEAD\\>" name))
+            (setq name (magit-rev-parse rev)))))
+      (setq rev (or name rev))
+      (when (string-match "^\\(?:tags\\|remotes\\)/\\(.*\\)" rev)
+        (let ((plain-name (match-string 1 rev)))
+          (unless (magit-ref-ambiguous-p plain-name)
+            (setq rev plain-name))))
+      rev)))
+
+(defun magit-put-line-property (prop val)
+  (put-text-property (line-beginning-position) (line-beginning-position 2)
+		     prop val))
+
+(defun magit-format-commit (commit format)
+  (magit-git-string "log" "--max-count=1"
+		    (concat "--pretty=format:" format)
+		    commit))
+
+(defun magit-current-line ()
+  (buffer-substring-no-properties (line-beginning-position)
+				  (line-end-position)))
+
+(defun magit-insert-region (beg end buf)
+  (let ((text (buffer-substring-no-properties beg end)))
+    (with-current-buffer buf
+      (insert text))))
+
+(defun magit-insert-current-line (buf)
+  (let ((text (buffer-substring-no-properties
+	       (line-beginning-position) (line-beginning-position 2))))
+    (with-current-buffer buf
+      (insert text))))
+
+(defun magit-file-uptodate-p (file)
+  (eq (magit-git-exit-code "diff" "--quiet" "--" file) 0))
+
+(defun magit-anything-staged-p ()
+  (not (eq (magit-git-exit-code "diff" "--quiet" "--cached") 0)))
+
+(defun magit-everything-clean-p ()
+  (and (not (magit-anything-staged-p))
+       (eq (magit-git-exit-code "diff" "--quiet") 0)))
+
+(defun magit-commit-parents (commit)
+  (cdr (split-string (magit-git-string "rev-list" "-1" "--parents" commit))))
+
+;; XXX - let the user choose the parent
+
+(defun magit-choose-parent-id (commit op)
+  (let* ((parents (magit-commit-parents commit)))
+    (if (> (length parents) 1)
+	(error "Can't %s merge commits" op)
+      nil)))
+
+;;; Revisions and ranges
+
+(defvar magit-current-range nil
+  "The range described by the current buffer.
+This is only non-nil in diff and log buffers.
+
+This has three possible (non-nil) forms.  If it's a string REF or
+a singleton list (REF), then the range is from REF to the current
+working directory state (or HEAD in a log buffer).  If it's a
+pair (START . END), then the range is START..END.")
+(make-variable-buffer-local 'magit-current-range)
+
+(defun magit-list-interesting-refs (&optional uninteresting)
+  "Return interesting references as given by `git show-ref'.
+Removes references matching UNINTERESTING from the
+results. UNINTERESTING can be either a function taking a single
+argument or a list of strings used as regexps."
+  (let ((refs ()))
+    (dolist (line (magit-git-lines "show-ref"))
+      (if (string-match "[^ ]+ +\\(.*\\)" line)
+          (let ((ref (match-string 1 line)))
+            (cond ((and (functionp uninteresting)
+                        (funcall uninteresting ref)))
+                  ((and (not (functionp uninteresting))
+                        (loop for i in uninteresting thereis (string-match i ref))))
+                  ((string-match "refs/heads/\\(.*\\)" ref)
+                   (let ((branch (match-string 1 ref)))
+                     (push (cons branch branch) refs)))
+                  ((string-match "refs/tags/\\(.*\\)" ref)
+                   (push (cons (format
+                                (if (eq magit-remote-ref-format 'branch-then-remote)
+                                    "%s (tag)" "%s")
+                                (match-string 1 ref))
+                               ref)
+                         refs))
+                  ((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref)
+                   (push (cons (if (eq magit-remote-ref-format 'branch-then-remote)
+                                   (format "%s (%s)"
+                                           (match-string 2 ref)
+                                           (match-string 1 ref))
+                                 (format "%s/%s"
+                                         (match-string 1 ref)
+                                         (match-string 2 ref)))
+                               ref)
+                         refs))))))
+    (nreverse refs)))
+
+(defvar magit-uninteresting-refs '("refs/remotes/\\([^/]+\\)/HEAD$"))
+
+;; TODO: fix this so that def can (must?) be git rev instead of, say, "master (origin)"
+;; which involves a particular display strategy and shouldn't be visible to callers
+;; of magit-read-rev
+(defun magit-read-rev (prompt &optional def uninteresting)
+  (let* ((interesting-refs (magit-list-interesting-refs
+                            (or uninteresting magit-uninteresting-refs)))
+	 (reply (magit-completing-read (concat prompt ": ") interesting-refs
+                                       nil nil nil 'magit-read-rev-history def))
+	 (rev (or (cdr (assoc reply interesting-refs)) reply)))
+    (if (string= rev "")
+	nil
+      rev)))
+
+(defun magit-read-rev-range (op &optional def-beg def-end)
+  (let ((beg (magit-read-rev (format "%s start" op)
+			     def-beg)))
+    (if (not beg)
+	nil
+      (save-match-data
+	(if (string-match "^\\(.+\\)\\.\\.\\(.+\\)$" beg)
+	    (cons (match-string 1 beg) (match-string 2 beg))
+	  (let ((end (magit-read-rev (format "%s end" op) def-end)))
+	    (cons beg end)))))))
+
+(defun magit-rev-to-git (rev)
+  (or rev
+      (error "No revision specified"))
+  (if (string= rev ".")
+      (magit-marked-commit)
+    rev))
+
+(defun magit-rev-range-to-git (range)
+  (or range
+      (error "No revision range specified"))
+  (if (stringp range)
+      range
+    (if (cdr range)
+	(format "%s..%s"
+		(magit-rev-to-git (car range))
+		(magit-rev-to-git (cdr range)))
+      (format "%s" (magit-rev-to-git (car range))))))
+
+(defun magit-rev-describe (rev)
+  (or rev
+      (error "No revision specified"))
+  (if (string= rev ".")
+      "mark"
+    (magit-name-rev rev)))
+
+(defun magit-rev-range-describe (range things)
+  (or range
+      (error "No revision range specified"))
+  (if (stringp range)
+      (format "%s in %s" things range)
+    (if (cdr range)
+	(format "%s from %s to %s" things
+		(magit-rev-describe (car range))
+		(magit-rev-describe (cdr range)))
+      (format "%s at %s" things (magit-rev-describe (car range))))))
+
+(defun magit-default-rev ()
+  (or (magit-name-rev (magit-commit-at-point t))
+      (let ((branch (magit-guess-branch)))
+	(if branch
+	    (if (string-match "^refs/\\(.*\\)" branch)
+		(match-string 1 branch)
+		branch)))))
+
+(defun magit-read-remote (&optional prompt def)
+  "Read the name of a remote.
+PROMPT is used as the prompt, and defaults to \"Remote\".
+DEF is the default value, and defaults to the value of `magit-get-current-branch'."
+  (let* ((prompt (or prompt "Remote: "))
+         (def (or def (magit-get-current-remote)))
+	 (remotes (magit-git-lines "remote"))
+	 (reply (magit-completing-read prompt remotes
+                                       nil nil nil nil def)))
+    (if (string= reply "") nil reply)))
+
+;;; Sections
+
+;; A buffer in magit-mode is organized into hierarchical sections.
+;; These sections are used for navigation and for hiding parts of the
+;; buffer.
+;;
+;; Most sections also represent the objects that Magit works with,
+;; such as files, diffs, hunks, commits, etc.  The 'type' of a section
+;; identifies what kind of object it represents (if any), and the
+;; parent and grand-parent, etc provide the context.
+
+(defstruct magit-section
+  parent title beginning end children hidden type info
+  needs-refresh-on-show)
+
+(defvar magit-top-section nil
+  "The top section of the current buffer.")
+(make-variable-buffer-local 'magit-top-section)
+(put 'magit-top-section 'permanent-local t)
+
+(defvar magit-old-top-section nil)
+
+(defvar magit-section-hidden-default nil)
+
+(defun magit-new-section (title type)
+  "Create a new section with title TITLE and type TYPE in current buffer.
+
+If not `magit-top-section' exist, the new section will be the new top-section
+otherwise, the new-section will be a child of the current top-section.
+
+If TYPE is nil, the section won't be highlighted."
+  (let* ((s (make-magit-section :parent magit-top-section
+				:title title
+				:type type
+				:hidden magit-section-hidden-default))
+	 (old (and magit-old-top-section
+		   (magit-find-section (magit-section-path s)
+				       magit-old-top-section))))
+    (if magit-top-section
+	(push s (magit-section-children magit-top-section))
+	(setq magit-top-section s))
+    (if old
+	(setf (magit-section-hidden s) (magit-section-hidden old)))
+    s))
+
+(defun magit-cancel-section (section)
+  "Delete the section SECTION."
+  (delete-region (magit-section-beginning section)
+		 (magit-section-end section))
+  (let ((parent (magit-section-parent section)))
+    (if parent
+	(setf (magit-section-children parent)
+	      (delq section (magit-section-children parent)))
+	(setq magit-top-section nil))))
+
+(defmacro magit-with-section (title type &rest body)
+  "Create a new section of title TITLE and type TYPE and evaluate BODY there.
+
+Sections create into BODY will be child of the new section.
+BODY must leave point at the end of the created section.
+
+If TYPE is nil, the section won't be highlighted."
+  (declare (indent 2))
+  (let ((s (make-symbol "*section*")))
+    `(let* ((,s (magit-new-section ,title ,type))
+	    (magit-top-section ,s))
+       (setf (magit-section-beginning ,s) (point))
+       ,@body
+       (setf (magit-section-end ,s) (point))
+       (setf (magit-section-children ,s)
+	     (nreverse (magit-section-children ,s)))
+       ,s)))
+
+(defun magit-set-section-info (info &optional section)
+  (setf (magit-section-info (or section magit-top-section)) info))
+
+(defun magit-set-section-needs-refresh-on-show (flag &optional section)
+  (setf (magit-section-needs-refresh-on-show
+	 (or section magit-top-section))
+	flag))
+
+(defmacro magit-create-buffer-sections (&rest body)
+  "Empty current buffer of text and magit's section, and then evaluate BODY."
+  (declare (indent 0))
+  `(let ((inhibit-read-only t))
+     (erase-buffer)
+     (let ((magit-old-top-section magit-top-section))
+       (setq magit-top-section nil)
+       ,@body
+       (when (null magit-top-section)
+	 (magit-with-section 'top nil
+	   (insert "(empty)\n")))
+       (magit-propertize-section magit-top-section)
+       (magit-section-set-hidden magit-top-section
+				 (magit-section-hidden magit-top-section)))))
+
+(defun magit-propertize-section (section)
+  "Add text-property needed for SECTION."
+  (put-text-property (magit-section-beginning section)
+		     (magit-section-end section)
+		     'magit-section section)
+  (dolist (s (magit-section-children section))
+    (magit-propertize-section s)))
+
+(defun magit-find-section (path top)
+  "Find the section at the path PATH in subsection of section TOP."
+  (if (null path)
+      top
+    (let ((secs (magit-section-children top)))
+      (while (and secs (not (equal (car path)
+				   (magit-section-title (car secs)))))
+	(setq secs (cdr secs)))
+      (and (car secs)
+	   (magit-find-section (cdr path) (car secs))))))
+
+(defun magit-section-path (section)
+  "Return the path of SECTION."
+  (if (not (magit-section-parent section))
+      '()
+    (append (magit-section-path (magit-section-parent section))
+	    (list (magit-section-title section)))))
+
+;; Dead code:
+(defun magit-find-section-at (pos secs)
+  "Return the section at POS in SECS."
+  ;; Could use the text-property
+  (while (and secs
+	      (not (and (<= (magit-section-beginning (car secs)) pos)
+			(<  pos (magit-section-end (car secs))))))
+    (setq secs (cdr secs)))
+  (if secs
+      (or (magit-find-section-at pos (magit-section-children (car secs)))
+	  (car secs))
+    nil))
+
+(defun magit-find-section-after (pos secs)
+  "Find the first section that begins after POS in the list SECS."
+  (while (and secs
+	      (not (> (magit-section-beginning (car secs)) pos)))
+    (setq secs (cdr secs)))
+  (car secs))
+
+(defun magit-find-section-before (pos secs)
+  "Find the last section that begins before POS in the list SECS."
+  (let ((prev nil))
+    (while (and secs
+		(not (> (magit-section-beginning (car secs)) pos)))
+      (setq prev (car secs))
+      (setq secs (cdr secs)))
+    prev))
+
+(defun magit-current-section ()
+  "Return the magit section at point."
+  (or (get-text-property (point) 'magit-section)
+      magit-top-section))
+
+(defun magit-insert-section (section-title-and-type
+			     buffer-title washer cmd &rest args)
+  "Run CMD and put its result in a new section.
+
+SECTION-TITLE-AND-TYPE is either a string that is the title of the section
+or (TITLE . TYPE) where TITLE is the title of the section and TYPE is its type.
+
+If there is no type, or if type is nil, the section won't be highlighted.
+
+BUFFER-TITLE is the inserted title of the section
+
+WASHER is a function that will be run after CMD.
+The buffer will be narrowed to the inserted text.
+It should add sectioning as needed for magit interaction
+
+CMD is an external command that will be run with ARGS as arguments"
+  (let* ((body-beg nil)
+	 (section-title (if (consp section-title-and-type)
+			    (car section-title-and-type)
+			  section-title-and-type))
+	 (section-type (if (consp section-title-and-type)
+			   (cdr section-title-and-type)
+			 nil))
+	 (section
+	  (magit-with-section section-title section-type
+	    (if buffer-title
+		(insert (propertize buffer-title 'face 'magit-section-title)
+			"\n"))
+	    (setq body-beg (point))
+	    (apply 'process-file cmd nil t nil args)
+	    (if (not (eq (char-before) ?\n))
+		(insert "\n"))
+	    (if washer
+		(save-restriction
+		  (narrow-to-region body-beg (point))
+		  (goto-char (point-min))
+		  (funcall washer)
+		  (goto-char (point-max)))))))
+    (if (= body-beg (point))
+	(magit-cancel-section section)
+      (insert "\n"))
+    section))
+
+(defun magit-git-section (section-title-and-type
+			  buffer-title washer &rest args)
+  "Run git and put its result in a new section.
+
+see `magit-insert-section' for meaning of the arguments"
+  (apply #'magit-insert-section
+	 section-title-and-type
+	 buffer-title
+	 washer
+	 magit-git-executable
+	 (append magit-git-standard-options args)))
+
+(defun magit-next-section (section)
+  "Return the section that is after SECTION."
+  (let ((parent (magit-section-parent section)))
+    (if parent
+	(let ((next (cadr (memq section
+				(magit-section-children parent)))))
+	  (or next
+	      (magit-next-section parent))))))
+
+(defun magit-goto-next-section ()
+  "Go to the next magit section."
+  (interactive)
+  (let* ((section (magit-current-section))
+	 (next (or (and (not (magit-section-hidden section))
+			(magit-section-children section)
+			(magit-find-section-after (point)
+						  (magit-section-children
+						   section)))
+		   (magit-next-section section))))
+
+    (if next
+	(progn
+	  (goto-char (magit-section-beginning next))
+	  (if (memq magit-submode '(log reflog))
+	      (magit-show-commit next))
+	  (if (not (magit-section-hidden next))
+	      (let ((offset (- (line-number-at-pos
+				(magit-section-beginning next))
+			       (line-number-at-pos
+				(magit-section-end next)))))
+		(if (< offset (window-height))
+		    (recenter offset)))))
+      (message "No next section"))))
+
+(defun magit-prev-section (section)
+  "Return the section that is before SECTION."
+  (let ((parent (magit-section-parent section)))
+    (if parent
+	(let ((prev (cadr (memq section
+				(reverse (magit-section-children parent))))))
+	  (cond (prev
+		 (while (and (not (magit-section-hidden prev))
+			     (magit-section-children prev))
+		   (setq prev (car (reverse (magit-section-children prev)))))
+		 prev)
+		(t
+		 parent))))))
+
+(defun magit-goto-previous-section ()
+  "Goto the previous magit section."
+  (interactive)
+  (let ((section (magit-current-section)))
+    (cond ((= (point) (magit-section-beginning section))
+	   (let ((prev (magit-prev-section (magit-current-section))))
+	     (if prev
+		 (progn
+		   (if (memq magit-submode '(log reflog))
+		       (magit-show-commit (or prev section)))
+		   (goto-char (magit-section-beginning prev)))
+	       (message "No previous section"))))
+	  (t
+	   (let ((prev (magit-find-section-before (point)
+						  (magit-section-children
+						   section))))
+	     (if (memq magit-submode '(log reflog))
+		 (magit-show-commit (or prev section)))
+	     (goto-char (magit-section-beginning (or prev section))))))))
+
+(defun magit-goto-parent-section ()
+  "Goto the parent section."
+  (interactive)
+  (let ((parent (magit-section-parent (magit-current-section))))
+    (when parent
+      (goto-char (magit-section-beginning parent)))))
+
+(defun magit-goto-section (path)
+  "Goto the section describe by PATH."
+  (let ((sec (magit-find-section path magit-top-section)))
+    (if sec
+	(goto-char (magit-section-beginning sec))
+      (message "No such section"))))
+
+(defun magit-for-all-sections (func &optional top)
+  "Run FUNC on TOP and recursively on all its children.
+
+Default value for TOP is `magit-top-section'"
+  (let ((section (or top magit-top-section)))
+    (when section
+      (funcall func section)
+      (dolist (c (magit-section-children section))
+	(magit-for-all-sections func c)))))
+
+(defun magit-section-set-hidden (section hidden)
+  "Hide SECTION if HIDDEN is not nil, show it otherwise."
+  (setf (magit-section-hidden section) hidden)
+  (if (and (not hidden)
+	   (magit-section-needs-refresh-on-show section))
+      (magit-refresh)
+    (let ((inhibit-read-only t)
+	  (beg (save-excursion
+		 (goto-char (magit-section-beginning section))
+		 (forward-line)
+		 (point)))
+	  (end (magit-section-end section)))
+      (put-text-property beg end 'invisible hidden))
+    (if (not hidden)
+	(dolist (c (magit-section-children section))
+	  (magit-section-set-hidden c (magit-section-hidden c))))))
+
+(defun magit-section-any-hidden (section)
+  "Return true if SECTION or any of its children is hidden."
+  (or (magit-section-hidden section)
+      (let ((kids (magit-section-children section)))
+	(while (and kids (not (magit-section-any-hidden (car kids))))
+	  (setq kids (cdr kids)))
+	kids)))
+
+(defun magit-section-collapse (section)
+  "Show SECTION and hide all its children."
+  (dolist (c (magit-section-children section))
+    (setf (magit-section-hidden c) t))
+  (magit-section-set-hidden section nil))
+
+(defun magit-section-expand (section)
+  "Show SECTION and all its children."
+  (dolist (c (magit-section-children section))
+    (setf (magit-section-hidden c) nil))
+  (magit-section-set-hidden section nil))
+
+(defun magit-section-expand-all-aux (section)
+  "Show recursively all SECTION's children."
+  (dolist (c (magit-section-children section))
+    (setf (magit-section-hidden c) nil)
+    (magit-section-expand-all-aux c)))
+
+(defun magit-section-expand-all (section)
+  "Show SECTION and all its children."
+  (magit-section-expand-all-aux section)
+  (magit-section-set-hidden section nil))
+
+(defun magit-section-hideshow (flag-or-func)
+  "Show or hide current section depending on FLAG-OR-FUNC.
+
+If FLAG-OR-FUNC is a function, it will be ran on current section
+IF FLAG-OR-FUNC is a Boolean value, the section will be hidden if its true, shown otherwise"
+  (let ((section (magit-current-section)))
+    (when (magit-section-parent section)
+      (goto-char (magit-section-beginning section))
+      (if (functionp flag-or-func)
+	  (funcall flag-or-func section)
+	  (magit-section-set-hidden section flag-or-func)))))
+
+(defun magit-show-section ()
+  "Show current section."
+  (interactive)
+  (magit-section-hideshow nil))
+
+(defun magit-hide-section ()
+  "Hide current section."
+  (interactive)
+  (magit-section-hideshow t))
+
+(defun magit-collapse-section ()
+  "Hide all subsection of current section."
+  (interactive)
+  (magit-section-hideshow #'magit-section-collapse))
+
+(defun magit-expand-section ()
+  "Show all subsection of current section."
+  (interactive)
+  (magit-section-hideshow #'magit-section-expand))
+
+(defun magit-toggle-file-section ()
+  "Like `magit-toggle-section' but toggle at file granularity."
+  (interactive)
+  (when (eq 'hunk (first (magit-section-context-type (magit-current-section))))
+    (magit-goto-parent-section))
+  (magit-toggle-section))
+
+(defun magit-toggle-section ()
+  "Toggle hidden status of current section."
+  (interactive)
+  (magit-section-hideshow
+   (lambda (s)
+     (magit-section-set-hidden s (not (magit-section-hidden s))))))
+
+(defun magit-expand-collapse-section ()
+  "Toggle hidden status of subsections of current section."
+  (interactive)
+  (magit-section-hideshow
+   (lambda (s)
+     (cond ((magit-section-any-hidden s)
+	    (magit-section-expand-all s))
+	   (t
+	    (magit-section-collapse s))))))
+
+(defun magit-cycle-section ()
+  "Cycle between expanded, hidden and collapsed state for current section.
+
+Hidden: only the first line of the section is shown
+Collapsed: only the first line of the subsection is shown
+Expanded: everything is shown."
+  (interactive)
+  (magit-section-hideshow
+   (lambda (s)
+     (cond ((magit-section-hidden s)
+	    (magit-section-collapse s))
+	   ((notany #'magit-section-hidden (magit-section-children s))
+	    (magit-section-set-hidden s t))
+	   (t
+	    (magit-section-expand s))))))
+
+(defun magit-section-lineage (s)
+  "Return list of parent, grand-parents... for section S."
+  (when s
+    (cons s (magit-section-lineage (magit-section-parent s)))))
+
+(defun magit-section-show-level (section level threshold path)
+  (magit-section-set-hidden section (>= level threshold))
+  (when (and (< level threshold)
+             (not (magit-no-commit-p)))
+	(if path
+	    (magit-section-show-level (car path) (1+ level) threshold (cdr path))
+	    (dolist (c (magit-section-children section))
+	      (magit-section-show-level c (1+ level) threshold nil)))))
+
+(defun magit-show-level (level all)
+  "Show section whose level is less than LEVEL, hide the others.
+If ALL is non nil, do this in all sections,
+otherwise do it only on ancestors and descendants of current section."
+  (magit-with-refresh
+    (if all
+	(magit-section-show-level magit-top-section 0 level nil)
+      (let ((path (reverse (magit-section-lineage (magit-current-section)))))
+	(magit-section-show-level (car path) 0 level (cdr path))))))
+
+(defun magit-show-only-files ()
+  "Show section that are files, but not there subsection.
+
+Do this in on ancestors and descendants of current section."
+  (interactive)
+  (if (eq magit-submode 'status)
+      (call-interactively 'magit-show-level-2)
+    (call-interactively 'magit-show-level-1)))
+
+(defun magit-show-only-files-all ()
+  "Show section that are files, but not there subsection.
+
+Do this for all sections"
+  (interactive)
+  (if (eq magit-submode 'status)
+      (call-interactively 'magit-show-level-2-all)
+    (call-interactively 'magit-show-level-1-all)))
+
+(defmacro magit-define-level-shower-1 (level all)
+  "Define an interactive function to show function of level LEVEL.
+
+If ALL is non nil, this function will affect all section,
+otherwise it will affect only ancestors and descendants of current section."
+  (let ((fun (intern (format "magit-show-level-%s%s"
+			     level (if all "-all" ""))))
+	(doc (format "Show sections on level %s." level)))
+    `(defun ,fun ()
+       ,doc
+       (interactive)
+       (magit-show-level ,level ,all))))
+
+(defmacro magit-define-level-shower (level)
+  "Define two interactive function to show function of level LEVEL.
+one for all, one for current lineage."
+  `(progn
+     (magit-define-level-shower-1 ,level nil)
+     (magit-define-level-shower-1 ,level t)))
+
+(defmacro magit-define-section-jumper (sym title)
+  "Define an interactive function to go to section SYM.
+
+TITLE is the displayed title of the section."
+  (let ((fun (intern (format "magit-jump-to-%s" sym)))
+	(doc (format "Jump to section `%s'." title)))
+    `(defun ,fun ()
+       ,doc
+       (interactive)
+       (magit-goto-section '(,sym)))))
+
+(defmacro magit-define-inserter (sym arglist &rest body)
+  (declare (indent defun))
+  (let ((fun (intern (format "magit-insert-%s" sym)))
+        (before (intern (format "magit-before-insert-%s-hook" sym)))
+        (after (intern (format "magit-after-insert-%s-hook" sym)))
+        (doc (format "Insert items for `%s'." sym)))
+    `(defun ,fun ,arglist
+       ,doc
+       (run-hooks ',before)
+       ,@body
+       (run-hooks ',after))))
+
+(defvar magit-highlight-overlay nil)
+
+(defvar magit-highlighted-section nil)
+
+(defun magit-highlight-section ()
+  "Highlight current section if it have a type."
+  (let ((section (magit-current-section)))
+    (when (not (eq section magit-highlighted-section))
+      (setq magit-highlighted-section section)
+      (if (not magit-highlight-overlay)
+	  (let ((ov (make-overlay 1 1)))
+	    (overlay-put ov 'face 'magit-item-highlight)
+	    (setq magit-highlight-overlay ov)))
+      (if (and section (magit-section-type section))
+	  (move-overlay magit-highlight-overlay
+			(magit-section-beginning section)
+			(magit-section-end section)
+			(current-buffer))
+	(delete-overlay magit-highlight-overlay)))))
+
+(defun magit-section-context-type (section)
+  (if (null section)
+      '()
+    (let ((c (or (magit-section-type section)
+		 (if (symbolp (magit-section-title section))
+		     (magit-section-title section)))))
+      (if c
+	  (cons c (magit-section-context-type
+		   (magit-section-parent section)))
+	'()))))
+
+(defun magit-prefix-p (prefix list)
+  ;;; Very schemish...
+  (or (null prefix)
+      (if (eq (car prefix) '*)
+          (or (magit-prefix-p (cdr prefix) list)
+              (and (not (null list))
+                   (magit-prefix-p prefix (cdr list))))
+        (and (not (null list))
+             (equal (car prefix) (car list))
+             (magit-prefix-p (cdr prefix) (cdr list))))))
+
+(defmacro magit-section-case (head &rest clauses)
+  "Make different action depending of current section.
+
+HEAD is (SECTION INFO &optional OPNAME),
+  SECTION will be bind to the current section,
+  INFO will be bind to the info's of the current section,
+  OPNAME is a string that will be used to describe current action,
+
+CLAUSES is a list of CLAUSE, each clause is (SECTION-TYPE &BODY)
+where SECTION-TYPE describe section where BODY will be run.
+
+This returns non-nil if some section matches. If the
+corresponding body return a non-nil value, it is returned,
+otherwise it roturn t.
+
+If no section matches, this returns nil if no OPNAME was given
+and throws an error otherwise."
+  (declare (indent 1))
+  (let ((section (car head))
+        (info (cadr head))
+        (type (make-symbol "*type*"))
+        (context (make-symbol "*context*"))
+        (opname (caddr head)))
+    `(let* ((,section (magit-current-section))
+            (,info (magit-section-info ,section))
+            (,type (magit-section-type ,section))
+            (,context (magit-section-context-type ,section)))
+       (cond ,@(mapcar (lambda (clause)
+                         (if (eq (car clause) t)
+                             `(t (or (progn ,@(cdr clause))
+				     t))
+                           (let ((prefix (reverse (car clause)))
+                                 (body (cdr clause)))
+                             `((magit-prefix-p ',prefix ,context)
+                               (or (progn ,@body)
+				   t)))))
+                       clauses)
+             ,@(when opname
+                 `(((run-hook-with-args-until-success
+                     ',(intern (format "magit-%s-action-hook" opname))))
+                   ((not ,type)
+                    (error "Nothing to %s here" ,opname))
+                   (t
+                    (error "Can't %s a %s"
+                           ,opname
+                           (or (get ,type 'magit-description)
+                               ,type)))))))))
+
+(defmacro magit-section-action (head &rest clauses)
+  (declare (indent 1))
+  `(magit-with-refresh
+     (magit-section-case ,head ,@clauses)))
+
+(defmacro magit-add-action (head &rest clauses)
+  "Add additional actions to a pre-existing operator.
+The syntax is identical to `magit-section-case', except that
+OPNAME is mandatory and specifies the operation to which to add
+the actions."
+  (declare (indent 1))
+  (let ((section (car head))
+        (info (cadr head))
+        (type (caddr head)))
+    `(add-hook ',(intern (format "magit-%s-action-hook" type))
+               (lambda ()
+                 ,(macroexpand
+                   ;; Don't pass in the opname so we don't recursively
+                   ;; run the hook again, and so we don't throw an
+                   ;; error if no action matches.
+                   `(magit-section-case (,section ,info)
+                      ,@clauses))))))
+
+(defun magit-wash-sequence (func)
+  "Run FUNC until end of buffer is reached.
+
+FUNC should leave point at the end of the modified region"
+  (while (and (not (eobp))
+              (funcall func))))
+
+(defmacro magit-define-command (sym arglist &rest body)
+  "Macro to define a magit command.
+It will define the magit-SYM function having ARGLIST as argument.
+It will also define the magit-SYM-command-hook variable.
+
+The defined function will call the function in the hook in
+order until one return non nil. If they all return nil then body will be called.
+
+It used to define hookable magit command: command defined by this
+function can be enriched by magit extension like magit-topgit and magit-svn"
+  (declare (indent defun))
+  (let ((fun (intern (format "magit-%s" sym)))
+        (hook (intern (format "magit-%s-command-hook" sym)))
+        (doc (format "Command for `%s'." sym))
+        (inter nil)
+        (instr body))
+    (when (stringp (car body))
+      (setq doc (car body)
+            instr (cdr body)))
+    (let ((form (car instr)))
+      (when (eq (car form) 'interactive)
+        (setq inter form
+              instr (cdr instr))))
+    `(defun ,fun ,arglist
+       ,doc
+       ,inter
+       (or (run-hook-with-args-until-success
+            ',hook ,@(remq '&optional (remq '&rest arglist)))
+           ,@instr))))
+
+;;; Running commands
+
+(defun magit-set-mode-line-process (str)
+  (let ((pr (if str (concat " " str) "")))
+    (save-excursion
+      (magit-for-all-buffers (lambda ()
+			       (setq mode-line-process pr))))))
+
+(defun magit-process-indicator-from-command (comps)
+  (if (magit-prefix-p (cons magit-git-executable magit-git-standard-options)
+		      comps)
+      (setq comps (nthcdr (+ (length magit-git-standard-options) 1) comps)))
+  (cond ((or (null (cdr comps))
+	     (not (member (car comps) '("remote"))))
+	 (car comps))
+	(t
+	 (concat (car comps) " " (cadr comps)))))
+
+(defvar magit-process nil)
+(defvar magit-process-client-buffer nil)
+(defvar magit-process-buffer-name "*magit-process*"
+  "Buffer name for running git commands.")
+
+(defun magit-run* (cmd-and-args
+		   &optional logline noerase noerror nowait input)
+  (if (and magit-process
+	   (get-buffer magit-process-buffer-name))
+      (error "Git is already running"))
+  (let ((cmd (car cmd-and-args))
+	(args (cdr cmd-and-args))
+	(dir default-directory)
+	(buf (get-buffer-create magit-process-buffer-name))
+	(successp nil))
+    (magit-set-mode-line-process
+     (magit-process-indicator-from-command cmd-and-args))
+    (setq magit-process-client-buffer (current-buffer))
+    (with-current-buffer buf
+      (view-mode 1)
+      (set (make-local-variable 'view-no-disable-on-exit) t)
+      (setq view-exit-action
+	    (lambda (buffer)
+	      (with-current-buffer buffer
+		(bury-buffer))))
+      (setq buffer-read-only t)
+      (let ((inhibit-read-only t))
+	(setq default-directory dir)
+	(if noerase
+	    (goto-char (point-max))
+	  (erase-buffer))
+	(insert "$ " (or logline
+			 (magit-concat-with-delim " " cmd-and-args))
+		"\n")
+	(cond (nowait
+	       (setq magit-process
+		     (let ((process-connection-type magit-process-connection-type))
+		       (apply 'magit-start-process cmd buf cmd args)))
+	       (set-process-sentinel magit-process 'magit-process-sentinel)
+	       (set-process-filter magit-process 'magit-process-filter)
+	       (when input
+		 (with-current-buffer input
+		   (process-send-region magit-process
+					(point-min) (point-max)))
+		 (process-send-eof magit-process)
+		 (sit-for 0.1 t))
+	       (cond ((= magit-process-popup-time 0)
+		      (pop-to-buffer (process-buffer magit-process)))
+		     ((> magit-process-popup-time 0)
+		      (run-with-timer
+		       magit-process-popup-time nil
+		       (function
+			(lambda (buf)
+			  (with-current-buffer buf
+			    (when magit-process
+			      (display-buffer (process-buffer magit-process))
+			      (goto-char (point-max))))))
+		       (current-buffer))))
+	       (setq successp t))
+	      (input
+	       (with-current-buffer input
+		 (setq default-directory dir)
+		 (setq magit-process
+		       ;; Don't use a pty, because it would set icrnl
+		       ;; which would modify the input (issue #20).
+		       (let ((process-connection-type nil))
+			 (apply 'magit-start-process cmd buf cmd args)))
+		 (set-process-filter magit-process 'magit-process-filter)
+		 (process-send-region magit-process
+				      (point-min) (point-max))
+		 (process-send-eof magit-process)
+		 (while (equal (process-status magit-process) 'run)
+		   (sit-for 0.1 t))
+		 (setq successp
+		       (equal (process-exit-status magit-process) 0))
+		 (setq magit-process nil))
+	       (magit-set-mode-line-process nil)
+	       (magit-need-refresh magit-process-client-buffer))
+	      (t
+	       (setq successp
+		     (equal (apply 'process-file cmd nil buf nil args) 0))
+	       (magit-set-mode-line-process nil)
+	       (magit-need-refresh magit-process-client-buffer))))
+      (or successp
+	  noerror
+	  (error
+	   (or (with-current-buffer (get-buffer magit-process-buffer-name)
+		 (when (re-search-backward
+			(concat "^error: \\(.*\\)" paragraph-separate) nil t)
+		   (match-string 1)))
+	       "Git failed")))
+      successp)))
+
+(autoload 'dired-uncache "dired")
+(defun magit-process-sentinel (process event)
+  (let ((msg (format "Git %s." (substring event 0 -1)))
+	(successp (string-match "^finished" event)))
+    (with-current-buffer (process-buffer process)
+      (let ((inhibit-read-only t))
+	(goto-char (point-max))
+	(insert msg "\n")
+	(message msg))
+      (unless (memq (process-status process) '(run open))
+        (dired-uncache default-directory)))
+    (setq magit-process nil)
+    (magit-set-mode-line-process nil)
+    (magit-refresh-buffer magit-process-client-buffer)))
+
+(defun magit-password (proc string)
+  "Checks if git/ssh asks for a password and ask the user for it."
+  (when (or (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
+	    (string-match "^\\\(.*\\\)'s password:" string))
+    (process-send-string proc
+                         (concat (read-passwd
+                                  (format "Password for '%s': " (match-string 1 string))
+                                  nil) "\n"))))
+
+(defun magit-process-filter (proc string)
+  (save-current-buffer
+    (set-buffer (process-buffer proc))
+    (let ((inhibit-read-only t))
+      (magit-password proc string)
+      (goto-char (process-mark proc))
+      ;; Find last ^M in string.  If one was found, ignore everything
+      ;; before it and delete the current line.
+      (let ((ret-pos (length string)))
+	(while (and (>= (setq ret-pos (1- ret-pos)) 0)
+		    (/= ?\r (aref string ret-pos))))
+	(cond ((>= ret-pos 0)
+	       (goto-char (line-beginning-position))
+	       (delete-region (point) (line-end-position))
+	       (insert (substring string (+ ret-pos 1))))
+	      (t
+	       (insert string))))
+      (set-marker (process-mark proc) (point)))))
+
+(defun magit-run (cmd &rest args)
+  (magit-with-refresh
+    (magit-run* (cons cmd args))))
+
+(defun magit-run-git (&rest args)
+  (magit-with-refresh
+    (magit-run* (append (cons magit-git-executable
+			      magit-git-standard-options)
+			args))))
+
+(defun magit-run-with-input (input cmd &rest args)
+  (magit-with-refresh
+    (magit-run* (cons cmd args) nil nil nil nil input)))
+
+(defun magit-run-git-with-input (input &rest args)
+  (magit-with-refresh
+    (magit-run* (append (cons magit-git-executable
+			      magit-git-standard-options)
+			args)
+		nil nil nil nil input)))
+
+(defun magit-run-git-async (&rest args)
+  (message "Running %s %s" magit-git-executable (mapconcat 'identity args " "))
+  (magit-run* (append (cons magit-git-executable
+			    magit-git-standard-options)
+		      args)
+	      nil nil nil t))
+
+(defun magit-run-async-with-input (input cmd &rest args)
+  (magit-run* (cons cmd args) nil nil nil t input))
+
+(defun magit-display-process ()
+  "Display output from most recent git command."
+  (interactive)
+  (unless (get-buffer magit-process-buffer-name)
+    (error "No Git commands have run"))
+  (display-buffer magit-process-buffer-name))
+
+;;; Mode
+
+;; We define individual functions (instead of using lambda etc) so
+;; that the online help can show something meaningful.
+
+(magit-define-section-jumper untracked "Untracked files")
+(magit-define-section-jumper unstaged  "Unstaged changes")
+(magit-define-section-jumper staged    "Staged changes")
+(magit-define-section-jumper unpushed  "Unpushed commits")
+
+(magit-define-level-shower 1)
+(magit-define-level-shower 2)
+(magit-define-level-shower 3)
+(magit-define-level-shower 4)
+
+(defun magit-true (prompt)
+  "Dummy function for turning on options on menu."
+  t)
+
+(easy-menu-define magit-mode-menu magit-mode-map
+  "Magit menu"
+  '("Magit"
+    ["Refresh" magit-refresh t]
+    ["Refresh all" magit-refresh-all t]
+    "---"
+    ["Stage" magit-stage-item t]
+    ["Stage all" magit-stage-all t]
+    ["Unstage" magit-unstage-item t]
+    ["Unstage all" magit-unstage-all t]
+    ["Commit" magit-log-edit t]
+    ["Add log entry" magit-add-log t]
+    ["Tag" magit-tag t]
+    ["Annotated tag" magit-annotated-tag t]
+    "---"
+    ["Diff working tree" magit-diff-working-tree t]
+    ["Diff" magit-diff t]
+    ("Log"
+     ["Short Log" magit-display-log t]
+     ["Long Log" magit-log-long t]
+     ["Reflog" magit-reflog t]
+     ["Extended..." magit-key-mode-popup-logging t])
+    "---"
+    ["Cherry pick" magit-cherry-pick-item t]
+    ["Apply" magit-apply-item t]
+    ["Revert" magit-revert-item t]
+    "---"
+    ["Ignore" magit-ignore-item t]
+    ["Ignore locally" magit-ignore-item-locally t]
+    ["Discard" magit-discard-item t]
+    ["Reset head" magit-reset-head t]
+    ["Reset working tree" magit-reset-working-tree t]
+    ["Stash" magit-stash t]
+    ["Snapshot" magit-stash-snapshot t]
+    "---"
+    ["Branch..." magit-checkout t]
+    ["Merge" magit-automatic-merge t]
+    ["Interactive resolve" magit-interactive-resolve-item t]
+    ["Rebase" magit-rebase-step t]
+    ("Rewrite"
+     ["Start" magit-rewrite-start t]
+     ["Stop" magit-rewrite-stop t]
+     ["Finish" magit-rewrite-finish t]
+     ["Abort" magit-rewrite-abort t]
+     ["Set used" magit-rewrite-set-used t]
+     ["Set unused" magit-rewrite-set-unused t])
+    "---"
+    ["Push" magit-push t]
+    ["Pull" magit-pull t]
+    ["Remote update" magit-remote-update t]
+    ("Submodule"
+     ["Submodule update" magit-submodule-update t]
+     ["Submodule update and init" magit-submodule-update-init t]
+     ["Submodule init" magit-submodule-init t]
+     ["Submodule sync" magit-submodule-sync t])
+    "---"
+    ("Extensions")
+    "---"
+    ["Display Git output" magit-display-process t]
+    ["Quit Magit" quit-window t]))
+
+(defvar magit-mode-hook nil "Hook run by `magit-mode'.")
+
+(put 'magit-mode 'mode-class 'special)
+
+(defvar magit-refresh-function nil)
+(make-variable-buffer-local 'magit-refresh-function)
+(put 'magit-refresh-function 'permanent-local t)
+
+(defvar magit-refresh-args nil)
+(make-variable-buffer-local 'magit-refresh-args)
+(put 'magit-refresh-args 'permanent-local t)
+
+(defvar last-point)
+
+(defun magit-remember-point ()
+  (setq last-point (point)))
+
+(defun magit-invisible-region-end (pos)
+  (while (and (not (= pos (point-max))) (invisible-p pos))
+    (setq pos (next-char-property-change pos)))
+  pos)
+
+(defun magit-invisible-region-start (pos)
+  (while (and (not (= pos (point-min))) (invisible-p pos))
+    (setq pos (1- (previous-char-property-change pos))))
+  pos)
+
+(defun magit-correct-point-after-command ()
+  "Move point outside of invisible regions.
+
+Emacs often leaves point in invisible regions, it seems.  To fix
+this, we move point ourselves and never let Emacs do its own
+adjustments.
+
+When point has to be moved out of an invisible region, it can be
+moved to its end or its beginning.  We usually move it to its
+end, except when that would move point back to where it was
+before the last command."
+  (if (invisible-p (point))
+      (let ((end (magit-invisible-region-end (point))))
+	(goto-char (if (= end last-point)
+		       (magit-invisible-region-start (point))
+		     end))))
+  (setq disable-point-adjustment t))
+
+(defun magit-post-command-hook ()
+  (magit-correct-point-after-command)
+  (magit-highlight-section))
+
+(defun magit-mode ()
+  "Review the status of a git repository and act on it.
+
+Please see the manual for a complete description of Magit.
+
+\\{magit-mode-map}"
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+  (setq buffer-read-only t)
+  (make-local-variable 'line-move-visual)
+  (setq major-mode 'magit-mode
+	mode-name "Magit"
+	mode-line-process ""
+	truncate-lines t
+	line-move-visual nil)
+  (add-hook 'pre-command-hook #'magit-remember-point nil t)
+  (add-hook 'post-command-hook #'magit-post-command-hook t t)
+  (use-local-map magit-mode-map)
+  (run-mode-hooks 'magit-mode-hook))
+
+(defun magit-mode-init (dir submode refresh-func &rest refresh-args)
+  (setq default-directory dir
+	magit-submode submode
+	magit-refresh-function refresh-func
+	magit-refresh-args refresh-args)
+  (magit-mode)
+  (magit-refresh-buffer))
+
+(defun magit-find-buffer (submode &optional dir)
+  (let ((topdir (magit-get-top-dir (or dir default-directory))))
+    (dolist (buf (buffer-list))
+      (if (with-current-buffer buf
+	    (and default-directory
+		 (equal (expand-file-name default-directory) topdir)
+		 (eq major-mode 'magit-mode)
+		 (eq magit-submode submode)))
+	  (return buf)))))
+
+(defun magit-find-status-buffer (&optional dir)
+  (magit-find-buffer 'status dir))
+
+(defun magit-for-all-buffers (func &optional dir)
+  (dolist (buf (buffer-list))
+    (with-current-buffer buf
+      (if (and (eq major-mode 'magit-mode)
+	       (or (null dir)
+		   (equal default-directory dir)))
+	  (funcall func)))))
+
+(defun magit-refresh-buffer (&optional buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (let* ((old-line (line-number-at-pos))
+	   (old-section (magit-current-section))
+	   (old-path (and old-section
+			  (magit-section-path (magit-current-section))))
+	   (section-line (and old-section
+			      (count-lines
+			       (magit-section-beginning old-section)
+			       (point)))))
+      (if magit-refresh-function
+	  (apply magit-refresh-function
+		 magit-refresh-args))
+      (magit-refresh-marked-commits-in-buffer)
+      (let ((s (and old-path (magit-find-section old-path magit-top-section))))
+	(cond (s
+	       (goto-char (magit-section-beginning s))
+	       (forward-line section-line))
+	      (t
+	       (magit-goto-line old-line)))
+	(dolist (w (get-buffer-window-list (current-buffer)))
+	  (set-window-point w (point)))
+	(magit-highlight-section)))))
+
+(defun magit-string-has-prefix-p (string prefix)
+  (eq (compare-strings string nil (length prefix) prefix nil nil) t))
+
+(defun magit-revert-buffers (dir &optional ignore-modtime)
+  (dolist (buffer (buffer-list))
+    (when (and buffer
+	       (buffer-file-name buffer)
+	       (file-readable-p (buffer-file-name buffer))
+	       (magit-string-has-prefix-p (buffer-file-name buffer) dir)
+	       (or ignore-modtime (not (verify-visited-file-modtime buffer)))
+	       (not (buffer-modified-p buffer)))
+      (with-current-buffer buffer
+	(condition-case var
+	  (revert-buffer t t nil)
+	  (error (let ((signal-data (cadr var)))
+		   (cond (t (magit-bug-report signal-data))))))))))
+
+(defun magit-update-vc-modeline (dir)
+  "Update the modeline for buffers representable by magit."
+  (dolist (buffer (buffer-list))
+    (when (and buffer
+	       (buffer-file-name buffer)
+	       (magit-string-has-prefix-p (buffer-file-name buffer) dir))
+      (with-current-buffer buffer
+	(condition-case var
+	    (vc-find-file-hook)
+	  (error (let ((signal-data (cadr var)))
+		   (cond (t (magit-bug-report signal-data))))))))))
+
+(defvar magit-refresh-needing-buffers nil)
+(defvar magit-refresh-pending nil)
+
+(defun magit-refresh-wrapper (func)
+  (if magit-refresh-pending
+      (funcall func)
+    (let* ((dir default-directory)
+	   (status-buffer (magit-find-buffer 'status dir))
+	   (magit-refresh-needing-buffers nil)
+	   (magit-refresh-pending t))
+      (unwind-protect
+	  (funcall func)
+	(when magit-refresh-needing-buffers
+	  (magit-revert-buffers dir)
+	  (dolist (b (adjoin status-buffer
+			     magit-refresh-needing-buffers))
+	    (magit-refresh-buffer b)))))))
+
+(defun magit-need-refresh (&optional buffer)
+  (let ((buffer (or buffer (current-buffer))))
+    (when (not (memq buffer magit-refresh-needing-buffers))
+      (setq magit-refresh-needing-buffers
+	    (cons buffer magit-refresh-needing-buffers)))))
+
+(defun magit-refresh ()
+  "Refresh current buffer to match repository state.
+Also revert every unmodified buffer visiting files
+in the corresponding directory."
+  (interactive)
+  (magit-with-refresh
+    (magit-need-refresh)))
+
+(defun magit-refresh-all ()
+  "Refresh all magit buffers to match respective repository states.
+Also revert every unmodified buffer visiting files
+in the corresponding directories."
+  (interactive)
+  (magit-for-all-buffers #'magit-refresh-buffer default-directory))
+
+;;; Untracked files
+
+(defun magit-wash-untracked-file ()
+  (if (looking-at "^? \\(.*\\)$")
+      (let ((file (match-string-no-properties 1)))
+	(delete-region (point) (+ (line-end-position) 1))
+	(magit-with-section file 'file
+	  (magit-set-section-info file)
+	  (insert "\t" file "\n"))
+	t)
+    nil))
+
+(defun magit-wash-untracked-files ()
+  ;; Setting magit-old-top-section to nil speeds up washing: no time
+  ;; is wasted looking up the old visibility, which doesn't matter for
+  ;; untracked files.
+  ;;
+  ;; XXX - speed this up in a more general way.
+  ;;
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-wash-untracked-file)))
+
+(defun magit-insert-untracked-files ()
+  (unless (string= (magit-get "status" "showUntrackedFiles") "no")
+    (apply 'magit-git-section
+           `(untracked
+           "Untracked files:"
+           magit-wash-untracked-files
+           "ls-files" "--others" "-t" "--exclude-standard"
+           ,@(when magit-omit-untracked-dir-contents
+               '("--directory"))))))
+
+;;; Diffs and Hunks
+
+(defvar magit-diff-context-lines 3)
+
+(defun magit-diff-U-arg ()
+  (format "-U%d" magit-diff-context-lines))
+
+(defun magit-diff-smaller-hunks (&optional count)
+  "Decrease the context for diff hunks by COUNT."
+  (interactive "p")
+  (setq magit-diff-context-lines (max 0 (- magit-diff-context-lines count)))
+  (magit-refresh))
+
+(defun magit-diff-larger-hunks (&optional count)
+  "Increase the context for diff hunks by COUNT."
+  (interactive "p")
+  (setq magit-diff-context-lines (+ magit-diff-context-lines count))
+  (magit-refresh))
+
+(defun magit-diff-default-hunks ()
+  "Reset context for diff hunks to the default size."
+  (interactive "")
+  (setq magit-diff-context-lines 3)
+  (magit-refresh))
+
+(defun magit-diff-line-file ()
+  (cond ((looking-at "^diff --git ./\\(.*\\) ./\\(.*\\)$")
+	 (match-string-no-properties 2))
+	((looking-at "^diff --cc +\\(.*\\)$")
+	 (match-string-no-properties 1))
+	(t
+	 nil)))
+
+(defun magit-wash-diffs ()
+  (magit-wash-sequence #'magit-wash-diff-or-other-file))
+
+(defun magit-wash-diff-or-other-file ()
+  (or (magit-wash-diff)
+      (magit-wash-other-file)))
+
+(defun magit-wash-other-file ()
+  (if (looking-at "^? \\(.*\\)$")
+      (let ((file (match-string-no-properties 1)))
+	(delete-region (point) (+ (line-end-position) 1))
+	(magit-with-section file 'file
+	  (magit-set-section-info file)
+	  (insert "\tNew      " file "\n"))
+	t)
+    nil))
+
+(defvar magit-hide-diffs nil)
+
+(defun magit-insert-diff-title (status file file2)
+  (let ((status-text (case status
+		       ((unmerged)
+			(format "Unmerged %s" file))
+		       ((new)
+			(format "New      %s" file))
+		       ((deleted)
+			(format "Deleted  %s" file))
+		       ((renamed)
+			(format "Renamed  %s   (from %s)"
+				file file2))
+		       ((modified)
+			(format "Modified %s" file))
+		       (t
+			(format "?        %s" file)))))
+    (insert "\t" status-text "\n")))
+
+(defun magit-wash-diff-section ()
+  (cond ((looking-at "^\\* Unmerged path \\(.*\\)")
+	 (let ((file (match-string-no-properties 1)))
+	   (delete-region (point) (line-end-position))
+	   (insert "\tUnmerged " file "\n")
+	   (magit-set-section-info (list 'unmerged file nil))
+	   t))
+	((looking-at "^diff")
+	 (let ((file (magit-diff-line-file))
+	       (end (save-excursion
+		      (forward-line) ;; skip over "diff" line
+		      (if (search-forward-regexp "^diff\\|^@@" nil t)
+			  (goto-char (match-beginning 0))
+			(goto-char (point-max)))
+		      (point-marker))))
+	   (let* ((status (cond
+			   ((looking-at "^diff --cc")
+			    'unmerged)
+			   ((save-excursion
+			      (search-forward-regexp "^new file" end t))
+			    'new)
+			   ((save-excursion
+			      (search-forward-regexp "^deleted" end t))
+			    'deleted)
+			   ((save-excursion
+			      (search-forward-regexp "^rename" end t))
+			    'renamed)
+			   (t
+			    'modified)))
+		  (file2 (cond
+			  ((save-excursion
+			     (search-forward-regexp "^rename from \\(.*\\)"
+						    end t))
+			   (match-string-no-properties 1)))))
+	     (magit-set-section-info (list status file file2))
+	     (magit-insert-diff-title status file file2)
+	     (goto-char end)
+	     (let ((magit-section-hidden-default nil))
+	       (magit-wash-sequence #'magit-wash-hunk))))
+	 t)
+	(t
+	 nil)))
+
+(defun magit-wash-diff ()
+  (let ((magit-section-hidden-default magit-hide-diffs))
+    (magit-with-section (magit-current-line) 'diff
+      (magit-wash-diff-section))))
+
+(defun magit-diff-item-kind (diff)
+  (car (magit-section-info diff)))
+
+(defun magit-diff-item-file (diff)
+  (cadr (magit-section-info diff)))
+
+(defun magit-diff-item-file2 (diff)
+  (caddr (magit-section-info diff)))
+
+(defun magit-wash-hunk ()
+  (cond ((looking-at "\\(^@+\\)[^@]*@+")
+	 (let ((n-columns (1- (length (match-string 1))))
+	       (head (match-string 0)))
+	   (magit-with-section head 'hunk
+	     (add-text-properties (match-beginning 0) (match-end 0)
+				  '(face magit-diff-hunk-header))
+	     (forward-line)
+	     (while (not (or (eobp)
+			     (looking-at "^diff\\|^@@")))
+	       (let ((prefix (buffer-substring-no-properties
+			      (point) (min (+ (point) n-columns) (point-max)))))
+		 (cond ((string-match "\\+" prefix)
+			(magit-put-line-property 'face 'magit-diff-add))
+		       ((string-match "-" prefix)
+			(magit-put-line-property 'face 'magit-diff-del))
+		       (t
+			(magit-put-line-property 'face 'magit-diff-none))))
+	       (forward-line))))
+	 t)
+	(t
+	 nil)))
+
+(defvar magit-diff-options nil)
+
+(defun magit-insert-diff (file)
+  (let ((cmd magit-git-executable)
+	(args (append (list "diff")
+		      (list (magit-diff-U-arg))
+		      magit-diff-options
+		      (list "--" file))))
+    (let ((p (point)))
+      (magit-git-insert args)
+      (if (not (eq (char-before) ?\n))
+	  (insert "\n"))
+      (save-restriction
+	(narrow-to-region p (point))
+	(goto-char p)
+	(magit-wash-diff-section)
+	(goto-char (point-max))))))
+
+(defvar magit-last-raw-diff nil)
+(defvar magit-ignore-unmerged-raw-diffs nil)
+
+(defun magit-wash-raw-diffs ()
+  (let ((magit-last-raw-diff nil))
+    (magit-wash-sequence #'magit-wash-raw-diff)))
+
+(defun magit-wash-raw-diff ()
+  (if (looking-at
+       ":\\([0-7]+\\) \\([0-7]+\\) [0-9a-f]+ [0-9a-f]+ \\(.\\)[0-9]*\t\\([^\t\n]+\\)$")
+      (let ((old-perm (match-string-no-properties 1))
+	    (new-perm (match-string-no-properties 2))
+	    (status (case (string-to-char (match-string-no-properties 3))
+		      (?A 'new)
+		      (?D 'deleted)
+		      (?M 'modified)
+		      (?U 'unmerged)
+		      (?T 'new-type)
+		      (t     nil)))
+	    (file (match-string-no-properties 4)))
+	;; If this is for the same file as the last diff, ignore it.
+	;; Unmerged files seem to get two entries.
+	;; We also ignore unmerged files when told so.
+	(if (or (equal file magit-last-raw-diff)
+		(and magit-ignore-unmerged-raw-diffs (eq status 'unmerged)))
+	    (delete-region (point) (+ (line-end-position) 1))
+	  (setq magit-last-raw-diff file)
+	  ;; The 'diff' section that is created here will not work with
+	  ;; magit-insert-diff-item-patch etc when we leave it empty.
+	  ;; Luckily, raw diffs are only produced for staged and
+	  ;; unstaged changes, and we never call
+	  ;; magit-insert-diff-item-patch on them.  This is a bit
+	  ;; brittle, of course.
+	  (let ((magit-section-hidden-default magit-hide-diffs))
+	    (magit-with-section file 'diff
+	      (delete-region (point) (+ (line-end-position) 1))
+	      (if (not (magit-section-hidden magit-top-section))
+		  (magit-insert-diff file)
+		(magit-set-section-info (list status file nil))
+		(magit-set-section-needs-refresh-on-show t)
+		(magit-insert-diff-title status file nil)))))
+	t)
+    nil))
+
+(defun magit-hunk-item-diff (hunk)
+  (let ((diff (magit-section-parent hunk)))
+    (or (eq (magit-section-type diff) 'diff)
+	(error "Huh?  Parent of hunk not a diff"))
+    diff))
+
+(defun magit-diff-item-insert-header (diff buf)
+  (let ((beg (save-excursion
+	       (goto-char (magit-section-beginning diff))
+	       (forward-line)
+	       (point)))
+	(end (if (magit-section-children diff)
+		 (magit-section-beginning (car (magit-section-children diff)))
+	       (magit-section-end diff))))
+    (magit-insert-region beg end buf)))
+
+(defun magit-insert-diff-item-patch (diff buf)
+  (let ((beg (save-excursion
+	       (goto-char (magit-section-beginning diff))
+	       (forward-line)
+	       (point)))
+	(end (magit-section-end diff)))
+    (magit-insert-region beg end buf)))
+
+(defun magit-insert-hunk-item-patch (hunk buf)
+  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
+  (magit-insert-region (magit-section-beginning hunk) (magit-section-end hunk)
+		       buf))
+
+(defun magit-insert-hunk-item-region-patch (hunk reverse beg end buf)
+  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
+  (save-excursion
+    (goto-char (magit-section-beginning hunk))
+    (magit-insert-current-line buf)
+    (forward-line)
+    (let ((copy-op (if reverse "+" "-")))
+      (while (< (point) (magit-section-end hunk))
+	(if (and (<= beg (point)) (< (point) end))
+	    (magit-insert-current-line buf)
+	  (cond ((looking-at " ")
+		 (magit-insert-current-line buf))
+		((looking-at copy-op)
+		 (let ((text (buffer-substring-no-properties
+			      (+ (point) 1) (line-beginning-position 2))))
+		   (with-current-buffer buf
+		     (insert " " text))))))
+	(forward-line))))
+  (with-current-buffer buf
+    (diff-fixup-modifs (point-min) (point-max))))
+
+(defun magit-hunk-item-is-conflict-p (hunk)
+  ;;; XXX - Using the title is a bit too clever...
+  (string-match "^diff --cc"
+		(magit-section-title (magit-hunk-item-diff hunk))))
+
+(defun magit-hunk-item-target-line (hunk)
+  (save-excursion
+    (beginning-of-line)
+    (let ((line (line-number-at-pos)))
+      (if (looking-at "-")
+	  (error "Can't visit removed lines"))
+      (goto-char (magit-section-beginning hunk))
+      (if (not (looking-at "@@+ .* \\+\\([0-9]+\\),[0-9]+ @@+"))
+	  (error "Hunk header not found"))
+      (let ((target (string-to-number (match-string 1))))
+	(forward-line)
+	(while (< (line-number-at-pos) line)
+	  ;; XXX - deal with combined diffs
+	  (if (not (looking-at "-"))
+	      (setq target (+ target 1)))
+	  (forward-line))
+	target))))
+
+(defvar magit-tmp-buffer-name " *magit-tmp*")
+
+(defmacro with-magit-tmp-buffer (var &rest body)
+  (declare (indent 1)
+	   (debug (symbolp &rest form)))
+  `(let ((,var (generate-new-buffer magit-tmp-buffer-name)))
+     (unwind-protect
+	  (progn ,@body)
+       (kill-buffer ,var))))
+
+(defun magit-apply-diff-item (diff &rest args)
+  (when (zerop magit-diff-context-lines)
+    (setq args (cons "--unidiff-zero" args)))
+  (with-magit-tmp-buffer tmp
+    (magit-insert-diff-item-patch diff tmp)
+    (apply #'magit-run-git-with-input tmp
+	   "apply" (append args (list "-")))))
+
+(defun magit-apply-hunk-item* (hunk reverse &rest args)
+  (when (zerop magit-diff-context-lines)
+    (setq args (cons "--unidiff-zero" args)))
+  (with-magit-tmp-buffer tmp
+    (if (magit-use-region-p)
+	(magit-insert-hunk-item-region-patch
+	 hunk reverse (region-beginning) (region-end) tmp)
+	(magit-insert-hunk-item-patch hunk tmp))
+    (apply #'magit-run-git-with-input tmp
+	   "apply" (append args (list "-")))))
+
+(defun magit-apply-hunk-item (hunk &rest args)
+  (apply #'magit-apply-hunk-item* hunk nil args))
+
+(defun magit-apply-hunk-item-reverse (hunk &rest args)
+  (apply #'magit-apply-hunk-item* hunk t (cons "--reverse" args)))
+
+(magit-define-inserter unstaged-changes (title)
+  (let ((magit-hide-diffs t))
+    (let ((magit-diff-options (append '() magit-diff-options)))
+      (magit-git-section 'unstaged title 'magit-wash-raw-diffs
+                         "diff-files"))))
+
+(magit-define-inserter staged-changes (staged no-commit)
+  (when staged
+    (let ((magit-hide-diffs t)
+          (base (if no-commit
+                    (magit-git-string "mktree")
+                  "HEAD")))
+      (let ((magit-diff-options (append '("--cached") magit-diff-options))
+            (magit-ignore-unmerged-raw-diffs t))
+        (magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs
+                           "diff-index" "--cached"
+                           base)))))
+
+;;; Logs and Commits
+
+(defvar magit-log-oneline-re
+  (concat
+   "^\\([_\\*|/ -.]+\\)?"                                  ; graph   (1)
+   "\\(?:"
+   "\\([0-9a-fA-F]\\{40\\}\\) "                            ; sha1    (2)
+   "\\(?:\\((\\(?:[^ ]+?\\(?:[:,] \\)?\\)+)\\) \\)?"       ; refs    (3)
+   "\\(.*\\)"                                              ; msg     (4)
+   "\\)?$")
+  "Regexp used to extract elements of git log output.
+Those output are generated by --pretty=oneline with graph, or --pretty=format:* %H %s")
+
+(defvar magit-present-log-line-function 'magit-present-log-line
+  "The function to use when generating a log line.
+It takes four args: CHART, SHA1, REFS and MESSAGE.  The function
+must return a string which will represent the log line.")
+
+(defun magit-present-log-line (graph sha1 refs message)
+  "The default log line generator."
+  (let* ((ref-re "\\(?:tag: \\)?refs/\\(bisect\\|tags\\|remotes\\|patches/[^/]*\\|heads\\)/\\(.+\\)")
+         (string-refs
+          (when refs
+            (concat (mapconcat
+                     (lambda (r)
+                       (propertize
+                        (if (string-match ref-re r)
+                            (match-string 2 r)
+                          r)
+                        'face (cond
+                               ((string= r "refs/stash")
+                                'magit-log-head-label-local)
+                               ((not (match-string 1 r))
+                                nil)
+                               ((string= (match-string 1 r) "remotes")
+                                'magit-log-head-label-remote)
+                               ((and (not (null (match-string 1 r))) 
+                                     (string-match "^patches/[^/]*$" (match-string 1 r))) ; Stacked Git
+                                'magit-log-head-label-patches)
+                               ((string= (match-string 1 r) "bisect")
+                                (if (string= (match-string 2 r) "bad")
+                                    'magit-log-head-label-bisect-bad
+                                  'magit-log-head-label-bisect-good))
+                               ((string= (match-string 1 r) "tags")
+                                'magit-log-head-label-tags)
+                               ((string= (match-string 1 r) "heads")
+                                'magit-log-head-label-local)
+                               (t
+                                'magit-log-head-label-local))))
+                     refs
+                     " ")
+                    " "))))
+    (concat
+     (if sha1
+         (propertize (substring sha1 0 8) 'face 'magit-log-sha1)
+       (insert-char ? 8))
+     " "
+     (when graph
+       (propertize graph 'face 'magit-log-graph))
+     string-refs
+     (when message
+       (propertize message 'face 'magit-log-message)))))
+
+(defvar magit-log-count ()
+  "Internal var used to count the number of logs actually added in a buffer.")
+
+(defmacro magit-create-log-buffer-sections (&rest body)
+  "Empty current buffer of text and magit's section, and then evaluate BODY.
+
+if the number of logs inserted in the buffer is `magit-log-cutoff-length'
+insert a line to tell how to insert more of them"
+  (declare (indent 0))
+  `(let ((magit-log-count 0) (inhibit-read-only t))
+     (magit-create-buffer-sections
+       ,@body
+       (if (= magit-log-count magit-log-cutoff-length)
+	   (magit-with-section "longer"  'longer
+	     (insert "type \"e\" to show more logs\n"))))))
+
+
+(defun magit-wash-log-line ()
+  (beginning-of-line)
+  (let ((line-re magit-log-oneline-re))
+    (cond
+     ((looking-at magit-log-oneline-re)
+      (let ((chart (match-string 1))
+            (sha1 (match-string 2))
+            (msg (match-string 4))
+            (refs (when (match-string 3)
+		    (delq nil
+			  (mapcar
+			   (lambda (s)
+			     (and (not
+				   (or (string= s "tag:")
+				       (string= s "HEAD"))) ; as of 1.6.6
+				  s))
+			   (split-string (match-string 3) "[(), ]" t))))))
+        (delete-region (point-at-bol) (point-at-eol))
+        (insert (funcall magit-present-log-line-function chart sha1 refs msg))
+        (goto-char (point-at-bol))
+        (if sha1
+            (magit-with-section sha1 'commit
+              (when magit-log-count (setq magit-log-count (1+ magit-log-count)))
+              (magit-set-section-info sha1)
+              (forward-line))
+          (forward-line))))
+     (t
+      (forward-line)))
+    t))
+
+(defun magit-wash-log ()
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-wash-log-line)))
+
+(defvar magit-currently-shown-commit nil)
+
+(defun magit-wash-commit ()
+  (when (looking-at "^commit \\([0-9a-fA-F]\\{40\\}\\)")
+    (add-text-properties (match-beginning 1) (match-end 1)
+			 '(face magit-log-sha1)))
+  (when (search-forward-regexp "^diff" nil t)
+    (goto-char (match-beginning 0))
+    (magit-wash-diffs)))
+
+(defun magit-refresh-commit-buffer (commit)
+  (magit-create-buffer-sections
+    (magit-git-section nil nil
+		       'magit-wash-commit
+		       "log"
+		       "--decorate=full"
+		       "--max-count=1"
+		       "--pretty=medium"
+		       "--cc"
+		       "-p" commit)))
+
+(define-minor-mode magit-commit-mode
+    "Minor mode to view a git commit.
+
+\\{magit-commit-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-commit-mode-map)
+
+(defvar magit-commit-buffer-name "*magit-commit*"
+  "Buffer name for displaying commit log messages.")
+
+(defun magit-show-commit (commit &optional scroll)
+  (when (magit-section-p commit)
+    (setq commit (magit-section-info commit)))
+  (let ((dir default-directory)
+	(buf (get-buffer-create magit-commit-buffer-name)))
+    (cond ((and (equal magit-currently-shown-commit commit)
+		;; if it's empty then the buffer was killed
+		(with-current-buffer buf
+		  (> (length (buffer-string)) 1)))
+	   (let ((win (get-buffer-window buf)))
+	     (cond ((not win)
+		    (display-buffer buf))
+		   (scroll
+		    (with-selected-window win
+		      (funcall scroll))))))
+	  (t
+	   (setq magit-currently-shown-commit commit)
+	   (display-buffer buf)
+	   (with-current-buffer buf
+	     (set-buffer buf)
+	     (goto-char (point-min))
+	     (magit-mode-init dir 'commit
+			      #'magit-refresh-commit-buffer commit)
+	     (magit-commit-mode t))))))
+
+(defvar magit-marked-commit nil)
+
+(defvar magit-mark-overlay nil)
+(make-variable-buffer-local 'magit-mark-overlay)
+(put 'magit-mark-overlay 'permanent-local t)
+
+(defun magit-refresh-marked-commits ()
+  (magit-for-all-buffers #'magit-refresh-marked-commits-in-buffer))
+
+(defun magit-refresh-marked-commits-in-buffer ()
+  (if (not magit-mark-overlay)
+      (let ((ov (make-overlay 1 1)))
+	(overlay-put ov 'face 'magit-item-mark)
+	(setq magit-mark-overlay ov)))
+  (delete-overlay magit-mark-overlay)
+  (magit-for-all-sections
+   (lambda (section)
+     (when (and (eq (magit-section-type section) 'commit)
+		(equal (magit-section-info section)
+		       magit-marked-commit))
+       (move-overlay magit-mark-overlay
+		     (magit-section-beginning section)
+		     (magit-section-end section)
+		     (current-buffer))))))
+
+(defun magit-set-marked-commit (commit)
+  (setq magit-marked-commit commit)
+  (magit-refresh-marked-commits))
+
+(defun magit-marked-commit ()
+  (or magit-marked-commit
+      (error "No commit marked")))
+
+(defun magit-remote-branch-name (remote branch)
+  "Get the name of the branch BRANCH on remote REMOTE"
+  (if (string= remote ".")
+      branch
+    (concat remote "/" branch)))
+
+(magit-define-inserter unpulled-commits (remote branch)
+  (when remote
+    (magit-git-section 'unpulled
+		       "Unpulled commits:" 'magit-wash-log
+		       "log" "--pretty=format:* %H %s"
+		       (format "HEAD..%s"
+			     (magit-remote-branch-name remote branch)))))
+
+(magit-define-inserter unpushed-commits (remote branch)
+  (when remote
+    (magit-git-section 'unpushed
+		       "Unpushed commits:" 'magit-wash-log
+		       "log" "--pretty=format:* %H %s"
+		       (format "%s..HEAD"
+			     (magit-remote-branch-name remote branch)))))
+
+(defun magit-remote-branch-for (local-branch &optional prepend-remote-name)
+  "Guess the remote branch name that LOCAL-BRANCH is tracking.
+Prepend \"remotes/\", the remote's name and \"/\" if
+PREPEND-REMOTE-NAME is non-nil."
+  (let ((merge (magit-get "branch" local-branch "merge")))
+    (save-match-data
+      (if (and merge (string-match "^refs/heads/\\(.+\\)" merge))
+	  (concat (if prepend-remote-name
+                      (concat "remotes/"
+                              (magit-get "branch" local-branch "remote")
+                              "/"))
+                  (match-string 1 merge))))))
+
+;;; Status
+
+(defvar magit-remote-string-hook nil)
+
+(defun magit-remote-string (remote remote-branch)
+  (cond
+   ((string= "." remote)
+    (format "branch %s"
+	    (propertize remote-branch 'face 'magit-branch)))
+   (remote
+      (concat
+       (propertize remote-branch 'face 'magit-branch)
+       " @ "
+       remote
+       " ("
+       (magit-get "remote" remote "url")
+       ")"))
+   (t
+    (run-hook-with-args-until-success 'magit-remote-string-hook))))
+
+(defun magit-refresh-status ()
+  (magit-create-buffer-sections
+    (magit-with-section 'status nil
+      (let* ((branch (magit-get-current-branch))
+	     (remote (and branch (magit-get "branch" branch "remote")))
+	     (remote-branch (or (and branch (magit-remote-branch-for branch)) branch))
+	     (remote-string (magit-remote-string remote remote-branch))
+	     (head (magit-git-string
+		    "log" "--max-count=1" "--abbrev-commit" "--pretty=oneline"))
+	     (no-commit (not head)))
+	(when remote-string
+	  (insert "Remote:   " remote-string "\n"))
+	(insert (format "Local:    %s %s\n"
+			(propertize (or branch "(detached)")
+				    'face 'magit-branch)
+			(abbreviate-file-name default-directory)))
+	(insert (format "Head:     %s\n"
+			(if no-commit "nothing commited (yet)" head)))
+	(let ((merge-heads (magit-file-lines ".git/MERGE_HEAD")))
+	  (if merge-heads
+	      (insert (format "Merging:   %s\n"
+			      (magit-concat-with-delim
+			       ", "
+			       (mapcar 'magit-name-rev merge-heads))))))
+	(let ((rebase (magit-rebase-info)))
+	  (if rebase
+	      (insert (apply 'format "Rebasing: onto %s (%s of %s); Press \"R\" to Abort, Skip, or Continue\n" rebase))))
+	(insert "\n")
+	(magit-git-exit-code "update-index" "--refresh")
+	(magit-insert-untracked-files)
+	(magit-insert-stashes)
+	(magit-insert-pending-changes)
+	(magit-insert-pending-commits)
+	(magit-insert-unpulled-commits remote remote-branch)
+	(let ((staged (or no-commit (magit-anything-staged-p))))
+	  (magit-insert-unstaged-changes
+	   (if staged "Unstaged changes:" "Changes:"))
+	  (magit-insert-staged-changes staged no-commit))
+	(magit-insert-unpushed-commits remote remote-branch)
+	(run-hooks 'magit-refresh-status-hook)))))
+
+(defun magit-init (dir)
+  "Initialize git repository in the DIR directory."
+  (interactive (list (read-directory-name "Directory for Git repository: ")))
+  (let ((topdir (magit-get-top-dir dir)))
+    (when (or (not topdir)
+	      (yes-or-no-p
+	       (format
+		(if (string-equal topdir (expand-file-name dir))
+		    "There is already a Git repository in %s. Reinitialize? "
+		  "There is a Git repository in %s. Create another in %s? ")
+		topdir dir)))
+      (unless (file-directory-p dir)
+	(and (y-or-n-p (format "Directory %s does not exists.  Create it? " dir))
+	     (make-directory dir)))
+      (let ((default-directory dir))
+	(magit-run* (list "git" "init"))))))
+
+(define-minor-mode magit-status-mode
+    "Minor mode for looking at git status.
+
+\\{magit-status-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-status-mode-map)
+
+(defun magit-save-some-buffers (&optional msg pred)
+  "Save some buffers if variable `magit-save-some-buffers' is non-nil.
+If variable `magit-save-some-buffers' is set to 'dontask then
+don't ask the user before saving the buffers, just go ahead and
+do it.
+
+Optional argument MSG is displayed in the minibuffer if variable
+`magit-save-some-buffers' is nil.
+
+Optional second argument PRED determines which buffers are considered:
+If PRED is nil, all the file-visiting buffers are considered.
+If PRED is t, then certain non-file buffers will also be considered.
+If PRED is a zero-argument function, it indicates for each buffer whether
+to consider it or not when called with that buffer current."
+  (interactive)
+  (let ((predicate-function (or pred magit-save-some-buffers-predicate)))
+
+    (if magit-save-some-buffers
+        (save-some-buffers
+         (eq magit-save-some-buffers 'dontask)
+         predicate-function)
+      (when msg
+        (message msg)))))
+
+
+(defun magit-save-buffers-predicate-all ()
+  "Prompt to save all buffers with unsaved changes"
+  t)
+
+(defun magit-save-buffers-predicate-tree-only ()
+  "Only prompt to save buffers which are within the current git project (as
+  determined by the dir passed to `magit-status'."
+  (let ((current-buf-dir
+         (file-name-directory (buffer-file-name (current-buffer)))))
+    (let ((invoked-git-root-dir (magit-get-top-dir default-directory)))
+      (let ((save-this-buffer
+             (and
+              invoked-git-root-dir
+              (eq 0
+                  (string-match
+                   (regexp-quote invoked-git-root-dir)
+                   current-buf-dir)))))
+        save-this-buffer))))
+
+;;;###autoload
+(defun magit-status (dir)
+  (interactive (list (or (and (not current-prefix-arg)
+			      (magit-get-top-dir default-directory))
+			 (magit-read-top-dir (and (consp current-prefix-arg)
+						  (> (car current-prefix-arg) 4))))))
+  (magit-save-some-buffers)
+  (let ((topdir (magit-get-top-dir dir)))
+    (unless topdir
+      (when (y-or-n-p (format "There is no Git repository in %S.  Create one? "
+			      dir))
+	(magit-init dir)
+	(setq topdir (magit-get-top-dir dir))))
+    (when topdir
+      (let ((buf (or (magit-find-buffer 'status topdir)
+		     (generate-new-buffer
+		      (concat "*magit: "
+			      (file-name-nondirectory
+			       (directory-file-name topdir)) "*")))))
+        (pop-to-buffer buf)
+        (magit-mode-init topdir 'status #'magit-refresh-status)
+        (magit-status-mode t)))))
+
+(magit-define-command automatic-merge (revision)
+  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
+\('git merge REVISION')."
+  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
+  (if revision
+      (magit-run-git "merge" (magit-rev-to-git revision))))
+
+;;; Staging and Unstaging
+
+(defun magit-stage-item (&optional ask)
+  "Add the item at point to the staging area.
+If ASK is set, ask for the file name rather than picking the one
+at point."
+  (interactive "P")
+  (if ask
+      (magit-run-git "add" (read-file-name "File to stage: "))
+    (magit-section-action (item info "stage")
+      ((untracked file)
+       (magit-run-git "add" info))
+      ((untracked)
+       (apply #'magit-run-git "add" "--"
+              (magit-git-lines "ls-files" "--other" "--exclude-standard")))
+      ((unstaged diff hunk)
+       (if (magit-hunk-item-is-conflict-p item)
+           (error (concat "Can't stage individual resolution hunks.  "
+                          "Please stage the whole file.")))
+       (magit-apply-hunk-item item "--cached"))
+      ((unstaged diff)
+       (magit-run-git "add" "-u" (magit-diff-item-file item)))
+      ((staged *)
+       (error "Already staged"))
+      ((hunk)
+       (error "Can't stage this hunk"))
+      ((diff)
+       (error "Can't stage this diff")))))
+
+(defun magit-unstage-item ()
+  "Remove the item at point from the staging area."
+  (interactive)
+  (magit-section-action (item info "unstage")
+    ((staged diff hunk)
+     (magit-apply-hunk-item-reverse item "--cached"))
+    ((staged diff)
+     (if (eq (car info) 'unmerged)
+	 (error "Can't unstage a unmerged file.  Resolve it first"))
+     (if (magit-no-commit-p)
+     	 (magit-run-git "rm" "--cached" "--" (magit-diff-item-file item))
+         (magit-run-git "reset" "-q" "HEAD" "--" (magit-diff-item-file item))))
+    ((unstaged *)
+     (error "Already unstaged"))
+    ((hunk)
+     (error "Can't unstage this hunk"))
+    ((diff)
+     (error "Can't unstage this diff"))))
+
+(defun magit-stage-all (&optional also-untracked-p)
+  "Add all remaining changes in tracked files to staging area.
+With prefix argument, add remaining untracked files as well.
+\('git add -u .' or 'git add .', respectively)."
+  (interactive "P")
+  (if also-untracked-p
+      (magit-run-git "add" ".")
+    (magit-run-git "add" "-u" ".")))
+
+(defun magit-unstage-all ()
+  "Remove all changes from staging area.
+\('git reset --mixed HEAD')."
+  (interactive)
+  (magit-run-git "reset" "HEAD"))
+
+;;; Branches
+
+(defun magit-get-tracking-name (remote branch)
+  "Given a REMOTE and a BRANCH name, ask the user for a local
+tracking brach name suggesting a sensible default."
+  (when (yes-or-no-p
+         (format "Create local tracking branch for %s? " branch))
+    (let* ((default-name (concat remote
+                                 "-"
+                                 (replace-regexp-in-string "[/]" "-" branch)))
+           (chosen-name (read-string (format "Call local branch (%s): " default-name)
+                                     nil
+                                     nil
+                                     default-name)))
+      (when (magit-ref-exists-p (concat "refs/heads/" chosen-name))
+        (error "'%s' already exists." chosen-name))
+      chosen-name)))
+
+(defun magit-maybe-create-local-tracking-branch (rev)
+  "Depending on the users wishes, create a tracking branch for
+rev... maybe."
+  (if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
+      (let* ((remote (match-string 1 rev))
+             (branch (match-string 2 rev))
+             (tracker-name (magit-get-tracking-name remote branch)))
+        (when tracker-name
+          (magit-run-git "checkout" "-b" tracker-name rev)
+          t))
+    nil))
+
+(magit-define-command checkout (revision)
+  "Switch 'HEAD' to REVISION and update working tree.
+Fails if working tree or staging area contain uncommitted changes.
+If REVISION is a remote branch, offer to create a local tracking branch.
+\('git checkout [-b] REVISION')."
+  (interactive
+   (list (let ((current-branch (magit-get-current-branch))
+               (default (magit-default-rev)))
+           (magit-read-rev "Switch to"
+                           (unless (string= current-branch default)
+                             default)
+                           (if current-branch
+                               (cons (concat "refs/heads/" current-branch "$")
+                                     magit-uninteresting-refs)
+                             magit-uninteresting-refs)))))
+  (if revision
+      (when (not (magit-maybe-create-local-tracking-branch revision))
+	(magit-save-some-buffers)
+	(magit-run-git "checkout" (magit-rev-to-git revision))
+	(magit-update-vc-modeline default-directory))))
+
+(defun magit-read-create-branch-args ()
+  (let* ((cur-branch (magit-get-current-branch))
+	 (branch (read-string "Create branch: "))
+	 (parent (magit-read-rev "Parent" cur-branch)))
+    (list branch parent)))
+
+(magit-define-command create-branch (branch parent)
+  "Switch 'HEAD' to new BRANCH at revision PARENT and update working tree.
+Fails if working tree or staging area contain uncommitted changes.
+\('git checkout -b BRANCH REVISION')."
+  (interactive (magit-read-create-branch-args))
+  (when (and branch (not (string= branch ""))
+	     parent)
+    (magit-save-some-buffers)
+    (magit-run-git "checkout" "-b"
+		   branch
+		   (append
+		    magit-custom-options
+		    (magit-rev-to-git parent)))
+    (magit-update-vc-modeline default-directory)))
+
+(defun magit-delete-branch (branch)
+  "Asks for a branch and deletes it.
+If the branch is the current one, offers to switch to `master' first.
+\('git branch -d BRANCH')."
+  (interactive (list (magit-read-rev "Branch to delete" (magit-default-rev))))
+  (when (and branch (string= branch (magit-get-current-branch)))
+    (if (y-or-n-p "Cannot delete current branch. Switch to master first? ")
+	(magit-checkout "master")
+      (setq branch nil)))
+  (when branch
+    (magit-run-git "branch" "-d" (append magit-custom-options
+					 (magit-rev-to-git branch)))))
+
+(defun magit-move-branch (old new)
+  "Renames or moves a branch.
+If the branch is the current one, offers to switch to `master' first.
+\('git branch -m OLD NEW')."
+  (interactive (list (magit-read-rev "Old name" (magit-default-rev))
+		     (magit-read-rev "New name" (magit-default-rev))))
+  (magit-run-git "branch" "-m" (magit-rev-to-git old) new))
+
+;;; Merging
+
+(defun magit-guess-branch ()
+  (magit-section-case (item info)
+    ((wazzup commit)
+     (magit-section-info (magit-section-parent item)))
+    ((commit) (magit-name-rev (substring info 0 8)))
+    ((wazzup) info)))
+
+(defun magit-merge (revision)
+  "Merge REVISION into the current 'HEAD'; leave changes uncommitted.
+With a prefix-arg, the merge will be squashed.
+\('git merge --no-commit [--squash|--no-ff] REVISION')."
+  (interactive
+   (list (magit-read-rev "Merge" (magit-default-rev))))
+  (if revision
+      (apply 'magit-run-git
+             "merge"
+             (magit-rev-to-git revision)
+             magit-custom-options)))
+
+;;; Rebasing
+
+(defun magit-rebase-info ()
+  "Returns a list indicating the state of an in-progress rebase,
+if any."
+  (cond ((file-exists-p ".git/rebase-merge")
+         (list
+          ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
+          (magit-name-rev (car (magit-file-lines ".git/rebase-merge/onto")))
+
+          ;; How many commits we've gone through
+          (length (magit-file-lines ".git/rebase-merge/done"))
+
+          ;; How many commits we have in total, without the comments
+          ;; at the end of git-rebase-todo.backup
+          (let ((todo-lines-with-comments (magit-file-lines ".git/rebase-merge/git-rebase-todo.backup")))
+            (loop for i in todo-lines-with-comments
+                  until (string= "" i)
+                  count i))))
+        ((and (file-exists-p ".git/rebase-apply")
+              (file-exists-p ".git/rebase-apply/onto"))
+         ;; we might be here because a non-interactive rebase failed: the
+         ;; patches didn't apply cleanly
+         (list
+          ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
+          (magit-name-rev (car (magit-file-lines ".git/rebase-apply/onto")))
+
+          ;; How many commits we've gone through
+          (- (string-to-number (car (magit-file-lines ".git/rebase-apply/next"))) 1)
+
+          ;; How many commits we have in total
+          (string-to-number (car (magit-file-lines ".git/rebase-apply/last")))
+          ))
+        (t nil)))
+
+(defun magit-rebase-step ()
+  (interactive)
+  (let ((info (magit-rebase-info)))
+    (if (not info)
+	(let* ((current-branch (magit-get-current-branch))
+               (remote (when current-branch
+                         (magit-get "branch" current-branch "remote")))
+               (remote-branch (when remote
+                                (magit-get "branch" current-branch "merge")))
+               (rev (magit-read-rev "Rebase to"
+                                    (when (and remote-branch
+                                               (string-match "refs/heads/\\(.*\\)" remote-branch))
+                                      (concat (match-string 1 remote-branch)
+                                              " (" remote ")"))
+                                    (if current-branch
+                                        (cons (concat "refs/heads/" current-branch)
+                                              magit-uninteresting-refs)
+                                      magit-uninteresting-refs))))
+	  (if rev
+	      (magit-run-git "rebase" (magit-rev-to-git rev))))
+      (let ((cursor-in-echo-area t)
+            (message-log-max nil))
+        (message "Rebase in progress. [A]bort, [S]kip, or [C]ontinue? ")
+        (let ((reply (read-event)))
+          (case reply
+            ((?A ?a)
+             (magit-run-git-async "rebase" "--abort"))
+            ((?S ?s)
+             (magit-run-git-async "rebase" "--skip"))
+            ((?C ?c)
+             (magit-run-git-async "rebase" "--continue"))))))))
+
+;;; Resetting
+
+(magit-define-command reset-head (revision &optional hard)
+  "Switch 'HEAD' to REVISION, keeping prior working tree and staging area.
+Any differences from REVISION become new changes to be committed.
+With prefix argument, all uncommitted changes in working tree
+and staging area are lost.
+\('git reset [--soft|--hard] REVISION')."
+  (interactive (list (magit-read-rev (format "%s head to"
+					     (if current-prefix-arg
+						 "Hard reset"
+					       "Reset"))
+				     (or (magit-default-rev)
+					 "HEAD^"))
+		     current-prefix-arg))
+  (when revision
+    (magit-run-git "reset" (if hard "--hard" "--soft")
+		   (magit-rev-to-git revision))
+    (magit-update-vc-modeline default-directory)))
+
+(magit-define-command reset-head-hard (revision)
+  "Switch 'HEAD' to REVISION, losing all changes.
+Uncomitted changes in both working tree and staging area are lost.
+\('git reset --hard REVISION')."
+  (interactive (list (magit-read-rev (format "Hard reset head to")
+				     (or (magit-default-rev)
+					 "HEAD"))))
+  (magit-reset-head revision t))
+
+(magit-define-command reset-working-tree ()
+  "Revert working tree and clear changes from staging area.
+\('git reset --hard HEAD')."
+  (interactive)
+  (when (yes-or-no-p "Discard all uncommitted changes? ")
+    (magit-reset-head-hard "HEAD")))
+
+;;; Rewriting
+
+(defun magit-read-rewrite-info ()
+  (when (file-exists-p ".git/magit-rewrite-info")
+    (with-temp-buffer
+      (insert-file-contents ".git/magit-rewrite-info")
+      (goto-char (point-min))
+      (read (current-buffer)))))
+
+(defun magit-write-rewrite-info (info)
+  (with-temp-file ".git/magit-rewrite-info"
+    (prin1 info (current-buffer))
+    (princ "\n" (current-buffer))))
+
+(magit-define-inserter pending-commits ()
+  (let* ((info (magit-read-rewrite-info))
+	 (pending (cdr (assq 'pending info))))
+    (when pending
+      (magit-with-section 'pending nil
+	(insert (propertize "Pending commits:\n"
+			    'face 'magit-section-title))
+	(dolist (p pending)
+	  (let* ((commit (car p))
+		 (properties (cdr p))
+		 (used (plist-get properties 'used)))
+	    (magit-with-section commit 'commit
+	      (magit-set-section-info commit)
+	      (insert (magit-git-string
+		       "log" "--max-count=1"
+		       (if used
+			   "--pretty=format:. %s"
+			 "--pretty=format:* %s")
+		       commit "--")
+		      "\n")))))
+      (insert "\n"))))
+
+(defun magit-rewrite-set-commit-property (commit prop value)
+  (let* ((info (magit-read-rewrite-info))
+	 (pending (cdr (assq 'pending info)))
+	 (p (assoc commit pending)))
+    (when p
+      (setf (cdr p) (plist-put (cdr p) prop value))
+      (magit-write-rewrite-info info)
+      (magit-need-refresh))))
+
+(defun magit-rewrite-set-used ()
+  (interactive)
+  (magit-section-action (item info)
+    ((pending commit)
+     (magit-rewrite-set-commit-property info 'used t))))
+
+(defun magit-rewrite-set-unused ()
+  (interactive)
+  (magit-section-action (item info)
+    ((pending commit)
+     (magit-rewrite-set-commit-property info 'used nil))))
+
+(magit-define-inserter pending-changes ()
+  (let* ((info (magit-read-rewrite-info))
+	 (orig (cadr (assq 'orig info))))
+    (when orig
+      (let ((magit-hide-diffs t))
+	(magit-git-section 'pending-changes
+			   "Pending changes"
+			   'magit-wash-diffs
+			   "diff" (magit-diff-U-arg) "-R" orig)))))
+
+(defun magit-rewrite-start (from &optional onto)
+  (interactive (list (magit-read-rev "Rewrite from" (magit-default-rev))))
+  (or (magit-everything-clean-p)
+      (error "You have uncommitted changes"))
+  (or (not (magit-read-rewrite-info))
+      (error "Rewrite in progress"))
+  (let* ((orig (magit-rev-parse "HEAD"))
+	 (base (or (car (magit-commit-parents from))
+		   (error "Can't rewrite a commit without a parent, sorry")))
+	 (pending (magit-git-lines "rev-list" (concat base ".."))))
+    (magit-write-rewrite-info `((orig ,orig)
+				(pending ,@(mapcar #'list pending))))
+    (magit-run-git "reset" "--hard" base)))
+
+(defun magit-rewrite-stop (&optional noconfirm)
+  (interactive)
+  (let* ((info (magit-read-rewrite-info)))
+    (or info
+	(error "No rewrite in progress"))
+    (when (or noconfirm
+	      (yes-or-no-p "Stop rewrite? "))
+      (magit-write-rewrite-info nil)
+      (magit-refresh))))
+
+(defun magit-rewrite-abort ()
+  (interactive)
+  (let* ((info (magit-read-rewrite-info))
+	 (orig (cadr (assq 'orig info))))
+    (or info
+	(error "No rewrite in progress"))
+    (or (magit-everything-clean-p)
+	(error "You have uncommitted changes"))
+    (when (yes-or-no-p "Abort rewrite? ")
+      (magit-write-rewrite-info nil)
+      (magit-run-git "reset" "--hard" orig))))
+
+(defun magit-rewrite-finish ()
+  (interactive)
+  (magit-with-refresh
+    (magit-rewrite-finish-step t)))
+
+(defun magit-rewrite-finish-step (first-p)
+  (let ((info (magit-read-rewrite-info)))
+    (or info
+	(error "No rewrite in progress"))
+    (let* ((pending (cdr (assq 'pending info)))
+	   (first-unused
+	    (let ((rpend (reverse pending)))
+	      (while (and rpend (plist-get (cdr (car rpend)) 'used))
+		(setq rpend (cdr rpend)))
+	      (car rpend)))
+	   (commit (car first-unused)))
+      (cond ((not first-unused)
+	     (magit-rewrite-stop t))
+	    ((magit-apply-commit commit t (not first-p))
+	     (magit-rewrite-set-commit-property commit 'used t)
+	     (magit-rewrite-finish-step nil))))))
+
+;;; Updating, pull, and push
+
+(magit-define-command fetch ()
+  "Run fetch."
+  (interactive)
+  (magit-run-git-async "fetch" (magit-read-remote)))
+
+(magit-define-command fetch-current ()
+  "Run fetch."
+  (interactive)
+  (magit-run-git-async "fetch"))
+
+(magit-define-command remote-update ()
+  "Update all remotes."
+  (interactive)
+  (magit-run-git-async "remote" "update"))
+
+(magit-define-command pull ()
+  "Run git pull against the current remote."
+  (interactive)
+  (let* ((branch (magit-get-current-branch))
+	 (config-branch (and branch (magit-get "branch" branch "merge")))
+	 (merge-branch (or (and config-branch (not current-prefix-arg))
+			   (magit-read-rev (format "Pull from")))))
+    (if (and branch (not config-branch))
+	(magit-set merge-branch "branch" branch "merge"))
+    (apply 'magit-run-git-async "pull" "-v" magit-custom-options)))
+
+(eval-when-compile (require 'pcomplete))
+
+(defun magit-shell-command (command)
+  "Perform arbitrary shell COMMAND."
+  (interactive "sCommand: ")
+  (require 'pcomplete)
+  (let ((args (car (with-temp-buffer
+		     (insert command)
+		     (pcomplete-parse-buffer-arguments))))
+	(magit-process-popup-time 0))
+    (magit-run* args nil nil nil t)))
+
+(defun magit-git-command (command)
+  "Perform arbitrary Git COMMAND.
+
+Similar to `magit-shell-command', but involves slightly less
+typing and automatically refreshes the status buffer."
+  (interactive "sRun git like this: ")
+  (require 'pcomplete)
+  (let ((args (car (with-temp-buffer
+		     (insert command)
+		     (pcomplete-parse-buffer-arguments))))
+	(magit-process-popup-time 0))
+    (magit-with-refresh
+      (magit-run* (append (cons magit-git-executable
+                                magit-git-standard-options)
+                          args)
+                  nil nil nil t))))
+
+(magit-define-command push-tags ()
+  "Push tags."
+  (interactive)
+  (magit-run-git-async "push" "--tags"))
+
+(magit-define-command push ()
+  (interactive)
+  (let* ((branch (or (magit-get-current-branch)
+		     (error "Don't push a detached head.  That's gross")))
+	 (branch-remote (magit-get-remote branch))
+	 (push-remote (if (or current-prefix-arg
+			      (not branch-remote))
+			  (magit-read-remote (format "Push %s to: " branch)
+					     branch-remote)
+			branch-remote))
+	 (ref-branch (magit-get "branch" branch "merge")))
+    (if (and (not branch-remote)
+	     (not current-prefix-arg))
+	(magit-set push-remote "branch" branch "remote"))
+    (apply 'magit-run-git-async "push" "-v" push-remote
+           (if ref-branch
+               (format "%s:%s" branch ref-branch)
+             branch)
+           magit-custom-options)
+    ;; Although git will automatically set up the remote,
+    ;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1),
+    ;; so we have to do that manually.
+    (unless ref-branch
+      (magit-set (concat "refs/heads/" branch) "branch" branch "merge"))))
+
+;;; Log edit mode
+
+(defvar magit-log-edit-mode-hook nil
+  "Hook run by `magit-log-edit-mode'.")
+
+(defvar magit-log-edit-buffer-name "*magit-edit-log*"
+  "Buffer name for composing commit messages.")
+
+(defvar magit-log-edit-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-c") 'magit-log-edit-commit)
+    (define-key map (kbd "C-c C-a") 'magit-log-edit-toggle-amending)
+    (define-key map (kbd "C-c C-s") 'magit-log-edit-toggle-signoff)
+    (define-key map (kbd "C-c C-e") 'magit-log-edit-toggle-allow-empty)
+    (define-key map (kbd "M-p") 'log-edit-previous-comment)
+    (define-key map (kbd "M-n") 'log-edit-next-comment)
+    (define-key map (kbd "C-c C-k") 'magit-log-edit-cancel-log-message)
+    (define-key map (kbd "C-c C-]") 'magit-log-edit-cancel-log-message)
+    (define-key map (kbd "C-x C-s") (lambda ()
+				      (interactive)
+				      (message "Not saved. Use C-c C-c to finalize this commit message.")))
+    map))
+
+(defvar magit-pre-log-edit-window-configuration nil)
+
+(defun magit-log-fill-paragraph (&optional justify)
+  "Fill the paragraph, but preserve open parentheses at beginning of lines.
+Prefix arg means justify as well."
+  (interactive "P")
+  ;; Add lines starting with a left paren or an asterisk.
+  (let ((paragraph-start (concat paragraph-start "\\|*\\|(")))
+    (let ((end (progn (forward-paragraph) (point)))
+	  (beg (progn (backward-paragraph) (point)))
+	  (adaptive-fill-mode nil))
+      (fill-region beg end justify)
+      t)))
+
+(define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit"
+  (set (make-local-variable 'fill-paragraph-function)
+       'magit-log-fill-paragraph))
+
+(defun magit-log-edit-cleanup ()
+  (save-excursion
+    (goto-char (point-min))
+    (flush-lines "^#")
+    (goto-char (point-min))
+    (if (re-search-forward "[ \t\n]*\\'" nil t)
+	(replace-match "\n" nil nil))))
+
+(defun magit-log-edit-append (str)
+  (with-current-buffer (get-buffer-create magit-log-edit-buffer-name)
+    (goto-char (point-max))
+    (insert str "\n")))
+
+(defconst magit-log-header-end "-- End of Magit header --\n")
+
+(defun magit-log-edit-get-fields ()
+  (let ((buf (get-buffer magit-log-edit-buffer-name))
+	(result nil))
+    (if buf
+	(with-current-buffer buf
+	  (goto-char (point-min))
+	  (while (looking-at "^\\([A-Za-z0-9-_]+\\): *\\(.*\\)$")
+	    (setq result (acons (intern (downcase (match-string 1)))
+				(match-string 2)
+				result))
+	    (forward-line))
+	  (if (not (looking-at (regexp-quote magit-log-header-end)))
+	      (setq result nil))))
+    (nreverse result)))
+
+(defun magit-log-edit-set-fields (fields)
+  (let ((buf (get-buffer-create magit-log-edit-buffer-name)))
+    (with-current-buffer buf
+      (goto-char (point-min))
+      (if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)*%s"
+					 (regexp-quote magit-log-header-end))
+				 nil t)
+	  (delete-region (match-beginning 0) (match-end 0)))
+      (goto-char (point-min))
+      (when fields
+	(while fields
+	  (insert (capitalize (symbol-name (caar fields))) ": "
+		  (cdar fields) "\n")
+	  (setq fields (cdr fields)))
+	(insert magit-log-header-end)))))
+
+(defun magit-log-edit-set-field (name value)
+  (let* ((fields (magit-log-edit-get-fields))
+	 (cell (assq name fields)))
+    (cond (cell
+	   (if value
+	       (rplacd cell value)
+	     (setq fields (delq cell fields))))
+	  (t
+	   (if value
+	       (setq fields (append fields (list (cons name value)))))))
+    (magit-log-edit-set-fields fields)))
+
+(defun magit-log-edit-get-field (name)
+  (cdr (assq name (magit-log-edit-get-fields))))
+
+(defun magit-log-edit-toggle-field (name default)
+  "Toggle the log-edit field named NAME.
+If it's currently unset, set it to DEFAULT (t or nil).
+
+Return nil if the field is toggled off, and non-nil if it's
+toggled on.  When it's toggled on for the first time, return
+'first."
+  (let* ((fields (magit-log-edit-get-fields))
+	 (cell (assq name fields)) yesp)
+    (if cell
+        (progn
+          (setq yesp (equal (cdr cell) "yes"))
+          (rplacd cell (if yesp "no" "yes")))
+      (setq fields (acons name (if default "yes" "no") fields))
+      (setq yesp (if default 'first)))
+    (magit-log-edit-set-fields fields)
+    yesp))
+
+(defun magit-log-edit-setup-author-env (author)
+  (cond (author
+	 ;; XXX - this is a bit strict, probably.
+	 (or (string-match "\\(.*\\) <\\(.*\\)>" author)
+	     (error "Can't parse author string"))
+	 ;; Shucks, setenv destroys the match data.
+	 (let ((name (match-string 1 author))
+	       (email (match-string 2 author))
+	       (date  (match-string 3 author)))
+	   (setenv "GIT_AUTHOR_NAME" name)
+	   (setenv "GIT_AUTHOR_EMAIL" email)
+	   (setenv "GIT_AUTHOR_DATE" date)))
+	(t
+	 (setenv "GIT_AUTHOR_NAME")
+	 (setenv "GIT_AUTHOR_EMAIL")
+	 (setenv "GIT_AUTHOR_DATE"))))
+
+(defun magit-log-edit-push-to-comment-ring (comment)
+  (when (or (ring-empty-p log-edit-comment-ring)
+	    (not (equal comment (ring-ref log-edit-comment-ring 0))))
+    (ring-insert log-edit-comment-ring comment)))
+
+(defun magit-log-edit-commit ()
+  "Finish edits and create new commit object.
+\('git commit ...')"
+  (interactive)
+  (let* ((fields (magit-log-edit-get-fields))
+	 (amend (equal (cdr (assq 'amend fields)) "yes"))
+	 (allow-empty (equal (cdr (assq 'allow-empty fields)) "yes"))
+	 (commit-all (equal (cdr (assq 'commit-all fields)) "yes"))
+	 (sign-off-field (assq 'sign-off fields))
+	 (sign-off (if sign-off-field
+		       (equal (cdr sign-off-field) "yes")
+		     magit-commit-signoff))
+	 (tag-rev (cdr (assq 'tag-rev fields)))
+	 (tag-name (cdr (assq 'tag-name fields)))
+	 (author (cdr (assq 'author fields))))
+    (magit-log-edit-push-to-comment-ring (buffer-string))
+    (magit-log-edit-setup-author-env author)
+    (magit-log-edit-set-fields nil)
+    (magit-log-edit-cleanup)
+    (if (= (buffer-size) 0)
+	(insert "(Empty description)\n"))
+    (let ((commit-buf (current-buffer)))
+      (with-current-buffer (magit-find-buffer 'status default-directory)
+	(cond (tag-name
+	       (magit-run-git-with-input commit-buf "tag" tag-name "-a" "-F" "-" tag-rev))
+	      ((or (not (or allow-empty commit-all amend (magit-anything-staged-p)))
+		   (not (or allow-empty (not commit-all) amend (not (magit-everything-clean-p)))))
+	       (error "Refusing to create empty commit. Maybe you want to amend or allow-empty?"))
+	      (t
+	       (apply #'magit-run-async-with-input commit-buf
+		      magit-git-executable
+		      (append magit-git-standard-options
+			      (list "commit" "-F" "-")
+			      (if (and commit-all (not allow-empty)) '("--all") '())
+			      (if amend '("--amend") '())
+			      (if allow-empty '("--allow-empty"))
+			      (if sign-off '("--signoff") '())))))))
+    (erase-buffer)
+    (bury-buffer)
+    (when (file-exists-p ".git/MERGE_MSG")
+      (delete-file ".git/MERGE_MSG"))
+    (magit-update-vc-modeline default-directory)
+    (when magit-pre-log-edit-window-configuration
+      (set-window-configuration magit-pre-log-edit-window-configuration)
+      (setq magit-pre-log-edit-window-configuration nil))))
+
+(defun magit-log-edit-cancel-log-message ()
+  "Abort edits and erase commit message being composed."
+  (interactive)
+  (when (or (not magit-log-edit-confirm-cancellation)
+	    (yes-or-no-p
+	     "Really cancel editing the log (any changes will be lost)?"))
+    (erase-buffer)
+    (bury-buffer)
+    (when magit-pre-log-edit-window-configuration
+      (set-window-configuration magit-pre-log-edit-window-configuration)
+      (setq magit-pre-log-edit-window-configuration nil))))
+
+(defun magit-log-edit-toggle-amending ()
+  "Toggle whether this will be an amendment to the previous commit.
+\(i.e., whether eventual commit does 'git commit --amend')"
+  (interactive)
+  (when (eq (magit-log-edit-toggle-field 'amend t) 'first)
+    (magit-log-edit-append
+     (magit-format-commit "HEAD" "%s%n%n%b"))))
+
+(defun magit-log-edit-toggle-signoff ()
+  "Toggle whether this commit will include a signoff.
+\(i.e., whether eventual commit does 'git commit --signoff')"
+  (interactive)
+  (magit-log-edit-toggle-field 'sign-off (not magit-commit-signoff)))
+
+(defun magit-log-edit-toggle-allow-empty ()
+  "Toggle whether this commit is allowed to be empty.
+This means that the eventual commit does 'git commit --allow-empty'."
+  (interactive)
+  (magit-log-edit-toggle-field 'allow-empty t))
+
+(defun magit-pop-to-log-edit (operation)
+  (let ((dir default-directory)
+	(buf (get-buffer-create magit-log-edit-buffer-name)))
+    (setq magit-pre-log-edit-window-configuration
+	  (current-window-configuration))
+    (pop-to-buffer buf)
+    (when (file-exists-p ".git/MERGE_MSG")
+      (insert-file-contents ".git/MERGE_MSG"))
+    (setq default-directory dir)
+    (magit-log-edit-mode)
+    (message "Type C-c C-c to %s (C-c C-k to cancel)." operation)))
+
+(defun magit-log-edit (amend-p)
+  "Brings up a buffer to allow editing of commit messages. Given
+a prefix arg will set the amend flag for the commit buffer.
+
+If there is a rebase in progress offer the user the option to
+continue it.
+
+\\{magit-log-edit-mode-map}"
+  (interactive "P")
+  (cond ((magit-rebase-info)
+	 (if (y-or-n-p "Rebase in progress.  Continue it? ")
+	     (magit-run-git "rebase" "--continue")))
+	(t
+	 (when (and magit-commit-all-when-nothing-staged
+		    (not (magit-anything-staged-p)))
+	   (cond ((eq magit-commit-all-when-nothing-staged 'ask-stage)
+		  (if (and (not (magit-everything-clean-p))
+			   (y-or-n-p "Nothing staged.  Stage everything now? "))
+		      (magit-stage-all)))
+		 ((not (magit-log-edit-get-field 'commit-all))
+		  (magit-log-edit-set-field
+		   'commit-all
+		   (if (or (eq magit-commit-all-when-nothing-staged t)
+			   (y-or-n-p
+			    "Nothing staged.  Commit all unstaged changes? "))
+		       "yes" "no")))))
+	 (when amend-p (magit-log-edit-toggle-amending))
+	 (magit-pop-to-log-edit "commit"))))
+
+(defun magit-add-log ()
+  (interactive)
+  (cond ((magit-rebase-info)
+	 (if (y-or-n-p "Rebase in progress.  Continue it? ")
+	     (magit-run-git "rebase" "--continue")))
+	(t
+	 (let ((section (magit-current-section)))
+	   (let ((fun (if (eq (magit-section-type section) 'hunk)
+			  (save-window-excursion
+			    (save-excursion
+			      (magit-visit-item)
+			      (add-log-current-defun)))
+			nil))
+		 (file (magit-diff-item-file
+			(cond ((eq (magit-section-type section) 'hunk)
+			       (magit-hunk-item-diff section))
+			      ((eq (magit-section-type section) 'diff)
+			       section)
+			      (t
+			       (error "No change at point"))))))
+	     (magit-log-edit nil)
+	     (goto-char (point-min))
+	     (cond ((not (search-forward-regexp
+			  (format "^\\* %s" (regexp-quote file)) nil t))
+		    ;; No entry for file, create it.
+		    (goto-char (point-max))
+		    (insert (format "\n* %s" file))
+		    (if fun
+			(insert (format " (%s)" fun)))
+		    (insert ": "))
+		   (fun
+		    ;; found entry for file, look for fun
+		    (let ((limit (or (save-excursion
+				       (and (search-forward-regexp "^\\* "
+								   nil t)
+					    (match-beginning 0)))
+				     (point-max))))
+		      (cond ((search-forward-regexp (format "(.*\\<%s\\>.*):"
+							    (regexp-quote fun))
+						    limit t)
+			     ;; found it, goto end of current entry
+			     (if (search-forward-regexp "^(" limit t)
+				 (backward-char 2)
+			       (goto-char limit)))
+			    (t
+			     ;; not found, insert new entry
+			     (goto-char limit)
+			     (if (bolp)
+				 (open-line 1)
+			       (newline))
+			     (insert (format "(%s): " fun))))))))))))
+
+;;; Tags
+
+(magit-define-command tag (name rev)
+  "Create a new lightweight tag with the given NAME at REV.
+\('git tag NAME')."
+  (interactive
+   (list
+    (read-string "Tag name: ")
+    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
+  (magit-run-git "tag" name rev))
+
+(magit-define-command annotated-tag (name rev)
+  "Start composing an annotated tag with the given NAME.
+Tag will point to the current 'HEAD'."
+  (interactive
+   (list
+    (read-string "Tag name: ")
+    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
+  (magit-log-edit-set-field 'tag-name name)
+  (magit-log-edit-set-field 'tag-rev rev)
+  (magit-pop-to-log-edit "tag"))
+
+;;; Stashing
+
+(defun magit-wash-stash ()
+  (if (search-forward-regexp "stash@{\\(.*?\\)}" (line-end-position) t)
+      (let ((stash (match-string-no-properties 0))
+	    (name (match-string-no-properties 1)))
+	(delete-region (match-beginning 0) (match-end 0))
+	(goto-char (match-beginning 0))
+	(fixup-whitespace)
+	(goto-char (line-beginning-position))
+	(insert name)
+	(goto-char (line-beginning-position))
+	(magit-with-section stash 'stash
+	  (magit-set-section-info stash)
+	  (forward-line)))
+      (forward-line))
+  t)
+
+(defun magit-wash-stashes ()
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-wash-stash)))
+
+(magit-define-inserter stashes ()
+  (magit-git-section 'stashes
+		     "Stashes:" 'magit-wash-stashes
+		     "stash" "list"))
+
+(magit-define-command stash (description)
+  "Create new stash of working tree and staging area named DESCRIPTION.
+Working tree and staging area revert to the current 'HEAD'.
+With prefix argument, changes in staging area are kept.
+\('git stash save [--keep-index] DESCRIPTION')"
+  (interactive "sStash description: ")
+  (apply 'magit-run-git `("stash" "save" ,@magit-custom-options "--" ,description)))
+
+(magit-define-command stash-snapshot ()
+  "Create new stash of working tree and staging area; keep changes in place.
+\('git stash save \"Snapshot...\"; git stash apply stash@{0}')"
+  (interactive)
+  (magit-with-refresh
+    (magit-run-git "stash" "save"
+		   (format-time-string "Snapshot taken at %Y-%m-%d %H:%M:%S"
+				       (current-time)))
+    (magit-run-git "stash" "apply" "stash@{0}")))
+
+(defvar magit-currently-shown-stash nil)
+
+(define-minor-mode magit-stash-mode
+    "Minor mode for looking at a git stash.
+
+\\{magit-stash-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-stash-mode-map)
+
+(defvar magit-stash-buffer-name "*magit-stash*"
+  "Buffer name for displaying a stash.")
+
+(defun magit-show-stash (stash &optional scroll)
+  (when (magit-section-p stash)
+    (setq stash (magit-section-info stash)))
+  (let ((dir default-directory)
+	(buf (get-buffer-create magit-stash-buffer-name))
+        (stash-id (magit-git-string "rev-list" "-1" stash)))
+    (cond ((and (equal magit-currently-shown-stash stash-id)
+                (with-current-buffer buf
+                  (> (length (buffer-string)) 1)))
+           (let ((win (get-buffer-window buf)))
+             (cond ((not win)
+                    (display-buffer buf))
+                   (scroll
+                    (with-selected-window win
+                      (funcall scroll))))))
+          (t
+           (setq magit-currently-shown-stash stash-id)
+           (display-buffer buf)
+           (with-current-buffer buf
+             (set-buffer buf)
+             (goto-char (point-min))
+             (let* ((range (cons (concat stash "^2^") stash))
+                    (args (magit-rev-range-to-git range)))
+               (magit-mode-init dir 'diff #'magit-refresh-diff-buffer
+                                range args)
+               (magit-stash-mode t)))))))
+
+;;; Commits
+
+(defun magit-commit-at-point (&optional nil-ok-p)
+  (let* ((section (magit-current-section))
+         (commit (or (and (not section)                          ; Places without a magit-section
+                          (get-text-property (point) 'revision)) ; but with a text property 'revision
+                     (and (eq (magit-section-type section) 'commit)
+                          (magit-section-info section)))))
+    (if nil-ok-p
+        commit
+      (or commit
+          (error "No commit at point")))))
+
+(defun magit-apply-commit (commit &optional docommit noerase revert)
+  (let* ((parent-id (magit-choose-parent-id commit "cherry-pick"))
+	 (success (magit-run* `(,magit-git-executable
+				,@magit-git-standard-options
+				,(if revert "revert" "cherry-pick")
+				,@(if parent-id
+				      (list "-m" (number-to-string parent-id)))
+				,@(if (not docommit) (list "--no-commit"))
+				,commit)
+			      nil noerase)))
+    (when (and (not docommit) success)
+      (cond (revert
+	     (magit-log-edit-append
+	      (magit-format-commit commit "Reverting \"%s\"")))
+	    (t
+	     (magit-log-edit-append
+	      (magit-format-commit commit "%s%n%n%b"))
+	     (magit-log-edit-set-field
+	      'author
+	      (magit-format-commit commit "%an <%ae>, %ai")))))
+    success))
+
+(defun magit-apply-item ()
+  (interactive)
+  (magit-section-action (item info "apply")
+    ((pending commit)
+     (magit-apply-commit info)
+     (magit-rewrite-set-commit-property info 'used t))
+    ((commit)
+     (magit-apply-commit info))
+    ((unstaged *)
+     (error "Change is already in your working tree"))
+    ((staged *)
+     (error "Change is already in your working tree"))
+    ((hunk)
+     (magit-apply-hunk-item item))
+    ((diff)
+     (magit-apply-diff-item item))
+    ((stash)
+     (magit-run-git "stash" "apply" info))))
+
+(defun magit-cherry-pick-item ()
+  (interactive)
+  (magit-section-action (item info "cherry-pick")
+    ((pending commit)
+     (magit-apply-commit info t)
+     (magit-rewrite-set-commit-property info 'used t))
+    ((commit)
+     (magit-apply-commit info t))
+    ((stash)
+     (magit-run-git "stash" "pop" info))))
+
+(defmacro magit-with-revert-confirmation (&rest body)
+  `(when (or (not magit-revert-item-confirm)
+             (yes-or-no-p "Really revert this item? "))
+     ,@body))
+
+(defun magit-revert-item ()
+  (interactive)
+  (magit-section-action (item info "revert")
+    ((pending commit)
+     (magit-with-revert-confirmation
+      (magit-apply-commit info nil nil t)
+      (magit-rewrite-set-commit-property info 'used nil)))
+    ((commit)
+     (magit-with-revert-confirmation
+      (magit-apply-commit info nil nil t)))
+    ;; Reverting unstaged changes cannot be undone
+    ((unstaged *)
+     (magit-discard-item))
+    ((hunk)
+     (magit-with-revert-confirmation
+      (magit-apply-hunk-item-reverse item)))
+    ((diff)
+     (magit-with-revert-confirmation
+      (magit-apply-diff-item item "--reverse")))))
+
+(defvar magit-have-graph 'unset)
+(defvar magit-have-decorate 'unset)
+(make-variable-buffer-local 'magit-have-graph)
+(put 'magit-have-graph 'permanent-local t)
+(make-variable-buffer-local 'magit-have-decorate)
+(put 'magit-have-decorate 'permanent-local t)
+
+(defun magit-configure-have-graph ()
+  (if (eq magit-have-graph 'unset)
+      (let ((res (magit-git-exit-code "log" "--graph" "--max-count=0")))
+	(setq magit-have-graph (eq res 0)))))
+
+(defun magit-configure-have-decorate ()
+  (if (eq magit-have-decorate 'unset)
+      (let ((res (magit-git-exit-code "log" "--decorate=full" "--max-count=0")))
+	(setq magit-have-decorate (eq res 0)))))
+
+(defun magit-log-show-more-entries (&optional arg)
+  "Grow the number of log entries shown.
+
+With no prefix optional ARG, show twice as much log entries.
+With a numerical prefix ARG, add this number to the number of shown log entries.
+With a non numeric prefix ARG, show all entries"
+  (interactive "P")
+  (make-local-variable 'magit-log-cutoff-length)
+  (cond
+    ((numberp arg)
+     (setq magit-log-cutoff-length (+ magit-log-cutoff-length arg)))
+    (arg
+     (setq magit-log-cutoff-length magit-log-infinite-length))
+    (t (setq magit-log-cutoff-length (* magit-log-cutoff-length 2))))
+  (magit-refresh))
+
+
+(defun magit-refresh-log-buffer (range style args)
+  (magit-configure-have-graph)
+  (magit-configure-have-decorate)
+  (setq magit-current-range range)
+  (magit-create-log-buffer-sections
+    (apply #'magit-git-section nil
+	   (magit-rev-range-describe range "Commits")
+	   'magit-wash-log
+	   `("log"
+	     ,(format "--max-count=%s" magit-log-cutoff-length)
+	     ,style
+	     ,@(if magit-have-decorate (list "--decorate=full"))
+	     ,@(if magit-have-graph (list "--graph"))
+	     ,@args
+	     "--"))))
+
+(define-minor-mode magit-log-mode
+    "Minor mode for looking at git log.
+
+\\{magit-log-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-log-mode-map)
+
+(defvar magit-log-buffer-name "*magit-log*"
+  "Buffer name for display of log entries.")
+(defvar magit-log-grep-buffer-name "*magit-grep-log*"
+  "Buffer name for display of log grep results.")
+
+(magit-define-command display-log-ranged ()
+  (interactive)
+  (magit-display-log t))
+
+(magit-define-command display-log (&optional ask-for-range &rest extra-args)
+  (interactive)
+  (let* ((log-range (if ask-for-range
+                        (magit-read-rev-range "Log" "HEAD")
+                      "HEAD"))
+	 (topdir (magit-get-top-dir default-directory))
+	 (args (nconc (list (magit-rev-range-to-git log-range))
+                      magit-custom-options
+                      extra-args)))
+    (magit-buffer-switch magit-log-buffer-name)
+    (magit-mode-init topdir 'log #'magit-refresh-log-buffer log-range
+		     "--pretty=oneline" args)
+    (magit-log-mode t)))
+
+(magit-define-command log-long-ranged ()
+  (interactive)
+  (magit-log-long t))
+
+(magit-define-command log-long (&optional ranged)
+  (interactive)
+  (let* ((range (if ranged
+		    (magit-read-rev-range "Long log" "HEAD")
+		  "HEAD"))
+	 (topdir (magit-get-top-dir default-directory))
+	 (args (append (list (magit-rev-range-to-git range))
+		       magit-custom-options)))
+    (magit-buffer-switch magit-log-buffer-name)
+    (magit-mode-init topdir 'log #'magit-refresh-log-buffer range
+		     "--stat" args)
+    (magit-log-mode t)))
+
+;;; Reflog
+
+(defvar magit-reflog-head nil
+  "The HEAD of the reflog in the current buffer.
+This is only non-nil in reflog buffers.")
+(make-variable-buffer-local 'magit-reflog-head)
+
+(defun magit-refresh-reflog-buffer (head args)
+  (setq magit-reflog-head head)
+  (magit-create-log-buffer-sections
+    (magit-git-section 'reflog
+		       (format "Local history of head %s" head)
+		       'magit-wash-log
+		       "log" "--walk-reflogs"
+		       (format "--max-count=%s" magit-log-cutoff-length)
+		       "--pretty=format:* %H %s"
+		       args)))
+
+(define-minor-mode magit-reflog-mode
+    "Minor mode for looking at git reflog.
+
+\\{magit-reflog-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-reflog-mode-map)
+
+(magit-define-command reflog (&optional ask-for-range)
+  (interactive)
+  (let ((at (or (if ask-for-range
+                    (magit-read-rev "Reflog of" (or (magit-guess-branch) "HEAD")))
+                "HEAD")))
+    (let* ((topdir (magit-get-top-dir default-directory))
+           (args (magit-rev-to-git at)))
+      (magit-buffer-switch "*magit-reflog*")
+      (magit-mode-init topdir 'reflog
+                       #'magit-refresh-reflog-buffer at args)
+      (magit-reflog-mode t))))
+
+(magit-define-command reflog-ranged ()
+  (interactive)
+  (magit-reflog t))
+
+;;; Diffing
+
+(defun magit-refresh-diff-buffer (range args)
+  (setq magit-current-range range)
+  (magit-create-buffer-sections
+    (magit-git-section 'diffbuf
+		       (magit-rev-range-describe range "Changes")
+		       'magit-wash-diffs
+		       "diff" (magit-diff-U-arg) args)))
+
+(define-minor-mode magit-diff-mode
+    "Minor mode for looking at a git diff.
+
+\\{magit-diff-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-diff-mode-map)
+
+(magit-define-command diff (range)
+  (interactive (list (magit-read-rev-range "Diff")))
+  (if range
+      (let* ((dir default-directory)
+             (args (magit-rev-range-to-git range))
+             (buf (get-buffer-create "*magit-diff*")))
+        (display-buffer buf)
+        (with-current-buffer buf
+          (magit-mode-init dir 'diff #'magit-refresh-diff-buffer range args)
+          (magit-diff-mode t)))))
+
+(magit-define-command diff-working-tree (rev)
+  (interactive (list (magit-read-rev "Diff with" (magit-default-rev))))
+  (magit-diff (or rev "HEAD")))
+
+(defun magit-diff-with-mark ()
+  (interactive)
+  (magit-diff (cons (magit-marked-commit)
+		    (magit-commit-at-point))))
+
+;;; Wazzup
+
+(defvar magit-wazzup-head nil
+  "The integration head for the current wazzup buffer.
+This is only non-nil in wazzup buffers.")
+(make-variable-buffer-local 'magit-wazzup-head)
+
+(defvar magit-wazzup-all-p nil
+  "Non-nil if the current wazzup buffer displays excluded branches.
+This is only meaningful in wazzup buffers.")
+(make-variable-buffer-local 'magit-wazzup-all-p)
+
+(defun magit-wazzup-toggle-ignore (branch edit)
+  (let ((ignore-file ".git/info/wazzup-exclude"))
+    (if edit
+	(setq branch (read-string "Branch to ignore for wazzup: " branch)))
+    (let ((ignored (magit-file-lines ignore-file)))
+      (cond ((member branch ignored)
+	     (when (or (not edit)
+		       (y-or-n-p "Branch %s is already ignored.  Unignore? "))
+	       (setq ignored (delete branch ignored))))
+	    (t
+	     (setq ignored (append ignored (list branch)))))
+      (magit-write-file-lines ignore-file ignored)
+      (magit-need-refresh))))
+
+(defun magit-refresh-wazzup-buffer (head all)
+  (setq magit-wazzup-head head)
+  (setq magit-wazzup-all-p all)
+  (let ((branch-desc (or head "(detached) HEAD")))
+    (unless head (setq head "HEAD"))
+    (magit-create-buffer-sections
+      (magit-with-section 'wazzupbuf nil
+	(insert (format "Wazzup, %s\n\n" branch-desc))
+	(let* ((excluded (magit-file-lines ".git/info/wazzup-exclude"))
+	       (all-branches (magit-list-interesting-refs))
+	       (branches (if all all-branches
+			   (delq nil (mapcar
+				      (lambda (b)
+					(and (not
+					      (member (cdr b) excluded))
+					     b))
+				      all-branches))))
+	       (reported (make-hash-table :test #'equal)))
+	  (dolist (branch branches)
+	    (let* ((name (car branch))
+		   (ref (cdr branch))
+		   (hash (magit-rev-parse ref))
+		   (reported-branch (gethash hash reported)))
+	      (unless (or (and reported-branch
+			       (string= (file-name-nondirectory ref)
+					reported-branch))
+			  (not (magit-git-string "merge-base" head ref)))
+		(puthash hash (file-name-nondirectory ref) reported)
+		(let* ((n (length (magit-git-lines "log" "--pretty=oneline"
+						   (concat head ".." ref))))
+		       (section
+			(let ((magit-section-hidden-default t))
+			  (magit-git-section
+			   (cons ref 'wazzup)
+			   (format "%s unmerged commits in %s%s"
+				   n name
+				   (if (member ref excluded)
+				       " (normally ignored)"
+				     ""))
+			   'magit-wash-log
+			   "log"
+			   (format "--max-count=%s" magit-log-cutoff-length)
+			   "--graph"
+			   "--pretty=oneline"
+			   (format "%s..%s" head ref)
+			   "--"))))
+		  (magit-set-section-info ref section))))))))))
+
+(define-minor-mode magit-wazzup-mode
+    "Minor mode for looking at commits that could be merged from other branches.
+
+\\{magit-wazzup-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-wazzup-mode-map)
+
+(defun magit-wazzup (&optional all)
+  (interactive "P")
+  (let ((topdir (magit-get-top-dir default-directory))
+	(current-branch (magit-get-current-branch)))
+    (magit-buffer-switch "*magit-wazzup*")
+    (magit-mode-init topdir 'wazzup
+		     #'magit-refresh-wazzup-buffer
+		     current-branch all)
+    (magit-wazzup-mode t)))
+
+;;; Miscellaneous
+
+(defun magit-ignore-file (file edit local)
+  (let ((ignore-file (if local ".git/info/exclude" ".gitignore")))
+    (if edit
+	(setq file (read-string "File to ignore: " file)))
+    (with-temp-buffer
+      (when (file-exists-p ignore-file)
+        (insert-file-contents ignore-file))
+      (goto-char (point-max))
+      (unless (bolp)
+	(insert "\n"))
+      (insert "/" file "\n")
+      (write-region nil nil ignore-file))
+    (magit-need-refresh)))
+
+(defun magit-ignore-item ()
+  (interactive)
+  (magit-section-action (item info "ignore")
+    ((untracked file)
+     (magit-ignore-file info current-prefix-arg nil))
+    ((wazzup)
+     (magit-wazzup-toggle-ignore info current-prefix-arg))))
+
+(defun magit-ignore-item-locally ()
+  (interactive)
+  (magit-section-action (item info "ignore")
+    ((untracked file)
+     (magit-ignore-file info current-prefix-arg t))))
+
+(defun magit-discard-diff (diff stagedp)
+  (let ((kind (magit-diff-item-kind diff))
+	(file (magit-diff-item-file diff)))
+    (cond ((eq kind 'deleted)
+	   (when (yes-or-no-p (format "Resurrect %s? " file))
+	     (magit-run-git "reset" "-q" "--" file)
+	     (magit-run-git "checkout" "--" file)))
+	  ((eq kind 'new)
+	   (if (yes-or-no-p (format "Delete %s? " file))
+	       (magit-run-git "rm" "-f" "--" file)))
+	  (t
+	   (if (yes-or-no-p (format "Discard changes to %s? " file))
+	       (if stagedp
+		   (magit-run-git "checkout" "HEAD" "--" file)
+		 (magit-run-git "checkout" "--" file)))))))
+
+(defun magit-discard-item ()
+  (interactive)
+  (magit-section-action (item info "discard")
+    ((untracked file)
+     (if (yes-or-no-p (format "Delete %s? " info))
+	 (magit-run "rm" info)))
+    ((untracked)
+     (if (yes-or-no-p "Delete all untracked files and directories? ")
+	 (magit-run "git" "clean" "-df")))
+    ((unstaged diff hunk)
+     (when (yes-or-no-p (if (magit-use-region-p)
+			    "Discard changes in region? "
+			  "Discard hunk? "))
+       (magit-apply-hunk-item-reverse item)))
+    ((staged diff hunk)
+     (if (magit-file-uptodate-p (magit-diff-item-file
+				 (magit-hunk-item-diff item)))
+	 (when (yes-or-no-p (if (magit-use-region-p)
+				"Discard changes in region? "
+			      "Discard hunk? "))
+	   (magit-apply-hunk-item-reverse item "--index"))
+       (error "Can't discard this hunk.  Please unstage it first")))
+    ((unstaged diff)
+     (magit-discard-diff item nil))
+    ((staged diff)
+     (if (magit-file-uptodate-p (magit-diff-item-file item))
+	 (magit-discard-diff item t)
+       (error "Can't discard staged changes to this file.  Please unstage it first")))
+    ((hunk)
+     (error "Can't discard this hunk"))
+    ((diff)
+     (error "Can't discard this diff"))
+    ((stash)
+     (when (yes-or-no-p "Discard stash? ")
+       (magit-run-git "stash" "drop" info)))))
+
+(defun magit-add-change-log-entry (&optional whoami file-name other-window
+                                             new-entry put-new-entry-on-new-line)
+  "Add a change log entry for current change."
+  (interactive (list current-prefix-arg
+		     (prompt-for-change-log-name)))
+  (let ((marker
+         (save-window-excursion
+           (magit-visit-item)
+           (set-marker (make-marker) (point)))))
+    (save-excursion
+      (with-current-buffer (marker-buffer marker)
+        (goto-char marker)
+        (add-change-log-entry whoami file-name other-window
+                              new-entry put-new-entry-on-new-line)))))
+
+(defun magit-add-change-log-entry-other-window (&optional whoami file-name)
+  "Add a change log entry for current change in other window."
+  (interactive (if current-prefix-arg
+		   (list current-prefix-arg
+			 (prompt-for-change-log-name))))
+  (magit-add-change-log-entry whoami file-name t))
+
+(defun magit-visit-item (&optional other-window)
+  "Visit current item.
+With a prefix argument, visit in other window."
+  (interactive (list current-prefix-arg))
+  (magit-section-action (item info "visit")
+    ((untracked file)
+     (funcall
+      (if other-window 'find-file-other-window 'find-file)
+      info))
+    ((diff)
+     (funcall
+      (if other-window 'find-file-other-window 'find-file)
+      (magit-diff-item-file item)))
+    ((hunk)
+     (let ((file (magit-diff-item-file (magit-hunk-item-diff item)))
+	   (line (magit-hunk-item-target-line item)))
+       (funcall
+        (if other-window 'find-file-other-window 'find-file)
+        file)
+       (goto-char (point-min))
+       (forward-line (1- line))))
+    ((commit)
+     (magit-show-commit info)
+     (pop-to-buffer magit-commit-buffer-name))
+    ((stash)
+     (magit-show-stash info)
+     (pop-to-buffer magit-stash-buffer-name))
+    ((longer)
+     (magit-log-show-more-entries ()))))
+
+(defun magit-show-item-or-scroll-up ()
+  (interactive)
+  (magit-section-action (item info)
+    ((commit)
+     (magit-show-commit info #'scroll-up))
+    ((stash)
+     (magit-show-stash info #'scroll-up))
+    (t
+     (scroll-up))))
+
+(defun magit-show-item-or-scroll-down ()
+  (interactive)
+  (magit-section-action (item info)
+    ((commit)
+     (magit-show-commit info #'scroll-down))
+    ((stash)
+     (magit-show-stash info #'scroll-down))
+    (t
+     (scroll-down))))
+
+(defun magit-mark-item (&optional unmark)
+  (interactive "P")
+  (if unmark
+      (magit-set-marked-commit nil)
+    (magit-section-action (item info "mark")
+      ((commit)
+       (magit-set-marked-commit (if (eq magit-marked-commit info)
+				    nil
+				  info))))))
+
+(defun magit-describe-item ()
+  (interactive)
+  (let ((section (magit-current-section)))
+    (message "Section: %s %s-%s %S %S %S"
+	     (magit-section-type section)
+	     (magit-section-beginning section)
+	     (magit-section-end section)
+	     (magit-section-title section)
+	     (magit-section-info section)
+	     (magit-section-context-type section))))
+
+(defun magit-copy-item-as-kill ()
+  "Copy sha1 of commit at point into kill ring."
+  (interactive)
+  (magit-section-action (item info "copy")
+    ((commit)
+     (kill-new info)
+     (message "%s" info))))
+
+(eval-when-compile (require 'server))
+
+(defun magit-server-running-p ()
+  "Test whether server is running (works with < 23 as well).
+
+Return values:
+  nil		   the server is definitely not running.
+  t		   the server seems to be running.
+  something else   we cannot determine whether it's running without using
+		   commands which may have to wait for a long time."
+  (if (functionp 'server-running-p)
+      (server-running-p)
+    (condition-case nil
+	(if server-use-tcp
+	    (with-temp-buffer
+	      (insert-file-contents-literally (expand-file-name server-name server-auth-dir))
+	      (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
+		       (assq 'comm
+			     (process-attributes
+			      (string-to-number (match-string 1))))
+		       t)
+		  :other))
+	  (delete-process
+	   (make-network-process
+	    :name "server-client-test" :family 'local :server nil :noquery t
+	    :service (expand-file-name server-name server-socket-dir)))
+	  t)
+      (file-error nil))))
+
+(defun magit-interactive-rebase ()
+  "Start a git rebase -i session, old school-style."
+  (interactive)
+  (unless (magit-server-running-p)
+    (server-start))
+  (let* ((section (get-text-property (point) 'magit-section))
+	 (commit (and (member 'commit (magit-section-context-type section))
+		      (magit-section-info section)))
+	 (old-editor (getenv "GIT_EDITOR")))
+    (setenv "GIT_EDITOR" (locate-file "emacsclient" exec-path))
+    (unwind-protect
+	(magit-run-git-async "rebase" "-i"
+			     (or (and commit (concat commit "^"))
+				 (magit-read-rev "Interactively rebase to" (magit-guess-branch))))
+      (if old-editor
+	  (setenv "GIT_EDITOR" old-editor)))))
+
+(define-derived-mode magit-show-branches-mode fundamental-mode
+  "Magit Branches")
+
+(defun magit-quit-branches-window ()
+  "Bury the branches buffer and delete its window."
+  (interactive)
+  (quit-window)
+  (delete-window))
+
+(defun magit--branch-name-from-line (line)
+  "Extract the branch name from line LINE of 'git branch' output."
+  (get-text-property 0 'branch-name line))
+
+(defun magit--branch-name-at-point ()
+  "Get the branch name in the line at point."
+  (let ((branch (magit--branch-name-from-line (thing-at-point 'line))))
+    (or branch (error "No branch at point"))))
+
+(defun magit-branches-window-checkout ()
+  "Check out the branch in the line at point."
+  (interactive)
+  (magit-checkout (magit--branch-name-at-point))
+  (magit-show-branches))
+
+(defun magit-remove-remote (ref)
+  "Return REF with any remote part removed."
+  (if (string-match "^remotes/" ref)
+      (substring ref 8)
+    ref))
+
+(defun magit-remove-branch (&optional force)
+  "Remove the branch in the line at point.
+With prefix force the removal even it it hasn't been merged."
+  (interactive "P")
+  (let ((args (list "branch"
+		    (if force "-D" "-d")
+		    (when (magit--is-branch-at-point-remote) "-r")
+		    ;; remove the remotes part
+		    (magit-remove-remote
+                     (magit--branch-name-at-point)))))
+    (apply 'magit-run-git (remq nil args))
+    (if (and (magit--is-branch-at-point-remote)
+             (yes-or-no-p "Remove branch in remote repository as well? "))
+        (magit-remove-branch-in-remote-repo (magit--branch-name-at-point)))
+    (magit-show-branches)))
+
+(defun magit--remotes ()
+  "Return a list of names for known remotes."
+  (magit-git-lines "remote"))
+
+(defun magit--branches-for-remote-repo (remote)
+  "Return a list of remote branch names for REMOTE.
+These are the branch names with the remote name stripped."
+  (remq nil
+        (mapcar (lambda (line)
+                  (save-match-data
+                    (if (and (not (string-match-p " -> " line))
+                             (string-match (concat "^ +" remote "/\\([^ $]+\\)")
+                                           line))
+                        (match-string 1 line))))
+                (magit-git-lines "branch" "-r"))))
+
+(defun magit-remove-branch-in-remote-repo (&optional branch-name-at-local)
+  "Remove a branch in a remote repository by pushing nothing into it.
+If BRANCH-NAME-AT-LOCAL is not given then ask the user for the
+name of the remote and branch name. The remote must be known to git."
+  (interactive)
+  (let ((all-remotes (magit--remotes))
+        remote branch)
+    (unless all-remotes
+      (error "No remote has been  configured"))
+    (if branch-name-at-local
+        (save-match-data
+          (if (string-match "^remotes/\\([^/]+\\)/\\(.+\\)" branch-name-at-local)
+              (setq remote (match-string 1 branch-name-at-local)
+                    branch (match-string 2 branch-name-at-local))
+            (error "Cannot parse remote and branch name from `%s'" branch-name-at-local)))
+      (setq remote (magit-completing-read "Name of remote repository: " all-remotes nil t)
+            branch (magit-completing-read "Name of branch in remote repository: "
+                                          (magit--branches-for-remote-repo remote))))
+    (unless (magit-get "remote" remote "url")
+      (error "Unknown remote"))
+    (magit-run-git "push"
+                   remote
+                   (concat ":refs/heads/" branch))))
+
+(defvar magit-branches-buffer-name "*magit-branches*")
+
+(defun magit--is-branch-at-point-remote()
+  "Return t if the branch at point is a remote tracking branch"
+  (get-text-property (point) 'remote))
+
+(defun magit--branch-view-details (branch-line)
+  "Extract details from branch -va output."
+  (string-match (concat
+                 "^\\(\\*? \\{1,2\\}\\)"       ; 1: current branch marker (maybe)
+                 "\\(.+?\\) +"                 ; 2: branch name
+
+                 "\\(?:"
+                 "\\([0-9a-fA-F]\\{7,8\\}\\) " ; 3: sha1
+                 "\\|\\(-> \\)"                ; 4: or the pointer to a ref
+                 "\\)"
+
+                 "\\(.+\\)"                    ; 5: message or ref
+                 )
+                branch-line)
+  (let ((res (list (cons 'current (match-string 1 branch-line))
+                   (cons 'branch  (match-string 2 branch-line))
+                   (cons 'remote  (string-match-p "^remotes/" (match-string 2 branch-line))))))
+    (unless (cdr (assoc 'remote res))
+      (setq res (append (list (cons 'tracking
+                                    (magit-remote-branch-for (cdr (assoc 'branch res))
+                                                             t)))
+                        res)))
+    (if (match-string 4 branch-line)
+        (cons (cons 'other-ref (match-string 5 branch-line)) res)
+      (append
+       (list
+        (cons 'sha1 (match-string 3 branch-line))
+        (cons 'msg (match-string 5 branch-line)))
+       res))))
+
+(defun magit-show-branches ()
+  "Show all of the current branches."
+  (interactive)
+  (let ((buffer-existed (get-buffer magit-branches-buffer-name)))
+    (unless (eq major-mode 'magit-show-branches-mode)
+      (let ((topdir (magit-get-top-dir default-directory)))
+        (magit-buffer-switch magit-branches-buffer-name)
+        (setq default-directory topdir)))
+    (let ((inhibit-read-only t)
+          (goto-branch-line (line-number-at-pos))
+          (branches (mapcar 'magit--branch-view-details
+                            (apply 'magit-git-lines "branch" "-va"
+                                   magit-custom-options))))
+      (erase-buffer)
+      (insert
+       (mapconcat
+        (lambda (b)
+          (propertize
+           (concat
+            (cdr (assoc 'current b))
+            (propertize (or (cdr (assoc 'sha1 b))
+                            "       ")
+                        'face 'magit-log-sha1)
+            " "
+            (apply 'propertize (cdr (assoc 'branch b))
+                   (if (string-match-p "^\\*" (cdr (assoc 'current b)))
+                       '(face magit-branch)))
+            (when (assoc 'other-ref b)
+              (concat " (" (cdr (assoc 'other-ref b)) ")"))
+            (when (cdr (assoc 'tracking b))
+              (concat " [" (propertize (cdr (assoc 'tracking b)) 'face 'magit-log-head-label-remote) "]")))
+           'remote (cdr (assoc 'remote b))
+           'branch-name (cdr (assoc 'branch b))
+           'revision (cdr (assoc 'sha1 b))))
+        branches
+        "\n"))
+      (magit-show-branches-mode)
+      (goto-char (point-min))
+      (if buffer-existed
+          (forward-line (1- goto-branch-line))
+        (while (and (< (point)
+                       (point-max))
+                    (not (string= (buffer-substring-no-properties (point) (1+ (point)))
+                                  "*")))
+          (forward-line 1)))))
+  (setq buffer-read-only t))
+
+(defun magit-change-what-branch-tracks ()
+  "Change which remote branch the current branch tracks."
+  (interactive)
+  (if (magit--is-branch-at-point-remote)
+      (error "Cannot modify a remote branch"))
+  (let* ((local-branch (magit--branch-name-at-point))
+         (new-tracked (magit-read-rev  "Change tracked branch to"
+                                       nil
+                                       (lambda (ref)
+                                         (not (string-match-p "refs/remotes/"
+                                                              ref)))))
+         new-remote new-branch)
+    (unless (string= (or new-tracked "") "")
+      (if (string-match "^refs/remotes/\\([^/]+\\)/\\(.+\\)" ; 1: remote name; 2: branch name
+                        new-tracked)
+          (setq new-remote (match-string 1 new-tracked)
+                new-branch (concat "refs/heads/" (match-string 2 new-tracked)))
+        ;; Match refs that are unknown in the local repository. Can be
+        ;; useful if you want to create a new branch in a remote
+        ;; repository.
+        (if (string-match "^\\([^ ]+\\) +(\\(.+\\))$" ; 1: branch name; 2: remote name
+                          new-tracked)
+            (setq new-remote (match-string 2 new-tracked)
+                  new-branch (concat "refs/heads/" (match-string 1 new-tracked)))
+            (error "Cannot parse the remote and branch name"))))
+    (magit-set new-remote "branch" local-branch "remote")
+    (magit-set new-branch "branch" local-branch "merge")
+    (magit-show-branches)
+    (if (string= (magit-get-current-branch) local-branch)
+        (magit-refresh-buffer (magit-find-buffer 'status default-directory)))))
+
+(defvar magit-ediff-file)
+(defvar magit-ediff-windows)
+
+(eval-when-compile (require 'ediff))
+
+(defun magit-interactive-resolve (file)
+  (require 'ediff)
+  (let ((merge-status (magit-git-string "ls-files" "-u" "--" file))
+	(base-buffer (generate-new-buffer (concat file ".base")))
+	(our-buffer (generate-new-buffer (concat file ".current")))
+	(their-buffer (generate-new-buffer (concat file ".merged")))
+	(windows (current-window-configuration)))
+    (if (null merge-status)
+	(error "Cannot resolve %s" file))
+    (with-current-buffer base-buffer
+      (if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
+	  (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:" file))))))
+    (with-current-buffer our-buffer
+      (if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
+	  (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:" file))))))
+    (with-current-buffer their-buffer
+      (if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
+	  (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:" file))))))
+    ;; We have now created the 3 buffer with ours, theirs and the ancestor files
+    (with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer)
+      (make-local-variable 'magit-ediff-file)
+      (setq magit-ediff-file file)
+      (make-local-variable 'magit-ediff-windows)
+      (setq magit-ediff-windows windows)
+      (make-local-variable 'ediff-quit-hook)
+      (add-hook 'ediff-quit-hook
+		(lambda ()
+		  (let ((buffer-A ediff-buffer-A)
+			(buffer-B ediff-buffer-B)
+			(buffer-C ediff-buffer-C)
+			(buffer-Ancestor ediff-ancestor-buffer)
+			(file magit-ediff-file)
+			(file-buffer)
+			(windows magit-ediff-windows))
+		    (ediff-cleanup-mess)
+		    (find-file file)
+		    (setq file-buffer (current-buffer))
+		    (erase-buffer)
+		    (insert-buffer-substring buffer-C)
+		    (kill-buffer buffer-A)
+		    (kill-buffer buffer-B)
+		    (kill-buffer buffer-C)
+		    (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor))
+		    (set-window-configuration windows)
+		    (magit-save-some-buffers
+		     "Conflict resolution finished; you may save the buffer"
+		     (lambda () (eq (current-buffer) file-buffer)))))))))
+
+(defun magit-interactive-resolve-item ()
+  (interactive)
+  (magit-section-action (item info "resolv")
+    ((diff)
+     (magit-interactive-resolve (cadr info)))))
+
+(defun magit-list-buffers ()
+  "Return a list of magit buffers."
+  (delq nil (mapcar (lambda (b)
+                      (with-current-buffer b
+                        (when (eq major-mode 'magit-mode)
+                          b)))
+                    (buffer-list))))
+
+(defun remove-dupes (list)
+  "Remove the duplicate items in a sorted list."
+  (let (tmp-list head)
+    (while list
+      (setq head (pop list))
+      (unless (equal head (car list))
+        (push head tmp-list)))
+    (reverse tmp-list)))
+
+(defun magit-list-projects ()
+  "Return a list of directories with a magit representation."
+  (remove-dupes
+   (sort
+    (mapcar (lambda (b)
+              (with-current-buffer b
+                (directory-file-name default-directory)))
+            (magit-list-buffers))
+    'string=)))
+
+(defun magit-submodule-update (&optional init)
+  "Update the submodule of the current git repository
+
+With a prefix arg, do a submodule update --init"
+  (interactive "P")
+  (let ((default-directory (magit-get-top-dir default-directory)))
+    (apply #'magit-run-git-async "submodule" "update" (if init '("--init") ()))))
+
+(defun magit-submodule-update-init ()
+  "Update and init the submodule of the current git repository."
+  (interactive)
+  (magit-submodule-update t))
+
+(defun magit-submodule-init ()
+  "Initialize the submodules"
+  (interactive)
+  (let ((default-directory (magit-get-top-dir default-directory)))
+    (magit-run-git-async "submodule" "init")))
+
+(defun magit-submodule-sync ()
+  "Synchronizes submodules' remote URL configuration"
+  (interactive)
+  (let ((default-directory (magit-get-top-dir default-directory)))
+    (magit-run-git-async "submodule" "sync")))
+
+(defun magit-run-git-gui ()
+  "Run `git gui' for the current git repository"
+  (interactive)
+  (let* ((default-directory (magit-get-top-dir default-directory)))
+    (start-process "git gui" nil "git" "gui")))
+
+(defun magit-run-gitk ()
+  "Run `gitk --all' for the current git repository"
+  (interactive)
+  (let* ((default-directory (magit-get-top-dir default-directory)))
+    (start-process "gitk" nil "gitk" "--all")))
+
+;; for emacs 22 compatibility
+
+(defun magit-string-match-p (regexp string &optional start)
+  "Same as `string-match' except this function does not change
+the match data."
+  (let ((inhibit-changing-match-data t))
+    (string-match regexp string start)))
+
+(when (not (fboundp 'string-match-p))
+  (fset 'string-match-p (symbol-function 'magit-string-match-p)))
+
+(provide 'magit)
+;;; magit.el ends here
diff --git a/elpa/magit-1.0.0/magit.elc b/elpa/magit-1.0.0/magit.elc
new file mode 100644
index 000000000..f3d8d1731
Binary files /dev/null and b/elpa/magit-1.0.0/magit.elc differ
diff --git a/elpa/magit-1.2.0/magit.info b/elpa/magit-1.0.0/magit.info
similarity index 56%
rename from elpa/magit-1.2.0/magit.info
rename to elpa/magit-1.0.0/magit.info
index deda92f09..2da7e9737 100644
--- a/elpa/magit-1.2.0/magit.info
+++ b/elpa/magit-1.0.0/magit.info
@@ -1,12 +1,11 @@
-This is magit.info, produced by makeinfo version 4.8 from magit.texi.
+This is magit.info, produced by makeinfo version 4.13 from magit.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
 * Magit: (magit).        Using Git from Emacs with Magit.
 END-INFO-DIR-ENTRY
 
-   Copyright (C) 2008, 2009, 2010, 2011 Magit contributors. (See the
-header of magit.el for the lengthy list of Magit contributors.)
+   Copyright (C) 2008, 2009, 2011 Marius Vollmer
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -21,11 +20,7 @@ Magit User Manual
 *****************
 
 Magit is an interface to the version control system Git, implemented as
-an extension to Emacs.  Magit supports GNU Emacs version 22 or later.
-It may work with other emacsen, but Magit developers do not intend to
-investigate and fix bugs that only appear in unsupported versions.
-Patches to fix bugs in other emacsen or volunteers to maintain
-compatibility are still welcome.
+an extension to Emacs.
 
 * Menu:
 
@@ -37,25 +32,20 @@ compatibility are still welcome.
 * Staging and Committing::
 * History::
 * Reflogs::
-* Commit Buffer::
 * Diffing::
 * Tagging::
 * Resetting::
 * Stashing::
 * Branching::
-* The Branch Manager::
+* The branch list::
 * Wazzup::
 * Merging::
 * Rebasing::
-* Interactive Rebasing::
 * Rewriting::
 * Pushing and Pulling::
-* Bisecting::
 * Submodules::
 * Using Magit Extensions::
 * Using Git Directly::
-* Customization::
-* Frequently Asked Questions::
 
 
 File: magit.info,  Node: Introduction,  Next: Acknowledgments,  Prev: Top,  Up: Top
@@ -74,7 +64,7 @@ most common Git operations convenient.  Thus, Magit will likely not
 save you from learning Git itself.
 
    This manual provides a tour of all Magit features.  It does not give
-an introduction to version control in general, or to Git in particular.
+a introduction to version control in general, or to Git in particular.
 
    The main entry point to Magit is `M-x magit-status', which will put
 you in Magit's status buffer.  You will be using it frequently, so it
@@ -96,9 +86,7 @@ File: magit.info,  Node: Acknowledgments,  Next: Sections,  Prev: Introduction,
 2 Acknowledgments
 *****************
 
-Marius Vollmer started the whole project.  Thanks !
-
-   From day one of the first Magit announcement, John Wiegley has
+From day one of the first Magit announcement, John Wiegley has
 contributed numerous fixes, UI improvements, and new features.  Thanks!
 
    Linh Dang and Christian Neukirchen also contributed from day one.
@@ -221,18 +209,18 @@ the working tree and the staging area.  You can hide and show them as
 described in the previous section.
 
    The first section shows _Untracked files_, if there are any.  See
-*Note Untracked files:: for more details.
+*note Untracked files:: for more details.
 
-   The next two sections show your local changes.  They are explained
-fully in the next chapter, *Note Staging and Committing::.
+   Two section show your local changes.  They are explained fully in the
+next chapter, *note Staging and Committing::.
 
    If the current branch is associated with a remote tracking branch,
 the status buffer shows the differences between the current branch and
-the tracking branch.  See *Note Pushing and Pulling:: for more
+the tracking branch.  See *note Pushing and Pulling:: for more
 information.
 
    During a history rewriting session, the status buffer shows the
-_Pending changes_ and _Pending commits_ sections.  See *Note
+_Pending changes_ and _Pending commits_ sections.  See *note
 Rewriting:: for more details.
 
 
@@ -243,8 +231,8 @@ File: magit.info,  Node: Untracked files,  Next: Staging and Committing,  Prev:
 
 Untracked files are shown in the _Untracked files_ section.
 
-   You can add an untracked file to the staging area with `s'.  If
-point is on the _Untracked files_ section title when you hit `s', all
+   You can add a untracked file to the staging area with `s'.  If point
+is on the _Untracked files_ section title when you it `s', all
 untracked files are staged.
 
    Typing `C-u S' anywhere will also stage all untracked files,
@@ -253,15 +241,11 @@ together with all changes to the tracked files.
    You can instruct Git to ignore them by typing `i'.  This will add
 the filename to the `.gitignore' file.  Typing `C-u i' will ask you for
 the name of the file to ignore.  This is useful to ignore whole
-directories, for example.  In this case, the minibuffer's future history
-(accessible with `M-n') contains predefined values (such as wildcards)
-that might be of interest. If prefix argument is negative (for example
-after typing `C-- i'), the prompt proposes wildcard by default.  The
-`I' command is similar to `i' but will add the file to
-`.git/info/exclude' instead.
-
-   To delete an untracked file forever, use `k'.  If point is on the
-_Untracked files_ section title when you hit `k', all untracked files
+directories, for example.  The `I' command is similar to `i' but will
+add the file to `.git/info/exclude' instead.
+
+   To delete a untracked file forever, use `k'.  If point is on the
+_Untracked files_ section title when you it `k', all untracked files
 are deleted.
 
 
@@ -284,7 +268,7 @@ changes_ and _Staged changes_.  The _Staged changes_ section shows the
 changes that will be included in the next commit, while the _Unstaged
 changes_ section shows the changes that will be left out.
 
-   To move an unstaged hunk into the staging area, move point into the
+   To move a unstaged hunk into the staging area, move point into the
 hunk and type `s'.  Likewise, to unstage a hunk, move point into it and
 type `u'.  If point is in a diff header when you type `s' or `u', all
 hunks belonging to that diff are moved at the same time.
@@ -294,10 +278,6 @@ in the region are staged or unstaged.  (This works line by line: if the
 beginning of a line is in the region it is included in the changes,
 otherwise it is not.)
 
-   To change the size of the hunks, you can type `+' or `-' to increase
-and decrease, respectively.  Typing `0' will reset the hunk size to the
-default.
-
    Typing `C-u s' will ask you for a name of a file to be staged, for
 example to stage files that are hidden.
 
@@ -338,10 +318,6 @@ determined by the `magit-commit-signoff' customization variable.
 allows you to make commits that serve as notes, without including any
 changes.
 
-   Typing `C-c C-t' will toggle the option to specify the name and
-email address for the commit's author.  The default is determined by
-the `user.name' and `user.email' git configuration settings.
-
    If you change your mind and don't want to go ahead with your commit
 while you are in the `*magit-log-edit*' buffer, you can just switch to
 another buffer, continue editing there, staging and unstaging things
@@ -366,33 +342,28 @@ buffer will be shown that displays the history in a terse form.  The
 first paragraph of each commit message is displayed, next to a
 representation of the relationships between commits.
 
-   To show the repository history between two branches or between any
-two points of the history, type `l r l'.  You will be prompted to enter
-references for starting point and ending point of the history range; you
-can use auto-completion to specify them.  A typical use case for ranged
-history log display would be `l r l master RET new-feature RET' that
-will display commits on the new-feature branch that are not in master;
-these commits can then be inspected and cherry-picked, for example.
-
-   More thorough filtering can be done by supplying `l' with one or
-more suffix arguments, as displayed in its popup.  `=g' ('Grep') for
-example, limits the output to commits of which the log message matches
-a specific string/regex.
+   Giving a prefix argument to `l' will ask for the starting and end
+point of the history.  This can be used to show the commits that are in
+one branch, but not in another, for example.  The start point can also
+be a range of revisions "r1..r2".  In that case "r1" is used as the
+start and "r2" as the end point of the history.
 
    Typing `l L' (or `l C-u L') will show the log in a more verbose form.
 
    Magit will show only `magit-log-cutoff-length' entries. `e' will
 show twice as many entries. `C-u e' will show all entries, and given a
-numeric prefix argument, `e' will add this number of entries.
+numeric prefix argument, `e' will add this number of entries. You can
+also show more entries by typing `RET' on the text appended at the end
+of the buffer.
 
    You can move point to a commit and then cause various things to
-happen with it.  (The following commands work in any list of commits,
+happen with it.  (The following commands work in any list of commit,
 such as the one shown in the _Unpushed commits_ section.)
 
    Typing `RET' will pop up more information about the current commit
-and move point into the new buffer.  *Note Commit Buffer::.  Typing
-`SPC' and `DEL' will also show the information, but will scroll the new
-buffer up or down (respectively) when typed again.
+and move point into the new buffer.  Typing `SPC' and `DEL' will also
+show the information, but will scroll the new buffer up or down
+(respectively) when typed again.
 
    Typing `a' will apply the current commit to your current branch.
 This is useful when you are browsing the history of some other branch
@@ -423,8 +394,10 @@ marked commit no matter where point is, use `C-u .'.
 marked commit as implicit arguments.  Other commands will offer the
 marked commit as a default when prompting for their arguments.
 
+   To grep the history press `s'.
+
 
-File: magit.info,  Node: Reflogs,  Next: Commit Buffer,  Prev: History,  Up: Top
+File: magit.info,  Node: Reflogs,  Next: Diffing,  Prev: History,  Up: Top
 
 8 Reflogs
 *********
@@ -437,51 +410,12 @@ head, while `l h' will show the reflog of `HEAD'.
 `l L' that shows the commit history.
 
 
-File: magit.info,  Node: Commit Buffer,  Next: Diffing,  Prev: Reflogs,  Up: Top
-
-9 Commit Buffer
-***************
-
-When you view a commit (perhaps by selecting it in the log buffer,
-*Note History::), the "commit buffer" is displayed, showing you
-information about the commit and letting you interact with it.
-
-   By placing your cursor within the diff or hunk and typing `a', you
-can apply the same patch to your working copy.  This is useful when you
-want to copy a change from another branch, but don't necessarily want
-to cherry-pick the whole commit.
-
-   By typing `v' you can apply the patch in reverse, removing all the
-lines that were added and adding all the lines that were removed.  This
-is a convenient way to remove a change after determining that it
-introduced a bug.
+File: magit.info,  Node: Diffing,  Next: Tagging,  Prev: Reflogs,  Up: Top
 
-   If the commit message refers to any other commits in the repository
-by their unique hash, the hash will be highlighted and you will be able
-to visit the referenced commit either by clicking on it or by moving
-your cursor onto it and pressing `RET'.
-
-   The commit buffer maintains a history of the commits it has shown.
-After visiting a referenced commit you can type `C-c C-b' to get back
-to where you came from.  To go forward in the history, type `C-c C-f'.
-There are also `[back]' and `[forward]' buttons at the bottom of the
-buffer.
-
-
-File: magit.info,  Node: Diffing,  Next: Tagging,  Prev: Commit Buffer,  Up: Top
-
-10 Diffing
-**********
-
-Magit typically shows diffs in the "unified" format.
-
-   In any buffer that shows a diff, you can type `e' anywhere within
-the diff to show the two versions of the file in Ediff.  If the diff is
-of a file in the status buffer that needs to be merged, you will be
-able to use Ediff as an interactive merge tool.  Otherwise, Ediff will
-simply show the two versions of the file.
+9 Diffing
+*********
 
-   To show the changes from your working tree to another revision, type
+To show the changes from you working tree to another revision, type
 `d'.  To show the changes between two arbitrary revisions, type `D'.
 
    You can use `a' within the diff output to apply the changes to your
@@ -495,10 +429,10 @@ to that region.
 
 File: magit.info,  Node: Tagging,  Next: Resetting,  Prev: Diffing,  Up: Top
 
-11 Tagging
+10 Tagging
 **********
 
-Typing `t t' will make a lighweight tag.  Typing `t a' will make an
+Typing `t t' will make a lighweight tag.  Typing `t T' will make a
 annotated tag.  It will put you in the normal `*magit-log-edit' buffer
 for writing commit messages, but typing `C-c C-c' in it will make the
 tag instead.  This is controlled by the `Tag' field that will be added
@@ -507,7 +441,7 @@ to the `*magit-log-edit*' buffer.  You can edit it, if you like.
 
 File: magit.info,  Node: Resetting,  Next: Stashing,  Prev: Tagging,  Up: Top
 
-12 Resetting
+11 Resetting
 ************
 
 Once you have added a commit to your local repository, you can not
@@ -542,7 +476,7 @@ first using an unprefixed `x' to reset only the head, and then using
 
 File: magit.info,  Node: Stashing,  Next: Branching,  Prev: Resetting,  Up: Top
 
-13 Stashing
+12 Stashing
 ***********
 
 You can create a new stash with `z z'.  Your stashes will be listed in
@@ -552,13 +486,8 @@ the status buffer, and you can apply them with `a' and pop them with
    With a prefix argument, both `a' and `A' will attempt to reinstate
 the index as well as the working tree from the stash.
 
-   Typing `z -k z' will create a stash just like `z z', but will leave
-the changes in your working tree and index. This makes it easier to,
-for example, test multiple variations of the same change.
-
-   If you just want to make quick snapshots in between edits, you can
-use `z s', which automatically enters a timestamp as description, and
-keeps your working tree and index intact by default.
+   Typing `z Z' will create a stash just like `z z', but will leave the
+changes in your working tree and index.
 
    You can visit and show stashes in the usual way: Typing `SPC' and
 `DEL' will pop up a buffer with the description of the stash and scroll
@@ -566,13 +495,13 @@ it, typing `RET' will move point into that buffer. Using `C-u RET' will
 move point into that buffer in other window.
 
 
-File: magit.info,  Node: Branching,  Next: The Branch Manager,  Prev: Stashing,  Up: Top
+File: magit.info,  Node: Branching,  Next: The branch list,  Prev: Stashing,  Up: Top
 
-14 Branching
+13 Branching
 ************
 
 The current branch is indicated in the header of the status buffer.
-You can switch to a different branch by typing `b b'.  This will
+You can switch to a different branch by typing `b c'.  This will
 immediately checkout the branch into your working copy, so you
 shouldn't have any local modifications when switching branches.
 
@@ -580,51 +509,46 @@ shouldn't have any local modifications when switching branches.
 local tracking branch for it instead.  This way, you can easily start
 working on new branches that have appeared in a remote repository.
 
-   Typing `b b' while point is at a commit description will offer that
+   Typing `b c' while point is at a commit description will offer that
 commit as the default to switch to.  This will result in a detached
 head.
 
-   Typing  `b m' will let you rename a branch. Unless a branch with the
-same name already exists, obviously...
+   To create a new branch and switch to it immediately, type `b B'.
 
-   To create a new branch and switch to it immediately, type `b n'.
-
-   To delete a branch, type `b d'. If you're currently on that branch,
-Magit will offer to switch to the 'master' branch.
-
-   Deleting a branch is only possible if it's already fully merged into
-HEAD or its upstream branch. Unless you type `b D', that is.  Here be
-dragons...
-
-   Typing `b v' will list the local and remote branches in a new buffer
-called `*magit-branches*' from which you can work with them. See *Note
-The Branch Manager:: for more details.
+   Typing `b V' will list the local and remote branches in a new buffer
+called `*magit-branches*' from which you can work with them. See *note
+The branch list:: for more details.
 
 
-File: magit.info,  Node: The Branch Manager,  Next: Wazzup,  Prev: Branching,  Up: Top
-
-15 The Branch Manager
-*********************
+File: magit.info,  Node: The branch list,  Next: Wazzup,  Prev: Branching,  Up: Top
 
-The Branch Manager is a separate buffer called `*magit-branches*' with
-its own local key map. The buffer contains both local and remote
-branches. The current local branch is marked by a "*" in front of the
-name.
+14 The branch list
+******************
 
-   To check out a branch, move your cursor to the desired branch and
-press `RET'.
+The branch list is a separate buffer called `*magit-branches*' with its
+own local key map. The keybindings are modeled after magit's main
+buffer. The buffer contains both local and remote branches. The current
+local branch is marked by a "*" in front of the name.
 
    Typing `k' will delete the branch in the current line, and `C-u k'
 deletes it even if it hasn't been merged into the current local branch.
 Deleting works for both local and remote branches.
 
-   By typing `T' on a local branch, you can change which remote branch
-it's set to track.
+   You can merge the branch in the current line by typing `m m' for a
+manual merge and `m m' for an automatic merge.
+
+   With `RET' or `b b' you can check out the branch in the current line.
+
+   Typing `$' shows the `*magit-process*' buffer which contains the
+transcript of the most recent command.
+
+   Typing `V' will refresh the branch list. `q' buries the branch list
+buffer and deletes its window.
 
 
-File: magit.info,  Node: Wazzup,  Next: Merging,  Prev: The Branch Manager,  Up: Top
+File: magit.info,  Node: Wazzup,  Next: Merging,  Prev: The branch list,  Up: Top
 
-16 Wazzup
+15 Wazzup
 *********
 
 Typing `w' will show a summary of how your other branches relate to the
@@ -646,12 +570,12 @@ unignore it.
 
 File: magit.info,  Node: Merging,  Next: Rebasing,  Prev: Wazzup,  Up: Top
 
-17 Merging
+16 Merging
 **********
 
-Magit offers two ways to merge branches: manual and automatic.  A
+Magit offers two ways to merge branches: manually and automatic.  A
 manual merge will apply all changes to your working tree and staging
-area, but will not commit them, while an automatic merge will go ahead
+area, but will not commit them, while a automatic merge will go ahead
 and commit them immediately.
 
    Type `m m' to initiate merge.
@@ -661,7 +585,7 @@ remind you that the next commit will be a merge commit (with more than
 one parent).  If you want to abort a manual merge, just do a hard reset
 to HEAD with `X'.
 
-   Merges can fail if the two branches you want to merge introduce
+   Merges can fail if the two branches you merge want to introduce
 conflicting changes.  In that case, the automatic merge stops before the
 commit, essentially falling back to a manual merge.  You need to resolve
 the conflicts for example with `e' and stage the resolved files, for
@@ -672,9 +596,9 @@ you can only stage whole files once all conflicts in them have been
 resolved.
 
 
-File: magit.info,  Node: Rebasing,  Next: Interactive Rebasing,  Prev: Merging,  Up: Top
+File: magit.info,  Node: Rebasing,  Next: Rewriting,  Prev: Merging,  Up: Top
 
-18 Rebasing
+17 Rebasing
 ***********
 
 Typing `R' in the status buffer will initiate a rebase or, if one is
@@ -692,34 +616,9 @@ configuring `git pull' to rebase instead of merge, for example.  Such a
 rebase can be finished with `R' as well.
 
 
-File: magit.info,  Node: Interactive Rebasing,  Next: Rewriting,  Prev: Rebasing,  Up: Top
-
-19 Interactive Rebasing
-***********************
-
-Typing `E' in the status buffer will initiate an interactive rebase.
-This is equivalent to running `git rebase --interactive' at the command
-line. The `git-rebase-todo' file will be opened in an Emacs buffer for
-you to edit. This file is opened using `emacsclient', so just edit this
-file as you normally would, then call the `server-edit' function
-(typically bound to `C-x #') to tell Emacs you are finished editing,
-and the rebase will proceed as usual.
-
-   If you have loaded `rebase-mode.el' (which is included in the Magit
-distribution), the `git-rebase-todo' buffer will be in `rebase-mode'.
-This mode disables normal text editing but instead provides single-key
-commands (shown in the buffer) to perform all the edits that you would
-normally do manually, including changing the operation to be performed
-each commit ("pick", "squash", etc.), deleting (commenting out) commits
-from the list, and reordering commits. You can finish editing the
-buffer and proceed with the rebase by pressing `C-c C-c', which is
-bound to `server-edit' in this mode, and you can abort the rebase with
-`C-c C-k', just like when editing a commit message in Magit.
-
-
-File: magit.info,  Node: Rewriting,  Next: Pushing and Pulling,  Prev: Interactive Rebasing,  Up: Top
+File: magit.info,  Node: Rewriting,  Next: Pushing and Pulling,  Prev: Rebasing,  Up: Top
 
-20 Rewriting
+18 Rewriting
 ************
 
 As hinted at earlier, you can rewrite your commit history.  For
@@ -741,12 +640,10 @@ associated with rewriting.  These commands all start with the `r'
 prefix key.
 
    Typing `r b' will start a rewrite operation.  You will be prompted
-for a _base_ commit.  This commit and all subsequent commits up until
-the current head are then put in a list of _Pending commits_, after
-which the current head will be reset to the _parent_ of the base
-commit.  This can be configured to behave like `git rebase', i.e.
-exclude the selected base commit from the rewrite operation, with the
-`magit-rewrite-inclusive' variable.
+for a _base_ commit, and all commits between the current head and this
+commit are put in a list of _Pending commits_ (including the base
+commit).  The current head will then be reset to the parent of the base
+commit.
 
    You would then typically use `a' and `A' to cherry pick commits from
 the list of pending commits in the desired order, until all have been
@@ -766,12 +663,12 @@ explicitly.
    You can also use `v' to revert a commit when you have changed your
 mind.  This will change the `.' mark back to `*'.
 
-   Once you are done with the rewrite, type `r s' to remove the book
+   Once you are done with the rewrite, type `r t' to remove the book
 keeping information from the status buffer.
 
    If you rather wish to start over, type `r a'.  This will abort the
 rewriting, resetting the current head back to the value it had before
-the rewrite was started with `r b'.
+the rewrite was started with `r s'.
 
    Typing `r f' will _finish_ the rewrite: it will apply all unused
 commits one after the other, as if you would us `A' with all of them.
@@ -786,28 +683,24 @@ changes that you still need to rewrite, and you can apply hunks from
 it, like from any other diff.
 
 
-File: magit.info,  Node: Pushing and Pulling,  Next: Bisecting,  Prev: Rewriting,  Up: Top
+File: magit.info,  Node: Pushing and Pulling,  Next: Submodules,  Prev: Rewriting,  Up: Top
 
-21 Pushing and Pulling
+19 Pushing and Pulling
 **********************
 
-Magit will run `git push' when you type `P P'.  If you give a prefix
-argument to `P P', you will be prompted for the repository to push to.
+Magit will run `git push' when you type `P p'.  If you give a prefix
+argument to `P p', you will be prompted for the repository to push to.
 When no default remote repository has been configured yet for the
-current branch, you will be prompted as well.  Typing `P P' will only
+current branch, you will be prompted as well.  Typing `P p' will only
 push the current branch to the remote.  In other words, it will run
 `git push <remote> <branch>'.  The branch will be created in the remote
 if it doesn't exist already.  The local branch will be configured so
-that it pulls from the new remote branch. If you give a double prefix
-argument to `P P', you will be prompted in addition for the target
-branch to push to.  In other words, it will run `git push <remote>
-<branch>:<target>'.
+that it pulls from the new remote branch.
 
-   Typing `f f' will run `git fetch'.  It will prompt for the name of
-the remote to update if there is no default one.  Typing `f o' will
-always prompt for the remote.  Typing `F F' will run `git pull'.  When
-you don't have a default branch configured to be pulled into the
-current one, you will be asked for it.
+   Typing `f f' will run `git remote update'.  With a prefix arg, it
+will prompt for the name of the remote to update.  Typing `F p' will
+run `git pull'.  When you don't have a default branch configured to be
+pulled into the current one, you will be asked for it.
 
    If there is a default remote repository for the current branch, Magit
 will show that repository in the status buffer header.
@@ -818,16 +711,16 @@ branch named `<remote>/<branch>'.  This section works just like the
 history buffer: you can see details about a commit with `RET', compare
 two of them with `.' and `=', and you can reset your current head to
 one of them with `x', for example. If you want to push the changes then
-type `P P'.
+type `P p'.
 
    When the remote branch has changes that are not in the current
 branch, Magit shows them in a section called _Unpulled changes_.  Typing
-`F F' will fetch and merge them into the current branch.
+`F p' will merge them into the current branch.
 
 
-File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Bisecting,  Up: Top
+File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Pushing and Pulling,  Up: Top
 
-22 Submodules
+20 Submodules
 *************
 
 `M u'
@@ -843,92 +736,22 @@ File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Bisec
      Synchronizes submodules' remote URL configuration setting to the
      value specified in .gitmodules.
 
-
-File: magit.info,  Node: Bisecting,  Next: Submodules,  Prev: Pushing and Pulling,  Up: Top
-
-23 Bisecting
-************
-
-Magit supports bisecting by showing how many revisions and steps are
-left to be tested in the status buffer. You can control the bisect
-session from both the status and from log buffers with the `B' key menu.
-
-   Typing `B s' will start a bisect session.  You will be prompted for
-a revision that is known to be bad (defaults to _HEAD_) and for a
-revision that is known to be good (defaults to the revision at point if
-there is one). git will select a revision for you to test, and Magit
-will update its status buffer accordingly.
-
-   You can tell git that the current revision is good with `B g', that
-it is bad with `B b' or that git should skip it with `B k'. You can
-also tell git to go into full automatic mode by giving it the name of a
-script to run for each revision to test with `B u'.
-
-   The current status can be shown as a log with `B l'. It contains the
-revisions that have already been tested and your decisions about their
-state.
-
-   The revisions left to test can be visualized in gitk with `B v'.
-
-   When you're finished bisecting you have to reset the session with `B
-r'.
-
 
 File: magit.info,  Node: Using Magit Extensions,  Next: Using Git Directly,  Prev: Submodules,  Up: Top
 
-24 Magit Extensions
+21 Magit Extensions
 *******************
 
 * Menu:
 
-* Activating extensions::
 * Interfacing with Subversion::
 * Interfacing with Topgit::
-* Interfacing with StGit::
 * Developing Extensions::
 
 
-File: magit.info,  Node: Activating extensions,  Next: Interfacing with Subversion,  Up: Using Magit Extensions
-
-24.1 Activating extensions
-==========================
-
-Magit comes with a couple of shipped extensions that allow interaction
-with `git-svn', `topgit' and `stgit'. See following sections for
-specific details on how to use them.
-
-   Extensions can be activated globally or on a per-repository basis.
-Since those extensions are implemented as minor modes, one can use for
-example `M-x magit-topgit-mode' to toggle the `topgit' extension,
-making the corresponding section and commands (un)available.
-
-   In order to do that automatically (and for every repository), one can
-use for example:
-
-     (add-hook 'magit-mode-hook 'turn-on-magit-topgit)
-
-   Magit also allows configuring different extensions, based on the git
-repository configuration.
-
-     (add-hook 'magit-mode-hook 'magit-load-config-extensions)
-
-   This will read git configuration variables and activate the relevant
-extensions.
-
-   For example, after running the following commands, the `topgit'
-extension will be loaded for every repository, while the `svn' one will
-be loaded only for the current one.
-
-     $ git config --global --add magit.extension topgit
-     $ git config --add magit.extension svn
-
-   Note the `--add' flag, which means that each extension gets its own
-line in the `config' file.
-
-
-File: magit.info,  Node: Interfacing with Subversion,  Next: Interfacing with Topgit,  Prev: Activating extensions,  Up: Using Magit Extensions
+File: magit.info,  Node: Interfacing with Subversion,  Next: Interfacing with Topgit,  Up: Using Magit Extensions
 
-24.2 Interfacing with Subversion
+21.1 Interfacing with Subversion
 ================================
 
 Typing `N r' runs `git svn rebase', typing `N c' runs `git svn dcommit'
@@ -940,9 +763,9 @@ the path of the remote Subversion repository. With a prefix (`C-u N s'
 the user will also be prompted for a branch to search in.
 
 
-File: magit.info,  Node: Interfacing with Topgit,  Next: Interfacing with StGit,  Prev: Interfacing with Subversion,  Up: Using Magit Extensions
+File: magit.info,  Node: Interfacing with Topgit,  Next: Developing Extensions,  Prev: Interfacing with Subversion,  Up: Using Magit Extensions
 
-24.3 Interfacing with Topgit
+21.2 Interfacing with Topgit
 ============================
 
 Topgit (http://repo.or.cz/r/topgit.git) is a patch queue manager that
@@ -958,38 +781,15 @@ prefix by convention. So, creating a "t/foo" branch will actually
 populate the "Topics" section with one more branch after committing
 `.topdeps' and `.topmsg'.
 
-   Also, the way we pull (see *Note Pushing and Pulling::) such a
+   Also, the way we pull (see *note Pushing and Pulling::) such a
 branch is slightly different, since it requires updating the various
 dependencies of that branch. This should be mostly transparent, except
 in case of conflicts.
 
 
-File: magit.info,  Node: Interfacing with StGit,  Next: Developing Extensions,  Prev: Interfacing with Topgit,  Up: Using Magit Extensions
-
-24.4 Interfacing with StGit
-===========================
-
-StGit (http://www.procode.org/stgit) is a Python application providing
-similar functionality to Quilt (i.e. pushing/popping patches to/from a
-stack) on top of Git. These operations are performed using Git commands
-and the patches are stored as Git commit objects, allowing easy merging
-of the StGit patches into other repositories using standard Git
-functionality.
-
-   `magit-stgit.el' provides basic integration with Magit, mostly by
-providing a "Series" section, whose patches can be seen as regular
-commits through the "visit" action.
-
-   You can change the current patch in a series with the "apply" action,
-as well as you can delete them using the "discard" action.
-
-   Additionally, the `magit-stgit-refresh' and `magit-stgit-rebase'
-commands let you perform the respective StGit operations.
-
-
-File: magit.info,  Node: Developing Extensions,  Prev: Interfacing with StGit,  Up: Using Magit Extensions
+File: magit.info,  Node: Developing Extensions,  Prev: Interfacing with Topgit,  Up: Using Magit Extensions
 
-24.5 Developing Extensions
+21.3 Developing Extensions
 ==========================
 
 Magit provides a generic mechanism to allow cooperation with Git-related
@@ -1064,29 +864,10 @@ systems, such as foreign VCS, patch systems,…
      take place in the "Extensions" submenu.
 
 
-   It is suggested that Magit extensions authors stick to the
-convention of making extensions minor modes. This has many advantages,
-including the fact that users are able to toggle extensions, and that
-it's easy to configure a specific set of extensions for a given
-repository.
-
-   Shipped extensions can serve as an example of how to develop new
-extensions.
-
-   Basically a `foo' extension should provide a `magit-foo-mode' minor
-mode, as well as a `turn-on-magit-foo' function.  The main task of the
-minor mode is to register/unregister the various hooks that the
-extension requires. The registered actions on the other hand can be
-left alone and activated globally, since they can be run only on
-displayed items, which won't happen when the minor mode is off.
-
-   Don't forget to call `magit-refresh' when the minor mode is toggled
-interactively, so that the relevant sections can be shown or hidden.
-
 
-File: magit.info,  Node: Using Git Directly,  Next: Customization,  Prev: Using Magit Extensions,  Up: Top
+File: magit.info,  Node: Using Git Directly,  Prev: Using Magit Extensions,  Up: Top
 
-25 Using Git Directly
+22 Using Git Directly
 *********************
 
 For situations when Magit doesn't do everything you need, you can run
@@ -1094,266 +875,39 @@ raw Git commands using `:'.  This will prompt for a Git command, run
 it, and refresh the status buffer.  The output can be viewed by typing
 `$'.
 
-
-File: magit.info,  Node: Customization,  Next: Frequently Asked Questions,  Prev: Using Git Directly,  Up: Top
-
-26 Customization
-****************
-
-The following variables can be used to adapt Magit to your workflow:
-
-`magit-git-executable'
-     The name of the Git executable.
-
-`magit-git-standard-options'
-     Standard options when running Git.
-
-`magit-repo-dirs'
-     Directories containing Git repositories.
-
-     Magit will look into these directories for Git repositories and
-     offer them as choices for `magit-status'.
-
-`magit-repo-dirs-depth'
-     The maximum depth to look for Git repos.
-
-     When looking for a Git repository below the directories in
-     `magit-repo-dirs', Magit will only descend this many levels deep.
-
-`magit-save-some-buffers'
-     Non-nil means that `magit-status' will save modified buffers
-     before running.  Setting this to `t' will ask which buffers to
-     save, setting it to `'dontask' will save all modified buffers
-     without asking.
-
-`magit-save-some-buffers-predicate'
-     Specifies a predicate function on `magit-save-some-buffers' to
-     determine which unsaved buffers should be prompted for saving.
-
-`magit-commit-all-when-nothing-staged'
-     Determines what `magit-log-edit' does when nothing is staged.
-     Setting this to `nil' will make it do nothing, setting it to `t'
-     will arrange things so that the actual commit command will use the
-     `--all' option, setting it to `'ask' will first ask for
-     confirmation whether to do this, and setting it to `'ask-stage'
-     will cause all changes to be staged, after a confirmation.
-
-`magit-commit-signoff'
-     When performing `git commit' adds `--signoff'.
-
-`magit-log-cutoff-length'
-     The maximum number of commits to show in the `log' and `whazzup'
-     buffers.
-
-`magit-log-infinite-length'
-     Number of log used to show as maximum for
-     `magit-log-cutoff-length'.
-
-`magit-log-auto-more'
-     Insert more log entries automatically when moving past the last
-     entry.
-
-     Only considered when moving past the last entry with
-     `magit-goto-next-section'.
-
-`magit-process-popup-time'
-     Popup the process buffer if a command takes longer than this many
-     seconds.
-
-`magit-revert-item-confirm'
-     Require acknowledgment before reverting an item.
-
-`magit-log-edit-confirm-cancellation'
-     Require acknowledgment before canceling the log edit buffer.
-
-`magit-remote-ref-format'
-     What format to use for autocompleting refs, in pariticular for
-     remotes.
-
-     Autocompletion is used by functions like `magit-checkout',
-     `magit-interactive-rebase' and others which offer branch name
-     completion.
-
-     The value `'name-then-remote' means remotes will be of the form
-     `name (remote)', while the value `'remote-slash-name' means that
-     they'll be of the form `remote/name'. I.e. something that's listed
-     as `remotes/upstream/next' by `git branch -l -a' will be
-     `upstream/next'.
-
-`magit-process-connection-type'
-     Connection type used for the git process.
-
-     `nil' mean pipe, it is usually faster and more efficient, and work
-     on cygwin.  `t' mean pty, it enable magit to prompt for passphrase
-     when needed.
-
-`magit-completing-read-function'
-     Function to be called when requesting input from the user.
-
-`magit-create-branch-behaviour'
-     Where magit will create a new branch if not supplied a branchname
-     or ref.
-
-     The value `'at-head' means a new branch will be created at the tip
-     of your current branch, while the value `'at-point' means magit
-     will try to find a valid reference at point...
-
-`magit-status-buffer-switch-function'
-     Function for `magit-status' to use for switching to the status
-     buffer.
-
-     The function is given one argument, the status buffer.
-
-`magit-rewrite-inclusive'
-     Whether magit includes the selected base commit in a rewrite
-     operation.
-
-     `t' means both the selected commit as well as any subsequent
-     commits will be rewritten. This is magit's default behaviour,
-     equivalent to `git rebase -i ${REV~1}'
-
-
-       A'---B'---C'---D'
-       ^
-
-     `nil' means the selected commit will be literally used as `base',
-     so only subsequent commits will be rewritten. This is consistent
-     with git-rebase, equivalent to `git rebase -i ${REV}', yet more
-     cumbersome to use from the status buffer.
-
-
-       A---B'---C'---D'
-       ^
-
-`magit-topgit-executable'
-     The name of the TopGit executable.
-
-`magit-topgit-branch-prefix'
-     Convention prefix for topic branch creation.
-
-
-
-File: magit.info,  Node: Frequently Asked Questions,  Prev: Customization,  Up: Top
-
-27 Frequently Asked Questions
-*****************************
-
-* Menu:
-
-* FAQ - Changes::
-* FAQ 1 - Troubleshooting::
-* FAQ 2 - Display issues::
-
-
-File: magit.info,  Node: FAQ - Changes,  Next: FAQ 1 - Troubleshooting,  Up: Frequently Asked Questions
-
-27.1 Changes
-============
-
-   * v1.1: Changed the way extensions work. Previously, they were
-     enabled unconditionally once the library was loaded. Now they are
-     minor modes that need to be activated explicitly (potentially on a
-     per-repository basis). See *Note Activating extensions::.
-
-
-
-File: magit.info,  Node: FAQ 1 - Troubleshooting,  Next: FAQ 2 - Display issues,  Prev: FAQ - Changes,  Up: Frequently Asked Questions
-
-27.2 Troubleshooting
-====================
-
-* Menu:
-
-* FAQ 1-1::    How do I get raw error messages from git?
-
-
-File: magit.info,  Node: FAQ 1-1,  Up: FAQ 1 - Troubleshooting
-
-27.2.1 Question 1.1
--------------------
-
-How do I get raw error messages from git?
-
-Answer
-......
-
-If a command goes wrong, you can hit `$' to access the git process
-buffer. There, the entire trace for the latest operation is available.
-
-
-File: magit.info,  Node: FAQ 2 - Display issues,  Prev: FAQ 1 - Troubleshooting,  Up: Frequently Asked Questions
-
-27.3 Display issues
-===================
-
-* Menu:
-
-* FAQ 2-1::    How do I fix international characters display?
-
-
-File: magit.info,  Node: FAQ 2-1,  Up: FAQ 2 - Display issues
-
-27.3.1 Question 2.1
--------------------
-
-How do I fix international characters display?
-
-Answer
-......
-
-Please make sure your Magit buffer uses a compatible coding system.  In
-the particular case of file names, git itself quotes them by default.
-You can disable this with one of the following approaches:
-
-     $ git config core.quotepath false
-
-   or
-
-     (setq magit-git-standard-options (append magit-git-standard-options
-                                              '("-c" "core.quotepath=false")))
-
-   The latter might not work in old versions of git.
-
 
 
 Tag Table:
-Node: Top639
-Node: Introduction1592
-Node: Acknowledgments3064
-Node: Sections3744
-Node: Status6294
-Node: Untracked files9033
-Node: Staging and Committing10237
-Node: History14135
-Node: Reflogs17315
-Node: Commit Buffer17719
-Node: Diffing19045
-Node: Tagging20032
-Node: Resetting20481
-Node: Stashing22005
-Node: Branching23063
-Node: The Branch Manager24441
-Node: Wazzup25157
-Node: Merging25948
-Node: Rebasing26998
-Node: Interactive Rebasing27824
-Node: Rewriting29116
-Node: Pushing and Pulling32141
-Node: Submodules34068
-Node: Bisecting34488
-Node: Using Magit Extensions35703
-Node: Activating extensions36000
-Node: Interfacing with Subversion37384
-Node: Interfacing with Topgit37982
-Node: Interfacing with StGit39010
-Node: Developing Extensions40008
-Node: Using Git Directly43786
-Node: Customization44157
-Node: Frequently Asked Questions48703
-Node: FAQ - Changes48934
-Node: FAQ 1 - Troubleshooting49342
-Node: FAQ 1-149590
-Node: FAQ 2 - Display issues49894
-Node: FAQ 2-150123
+Node: Top556
+Node: Introduction1120
+Node: Acknowledgments2591
+Node: Sections3215
+Node: Status5765
+Node: Untracked files8494
+Node: Staging and Committing9441
+Node: History12986
+Node: Reflogs15869
+Node: Diffing16267
+Node: Tagging16865
+Node: Resetting17313
+Node: Stashing18837
+Node: Branching19615
+Node: The branch list20598
+Node: Wazzup21586
+Node: Merging22374
+Node: Rebasing23425
+Node: Rewriting24240
+Node: Pushing and Pulling27095
+Node: Submodules28782
+Node: Using Magit Extensions29212
+Node: Interfacing with Subversion29456
+Node: Interfacing with Topgit30024
+Node: Developing Extensions31051
+Node: Using Git Directly33924
 
 End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/elpa/magit-1.0.0/magit.spec b/elpa/magit-1.0.0/magit.spec
new file mode 100644
index 000000000..6c200866e
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.spec
@@ -0,0 +1,44 @@
+Name:		magit
+Version:	1.0.0
+Release:	1%{?dist}
+Summary:	An Emacs Extension for Git
+BuildArch: noarch
+Group:		Development/Tools
+License:	GPLv3
+URL:		http://zagadka.vm.bytemark.co.uk/magit
+Source0:	%{url}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	texinfo, autoconf, automake, emacs
+Requires:	git, emacs
+
+%description
+Magit is an interface to the version control system Git, implemented
+as an extension to Emacs.
+
+%prep
+%setup -q
+
+%build
+%configure --prefix=/usr --sysconfdir=/etc --with-site-start=/usr/share/emacs/site-lisp/site-start.d
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/usr/share/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/usr/share/emacs/site-lisp/site-start.d/50magit.el
+/usr/share/emacs/site-lisp/magit.el
+/usr/share/emacs/site-lisp/magit.elc
+%doc README.md
+/usr/share/info/magit.info.gz
+
+%changelog
+* Sun Mar 14 2010	Ben Walton <bwalton@artsci.utoronto.ca>
+- Initial spec file creation.
diff --git a/elpa/magit-1.0.0/magit.spec.in b/elpa/magit-1.0.0/magit.spec.in
new file mode 100644
index 000000000..ae7ec453d
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.spec.in
@@ -0,0 +1,44 @@
+Name:		magit
+Version:	@VERSION@
+Release:	1%{?dist}
+Summary:	An Emacs Extension for Git
+BuildArch: noarch
+Group:		Development/Tools
+License:	GPLv3
+URL:		http://zagadka.vm.bytemark.co.uk/magit
+Source0:	%{url}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	texinfo, autoconf, automake, emacs
+Requires:	git, emacs
+
+%description
+Magit is an interface to the version control system Git, implemented
+as an extension to Emacs.
+
+%prep
+%setup -q
+
+%build
+%configure --prefix=/usr --sysconfdir=/etc --with-site-start=/usr/share/emacs/site-lisp/site-start.d
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/usr/share/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/usr/share/emacs/site-lisp/site-start.d/50magit.el
+/usr/share/emacs/site-lisp/magit.el
+/usr/share/emacs/site-lisp/magit.elc
+%doc README.md
+/usr/share/info/magit.info.gz
+
+%changelog
+* Sun Mar 14 2010	Ben Walton <bwalton@artsci.utoronto.ca>
+- Initial spec file creation.
diff --git a/elpa/magit-1.0.0/magit.texi b/elpa/magit-1.0.0/magit.texi
new file mode 100644
index 000000000..aeac0c271
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.texi
@@ -0,0 +1,847 @@
+\input texinfo.tex    @c -*-texinfo-*-
+@c %**start of header
+@setfilename magit.info
+@settitle Magit User Manual
+@documentencoding utf-8
+@c %**end of header
+
+@dircategory Emacs
+@direntry
+* Magit: (magit).        Using Git from Emacs with Magit.
+@end direntry
+
+@copying
+Copyright @copyright{} 2008, 2009, 2011 Marius Vollmer
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.
+@end quotation
+@end copying
+
+@node Top
+@top Magit User Manual
+
+Magit is an interface to the version control system Git, implemented
+as an extension to Emacs.
+
+@menu
+* Introduction::
+* Acknowledgments::
+* Sections::
+* Status::
+* Untracked files::
+* Staging and Committing::
+* History::
+* Reflogs::
+* Diffing::
+* Tagging::
+* Resetting::
+* Stashing::
+* Branching::
+* The branch list::
+* Wazzup::
+* Merging::
+* Rebasing::
+* Rewriting::
+* Pushing and Pulling::
+* Submodules::         
+* Using Magit Extensions::
+* Using Git Directly::
+@end menu
+
+@node Introduction
+@chapter Introduction
+
+With Magit, you can inspect and modify your Git repositories with
+Emacs.  You can review and commit the changes you have made to the
+tracked files, for example, and you can browse the history of past
+changes.  There is support for cherry picking, reverting, merging,
+rebasing, and other common Git operations.
+
+Magit is not a complete interface to Git; it just aims to make the
+most common Git operations convenient.  Thus, Magit will likely not
+save you from learning Git itself.
+
+This manual provides a tour of all Magit features.  It does not give a
+introduction to version control in general, or to Git in particular.
+
+The main entry point to Magit is @kbd{M-x magit-status}, which will
+put you in Magit's status buffer.  You will be using it frequently, so
+it is probably a good idea to bind @code{magit-status} to a key of
+your choice.
+
+In addition to the status buffer, Magit will also create buffers that
+show lists of commits, buffers with diffs, and other kinds of buffers.
+All these buffers are in @code{magit-mode} and have the same key
+bindings.  Not all commands make sense in all contexts, but a given
+key will always do the same thing in all Magit buffers.
+
+Naturally, Magit runs the @code{git} command to do most of the work.
+The @code{*magit-process*} buffer contains the transcript of the most
+recent command.  You can switch to it with @kbd{$}.
+
+@node Acknowledgments
+@chapter Acknowledgments
+
+From day one of the first Magit announcement, John Wiegley has
+contributed numerous fixes, UI improvements, and new features.
+Thanks!
+
+Linh Dang and Christian Neukirchen also contributed from day one.
+Thanks!
+
+Phil Hagelberg joined a few days later.  Thanks!
+
+Alex Ott contributed support for git svn.  Thanks!
+
+Marcin Bachry contributed bug fixes and support for decorated logs.
+Thanks!
+
+Alexey Voinov fixed bugs.  Thanks!
+
+Rémi Vanicat helped with Tramp support.  Thanks!
+
+@node Sections
+@chapter Sections
+
+All Magit buffers are structured into nested 'sections'.  These
+sections can be hidden and shown individually.  When a section is
+hidden, only its first line is shown and all its children are
+completely invisible.
+
+The most fine-grained way to control the visibility of sections is the
+@kbd{TAB} key.  It will to toggle the current section (the section
+that contains point) between being hidden and being shown.
+
+Typing @kbd{S-TAB} toggles the visibility of the children of the
+current section.  When all of them are shown, they will all be hidden.
+Otherwise, when some or all are hidden, they will all be shown.
+
+The digit keys @kbd{1}, @kbd{2}, @kbd{3}, and @kbd{4} control the
+visibility of sections based on levels.  Hitting @kbd{2}, for example,
+will show sections on levels one and two, and will hide sections on
+level 3.  However, only sections that are a parent or child of the
+current section are affected.
+
+For example, when the current section is on level 3 and you hit
+@kbd{1}, the grand-parent of the current section (which is on level
+one) will be shown, and the parent of the current section (level 2)
+will be hidden.  The visibility of no other section will be changed.
+
+This sounds a bit complicated, but you'll figure it out.
+
+Using @kbd{M-1}, @kbd{M-2}, @kbd{M-3}, and @kbd{M-4} is similar to the
+unmodified digits, but now all sections on the respective level are
+affected, regardless of whether or not they are related to the current
+section.
+
+For example, @kbd{M-1} will only show the first lines of the top-level
+sections and will hide everything else.  Typing @kbd{M-4} on the other
+hand will show everything.
+
+Because of the way the status buffer is set up, some changes to
+section visibility are more common than others.  Files are on level 2
+and diff hunks are on level 4.  Thus, you can type @kbd{2} to collapse
+the diff of the current file, and @kbd{M-2} to collapse all files.
+This returns the status buffer to its default setup and is a quick way
+to unclutter it after drilling down into the modified files.
+
+Because @kbd{2} and @kbd{M-2} are so common in the status buffer, they
+are bound to additional, more mnemonic keys: @kbd{M-h} (hide) and
+@kbd{M-H} (hide all).  Likewise @kbd{4} and @kbd{M-4} are also
+available as @kbd{M-s} (show) and @kbd{M-S} (show all).
+
+In other buffers than the status buffer, @kbd{M-h}, @kbd{M-H},
+@kbd{M-s}, and @kbd{M-S} might work on different levels than on 2 and
+4, but they keep their general meaning: @kbd{M-H} hides all detail,
+and @kbd{M-S} shows everything.
+
+@node Status
+@chapter Status
+
+Running @kbd{M-x magit-status} displays the main interface of Magit,
+the status buffer.  You can have multiple status buffers active at the
+same time, each associated with its own Git repository.
+
+When invoking @kbd{M-x magit-status} from within a Git repository, it
+will switch to the status buffer of that repository.  Otherwise, it
+will prompt for a directory.  With a prefix argument, it will always
+prompt.
+
+You can set @code{magit-repo-dirs} to customize how
+@code{magit-status} asks for the repository to work on.  When
+@code{magit-repo-dirs} is nil, @code{magit-status} will simply ask for
+a directory.
+
+If you specify a directory that is not a Git repository, @kbd{M-x
+magit-status} will offer to initialize it as one.
+
+When @code{magit-repo-dirs} is not nil, it is treated as a list of
+directory names, and @code{magit-status} will find all Git
+repositories in those directories and offer them for completion.
+(Magit will only look @code{magit-repo-dirs-depth} levels deep,
+however.)
+
+With two prefix arguments, @code{magit-status} will always prompt for
+a raw directory.
+
+Thus, you would normally set @code{magit-repo-dirs} to the places
+where you keep most of your Git repositories and switch between them
+with @kbd{C-u M-x magit-status}.  If you want to go to a repository
+outside of your normal working areas, or if you want to create a new
+repository, you would use @kbd{C-u C-u M-x magit-status}.
+
+You need to explicitly refresh the status buffer when you have made
+changes to the repository from outside of Emacs.  You can type @kbd{g}
+in the status buffer itself, or just use @kbd{M-x magit-status}
+instead of @kbd{C-x b} when switching to it.  You also need to refresh
+the status buffer in this way after saving a file in Emacs.
+
+The header at the top of the status buffer shows a short summary of
+the repository state: where it is located, which branch is checked
+out, etc.  Below the header are a number of sections that show details
+about the working tree and the staging area.  You can hide and show
+them as described in the previous section.
+
+The first section shows @emph{Untracked files}, if there are any.  See
+@ref{Untracked files} for more details.
+
+Two section show your local changes.  They are explained fully in the
+next chapter, @ref{Staging and Committing}.
+
+If the current branch is associated with a remote tracking branch, the
+status buffer shows the differences between the current branch and the
+tracking branch.  See @ref{Pushing and Pulling} for more information.
+
+During a history rewriting session, the status buffer shows the
+@emph{Pending changes} and @emph{Pending commits} sections.  See
+@ref{Rewriting} for more details.
+
+@node Untracked files
+@chapter Untracked files
+
+Untracked files are shown in the @emph{Untracked files} section.
+
+You can add a untracked file to the staging area with @kbd{s}.  If
+point is on the @emph{Untracked files} section title when you it
+@kbd{s}, all untracked files are staged.
+
+Typing @kbd{C-u S} anywhere will also stage all untracked files,
+together with all changes to the tracked files.
+
+You can instruct Git to ignore them by typing @kbd{i}.  This will add
+the filename to the @code{.gitignore} file.  Typing @kbd{C-u i} will
+ask you for the name of the file to ignore.  This is useful to ignore
+whole directories, for example.  The @kbd{I} command is similar to
+@kbd{i} but will add the file to @code{.git/info/exclude} instead.
+
+To delete a untracked file forever, use @kbd{k}.  If point is on the
+@emph{Untracked files} section title when you it @kbd{k}, all
+untracked files are deleted.
+
+@node Staging and Committing
+@chapter Staging and Committing
+
+Comitting with Git is a two step process: first you add the changes
+you want to commit to a 'staging area', and then you commit them to
+the repository.  This allows you to only commit a subset of your local
+changes.
+
+Magit allows you to ignore the staging area if you wish.  As long as
+your staging area is unused, Magit will show your uncomitted changes
+in a section named @emph{Changes}.
+
+When the staging area is in use, Magit uses two sections:
+@emph{Unstaged changes} and @emph{Staged changes}.  The @emph{Staged
+changes} section shows the changes that will be included in the next
+commit, while the @emph{Unstaged changes} section shows the changes
+that will be left out.
+
+To move a unstaged hunk into the staging area, move point into the
+hunk and type @kbd{s}.  Likewise, to unstage a hunk, move point into
+it and type @kbd{u}.  If point is in a diff header when you type
+@kbd{s} or @kbd{u}, all hunks belonging to that diff are moved at the
+same time.
+
+If the region is active when you type @kbd{s} or @kbd{u}, only the
+changes in the region are staged or unstaged.  (This works line by
+line: if the beginning of a line is in the region it is included in
+the changes, otherwise it is not.)
+
+Typing @kbd{C-u s} will ask you for a name of a file to be staged, for
+example to stage files that are hidden.
+
+To move all hunks of all diffs into the staging area in one go, type
+@kbd{S}.  To unstage everything, type @kbd{U}.
+
+Typing @kbd{C-u S} will stage all untracked files in addition to the
+changes to tracked files.
+
+You can discard uncommitted changes by moving point into a hunk and
+typing @kbd{k}.  The changes to discard are selected as with @kbd{s}
+and @kbd{u}.
+
+Before committing, you should write a short description of the
+changes.
+
+Type @kbd{c} to pop up a buffer where you can write your change
+description.  Once you are happy with the description, type @kbd{C-c
+C-c} in that buffer to perform the commit.
+
+If you want to write changes in a @file{ChangeLog} file, you can use
+@kbd{C-x 4 a} on a diff hunk.
+
+Typing @kbd{c} when the staging area is unused is a special situation.
+Normally, the next commit would be empty, but you can configure Magit
+to do something more useful by customizing the
+@code{magit-commit-all-when-nothing-staged} variable.  One choice is
+to instruct the subsequent @kbd{C-c C-c} to commit all changes.
+Another choice is stage everything at the time of hitting @kbd{c}.
+
+You can type @kbd{C-c C-a} in the buffer with the change description
+to toggle a flag that determines whether the next commit will
+@emph{amend} the current commit in HEAD.
+
+Typing @kbd{C-c C-s} will toggle the @code{--signoff} option.  The
+default is determined by the @code{magit-commit-signoff} customization
+variable.
+
+Typing @kbd{C-c C-e} will toggle the @code{--allow-empty} option.  This
+allows you to make commits that serve as notes, without including any
+changes.
+
+If you change your mind and don't want to go ahead with your commit
+while you are in the @code{*magit-log-edit*} buffer, you can just
+switch to another buffer, continue editing there, staging and
+unstaging things until you are happy, and then return to the
+@code{*magit-log-edit*} buffer, maybe via @kbd{C-x b}, or by hitting
+@kbd{c} again in a Magit buffer.
+
+If you want to erase the @code{*magit-log-edit*} buffer and bury it,
+you can hit @kbd{C-c C-k} in it.
+
+Typing @kbd{C} will also pop up the change description buffer, but in
+addition, it will try to insert a ChangeLog-style entry for the change
+that point is in.
+
+@node History
+@chapter History
+
+To show the repository history of your current head, type @kbd{l l}.  A
+new buffer will be shown that displays the history in a terse form.
+The first paragraph of each commit message is displayed, next to a
+representation of the relationships between commits.
+
+Giving a prefix argument to @kbd{l} will ask for the starting and end
+point of the history.  This can be used to show the commits that are
+in one branch, but not in another, for example.  The start point can
+also be a range of revisions ``r1..r2''.  In that case ``r1'' is used
+as the start and ``r2'' as the end point of the history.
+
+Typing @kbd{l L} (or @kbd{l C-u L}) will show the log in a more verbose
+form.
+
+Magit will show only @code{magit-log-cutoff-length} entries. @kbd{e}
+will show twice as many entries. @kbd{C-u e} will show all entries,
+and given a numeric prefix argument, @kbd{e} will add this number of
+entries. You can also show more entries by typing @kbd{RET} on the
+text appended at the end of the buffer.
+
+You can move point to a commit and then cause various things to happen
+with it.  (The following commands work in any list of commit, such as
+the one shown in the @emph{Unpushed commits} section.)
+
+Typing @kbd{RET} will pop up more information about the current commit
+and move point into the new buffer.  Typing @kbd{SPC} and @kbd{DEL}
+will also show the information, but will scroll the new buffer up or
+down (respectively) when typed again.
+
+Typing @kbd{a} will apply the current commit to your current branch.
+This is useful when you are browsing the history of some other branch
+and you want to `cherry-pick' some changes from it.  A typical
+situation is applying selected bug fixes from the development version
+of a program to a release branch.  The cherry-picked changes will not
+be committed automatically; you need to do that explicitly.
+
+Typing @kbd{A} will cherry-pick the current commit and will also
+commit the changes automatically when there have not been any
+conflicts.
+
+Typing @kbd{v} will revert the current commit.  Thus, it will apply
+the changes made by that commit in reverse.  This is obviously useful
+to cleanly undo changes that turned out to be wrong.  As with @kbd{a},
+you need to commit the changes explicitly.
+
+Typing @kbd{C-w} will copy the sha1 of the current commit into the
+kill ring.
+
+Typing @kbd{=} will show the differences from the current commit to
+the @dfn{marked} commit.
+
+You can mark the current commit by typing @kbd{.}.  When the current
+commit is already marked, typing @kbd{.} will unmark it.  To unmark
+the marked commit no matter where point is, use @kbd{C-u .}.
+
+Some commands, such as @kbd{=}, will use the current commit and the
+marked commit as implicit arguments.  Other commands will offer the
+marked commit as a default when prompting for their arguments.
+
+To grep the history press @kbd{s}.
+
+@node Reflogs
+@chapter Reflogs
+
+You can use @kbd{l h} and @kbd{l H} to browse your @emph{reflog}, the
+local history of changes made to your repository heads.  Typing
+@kbd{H} will ask for a head, while @kbd{l h} will show the reflog of
+@code{HEAD}.
+
+The resulting buffer is just like the buffer produced by @kbd{l l} and
+@kbd{l L} that shows the commit history.
+
+@node Diffing
+@chapter Diffing
+
+To show the changes from you working tree to another revision, type
+@kbd{d}.  To show the changes between two arbitrary revisions, type
+@kbd{D}.
+
+You can use @kbd{a} within the diff output to apply the changes to
+your working tree.  As usual when point is in a diff header for a
+file, all changes for that file are applied, and when it is in a hunk,
+only that hunk is.  When the region is active, the applied changes are
+restricted to that region.
+
+Typing @kbd{v} will apply the selected changes in reverse.
+
+@node Tagging
+@chapter Tagging
+
+Typing @kbd{t t} will make a lighweight tag.  Typing @kbd{t T} will
+make a annotated tag.  It will put you in the normal
+@code{*magit-log-edit} buffer for writing commit messages, but typing
+@kbd{C-c C-c} in it will make the tag instead.  This is controlled by
+the @code{Tag} field that will be added to the @code{*magit-log-edit*}
+buffer.  You can edit it, if you like.
+
+@node Resetting
+@chapter Resetting
+
+Once you have added a commit to your local repository, you can not
+change that commit anymore in any way.  But you can reset your current
+head to an earlier commit and start over.
+
+If you have published your history already, rewriting it in this way
+can be confusing and should be avoided.  However, rewriting your local
+history is fine and it is often cleaner to fix mistakes this way than
+by reverting commits (with @kbd{v}, for example).
+
+Typing @kbd{x} will ask for a revision and reset your current head to
+it.  No changes will be made to your working tree and staging area.
+Thus, the @emph{Staged changes} section in the status buffer will show
+the changes that you have removed from your commit history.  You can
+commit the changes again as if you had just made them, thus rewriting
+history.
+
+Typing @kbd{x} while point is in a line that describes a commit will
+offer this commit as the default revision to reset to.  Thus, you can
+move point to one of the commits in the @emph{Unpushed commits}
+section and hit @kbd{x RET} to reset your current head to it.
+
+Type @kbd{X} to reset your working tree and staging area to the most
+recently committed state.  This will discard your local modifications,
+so be careful.
+
+You can give a prefix to @kbd{x} if you want to reset both the current
+head and your working tree to a given commit.  This is the same as
+first using an unprefixed @kbd{x} to reset only the head, and then
+using @kbd{X}.
+
+@node Stashing
+@chapter Stashing
+
+You can create a new stash with @kbd{z z}.  Your stashes will be listed
+in the status buffer, and you can apply them with @kbd{a} and pop them
+with @kbd{A}.  To drop a stash, use @kbd{k}.
+
+With a prefix argument, both @kbd{a} and @kbd{A} will attempt to
+reinstate the index as well as the working tree from the stash.
+
+Typing @kbd{z Z} will create a stash just like @kbd{z z}, but will
+leave the changes in your working tree and index.
+
+You can visit and show stashes in the usual way: Typing @kbd{SPC} and
+@kbd{DEL} will pop up a buffer with the description of the stash and
+scroll it, typing @kbd{RET} will move point into that buffer. Using
+@kbd{C-u RET} will move point into that buffer in other window.
+
+@node Branching
+@chapter Branching
+
+The current branch is indicated in the header of the status buffer.
+You can switch to a different branch by typing @kbd{b c}.  This will
+immediately checkout the branch into your working copy, so you
+shouldn't have any local modifications when switching branches.
+
+If you try to switch to a remote branch, Magit will offer to create a
+local tracking branch for it instead.  This way, you can easily start
+working on new branches that have appeared in a remote repository.
+
+Typing @kbd{b c} while point is at a commit description will offer
+that commit as the default to switch to.  This will result in a
+detached head.
+
+To create a new branch and switch to it immediately, type @kbd{b B}.
+
+Typing @kbd{b V} will list the local and remote branches in a new buffer
+called @code{*magit-branches*} from which you can work with them. See
+@ref{The branch list} for more details.
+
+
+@node The branch list
+@chapter The branch list
+
+The branch list is a separate buffer called @code{*magit-branches*}
+with its own local key map. The keybindings are modeled after magit's
+main buffer. The buffer contains both local and remote branches. The
+current local branch is marked by a ``*'' in front of the name.
+
+Typing @kbd{k} will delete the branch in the current line, and
+@kbd{C-u k} deletes it even if it hasn't been merged into the current
+local branch. Deleting works for both local and remote branches.
+
+You can merge the branch in the current line by typing @kbd{m m} for a
+manual merge and @kbd{m m} for an automatic merge.
+
+With @kbd{RET} or @kbd{b b} you can check out the branch in the current
+line.
+
+Typing @kbd{$} shows the @code{*magit-process*} buffer which contains
+the transcript of the most recent command.
+
+Typing @kbd{V} will refresh the branch list. @kbd{q} buries the branch
+list buffer and deletes its window.
+
+
+@node Wazzup
+@chapter Wazzup
+
+Typing @kbd{w} will show a summary of how your other branches relate
+to the current branch.
+
+For each branch, you will get a section that lists the commits in that
+branch that are not in the current branch.  The sections are initially
+collapsed; you need to explicitly open them with @kbd{TAB} (or
+similar) to show the lists of commits.
+
+When point is on a @emph{N unmerged commits in ...} title, the
+corresponding branch will be offered as the default for a merge.
+
+Hitting @kbd{i} on a branch title will ignore this branch in the
+wazzup view.  You can use @kbd{C-u w} to show all branches, including
+the ignored ones.  Hitting @kbd{i} on an already ignored branch in
+that view will unignore it.
+
+@node Merging
+@chapter Merging
+
+Magit offers two ways to merge branches: manually and automatic.  A
+manual merge will apply all changes to your working tree and staging
+area, but will not commit them, while a automatic merge will go ahead
+and commit them immediately.
+
+Type @kbd{m m} to initiate merge.
+
+After initiating a merge, the header of the status buffer might remind
+you that the next commit will be a merge commit (with more than one
+parent).  If you want to abort a manual merge, just do a hard reset to
+HEAD with @kbd{X}.
+
+Merges can fail if the two branches you merge want to introduce
+conflicting changes.  In that case, the automatic merge stops before the
+commit, essentially falling back to a manual merge.  You need to resolve
+the conflicts for example with @kbd{e} and stage the resolved files, for
+example with @kbd{S}.
+
+You can not stage individual hunks one by one as you resolve them, you
+can only stage whole files once all conflicts in them have been
+resolved.
+
+@node Rebasing
+@chapter Rebasing
+
+Typing @kbd{R} in the status buffer will initiate a rebase or, if one
+is already in progress, ask you how to continue.
+
+When a rebase is stopped in the middle because of a conflict, the
+header of the status buffer will indicate how far along you are in the
+series of commits that are being replayed.  When that happens, you
+should resolve the conflicts and stage everything and hit @kbd{R c} to
+continue the rebase.  Alternatively, hitting @kbd{c} or @kbd{C} while
+in the middle of a rebase will also ask you whether to continue the
+rebase.
+
+Of course, you can initiate a rebase in any number of ways, by
+configuring @code{git pull} to rebase instead of merge, for example.
+Such a rebase can be finished with @kbd{R} as well.
+
+@node Rewriting
+@chapter Rewriting
+
+As hinted at earlier, you can rewrite your commit history.  For
+example, you can reset the current head to an earlier commit with
+@kbd{x}.  This leaves the working tree unchanged, and the status
+buffer will show all the changes that have been made since that new
+value of the current head.  You can commit these changes again,
+possibly splitting them into multiple commits as you go along.
+
+Amending your last commit is a common special case of rewriting
+history like this.
+
+Another common way to rewrite history is to reset the head to an
+earlier commit, and then to cherry pick the previous commits in a
+different order.  You could pick them from the reflog, for example.
+
+Magit has several commands that can simplify the book keeping
+associated with rewriting.  These commands all start with the @kbd{r}
+prefix key.
+
+Typing @kbd{r b} will start a rewrite operation.  You will be prompted
+for a @emph{base} commit, and all commits between the current head and
+this commit are put in a list of @emph{Pending commits} (including the
+base commit).  The current head will then be reset to the parent of
+the base commit.
+
+You would then typically use @kbd{a} and @kbd{A} to cherry pick
+commits from the list of pending commits in the desired order, until
+all have been applied.  Magit shows which commits have been applied by
+changing their marker from @code{*} to @code{.}.
+
+Using @kbd{A} will immediately commit the commit (as usual).  If you
+want to combine multiple previous commits into a single new one, use
+@kbd{a} to apply them all to your working tree, and then commit them
+together.
+
+Magit has no explicit support for rewriting merge commits.  It will
+happily include merge commits in the list of pending commits, but
+there is no way of replaying them automatically.  You have to redo the
+merge explicitly.
+
+You can also use @kbd{v} to revert a commit when you have changed your
+mind.  This will change the @code{.} mark back to @code{*}.
+
+Once you are done with the rewrite, type @kbd{r t} to remove the book
+keeping information from the status buffer.
+
+If you rather wish to start over, type @kbd{r a}.  This will abort the
+rewriting, resetting the current head back to the value it had before
+the rewrite was started with @kbd{r s}.
+
+Typing @kbd{r f} will @emph{finish} the rewrite: it will apply all
+unused commits one after the other, as if you would us @kbd{A} with
+all of them.
+
+You can change the @kbd{*} and @kbd{.} marks of a pending commit
+explicitly with @kbd{r *} and @kbd{r .}.
+
+In addition to a list of pending commits, the status buffer will show
+the @emph{Pending changes}.  This section shows the diff between the
+original head and the current head.  You can use it to review the
+changes that you still need to rewrite, and you can apply hunks from
+it, like from any other diff.
+
+@node Pushing and Pulling
+@chapter Pushing and Pulling
+
+Magit will run @code{git push} when you type @kbd{P p}.  If you give a
+prefix argument to @kbd{P p}, you will be prompted for the repository to
+push to.  When no default remote repository has been configured yet for
+the current branch, you will be prompted as well.  Typing @kbd{P p} will
+only push the current branch to the remote.  In other words, it will run
+@code{git push <remote> <branch>}.  The branch will be created in the
+remote if it doesn't exist already.  The local branch will be configured
+so that it pulls from the new remote branch.
+
+Typing @kbd{f f} will run @code{git remote update}.  With a prefix
+arg, it will prompt for the name of the remote to update.  Typing
+@kbd{F p} will run @code{git pull}.  When you don't have a default
+branch configured to be pulled into the current one, you will be asked
+for it.
+
+If there is a default remote repository for the current branch, Magit
+will show that repository in the status buffer header.
+
+In this case, the status buffer will also have a @emph{Unpushed
+commits} section that shows the commits on your current head that are
+not in the branch named @code{<remote>/<branch>}.  This section works
+just like the history buffer: you can see details about a commit with
+@kbd{RET}, compare two of them with @kbd{.} and @kbd{=}, and you can
+reset your current head to one of them with @kbd{x}, for example. If
+you want to push the changes then type @kbd{P p}.
+
+When the remote branch has changes that are not in the current branch,
+Magit shows them in a section called @emph{Unpulled changes}.  Typing
+@kbd{F p} will merge them into the current branch.
+
+@node Submodules
+@chapter Submodules
+
+@table @kbd
+@item M u
+Update the submodules, with a prefix argument it will initializing.
+
+@item M i
+Initialize the submodules.
+
+@item M b
+Update and initialize the submodules in one go.
+
+@item M s
+Synchronizes submodules' remote URL configuration setting to the value
+specified in .gitmodules.
+@end table
+
+
+@node Using Magit Extensions
+@chapter Magit Extensions
+
+@menu
+* Interfacing with Subversion::
+* Interfacing with Topgit::
+* Developing Extensions::
+@end menu
+
+
+@node Interfacing with Subversion
+@section Interfacing with Subversion
+
+Typing @kbd{N r} runs @code{git svn rebase}, typing @kbd{N c} runs
+@code{git svn dcommit} and typing @kbd{N f} runs @code{git svn fetch}.
+
+@kbd{N s} will prompt you for a (numeric, Subversion) revision and
+then search for a corresponding Git sha1 for the commit. This is
+limited to the path of the remote Subversion repository. With a prefix
+(@kbd{C-u N s} the user will also be prompted for a branch to search
+in.
+
+@node Interfacing with Topgit
+@section Interfacing with Topgit
+
+Topgit (http://repo.or.cz/r/topgit.git) is a patch queue manager that
+aims at being close as possible to raw Git, which makes it easy to use
+with Magit. In particular, it does not require to use a different set of
+commands for ``commit'', ``update'',… operations.
+
+@file{magit-topgit.el} provides basic integration with Magit, mostly by
+providing a ``Topics'' section.
+
+Topgit branches can be created the regular way, by using a ``t/'' prefix
+by convention. So, creating a ``t/foo'' branch will actually populate
+the ``Topics'' section with one more branch after committing
+@file{.topdeps} and @file{.topmsg}.
+
+Also, the way we pull (see @ref{Pushing and Pulling}) such a branch is
+slightly different, since it requires updating the various dependencies
+of that branch. This should be mostly transparent, except in case
+of conflicts.
+
+@node Developing Extensions
+@section Developing Extensions
+
+Magit provides a generic mechanism to allow cooperation with Git-related
+systems, such as foreign VCS, patch systems,…
+
+In particular it allows to:
+
+@itemize @bullet
+@item
+Define sections to display specific informations about the current state
+of the repository, and place them relatively to existing sections.
+
+@code{magit-define-inserter} automagically defines two hooks called
+@code{magit-before-insert-SECTION-hook} and
+@code{magit-after-insert-SECTION-hook} that allow to generate and place
+more sections.
+
+In the following example, we use the builtin ``stashes'' section to
+place our own ``foo'' one.
+
+@example
+(magit-define-inserter foo ()
+  (magit-git-section 'foo
+                     "Foo:" 'foo-wash-function
+                     "foo" "arg1" "arg2"))
+(add-hook 'magit-after-insert-stashes-hook 'magit-insert-foo)
+@end example
+
+@item
+Define new types of objects in those sections.
+
+The function @code{foo-wash-function} defined above post-processes each
+line of the output of the ``git foo arg1 arg2'' command, and is able to
+associate a type to certain lines.
+
+A simple implementation could be:
+
+@example
+(defun foo-wash-function ()
+  (let ((foo (buffer-substring (line-beginning-position) (line-end-position))))
+    (goto-char (line-beginning-position))
+    (magit-with-section foo 'foo
+      (magit-set-section-info foo)
+      (forward-line))))
+@end example
+
+In this case, every line of the command output is transformed into an
+object of type @code{'foo}.
+
+@item
+Alter behavior of generic commands to dispatch them correctly to the
+relevant system, optionally making use of the newly defined types.
+
+@example
+(magit-add-action (item info "discard")
+  ((foo)
+   (do-something-meaningful-for-discarding-a-foo)))
+@end example
+
+This will alter the behavior of @kbd{k}, when applied to those objects.
+
+@item
+Plug a different logic into basic commands, to reflect the presence of
+the extension.
+
+@code{magit-define-command} automagically defines
+a @code{magit-CMD-command-hook} that can contain a list of functions to
+call before the actual core code. Execution stops after the first hook
+that returns a non-nil value. This leaves room for extension logic.
+
+@example
+(add-hook 'magit-create-branch-command-hook 'foo-create-branch)
+@end example
+
+The function @code{foo-create-branch} will be called each time an
+attempt is made to create a branch, and can, for example, react to
+a certain name convention.
+
+@item
+Define new commands and associated menu.
+
+This part is not really specific to extensions, except that menus take
+place in the ``Extensions'' submenu.
+
+@end itemize
+
+@node Using Git Directly
+@chapter Using Git Directly
+
+For situations when Magit doesn't do everything you need, you can run
+raw Git commands using @kbd{:}.  This will prompt for a Git command, run
+it, and refresh the status buffer.  The output can be viewed by typing
+@kbd{$}.
+
+@bye
diff --git a/elpa/magit-1.2.0/dir b/elpa/magit-1.2.0/dir
deleted file mode 100644
index 2e646dbd8..000000000
--- a/elpa/magit-1.2.0/dir
+++ /dev/null
@@ -1,18 +0,0 @@
-This is the file .../info/dir, which contains the
-topmost node of the Info hierarchy, called (dir)Top.
-The first time you invoke Info you start off looking at this node.
-
-File: dir,	Node: Top	This is the top of the INFO tree
-
-  This (the Directory node) gives a menu of major topics.
-  Typing "q" exits, "?" lists all Info commands, "d" returns here,
-  "h" gives a primer for first-timers,
-  "mEmacs<Return>" visits the Emacs manual, etc.
-
-  In Emacs, you can click mouse button 2 on a menu item or cross reference
-  to select it.
-
-* Menu:
-
-Emacs
-* Magit: (magit).        Using Git from Emacs with Magit.
diff --git a/elpa/magit-1.2.0/magit-autoloads.el b/elpa/magit-1.2.0/magit-autoloads.el
deleted file mode 100644
index c9dc02173..000000000
--- a/elpa/magit-1.2.0/magit-autoloads.el
+++ /dev/null
@@ -1,164 +0,0 @@
-;;; magit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads (magit-status) "magit" "magit.el" (21031 23266
-;;;;;;  0 0))
-;;; Generated autoloads from magit.el
-
-(autoload 'magit-status "magit" "\
-Open a Magit status buffer for the Git repository containing
-DIR.  If DIR is not within a Git repository, offer to create a
-Git repository in DIR.
-
-Interactively, a prefix argument means to ask the user which Git
-repository to use even if `default-directory' is under Git control.
-Two prefix arguments means to ignore `magit-repo-dirs' when asking for
-user input.
-
-\(fn DIR)" t nil)
-
-;;;***
-
-;;;### (autoloads (magit-blame-mode) "magit-blame" "magit-blame.el"
-;;;;;;  (21031 23265 0 0))
-;;; Generated autoloads from magit-blame.el
-
-(autoload 'magit-blame-mode "magit-blame" "\
-Display blame information inline.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads (turn-on-magit-stgit magit-stgit-mode) "magit-stgit"
-;;;;;;  "magit-stgit.el" (21031 23265 0 0))
-;;; Generated autoloads from magit-stgit.el
-
-(autoload 'magit-stgit-mode "magit-stgit" "\
-StGit support for Magit
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-magit-stgit "magit-stgit" "\
-Unconditionally turn on `magit-stgit-mode'.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (turn-on-magit-svn magit-svn-mode) "magit-svn"
-;;;;;;  "magit-svn.el" (21031 23265 0 0))
-;;; Generated autoloads from magit-svn.el
-
-(autoload 'magit-svn-mode "magit-svn" "\
-SVN support for Magit
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-magit-svn "magit-svn" "\
-Unconditionally turn on `magit-svn-mode'.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (turn-on-magit-topgit magit-topgit-mode) "magit-topgit"
-;;;;;;  "magit-topgit.el" (21031 23265 0 0))
-;;; Generated autoloads from magit-topgit.el
-
-(autoload 'magit-topgit-mode "magit-topgit" "\
-Topgit support for Magit
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-magit-topgit "magit-topgit" "\
-Unconditionally turn on `magit-topgit-mode'.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (global-magit-wip-save-mode magit-wip-save-mode
-;;;;;;  magit-wip-mode) "magit-wip" "magit-wip.el" (21031 23265 0
-;;;;;;  0))
-;;; Generated autoloads from magit-wip.el
-
-(defvar magit-wip-mode nil "\
-Non-nil if Magit-Wip mode is enabled.
-See the command `magit-wip-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `magit-wip-mode'.")
-
-(custom-autoload 'magit-wip-mode "magit-wip" nil)
-
-(autoload 'magit-wip-mode "magit-wip" "\
-In Magit log buffers; give wip refs a special appearance.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'magit-wip-save-mode "magit-wip" "\
-Magit support for committing to a work-in-progress ref.
-
-When this minor mode is turned on and a file is saved inside a writable
-git repository then it is also committed to a special work-in-progress
-ref.
-
-\(fn &optional ARG)" t nil)
-
-(defvar global-magit-wip-save-mode nil "\
-Non-nil if Global-Magit-Wip-Save mode is enabled.
-See the command `global-magit-wip-save-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `global-magit-wip-save-mode'.")
-
-(custom-autoload 'global-magit-wip-save-mode "magit-wip" nil)
-
-(autoload 'global-magit-wip-save-mode "magit-wip" "\
-Toggle Magit-Wip-Save mode in all buffers.
-With prefix ARG, enable Global-Magit-Wip-Save mode if ARG is positive;
-otherwise, disable it.  If called from Lisp, enable the mode if
-ARG is omitted or nil.
-
-Magit-Wip-Save mode is enabled in all buffers where
-`turn-on-magit-wip-save' would do it.
-See `magit-wip-save-mode' for more information on Magit-Wip-Save mode.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads (rebase-mode) "rebase-mode" "rebase-mode.el" (21031
-;;;;;;  23266 0 0))
-;;; Generated autoloads from rebase-mode.el
-
-(autoload 'rebase-mode "rebase-mode" "\
-Major mode for editing of a Git rebase file.
-
-Rebase files are generated when you run 'git rebase -i' or run
-`magit-interactive-rebase'.  They describe how Git should perform
-the rebase.  See the documentation for git-rebase (e.g., by
-running 'man git-rebase' at the command line) for details.
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("git-rebase-todo" . rebase-mode))
-
-;;;***
-
-;;;### (autoloads nil nil ("magit-bisect.el" "magit-key-mode.el"
-;;;;;;  "magit-pkg.el") (21031 23266 146431 0))
-
-;;;***
-
-(provide 'magit-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; magit-autoloads.el ends here
diff --git a/elpa/magit-1.2.0/magit-autoloads.el~ b/elpa/magit-1.2.0/magit-autoloads.el~
deleted file mode 100644
index 280131311..000000000
--- a/elpa/magit-1.2.0/magit-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; magit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'magit-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; magit-autoloads.el ends here
diff --git a/elpa/magit-1.2.0/magit-bisect.el b/elpa/magit-1.2.0/magit-bisect.el
deleted file mode 100644
index cdb6455eb..000000000
--- a/elpa/magit-1.2.0/magit-bisect.el
+++ /dev/null
@@ -1,195 +0,0 @@
-(require 'magit)
-
-(defvar magit--bisect-last-pos)
-(defvar magit--bisect-tmp-file)
-(defvar magit--bisect-info nil)
-(make-variable-buffer-local 'magit--bisect-info)
-(put 'magit--bisect-info 'permanent-local t)
-
-(defun magit--bisecting-p (&optional required-status)
-  "Return t if a bisect session is running.
-If REQUIRED-STATUS is not nil then the current status must also
-match REQUIRED-STATUS."
-  (and (file-exists-p (concat (magit-git-dir) "BISECT_LOG"))
-       (or (not required-status)
-           (eq (plist-get (magit--bisect-info) :status)
-               required-status))))
-
-(defun magit--bisect-info ()
-  (with-current-buffer (magit-find-status-buffer)
-    (or (if (local-variable-p 'magit--bisect-info) magit--bisect-info)
-        (list :status (if (magit--bisecting-p) 'running 'not-running)))))
-
-(defun magit--bisect-cmd (&rest args)
-  "Run `git bisect ...' and update the status buffer"
-  (with-current-buffer (magit-find-status-buffer)
-    (let* ((output (apply 'magit-git-lines (append '("bisect") args)))
-           (cmd (car args))
-           (first-line (car output)))
-      (save-match-data
-        (setq magit--bisect-info
-              (cond ((string= cmd "reset")
-                     (list :status 'not-running))
-                    ;; Bisecting: 78 revisions left to test after this (roughly 6 steps)
-                    ((string-match "^Bisecting:\\s-+\\([0-9]+\\).+roughly\\s-+\\([0-9]+\\)" first-line)
-                     (list :status 'running
-                           :revs (match-string 1 first-line)
-                           :steps (match-string 2 first-line)))
-                    ;; e2596955d9253a80aec9071c18079705597fa102 is the first bad commit
-                    ((string-match "^\\([a-f0-9]+\\)\\s-.*first bad commit" first-line)
-                     (list :status 'finished
-                           :bad (match-string 1 first-line)))
-                    (t
-                     (list :status 'error)))))))
-  (magit-refresh))
-
-(defun magit--bisect-info-for-status (branch)
-  "Return bisect info suitable for display in the status buffer"
-  (let* ((info (magit--bisect-info))
-         (status (plist-get info :status)))
-    (cond ((eq status 'not-running)
-           (or branch "(detached)"))
-          ((eq status 'running)
-           (format "(bisecting; %s revisions & %s steps left)"
-                   (or (plist-get info :revs) "unknown number of")
-                   (or (plist-get info :steps) "unknown number of")))
-          ((eq status 'finished)
-           (format "(bisected: first bad revision is %s)" (plist-get info :bad)))
-          (t
-           "(bisecting; unknown error occured)"))))
-
-(defun magit-bisect-start ()
-  "Start a bisect session"
-  (interactive)
-  (if (magit--bisecting-p)
-      (error "Already bisecting"))
-  (let ((bad (magit-read-rev "Start bisect with known bad revision" "HEAD"))
-        (good (magit-read-rev "Good revision" (magit-default-rev))))
-    (magit--bisect-cmd "start" bad good)))
-
-(defun magit-bisect-reset ()
-  "Quit a bisect session"
-  (interactive)
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "reset"))
-
-(defun magit-bisect-good ()
-  "Tell git that the current revision is good during a bisect session"
-  (interactive)
-  (unless (magit--bisecting-p 'running)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "good"))
-
-(defun magit-bisect-bad ()
-  "Tell git that the current revision is bad during a bisect session"
-  (interactive)
-  (unless (magit--bisecting-p 'running)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "bad"))
-
-(defun magit-bisect-skip ()
-  "Tell git to skip the current revision during a bisect session."
-  (interactive)
-  (unless (magit--bisecting-p 'running)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "skip"))
-
-(defun magit-bisect-log ()
-  "Show the bisect log"
-  (interactive)
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (magit-run-git "bisect" "log")
-  (magit-display-process))
-
-(defun magit-bisect-visualize ()
-  "Show the remaining suspects with gitk"
-  (interactive)
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (magit-run-git "bisect" "visualize")
-  (unless (getenv "DISPLAY")
-    (magit-display-process)))
-
-(easy-mmode-defmap magit-bisect-minibuffer-local-map
-  '(("\C-i" . comint-dynamic-complete-filename))
-  "Keymap for minibuffer prompting of rebase command."
-  :inherit minibuffer-local-map)
-
-(defvar magit-bisect-mode-history nil
-  "Previously run bisect commands.")
-
-(defun magit-bisect-run (command)
-  "Bisect automatically by running commands after each step"
-  (interactive
-   (list
-    (read-from-minibuffer "Run command (like this): "
-                          ""
-                          magit-bisect-minibuffer-local-map
-                          nil
-                          'magit-bisect-mode-history)))
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (let ((file (make-temp-file "magit-bisect-run"))
-        buffer)
-    (with-temp-buffer
-      (insert "#!/bin/sh\n" command "\n")
-      (write-region (point-min) (point-max) file))
-    (set-file-modes file #o755)
-    (magit-run-git-async "bisect" "run" file)
-    (magit-display-process)
-    (setq buffer (get-buffer magit-process-buffer-name))
-    (with-current-buffer buffer
-      (set (make-local-variable 'magit--bisect-last-pos) 0)
-      (set (make-local-variable 'magit--bisect-tmp-file) file))
-    (set-process-filter (get-buffer-process buffer) 'magit--bisect-run-filter)
-    (set-process-sentinel (get-buffer-process buffer) 'magit--bisect-run-sentinel)))
-
-(defun magit--bisect-run-filter (process output)
-  (with-current-buffer (process-buffer process)
-    (save-match-data
-      (let ((inhibit-read-only t)
-            line new-info)
-        (insert output)
-        (goto-char magit--bisect-last-pos)
-        (beginning-of-line)
-        (while (< (point) (point-max))
-          (cond ( ;; Bisecting: 78 revisions left to test after this (roughly 6 steps)
-                 (looking-at "^Bisecting:\\s-+\\([0-9]+\\).+roughly\\s-+\\([0-9]+\\)")
-                 (setq new-info (list :status 'running
-                                      :revs (match-string 1)
-                                      :steps (match-string 2))))
-                ( ;; e2596955d9253a80aec9071c18079705597fa102 is the first bad commit
-                 (looking-at "^\\([a-f0-9]+\\)\\s-.*first bad commit")
-                 (setq new-info (list :status 'finished
-                                      :bad (match-string 1)))))
-          (forward-line 1))
-        (goto-char (point-max))
-        (setq magit--bisect-last-pos (point))
-        (if new-info
-            (with-current-buffer (magit-find-status-buffer)
-              (setq magit--bisect-info new-info)
-              (magit--bisect-update-status-buffer)))))))
-
-(defun magit--bisect-run-sentinel (process event)
-  (if (string-match-p "^finish" event)
-      (with-current-buffer (process-buffer process)
-        (delete-file magit--bisect-tmp-file)))
-  (magit-process-sentinel process event))
-
-(defun magit--bisect-update-status-buffer ()
-  (with-current-buffer (magit-find-status-buffer)
-    (save-excursion
-      (save-match-data
-        (let ((inhibit-read-only t))
-          (goto-char (point-min))
-          (when (search-forward-regexp "Local:" nil t)
-            (beginning-of-line)
-            (kill-line)
-            (insert (format "Local:    %s %s"
-                            (propertize (magit--bisect-info-for-status (magit-get-current-branch))
-                                        'face 'magit-branch)
-                            (abbreviate-file-name default-directory)))))))))
-
-(provide 'magit-bisect)
diff --git a/elpa/magit-1.2.0/magit-bisect.elc b/elpa/magit-1.2.0/magit-bisect.elc
deleted file mode 100644
index 997106569..000000000
Binary files a/elpa/magit-1.2.0/magit-bisect.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/magit-blame.el b/elpa/magit-1.2.0/magit-blame.el
deleted file mode 100644
index 8518dcb45..000000000
--- a/elpa/magit-1.2.0/magit-blame.el
+++ /dev/null
@@ -1,303 +0,0 @@
-;;; magit-blame.el --- blame support for magit
-
-;; Copyright (C) 2012  Rüdiger Sonderfeld
-;; Copyright (C) 2012  Yann Hodique
-;; Copyright (C) 2011  byplayer
-;; Copyright (C) 2010  Alexander Prusov
-;; Copyright (C) 2009  Tim Moore
-;; Copyright (C) 2008  Linh Dang
-;; Copyright (C) 2008  Marius Vollmer
-
-;; Author: Yann Hodique <yann.hodique@gmail.com>
-;; Keywords:
-
-;; Magit 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, or (at your option)
-;; any later version.
-;;
-;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This code has been backported from Egg (Magit fork) to Magit
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'magit)
-
-(defface magit-blame-header
-  '((t :inherit magit-header))
-  "Face for blame header."
-  :group 'magit-faces)
-
-(defface magit-blame-sha1
-  '((t :inherit (magit-log-sha1
-                 magit-blame-header)))
-  "Face for blame sha1."
-  :group 'magit-faces)
-
-(defface magit-blame-culprit
-  '((t :inherit magit-blame-header))
-  "Face for blame culprit."
-  :group 'magit-faces)
-
-(defface magit-blame-time
-  '((t :inherit magit-blame-header))
-  "Face for blame time."
-  :group 'magit-faces)
-
-(defface magit-blame-subject
-  '((t :inherit (magit-log-message magit-blame-header)))
-  "Face for blame tag line."
-  :group 'magit-faces)
-
-(defconst magit-blame-map
-  (let ((map (make-sparse-keymap "Magit:Blame")))
-    (define-key map (kbd "l") 'magit-blame-locate-commit)
-    (define-key map (kbd "RET") 'magit-blame-locate-commit)
-    (define-key map (kbd "q") 'magit-blame-mode)
-    (define-key map (kbd "n") 'magit-blame-next-chunk)
-    (define-key map (kbd "p") 'magit-blame-previous-chunk)
-    map)
-  "Keymap for an annotated section.\\{magit-blame-map}")
-
-(defvar magit-blame-buffer-read-only)
-(make-variable-buffer-local 'magit-blame-buffer-read-only)
-
-;;;###autoload
-(define-minor-mode magit-blame-mode
-  "Display blame information inline."
-  :keymap magit-blame-map
-  :lighter " blame"
-  (unless (buffer-file-name)
-    (error "Current buffer has no associated file!"))
-  (when (and (buffer-modified-p)
-             (y-or-n-p (format "save %s first? " (buffer-file-name))))
-    (save-buffer))
-
-  (if magit-blame-mode
-      (progn
-        (setq magit-blame-buffer-read-only buffer-read-only)
-        (magit-blame-file-on (current-buffer))
-        (set-buffer-modified-p nil)
-        (setq buffer-read-only t))
-    (magit-blame-file-off (current-buffer))
-    (set-buffer-modified-p nil)
-    (setq buffer-read-only magit-blame-buffer-read-only)))
-
-(defun magit-blame-file-off (buffer)
-  (save-excursion
-    (save-restriction
-      (with-current-buffer buffer
-        (widen)
-        (mapc (lambda (ov)
-                (if (overlay-get ov :blame)
-                    (delete-overlay ov)))
-              (overlays-in (point-min) (point-max)))))))
-
-(defun magit-blame-file-on (buffer)
-  (magit-blame-file-off buffer)
-  (save-excursion
-    (with-current-buffer buffer
-      (save-restriction
-        (with-temp-buffer
-          (magit-git-insert (list "blame" "--porcelain" "--"
-                                  (file-name-nondirectory
-                                   (buffer-file-name buffer))))
-          (magit-blame-parse buffer (current-buffer)))))))
-
-(defun magit-blame-locate-commit (pos)
-  "Jump to a commit in the branch history from an annotated blame section."
-  (interactive "d")
-  (let ((overlays (overlays-at pos))
-        sha1)
-    (dolist (ov overlays)
-      (if (overlay-get ov :blame)
-          (setq sha1 (plist-get (nth 3 (overlay-get ov :blame)) :sha1))))
-    (if sha1
-        (magit-show-commit sha1))))
-
-(defun magit-find-next-overlay-change (BEG END PROP)
-  "Return the next position after BEG where an overlay matching a
-property PROP starts or ends. If there are no matching overlay
-boundaries from BEG to END, the return value is nil."
-  (save-excursion
-    (goto-char BEG)
-    (catch 'found
-      (flet ((overlay-change (pos)
-                             (if (< BEG END) (next-overlay-change pos)
-                               (previous-overlay-change pos)))
-             (within-bounds-p (pos)
-                              (if (< BEG END) (< pos END)
-                                (> pos END))))
-        (let ((ov-pos BEG))
-          ;; iterate through overlay changes from BEG to END
-          (while (within-bounds-p ov-pos)
-            (let* ((next-ov-pos (overlay-change ov-pos))
-                   ;; search for an overlay with a PROP property
-                   (next-ov
-                    (let ((overlays (overlays-at next-ov-pos)))
-                      (while (and overlays
-                                  (not (overlay-get (car overlays) PROP)))
-                        (setq overlays (cdr overlays)))
-                      (car overlays))))
-              (if next-ov
-                  ;; found the next overlay with prop PROP at next-ov-pos
-                  (throw 'found next-ov-pos)
-                ;; no matching overlay found, keep looking
-                (setq ov-pos next-ov-pos)))))))))
-
-(defun magit-blame-next-chunk (pos)
-  "Go to the next blame chunk."
-  (interactive "d")
-  (let ((next-chunk-pos (magit-find-next-overlay-change pos (point-max) :blame)))
-    (when next-chunk-pos
-      (goto-char next-chunk-pos))))
-
-(defun magit-blame-previous-chunk (pos)
-  "Go to the previous blame chunk."
-  (interactive "d")
-  (let ((prev-chunk-pos (magit-find-next-overlay-change pos (point-min) :blame)))
-    (when prev-chunk-pos
-      (goto-char prev-chunk-pos))))
-
-(defcustom magit-time-format-string "%Y-%m-%dT%T%z"
-  "How to format time in magit-blame header."
-  :group 'magit
-  :type 'string)
-
-(defun magit-blame-decode-time (unixtime &optional tz)
-  "Decode UNIXTIME into (HIGH LOW) format.
-
-The second argument TZ can be used to add the timezone in (-)HHMM
-format to UNIXTIME.  UNIXTIME should be either a number
-containing seconds since epoch or Emacs's (HIGH LOW
-. IGNORED) format."
-  (when (numberp tz)
-    (unless (numberp unixtime)
-      (setq unixtime (float-time unixtime)))
-    (let* ((ptz (abs tz))
-           (min (+ (* (/ ptz 100) 60)
-                   (mod ptz 100))))
-      (setq unixtime (+ (* (if (< tz 0) (- min) min) 60) unixtime))))
-
-  (when (numberp unixtime)
-    (setq unixtime (seconds-to-time unixtime)))
-  unixtime)
-
-(defun magit-blame-format-time-string (format &optional unixtime tz)
-  "Use FORMAT to format the time UNIXTIME, or now if omitted.
-
-UNIXTIME is specified as a number containing seconds since epoch
-or Emacs's (HIGH LOW . IGNORED) format.  The optional argument TZ
-can be used to set the time zone.  If TZ is a number it is
-treated as a (-)HHMM offset to Universal Time.  If TZ is not
-a number and non-nil the time is printed in UTC.  If TZ is nil
-the local zime zone is used.  The format of the function is
-similar to `format-time-string' except for %Z which is not
-officially supported at the moment."
-  (unless unixtime
-    (setq unixtime (current-time)))
-  (when (numberp tz) ;; TODO add support for %Z
-    (setq format (replace-regexp-in-string "%z" (format "%+05d" tz) format)))
-  (format-time-string format (magit-blame-decode-time unixtime tz) tz))
-
-(defun magit-blame-parse (target-buf blame-buf)
-  "Parse blame-info in buffer BLAME-BUF and decorate TARGET-BUF buffer."
-  (save-match-data
-    (let ((blank (propertize " " 'face 'magit-blame-header))
-          (nl (propertize "\n" 'face 'magit-blame-header))
-          (commit-hash (make-hash-table :test 'equal :size 577))
-          commit commit-info old-line new-line num old-file subject author
-          author-time author-timezone info ov beg end blame)
-      (with-current-buffer blame-buf
-        (goto-char (point-min))
-        ;; search for a ful commit info
-        (while (re-search-forward "^\\([0-9a-f]\\{40\\}\\) \\([0-9]+\\) \\([0-9]+\\) \\([0-9]+\\)$" nil t)
-          (setq commit (match-string-no-properties 1)
-                old-line (string-to-number
-                          (match-string-no-properties 2))
-                new-line (string-to-number
-                          (match-string-no-properties 3))
-                num (string-to-number
-                     (match-string-no-properties 4)))
-          ;; was this commit already seen (and stored in the hash)?
-          (setq commit-info (gethash commit commit-hash))
-          ;; Nope, this is the 1st time, the full commit-info follow.
-          (unless commit-info
-            (re-search-forward "^author \\(.+\\)$")
-            (setq author (match-string-no-properties 1))
-            (re-search-forward "^author-time \\(.+\\)$")
-            (setq author-time (string-to-number
-                               (match-string-no-properties 1)))
-            (re-search-forward "^author-tz \\(.+\\)$")
-            (setq author-timezone (string-to-number
-                                   (match-string-no-properties 1)))
-            (re-search-forward "^summary \\(.+\\)$")
-            (setq subject (match-string-no-properties 1))
-            (re-search-forward "^filename \\(.+\\)$")
-            (setq old-file (match-string-no-properties 1))
-            (setq commit-info (list :sha1 commit :author author
-                                    :author-time author-time
-                                    :author-timezone author-timezone
-                                    :subject subject :file old-file))
-            ;; save it in the hash
-            (puthash commit commit-info commit-hash))
-          ;; add the current blame-block into the list INFO.
-          (setq info (cons (list old-line new-line num commit-info)
-                           info))))
-      ;; now do from beginning
-      (setq info (nreverse info))
-      (with-current-buffer target-buf
-        ;; for every blame chunk
-        (dolist (chunk info)
-          (setq commit-info (nth 3 chunk)
-                old-line (nth 0 chunk)
-                new-line (nth 1 chunk)
-                num (nth 2 chunk)
-                commit (plist-get commit-info :sha1)
-                author (plist-get commit-info :author)
-                author-time (plist-get commit-info :author-time)
-                author-timezone (plist-get commit-info :author-timezone)
-                subject (plist-get commit-info :subject))
-
-          (goto-char (point-min))
-          (forward-line (1- new-line))
-
-          (setq beg (line-beginning-position)
-                end (save-excursion
-                      (forward-line num)
-                      (line-beginning-position)))
-          ;; mark the blame chunk
-          (put-text-property beg end :blame chunk)
-
-          ;; make an overlay with blame info as 'before-string
-          ;; on the current chunk.
-          (setq ov (make-overlay beg end))
-          (overlay-put ov :blame chunk)
-          (setq blame (concat
-                       (propertize (substring-no-properties commit 0 8)
-                                   'face 'magit-blame-sha1)
-                       blank
-                       (propertize (format "%-20s" author)
-                                   'face 'magit-blame-culprit)
-                       blank
-                       (propertize (magit-blame-format-time-string
-                                    magit-time-format-string
-                                    author-time author-timezone)
-                                   'face 'magit-blame-time)
-                       blank
-                       (propertize subject 'face 'magit-blame-subject)
-                       blank nl))
-          (overlay-put ov 'before-string blame))))))
-
-(provide 'magit-blame)
-;;; magit-blame.el ends here
diff --git a/elpa/magit-1.2.0/magit-blame.elc b/elpa/magit-1.2.0/magit-blame.elc
deleted file mode 100644
index cf7ee2594..000000000
Binary files a/elpa/magit-1.2.0/magit-blame.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/magit-key-mode.elc b/elpa/magit-1.2.0/magit-key-mode.elc
deleted file mode 100644
index 5aa483752..000000000
Binary files a/elpa/magit-1.2.0/magit-key-mode.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/magit-pkg.el b/elpa/magit-1.2.0/magit-pkg.el
deleted file mode 100644
index 11ad3243c..000000000
--- a/elpa/magit-1.2.0/magit-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "magit" "1.2.0" "Control Git from Emacs.")
diff --git a/elpa/magit-1.2.0/magit-stgit.el b/elpa/magit-1.2.0/magit-stgit.el
deleted file mode 100644
index b105b71f4..000000000
--- a/elpa/magit-1.2.0/magit-stgit.el
+++ /dev/null
@@ -1,288 +0,0 @@
-;;; magit-stgit.el --- StGit plug-in for Magit
-
-;; Copyright (C) 2011  Lluis Vilanova
-;;
-;; Magit 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, or (at your option)
-;; any later version.
-;;
-;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This plug-in provides StGit functionality as a separate component of Magit.
-
-;; Available actions:
-;; - visit: Shows the patch at point in the series (stg show)
-;; - apply: Goes to the patch at point in the series (stg goto)
-;; - discard: Deletes the marked/at point patch in the series (stg delete)
-
-;; Available commands:
-;; - `magit-stgit-refresh': Refresh the marked/at point patch in the series
-;;   (stg refresh)
-;; - `magit-stgit-repair': Repair the StGit metadata (stg repair)
-;; - `magit-stgit-rebase': Rebase the whole series (stg rebase)
-
-;; TODO:
-;; - Let the user select which files must be included in a refresh.
-;; - Missing actions for `magit-show-item-or-scroll-up' and
-;;   `magit-show-item-or-scroll-down'.
-;; - Marking a patch is slow and refreshes all buffers, which resets their
-;;   position (i.e., the buffer is shown from its first line).
-
-;;; Code:
-
-(require 'magit)
-(eval-when-compile
-  (require 'cl))
-
-;;; Customizables:
-
-(defcustom magit-stgit-executable "stg"
-  "The name of the StGit executable."
-  :group 'magit
-  :type 'string)
-
-(defface magit-stgit-applied
-  '((t :inherit magit-diff-add))
-  "Face for an applied stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-current
-  '((t :inherit magit-item-highlight))
-  "Face for the current stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-other
-  '((t :inherit magit-diff-del))
-  "Face for a non-applied stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-marked
-  '((t :inherit magit-item-mark))
-  "Face for a marked stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-empty
-  '((t :inherit magit-item-mark))
-  "Face for an empty stgit patch."
-  :group 'magit-faces)
-
-;;; Common code:
-
-(defvar magit-stgit--enabled nil
-  "Whether this buffer has StGit support.")
-(make-variable-buffer-local 'magit-stgit--enabled)
-
-(defvar magit-stgit-mode)
-
-(defun magit-stgit--enabled ()
-  "Whether this buffer has StGit support enabled."
-  (if (assoc 'magit-stgit--enabled (buffer-local-variables))
-      magit-stgit--enabled
-    (setq magit-stgit--enabled
-          (and magit-stgit-mode
-               (not (null
-                     (member (concat (magit-get-current-branch) ".stgit")
-                             (mapcar #'(lambda (line)
-                                         (string-match "^\\*?\s*\\([^\s]*\\)"
-                                                       line)
-                                         (match-string 1 line))
-                                     (magit-git-lines "branch")))))))))
-
-(defun magit-stgit--enabled-reset ()
-  "Reset the StGit enabled state."
-  (kill-local-variable 'magit-stgit--enabled))
-
-(defvar magit-stgit--marked-patch nil
-  "The (per-buffer) currently marked patch in an StGit series.")
-(make-variable-buffer-local 'magit-stgit--marked-patch)
-
-;;; Menu:
-
-(easy-menu-define magit-stgit-extension-menu
-  nil
-  "StGit extension menu"
-  '("StGit"
-    :active (magit-stgit--enabled)
-
-    ["Refresh patch" magit-stgit-refresh
-     :help "Refresh the contents of a patch in an StGit series"]
-    ["Repair" magit-stgit-repair
-     :help "Repair StGit metadata if branch was modified with git commands"]
-    ["Rebase series" magit-stgit-rebase
-     :help "Rebase an StGit patch series"]
-    ))
-
-(easy-menu-add-item 'magit-mode-menu
-                    '("Extensions")
-                    magit-stgit-extension-menu)
-
-;;; Series section:
-
-(defun magit-stgit--wash-patch ()
-  (if (search-forward-regexp "^\\(.\\)\\(.\\) \\([^\s]*\\)\\(\s*# ?\\)\\(.*\\)"
-                             (line-end-position) t)
-      (let* ((empty-str "[empty] ")
-             (indent-str (make-string (string-bytes empty-str) ?\ ))
-             (empty (match-string 1))
-             (state (match-string 2))
-             (patch (match-string 3))
-             (descr (match-string 5)))
-        (delete-region (line-beginning-position) (line-end-position))
-        (insert
-         (cond ((string= empty "0")
-                (propertize (concat empty-str " " state " " descr) 'face 'magit-stgit-empty))
-               ((string= magit-stgit--marked-patch patch)
-                (propertize (concat indent-str " " state " " descr) 'face 'magit-stgit-marked))
-               ((string= state "+")
-                (concat indent-str " " (propertize state 'face 'magit-stgit-applied) " " descr))
-               ((string= state ">")
-                (propertize (concat indent-str " " state " " descr) 'face 'magit-stgit-current))
-               ((string= state "-")
-                (concat indent-str " " (propertize state 'face 'magit-stgit-other) " " descr))))
-        (goto-char (line-beginning-position))
-        (magit-with-section patch 'series
-          (magit-set-section-info patch)
-          (goto-char (line-end-position)))
-        (forward-line))
-    (delete-region (line-beginning-position) (1+ (line-end-position))))
-  t)
-
-(defun magit-stgit--wash-series ()
-    (let ((magit-old-top-section nil))
-      (magit-wash-sequence #'magit-stgit--wash-patch)))
-
-(magit-define-inserter series ()
-  (when (executable-find magit-stgit-executable)
-    (magit-insert-section 'series
-                          "Series:" 'magit-stgit--wash-series
-                          magit-stgit-executable "series" "-a" "-d" "-e")))
-
-;;; Actions:
-
-;; Copy of `magit-refresh-commit-buffer' (version 1.0.0)
-(defun magit-stgit--refresh-patch-buffer (patch)
-  (magit-create-buffer-sections
-    (magit-insert-section nil nil
-                       'magit-wash-commit
-                       magit-stgit-executable
-                       "show"
-                       patch)))
-
-;; Copy of `magit-show-commit' (version 1.0.0)
-(defun magit-stgit--show-patch (patch &optional scroll)
-  (when (magit-section-p patch)
-    (setq patch (magit-section-info patch)))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-commit-buffer-name)))
-    (cond ((and (equal magit-currently-shown-commit patch)
-                ;; if it's empty then the buffer was killed
-                (with-current-buffer buf
-                  (> (length (buffer-string)) 1)))
-           (let ((win (get-buffer-window buf)))
-             (cond ((not win)
-                    (display-buffer buf))
-                   (scroll
-                    (with-selected-window win
-                      (funcall scroll))))))
-          (t
-           (setq magit-currently-shown-commit patch)
-           (display-buffer buf)
-           (with-current-buffer buf
-             (set-buffer buf)
-             (goto-char (point-min))
-             (magit-mode-init dir 'magit-commit-mode
-                              #'magit-stgit--refresh-patch-buffer patch))))))
-
-(magit-add-action (item info "visit")
-  ((series)
-   (magit-stgit--show-patch info)
-   (pop-to-buffer magit-commit-buffer-name)))
-
-(magit-add-action (item info "apply")
-  ((series)
-   (magit-run magit-stgit-executable "goto" info)))
-
-(magit-add-action (item info "discard")
-  ((series)
-   (let ((patch (or magit-stgit--marked-patch info)))
-     (if (yes-or-no-p (format "Delete patch '%s' in series? " patch))
-         (progn
-           (if (string= magit-stgit--marked-patch patch)
-               (setq magit-stgit--marked-patch nil))
-           (magit-run magit-stgit-executable "delete" patch))))))
-
-(defun magit-stgit--set-marked-patch (patch)
-  (setq magit-stgit--marked-patch
-        (if (string= magit-stgit--marked-patch patch)
-            nil
-          patch)))
-
-(magit-add-action (item info "mark")
-  ((series)
-   (magit-stgit--set-marked-patch info)
-   (magit-refresh-all)))
-
-;;; Commands:
-
-(defun magit-stgit-refresh ()
-  "Refresh the contents of a patch in an StGit series.
-If there is no marked patch in the series, refreshes the current
-patch.
-Otherwise, refreshes the marked patch."
-  (interactive)
-  (if magit-stgit--marked-patch
-      (magit-run magit-stgit-executable "refresh" "-p" magit-stgit--marked-patch)
-    (magit-run magit-stgit-executable "refresh")))
-
-(defun magit-stgit-repair ()
-  "Repair StGit metadata if branch was modified with git commands.
-In the case of Git commits these will be imported as new patches
-into the series."
-  (interactive)
-  (message "Repairing series...")
-  (magit-run magit-stgit-executable "repair")
-  (message ""))
-
-(defun magit-stgit-rebase ()
-  "Rebase an StGit patch series."
-  (interactive)
-  (if (magit-get-current-remote)
-      (progn
-        (if (yes-or-no-p "Update remotes? ")
-            (progn
-              (message "Updating remotes...")
-              (magit-run-git-async "remote" "update")))
-        (magit-run magit-stgit-executable "rebase"
-                   (format "remotes/%s/%s"
-                           (magit-get-current-remote)
-                           (magit-get-current-branch))))))
-
-;;;###autoload
-(define-minor-mode magit-stgit-mode "StGit support for Magit"
-  :lighter " Stg" :require 'magit-stgit
-  (or (derived-mode-p 'magit-mode)
-      (error "This mode only makes sense with magit"))
-  (if magit-stgit-mode
-      (progn
-        (add-hook 'magit-after-insert-stashes-hook 'magit-insert-series nil t))
-    (progn
-      (remove-hook 'magit-after-insert-stashes-hook 'magit-insert-series t)))
-  (when (called-interactively-p 'any)
-    (magit-refresh)))
-
-;;;###autoload
-(defun turn-on-magit-stgit ()
-  "Unconditionally turn on `magit-stgit-mode'."
-  (magit-stgit-mode 1))
-
-(provide 'magit-stgit)
-;;; magit-stgit.el ends here
diff --git a/elpa/magit-1.2.0/magit-stgit.elc b/elpa/magit-1.2.0/magit-stgit.elc
deleted file mode 100644
index 298418c9d..000000000
Binary files a/elpa/magit-1.2.0/magit-stgit.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/magit-svn.elc b/elpa/magit-1.2.0/magit-svn.elc
deleted file mode 100644
index 3d340ff9d..000000000
Binary files a/elpa/magit-1.2.0/magit-svn.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/magit-topgit.el b/elpa/magit-1.2.0/magit-topgit.el
deleted file mode 100644
index 6f0080cc2..000000000
--- a/elpa/magit-1.2.0/magit-topgit.el
+++ /dev/null
@@ -1,191 +0,0 @@
-;;; magit-topgit.el --- topgit plug-in for Magit
-
-;; Copyright (C) 2010  Nathan Weizenbaum
-;; Copyright (C) 2010  Yann Hodique
-;;
-;; Magit 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, or (at your option)
-;; any later version.
-;;
-;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This plug-in provides topgit functionality as a separate component of Magit
-
-;;; Code:
-
-(require 'magit)
-(eval-when-compile
-  (require 'cl))
-
-(defcustom magit-topgit-executable "tg"
-  "The name of the TopGit executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-topgit-branch-prefix "t/"
-  "Convention prefix for topic branch creation."
-  :group 'magit
-  :type 'string)
-
-(defface magit-topgit-current
-  '((t :weight bold :inherit magit-branch))
-  "Face for section titles."
-  :group 'magit-faces)
-
-;;; Topic branches (using topgit)
-
-(defun magit-topgit-in-topic-p ()
-  (and (file-exists-p ".topdeps")
-       (executable-find magit-topgit-executable)))
-
-(defun magit-topgit-create-branch (branch parent)
-  (when (zerop (or (string-match magit-topgit-branch-prefix branch) -1))
-    (magit-run* (list magit-topgit-executable "create"
-                      branch (magit-rev-to-git parent))
-                nil nil nil t)
-    t))
-
-(defun magit-topgit-pull ()
-  (when (magit-topgit-in-topic-p)
-    (magit-run* (list magit-topgit-executable "update")
-                nil nil nil t)
-    t))
-
-(defun magit-topgit-push ()
-  (when (magit-topgit-in-topic-p)
-    (let* ((branch (or (magit-get-current-branch)
-                       (error "Don't push a detached head.  That's gross")))
-           (remote (magit-get "topgit" "remote"))
-           (push-remote (if (or current-prefix-arg (not remote))
-                            (magit-read-remote (format "Push %s to" branch))
-                          remote)))
-      (when (and (not remote)
-                 (not current-prefix-arg))
-        (magit-set push-remote "topgit" "remote"))
-      (magit-run magit-topgit-executable "push" "-r" push-remote))
-    t))
-
-(defun magit-topgit-remote-update (&optional remote)
-  (when (magit-topgit-in-topic-p)
-    (let* ((remote (magit-get "topgit" "remote"))
-           (remote-update (if (or current-prefix-arg (not remote))
-                              (magit-read-remote)
-                            remote)))
-      (if (and (not remote)
-               (not current-prefix-arg))
-          (progn
-            (magit-set remote-update "topgit" "remote")
-            (magit-run magit-topgit-executable "remote"
-                       "--populate" remote-update)))
-      (magit-run magit-topgit-executable "remote" remote-update))
-    ;; We return nil anyway, as we also want regular "git remote update" to
-    ;; happen
-    nil))
-
-(defun magit-topgit-parse-flags (flags-string)
-  (let ((flags (string-to-list flags-string))
-        (void-flag ?\ ))
-    (list :current (not (eq (nth 0 flags) void-flag))
-          :empty (not (eq (nth 1 flags) void-flag)))))
-
-(defun magit-topgit-wash-topic ()
-  (let ((fmt "^\\(.\\{7\\}\\)\\s-\\(\\S-+\\)\\s-+\\(.*\\)"))
-    (if (search-forward-regexp fmt (line-end-position) t)
-        (let ((flags (magit-topgit-parse-flags (match-string 1)))
-              (topic (match-string 2)))
-          (goto-char (line-beginning-position))
-          (delete-char 8)
-          (insert "\t")
-          (goto-char (line-beginning-position))
-          (magit-with-section topic 'topic
-            (magit-set-section-info topic)
-            (let ((beg (1+ (line-beginning-position)))
-                  (end (line-end-position)))
-              (when (plist-get flags :current)
-                (put-text-property beg end 'face 'magit-topgit-current))
-              (when (plist-get flags :empty)
-                (put-text-property beg end 'face `(:strike-through t :inherit ,(get-text-property beg 'face)))))
-            (forward-line)))
-      (delete-region (line-beginning-position) (1+ (line-end-position))))
-    t))
-
-(defun magit-topgit-wash-topics ()
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-topgit-wash-topic)))
-
-(defun magit-topgit-section (section title washer &rest args)
-  (when (executable-find magit-topgit-executable)
-    (let ((magit-git-executable magit-topgit-executable)
-          (magit-git-standard-options nil))
-      (apply 'magit-git-section section title washer args))))
-
-(magit-define-inserter topics ()
-  (magit-topgit-section 'topics
-                        "Topics:" 'magit-topgit-wash-topics
-                        "summary"))
-
-(magit-add-action (item info "discard")
-  ((topic)
-   (when (yes-or-no-p "Discard topic? ")
-     (magit-run* (list magit-topgit-executable "delete" "-f" info)
-                 nil nil nil t))))
-
-(magit-add-action (item info "visit")
-  ((topic)
-   (magit-checkout info)))
-
-(defun magit-topgit-get-top-bases-color (suffix)
-  (list nil nil))
-
-(defun magit-topgit-get-remote-top-bases-color (suffix)
-  (when (string-match "^\\(?:[^/]+\\)/top-bases" suffix)
-    (list nil nil)))
-
-(defconst magit-topgit-ignored-namespace
-  '("top-bases" magit-topgit-get-top-bases-color))
-
-;;;###autoload
-(define-minor-mode magit-topgit-mode "Topgit support for Magit"
-  :lighter " Topgit" :require 'magit-topgit
-  (or (derived-mode-p 'magit-mode)
-      (error "This mode only makes sense with magit"))
-  (if magit-topgit-mode
-      (progn
-        (add-hook 'magit-after-insert-stashes-hook 'magit-insert-topics nil t)
-        (add-hook 'magit-create-branch-command-hook 'magit-topgit-create-branch nil t)
-        (add-hook 'magit-pull-command-hook 'magit-topgit-pull nil t)
-        (add-hook 'magit-remote-update-command-hook 'magit-topgit-remote-update nil t)
-        (add-hook 'magit-push-command-hook 'magit-topgit-push nil t)
-        ;; hide refs for top-bases namespace in any remote
-        (add-hook 'magit-log-remotes-color-hook
-                  'magit-topgit-get-remote-top-bases-color)
-        ;; hide refs in the top-bases namespace, as they're not meant for the user
-        (add-to-list 'magit-refs-namespaces magit-topgit-ignored-namespace))
-    (progn
-        (remove-hook 'magit-after-insert-stashes-hook 'magit-insert-topics t)
-        (remove-hook 'magit-create-branch-command-hook 'magit-topgit-create-branch t)
-        (remove-hook 'magit-pull-command-hook 'magit-topgit-pull t)
-        (remove-hook 'magit-remote-update-command-hook 'magit-topgit-remote-update t)
-        (remove-hook 'magit-push-command-hook 'magit-topgit-push t)
-        (remove-hook 'magit-log-remotes-color-hook
-                     'magit-topgit-get-remote-top-bases-color)
-        (delete magit-topgit-ignored-namespace magit-refs-namespaces)))
-  (when (called-interactively-p 'any)
-    (magit-refresh)))
-
-;;;###autoload
-(defun turn-on-magit-topgit ()
-  "Unconditionally turn on `magit-topgit-mode'."
-  (magit-topgit-mode 1))
-
-(provide 'magit-topgit)
-;;; magit-topgit.el ends here
diff --git a/elpa/magit-1.2.0/magit-topgit.elc b/elpa/magit-1.2.0/magit-topgit.elc
deleted file mode 100644
index 3998b5a0f..000000000
Binary files a/elpa/magit-1.2.0/magit-topgit.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/magit-wip.el b/elpa/magit-1.2.0/magit-wip.el
deleted file mode 100644
index 5c198404d..000000000
--- a/elpa/magit-1.2.0/magit-wip.el
+++ /dev/null
@@ -1,153 +0,0 @@
-;;; magit-wip.el --- git-wip plug-in for Magit
-
-;; Copyright (C) 2012  Jonas Bernoulli
-;; Copyright (C) 2012  Ryan C. Thompson
-
-;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
-
-;; Magit 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, or (at your option)
-;; any later version.
-;;
-;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This plug-in provides support for special work-in-progress refs.
-
-;; This requires the third-party git command "git wip" which is available
-;; from https://github.com/bartman/git-wip.
-
-;; The global mode `magit-wip-mode' provides highlighting of wip refs in
-;; Magit buffers while the local mode `magit-wip-save-mode' commits to
-;; such a ref when saving a file-visiting buffer.
-
-;; To enable `magit-wip-save-mode' enable `global-magit-wip-save-mode'
-;; and use the Magit extension mechanism to select the repositories in
-;; which you want to use a work-in-progress ref.  Usually you also want
-;; to enable `magit-wip-mode'.
-;;
-;;   (magit-wip-mode 1)
-;;   (global-magit-wip-save-mode 1)
-;;
-;;   $ git config --add magit.extension wip-save           # or
-;;   $ git config --global --add magit.extension wip-save
-
-;; Note that `global-magit-wip-save-mode' is the only mode that uses the
-;; extension mechanism for file-visiting buffers all other global modes
-;; making use of it to turn on local modes in Magit buffers.
-
-;;; Code:
-
-(require 'magit)
-(require 'format-spec)
-
-;;; Magit Wip Mode.
-
-(defface magit-log-head-label-wip
-  '((((class color) (background light))
-     :box t
-     :background "Grey95"
-     :foreground "LightSkyBlue3")
-    (((class color) (background dark))
-     :box t
-     :background "Grey07"
-     :foreground "LightSkyBlue4"))
-  "Face for git-wip labels shown in log buffer."
-  :group 'magit-faces)
-
-(defun magit-log-get-wip-color (suffix)
-  (list (concat "(WIP) " suffix)
-        'magit-log-head-label-wip))
-
-(defconst magit-wip-refs-namespace
-  '("wip" magit-log-get-wip-color))
-
-;;;###autoload
-(define-minor-mode magit-wip-mode
-  "In Magit log buffers; give wip refs a special appearance."
-  :group 'magit
-  :global t
-  (if magit-wip-mode
-      (add-to-list 'magit-refs-namespaces magit-wip-refs-namespace 'append)
-    (setq magit-refs-namespaces
-          (delete magit-wip-refs-namespace magit-refs-namespaces))))
-
-;;; Magit Wip Save Mode.
-
-(defcustom magit-wip-commit-message "WIP %r"
-  "Commit message for git-wip commits.
-
-The following `format'-like specs are supported:
-%f the full name of the file being saved, and
-%r the name of the file being saved, relative to the repository root
-%g the root of the git repository."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-wip-echo-area-message "Wrote %f (wip)"
-  "Message shown in the echo area after creating a git-wip commit.
-
-The following `format'-like specs are supported:
-%f the full name of the file being saved, and
-%r the name of the file being saved, relative to the repository root.
-%g the root of the git repository."
-  :group 'magit
-  :type '(choice (const :tag "No message" nil) string))
-
-(defvar magit-wip-save-mode-lighter " Wip")
-
-;;;###autoload
-(define-minor-mode magit-wip-save-mode
-  "Magit support for committing to a work-in-progress ref.
-
-When this minor mode is turned on and a file is saved inside a writable
-git repository then it is also committed to a special work-in-progress
-ref."
-  :lighter magit-wip-save-mode-lighter
-  (if magit-wip-save-mode
-      (add-hook  'after-save-hook 'magit-wip-save-safe t t)
-    (remove-hook 'after-save-hook 'magit-wip-save-safe t)))
-
-;;;###autoload
-(define-globalized-minor-mode global-magit-wip-save-mode
-  magit-wip-save-mode turn-on-magit-wip-save
-  :group 'magit)
-
-(defun turn-on-magit-wip-save ()
-  (when (and (buffer-file-name)
-             (magit-get-top-dir default-directory)
-             (member "wip-save" (magit-get-all "magit.extension")))
-    (if (= (magit-git-exit-code "wip" "-h") 0)
-        (magit-wip-save-mode 1)
-      (message "Git command 'git wip' cannot be found"))))
-
-(defun magit-wip-save-safe ()
-  (condition-case err
-      (magit-wip-save)
-    (error
-     (message "Magit WIP got an error: %S" err))))
-
-(defun magit-wip-save ()
-  (let* ((top-dir (magit-get-top-dir default-directory))
-         (name (file-truename (buffer-file-name)))
-         (spec `((?r . ,(file-relative-name name top-dir))
-                 (?f . ,(buffer-file-name))
-                 (?g . ,top-dir))))
-    (when (and top-dir (file-writable-p top-dir))
-      (save-excursion ; kludge see https://github.com/magit/magit/issues/441
-        (magit-run-git "wip" "save"
-                       (format-spec magit-wip-commit-message spec)
-                       "--editor" "--" name))
-      (when magit-wip-echo-area-message
-        (message (format-spec magit-wip-echo-area-message spec))))))
-
-(provide 'magit-wip)
-;;; magit-wip.el ends here
diff --git a/elpa/magit-1.2.0/magit-wip.elc b/elpa/magit-1.2.0/magit-wip.elc
deleted file mode 100644
index a1ed255f0..000000000
Binary files a/elpa/magit-1.2.0/magit-wip.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/magit.el b/elpa/magit-1.2.0/magit.el
deleted file mode 100644
index 121ec9c72..000000000
--- a/elpa/magit-1.2.0/magit.el
+++ /dev/null
@@ -1,6001 +0,0 @@
-;;; magit.el --- control Git from Emacs
-
-;; Copyright (C) 2010 Aaron Culich.
-;; Copyright (C) 2010 Alan Falloon.
-;; Copyright (C) 2008, 2010 Alex Ott.
-;; Copyright (C) 2008, 2009, 2010 Alexey Voinov.
-;; Copyright (C) 2010 Ben Walton.
-;; Copyright (C) 2010 Chris Bernard.
-;; Copyright (C) 2010 Christian Kluge.
-;; Copyright (C) 2008 Daniel Farina.
-;; Copyright (C) 2010 David Abrahams.
-;; Copyright (C) 2009 David Wallin.
-;; Copyright (C) 2009, 2010 Hannu Koivisto.
-;; Copyright (C) 2009 Ian Eure.
-;; Copyright (C) 2009 Jesse Alama.
-;; Copyright (C) 2009 John Wiegley.
-;; Copyright (C) 2010 Leo.
-;; Copyright (C) 2008, 2009 Marcin Bachry.
-;; Copyright (C) 2008, 2009 Marius Vollmer.
-;; Copyright (C) 2010 Mark Hepburn.
-;; Copyright (C) 2010 Moritz Bunkus.
-;; Copyright (C) 2010 Nathan Weizenbaum.
-;; Copyright (C) 2010 Oscar Fuentes.
-;; Copyright (C) 2009 Pavel Holejsovsky.
-;; Copyright (C) 2011-2012 Peter J Weisberg
-;; Copyright (C) 2009, 2010 Phil Jackson.
-;; Copyright (C) 2010 Philip Weaver.
-;; Copyright (C) 2010 Ramkumar Ramachandra.
-;; Copyright (C) 2010 Remco van 't Veer.
-;; Copyright (C) 2009 René Stadler.
-;; Copyright (C) 2010 Robin Green.
-;; Copyright (C) 2010 Roger Crew.
-;; Copyright (C) 2009, 2010, 2011 Rémi Vanicat.
-;; Copyright (C) 2010 Sean Bryant.
-;; Copyright (C) 2009, 2011 Steve Purcell.
-;; Copyright (C) 2010 Timo Juhani Lindfors.
-;; Copyright (C) 2010, 2011 Yann Hodique.
-;; Copyright (C) 2010 Ævar Arnfjörð Bjarmason.
-;; Copyright (C) 2010 Óscar Fuentes.
-
-;; Original Author: Marius Vollmer <marius.vollmer@nokia.com>
-;; Former Maintainer: Phil Jackson <phil@shellarchive.co.uk>
-;; Maintenance Group: https://github.com/organizations/magit/teams/53130
-;;   Currently composed of:
-;;   - Phil Jackson
-;;   - Peter J Weisberg
-;;   - Yann Hodique
-;;   - Rémi Vanicat
-;; Version: 1.2.0
-;; Keywords: tools
-
-;;
-;; Magit 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, or (at your option)
-;; any later version.
-;;
-;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Invoking the magit-status function will show a buffer with the
-;; status of the current git repository and its working tree.  That
-;; buffer offers key bindings for manipulating the status in simple
-;; ways.
-;;
-;; The status buffer mainly shows the difference between the working
-;; tree and the index, and the difference between the index and the
-;; current HEAD.  You can add individual hunks from the working tree
-;; to the index, and you can commit the index.
-;;
-;; See the Magit User Manual for more information.
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'log-edit)
-(require 'easymenu)
-(require 'diff-mode)
-
-;; Silences byte-compiler warnings
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest args))))
-
-(eval-when-compile  (require 'view))
-(declare-function view-mode 'view)
-(eval-when-compile (require 'iswitchb))
-(eval-when-compile (require 'ido))
-(eval-when-compile (require 'ediff))
-
-;; Dummy to be used by the defcustoms when first loading the file.
-(eval-when (load eval)
-  (defalias 'magit-set-variable-and-refresh 'set-default))
-
-;;; Code:
-(defgroup magit nil
-  "Controlling Git from Emacs."
-  :prefix "magit-"
-  :group 'tools)
-
-(defcustom magit-git-executable "git"
-  "The name of the Git executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-gitk-executable (concat (file-name-directory magit-git-executable)
-                                         "gitk")
-  "The name of the Gitk executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-git-standard-options '("--no-pager")
-  "Standard options when running Git."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs nil
-  "Directories containing Git repositories.
-Magit will look into these directories for Git repositories and
-offer them as choices for `magit-status'."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs-depth 3
-  "The maximum depth to look for Git repos.
-When looking for a Git repository below the directories in `magit-repo-dirs',
-Magit will only descend this many levels deep."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-set-upstream-on-push nil
-  "Non-nil means that `magit-push' may use --set-upstream when pushing a branch.
-This only applies if the branch does not have an upstream set yet.
-Setting this to t will ask if --set-upstream should be used.
-Setting it to 'dontask will always use --set-upstream.
-Setting it to 'refuse will refuse to push unless a remote branch has already been set.
-
---set-upstream is supported with git > 1.7.0"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Refuse" refuse)
-                 (const :tag "Always" dontask)))
-
-(defcustom magit-save-some-buffers t
-  "Non-nil means that \\[magit-status] will save modified buffers before running.
-Setting this to t will ask which buffers to save, setting it to 'dontask will
-save all modified buffers without asking."
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Save without asking" dontask)))
-
-(defcustom magit-save-some-buffers-predicate
-  'magit-save-buffers-predicate-tree-only
-  "A predicate function to decide whether to save a buffer.
-
-Used by function `magit-save-some-buffers' when the variable of
-the same name is non-nil."
-
-  :group 'magit
-  :type '(radio (function-item magit-save-buffers-predicate-tree-only)
-                (function-item magit-save-buffers-predicate-all)
-                (function :tag "Other")))
-
-(defcustom magit-default-tracking-name-function
-  'magit-default-tracking-name-remote-plus-branch
-  "Specifies the function to use to generate default tracking branch names
-when doing a \\[magit-checkout].
-
-The default is magit-default-tracking-name-remote-plus-branch,
-which generates a tracking name of the form 'REMOTE-BRANCHNAME'."
-  :group 'magit
-  :type '(radio (function-item magit-default-tracking-name-remote-plus-branch)
-                (function-item magit-default-tracking-name-branch-only)
-                (function :tag "Other")))
-
-(defcustom magit-commit-all-when-nothing-staged 'ask
-  "Determines what \\[magit-log-edit] does when nothing is staged.
-Setting this to nil will make it do nothing, setting it to t will
-arrange things so that the actual commit command will use the \"--all\" option,
-setting it to 'ask will first ask for confirmation whether to do this,
-and setting it to 'ask-stage will cause all changes to be staged,
-after a confirmation."
-  :group 'magit
-  :type '(choice (const :tag "No" nil)
-                 (const :tag "Always" t)
-                 (const :tag "Ask" ask)
-                 (const :tag "Ask to stage everything" ask-stage)))
-
-(defcustom magit-commit-signoff nil
-  "Add the \"Signed-off-by:\" line when committing."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-sha1-abbrev-length 7
-  "The number of digits to show when a sha1 is displayed in abbreviated form."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-cutoff-length 100
-  "The maximum number of commits to show in the log and whazzup buffers."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-infinite-length 99999
-  "Number of log used to show as maximum for `magit-log-cutoff-length'."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-auto-more nil
-  "Insert more log entries automatically when moving past the last entry.
-
-Only considered when moving past the last entry with
-`magit-goto-*-section' commands."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-process-popup-time -1
-  "Popup the process buffer if a command takes longer than this many seconds."
-  :group 'magit
-  :type '(choice (const :tag "Never" -1)
-                 (const :tag "Immediately" 0)
-                 (integer :tag "After this many seconds")))
-
-(defcustom magit-revert-item-confirm t
-  "Require acknowledgment before reverting an item."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-log-edit-confirm-cancellation nil
-  "Require acknowledgment before canceling the log edit buffer."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-remote-ref-format 'branch-then-remote
-  "What format to use for autocompleting refs, in pariticular for remotes.
-
-Autocompletion is used by functions like `magit-checkout',
-`magit-interactive-rebase' and others which offer branch name
-completion.
-
-The value 'name-then-remote means remotes will be of the
-form \"name (remote)\", while the value 'remote-slash-name
-means that they'll be of the form \"remote/name\".  I.e. something that's
-listed as \"remotes/upstream/next\" by \"git branch -l -a\"
-will be \"upstream/next\"."
-  :group 'magit
-  :type '(choice (const :tag "name (remote)" branch-then-remote)
-                 (const :tag "remote/name" remote-slash-branch)))
-
-(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
-  "Connection type used for the git process.
-
-If nil, use pipes: this is usually more efficient, and works on Cygwin.
-If t, use ptys: this enables magit to prompt for passphrases when needed."
-  :group 'magit
-  :type '(choice (const :tag "pipe" nil)
-                 (const :tag "pty" t)))
-
-(defcustom magit-completing-read-function 'magit-builtin-completing-read
-  "Function to be called when requesting input from the user."
-  :group 'magit
-  :type '(radio (function-item magit-iswitchb-completing-read)
-                (function-item magit-ido-completing-read)
-                (function-item magit-builtin-completing-read)
-                (function :tag "Other")))
-
-(defcustom magit-create-branch-behaviour 'at-head
-  "Where magit will create a new branch if not supplied a branchname or ref.
-
-The value 'at-head means a new branch will be created at the tip
-of your current branch, while the value 'at-point means magit
-will try to find a valid reference at point..."
-  :group 'magit
-  :type '(choice (const :tag "at HEAD" at-head)
-                 (const :tag "at point" at-point)))
-
-(defcustom magit-status-buffer-switch-function 'pop-to-buffer
-  "Function for `magit-status' to use for switching to the status buffer.
-
-The function is given one argument, the status buffer."
-  :group 'magit
-  :type '(radio (function-item switch-to-buffer)
-                (function-item pop-to-buffer)
-                (function :tag "Other")))
-
-(defcustom magit-rewrite-inclusive t
-  "Whether magit includes the selected base commit in a rewrite operation.
-
-t means both the selected commit as well as any subsequent
-commits will be rewritten.  This is magit's default behaviour,
-equivalent to 'git rebase -i ${REV}~1'
-
-  A'---B'---C'---D'
-  ^
-
-nil means the selected commit will be literally used as 'base',
-so only subsequent commits will be rewritten.  This is consistent
-with git-rebase, equivalent to 'git rebase -i ${REV}', yet more
-cumbersome to use from the status buffer.
-
-  A---B'---C'---D'
-  ^"
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "Ask"   ask)))
-
-(defcustom magit-highlight-whitespace t
-  "Specifies where to highlight whitespace errors.
-See `magit-highlight-trailing-whitespace',
-`magit-highlight-indentation'.  The symbol t means in all diffs,
-'status means only in the status buffer, and nil means nowhere."
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "In status buffer" status))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-trailing-whitespace t
-  "Highlight whitespace at the end of a line in diffs.
-Used only when `magit-highlight-whitespace' is non-nil."
-  :group 'magit
-  :type 'boolean
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-indentation nil
-  "Highlight the \"wrong\" indentation style.
-Used only when `magit-highlight-whitespace' is non-nil.
-
-The value is a list of cons cells.  The car is a regular
-expression, and the cdr is the value that applies to repositories
-whose directory matches the regular expression.  If more than one
-item matches, then the *last* item in the list applies.  So, the
-default value should come first in the list.
-
-If the value is `tabs', highlight indentation with tabs.  If the
-value is an integer, highlight indentation with at least that
-many spaces.  Otherwise, highlight neither."
-  :group 'magit
-  :type `(repeat (cons (string :tag "Directory regexp")
-                       (choice (const :tag "Tabs" tabs)
-                               (integer :tag "Spaces" :value ,tab-width)
-                               (const :tag "Neither" nil))))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-diff-refine-hunk nil
-  "Show fine (word-granularity) differences within diff hunks.
-
-There are three possible settings:
-
-  nil means to never show fine differences
-
-  t means to only show fine differences for the currently
-  selected diff hunk
-
-  `all' means to always show fine differences for all displayed diff hunks"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Selected only" t)
-                 (const :tag "All" all))
-  :set 'magit-set-variable-and-refresh)
-
-(defvar magit-current-indentation nil
-  "Indentation highlight used in the current buffer.
-This is calculated from `magit-highlight-indentation'.")
-(make-variable-buffer-local 'magit-current-indentation)
-
-(defgroup magit-faces nil
-  "Customize the appearance of Magit."
-  :prefix "magit-"
-  :group 'faces
-  :group 'magit)
-
-(defface magit-header
-  '((t :inherit header-line))
-  "Face for generic header lines.
-
-Many Magit faces inherit from this one by default."
-  :group 'magit-faces)
-
-(defface magit-section-title
-  '((t :inherit magit-header))
-  "Face for section titles."
-  :group 'magit-faces)
-
-(defface magit-branch
-  '((t :inherit magit-header))
-  "Face for the current branch."
-  :group 'magit-faces)
-
-(defface magit-diff-file-header
-  '((t :inherit diff-file-header))
-  "Face for diff file header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-header
-  '((t :inherit diff-hunk-header))
-  "Face for diff hunk header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-add
-  '((t :inherit diff-added))
-  "Face for lines in a diff that have been added."
-  :group 'magit-faces)
-
-(defface magit-diff-none
-  '((t :inherit diff-context))
-  "Face for lines in a diff that are unchanged."
-  :group 'magit-faces)
-
-(defface magit-diff-del
-  '((t :inherit diff-removed))
-  "Face for lines in a diff that have been deleted."
-  :group 'magit-faces)
-
-(defface magit-log-graph
-  '((((class color) (background light))
-     :foreground "grey11")
-    (((class color) (background dark))
-     :foreground "grey80"))
-  "Face for the graph element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-sha1
-  '((((class color) (background light))
-     :foreground "firebrick")
-    (((class color) (background dark))
-     :foreground "tomato"))
-  "Face for the sha1 element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-message
-  '((t))
-  "Face for the message element of the log output."
-  :group 'magit-faces)
-
-(defface magit-item-highlight
-  '((t :inherit highlight))
-  "Face for highlighting the current item."
-  :group 'magit-faces)
-
-(defface magit-item-mark
-  '((t :inherit secondary-selection))
-  "Face for highlighting marked item."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-good
-  '((((class color) (background light))
-     :box t
-     :background "light green"
-     :foreground "dark olive green")
-    (((class color) (background dark))
-     :box t
-     :background "light green"
-     :foreground "dark olive green"))
-  "Face for good bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-bad
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for bad bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-remote
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "OliveDrab4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey11"
-     :foreground "DarkSeaGreen2"))
-  "Face for remote branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-tags
-  '((((class color) (background light))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4")
-    (((class color) (background dark))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4"))
-  "Face for tag labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-patches
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for Stacked Git patches."
-  :group 'magit-faces)
-
-(defface magit-whitespace-warning-face
-  '((t :inherit trailing-whitespace))
-  "Face for highlighting whitespace errors in Magit diffs."
-  :group 'magit-faces)
-
-(defvar magit-custom-options '()
-  "List of custom options to pass to Git.
-Do not customize this (used in the `magit-key-mode' implementation).")
-
-(defvar magit-read-rev-history nil
-  "The history of inputs to `magit-read-rev'.")
-
-(defvar magit-buffer-internal nil
-  "Track associated *magit* buffers.
-Do not customize this (used in the `magit-log-edit-mode' implementation
-to switch back to the *magit* buffer associated with a given commit
-operation after commit).")
-
-(defvar magit-back-navigation-history nil
-  "History items that will be visited by successively going \"back\".")
-(make-variable-buffer-local 'magit-back-navigation-history)
-(put 'magit-back-navigation-history 'permanent-local t)
-
-(defvar magit-forward-navigation-history nil
-  "History items that will be visited by successively going \"forward\".")
-(make-variable-buffer-local 'magit-forward-navigation-history)
-(put 'magit-forward-navigation-history 'permanent-local t)
-
-(defvar magit-omit-untracked-dir-contents nil
-  "When non-nil magit will only list an untracked directory, not its contents.")
-
-(defvar magit-tmp-buffer-name " *magit-tmp*")
-
-(defface magit-log-head-label-local
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "LightSkyBlue4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey13"
-     :foreground "LightSkyBlue1"))
-  "Face for local branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-default
-  '((((class color) (background light))
-     :box t
-     :background "Grey50")
-    (((class color) (background dark))
-     :box t
-     :background "Grey50"))
-  "Face for unknown ref labels shown in log buffer."
-  :group 'magit-faces)
-
-(defvar magit-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map t)
-    (define-key map (kbd "n") 'magit-goto-next-section)
-    (define-key map (kbd "p") 'magit-goto-previous-section)
-    (define-key map (kbd "^") 'magit-goto-parent-section)
-    (define-key map (kbd "M-n") 'magit-goto-next-sibling-section)
-    (define-key map (kbd "M-p") 'magit-goto-previous-sibling-section)
-    (define-key map (kbd "TAB") 'magit-toggle-section)
-    (define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
-    (define-key map (kbd "1") 'magit-show-level-1)
-    (define-key map (kbd "2") 'magit-show-level-2)
-    (define-key map (kbd "3") 'magit-show-level-3)
-    (define-key map (kbd "4") 'magit-show-level-4)
-    (define-key map (kbd "M-1") 'magit-show-level-1-all)
-    (define-key map (kbd "M-2") 'magit-show-level-2-all)
-    (define-key map (kbd "M-3") 'magit-show-level-3-all)
-    (define-key map (kbd "M-4") 'magit-show-level-4-all)
-    (define-key map (kbd "M-h") 'magit-show-only-files)
-    (define-key map (kbd "M-H") 'magit-show-only-files-all)
-    (define-key map (kbd "M-s") 'magit-show-level-4)
-    (define-key map (kbd "M-S") 'magit-show-level-4-all)
-    (define-key map (kbd "g") 'magit-refresh)
-    (define-key map (kbd "G") 'magit-refresh-all)
-    (define-key map (kbd "?") 'magit-describe-item)
-    (define-key map (kbd "!") 'magit-key-mode-popup-running)
-    (define-key map (kbd ":") 'magit-git-command)
-    (define-key map (kbd "C-x 4 a") 'magit-add-change-log-entry-other-window)
-    (define-key map (kbd "L") 'magit-add-change-log-entry-no-option)
-    (define-key map (kbd "RET") 'magit-visit-item)
-    (define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
-    (define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
-    (define-key map (kbd "C-w") 'magit-copy-item-as-kill)
-    (define-key map (kbd "R") 'magit-rebase-step)
-    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
-    (define-key map (kbd "r") 'magit-key-mode-popup-rewriting)
-    (define-key map (kbd "P") 'magit-key-mode-popup-pushing)
-    (define-key map (kbd "f") 'magit-key-mode-popup-fetching)
-    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
-    (define-key map (kbd "M") 'magit-key-mode-popup-remoting)
-    (define-key map (kbd "B") 'magit-key-mode-popup-bisecting)
-    (define-key map (kbd "F") 'magit-key-mode-popup-pulling)
-    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
-    (define-key map (kbd "$") 'magit-display-process)
-    (define-key map (kbd "c") 'magit-log-edit)
-    (define-key map (kbd "E") 'magit-interactive-rebase)
-    (define-key map (kbd "e") 'magit-ediff)
-    (define-key map (kbd "w") 'magit-wazzup)
-    (define-key map (kbd "q") 'magit-quit-window)
-    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
-    (define-key map (kbd "x") 'magit-reset-head)
-    (define-key map (kbd "v") 'magit-revert-item)
-    (define-key map (kbd "a") 'magit-apply-item)
-    (define-key map (kbd "A") 'magit-cherry-pick-item)
-    (define-key map (kbd "d") 'magit-diff-working-tree)
-    (define-key map (kbd "D") 'magit-diff)
-    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
-    (define-key map (kbd "+") 'magit-diff-larger-hunks)
-    (define-key map (kbd "0") 'magit-diff-default-hunks)
-    (define-key map (kbd "h") 'magit-toggle-diff-refine-hunk)
-    map))
-
-(defvar magit-commit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-b") 'magit-show-commit-backward)
-    (define-key map (kbd "C-c C-f") 'magit-show-commit-forward)
-    map))
-
-(defvar magit-status-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "s") 'magit-stage-item)
-    (define-key map (kbd "S") 'magit-stage-all)
-    (define-key map (kbd "u") 'magit-unstage-item)
-    (define-key map (kbd "U") 'magit-unstage-all)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    (define-key map (kbd "I") 'magit-ignore-item-locally)
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "C") 'magit-add-log)
-    (define-key map (kbd "X") 'magit-reset-working-tree)
-    (define-key map (kbd "z") 'magit-key-mode-popup-stashing)
-    map))
-
-(eval-after-load 'dired-x
-  '(define-key magit-status-mode-map [remap dired-jump] 'magit-dired-jump))
-
-(defvar magit-log-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "e") 'magit-log-show-more-entries)
-    map))
-
-(defvar magit-wazzup-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    map))
-
-(defvar magit-branch-manager-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "c") 'magit-create-branch)
-    (define-key map (kbd "a") 'magit-add-remote)
-    (define-key map (kbd "r") 'magit-move-item)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "T") 'magit-change-what-branch-tracks)
-    map))
-
-(defvar magit-bug-report-url
-  "http://github.com/magit/magit/issues")
-
-(defconst magit-version "1.2.0"
-  "The version of Magit that you're using.")
-
-(defun magit-bug-report (str)
-  "Asks the user to submit a bug report about the error described in STR."
-;; XXX - should propose more information to be included.
-  (message (concat
-            "Unknown error: %s\n"
-            "Please, with as much information as possible, file a bug at\n"
-            "%s\n"
-            "You are using Magit version %s.")
-           str magit-bug-report-url magit-version))
-
-(defun magit-buffer-switch (buf)
-  (if (string-match "magit" (buffer-name))
-      (switch-to-buffer buf)
-    (pop-to-buffer buf)))
-
-;;; Macros
-
-(defmacro magit-with-refresh (&rest body)
-  (declare (indent 0))
-  `(magit-refresh-wrapper (lambda () ,@body)))
-
-;;; Git features
-
-(defvar magit-have-graph 'unset)
-(defvar magit-have-decorate 'unset)
-(defvar magit-have-abbrev 'unset)
-(make-variable-buffer-local 'magit-have-graph)
-(put 'magit-have-graph 'permanent-local t)
-(make-variable-buffer-local 'magit-have-decorate)
-(put 'magit-have-decorate 'permanent-local t)
-(make-variable-buffer-local 'magit-have-abbrev)
-(put 'magit-have-abbrev 'permanent-local t)
-
-(defun magit-configure-have-graph ()
-  (if (eq magit-have-graph 'unset)
-      (let ((res (magit-git-exit-code "log" "--graph" "--max-count=0")))
-        (setq magit-have-graph (eq res 0)))))
-
-(defun magit-configure-have-decorate ()
-  (if (eq magit-have-decorate 'unset)
-      (let ((res (magit-git-exit-code "log" "--decorate=full" "--max-count=0")))
-        (setq magit-have-decorate (eq res 0)))))
-
-(defun magit-configure-have-abbrev ()
-  (if (eq magit-have-abbrev 'unset)
-      (let ((res (magit-git-exit-code "log" "--no-abbrev-commit" "--max-count=0")))
-        (setq magit-have-abbrev (eq res 0)))))
-
-;;; Compatibilities
-
-(eval-and-compile
-  (defun magit-max-args-internal (function)
-    "Returns the maximum number of arguments accepted by FUNCTION."
-    (if (symbolp function)
-        (setq function (symbol-function function)))
-    (if (subrp function)
-        (let ((max (cdr (subr-arity function))))
-          (if (eq 'many max)
-              most-positive-fixnum
-            max))
-      (if (eq 'macro (car-safe function))
-          (setq function (cdr function)))
-      (let ((arglist (if (byte-code-function-p function)
-                         (aref function 0)
-                       (second function))))
-        (if (memq '&rest arglist)
-            most-positive-fixnum
-          (length (remq '&optional arglist))))))
-
-  (if (functionp 'start-file-process)
-      (defalias 'magit-start-process 'start-file-process)
-    (defalias 'magit-start-process 'start-process))
-
-  (unless (fboundp 'string-match-p)
-    (defun string-match-p (regexp string &optional start)
-      "Same as `string-match' except this function does not
-change the match data."
-      (let ((inhibit-changing-match-data t))
-        (string-match regexp string start))))
-
-  (if (fboundp 'with-silent-modifications)
-      (defalias 'magit-with-silent-modifications 'with-silent-modifications)
-    (defmacro magit-with-silent-modifications (&rest body)
-      "Execute body without changing `buffer-modified-p'. Also, do not
-record undo information."
-      `(set-buffer-modified-p
-        (prog1 (buffer-modified-p)
-          (let ((buffer-undo-list t)
-                before-change-functions
-                after-change-functions)
-            ,@body)))))
-
-  (if (>= (magit-max-args-internal 'delete-directory) 2)
-      (defalias 'magit-delete-directory 'delete-directory)
-    (defun magit-delete-directory (directory &optional recursive)
-      "Deletes a directory named DIRECTORY.  If RECURSIVE is non-nil,
-recursively delete all of DIRECTORY's contents as well.
-
-Does not follow symlinks."
-      (if (or (file-symlink-p directory)
-              (not (file-directory-p directory)))
-          (delete-file directory)
-        (if recursive
-            ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23
-            (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
-              (magit-delete-directory file recursive)))
-        (delete-directory directory)))))
-
-;;; Utilities
-
-(defun magit-set-variable-and-refresh (symbol value)
-  "Set SYMBOL to VALUE and call `magit-refresh-all'"
-  (set-default symbol value)
-  (magit-refresh-all))
-
-(defun magit-iswitchb-completing-read (prompt choices &optional predicate require-match
-                                              initial-input hist def)
-  "iswitchb-based completing-read almost-replacement."
-  (require 'iswitchb)
-  (let ((iswitchb-make-buflist-hook
-         (lambda ()
-           (setq iswitchb-temp-buflist (if (consp (first choices))
-                                           (mapcar #'car choices)
-                                         choices)))))
-    (iswitchb-read-buffer prompt (or initial-input def) require-match)))
-
-(defun magit-ido-completing-read (prompt choices &optional predicate require-match initial-input hist def)
-  "ido-based completing-read almost-replacement."
-  (require 'ido)
-  (let ((selected (ido-completing-read prompt (if (consp (first choices))
-                                                  (mapcar #'car choices)
-                                                choices)
-                                       predicate require-match initial-input hist def)))
-    (if (consp (first choices))
-        (or (cdr (assoc selected choices))
-            selected)
-      selected)))
-
-(defun magit-builtin-completing-read (prompt choices &optional predicate require-match
-                                             initial-input hist def)
-  "Magit wrapper for standard `completing-read' function."
-  (completing-read (if (and def (> (length prompt) 2)
-                            (string-equal ": " (substring prompt -2)))
-                       (format "%s (default %s): " (substring prompt 0 -2) def)
-                     prompt)
-                   choices predicate require-match initial-input hist def))
-
-(defun magit-completing-read (prompt choices &optional predicate require-match
-                                     initial-input hist def)
-  (funcall magit-completing-read-function prompt choices predicate require-match
-           initial-input hist def))
-
-(defun magit-use-region-p ()
-  (if (fboundp 'use-region-p)
-      (use-region-p)
-    (and transient-mark-mode mark-active)))
-
-(defun magit-goto-line (line)
-  "Like `goto-line' but doesn't set the mark."
-  (save-restriction
-    (widen)
-    (goto-char 1)
-    (forward-line (1- line))))
-
-(defun magit-trim-line (str)
-  (if (string= str "")
-      nil
-    (if (equal (elt str (- (length str) 1)) ?\n)
-        (substring str 0 (- (length str) 1))
-      str)))
-
-(defun magit-split-lines (str)
-  (if (string= str "")
-      nil
-    (let ((lines (nreverse (split-string str "\n"))))
-      (if (string= (car lines) "")
-          (setq lines (cdr lines)))
-      (nreverse lines))))
-
-(defun magit-git-insert (args)
-  (insert (magit-git-output args)))
-
-(defun magit-git-output (args)
-  (magit-cmd-output magit-git-executable (append magit-git-standard-options args)))
-
-(defun magit-cmd-insert (cmd args)
-  (insert (magit-cmd-output cmd args)))
-
-(defun magit-cmd-output (cmd args)
-  (let ((cmd-output (with-output-to-string
-                      (with-current-buffer standard-output
-                        (apply #'process-file
-                               cmd
-                               nil (list t nil) nil
-                               args)))))
-    (replace-regexp-in-string "\e\\[.*?m" "" cmd-output)))
-
-(defun magit-git-string (&rest args)
-  (magit-trim-line (magit-git-output args)))
-
-(defun magit-git-lines (&rest args)
-  (magit-split-lines (magit-git-output args)))
-
-(defun magit-git-exit-code (&rest args)
-  (apply #'process-file magit-git-executable nil nil nil
-         (append magit-git-standard-options args)))
-
-(defun magit-file-lines (file)
-  (when (file-exists-p file)
-    (with-temp-buffer
-      (insert-file-contents file)
-      (let ((rev (nreverse (split-string (buffer-string) "\n"))))
-        (nreverse (if (equal (car rev) "")
-                      (cdr rev)
-                    rev))))))
-
-(defun magit-write-file-lines (file lines)
-  (with-temp-buffer
-    (dolist (l lines)
-      (insert l "\n"))
-    (write-file file)))
-
-(defun magit-get (&rest keys)
-  "Return the value of Git config entry specified by KEYS."
-  (magit-git-string "config" (mapconcat 'identity keys ".")))
-
-(defun magit-get-all (&rest keys)
-  "Return all values of the Git config entry specified by KEYS."
-  (magit-git-lines "config" "--get-all" (mapconcat 'identity keys ".")))
-
-(defun magit-get-boolean (&rest keys)
-  "Return the boolean value of Git config entry specified by KEYS."
-  (equal (magit-git-string "config" "--bool" (mapconcat 'identity keys "."))
-         "true"))
-
-(defun magit-set (val &rest keys)
-  "Set Git config settings specified by KEYS to VAL."
-  (if val
-      (magit-git-string "config" (mapconcat 'identity keys ".") val)
-    (magit-git-string "config" "--unset" (mapconcat 'identity keys "."))))
-
-(defun magit-remove-conflicts (alist)
-  (let ((dict (make-hash-table :test 'equal))
-        (result nil))
-    (dolist (a alist)
-      (puthash (car a) (cons (cdr a) (gethash (car a) dict))
-               dict))
-    (maphash (lambda (key value)
-               (if (= (length value) 1)
-                   (push (cons key (car value)) result)
-                 (let ((sub (magit-remove-conflicts
-                             (mapcar (lambda (entry)
-                                       (let ((dir (directory-file-name
-                                                   (substring entry 0 (- (length key))))))
-                                         (cons (concat (file-name-nondirectory dir) "/" key)
-                                               entry)))
-                                     value))))
-                   (setq result (append result sub)))))
-             dict)
-    result))
-
-(defun magit-git-repo-p (dir)
-  (file-exists-p (expand-file-name ".git" dir)))
-
-(defun magit-git-dir ()
-  "Returns the .git directory for the current repository."
-  (concat (expand-file-name (magit-git-string "rev-parse" "--git-dir")) "/"))
-
-(defun magit-no-commit-p ()
-  "Return non-nil if there is no commit in the current git repository."
-  (not (magit-git-string
-        "rev-list" "HEAD" "--max-count=1")))
-
-(defun magit-list-repos* (dir level)
-  (if (magit-git-repo-p dir)
-      (list dir)
-    (apply #'append
-           (mapcar (lambda (entry)
-                     (unless (or (string= (substring entry -3) "/..")
-                                 (string= (substring entry -2) "/."))
-                       (magit-list-repos* entry (+ level 1))))
-                   (and (file-directory-p dir)
-                        (< level magit-repo-dirs-depth)
-                        (directory-files dir t nil t))))))
-
-(defun magit-list-repos (dirs)
-  (magit-remove-conflicts
-   (apply #'append
-          (mapcar (lambda (dir)
-                    (mapcar #'(lambda (repo)
-                                (cons (file-name-nondirectory repo)
-                                      repo))
-                            (magit-list-repos* dir 0)))
-                  dirs))))
-
-(defun magit-get-top-dir (cwd)
-  (let ((cwd (expand-file-name (file-truename cwd))))
-    (when (file-directory-p cwd)
-      (let* ((default-directory (file-name-as-directory cwd))
-             (cdup (magit-git-string "rev-parse" "--show-cdup")))
-        (when cdup
-          (file-name-as-directory (expand-file-name cdup cwd)))))))
-
-(defun magit-get-ref (ref)
-  (magit-git-string "symbolic-ref" "-q" ref))
-
-(defun magit-get-current-branch ()
-  (let* ((head (magit-get-ref "HEAD"))
-         (pos (and head (string-match "^refs/heads/" head))))
-    (if pos
-        (substring head 11)
-      nil)))
-
-(defun magit-get-remote (branch)
-  "Return the name of the remote for BRANCH.
-If branch is nil or it has no remote, but a remote named
-\"origin\" exists, return that. Otherwise, return nil."
-  (let ((remote (or (and branch (magit-get "branch" branch "remote"))
-                    (and (magit-get "remote" "origin" "url") "origin"))))
-    (if (string= remote "") nil remote)))
-
-(defun magit-get-current-remote ()
-  "Return the name of the remote for the current branch.
-If there is no current branch, or no remote for that branch,
-but a remote named \"origin\" is configured, return that.
-Otherwise, return nil."
-  (magit-get-remote (magit-get-current-branch)))
-
-(defun magit-ref-exists-p (ref)
-  (= (magit-git-exit-code "show-ref" "--verify" ref) 0))
-
-(defun magit-read-top-dir (dir)
-  "Ask the user for a Git repository.  The choices offered by
-auto-completion will be the repositories under `magit-repo-dirs'.
-If `magit-repo-dirs' is nil or DIR is non-nill, then
-autocompletion will offer directory names."
-  (if (and (not dir) magit-repo-dirs)
-      (let* ((repos (magit-list-repos magit-repo-dirs))
-             (reply (magit-completing-read "Git repository: " repos)))
-        (file-name-as-directory
-         (or (cdr (assoc reply repos))
-             (if (file-directory-p reply)
-                 (expand-file-name reply)
-               (error "Not a repository or a directory: %s" reply)))))
-    (file-name-as-directory
-     (read-directory-name "Git repository: "
-                          (or (magit-get-top-dir default-directory)
-                              default-directory)))))
-
-(defun magit-rev-parse (ref)
-  "Return the SHA hash for REF."
-  (magit-git-string "rev-parse" ref))
-
-(defun magit-ref-ambiguous-p (ref)
-  "Return whether or not REF is ambiguous."
-  ;; If REF is ambiguous, rev-parse just prints errors,
-  ;; so magit-git-string returns nil.
-  (not (magit-git-string "rev-parse" "--abbrev-ref" ref)))
-
-(defun magit-name-rev (rev &optional no-trim)
-  "Return a human-readable name for REV.
-Unlike git name-rev, this will remove tags/ and remotes/ prefixes
-if that can be done unambiguously (unless optional arg NO-TRIM is
-non-nil).  In addition, it will filter out revs involving HEAD."
-  (when rev
-    (let ((name (magit-git-string "name-rev" "--no-undefined" "--name-only" rev)))
-      ;; There doesn't seem to be a way of filtering HEAD out from name-rev,
-      ;; so we have to do it manually.
-      ;; HEAD-based names are too transient to allow.
-      (when (and (stringp name)
-                 (string-match "^\\(.*\\<HEAD\\)\\([~^].*\\|$\\)" name))
-        (let ((head-ref (match-string 1 name))
-              (modifier (match-string 2 name)))
-          ;; Sometimes when name-rev gives a HEAD-based name,
-          ;; rev-parse will give an actual branch or remote name.
-          (setq name (concat (magit-git-string "rev-parse" "--abbrev-ref" head-ref)
-                             modifier))
-          ;; If rev-parse doesn't give us what we want, just use the SHA.
-          (when (or (null name) (string-match-p "\\<HEAD\\>" name))
-            (setq name (magit-rev-parse rev)))))
-      (setq rev (or name rev))
-      (when (string-match "^\\(?:tags\\|remotes\\)/\\(.*\\)" rev)
-        (let ((plain-name (match-string 1 rev)))
-          (unless (or no-trim (magit-ref-ambiguous-p plain-name))
-            (setq rev plain-name))))
-      rev)))
-
-(defun magit-highlight-line-whitespace ()
-  (when (and magit-highlight-whitespace
-             (or (derived-mode-p 'magit-status-mode)
-                 (not (eq magit-highlight-whitespace 'status))))
-    (if (and magit-highlight-trailing-whitespace
-             (looking-at "^[-+].*?\\([ \t]+\\)$"))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))
-    (if (or (and (eq magit-current-indentation 'tabs)
-                 (looking-at "^[-+]\\( *\t[ \t]*\\)"))
-            (and (integerp magit-current-indentation)
-                 (looking-at (format "^[-+]\\([ \t]* \\{%s,\\}[ \t]*\\)"
-                                     magit-current-indentation))))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))))
-
-(defun magit-put-line-property (prop val)
-  (put-text-property (line-beginning-position) (line-beginning-position 2)
-                     prop val))
-
-(defun magit-format-commit (commit format)
-  (magit-git-string "log" "--max-count=1"
-                    (concat "--pretty=format:" format)
-                    commit))
-
-(defun magit-current-line ()
-  (buffer-substring-no-properties (line-beginning-position)
-                                  (line-end-position)))
-
-(defun magit-insert-region (beg end buf)
-  (let ((text (buffer-substring-no-properties beg end)))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-insert-current-line (buf)
-  (let ((text (buffer-substring-no-properties
-               (line-beginning-position) (line-beginning-position 2))))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-file-uptodate-p (file)
-  (eq (magit-git-exit-code "diff" "--quiet" "--" file) 0))
-
-(defun magit-anything-staged-p ()
-  (not (eq (magit-git-exit-code "diff" "--quiet" "--cached") 0)))
-
-(defun magit-everything-clean-p ()
-  (and (not (magit-anything-staged-p))
-       (eq (magit-git-exit-code "diff" "--quiet") 0)))
-
-(defun magit-commit-parents (commit)
-  (cdr (split-string (magit-git-string "rev-list" "-1" "--parents" commit))))
-
-;; XXX - let the user choose the parent
-
-(defun magit-choose-parent-id (commit op)
-  (let* ((parents (magit-commit-parents commit)))
-    (if (> (length parents) 1)
-        (error "Can't %s merge commits" op)
-      nil)))
-
-;;; Revisions and ranges
-
-(defvar magit-current-range nil
-  "The range described by the current buffer.
-This is only non-nil in diff and log buffers.
-
-This has three possible (non-nil) forms.  If it's a string REF or
-a singleton list (REF), then the range is from REF to the current
-working directory state (or HEAD in a log buffer).  If it's a
-pair (START . END), then the range is START..END.")
-(make-variable-buffer-local 'magit-current-range)
-
-(defun magit-list-interesting-refs (&optional uninteresting)
-  "Return interesting references as given by `git show-ref'.
-Removes references matching UNINTERESTING from the
-results. UNINTERESTING can be either a function taking a single
-argument or a list of strings used as regexps."
-  (let ((refs ()))
-    (dolist (line (magit-git-lines "show-ref"))
-      (if (string-match "[^ ]+ +\\(.*\\)" line)
-          (let ((ref (match-string 1 line)))
-            (cond ((and (functionp uninteresting)
-                        (funcall uninteresting ref)))
-                  ((and (not (functionp uninteresting))
-                        (loop for i in uninteresting thereis (string-match i ref))))
-                  (t
-                   (let ((fmt-ref (magit-format-ref ref)))
-                     (when fmt-ref
-                       (push (cons fmt-ref
-                                   (replace-regexp-in-string "^refs/heads/"
-                                                             "" ref))
-                             refs))))))))
-    (nreverse refs)))
-
-(defun magit-format-ref (ref)
-  "Convert fully-specified ref REF into its displayable form
-according to `magit-remote-ref-format'"
-  (cond
-   ((null ref)
-    nil)
-   ((string-match "refs/heads/\\(.*\\)" ref)
-    (match-string 1 ref))
-   ((string-match "refs/tags/\\(.*\\)" ref)
-    (format (if (eq magit-remote-ref-format 'branch-then-remote)
-                "%s (tag)"
-              "%s")
-            (match-string 1 ref)))
-   ((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref)
-    (if (eq magit-remote-ref-format 'branch-then-remote)
-        (format "%s (%s)"
-                (match-string 2 ref)
-                (match-string 1 ref))
-      (format "%s/%s"
-              (match-string 1 ref)
-              (match-string 2 ref))))))
-
-(defun magit-tree-contents (treeish)
-  "Returns a list of all files under TREEISH.  TREEISH can be a tree,
-a commit, or any reference to one of those."
-  (let ((return-value nil))
-    (with-temp-buffer
-      (magit-git-insert (list "ls-tree" "-r" treeish))
-      (if (eql 0 (buffer-size))
-          (error "%s is not a commit or tree." treeish))
-      (goto-char (point-min))
-      (while (search-forward-regexp "\t\\(.*\\)" nil 'noerror)
-        (push (match-string 1) return-value)))
-    return-value))
-
-(defvar magit-uninteresting-refs '("refs/remotes/\\([^/]+\\)/HEAD$" "refs/stash"))
-
-(defun magit-read-file-from-rev (revision)
-  (magit-completing-read (format "Retrieve file from %s: " revision)
-                         (magit-tree-contents revision)
-                         nil
-                         'require-match
-                         nil
-                         'magit-read-file-hist
-                         (if buffer-file-name
-                             (let ((topdir-length (length (magit-get-top-dir default-directory))))
-                               (substring (buffer-file-name) topdir-length)))))
-
-(defun magit-read-rev (prompt &optional default uninteresting)
-  (let* ((interesting-refs (magit-list-interesting-refs
-                            (or uninteresting magit-uninteresting-refs)))
-         (reply (magit-completing-read (concat prompt ": ") interesting-refs
-                                       nil nil nil 'magit-read-rev-history default))
-         (rev (or (cdr (assoc reply interesting-refs)) reply)))
-    (if (string= rev "")
-        nil
-      rev)))
-
-(defun magit-read-rev-range (op &optional def-beg def-end)
-  (let ((beg (magit-read-rev (format "%s start" op)
-                             def-beg)))
-    (if (not beg)
-        nil
-      (save-match-data
-        (if (string-match "^\\(.+\\)\\.\\.\\(.+\\)$" beg)
-            (cons (match-string 1 beg) (match-string 2 beg))
-          (let ((end (magit-read-rev (format "%s end" op) def-end)))
-            (cons beg end)))))))
-
-(defun magit-rev-to-git (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      (magit-marked-commit)
-    rev))
-
-(defun magit-rev-range-to-git (range)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      range
-    (if (cdr range)
-        (format "%s..%s"
-                (magit-rev-to-git (car range))
-                (magit-rev-to-git (cdr range)))
-      (format "%s" (magit-rev-to-git (car range))))))
-
-(defun magit-rev-describe (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      "mark"
-    (magit-name-rev rev)))
-
-(defun magit-rev-range-describe (range things)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      (format "%s in %s" things range)
-    (if (cdr range)
-        (format "%s from %s to %s" things
-                (magit-rev-describe (car range))
-                (magit-rev-describe (cdr range)))
-      (format "%s at %s" things (magit-rev-describe (car range))))))
-
-(defun magit-default-rev (&optional no-trim)
-  (or (magit-name-rev (magit-commit-at-point t) no-trim)
-      (let ((branch (magit-guess-branch)))
-        (if branch
-            (if (string-match "^refs/\\(.*\\)" branch)
-                (match-string 1 branch)
-              branch)))))
-
-(defun magit-read-remote (&optional prompt def)
-  "Read the name of a remote.
-PROMPT is used as the prompt, and defaults to \"Remote\".
-DEF is the default value."
-  (let* ((prompt (or prompt "Remote"))
-         (def (or def (magit-guess-remote)))
-         (remotes (magit-git-lines "remote"))
-
-         (reply (magit-completing-read (concat prompt ": ") remotes
-                                       nil nil nil nil def)))
-    (if (string= reply "") nil reply)))
-
-(defun magit-read-remote-branch (remote &optional prompt default)
-  (let* ((prompt (or prompt (format "Remote branch (in %s)" remote)))
-         (branches (delete nil
-                           (mapcar
-                            (lambda (b)
-                              (and (not (string-match " -> " b))
-                                   (string-match (format "^ *%s/\\(.*\\)$"
-                                                         (regexp-quote remote)) b)
-                                   (match-string 1 b)))
-                            (magit-git-lines "branch" "-r"))))
-         (reply (magit-completing-read (concat prompt ": ") branches
-                                       nil nil nil nil default)))
-    (if (string= reply "") nil reply)))
-
-;;; Sections
-
-;; A buffer in magit-mode is organized into hierarchical sections.
-;; These sections are used for navigation and for hiding parts of the
-;; buffer.
-;;
-;; Most sections also represent the objects that Magit works with,
-;; such as files, diffs, hunks, commits, etc.  The 'type' of a section
-;; identifies what kind of object it represents (if any), and the
-;; parent and grand-parent, etc provide the context.
-
-(defstruct magit-section
-  parent title beginning end children hidden type info
-  needs-refresh-on-show)
-
-(defvar magit-top-section nil
-  "The top section of the current buffer.")
-(make-variable-buffer-local 'magit-top-section)
-(put 'magit-top-section 'permanent-local t)
-
-(defvar magit-old-top-section nil)
-
-(defvar magit-section-hidden-default nil)
-
-(defun magit-new-section (title type)
-  "Create a new section with title TITLE and type TYPE in current buffer.
-
-If not `magit-top-section' exist, the new section will be the new top-section
-otherwise, the new-section will be a child of the current top-section.
-
-If TYPE is nil, the section won't be highlighted."
-  (let* ((s (make-magit-section :parent magit-top-section
-                                :title title
-                                :type type
-                                :hidden magit-section-hidden-default))
-         (old (and magit-old-top-section
-                   (magit-find-section (magit-section-path s)
-                                       magit-old-top-section))))
-    (if magit-top-section
-        (push s (magit-section-children magit-top-section))
-      (setq magit-top-section s))
-    (if old
-        (setf (magit-section-hidden s) (magit-section-hidden old)))
-    s))
-
-(defun magit-cancel-section (section)
-  "Delete the section SECTION."
-  (delete-region (magit-section-beginning section)
-                 (magit-section-end section))
-  (let ((parent (magit-section-parent section)))
-    (if parent
-        (setf (magit-section-children parent)
-              (delq section (magit-section-children parent)))
-      (setq magit-top-section nil))))
-
-(defmacro magit-with-section (title type &rest body)
-  "Create a new section of title TITLE and type TYPE and evaluate BODY there.
-
-Sections created inside BODY will become children of the new
-section. BODY must leave point at the end of the created section.
-
-If TYPE is nil, the section won't be highlighted."
-  (declare (indent 2))
-  (let ((s (make-symbol "*section*")))
-    `(let* ((,s (magit-new-section ,title ,type))
-            (magit-top-section ,s))
-       (setf (magit-section-beginning ,s) (point))
-       ,@body
-       (setf (magit-section-end ,s) (point))
-       (setf (magit-section-children ,s)
-             (nreverse (magit-section-children ,s)))
-       ,s)))
-
-(defun magit-set-section (title type start end)
-  "Create a new section of title TITLE and type TYPE with specified start and
-end positions."
-  (let ((section (magit-new-section title type)))
-    (setf (magit-section-beginning section) start)
-    (setf (magit-section-end section) end)
-    section))
-
-(defun magit-set-section-info (info &optional section)
-  (setf (magit-section-info (or section magit-top-section)) info))
-
-(defun magit-set-section-needs-refresh-on-show (flag &optional section)
-  (setf (magit-section-needs-refresh-on-show
-         (or section magit-top-section))
-        flag))
-
-(defmacro magit-create-buffer-sections (&rest body)
-  "Empty current buffer of text and Magit's sections, and then evaluate BODY."
-  (declare (indent 0))
-  `(let ((inhibit-read-only t))
-     (erase-buffer)
-     (let ((magit-old-top-section magit-top-section))
-       (setq magit-top-section nil)
-       ,@body
-       (when (null magit-top-section)
-         (magit-with-section 'top nil
-           (insert "(empty)\n")))
-       (magit-propertize-section magit-top-section)
-       (magit-section-set-hidden magit-top-section
-                                 (magit-section-hidden magit-top-section)))))
-
-(defun magit-propertize-section (section)
-  "Add text-property needed for SECTION."
-  (put-text-property (magit-section-beginning section)
-                     (magit-section-end section)
-                     'magit-section section)
-  (dolist (s (magit-section-children section))
-    (magit-propertize-section s)))
-
-(defun magit-find-section (path top)
-  "Find the section at the path PATH in subsection of section TOP."
-  (if (null path)
-      top
-    (let ((secs (magit-section-children top)))
-      (while (and secs (not (equal (car path)
-                                   (magit-section-title (car secs)))))
-        (setq secs (cdr secs)))
-      (and (car secs)
-           (magit-find-section (cdr path) (car secs))))))
-
-(defun magit-section-path (section)
-  "Return the path of SECTION."
-  (if (not (magit-section-parent section))
-      '()
-    (append (magit-section-path (magit-section-parent section))
-            (list (magit-section-title section)))))
-
-(defun magit-find-section-after (pos)
-  "Find the first section that begins after POS."
-  (magit-find-section-after* pos (list magit-top-section)))
-
-(defun magit-find-section-after* (pos secs)
-  "Find the first section that begins after POS in the list SECS
-\(including children of sections in SECS)."
-  (while (and secs
-              (<= (magit-section-beginning (car secs)) pos))
-    (setq secs (if (magit-section-hidden (car secs))
-                   (cdr secs)
-                 (append (magit-section-children (car secs))
-                         (cdr secs)))))
-  (car secs))
-
-(defun magit-find-section-before (pos)
-  "Return the last section that begins before POS."
-  (let ((section (magit-find-section-at pos)))
-    (do* ((current (or (magit-section-parent section)
-                       section)
-                   next)
-          (next (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))
-                (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))))
-        ((null next) current))))
-
-(defun magit-find-section-before* (pos secs)
-  "Find the last section that begins before POS in the list SECS."
-  (let ((prev nil))
-    (while (and secs
-                (< (magit-section-beginning (car secs)) pos))
-      (setq prev (car secs))
-      (setq secs (cdr secs)))
-    prev))
-
-(defun magit-current-section ()
-  "Return the Magit section at point."
-  (magit-find-section-at (point)))
-
-(defun magit-find-section-at (pos)
-  "Return the Magit section at POS."
-  (or (get-text-property pos 'magit-section)
-      magit-top-section))
-
-(defun magit-insert-section (section-title-and-type
-                             buffer-title washer cmd &rest args)
-  "Run CMD and put its result in a new section.
-
-SECTION-TITLE-AND-TYPE is either a string that is the title of the section
-or (TITLE . TYPE) where TITLE is the title of the section and TYPE is its type.
-
-If there is no type, or if type is nil, the section won't be highlighted.
-
-BUFFER-TITLE is the inserted title of the section
-
-WASHER is a function that will be run after CMD.
-The buffer will be narrowed to the inserted text.
-It should add sectioning as needed for Magit interaction.
-
-CMD is an external command that will be run with ARGS as arguments."
-  (let* ((body-beg nil)
-         (section-title (if (consp section-title-and-type)
-                            (car section-title-and-type)
-                          section-title-and-type))
-         (section-type (if (consp section-title-and-type)
-                           (cdr section-title-and-type)
-                         nil))
-         (section
-          (magit-with-section section-title section-type
-            (if buffer-title
-                (insert (propertize buffer-title 'face 'magit-section-title)
-                        "\n"))
-            (setq body-beg (point))
-            (magit-cmd-insert cmd args)
-            (if (not (eq (char-before) ?\n))
-                (insert "\n"))
-            (if washer
-                (save-restriction
-                  (narrow-to-region body-beg (point))
-                  (goto-char (point-min))
-                  (funcall washer)
-                  (goto-char (point-max)))))))
-    (if (= body-beg (point))
-        (magit-cancel-section section)
-      (insert "\n"))
-    section))
-
-(defun magit-git-section (section-title-and-type
-                          buffer-title washer &rest args)
-  "Run git and put its result in a new section.
-
-see `magit-insert-section' for meaning of the arguments"
-  (apply #'magit-insert-section
-         section-title-and-type
-         buffer-title
-         washer
-         magit-git-executable
-         (append magit-git-standard-options args)))
-
-(defun magit-goto-next-section ()
-  "Go to the next section."
-  (interactive)
-  (let ((next (magit-find-section-after (point))))
-    (if next
-        (magit-goto-section next)
-      (message "No next section"))))
-
-(defun magit-goto-previous-section ()
-  "Go to the previous section."
-  (interactive)
-  (if (eq (point) 1)
-      (message "No previous section")
-    (magit-goto-section (magit-find-section-before (point)))))
-
-(defun magit-goto-parent-section ()
-  "Go to the parent section."
-  (interactive)
-  (let ((parent (magit-section-parent (magit-current-section))))
-    (when parent
-      (goto-char (magit-section-beginning parent)))))
-
-(defun magit-goto-next-sibling-section ()
-  "Go to the next sibling section."
-  (interactive)
-  (let* ((initial (point))
-         (section (magit-current-section))
-         (end (- (magit-section-end section) 1))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (next-sibling (magit-find-section-after* end siblings)))
-    (if next-sibling
-        (magit-goto-section next-sibling)
-      (magit-goto-next-section))))
-
-(defun magit-goto-previous-sibling-section ()
-  "Go to the previous sibling section."
-  (interactive)
-  (let* ((section (magit-current-section))
-         (beginning (magit-section-beginning section))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (previous-sibling (magit-find-section-before* beginning siblings)))
-    (if previous-sibling
-        (magit-goto-section previous-sibling)
-      (magit-goto-parent-section))))
-
-(defun magit-goto-section (section)
-  (goto-char (magit-section-beginning section))
-  (cond
-   ((and magit-log-auto-more
-         (eq (magit-section-type section) 'longer))
-    (magit-log-show-more-entries)
-    (forward-line -1)
-    (magit-goto-next-section))
-   ((and (eq (magit-section-type section) 'commit)
-         (derived-mode-p 'magit-log-mode))
-    (magit-show-commit section))))
-
-(defun magit-goto-section-at-path (path)
-  "Go to the section described by PATH."
-  (let ((sec (magit-find-section path magit-top-section)))
-    (if sec
-        (goto-char (magit-section-beginning sec))
-      (message "No such section"))))
-
-(defun magit-for-all-sections (func &optional top)
-  "Run FUNC on TOP and recursively on all its children.
-
-Default value for TOP is `magit-top-section'"
-  (let ((section (or top magit-top-section)))
-    (when section
-      (funcall func section)
-      (dolist (c (magit-section-children section))
-        (magit-for-all-sections func c)))))
-
-(defun magit-section-set-hidden (section hidden)
-  "Hide SECTION if HIDDEN is not nil, show it otherwise."
-  (setf (magit-section-hidden section) hidden)
-  (if (and (not hidden)
-           (magit-section-needs-refresh-on-show section))
-      (magit-refresh)
-    (let ((inhibit-read-only t)
-          (beg (save-excursion
-                 (goto-char (magit-section-beginning section))
-                 (forward-line)
-                 (point)))
-          (end (magit-section-end section)))
-      (if (< beg end)
-          (put-text-property beg end 'invisible hidden)))
-    (if (not hidden)
-        (dolist (c (magit-section-children section))
-          (magit-section-set-hidden c (magit-section-hidden c))))))
-
-(defun magit-section-any-hidden (section)
-  "Return true if SECTION or any of its children is hidden."
-  (or (magit-section-hidden section)
-      (let ((kids (magit-section-children section)))
-        (while (and kids (not (magit-section-any-hidden (car kids))))
-          (setq kids (cdr kids)))
-        kids)))
-
-(defun magit-section-collapse (section)
-  "Show SECTION and hide all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) t))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand (section)
-  "Show SECTION and all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand-all-aux (section)
-  "Show recursively all SECTION's children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil)
-    (magit-section-expand-all-aux c)))
-
-(defun magit-section-expand-all (section)
-  "Show SECTION and all its children."
-  (magit-section-expand-all-aux section)
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-hideshow (flag-or-func)
-  "Show or hide current section depending on FLAG-OR-FUNC.
-
-If FLAG-OR-FUNC is a function, it will be ran on current section
-IF FLAG-OR-FUNC is a Boolean value, the section will be hidden if its true, shown otherwise"
-  (let ((section (magit-current-section)))
-    (when (magit-section-parent section)
-      (goto-char (magit-section-beginning section))
-      (if (functionp flag-or-func)
-          (funcall flag-or-func section)
-        (magit-section-set-hidden section flag-or-func)))))
-
-(defun magit-show-section ()
-  "Show current section."
-  (interactive)
-  (magit-section-hideshow nil))
-
-(defun magit-hide-section ()
-  "Hide current section."
-  (interactive)
-  (magit-section-hideshow t))
-
-(defun magit-collapse-section ()
-  "Hide all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-collapse))
-
-(defun magit-expand-section ()
-  "Show all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-expand))
-
-(defun magit-toggle-file-section ()
-  "Like `magit-toggle-section' but toggle at file granularity."
-  (interactive)
-  (when (eq 'hunk (first (magit-section-context-type (magit-current-section))))
-    (magit-goto-parent-section))
-  (magit-toggle-section))
-
-(defun magit-toggle-section ()
-  "Toggle hidden status of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (magit-section-set-hidden s (not (magit-section-hidden s))))))
-
-(defun magit-expand-collapse-section ()
-  "Toggle hidden status of subsections of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-any-hidden s)
-            (magit-section-expand-all s))
-           (t
-            (magit-section-collapse s))))))
-
-(defun magit-cycle-section ()
-  "Cycle between expanded, hidden and collapsed state for current section.
-
-Hidden: only the first line of the section is shown
-Collapsed: only the first line of the subsection is shown
-Expanded: everything is shown."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-hidden s)
-            (magit-section-collapse s))
-           ((notany #'magit-section-hidden (magit-section-children s))
-            (magit-section-set-hidden s t))
-           (t
-            (magit-section-expand s))))))
-
-(defun magit-section-lineage (s)
-  "Return list of parent, grand-parents... for section S."
-  (when s
-    (cons s (magit-section-lineage (magit-section-parent s)))))
-
-(defun magit-section-show-level (section level threshold path)
-  (magit-section-set-hidden section (>= level threshold))
-  (when (and (< level threshold)
-             (not (magit-no-commit-p)))
-    (if path
-        (magit-section-show-level (car path) (1+ level) threshold (cdr path))
-      (dolist (c (magit-section-children section))
-        (magit-section-show-level c (1+ level) threshold nil)))))
-
-(defun magit-show-level (level all)
-  "Show section whose level is less than LEVEL, hide the others.
-If ALL is non nil, do this in all sections,
-otherwise do it only on ancestors and descendants of current section."
-  (magit-with-refresh
-    (if all
-        (magit-section-show-level magit-top-section 0 level nil)
-      (let ((path (reverse (magit-section-lineage (magit-current-section)))))
-        (magit-section-show-level (car path) 0 level (cdr path))))))
-
-(defun magit-show-only-files ()
-  "Show section that are files, but not there subsection.
-
-Do this in on ancestors and descendants of current section."
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2)
-    (call-interactively 'magit-show-level-1)))
-
-(defun magit-show-only-files-all ()
-  "Show section that are files, but not there subsection.
-
-Do this for all sections"
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2-all)
-    (call-interactively 'magit-show-level-1-all)))
-
-(defmacro magit-define-level-shower-1 (level all)
-  "Define an interactive function to show function of level LEVEL.
-
-If ALL is non nil, this function will affect all section,
-otherwise it will affect only ancestors and descendants of current section."
-  (let ((fun (intern (format "magit-show-level-%s%s"
-                             level (if all "-all" ""))))
-        (doc (format "Show sections on level %s." level)))
-    `(defun ,fun ()
-       ,doc
-       (interactive)
-       (magit-show-level ,level ,all))))
-
-(defmacro magit-define-level-shower (level)
-  "Define two interactive function to show function of level LEVEL.
-one for all, one for current lineage."
-  `(progn
-     (magit-define-level-shower-1 ,level nil)
-     (magit-define-level-shower-1 ,level t)))
-
-(defmacro magit-define-section-jumper (sym title)
-  "Define an interactive function to go to section SYM.
-
-TITLE is the displayed title of the section."
-  (let ((fun (intern (format "magit-jump-to-%s" sym)))
-        (doc (format "Jump to section `%s'." title)))
-    `(progn
-       (defun ,fun ()
-         ,doc
-         (interactive)
-         (magit-goto-section-at-path '(,sym)))
-       (put ',fun 'definition-name ',sym))))
-
-(defmacro magit-define-inserter (sym arglist &rest body)
-  (declare (indent defun))
-  (let ((fun (intern (format "magit-insert-%s" sym)))
-        (before (intern (format "magit-before-insert-%s-hook" sym)))
-        (after (intern (format "magit-after-insert-%s-hook" sym)))
-        (doc (format "Insert items for `%s'." sym)))
-    `(progn
-       (defvar ,before nil)
-       (defvar ,after nil)
-       (defun ,fun ,arglist
-         ,doc
-         (run-hooks ',before)
-         ,@body
-         (run-hooks ',after))
-       (put ',before 'definition-name ',sym)
-       (put ',after 'definition-name ',sym)
-       (put ',fun 'definition-name ',sym))))
-
-(defvar magit-highlighted-section nil)
-
-(defun magit-refine-section (section)
-  "Apply temporary refinements to the display of SECTION.
-Refinements can be undone with `magit-unrefine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; Refine the current hunk to show fine details, using
-           ;; diff-mode machinery.
-           (save-excursion
-             (goto-char (magit-section-beginning magit-highlighted-section))
-             (diff-refine-hunk))))))
-
-(defun magit-unrefine-section (section)
-  "Remove refinements to the display of SECTION done by `magit-refine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; XXX this should be in some diff-mode function, like
-           ;; `diff-unrefine-hunk'
-           (remove-overlays (magit-section-beginning section)
-                            (magit-section-end section)
-                            'diff-mode 'fine)))))
-
-(defvar magit-highlight-overlay nil)
-
-(defun magit-highlight-section ()
-  "Highlight current section if it has a type."
-  (let ((section (magit-current-section)))
-    (when (not (eq section magit-highlighted-section))
-      (when magit-highlighted-section
-        ;; remove any refinement from previous hunk
-        (magit-unrefine-section magit-highlighted-section))
-      (setq magit-highlighted-section section)
-      (if (not magit-highlight-overlay)
-          (let ((ov (make-overlay 1 1)))
-            (overlay-put ov 'face 'magit-item-highlight)
-            (setq magit-highlight-overlay ov)))
-      (if (and section (magit-section-type section))
-          (progn
-            (magit-refine-section section)
-            (move-overlay magit-highlight-overlay
-                          (magit-section-beginning section)
-                          (magit-section-end section)
-                          (current-buffer)))
-        (delete-overlay magit-highlight-overlay)))))
-
-(defun magit-section-context-type (section)
-  (if (null section)
-      '()
-    (let ((c (or (magit-section-type section)
-                 (if (symbolp (magit-section-title section))
-                     (magit-section-title section)))))
-      (if c
-          (cons c (magit-section-context-type
-                   (magit-section-parent section)))
-        '()))))
-
-(defun magit-prefix-p (prefix list)
-  "Returns non-nil if PREFIX is a prefix of LIST.  PREFIX and LIST should both be
-lists.
-
-If the car of PREFIX is the symbol '*, then return non-nil if the cdr of PREFIX
-is a sublist of LIST (as if '* matched zero or more arbitrary elements of LIST)"
-  ;;; Very schemish...
-  (or (null prefix)
-      (if (eq (car prefix) '*)
-          (or (magit-prefix-p (cdr prefix) list)
-              (and (not (null list))
-                   (magit-prefix-p prefix (cdr list))))
-        (and (not (null list))
-             (equal (car prefix) (car list))
-             (magit-prefix-p (cdr prefix) (cdr list))))))
-
-(defmacro magit-section-case (head &rest clauses)
-  "Make different action depending of current section.
-
-HEAD is (SECTION INFO &optional OPNAME),
-  SECTION will be bind to the current section,
-  INFO will be bind to the info's of the current section,
-  OPNAME is a string that will be used to describe current action,
-
-CLAUSES is a list of CLAUSE, each clause is (SECTION-TYPE &BODY)
-where SECTION-TYPE describe section where BODY will be run.
-
-This returns non-nil if some section matches. If the
-corresponding body return a non-nil value, it is returned,
-otherwise it returns t.
-
-If no section matches, this returns nil if no OPNAME was given
-and throws an error otherwise."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (make-symbol "*type*"))
-        (context (make-symbol "*context*"))
-        (opname (caddr head)))
-    `(let* ((,section (magit-current-section))
-            (,info (and ,section (magit-section-info ,section)))
-            (,type (and ,section (magit-section-type ,section)))
-            (,context (magit-section-context-type ,section)))
-       (cond ,@(mapcar (lambda (clause)
-                         (if (eq (car clause) t)
-                             `(t (or (progn ,@(cdr clause))
-                                     t))
-                           (let ((prefix (reverse (car clause)))
-                                 (body (cdr clause)))
-                             `((magit-prefix-p ',prefix ,context)
-                               (or (progn ,@body)
-                                   t)))))
-                       clauses)
-             ,@(when opname
-                 `(((run-hook-with-args-until-success
-                     ',(intern (format "magit-%s-action-hook" opname))))
-                   ((not ,type)
-                    (error "Nothing to %s here" ,opname))
-                   (t
-                    (error "Can't %s a %s"
-                           ,opname
-                           (or (get ,type 'magit-description)
-                               ,type)))))))))
-
-(defmacro magit-section-action (head &rest clauses)
-  (declare (indent 1))
-  `(magit-with-refresh
-     (magit-section-case ,head ,@clauses)))
-
-(defmacro magit-add-action (head &rest clauses)
-  "Add additional actions to a pre-existing operator.
-The syntax is identical to `magit-section-case', except that
-OPNAME is mandatory and specifies the operation to which to add
-the actions."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (caddr head)))
-    `(add-hook ',(intern (format "magit-%s-action-hook" type))
-               (lambda ()
-                 ,(macroexpand
-                   ;; Don't pass in the opname so we don't recursively
-                   ;; run the hook again, and so we don't throw an
-                   ;; error if no action matches.
-                   `(magit-section-case (,section ,info)
-                      ,@clauses))))))
-
-(defun magit-wash-sequence (func)
-  "Run FUNC until end of buffer is reached.
-
-FUNC should leave point at the end of the modified region"
-  (while (and (not (eobp))
-              (funcall func))))
-
-(defmacro magit-define-command (sym arglist &rest body)
-  "Macro to define a magit command.
-It will define the magit-SYM function having ARGLIST as argument.
-It will also define the magit-SYM-command-hook variable.
-
-The defined function will call the function in the hook in
-order until one return non nil. If they all return nil then body will be called.
-
-It is used to define hookable magit command: command defined by this
-function can be enriched by magit extension like magit-topgit and magit-svn"
-  (declare (indent defun)
-           (debug (&define name lambda-list
-                           [&optional stringp]        ; Match the doc string, if present.
-                           [&optional ("interactive" interactive)]
-                           def-body)))
-  (let ((fun (intern (format "magit-%s" sym)))
-        (hook (intern (format "magit-%s-command-hook" sym)))
-        (doc (format "Command for `%s'." sym))
-        (inter nil)
-        (instr body))
-    (when (stringp (car body))
-      (setq doc (car body)
-            instr (cdr body)))
-    (let ((form (car instr)))
-      (when (eq (car form) 'interactive)
-        (setq inter form
-              instr (cdr instr))))
-    `(progn
-       (defvar ,hook nil)
-       (defun ,fun ,arglist
-         ,doc
-         ,inter
-         (or (run-hook-with-args-until-success
-              ',hook ,@(remq '&optional (remq '&rest arglist)))
-             ,@instr))
-       (put ',fun 'definition-name ',sym)
-       (put ',hook 'definition-name ',sym))))
-
-;;; Running commands
-
-(defun magit-set-mode-line-process (str)
-  (let ((pr (if str (concat " " str) "")))
-    (save-excursion
-      (magit-for-all-buffers (lambda ()
-                               (setq mode-line-process pr))))))
-
-(defun magit-process-indicator-from-command (comps)
-  (if (magit-prefix-p (cons magit-git-executable magit-git-standard-options)
-                      comps)
-      (setq comps (nthcdr (+ (length magit-git-standard-options) 1) comps)))
-  (cond ((or (null (cdr comps))
-             (not (member (car comps) '("remote"))))
-         (car comps))
-        (t
-         (concat (car comps) " " (cadr comps)))))
-
-(defvar magit-process nil)
-(defvar magit-process-client-buffer nil)
-(defvar magit-process-buffer-name "*magit-process*"
-  "Buffer name for running git commands.")
-
-(defun magit-run* (cmd-and-args
-                   &optional logline noerase noerror nowait input)
-  (if (and magit-process
-           (get-buffer magit-process-buffer-name))
-      (error "Git is already running"))
-  (let ((cmd (car cmd-and-args))
-        (args (cdr cmd-and-args))
-        (dir default-directory)
-        (buf (get-buffer-create magit-process-buffer-name))
-        (successp nil))
-    (magit-set-mode-line-process
-     (magit-process-indicator-from-command cmd-and-args))
-    (setq magit-process-client-buffer (current-buffer))
-    (with-current-buffer buf
-      (view-mode 1)
-      (set (make-local-variable 'view-no-disable-on-exit) t)
-      (setq view-exit-action
-            (lambda (buffer)
-              (with-current-buffer buffer
-                (bury-buffer))))
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (setq default-directory dir)
-        (if noerase
-            (goto-char (point-max))
-          (erase-buffer))
-        (insert "$ " (or logline
-                         (mapconcat 'identity cmd-and-args " "))
-                "\n")
-        (cond (nowait
-               (setq magit-process
-                     (let ((process-connection-type magit-process-connection-type))
-                       (apply 'magit-start-process cmd buf cmd args)))
-               (set-process-sentinel magit-process 'magit-process-sentinel)
-               (set-process-filter magit-process 'magit-process-filter)
-               (when input
-                 (with-current-buffer input
-                   (process-send-region magit-process
-                                        (point-min) (point-max)))
-                 (process-send-eof magit-process)
-                 (sit-for 0.1 t))
-               (cond ((= magit-process-popup-time 0)
-                      (pop-to-buffer (process-buffer magit-process)))
-                     ((> magit-process-popup-time 0)
-                      (run-with-timer
-                       magit-process-popup-time nil
-                       (function
-                        (lambda (buf)
-                          (with-current-buffer buf
-                            (when magit-process
-                              (display-buffer (process-buffer magit-process))
-                              (goto-char (point-max))))))
-                       (current-buffer))))
-               (setq successp t))
-              (input
-               (with-current-buffer input
-                 (setq default-directory dir)
-                 (setq magit-process
-                       ;; Don't use a pty, because it would set icrnl
-                       ;; which would modify the input (issue #20).
-                       (let ((process-connection-type nil))
-                         (apply 'magit-start-process cmd buf cmd args)))
-                 (set-process-filter magit-process 'magit-process-filter)
-                 (process-send-region magit-process
-                                      (point-min) (point-max))
-                 (process-send-eof magit-process)
-                 (while (equal (process-status magit-process) 'run)
-                   (sit-for 0.1 t))
-                 (setq successp
-                       (equal (process-exit-status magit-process) 0))
-                 (setq magit-process nil))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))
-              (t
-               (setq successp
-                     (equal (apply 'process-file cmd nil buf nil args) 0))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))))
-      (or successp
-          noerror
-          (error
-           "%s ... [Hit %s or see buffer %s for details]"
-           (or (with-current-buffer (get-buffer magit-process-buffer-name)
-                 (when (re-search-backward
-                        (concat "^error: \\(.*\\)" paragraph-separate) nil t)
-                   (match-string 1)))
-               "Git failed")
-           (with-current-buffer magit-process-client-buffer
-             (key-description (car (where-is-internal
-                                    'magit-display-process))))
-           magit-process-buffer-name))
-      successp)))
-
-(autoload 'dired-uncache "dired")
-(defun magit-process-sentinel (process event)
-  (let ((msg (format "%s %s." (process-name process) (substring event 0 -1)))
-        (successp (string-match "^finished" event))
-        (key (with-current-buffer magit-process-client-buffer
-               (key-description (car (where-is-internal
-                                      'magit-display-process))))))
-    (with-current-buffer (process-buffer process)
-      (let ((inhibit-read-only t))
-        (goto-char (point-max))
-        (insert msg "\n")
-        (message (if successp msg
-                   (format "%s Hit %s or see buffer %s for details."
-                           msg key (current-buffer)))))
-      (unless (memq (process-status process) '(run open))
-        (dired-uncache default-directory)))
-    (setq magit-process nil)
-    (magit-set-mode-line-process nil)
-    (magit-refresh-buffer magit-process-client-buffer)))
-
-(defun magit-password (proc string)
-  "Checks if git/ssh asks for a password and ask the user for it."
-  (let (ask)
-    (cond ((or (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
-               (string-match "^\\\(.*\\\)'s password:" string)
-               (string-match "^Password for '\\\(.*\\\)':" string))
-           (setq ask (format "Password for '%s': " (match-string 1 string))))
-          ((string-match "^[pP]assword:" string)
-           (setq ask "Password:")))
-    (when ask
-      (process-send-string proc (concat (read-passwd ask nil) "\n")))))
-
-(defun magit-username (proc string)
-  "Checks if git asks for a username and ask the user for it."
-  (when (string-match "^Username for '\\\(.*\\\)':" string)
-    (process-send-string proc
-                         (concat
-                          (read-string (format "Username for '%s': "
-                                               (match-string 1 string))
-                                       nil nil (user-login-name))
-                          "\n"))))
-
-(defun magit-process-filter (proc string)
-  (save-current-buffer
-    (set-buffer (process-buffer proc))
-    (let ((inhibit-read-only t))
-      (magit-username proc string)
-      (magit-password proc string)
-      (goto-char (process-mark proc))
-      ;; Find last ^M in string.  If one was found, ignore everything
-      ;; before it and delete the current line.
-      (let ((ret-pos (length string)))
-        (while (and (>= (setq ret-pos (1- ret-pos)) 0)
-                    (/= ?\r (aref string ret-pos))))
-        (cond ((>= ret-pos 0)
-               (goto-char (line-beginning-position))
-               (delete-region (point) (line-end-position))
-               (insert (substring string (+ ret-pos 1))))
-              (t
-               (insert string))))
-      (set-marker (process-mark proc) (point)))))
-
-(defun magit-run (cmd &rest args)
-  (magit-with-refresh
-    (magit-run* (cons cmd args))))
-
-(defun magit-run-git (&rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args))))
-
-(defun magit-run-git-with-input (input &rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args)
-                nil nil nil nil input)))
-
-(defun magit-run-git-async (&rest args)
-  (message "Running %s %s" magit-git-executable (mapconcat 'identity args " "))
-  (magit-run* (append (cons magit-git-executable
-                            magit-git-standard-options)
-                      args)
-              nil nil nil t))
-
-(defun magit-run-async-with-input (input cmd &rest args)
-  (magit-run* (cons cmd args) nil nil nil t input))
-
-(defun magit-display-process ()
-  "Display output from most recent git command."
-  (interactive)
-  (unless (get-buffer magit-process-buffer-name)
-    (error "No Git commands have run"))
-  (display-buffer magit-process-buffer-name))
-
-;;; Mode
-
-;; We define individual functions (instead of using lambda etc) so
-;; that the online help can show something meaningful.
-
-(magit-define-section-jumper untracked "Untracked files")
-(magit-define-section-jumper unstaged  "Unstaged changes")
-(magit-define-section-jumper staged    "Staged changes")
-(magit-define-section-jumper unpushed  "Unpushed commits")
-
-(magit-define-level-shower 1)
-(magit-define-level-shower 2)
-(magit-define-level-shower 3)
-(magit-define-level-shower 4)
-
-(easy-menu-define magit-mode-menu magit-mode-map
-  "Magit menu"
-  '("Magit"
-    ["Refresh" magit-refresh t]
-    ["Refresh all" magit-refresh-all t]
-    "---"
-    ["Stage" magit-stage-item t]
-    ["Stage all" magit-stage-all t]
-    ["Unstage" magit-unstage-item t]
-    ["Unstage all" magit-unstage-all t]
-    ["Commit" magit-log-edit t]
-    ["Add log entry" magit-add-log t]
-    ["Tag" magit-tag t]
-    ["Annotated tag" magit-annotated-tag t]
-    "---"
-    ["Diff working tree" magit-diff-working-tree t]
-    ["Diff" magit-diff t]
-    ("Log"
-     ["Short Log" magit-log t]
-     ["Long Log" magit-log-long t]
-     ["Reflog" magit-reflog t]
-     ["Extended..." magit-key-mode-popup-logging t])
-    "---"
-    ["Cherry pick" magit-cherry-pick-item t]
-    ["Apply" magit-apply-item t]
-    ["Revert" magit-revert-item t]
-    "---"
-    ["Ignore" magit-ignore-item t]
-    ["Ignore locally" magit-ignore-item-locally t]
-    ["Discard" magit-discard-item t]
-    ["Reset head" magit-reset-head t]
-    ["Reset working tree" magit-reset-working-tree t]
-    ["Stash" magit-stash t]
-    ["Snapshot" magit-stash-snapshot t]
-    "---"
-    ["Branch..." magit-checkout t]
-    ["Merge" magit-manual-merge t]
-    ["Interactive resolve" magit-interactive-resolve-item t]
-    ["Rebase" magit-rebase-step t]
-    ("Rewrite"
-     ["Start" magit-rewrite-start t]
-     ["Stop" magit-rewrite-stop t]
-     ["Finish" magit-rewrite-finish t]
-     ["Abort" magit-rewrite-abort t]
-     ["Set used" magit-rewrite-set-used t]
-     ["Set unused" magit-rewrite-set-unused t])
-    "---"
-    ["Push" magit-push t]
-    ["Pull" magit-pull t]
-    ["Remote update" magit-remote-update t]
-    ("Submodule"
-     ["Submodule update" magit-submodule-update t]
-     ["Submodule update and init" magit-submodule-update-init t]
-     ["Submodule init" magit-submodule-init t]
-     ["Submodule sync" magit-submodule-sync t])
-    "---"
-    ("Extensions")
-    "---"
-    ["Display Git output" magit-display-process t]
-    ["Quit Magit" magit-quit-window t]))
-
-(defvar magit-mode-hook nil "Hook run by `magit-mode'.")
-
-(put 'magit-mode 'mode-class 'special)
-
-(defvar magit-refresh-function nil)
-(make-variable-buffer-local 'magit-refresh-function)
-(put 'magit-refresh-function 'permanent-local t)
-
-(defvar magit-refresh-args nil)
-(make-variable-buffer-local 'magit-refresh-args)
-(put 'magit-refresh-args 'permanent-local t)
-
-(defvar last-point)
-
-(defun magit-remember-point ()
-  (setq last-point (point)))
-
-(defun magit-invisible-region-end (pos)
-  (while (and (not (= pos (point-max))) (invisible-p pos))
-    (setq pos (next-char-property-change pos)))
-  pos)
-
-(defun magit-invisible-region-start (pos)
-  (while (and (not (= pos (point-min))) (invisible-p pos))
-    (setq pos (1- (previous-char-property-change pos))))
-  pos)
-
-(defun magit-correct-point-after-command ()
-  "Move point outside of invisible regions.
-
-Emacs often leaves point in invisible regions, it seems.  To fix
-this, we move point ourselves and never let Emacs do its own
-adjustments.
-
-When point has to be moved out of an invisible region, it can be
-moved to its end or its beginning.  We usually move it to its
-end, except when that would move point back to where it was
-before the last command."
-  (if (invisible-p (point))
-      (let ((end (magit-invisible-region-end (point))))
-        (goto-char (if (= end last-point)
-                       (magit-invisible-region-start (point))
-                     end))))
-  (setq disable-point-adjustment t))
-
-(defun magit-post-command-hook ()
-  (magit-correct-point-after-command)
-  (magit-highlight-section))
-
-(defun magit-mode ()
-  "Review the status of a git repository and act on it.
-
-Please see the manual for a complete description of Magit.
-
-\\{magit-mode-map}"
-  (kill-all-local-variables)
-  (buffer-disable-undo)
-  (setq buffer-read-only t
-        truncate-lines t
-        major-mode 'magit-mode
-        mode-name "Magit"
-        mode-line-process "")
-  (add-hook 'pre-command-hook #'magit-remember-point nil t)
-  (add-hook 'post-command-hook #'magit-post-command-hook t t)
-  (use-local-map magit-mode-map)
-  (setq magit-current-indentation (magit-indentation-for default-directory))
-  ;; Emacs' normal method of showing trailing whitespace gives weird
-  ;; results when `magit-whitespace-warning-face' is different from
-  ;; `trailing-whitespace'.
-  (if (and magit-highlight-whitespace magit-highlight-trailing-whitespace)
-      (setq show-trailing-whitespace nil))
-  (run-mode-hooks 'magit-mode-hook))
-
-(defun magit-mode-init (dir submode refresh-func &rest refresh-args)
-  (setq default-directory dir
-        magit-refresh-function refresh-func
-        magit-refresh-args refresh-args)
-  (funcall submode)
-  (magit-refresh-buffer))
-
-(defun magit-indentation-for (dir)
-  (let (result)
-    (dolist (pair magit-highlight-indentation)
-      (if (string-match-p (car pair) dir)
-          (setq result (cdr pair))))
-    result))
-
-(defun magit-find-buffer (submode &optional dir)
-  (let ((topdir (magit-get-top-dir (or dir default-directory))))
-    (dolist (buf (buffer-list))
-      (if (with-current-buffer buf
-            (and (eq major-mode submode)
-                 default-directory
-                 (equal (expand-file-name default-directory) topdir)))
-          (return buf)))))
-
-(defun magit-find-status-buffer (&optional dir)
-  (magit-find-buffer 'magit-status-mode dir))
-
-(defun magit-for-all-buffers (func &optional dir)
-  (dolist (buf (buffer-list))
-    (with-current-buffer buf
-      (if (and (derived-mode-p 'magit-mode)
-               (or (null dir)
-                   (equal default-directory dir)))
-          (funcall func)))))
-
-(defun magit-refresh-buffer (&optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (let* ((old-line (line-number-at-pos))
-           (old-point (point))
-           (old-section (magit-current-section))
-           (old-path (and old-section
-                          (magit-section-path (magit-current-section)))))
-      (beginning-of-line)
-      (let ((section-line (and old-section
-                               (count-lines
-                                (magit-section-beginning old-section)
-                                (point))))
-            (line-char (- old-point (point))))
-        (if magit-refresh-function
-            (apply magit-refresh-function
-                   magit-refresh-args))
-        (magit-refresh-marked-commits-in-buffer)
-        (let ((s (and old-path (magit-find-section old-path magit-top-section))))
-          (cond (s
-                 (goto-char (magit-section-beginning s))
-                 (forward-line section-line)
-                 (forward-char line-char))
-                (t
-                 (magit-goto-line old-line)))
-          (dolist (w (get-buffer-window-list (current-buffer)))
-            (set-window-point w (point)))
-          (magit-highlight-section))))))
-
-(defun magit-string-has-prefix-p (string prefix)
-  (eq (compare-strings string nil (length prefix) prefix nil nil) t))
-
-(defun magit-revert-buffers (dir &optional ignore-modtime)
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               ;; don't revert indirect buffers, as the parent will be reverted
-               (not (buffer-base-buffer buffer))
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir)
-               (file-readable-p (buffer-file-name buffer))
-               (or ignore-modtime (not (verify-visited-file-modtime buffer)))
-               (not (buffer-modified-p buffer)))
-      (with-current-buffer buffer
-        (condition-case var
-            (revert-buffer t t nil)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defun magit-update-vc-modeline (dir)
-  "Update the modeline for buffers representable by magit."
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir))
-      (with-current-buffer buffer
-        (condition-case var
-            (vc-find-file-hook)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defvar magit-refresh-needing-buffers nil)
-(defvar magit-refresh-pending nil)
-
-(defun magit-refresh-wrapper (func)
-  (if magit-refresh-pending
-      (funcall func)
-    (let* ((dir default-directory)
-           (status-buffer (magit-find-status-buffer dir))
-           (magit-refresh-needing-buffers nil)
-           (magit-refresh-pending t))
-      (unwind-protect
-          (funcall func)
-        (when magit-refresh-needing-buffers
-          (magit-revert-buffers dir)
-          (dolist (b (adjoin status-buffer
-                             magit-refresh-needing-buffers))
-            (magit-refresh-buffer b)))))))
-
-(defun magit-need-refresh (&optional buffer)
-  "Mark BUFFER as needing to be refreshed.  If BUFFER is nil, use the
-current buffer."
-  (pushnew (or buffer (current-buffer)) magit-refresh-needing-buffers :test 'eq))
-
-(defun magit-refresh ()
-  "Refresh current buffer to match repository state.
-Also revert every unmodified buffer visiting files
-in the corresponding directory."
-  (interactive)
-  (magit-with-refresh
-    (magit-need-refresh)))
-
-(defun magit-refresh-all ()
-  "Refresh all magit buffers to match respective repository states.
-Also revert every unmodified buffer visiting files
-in the corresponding directories."
-  (interactive)
-  (magit-for-all-buffers #'magit-refresh-buffer default-directory))
-
-;;; Untracked files
-
-(defun magit-wash-untracked-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\t" file "\n"))
-        t)
-    nil))
-
-(defun magit-wash-untracked-files ()
-  ;; Setting magit-old-top-section to nil speeds up washing: no time
-  ;; is wasted looking up the old visibility, which doesn't matter for
-  ;; untracked files.
-  ;;
-  ;; XXX - speed this up in a more general way.
-  ;;
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-untracked-file)))
-
-(defun magit-insert-untracked-files ()
-  (unless (string= (magit-get "status" "showUntrackedFiles") "no")
-    (apply 'magit-git-section
-           `(untracked
-             "Untracked files:"
-             magit-wash-untracked-files
-             "ls-files" "--others" "-t" "--exclude-standard"
-             ,@(when magit-omit-untracked-dir-contents
-                 '("--directory"))))))
-
-;;; Diffs and Hunks
-
-(defvar magit-diff-context-lines 3)
-
-(defun magit-diff-U-arg ()
-  (format "-U%d" magit-diff-context-lines))
-
-(defun magit-diff-smaller-hunks (&optional count)
-  "Decrease the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (max 0 (- magit-diff-context-lines count)))
-  (magit-refresh))
-
-(defun magit-diff-larger-hunks (&optional count)
-  "Increase the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (+ magit-diff-context-lines count))
-  (magit-refresh))
-
-(defun magit-diff-default-hunks ()
-  "Reset context for diff hunks to the default size."
-  (interactive "")
-  (setq magit-diff-context-lines 3)
-  (magit-refresh))
-
-(defun magit-toggle-diff-refine-hunk (&optional other)
-  (interactive "P")
-  "Turn diff-hunk refining on or off.
-
-If hunk refining is currently on, then hunk refining is turned off.
-If hunk refining is off, then hunk refining is turned on, in
-`selected' mode (only the currently selected hunk is refined).
-
-With a prefix argument, the \"third choice\" is used instead:
-If hunk refining is currently on, then refining is kept on, but
-the refining mode (`selected' or `all') is switched.
-If hunk refining is off, then hunk refining is turned on, in
-`all' mode (all hunks refined).
-
-Customize `magit-diff-refine-hunk' to change the default mode."
-  (let* ((old magit-diff-refine-hunk)
-         (new
-          (if other
-              (if (eq old 'all) t 'all)
-            (not old))))
-
-    ;; remove any old refining in currently highlighted section
-    (when (and magit-highlighted-section old (not (eq old 'all)))
-      (magit-unrefine-section magit-highlighted-section))
-
-    ;; set variable to new value locally
-    (set (make-local-variable 'magit-diff-refine-hunk) new)
-
-    ;; if now highlighting in "selected only" mode, turn refining back
-    ;; on in the current section
-    (when (and magit-highlighted-section new (not (eq new 'all)))
-      (magit-refine-section magit-highlighted-section))
-
-    ;; `all' mode being turned on or off needs a complete refresh
-    (when (or (eq old 'all) (eq new 'all))
-      (magit-refresh))))
-
-(defun magit-diff-line-file ()
-  (cond ((looking-at "^diff --git ./\\(.*\\) ./\\(.*\\)$")
-         (match-string-no-properties 2))
-        ((looking-at "^diff --cc +\\(.*\\)$")
-         (match-string-no-properties 1))
-        (t
-         nil)))
-
-(defun magit-wash-diffs ()
-  (magit-wash-sequence #'magit-wash-diff-or-other-file))
-
-(defun magit-wash-diff-or-other-file ()
-  (or (magit-wash-diff)
-      (magit-wash-other-file)))
-
-(defun magit-wash-other-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\tNew      " file "\n"))
-        t)
-    nil))
-
-(defvar magit-hide-diffs nil)
-
-(defvar magit-indentation-level 1)
-
-(defun magit-insert-diff-title (status file file2)
-  (let ((status-text (case status
-                       ((unmerged)
-                        (format "Unmerged   %s" file))
-                       ((new)
-                        (format "New        %s" file))
-                       ((deleted)
-                        (format "Deleted    %s" file))
-                       ((renamed)
-                        (format "Renamed    %s   (from %s)"
-                                file file2))
-                       ((modified)
-                        (format "Modified   %s" file))
-                       ((typechange)
-                        (format "Typechange %s" file))
-                       (t
-                        (format "?          %s" file)))))
-    (insert (make-string magit-indentation-level ?\t) status-text "\n")))
-
-(defvar magit-current-diff-range nil
-  "Used internally when setting up magit diff sections.")
-
-(defun magit-wash-typechange-section (file)
-  (magit-set-section-info (list 'typechange file))
-  (let ((first-start (point-marker))
-        (second-start (progn (forward-line 1)
-                             (search-forward-regexp "^diff")
-                             (beginning-of-line)
-                             (point-marker))))
-    (let ((magit-indentation-level (+ magit-indentation-level 1)))
-      (save-restriction
-        (narrow-to-region first-start second-start)
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section)))
-      (save-restriction
-        (narrow-to-region second-start (point-max))
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section))))))
-
-(defun magit-wash-diff-section ()
-  (cond ((looking-at "^\\* Unmerged path \\(.*\\)")
-         (let ((file (match-string-no-properties 1)))
-           (delete-region (point) (line-end-position))
-           (insert "\tUnmerged " file "\n")
-           (magit-set-section-info (list 'unmerged file nil))
-           t))
-        ((looking-at "^diff")
-         (let ((file (magit-diff-line-file))
-               (end (save-excursion
-                      (forward-line) ;; skip over "diff" line
-                      (if (search-forward-regexp "^diff\\|^@@" nil t)
-                          (goto-char (match-beginning 0))
-                        (goto-char (point-max)))
-                      (point-marker))))
-           (let* ((status (cond
-                           ((looking-at "^diff --cc")
-                            'unmerged)
-                           ((save-excursion
-                              (search-forward-regexp "^new file" end t))
-                            'new)
-                           ((save-excursion
-                              (search-forward-regexp "^deleted" end t))
-                            'deleted)
-                           ((save-excursion
-                              (search-forward-regexp "^rename" end t))
-                            'renamed)
-                           (t
-                            'modified)))
-                  (file2 (cond
-                          ((save-excursion
-                             (search-forward-regexp "^rename from \\(.*\\)"
-                                                    end t))
-                           (match-string-no-properties 1)))))
-             (magit-set-section-info (list status
-                                           file
-                                           (or file2 file)
-                                           magit-current-diff-range))
-             (magit-insert-diff-title status file file2)
-             (when (search-forward-regexp "\\(--- \\(.*\\)\n\\+\\+\\+ \\(.*\\)\n\\)" () t)
-               (when (match-string 1)
-                 (add-text-properties (match-beginning 1) (match-end 1)
-                                      '(face magit-diff-hunk-header))
-                 (add-text-properties (match-beginning 2) (match-end 2)
-                                      '(face magit-diff-file-header))
-                 (add-text-properties (match-beginning 3) (match-end 3)
-                                      '(face magit-diff-file-header))))
-             (goto-char end)
-             (let ((magit-section-hidden-default nil))
-               (magit-wash-sequence #'magit-wash-hunk))))
-         t)
-        (t
-         nil)))
-
-(defun magit-wash-diff ()
-  (let ((magit-section-hidden-default magit-hide-diffs))
-    (magit-with-section (magit-current-line) 'diff
-      (magit-wash-diff-section))))
-
-(defun magit-diff-item-kind (diff)
-  (car (magit-section-info diff)))
-
-(defun magit-diff-item-file (diff)
-  (cadr (magit-section-info diff)))
-
-(defun magit-diff-item-file2 (diff)
-  (caddr (magit-section-info diff)))
-
-(defun magit-diff-item-range (diff)
-  (nth 3 (magit-section-info diff)))
-
-(defun magit-wash-hunk ()
-  (cond ((looking-at "\\(^@+\\)[^@]*@+.*")
-         (let ((n-columns (1- (length (match-string 1))))
-               (head (match-string 0))
-               (hunk-start-pos (point)))
-           (magit-with-section head 'hunk
-             (add-text-properties (match-beginning 0) (match-end 0)
-                                  '(face magit-diff-hunk-header))
-             (forward-line)
-             (while (not (or (eobp)
-                             (looking-at "^diff\\|^@@")))
-               (magit-highlight-line-whitespace)
-               (let ((prefix (buffer-substring-no-properties
-                              (point) (min (+ (point) n-columns) (point-max)))))
-                 (cond ((string-match "\\+" prefix)
-                        (magit-put-line-property 'face 'magit-diff-add))
-                       ((string-match "-" prefix)
-                        (magit-put-line-property 'face 'magit-diff-del))
-                       (t
-                        (magit-put-line-property 'face 'magit-diff-none))))
-               (forward-line)))
-
-           (when (eq magit-diff-refine-hunk 'all)
-             (save-excursion
-               (goto-char hunk-start-pos)
-               (diff-refine-hunk))))
-         t)
-        (t
-         nil)))
-
-(defvar magit-diff-options nil)
-
-(defun magit-insert-diff (file status)
-  (let ((cmd magit-git-executable)
-        (args (append (list "diff")
-                      (list (magit-diff-U-arg))
-                      magit-diff-options
-                      (list "--" file))))
-    (let ((p (point)))
-      (magit-git-insert args)
-      (if (not (eq (char-before) ?\n))
-          (insert "\n"))
-      (save-restriction
-        (narrow-to-region p (point))
-        (goto-char p)
-        (cond
-         ((eq status 'typechange)
-          (magit-insert-diff-title status file file)
-          (magit-wash-typechange-section file))
-         (t
-          (magit-wash-diff-section)))
-        (goto-char (point-max))))))
-
-(defvar magit-last-raw-diff nil)
-(defvar magit-ignore-unmerged-raw-diffs nil)
-
-(defun magit-wash-raw-diffs ()
-  (let ((magit-last-raw-diff nil))
-    (magit-wash-sequence #'magit-wash-raw-diff)))
-
-(defun magit-wash-raw-diff ()
-  (if (looking-at
-       ":\\([0-7]+\\) \\([0-7]+\\) [0-9a-f]+ [0-9a-f]+ \\(.\\)[0-9]*\t\\([^\t\n]+\\)$")
-      (let ((old-perm (match-string-no-properties 1))
-            (new-perm (match-string-no-properties 2))
-            (status (case (string-to-char (match-string-no-properties 3))
-                      (?A 'new)
-                      (?D 'deleted)
-                      (?M 'modified)
-                      (?U 'unmerged)
-                      (?T 'typechange)
-                      (t     nil)))
-            (file (match-string-no-properties 4)))
-        ;; If this is for the same file as the last diff, ignore it.
-        ;; Unmerged files seem to get two entries.
-        ;; We also ignore unmerged files when told so.
-        (if (or (equal file magit-last-raw-diff)
-                (and magit-ignore-unmerged-raw-diffs (eq status 'unmerged)))
-            (delete-region (point) (+ (line-end-position) 1))
-          (setq magit-last-raw-diff file)
-          ;; The 'diff' section that is created here will not work with
-          ;; magit-insert-diff-item-patch etc when we leave it empty.
-          ;; Luckily, raw diffs are only produced for staged and
-          ;; unstaged changes, and we never call
-          ;; magit-insert-diff-item-patch on them.  This is a bit
-          ;; brittle, of course.
-          (let ((magit-section-hidden-default magit-hide-diffs))
-            (magit-with-section file 'diff
-              (delete-region (point) (+ (line-end-position) 1))
-              (if (not (magit-section-hidden magit-top-section))
-                  (magit-insert-diff file status)
-                (magit-set-section-info (list status file nil))
-                (magit-set-section-needs-refresh-on-show t)
-                (magit-insert-diff-title status file nil)))))
-        t)
-    nil))
-
-(defun magit-hunk-item-diff (hunk)
-  (let ((diff (magit-section-parent hunk)))
-    (or (eq (magit-section-type diff) 'diff)
-        (error "Huh?  Parent of hunk not a diff"))
-    diff))
-
-(defun magit-diff-item-insert-header (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (if (magit-section-children diff)
-                 (magit-section-beginning (car (magit-section-children diff)))
-               (magit-section-end diff))))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-diff-item-patch (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (magit-section-end diff)))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-hunk-item-patch (hunk buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (magit-insert-region (magit-section-beginning hunk) (magit-section-end hunk)
-                       buf))
-
-(defun magit-insert-hunk-item-region-patch (hunk reverse beg end buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (save-excursion
-    (goto-char (magit-section-beginning hunk))
-    (magit-insert-current-line buf)
-    (forward-line)
-    (let ((copy-op (if reverse "+" "-")))
-      (while (< (point) (magit-section-end hunk))
-        (if (and (<= beg (point)) (< (point) end))
-            (magit-insert-current-line buf)
-          (cond ((looking-at " ")
-                 (magit-insert-current-line buf))
-                ((looking-at copy-op)
-                 (let ((text (buffer-substring-no-properties
-                              (+ (point) 1) (line-beginning-position 2))))
-                   (with-current-buffer buf
-                     (insert " " text))))))
-        (forward-line))))
-  (with-current-buffer buf
-    (diff-fixup-modifs (point-min) (point-max))))
-
-(defun magit-hunk-item-is-conflict-p (hunk)
-  ;;; XXX - Using the title is a bit too clever...
-  (string-match "^diff --cc"
-                (magit-section-title (magit-hunk-item-diff hunk))))
-
-(defun magit-hunk-item-target-line (hunk)
-  (save-excursion
-    (beginning-of-line)
-    (let ((line (line-number-at-pos)))
-      (goto-char (magit-section-beginning hunk))
-      (if (not (looking-at "@@+ .* \\+\\([0-9]+\\)\\(,[0-9]+\\)? @@+"))
-          (error "Hunk header not found"))
-      (let ((target (string-to-number (match-string 1))))
-        (forward-line)
-        (while (< (line-number-at-pos) line)
-          ;; XXX - deal with combined diffs
-          (if (not (looking-at "-"))
-              (setq target (+ target 1)))
-          (forward-line))
-        target))))
-
-(defun magit-show (commit filename &optional select prefix)
-  "Returns a buffer containing the contents of the file FILENAME, as stored in
-COMMIT.  COMMIT may be one of the following:
-
-- A string with the name of a commit, such as \"head\" or \"dae86e\".  See 'git
-  help revisions' for syntax.
-- The symbol 'index, indicating that you want the version in Git's index or
-  staging area.
-- The symbol 'working, indicating that you want the version in the working
-  directory.  In this case you'll get a buffer visiting the file.  If there's
-  already a buffer visiting that file, you'll get that one.
-
-When called interactively or when SELECT is non-nil, make the buffer active,
-either in another window or (with a prefix argument) in the current window."
-  (interactive (let* ((revision (magit-read-rev "Retrieve file from revision"))
-                      (filename (magit-read-file-from-rev revision)))
-                 (list revision filename t current-prefix-arg)))
-  (if (eq commit 'working)
-      (find-file-noselect filename)
-    (let ((buffer (create-file-buffer (format "%s.%s" filename (replace-regexp-in-string ".*/" "" (prin1-to-string commit t))))))
-      (cond
-       ((eq commit 'index)
-        (let ((checkout-string (magit-git-string "checkout-index"
-                                                 "--temp"
-                                                 filename)))
-          (string-match "^\\(.*\\)\t" checkout-string)
-          (with-current-buffer buffer
-            (let ((tmpname (match-string 1 checkout-string)))
-              (magit-with-silent-modifications
-               (insert-file-contents tmpname nil nil nil t))
-              (delete-file tmpname)))))
-       (t
-        (with-current-buffer buffer
-          (magit-with-silent-modifications
-           (magit-git-insert (list "cat-file" "-p"
-                                   (concat commit ":" filename)))))))
-      (with-current-buffer buffer
-        (let ((buffer-file-name filename))
-          (normal-mode))
-        (goto-char (point-min)))
-      (if select
-          (if prefix
-              (switch-to-buffer buffer)
-            (switch-to-buffer-other-window buffer))
-        buffer))))
-
-(defmacro with-magit-tmp-buffer (var &rest body)
-  (declare (indent 1)
-           (debug (symbolp &rest form)))
-  `(let ((,var (generate-new-buffer magit-tmp-buffer-name)))
-     (unwind-protect
-         (progn ,@body)
-       (kill-buffer ,var))))
-
-(defun magit-apply-diff-item (diff &rest args)
-  (when (zerop magit-diff-context-lines)
-    (setq args (cons "--unidiff-zero" args)))
-  (with-magit-tmp-buffer tmp
-    (magit-insert-diff-item-patch diff tmp)
-    (apply #'magit-run-git-with-input tmp
-           "apply" (append args (list "-")))))
-
-(defun magit-apply-hunk-item* (hunk reverse &rest args)
-  "Apply single hunk or part of a hunk to the index or working file.
-
-This function is the core of magit's stage, unstage, apply, and
-revert operations.  HUNK (or the portion of it selected by the
-region) will be applied to either the index, if \"--cached\" is a
-member of ARGS, or to the working file otherwise."
-  (let ((zero-context (zerop magit-diff-context-lines))
-        (use-region (magit-use-region-p)))
-    (when zero-context
-      (setq args (cons "--unidiff-zero" args)))
-    (when reverse
-      (setq args (cons "--reverse" args)))
-    (when (and use-region zero-context)
-      (error (concat "Not enough context to partially apply hunk.  "
-                     "Use `+' to increase context.")))
-    (with-magit-tmp-buffer tmp
-      (if use-region
-          (magit-insert-hunk-item-region-patch
-           hunk reverse (region-beginning) (region-end) tmp)
-        (magit-insert-hunk-item-patch hunk tmp))
-      (apply #'magit-run-git-with-input tmp
-             "apply" (append args (list "-"))))))
-
-(defun magit-apply-hunk-item (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk nil args))
-
-(defun magit-apply-hunk-item-reverse (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk t args))
-
-(magit-define-inserter unstaged-changes (title)
-  (let ((magit-hide-diffs t)
-        (magit-current-diff-range (cons 'index 'working)))
-    (let ((magit-diff-options (append '() magit-diff-options)))
-      (magit-git-section 'unstaged title 'magit-wash-raw-diffs
-                         "diff-files"))))
-
-(magit-define-inserter staged-changes (staged no-commit)
-  (let ((magit-current-diff-range (cons "HEAD" 'index)))
-    (when staged
-      (let ((magit-hide-diffs t)
-            (base (if no-commit
-                      (magit-git-string "mktree")
-                    "HEAD")))
-        (let ((magit-diff-options (append '("--cached") magit-diff-options))
-              (magit-ignore-unmerged-raw-diffs t))
-          (magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs
-                             "diff-index" "--cached"
-                             base))))))
-
-;;; Logs and Commits
-
-                                        ; Note: making this a plain defcustom would probably let users break
-                                        ; the parser too easily
-(defvar magit-git-log-options
-  (list
-   "--pretty=format:* %h %s"
-   (format "--abbrev=%s" magit-sha1-abbrev-length)))
-                                        ; --decorate=full otherwise some ref prefixes are stripped
-                                        ;  '("--pretty=format:* %H%d %s" "--decorate=full"))
-
-;;
-;; Regexps for parsing ref names
-;;
-;; see the `git-check-ref-format' manpage for details
-
-(defconst magit-ref-nonchars "\000-\037\177 ~^:?*[\\"
-  "Characters specifically disallowed from appearing in Git symbolic refs.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-ref-nonslash-re
-  (concat "\\(?:"
-          ;; "no slash-separated component can begin with a dot ." (rule 1)
-          "[^" magit-ref-nonchars "./]"
-          ;; "cannot have two consecutive dots ..  anywhere." (rule 3)
-          "\\.?"
-          "\\)*")
-  "Regexp that matches the non-slash parts of a ref name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-refname-re
-  (concat
-   "\\(?:HEAD\\|"
-
-   "\\(?:tag: \\)?"
-
-   ;; optional non-slash sequence at the beginning
-   magit-ref-nonslash-re
-
-   ;; any number of slash-prefixed sequences
-   "\\(?:"
-   "/"
-   magit-ref-nonslash-re
-   "\\)*"
-
-   "/" ;; "must contain at least one /." (rule 2)
-   magit-ref-nonslash-re
-
-   ;; "cannot end with a slash / nor a dot .." (rule 5)
-   "[^" magit-ref-nonchars "./]"
-
-   "\\)"
-   )
-  "Regexp that matches a git symbolic reference name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-log-oneline-re
-  (concat
-   "^\\([_\\*|/ -.]+\\)?"                          ; graph   (1)
-   "\\(?:"
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defconst magit-log-longline-re
-  (concat
-   ;; use \0 delimiter (from -z option) to identify commits. this prevents
-   ;; commit messages containing lines like "commit 00000" from polluting the
-   ;; display
-   "\\(?:\\(?:\\`\\|\0\\)"
-   "\\([_\\*|/ -.]+\\)?"                           ; graph   (1)
-   "commit "
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "$\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defvar magit-present-log-line-function 'magit-present-log-line
-  "The function to use when generating a log line.
-It takes four args: CHART, SHA1, REFS and MESSAGE.  The function
-must return a string which will represent the log line.")
-
-(defun magit-log-get-bisect-state-color (suffix)
-  (if (string= suffix "bad")
-      (list suffix 'magit-log-head-label-bisect-bad)
-    (list suffix 'magit-log-head-label-bisect-good)))
-
-(defun magit-log-get-patches-color (suffix)
-  (list (and (string-match ".+/\\(.+\\)" suffix)
-             (match-string 1 suffix))
-        'magit-log-head-label-patches))
-
-(defvar magit-log-remotes-color-hook nil)
-
-(defun magit-log-get-remotes-color (suffix)
-  (or
-   (run-hook-with-args-until-success
-    'magit-log-remotes-color-hook suffix)
-   (list suffix 'magit-log-head-label-remote)))
-
-(defvar magit-refs-namespaces
-  '(("tags" . magit-log-head-label-tags)
-    ("remotes" magit-log-get-remotes-color)
-    ("heads" . magit-log-head-label-local)
-    ("patches" magit-log-get-patches-color)
-    ("bisect" magit-log-get-bisect-state-color)))
-
-(defun magit-ref-get-label-color (r)
-  (let ((uninteresting (loop for re in magit-uninteresting-refs
-                             thereis (string-match re r))))
-    (if uninteresting (list nil nil)
-      (let* ((ref-re "\\(?:tag: \\)?refs/\\(?:\\([^/]+\\)/\\)?\\(.+\\)")
-             (label (and (string-match ref-re r)
-                         (match-string 2 r)))
-             (res (let ((colorizer
-                         (cdr (assoc (match-string 1 r)
-                                     magit-refs-namespaces))))
-                    (cond ((null colorizer)
-                           (list r 'magit-log-head-label-default))
-                          ((symbolp colorizer)
-                           (list label colorizer))
-                          ((listp colorizer)
-                           (funcall (car colorizer)
-                                    (match-string 2 r)))
-                          (t
-                           (list r 'magit-log-head-label-default))))))
-        res))))
-
-(defun magit-present-log-line (graph sha1 refs message)
-  "The default log line generator."
-  (let ((string-refs
-         (when refs
-           (let ((colored-labels
-                  (delete nil
-                          (mapcar (lambda (r)
-                                    (destructuring-bind (label face)
-                                        (magit-ref-get-label-color r)
-                                      (and label
-                                           (propertize label 'face face))))
-                                  refs))))
-             (concat
-              (mapconcat 'identity colored-labels " ")
-              " ")))))
-
-    (concat
-     (if sha1
-         (propertize sha1 'face 'magit-log-sha1)
-       (insert-char ? magit-sha1-abbrev-length))
-     " "
-     (when graph
-       (propertize graph 'face 'magit-log-graph))
-     string-refs
-     (when message
-       (propertize message 'face 'magit-log-message)))))
-
-(defvar magit-log-count ()
-  "Internal var used to count the number of logs actually added in a buffer.")
-
-(defmacro magit-create-log-buffer-sections (&rest body)
-  "Empty current buffer of text and magit's section, and then evaluate BODY.
-
-if the number of logs inserted in the buffer is `magit-log-cutoff-length'
-insert a line to tell how to insert more of them"
-  (declare (indent 0))
-  `(let ((magit-log-count 0) (inhibit-read-only t))
-     (magit-create-buffer-sections
-       (magit-with-section 'log nil
-         ,@body
-         (if (= magit-log-count magit-log-cutoff-length)
-             (magit-with-section "longer"  'longer
-               (insert "type \"e\" to show more logs\n")))))))
-
-(defun magit-wash-log-line (style)
-  (beginning-of-line)
-  (let ((line-re (cond ((eq style 'long) magit-log-longline-re)
-                       (t magit-log-oneline-re))))
-    (cond
-     ((looking-at line-re)
-      (let ((chart (match-string 1))
-            (sha1 (match-string 2))
-            (msg (match-string 4))
-            (refs (when (match-string 3)
-                    (delq nil
-                          (mapcar
-                           (lambda (s)
-                             (and (not
-                                   (or (string= s "tag:")
-                                       (string= s "HEAD"))) ; as of 1.6.6
-                                  s))
-                           (split-string (match-string 3) "[(), ]" t))))))
-        (delete-region (point-at-bol) (point-at-eol))
-        (insert (funcall magit-present-log-line-function chart sha1 refs msg))
-        (goto-char (point-at-bol))
-        (if sha1
-            (magit-with-section sha1 'commit
-              (when magit-log-count (setq magit-log-count (1+ magit-log-count)))
-              (magit-set-section-info sha1)
-              (forward-line))
-          (forward-line))))
-     (t
-      (forward-line)))
-    t))
-
-(defun magit-wash-log (&optional style)
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence (apply-partially 'magit-wash-log-line style))))
-
-(defvar magit-currently-shown-commit nil)
-
-(defun magit-wash-commit ()
-  (let ((magit-current-diff-range))
-    (when (looking-at "^commit \\([0-9a-fA-F]\\{40\\}\\)")
-      (setq magit-current-diff-range (match-string 1))
-      (add-text-properties (match-beginning 1) (match-end 1)
-                           '(face magit-log-sha1)))
-    (cond
-     ((search-forward-regexp "^Merge: \\([0-9a-fA-F]+\\) \\([0-9a-fA-F]+\\)$" nil t)
-      (setq magit-current-diff-range (cons (cons (match-string 1)
-                                                 (match-string 2))
-                                           magit-current-diff-range))
-      (let ((first (magit-set-section nil 'commit (match-beginning 1) (match-end 1)))
-            (second (magit-set-section nil 'commit (match-beginning 2) (match-end 2))))
-        (magit-set-section-info (match-string 1) first)
-        (magit-set-section-info (match-string 2) second))
-      (make-commit-button (match-beginning 1) (match-end 1))
-      (make-commit-button (match-beginning 2) (match-end 2)))
-     (t
-      (setq magit-current-diff-range (cons (concat magit-current-diff-range "^")
-                                           magit-current-diff-range))))
-    (search-forward-regexp "^$")
-    (while (and
-            (search-forward-regexp "\\(\\b[0-9a-fA-F]\\{4,40\\}\\b\\)\\|\\(^diff\\)" nil 'noerror)
-            (not (match-string 2)))
-      (let ((sha1 (match-string 1))
-            (start (match-beginning 1))
-            (end (match-end 1)))
-        (when (string-equal "commit" (magit-git-string "cat-file" "-t" sha1))
-          (make-commit-button start end)
-          (let ((section (magit-set-section sha1 'commit start end)))
-            (magit-set-section-info sha1 section)))))
-    (beginning-of-line)
-    (when (looking-at "^diff")
-      (magit-wash-diffs))
-    (goto-char (point-max))
-    (insert "\n")
-    (if magit-back-navigation-history
-        (magit-with-section "[back]" 'button
-          (insert-text-button "[back]"
-                              'help-echo "Previous commit"
-                              'action 'magit-show-commit-backward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))
-    (insert " ")
-    (if magit-forward-navigation-history
-        (magit-with-section "[forward]" 'button
-          (insert-text-button "[forward]"
-                              'help-echo "Next commit"
-                              'action 'magit-show-commit-forward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))))
-
-(defun make-commit-button (start end)
-  (make-text-button start end
-                    'help-echo "Visit commit"
-                    'action (lambda (button)
-                              (save-excursion
-                                (goto-char button)
-                                (magit-visit-item)))
-                    'follow-link t
-                    'mouse-face 'magit-item-highlight
-                    'face 'magit-log-sha1))
-
-(defun magit-refresh-commit-buffer (commit)
-  (magit-configure-have-abbrev)
-  (magit-configure-have-decorate)
-  (magit-create-buffer-sections
-    (apply #'magit-git-section nil nil
-           'magit-wash-commit
-           "log"
-           "--max-count=1"
-           "--pretty=medium"
-           `(,@(if magit-have-abbrev (list "--no-abbrev-commit"))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             "--cc"
-             "-p" ,commit))))
-
-(define-derived-mode magit-commit-mode magit-mode "Magit"
-  "Mode to view a git commit.
-
-\\{magit-commit-mode-map}"
-  :group 'magit)
-
-(defvar magit-commit-buffer-name "*magit-commit*"
-  "Buffer name for displaying commit log messages.")
-
-(defun magit-show-commit (commit &optional scroll inhibit-history select)
-  "Show information about a commit in the buffer named by
-`magit-commit-buffer-name'.  COMMIT can be any valid name for a commit
-in the current Git repository.
-
-When called interactively or when SELECT is non-nil, switch to
-the commit buffer using `pop-to-buffer'.
-
-Unless INHIBIT-HISTORY is non-nil, the commit currently shown
-will be pushed onto `magit-back-navigation-history' and
-`magit-forward-navigation-history' will be cleared.
-
-Noninteractively, if the commit is already displayed and SCROLL
-is provided, call SCROLL's function definition in the commit
-window.  (`scroll-up' and `scroll-down' are typically passed in
-for this argument.)"
-  (interactive (list (magit-read-rev "Show commit (hash or ref)")
-                     nil nil t))
-  (when (magit-section-p commit)
-    (setq commit (magit-section-info commit)))
-  (unless (eql 0 (magit-git-exit-code "cat-file" "commit" commit))
-    (error "%s is not a commit" commit))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-commit-buffer-name)))
-    (cond
-     ((and (equal magit-currently-shown-commit commit)
-           ;; if it's empty then the buffer was killed
-           (with-current-buffer buf
-             (> (length (buffer-string)) 1)))
-      (let ((win (get-buffer-window buf)))
-        (cond ((not win)
-               (display-buffer buf))
-              (scroll
-               (with-selected-window win
-                 (funcall scroll))))))
-     (commit
-      (display-buffer buf)
-      (with-current-buffer buf
-        (unless inhibit-history
-          (push (cons default-directory magit-currently-shown-commit)
-                magit-back-navigation-history)
-          (setq magit-forward-navigation-history nil))
-        (setq magit-currently-shown-commit commit)
-        (goto-char (point-min))
-        (magit-mode-init dir 'magit-commit-mode
-                         #'magit-refresh-commit-buffer commit))))
-    (if select
-        (pop-to-buffer buf))))
-
-(defun magit-show-commit-backward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-back-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-back-navigation-history
-      (error "No previous commit."))
-    (let ((histitem (pop magit-back-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-forward-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defun magit-show-commit-forward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-forward-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-forward-navigation-history
-      (error "No next commit."))
-    (let ((histitem (pop magit-forward-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-back-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defvar magit-marked-commit nil)
-
-(defvar magit-mark-overlay nil)
-(make-variable-buffer-local 'magit-mark-overlay)
-(put 'magit-mark-overlay 'permanent-local t)
-
-(defun magit-refresh-marked-commits ()
-  (magit-for-all-buffers #'magit-refresh-marked-commits-in-buffer))
-
-(defun magit-refresh-marked-commits-in-buffer ()
-  (if (not magit-mark-overlay)
-      (let ((ov (make-overlay 1 1)))
-        (overlay-put ov 'face 'magit-item-mark)
-        (setq magit-mark-overlay ov)))
-  (delete-overlay magit-mark-overlay)
-  (magit-for-all-sections
-   (lambda (section)
-     (when (and (eq (magit-section-type section) 'commit)
-                (equal (magit-section-info section)
-                       magit-marked-commit))
-       (move-overlay magit-mark-overlay
-                     (magit-section-beginning section)
-                     (magit-section-end section)
-                     (current-buffer))))))
-
-(defun magit-set-marked-commit (commit)
-  (setq magit-marked-commit commit)
-  (magit-refresh-marked-commits))
-
-(defun magit-marked-commit ()
-  (or magit-marked-commit
-      (error "No commit marked")))
-
-(defun magit-remote-branch-name (remote branch)
-  "Get the name of the branch BRANCH on remote REMOTE"
-  (if (string= remote ".")
-      branch
-    (concat remote "/" branch)))
-
-(magit-define-inserter unpulled-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpulled "Unpulled commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "HEAD..%s" (magit-remote-branch-name remote branch)))))))
-
-(magit-define-inserter unpushed-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpushed "Unpushed commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "%s..HEAD" (magit-remote-branch-name remote branch)))))))
-
-(defun magit-remote-branch-for (local-branch &optional fully-qualified-name)
-  "Guess the remote branch name that LOCAL-BRANCH is tracking.
-Gives a fully qualified name (e.g., refs/remotes/origin/master) if
-FULLY-QUALIFIED-NAME is non-nil."
-  (let ((merge (magit-get "branch" local-branch "merge")))
-    (save-match-data
-      (if (and merge (string-match "^refs/heads/\\(.+\\)" merge))
-          (concat (if fully-qualified-name
-                      (let ((remote-name (magit-get "branch" local-branch "remote")))
-                        (if (string= "." remote-name)
-                            "refs/heads/"
-                          (concat "refs/remotes/" remote-name "/"))))
-                  (match-string 1 merge))))))
-
-;;; Status
-
-(defvar magit-remote-string-hook nil)
-
-(defun magit-remote-string (remote remote-branch remote-rebase)
-  (cond
-   ((string= "." remote)
-    (concat
-     (when remote-rebase "onto ")
-     "branch "
-     (propertize remote-branch 'face 'magit-branch)))
-   (remote
-    (concat
-     (when remote-rebase "onto ")
-     (propertize remote-branch 'face 'magit-branch)
-     " @ "
-     remote
-     " ("
-     (magit-get "remote" remote "url")
-     ")"))
-   (t
-    (run-hook-with-args-until-success 'magit-remote-string-hook))))
-
-(declare-function magit--bisect-info-for-status "magit-bisect" (branch))
-
-(defun magit-refresh-status ()
-  (magit-create-buffer-sections
-    (magit-with-section 'status nil
-      (let* ((branch (magit-get-current-branch))
-             (remote (and branch (magit-get "branch" branch "remote")))
-             (remote-rebase (and branch (magit-get-boolean "branch" branch "rebase")))
-             (remote-branch (or (and branch (magit-remote-branch-for branch)) branch))
-             (remote-string (magit-remote-string remote remote-branch remote-rebase))
-             (head (magit-git-string
-                    "log"
-                    "--max-count=1"
-                    "--abbrev-commit"
-                    (format "--abbrev=%s" magit-sha1-abbrev-length)
-                    "--pretty=oneline"))
-             (no-commit (not head)))
-        (when remote-string
-          (insert "Remote:   " remote-string "\n"))
-        (insert (format "Local:    %s %s\n"
-                        (propertize (magit--bisect-info-for-status branch)
-                                    'face 'magit-branch)
-                        (abbreviate-file-name default-directory)))
-        (insert (format "Head:     %s\n"
-                        (if no-commit "nothing commited (yet)" head)))
-        (let ((merge-heads (magit-file-lines (concat (magit-git-dir)
-                                                     "MERGE_HEAD"))))
-          (if merge-heads
-              (insert (format "Merging:   %s\n"
-                              (mapconcat 'identity
-                                         (mapcar 'magit-name-rev merge-heads)
-                                         ", ")))))
-        (let ((rebase (magit-rebase-info)))
-          (if rebase
-              (insert (apply 'format "Rebasing: onto %s (%s of %s); Press \"R\" to Abort, Skip, or Continue\n" rebase))))
-        (insert "\n")
-        (magit-git-exit-code "update-index" "--refresh")
-        (magit-insert-stashes)
-        (magit-insert-untracked-files)
-        (magit-insert-pending-changes)
-        (magit-insert-pending-commits)
-        (magit-insert-unpulled-commits remote remote-branch)
-        (let ((staged (or no-commit (magit-anything-staged-p))))
-          (magit-insert-unstaged-changes
-           (if staged "Unstaged changes:" "Changes:"))
-          (magit-insert-staged-changes staged no-commit))
-        (magit-insert-unpushed-commits remote remote-branch)
-        (run-hooks 'magit-refresh-status-hook)))))
-
-(defun magit-init (dir)
-  "Initialize git repository in the DIR directory."
-  (interactive (list (read-directory-name "Directory for Git repository: ")))
-  (let* ((dir (file-name-as-directory (expand-file-name dir)))
-         (topdir (magit-get-top-dir dir)))
-    (when (or (not topdir)
-              (yes-or-no-p
-               (format
-                (if (string-equal topdir dir)
-                    "There is already a Git repository in %s. Reinitialize? "
-                  "There is a Git repository in %s. Create another in %s? ")
-                topdir dir)))
-      (unless (file-directory-p dir)
-        (and (y-or-n-p (format "Directory %s does not exists.  Create it? " dir))
-             (make-directory dir)))
-      (let ((default-directory dir))
-        (magit-run* (list magit-git-executable "init"))))))
-
-(define-derived-mode magit-status-mode magit-mode "Magit"
-  "Mode for looking at git status.
-
-\\{magit-status-mode-map}"
-  :group 'magit)
-
-(defvar magit-default-directory nil)
-
-(defun magit-save-some-buffers (&optional msg pred)
-  "Save some buffers if variable `magit-save-some-buffers' is non-nil.
-If variable `magit-save-some-buffers' is set to 'dontask then
-don't ask the user before saving the buffers, just go ahead and
-do it.
-
-Optional argument MSG is displayed in the minibuffer if variable
-`magit-save-some-buffers' is nil.
-
-Optional second argument PRED determines which buffers are considered:
-If PRED is nil, all the file-visiting buffers are considered.
-If PRED is t, then certain non-file buffers will also be considered.
-If PRED is a zero-argument function, it indicates for each buffer whether
-to consider it or not when called with that buffer current."
-  (interactive)
-  (let ((predicate-function (or pred magit-save-some-buffers-predicate))
-        (magit-default-directory default-directory))
-    (if magit-save-some-buffers
-        (save-some-buffers
-         (eq magit-save-some-buffers 'dontask)
-         predicate-function)
-      (when msg
-        (message msg)))))
-
-(defun magit-save-buffers-predicate-all ()
-  "Prompt to save all buffers with unsaved changes"
-  t)
-
-(defun magit-save-buffers-predicate-tree-only ()
-  "Only prompt to save buffers which are within the current git project (as
-  determined by the dir passed to `magit-status'."
-  (and buffer-file-name
-       (string= (magit-get-top-dir magit-default-directory)
-                (magit-get-top-dir (file-name-directory buffer-file-name)))))
-
-;;;###autoload
-(defun magit-status (dir)
-  "Open a Magit status buffer for the Git repository containing
-DIR.  If DIR is not within a Git repository, offer to create a
-Git repository in DIR.
-
-Interactively, a prefix argument means to ask the user which Git
-repository to use even if `default-directory' is under Git control.
-Two prefix arguments means to ignore `magit-repo-dirs' when asking for
-user input."
-  (interactive (list (if current-prefix-arg
-                         (magit-read-top-dir
-                          (> (prefix-numeric-value current-prefix-arg)
-                             4))
-                       (or (magit-get-top-dir default-directory)
-                           (magit-read-top-dir nil)))))
-  (magit-save-some-buffers)
-  (let ((topdir (magit-get-top-dir dir)))
-    (unless topdir
-      (when (y-or-n-p (format "There is no Git repository in %S.  Create one? "
-                              dir))
-        (magit-init dir)
-        (setq topdir (magit-get-top-dir dir))))
-    (when topdir
-      (let ((buf (or (magit-find-status-buffer topdir)
-                     (generate-new-buffer
-                      (concat "*magit: "
-                              (file-name-nondirectory
-                               (directory-file-name topdir)) "*")))))
-        (funcall magit-status-buffer-switch-function buf)
-        (magit-mode-init topdir 'magit-status-mode #'magit-refresh-status)))))
-
-(magit-define-command automatic-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (if revision
-      (magit-run-git "merge" (magit-rev-to-git revision))))
-
-(magit-define-command manual-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (when revision
-    (apply 'magit-run-git
-           "merge" "--no-commit"
-           (magit-rev-to-git revision)
-           magit-custom-options)
-    (when (file-exists-p ".git/MERGE_MSG")
-        (magit-log-edit))))
-
-;;; Staging and Unstaging
-
-(defun magit-stage-item (&optional ask)
-  "Add the item at point to the staging area.
-If ASK is set, ask for the file name rather than picking the one
-at point."
-  (interactive "P")
-  (if ask
-      (magit-run-git "add" (read-file-name "File to stage: "))
-    (magit-section-action (item info "stage")
-      ((untracked file)
-       (magit-run-git "add" info))
-      ((untracked)
-       (apply #'magit-run-git "add" "--"
-              (magit-git-lines "ls-files" "--other" "--exclude-standard")))
-      ((unstaged diff hunk)
-       (if (magit-hunk-item-is-conflict-p item)
-           (error (concat "Can't stage individual resolution hunks.  "
-                          "Please stage the whole file.")))
-       (magit-apply-hunk-item item "--cached"))
-      ((unstaged diff)
-       (magit-run-git "add" "-u" (magit-diff-item-file item)))
-      ((staged *)
-       (error "Already staged"))
-      ((diff diff)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((diff diff hunk)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((hunk)
-       (error "Can't stage this hunk"))
-      ((diff)
-       (error "Can't stage this diff")))))
-
-(defun magit-unstage-item ()
-  "Remove the item at point from the staging area."
-  (interactive)
-  (magit-section-action (item info "unstage")
-    ((staged diff hunk)
-     (magit-apply-hunk-item-reverse item "--cached"))
-    ((staged diff)
-     (if (eq (car info) 'unmerged)
-         (error "Can't unstage an unmerged file.  Resolve it first"))
-     (if (magit-no-commit-p)
-         (magit-run-git "rm" "--cached" "--" (magit-diff-item-file item))
-       (magit-run-git "reset" "-q" "HEAD" "--" (magit-diff-item-file item))))
-    ((unstaged *)
-     (error "Already unstaged"))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((hunk)
-     (error "Can't unstage this hunk"))
-    ((diff)
-     (error "Can't unstage this diff"))))
-
-(defun magit-stage-all (&optional also-untracked-p)
-  "Add all remaining changes in tracked files to staging area.
-With prefix argument, add remaining untracked files as well.
-\('git add -u .' or 'git add .', respectively)."
-  (interactive "P")
-  (if also-untracked-p
-      (magit-run-git "add" ".")
-    (magit-run-git "add" "-u" ".")))
-
-(defun magit-unstage-all ()
-  "Remove all changes from staging area.
-\('git reset --mixed HEAD')."
-  (interactive)
-  (magit-run-git "reset" "HEAD"))
-
-;;; Branches
-
-(defun escape-branch-name (branch)
-  "Escapes branch names to remove problematic characters."
-  (replace-regexp-in-string "[/]" "-" branch))
-
-(defun magit-default-tracking-name-remote-plus-branch
-  (remote branch)
-  "Use the remote name plus a hyphen plus the escaped branch name for tracking branches."
-  (concat remote "-" (escape-branch-name branch)))
-
-(defun magit-default-tracking-name-branch-only
-  (remote branch)
-  "Use just the escaped branch name for tracking branches."
-  (escape-branch-name branch))
-
-(defun magit-get-tracking-name (remote branch)
-  "Given a REMOTE and a BRANCH name, ask the user for a local
-tracking brach name suggesting a sensible default."
-  (when (yes-or-no-p
-         (format "Create local tracking branch for %s? " branch))
-    (let* ((default-name
-             (funcall magit-default-tracking-name-function remote branch))
-           (chosen-name (read-string (format "Call local branch (%s): " default-name)
-                                     nil
-                                     nil
-                                     default-name)))
-      (when (magit-ref-exists-p (concat "refs/heads/" chosen-name))
-        (error "'%s' already exists." chosen-name))
-      chosen-name)))
-
-(defun magit-maybe-create-local-tracking-branch (rev)
-  "Depending on the users wishes, create a tracking branch for
-rev... maybe."
-  (if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
-      (let* ((remote (match-string 1 rev))
-             (branch (match-string 2 rev))
-             (tracker-name (magit-get-tracking-name remote branch)))
-        (when tracker-name
-          (magit-run-git "checkout" "-b" tracker-name rev)
-          t))
-    nil))
-
-(magit-define-command checkout (revision)
-  "Switch 'HEAD' to REVISION and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-If REVISION is a remote branch, offer to create a local tracking branch.
-\('git checkout [-b] REVISION')."
-  (interactive
-   (list (let ((current-branch (magit-get-current-branch))
-               (default (magit-default-rev)))
-           (magit-read-rev "Switch to"
-                           (unless (string= current-branch default)
-                             default)
-                           (if current-branch
-                               (cons (concat "refs/heads/" current-branch "$")
-                                     magit-uninteresting-refs)
-                             magit-uninteresting-refs)))))
-  (if revision
-      (when (not (magit-maybe-create-local-tracking-branch revision))
-        (magit-save-some-buffers)
-        (magit-run-git "checkout" (magit-rev-to-git revision))
-        (magit-update-vc-modeline default-directory))))
-
-(defun magit-read-create-branch-args ()
-  (let* ((cur-branch (magit-get-current-branch))
-         (cur-point (magit-default-rev))
-         (branch (read-string "Create branch: "))
-         (parent (magit-read-rev "Parent"
-                                 (cond
-                                  ((eq magit-create-branch-behaviour 'at-point) cur-point)
-                                  ((eq magit-create-branch-behaviour 'at-head) cur-branch)
-                                  (t cur-branch)))))
-    (list branch parent)))
-
-(magit-define-command create-branch (branch parent)
-  "Switch 'HEAD' to new BRANCH at revision PARENT and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-\('git checkout -b BRANCH REVISION')."
-  (interactive (magit-read-create-branch-args))
-  (when (and branch (not (string= branch ""))
-             parent)
-    (magit-save-some-buffers)
-    (magit-run-git "checkout" "-b"
-                   branch
-                   (append
-                    magit-custom-options
-                    (magit-rev-to-git parent)))
-    (magit-update-vc-modeline default-directory)))
-
-(defun magit-delete-branch (branch &optional force)
-  "Deletes a branch.
-If the branch is the current one, offers to switch to `master' first.
-With prefix, forces the removal even if it hasn't been merged.
-Works with local or remote branches.
-\('git branch [-d|-D] BRANCH' or 'git push <remote-part-of-BRANCH> :refs/heads/BRANCH')."
-  (interactive (list (magit-read-rev "Branch to delete" (magit-default-rev 'notrim))
-                     current-prefix-arg))
-  (let* ((remote (magit-remote-part-of-branch branch))
-         (is-current (string= branch (magit-get-current-branch)))
-         (args (list "branch"
-                     (if force "-D" "-d")
-                     branch)))
-    (cond
-     (remote
-      (magit-run-git "push" remote (concat ":refs/heads/" (magit-branch-no-remote branch))))
-     (is-current
-      (when (y-or-n-p "Cannot delete current branch. Switch to master first? ")
-          (progn
-            (magit-checkout "master")
-            (apply 'magit-run-git args))
-          (message "The current branch was not deleted.")))
-     (t
-            (apply 'magit-run-git args)))))
-
-(defun magit-move-branch (old new &optional force)
-  "Renames or moves a branch.
-With prefix, forces the move even if NEW already exists.
-\('git branch [-m|-M] OLD NEW')."
-  (interactive (list (magit-read-rev "Old name" (magit-default-rev))
-                     (read-string "New name: ")
-                     current-prefix-arg))
-  (magit-run-git "branch" (if force
-                              "-M"
-                            "-m")
-                 (magit-rev-to-git old) new))
-
-(defun magit-guess-branch ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-current-section)))
-    ((wazzup commit)
-     (magit-section-info (magit-section-parent item)))
-    ((commit) (magit-name-rev (substring info 0 magit-sha1-abbrev-length)))
-    ((wazzup) info)))
-
-;;; Remotes
-
-(defun magit-add-remote (remote url)
-  "Adds a remote and fetches it.
-\('git remote add REMOTE URL')."
-  (interactive (list (read-string "Add remote: ")
-                     (read-string "URL: ")))
-  (magit-run-git "remote" "add" "-f" remote url))
-
-(defun magit-remove-remote (remote)
-  "Deletes a remote.
-\('git remote rm REMOTE')."
-  (interactive (list (magit-read-remote "Remote to delete")))
-  (magit-run-git "remote" "rm" remote))
-
-(defun magit-rename-remote (old new)
-  "Renames a remote.
-\('git remote rename OLD NEW')."
-  (interactive (list (magit-read-remote "Old name")
-                     (read-string "New name: ")))
-  (magit-run-git "remote" "rename" old new))
-
-(defun magit-guess-remote ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-section-parent item)))
-    ((remote)
-     info)
-    (t
-     (if  (string= info ".")
-         info
-       (magit-get-current-remote)))))
-
-;;; Merging
-
-(defun magit-merge (revision)
-  "Merge REVISION into the current 'HEAD'; leave changes uncommitted.
-With a prefix-arg, the merge will be squashed.
-\('git merge --no-commit [--squash|--no-ff] REVISION')."
-  (interactive
-   (list (magit-read-rev "Merge" (magit-default-rev))))
-  (if revision
-      (apply 'magit-run-git
-             "merge"
-             (magit-rev-to-git revision)
-             magit-custom-options)))
-
-;;; Rebasing
-
-(defun magit-rebase-info ()
-  "Returns a list indicating the state of an in-progress rebase,
-if any."
-  (let ((git-dir (magit-git-dir)))
-    (cond ((file-exists-p (concat git-dir "rebase-merge"))
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-merge/onto"))))
-
-            ;; How many commits we've gone through
-            (length (magit-file-lines (concat git-dir "rebase-merge/done")))
-
-            ;; How many commits we have in total, without the comments
-            ;; at the end of git-rebase-todo.backup
-            (let ((todo-lines-with-comments (magit-file-lines (concat git-dir "rebase-merge/git-rebase-todo.backup"))))
-              (loop for i in todo-lines-with-comments
-                    until (string= "" i)
-                    count i))))
-          ((and (file-exists-p (concat git-dir "rebase-apply"))
-                (file-exists-p (concat git-dir "rebase-apply/onto")))
-           ;; we might be here because a non-interactive rebase failed: the
-           ;; patches didn't apply cleanly
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-apply/onto"))))
-
-            ;; How many commits we've gone through
-            (- (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/next")))) 1)
-
-            ;; How many commits we have in total
-            (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/last"))))
-            ))
-          (t nil))))
-
-(defun magit-rebase-step ()
-  (interactive)
-  (let ((info (magit-rebase-info)))
-    (if (not info)
-        (let* ((current-branch (magit-get-current-branch))
-               (rev (magit-read-rev "Rebase to"
-                                    (magit-format-ref (magit-remote-branch-for current-branch t))
-                                    (if current-branch
-                                        (cons (concat "refs/heads/" current-branch)
-                                              magit-uninteresting-refs)
-                                      magit-uninteresting-refs))))
-          (if rev
-              (magit-run-git "rebase" (magit-rev-to-git rev))))
-      (let ((cursor-in-echo-area t)
-            (message-log-max nil))
-        (message "Rebase in progress. [A]bort, [S]kip, or [C]ontinue? ")
-        (let ((reply (read-event)))
-          (case reply
-            ((?A ?a)
-             (magit-run-git-async "rebase" "--abort"))
-            ((?S ?s)
-             (magit-run-git-async "rebase" "--skip"))
-            ((?C ?c)
-             (magit-run-git-async "rebase" "--continue"))))))))
-
-;;; Resetting
-
-(magit-define-command reset-head (revision &optional hard)
-  "Switch 'HEAD' to REVISION, keeping prior working tree and staging area.
-Any differences from REVISION become new changes to be committed.
-With prefix argument, all uncommitted changes in working tree
-and staging area are lost.
-\('git reset [--soft|--hard] REVISION')."
-  (interactive (list (magit-read-rev (format "%s head to"
-                                             (if current-prefix-arg
-                                                 "Hard reset"
-                                               "Reset"))
-                                     (or (magit-default-rev)
-                                         "HEAD^"))
-                     current-prefix-arg))
-  (when revision
-    (magit-run-git "reset" (if hard "--hard" "--soft")
-                   (magit-rev-to-git revision))
-    (magit-update-vc-modeline default-directory)))
-
-(magit-define-command reset-head-hard (revision)
-  "Switch 'HEAD' to REVISION, losing all changes.
-Uncomitted changes in both working tree and staging area are lost.
-\('git reset --hard REVISION')."
-  (interactive (list (magit-read-rev (format "Hard reset head to")
-                                     (or (magit-default-rev)
-                                         "HEAD"))))
-  (magit-reset-head revision t))
-
-(magit-define-command reset-working-tree (&optional arg)
-  "Revert working tree and clear changes from staging area.
-\('git reset --hard HEAD').
-
-With a prefix arg, also remove untracked files.  With two prefix args, remove ignored files as well."
-  (interactive "p")
-  (let ((include-untracked (>= arg 4))
-        (include-ignored (>= arg 16)))
-    (when (yes-or-no-p (format "Discard all uncommitted changes%s%s? "
-                               (if include-untracked
-                                   ", untracked files"
-                                 "")
-                               (if include-ignored
-                                   ", ignored files"
-                                 "")))
-      (magit-reset-head-hard "HEAD")
-      (if include-untracked
-          (magit-run-git "clean" "-fd" (if include-ignored
-                                           "-x"
-                                         ""))))))
-
-;;; Rewriting
-
-(defun magit-read-rewrite-info ()
-  (when (file-exists-p (concat (magit-git-dir) "magit-rewrite-info"))
-    (with-temp-buffer
-      (insert-file-contents (concat (magit-git-dir) "magit-rewrite-info"))
-      (goto-char (point-min))
-      (read (current-buffer)))))
-
-(defun magit-write-rewrite-info (info)
-  (with-temp-file (concat (magit-git-dir) "magit-rewrite-info")
-    (prin1 info (current-buffer))
-    (princ "\n" (current-buffer))))
-
-(magit-define-inserter pending-commits ()
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info))))
-    (when pending
-      (magit-with-section 'pending nil
-        (insert (propertize "Pending commits:\n"
-                            'face 'magit-section-title))
-        (dolist (p pending)
-          (let* ((commit (car p))
-                 (properties (cdr p))
-                 (used (plist-get properties 'used)))
-            (magit-with-section commit 'commit
-              (magit-set-section-info commit)
-              (insert (magit-git-string
-                       "log" "--max-count=1"
-                       (if used
-                           "--pretty=format:. %s"
-                         "--pretty=format:* %s")
-                       commit "--")
-                      "\n")))))
-      (insert "\n"))))
-
-(defun magit-rewrite-set-commit-property (commit prop value)
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info)))
-         (p (assoc commit pending)))
-    (when p
-      (setf (cdr p) (plist-put (cdr p) prop value))
-      (magit-write-rewrite-info info)
-      (magit-need-refresh))))
-
-(defun magit-rewrite-set-used ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used t))))
-
-(defun magit-rewrite-set-unused ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used nil))))
-
-(magit-define-inserter pending-changes ()
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (when orig
-      (let ((magit-hide-diffs t))
-        (magit-git-section 'pending-changes
-                           "Pending changes"
-                           'magit-wash-diffs
-                           "diff" (magit-diff-U-arg) "-R" orig)))))
-
-(defun magit-rewrite-start (from &optional onto)
-  (interactive (list (magit-read-rev "Rewrite from" (magit-default-rev))))
-  (or (magit-everything-clean-p)
-      (error "You have uncommitted changes"))
-  (or (not (magit-read-rewrite-info))
-      (error "Rewrite in progress"))
-  (let* ((orig (magit-rev-parse "HEAD"))
-         (base
-          (if
-              (or
-               (eq magit-rewrite-inclusive t)
-               (and
-                (eq magit-rewrite-inclusive 'ask)
-                (y-or-n-p "Include selected revision in rewrite? ")))
-              (or
-               (car (magit-commit-parents from))
-               (error "Can't rewrite a parentless commit."))
-            from))
-         (pending (magit-git-lines "rev-list" (concat base ".."))))
-    (magit-write-rewrite-info `((orig ,orig)
-                                (pending ,@(mapcar #'list pending))))
-    (magit-run-git "reset" "--hard" base)))
-
-(defun magit-rewrite-stop (&optional noconfirm)
-  (interactive)
-  (let* ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (when (or noconfirm
-              (yes-or-no-p "Stop rewrite? "))
-      (magit-write-rewrite-info nil)
-      (magit-refresh))))
-
-(defun magit-rewrite-abort ()
-  (interactive)
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (or info
-        (error "No rewrite in progress"))
-    (or (magit-everything-clean-p)
-        (error "You have uncommitted changes"))
-    (when (yes-or-no-p "Abort rewrite? ")
-      (magit-write-rewrite-info nil)
-      (magit-run-git "reset" "--hard" orig))))
-
-(defun magit-rewrite-finish ()
-  (interactive)
-  (magit-with-refresh
-    (magit-rewrite-finish-step t)))
-
-(defun magit-rewrite-finish-step (first-p)
-  (let ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (let* ((pending (cdr (assq 'pending info)))
-           (first-unused
-            (let ((rpend (reverse pending)))
-              (while (and rpend (plist-get (cdr (car rpend)) 'used))
-                (setq rpend (cdr rpend)))
-              (car rpend)))
-           (commit (car first-unused)))
-      (cond ((not first-unused)
-             (magit-rewrite-stop t))
-            ((magit-apply-commit commit t (not first-p))
-             (magit-rewrite-set-commit-property commit 'used t)
-             (magit-rewrite-finish-step nil))))))
-
-;;; Updating, pull, and push
-
-(magit-define-command fetch (remote)
-  "Fetch from REMOTE."
-  (interactive (list (magit-read-remote)))
-  (apply 'magit-run-git-async "fetch" remote magit-custom-options))
-
-(magit-define-command fetch-current ()
-  "Run fetch for default remote.
-
-If there is no default remote, ask for one."
-  (interactive)
-  (magit-fetch (or (magit-get-current-remote)
-                   (magit-read-remote))))
-
-(magit-define-command remote-update ()
-  "Update all remotes."
-  (interactive)
-  (apply 'magit-run-git-async "remote" "update" magit-custom-options))
-
-(magit-define-command pull ()
-  "Run git pull against the current remote."
-  (interactive)
-  (let* ((branch (magit-get-current-branch))
-         (branch-remote (magit-get-remote branch))
-         (config-branch (and branch (magit-get "branch" branch "merge")))
-         (merge-branch (or (and config-branch (not current-prefix-arg))
-                           (magit-read-remote-branch
-                            branch-remote (format "Pull from: ")))))
-    (when (and branch (not config-branch))
-      (magit-set branch-remote "branch" branch "remote")
-      (magit-set (format "refs/heads/%s" merge-branch)
-                 "branch" branch "merge"))
-    (apply 'magit-run-git-async "pull" "-v" magit-custom-options)))
-
-(eval-when-compile (require 'eshell))
-
-(defun magit-parse-arguments (command)
-  (require 'eshell)
-  (with-temp-buffer
-    (insert command)
-    (mapcar 'eval (eshell-parse-arguments (point-min) (point-max)))))
-
-(defun magit-shell-command (command)
-  "Perform arbitrary shell COMMAND."
-  (interactive "sCommand: ")
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-run* args nil nil nil t)))
-
-(defvar magit-git-command-history nil)
-
-(defun magit-git-command (command)
-  "Perform arbitrary Git COMMAND.
-
-Similar to `magit-shell-command', but involves slightly less
-typing and automatically refreshes the status buffer."
-  (interactive
-   (list (read-string "Run git like this: " nil 'magit-git-command-history)))
-  (require 'pcomplete)
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-with-refresh
-      (magit-run* (append (cons magit-git-executable
-                                magit-git-standard-options)
-                          args)
-                  nil nil nil t))))
-
-(magit-define-command push-tags ()
-  "Push tags."
-  (interactive)
-  (magit-run-git-async "push" "--tags"))
-
-(magit-define-command push ()
-  "Push the current branch to a remote repository.
-
-With no prefix argument, ask `magit-get-remote' what remote to
-use for this branch.
-
-With a prefix arg \(e.g., \\[universal-argument] \\[magit-push]), \
-ask user instead.
-
-With \\[universal-argument] \\[universal-argument] as prefix, \
-also prompt user for the remote branch;
-otherwise, try to use the branch.<name>.merge git-config(1)
-option, falling back to something hairy if that is unset."
-  (interactive)
-  (let* ((branch (or (magit-get-current-branch)
-                     (error "Don't push a detached head.  That's gross")))
-         (branch-remote (magit-get-remote branch))
-         (push-remote (if (or current-prefix-arg
-                              (not branch-remote))
-                          (magit-read-remote (format "Push %s to remote"
-                                                     branch)
-                                             branch-remote)
-                        branch-remote))
-         (ref-branch (or (and (>= (prefix-numeric-value current-prefix-arg) 16)
-                              (magit-read-remote-branch
-                               push-remote (format "Push %s as branch" branch)))
-                         (magit-get "branch" branch "merge"))))
-    (if (and (not ref-branch)
-             (eq magit-set-upstream-on-push 'refuse))
-        (error "Not pushing since no upstream has been set.")
-      (let ((set-upstream-on-push (and (not ref-branch)
-                                       (or (eq magit-set-upstream-on-push 'dontask)
-                                           (and (eq magit-set-upstream-on-push t)
-                                                (yes-or-no-p "Set upstream while pushing? "))))))
-        (if (and (not branch-remote)
-                 (not current-prefix-arg))
-            (magit-set push-remote "branch" branch "remote"))
-        (apply 'magit-run-git-async "push" "-v" push-remote
-               (if ref-branch
-                   (format "%s:%s" branch ref-branch)
-                 branch)
-               (if set-upstream-on-push
-                   (cons "--set-upstream" magit-custom-options)
-                 magit-custom-options))
-        ;; Although git will automatically set up the remote,
-        ;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1),
-        ;; so we have to do that manually.
-        (unless ref-branch
-          (magit-set (concat "refs/heads/" branch) "branch" branch "merge"))))))
-
-;;; Log edit mode
-
-(defvar magit-log-edit-buffer-name "*magit-edit-log*"
-  "Buffer name for composing commit messages.")
-
-(defvar magit-log-edit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-c") 'magit-log-edit-commit)
-    (define-key map (kbd "C-x #") 'magit-log-edit-commit)
-    (define-key map (kbd "C-c C-a") 'magit-log-edit-toggle-amending)
-    (define-key map (kbd "C-c C-s") 'magit-log-edit-toggle-signoff)
-    (define-key map (kbd "C-c C-t") 'magit-log-edit-toggle-author)
-    (define-key map (kbd "C-c C-e") 'magit-log-edit-toggle-allow-empty)
-    (define-key map (kbd "M-p") 'log-edit-previous-comment)
-    (define-key map (kbd "M-n") 'log-edit-next-comment)
-    (define-key map (kbd "C-c C-k") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-c C-]") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-x C-s") (lambda ()
-                                      (interactive)
-                                      (message "Not saved. Use C-c C-c to finalize this commit message.")))
-    map))
-
-(defvar magit-pre-log-edit-window-configuration nil)
-
-(define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit"
-  ;; Recognize changelog-style paragraphs
-  (set (make-local-variable 'paragraph-start)
-       (concat paragraph-start "\\|*\\|(")))
-
-(defun magit-log-edit-cleanup ()
-  (save-excursion
-    (goto-char (point-min))
-    (goto-char (point-min))
-    (if (re-search-forward "[ \t\n]*\\'" nil t)
-        (replace-match "\n" nil nil))))
-
-(defun magit-log-edit-append (str)
-  (with-current-buffer (get-buffer-create magit-log-edit-buffer-name)
-    (goto-char (point-max))
-    (insert str "\n")))
-
-(defconst magit-log-header-end "-- End of Magit header --\n")
-
-(defun magit-log-edit-get-fields ()
-  (let ((buf (get-buffer magit-log-edit-buffer-name))
-        (result nil))
-    (if buf
-        (with-current-buffer buf
-          (goto-char (point-min))
-          (while (looking-at "^\\([A-Za-z0-9-_]+\\): *\\(.+\\)?$")
-            (setq result (acons (intern (downcase (match-string 1)))
-                                (read (or (match-string 2) "nil"))
-                                result))
-            (forward-line))
-          (if (not (looking-at (regexp-quote magit-log-header-end)))
-              (setq result nil))))
-    (nreverse result)))
-
-(defun magit-log-edit-set-fields (fields)
-  (let ((buf (get-buffer-create magit-log-edit-buffer-name)))
-    (with-current-buffer buf
-      (goto-char (point-min))
-      (if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)*%s"
-                                         (regexp-quote magit-log-header-end))
-                                 nil t)
-          (delete-region (match-beginning 0) (match-end 0)))
-      (goto-char (point-min))
-      (when fields
-        (while fields
-          (insert (capitalize (symbol-name (caar fields))) ": "
-                  (prin1-to-string (cdar fields)) "\n")
-          (setq fields (cdr fields)))
-        (insert magit-log-header-end)))))
-
-(defun magit-log-edit-set-field (name value)
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)))
-    (cond (cell
-           (if value
-               (rplacd cell value)
-             (setq fields (delq cell fields))))
-          (t
-           (if value
-               (setq fields (append fields (list (cons name value)))))))
-    (magit-log-edit-set-fields fields)))
-
-(defun magit-log-edit-get-field (name)
-  (cdr (assq name (magit-log-edit-get-fields))))
-
-(defun magit-log-edit-toggle-field (name default)
-  "Toggle the log-edit field named NAME.
-If it's currently unset, set it to DEFAULT (t or nil).
-
-Return nil if the field is toggled off, and non-nil if it's
-toggled on.  When it's toggled on for the first time, return
-'first."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)) yesp)
-    (if cell
-        (progn
-          (setq yesp (equal (cdr cell) "yes"))
-          (rplacd cell (if yesp "no" "yes")))
-      (setq fields (acons name (if default "yes" "no") fields))
-      (setq yesp (if default 'first)))
-    (magit-log-edit-set-fields fields)
-    yesp))
-
-(defun magit-log-edit-toggle-input (name default)
-  "Toggle the log-edit input named NAME.
-If it's currently unset, set it to DEFAULT (a string). If it is
-set remove it.
-
-Return nil if the input is toggled off, and its valud if it's
-toggled on."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields))
-         result)
-    (if cell
-        (progn
-          (setq fields (assq-delete-all name fields)
-                result (cdr cell)))
-      (setq fields (acons name default fields)))
-    (magit-log-edit-set-fields fields)
-    result))
-
-(defun magit-log-edit-setup-author-env (author)
-  "Set GIT_AUTHOR_* variables from AUTHOR spec.
-If AUTHOR is nil, honor default values from
-environment (potentially empty)."
-  (when author
-    ;; XXX - this is a bit strict, probably.
-    (or (string-match "\\(.*\\) <\\(.*\\)>\\(?:,\\s-*\\(.+\\)\\)?" author)
-        (error "Can't parse author string"))
-    ;; Shucks, setenv destroys the match data.
-    (let ((name (match-string 1 author))
-          (email (match-string 2 author))
-          (date  (match-string 3 author)))
-      (make-local-variable 'process-environment)
-      (setenv "GIT_AUTHOR_NAME" name)
-      (setenv "GIT_AUTHOR_EMAIL" email)
-      (if date
-          (setenv "GIT_AUTHOR_DATE" date)))))
-
-(defun magit-log-edit-push-to-comment-ring (comment)
-  (when (or (ring-empty-p log-edit-comment-ring)
-            (not (equal comment (ring-ref log-edit-comment-ring 0))))
-    (ring-insert log-edit-comment-ring comment)))
-
-(defun magit-log-edit-commit ()
-  "Finish edits and create new commit object.
-\('git commit ...')"
-  (interactive)
-  (let* ((fields (magit-log-edit-get-fields))
-         (amend (equal (cdr (assq 'amend fields)) "yes"))
-         (allow-empty (equal (cdr (assq 'allow-empty fields)) "yes"))
-         (commit-all (equal (cdr (assq 'commit-all fields)) "yes"))
-         (sign-off-field (assq 'sign-off fields))
-         (sign-off (if sign-off-field
-                       (equal (cdr sign-off-field) "yes")
-                     magit-commit-signoff))
-         (tag-rev (cdr (assq 'tag-rev fields)))
-         (tag-name (cdr (assq 'tag-name fields)))
-         (author (cdr (assq 'author fields)))
-         (tag-options (cdr (assq 'tag-options fields))))
-
-    (unless (or (magit-anything-staged-p)
-                allow-empty
-                amend
-                tag-name
-                (file-exists-p (concat (magit-git-dir) "MERGE_HEAD"))
-                (and commit-all
-                     (not (magit-everything-clean-p))))
-      (error "Refusing to create empty commit. Maybe you want to amend (%s) or allow-empty (%s)?"
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-amending)))
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-allow-empty)))))
-
-    (magit-log-edit-push-to-comment-ring (buffer-string))
-    (magit-log-edit-setup-author-env author)
-    (magit-log-edit-set-fields nil)
-    (magit-log-edit-cleanup)
-    (if (= (buffer-size) 0)
-        (insert "(Empty description)\n"))
-    (let ((env process-environment)
-          (commit-buf (current-buffer)))
-      (with-current-buffer (magit-find-status-buffer default-directory)
-        (let ((process-environment env))
-          (cond (tag-name
-                 (apply #'magit-run-git-with-input commit-buf
-                        "tag" (append tag-options (list tag-name "-a" "-F" "-" tag-rev))))
-                (t
-                 (apply #'magit-run-async-with-input commit-buf
-                        magit-git-executable
-                        (append magit-git-standard-options
-                                '("commit")
-                                magit-custom-options
-                                '("-F" "-")
-                                (if (and commit-all (not allow-empty)) '("--all") '())
-                                (if amend '("--amend") '())
-                                (if allow-empty '("--allow-empty"))
-                                (if sign-off '("--signoff") '()))))))))
-    ;; shouldn't we kill that buffer altogether?
-    (erase-buffer)
-    (let ((magit-buf magit-buffer-internal))
-      (bury-buffer)
-      (set-buffer magit-buf))
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (delete-file (concat (magit-git-dir) "MERGE_MSG")))
-    ;; potentially the local environment has been altered with settings that
-    ;; were specific to this commit. Let's revert it
-    (kill-local-variable 'process-environment)
-    (magit-update-vc-modeline default-directory)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-cancel-log-message ()
-  "Abort edits and erase commit message being composed."
-  (interactive)
-  (when (or (not magit-log-edit-confirm-cancellation)
-            (yes-or-no-p
-             "Really cancel editing the log (any changes will be lost)?"))
-    (erase-buffer)
-    (bury-buffer)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-toggle-amending ()
-  "Toggle whether this will be an amendment to the previous commit.
-\(i.e., whether eventual commit does 'git commit --amend')"
-  (interactive)
-  (when (eq (magit-log-edit-toggle-field 'amend t) 'first)
-    (magit-log-edit-append
-     (magit-trim-line (magit-format-commit "HEAD" "%s%n%n%b")))))
-
-(defun magit-log-edit-toggle-signoff ()
-  "Toggle whether this commit will include a signoff.
-\(i.e., whether eventual commit does 'git commit --signoff')"
-  (interactive)
-  (magit-log-edit-toggle-field 'sign-off (not magit-commit-signoff)))
-
-(defun magit-log-edit-toggle-author ()
-  "Toggle whether this commit will include an author.
-\(i.e., whether eventual commit is run with GIT_AUTHOR_NAME and
-GIT_AUTHOR_EMAIL set)"
-  (interactive)
-  (magit-log-edit-toggle-input 'author (format "%s <%s>"
-                                               (or (magit-get "user" "name") "Author Name")
-                                               (or (magit-get "user" "email") "author@email"))))
-
-(defun magit-log-edit-toggle-allow-empty ()
-  "Toggle whether this commit is allowed to be empty.
-This means that the eventual commit does 'git commit --allow-empty'."
-  (interactive)
-  (magit-log-edit-toggle-field 'allow-empty t))
-
-(defun magit-pop-to-log-edit (operation)
-  (let ((dir default-directory)
-        (magit-buf (current-buffer))
-        (buf (get-buffer-create magit-log-edit-buffer-name)))
-    (setq magit-pre-log-edit-window-configuration
-          (current-window-configuration))
-    (pop-to-buffer buf)
-    (setq default-directory dir)
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (insert-file-contents (concat (magit-git-dir) "MERGE_MSG")))
-    (magit-log-edit-mode)
-    (make-local-variable 'magit-buffer-internal)
-    (setq magit-buffer-internal magit-buf)
-    (message "Type C-c C-c to %s (C-c C-k to cancel)." operation)))
-
-(defun magit-log-edit (&optional arg)
-  "Brings up a buffer to allow editing of commit messages.
-
-Giving a simple prefix arg will amend a previous commit, while
-a double prefix arg will allow creating an empty one.
-
-If there is a rebase in progress, offer the user the option to
-continue it.
-
-\\{magit-log-edit-mode-map}"
-  (interactive "P")
-  ;; If repository is dirty there is no point in trying to
-  ;; suggest to continue the rebase. Git will rebuke you and exit with
-  ;; error code, so suggest it only if theres absolutely nothing else
-  ;; to do and rebase is ongoing.
-  (if (and (magit-everything-clean-p)
-           (magit-rebase-info)
-           (y-or-n-p "Rebase in progress.  Continue it? "))
-      (magit-run-git-async "rebase" "--continue")
-
-    ;; If there's nothing staged, set commit flag to `nil', thus
-    ;; avoiding unnescessary popping up of the log edit buffer in case
-    ;; when user chose to forgo commiting all unstaged changes
-    (let ((amend-p (= (prefix-numeric-value arg) 4))
-          (empty-p (= (prefix-numeric-value arg) 16)))
-      (when (and magit-commit-all-when-nothing-staged
-                 (not (magit-everything-clean-p))
-                 (not (magit-anything-staged-p)))
-        (cond ((eq magit-commit-all-when-nothing-staged 'ask-stage)
-               (when (y-or-n-p "Nothing staged.  Stage everything now? ")
-                 (magit-stage-all)))
-              ((not (magit-log-edit-get-field 'commit-all))
-               (when (or (eq magit-commit-all-when-nothing-staged t)
-                         (y-or-n-p
-                          "Nothing staged.  Commit all unstaged changes? "))
-                 (magit-log-edit-set-field 'commit-all "yes")))))
-      (when amend-p
-        (magit-log-edit-toggle-amending))
-      (when empty-p
-        (magit-log-edit-toggle-allow-empty))
-      (let ((author-email (or (getenv "GIT_AUTHOR_EMAIL") ""))
-            (author-name (or (getenv "GIT_AUTHOR_NAME") ""))
-            (author-date (or (getenv "GIT_AUTHOR_DATE") "")))
-        (if (not (string= author-email ""))
-            (magit-log-edit-set-field 'author (format "%s <%s>%s"
-                                                      (if (string= "" author-name) author-email author-name)
-                                                      author-email
-                                                      (if (string= "" author-date) "" (format ", %s" author-date))))))
-      (magit-pop-to-log-edit "commit"))))
-
-(defun magit-add-log ()
-  (interactive)
-  (cond ((magit-rebase-info)
-         (if (y-or-n-p "Rebase in progress.  Continue it? ")
-             (magit-run-git-async "rebase" "--continue")))
-        (t
-         (let ((section (magit-current-section)))
-           (let ((fun (if (eq (magit-section-type section) 'hunk)
-                          (save-window-excursion
-                            (save-excursion
-                              (magit-visit-item)
-                              (add-log-current-defun)))
-                        nil))
-                 (file (magit-diff-item-file
-                        (cond ((eq (magit-section-type section) 'hunk)
-                               (magit-hunk-item-diff section))
-                              ((eq (magit-section-type section) 'diff)
-                               section)
-                              (t
-                               (error "No change at point"))))))
-             (magit-log-edit nil)
-             (goto-char (point-min))
-             (cond ((not (search-forward-regexp
-                          (format "^\\* %s" (regexp-quote file)) nil t))
-                    ;; No entry for file, create it.
-                    (goto-char (point-max))
-                    (insert (format "\n* %s" file))
-                    (if fun
-                        (insert (format " (%s)" fun)))
-                    (insert ": "))
-                   (fun
-                    ;; found entry for file, look for fun
-                    (let ((limit (or (save-excursion
-                                       (and (search-forward-regexp "^\\* "
-                                                                   nil t)
-                                            (match-beginning 0)))
-                                     (point-max))))
-                      (cond ((search-forward-regexp (format "(.*\\<%s\\>.*):"
-                                                            (regexp-quote fun))
-                                                    limit t)
-                             ;; found it, goto end of current entry
-                             (if (search-forward-regexp "^(" limit t)
-                                 (backward-char 2)
-                               (goto-char limit)))
-                            (t
-                             ;; not found, insert new entry
-                             (goto-char limit)
-                             (if (bolp)
-                                 (open-line 1)
-                               (newline))
-                             (insert (format "(%s): " fun))))))
-                   (t
-                    ;; found entry for file, look for beginning  it
-                    (when (looking-at ":")
-                      (forward-char 2)))))))))
-
-;;; Tags
-
-(magit-define-command tag (name rev)
-  "Create a new lightweight tag with the given NAME at REV.
-\('git tag NAME')."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (apply #'magit-run-git "tag" (append magit-custom-options (list name rev))))
-
-(magit-define-command annotated-tag (name rev)
-  "Start composing an annotated tag with the given NAME.
-Tag will point to the current 'HEAD'."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (magit-log-edit-set-field 'tag-name name)
-  (magit-log-edit-set-field 'tag-rev rev)
-  (magit-log-edit-set-field 'tag-options magit-custom-options)
-  (magit-pop-to-log-edit "tag"))
-
-;;; Stashing
-
-(defun magit-wash-stash ()
-  (if (search-forward-regexp "stash@{\\(.*?\\)}" (line-end-position) t)
-      (let ((stash (match-string-no-properties 0))
-            (name (match-string-no-properties 1)))
-        (delete-region (match-beginning 0) (match-end 0))
-        (goto-char (match-beginning 0))
-        (fixup-whitespace)
-        (goto-char (line-beginning-position))
-        (insert name)
-        (goto-char (line-beginning-position))
-        (magit-with-section stash 'stash
-          (magit-set-section-info stash)
-          (forward-line)))
-    (forward-line))
-  t)
-
-(defun magit-wash-stashes ()
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-stash)))
-
-(magit-define-inserter stashes ()
-  (magit-git-section 'stashes
-                     "Stashes:" 'magit-wash-stashes
-                     "stash" "list"))
-
-(magit-define-command stash (description)
-  "Create new stash of working tree and staging area named DESCRIPTION.
-Working tree and staging area revert to the current 'HEAD'.
-With prefix argument, changes in staging area are kept.
-\('git stash save [--keep-index] DESCRIPTION')"
-  (interactive "sStash description: ")
-  (apply 'magit-run-git `("stash" "save" ,@magit-custom-options "--" ,description)))
-
-(magit-define-command stash-snapshot ()
-  "Create new stash of working tree and staging area; keep changes in place.
-\('git stash save \"Snapshot...\"; git stash apply stash@{0}')"
-  (interactive)
-  (magit-with-refresh
-    (apply 'magit-run-git `("stash" "save" ,@magit-custom-options
-                   ,(format-time-string "Snapshot taken at %Y-%m-%d %H:%M:%S"
-                                       (current-time))))
-    (magit-run-git "stash" "apply" "stash@{0}")))
-
-(defvar magit-currently-shown-stash nil)
-
-(define-derived-mode magit-stash-mode magit-mode "Magit Stash"
-  "Mode for looking at a git stash.
-
-\\{magit-stash-mode-map}"
-  :group 'magit)
-
-(defvar magit-stash-buffer-name "*magit-stash*"
-  "Buffer name for displaying a stash.")
-
-(defun magit-show-stash (stash &optional scroll)
-  (when (magit-section-p stash)
-    (setq stash (magit-section-info stash)))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-stash-buffer-name))
-        (stash-id (magit-git-string "rev-list" "-1" stash)))
-    (cond ((and (equal magit-currently-shown-stash stash-id)
-                (with-current-buffer buf
-                  (> (length (buffer-string)) 1)))
-           (let ((win (get-buffer-window buf)))
-             (cond ((not win)
-                    (display-buffer buf))
-                   (scroll
-                    (with-selected-window win
-                      (funcall scroll))))))
-          (t
-           (setq magit-currently-shown-stash stash-id)
-           (display-buffer buf)
-           (with-current-buffer buf
-             (set-buffer buf)
-             (goto-char (point-min))
-             (let* ((range (cons (concat stash "^2^") stash))
-                    (magit-current-diff-range range)
-                    (args (magit-rev-range-to-git range)))
-               (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer
-                                range args)))))))
-;;; Commits
-
-(defun magit-commit-at-point (&optional nil-ok-p)
-  (let* ((section (magit-current-section))
-         (commit (if (and section
-                          (eq (magit-section-type section) 'commit))
-                     (magit-section-info section)
-                 (get-text-property (point) 'revision))))
-    (if nil-ok-p
-        commit
-      (or commit
-          (error "No commit at point")))))
-
-(defun magit-apply-commit (commit &optional docommit noerase revert)
-  (let* ((parent-id (magit-choose-parent-id commit "cherry-pick"))
-         (success (magit-run* `(,magit-git-executable
-                                ,@magit-git-standard-options
-                                ,(if revert "revert" "cherry-pick")
-                                ,@(if parent-id
-                                      (list "-m" (number-to-string parent-id)))
-                                ,@(if (not docommit) (list "--no-commit"))
-                                ,commit)
-                              nil noerase)))
-    (when (and (not docommit) success)
-      (cond (revert
-             (magit-log-edit-append
-              (magit-format-commit commit "Reverting \"%s\"")))
-            (t
-             (magit-log-edit-append
-              (magit-format-commit commit "%s%n%n%b"))
-             (magit-log-edit-set-field
-              'author
-              (magit-format-commit commit "%an <%ae>, %ai")))))
-    success))
-
-(defun magit-apply-item ()
-  (interactive)
-  (magit-section-action (item info "apply")
-    ((pending commit)
-     (magit-apply-commit info)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info))
-    ((unstaged *)
-     (error "Change is already in your working tree"))
-    ((staged *)
-     (error "Change is already in your working tree"))
-    ((hunk)
-     (magit-apply-hunk-item item))
-    ((diff)
-     (magit-apply-diff-item item))
-    ((stash)
-     (magit-run-git "stash" "apply" info))))
-
-(defun magit-cherry-pick-item ()
-  (interactive)
-  (magit-section-action (item info "cherry-pick")
-    ((pending commit)
-     (magit-apply-commit info t)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info t))
-    ((stash)
-     (magit-run-git "stash" "pop" info))))
-
-(defmacro magit-with-revert-confirmation (&rest body)
-  `(when (or (not magit-revert-item-confirm)
-             (yes-or-no-p "Really revert this item? "))
-     ,@body))
-
-(defun magit-revert-item ()
-  (interactive)
-  (magit-section-action (item info "revert")
-    ((pending commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)
-      (magit-rewrite-set-commit-property info 'used nil)))
-    ((commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)))
-    ;; Reverting unstaged changes cannot be undone
-    ((unstaged *)
-     (magit-discard-item))
-    ((hunk)
-     (magit-with-revert-confirmation
-      (magit-apply-hunk-item-reverse item)))
-    ((diff)
-     (magit-with-revert-confirmation
-      (magit-apply-diff-item item "--reverse")))))
-
-(defun magit-log-show-more-entries (&optional arg)
-  "Grow the number of log entries shown.
-
-With no prefix optional ARG, show twice as many log entries.
-With a numerical prefix ARG, add this number to the number of shown log entries.
-With a non numeric prefix ARG, show all entries"
-  (interactive "P")
-  (make-local-variable 'magit-log-cutoff-length)
-  (cond
-   ((numberp arg)
-    (setq magit-log-cutoff-length (+ magit-log-cutoff-length arg)))
-   (arg
-    (setq magit-log-cutoff-length magit-log-infinite-length))
-   (t (setq magit-log-cutoff-length (* magit-log-cutoff-length 2))))
-  (let ((old-point (point)))
-    (magit-refresh)
-    (goto-char old-point)))
-
-(defun magit-refresh-log-buffer (range style args)
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range "Commits")
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             ,@args
-             "--"))))
-
-(define-derived-mode magit-log-mode magit-mode "Magit Log"
-  "Mode for looking at git log.
-
-\\{magit-log-mode-map}"
-  :group 'magit)
-
-(defvar magit-log-buffer-name "*magit-log*"
-  "Buffer name for display of log entries.")
-
-(magit-define-command log-ranged ()
-  (interactive)
-  (magit-log t))
-(define-obsolete-function-alias 'magit-display-log-ranged 'magit-log-ranged)
-
-(magit-define-command log (&optional ask-for-range &rest extra-args)
-  (interactive)
-  (let* ((log-range (if ask-for-range
-                        (magit-read-rev-range "Log" "HEAD")
-                      "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (nconc (list (magit-rev-range-to-git log-range))
-                      magit-custom-options
-                      extra-args)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer log-range
-                     'oneline args)))
-
-(define-obsolete-function-alias 'magit-display-log 'magit-log)
-
-(magit-define-command log-long-ranged ()
-  (interactive)
-  (magit-log-long t))
-
-(magit-define-command log-long (&optional ranged)
-  (interactive)
-  (let* ((range (if ranged
-                    (magit-read-rev-range "Long log" "HEAD")
-                  "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (append (list (magit-rev-range-to-git range))
-                       magit-custom-options)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer range
-                     'long args)))
-
-;;; Reflog
-
-(defvar magit-reflog-head nil
-  "The HEAD of the reflog in the current buffer.
-This is only non-nil in reflog buffers.")
-(make-variable-buffer-local 'magit-reflog-head)
-
-(defun magit-refresh-reflog-buffer (head args)
-  (setq magit-reflog-head head)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section
-           'reflog (format "Local history of head %s" head) 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    "--walk-reflogs"
-                    (format "--max-count=%s" magit-log-cutoff-length)
-                    args)))))
-
-(define-derived-mode magit-reflog-mode magit-log-mode "Magit Reflog"
-  "Mode for looking at git reflog.
-
-\\{magit-reflog-mode-map}"
-  :group 'magit)
-
-(magit-define-command reflog (&optional ask-for-range)
-  (interactive)
-  (let ((at (or (if ask-for-range
-                    (magit-read-rev "Reflog of" (or (magit-guess-branch) "HEAD")))
-                "HEAD")))
-    (let* ((topdir (magit-get-top-dir default-directory))
-           (args (magit-rev-to-git at)))
-      (magit-buffer-switch "*magit-reflog*")
-      (magit-mode-init topdir 'magit-reflog-mode
-                       #'magit-refresh-reflog-buffer at args))))
-
-(magit-define-command reflog-ranged ()
-  (interactive)
-  (magit-reflog t))
-
-;;; Diffing
-
-(defvar magit-ediff-buffers nil
-  "List of buffers that may be killed by `magit-ediff-restore'.")
-
-(defvar magit-ediff-windows nil
-  "The window configuration that will be restored when Ediff is finished.")
-
-(defun magit-ediff()
-  "View the current DIFF section in ediff."
-  (interactive)
-  (let ((diff (magit-current-section)))
-    (when (magit-section-hidden diff)
-      ;; Range is not set until the first time the diff is visible.
-      ;; This somewhat hackish code makes sure it's been visible at least once.
-      (magit-toggle-section)
-      (magit-toggle-section)
-      (setq diff (magit-current-section)))
-    (if (eq 'hunk (magit-section-type diff))
-        (setq diff (magit-section-parent diff)))
-    (unless (eq 'diff (magit-section-type diff))
-      (error "No diff at this location"))
-    (let* ((type (magit-diff-item-kind diff))
-           (file1 (magit-diff-item-file diff))
-           (file2 (magit-diff-item-file2 diff))
-           (range (magit-diff-item-range diff)))
-      (cond
-       ((memq type '(new deleted typechange))
-        (message "Why ediff a %s file?" type))
-       ((and (eq type 'unmerged)
-             (eq (cdr range) 'working))
-        (magit-interactive-resolve file1))
-       ((consp (car range))
-        (magit-ediff* (magit-show (caar range) file2)
-                      (magit-show (cdar range) file2)
-                      (magit-show (cdr range) file1)))
-       (t
-        (magit-ediff* (magit-show (car range) file2)
-                      (magit-show (cdr range) file1)))))))
-
-(defun magit-ediff* (a b &optional c)
-  (setq magit-ediff-buffers (list a b c))
-  (setq magit-ediff-windows (current-window-configuration))
-  (add-hook 'ediff-quit-hook 'magit-ediff-restore 'append)
-  (if c
-      (ediff-buffers3 a b c)
-    (ediff-buffers a b)))
-
-(defun magit-ediff-restore()
-  "Kill any buffers in `magit-ediff-buffers' that are not visiting files and
-restore the window state that was saved before ediff was called."
-  (dolist (buffer magit-ediff-buffers)
-    (if (and (null (buffer-file-name buffer))
-             (buffer-live-p buffer))
-        (kill-buffer buffer)))
-  (setq magit-ediff-buffers nil)
-  (set-window-configuration magit-ediff-windows)
-  (remove-hook 'ediff-quit-hook 'magit-ediff-restore))
-
-(defun magit-refresh-diff-buffer (range args)
-  (let ((magit-current-diff-range (cond
-                                   ((stringp range)
-                                    (cons range 'working))
-                                   ((null (cdr range))
-                                    (cons (car range) 'working))
-                                   (t
-                                    range))))
-    (setq magit-current-range range)
-    (magit-create-buffer-sections
-      (magit-git-section 'diffbuf
-                         (magit-rev-range-describe range "Changes")
-                         'magit-wash-diffs
-                         "diff" (magit-diff-U-arg) args "--"))))
-
-(define-derived-mode magit-diff-mode magit-mode "Magit Diff"
-  "Mode for looking at a git diff.
-
-\\{magit-diff-mode-map}"
-  :group 'magit)
-
-(magit-define-command diff (range)
-  (interactive (list (magit-read-rev-range "Diff")))
-  (if range
-      (let* ((dir default-directory)
-             (args (magit-rev-range-to-git range))
-             (buf (get-buffer-create "*magit-diff*")))
-        (display-buffer buf)
-        (with-current-buffer buf
-          (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer range args)))))
-
-(magit-define-command diff-working-tree (rev)
-  (interactive (list (magit-read-rev "Diff with" (magit-default-rev))))
-  (magit-diff (or rev "HEAD")))
-
-(defun magit-diff-with-mark ()
-  (interactive)
-  (magit-diff (cons (magit-marked-commit)
-                    (magit-commit-at-point))))
-
-;;; Wazzup
-
-(defvar magit-wazzup-head nil
-  "The integration head for the current wazzup buffer.
-This is only non-nil in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-head)
-
-(defvar magit-wazzup-all-p nil
-  "Non-nil if the current wazzup buffer displays excluded branches.
-This is only meaningful in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-all-p)
-
-(defun magit-wazzup-toggle-ignore (branch edit)
-  (let ((ignore-file (concat (magit-git-dir) "info/wazzup-exclude")))
-    (if edit
-        (setq branch (read-string "Branch to ignore for wazzup: " branch)))
-    (let ((ignored (magit-file-lines ignore-file)))
-      (cond ((member branch ignored)
-             (when (or (not edit)
-                       (y-or-n-p "Branch %s is already ignored.  Unignore? "))
-               (setq ignored (delete branch ignored))))
-            (t
-             (setq ignored (append ignored (list branch)))))
-      (magit-write-file-lines ignore-file ignored)
-      (magit-need-refresh))))
-
-(defun magit-refresh-wazzup-buffer (head all)
-  (setq magit-wazzup-head head)
-  (setq magit-wazzup-all-p all)
-  (let ((branch-desc (or head "(detached) HEAD")))
-    (unless head (setq head "HEAD"))
-    (magit-create-buffer-sections
-      (magit-with-section 'wazzupbuf nil
-        (insert (format "Wazzup, %s\n\n" branch-desc))
-        (let* ((excluded (magit-file-lines (concat (magit-git-dir) "info/wazzup-exclude")))
-               (all-branches (magit-list-interesting-refs))
-               (branches (if all all-branches
-                           (delq nil (mapcar
-                                      (lambda (b)
-                                        (and (not
-                                              (member (cdr b) excluded))
-                                             b))
-                                      all-branches))))
-               (reported (make-hash-table :test #'equal)))
-          (dolist (branch branches)
-            (let* ((name (car branch))
-                   (ref (cdr branch))
-                   (hash (magit-rev-parse ref))
-                   (reported-branch (gethash hash reported)))
-              (unless (or (and reported-branch
-                               (string= (file-name-nondirectory ref)
-                                        reported-branch))
-                          (not (magit-git-string "merge-base" head ref)))
-                (puthash hash (file-name-nondirectory ref) reported)
-                (let* ((n (length (magit-git-lines "log" "--pretty=oneline"
-                                                   (concat head ".." ref))))
-                       (section
-                        (let ((magit-section-hidden-default t))
-                          (magit-git-section
-                           (cons ref 'wazzup)
-                           (format "%s unmerged commits in %s%s"
-                                   n name
-                                   (if (member ref excluded)
-                                       " (normally ignored)"
-                                     ""))
-                           'magit-wash-log
-                           "log"
-                           (format "--max-count=%s" magit-log-cutoff-length)
-                           "--abbrev-commit"
-                           (format "--abbrev=%s" magit-sha1-abbrev-length)
-                           "--graph"
-                           "--pretty=oneline"
-                           (format "%s..%s" head ref)
-                           "--"))))
-                  (magit-set-section-info ref section))))))))))
-
-(define-derived-mode magit-wazzup-mode magit-mode "Magit Wazzup"
-  "Mode for looking at commits that could be merged from other branches.
-
-\\{magit-wazzup-mode-map}"
-  :group 'magit)
-
-(defun magit-wazzup (&optional all)
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-branch (magit-get-current-branch)))
-    (magit-buffer-switch "*magit-wazzup*")
-    (magit-mode-init topdir 'magit-wazzup-mode
-                     #'magit-refresh-wazzup-buffer
-                     current-branch all)))
-
-(defun magit-filename (filename)
-  "Return the path of FILENAME relative to its git repository.
-
-If FILENAME is absolute, return a path relative to the git
-repository containing it. Otherwise, return a path relative to
-the current git repository."
-  (let ((topdir (expand-file-name
-                 (magit-get-top-dir (or (file-name-directory filename)
-                                        default-directory))))
-        (file (file-truename filename)))
-    (when (and (not (string= topdir ""))
-               ;; FILE must start with the git repository path
-               (zerop (string-match-p (concat "\\`" topdir) file)))
-      (substring file (length topdir)))))
-
-;; This variable is used to keep track of the current file in the
-;; *magit-log* buffer when this one is dedicated to showing the log of
-;; just 1 file.
-(defvar magit-file-log-file nil)
-(make-variable-buffer-local 'magit-file-log-file)
-
-(defun magit-refresh-file-log-buffer (file range style)
-  "Refresh the current file-log buffer by calling git.
-
-FILE is the path of the file whose log must be displayed.
-
-`magit-current-range' will be set to the value of RANGE.
-
-STYLE controls the display. It is either `'long',  `'oneline', or something else.
- "
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (setq magit-file-log-file file)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range (format "Commits for file %s" file))
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             "--"
-             ,file))))
-
-(defun magit-file-log (&optional all)
-  "Display the log for the currently visited file or another one.
-
-With a prefix argument or if no file is currently visited, ask
-for the file whose log must be displayed."
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-file (magit-filename
-                       (if (or current-prefix-arg (not buffer-file-name))
-                           (magit-read-file-from-rev (magit-get-current-branch))
-                        buffer-file-name)))
-        (range "HEAD"))
-    (magit-buffer-switch "*magit-log*")
-    (magit-mode-init topdir 'magit-log-mode
-                     #'magit-refresh-file-log-buffer
-                     current-file range 'oneline)))
-
-(defun magit-show-file-revision ()
-  "Open a new buffer showing the current file in the revision at point."
-  (interactive)
-  (flet ((magit-show-file-from-diff (item)
-                                    (switch-to-buffer-other-window
-                                     (magit-show (cdr (magit-diff-item-range item))
-                                                 (magit-diff-item-file item)))))
-    (magit-section-action (item info "show")
-      ((commit)
-       (let ((current-file (or magit-file-log-file
-                               (magit-read-file-from-rev info))))
-         (switch-to-buffer-other-window
-          (magit-show info current-file))))
-      ((hunk) (magit-show-file-from-diff (magit-hunk-item-diff item)))
-      ((diff) (magit-show-file-from-diff item)))))
-
-;;; Miscellaneous
-
-(defun magit-ignore-modifiable-file (file edit)
-  "Prompt the user for the filename to be added to git ignore.
-\\<minibuffer-local-map>
-The minibuffer's future history (accessible with \\[next-history-element])
-contains predefined values (such as wildcards) that might
-be of interest.
-The history and default value are derived from the filename FILE.
-If EDIT argument is negative, the prompt proposes wildcard by default.
-"
-  (let* ((just-extension (concat "*." (file-name-extension file)))
-         (full-extension (concat (file-name-directory file) just-extension))
-         (just-file (file-name-nondirectory file))
-         ;; change the order in history depending on the negativity of
-         ;; EDIT.
-         (history (if (< (prefix-numeric-value edit) 0)
-                      (list full-extension just-extension file just-file)
-                    (list file full-extension just-extension just-file))))
-    (read-string
-     (format "File to ignore [%s]: " (car history))
-     nil nil history)))
-
-(defun magit-ignore-file (file edit local)
-  "Add FILE to the list of files to ignore.
-\\<minibuffer-local-map>
-If EDIT is non-`nil', prompt the user for the filename to
-be added to git ignore. In this case, the minibuffer's
-future history (accessible with \\[next-history-element]) contains predefined
-values (such as wildcards) that might be of interest.
-
-If LOCAL is nil, the `.gitignore' file is updated.
-Otherwise, it is `.git/info/exclude'."
-  (let* ((local-ignore-dir (concat (magit-git-dir) "info/"))
-         (ignore-file (if local
-                          (concat local-ignore-dir "exclude")
-                        ".gitignore")))
-    (if edit
-      (setq file (magit-ignore-modifiable-file file edit)))
-    (if (and local (not (file-exists-p local-ignore-dir)))
-        (make-directory local-ignore-dir t))
-    (with-temp-buffer
-      (when (file-exists-p ignore-file)
-        (insert-file-contents ignore-file))
-      (goto-char (point-max))
-      (unless (bolp)
-        (insert "\n"))
-      (insert file "\n")
-      (write-region nil nil ignore-file))
-    (magit-need-refresh)))
-
-(defun magit-ignore-item ()
-  "Add FILE to the `.gitignore' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-\(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg nil))
-    ((wazzup)
-     (magit-wazzup-toggle-ignore info current-prefix-arg))))
-
-(defun magit-ignore-item-locally ()
-  "Add FILE to the `.git/info/exclude' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg t))))
-
-(defun magit-discard-diff (diff stagedp)
-  (let ((kind (magit-diff-item-kind diff))
-        (file (magit-diff-item-file diff)))
-    (cond ((eq kind 'deleted)
-           (when (yes-or-no-p (format "Resurrect %s? " file))
-             (magit-run-git "reset" "-q" "--" file)
-             (magit-run-git "checkout" "--" file)))
-          ((eq kind 'new)
-           (if (yes-or-no-p (format "Delete %s? " file))
-               (magit-run-git "rm" "-f" "--" file)))
-          (t
-           (if (yes-or-no-p (format "Discard changes to %s? " file))
-               (if stagedp
-                   (magit-run-git "checkout" "HEAD" "--" file)
-                 (magit-run-git "checkout" "--" file)))))))
-
-(defun magit-discard-item ()
-  (interactive)
-  (magit-section-action (item info "discard")
-    ((untracked file)
-     (when (yes-or-no-p (format "Delete %s? " info))
-       (if (and (file-directory-p info)
-                (not (file-symlink-p info)))
-           (magit-delete-directory info 'recursive)
-         (delete-file info))
-       (magit-refresh-buffer)))
-    ((untracked)
-     (if (yes-or-no-p "Delete all untracked files and directories? ")
-         (magit-run-git "clean" "-df")))
-    ((unstaged diff hunk)
-     (when (yes-or-no-p (if (magit-use-region-p)
-                            "Discard changes in region? "
-                          "Discard hunk? "))
-       (magit-apply-hunk-item-reverse item)))
-    ((staged diff hunk)
-     (if (magit-file-uptodate-p (magit-diff-item-file
-                                 (magit-hunk-item-diff item)))
-         (when (yes-or-no-p (if (magit-use-region-p)
-                                "Discard changes in region? "
-                              "Discard hunk? "))
-           (magit-apply-hunk-item-reverse item "--index"))
-       (error "Can't discard this hunk.  Please unstage it first")))
-    ((unstaged diff)
-     (magit-discard-diff item nil))
-    ((staged diff)
-     (if (magit-file-uptodate-p (magit-diff-item-file item))
-         (magit-discard-diff item t)
-       (error "Can't discard staged changes to this file.  Please unstage it first")))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((hunk)
-     (error "Can't discard this hunk"))
-    ((diff)
-     (error "Can't discard this diff"))
-    ((stash)
-     (when (yes-or-no-p "Discard stash? ")
-       (magit-run-git "stash" "drop" info)))
-    ((branch)
-     (when (yes-or-no-p (if current-prefix-arg
-                            "Force delete branch?"
-                          "Delete branch? "))
-       (magit-delete-branch info current-prefix-arg)))
-    ((remote)
-     (when (yes-or-no-p "Remove remote? ")
-       (magit-remove-remote info)))))
-
-(defun magit-move-item ()
-  (interactive)
-  (magit-section-action (item info "move")
-    ((branch)
-     (call-interactively 'magit-move-branch))
-    ((remote)
-     (call-interactively 'magit-rename-remote))))
-
-(defmacro magit-visiting-file-item (&rest body)
-  `(let ((marker (save-window-excursion
-                   (magit-visit-file-item)
-                   (set-marker (make-marker) (point)))))
-     (save-excursion
-       (with-current-buffer (marker-buffer marker)
-         (goto-char marker)
-         ,@body))))
-
-(defun magit-add-change-log-entry-no-option (&optional other-window)
-  "Add a change log entry for current change.
-With a prefix argument, edit in other window.
-The name of the change log file is set by variable change-log-default-name."
-  (interactive "P")
-  (if other-window
-      (magit-visiting-file-item (add-change-log-entry-other-window))
-    (magit-visiting-file-item (add-change-log-entry))))
-
-(defun magit-add-change-log-entry-other-window ()
-  (interactive)
-  (magit-visiting-file-item (call-interactively 'add-change-log-entry-other-window)))
-
-(eval-after-load 'dired-x
-  '(defun magit-dired-jump (&optional other-window)
-    "Visit current item.
-With a prefix argument, visit in other window."
-    (interactive "P")
-    (require 'dired-x)
-    (magit-section-action (item info "dired-jump")
-      ((untracked file)
-       (dired-jump other-window (file-truename info)))
-      ((diff)
-       (dired-jump other-window (file-truename (magit-diff-item-file item))))
-      ((hunk)
-       (dired-jump other-window
-                   (file-truename (magit-diff-item-file
-                                   (magit-hunk-item-diff item))))))))
-
-(defun magit-visit-file-item (&optional other-window)
-  "Visit current file associated with item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit-file")
-    ((untracked file)
-     (funcall
-      (if other-window 'find-file-other-window 'find-file)
-      info))
-    ((diff)
-     (let ((file (magit-diff-item-file item)))
-       (cond ((not (file-exists-p file))
-              (error "Can't visit deleted file: %s" file))
-             ((file-directory-p file)
-              (magit-status file))
-             (t
-              (funcall
-               (if other-window 'find-file-other-window 'find-file)
-               file)))))
-    ((hunk)
-     (let ((file (magit-diff-item-file (magit-hunk-item-diff item)))
-           (line (magit-hunk-item-target-line item)))
-       (if (not (file-exists-p file))
-           (error "Can't visit deleted file: %s" file))
-       (funcall
-        (if other-window 'find-file-other-window 'find-file)
-        file)
-       (goto-char (point-min))
-       (forward-line (1- line))))))
-
-(defun magit-visit-item (&optional other-window)
-  "Visit current item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit")
-    ((untracked file)
-     (call-interactively 'magit-visit-file-item))
-    ((diff)
-     (call-interactively 'magit-visit-file-item))
-    ((hunk)
-     (call-interactively 'magit-visit-file-item))
-    ((commit)
-     (magit-show-commit info nil nil 'select))
-    ((stash)
-     (magit-show-stash info)
-     (pop-to-buffer magit-stash-buffer-name))
-    ((branch)
-     (magit-checkout info))
-    ((longer)
-     (magit-log-show-more-entries ()))))
-
-(defun magit-show-item-or-scroll-up ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-up))
-    ((stash)
-     (magit-show-stash info #'scroll-up))
-    (t
-     (scroll-up))))
-
-(defun magit-show-item-or-scroll-down ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-down))
-    ((stash)
-     (magit-show-stash info #'scroll-down))
-    (t
-     (scroll-down))))
-
-(defun magit-mark-item (&optional unmark)
-  (interactive "P")
-  (if unmark
-      (magit-set-marked-commit nil)
-    (magit-section-action (item info "mark")
-      ((commit)
-       (magit-set-marked-commit (if (eq magit-marked-commit info)
-                                    nil
-                                  info))))))
-
-(defun magit-describe-item ()
-  (interactive)
-  (let ((section (magit-current-section)))
-    (message "Section: %s %s-%s %S %S %S"
-             (magit-section-type section)
-             (magit-section-beginning section)
-             (magit-section-end section)
-             (magit-section-title section)
-             (magit-section-info section)
-             (magit-section-context-type section))))
-
-(defun magit-copy-item-as-kill ()
-  "Copy sha1 of commit at point into kill ring."
-  (interactive)
-  (magit-section-action (item info "copy")
-    ((commit)
-     (kill-new info)
-     (message "%s" info))))
-
-(eval-when-compile (require 'server))
-
-(defun magit-server-running-p ()
-  "Test whether server is running (works with < 23 as well).
-
-Return values:
-  nil              the server is definitely not running.
-  t                the server seems to be running.
-  something else   we cannot determine whether it's running without using
-                   commands which may have to wait for a long time."
-  (require 'server)
-  (if (functionp 'server-running-p)
-      (server-running-p)
-    (condition-case nil
-        (if server-use-tcp
-            (with-temp-buffer
-              (insert-file-contents-literally (expand-file-name server-name server-auth-dir))
-              (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
-                       (assq 'comm
-                             (process-attributes
-                              (string-to-number (match-string 1))))
-                       t)
-                  :other))
-          (delete-process
-           (make-network-process
-            :name "server-client-test" :family 'local :server nil :noquery t
-            :service (expand-file-name server-name server-socket-dir)))
-          t)
-      (file-error nil))))
-
-(defun magit-interactive-rebase ()
-  "Start a git rebase -i session, old school-style."
-  (interactive)
-  (unless (magit-server-running-p)
-    (server-start))
-  (let* ((section (get-text-property (point) 'magit-section))
-         (commit (and (member 'commit (magit-section-context-type section))
-                      (magit-section-info section)))
-         (old-editor (getenv "GIT_EDITOR")))
-    (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
-                                 " -s " server-name))
-    (unwind-protect
-        (magit-run-git-async "rebase" "-i"
-                             (or (and commit (concat commit "^"))
-                                 (magit-read-rev "Interactively rebase to" (magit-guess-branch))))
-      (if old-editor
-          (setenv "GIT_EDITOR" old-editor)))))
-
-(define-derived-mode magit-branch-manager-mode magit-mode "Magit Branch"
-  "Magit Branches")
-
-(defun magit-quit-window (&optional kill-buffer)
-  "Bury the buffer and delete its window.  With a prefix argument, kill the
-buffer instead."
-  (interactive "P")
-  (quit-window kill-buffer (selected-window)))
-
-(defun magit--branch-name-at-point ()
-  "Get the branch name in the line at point."
-  (let ((branch (magit-section-info (magit-current-section))))
-    (or branch (error "No branch at point"))))
-
-(defun magit--branches-for-remote-repo (remote)
-  "Return a list of remote branch names for REMOTE.
-These are the branch names with the remote name stripped."
-  (remq nil
-        (mapcar (lambda (line)
-                  (save-match-data
-                    (if (and (not (string-match-p " -> " line))
-                             (string-match (concat "^ +" remote "/\\([^ $]+\\)")
-                                           line))
-                        (match-string 1 line))))
-                (magit-git-lines "branch" "-r"))))
-
-(defvar magit-branches-buffer-name "*magit-branches*")
-
-(defun magit--is-branch-at-point-remote ()
-  "Return non-nil if the branch at point is a remote tracking branch"
-  (magit-remote-part-of-branch (magit--branch-name-at-point)))
-
-(defun magit-remote-part-of-branch (branch)
-  (when (string-match-p "^\\(?:refs/\\)?remotes\\/" branch)
-    (loop for remote in (magit-git-lines "remote")
-          when (string-match-p (format "^\\(?:refs/\\)?remotes\\/%s\\/" (regexp-quote remote)) branch) return remote)))
-
-(defun magit-branch-no-remote (branch)
-  (let ((remote (magit-remote-part-of-branch branch)))
-    (if remote
-        (progn
-          ;; This has to match if remote is non-nil
-          (assert (string-match (format "^\\(?:refs/\\)?remotes\\/%s\\/\\(.*\\)" (regexp-quote remote)) branch)
-                  'show-args "Unexpected string-match failure: %s %s")
-          (match-string 1 branch))
-      branch)))
-
-(defun magit-wash-branch-line (&optional remote-name)
-  (looking-at (concat
-               "^\\([ *] \\)"                 ; 1: current branch marker
-               "\\(.+?\\) +"                  ; 2: branch name
-
-               "\\(?:"
-
-               "\\([0-9a-fA-F]+\\)"           ; 3: sha1
-               " "
-               "\\(?:\\["
-               "\\([^:\n]+?\\)"               ; 4: tracking (non-greedy + to avoid matching \n)
-               "\\(?:: \\)?"
-               "\\(?:ahead \\([0-9]+\\)\\)?"  ; 5: ahead
-               "\\(?:, \\)?"
-               "\\(?:behind \\([0-9]+\\)\\)?" ; 6: behind
-               "\\] \\)?"
-               "\\(?:.*\\)"                   ; message
-
-               "\\|"                          ; or
-
-               "-> "                          ; the pointer to
-               "\\(.+\\)"                     ; 7: a ref
-
-               "\\)\n"))
-
-  (let* ((current-string (match-string 1))
-         (branch         (match-string 2))
-         (sha1           (match-string 3))
-         (tracking       (match-string 4))
-         (ahead          (match-string 5))
-         (behind         (match-string 6))
-         (other-ref      (match-string 7))
-         (current (string-match-p "^\\*" current-string)))
-
-    ; the current line is deleted before being reconstructed
-    (delete-region (point)
-                   (line-beginning-position 2))
-
-    (magit-with-section branch 'branch
-      (magit-set-section-info branch)
-      (insert-before-markers
-       ; sha1
-       (propertize (or sha1
-                       (make-string magit-sha1-abbrev-length ? ))
-                   'face 'magit-log-sha1)
-       " "
-       ; current marker
-       (if current
-           "# "
-         "  ")
-       ; branch name
-       (apply 'propertize (magit-branch-no-remote branch)
-              (if current
-                  '(face magit-branch)))
-       ; other ref that this branch is pointing to
-       (if other-ref
-           (concat " -> " (substring other-ref (+ 1 (length remote-name))))
-         "")
-       ; tracking information
-       (if (and tracking
-                (equal (magit-remote-branch-for branch t)
-                       (concat "refs/remotes/" tracking)))
-           (concat " ["
-                   ; getting rid of the tracking branch name if it is the same as the branch name
-                   (let* ((tracking-remote (magit-get "branch" branch "remote"))
-                          (tracking-branch (substring tracking (+ 1 (length tracking-remote)))))
-                     (propertize (if (string= branch tracking-branch)
-                                     (concat "@ " tracking-remote)
-                                   (concat tracking-branch " @ " tracking-remote))
-                                 'face 'magit-log-head-label-remote))
-                   ; ahead/behind information
-                   (if (or ahead
-                           behind)
-                       ": "
-                     "")
-                   (if ahead
-                       (concat "ahead "
-                               (propertize ahead
-                                           'face (if current
-                                                     'magit-branch))
-                               (if behind
-                                   ", "
-                                 ""))
-                     "")
-                   (if behind
-                       (concat "behind "
-                               (propertize behind
-                                           'face 'magit-log-head-label-remote))
-                     "")
-                   "]")
-         "")
-       "\n"))))
-
-(defun magit-wash-remote-branches-group (group)
-  (let* ((remote-name (first group))
-         (url (magit-get "remote" remote-name "url"))
-         (push-url (magit-get "remote" remote-name "pushurl"))
-         (urls (concat url (if push-url
-                               (concat ", "push-url)
-                             "")))
-         (marker (second group)))
-
-    (magit-with-section (concat "remote:" remote-name) 'remote
-      (magit-set-section-info remote-name)
-      (insert-before-markers (propertize (format "%s (%s):" remote-name urls) 'face 'magit-section-title) "\n")
-      (magit-wash-branches-between-point-and-marker marker remote-name))
-    (insert-before-markers "\n")))
-
-(defun magit-wash-branches-between-point-and-marker (marker &optional remote-name)
-  (save-restriction
-    (narrow-to-region (point) marker)
-    (magit-wash-sequence
-     (if remote-name
-         (apply-partially 'magit-wash-branch-line remote-name)
-       #'magit-wash-branch-line))))
-
-(defun magit-wash-branches ()
-         ; get the names of the remotes
-  (let* ((remotes (magit-git-lines "remote"))
-         ; get the location of remotes in the buffer
-         (markers
-          (append (mapcar (lambda (remote)
-                            (save-excursion
-                              (when (search-forward-regexp
-                                     (concat "^  remotes\\/" remote) nil t)
-                                (beginning-of-line)
-                                (point-marker))))
-                          remotes)
-                  (list (save-excursion
-                          (goto-char (point-max))
-                          (point-marker)))))
-         ; list of remote elements to display in the buffer
-         (remote-groups (loop for remote in remotes
-                              for end-markers on (cdr markers)
-                              for marker = (loop for x in end-markers thereis x)
-                              collect (list remote marker))))
-
-    ; actual displaying of information
-    (magit-with-section "local" nil
-      (insert-before-markers (propertize "Local:" 'face 'magit-section-title) "\n")
-      (magit-set-section-info ".")
-      (magit-wash-branches-between-point-and-marker
-       (loop for x in markers thereis x)))
-
-    (insert-before-markers "\n")
-
-    (mapc 'magit-wash-remote-branches-group remote-groups)
-
-    ; make sure markers point to nil so that they can be garbage collected
-    (mapc (lambda (marker)
-            (when marker
-             (set-marker marker nil)))
-          markers)))
-
-(defun magit-refresh-branch-manager ()
-  (magit-create-buffer-sections
-    (magit-git-section "branches" nil 'magit-wash-branches
-                       "branch"
-                       "-vva"
-                       (format "--abbrev=%s" magit-sha1-abbrev-length))))
-
-(magit-define-command branch-manager ()
-  (interactive)
-  (let ((topdir (magit-get-top-dir default-directory)))
-    (magit-buffer-switch magit-branches-buffer-name)
-    (magit-mode-init topdir 'magit-branch-manager-mode #'magit-refresh-branch-manager)))
-
-(defun magit-change-what-branch-tracks ()
-  "Change which remote branch the current branch tracks."
-  (interactive)
-  (if (magit--is-branch-at-point-remote)
-      (error "Cannot modify a remote branch"))
-  (let* ((local-branch (magit--branch-name-at-point))
-         (new-tracked (magit-read-rev  "Change tracked branch to"
-                                       nil
-                                       (lambda (ref)
-                                         (not (string-match-p "refs/remotes/"
-                                                              ref)))))
-         new-remote new-branch)
-    (unless (string= (or new-tracked "") "")
-      (cond (;; Match refs that are unknown in the local repository if
-             ;; `magit-remote-ref-format' is set to
-             ;; `name-then-remote'. Can be useful if you want to
-             ;; create a new branch in a remote repository.
-             (string-match "^\\([^ ]+\\) +(\\(.+\\))$" ; 1: branch name; 2: remote name
-                           new-tracked)
-             (setq new-remote (match-string 2 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 1 new-tracked))))
-            ((string-match "^\\(?:refs/remotes/\\)?\\([^/]+\\)/\\(.+\\)" ; 1: remote name; 2: branch name
-                           new-tracked)
-             (setq new-remote (match-string 1 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 2 new-tracked))))
-            (t (error "Cannot parse the remote and branch name"))))
-    (magit-set new-remote "branch" local-branch "remote")
-    (magit-set new-branch "branch" local-branch "merge")
-    (magit-branch-manager)
-    (if (string= (magit-get-current-branch) local-branch)
-        (magit-refresh-buffer (magit-find-status-buffer default-directory)))))
-
-(defvar magit-ediff-file)
-
-(defun magit-interactive-resolve (file)
-  (require 'ediff)
-  (let ((merge-status (magit-git-string "ls-files" "-u" "--" file))
-        (base-buffer (generate-new-buffer (concat file ".base")))
-        (our-buffer (generate-new-buffer (concat file ".current")))
-        (their-buffer (generate-new-buffer (concat file ".merged")))
-        (windows (current-window-configuration)))
-    (if (null merge-status)
-        (error "Cannot resolve %s" file))
-    (with-current-buffer base-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:" file))))))
-    (with-current-buffer our-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    (with-current-buffer their-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    ;; We have now created the 3 buffer with ours, theirs and the ancestor files
-    (with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer)
-      (make-local-variable 'magit-ediff-file)
-      (setq magit-ediff-file file)
-      (make-local-variable 'magit-ediff-windows)
-      (setq magit-ediff-windows windows)
-      (make-local-variable 'ediff-quit-hook)
-      (add-hook 'ediff-quit-hook
-                (lambda ()
-                  (let ((buffer-A ediff-buffer-A)
-                        (buffer-B ediff-buffer-B)
-                        (buffer-C ediff-buffer-C)
-                        (buffer-Ancestor ediff-ancestor-buffer)
-                        (file magit-ediff-file)
-                        (file-buffer)
-                        (windows magit-ediff-windows))
-                    (ediff-cleanup-mess)
-                    (find-file file)
-                    (setq file-buffer (current-buffer))
-                    (erase-buffer)
-                    (insert-buffer-substring buffer-C)
-                    (kill-buffer buffer-A)
-                    (kill-buffer buffer-B)
-                    (kill-buffer buffer-C)
-                    (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor))
-                    (set-window-configuration windows)
-                    (magit-save-some-buffers
-                     "Conflict resolution finished; you may save the buffer"
-                     (lambda () (eq (current-buffer) file-buffer)))))))))
-
-(defun magit-interactive-resolve-item ()
-  (interactive)
-  (magit-section-action (item info "resolv")
-    ((diff)
-     (magit-interactive-resolve (cadr info)))))
-
-(defun magit-submodule-update (&optional init)
-  "Update the submodule of the current git repository
-
-With a prefix arg, do a submodule update --init"
-  (interactive "P")
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (apply #'magit-run-git-async "submodule" "update" (if init '("--init") ()))))
-
-(defun magit-submodule-update-init ()
-  "Update and init the submodule of the current git repository."
-  (interactive)
-  (magit-submodule-update t))
-
-(defun magit-submodule-init ()
-  "Initialize the submodules"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "init")))
-
-(defun magit-submodule-sync ()
-  "Synchronizes submodules' remote URL configuration"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "sync")))
-
-(defun magit-run-git-gui ()
-  "Run `git gui' for the current git repository"
-  (interactive)
-  (let* ((default-directory (magit-get-top-dir default-directory)))
-    (magit-start-process "Git Gui" nil magit-git-executable "gui")))
-
-(defun magit-run-gitk ()
-  "Run `gitk --all' for the current git repository"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (cond
-     ((eq system-type 'windows-nt)
-      ;; Gitk is a shell script, and Windows doesn't know how to
-      ;; "execute" it.  The Windows version of Git comes with an
-      ;; implementation of "sh" and everything else it needs, but
-      ;; Windows users might not have added the directory where it's
-      ;; installed to their path
-      (let ((git-bin-dir (file-name-directory magit-gitk-executable))
-            (exec-path exec-path)
-            (process-environment process-environment))
-        (when git-bin-dir
-          ;; Adding it onto the end so that anything the user
-          ;; specified will get tried first.  Emacs looks in
-          ;; exec-path; PATH is the environment variable inherited by
-          ;; the process.  I need to change both.
-          (setq exec-path (append exec-path (list git-bin-dir)))
-          (push (format "PATH=%s;%s"
-                        (getenv "PATH")
-                        (replace-regexp-in-string "/" "\\\\" git-bin-dir))
-                process-environment))
-        (magit-start-process "Gitk" nil "sh" magit-gitk-executable "--all")))
-     (t
-      (magit-start-process "Gitk" nil magit-gitk-executable "--all")))))
-
-(defun magit-load-config-extensions ()
-  "Try to load magit extensions that are defined at git config
-layer. This can be added to `magit-mode-hook' for example"
-  (dolist (ext (magit-get-all "magit.extension"))
-    (let ((sym (intern (format "magit-%s-mode" ext))))
-      (when (and (fboundp sym)
-                 (not (eq sym 'magit-wip-save-mode)))
-        (funcall sym 1)))))
-
-(provide 'magit)
-
-;; rest of magit core
-(require 'magit-key-mode)
-(require 'magit-bisect)
-
-;;; magit.el ends here
diff --git a/elpa/magit-1.2.0/magit.el-e b/elpa/magit-1.2.0/magit.el-e
deleted file mode 100644
index 5923afc1a..000000000
--- a/elpa/magit-1.2.0/magit.el-e
+++ /dev/null
@@ -1,6001 +0,0 @@
-;;; magit.el --- control Git from Emacs
-
-;; Copyright (C) 2010 Aaron Culich.
-;; Copyright (C) 2010 Alan Falloon.
-;; Copyright (C) 2008, 2010 Alex Ott.
-;; Copyright (C) 2008, 2009, 2010 Alexey Voinov.
-;; Copyright (C) 2010 Ben Walton.
-;; Copyright (C) 2010 Chris Bernard.
-;; Copyright (C) 2010 Christian Kluge.
-;; Copyright (C) 2008 Daniel Farina.
-;; Copyright (C) 2010 David Abrahams.
-;; Copyright (C) 2009 David Wallin.
-;; Copyright (C) 2009, 2010 Hannu Koivisto.
-;; Copyright (C) 2009 Ian Eure.
-;; Copyright (C) 2009 Jesse Alama.
-;; Copyright (C) 2009 John Wiegley.
-;; Copyright (C) 2010 Leo.
-;; Copyright (C) 2008, 2009 Marcin Bachry.
-;; Copyright (C) 2008, 2009 Marius Vollmer.
-;; Copyright (C) 2010 Mark Hepburn.
-;; Copyright (C) 2010 Moritz Bunkus.
-;; Copyright (C) 2010 Nathan Weizenbaum.
-;; Copyright (C) 2010 Oscar Fuentes.
-;; Copyright (C) 2009 Pavel Holejsovsky.
-;; Copyright (C) 2011-2012 Peter J Weisberg
-;; Copyright (C) 2009, 2010 Phil Jackson.
-;; Copyright (C) 2010 Philip Weaver.
-;; Copyright (C) 2010 Ramkumar Ramachandra.
-;; Copyright (C) 2010 Remco van 't Veer.
-;; Copyright (C) 2009 René Stadler.
-;; Copyright (C) 2010 Robin Green.
-;; Copyright (C) 2010 Roger Crew.
-;; Copyright (C) 2009, 2010, 2011 Rémi Vanicat.
-;; Copyright (C) 2010 Sean Bryant.
-;; Copyright (C) 2009, 2011 Steve Purcell.
-;; Copyright (C) 2010 Timo Juhani Lindfors.
-;; Copyright (C) 2010, 2011 Yann Hodique.
-;; Copyright (C) 2010 Ævar Arnfjörð Bjarmason.
-;; Copyright (C) 2010 Óscar Fuentes.
-
-;; Original Author: Marius Vollmer <marius.vollmer@nokia.com>
-;; Former Maintainer: Phil Jackson <phil@shellarchive.co.uk>
-;; Maintenance Group: https://github.com/organizations/magit/teams/53130
-;;   Currently composed of:
-;;   - Phil Jackson
-;;   - Peter J Weisberg
-;;   - Yann Hodique
-;;   - Rémi Vanicat
-;; Version: @GIT_DEV_VERSION@
-;; Keywords: tools
-
-;;
-;; Magit 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, or (at your option)
-;; any later version.
-;;
-;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Invoking the magit-status function will show a buffer with the
-;; status of the current git repository and its working tree.  That
-;; buffer offers key bindings for manipulating the status in simple
-;; ways.
-;;
-;; The status buffer mainly shows the difference between the working
-;; tree and the index, and the difference between the index and the
-;; current HEAD.  You can add individual hunks from the working tree
-;; to the index, and you can commit the index.
-;;
-;; See the Magit User Manual for more information.
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'log-edit)
-(require 'easymenu)
-(require 'diff-mode)
-
-;; Silences byte-compiler warnings
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest args))))
-
-(eval-when-compile  (require 'view))
-(declare-function view-mode 'view)
-(eval-when-compile (require 'iswitchb))
-(eval-when-compile (require 'ido))
-(eval-when-compile (require 'ediff))
-
-;; Dummy to be used by the defcustoms when first loading the file.
-(eval-when (load eval)
-  (defalias 'magit-set-variable-and-refresh 'set-default))
-
-;;; Code:
-(defgroup magit nil
-  "Controlling Git from Emacs."
-  :prefix "magit-"
-  :group 'tools)
-
-(defcustom magit-git-executable "git"
-  "The name of the Git executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-gitk-executable (concat (file-name-directory magit-git-executable)
-                                         "gitk")
-  "The name of the Gitk executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-git-standard-options '("--no-pager")
-  "Standard options when running Git."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs nil
-  "Directories containing Git repositories.
-Magit will look into these directories for Git repositories and
-offer them as choices for `magit-status'."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs-depth 3
-  "The maximum depth to look for Git repos.
-When looking for a Git repository below the directories in `magit-repo-dirs',
-Magit will only descend this many levels deep."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-set-upstream-on-push nil
-  "Non-nil means that `magit-push' may use --set-upstream when pushing a branch.
-This only applies if the branch does not have an upstream set yet.
-Setting this to t will ask if --set-upstream should be used.
-Setting it to 'dontask will always use --set-upstream.
-Setting it to 'refuse will refuse to push unless a remote branch has already been set.
-
---set-upstream is supported with git > 1.7.0"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Refuse" refuse)
-                 (const :tag "Always" dontask)))
-
-(defcustom magit-save-some-buffers t
-  "Non-nil means that \\[magit-status] will save modified buffers before running.
-Setting this to t will ask which buffers to save, setting it to 'dontask will
-save all modified buffers without asking."
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Save without asking" dontask)))
-
-(defcustom magit-save-some-buffers-predicate
-  'magit-save-buffers-predicate-tree-only
-  "A predicate function to decide whether to save a buffer.
-
-Used by function `magit-save-some-buffers' when the variable of
-the same name is non-nil."
-
-  :group 'magit
-  :type '(radio (function-item magit-save-buffers-predicate-tree-only)
-                (function-item magit-save-buffers-predicate-all)
-                (function :tag "Other")))
-
-(defcustom magit-default-tracking-name-function
-  'magit-default-tracking-name-remote-plus-branch
-  "Specifies the function to use to generate default tracking branch names
-when doing a \\[magit-checkout].
-
-The default is magit-default-tracking-name-remote-plus-branch,
-which generates a tracking name of the form 'REMOTE-BRANCHNAME'."
-  :group 'magit
-  :type '(radio (function-item magit-default-tracking-name-remote-plus-branch)
-                (function-item magit-default-tracking-name-branch-only)
-                (function :tag "Other")))
-
-(defcustom magit-commit-all-when-nothing-staged 'ask
-  "Determines what \\[magit-log-edit] does when nothing is staged.
-Setting this to nil will make it do nothing, setting it to t will
-arrange things so that the actual commit command will use the \"--all\" option,
-setting it to 'ask will first ask for confirmation whether to do this,
-and setting it to 'ask-stage will cause all changes to be staged,
-after a confirmation."
-  :group 'magit
-  :type '(choice (const :tag "No" nil)
-                 (const :tag "Always" t)
-                 (const :tag "Ask" ask)
-                 (const :tag "Ask to stage everything" ask-stage)))
-
-(defcustom magit-commit-signoff nil
-  "Add the \"Signed-off-by:\" line when committing."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-sha1-abbrev-length 7
-  "The number of digits to show when a sha1 is displayed in abbreviated form."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-cutoff-length 100
-  "The maximum number of commits to show in the log and whazzup buffers."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-infinite-length 99999
-  "Number of log used to show as maximum for `magit-log-cutoff-length'."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-auto-more nil
-  "Insert more log entries automatically when moving past the last entry.
-
-Only considered when moving past the last entry with
-`magit-goto-*-section' commands."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-process-popup-time -1
-  "Popup the process buffer if a command takes longer than this many seconds."
-  :group 'magit
-  :type '(choice (const :tag "Never" -1)
-                 (const :tag "Immediately" 0)
-                 (integer :tag "After this many seconds")))
-
-(defcustom magit-revert-item-confirm t
-  "Require acknowledgment before reverting an item."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-log-edit-confirm-cancellation nil
-  "Require acknowledgment before canceling the log edit buffer."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-remote-ref-format 'branch-then-remote
-  "What format to use for autocompleting refs, in pariticular for remotes.
-
-Autocompletion is used by functions like `magit-checkout',
-`magit-interactive-rebase' and others which offer branch name
-completion.
-
-The value 'name-then-remote means remotes will be of the
-form \"name (remote)\", while the value 'remote-slash-name
-means that they'll be of the form \"remote/name\".  I.e. something that's
-listed as \"remotes/upstream/next\" by \"git branch -l -a\"
-will be \"upstream/next\"."
-  :group 'magit
-  :type '(choice (const :tag "name (remote)" branch-then-remote)
-                 (const :tag "remote/name" remote-slash-branch)))
-
-(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
-  "Connection type used for the git process.
-
-If nil, use pipes: this is usually more efficient, and works on Cygwin.
-If t, use ptys: this enables magit to prompt for passphrases when needed."
-  :group 'magit
-  :type '(choice (const :tag "pipe" nil)
-                 (const :tag "pty" t)))
-
-(defcustom magit-completing-read-function 'magit-builtin-completing-read
-  "Function to be called when requesting input from the user."
-  :group 'magit
-  :type '(radio (function-item magit-iswitchb-completing-read)
-                (function-item magit-ido-completing-read)
-                (function-item magit-builtin-completing-read)
-                (function :tag "Other")))
-
-(defcustom magit-create-branch-behaviour 'at-head
-  "Where magit will create a new branch if not supplied a branchname or ref.
-
-The value 'at-head means a new branch will be created at the tip
-of your current branch, while the value 'at-point means magit
-will try to find a valid reference at point..."
-  :group 'magit
-  :type '(choice (const :tag "at HEAD" at-head)
-                 (const :tag "at point" at-point)))
-
-(defcustom magit-status-buffer-switch-function 'pop-to-buffer
-  "Function for `magit-status' to use for switching to the status buffer.
-
-The function is given one argument, the status buffer."
-  :group 'magit
-  :type '(radio (function-item switch-to-buffer)
-                (function-item pop-to-buffer)
-                (function :tag "Other")))
-
-(defcustom magit-rewrite-inclusive t
-  "Whether magit includes the selected base commit in a rewrite operation.
-
-t means both the selected commit as well as any subsequent
-commits will be rewritten.  This is magit's default behaviour,
-equivalent to 'git rebase -i ${REV}~1'
-
-  A'---B'---C'---D'
-  ^
-
-nil means the selected commit will be literally used as 'base',
-so only subsequent commits will be rewritten.  This is consistent
-with git-rebase, equivalent to 'git rebase -i ${REV}', yet more
-cumbersome to use from the status buffer.
-
-  A---B'---C'---D'
-  ^"
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "Ask"   ask)))
-
-(defcustom magit-highlight-whitespace t
-  "Specifies where to highlight whitespace errors.
-See `magit-highlight-trailing-whitespace',
-`magit-highlight-indentation'.  The symbol t means in all diffs,
-'status means only in the status buffer, and nil means nowhere."
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "In status buffer" status))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-trailing-whitespace t
-  "Highlight whitespace at the end of a line in diffs.
-Used only when `magit-highlight-whitespace' is non-nil."
-  :group 'magit
-  :type 'boolean
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-indentation nil
-  "Highlight the \"wrong\" indentation style.
-Used only when `magit-highlight-whitespace' is non-nil.
-
-The value is a list of cons cells.  The car is a regular
-expression, and the cdr is the value that applies to repositories
-whose directory matches the regular expression.  If more than one
-item matches, then the *last* item in the list applies.  So, the
-default value should come first in the list.
-
-If the value is `tabs', highlight indentation with tabs.  If the
-value is an integer, highlight indentation with at least that
-many spaces.  Otherwise, highlight neither."
-  :group 'magit
-  :type `(repeat (cons (string :tag "Directory regexp")
-                       (choice (const :tag "Tabs" tabs)
-                               (integer :tag "Spaces" :value ,tab-width)
-                               (const :tag "Neither" nil))))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-diff-refine-hunk nil
-  "Show fine (word-granularity) differences within diff hunks.
-
-There are three possible settings:
-
-  nil means to never show fine differences
-
-  t means to only show fine differences for the currently
-  selected diff hunk
-
-  `all' means to always show fine differences for all displayed diff hunks"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Selected only" t)
-                 (const :tag "All" all))
-  :set 'magit-set-variable-and-refresh)
-
-(defvar magit-current-indentation nil
-  "Indentation highlight used in the current buffer.
-This is calculated from `magit-highlight-indentation'.")
-(make-variable-buffer-local 'magit-current-indentation)
-
-(defgroup magit-faces nil
-  "Customize the appearance of Magit."
-  :prefix "magit-"
-  :group 'faces
-  :group 'magit)
-
-(defface magit-header
-  '((t :inherit header-line))
-  "Face for generic header lines.
-
-Many Magit faces inherit from this one by default."
-  :group 'magit-faces)
-
-(defface magit-section-title
-  '((t :inherit magit-header))
-  "Face for section titles."
-  :group 'magit-faces)
-
-(defface magit-branch
-  '((t :inherit magit-header))
-  "Face for the current branch."
-  :group 'magit-faces)
-
-(defface magit-diff-file-header
-  '((t :inherit diff-file-header))
-  "Face for diff file header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-header
-  '((t :inherit diff-hunk-header))
-  "Face for diff hunk header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-add
-  '((t :inherit diff-added))
-  "Face for lines in a diff that have been added."
-  :group 'magit-faces)
-
-(defface magit-diff-none
-  '((t :inherit diff-context))
-  "Face for lines in a diff that are unchanged."
-  :group 'magit-faces)
-
-(defface magit-diff-del
-  '((t :inherit diff-removed))
-  "Face for lines in a diff that have been deleted."
-  :group 'magit-faces)
-
-(defface magit-log-graph
-  '((((class color) (background light))
-     :foreground "grey11")
-    (((class color) (background dark))
-     :foreground "grey80"))
-  "Face for the graph element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-sha1
-  '((((class color) (background light))
-     :foreground "firebrick")
-    (((class color) (background dark))
-     :foreground "tomato"))
-  "Face for the sha1 element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-message
-  '((t))
-  "Face for the message element of the log output."
-  :group 'magit-faces)
-
-(defface magit-item-highlight
-  '((t :inherit highlight))
-  "Face for highlighting the current item."
-  :group 'magit-faces)
-
-(defface magit-item-mark
-  '((t :inherit secondary-selection))
-  "Face for highlighting marked item."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-good
-  '((((class color) (background light))
-     :box t
-     :background "light green"
-     :foreground "dark olive green")
-    (((class color) (background dark))
-     :box t
-     :background "light green"
-     :foreground "dark olive green"))
-  "Face for good bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-bad
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for bad bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-remote
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "OliveDrab4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey11"
-     :foreground "DarkSeaGreen2"))
-  "Face for remote branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-tags
-  '((((class color) (background light))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4")
-    (((class color) (background dark))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4"))
-  "Face for tag labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-patches
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for Stacked Git patches."
-  :group 'magit-faces)
-
-(defface magit-whitespace-warning-face
-  '((t :inherit trailing-whitespace))
-  "Face for highlighting whitespace errors in Magit diffs."
-  :group 'magit-faces)
-
-(defvar magit-custom-options '()
-  "List of custom options to pass to Git.
-Do not customize this (used in the `magit-key-mode' implementation).")
-
-(defvar magit-read-rev-history nil
-  "The history of inputs to `magit-read-rev'.")
-
-(defvar magit-buffer-internal nil
-  "Track associated *magit* buffers.
-Do not customize this (used in the `magit-log-edit-mode' implementation
-to switch back to the *magit* buffer associated with a given commit
-operation after commit).")
-
-(defvar magit-back-navigation-history nil
-  "History items that will be visited by successively going \"back\".")
-(make-variable-buffer-local 'magit-back-navigation-history)
-(put 'magit-back-navigation-history 'permanent-local t)
-
-(defvar magit-forward-navigation-history nil
-  "History items that will be visited by successively going \"forward\".")
-(make-variable-buffer-local 'magit-forward-navigation-history)
-(put 'magit-forward-navigation-history 'permanent-local t)
-
-(defvar magit-omit-untracked-dir-contents nil
-  "When non-nil magit will only list an untracked directory, not its contents.")
-
-(defvar magit-tmp-buffer-name " *magit-tmp*")
-
-(defface magit-log-head-label-local
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "LightSkyBlue4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey13"
-     :foreground "LightSkyBlue1"))
-  "Face for local branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-default
-  '((((class color) (background light))
-     :box t
-     :background "Grey50")
-    (((class color) (background dark))
-     :box t
-     :background "Grey50"))
-  "Face for unknown ref labels shown in log buffer."
-  :group 'magit-faces)
-
-(defvar magit-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map t)
-    (define-key map (kbd "n") 'magit-goto-next-section)
-    (define-key map (kbd "p") 'magit-goto-previous-section)
-    (define-key map (kbd "^") 'magit-goto-parent-section)
-    (define-key map (kbd "M-n") 'magit-goto-next-sibling-section)
-    (define-key map (kbd "M-p") 'magit-goto-previous-sibling-section)
-    (define-key map (kbd "TAB") 'magit-toggle-section)
-    (define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
-    (define-key map (kbd "1") 'magit-show-level-1)
-    (define-key map (kbd "2") 'magit-show-level-2)
-    (define-key map (kbd "3") 'magit-show-level-3)
-    (define-key map (kbd "4") 'magit-show-level-4)
-    (define-key map (kbd "M-1") 'magit-show-level-1-all)
-    (define-key map (kbd "M-2") 'magit-show-level-2-all)
-    (define-key map (kbd "M-3") 'magit-show-level-3-all)
-    (define-key map (kbd "M-4") 'magit-show-level-4-all)
-    (define-key map (kbd "M-h") 'magit-show-only-files)
-    (define-key map (kbd "M-H") 'magit-show-only-files-all)
-    (define-key map (kbd "M-s") 'magit-show-level-4)
-    (define-key map (kbd "M-S") 'magit-show-level-4-all)
-    (define-key map (kbd "g") 'magit-refresh)
-    (define-key map (kbd "G") 'magit-refresh-all)
-    (define-key map (kbd "?") 'magit-describe-item)
-    (define-key map (kbd "!") 'magit-key-mode-popup-running)
-    (define-key map (kbd ":") 'magit-git-command)
-    (define-key map (kbd "C-x 4 a") 'magit-add-change-log-entry-other-window)
-    (define-key map (kbd "L") 'magit-add-change-log-entry-no-option)
-    (define-key map (kbd "RET") 'magit-visit-item)
-    (define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
-    (define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
-    (define-key map (kbd "C-w") 'magit-copy-item-as-kill)
-    (define-key map (kbd "R") 'magit-rebase-step)
-    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
-    (define-key map (kbd "r") 'magit-key-mode-popup-rewriting)
-    (define-key map (kbd "P") 'magit-key-mode-popup-pushing)
-    (define-key map (kbd "f") 'magit-key-mode-popup-fetching)
-    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
-    (define-key map (kbd "M") 'magit-key-mode-popup-remoting)
-    (define-key map (kbd "B") 'magit-key-mode-popup-bisecting)
-    (define-key map (kbd "F") 'magit-key-mode-popup-pulling)
-    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
-    (define-key map (kbd "$") 'magit-display-process)
-    (define-key map (kbd "c") 'magit-log-edit)
-    (define-key map (kbd "E") 'magit-interactive-rebase)
-    (define-key map (kbd "e") 'magit-ediff)
-    (define-key map (kbd "w") 'magit-wazzup)
-    (define-key map (kbd "q") 'magit-quit-window)
-    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
-    (define-key map (kbd "x") 'magit-reset-head)
-    (define-key map (kbd "v") 'magit-revert-item)
-    (define-key map (kbd "a") 'magit-apply-item)
-    (define-key map (kbd "A") 'magit-cherry-pick-item)
-    (define-key map (kbd "d") 'magit-diff-working-tree)
-    (define-key map (kbd "D") 'magit-diff)
-    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
-    (define-key map (kbd "+") 'magit-diff-larger-hunks)
-    (define-key map (kbd "0") 'magit-diff-default-hunks)
-    (define-key map (kbd "h") 'magit-toggle-diff-refine-hunk)
-    map))
-
-(defvar magit-commit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-b") 'magit-show-commit-backward)
-    (define-key map (kbd "C-c C-f") 'magit-show-commit-forward)
-    map))
-
-(defvar magit-status-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "s") 'magit-stage-item)
-    (define-key map (kbd "S") 'magit-stage-all)
-    (define-key map (kbd "u") 'magit-unstage-item)
-    (define-key map (kbd "U") 'magit-unstage-all)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    (define-key map (kbd "I") 'magit-ignore-item-locally)
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "C") 'magit-add-log)
-    (define-key map (kbd "X") 'magit-reset-working-tree)
-    (define-key map (kbd "z") 'magit-key-mode-popup-stashing)
-    map))
-
-(eval-after-load 'dired-x
-  '(define-key magit-status-mode-map [remap dired-jump] 'magit-dired-jump))
-
-(defvar magit-log-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "e") 'magit-log-show-more-entries)
-    map))
-
-(defvar magit-wazzup-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    map))
-
-(defvar magit-branch-manager-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "c") 'magit-create-branch)
-    (define-key map (kbd "a") 'magit-add-remote)
-    (define-key map (kbd "r") 'magit-move-item)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "T") 'magit-change-what-branch-tracks)
-    map))
-
-(defvar magit-bug-report-url
-  "http://github.com/magit/magit/issues")
-
-(defconst magit-version "@GIT_DEV_VERSION@"
-  "The version of Magit that you're using.")
-
-(defun magit-bug-report (str)
-  "Asks the user to submit a bug report about the error described in STR."
-;; XXX - should propose more information to be included.
-  (message (concat
-            "Unknown error: %s\n"
-            "Please, with as much information as possible, file a bug at\n"
-            "%s\n"
-            "You are using Magit version %s.")
-           str magit-bug-report-url magit-version))
-
-(defun magit-buffer-switch (buf)
-  (if (string-match "magit" (buffer-name))
-      (switch-to-buffer buf)
-    (pop-to-buffer buf)))
-
-;;; Macros
-
-(defmacro magit-with-refresh (&rest body)
-  (declare (indent 0))
-  `(magit-refresh-wrapper (lambda () ,@body)))
-
-;;; Git features
-
-(defvar magit-have-graph 'unset)
-(defvar magit-have-decorate 'unset)
-(defvar magit-have-abbrev 'unset)
-(make-variable-buffer-local 'magit-have-graph)
-(put 'magit-have-graph 'permanent-local t)
-(make-variable-buffer-local 'magit-have-decorate)
-(put 'magit-have-decorate 'permanent-local t)
-(make-variable-buffer-local 'magit-have-abbrev)
-(put 'magit-have-abbrev 'permanent-local t)
-
-(defun magit-configure-have-graph ()
-  (if (eq magit-have-graph 'unset)
-      (let ((res (magit-git-exit-code "log" "--graph" "--max-count=0")))
-        (setq magit-have-graph (eq res 0)))))
-
-(defun magit-configure-have-decorate ()
-  (if (eq magit-have-decorate 'unset)
-      (let ((res (magit-git-exit-code "log" "--decorate=full" "--max-count=0")))
-        (setq magit-have-decorate (eq res 0)))))
-
-(defun magit-configure-have-abbrev ()
-  (if (eq magit-have-abbrev 'unset)
-      (let ((res (magit-git-exit-code "log" "--no-abbrev-commit" "--max-count=0")))
-        (setq magit-have-abbrev (eq res 0)))))
-
-;;; Compatibilities
-
-(eval-and-compile
-  (defun magit-max-args-internal (function)
-    "Returns the maximum number of arguments accepted by FUNCTION."
-    (if (symbolp function)
-        (setq function (symbol-function function)))
-    (if (subrp function)
-        (let ((max (cdr (subr-arity function))))
-          (if (eq 'many max)
-              most-positive-fixnum
-            max))
-      (if (eq 'macro (car-safe function))
-          (setq function (cdr function)))
-      (let ((arglist (if (byte-code-function-p function)
-                         (aref function 0)
-                       (second function))))
-        (if (memq '&rest arglist)
-            most-positive-fixnum
-          (length (remq '&optional arglist))))))
-
-  (if (functionp 'start-file-process)
-      (defalias 'magit-start-process 'start-file-process)
-    (defalias 'magit-start-process 'start-process))
-
-  (unless (fboundp 'string-match-p)
-    (defun string-match-p (regexp string &optional start)
-      "Same as `string-match' except this function does not
-change the match data."
-      (let ((inhibit-changing-match-data t))
-        (string-match regexp string start))))
-
-  (if (fboundp 'with-silent-modifications)
-      (defalias 'magit-with-silent-modifications 'with-silent-modifications)
-    (defmacro magit-with-silent-modifications (&rest body)
-      "Execute body without changing `buffer-modified-p'. Also, do not
-record undo information."
-      `(set-buffer-modified-p
-        (prog1 (buffer-modified-p)
-          (let ((buffer-undo-list t)
-                before-change-functions
-                after-change-functions)
-            ,@body)))))
-
-  (if (>= (magit-max-args-internal 'delete-directory) 2)
-      (defalias 'magit-delete-directory 'delete-directory)
-    (defun magit-delete-directory (directory &optional recursive)
-      "Deletes a directory named DIRECTORY.  If RECURSIVE is non-nil,
-recursively delete all of DIRECTORY's contents as well.
-
-Does not follow symlinks."
-      (if (or (file-symlink-p directory)
-              (not (file-directory-p directory)))
-          (delete-file directory)
-        (if recursive
-            ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23
-            (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
-              (magit-delete-directory file recursive)))
-        (delete-directory directory)))))
-
-;;; Utilities
-
-(defun magit-set-variable-and-refresh (symbol value)
-  "Set SYMBOL to VALUE and call `magit-refresh-all'"
-  (set-default symbol value)
-  (magit-refresh-all))
-
-(defun magit-iswitchb-completing-read (prompt choices &optional predicate require-match
-                                              initial-input hist def)
-  "iswitchb-based completing-read almost-replacement."
-  (require 'iswitchb)
-  (let ((iswitchb-make-buflist-hook
-         (lambda ()
-           (setq iswitchb-temp-buflist (if (consp (first choices))
-                                           (mapcar #'car choices)
-                                         choices)))))
-    (iswitchb-read-buffer prompt (or initial-input def) require-match)))
-
-(defun magit-ido-completing-read (prompt choices &optional predicate require-match initial-input hist def)
-  "ido-based completing-read almost-replacement."
-  (require 'ido)
-  (let ((selected (ido-completing-read prompt (if (consp (first choices))
-                                                  (mapcar #'car choices)
-                                                choices)
-                                       predicate require-match initial-input hist def)))
-    (if (consp (first choices))
-        (or (cdr (assoc selected choices))
-            selected)
-      selected)))
-
-(defun magit-builtin-completing-read (prompt choices &optional predicate require-match
-                                             initial-input hist def)
-  "Magit wrapper for standard `completing-read' function."
-  (completing-read (if (and def (> (length prompt) 2)
-                            (string-equal ": " (substring prompt -2)))
-                       (format "%s (default %s): " (substring prompt 0 -2) def)
-                     prompt)
-                   choices predicate require-match initial-input hist def))
-
-(defun magit-completing-read (prompt choices &optional predicate require-match
-                                     initial-input hist def)
-  (funcall magit-completing-read-function prompt choices predicate require-match
-           initial-input hist def))
-
-(defun magit-use-region-p ()
-  (if (fboundp 'use-region-p)
-      (use-region-p)
-    (and transient-mark-mode mark-active)))
-
-(defun magit-goto-line (line)
-  "Like `goto-line' but doesn't set the mark."
-  (save-restriction
-    (widen)
-    (goto-char 1)
-    (forward-line (1- line))))
-
-(defun magit-trim-line (str)
-  (if (string= str "")
-      nil
-    (if (equal (elt str (- (length str) 1)) ?\n)
-        (substring str 0 (- (length str) 1))
-      str)))
-
-(defun magit-split-lines (str)
-  (if (string= str "")
-      nil
-    (let ((lines (nreverse (split-string str "\n"))))
-      (if (string= (car lines) "")
-          (setq lines (cdr lines)))
-      (nreverse lines))))
-
-(defun magit-git-insert (args)
-  (insert (magit-git-output args)))
-
-(defun magit-git-output (args)
-  (magit-cmd-output magit-git-executable (append magit-git-standard-options args)))
-
-(defun magit-cmd-insert (cmd args)
-  (insert (magit-cmd-output cmd args)))
-
-(defun magit-cmd-output (cmd args)
-  (let ((cmd-output (with-output-to-string
-                      (with-current-buffer standard-output
-                        (apply #'process-file
-                               cmd
-                               nil (list t nil) nil
-                               args)))))
-    (replace-regexp-in-string "\e\\[.*?m" "" cmd-output)))
-
-(defun magit-git-string (&rest args)
-  (magit-trim-line (magit-git-output args)))
-
-(defun magit-git-lines (&rest args)
-  (magit-split-lines (magit-git-output args)))
-
-(defun magit-git-exit-code (&rest args)
-  (apply #'process-file magit-git-executable nil nil nil
-         (append magit-git-standard-options args)))
-
-(defun magit-file-lines (file)
-  (when (file-exists-p file)
-    (with-temp-buffer
-      (insert-file-contents file)
-      (let ((rev (nreverse (split-string (buffer-string) "\n"))))
-        (nreverse (if (equal (car rev) "")
-                      (cdr rev)
-                    rev))))))
-
-(defun magit-write-file-lines (file lines)
-  (with-temp-buffer
-    (dolist (l lines)
-      (insert l "\n"))
-    (write-file file)))
-
-(defun magit-get (&rest keys)
-  "Return the value of Git config entry specified by KEYS."
-  (magit-git-string "config" (mapconcat 'identity keys ".")))
-
-(defun magit-get-all (&rest keys)
-  "Return all values of the Git config entry specified by KEYS."
-  (magit-git-lines "config" "--get-all" (mapconcat 'identity keys ".")))
-
-(defun magit-get-boolean (&rest keys)
-  "Return the boolean value of Git config entry specified by KEYS."
-  (equal (magit-git-string "config" "--bool" (mapconcat 'identity keys "."))
-         "true"))
-
-(defun magit-set (val &rest keys)
-  "Set Git config settings specified by KEYS to VAL."
-  (if val
-      (magit-git-string "config" (mapconcat 'identity keys ".") val)
-    (magit-git-string "config" "--unset" (mapconcat 'identity keys "."))))
-
-(defun magit-remove-conflicts (alist)
-  (let ((dict (make-hash-table :test 'equal))
-        (result nil))
-    (dolist (a alist)
-      (puthash (car a) (cons (cdr a) (gethash (car a) dict))
-               dict))
-    (maphash (lambda (key value)
-               (if (= (length value) 1)
-                   (push (cons key (car value)) result)
-                 (let ((sub (magit-remove-conflicts
-                             (mapcar (lambda (entry)
-                                       (let ((dir (directory-file-name
-                                                   (substring entry 0 (- (length key))))))
-                                         (cons (concat (file-name-nondirectory dir) "/" key)
-                                               entry)))
-                                     value))))
-                   (setq result (append result sub)))))
-             dict)
-    result))
-
-(defun magit-git-repo-p (dir)
-  (file-exists-p (expand-file-name ".git" dir)))
-
-(defun magit-git-dir ()
-  "Returns the .git directory for the current repository."
-  (concat (expand-file-name (magit-git-string "rev-parse" "--git-dir")) "/"))
-
-(defun magit-no-commit-p ()
-  "Return non-nil if there is no commit in the current git repository."
-  (not (magit-git-string
-        "rev-list" "HEAD" "--max-count=1")))
-
-(defun magit-list-repos* (dir level)
-  (if (magit-git-repo-p dir)
-      (list dir)
-    (apply #'append
-           (mapcar (lambda (entry)
-                     (unless (or (string= (substring entry -3) "/..")
-                                 (string= (substring entry -2) "/."))
-                       (magit-list-repos* entry (+ level 1))))
-                   (and (file-directory-p dir)
-                        (< level magit-repo-dirs-depth)
-                        (directory-files dir t nil t))))))
-
-(defun magit-list-repos (dirs)
-  (magit-remove-conflicts
-   (apply #'append
-          (mapcar (lambda (dir)
-                    (mapcar #'(lambda (repo)
-                                (cons (file-name-nondirectory repo)
-                                      repo))
-                            (magit-list-repos* dir 0)))
-                  dirs))))
-
-(defun magit-get-top-dir (cwd)
-  (let ((cwd (expand-file-name (file-truename cwd))))
-    (when (file-directory-p cwd)
-      (let* ((default-directory (file-name-as-directory cwd))
-             (cdup (magit-git-string "rev-parse" "--show-cdup")))
-        (when cdup
-          (file-name-as-directory (expand-file-name cdup cwd)))))))
-
-(defun magit-get-ref (ref)
-  (magit-git-string "symbolic-ref" "-q" ref))
-
-(defun magit-get-current-branch ()
-  (let* ((head (magit-get-ref "HEAD"))
-         (pos (and head (string-match "^refs/heads/" head))))
-    (if pos
-        (substring head 11)
-      nil)))
-
-(defun magit-get-remote (branch)
-  "Return the name of the remote for BRANCH.
-If branch is nil or it has no remote, but a remote named
-\"origin\" exists, return that. Otherwise, return nil."
-  (let ((remote (or (and branch (magit-get "branch" branch "remote"))
-                    (and (magit-get "remote" "origin" "url") "origin"))))
-    (if (string= remote "") nil remote)))
-
-(defun magit-get-current-remote ()
-  "Return the name of the remote for the current branch.
-If there is no current branch, or no remote for that branch,
-but a remote named \"origin\" is configured, return that.
-Otherwise, return nil."
-  (magit-get-remote (magit-get-current-branch)))
-
-(defun magit-ref-exists-p (ref)
-  (= (magit-git-exit-code "show-ref" "--verify" ref) 0))
-
-(defun magit-read-top-dir (dir)
-  "Ask the user for a Git repository.  The choices offered by
-auto-completion will be the repositories under `magit-repo-dirs'.
-If `magit-repo-dirs' is nil or DIR is non-nill, then
-autocompletion will offer directory names."
-  (if (and (not dir) magit-repo-dirs)
-      (let* ((repos (magit-list-repos magit-repo-dirs))
-             (reply (magit-completing-read "Git repository: " repos)))
-        (file-name-as-directory
-         (or (cdr (assoc reply repos))
-             (if (file-directory-p reply)
-                 (expand-file-name reply)
-               (error "Not a repository or a directory: %s" reply)))))
-    (file-name-as-directory
-     (read-directory-name "Git repository: "
-                          (or (magit-get-top-dir default-directory)
-                              default-directory)))))
-
-(defun magit-rev-parse (ref)
-  "Return the SHA hash for REF."
-  (magit-git-string "rev-parse" ref))
-
-(defun magit-ref-ambiguous-p (ref)
-  "Return whether or not REF is ambiguous."
-  ;; If REF is ambiguous, rev-parse just prints errors,
-  ;; so magit-git-string returns nil.
-  (not (magit-git-string "rev-parse" "--abbrev-ref" ref)))
-
-(defun magit-name-rev (rev &optional no-trim)
-  "Return a human-readable name for REV.
-Unlike git name-rev, this will remove tags/ and remotes/ prefixes
-if that can be done unambiguously (unless optional arg NO-TRIM is
-non-nil).  In addition, it will filter out revs involving HEAD."
-  (when rev
-    (let ((name (magit-git-string "name-rev" "--no-undefined" "--name-only" rev)))
-      ;; There doesn't seem to be a way of filtering HEAD out from name-rev,
-      ;; so we have to do it manually.
-      ;; HEAD-based names are too transient to allow.
-      (when (and (stringp name)
-                 (string-match "^\\(.*\\<HEAD\\)\\([~^].*\\|$\\)" name))
-        (let ((head-ref (match-string 1 name))
-              (modifier (match-string 2 name)))
-          ;; Sometimes when name-rev gives a HEAD-based name,
-          ;; rev-parse will give an actual branch or remote name.
-          (setq name (concat (magit-git-string "rev-parse" "--abbrev-ref" head-ref)
-                             modifier))
-          ;; If rev-parse doesn't give us what we want, just use the SHA.
-          (when (or (null name) (string-match-p "\\<HEAD\\>" name))
-            (setq name (magit-rev-parse rev)))))
-      (setq rev (or name rev))
-      (when (string-match "^\\(?:tags\\|remotes\\)/\\(.*\\)" rev)
-        (let ((plain-name (match-string 1 rev)))
-          (unless (or no-trim (magit-ref-ambiguous-p plain-name))
-            (setq rev plain-name))))
-      rev)))
-
-(defun magit-highlight-line-whitespace ()
-  (when (and magit-highlight-whitespace
-             (or (derived-mode-p 'magit-status-mode)
-                 (not (eq magit-highlight-whitespace 'status))))
-    (if (and magit-highlight-trailing-whitespace
-             (looking-at "^[-+].*?\\([ \t]+\\)$"))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))
-    (if (or (and (eq magit-current-indentation 'tabs)
-                 (looking-at "^[-+]\\( *\t[ \t]*\\)"))
-            (and (integerp magit-current-indentation)
-                 (looking-at (format "^[-+]\\([ \t]* \\{%s,\\}[ \t]*\\)"
-                                     magit-current-indentation))))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))))
-
-(defun magit-put-line-property (prop val)
-  (put-text-property (line-beginning-position) (line-beginning-position 2)
-                     prop val))
-
-(defun magit-format-commit (commit format)
-  (magit-git-string "log" "--max-count=1"
-                    (concat "--pretty=format:" format)
-                    commit))
-
-(defun magit-current-line ()
-  (buffer-substring-no-properties (line-beginning-position)
-                                  (line-end-position)))
-
-(defun magit-insert-region (beg end buf)
-  (let ((text (buffer-substring-no-properties beg end)))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-insert-current-line (buf)
-  (let ((text (buffer-substring-no-properties
-               (line-beginning-position) (line-beginning-position 2))))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-file-uptodate-p (file)
-  (eq (magit-git-exit-code "diff" "--quiet" "--" file) 0))
-
-(defun magit-anything-staged-p ()
-  (not (eq (magit-git-exit-code "diff" "--quiet" "--cached") 0)))
-
-(defun magit-everything-clean-p ()
-  (and (not (magit-anything-staged-p))
-       (eq (magit-git-exit-code "diff" "--quiet") 0)))
-
-(defun magit-commit-parents (commit)
-  (cdr (split-string (magit-git-string "rev-list" "-1" "--parents" commit))))
-
-;; XXX - let the user choose the parent
-
-(defun magit-choose-parent-id (commit op)
-  (let* ((parents (magit-commit-parents commit)))
-    (if (> (length parents) 1)
-        (error "Can't %s merge commits" op)
-      nil)))
-
-;;; Revisions and ranges
-
-(defvar magit-current-range nil
-  "The range described by the current buffer.
-This is only non-nil in diff and log buffers.
-
-This has three possible (non-nil) forms.  If it's a string REF or
-a singleton list (REF), then the range is from REF to the current
-working directory state (or HEAD in a log buffer).  If it's a
-pair (START . END), then the range is START..END.")
-(make-variable-buffer-local 'magit-current-range)
-
-(defun magit-list-interesting-refs (&optional uninteresting)
-  "Return interesting references as given by `git show-ref'.
-Removes references matching UNINTERESTING from the
-results. UNINTERESTING can be either a function taking a single
-argument or a list of strings used as regexps."
-  (let ((refs ()))
-    (dolist (line (magit-git-lines "show-ref"))
-      (if (string-match "[^ ]+ +\\(.*\\)" line)
-          (let ((ref (match-string 1 line)))
-            (cond ((and (functionp uninteresting)
-                        (funcall uninteresting ref)))
-                  ((and (not (functionp uninteresting))
-                        (loop for i in uninteresting thereis (string-match i ref))))
-                  (t
-                   (let ((fmt-ref (magit-format-ref ref)))
-                     (when fmt-ref
-                       (push (cons fmt-ref
-                                   (replace-regexp-in-string "^refs/heads/"
-                                                             "" ref))
-                             refs))))))))
-    (nreverse refs)))
-
-(defun magit-format-ref (ref)
-  "Convert fully-specified ref REF into its displayable form
-according to `magit-remote-ref-format'"
-  (cond
-   ((null ref)
-    nil)
-   ((string-match "refs/heads/\\(.*\\)" ref)
-    (match-string 1 ref))
-   ((string-match "refs/tags/\\(.*\\)" ref)
-    (format (if (eq magit-remote-ref-format 'branch-then-remote)
-                "%s (tag)"
-              "%s")
-            (match-string 1 ref)))
-   ((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref)
-    (if (eq magit-remote-ref-format 'branch-then-remote)
-        (format "%s (%s)"
-                (match-string 2 ref)
-                (match-string 1 ref))
-      (format "%s/%s"
-              (match-string 1 ref)
-              (match-string 2 ref))))))
-
-(defun magit-tree-contents (treeish)
-  "Returns a list of all files under TREEISH.  TREEISH can be a tree,
-a commit, or any reference to one of those."
-  (let ((return-value nil))
-    (with-temp-buffer
-      (magit-git-insert (list "ls-tree" "-r" treeish))
-      (if (eql 0 (buffer-size))
-          (error "%s is not a commit or tree." treeish))
-      (goto-char (point-min))
-      (while (search-forward-regexp "\t\\(.*\\)" nil 'noerror)
-        (push (match-string 1) return-value)))
-    return-value))
-
-(defvar magit-uninteresting-refs '("refs/remotes/\\([^/]+\\)/HEAD$" "refs/stash"))
-
-(defun magit-read-file-from-rev (revision)
-  (magit-completing-read (format "Retrieve file from %s: " revision)
-                         (magit-tree-contents revision)
-                         nil
-                         'require-match
-                         nil
-                         'magit-read-file-hist
-                         (if buffer-file-name
-                             (let ((topdir-length (length (magit-get-top-dir default-directory))))
-                               (substring (buffer-file-name) topdir-length)))))
-
-(defun magit-read-rev (prompt &optional default uninteresting)
-  (let* ((interesting-refs (magit-list-interesting-refs
-                            (or uninteresting magit-uninteresting-refs)))
-         (reply (magit-completing-read (concat prompt ": ") interesting-refs
-                                       nil nil nil 'magit-read-rev-history default))
-         (rev (or (cdr (assoc reply interesting-refs)) reply)))
-    (if (string= rev "")
-        nil
-      rev)))
-
-(defun magit-read-rev-range (op &optional def-beg def-end)
-  (let ((beg (magit-read-rev (format "%s start" op)
-                             def-beg)))
-    (if (not beg)
-        nil
-      (save-match-data
-        (if (string-match "^\\(.+\\)\\.\\.\\(.+\\)$" beg)
-            (cons (match-string 1 beg) (match-string 2 beg))
-          (let ((end (magit-read-rev (format "%s end" op) def-end)))
-            (cons beg end)))))))
-
-(defun magit-rev-to-git (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      (magit-marked-commit)
-    rev))
-
-(defun magit-rev-range-to-git (range)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      range
-    (if (cdr range)
-        (format "%s..%s"
-                (magit-rev-to-git (car range))
-                (magit-rev-to-git (cdr range)))
-      (format "%s" (magit-rev-to-git (car range))))))
-
-(defun magit-rev-describe (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      "mark"
-    (magit-name-rev rev)))
-
-(defun magit-rev-range-describe (range things)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      (format "%s in %s" things range)
-    (if (cdr range)
-        (format "%s from %s to %s" things
-                (magit-rev-describe (car range))
-                (magit-rev-describe (cdr range)))
-      (format "%s at %s" things (magit-rev-describe (car range))))))
-
-(defun magit-default-rev (&optional no-trim)
-  (or (magit-name-rev (magit-commit-at-point t) no-trim)
-      (let ((branch (magit-guess-branch)))
-        (if branch
-            (if (string-match "^refs/\\(.*\\)" branch)
-                (match-string 1 branch)
-              branch)))))
-
-(defun magit-read-remote (&optional prompt def)
-  "Read the name of a remote.
-PROMPT is used as the prompt, and defaults to \"Remote\".
-DEF is the default value."
-  (let* ((prompt (or prompt "Remote"))
-         (def (or def (magit-guess-remote)))
-         (remotes (magit-git-lines "remote"))
-
-         (reply (magit-completing-read (concat prompt ": ") remotes
-                                       nil nil nil nil def)))
-    (if (string= reply "") nil reply)))
-
-(defun magit-read-remote-branch (remote &optional prompt default)
-  (let* ((prompt (or prompt (format "Remote branch (in %s)" remote)))
-         (branches (delete nil
-                           (mapcar
-                            (lambda (b)
-                              (and (not (string-match " -> " b))
-                                   (string-match (format "^ *%s/\\(.*\\)$"
-                                                         (regexp-quote remote)) b)
-                                   (match-string 1 b)))
-                            (magit-git-lines "branch" "-r"))))
-         (reply (magit-completing-read (concat prompt ": ") branches
-                                       nil nil nil nil default)))
-    (if (string= reply "") nil reply)))
-
-;;; Sections
-
-;; A buffer in magit-mode is organized into hierarchical sections.
-;; These sections are used for navigation and for hiding parts of the
-;; buffer.
-;;
-;; Most sections also represent the objects that Magit works with,
-;; such as files, diffs, hunks, commits, etc.  The 'type' of a section
-;; identifies what kind of object it represents (if any), and the
-;; parent and grand-parent, etc provide the context.
-
-(defstruct magit-section
-  parent title beginning end children hidden type info
-  needs-refresh-on-show)
-
-(defvar magit-top-section nil
-  "The top section of the current buffer.")
-(make-variable-buffer-local 'magit-top-section)
-(put 'magit-top-section 'permanent-local t)
-
-(defvar magit-old-top-section nil)
-
-(defvar magit-section-hidden-default nil)
-
-(defun magit-new-section (title type)
-  "Create a new section with title TITLE and type TYPE in current buffer.
-
-If not `magit-top-section' exist, the new section will be the new top-section
-otherwise, the new-section will be a child of the current top-section.
-
-If TYPE is nil, the section won't be highlighted."
-  (let* ((s (make-magit-section :parent magit-top-section
-                                :title title
-                                :type type
-                                :hidden magit-section-hidden-default))
-         (old (and magit-old-top-section
-                   (magit-find-section (magit-section-path s)
-                                       magit-old-top-section))))
-    (if magit-top-section
-        (push s (magit-section-children magit-top-section))
-      (setq magit-top-section s))
-    (if old
-        (setf (magit-section-hidden s) (magit-section-hidden old)))
-    s))
-
-(defun magit-cancel-section (section)
-  "Delete the section SECTION."
-  (delete-region (magit-section-beginning section)
-                 (magit-section-end section))
-  (let ((parent (magit-section-parent section)))
-    (if parent
-        (setf (magit-section-children parent)
-              (delq section (magit-section-children parent)))
-      (setq magit-top-section nil))))
-
-(defmacro magit-with-section (title type &rest body)
-  "Create a new section of title TITLE and type TYPE and evaluate BODY there.
-
-Sections created inside BODY will become children of the new
-section. BODY must leave point at the end of the created section.
-
-If TYPE is nil, the section won't be highlighted."
-  (declare (indent 2))
-  (let ((s (make-symbol "*section*")))
-    `(let* ((,s (magit-new-section ,title ,type))
-            (magit-top-section ,s))
-       (setf (magit-section-beginning ,s) (point))
-       ,@body
-       (setf (magit-section-end ,s) (point))
-       (setf (magit-section-children ,s)
-             (nreverse (magit-section-children ,s)))
-       ,s)))
-
-(defun magit-set-section (title type start end)
-  "Create a new section of title TITLE and type TYPE with specified start and
-end positions."
-  (let ((section (magit-new-section title type)))
-    (setf (magit-section-beginning section) start)
-    (setf (magit-section-end section) end)
-    section))
-
-(defun magit-set-section-info (info &optional section)
-  (setf (magit-section-info (or section magit-top-section)) info))
-
-(defun magit-set-section-needs-refresh-on-show (flag &optional section)
-  (setf (magit-section-needs-refresh-on-show
-         (or section magit-top-section))
-        flag))
-
-(defmacro magit-create-buffer-sections (&rest body)
-  "Empty current buffer of text and Magit's sections, and then evaluate BODY."
-  (declare (indent 0))
-  `(let ((inhibit-read-only t))
-     (erase-buffer)
-     (let ((magit-old-top-section magit-top-section))
-       (setq magit-top-section nil)
-       ,@body
-       (when (null magit-top-section)
-         (magit-with-section 'top nil
-           (insert "(empty)\n")))
-       (magit-propertize-section magit-top-section)
-       (magit-section-set-hidden magit-top-section
-                                 (magit-section-hidden magit-top-section)))))
-
-(defun magit-propertize-section (section)
-  "Add text-property needed for SECTION."
-  (put-text-property (magit-section-beginning section)
-                     (magit-section-end section)
-                     'magit-section section)
-  (dolist (s (magit-section-children section))
-    (magit-propertize-section s)))
-
-(defun magit-find-section (path top)
-  "Find the section at the path PATH in subsection of section TOP."
-  (if (null path)
-      top
-    (let ((secs (magit-section-children top)))
-      (while (and secs (not (equal (car path)
-                                   (magit-section-title (car secs)))))
-        (setq secs (cdr secs)))
-      (and (car secs)
-           (magit-find-section (cdr path) (car secs))))))
-
-(defun magit-section-path (section)
-  "Return the path of SECTION."
-  (if (not (magit-section-parent section))
-      '()
-    (append (magit-section-path (magit-section-parent section))
-            (list (magit-section-title section)))))
-
-(defun magit-find-section-after (pos)
-  "Find the first section that begins after POS."
-  (magit-find-section-after* pos (list magit-top-section)))
-
-(defun magit-find-section-after* (pos secs)
-  "Find the first section that begins after POS in the list SECS
-\(including children of sections in SECS)."
-  (while (and secs
-              (<= (magit-section-beginning (car secs)) pos))
-    (setq secs (if (magit-section-hidden (car secs))
-                   (cdr secs)
-                 (append (magit-section-children (car secs))
-                         (cdr secs)))))
-  (car secs))
-
-(defun magit-find-section-before (pos)
-  "Return the last section that begins before POS."
-  (let ((section (magit-find-section-at pos)))
-    (do* ((current (or (magit-section-parent section)
-                       section)
-                   next)
-          (next (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))
-                (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))))
-        ((null next) current))))
-
-(defun magit-find-section-before* (pos secs)
-  "Find the last section that begins before POS in the list SECS."
-  (let ((prev nil))
-    (while (and secs
-                (< (magit-section-beginning (car secs)) pos))
-      (setq prev (car secs))
-      (setq secs (cdr secs)))
-    prev))
-
-(defun magit-current-section ()
-  "Return the Magit section at point."
-  (magit-find-section-at (point)))
-
-(defun magit-find-section-at (pos)
-  "Return the Magit section at POS."
-  (or (get-text-property pos 'magit-section)
-      magit-top-section))
-
-(defun magit-insert-section (section-title-and-type
-                             buffer-title washer cmd &rest args)
-  "Run CMD and put its result in a new section.
-
-SECTION-TITLE-AND-TYPE is either a string that is the title of the section
-or (TITLE . TYPE) where TITLE is the title of the section and TYPE is its type.
-
-If there is no type, or if type is nil, the section won't be highlighted.
-
-BUFFER-TITLE is the inserted title of the section
-
-WASHER is a function that will be run after CMD.
-The buffer will be narrowed to the inserted text.
-It should add sectioning as needed for Magit interaction.
-
-CMD is an external command that will be run with ARGS as arguments."
-  (let* ((body-beg nil)
-         (section-title (if (consp section-title-and-type)
-                            (car section-title-and-type)
-                          section-title-and-type))
-         (section-type (if (consp section-title-and-type)
-                           (cdr section-title-and-type)
-                         nil))
-         (section
-          (magit-with-section section-title section-type
-            (if buffer-title
-                (insert (propertize buffer-title 'face 'magit-section-title)
-                        "\n"))
-            (setq body-beg (point))
-            (magit-cmd-insert cmd args)
-            (if (not (eq (char-before) ?\n))
-                (insert "\n"))
-            (if washer
-                (save-restriction
-                  (narrow-to-region body-beg (point))
-                  (goto-char (point-min))
-                  (funcall washer)
-                  (goto-char (point-max)))))))
-    (if (= body-beg (point))
-        (magit-cancel-section section)
-      (insert "\n"))
-    section))
-
-(defun magit-git-section (section-title-and-type
-                          buffer-title washer &rest args)
-  "Run git and put its result in a new section.
-
-see `magit-insert-section' for meaning of the arguments"
-  (apply #'magit-insert-section
-         section-title-and-type
-         buffer-title
-         washer
-         magit-git-executable
-         (append magit-git-standard-options args)))
-
-(defun magit-goto-next-section ()
-  "Go to the next section."
-  (interactive)
-  (let ((next (magit-find-section-after (point))))
-    (if next
-        (magit-goto-section next)
-      (message "No next section"))))
-
-(defun magit-goto-previous-section ()
-  "Go to the previous section."
-  (interactive)
-  (if (eq (point) 1)
-      (message "No previous section")
-    (magit-goto-section (magit-find-section-before (point)))))
-
-(defun magit-goto-parent-section ()
-  "Go to the parent section."
-  (interactive)
-  (let ((parent (magit-section-parent (magit-current-section))))
-    (when parent
-      (goto-char (magit-section-beginning parent)))))
-
-(defun magit-goto-next-sibling-section ()
-  "Go to the next sibling section."
-  (interactive)
-  (let* ((initial (point))
-         (section (magit-current-section))
-         (end (- (magit-section-end section) 1))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (next-sibling (magit-find-section-after* end siblings)))
-    (if next-sibling
-        (magit-goto-section next-sibling)
-      (magit-goto-next-section))))
-
-(defun magit-goto-previous-sibling-section ()
-  "Go to the previous sibling section."
-  (interactive)
-  (let* ((section (magit-current-section))
-         (beginning (magit-section-beginning section))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (previous-sibling (magit-find-section-before* beginning siblings)))
-    (if previous-sibling
-        (magit-goto-section previous-sibling)
-      (magit-goto-parent-section))))
-
-(defun magit-goto-section (section)
-  (goto-char (magit-section-beginning section))
-  (cond
-   ((and magit-log-auto-more
-         (eq (magit-section-type section) 'longer))
-    (magit-log-show-more-entries)
-    (forward-line -1)
-    (magit-goto-next-section))
-   ((and (eq (magit-section-type section) 'commit)
-         (derived-mode-p 'magit-log-mode))
-    (magit-show-commit section))))
-
-(defun magit-goto-section-at-path (path)
-  "Go to the section described by PATH."
-  (let ((sec (magit-find-section path magit-top-section)))
-    (if sec
-        (goto-char (magit-section-beginning sec))
-      (message "No such section"))))
-
-(defun magit-for-all-sections (func &optional top)
-  "Run FUNC on TOP and recursively on all its children.
-
-Default value for TOP is `magit-top-section'"
-  (let ((section (or top magit-top-section)))
-    (when section
-      (funcall func section)
-      (dolist (c (magit-section-children section))
-        (magit-for-all-sections func c)))))
-
-(defun magit-section-set-hidden (section hidden)
-  "Hide SECTION if HIDDEN is not nil, show it otherwise."
-  (setf (magit-section-hidden section) hidden)
-  (if (and (not hidden)
-           (magit-section-needs-refresh-on-show section))
-      (magit-refresh)
-    (let ((inhibit-read-only t)
-          (beg (save-excursion
-                 (goto-char (magit-section-beginning section))
-                 (forward-line)
-                 (point)))
-          (end (magit-section-end section)))
-      (if (< beg end)
-          (put-text-property beg end 'invisible hidden)))
-    (if (not hidden)
-        (dolist (c (magit-section-children section))
-          (magit-section-set-hidden c (magit-section-hidden c))))))
-
-(defun magit-section-any-hidden (section)
-  "Return true if SECTION or any of its children is hidden."
-  (or (magit-section-hidden section)
-      (let ((kids (magit-section-children section)))
-        (while (and kids (not (magit-section-any-hidden (car kids))))
-          (setq kids (cdr kids)))
-        kids)))
-
-(defun magit-section-collapse (section)
-  "Show SECTION and hide all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) t))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand (section)
-  "Show SECTION and all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand-all-aux (section)
-  "Show recursively all SECTION's children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil)
-    (magit-section-expand-all-aux c)))
-
-(defun magit-section-expand-all (section)
-  "Show SECTION and all its children."
-  (magit-section-expand-all-aux section)
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-hideshow (flag-or-func)
-  "Show or hide current section depending on FLAG-OR-FUNC.
-
-If FLAG-OR-FUNC is a function, it will be ran on current section
-IF FLAG-OR-FUNC is a Boolean value, the section will be hidden if its true, shown otherwise"
-  (let ((section (magit-current-section)))
-    (when (magit-section-parent section)
-      (goto-char (magit-section-beginning section))
-      (if (functionp flag-or-func)
-          (funcall flag-or-func section)
-        (magit-section-set-hidden section flag-or-func)))))
-
-(defun magit-show-section ()
-  "Show current section."
-  (interactive)
-  (magit-section-hideshow nil))
-
-(defun magit-hide-section ()
-  "Hide current section."
-  (interactive)
-  (magit-section-hideshow t))
-
-(defun magit-collapse-section ()
-  "Hide all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-collapse))
-
-(defun magit-expand-section ()
-  "Show all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-expand))
-
-(defun magit-toggle-file-section ()
-  "Like `magit-toggle-section' but toggle at file granularity."
-  (interactive)
-  (when (eq 'hunk (first (magit-section-context-type (magit-current-section))))
-    (magit-goto-parent-section))
-  (magit-toggle-section))
-
-(defun magit-toggle-section ()
-  "Toggle hidden status of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (magit-section-set-hidden s (not (magit-section-hidden s))))))
-
-(defun magit-expand-collapse-section ()
-  "Toggle hidden status of subsections of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-any-hidden s)
-            (magit-section-expand-all s))
-           (t
-            (magit-section-collapse s))))))
-
-(defun magit-cycle-section ()
-  "Cycle between expanded, hidden and collapsed state for current section.
-
-Hidden: only the first line of the section is shown
-Collapsed: only the first line of the subsection is shown
-Expanded: everything is shown."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-hidden s)
-            (magit-section-collapse s))
-           ((notany #'magit-section-hidden (magit-section-children s))
-            (magit-section-set-hidden s t))
-           (t
-            (magit-section-expand s))))))
-
-(defun magit-section-lineage (s)
-  "Return list of parent, grand-parents... for section S."
-  (when s
-    (cons s (magit-section-lineage (magit-section-parent s)))))
-
-(defun magit-section-show-level (section level threshold path)
-  (magit-section-set-hidden section (>= level threshold))
-  (when (and (< level threshold)
-             (not (magit-no-commit-p)))
-    (if path
-        (magit-section-show-level (car path) (1+ level) threshold (cdr path))
-      (dolist (c (magit-section-children section))
-        (magit-section-show-level c (1+ level) threshold nil)))))
-
-(defun magit-show-level (level all)
-  "Show section whose level is less than LEVEL, hide the others.
-If ALL is non nil, do this in all sections,
-otherwise do it only on ancestors and descendants of current section."
-  (magit-with-refresh
-    (if all
-        (magit-section-show-level magit-top-section 0 level nil)
-      (let ((path (reverse (magit-section-lineage (magit-current-section)))))
-        (magit-section-show-level (car path) 0 level (cdr path))))))
-
-(defun magit-show-only-files ()
-  "Show section that are files, but not there subsection.
-
-Do this in on ancestors and descendants of current section."
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2)
-    (call-interactively 'magit-show-level-1)))
-
-(defun magit-show-only-files-all ()
-  "Show section that are files, but not there subsection.
-
-Do this for all sections"
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2-all)
-    (call-interactively 'magit-show-level-1-all)))
-
-(defmacro magit-define-level-shower-1 (level all)
-  "Define an interactive function to show function of level LEVEL.
-
-If ALL is non nil, this function will affect all section,
-otherwise it will affect only ancestors and descendants of current section."
-  (let ((fun (intern (format "magit-show-level-%s%s"
-                             level (if all "-all" ""))))
-        (doc (format "Show sections on level %s." level)))
-    `(defun ,fun ()
-       ,doc
-       (interactive)
-       (magit-show-level ,level ,all))))
-
-(defmacro magit-define-level-shower (level)
-  "Define two interactive function to show function of level LEVEL.
-one for all, one for current lineage."
-  `(progn
-     (magit-define-level-shower-1 ,level nil)
-     (magit-define-level-shower-1 ,level t)))
-
-(defmacro magit-define-section-jumper (sym title)
-  "Define an interactive function to go to section SYM.
-
-TITLE is the displayed title of the section."
-  (let ((fun (intern (format "magit-jump-to-%s" sym)))
-        (doc (format "Jump to section `%s'." title)))
-    `(progn
-       (defun ,fun ()
-         ,doc
-         (interactive)
-         (magit-goto-section-at-path '(,sym)))
-       (put ',fun 'definition-name ',sym))))
-
-(defmacro magit-define-inserter (sym arglist &rest body)
-  (declare (indent defun))
-  (let ((fun (intern (format "magit-insert-%s" sym)))
-        (before (intern (format "magit-before-insert-%s-hook" sym)))
-        (after (intern (format "magit-after-insert-%s-hook" sym)))
-        (doc (format "Insert items for `%s'." sym)))
-    `(progn
-       (defvar ,before nil)
-       (defvar ,after nil)
-       (defun ,fun ,arglist
-         ,doc
-         (run-hooks ',before)
-         ,@body
-         (run-hooks ',after))
-       (put ',before 'definition-name ',sym)
-       (put ',after 'definition-name ',sym)
-       (put ',fun 'definition-name ',sym))))
-
-(defvar magit-highlighted-section nil)
-
-(defun magit-refine-section (section)
-  "Apply temporary refinements to the display of SECTION.
-Refinements can be undone with `magit-unrefine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; Refine the current hunk to show fine details, using
-           ;; diff-mode machinery.
-           (save-excursion
-             (goto-char (magit-section-beginning magit-highlighted-section))
-             (diff-refine-hunk))))))
-
-(defun magit-unrefine-section (section)
-  "Remove refinements to the display of SECTION done by `magit-refine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; XXX this should be in some diff-mode function, like
-           ;; `diff-unrefine-hunk'
-           (remove-overlays (magit-section-beginning section)
-                            (magit-section-end section)
-                            'diff-mode 'fine)))))
-
-(defvar magit-highlight-overlay nil)
-
-(defun magit-highlight-section ()
-  "Highlight current section if it has a type."
-  (let ((section (magit-current-section)))
-    (when (not (eq section magit-highlighted-section))
-      (when magit-highlighted-section
-        ;; remove any refinement from previous hunk
-        (magit-unrefine-section magit-highlighted-section))
-      (setq magit-highlighted-section section)
-      (if (not magit-highlight-overlay)
-          (let ((ov (make-overlay 1 1)))
-            (overlay-put ov 'face 'magit-item-highlight)
-            (setq magit-highlight-overlay ov)))
-      (if (and section (magit-section-type section))
-          (progn
-            (magit-refine-section section)
-            (move-overlay magit-highlight-overlay
-                          (magit-section-beginning section)
-                          (magit-section-end section)
-                          (current-buffer)))
-        (delete-overlay magit-highlight-overlay)))))
-
-(defun magit-section-context-type (section)
-  (if (null section)
-      '()
-    (let ((c (or (magit-section-type section)
-                 (if (symbolp (magit-section-title section))
-                     (magit-section-title section)))))
-      (if c
-          (cons c (magit-section-context-type
-                   (magit-section-parent section)))
-        '()))))
-
-(defun magit-prefix-p (prefix list)
-  "Returns non-nil if PREFIX is a prefix of LIST.  PREFIX and LIST should both be
-lists.
-
-If the car of PREFIX is the symbol '*, then return non-nil if the cdr of PREFIX
-is a sublist of LIST (as if '* matched zero or more arbitrary elements of LIST)"
-  ;;; Very schemish...
-  (or (null prefix)
-      (if (eq (car prefix) '*)
-          (or (magit-prefix-p (cdr prefix) list)
-              (and (not (null list))
-                   (magit-prefix-p prefix (cdr list))))
-        (and (not (null list))
-             (equal (car prefix) (car list))
-             (magit-prefix-p (cdr prefix) (cdr list))))))
-
-(defmacro magit-section-case (head &rest clauses)
-  "Make different action depending of current section.
-
-HEAD is (SECTION INFO &optional OPNAME),
-  SECTION will be bind to the current section,
-  INFO will be bind to the info's of the current section,
-  OPNAME is a string that will be used to describe current action,
-
-CLAUSES is a list of CLAUSE, each clause is (SECTION-TYPE &BODY)
-where SECTION-TYPE describe section where BODY will be run.
-
-This returns non-nil if some section matches. If the
-corresponding body return a non-nil value, it is returned,
-otherwise it returns t.
-
-If no section matches, this returns nil if no OPNAME was given
-and throws an error otherwise."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (make-symbol "*type*"))
-        (context (make-symbol "*context*"))
-        (opname (caddr head)))
-    `(let* ((,section (magit-current-section))
-            (,info (and ,section (magit-section-info ,section)))
-            (,type (and ,section (magit-section-type ,section)))
-            (,context (magit-section-context-type ,section)))
-       (cond ,@(mapcar (lambda (clause)
-                         (if (eq (car clause) t)
-                             `(t (or (progn ,@(cdr clause))
-                                     t))
-                           (let ((prefix (reverse (car clause)))
-                                 (body (cdr clause)))
-                             `((magit-prefix-p ',prefix ,context)
-                               (or (progn ,@body)
-                                   t)))))
-                       clauses)
-             ,@(when opname
-                 `(((run-hook-with-args-until-success
-                     ',(intern (format "magit-%s-action-hook" opname))))
-                   ((not ,type)
-                    (error "Nothing to %s here" ,opname))
-                   (t
-                    (error "Can't %s a %s"
-                           ,opname
-                           (or (get ,type 'magit-description)
-                               ,type)))))))))
-
-(defmacro magit-section-action (head &rest clauses)
-  (declare (indent 1))
-  `(magit-with-refresh
-     (magit-section-case ,head ,@clauses)))
-
-(defmacro magit-add-action (head &rest clauses)
-  "Add additional actions to a pre-existing operator.
-The syntax is identical to `magit-section-case', except that
-OPNAME is mandatory and specifies the operation to which to add
-the actions."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (caddr head)))
-    `(add-hook ',(intern (format "magit-%s-action-hook" type))
-               (lambda ()
-                 ,(macroexpand
-                   ;; Don't pass in the opname so we don't recursively
-                   ;; run the hook again, and so we don't throw an
-                   ;; error if no action matches.
-                   `(magit-section-case (,section ,info)
-                      ,@clauses))))))
-
-(defun magit-wash-sequence (func)
-  "Run FUNC until end of buffer is reached.
-
-FUNC should leave point at the end of the modified region"
-  (while (and (not (eobp))
-              (funcall func))))
-
-(defmacro magit-define-command (sym arglist &rest body)
-  "Macro to define a magit command.
-It will define the magit-SYM function having ARGLIST as argument.
-It will also define the magit-SYM-command-hook variable.
-
-The defined function will call the function in the hook in
-order until one return non nil. If they all return nil then body will be called.
-
-It is used to define hookable magit command: command defined by this
-function can be enriched by magit extension like magit-topgit and magit-svn"
-  (declare (indent defun)
-           (debug (&define name lambda-list
-                           [&optional stringp]        ; Match the doc string, if present.
-                           [&optional ("interactive" interactive)]
-                           def-body)))
-  (let ((fun (intern (format "magit-%s" sym)))
-        (hook (intern (format "magit-%s-command-hook" sym)))
-        (doc (format "Command for `%s'." sym))
-        (inter nil)
-        (instr body))
-    (when (stringp (car body))
-      (setq doc (car body)
-            instr (cdr body)))
-    (let ((form (car instr)))
-      (when (eq (car form) 'interactive)
-        (setq inter form
-              instr (cdr instr))))
-    `(progn
-       (defvar ,hook nil)
-       (defun ,fun ,arglist
-         ,doc
-         ,inter
-         (or (run-hook-with-args-until-success
-              ',hook ,@(remq '&optional (remq '&rest arglist)))
-             ,@instr))
-       (put ',fun 'definition-name ',sym)
-       (put ',hook 'definition-name ',sym))))
-
-;;; Running commands
-
-(defun magit-set-mode-line-process (str)
-  (let ((pr (if str (concat " " str) "")))
-    (save-excursion
-      (magit-for-all-buffers (lambda ()
-                               (setq mode-line-process pr))))))
-
-(defun magit-process-indicator-from-command (comps)
-  (if (magit-prefix-p (cons magit-git-executable magit-git-standard-options)
-                      comps)
-      (setq comps (nthcdr (+ (length magit-git-standard-options) 1) comps)))
-  (cond ((or (null (cdr comps))
-             (not (member (car comps) '("remote"))))
-         (car comps))
-        (t
-         (concat (car comps) " " (cadr comps)))))
-
-(defvar magit-process nil)
-(defvar magit-process-client-buffer nil)
-(defvar magit-process-buffer-name "*magit-process*"
-  "Buffer name for running git commands.")
-
-(defun magit-run* (cmd-and-args
-                   &optional logline noerase noerror nowait input)
-  (if (and magit-process
-           (get-buffer magit-process-buffer-name))
-      (error "Git is already running"))
-  (let ((cmd (car cmd-and-args))
-        (args (cdr cmd-and-args))
-        (dir default-directory)
-        (buf (get-buffer-create magit-process-buffer-name))
-        (successp nil))
-    (magit-set-mode-line-process
-     (magit-process-indicator-from-command cmd-and-args))
-    (setq magit-process-client-buffer (current-buffer))
-    (with-current-buffer buf
-      (view-mode 1)
-      (set (make-local-variable 'view-no-disable-on-exit) t)
-      (setq view-exit-action
-            (lambda (buffer)
-              (with-current-buffer buffer
-                (bury-buffer))))
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (setq default-directory dir)
-        (if noerase
-            (goto-char (point-max))
-          (erase-buffer))
-        (insert "$ " (or logline
-                         (mapconcat 'identity cmd-and-args " "))
-                "\n")
-        (cond (nowait
-               (setq magit-process
-                     (let ((process-connection-type magit-process-connection-type))
-                       (apply 'magit-start-process cmd buf cmd args)))
-               (set-process-sentinel magit-process 'magit-process-sentinel)
-               (set-process-filter magit-process 'magit-process-filter)
-               (when input
-                 (with-current-buffer input
-                   (process-send-region magit-process
-                                        (point-min) (point-max)))
-                 (process-send-eof magit-process)
-                 (sit-for 0.1 t))
-               (cond ((= magit-process-popup-time 0)
-                      (pop-to-buffer (process-buffer magit-process)))
-                     ((> magit-process-popup-time 0)
-                      (run-with-timer
-                       magit-process-popup-time nil
-                       (function
-                        (lambda (buf)
-                          (with-current-buffer buf
-                            (when magit-process
-                              (display-buffer (process-buffer magit-process))
-                              (goto-char (point-max))))))
-                       (current-buffer))))
-               (setq successp t))
-              (input
-               (with-current-buffer input
-                 (setq default-directory dir)
-                 (setq magit-process
-                       ;; Don't use a pty, because it would set icrnl
-                       ;; which would modify the input (issue #20).
-                       (let ((process-connection-type nil))
-                         (apply 'magit-start-process cmd buf cmd args)))
-                 (set-process-filter magit-process 'magit-process-filter)
-                 (process-send-region magit-process
-                                      (point-min) (point-max))
-                 (process-send-eof magit-process)
-                 (while (equal (process-status magit-process) 'run)
-                   (sit-for 0.1 t))
-                 (setq successp
-                       (equal (process-exit-status magit-process) 0))
-                 (setq magit-process nil))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))
-              (t
-               (setq successp
-                     (equal (apply 'process-file cmd nil buf nil args) 0))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))))
-      (or successp
-          noerror
-          (error
-           "%s ... [Hit %s or see buffer %s for details]"
-           (or (with-current-buffer (get-buffer magit-process-buffer-name)
-                 (when (re-search-backward
-                        (concat "^error: \\(.*\\)" paragraph-separate) nil t)
-                   (match-string 1)))
-               "Git failed")
-           (with-current-buffer magit-process-client-buffer
-             (key-description (car (where-is-internal
-                                    'magit-display-process))))
-           magit-process-buffer-name))
-      successp)))
-
-(autoload 'dired-uncache "dired")
-(defun magit-process-sentinel (process event)
-  (let ((msg (format "%s %s." (process-name process) (substring event 0 -1)))
-        (successp (string-match "^finished" event))
-        (key (with-current-buffer magit-process-client-buffer
-               (key-description (car (where-is-internal
-                                      'magit-display-process))))))
-    (with-current-buffer (process-buffer process)
-      (let ((inhibit-read-only t))
-        (goto-char (point-max))
-        (insert msg "\n")
-        (message (if successp msg
-                   (format "%s Hit %s or see buffer %s for details."
-                           msg key (current-buffer)))))
-      (unless (memq (process-status process) '(run open))
-        (dired-uncache default-directory)))
-    (setq magit-process nil)
-    (magit-set-mode-line-process nil)
-    (magit-refresh-buffer magit-process-client-buffer)))
-
-(defun magit-password (proc string)
-  "Checks if git/ssh asks for a password and ask the user for it."
-  (let (ask)
-    (cond ((or (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
-               (string-match "^\\\(.*\\\)'s password:" string)
-               (string-match "^Password for '\\\(.*\\\)':" string))
-           (setq ask (format "Password for '%s': " (match-string 1 string))))
-          ((string-match "^[pP]assword:" string)
-           (setq ask "Password:")))
-    (when ask
-      (process-send-string proc (concat (read-passwd ask nil) "\n")))))
-
-(defun magit-username (proc string)
-  "Checks if git asks for a username and ask the user for it."
-  (when (string-match "^Username for '\\\(.*\\\)':" string)
-    (process-send-string proc
-                         (concat
-                          (read-string (format "Username for '%s': "
-                                               (match-string 1 string))
-                                       nil nil (user-login-name))
-                          "\n"))))
-
-(defun magit-process-filter (proc string)
-  (save-current-buffer
-    (set-buffer (process-buffer proc))
-    (let ((inhibit-read-only t))
-      (magit-username proc string)
-      (magit-password proc string)
-      (goto-char (process-mark proc))
-      ;; Find last ^M in string.  If one was found, ignore everything
-      ;; before it and delete the current line.
-      (let ((ret-pos (length string)))
-        (while (and (>= (setq ret-pos (1- ret-pos)) 0)
-                    (/= ?\r (aref string ret-pos))))
-        (cond ((>= ret-pos 0)
-               (goto-char (line-beginning-position))
-               (delete-region (point) (line-end-position))
-               (insert (substring string (+ ret-pos 1))))
-              (t
-               (insert string))))
-      (set-marker (process-mark proc) (point)))))
-
-(defun magit-run (cmd &rest args)
-  (magit-with-refresh
-    (magit-run* (cons cmd args))))
-
-(defun magit-run-git (&rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args))))
-
-(defun magit-run-git-with-input (input &rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args)
-                nil nil nil nil input)))
-
-(defun magit-run-git-async (&rest args)
-  (message "Running %s %s" magit-git-executable (mapconcat 'identity args " "))
-  (magit-run* (append (cons magit-git-executable
-                            magit-git-standard-options)
-                      args)
-              nil nil nil t))
-
-(defun magit-run-async-with-input (input cmd &rest args)
-  (magit-run* (cons cmd args) nil nil nil t input))
-
-(defun magit-display-process ()
-  "Display output from most recent git command."
-  (interactive)
-  (unless (get-buffer magit-process-buffer-name)
-    (error "No Git commands have run"))
-  (display-buffer magit-process-buffer-name))
-
-;;; Mode
-
-;; We define individual functions (instead of using lambda etc) so
-;; that the online help can show something meaningful.
-
-(magit-define-section-jumper untracked "Untracked files")
-(magit-define-section-jumper unstaged  "Unstaged changes")
-(magit-define-section-jumper staged    "Staged changes")
-(magit-define-section-jumper unpushed  "Unpushed commits")
-
-(magit-define-level-shower 1)
-(magit-define-level-shower 2)
-(magit-define-level-shower 3)
-(magit-define-level-shower 4)
-
-(easy-menu-define magit-mode-menu magit-mode-map
-  "Magit menu"
-  '("Magit"
-    ["Refresh" magit-refresh t]
-    ["Refresh all" magit-refresh-all t]
-    "---"
-    ["Stage" magit-stage-item t]
-    ["Stage all" magit-stage-all t]
-    ["Unstage" magit-unstage-item t]
-    ["Unstage all" magit-unstage-all t]
-    ["Commit" magit-log-edit t]
-    ["Add log entry" magit-add-log t]
-    ["Tag" magit-tag t]
-    ["Annotated tag" magit-annotated-tag t]
-    "---"
-    ["Diff working tree" magit-diff-working-tree t]
-    ["Diff" magit-diff t]
-    ("Log"
-     ["Short Log" magit-log t]
-     ["Long Log" magit-log-long t]
-     ["Reflog" magit-reflog t]
-     ["Extended..." magit-key-mode-popup-logging t])
-    "---"
-    ["Cherry pick" magit-cherry-pick-item t]
-    ["Apply" magit-apply-item t]
-    ["Revert" magit-revert-item t]
-    "---"
-    ["Ignore" magit-ignore-item t]
-    ["Ignore locally" magit-ignore-item-locally t]
-    ["Discard" magit-discard-item t]
-    ["Reset head" magit-reset-head t]
-    ["Reset working tree" magit-reset-working-tree t]
-    ["Stash" magit-stash t]
-    ["Snapshot" magit-stash-snapshot t]
-    "---"
-    ["Branch..." magit-checkout t]
-    ["Merge" magit-manual-merge t]
-    ["Interactive resolve" magit-interactive-resolve-item t]
-    ["Rebase" magit-rebase-step t]
-    ("Rewrite"
-     ["Start" magit-rewrite-start t]
-     ["Stop" magit-rewrite-stop t]
-     ["Finish" magit-rewrite-finish t]
-     ["Abort" magit-rewrite-abort t]
-     ["Set used" magit-rewrite-set-used t]
-     ["Set unused" magit-rewrite-set-unused t])
-    "---"
-    ["Push" magit-push t]
-    ["Pull" magit-pull t]
-    ["Remote update" magit-remote-update t]
-    ("Submodule"
-     ["Submodule update" magit-submodule-update t]
-     ["Submodule update and init" magit-submodule-update-init t]
-     ["Submodule init" magit-submodule-init t]
-     ["Submodule sync" magit-submodule-sync t])
-    "---"
-    ("Extensions")
-    "---"
-    ["Display Git output" magit-display-process t]
-    ["Quit Magit" magit-quit-window t]))
-
-(defvar magit-mode-hook nil "Hook run by `magit-mode'.")
-
-(put 'magit-mode 'mode-class 'special)
-
-(defvar magit-refresh-function nil)
-(make-variable-buffer-local 'magit-refresh-function)
-(put 'magit-refresh-function 'permanent-local t)
-
-(defvar magit-refresh-args nil)
-(make-variable-buffer-local 'magit-refresh-args)
-(put 'magit-refresh-args 'permanent-local t)
-
-(defvar last-point)
-
-(defun magit-remember-point ()
-  (setq last-point (point)))
-
-(defun magit-invisible-region-end (pos)
-  (while (and (not (= pos (point-max))) (invisible-p pos))
-    (setq pos (next-char-property-change pos)))
-  pos)
-
-(defun magit-invisible-region-start (pos)
-  (while (and (not (= pos (point-min))) (invisible-p pos))
-    (setq pos (1- (previous-char-property-change pos))))
-  pos)
-
-(defun magit-correct-point-after-command ()
-  "Move point outside of invisible regions.
-
-Emacs often leaves point in invisible regions, it seems.  To fix
-this, we move point ourselves and never let Emacs do its own
-adjustments.
-
-When point has to be moved out of an invisible region, it can be
-moved to its end or its beginning.  We usually move it to its
-end, except when that would move point back to where it was
-before the last command."
-  (if (invisible-p (point))
-      (let ((end (magit-invisible-region-end (point))))
-        (goto-char (if (= end last-point)
-                       (magit-invisible-region-start (point))
-                     end))))
-  (setq disable-point-adjustment t))
-
-(defun magit-post-command-hook ()
-  (magit-correct-point-after-command)
-  (magit-highlight-section))
-
-(defun magit-mode ()
-  "Review the status of a git repository and act on it.
-
-Please see the manual for a complete description of Magit.
-
-\\{magit-mode-map}"
-  (kill-all-local-variables)
-  (buffer-disable-undo)
-  (setq buffer-read-only t
-        truncate-lines t
-        major-mode 'magit-mode
-        mode-name "Magit"
-        mode-line-process "")
-  (add-hook 'pre-command-hook #'magit-remember-point nil t)
-  (add-hook 'post-command-hook #'magit-post-command-hook t t)
-  (use-local-map magit-mode-map)
-  (setq magit-current-indentation (magit-indentation-for default-directory))
-  ;; Emacs' normal method of showing trailing whitespace gives weird
-  ;; results when `magit-whitespace-warning-face' is different from
-  ;; `trailing-whitespace'.
-  (if (and magit-highlight-whitespace magit-highlight-trailing-whitespace)
-      (setq show-trailing-whitespace nil))
-  (run-mode-hooks 'magit-mode-hook))
-
-(defun magit-mode-init (dir submode refresh-func &rest refresh-args)
-  (setq default-directory dir
-        magit-refresh-function refresh-func
-        magit-refresh-args refresh-args)
-  (funcall submode)
-  (magit-refresh-buffer))
-
-(defun magit-indentation-for (dir)
-  (let (result)
-    (dolist (pair magit-highlight-indentation)
-      (if (string-match-p (car pair) dir)
-          (setq result (cdr pair))))
-    result))
-
-(defun magit-find-buffer (submode &optional dir)
-  (let ((topdir (magit-get-top-dir (or dir default-directory))))
-    (dolist (buf (buffer-list))
-      (if (with-current-buffer buf
-            (and (eq major-mode submode)
-                 default-directory
-                 (equal (expand-file-name default-directory) topdir)))
-          (return buf)))))
-
-(defun magit-find-status-buffer (&optional dir)
-  (magit-find-buffer 'magit-status-mode dir))
-
-(defun magit-for-all-buffers (func &optional dir)
-  (dolist (buf (buffer-list))
-    (with-current-buffer buf
-      (if (and (derived-mode-p 'magit-mode)
-               (or (null dir)
-                   (equal default-directory dir)))
-          (funcall func)))))
-
-(defun magit-refresh-buffer (&optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (let* ((old-line (line-number-at-pos))
-           (old-point (point))
-           (old-section (magit-current-section))
-           (old-path (and old-section
-                          (magit-section-path (magit-current-section)))))
-      (beginning-of-line)
-      (let ((section-line (and old-section
-                               (count-lines
-                                (magit-section-beginning old-section)
-                                (point))))
-            (line-char (- old-point (point))))
-        (if magit-refresh-function
-            (apply magit-refresh-function
-                   magit-refresh-args))
-        (magit-refresh-marked-commits-in-buffer)
-        (let ((s (and old-path (magit-find-section old-path magit-top-section))))
-          (cond (s
-                 (goto-char (magit-section-beginning s))
-                 (forward-line section-line)
-                 (forward-char line-char))
-                (t
-                 (magit-goto-line old-line)))
-          (dolist (w (get-buffer-window-list (current-buffer)))
-            (set-window-point w (point)))
-          (magit-highlight-section))))))
-
-(defun magit-string-has-prefix-p (string prefix)
-  (eq (compare-strings string nil (length prefix) prefix nil nil) t))
-
-(defun magit-revert-buffers (dir &optional ignore-modtime)
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               ;; don't revert indirect buffers, as the parent will be reverted
-               (not (buffer-base-buffer buffer))
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir)
-               (file-readable-p (buffer-file-name buffer))
-               (or ignore-modtime (not (verify-visited-file-modtime buffer)))
-               (not (buffer-modified-p buffer)))
-      (with-current-buffer buffer
-        (condition-case var
-            (revert-buffer t t nil)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defun magit-update-vc-modeline (dir)
-  "Update the modeline for buffers representable by magit."
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir))
-      (with-current-buffer buffer
-        (condition-case var
-            (vc-find-file-hook)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defvar magit-refresh-needing-buffers nil)
-(defvar magit-refresh-pending nil)
-
-(defun magit-refresh-wrapper (func)
-  (if magit-refresh-pending
-      (funcall func)
-    (let* ((dir default-directory)
-           (status-buffer (magit-find-status-buffer dir))
-           (magit-refresh-needing-buffers nil)
-           (magit-refresh-pending t))
-      (unwind-protect
-          (funcall func)
-        (when magit-refresh-needing-buffers
-          (magit-revert-buffers dir)
-          (dolist (b (adjoin status-buffer
-                             magit-refresh-needing-buffers))
-            (magit-refresh-buffer b)))))))
-
-(defun magit-need-refresh (&optional buffer)
-  "Mark BUFFER as needing to be refreshed.  If BUFFER is nil, use the
-current buffer."
-  (pushnew (or buffer (current-buffer)) magit-refresh-needing-buffers :test 'eq))
-
-(defun magit-refresh ()
-  "Refresh current buffer to match repository state.
-Also revert every unmodified buffer visiting files
-in the corresponding directory."
-  (interactive)
-  (magit-with-refresh
-    (magit-need-refresh)))
-
-(defun magit-refresh-all ()
-  "Refresh all magit buffers to match respective repository states.
-Also revert every unmodified buffer visiting files
-in the corresponding directories."
-  (interactive)
-  (magit-for-all-buffers #'magit-refresh-buffer default-directory))
-
-;;; Untracked files
-
-(defun magit-wash-untracked-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\t" file "\n"))
-        t)
-    nil))
-
-(defun magit-wash-untracked-files ()
-  ;; Setting magit-old-top-section to nil speeds up washing: no time
-  ;; is wasted looking up the old visibility, which doesn't matter for
-  ;; untracked files.
-  ;;
-  ;; XXX - speed this up in a more general way.
-  ;;
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-untracked-file)))
-
-(defun magit-insert-untracked-files ()
-  (unless (string= (magit-get "status" "showUntrackedFiles") "no")
-    (apply 'magit-git-section
-           `(untracked
-             "Untracked files:"
-             magit-wash-untracked-files
-             "ls-files" "--others" "-t" "--exclude-standard"
-             ,@(when magit-omit-untracked-dir-contents
-                 '("--directory"))))))
-
-;;; Diffs and Hunks
-
-(defvar magit-diff-context-lines 3)
-
-(defun magit-diff-U-arg ()
-  (format "-U%d" magit-diff-context-lines))
-
-(defun magit-diff-smaller-hunks (&optional count)
-  "Decrease the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (max 0 (- magit-diff-context-lines count)))
-  (magit-refresh))
-
-(defun magit-diff-larger-hunks (&optional count)
-  "Increase the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (+ magit-diff-context-lines count))
-  (magit-refresh))
-
-(defun magit-diff-default-hunks ()
-  "Reset context for diff hunks to the default size."
-  (interactive "")
-  (setq magit-diff-context-lines 3)
-  (magit-refresh))
-
-(defun magit-toggle-diff-refine-hunk (&optional other)
-  (interactive "P")
-  "Turn diff-hunk refining on or off.
-
-If hunk refining is currently on, then hunk refining is turned off.
-If hunk refining is off, then hunk refining is turned on, in
-`selected' mode (only the currently selected hunk is refined).
-
-With a prefix argument, the \"third choice\" is used instead:
-If hunk refining is currently on, then refining is kept on, but
-the refining mode (`selected' or `all') is switched.
-If hunk refining is off, then hunk refining is turned on, in
-`all' mode (all hunks refined).
-
-Customize `magit-diff-refine-hunk' to change the default mode."
-  (let* ((old magit-diff-refine-hunk)
-         (new
-          (if other
-              (if (eq old 'all) t 'all)
-            (not old))))
-
-    ;; remove any old refining in currently highlighted section
-    (when (and magit-highlighted-section old (not (eq old 'all)))
-      (magit-unrefine-section magit-highlighted-section))
-
-    ;; set variable to new value locally
-    (set (make-local-variable 'magit-diff-refine-hunk) new)
-
-    ;; if now highlighting in "selected only" mode, turn refining back
-    ;; on in the current section
-    (when (and magit-highlighted-section new (not (eq new 'all)))
-      (magit-refine-section magit-highlighted-section))
-
-    ;; `all' mode being turned on or off needs a complete refresh
-    (when (or (eq old 'all) (eq new 'all))
-      (magit-refresh))))
-
-(defun magit-diff-line-file ()
-  (cond ((looking-at "^diff --git ./\\(.*\\) ./\\(.*\\)$")
-         (match-string-no-properties 2))
-        ((looking-at "^diff --cc +\\(.*\\)$")
-         (match-string-no-properties 1))
-        (t
-         nil)))
-
-(defun magit-wash-diffs ()
-  (magit-wash-sequence #'magit-wash-diff-or-other-file))
-
-(defun magit-wash-diff-or-other-file ()
-  (or (magit-wash-diff)
-      (magit-wash-other-file)))
-
-(defun magit-wash-other-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\tNew      " file "\n"))
-        t)
-    nil))
-
-(defvar magit-hide-diffs nil)
-
-(defvar magit-indentation-level 1)
-
-(defun magit-insert-diff-title (status file file2)
-  (let ((status-text (case status
-                       ((unmerged)
-                        (format "Unmerged   %s" file))
-                       ((new)
-                        (format "New        %s" file))
-                       ((deleted)
-                        (format "Deleted    %s" file))
-                       ((renamed)
-                        (format "Renamed    %s   (from %s)"
-                                file file2))
-                       ((modified)
-                        (format "Modified   %s" file))
-                       ((typechange)
-                        (format "Typechange %s" file))
-                       (t
-                        (format "?          %s" file)))))
-    (insert (make-string magit-indentation-level ?\t) status-text "\n")))
-
-(defvar magit-current-diff-range nil
-  "Used internally when setting up magit diff sections.")
-
-(defun magit-wash-typechange-section (file)
-  (magit-set-section-info (list 'typechange file))
-  (let ((first-start (point-marker))
-        (second-start (progn (forward-line 1)
-                             (search-forward-regexp "^diff")
-                             (beginning-of-line)
-                             (point-marker))))
-    (let ((magit-indentation-level (+ magit-indentation-level 1)))
-      (save-restriction
-        (narrow-to-region first-start second-start)
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section)))
-      (save-restriction
-        (narrow-to-region second-start (point-max))
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section))))))
-
-(defun magit-wash-diff-section ()
-  (cond ((looking-at "^\\* Unmerged path \\(.*\\)")
-         (let ((file (match-string-no-properties 1)))
-           (delete-region (point) (line-end-position))
-           (insert "\tUnmerged " file "\n")
-           (magit-set-section-info (list 'unmerged file nil))
-           t))
-        ((looking-at "^diff")
-         (let ((file (magit-diff-line-file))
-               (end (save-excursion
-                      (forward-line) ;; skip over "diff" line
-                      (if (search-forward-regexp "^diff\\|^@@" nil t)
-                          (goto-char (match-beginning 0))
-                        (goto-char (point-max)))
-                      (point-marker))))
-           (let* ((status (cond
-                           ((looking-at "^diff --cc")
-                            'unmerged)
-                           ((save-excursion
-                              (search-forward-regexp "^new file" end t))
-                            'new)
-                           ((save-excursion
-                              (search-forward-regexp "^deleted" end t))
-                            'deleted)
-                           ((save-excursion
-                              (search-forward-regexp "^rename" end t))
-                            'renamed)
-                           (t
-                            'modified)))
-                  (file2 (cond
-                          ((save-excursion
-                             (search-forward-regexp "^rename from \\(.*\\)"
-                                                    end t))
-                           (match-string-no-properties 1)))))
-             (magit-set-section-info (list status
-                                           file
-                                           (or file2 file)
-                                           magit-current-diff-range))
-             (magit-insert-diff-title status file file2)
-             (when (search-forward-regexp "\\(--- \\(.*\\)\n\\+\\+\\+ \\(.*\\)\n\\)" () t)
-               (when (match-string 1)
-                 (add-text-properties (match-beginning 1) (match-end 1)
-                                      '(face magit-diff-hunk-header))
-                 (add-text-properties (match-beginning 2) (match-end 2)
-                                      '(face magit-diff-file-header))
-                 (add-text-properties (match-beginning 3) (match-end 3)
-                                      '(face magit-diff-file-header))))
-             (goto-char end)
-             (let ((magit-section-hidden-default nil))
-               (magit-wash-sequence #'magit-wash-hunk))))
-         t)
-        (t
-         nil)))
-
-(defun magit-wash-diff ()
-  (let ((magit-section-hidden-default magit-hide-diffs))
-    (magit-with-section (magit-current-line) 'diff
-      (magit-wash-diff-section))))
-
-(defun magit-diff-item-kind (diff)
-  (car (magit-section-info diff)))
-
-(defun magit-diff-item-file (diff)
-  (cadr (magit-section-info diff)))
-
-(defun magit-diff-item-file2 (diff)
-  (caddr (magit-section-info diff)))
-
-(defun magit-diff-item-range (diff)
-  (nth 3 (magit-section-info diff)))
-
-(defun magit-wash-hunk ()
-  (cond ((looking-at "\\(^@+\\)[^@]*@+.*")
-         (let ((n-columns (1- (length (match-string 1))))
-               (head (match-string 0))
-               (hunk-start-pos (point)))
-           (magit-with-section head 'hunk
-             (add-text-properties (match-beginning 0) (match-end 0)
-                                  '(face magit-diff-hunk-header))
-             (forward-line)
-             (while (not (or (eobp)
-                             (looking-at "^diff\\|^@@")))
-               (magit-highlight-line-whitespace)
-               (let ((prefix (buffer-substring-no-properties
-                              (point) (min (+ (point) n-columns) (point-max)))))
-                 (cond ((string-match "\\+" prefix)
-                        (magit-put-line-property 'face 'magit-diff-add))
-                       ((string-match "-" prefix)
-                        (magit-put-line-property 'face 'magit-diff-del))
-                       (t
-                        (magit-put-line-property 'face 'magit-diff-none))))
-               (forward-line)))
-
-           (when (eq magit-diff-refine-hunk 'all)
-             (save-excursion
-               (goto-char hunk-start-pos)
-               (diff-refine-hunk))))
-         t)
-        (t
-         nil)))
-
-(defvar magit-diff-options nil)
-
-(defun magit-insert-diff (file status)
-  (let ((cmd magit-git-executable)
-        (args (append (list "diff")
-                      (list (magit-diff-U-arg))
-                      magit-diff-options
-                      (list "--" file))))
-    (let ((p (point)))
-      (magit-git-insert args)
-      (if (not (eq (char-before) ?\n))
-          (insert "\n"))
-      (save-restriction
-        (narrow-to-region p (point))
-        (goto-char p)
-        (cond
-         ((eq status 'typechange)
-          (magit-insert-diff-title status file file)
-          (magit-wash-typechange-section file))
-         (t
-          (magit-wash-diff-section)))
-        (goto-char (point-max))))))
-
-(defvar magit-last-raw-diff nil)
-(defvar magit-ignore-unmerged-raw-diffs nil)
-
-(defun magit-wash-raw-diffs ()
-  (let ((magit-last-raw-diff nil))
-    (magit-wash-sequence #'magit-wash-raw-diff)))
-
-(defun magit-wash-raw-diff ()
-  (if (looking-at
-       ":\\([0-7]+\\) \\([0-7]+\\) [0-9a-f]+ [0-9a-f]+ \\(.\\)[0-9]*\t\\([^\t\n]+\\)$")
-      (let ((old-perm (match-string-no-properties 1))
-            (new-perm (match-string-no-properties 2))
-            (status (case (string-to-char (match-string-no-properties 3))
-                      (?A 'new)
-                      (?D 'deleted)
-                      (?M 'modified)
-                      (?U 'unmerged)
-                      (?T 'typechange)
-                      (t     nil)))
-            (file (match-string-no-properties 4)))
-        ;; If this is for the same file as the last diff, ignore it.
-        ;; Unmerged files seem to get two entries.
-        ;; We also ignore unmerged files when told so.
-        (if (or (equal file magit-last-raw-diff)
-                (and magit-ignore-unmerged-raw-diffs (eq status 'unmerged)))
-            (delete-region (point) (+ (line-end-position) 1))
-          (setq magit-last-raw-diff file)
-          ;; The 'diff' section that is created here will not work with
-          ;; magit-insert-diff-item-patch etc when we leave it empty.
-          ;; Luckily, raw diffs are only produced for staged and
-          ;; unstaged changes, and we never call
-          ;; magit-insert-diff-item-patch on them.  This is a bit
-          ;; brittle, of course.
-          (let ((magit-section-hidden-default magit-hide-diffs))
-            (magit-with-section file 'diff
-              (delete-region (point) (+ (line-end-position) 1))
-              (if (not (magit-section-hidden magit-top-section))
-                  (magit-insert-diff file status)
-                (magit-set-section-info (list status file nil))
-                (magit-set-section-needs-refresh-on-show t)
-                (magit-insert-diff-title status file nil)))))
-        t)
-    nil))
-
-(defun magit-hunk-item-diff (hunk)
-  (let ((diff (magit-section-parent hunk)))
-    (or (eq (magit-section-type diff) 'diff)
-        (error "Huh?  Parent of hunk not a diff"))
-    diff))
-
-(defun magit-diff-item-insert-header (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (if (magit-section-children diff)
-                 (magit-section-beginning (car (magit-section-children diff)))
-               (magit-section-end diff))))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-diff-item-patch (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (magit-section-end diff)))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-hunk-item-patch (hunk buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (magit-insert-region (magit-section-beginning hunk) (magit-section-end hunk)
-                       buf))
-
-(defun magit-insert-hunk-item-region-patch (hunk reverse beg end buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (save-excursion
-    (goto-char (magit-section-beginning hunk))
-    (magit-insert-current-line buf)
-    (forward-line)
-    (let ((copy-op (if reverse "+" "-")))
-      (while (< (point) (magit-section-end hunk))
-        (if (and (<= beg (point)) (< (point) end))
-            (magit-insert-current-line buf)
-          (cond ((looking-at " ")
-                 (magit-insert-current-line buf))
-                ((looking-at copy-op)
-                 (let ((text (buffer-substring-no-properties
-                              (+ (point) 1) (line-beginning-position 2))))
-                   (with-current-buffer buf
-                     (insert " " text))))))
-        (forward-line))))
-  (with-current-buffer buf
-    (diff-fixup-modifs (point-min) (point-max))))
-
-(defun magit-hunk-item-is-conflict-p (hunk)
-  ;;; XXX - Using the title is a bit too clever...
-  (string-match "^diff --cc"
-                (magit-section-title (magit-hunk-item-diff hunk))))
-
-(defun magit-hunk-item-target-line (hunk)
-  (save-excursion
-    (beginning-of-line)
-    (let ((line (line-number-at-pos)))
-      (goto-char (magit-section-beginning hunk))
-      (if (not (looking-at "@@+ .* \\+\\([0-9]+\\)\\(,[0-9]+\\)? @@+"))
-          (error "Hunk header not found"))
-      (let ((target (string-to-number (match-string 1))))
-        (forward-line)
-        (while (< (line-number-at-pos) line)
-          ;; XXX - deal with combined diffs
-          (if (not (looking-at "-"))
-              (setq target (+ target 1)))
-          (forward-line))
-        target))))
-
-(defun magit-show (commit filename &optional select prefix)
-  "Returns a buffer containing the contents of the file FILENAME, as stored in
-COMMIT.  COMMIT may be one of the following:
-
-- A string with the name of a commit, such as \"head\" or \"dae86e\".  See 'git
-  help revisions' for syntax.
-- The symbol 'index, indicating that you want the version in Git's index or
-  staging area.
-- The symbol 'working, indicating that you want the version in the working
-  directory.  In this case you'll get a buffer visiting the file.  If there's
-  already a buffer visiting that file, you'll get that one.
-
-When called interactively or when SELECT is non-nil, make the buffer active,
-either in another window or (with a prefix argument) in the current window."
-  (interactive (let* ((revision (magit-read-rev "Retrieve file from revision"))
-                      (filename (magit-read-file-from-rev revision)))
-                 (list revision filename t current-prefix-arg)))
-  (if (eq commit 'working)
-      (find-file-noselect filename)
-    (let ((buffer (create-file-buffer (format "%s.%s" filename (replace-regexp-in-string ".*/" "" (prin1-to-string commit t))))))
-      (cond
-       ((eq commit 'index)
-        (let ((checkout-string (magit-git-string "checkout-index"
-                                                 "--temp"
-                                                 filename)))
-          (string-match "^\\(.*\\)\t" checkout-string)
-          (with-current-buffer buffer
-            (let ((tmpname (match-string 1 checkout-string)))
-              (magit-with-silent-modifications
-               (insert-file-contents tmpname nil nil nil t))
-              (delete-file tmpname)))))
-       (t
-        (with-current-buffer buffer
-          (magit-with-silent-modifications
-           (magit-git-insert (list "cat-file" "-p"
-                                   (concat commit ":" filename)))))))
-      (with-current-buffer buffer
-        (let ((buffer-file-name filename))
-          (normal-mode))
-        (goto-char (point-min)))
-      (if select
-          (if prefix
-              (switch-to-buffer buffer)
-            (switch-to-buffer-other-window buffer))
-        buffer))))
-
-(defmacro with-magit-tmp-buffer (var &rest body)
-  (declare (indent 1)
-           (debug (symbolp &rest form)))
-  `(let ((,var (generate-new-buffer magit-tmp-buffer-name)))
-     (unwind-protect
-         (progn ,@body)
-       (kill-buffer ,var))))
-
-(defun magit-apply-diff-item (diff &rest args)
-  (when (zerop magit-diff-context-lines)
-    (setq args (cons "--unidiff-zero" args)))
-  (with-magit-tmp-buffer tmp
-    (magit-insert-diff-item-patch diff tmp)
-    (apply #'magit-run-git-with-input tmp
-           "apply" (append args (list "-")))))
-
-(defun magit-apply-hunk-item* (hunk reverse &rest args)
-  "Apply single hunk or part of a hunk to the index or working file.
-
-This function is the core of magit's stage, unstage, apply, and
-revert operations.  HUNK (or the portion of it selected by the
-region) will be applied to either the index, if \"--cached\" is a
-member of ARGS, or to the working file otherwise."
-  (let ((zero-context (zerop magit-diff-context-lines))
-        (use-region (magit-use-region-p)))
-    (when zero-context
-      (setq args (cons "--unidiff-zero" args)))
-    (when reverse
-      (setq args (cons "--reverse" args)))
-    (when (and use-region zero-context)
-      (error (concat "Not enough context to partially apply hunk.  "
-                     "Use `+' to increase context.")))
-    (with-magit-tmp-buffer tmp
-      (if use-region
-          (magit-insert-hunk-item-region-patch
-           hunk reverse (region-beginning) (region-end) tmp)
-        (magit-insert-hunk-item-patch hunk tmp))
-      (apply #'magit-run-git-with-input tmp
-             "apply" (append args (list "-"))))))
-
-(defun magit-apply-hunk-item (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk nil args))
-
-(defun magit-apply-hunk-item-reverse (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk t args))
-
-(magit-define-inserter unstaged-changes (title)
-  (let ((magit-hide-diffs t)
-        (magit-current-diff-range (cons 'index 'working)))
-    (let ((magit-diff-options (append '() magit-diff-options)))
-      (magit-git-section 'unstaged title 'magit-wash-raw-diffs
-                         "diff-files"))))
-
-(magit-define-inserter staged-changes (staged no-commit)
-  (let ((magit-current-diff-range (cons "HEAD" 'index)))
-    (when staged
-      (let ((magit-hide-diffs t)
-            (base (if no-commit
-                      (magit-git-string "mktree")
-                    "HEAD")))
-        (let ((magit-diff-options (append '("--cached") magit-diff-options))
-              (magit-ignore-unmerged-raw-diffs t))
-          (magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs
-                             "diff-index" "--cached"
-                             base))))))
-
-;;; Logs and Commits
-
-                                        ; Note: making this a plain defcustom would probably let users break
-                                        ; the parser too easily
-(defvar magit-git-log-options
-  (list
-   "--pretty=format:* %h %s"
-   (format "--abbrev=%s" magit-sha1-abbrev-length)))
-                                        ; --decorate=full otherwise some ref prefixes are stripped
-                                        ;  '("--pretty=format:* %H%d %s" "--decorate=full"))
-
-;;
-;; Regexps for parsing ref names
-;;
-;; see the `git-check-ref-format' manpage for details
-
-(defconst magit-ref-nonchars "\000-\037\177 ~^:?*[\\"
-  "Characters specifically disallowed from appearing in Git symbolic refs.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-ref-nonslash-re
-  (concat "\\(?:"
-          ;; "no slash-separated component can begin with a dot ." (rule 1)
-          "[^" magit-ref-nonchars "./]"
-          ;; "cannot have two consecutive dots ..  anywhere." (rule 3)
-          "\\.?"
-          "\\)*")
-  "Regexp that matches the non-slash parts of a ref name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-refname-re
-  (concat
-   "\\(?:HEAD\\|"
-
-   "\\(?:tag: \\)?"
-
-   ;; optional non-slash sequence at the beginning
-   magit-ref-nonslash-re
-
-   ;; any number of slash-prefixed sequences
-   "\\(?:"
-   "/"
-   magit-ref-nonslash-re
-   "\\)*"
-
-   "/" ;; "must contain at least one /." (rule 2)
-   magit-ref-nonslash-re
-
-   ;; "cannot end with a slash / nor a dot .." (rule 5)
-   "[^" magit-ref-nonchars "./]"
-
-   "\\)"
-   )
-  "Regexp that matches a git symbolic reference name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-log-oneline-re
-  (concat
-   "^\\([_\\*|/ -.]+\\)?"                          ; graph   (1)
-   "\\(?:"
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defconst magit-log-longline-re
-  (concat
-   ;; use \0 delimiter (from -z option) to identify commits. this prevents
-   ;; commit messages containing lines like "commit 00000" from polluting the
-   ;; display
-   "\\(?:\\(?:\\`\\|\0\\)"
-   "\\([_\\*|/ -.]+\\)?"                           ; graph   (1)
-   "commit "
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "$\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defvar magit-present-log-line-function 'magit-present-log-line
-  "The function to use when generating a log line.
-It takes four args: CHART, SHA1, REFS and MESSAGE.  The function
-must return a string which will represent the log line.")
-
-(defun magit-log-get-bisect-state-color (suffix)
-  (if (string= suffix "bad")
-      (list suffix 'magit-log-head-label-bisect-bad)
-    (list suffix 'magit-log-head-label-bisect-good)))
-
-(defun magit-log-get-patches-color (suffix)
-  (list (and (string-match ".+/\\(.+\\)" suffix)
-             (match-string 1 suffix))
-        'magit-log-head-label-patches))
-
-(defvar magit-log-remotes-color-hook nil)
-
-(defun magit-log-get-remotes-color (suffix)
-  (or
-   (run-hook-with-args-until-success
-    'magit-log-remotes-color-hook suffix)
-   (list suffix 'magit-log-head-label-remote)))
-
-(defvar magit-refs-namespaces
-  '(("tags" . magit-log-head-label-tags)
-    ("remotes" magit-log-get-remotes-color)
-    ("heads" . magit-log-head-label-local)
-    ("patches" magit-log-get-patches-color)
-    ("bisect" magit-log-get-bisect-state-color)))
-
-(defun magit-ref-get-label-color (r)
-  (let ((uninteresting (loop for re in magit-uninteresting-refs
-                             thereis (string-match re r))))
-    (if uninteresting (list nil nil)
-      (let* ((ref-re "\\(?:tag: \\)?refs/\\(?:\\([^/]+\\)/\\)?\\(.+\\)")
-             (label (and (string-match ref-re r)
-                         (match-string 2 r)))
-             (res (let ((colorizer
-                         (cdr (assoc (match-string 1 r)
-                                     magit-refs-namespaces))))
-                    (cond ((null colorizer)
-                           (list r 'magit-log-head-label-default))
-                          ((symbolp colorizer)
-                           (list label colorizer))
-                          ((listp colorizer)
-                           (funcall (car colorizer)
-                                    (match-string 2 r)))
-                          (t
-                           (list r 'magit-log-head-label-default))))))
-        res))))
-
-(defun magit-present-log-line (graph sha1 refs message)
-  "The default log line generator."
-  (let ((string-refs
-         (when refs
-           (let ((colored-labels
-                  (delete nil
-                          (mapcar (lambda (r)
-                                    (destructuring-bind (label face)
-                                        (magit-ref-get-label-color r)
-                                      (and label
-                                           (propertize label 'face face))))
-                                  refs))))
-             (concat
-              (mapconcat 'identity colored-labels " ")
-              " ")))))
-
-    (concat
-     (if sha1
-         (propertize sha1 'face 'magit-log-sha1)
-       (insert-char ? magit-sha1-abbrev-length))
-     " "
-     (when graph
-       (propertize graph 'face 'magit-log-graph))
-     string-refs
-     (when message
-       (propertize message 'face 'magit-log-message)))))
-
-(defvar magit-log-count ()
-  "Internal var used to count the number of logs actually added in a buffer.")
-
-(defmacro magit-create-log-buffer-sections (&rest body)
-  "Empty current buffer of text and magit's section, and then evaluate BODY.
-
-if the number of logs inserted in the buffer is `magit-log-cutoff-length'
-insert a line to tell how to insert more of them"
-  (declare (indent 0))
-  `(let ((magit-log-count 0) (inhibit-read-only t))
-     (magit-create-buffer-sections
-       (magit-with-section 'log nil
-         ,@body
-         (if (= magit-log-count magit-log-cutoff-length)
-             (magit-with-section "longer"  'longer
-               (insert "type \"e\" to show more logs\n")))))))
-
-(defun magit-wash-log-line (style)
-  (beginning-of-line)
-  (let ((line-re (cond ((eq style 'long) magit-log-longline-re)
-                       (t magit-log-oneline-re))))
-    (cond
-     ((looking-at line-re)
-      (let ((chart (match-string 1))
-            (sha1 (match-string 2))
-            (msg (match-string 4))
-            (refs (when (match-string 3)
-                    (delq nil
-                          (mapcar
-                           (lambda (s)
-                             (and (not
-                                   (or (string= s "tag:")
-                                       (string= s "HEAD"))) ; as of 1.6.6
-                                  s))
-                           (split-string (match-string 3) "[(), ]" t))))))
-        (delete-region (point-at-bol) (point-at-eol))
-        (insert (funcall magit-present-log-line-function chart sha1 refs msg))
-        (goto-char (point-at-bol))
-        (if sha1
-            (magit-with-section sha1 'commit
-              (when magit-log-count (setq magit-log-count (1+ magit-log-count)))
-              (magit-set-section-info sha1)
-              (forward-line))
-          (forward-line))))
-     (t
-      (forward-line)))
-    t))
-
-(defun magit-wash-log (&optional style)
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence (apply-partially 'magit-wash-log-line style))))
-
-(defvar magit-currently-shown-commit nil)
-
-(defun magit-wash-commit ()
-  (let ((magit-current-diff-range))
-    (when (looking-at "^commit \\([0-9a-fA-F]\\{40\\}\\)")
-      (setq magit-current-diff-range (match-string 1))
-      (add-text-properties (match-beginning 1) (match-end 1)
-                           '(face magit-log-sha1)))
-    (cond
-     ((search-forward-regexp "^Merge: \\([0-9a-fA-F]+\\) \\([0-9a-fA-F]+\\)$" nil t)
-      (setq magit-current-diff-range (cons (cons (match-string 1)
-                                                 (match-string 2))
-                                           magit-current-diff-range))
-      (let ((first (magit-set-section nil 'commit (match-beginning 1) (match-end 1)))
-            (second (magit-set-section nil 'commit (match-beginning 2) (match-end 2))))
-        (magit-set-section-info (match-string 1) first)
-        (magit-set-section-info (match-string 2) second))
-      (make-commit-button (match-beginning 1) (match-end 1))
-      (make-commit-button (match-beginning 2) (match-end 2)))
-     (t
-      (setq magit-current-diff-range (cons (concat magit-current-diff-range "^")
-                                           magit-current-diff-range))))
-    (search-forward-regexp "^$")
-    (while (and
-            (search-forward-regexp "\\(\\b[0-9a-fA-F]\\{4,40\\}\\b\\)\\|\\(^diff\\)" nil 'noerror)
-            (not (match-string 2)))
-      (let ((sha1 (match-string 1))
-            (start (match-beginning 1))
-            (end (match-end 1)))
-        (when (string-equal "commit" (magit-git-string "cat-file" "-t" sha1))
-          (make-commit-button start end)
-          (let ((section (magit-set-section sha1 'commit start end)))
-            (magit-set-section-info sha1 section)))))
-    (beginning-of-line)
-    (when (looking-at "^diff")
-      (magit-wash-diffs))
-    (goto-char (point-max))
-    (insert "\n")
-    (if magit-back-navigation-history
-        (magit-with-section "[back]" 'button
-          (insert-text-button "[back]"
-                              'help-echo "Previous commit"
-                              'action 'magit-show-commit-backward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))
-    (insert " ")
-    (if magit-forward-navigation-history
-        (magit-with-section "[forward]" 'button
-          (insert-text-button "[forward]"
-                              'help-echo "Next commit"
-                              'action 'magit-show-commit-forward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))))
-
-(defun make-commit-button (start end)
-  (make-text-button start end
-                    'help-echo "Visit commit"
-                    'action (lambda (button)
-                              (save-excursion
-                                (goto-char button)
-                                (magit-visit-item)))
-                    'follow-link t
-                    'mouse-face 'magit-item-highlight
-                    'face 'magit-log-sha1))
-
-(defun magit-refresh-commit-buffer (commit)
-  (magit-configure-have-abbrev)
-  (magit-configure-have-decorate)
-  (magit-create-buffer-sections
-    (apply #'magit-git-section nil nil
-           'magit-wash-commit
-           "log"
-           "--max-count=1"
-           "--pretty=medium"
-           `(,@(if magit-have-abbrev (list "--no-abbrev-commit"))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             "--cc"
-             "-p" ,commit))))
-
-(define-derived-mode magit-commit-mode magit-mode "Magit"
-  "Mode to view a git commit.
-
-\\{magit-commit-mode-map}"
-  :group 'magit)
-
-(defvar magit-commit-buffer-name "*magit-commit*"
-  "Buffer name for displaying commit log messages.")
-
-(defun magit-show-commit (commit &optional scroll inhibit-history select)
-  "Show information about a commit in the buffer named by
-`magit-commit-buffer-name'.  COMMIT can be any valid name for a commit
-in the current Git repository.
-
-When called interactively or when SELECT is non-nil, switch to
-the commit buffer using `pop-to-buffer'.
-
-Unless INHIBIT-HISTORY is non-nil, the commit currently shown
-will be pushed onto `magit-back-navigation-history' and
-`magit-forward-navigation-history' will be cleared.
-
-Noninteractively, if the commit is already displayed and SCROLL
-is provided, call SCROLL's function definition in the commit
-window.  (`scroll-up' and `scroll-down' are typically passed in
-for this argument.)"
-  (interactive (list (magit-read-rev "Show commit (hash or ref)")
-                     nil nil t))
-  (when (magit-section-p commit)
-    (setq commit (magit-section-info commit)))
-  (unless (eql 0 (magit-git-exit-code "cat-file" "commit" commit))
-    (error "%s is not a commit" commit))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-commit-buffer-name)))
-    (cond
-     ((and (equal magit-currently-shown-commit commit)
-           ;; if it's empty then the buffer was killed
-           (with-current-buffer buf
-             (> (length (buffer-string)) 1)))
-      (let ((win (get-buffer-window buf)))
-        (cond ((not win)
-               (display-buffer buf))
-              (scroll
-               (with-selected-window win
-                 (funcall scroll))))))
-     (commit
-      (display-buffer buf)
-      (with-current-buffer buf
-        (unless inhibit-history
-          (push (cons default-directory magit-currently-shown-commit)
-                magit-back-navigation-history)
-          (setq magit-forward-navigation-history nil))
-        (setq magit-currently-shown-commit commit)
-        (goto-char (point-min))
-        (magit-mode-init dir 'magit-commit-mode
-                         #'magit-refresh-commit-buffer commit))))
-    (if select
-        (pop-to-buffer buf))))
-
-(defun magit-show-commit-backward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-back-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-back-navigation-history
-      (error "No previous commit."))
-    (let ((histitem (pop magit-back-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-forward-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defun magit-show-commit-forward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-forward-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-forward-navigation-history
-      (error "No next commit."))
-    (let ((histitem (pop magit-forward-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-back-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defvar magit-marked-commit nil)
-
-(defvar magit-mark-overlay nil)
-(make-variable-buffer-local 'magit-mark-overlay)
-(put 'magit-mark-overlay 'permanent-local t)
-
-(defun magit-refresh-marked-commits ()
-  (magit-for-all-buffers #'magit-refresh-marked-commits-in-buffer))
-
-(defun magit-refresh-marked-commits-in-buffer ()
-  (if (not magit-mark-overlay)
-      (let ((ov (make-overlay 1 1)))
-        (overlay-put ov 'face 'magit-item-mark)
-        (setq magit-mark-overlay ov)))
-  (delete-overlay magit-mark-overlay)
-  (magit-for-all-sections
-   (lambda (section)
-     (when (and (eq (magit-section-type section) 'commit)
-                (equal (magit-section-info section)
-                       magit-marked-commit))
-       (move-overlay magit-mark-overlay
-                     (magit-section-beginning section)
-                     (magit-section-end section)
-                     (current-buffer))))))
-
-(defun magit-set-marked-commit (commit)
-  (setq magit-marked-commit commit)
-  (magit-refresh-marked-commits))
-
-(defun magit-marked-commit ()
-  (or magit-marked-commit
-      (error "No commit marked")))
-
-(defun magit-remote-branch-name (remote branch)
-  "Get the name of the branch BRANCH on remote REMOTE"
-  (if (string= remote ".")
-      branch
-    (concat remote "/" branch)))
-
-(magit-define-inserter unpulled-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpulled "Unpulled commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "HEAD..%s" (magit-remote-branch-name remote branch)))))))
-
-(magit-define-inserter unpushed-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpushed "Unpushed commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "%s..HEAD" (magit-remote-branch-name remote branch)))))))
-
-(defun magit-remote-branch-for (local-branch &optional fully-qualified-name)
-  "Guess the remote branch name that LOCAL-BRANCH is tracking.
-Gives a fully qualified name (e.g., refs/remotes/origin/master) if
-FULLY-QUALIFIED-NAME is non-nil."
-  (let ((merge (magit-get "branch" local-branch "merge")))
-    (save-match-data
-      (if (and merge (string-match "^refs/heads/\\(.+\\)" merge))
-          (concat (if fully-qualified-name
-                      (let ((remote-name (magit-get "branch" local-branch "remote")))
-                        (if (string= "." remote-name)
-                            "refs/heads/"
-                          (concat "refs/remotes/" remote-name "/"))))
-                  (match-string 1 merge))))))
-
-;;; Status
-
-(defvar magit-remote-string-hook nil)
-
-(defun magit-remote-string (remote remote-branch remote-rebase)
-  (cond
-   ((string= "." remote)
-    (concat
-     (when remote-rebase "onto ")
-     "branch "
-     (propertize remote-branch 'face 'magit-branch)))
-   (remote
-    (concat
-     (when remote-rebase "onto ")
-     (propertize remote-branch 'face 'magit-branch)
-     " @ "
-     remote
-     " ("
-     (magit-get "remote" remote "url")
-     ")"))
-   (t
-    (run-hook-with-args-until-success 'magit-remote-string-hook))))
-
-(declare-function magit--bisect-info-for-status "magit-bisect" (branch))
-
-(defun magit-refresh-status ()
-  (magit-create-buffer-sections
-    (magit-with-section 'status nil
-      (let* ((branch (magit-get-current-branch))
-             (remote (and branch (magit-get "branch" branch "remote")))
-             (remote-rebase (and branch (magit-get-boolean "branch" branch "rebase")))
-             (remote-branch (or (and branch (magit-remote-branch-for branch)) branch))
-             (remote-string (magit-remote-string remote remote-branch remote-rebase))
-             (head (magit-git-string
-                    "log"
-                    "--max-count=1"
-                    "--abbrev-commit"
-                    (format "--abbrev=%s" magit-sha1-abbrev-length)
-                    "--pretty=oneline"))
-             (no-commit (not head)))
-        (when remote-string
-          (insert "Remote:   " remote-string "\n"))
-        (insert (format "Local:    %s %s\n"
-                        (propertize (magit--bisect-info-for-status branch)
-                                    'face 'magit-branch)
-                        (abbreviate-file-name default-directory)))
-        (insert (format "Head:     %s\n"
-                        (if no-commit "nothing commited (yet)" head)))
-        (let ((merge-heads (magit-file-lines (concat (magit-git-dir)
-                                                     "MERGE_HEAD"))))
-          (if merge-heads
-              (insert (format "Merging:   %s\n"
-                              (mapconcat 'identity
-                                         (mapcar 'magit-name-rev merge-heads)
-                                         ", ")))))
-        (let ((rebase (magit-rebase-info)))
-          (if rebase
-              (insert (apply 'format "Rebasing: onto %s (%s of %s); Press \"R\" to Abort, Skip, or Continue\n" rebase))))
-        (insert "\n")
-        (magit-git-exit-code "update-index" "--refresh")
-        (magit-insert-stashes)
-        (magit-insert-untracked-files)
-        (magit-insert-pending-changes)
-        (magit-insert-pending-commits)
-        (magit-insert-unpulled-commits remote remote-branch)
-        (let ((staged (or no-commit (magit-anything-staged-p))))
-          (magit-insert-unstaged-changes
-           (if staged "Unstaged changes:" "Changes:"))
-          (magit-insert-staged-changes staged no-commit))
-        (magit-insert-unpushed-commits remote remote-branch)
-        (run-hooks 'magit-refresh-status-hook)))))
-
-(defun magit-init (dir)
-  "Initialize git repository in the DIR directory."
-  (interactive (list (read-directory-name "Directory for Git repository: ")))
-  (let* ((dir (file-name-as-directory (expand-file-name dir)))
-         (topdir (magit-get-top-dir dir)))
-    (when (or (not topdir)
-              (yes-or-no-p
-               (format
-                (if (string-equal topdir dir)
-                    "There is already a Git repository in %s. Reinitialize? "
-                  "There is a Git repository in %s. Create another in %s? ")
-                topdir dir)))
-      (unless (file-directory-p dir)
-        (and (y-or-n-p (format "Directory %s does not exists.  Create it? " dir))
-             (make-directory dir)))
-      (let ((default-directory dir))
-        (magit-run* (list magit-git-executable "init"))))))
-
-(define-derived-mode magit-status-mode magit-mode "Magit"
-  "Mode for looking at git status.
-
-\\{magit-status-mode-map}"
-  :group 'magit)
-
-(defvar magit-default-directory nil)
-
-(defun magit-save-some-buffers (&optional msg pred)
-  "Save some buffers if variable `magit-save-some-buffers' is non-nil.
-If variable `magit-save-some-buffers' is set to 'dontask then
-don't ask the user before saving the buffers, just go ahead and
-do it.
-
-Optional argument MSG is displayed in the minibuffer if variable
-`magit-save-some-buffers' is nil.
-
-Optional second argument PRED determines which buffers are considered:
-If PRED is nil, all the file-visiting buffers are considered.
-If PRED is t, then certain non-file buffers will also be considered.
-If PRED is a zero-argument function, it indicates for each buffer whether
-to consider it or not when called with that buffer current."
-  (interactive)
-  (let ((predicate-function (or pred magit-save-some-buffers-predicate))
-        (magit-default-directory default-directory))
-    (if magit-save-some-buffers
-        (save-some-buffers
-         (eq magit-save-some-buffers 'dontask)
-         predicate-function)
-      (when msg
-        (message msg)))))
-
-(defun magit-save-buffers-predicate-all ()
-  "Prompt to save all buffers with unsaved changes"
-  t)
-
-(defun magit-save-buffers-predicate-tree-only ()
-  "Only prompt to save buffers which are within the current git project (as
-  determined by the dir passed to `magit-status'."
-  (and buffer-file-name
-       (string= (magit-get-top-dir magit-default-directory)
-                (magit-get-top-dir (file-name-directory buffer-file-name)))))
-
-;;;###autoload
-(defun magit-status (dir)
-  "Open a Magit status buffer for the Git repository containing
-DIR.  If DIR is not within a Git repository, offer to create a
-Git repository in DIR.
-
-Interactively, a prefix argument means to ask the user which Git
-repository to use even if `default-directory' is under Git control.
-Two prefix arguments means to ignore `magit-repo-dirs' when asking for
-user input."
-  (interactive (list (if current-prefix-arg
-                         (magit-read-top-dir
-                          (> (prefix-numeric-value current-prefix-arg)
-                             4))
-                       (or (magit-get-top-dir default-directory)
-                           (magit-read-top-dir nil)))))
-  (magit-save-some-buffers)
-  (let ((topdir (magit-get-top-dir dir)))
-    (unless topdir
-      (when (y-or-n-p (format "There is no Git repository in %S.  Create one? "
-                              dir))
-        (magit-init dir)
-        (setq topdir (magit-get-top-dir dir))))
-    (when topdir
-      (let ((buf (or (magit-find-status-buffer topdir)
-                     (generate-new-buffer
-                      (concat "*magit: "
-                              (file-name-nondirectory
-                               (directory-file-name topdir)) "*")))))
-        (funcall magit-status-buffer-switch-function buf)
-        (magit-mode-init topdir 'magit-status-mode #'magit-refresh-status)))))
-
-(magit-define-command automatic-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (if revision
-      (magit-run-git "merge" (magit-rev-to-git revision))))
-
-(magit-define-command manual-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (when revision
-    (apply 'magit-run-git
-           "merge" "--no-commit"
-           (magit-rev-to-git revision)
-           magit-custom-options)
-    (when (file-exists-p ".git/MERGE_MSG")
-        (magit-log-edit))))
-
-;;; Staging and Unstaging
-
-(defun magit-stage-item (&optional ask)
-  "Add the item at point to the staging area.
-If ASK is set, ask for the file name rather than picking the one
-at point."
-  (interactive "P")
-  (if ask
-      (magit-run-git "add" (read-file-name "File to stage: "))
-    (magit-section-action (item info "stage")
-      ((untracked file)
-       (magit-run-git "add" info))
-      ((untracked)
-       (apply #'magit-run-git "add" "--"
-              (magit-git-lines "ls-files" "--other" "--exclude-standard")))
-      ((unstaged diff hunk)
-       (if (magit-hunk-item-is-conflict-p item)
-           (error (concat "Can't stage individual resolution hunks.  "
-                          "Please stage the whole file.")))
-       (magit-apply-hunk-item item "--cached"))
-      ((unstaged diff)
-       (magit-run-git "add" "-u" (magit-diff-item-file item)))
-      ((staged *)
-       (error "Already staged"))
-      ((diff diff)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((diff diff hunk)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((hunk)
-       (error "Can't stage this hunk"))
-      ((diff)
-       (error "Can't stage this diff")))))
-
-(defun magit-unstage-item ()
-  "Remove the item at point from the staging area."
-  (interactive)
-  (magit-section-action (item info "unstage")
-    ((staged diff hunk)
-     (magit-apply-hunk-item-reverse item "--cached"))
-    ((staged diff)
-     (if (eq (car info) 'unmerged)
-         (error "Can't unstage an unmerged file.  Resolve it first"))
-     (if (magit-no-commit-p)
-         (magit-run-git "rm" "--cached" "--" (magit-diff-item-file item))
-       (magit-run-git "reset" "-q" "HEAD" "--" (magit-diff-item-file item))))
-    ((unstaged *)
-     (error "Already unstaged"))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((hunk)
-     (error "Can't unstage this hunk"))
-    ((diff)
-     (error "Can't unstage this diff"))))
-
-(defun magit-stage-all (&optional also-untracked-p)
-  "Add all remaining changes in tracked files to staging area.
-With prefix argument, add remaining untracked files as well.
-\('git add -u .' or 'git add .', respectively)."
-  (interactive "P")
-  (if also-untracked-p
-      (magit-run-git "add" ".")
-    (magit-run-git "add" "-u" ".")))
-
-(defun magit-unstage-all ()
-  "Remove all changes from staging area.
-\('git reset --mixed HEAD')."
-  (interactive)
-  (magit-run-git "reset" "HEAD"))
-
-;;; Branches
-
-(defun escape-branch-name (branch)
-  "Escapes branch names to remove problematic characters."
-  (replace-regexp-in-string "[/]" "-" branch))
-
-(defun magit-default-tracking-name-remote-plus-branch
-  (remote branch)
-  "Use the remote name plus a hyphen plus the escaped branch name for tracking branches."
-  (concat remote "-" (escape-branch-name branch)))
-
-(defun magit-default-tracking-name-branch-only
-  (remote branch)
-  "Use just the escaped branch name for tracking branches."
-  (escape-branch-name branch))
-
-(defun magit-get-tracking-name (remote branch)
-  "Given a REMOTE and a BRANCH name, ask the user for a local
-tracking brach name suggesting a sensible default."
-  (when (yes-or-no-p
-         (format "Create local tracking branch for %s? " branch))
-    (let* ((default-name
-             (funcall magit-default-tracking-name-function remote branch))
-           (chosen-name (read-string (format "Call local branch (%s): " default-name)
-                                     nil
-                                     nil
-                                     default-name)))
-      (when (magit-ref-exists-p (concat "refs/heads/" chosen-name))
-        (error "'%s' already exists." chosen-name))
-      chosen-name)))
-
-(defun magit-maybe-create-local-tracking-branch (rev)
-  "Depending on the users wishes, create a tracking branch for
-rev... maybe."
-  (if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
-      (let* ((remote (match-string 1 rev))
-             (branch (match-string 2 rev))
-             (tracker-name (magit-get-tracking-name remote branch)))
-        (when tracker-name
-          (magit-run-git "checkout" "-b" tracker-name rev)
-          t))
-    nil))
-
-(magit-define-command checkout (revision)
-  "Switch 'HEAD' to REVISION and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-If REVISION is a remote branch, offer to create a local tracking branch.
-\('git checkout [-b] REVISION')."
-  (interactive
-   (list (let ((current-branch (magit-get-current-branch))
-               (default (magit-default-rev)))
-           (magit-read-rev "Switch to"
-                           (unless (string= current-branch default)
-                             default)
-                           (if current-branch
-                               (cons (concat "refs/heads/" current-branch "$")
-                                     magit-uninteresting-refs)
-                             magit-uninteresting-refs)))))
-  (if revision
-      (when (not (magit-maybe-create-local-tracking-branch revision))
-        (magit-save-some-buffers)
-        (magit-run-git "checkout" (magit-rev-to-git revision))
-        (magit-update-vc-modeline default-directory))))
-
-(defun magit-read-create-branch-args ()
-  (let* ((cur-branch (magit-get-current-branch))
-         (cur-point (magit-default-rev))
-         (branch (read-string "Create branch: "))
-         (parent (magit-read-rev "Parent"
-                                 (cond
-                                  ((eq magit-create-branch-behaviour 'at-point) cur-point)
-                                  ((eq magit-create-branch-behaviour 'at-head) cur-branch)
-                                  (t cur-branch)))))
-    (list branch parent)))
-
-(magit-define-command create-branch (branch parent)
-  "Switch 'HEAD' to new BRANCH at revision PARENT and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-\('git checkout -b BRANCH REVISION')."
-  (interactive (magit-read-create-branch-args))
-  (when (and branch (not (string= branch ""))
-             parent)
-    (magit-save-some-buffers)
-    (magit-run-git "checkout" "-b"
-                   branch
-                   (append
-                    magit-custom-options
-                    (magit-rev-to-git parent)))
-    (magit-update-vc-modeline default-directory)))
-
-(defun magit-delete-branch (branch &optional force)
-  "Deletes a branch.
-If the branch is the current one, offers to switch to `master' first.
-With prefix, forces the removal even if it hasn't been merged.
-Works with local or remote branches.
-\('git branch [-d|-D] BRANCH' or 'git push <remote-part-of-BRANCH> :refs/heads/BRANCH')."
-  (interactive (list (magit-read-rev "Branch to delete" (magit-default-rev 'notrim))
-                     current-prefix-arg))
-  (let* ((remote (magit-remote-part-of-branch branch))
-         (is-current (string= branch (magit-get-current-branch)))
-         (args (list "branch"
-                     (if force "-D" "-d")
-                     branch)))
-    (cond
-     (remote
-      (magit-run-git "push" remote (concat ":refs/heads/" (magit-branch-no-remote branch))))
-     (is-current
-      (when (y-or-n-p "Cannot delete current branch. Switch to master first? ")
-          (progn
-            (magit-checkout "master")
-            (apply 'magit-run-git args))
-          (message "The current branch was not deleted.")))
-     (t
-            (apply 'magit-run-git args)))))
-
-(defun magit-move-branch (old new &optional force)
-  "Renames or moves a branch.
-With prefix, forces the move even if NEW already exists.
-\('git branch [-m|-M] OLD NEW')."
-  (interactive (list (magit-read-rev "Old name" (magit-default-rev))
-                     (read-string "New name: ")
-                     current-prefix-arg))
-  (magit-run-git "branch" (if force
-                              "-M"
-                            "-m")
-                 (magit-rev-to-git old) new))
-
-(defun magit-guess-branch ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-current-section)))
-    ((wazzup commit)
-     (magit-section-info (magit-section-parent item)))
-    ((commit) (magit-name-rev (substring info 0 magit-sha1-abbrev-length)))
-    ((wazzup) info)))
-
-;;; Remotes
-
-(defun magit-add-remote (remote url)
-  "Adds a remote and fetches it.
-\('git remote add REMOTE URL')."
-  (interactive (list (read-string "Add remote: ")
-                     (read-string "URL: ")))
-  (magit-run-git "remote" "add" "-f" remote url))
-
-(defun magit-remove-remote (remote)
-  "Deletes a remote.
-\('git remote rm REMOTE')."
-  (interactive (list (magit-read-remote "Remote to delete")))
-  (magit-run-git "remote" "rm" remote))
-
-(defun magit-rename-remote (old new)
-  "Renames a remote.
-\('git remote rename OLD NEW')."
-  (interactive (list (magit-read-remote "Old name")
-                     (read-string "New name: ")))
-  (magit-run-git "remote" "rename" old new))
-
-(defun magit-guess-remote ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-section-parent item)))
-    ((remote)
-     info)
-    (t
-     (if  (string= info ".")
-         info
-       (magit-get-current-remote)))))
-
-;;; Merging
-
-(defun magit-merge (revision)
-  "Merge REVISION into the current 'HEAD'; leave changes uncommitted.
-With a prefix-arg, the merge will be squashed.
-\('git merge --no-commit [--squash|--no-ff] REVISION')."
-  (interactive
-   (list (magit-read-rev "Merge" (magit-default-rev))))
-  (if revision
-      (apply 'magit-run-git
-             "merge"
-             (magit-rev-to-git revision)
-             magit-custom-options)))
-
-;;; Rebasing
-
-(defun magit-rebase-info ()
-  "Returns a list indicating the state of an in-progress rebase,
-if any."
-  (let ((git-dir (magit-git-dir)))
-    (cond ((file-exists-p (concat git-dir "rebase-merge"))
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-merge/onto"))))
-
-            ;; How many commits we've gone through
-            (length (magit-file-lines (concat git-dir "rebase-merge/done")))
-
-            ;; How many commits we have in total, without the comments
-            ;; at the end of git-rebase-todo.backup
-            (let ((todo-lines-with-comments (magit-file-lines (concat git-dir "rebase-merge/git-rebase-todo.backup"))))
-              (loop for i in todo-lines-with-comments
-                    until (string= "" i)
-                    count i))))
-          ((and (file-exists-p (concat git-dir "rebase-apply"))
-                (file-exists-p (concat git-dir "rebase-apply/onto")))
-           ;; we might be here because a non-interactive rebase failed: the
-           ;; patches didn't apply cleanly
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-apply/onto"))))
-
-            ;; How many commits we've gone through
-            (- (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/next")))) 1)
-
-            ;; How many commits we have in total
-            (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/last"))))
-            ))
-          (t nil))))
-
-(defun magit-rebase-step ()
-  (interactive)
-  (let ((info (magit-rebase-info)))
-    (if (not info)
-        (let* ((current-branch (magit-get-current-branch))
-               (rev (magit-read-rev "Rebase to"
-                                    (magit-format-ref (magit-remote-branch-for current-branch t))
-                                    (if current-branch
-                                        (cons (concat "refs/heads/" current-branch)
-                                              magit-uninteresting-refs)
-                                      magit-uninteresting-refs))))
-          (if rev
-              (magit-run-git "rebase" (magit-rev-to-git rev))))
-      (let ((cursor-in-echo-area t)
-            (message-log-max nil))
-        (message "Rebase in progress. [A]bort, [S]kip, or [C]ontinue? ")
-        (let ((reply (read-event)))
-          (case reply
-            ((?A ?a)
-             (magit-run-git-async "rebase" "--abort"))
-            ((?S ?s)
-             (magit-run-git-async "rebase" "--skip"))
-            ((?C ?c)
-             (magit-run-git-async "rebase" "--continue"))))))))
-
-;;; Resetting
-
-(magit-define-command reset-head (revision &optional hard)
-  "Switch 'HEAD' to REVISION, keeping prior working tree and staging area.
-Any differences from REVISION become new changes to be committed.
-With prefix argument, all uncommitted changes in working tree
-and staging area are lost.
-\('git reset [--soft|--hard] REVISION')."
-  (interactive (list (magit-read-rev (format "%s head to"
-                                             (if current-prefix-arg
-                                                 "Hard reset"
-                                               "Reset"))
-                                     (or (magit-default-rev)
-                                         "HEAD^"))
-                     current-prefix-arg))
-  (when revision
-    (magit-run-git "reset" (if hard "--hard" "--soft")
-                   (magit-rev-to-git revision))
-    (magit-update-vc-modeline default-directory)))
-
-(magit-define-command reset-head-hard (revision)
-  "Switch 'HEAD' to REVISION, losing all changes.
-Uncomitted changes in both working tree and staging area are lost.
-\('git reset --hard REVISION')."
-  (interactive (list (magit-read-rev (format "Hard reset head to")
-                                     (or (magit-default-rev)
-                                         "HEAD"))))
-  (magit-reset-head revision t))
-
-(magit-define-command reset-working-tree (&optional arg)
-  "Revert working tree and clear changes from staging area.
-\('git reset --hard HEAD').
-
-With a prefix arg, also remove untracked files.  With two prefix args, remove ignored files as well."
-  (interactive "p")
-  (let ((include-untracked (>= arg 4))
-        (include-ignored (>= arg 16)))
-    (when (yes-or-no-p (format "Discard all uncommitted changes%s%s? "
-                               (if include-untracked
-                                   ", untracked files"
-                                 "")
-                               (if include-ignored
-                                   ", ignored files"
-                                 "")))
-      (magit-reset-head-hard "HEAD")
-      (if include-untracked
-          (magit-run-git "clean" "-fd" (if include-ignored
-                                           "-x"
-                                         ""))))))
-
-;;; Rewriting
-
-(defun magit-read-rewrite-info ()
-  (when (file-exists-p (concat (magit-git-dir) "magit-rewrite-info"))
-    (with-temp-buffer
-      (insert-file-contents (concat (magit-git-dir) "magit-rewrite-info"))
-      (goto-char (point-min))
-      (read (current-buffer)))))
-
-(defun magit-write-rewrite-info (info)
-  (with-temp-file (concat (magit-git-dir) "magit-rewrite-info")
-    (prin1 info (current-buffer))
-    (princ "\n" (current-buffer))))
-
-(magit-define-inserter pending-commits ()
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info))))
-    (when pending
-      (magit-with-section 'pending nil
-        (insert (propertize "Pending commits:\n"
-                            'face 'magit-section-title))
-        (dolist (p pending)
-          (let* ((commit (car p))
-                 (properties (cdr p))
-                 (used (plist-get properties 'used)))
-            (magit-with-section commit 'commit
-              (magit-set-section-info commit)
-              (insert (magit-git-string
-                       "log" "--max-count=1"
-                       (if used
-                           "--pretty=format:. %s"
-                         "--pretty=format:* %s")
-                       commit "--")
-                      "\n")))))
-      (insert "\n"))))
-
-(defun magit-rewrite-set-commit-property (commit prop value)
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info)))
-         (p (assoc commit pending)))
-    (when p
-      (setf (cdr p) (plist-put (cdr p) prop value))
-      (magit-write-rewrite-info info)
-      (magit-need-refresh))))
-
-(defun magit-rewrite-set-used ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used t))))
-
-(defun magit-rewrite-set-unused ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used nil))))
-
-(magit-define-inserter pending-changes ()
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (when orig
-      (let ((magit-hide-diffs t))
-        (magit-git-section 'pending-changes
-                           "Pending changes"
-                           'magit-wash-diffs
-                           "diff" (magit-diff-U-arg) "-R" orig)))))
-
-(defun magit-rewrite-start (from &optional onto)
-  (interactive (list (magit-read-rev "Rewrite from" (magit-default-rev))))
-  (or (magit-everything-clean-p)
-      (error "You have uncommitted changes"))
-  (or (not (magit-read-rewrite-info))
-      (error "Rewrite in progress"))
-  (let* ((orig (magit-rev-parse "HEAD"))
-         (base
-          (if
-              (or
-               (eq magit-rewrite-inclusive t)
-               (and
-                (eq magit-rewrite-inclusive 'ask)
-                (y-or-n-p "Include selected revision in rewrite? ")))
-              (or
-               (car (magit-commit-parents from))
-               (error "Can't rewrite a parentless commit."))
-            from))
-         (pending (magit-git-lines "rev-list" (concat base ".."))))
-    (magit-write-rewrite-info `((orig ,orig)
-                                (pending ,@(mapcar #'list pending))))
-    (magit-run-git "reset" "--hard" base)))
-
-(defun magit-rewrite-stop (&optional noconfirm)
-  (interactive)
-  (let* ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (when (or noconfirm
-              (yes-or-no-p "Stop rewrite? "))
-      (magit-write-rewrite-info nil)
-      (magit-refresh))))
-
-(defun magit-rewrite-abort ()
-  (interactive)
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (or info
-        (error "No rewrite in progress"))
-    (or (magit-everything-clean-p)
-        (error "You have uncommitted changes"))
-    (when (yes-or-no-p "Abort rewrite? ")
-      (magit-write-rewrite-info nil)
-      (magit-run-git "reset" "--hard" orig))))
-
-(defun magit-rewrite-finish ()
-  (interactive)
-  (magit-with-refresh
-    (magit-rewrite-finish-step t)))
-
-(defun magit-rewrite-finish-step (first-p)
-  (let ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (let* ((pending (cdr (assq 'pending info)))
-           (first-unused
-            (let ((rpend (reverse pending)))
-              (while (and rpend (plist-get (cdr (car rpend)) 'used))
-                (setq rpend (cdr rpend)))
-              (car rpend)))
-           (commit (car first-unused)))
-      (cond ((not first-unused)
-             (magit-rewrite-stop t))
-            ((magit-apply-commit commit t (not first-p))
-             (magit-rewrite-set-commit-property commit 'used t)
-             (magit-rewrite-finish-step nil))))))
-
-;;; Updating, pull, and push
-
-(magit-define-command fetch (remote)
-  "Fetch from REMOTE."
-  (interactive (list (magit-read-remote)))
-  (apply 'magit-run-git-async "fetch" remote magit-custom-options))
-
-(magit-define-command fetch-current ()
-  "Run fetch for default remote.
-
-If there is no default remote, ask for one."
-  (interactive)
-  (magit-fetch (or (magit-get-current-remote)
-                   (magit-read-remote))))
-
-(magit-define-command remote-update ()
-  "Update all remotes."
-  (interactive)
-  (apply 'magit-run-git-async "remote" "update" magit-custom-options))
-
-(magit-define-command pull ()
-  "Run git pull against the current remote."
-  (interactive)
-  (let* ((branch (magit-get-current-branch))
-         (branch-remote (magit-get-remote branch))
-         (config-branch (and branch (magit-get "branch" branch "merge")))
-         (merge-branch (or (and config-branch (not current-prefix-arg))
-                           (magit-read-remote-branch
-                            branch-remote (format "Pull from: ")))))
-    (when (and branch (not config-branch))
-      (magit-set branch-remote "branch" branch "remote")
-      (magit-set (format "refs/heads/%s" merge-branch)
-                 "branch" branch "merge"))
-    (apply 'magit-run-git-async "pull" "-v" magit-custom-options)))
-
-(eval-when-compile (require 'eshell))
-
-(defun magit-parse-arguments (command)
-  (require 'eshell)
-  (with-temp-buffer
-    (insert command)
-    (mapcar 'eval (eshell-parse-arguments (point-min) (point-max)))))
-
-(defun magit-shell-command (command)
-  "Perform arbitrary shell COMMAND."
-  (interactive "sCommand: ")
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-run* args nil nil nil t)))
-
-(defvar magit-git-command-history nil)
-
-(defun magit-git-command (command)
-  "Perform arbitrary Git COMMAND.
-
-Similar to `magit-shell-command', but involves slightly less
-typing and automatically refreshes the status buffer."
-  (interactive
-   (list (read-string "Run git like this: " nil 'magit-git-command-history)))
-  (require 'pcomplete)
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-with-refresh
-      (magit-run* (append (cons magit-git-executable
-                                magit-git-standard-options)
-                          args)
-                  nil nil nil t))))
-
-(magit-define-command push-tags ()
-  "Push tags."
-  (interactive)
-  (magit-run-git-async "push" "--tags"))
-
-(magit-define-command push ()
-  "Push the current branch to a remote repository.
-
-With no prefix argument, ask `magit-get-remote' what remote to
-use for this branch.
-
-With a prefix arg \(e.g., \\[universal-argument] \\[magit-push]), \
-ask user instead.
-
-With \\[universal-argument] \\[universal-argument] as prefix, \
-also prompt user for the remote branch;
-otherwise, try to use the branch.<name>.merge git-config(1)
-option, falling back to something hairy if that is unset."
-  (interactive)
-  (let* ((branch (or (magit-get-current-branch)
-                     (error "Don't push a detached head.  That's gross")))
-         (branch-remote (magit-get-remote branch))
-         (push-remote (if (or current-prefix-arg
-                              (not branch-remote))
-                          (magit-read-remote (format "Push %s to remote"
-                                                     branch)
-                                             branch-remote)
-                        branch-remote))
-         (ref-branch (or (and (>= (prefix-numeric-value current-prefix-arg) 16)
-                              (magit-read-remote-branch
-                               push-remote (format "Push %s as branch" branch)))
-                         (magit-get "branch" branch "merge"))))
-    (if (and (not ref-branch)
-             (eq magit-set-upstream-on-push 'refuse))
-        (error "Not pushing since no upstream has been set.")
-      (let ((set-upstream-on-push (and (not ref-branch)
-                                       (or (eq magit-set-upstream-on-push 'dontask)
-                                           (and (eq magit-set-upstream-on-push t)
-                                                (yes-or-no-p "Set upstream while pushing? "))))))
-        (if (and (not branch-remote)
-                 (not current-prefix-arg))
-            (magit-set push-remote "branch" branch "remote"))
-        (apply 'magit-run-git-async "push" "-v" push-remote
-               (if ref-branch
-                   (format "%s:%s" branch ref-branch)
-                 branch)
-               (if set-upstream-on-push
-                   (cons "--set-upstream" magit-custom-options)
-                 magit-custom-options))
-        ;; Although git will automatically set up the remote,
-        ;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1),
-        ;; so we have to do that manually.
-        (unless ref-branch
-          (magit-set (concat "refs/heads/" branch) "branch" branch "merge"))))))
-
-;;; Log edit mode
-
-(defvar magit-log-edit-buffer-name "*magit-edit-log*"
-  "Buffer name for composing commit messages.")
-
-(defvar magit-log-edit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-c") 'magit-log-edit-commit)
-    (define-key map (kbd "C-x #") 'magit-log-edit-commit)
-    (define-key map (kbd "C-c C-a") 'magit-log-edit-toggle-amending)
-    (define-key map (kbd "C-c C-s") 'magit-log-edit-toggle-signoff)
-    (define-key map (kbd "C-c C-t") 'magit-log-edit-toggle-author)
-    (define-key map (kbd "C-c C-e") 'magit-log-edit-toggle-allow-empty)
-    (define-key map (kbd "M-p") 'log-edit-previous-comment)
-    (define-key map (kbd "M-n") 'log-edit-next-comment)
-    (define-key map (kbd "C-c C-k") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-c C-]") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-x C-s") (lambda ()
-                                      (interactive)
-                                      (message "Not saved. Use C-c C-c to finalize this commit message.")))
-    map))
-
-(defvar magit-pre-log-edit-window-configuration nil)
-
-(define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit"
-  ;; Recognize changelog-style paragraphs
-  (set (make-local-variable 'paragraph-start)
-       (concat paragraph-start "\\|*\\|(")))
-
-(defun magit-log-edit-cleanup ()
-  (save-excursion
-    (goto-char (point-min))
-    (goto-char (point-min))
-    (if (re-search-forward "[ \t\n]*\\'" nil t)
-        (replace-match "\n" nil nil))))
-
-(defun magit-log-edit-append (str)
-  (with-current-buffer (get-buffer-create magit-log-edit-buffer-name)
-    (goto-char (point-max))
-    (insert str "\n")))
-
-(defconst magit-log-header-end "-- End of Magit header --\n")
-
-(defun magit-log-edit-get-fields ()
-  (let ((buf (get-buffer magit-log-edit-buffer-name))
-        (result nil))
-    (if buf
-        (with-current-buffer buf
-          (goto-char (point-min))
-          (while (looking-at "^\\([A-Za-z0-9-_]+\\): *\\(.+\\)?$")
-            (setq result (acons (intern (downcase (match-string 1)))
-                                (read (or (match-string 2) "nil"))
-                                result))
-            (forward-line))
-          (if (not (looking-at (regexp-quote magit-log-header-end)))
-              (setq result nil))))
-    (nreverse result)))
-
-(defun magit-log-edit-set-fields (fields)
-  (let ((buf (get-buffer-create magit-log-edit-buffer-name)))
-    (with-current-buffer buf
-      (goto-char (point-min))
-      (if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)*%s"
-                                         (regexp-quote magit-log-header-end))
-                                 nil t)
-          (delete-region (match-beginning 0) (match-end 0)))
-      (goto-char (point-min))
-      (when fields
-        (while fields
-          (insert (capitalize (symbol-name (caar fields))) ": "
-                  (prin1-to-string (cdar fields)) "\n")
-          (setq fields (cdr fields)))
-        (insert magit-log-header-end)))))
-
-(defun magit-log-edit-set-field (name value)
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)))
-    (cond (cell
-           (if value
-               (rplacd cell value)
-             (setq fields (delq cell fields))))
-          (t
-           (if value
-               (setq fields (append fields (list (cons name value)))))))
-    (magit-log-edit-set-fields fields)))
-
-(defun magit-log-edit-get-field (name)
-  (cdr (assq name (magit-log-edit-get-fields))))
-
-(defun magit-log-edit-toggle-field (name default)
-  "Toggle the log-edit field named NAME.
-If it's currently unset, set it to DEFAULT (t or nil).
-
-Return nil if the field is toggled off, and non-nil if it's
-toggled on.  When it's toggled on for the first time, return
-'first."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)) yesp)
-    (if cell
-        (progn
-          (setq yesp (equal (cdr cell) "yes"))
-          (rplacd cell (if yesp "no" "yes")))
-      (setq fields (acons name (if default "yes" "no") fields))
-      (setq yesp (if default 'first)))
-    (magit-log-edit-set-fields fields)
-    yesp))
-
-(defun magit-log-edit-toggle-input (name default)
-  "Toggle the log-edit input named NAME.
-If it's currently unset, set it to DEFAULT (a string). If it is
-set remove it.
-
-Return nil if the input is toggled off, and its valud if it's
-toggled on."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields))
-         result)
-    (if cell
-        (progn
-          (setq fields (assq-delete-all name fields)
-                result (cdr cell)))
-      (setq fields (acons name default fields)))
-    (magit-log-edit-set-fields fields)
-    result))
-
-(defun magit-log-edit-setup-author-env (author)
-  "Set GIT_AUTHOR_* variables from AUTHOR spec.
-If AUTHOR is nil, honor default values from
-environment (potentially empty)."
-  (when author
-    ;; XXX - this is a bit strict, probably.
-    (or (string-match "\\(.*\\) <\\(.*\\)>\\(?:,\\s-*\\(.+\\)\\)?" author)
-        (error "Can't parse author string"))
-    ;; Shucks, setenv destroys the match data.
-    (let ((name (match-string 1 author))
-          (email (match-string 2 author))
-          (date  (match-string 3 author)))
-      (make-local-variable 'process-environment)
-      (setenv "GIT_AUTHOR_NAME" name)
-      (setenv "GIT_AUTHOR_EMAIL" email)
-      (if date
-          (setenv "GIT_AUTHOR_DATE" date)))))
-
-(defun magit-log-edit-push-to-comment-ring (comment)
-  (when (or (ring-empty-p log-edit-comment-ring)
-            (not (equal comment (ring-ref log-edit-comment-ring 0))))
-    (ring-insert log-edit-comment-ring comment)))
-
-(defun magit-log-edit-commit ()
-  "Finish edits and create new commit object.
-\('git commit ...')"
-  (interactive)
-  (let* ((fields (magit-log-edit-get-fields))
-         (amend (equal (cdr (assq 'amend fields)) "yes"))
-         (allow-empty (equal (cdr (assq 'allow-empty fields)) "yes"))
-         (commit-all (equal (cdr (assq 'commit-all fields)) "yes"))
-         (sign-off-field (assq 'sign-off fields))
-         (sign-off (if sign-off-field
-                       (equal (cdr sign-off-field) "yes")
-                     magit-commit-signoff))
-         (tag-rev (cdr (assq 'tag-rev fields)))
-         (tag-name (cdr (assq 'tag-name fields)))
-         (author (cdr (assq 'author fields)))
-         (tag-options (cdr (assq 'tag-options fields))))
-
-    (unless (or (magit-anything-staged-p)
-                allow-empty
-                amend
-                tag-name
-                (file-exists-p (concat (magit-git-dir) "MERGE_HEAD"))
-                (and commit-all
-                     (not (magit-everything-clean-p))))
-      (error "Refusing to create empty commit. Maybe you want to amend (%s) or allow-empty (%s)?"
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-amending)))
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-allow-empty)))))
-
-    (magit-log-edit-push-to-comment-ring (buffer-string))
-    (magit-log-edit-setup-author-env author)
-    (magit-log-edit-set-fields nil)
-    (magit-log-edit-cleanup)
-    (if (= (buffer-size) 0)
-        (insert "(Empty description)\n"))
-    (let ((env process-environment)
-          (commit-buf (current-buffer)))
-      (with-current-buffer (magit-find-status-buffer default-directory)
-        (let ((process-environment env))
-          (cond (tag-name
-                 (apply #'magit-run-git-with-input commit-buf
-                        "tag" (append tag-options (list tag-name "-a" "-F" "-" tag-rev))))
-                (t
-                 (apply #'magit-run-async-with-input commit-buf
-                        magit-git-executable
-                        (append magit-git-standard-options
-                                '("commit")
-                                magit-custom-options
-                                '("-F" "-")
-                                (if (and commit-all (not allow-empty)) '("--all") '())
-                                (if amend '("--amend") '())
-                                (if allow-empty '("--allow-empty"))
-                                (if sign-off '("--signoff") '()))))))))
-    ;; shouldn't we kill that buffer altogether?
-    (erase-buffer)
-    (let ((magit-buf magit-buffer-internal))
-      (bury-buffer)
-      (set-buffer magit-buf))
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (delete-file (concat (magit-git-dir) "MERGE_MSG")))
-    ;; potentially the local environment has been altered with settings that
-    ;; were specific to this commit. Let's revert it
-    (kill-local-variable 'process-environment)
-    (magit-update-vc-modeline default-directory)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-cancel-log-message ()
-  "Abort edits and erase commit message being composed."
-  (interactive)
-  (when (or (not magit-log-edit-confirm-cancellation)
-            (yes-or-no-p
-             "Really cancel editing the log (any changes will be lost)?"))
-    (erase-buffer)
-    (bury-buffer)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-toggle-amending ()
-  "Toggle whether this will be an amendment to the previous commit.
-\(i.e., whether eventual commit does 'git commit --amend')"
-  (interactive)
-  (when (eq (magit-log-edit-toggle-field 'amend t) 'first)
-    (magit-log-edit-append
-     (magit-trim-line (magit-format-commit "HEAD" "%s%n%n%b")))))
-
-(defun magit-log-edit-toggle-signoff ()
-  "Toggle whether this commit will include a signoff.
-\(i.e., whether eventual commit does 'git commit --signoff')"
-  (interactive)
-  (magit-log-edit-toggle-field 'sign-off (not magit-commit-signoff)))
-
-(defun magit-log-edit-toggle-author ()
-  "Toggle whether this commit will include an author.
-\(i.e., whether eventual commit is run with GIT_AUTHOR_NAME and
-GIT_AUTHOR_EMAIL set)"
-  (interactive)
-  (magit-log-edit-toggle-input 'author (format "%s <%s>"
-                                               (or (magit-get "user" "name") "Author Name")
-                                               (or (magit-get "user" "email") "author@email"))))
-
-(defun magit-log-edit-toggle-allow-empty ()
-  "Toggle whether this commit is allowed to be empty.
-This means that the eventual commit does 'git commit --allow-empty'."
-  (interactive)
-  (magit-log-edit-toggle-field 'allow-empty t))
-
-(defun magit-pop-to-log-edit (operation)
-  (let ((dir default-directory)
-        (magit-buf (current-buffer))
-        (buf (get-buffer-create magit-log-edit-buffer-name)))
-    (setq magit-pre-log-edit-window-configuration
-          (current-window-configuration))
-    (pop-to-buffer buf)
-    (setq default-directory dir)
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (insert-file-contents (concat (magit-git-dir) "MERGE_MSG")))
-    (magit-log-edit-mode)
-    (make-local-variable 'magit-buffer-internal)
-    (setq magit-buffer-internal magit-buf)
-    (message "Type C-c C-c to %s (C-c C-k to cancel)." operation)))
-
-(defun magit-log-edit (&optional arg)
-  "Brings up a buffer to allow editing of commit messages.
-
-Giving a simple prefix arg will amend a previous commit, while
-a double prefix arg will allow creating an empty one.
-
-If there is a rebase in progress, offer the user the option to
-continue it.
-
-\\{magit-log-edit-mode-map}"
-  (interactive "P")
-  ;; If repository is dirty there is no point in trying to
-  ;; suggest to continue the rebase. Git will rebuke you and exit with
-  ;; error code, so suggest it only if theres absolutely nothing else
-  ;; to do and rebase is ongoing.
-  (if (and (magit-everything-clean-p)
-           (magit-rebase-info)
-           (y-or-n-p "Rebase in progress.  Continue it? "))
-      (magit-run-git-async "rebase" "--continue")
-
-    ;; If there's nothing staged, set commit flag to `nil', thus
-    ;; avoiding unnescessary popping up of the log edit buffer in case
-    ;; when user chose to forgo commiting all unstaged changes
-    (let ((amend-p (= (prefix-numeric-value arg) 4))
-          (empty-p (= (prefix-numeric-value arg) 16)))
-      (when (and magit-commit-all-when-nothing-staged
-                 (not (magit-everything-clean-p))
-                 (not (magit-anything-staged-p)))
-        (cond ((eq magit-commit-all-when-nothing-staged 'ask-stage)
-               (when (y-or-n-p "Nothing staged.  Stage everything now? ")
-                 (magit-stage-all)))
-              ((not (magit-log-edit-get-field 'commit-all))
-               (when (or (eq magit-commit-all-when-nothing-staged t)
-                         (y-or-n-p
-                          "Nothing staged.  Commit all unstaged changes? "))
-                 (magit-log-edit-set-field 'commit-all "yes")))))
-      (when amend-p
-        (magit-log-edit-toggle-amending))
-      (when empty-p
-        (magit-log-edit-toggle-allow-empty))
-      (let ((author-email (or (getenv "GIT_AUTHOR_EMAIL") ""))
-            (author-name (or (getenv "GIT_AUTHOR_NAME") ""))
-            (author-date (or (getenv "GIT_AUTHOR_DATE") "")))
-        (if (not (string= author-email ""))
-            (magit-log-edit-set-field 'author (format "%s <%s>%s"
-                                                      (if (string= "" author-name) author-email author-name)
-                                                      author-email
-                                                      (if (string= "" author-date) "" (format ", %s" author-date))))))
-      (magit-pop-to-log-edit "commit"))))
-
-(defun magit-add-log ()
-  (interactive)
-  (cond ((magit-rebase-info)
-         (if (y-or-n-p "Rebase in progress.  Continue it? ")
-             (magit-run-git-async "rebase" "--continue")))
-        (t
-         (let ((section (magit-current-section)))
-           (let ((fun (if (eq (magit-section-type section) 'hunk)
-                          (save-window-excursion
-                            (save-excursion
-                              (magit-visit-item)
-                              (add-log-current-defun)))
-                        nil))
-                 (file (magit-diff-item-file
-                        (cond ((eq (magit-section-type section) 'hunk)
-                               (magit-hunk-item-diff section))
-                              ((eq (magit-section-type section) 'diff)
-                               section)
-                              (t
-                               (error "No change at point"))))))
-             (magit-log-edit nil)
-             (goto-char (point-min))
-             (cond ((not (search-forward-regexp
-                          (format "^\\* %s" (regexp-quote file)) nil t))
-                    ;; No entry for file, create it.
-                    (goto-char (point-max))
-                    (insert (format "\n* %s" file))
-                    (if fun
-                        (insert (format " (%s)" fun)))
-                    (insert ": "))
-                   (fun
-                    ;; found entry for file, look for fun
-                    (let ((limit (or (save-excursion
-                                       (and (search-forward-regexp "^\\* "
-                                                                   nil t)
-                                            (match-beginning 0)))
-                                     (point-max))))
-                      (cond ((search-forward-regexp (format "(.*\\<%s\\>.*):"
-                                                            (regexp-quote fun))
-                                                    limit t)
-                             ;; found it, goto end of current entry
-                             (if (search-forward-regexp "^(" limit t)
-                                 (backward-char 2)
-                               (goto-char limit)))
-                            (t
-                             ;; not found, insert new entry
-                             (goto-char limit)
-                             (if (bolp)
-                                 (open-line 1)
-                               (newline))
-                             (insert (format "(%s): " fun))))))
-                   (t
-                    ;; found entry for file, look for beginning  it
-                    (when (looking-at ":")
-                      (forward-char 2)))))))))
-
-;;; Tags
-
-(magit-define-command tag (name rev)
-  "Create a new lightweight tag with the given NAME at REV.
-\('git tag NAME')."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (apply #'magit-run-git "tag" (append magit-custom-options (list name rev))))
-
-(magit-define-command annotated-tag (name rev)
-  "Start composing an annotated tag with the given NAME.
-Tag will point to the current 'HEAD'."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (magit-log-edit-set-field 'tag-name name)
-  (magit-log-edit-set-field 'tag-rev rev)
-  (magit-log-edit-set-field 'tag-options magit-custom-options)
-  (magit-pop-to-log-edit "tag"))
-
-;;; Stashing
-
-(defun magit-wash-stash ()
-  (if (search-forward-regexp "stash@{\\(.*?\\)}" (line-end-position) t)
-      (let ((stash (match-string-no-properties 0))
-            (name (match-string-no-properties 1)))
-        (delete-region (match-beginning 0) (match-end 0))
-        (goto-char (match-beginning 0))
-        (fixup-whitespace)
-        (goto-char (line-beginning-position))
-        (insert name)
-        (goto-char (line-beginning-position))
-        (magit-with-section stash 'stash
-          (magit-set-section-info stash)
-          (forward-line)))
-    (forward-line))
-  t)
-
-(defun magit-wash-stashes ()
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-stash)))
-
-(magit-define-inserter stashes ()
-  (magit-git-section 'stashes
-                     "Stashes:" 'magit-wash-stashes
-                     "stash" "list"))
-
-(magit-define-command stash (description)
-  "Create new stash of working tree and staging area named DESCRIPTION.
-Working tree and staging area revert to the current 'HEAD'.
-With prefix argument, changes in staging area are kept.
-\('git stash save [--keep-index] DESCRIPTION')"
-  (interactive "sStash description: ")
-  (apply 'magit-run-git `("stash" "save" ,@magit-custom-options "--" ,description)))
-
-(magit-define-command stash-snapshot ()
-  "Create new stash of working tree and staging area; keep changes in place.
-\('git stash save \"Snapshot...\"; git stash apply stash@{0}')"
-  (interactive)
-  (magit-with-refresh
-    (apply 'magit-run-git `("stash" "save" ,@magit-custom-options
-                   ,(format-time-string "Snapshot taken at %Y-%m-%d %H:%M:%S"
-                                       (current-time))))
-    (magit-run-git "stash" "apply" "stash@{0}")))
-
-(defvar magit-currently-shown-stash nil)
-
-(define-derived-mode magit-stash-mode magit-mode "Magit Stash"
-  "Mode for looking at a git stash.
-
-\\{magit-stash-mode-map}"
-  :group 'magit)
-
-(defvar magit-stash-buffer-name "*magit-stash*"
-  "Buffer name for displaying a stash.")
-
-(defun magit-show-stash (stash &optional scroll)
-  (when (magit-section-p stash)
-    (setq stash (magit-section-info stash)))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-stash-buffer-name))
-        (stash-id (magit-git-string "rev-list" "-1" stash)))
-    (cond ((and (equal magit-currently-shown-stash stash-id)
-                (with-current-buffer buf
-                  (> (length (buffer-string)) 1)))
-           (let ((win (get-buffer-window buf)))
-             (cond ((not win)
-                    (display-buffer buf))
-                   (scroll
-                    (with-selected-window win
-                      (funcall scroll))))))
-          (t
-           (setq magit-currently-shown-stash stash-id)
-           (display-buffer buf)
-           (with-current-buffer buf
-             (set-buffer buf)
-             (goto-char (point-min))
-             (let* ((range (cons (concat stash "^2^") stash))
-                    (magit-current-diff-range range)
-                    (args (magit-rev-range-to-git range)))
-               (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer
-                                range args)))))))
-;;; Commits
-
-(defun magit-commit-at-point (&optional nil-ok-p)
-  (let* ((section (magit-current-section))
-         (commit (if (and section
-                          (eq (magit-section-type section) 'commit))
-                     (magit-section-info section)
-                 (get-text-property (point) 'revision))))
-    (if nil-ok-p
-        commit
-      (or commit
-          (error "No commit at point")))))
-
-(defun magit-apply-commit (commit &optional docommit noerase revert)
-  (let* ((parent-id (magit-choose-parent-id commit "cherry-pick"))
-         (success (magit-run* `(,magit-git-executable
-                                ,@magit-git-standard-options
-                                ,(if revert "revert" "cherry-pick")
-                                ,@(if parent-id
-                                      (list "-m" (number-to-string parent-id)))
-                                ,@(if (not docommit) (list "--no-commit"))
-                                ,commit)
-                              nil noerase)))
-    (when (and (not docommit) success)
-      (cond (revert
-             (magit-log-edit-append
-              (magit-format-commit commit "Reverting \"%s\"")))
-            (t
-             (magit-log-edit-append
-              (magit-format-commit commit "%s%n%n%b"))
-             (magit-log-edit-set-field
-              'author
-              (magit-format-commit commit "%an <%ae>, %ai")))))
-    success))
-
-(defun magit-apply-item ()
-  (interactive)
-  (magit-section-action (item info "apply")
-    ((pending commit)
-     (magit-apply-commit info)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info))
-    ((unstaged *)
-     (error "Change is already in your working tree"))
-    ((staged *)
-     (error "Change is already in your working tree"))
-    ((hunk)
-     (magit-apply-hunk-item item))
-    ((diff)
-     (magit-apply-diff-item item))
-    ((stash)
-     (magit-run-git "stash" "apply" info))))
-
-(defun magit-cherry-pick-item ()
-  (interactive)
-  (magit-section-action (item info "cherry-pick")
-    ((pending commit)
-     (magit-apply-commit info t)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info t))
-    ((stash)
-     (magit-run-git "stash" "pop" info))))
-
-(defmacro magit-with-revert-confirmation (&rest body)
-  `(when (or (not magit-revert-item-confirm)
-             (yes-or-no-p "Really revert this item? "))
-     ,@body))
-
-(defun magit-revert-item ()
-  (interactive)
-  (magit-section-action (item info "revert")
-    ((pending commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)
-      (magit-rewrite-set-commit-property info 'used nil)))
-    ((commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)))
-    ;; Reverting unstaged changes cannot be undone
-    ((unstaged *)
-     (magit-discard-item))
-    ((hunk)
-     (magit-with-revert-confirmation
-      (magit-apply-hunk-item-reverse item)))
-    ((diff)
-     (magit-with-revert-confirmation
-      (magit-apply-diff-item item "--reverse")))))
-
-(defun magit-log-show-more-entries (&optional arg)
-  "Grow the number of log entries shown.
-
-With no prefix optional ARG, show twice as many log entries.
-With a numerical prefix ARG, add this number to the number of shown log entries.
-With a non numeric prefix ARG, show all entries"
-  (interactive "P")
-  (make-local-variable 'magit-log-cutoff-length)
-  (cond
-   ((numberp arg)
-    (setq magit-log-cutoff-length (+ magit-log-cutoff-length arg)))
-   (arg
-    (setq magit-log-cutoff-length magit-log-infinite-length))
-   (t (setq magit-log-cutoff-length (* magit-log-cutoff-length 2))))
-  (let ((old-point (point)))
-    (magit-refresh)
-    (goto-char old-point)))
-
-(defun magit-refresh-log-buffer (range style args)
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range "Commits")
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             ,@args
-             "--"))))
-
-(define-derived-mode magit-log-mode magit-mode "Magit Log"
-  "Mode for looking at git log.
-
-\\{magit-log-mode-map}"
-  :group 'magit)
-
-(defvar magit-log-buffer-name "*magit-log*"
-  "Buffer name for display of log entries.")
-
-(magit-define-command log-ranged ()
-  (interactive)
-  (magit-log t))
-(define-obsolete-function-alias 'magit-display-log-ranged 'magit-log-ranged)
-
-(magit-define-command log (&optional ask-for-range &rest extra-args)
-  (interactive)
-  (let* ((log-range (if ask-for-range
-                        (magit-read-rev-range "Log" "HEAD")
-                      "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (nconc (list (magit-rev-range-to-git log-range))
-                      magit-custom-options
-                      extra-args)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer log-range
-                     'oneline args)))
-
-(define-obsolete-function-alias 'magit-display-log 'magit-log)
-
-(magit-define-command log-long-ranged ()
-  (interactive)
-  (magit-log-long t))
-
-(magit-define-command log-long (&optional ranged)
-  (interactive)
-  (let* ((range (if ranged
-                    (magit-read-rev-range "Long log" "HEAD")
-                  "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (append (list (magit-rev-range-to-git range))
-                       magit-custom-options)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer range
-                     'long args)))
-
-;;; Reflog
-
-(defvar magit-reflog-head nil
-  "The HEAD of the reflog in the current buffer.
-This is only non-nil in reflog buffers.")
-(make-variable-buffer-local 'magit-reflog-head)
-
-(defun magit-refresh-reflog-buffer (head args)
-  (setq magit-reflog-head head)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section
-           'reflog (format "Local history of head %s" head) 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    "--walk-reflogs"
-                    (format "--max-count=%s" magit-log-cutoff-length)
-                    args)))))
-
-(define-derived-mode magit-reflog-mode magit-log-mode "Magit Reflog"
-  "Mode for looking at git reflog.
-
-\\{magit-reflog-mode-map}"
-  :group 'magit)
-
-(magit-define-command reflog (&optional ask-for-range)
-  (interactive)
-  (let ((at (or (if ask-for-range
-                    (magit-read-rev "Reflog of" (or (magit-guess-branch) "HEAD")))
-                "HEAD")))
-    (let* ((topdir (magit-get-top-dir default-directory))
-           (args (magit-rev-to-git at)))
-      (magit-buffer-switch "*magit-reflog*")
-      (magit-mode-init topdir 'magit-reflog-mode
-                       #'magit-refresh-reflog-buffer at args))))
-
-(magit-define-command reflog-ranged ()
-  (interactive)
-  (magit-reflog t))
-
-;;; Diffing
-
-(defvar magit-ediff-buffers nil
-  "List of buffers that may be killed by `magit-ediff-restore'.")
-
-(defvar magit-ediff-windows nil
-  "The window configuration that will be restored when Ediff is finished.")
-
-(defun magit-ediff()
-  "View the current DIFF section in ediff."
-  (interactive)
-  (let ((diff (magit-current-section)))
-    (when (magit-section-hidden diff)
-      ;; Range is not set until the first time the diff is visible.
-      ;; This somewhat hackish code makes sure it's been visible at least once.
-      (magit-toggle-section)
-      (magit-toggle-section)
-      (setq diff (magit-current-section)))
-    (if (eq 'hunk (magit-section-type diff))
-        (setq diff (magit-section-parent diff)))
-    (unless (eq 'diff (magit-section-type diff))
-      (error "No diff at this location"))
-    (let* ((type (magit-diff-item-kind diff))
-           (file1 (magit-diff-item-file diff))
-           (file2 (magit-diff-item-file2 diff))
-           (range (magit-diff-item-range diff)))
-      (cond
-       ((memq type '(new deleted typechange))
-        (message "Why ediff a %s file?" type))
-       ((and (eq type 'unmerged)
-             (eq (cdr range) 'working))
-        (magit-interactive-resolve file1))
-       ((consp (car range))
-        (magit-ediff* (magit-show (caar range) file2)
-                      (magit-show (cdar range) file2)
-                      (magit-show (cdr range) file1)))
-       (t
-        (magit-ediff* (magit-show (car range) file2)
-                      (magit-show (cdr range) file1)))))))
-
-(defun magit-ediff* (a b &optional c)
-  (setq magit-ediff-buffers (list a b c))
-  (setq magit-ediff-windows (current-window-configuration))
-  (add-hook 'ediff-quit-hook 'magit-ediff-restore 'append)
-  (if c
-      (ediff-buffers3 a b c)
-    (ediff-buffers a b)))
-
-(defun magit-ediff-restore()
-  "Kill any buffers in `magit-ediff-buffers' that are not visiting files and
-restore the window state that was saved before ediff was called."
-  (dolist (buffer magit-ediff-buffers)
-    (if (and (null (buffer-file-name buffer))
-             (buffer-live-p buffer))
-        (kill-buffer buffer)))
-  (setq magit-ediff-buffers nil)
-  (set-window-configuration magit-ediff-windows)
-  (remove-hook 'ediff-quit-hook 'magit-ediff-restore))
-
-(defun magit-refresh-diff-buffer (range args)
-  (let ((magit-current-diff-range (cond
-                                   ((stringp range)
-                                    (cons range 'working))
-                                   ((null (cdr range))
-                                    (cons (car range) 'working))
-                                   (t
-                                    range))))
-    (setq magit-current-range range)
-    (magit-create-buffer-sections
-      (magit-git-section 'diffbuf
-                         (magit-rev-range-describe range "Changes")
-                         'magit-wash-diffs
-                         "diff" (magit-diff-U-arg) args "--"))))
-
-(define-derived-mode magit-diff-mode magit-mode "Magit Diff"
-  "Mode for looking at a git diff.
-
-\\{magit-diff-mode-map}"
-  :group 'magit)
-
-(magit-define-command diff (range)
-  (interactive (list (magit-read-rev-range "Diff")))
-  (if range
-      (let* ((dir default-directory)
-             (args (magit-rev-range-to-git range))
-             (buf (get-buffer-create "*magit-diff*")))
-        (display-buffer buf)
-        (with-current-buffer buf
-          (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer range args)))))
-
-(magit-define-command diff-working-tree (rev)
-  (interactive (list (magit-read-rev "Diff with" (magit-default-rev))))
-  (magit-diff (or rev "HEAD")))
-
-(defun magit-diff-with-mark ()
-  (interactive)
-  (magit-diff (cons (magit-marked-commit)
-                    (magit-commit-at-point))))
-
-;;; Wazzup
-
-(defvar magit-wazzup-head nil
-  "The integration head for the current wazzup buffer.
-This is only non-nil in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-head)
-
-(defvar magit-wazzup-all-p nil
-  "Non-nil if the current wazzup buffer displays excluded branches.
-This is only meaningful in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-all-p)
-
-(defun magit-wazzup-toggle-ignore (branch edit)
-  (let ((ignore-file (concat (magit-git-dir) "info/wazzup-exclude")))
-    (if edit
-        (setq branch (read-string "Branch to ignore for wazzup: " branch)))
-    (let ((ignored (magit-file-lines ignore-file)))
-      (cond ((member branch ignored)
-             (when (or (not edit)
-                       (y-or-n-p "Branch %s is already ignored.  Unignore? "))
-               (setq ignored (delete branch ignored))))
-            (t
-             (setq ignored (append ignored (list branch)))))
-      (magit-write-file-lines ignore-file ignored)
-      (magit-need-refresh))))
-
-(defun magit-refresh-wazzup-buffer (head all)
-  (setq magit-wazzup-head head)
-  (setq magit-wazzup-all-p all)
-  (let ((branch-desc (or head "(detached) HEAD")))
-    (unless head (setq head "HEAD"))
-    (magit-create-buffer-sections
-      (magit-with-section 'wazzupbuf nil
-        (insert (format "Wazzup, %s\n\n" branch-desc))
-        (let* ((excluded (magit-file-lines (concat (magit-git-dir) "info/wazzup-exclude")))
-               (all-branches (magit-list-interesting-refs))
-               (branches (if all all-branches
-                           (delq nil (mapcar
-                                      (lambda (b)
-                                        (and (not
-                                              (member (cdr b) excluded))
-                                             b))
-                                      all-branches))))
-               (reported (make-hash-table :test #'equal)))
-          (dolist (branch branches)
-            (let* ((name (car branch))
-                   (ref (cdr branch))
-                   (hash (magit-rev-parse ref))
-                   (reported-branch (gethash hash reported)))
-              (unless (or (and reported-branch
-                               (string= (file-name-nondirectory ref)
-                                        reported-branch))
-                          (not (magit-git-string "merge-base" head ref)))
-                (puthash hash (file-name-nondirectory ref) reported)
-                (let* ((n (length (magit-git-lines "log" "--pretty=oneline"
-                                                   (concat head ".." ref))))
-                       (section
-                        (let ((magit-section-hidden-default t))
-                          (magit-git-section
-                           (cons ref 'wazzup)
-                           (format "%s unmerged commits in %s%s"
-                                   n name
-                                   (if (member ref excluded)
-                                       " (normally ignored)"
-                                     ""))
-                           'magit-wash-log
-                           "log"
-                           (format "--max-count=%s" magit-log-cutoff-length)
-                           "--abbrev-commit"
-                           (format "--abbrev=%s" magit-sha1-abbrev-length)
-                           "--graph"
-                           "--pretty=oneline"
-                           (format "%s..%s" head ref)
-                           "--"))))
-                  (magit-set-section-info ref section))))))))))
-
-(define-derived-mode magit-wazzup-mode magit-mode "Magit Wazzup"
-  "Mode for looking at commits that could be merged from other branches.
-
-\\{magit-wazzup-mode-map}"
-  :group 'magit)
-
-(defun magit-wazzup (&optional all)
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-branch (magit-get-current-branch)))
-    (magit-buffer-switch "*magit-wazzup*")
-    (magit-mode-init topdir 'magit-wazzup-mode
-                     #'magit-refresh-wazzup-buffer
-                     current-branch all)))
-
-(defun magit-filename (filename)
-  "Return the path of FILENAME relative to its git repository.
-
-If FILENAME is absolute, return a path relative to the git
-repository containing it. Otherwise, return a path relative to
-the current git repository."
-  (let ((topdir (expand-file-name
-                 (magit-get-top-dir (or (file-name-directory filename)
-                                        default-directory))))
-        (file (file-truename filename)))
-    (when (and (not (string= topdir ""))
-               ;; FILE must start with the git repository path
-               (zerop (string-match-p (concat "\\`" topdir) file)))
-      (substring file (length topdir)))))
-
-;; This variable is used to keep track of the current file in the
-;; *magit-log* buffer when this one is dedicated to showing the log of
-;; just 1 file.
-(defvar magit-file-log-file nil)
-(make-variable-buffer-local 'magit-file-log-file)
-
-(defun magit-refresh-file-log-buffer (file range style)
-  "Refresh the current file-log buffer by calling git.
-
-FILE is the path of the file whose log must be displayed.
-
-`magit-current-range' will be set to the value of RANGE.
-
-STYLE controls the display. It is either `'long',  `'oneline', or something else.
- "
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (setq magit-file-log-file file)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range (format "Commits for file %s" file))
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             "--"
-             ,file))))
-
-(defun magit-file-log (&optional all)
-  "Display the log for the currently visited file or another one.
-
-With a prefix argument or if no file is currently visited, ask
-for the file whose log must be displayed."
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-file (magit-filename
-                       (if (or current-prefix-arg (not buffer-file-name))
-                           (magit-read-file-from-rev (magit-get-current-branch))
-                        buffer-file-name)))
-        (range "HEAD"))
-    (magit-buffer-switch "*magit-log*")
-    (magit-mode-init topdir 'magit-log-mode
-                     #'magit-refresh-file-log-buffer
-                     current-file range 'oneline)))
-
-(defun magit-show-file-revision ()
-  "Open a new buffer showing the current file in the revision at point."
-  (interactive)
-  (flet ((magit-show-file-from-diff (item)
-                                    (switch-to-buffer-other-window
-                                     (magit-show (cdr (magit-diff-item-range item))
-                                                 (magit-diff-item-file item)))))
-    (magit-section-action (item info "show")
-      ((commit)
-       (let ((current-file (or magit-file-log-file
-                               (magit-read-file-from-rev info))))
-         (switch-to-buffer-other-window
-          (magit-show info current-file))))
-      ((hunk) (magit-show-file-from-diff (magit-hunk-item-diff item)))
-      ((diff) (magit-show-file-from-diff item)))))
-
-;;; Miscellaneous
-
-(defun magit-ignore-modifiable-file (file edit)
-  "Prompt the user for the filename to be added to git ignore.
-\\<minibuffer-local-map>
-The minibuffer's future history (accessible with \\[next-history-element])
-contains predefined values (such as wildcards) that might
-be of interest.
-The history and default value are derived from the filename FILE.
-If EDIT argument is negative, the prompt proposes wildcard by default.
-"
-  (let* ((just-extension (concat "*." (file-name-extension file)))
-         (full-extension (concat (file-name-directory file) just-extension))
-         (just-file (file-name-nondirectory file))
-         ;; change the order in history depending on the negativity of
-         ;; EDIT.
-         (history (if (< (prefix-numeric-value edit) 0)
-                      (list full-extension just-extension file just-file)
-                    (list file full-extension just-extension just-file))))
-    (read-string
-     (format "File to ignore [%s]: " (car history))
-     nil nil history)))
-
-(defun magit-ignore-file (file edit local)
-  "Add FILE to the list of files to ignore.
-\\<minibuffer-local-map>
-If EDIT is non-`nil', prompt the user for the filename to
-be added to git ignore. In this case, the minibuffer's
-future history (accessible with \\[next-history-element]) contains predefined
-values (such as wildcards) that might be of interest.
-
-If LOCAL is nil, the `.gitignore' file is updated.
-Otherwise, it is `.git/info/exclude'."
-  (let* ((local-ignore-dir (concat (magit-git-dir) "info/"))
-         (ignore-file (if local
-                          (concat local-ignore-dir "exclude")
-                        ".gitignore")))
-    (if edit
-      (setq file (magit-ignore-modifiable-file file edit)))
-    (if (and local (not (file-exists-p local-ignore-dir)))
-        (make-directory local-ignore-dir t))
-    (with-temp-buffer
-      (when (file-exists-p ignore-file)
-        (insert-file-contents ignore-file))
-      (goto-char (point-max))
-      (unless (bolp)
-        (insert "\n"))
-      (insert file "\n")
-      (write-region nil nil ignore-file))
-    (magit-need-refresh)))
-
-(defun magit-ignore-item ()
-  "Add FILE to the `.gitignore' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-\(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg nil))
-    ((wazzup)
-     (magit-wazzup-toggle-ignore info current-prefix-arg))))
-
-(defun magit-ignore-item-locally ()
-  "Add FILE to the `.git/info/exclude' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg t))))
-
-(defun magit-discard-diff (diff stagedp)
-  (let ((kind (magit-diff-item-kind diff))
-        (file (magit-diff-item-file diff)))
-    (cond ((eq kind 'deleted)
-           (when (yes-or-no-p (format "Resurrect %s? " file))
-             (magit-run-git "reset" "-q" "--" file)
-             (magit-run-git "checkout" "--" file)))
-          ((eq kind 'new)
-           (if (yes-or-no-p (format "Delete %s? " file))
-               (magit-run-git "rm" "-f" "--" file)))
-          (t
-           (if (yes-or-no-p (format "Discard changes to %s? " file))
-               (if stagedp
-                   (magit-run-git "checkout" "HEAD" "--" file)
-                 (magit-run-git "checkout" "--" file)))))))
-
-(defun magit-discard-item ()
-  (interactive)
-  (magit-section-action (item info "discard")
-    ((untracked file)
-     (when (yes-or-no-p (format "Delete %s? " info))
-       (if (and (file-directory-p info)
-                (not (file-symlink-p info)))
-           (magit-delete-directory info 'recursive)
-         (delete-file info))
-       (magit-refresh-buffer)))
-    ((untracked)
-     (if (yes-or-no-p "Delete all untracked files and directories? ")
-         (magit-run-git "clean" "-df")))
-    ((unstaged diff hunk)
-     (when (yes-or-no-p (if (magit-use-region-p)
-                            "Discard changes in region? "
-                          "Discard hunk? "))
-       (magit-apply-hunk-item-reverse item)))
-    ((staged diff hunk)
-     (if (magit-file-uptodate-p (magit-diff-item-file
-                                 (magit-hunk-item-diff item)))
-         (when (yes-or-no-p (if (magit-use-region-p)
-                                "Discard changes in region? "
-                              "Discard hunk? "))
-           (magit-apply-hunk-item-reverse item "--index"))
-       (error "Can't discard this hunk.  Please unstage it first")))
-    ((unstaged diff)
-     (magit-discard-diff item nil))
-    ((staged diff)
-     (if (magit-file-uptodate-p (magit-diff-item-file item))
-         (magit-discard-diff item t)
-       (error "Can't discard staged changes to this file.  Please unstage it first")))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((hunk)
-     (error "Can't discard this hunk"))
-    ((diff)
-     (error "Can't discard this diff"))
-    ((stash)
-     (when (yes-or-no-p "Discard stash? ")
-       (magit-run-git "stash" "drop" info)))
-    ((branch)
-     (when (yes-or-no-p (if current-prefix-arg
-                            "Force delete branch?"
-                          "Delete branch? "))
-       (magit-delete-branch info current-prefix-arg)))
-    ((remote)
-     (when (yes-or-no-p "Remove remote? ")
-       (magit-remove-remote info)))))
-
-(defun magit-move-item ()
-  (interactive)
-  (magit-section-action (item info "move")
-    ((branch)
-     (call-interactively 'magit-move-branch))
-    ((remote)
-     (call-interactively 'magit-rename-remote))))
-
-(defmacro magit-visiting-file-item (&rest body)
-  `(let ((marker (save-window-excursion
-                   (magit-visit-file-item)
-                   (set-marker (make-marker) (point)))))
-     (save-excursion
-       (with-current-buffer (marker-buffer marker)
-         (goto-char marker)
-         ,@body))))
-
-(defun magit-add-change-log-entry-no-option (&optional other-window)
-  "Add a change log entry for current change.
-With a prefix argument, edit in other window.
-The name of the change log file is set by variable change-log-default-name."
-  (interactive "P")
-  (if other-window
-      (magit-visiting-file-item (add-change-log-entry-other-window))
-    (magit-visiting-file-item (add-change-log-entry))))
-
-(defun magit-add-change-log-entry-other-window ()
-  (interactive)
-  (magit-visiting-file-item (call-interactively 'add-change-log-entry-other-window)))
-
-(eval-after-load 'dired-x
-  '(defun magit-dired-jump (&optional other-window)
-    "Visit current item.
-With a prefix argument, visit in other window."
-    (interactive "P")
-    (require 'dired-x)
-    (magit-section-action (item info "dired-jump")
-      ((untracked file)
-       (dired-jump other-window (file-truename info)))
-      ((diff)
-       (dired-jump other-window (file-truename (magit-diff-item-file item))))
-      ((hunk)
-       (dired-jump other-window
-                   (file-truename (magit-diff-item-file
-                                   (magit-hunk-item-diff item))))))))
-
-(defun magit-visit-file-item (&optional other-window)
-  "Visit current file associated with item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit-file")
-    ((untracked file)
-     (funcall
-      (if other-window 'find-file-other-window 'find-file)
-      info))
-    ((diff)
-     (let ((file (magit-diff-item-file item)))
-       (cond ((not (file-exists-p file))
-              (error "Can't visit deleted file: %s" file))
-             ((file-directory-p file)
-              (magit-status file))
-             (t
-              (funcall
-               (if other-window 'find-file-other-window 'find-file)
-               file)))))
-    ((hunk)
-     (let ((file (magit-diff-item-file (magit-hunk-item-diff item)))
-           (line (magit-hunk-item-target-line item)))
-       (if (not (file-exists-p file))
-           (error "Can't visit deleted file: %s" file))
-       (funcall
-        (if other-window 'find-file-other-window 'find-file)
-        file)
-       (goto-char (point-min))
-       (forward-line (1- line))))))
-
-(defun magit-visit-item (&optional other-window)
-  "Visit current item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit")
-    ((untracked file)
-     (call-interactively 'magit-visit-file-item))
-    ((diff)
-     (call-interactively 'magit-visit-file-item))
-    ((hunk)
-     (call-interactively 'magit-visit-file-item))
-    ((commit)
-     (magit-show-commit info nil nil 'select))
-    ((stash)
-     (magit-show-stash info)
-     (pop-to-buffer magit-stash-buffer-name))
-    ((branch)
-     (magit-checkout info))
-    ((longer)
-     (magit-log-show-more-entries ()))))
-
-(defun magit-show-item-or-scroll-up ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-up))
-    ((stash)
-     (magit-show-stash info #'scroll-up))
-    (t
-     (scroll-up))))
-
-(defun magit-show-item-or-scroll-down ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-down))
-    ((stash)
-     (magit-show-stash info #'scroll-down))
-    (t
-     (scroll-down))))
-
-(defun magit-mark-item (&optional unmark)
-  (interactive "P")
-  (if unmark
-      (magit-set-marked-commit nil)
-    (magit-section-action (item info "mark")
-      ((commit)
-       (magit-set-marked-commit (if (eq magit-marked-commit info)
-                                    nil
-                                  info))))))
-
-(defun magit-describe-item ()
-  (interactive)
-  (let ((section (magit-current-section)))
-    (message "Section: %s %s-%s %S %S %S"
-             (magit-section-type section)
-             (magit-section-beginning section)
-             (magit-section-end section)
-             (magit-section-title section)
-             (magit-section-info section)
-             (magit-section-context-type section))))
-
-(defun magit-copy-item-as-kill ()
-  "Copy sha1 of commit at point into kill ring."
-  (interactive)
-  (magit-section-action (item info "copy")
-    ((commit)
-     (kill-new info)
-     (message "%s" info))))
-
-(eval-when-compile (require 'server))
-
-(defun magit-server-running-p ()
-  "Test whether server is running (works with < 23 as well).
-
-Return values:
-  nil              the server is definitely not running.
-  t                the server seems to be running.
-  something else   we cannot determine whether it's running without using
-                   commands which may have to wait for a long time."
-  (require 'server)
-  (if (functionp 'server-running-p)
-      (server-running-p)
-    (condition-case nil
-        (if server-use-tcp
-            (with-temp-buffer
-              (insert-file-contents-literally (expand-file-name server-name server-auth-dir))
-              (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
-                       (assq 'comm
-                             (process-attributes
-                              (string-to-number (match-string 1))))
-                       t)
-                  :other))
-          (delete-process
-           (make-network-process
-            :name "server-client-test" :family 'local :server nil :noquery t
-            :service (expand-file-name server-name server-socket-dir)))
-          t)
-      (file-error nil))))
-
-(defun magit-interactive-rebase ()
-  "Start a git rebase -i session, old school-style."
-  (interactive)
-  (unless (magit-server-running-p)
-    (server-start))
-  (let* ((section (get-text-property (point) 'magit-section))
-         (commit (and (member 'commit (magit-section-context-type section))
-                      (magit-section-info section)))
-         (old-editor (getenv "GIT_EDITOR")))
-    (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
-                                 " -s " server-name))
-    (unwind-protect
-        (magit-run-git-async "rebase" "-i"
-                             (or (and commit (concat commit "^"))
-                                 (magit-read-rev "Interactively rebase to" (magit-guess-branch))))
-      (if old-editor
-          (setenv "GIT_EDITOR" old-editor)))))
-
-(define-derived-mode magit-branch-manager-mode magit-mode "Magit Branch"
-  "Magit Branches")
-
-(defun magit-quit-window (&optional kill-buffer)
-  "Bury the buffer and delete its window.  With a prefix argument, kill the
-buffer instead."
-  (interactive "P")
-  (quit-window kill-buffer (selected-window)))
-
-(defun magit--branch-name-at-point ()
-  "Get the branch name in the line at point."
-  (let ((branch (magit-section-info (magit-current-section))))
-    (or branch (error "No branch at point"))))
-
-(defun magit--branches-for-remote-repo (remote)
-  "Return a list of remote branch names for REMOTE.
-These are the branch names with the remote name stripped."
-  (remq nil
-        (mapcar (lambda (line)
-                  (save-match-data
-                    (if (and (not (string-match-p " -> " line))
-                             (string-match (concat "^ +" remote "/\\([^ $]+\\)")
-                                           line))
-                        (match-string 1 line))))
-                (magit-git-lines "branch" "-r"))))
-
-(defvar magit-branches-buffer-name "*magit-branches*")
-
-(defun magit--is-branch-at-point-remote ()
-  "Return non-nil if the branch at point is a remote tracking branch"
-  (magit-remote-part-of-branch (magit--branch-name-at-point)))
-
-(defun magit-remote-part-of-branch (branch)
-  (when (string-match-p "^\\(?:refs/\\)?remotes\\/" branch)
-    (loop for remote in (magit-git-lines "remote")
-          when (string-match-p (format "^\\(?:refs/\\)?remotes\\/%s\\/" (regexp-quote remote)) branch) return remote)))
-
-(defun magit-branch-no-remote (branch)
-  (let ((remote (magit-remote-part-of-branch branch)))
-    (if remote
-        (progn
-          ;; This has to match if remote is non-nil
-          (assert (string-match (format "^\\(?:refs/\\)?remotes\\/%s\\/\\(.*\\)" (regexp-quote remote)) branch)
-                  'show-args "Unexpected string-match failure: %s %s")
-          (match-string 1 branch))
-      branch)))
-
-(defun magit-wash-branch-line (&optional remote-name)
-  (looking-at (concat
-               "^\\([ *] \\)"                 ; 1: current branch marker
-               "\\(.+?\\) +"                  ; 2: branch name
-
-               "\\(?:"
-
-               "\\([0-9a-fA-F]+\\)"           ; 3: sha1
-               " "
-               "\\(?:\\["
-               "\\([^:\n]+?\\)"               ; 4: tracking (non-greedy + to avoid matching \n)
-               "\\(?:: \\)?"
-               "\\(?:ahead \\([0-9]+\\)\\)?"  ; 5: ahead
-               "\\(?:, \\)?"
-               "\\(?:behind \\([0-9]+\\)\\)?" ; 6: behind
-               "\\] \\)?"
-               "\\(?:.*\\)"                   ; message
-
-               "\\|"                          ; or
-
-               "-> "                          ; the pointer to
-               "\\(.+\\)"                     ; 7: a ref
-
-               "\\)\n"))
-
-  (let* ((current-string (match-string 1))
-         (branch         (match-string 2))
-         (sha1           (match-string 3))
-         (tracking       (match-string 4))
-         (ahead          (match-string 5))
-         (behind         (match-string 6))
-         (other-ref      (match-string 7))
-         (current (string-match-p "^\\*" current-string)))
-
-    ; the current line is deleted before being reconstructed
-    (delete-region (point)
-                   (line-beginning-position 2))
-
-    (magit-with-section branch 'branch
-      (magit-set-section-info branch)
-      (insert-before-markers
-       ; sha1
-       (propertize (or sha1
-                       (make-string magit-sha1-abbrev-length ? ))
-                   'face 'magit-log-sha1)
-       " "
-       ; current marker
-       (if current
-           "# "
-         "  ")
-       ; branch name
-       (apply 'propertize (magit-branch-no-remote branch)
-              (if current
-                  '(face magit-branch)))
-       ; other ref that this branch is pointing to
-       (if other-ref
-           (concat " -> " (substring other-ref (+ 1 (length remote-name))))
-         "")
-       ; tracking information
-       (if (and tracking
-                (equal (magit-remote-branch-for branch t)
-                       (concat "refs/remotes/" tracking)))
-           (concat " ["
-                   ; getting rid of the tracking branch name if it is the same as the branch name
-                   (let* ((tracking-remote (magit-get "branch" branch "remote"))
-                          (tracking-branch (substring tracking (+ 1 (length tracking-remote)))))
-                     (propertize (if (string= branch tracking-branch)
-                                     (concat "@ " tracking-remote)
-                                   (concat tracking-branch " @ " tracking-remote))
-                                 'face 'magit-log-head-label-remote))
-                   ; ahead/behind information
-                   (if (or ahead
-                           behind)
-                       ": "
-                     "")
-                   (if ahead
-                       (concat "ahead "
-                               (propertize ahead
-                                           'face (if current
-                                                     'magit-branch))
-                               (if behind
-                                   ", "
-                                 ""))
-                     "")
-                   (if behind
-                       (concat "behind "
-                               (propertize behind
-                                           'face 'magit-log-head-label-remote))
-                     "")
-                   "]")
-         "")
-       "\n"))))
-
-(defun magit-wash-remote-branches-group (group)
-  (let* ((remote-name (first group))
-         (url (magit-get "remote" remote-name "url"))
-         (push-url (magit-get "remote" remote-name "pushurl"))
-         (urls (concat url (if push-url
-                               (concat ", "push-url)
-                             "")))
-         (marker (second group)))
-
-    (magit-with-section (concat "remote:" remote-name) 'remote
-      (magit-set-section-info remote-name)
-      (insert-before-markers (propertize (format "%s (%s):" remote-name urls) 'face 'magit-section-title) "\n")
-      (magit-wash-branches-between-point-and-marker marker remote-name))
-    (insert-before-markers "\n")))
-
-(defun magit-wash-branches-between-point-and-marker (marker &optional remote-name)
-  (save-restriction
-    (narrow-to-region (point) marker)
-    (magit-wash-sequence
-     (if remote-name
-         (apply-partially 'magit-wash-branch-line remote-name)
-       #'magit-wash-branch-line))))
-
-(defun magit-wash-branches ()
-         ; get the names of the remotes
-  (let* ((remotes (magit-git-lines "remote"))
-         ; get the location of remotes in the buffer
-         (markers
-          (append (mapcar (lambda (remote)
-                            (save-excursion
-                              (when (search-forward-regexp
-                                     (concat "^  remotes\\/" remote) nil t)
-                                (beginning-of-line)
-                                (point-marker))))
-                          remotes)
-                  (list (save-excursion
-                          (goto-char (point-max))
-                          (point-marker)))))
-         ; list of remote elements to display in the buffer
-         (remote-groups (loop for remote in remotes
-                              for end-markers on (cdr markers)
-                              for marker = (loop for x in end-markers thereis x)
-                              collect (list remote marker))))
-
-    ; actual displaying of information
-    (magit-with-section "local" nil
-      (insert-before-markers (propertize "Local:" 'face 'magit-section-title) "\n")
-      (magit-set-section-info ".")
-      (magit-wash-branches-between-point-and-marker
-       (loop for x in markers thereis x)))
-
-    (insert-before-markers "\n")
-
-    (mapc 'magit-wash-remote-branches-group remote-groups)
-
-    ; make sure markers point to nil so that they can be garbage collected
-    (mapc (lambda (marker)
-            (when marker
-             (set-marker marker nil)))
-          markers)))
-
-(defun magit-refresh-branch-manager ()
-  (magit-create-buffer-sections
-    (magit-git-section "branches" nil 'magit-wash-branches
-                       "branch"
-                       "-vva"
-                       (format "--abbrev=%s" magit-sha1-abbrev-length))))
-
-(magit-define-command branch-manager ()
-  (interactive)
-  (let ((topdir (magit-get-top-dir default-directory)))
-    (magit-buffer-switch magit-branches-buffer-name)
-    (magit-mode-init topdir 'magit-branch-manager-mode #'magit-refresh-branch-manager)))
-
-(defun magit-change-what-branch-tracks ()
-  "Change which remote branch the current branch tracks."
-  (interactive)
-  (if (magit--is-branch-at-point-remote)
-      (error "Cannot modify a remote branch"))
-  (let* ((local-branch (magit--branch-name-at-point))
-         (new-tracked (magit-read-rev  "Change tracked branch to"
-                                       nil
-                                       (lambda (ref)
-                                         (not (string-match-p "refs/remotes/"
-                                                              ref)))))
-         new-remote new-branch)
-    (unless (string= (or new-tracked "") "")
-      (cond (;; Match refs that are unknown in the local repository if
-             ;; `magit-remote-ref-format' is set to
-             ;; `name-then-remote'. Can be useful if you want to
-             ;; create a new branch in a remote repository.
-             (string-match "^\\([^ ]+\\) +(\\(.+\\))$" ; 1: branch name; 2: remote name
-                           new-tracked)
-             (setq new-remote (match-string 2 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 1 new-tracked))))
-            ((string-match "^\\(?:refs/remotes/\\)?\\([^/]+\\)/\\(.+\\)" ; 1: remote name; 2: branch name
-                           new-tracked)
-             (setq new-remote (match-string 1 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 2 new-tracked))))
-            (t (error "Cannot parse the remote and branch name"))))
-    (magit-set new-remote "branch" local-branch "remote")
-    (magit-set new-branch "branch" local-branch "merge")
-    (magit-branch-manager)
-    (if (string= (magit-get-current-branch) local-branch)
-        (magit-refresh-buffer (magit-find-status-buffer default-directory)))))
-
-(defvar magit-ediff-file)
-
-(defun magit-interactive-resolve (file)
-  (require 'ediff)
-  (let ((merge-status (magit-git-string "ls-files" "-u" "--" file))
-        (base-buffer (generate-new-buffer (concat file ".base")))
-        (our-buffer (generate-new-buffer (concat file ".current")))
-        (their-buffer (generate-new-buffer (concat file ".merged")))
-        (windows (current-window-configuration)))
-    (if (null merge-status)
-        (error "Cannot resolve %s" file))
-    (with-current-buffer base-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:" file))))))
-    (with-current-buffer our-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    (with-current-buffer their-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    ;; We have now created the 3 buffer with ours, theirs and the ancestor files
-    (with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer)
-      (make-local-variable 'magit-ediff-file)
-      (setq magit-ediff-file file)
-      (make-local-variable 'magit-ediff-windows)
-      (setq magit-ediff-windows windows)
-      (make-local-variable 'ediff-quit-hook)
-      (add-hook 'ediff-quit-hook
-                (lambda ()
-                  (let ((buffer-A ediff-buffer-A)
-                        (buffer-B ediff-buffer-B)
-                        (buffer-C ediff-buffer-C)
-                        (buffer-Ancestor ediff-ancestor-buffer)
-                        (file magit-ediff-file)
-                        (file-buffer)
-                        (windows magit-ediff-windows))
-                    (ediff-cleanup-mess)
-                    (find-file file)
-                    (setq file-buffer (current-buffer))
-                    (erase-buffer)
-                    (insert-buffer-substring buffer-C)
-                    (kill-buffer buffer-A)
-                    (kill-buffer buffer-B)
-                    (kill-buffer buffer-C)
-                    (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor))
-                    (set-window-configuration windows)
-                    (magit-save-some-buffers
-                     "Conflict resolution finished; you may save the buffer"
-                     (lambda () (eq (current-buffer) file-buffer)))))))))
-
-(defun magit-interactive-resolve-item ()
-  (interactive)
-  (magit-section-action (item info "resolv")
-    ((diff)
-     (magit-interactive-resolve (cadr info)))))
-
-(defun magit-submodule-update (&optional init)
-  "Update the submodule of the current git repository
-
-With a prefix arg, do a submodule update --init"
-  (interactive "P")
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (apply #'magit-run-git-async "submodule" "update" (if init '("--init") ()))))
-
-(defun magit-submodule-update-init ()
-  "Update and init the submodule of the current git repository."
-  (interactive)
-  (magit-submodule-update t))
-
-(defun magit-submodule-init ()
-  "Initialize the submodules"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "init")))
-
-(defun magit-submodule-sync ()
-  "Synchronizes submodules' remote URL configuration"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "sync")))
-
-(defun magit-run-git-gui ()
-  "Run `git gui' for the current git repository"
-  (interactive)
-  (let* ((default-directory (magit-get-top-dir default-directory)))
-    (magit-start-process "Git Gui" nil magit-git-executable "gui")))
-
-(defun magit-run-gitk ()
-  "Run `gitk --all' for the current git repository"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (cond
-     ((eq system-type 'windows-nt)
-      ;; Gitk is a shell script, and Windows doesn't know how to
-      ;; "execute" it.  The Windows version of Git comes with an
-      ;; implementation of "sh" and everything else it needs, but
-      ;; Windows users might not have added the directory where it's
-      ;; installed to their path
-      (let ((git-bin-dir (file-name-directory magit-gitk-executable))
-            (exec-path exec-path)
-            (process-environment process-environment))
-        (when git-bin-dir
-          ;; Adding it onto the end so that anything the user
-          ;; specified will get tried first.  Emacs looks in
-          ;; exec-path; PATH is the environment variable inherited by
-          ;; the process.  I need to change both.
-          (setq exec-path (append exec-path (list git-bin-dir)))
-          (push (format "PATH=%s;%s"
-                        (getenv "PATH")
-                        (replace-regexp-in-string "/" "\\\\" git-bin-dir))
-                process-environment))
-        (magit-start-process "Gitk" nil "sh" magit-gitk-executable "--all")))
-     (t
-      (magit-start-process "Gitk" nil magit-gitk-executable "--all")))))
-
-(defun magit-load-config-extensions ()
-  "Try to load magit extensions that are defined at git config
-layer. This can be added to `magit-mode-hook' for example"
-  (dolist (ext (magit-get-all "magit.extension"))
-    (let ((sym (intern (format "magit-%s-mode" ext))))
-      (when (and (fboundp sym)
-                 (not (eq sym 'magit-wip-save-mode)))
-        (funcall sym 1)))))
-
-(provide 'magit)
-
-;; rest of magit core
-(require 'magit-key-mode)
-(require 'magit-bisect)
-
-;;; magit.el ends here
diff --git a/elpa/magit-1.2.0/magit.elc b/elpa/magit-1.2.0/magit.elc
deleted file mode 100644
index 3e4958feb..000000000
Binary files a/elpa/magit-1.2.0/magit.elc and /dev/null differ
diff --git a/elpa/magit-1.2.0/rebase-mode.el b/elpa/magit-1.2.0/rebase-mode.el
deleted file mode 100644
index 1ccfb540e..000000000
--- a/elpa/magit-1.2.0/rebase-mode.el
+++ /dev/null
@@ -1,322 +0,0 @@
-;;; rebase-mode -- edit git rebase files.
-
-;; Copyright (C) 2010  Phil Jackson
-;; Copyright (C) 2011  Peter J Weisberg
-;;
-;; Magit 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, or (at your option)
-;; any later version.
-;;
-;; Magit 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 Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Allows the editing of a git rebase file (which you might get when
-;; using 'git rebase -i' or hitting 'E' in Magit). Assumes editing is
-;; happening in a server.
-
-;;; Code:
-
-(require 'server)
-
-(defgroup rebase-mode nil
-  "Customize Rebase Mode"
-  :group 'faces)
-
-(defface rebase-mode-killed-action-face
-  '((((class color))
-     :inherit font-lock-comment-face
-     :strike-through t))
-  "Action lines in the rebase TODO list that have been commented out."
-  :group 'rebase-mode)
-
-(defface rebase-mode-description-face
-  '((t :inherit font-lock-comment-face))
-  "Face for one-line commit descriptions"
-  :group 'rebase-mode)
-
-(defconst rebase-mode-action-line-re
-  (rx
-   line-start
-   (? "#")
-   (group
-    (|
-     (any "presf")
-     "pick"
-     "reword"
-     "edit"
-     "squash"
-     "fixup"))
-   (char space)
-   (group
-    (** 4 40 hex-digit)) ;sha1
-   (char space)
-   (group
-    (* not-newline)))
-  "Regexp that matches an action line in a rebase buffer.")
-
-(defconst rebase-mode-exec-line-re
-  (rx
-   line-start
-   (? "#")
-   (group
-    (| "x"
-       "exec"))
-   (char space)
-   (group
-    (* not-newline)))
-  "Regexp that matches an exec line in a rebase buffer.")
-
-(defconst rebase-mode-dead-line-re
-  (rx-to-string `(and line-start
-                      (char ?#)
-                      (or (regexp ,(substring rebase-mode-action-line-re 1))
-                          (regexp ,(substring rebase-mode-exec-line-re 1)))) t)
-  "Regexp that matches a commented-out exec or action line in a rebase buffer.")
-
-(defvar rebase-mode-font-lock-keywords
-  (list
-   (list rebase-mode-action-line-re
-         '(1 font-lock-keyword-face)
-         '(2 font-lock-builtin-face)
-         '(3 'rebase-mode-description-face))
-   (list rebase-mode-exec-line-re
-         '(1 font-lock-keyword-face))
-   (list (rx line-start (char "#") (* not-newline)) 0 font-lock-comment-face)
-   (list rebase-mode-dead-line-re 0 ''rebase-mode-killed-action-face t))
-  "Font lock keywords for `rebase-mode'.")
-
-(defvar key-to-action-map
-  '(("c" . "pick")
-    ("r" . "reword")
-    ("e" . "edit")
-    ("s" . "squash")
-    ("f" . "fixup"))
-  "Mapping from key to action.")
-
-(defvar rebase-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "q") 'server-edit)
-    (define-key map (kbd "C-c C-c") 'server-edit)
-
-    (define-key map (kbd "a") 'rebase-mode-abort)
-    (define-key map (kbd "C-c C-k") 'rebase-mode-abort)
-
-    (define-key map (kbd "M-p") 'rebase-mode-move-line-up)
-    (define-key map (kbd "M-n") 'rebase-mode-move-line-down)
-    (define-key map (kbd "k") 'rebase-mode-kill-line)
-    (define-key map (kbd "x") 'rebase-mode-exec)
-
-    (define-key map (kbd "n") 'forward-line)
-    (define-key map (kbd "p") '(lambda(n)
-                                 (interactive "p")
-                                 (forward-line (* n -1))))
-    (define-key map [remap undo] 'rebase-mode-undo)
-    map)
-  "Keymap for rebase-mode.  Note this will be added to by the
-top-level code which defines the edit functions.")
-
-(require 'easymenu)
-(easy-menu-define rebase-mode-menu rebase-mode-map
-  "Rebase-mode menu"
-  '("Rebase"
-    ["Pick" rebase-mode-pick t]
-    ["Reword" rebase-mode-reword t]
-    ["Edit" rebase-mode-edit t]
-    ["Squash" rebase-mode-squash t]
-    ["Fixup" rebase-mode-fixup t]
-    ["Kill" rebase-mode-kill-line t]
-    ["Move Down" rebase-mode-move-line-down t]
-    ["Move Up" rebase-mode-move-line-up t]
-    ["Execute" rebase-mode-exec t]
-    "---"
-    ["Abort" rebase-mode-abort t]
-    ["Done" server-edit t]))
-
-;; create the functions which edit the action lines themselves (based
-;; on `key-to-action-map' above)
-(mapc (lambda (key-action)
-        (let ((fun-name (intern (concat "rebase-mode-" (cdr key-action)))))
-          ;; define the function
-          (eval `(defun ,fun-name ()
-                   (interactive)
-                   (rebase-mode-edit-line ,(cdr key-action))))
-
-          ;; bind the function in `rebase-mode-map'
-          (define-key rebase-mode-map (car key-action) fun-name)))
-      key-to-action-map)
-
-(defun rebase-mode-edit-line (change-to)
-  "Change the keyword at the start of the current action line to
-that of CHANGE-TO."
-  (when (rebase-mode-looking-at-action)
-    (let ((buffer-read-only nil)
-          (start (point)))
-      (goto-char (point-at-bol))
-      (delete-region (point) (progn (forward-word 1) (point)))
-      (insert change-to)
-      (goto-char start))))
-
-(defun rebase-mode-looking-at-action ()
-  "Return non-nil if looking at an action line."
-  (save-excursion
-    (goto-char (point-at-bol))
-    (looking-at rebase-mode-action-line-re)))
-
-(defun rebase-mode-looking-at-action-or-exec ()
-  "Return non-nil if looking at an action line or exec line."
-  (save-excursion
-    (goto-char (point-at-bol))
-    (or (looking-at rebase-mode-action-line-re)
-        (looking-at rebase-mode-exec-line-re))))
-
-(defun rebase-mode-looking-at-exec ()
-  "Return non-nil if cursor is on an exec line."
-  (string-match rebase-mode-exec-line-re (thing-at-point 'line)))
-
-(defun rebase-mode-looking-at-killed-exec ()
-  "Return non-nil if looking at an exec line that has been commented out"
-  (let ((line (thing-at-point 'line)))
-    (and (eq (aref line 0) ?#)
-         (string-match rebase-mode-exec-line-re line))))
-
-(defun rebase-mode-move-line-up ()
-  "Move the current action line up."
-  (interactive)
-  (when (rebase-mode-looking-at-action-or-exec)
-    (let ((buffer-read-only nil)
-          (col (current-column)))
-      (transpose-lines 1)
-      (forward-line -2)
-      (move-to-column col))))
-
-(defun rebase-mode-move-line-down ()
-  "Assuming the next line is also an action line, move the current line down."
-  (interactive)
-  ;; if we're on an action and the next line is also an action
-  (when (and (rebase-mode-looking-at-action-or-exec)
-             (save-excursion
-               (forward-line)
-               (rebase-mode-looking-at-action-or-exec)))
-    (let ((buffer-read-only nil)
-          (col (current-column)))
-      (forward-line 1)
-      (transpose-lines 1)
-      (forward-line -1)
-      (move-to-column col))))
-
-(defun rebase-mode-abort ()
-  "Abort this rebase (by emptying the buffer, saving and closing
-server connection)."
-  (interactive)
-  (when (or (not (buffer-modified-p))
-            (y-or-n-p "Abort this rebase? "))
-    (let ((buffer-read-only nil))
-      (delete-region (point-min) (point-max))
-      (save-buffer)
-      (server-edit))))
-
-(defun rebase-mode-kill-line ()
-  "Kill the current action line."
-  (interactive)
-  (when (and (not (eq (char-after (point-at-bol)) ?#))
-             (rebase-mode-looking-at-action-or-exec))
-    (beginning-of-line)
-    (let ((buffer-read-only nil))
-      (insert "#"))
-    (forward-line)))
-
-(defun rebase-mode-exec (edit)
-  "Prompt the user for a shell command to be executed, and add it to
-the todo list.
-
-If the cursor is on a commented-out exec line, uncomment the
-current line instead of prompting.
-
-When the prefix argument EDIT is non-nil and the cursor is on an
-exec line, edit that line instead of inserting a new one.  If the
-exec line was commented out, also uncomment it."
-  (interactive "P")
-  (cond
-   ((and edit (rebase-mode-looking-at-exec))
-    (let ((new-line (rebase-mode-read-exec-line
-                     (match-string-no-properties 2 (thing-at-point 'line))))
-          (inhibit-read-only t))
-      (delete-region (point-at-bol) (point-at-eol))
-      (if (not (equal "" new-line))
-          (insert "exec " new-line)
-        (delete-char -1)
-        (forward-line))
-      (move-beginning-of-line nil)))
-   ((rebase-mode-looking-at-killed-exec)
-    (save-excursion
-      (beginning-of-line)
-      (let ((buffer-read-only nil))
-        (delete-char 1))))
-   (t
-    (let ((inhibit-read-only t)
-          (line (rebase-mode-read-exec-line)))
-      (unless (equal "" line)
-        (move-end-of-line nil)
-        (newline)
-        (insert (concat "exec " line))))
-    (move-beginning-of-line nil))))
-
-(defun rebase-mode-read-exec-line (&optional initial-line)
-  (read-shell-command "Execute: " initial-line))
-
-(defun rebase-mode-undo (&optional arg)
-  "A thin wrapper around `undo', which allows undoing in
-read-only buffers."
-  (interactive "P")
-  (let ((inhibit-read-only t))
-    (undo arg)))
-
-;;;###autoload
-(define-derived-mode rebase-mode special-mode "Rebase"
-  "Major mode for editing of a Git rebase file.
-
-Rebase files are generated when you run 'git rebase -i' or run
-`magit-interactive-rebase'.  They describe how Git should perform
-the rebase.  See the documentation for git-rebase (e.g., by
-running 'man git-rebase' at the command line) for details."
-  (setq font-lock-defaults '(rebase-mode-font-lock-keywords t t)))
-
-(defun rebase-mode-show-keybindings ()
-  "Modify the \"Commands:\" section of the comment Git generates
-at the bottom of the file so that in place of the one-letter
-abbreviation for the command, it shows the command's keybinding.
-By default, this is the same except for the \"pick\" command."
-  (save-excursion
-    (goto-char (point-min))
-    (while (search-forward-regexp "^#  \\(.\\), \\([[:alpha:]]+\\) = " nil t)
-      (let ((start (match-beginning 1))
-            (end (match-end 1))
-            (command (intern (concat "rebase-mode-" (match-string 2)))))
-        (when (fboundp command)
-          (let ((overlay (make-overlay start end)))
-            (overlay-put overlay
-                         'display
-                         (key-description (where-is-internal command nil t)))))))))
-
-(add-hook 'rebase-mode-hook 'rebase-mode-show-keybindings t)
-
-(defun rebase-mode-disable-before-save-hook ()
-  (set (make-local-variable 'before-save-hook) nil))
-
-(add-hook 'rebase-mode-hook 'rebase-mode-disable-before-save-hook)
-
-;;;###autoload
-(add-to-list 'auto-mode-alist
-             '("git-rebase-todo" . rebase-mode))
-
-(provide 'rebase-mode)
-
-;;; rebase-mode.el ends here
diff --git a/elpa/magit-1.2.0/rebase-mode.elc b/elpa/magit-1.2.0/rebase-mode.elc
deleted file mode 100644
index f13815318..000000000
Binary files a/elpa/magit-1.2.0/rebase-mode.elc and /dev/null differ
diff --git a/elpa/paredit-22/paredit-autoloads.el b/elpa/paredit-22/paredit-autoloads.el
index 2049d2270..a27ccb27a 100644
--- a/elpa/paredit-22/paredit-autoloads.el
+++ b/elpa/paredit-22/paredit-autoloads.el
@@ -3,8 +3,7 @@
 ;;; Code:
 
 
-;;;### (autoloads (paredit-mode) "paredit" "paredit.el" (21031 23282
-;;;;;;  0 0))
+;;;### (autoloads (paredit-mode) "paredit" "paredit.el" (20166 22150))
 ;;; Generated autoloads from paredit.el
 
 (autoload 'paredit-mode "paredit" "\
@@ -20,8 +19,7 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
 
 ;;;***
 
-;;;### (autoloads nil nil ("paredit-pkg.el") (21031 23282 262946
-;;;;;;  0))
+;;;### (autoloads nil nil ("paredit-pkg.el") (20166 22150 922167))
 
 ;;;***
 
diff --git a/elpa/paredit-22/paredit-pkg.elc b/elpa/paredit-22/paredit-pkg.elc
index da197695b..249a95883 100644
Binary files a/elpa/paredit-22/paredit-pkg.elc and b/elpa/paredit-22/paredit-pkg.elc differ
diff --git a/elpa/paredit-22/paredit.elc b/elpa/paredit-22/paredit.elc
index 12b272c36..721bcb87d 100644
Binary files a/elpa/paredit-22/paredit.elc and b/elpa/paredit-22/paredit.elc differ
diff --git a/elpa/pkg-info-0.4/pkg-info-pkg.el b/elpa/pkg-info-0.4/pkg-info-pkg.el
deleted file mode 100644
index c65be9232..000000000
--- a/elpa/pkg-info-0.4/pkg-info-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "pkg-info" "0.4" "Information about packages       -*- lexical-binding: t; -*-" (quote ((dash "1.6.0") (epl "0.4"))))
diff --git a/elpa/pkg-info-0.4/pkg-info-autoloads.el b/elpa/pkg-info-20131101.408/pkg-info-autoloads.el
similarity index 95%
rename from elpa/pkg-info-0.4/pkg-info-autoloads.el
rename to elpa/pkg-info-20131101.408/pkg-info-autoloads.el
index 74ec98576..1f55e6d34 100644
--- a/elpa/pkg-info-0.4/pkg-info-autoloads.el
+++ b/elpa/pkg-info-20131101.408/pkg-info-autoloads.el
@@ -5,7 +5,7 @@
 
 ;;;### (autoloads (pkg-info-version-info pkg-info-package-version
 ;;;;;;  pkg-info-defining-library-version pkg-info-library-version)
-;;;;;;  "pkg-info" "pkg-info.el" (21124 57415))
+;;;;;;  "pkg-info" "pkg-info.el" (21184 20186))
 ;;; Generated autoloads from pkg-info.el
 
 (autoload 'pkg-info-library-version "pkg-info" "\
@@ -73,7 +73,7 @@ version.
 
 ;;;***
 
-;;;### (autoloads nil nil ("pkg-info-pkg.el") (21124 57415 852515))
+;;;### (autoloads nil nil ("pkg-info-pkg.el") (21184 20186 468049))
 
 ;;;***
 
diff --git a/elpa/pkg-info-20131101.408/pkg-info-pkg.el b/elpa/pkg-info-20131101.408/pkg-info-pkg.el
new file mode 100644
index 000000000..ebafed5d6
--- /dev/null
+++ b/elpa/pkg-info-20131101.408/pkg-info-pkg.el
@@ -0,0 +1 @@
+(define-package "pkg-info" "20131101.408" "Information about packages" (quote ((dash "1.6.0") (epl "0.4"))))
diff --git a/elpa/pkg-info-0.4/pkg-info-pkg.elc b/elpa/pkg-info-20131101.408/pkg-info-pkg.elc
similarity index 60%
rename from elpa/pkg-info-0.4/pkg-info-pkg.elc
rename to elpa/pkg-info-20131101.408/pkg-info-pkg.elc
index 9c5b83e05..137cea05e 100644
Binary files a/elpa/pkg-info-0.4/pkg-info-pkg.elc and b/elpa/pkg-info-20131101.408/pkg-info-pkg.elc differ
diff --git a/elpa/pkg-info-0.4/pkg-info.el b/elpa/pkg-info-20131101.408/pkg-info.el
similarity index 99%
rename from elpa/pkg-info-0.4/pkg-info.el
rename to elpa/pkg-info-20131101.408/pkg-info.el
index fd3189f0f..d54c839a9 100644
--- a/elpa/pkg-info-0.4/pkg-info.el
+++ b/elpa/pkg-info-20131101.408/pkg-info.el
@@ -5,7 +5,8 @@
 ;; Author: Sebastian Wiesner <lunaryorn@gmail.com>
 ;; URL: https://github.com/lunaryorn/pkg-info.el
 ;; Keywords: convenience
-;; Version: 0.4
+;; Version: 20131101.408
+;; X-Original-Version: 0.5-cvs
 ;; Package-Requires: ((dash "1.6.0") (epl "0.4"))
 
 ;; This file is not part of GNU Emacs.
diff --git a/elpa/pkg-info-20131101.408/pkg-info.elc b/elpa/pkg-info-20131101.408/pkg-info.elc
new file mode 100644
index 000000000..bdfe20463
Binary files /dev/null and b/elpa/pkg-info-20131101.408/pkg-info.elc differ
diff --git a/elpa/popup-0.5/popup-autoloads.el b/elpa/popup-0.5/popup-autoloads.el
index 9859825f1..ea87ae39e 100644
--- a/elpa/popup-0.5/popup-autoloads.el
+++ b/elpa/popup-0.5/popup-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("popup-pkg.el" "popup.el") (21031 23303
-;;;;;;  628729 0))
+;;;### (autoloads nil nil ("popup-pkg.el" "popup.el") (20887 42932
+;;;;;;  288158))
 
 ;;;***
 
diff --git a/elpa/popup-0.5/popup-pkg.elc b/elpa/popup-0.5/popup-pkg.elc
index 2e2e75220..7888ce4ee 100644
Binary files a/elpa/popup-0.5/popup-pkg.elc and b/elpa/popup-0.5/popup-pkg.elc differ
diff --git a/elpa/popup-0.5/popup.elc b/elpa/popup-0.5/popup.elc
index 58c4385fa..05c226153 100644
Binary files a/elpa/popup-0.5/popup.elc and b/elpa/popup-0.5/popup.elc differ
diff --git a/elpa/projectile-0.9.2/projectile-autoloads.el b/elpa/projectile-0.9.2/projectile-autoloads.el
new file mode 100644
index 000000000..94f5d3286
--- /dev/null
+++ b/elpa/projectile-0.9.2/projectile-autoloads.el
@@ -0,0 +1,52 @@
+;;; projectile-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (projectile-global-mode projectile-mode) "projectile"
+;;;;;;  "projectile.el" (21077 32442 0 0))
+;;; Generated autoloads from projectile.el
+
+(autoload 'projectile-mode "projectile" "\
+Minor mode to assist project management and navigation.
+
+\\{projectile-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar projectile-global-mode nil "\
+Non-nil if Projectile-Global mode is enabled.
+See the command `projectile-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `projectile-global-mode'.")
+
+(custom-autoload 'projectile-global-mode "projectile" nil)
+
+(autoload 'projectile-global-mode "projectile" "\
+Toggle Projectile mode in all buffers.
+With prefix ARG, enable Projectile-Global mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Projectile mode is enabled in all buffers where
+`projectile-on' would do it.
+See `projectile-mode' for more information on Projectile mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("projectile-pkg.el") (21077 32442 851509
+;;;;;;  0))
+
+;;;***
+
+(provide 'projectile-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; projectile-autoloads.el ends here
diff --git a/elpa/projectile-0.9.2/projectile-pkg.el b/elpa/projectile-0.9.2/projectile-pkg.el
new file mode 100644
index 000000000..9d4df7e3b
--- /dev/null
+++ b/elpa/projectile-0.9.2/projectile-pkg.el
@@ -0,0 +1 @@
+(define-package "projectile" "0.9.2" "Manage and navigate projects in Emacs easily" (quote ((s "1.0.0") (dash "1.0.0"))))
diff --git a/elpa/projectile-0.9.2/projectile.el b/elpa/projectile-0.9.2/projectile.el
new file mode 100644
index 000000000..98da5149b
--- /dev/null
+++ b/elpa/projectile-0.9.2/projectile.el
@@ -0,0 +1,1015 @@
+;;; projectile.el --- Manage and navigate projects in Emacs easily
+
+;; Copyright © 2011-2013 Bozhidar Batsov
+
+;; Author: Bozhidar Batsov
+;; URL: https://github.com/bbatsov/projectile
+;; Keywords: project, convenience
+;; Version: 0.9.2
+;; Package-Requires: ((s "1.0.0") (dash "1.0.0"))
+
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; 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, 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library provides easy project management and navigation.  The
+;; concept of a project is pretty basic - just a folder containing
+;; special file.  Currently git, mercurial and bazaar repos are
+;; considered projects by default.  If you want to mark a folder
+;; manually as a project just create an empty .projectile file in
+;; it.  See the README for more details.
+;;
+;;; Code:
+
+;; requires
+(require 'cl)
+(require 'easymenu)
+(require 'thingatpt)
+(require 's)
+(require 'dash)
+(require 'grep)
+
+(defgroup projectile nil
+  "Manage and navigate projects easily."
+  :group 'tools
+  :group 'convenience)
+
+(defconst projectile-current-version "0.9.1"
+  "The current Projectile version.")
+
+(defcustom projectile-use-native-indexing (eq system-type 'windows-nt)
+  "Use native Emacs Lisp project indexing."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-enable-caching projectile-use-native-indexing
+  "Enable project files caching."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-require-project-root t
+  "Require the presence of a project root to operate when true.
+Otherwise consider the current directory the project root."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-completion-system 'ido
+  "The completion system to be used by Projectile."
+  :group 'projectile
+  :type 'symbol
+  :options '(ido grizzl default))
+
+(defcustom projectile-ack-function 'ack-and-a-half
+  "The ack function to use."
+  :group 'projectile
+  :type 'symbol
+  :options '(ack-and-a-half default))
+
+(defcustom projectile-keymap-prefix (kbd "C-c p")
+  "Projectile keymap prefix."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-cache-file
+  (expand-file-name "projectile.cache" user-emacs-directory)
+  "The name of Projectile's cache file."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-tags-command "ctags -Re %s %s"
+  "The command Projectile's going to use to generate a TAGS file."
+  :group 'projectile
+  :type 'string)
+
+;; variables
+(defvar projectile-project-root-files
+  '(".projectile" "project.clj" ".git" ".hg" ".fslckout" ".bzr" "_darcs"
+    "rebar.config" "pom.xml" "build.sbt" "Gemfile" "Makefile")
+  "A list of files considered to mark the root of a project.")
+
+(defvar projectile-globally-ignored-files
+  '("TAGS")
+  "A list of files globally ignored by projectile.")
+
+(defvar projectile-globally-ignored-directories
+  '(".idea" ".eunit" ".git" ".hg" ".fslckout" ".bzr" "_darcs")
+  "A list of directories globally ignored by projectile.")
+
+(defvar projectile-find-file-hook nil
+  "Hooks run when a file is opened with `projectile-find-file'.")
+
+(defvar projectile-find-dir-hook nil
+  "Hooks run when a directory is opened with `projectile-find-dir'.")
+
+(defun projectile-serialize (data filename)
+  "Serialize DATA to FILENAME.
+
+The saved data can be restored with `projectile-unserialize'."
+  (when (file-writable-p filename)
+    (with-temp-file filename
+      (insert (prin1-to-string data)))))
+
+(defun projectile-unserialize (filename)
+  "Read data serialized by `projectile-serialize' from FILENAME."
+  (when (file-exists-p filename)
+    (with-temp-buffer
+      (insert-file-contents filename)
+      (read (buffer-string)))))
+
+(defvar projectile-projects-cache
+  (or (projectile-unserialize projectile-cache-file)
+      (make-hash-table :test 'equal))
+  "A hashmap used to cache project file names to speed up related operations.")
+
+(defvar projectile-known-projects nil
+  "List of locations where we have previously seen projects.
+The list of projects is ordered by the time they have been accessed.")
+
+(defcustom projectile-known-projects-file
+  (expand-file-name "projectile-bookmarks.eld"
+                    user-emacs-directory)
+  "Name and location of the Projectile's known projects file."
+  :group 'projectile
+  :type 'string)
+
+(defun projectile-version ()
+  "Reports the version of Projectile in use."
+  (interactive)
+  (message "Projectile (version %s) 2011-2013 Bozhidar Batsov <bozhidar@batsov.com>"
+           projectile-current-version))
+
+(defun projectile-invalidate-cache (arg)
+  "Remove the current project's files from `projectile-projects-cache'.
+
+With a prefix argument ARG prompts for the name of the project whose cache
+to invalidate."
+  (interactive "P")
+  (let ((project-root
+         (if arg
+             (completing-read "Remove cache for: "
+                              (projectile-hash-keys projectile-projects-cache))
+             (projectile-project-root))))
+    (remhash project-root projectile-projects-cache)
+    (projectile-serialize-cache)
+    (message "Invalidated Projectile cache for %s."
+             (propertize project-root 'face 'font-lock-keyword-face))))
+
+(defun projectile-cache-project (project files)
+  "Cache PROJECTs FILES.
+The cache is created both in memory and on the hard drive."
+  (when projectile-enable-caching
+    (puthash project files projectile-projects-cache)
+    (projectile-serialize-cache)))
+
+(defun projectile-project-root ()
+  "Retrieves the root directory of a project if available.
+The current directory is assumed to be the project's root otherwise."
+  (let ((project-root
+         (or (->> projectile-project-root-files
+               (--map (locate-dominating-file default-directory it))
+               (-remove #'null)
+               (car)
+               (projectile-expand-file-name))
+             (if projectile-require-project-root
+                 (error "You're not into a project")
+               default-directory))))
+    project-root))
+
+(defun projectile-expand-file-name (file-name)
+  "A thin wrapper around `expand-file-name' that handles nil.
+Expand FILE-NAME using `default-directory'."
+  (when file-name
+    (expand-file-name file-name)))
+
+(defun projectile-project-p ()
+  "Check if we're in a project."
+  (condition-case nil
+      (projectile-project-root)
+    (error nil)))
+
+(defun projectile-project-name ()
+  "Return project name."
+  (let ((project-root
+         (condition-case nil
+             (projectile-project-root)
+           (error default-directory))))
+   (file-name-nondirectory (directory-file-name project-root))))
+
+(defun projectile-get-project-directories ()
+  "Get the list of project directories that are of interest to the user."
+  (-map (lambda (subdir) (concat (projectile-project-root) subdir))
+        (or (car (projectile-parse-dirconfig-file)) '(""))))
+
+(defun projectile-dir-files (directory)
+  "List the files in DIRECTORY and in its sub-directories.
+Files are returned as relative paths to the project root."
+  ;; check for a cache hit first if caching is enabled
+  (let ((files-list (and projectile-enable-caching
+                         (gethash directory projectile-projects-cache)))
+        (root (projectile-project-root)))
+    ;; cache disabled or cache miss
+    (or files-list
+        (if projectile-use-native-indexing
+            (projectile-dir-files-native root directory)
+          ;; use external tools to get the project files
+          (projectile-dir-files-external root directory)))))
+
+(defun projectile-dir-files-native (root directory)
+  "Get the files for ROOT under DIRECTORY using just Emacs Lisp."
+  (message "Projectile is indexing %s. This may take a while."
+           (propertize directory 'face 'font-lock-keyword-face))
+  ;; we need the files with paths relative to the project root
+  (-map (lambda (file) (s-chop-prefix root file))
+        (projectile-index-directory directory (projectile-patterns-to-ignore))))
+
+(defun projectile-dir-files-external (root directory)
+  "Get the files for ROOT under DIRECTORY using external tools."
+  (let ((default-directory directory)
+        (files-list nil))
+    (setq files-list (-map (lambda (f)
+                             (s-chop-prefix root (expand-file-name f directory)))
+                           (projectile-get-repo-files)))
+    files-list))
+
+(defun projectile-file-cached-p (file project)
+  "Check if FILE is already in PROJECT cache."
+  (member file (gethash project projectile-projects-cache)))
+
+(defun projectile-cache-current-file ()
+  "Add the currently visited file to the cache."
+  (interactive)
+  (let* ((current-project (projectile-project-root))
+        (current-file (file-relative-name (buffer-file-name (current-buffer)) current-project)))
+    (unless (projectile-file-cached-p current-file current-project)
+      (puthash current-project
+               (cons current-file (gethash current-project projectile-projects-cache))
+               projectile-projects-cache)
+      (projectile-serialize-cache)
+      (message "File %s added to project %s cache." current-file current-project))))
+
+;; cache opened files automatically to reduce the need for cache invalidation
+(defun projectile-cache-files-find-file-hook ()
+  "Function for caching files with `find-file-hook'."
+  (when (and (projectile-project-p) projectile-enable-caching)
+    (projectile-cache-current-file)))
+
+(defun projectile-cache-projects-find-file-hook ()
+  "Function for caching projects with `find-file-hook'."
+  (when (projectile-project-p)
+    (projectile-add-known-project (projectile-project-root))
+    (projectile-save-known-projects)))
+
+(defcustom projectile-git-command "git ls-files -zco --exclude-standard"
+  "Command used by projectile to get the files in a git project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-hg-command "hg locate -0 -I ."
+  "Command used by projectile to get the files in a hg project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-fossil-command "fossil ls"
+  "Command used by projectile to get the files in a fossil project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-bzr-command "bzr ls --versioned -0"
+  "Command used by projectile to get the files in a bazaar project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-darcs-command "darcs show files -0 . "
+  "Command used by projectile to get the files in a darcs project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-svn-command "find . -type f -print0"
+  "Command used by projectile to get the files in a svn project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-generic-command "find . -type f -print0"
+  "Command used by projectile to get the files in a generic project."
+  :group 'projectile
+  :type 'string)
+
+(defun projectile-get-ext-command ()
+  "Determine which external command to invoke based on the project's VCS."
+  (let ((vcs (projectile-project-vcs)))
+    (cond
+     ((eq vcs 'git) projectile-git-command)
+     ((eq vcs 'hg) projectile-hg-command)
+     ((eq vcs 'fossil) projectile-fossil-command)
+     ((eq vcs 'bzr) projectile-bzr-command)
+     ((eq vcs 'darcs) projectile-darcs-command)
+     ((eq vcs 'svn) projectile-svn-command)
+     (t projectile-generic-command))))
+
+(defun projectile-get-repo-files ()
+  "Get a list of the files in the project."
+  (projectile-files-via-ext-command (projectile-get-ext-command)))
+
+(defun projectile-files-via-ext-command (command)
+  "Get a list of relative file names in the project root by executing COMMAND."
+  (split-string (shell-command-to-string command) "\0" t))
+
+(defun projectile-index-directory (directory patterns)
+  "Index DIRECTORY taking into account PATTERNS.
+The function calls itself recursively until all sub-directories
+have been indexed."
+  (let (files-list)
+    (dolist (current-file (file-name-all-completions "" directory) files-list)
+      (let ((absolute-file (expand-file-name current-file directory)))
+        (cond
+         ;; check for directories that are not ignored
+         ((and (s-ends-with-p "/" current-file)
+               ;; avoid loops & ignore some well known directories
+               (not (-any? (lambda (file)
+                            (string= (s-chop-suffix "/" current-file) file))
+                          '("." ".." ".svn" ".cvs")))
+               (not (projectile-ignored-directory-p absolute-file))
+               (not (and patterns
+                         (projectile-ignored-rel-p directory
+                                                   absolute-file patterns))))
+          (setq files-list (append files-list
+                                   (projectile-index-directory
+                                    (expand-file-name current-file directory)
+                                    patterns))))
+         ;; check for regular files that are not ignored
+         ((and (not (s-ends-with-p "/" current-file))
+               (not (projectile-ignored-file-p absolute-file))
+               (not (and patterns
+                         (projectile-ignored-rel-p directory
+                                                   absolute-file patterns))))
+          (setq files-list (cons
+                            (expand-file-name current-file directory)
+                            files-list))))))))
+
+(defun projectile-project-buffers ()
+  "Get a list of project buffers."
+  (let ((project-root (projectile-project-root)))
+    (-filter (lambda (buffer)
+               (projectile-project-buffer-p buffer project-root))
+             (buffer-list))))
+
+(defun projectile-project-buffer-p (buffer project-root)
+  "Check if BUFFER is under PROJECT-ROOT."
+  (with-current-buffer buffer
+    (and (s-starts-with? project-root
+                         (expand-file-name default-directory))
+         ;; ignore hidden buffers
+         (not (s-starts-with? " " (buffer-name buffer))))))
+
+(defun projectile-project-buffer-names ()
+  "Get a list of project buffer names."
+  (-map 'buffer-name (projectile-project-buffers)))
+
+(defun projectile-prepend-project-name (string)
+  "Prepend the current project's name to STRING."
+  (format "[%s] %s" (projectile-project-name) string))
+
+(defun projectile-switch-to-buffer ()
+  "Switch to a project buffer."
+  (interactive)
+  (switch-to-buffer
+   (projectile-completing-read
+    "Switch to buffer: "
+    (projectile-project-buffer-names))))
+
+(defun projectile-multi-occur ()
+  "Do a `multi-occur' in the project's buffers."
+  (interactive)
+  (multi-occur (projectile-project-buffers)
+               (car (occur-read-primary-args))))
+
+(defun projectile-ignored-directory-p (directory)
+  "Check if DIRECTORY should be ignored."
+  (member directory (projectile-ignored-directories)))
+
+(defun projectile-ignored-file-p (file)
+  "Check if FILE should be ignored."
+  (member file (projectile-ignored-files)))
+
+(defun projectile-ignored-rel-p (directory file patterns)
+  "Check if FILE should be ignored relative to DIRECTORY according to PATTERNS."
+  (let ((default-directory directory))
+    (-any? (lambda (pattern)
+             (or (s-ends-with? (s-chop-suffix "/" pattern)
+                               (s-chop-suffix "/" file))
+                 (member file (file-expand-wildcards pattern t))))
+           patterns)))
+
+(defun projectile-ignored-files ()
+  "Return list of ignored files."
+  (-map
+   'projectile-expand-root
+   (append
+    projectile-globally-ignored-files
+    (projectile-project-ignored-files))))
+
+(defun projectile-ignored-directories ()
+  "Return list of ignored directories."
+  (-map
+   'file-name-as-directory
+   (-map
+    'projectile-expand-root
+    (append
+     projectile-globally-ignored-directories
+     (projectile-project-ignored-directories)))))
+
+(defun projectile-project-ignored-files ()
+  "Return list of project ignored files."
+  (-remove 'file-directory-p (projectile-project-ignored)))
+
+(defun projectile-project-ignored-directories ()
+  "Return list of project ignored directories."
+  (-filter 'file-directory-p (projectile-project-ignored)))
+
+(defun projectile-paths-to-ignore ()
+  "Return a list of ignored project paths."
+  (-map (lambda (pattern)
+          (s-chop-prefix "/" pattern))
+        (-filter (lambda (pattern)
+                   (s-starts-with? "/" pattern))
+                 (cdr (projectile-parse-dirconfig-file)))))
+
+(defun projectile-patterns-to-ignore ()
+  "Return a list of relative file patterns."
+  (-remove (lambda (pattern)
+             (s-starts-with? "/" pattern))
+           (cdr (projectile-parse-dirconfig-file))))
+
+(defun projectile-project-ignored ()
+  "Return list of project ignored files/directories."
+  (let ((paths (projectile-paths-to-ignore))
+        (default-directory (projectile-project-root)))
+    (apply 'append
+           (-map
+            (lambda (pattern)
+              (file-expand-wildcards pattern t))
+            paths))))
+
+(defun projectile-dirconfig-file ()
+  "Return the absolute path to the project's dirconfig file."
+  (expand-file-name ".projectile" (projectile-project-root)))
+
+(defun projectile-parse-dirconfig-file ()
+  "Parse project ignore file and return directories to ignore and keep.
+
+The return value will be a cons, the car being the list of
+directories to keep, and the cdr being the list of files or
+directories to ignore.
+
+Strings starting with + will be added to the list of directories
+to keep, and strings starting with - will be added to the list of
+directories to ignore.  For backward compatibility, without a
+prefix the string will be assumed to be an ignore string."
+  (let ((dirconfig-file (projectile-dirconfig-file)))
+    (when (file-exists-p dirconfig-file)
+      (with-temp-buffer
+        (insert-file-contents-literally dirconfig-file)
+        (let* ((split-string-default-separators "[\r\n]")
+               (strings (-map 's-trim (delete "" (split-string (buffer-string)))))
+               (separated-vals (--separate (s-starts-with? "+" it) strings)))
+          (flet ((strip-prefix (s) (s-chop-prefixes '("-" "+") s)))
+            (cons (-map 'strip-prefix (first separated-vals))
+                  (-map 'strip-prefix (second separated-vals)))))))))
+
+(defun projectile-expand-root (name)
+  "Expand NAME to project root.
+
+Never use on many files since it's going to recalculate the
+project-root for every file."
+  (expand-file-name name (projectile-project-root)))
+
+(defun projectile-completing-read (prompt choices)
+  "Present a project tailored PROMPT with CHOICES."
+  (let ((prompt (projectile-prepend-project-name prompt)))
+    (cond
+     ((eq projectile-completion-system 'ido)
+      (ido-completing-read prompt choices))
+     ((eq projectile-completion-system 'default)
+      (completing-read prompt choices))
+     ((eq projectile-completion-system 'grizzl)
+      (if (and (fboundp 'grizzl-completing-read)
+               (fboundp 'grizzl-make-index))
+          (grizzl-completing-read prompt (grizzl-make-index choices))
+        (user-error "Please install grizzl from \
+https://github.com/d11wtq/grizzl")))
+     (t (funcall projectile-completion-system prompt choices)))))
+
+(defun projectile-current-project-files ()
+  "Return a list of files for the current project."
+  (let ((files (and projectile-enable-caching
+                    (gethash (projectile-project-root) projectile-projects-cache))))
+    ;; nothing is cached
+    (unless files
+      (setq files (-mapcat 'projectile-dir-files
+                           (projectile-get-project-directories)))
+      ;; cache the resulting list of files
+      (when projectile-enable-caching
+        (projectile-cache-project (projectile-project-root) files)))
+    files))
+
+(defun projectile-current-project-dirs ()
+  "Return a list of dirs for the current project."
+  (-remove 'null (-distinct
+                  (-map 'file-name-directory
+                        (projectile-current-project-files)))))
+
+(defun projectile-hash-keys (hash)
+  "Return a list of all HASH keys."
+  (let (allkeys)
+    (maphash (lambda (k v) (setq allkeys (cons k allkeys))) hash)
+    allkeys))
+
+(defun projectile-find-file (arg)
+  "Jump to a project's file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((file (projectile-completing-read "Find file: "
+                                          (projectile-current-project-files))))
+    (find-file (expand-file-name file (projectile-project-root)))
+    (run-hooks 'projectile-find-file-hook)))
+
+(defun projectile-find-dir (arg)
+  "Jump to a project's file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((dir (projectile-completing-read "Find dir: "
+                                          (projectile-current-project-dirs))))
+    (dired (expand-file-name dir (projectile-project-root)))
+    (run-hooks 'projectile-find-dir-hook)))
+
+(defun projectile-find-test-file (arg)
+  "Jump to a project's test file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((file (projectile-completing-read "Find test file: "
+                                          (projectile-current-project-files))))
+    (find-file (expand-file-name file (projectile-project-root)))))
+
+(defvar projectile-test-files-suffices '("_test" "_spec" "Test" "-test")
+  "Some common suffices of test files.")
+
+(defun projectile-test-files (files)
+  "Return only the test FILES."
+  (-filter 'projectile-test-file-p files))
+
+(defun projectile-test-file-p (file)
+  "Check if FILE is a test file."
+  (-any? (lambda (suffix)
+           (s-ends-with? suffix (file-name-sans-extension file)))
+         projectile-test-files-suffices))
+
+(defvar projectile-rails-rspec '("Gemfile" "app" "lib" "db" "config" "spec"))
+(defvar projectile-rails-test '("Gemfile" "app" "lib" "db" "config" "test"))
+(defvar projectile-symfony '("composer.json" "app" "src" "vendor"))
+(defvar projectile-ruby-rspec '("Gemfile" "lib" "spec"))
+(defvar projectile-ruby-test '("Gemfile" "lib" "test"))
+(defvar projectile-maven '("pom.xml"))
+(defvar projectile-lein '("project.clj"))
+(defvar projectile-rebar '("rebar"))
+(defvar projectile-make '("Makefile"))
+
+(defun projectile-project-type ()
+  "Determine the project's type based on its structure."
+  (let ((project-root (projectile-project-root)))
+    (cond
+     ((projectile-verify-files projectile-rails-rspec) 'rails-rspec)
+     ((projectile-verify-files projectile-rails-test) 'rails-test)
+     ((projectile-verify-files projectile-ruby-rspec) 'ruby-rspec)
+     ((projectile-verify-files projectile-ruby-test) 'ruby-test)
+     ((projectile-verify-files projectile-symfony) 'symfony)
+     ((projectile-verify-files projectile-maven) 'maven)
+     ((projectile-verify-files projectile-lein) 'lein)
+     ((projectile-verify-files projectile-rebar) 'rebar)
+     ((projectile-verify-files projectile-make) 'make)
+     (t 'generic))))
+
+(defun projectile-verify-files (files)
+  "Check whether all FILES exist in the current project."
+  (-all? 'projectile-verify-file files))
+
+(defun projectile-verify-file (file)
+  "Check whether FILE exists in the current project."
+  (file-exists-p (projectile-expand-root file)))
+
+(defun projectile-project-vcs ()
+  "Determine the VCS used by the project if any."
+  (let ((project-root (projectile-project-root)))
+   (cond
+    ((file-exists-p (expand-file-name ".git" project-root)) 'git)
+    ((file-exists-p (expand-file-name ".hg" project-root)) 'hg)
+    ((file-exists-p (expand-file-name ".fossil" project-root)) 'fossil)
+    ((file-exists-p (expand-file-name ".bzr" project-root)) 'bzr)
+    ((file-exists-p (expand-file-name "_darcs" project-root)) 'darcs)
+    ((file-exists-p (expand-file-name ".svn" project-root)) 'svn)
+    ((locate-dominating-file project-root ".git") 'git)
+    ((locate-dominating-file project-root ".hg") 'hg)
+    ((locate-dominating-file project-root ".fossil") 'fossil)
+    ((locate-dominating-file project-root ".bzr") 'bzr)
+    ((locate-dominating-file project-root "_darcs") 'darcs)
+    ((locate-dominating-file project-root ".svn") 'svn)
+    (t 'none))))
+
+(defun projectile-toggle-between-implemenation-and-test ()
+  "Toggle between an implementation file and its test file."
+  (interactive)
+  (if (projectile-test-file-p (buffer-file-name))
+      ;; find the matching impl file
+      (let ((impl-file (projectile-find-matching-file (buffer-file-name))))
+        (if impl-file
+            (find-file (projectile-expand-root impl-file))
+          (error "No matching source file found")))
+    ;; find the matching test file
+    (let ((test-file (projectile-find-matching-test (buffer-file-name))))
+      (if test-file
+          (find-file (projectile-expand-root test-file))
+        (error "No matching test file found")))))
+
+(defun projectile-test-suffix (project-type)
+  "Find test files suffix based on PROJECT-TYPE."
+  (cond
+   ((member project-type '(rails-rspec ruby-rspec)) "_spec")
+   ((member project-type '(rails-test ruby-test lein)) "_test")
+   ((member project-type '(maven symfony)) "Test")
+   (t (error "Project type not supported!"))))
+
+(defun projectile-find-matching-test (file)
+  "Compute the name of the test matching FILE."
+  (let ((basename (file-name-nondirectory (file-name-sans-extension file)))
+        (extension (file-name-extension file))
+        (test-suffix (projectile-test-suffix (projectile-project-type))))
+      (-first (lambda (current-file)
+                (s-equals? (file-name-nondirectory (file-name-sans-extension current-file))
+                           (concat basename test-suffix)))
+              (projectile-current-project-files))))
+
+(defun projectile-find-matching-file (test-file)
+  "Compute the name of a file matching TEST-FILE."
+  (let ((basename (file-name-nondirectory (file-name-sans-extension test-file)))
+        (extension (file-name-extension test-file))
+        (test-suffix (projectile-test-suffix (projectile-project-type))))
+    (-first (lambda (current-file)
+              (s-equals? (concat (file-name-nondirectory (file-name-sans-extension current-file)) test-suffix)
+                         basename))
+            (projectile-current-project-files))))
+
+(defun projectile-grep ()
+  "Perform rgrep in the project."
+  (interactive)
+  (let ((roots (projectile-get-project-directories))
+        (search-regexp (if (and transient-mark-mode mark-active)
+                           (buffer-substring (region-beginning) (region-end))
+                         (read-string (projectile-prepend-project-name "Grep for: ")
+                                      (projectile-symbol-at-point)))))
+    (dolist (root-dir roots)
+      (require 'grep)
+      ;; paths for find-grep should relative and without trailing /
+      (let ((grep-find-ignored-directories (union (-map (lambda (dir) (s-chop-suffix "/" (s-chop-prefix root-dir dir)))
+                                                         (cdr (projectile-ignored-directories))) grep-find-ignored-directories))
+            (grep-find-ignored-files (union (-map (lambda (file) (s-chop-prefix root-dir file)) (projectile-ignored-files)) grep-find-ignored-files)))
+        (grep-compute-defaults)
+        (rgrep search-regexp "* .*" root-dir)))))
+
+(defun projectile-ack ()
+  "Run an `ack-and-a-half' search in the project."
+  (interactive)
+  (let ((ack-and-a-half-arguments
+         (-map
+          (lambda (path)
+            (concat "--ignore-dir=" (file-name-nondirectory (directory-file-name path))))
+          (projectile-ignored-directories))))
+    (call-interactively projectile-ack-function)))
+
+(defun projectile-tags-exclude-patterns ()
+  "Return a string with exclude patterns for ctags."
+  (mapconcat (lambda (pattern) (format "--exclude=%s" pattern))
+       (projectile-project-ignored-directories) " "))
+
+(defun projectile-regenerate-tags ()
+  "Regenerate the project's etags."
+  (interactive)
+  (let* ((project-root (projectile-project-root))
+         (tags-exclude (projectile-tags-exclude-patterns))
+         (default-directory project-root))
+    (shell-command (format projectile-tags-command tags-exclude project-root))
+    (visit-tags-table project-root)))
+
+(defun projectile-replace ()
+  "Replace a string in the project using `tags-query-replace'."
+  (interactive)
+  (let* ((old-text (read-string
+                    (projectile-prepend-project-name "Replace: ")
+                    (projectile-symbol-at-point)))
+        (new-text (read-string
+                   (projectile-prepend-project-name
+                    (format "Replace %s with: " old-text)))))
+    (tags-query-replace old-text new-text nil '(-map 'projectile-expand-root (projectile-current-project-files)))))
+
+(defun projectile-symbol-at-point ()
+  "Get the symbol at point and strip its properties."
+  (substring-no-properties (or (thing-at-point 'symbol) "")))
+
+(defun projectile-kill-buffers ()
+  "Kill all project buffers."
+  (interactive)
+  (let* ((buffers (projectile-project-buffer-names))
+         (question
+          (format
+           "Are you sure you want to kill %d buffer(s) for '%s'? "
+           (length buffers)
+           (projectile-project-name))))
+    (if (yes-or-no-p question)
+        (mapc 'kill-buffer buffers))))
+
+(defun projectile-dired ()
+  "Opens dired at the root of the project."
+  (interactive)
+  (dired (projectile-project-root)))
+
+(defun projectile-recentf ()
+  "Show a list of recently visited files in a project."
+  (interactive)
+  (if (boundp 'recentf-list)
+      (find-file (projectile-expand-root (projectile-completing-read "Recently visited files: " (projectile-recentf-files)))))
+    (message "recentf is not enabled"))
+
+(defun projectile-recentf-files ()
+  "Return a list of recently visited files in a project."
+  (if (boundp 'recentf-list)
+      (let ((project-root (projectile-project-root)))
+        (->> recentf-list
+          (-filter (lambda (file) (s-starts-with-p project-root file)))
+          (-map (lambda (file) (s-chop-prefix project-root file)))))
+    nil))
+
+(defun projectile-serialize-cache ()
+  "Serializes the memory cache to the hard drive."
+  (projectile-serialize projectile-projects-cache projectile-cache-file))
+
+(defvar projectile-rails-compile-cmd "bundle exec rails server")
+(defvar projectile-ruby-compile-cmd "bundle exec rake build")
+(defvar projectile-ruby-test-cmd "bundle exec rake test")
+(defvar projectile-ruby-rspec-cmd "bundle exec rspec")
+(defvar projectile-symfony-compile-cmd "app/console server:run")
+(defvar projectile-symfony-test-cmd "phpunit -c app ")
+(defvar projectile-maven-compile-cmd "mvn clean install")
+(defvar projectile-maven-test-cmd "mvn test")
+(defvar projectile-lein-compile-cmd "lein compile")
+(defvar projectile-lein-test-cmd "lein test")
+(defvar projectile-rebar-compile-cmd "rebar")
+(defvar projectile-rebar-test-cmd "rebar eunit")
+(defvar projectile-make-compile-cmd "make")
+(defvar projectile-make-test-cmd "make test")
+
+(defvar projectile-compilation-cmd-map
+  (make-hash-table :test 'equal)
+  "A mapping between projects and the last compilation command used on them.")
+(defvar projectile-test-cmd-map
+  (make-hash-table :test 'equal)
+  "A mapping between projects and the last test command used on them.")
+
+(defun projectile-default-compilation-command (project-type)
+  "Retrieve default compilation command for PROJECT-TYPE."
+  (cond
+   ((member project-type '(rails-rspec rails-test)) projectile-rails-compile-cmd)
+   ((member project-type '(ruby-rspec ruby-test)) projectile-ruby-compile-cmd)
+   ((eq project-type 'symfony) projectile-symfony-compile-cmd)
+   ((eq project-type 'lein) projectile-lein-compile-cmd)
+   ((eq project-type 'make) projectile-make-compile-cmd)
+   ((eq project-type 'rebar) projectile-rebar-compile-cmd)
+   ((eq project-type 'maven) projectile-maven-compile-cmd)
+   (t projectile-make-compile-cmd)))
+
+(defun projectile-default-test-command (project-type)
+  "Retrieve default test command for PROJECT-TYPE."
+  (cond
+   ((member project-type '(rails-rspec ruby-rspec)) projectile-ruby-rspec-cmd)
+   ((member project-type '(rails-test ruby-test)) projectile-ruby-test-cmd)
+   ((eq project-type 'symfony) projectile-symfony-test-cmd)
+   ((eq project-type 'lein) projectile-lein-test-cmd)
+   ((eq project-type 'make) projectile-make-test-cmd)
+   ((eq project-type 'rebar) projectile-rebar-test-cmd)
+   ((eq project-type 'maven) projectile-maven-test-cmd)
+   (t projectile-make-test-cmd)))
+
+(defun projectile-compilation-command (project)
+  "Retrieve the compilation command for PROJECT."
+  (or (gethash project projectile-compilation-cmd-map)
+      (projectile-default-compilation-command (projectile-project-type))))
+
+(defun projectile-test-command (project)
+  "Retrieve the compilation command for PROJECT."
+  (or (gethash project projectile-test-cmd-map)
+      (projectile-default-test-command (projectile-project-type))))
+
+(defun projectile-compile-project ()
+  "Run project compilation command."
+  (interactive)
+  (let* ((project-root (projectile-project-root))
+         (compilation-cmd (compilation-read-command (projectile-compilation-command project-root)))
+         (default-directory project-root))
+    (puthash project-root compilation-cmd projectile-compilation-cmd-map)
+    (compilation-start compilation-cmd)))
+
+;; TODO - factor this duplication out
+(defun projectile-test-project ()
+  "Run project test command."
+  (interactive)
+  (let* ((project-root (projectile-project-root))
+         (test-cmd (compilation-read-command (projectile-test-command project-root)))
+         (default-directory project-root))
+    (puthash project-root test-cmd projectile-test-cmd-map)
+    (compilation-start test-cmd)))
+
+(defun projectile-switch-project ()
+  "Switch to a project we have seen before."
+  (interactive)
+  (let* ((project-to-switch
+         (projectile-completing-read "Switch to which project: "
+                                     projectile-known-projects))
+         (default-directory project-to-switch))
+    (projectile-find-file nil)
+    (let ((project-switched project-to-switch))
+      (run-hooks 'projectile-switch-project-hook))))
+
+(defvar projectile-switch-project-hook nil
+  "Hooks run when project is switched.
+
+The path to the opened project is available as PROJECT-SWITCHED")
+
+(defun projectile-clear-known-projects ()
+  "Clear both `projectile-known-projects' and `projectile-known-projects-file'."
+  (interactive)
+  (setq projectile-known-projects nil)
+  (projectile-save-known-projects))
+
+(defun projectile-remove-known-project ()
+  "Remove a projected from the list of known projects."
+  (interactive)
+  (let ((project-to-remove
+          (projectile-completing-read "Switch to which project: "
+                                      projectile-known-projects)))
+    (setq projectile-known-projects
+          (--reject (string= project-to-remove it) projectile-known-projects))
+    (projectile-save-known-projects)
+    (message "Project %s removed from the list of known projects." project-to-remove)))
+
+(defun projectile-add-known-project (project-root)
+  "Add PROJECT-ROOT to the list of known projects."
+  (setq projectile-known-projects
+        (-distinct
+         (cons (abbreviate-file-name project-root) projectile-known-projects))))
+
+(defun projectile-load-known-projects ()
+  "Load saved projects from `projectile-known-projects-file'.
+Also set `projectile-known-projects'."
+  (setq projectile-known-projects
+        (projectile-unserialize projectile-known-projects-file)))
+
+;; load the known projects
+(projectile-load-known-projects)
+
+(defun projectile-save-known-projects ()
+  "Save PROJECTILE-KNOWN-PROJECTS to PROJECTILE-KNOWN-PROJECTS-FILE."
+  (projectile-serialize projectile-known-projects projectile-known-projects-file))
+
+(defvar projectile-mode-map
+  (let ((map (make-sparse-keymap)))
+    (let ((prefix-map (make-sparse-keymap)))
+      (define-key prefix-map (kbd "f") 'projectile-find-file)
+      (define-key prefix-map (kbd "T") 'projectile-find-test-file)
+      (define-key prefix-map (kbd "t") 'projectile-toggle-between-implemenation-and-test)
+      (define-key prefix-map (kbd "g") 'projectile-grep)
+      (define-key prefix-map (kbd "b") 'projectile-switch-to-buffer)
+      (define-key prefix-map (kbd "o") 'projectile-multi-occur)
+      (define-key prefix-map (kbd "r") 'projectile-replace)
+      (define-key prefix-map (kbd "i") 'projectile-invalidate-cache)
+      (define-key prefix-map (kbd "R") 'projectile-regenerate-tags)
+      (define-key prefix-map (kbd "k") 'projectile-kill-buffers)
+      (define-key prefix-map (kbd "d") 'projectile-find-dir)
+      (define-key prefix-map (kbd "D") 'projectile-dired)
+      (define-key prefix-map (kbd "e") 'projectile-recentf)
+      (define-key prefix-map (kbd "a") 'projectile-ack)
+      (define-key prefix-map (kbd "c") 'projectile-compile-project)
+      (define-key prefix-map (kbd "p") 'projectile-test-project)
+      (define-key prefix-map (kbd "z") 'projectile-cache-current-file)
+      (define-key prefix-map (kbd "s") 'projectile-switch-project)
+
+      (define-key map projectile-keymap-prefix prefix-map))
+    map)
+  "Keymap for Projectile mode.")
+
+(defun projectile-add-menu ()
+  "Add Projectile's menu under Tools."
+  (easy-menu-add-item nil '("Tools")
+                      '("Projectile"
+                        ["Find file" projectile-find-file]
+                        ["Switch to buffer" projectile-switch-to-buffer]
+                        ["Kill project buffers" projectile-kill-buffers]
+                        ["Recent files" projectile-recentf]
+                        "--"
+                        ["Open project in dired" projectile-dired]
+                        ["Find in project (grep)" projectile-grep]
+                        ["Find in project (ack)" projectile-ack]
+                        ["Replace in project" projectile-replace]
+                        ["Multi-occur in project" projectile-multi-occur]
+                        "--"
+                        ["Invalidate cache" projectile-invalidate-cache]
+                        ["Regenerate etags" projectile-regenerate-tags]
+                        "--"
+                        ["Compile project" projectile-compile-project]
+                        ["Test project" projectile-test-project]
+                        "--"
+                        ["About" projectile-version])
+                      "Search Files (Grep)...")
+
+  (easy-menu-add-item nil '("Tools") '("--") "Search Files (Grep)..."))
+
+(defun projectile-remove-menu ()
+  "Remove Projectile's menu."
+  (easy-menu-remove-item nil '("Tools") "Projectile")
+  (easy-menu-remove-item nil '("Tools") "--"))
+
+;;; define minor mode
+
+;;;###autoload
+(define-minor-mode projectile-mode
+  "Minor mode to assist project management and navigation.
+
+\\{projectile-mode-map}"
+  :lighter " Projectile"
+  :keymap projectile-mode-map
+  :group 'projectile
+  (if projectile-mode
+      ;; on start
+      (projectile-add-menu)
+    ;; on stop
+    (projectile-remove-menu)))
+
+;;;###autoload
+(define-globalized-minor-mode projectile-global-mode
+  projectile-mode
+  projectile-on)
+
+(defun projectile-on ()
+  "Enable Projectile minor mode."
+  (projectile-mode 1))
+
+(defun projectile-off ()
+  "Disable Projectile minor mode."
+  (projectile-mode -1))
+
+(defun projectile-global-on ()
+  "Enable Projectile global minor mode."
+  (add-hook 'find-file-hook 'projectile-cache-files-find-file-hook)
+  (add-hook 'find-file-hook 'projectile-cache-projects-find-file-hook)
+  (add-hook 'projectile-find-dir-hook 'projectile-cache-projects-find-file-hook))
+
+(defun projectile-global-off ()
+  "Disable Projectile global minor mode."
+  (remove-hook 'find-file-hook 'projectile-cache-files-find-file-hook)
+  (remove-hook 'find-file-hook 'projectile-cache-projects-find-file-hook))
+
+(defadvice projectile-global-mode (after projectile-setup-hooks activate)
+  "Add/remove `find-file-hook' functions within `projectile-global-mode'."
+  (if projectile-global-mode
+      (projectile-global-on)
+    (projectile-global-off)))
+
+(provide 'projectile)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+
+;;; projectile.el ends here
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el
new file mode 100644
index 000000000..2d0a90806
--- /dev/null
+++ b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el
@@ -0,0 +1,61 @@
+;;; rainbow-delimiters-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (global-rainbow-delimiters-mode rainbow-delimiters-mode-disable
+;;;;;;  rainbow-delimiters-mode-enable rainbow-delimiters-mode) "rainbow-delimiters"
+;;;;;;  "rainbow-delimiters.el" (20887 43078))
+;;; Generated autoloads from rainbow-delimiters.el
+
+(autoload 'rainbow-delimiters-mode "rainbow-delimiters" "\
+Highlight nested parentheses, brackets, and braces according to their depth.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'rainbow-delimiters-mode-enable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'rainbow-delimiters-mode-disable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(defvar global-rainbow-delimiters-mode nil "\
+Non-nil if Global-Rainbow-Delimiters mode is enabled.
+See the command `global-rainbow-delimiters-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-rainbow-delimiters-mode'.")
+
+(custom-autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" nil)
+
+(autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" "\
+Toggle Rainbow-Delimiters mode in all buffers.
+With prefix ARG, enable Global-Rainbow-Delimiters mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Rainbow-Delimiters mode is enabled in all buffers where
+`rainbow-delimiters-mode-enable' would do it.
+See `rainbow-delimiters-mode' for more information on Rainbow-Delimiters mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("rainbow-delimiters-pkg.el") (20887 43078
+;;;;;;  250887))
+
+;;;***
+
+(provide 'rainbow-delimiters-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; rainbow-delimiters-autoloads.el ends here
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el
new file mode 100644
index 000000000..46adb6133
--- /dev/null
+++ b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el
@@ -0,0 +1 @@
+(define-package "rainbow-delimiters" "1.3.4" "Highlight nested parens, brackets, braces a different color at each depth." (quote nil))
diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.elc b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc
similarity index 54%
rename from elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.elc
rename to elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc
index 018b480ad..25caafc4e 100644
Binary files a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.elc and b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc differ
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el
new file mode 100644
index 000000000..e3c6ce029
--- /dev/null
+++ b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el
@@ -0,0 +1,520 @@
+;;; rainbow-delimiters.el --- Highlight nested parens, brackets, braces a different color at each depth.
+
+;; Copyright (C) 2010-2012 Jeremy L. Rayman.
+;; Author: Jeremy L. Rayman <jeremy.rayman@gmail.com>
+;; Maintainer: Jeremy L. Rayman <jeremy.rayman@gmail.com>
+;; Created: 2010-09-02
+;; Version: 1.3.4
+;; Keywords: faces, convenience, lisp, matching, tools, rainbow, rainbow parentheses, rainbow parens
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+;; URL: http://github.com/jlr/rainbow-delimiters/raw/master/rainbow-delimiters.el
+
+;; 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/>.
+
+
+;;; Commentary:
+;;
+;; Rainbow-delimiters is a rainbow parentheses-like mode which highlights
+;; parentheses, brackets, and braces according to their depth. Each
+;; successive level is highlighted in a different color. This makes it easy
+;; to spot matching delimiters, orient yourself in the code, and tell which
+;; statements are at a given level.
+;;
+;; Great care has been taken to make this mode FAST. You shouldn't see
+;; any discernible change in scrolling or editing speed while using it,
+;; even in delimiter-rich languages like Clojure, Lisp, and Scheme.
+;;
+;; Default colors are subtle, with the philosophy that syntax highlighting
+;; shouldn't be visually intrusive. Color schemes are always a matter of
+;; taste.  If you take the time to design a new color scheme, please share
+;; (even a simple list of colors works) on the EmacsWiki page or via github.
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+
+
+;;; Installation:
+
+;; 1. Place rainbow-delimiters.el on your emacs load-path.
+;;
+;; 2. Compile the file (necessary for speed):
+;; M-x byte-compile-file <location of rainbow-delimiters.el>
+;;
+;; 3. Add the following to your dot-emacs/init file:
+;; (require 'rainbow-delimiters)
+;;
+;; 4. Activate the mode in your init file.
+;;    You can choose to enable it only in certain modes, or Emacs-wide:
+;;
+;; - To enable it only in certain modes, add lines like the following:
+;; (add-hook 'clojure-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To enable it in all programming-related emacs modes (Emacs 24+):
+;; (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To activate the mode globally, add to your init file:
+;; (global-rainbow-delimiters-mode)
+;;
+;; - To temporarily activate rainbow-delimiters mode in an open buffer:
+;; M-x rainbow-delimiters-mode
+;;
+;; - To toggle global-rainbow-delimiters-mode:
+;; M-x global-rainbow-delimiters-mode
+
+;;; Customization:
+
+;; To customize various options, including the color scheme:
+;; M-x customize-group rainbow-delimiters
+;;
+;; deftheme / color-theme.el users:
+;; You can specify custom colors by adding the appropriate faces to your theme.
+;; - Faces take the form of:
+;;   'rainbow-delimiters-depth-#-face' with # being the depth.
+;;   Depth begins at 1, the outermost color.
+;;   Faces exist for depths 1-9.
+;; - The unmatched delimiter face (normally colored red) is:
+;;   'rainbow-delimiters-unmatched-face'
+
+
+;;; Change Log:
+
+;; 1.0 - Initial release.
+;; 1.1 - Stop tracking each delimiter's depth independently.
+;;       This had lead to confusing results when viewing clojure
+;;       code. Instead, just color based on current nesting inside
+;;       all delimiters combined.
+;;     - Added 'all-delimiters' faces to apply a color scheme to
+;;       all delimiters at once. Other faces inherit from this group.
+;; 1.1.1 - Change color scheme to a lighter, more subtle style.
+;; 1.1.2: (2011-03-25)
+;;  - Add an unmatched-delimiter face and correct problem with
+;;    coloring of text following unmatched closing delims.
+;; 1.2: (2011-03-28)
+;;  - Unify delimiter faces: all delimiter types now use the same depth
+;;    faces, of form 'rainbow-delimiters-depth-#-face'.
+;; 1.2.1: (2011-03-29)
+;;  - Conform to ELPA conventions.
+;; 1.3: (2011-05-24)
+;;  - Add separate color schemes for light and dark background modes.
+;;  - Checkboxes to enable/disable highlighting for each delimiter type.
+;;  - Improvements to Customize interface.
+;;  - Infinite depth support by cycling through defined faces repeatedly.
+;;  - Documentation changes.
+;; 1.3.1 (2011-05-25)
+;;  - Light color theme appears entirely grey on SRGB monitors. Revert to
+;;    old color theme until a nicer light background theme can be added.
+;;  - Correct typo in the installation step for users of dark backgrounds.
+;; 1.3.2 (2011-10-14)
+;;  - Add 'global-rainbow-delimiters-mode'.
+;;  - Respect syntax of current buffer major-mode so delimiters
+;;    highlight correctly in non-lisp languages.
+;; 1.3.3 (2011-11-25)
+;;  - Backwards compatibility with Emacs versions prior to 23.2.
+;;    Defines "with-silent-modifications" if undefined.
+;; 1.3.4 (2012-04-27)
+;;  - Further optimize highlighting speed. Benchmarks show 2x improvement.
+;;  - Color scheme for light backgrounds.
+;;  - Eliminate bottleneck seen in certain large files.
+;;    A large file which revealed this bottleneck now highlights ~40x faster.
+;;  - Correct broken/incorrect highlighting reported in certain languages.
+
+;;; TODO:
+
+;; - Add support for independent depth tracking of each delimiter type
+;;   for users of C-like languages.
+;; - Python style - increase depth with each new indentation.
+;; - Add support for nested tags (XML, HTML)
+;; - Set up proper example defthemes for rainbow-delimiters faces.
+;; - Intelligent support for other languages: Ruby, LaTeX tags, et al.
+
+;;; Issues:
+
+;; - Rainbow-delimiters mode does not appear to change the color of
+;;   delimiters when Org-mode is also enabled.
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+
+;; Note: some of the functions in this file have been inlined for speed.
+;; Inlining functions can cause problems with debugging. To debug these
+;; functions more easily, change defsubst -> defun.
+;; http://www.gnu.org/s/emacs/manual/html_node/elisp/Compilation-Tips.html
+
+;;; Customize interface:
+
+(defgroup rainbow-delimiters nil
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  :prefix "rainbow-delimiters-"
+  :link '(url-link :tag "Website for rainbow-delimiters (EmacsWiki)"
+                   "http://www.emacswiki.org/emacs/RainbowDelimiters")
+  :group 'applications)
+
+(defgroup rainbow-delimiters-faces nil
+  "Faces for successively nested pairs of delimiters.
+
+When depth exceeds innermost defined face, colors cycle back through."
+  :tag "Color Scheme"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Toggle Delimiters" "rainbow-delimiters-toggle-delimiter-highlighting")
+  :prefix 'rainbow-delimiters-faces-)
+
+;; Choose which delimiters you want to highlight in your preferred language:
+
+(defgroup rainbow-delimiters-toggle-delimiter-highlighting nil
+  "Choose which delimiters to highlight."
+  :tag "Toggle Delimiters"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Color Scheme" "rainbow-delimiters-faces"))
+
+(defcustom rainbow-delimiters-highlight-parens-p t
+  "Enable highlighting of nested parentheses -- ().
+
+Non-nil (default) enables highlighting of parentheses.
+Nil disables parentheses highlighting."
+  :tag "Highlight Parentheses?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-brackets-p t
+  "Enable highlighting of nested brackets -- [].
+
+Non-nil (default) enables highlighting of brackets.
+Nil disables bracket highlighting."
+  :tag "Highlight Brackets?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-braces-p t
+  "Enable highlighting of nested braces -- {}.
+
+Non-nil (default) enables highlighting of braces.
+Nil disables brace highlighting."
+  :tag "Highlight Braces?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+
+;;; Faces:
+
+;; Unmatched delimiter face:
+(defface rainbow-delimiters-unmatched-face
+  '((((background light)) (:foreground "#88090B"))
+    (((background dark)) (:foreground "#88090B")))
+  "Face to highlight unmatched closing delimiters in."
+  :group 'rainbow-delimiters-faces)
+
+;; Faces for highlighting delimiters by nested level:
+(defface rainbow-delimiters-depth-1-face
+  '((((background light)) (:foreground "#707183"))
+    (((background dark)) (:foreground "grey55")))
+  "Nested delimiters face, depth 1 - outermost set."
+  :tag "Rainbow Delimiters Depth 1 Face -- OUTERMOST"
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-2-face
+  '((((background light)) (:foreground "#7388d6"))
+    (((background dark)) (:foreground "#93a8c6")))
+  "Nested delimiters face, depth 2."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-3-face
+  '((((background light)) (:foreground "#909183"))
+    (((background dark)) (:foreground "#b0b1a3")))
+  "Nested delimiters face, depth 3."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-4-face
+  '((((background light)) (:foreground "#709870"))
+    (((background dark)) (:foreground "#97b098")))
+  "Nested delimiters face, depth 4."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-5-face
+  '((((background light)) (:foreground "#907373"))
+    (((background dark)) (:foreground "#aebed8")))
+  "Nested delimiters face, depth 5."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-6-face
+  '((((background light)) (:foreground "#6276ba"))
+    (((background dark)) (:foreground "#b0b0b3")))
+  "Nested delimiters face, depth 6."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-7-face
+  '((((background light)) (:foreground "#858580"))
+    (((background dark)) (:foreground "#90a890")))
+  "Nested delimiters face, depth 7."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-8-face
+  '((((background light)) (:foreground "#80a880"))
+    (((background dark)) (:foreground "#a2b6da")))
+  "Nested delimiters face, depth 8."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-9-face
+  '((((background light)) (:foreground "#887070"))
+    (((background dark)) (:foreground "#9cb6ad")))
+  "Nested delimiters face, depth 9."
+  :group 'rainbow-delimiters-faces)
+
+;;; Faces 10+:
+;; NOTE: Currently unused. Additional faces for depths 9+ can be added on request.
+
+(defconst rainbow-delimiters-max-face-count 9
+  "Number of faces defined for highlighting delimiter levels.
+
+Determines depth at which to cycle through faces again.")
+
+;;; Face utility functions
+
+(defsubst rainbow-delimiters-depth-face (depth)
+  "Return face-name for DEPTH as a string 'rainbow-delimiters-depth-DEPTH-face'.
+
+For example: 'rainbow-delimiters-depth-1-face'."
+  (concat "rainbow-delimiters-depth-"
+          (number-to-string
+           (or
+            ;; Our nesting depth has a face defined for it.
+            (and (< depth rainbow-delimiters-max-face-count)
+                 depth)
+            ;; Deeper than # of defined faces; cycle back through to beginning.
+            ;; Depth 1 face is only applied to the outermost delimiter pair.
+            ;; Cycles infinitely through faces 2-9.
+            (let ((cycled-depth (mod depth rainbow-delimiters-max-face-count)))
+              (if (/= cycled-depth 0)
+                  ;; Return face # that corresponds to current nesting level.
+                  (mod depth rainbow-delimiters-max-face-count)
+                ;; Special case: depth divides evenly into max, correct face # is max.
+                rainbow-delimiters-max-face-count))))
+          "-face"))
+
+
+;;; Nesting level
+
+(defvar rainbow-delimiters-syntax-table nil
+  "Syntax table (inherited from buffer major-mode) which uses all delimiters.
+
+When rainbow-delimiters-minor-mode is first activated, it sets this variable and
+the other rainbow-delimiters specific syntax tables based on the current
+major-mode. The syntax table is constructed by the function
+'rainbow-delimiters-make-syntax-table'.")
+
+;; syntax-table: used with syntax-ppss for determining current depth.
+(defun rainbow-delimiters-make-syntax-table (syntax-table)
+  "Inherit SYNTAX-TABLE and add delimiters intended to be highlighted by mode."
+  (let ((table (copy-syntax-table syntax-table)))
+    (modify-syntax-entry ?\( "()  " table)
+    (modify-syntax-entry ?\) ")(  " table)
+    (modify-syntax-entry ?\[ "(]" table)
+    (modify-syntax-entry ?\] ")[" table)
+    (modify-syntax-entry ?\{ "(}" table)
+    (modify-syntax-entry ?\} "){" table)
+    table))
+
+(defsubst rainbow-delimiters-depth (loc)
+  "Return # of nested levels of parens, brackets, braces LOC is inside of."
+  (let ((depth
+         (with-syntax-table rainbow-delimiters-syntax-table
+           (car (syntax-ppss loc)))))
+    (if (>= depth 0)
+        depth
+      0))) ; ignore negative depths created by unmatched closing parens.
+
+
+;;; Text properties
+
+;; Backwards compatibility: Emacs < v23.2 lack macro 'with-silent-modifications'.
+(eval-and-compile
+  (unless (fboundp 'with-silent-modifications)
+    (defmacro with-silent-modifications (&rest body)
+      "Defined by rainbow-delimiters.el for backwards compatibility with Emacs < 23.2.
+ Execute BODY, pretending it does not modify the buffer.
+If BODY performs real modifications to the buffer's text, other
+than cosmetic ones, undo data may become corrupted.
+
+This macro will run BODY normally, but doesn't count its buffer
+modifications as being buffer modifications.  This affects things
+like buffer-modified-p, checking whether the file is locked by
+someone else, running buffer modification hooks, and other things
+of that nature.
+
+Typically used around modifications of text-properties which do
+not really affect the buffer's content."
+      (declare (debug t) (indent 0))
+      (let ((modified (make-symbol "modified")))
+        `(let* ((,modified (buffer-modified-p))
+                (buffer-undo-list t)
+                (inhibit-read-only t)
+                (inhibit-modification-hooks t)
+                deactivate-mark
+                ;; Avoid setting and removing file locks and checking
+                ;; buffer's uptodate-ness w.r.t the underlying file.
+                buffer-file-name
+                buffer-file-truename)
+           (unwind-protect
+               (progn
+                 ,@body)
+             (unless ,modified
+               (restore-buffer-modified-p nil))))))))
+
+(defsubst rainbow-delimiters-propertize-delimiter (loc depth)
+  "Highlight a single delimiter at LOC according to DEPTH.
+
+LOC is the location of the character to add text properties to.
+DEPTH is the nested depth at LOC, which determines the face to use.
+
+Sets text properties:
+`font-lock-face' to the appropriate delimiter face.
+`rear-nonsticky' to prevent color from bleeding into subsequent characters typed by the user."
+  (with-silent-modifications
+    (let ((delim-face (if (<= depth 0)
+                          "rainbow-delimiters-unmatched-face"
+                        (rainbow-delimiters-depth-face depth))))
+      ;; (when (eq depth -1) (message "Unmatched delimiter at char %s." loc))
+      (add-text-properties loc (1+ loc)
+                           `(font-lock-face ,delim-face
+                             rear-nonsticky t)))))
+
+
+(defsubst rainbow-delimiters-unpropertize-delimiter (loc)
+  "Remove text properties set by rainbow-delimiters mode from char at LOC."
+  (with-silent-modifications
+    (remove-text-properties loc (1+ loc)
+                            '(font-lock-face nil
+                              rear-nonsticky nil))))
+
+
+(defsubst rainbow-delimiters-char-ineligible-p (loc)
+  "Return t if char at LOC should be skipped, e.g. if inside a comment.
+
+Returns t if char at loc meets one of the following conditions:
+- Inside a string.
+- Inside a comment.
+- Is an escaped char, e.g. ?\)"
+  (let ((parse-state (syntax-ppss loc)))
+    (or
+     (nth 3 parse-state)                ; inside string?
+     (nth 4 parse-state)                ; inside comment?
+     (and (eq (char-before loc) ?\\)  ; escaped char, e.g. ?\) - not counted
+          (and (not (eq (char-before (1- loc)) ?\\)) ; special-case: ignore ?\\
+               (eq (char-before (1- loc)) ?\?))))))
+;; NOTE: standard char read syntax '?)' is not tested for because emacs manual
+;; states punctuation such as delimiters should _always_ use escaped '?\)' form.
+
+
+(defsubst rainbow-delimiters-apply-color (delim depth loc)
+  "Apply color for DEPTH to DELIM at LOC following user settings.
+
+DELIM is a string specifying delimiter type.
+DEPTH is the delimiter depth, or corresponding face # if colors are repeating.
+LOC is location of character (delimiter) to be colorized."
+  (and
+   ;; Ensure user has enabled highlighting of this delimiter type.
+   (symbol-value (intern-soft
+                  (concat "rainbow-delimiters-highlight-" delim "s-p")))
+   (rainbow-delimiters-propertize-delimiter loc
+                                            depth)))
+
+
+;;; JIT-Lock functionality
+
+;; Used to skip delimiter-by-delimiter `rainbow-delimiters-propertize-region'.
+(defconst rainbow-delimiters-delim-regex "\\(\(\\|\)\\|\\[\\|\\]\\|\{\\|\}\\)"
+  "Regex matching all opening and closing delimiters the mode highlights.")
+
+;; main function called by jit-lock:
+(defsubst rainbow-delimiters-propertize-region (start end)
+  "Highlight delimiters in region between START and END.
+
+Used by jit-lock for dynamic highlighting."
+  (save-excursion
+    (goto-char start)
+    ;; START can be anywhere in buffer; determine the nesting depth at START loc
+    (let ((depth (rainbow-delimiters-depth start)))
+      (while (and (< (point) end)
+                  (re-search-forward rainbow-delimiters-delim-regex end t))
+        (backward-char) ; re-search-forward places point after delim; go back.
+        (unless (rainbow-delimiters-char-ineligible-p (point))
+          (let ((delim (char-after (point))))
+            (cond ((eq ?\( delim)       ; (
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "paren" depth (point)))
+                  ((eq ?\) delim)       ; )
+                   (rainbow-delimiters-apply-color "paren" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched paren
+                                   (1- depth))))
+                  ((eq ?\[ delim)       ; [
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "bracket" depth (point)))
+                  ((eq ?\] delim)       ; ]
+                   (rainbow-delimiters-apply-color "bracket" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched bracket
+                                   (1- depth))))
+                  ((eq ?\{ delim)       ; {
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "brace" depth (point)))
+                  ((eq ?\} delim)       ; }
+                   (rainbow-delimiters-apply-color "brace" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched brace
+                                   (1- depth)))))))
+        ;; move past delimiter so re-search-forward doesn't pick it up again
+        (forward-char)))))
+
+(defun rainbow-delimiters-unpropertize-region (start end)
+  "Remove highlighting from delimiters between START and END."
+  (save-excursion
+    (goto-char start)
+    (while (and (< (point) end)
+                (re-search-forward rainbow-delimiters-delim-regex end t))
+      ;; re-search-forward places point 1 further than the delim matched:
+      (rainbow-delimiters-unpropertize-delimiter (1- (point))))))
+
+
+;;; Minor mode:
+
+;;;###autoload
+(define-minor-mode rainbow-delimiters-mode
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  nil "" nil ; No modeline lighter - it's already obvious when the mode is on.
+  (if (not rainbow-delimiters-mode)
+      (progn
+        (jit-lock-unregister 'rainbow-delimiters-propertize-region)
+        (rainbow-delimiters-unpropertize-region (point-min) (point-max)))
+    (jit-lock-register 'rainbow-delimiters-propertize-region t)
+    ;; Create necessary syntax tables inheriting from current major-mode.
+    (set (make-local-variable 'rainbow-delimiters-syntax-table)
+         (rainbow-delimiters-make-syntax-table (syntax-table)))))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-enable ()
+  (rainbow-delimiters-mode 1))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-disable ()
+  (rainbow-delimiters-mode 0))
+
+;;;###autoload
+(define-globalized-minor-mode global-rainbow-delimiters-mode
+  rainbow-delimiters-mode rainbow-delimiters-mode-enable)
+
+(provide 'rainbow-delimiters)
+
+;;; rainbow-delimiters.el ends here.
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.elc b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.elc
new file mode 100644
index 000000000..1119a7df5
Binary files /dev/null and b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.elc differ
diff --git a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el
new file mode 100644
index 000000000..4f25d3c12
--- /dev/null
+++ b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el
@@ -0,0 +1,61 @@
+;;; rainbow-delimiters-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (global-rainbow-delimiters-mode rainbow-delimiters-mode-disable
+;;;;;;  rainbow-delimiters-mode-enable rainbow-delimiters-mode) "rainbow-delimiters"
+;;;;;;  "rainbow-delimiters.el" (21130 14442 0 0))
+;;; Generated autoloads from rainbow-delimiters.el
+
+(autoload 'rainbow-delimiters-mode "rainbow-delimiters" "\
+Highlight nested parentheses, brackets, and braces according to their depth.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'rainbow-delimiters-mode-enable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'rainbow-delimiters-mode-disable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(defvar global-rainbow-delimiters-mode nil "\
+Non-nil if Global-Rainbow-Delimiters mode is enabled.
+See the command `global-rainbow-delimiters-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-rainbow-delimiters-mode'.")
+
+(custom-autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" nil)
+
+(autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" "\
+Toggle Rainbow-Delimiters mode in all buffers.
+With prefix ARG, enable Global-Rainbow-Delimiters mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Rainbow-Delimiters mode is enabled in all buffers where
+`rainbow-delimiters-mode-enable' would do it.
+See `rainbow-delimiters-mode' for more information on Rainbow-Delimiters mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("rainbow-delimiters-pkg.el") (21130 14442
+;;;;;;  625138 0))
+
+;;;***
+
+(provide 'rainbow-delimiters-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; rainbow-delimiters-autoloads.el ends here
diff --git a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el
new file mode 100644
index 000000000..ceaf273b3
--- /dev/null
+++ b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el
@@ -0,0 +1 @@
+(define-package "rainbow-delimiters" "20131015.1304" "Highlight nested parens, brackets, braces a different color at each depth. [github]" (quote nil))
diff --git a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el
new file mode 100644
index 000000000..4a8b46249
--- /dev/null
+++ b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el
@@ -0,0 +1,544 @@
+;;; rainbow-delimiters.el --- Highlight nested parens, brackets, braces a different color at each depth.
+
+;; Copyright (C) 2010-2013 Jeremy Rayman.
+;; Author: Jeremy Rayman <opensource@jeremyrayman.com>
+;; Maintainer: Jeremy Rayman <opensource@jeremyrayman.com>
+;; Created: 2010-09-02
+;; Version: 20131015.1304
+;; X-Original-Version: 1.3.4
+;; Keywords: faces, convenience, lisp, matching, tools, rainbow, rainbow parentheses, rainbow parens
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+;; URL: http://github.com/jlr/rainbow-delimiters/raw/master/rainbow-delimiters.el
+
+;; 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/>.
+
+
+;;; Commentary:
+;;
+;; Rainbow-delimiters is a “rainbow parentheses�-like mode which highlights
+;; parentheses, brackets, and braces according to their depth. Each
+;; successive level is highlighted in a different color. This makes it easy
+;; to spot matching delimiters, orient yourself in the code, and tell which
+;; statements are at a given level.
+;;
+;; Great care has been taken to make this mode FAST. You shouldn't see
+;; any discernible change in scrolling or editing speed while using it,
+;; even in delimiter-rich languages like Clojure, Lisp, and Scheme.
+;;
+;; Default colors are subtle, with the philosophy that syntax highlighting
+;; shouldn't be visually intrusive. Color schemes are always a matter of
+;; taste.  If you take the time to design a new color scheme, please share
+;; (even a simple list of colors works) on the EmacsWiki page or via github.
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+
+
+;;; Installation:
+
+;; 1. Place rainbow-delimiters.el on your emacs load-path.
+;;
+;; 2. Compile the file (necessary for speed):
+;; M-x byte-compile-file <location of rainbow-delimiters.el>
+;;
+;; 3. Add the following to your dot-emacs/init file:
+;; (require 'rainbow-delimiters)
+;;
+;; 4. Activate the mode in your init file.
+;;    You can choose to enable it only in certain modes, or Emacs-wide:
+;;
+;; - To enable it only in certain modes, add lines like the following:
+;; (add-hook 'clojure-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To enable it in all programming-related emacs modes (Emacs 24+):
+;; (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To activate the mode globally, add to your init file:
+;; (global-rainbow-delimiters-mode)
+;;
+;; - To temporarily activate rainbow-delimiters mode in an open buffer:
+;; M-x rainbow-delimiters-mode
+;;
+;; - To toggle global-rainbow-delimiters-mode:
+;; M-x global-rainbow-delimiters-mode
+
+;;; Customization:
+
+;; To customize various options, including the color scheme:
+;; M-x customize-group rainbow-delimiters
+;;
+;; deftheme / color-theme.el users:
+;; You can specify custom colors by adding the appropriate faces to your theme.
+;; - Faces take the form of:
+;;   'rainbow-delimiters-depth-#-face' with # being the depth.
+;;   Depth begins at 1, the outermost color.
+;;   Faces exist for depths 1-9.
+;; - The unmatched delimiter face (normally colored red) is:
+;;   'rainbow-delimiters-unmatched-face'
+
+
+;;; Change Log:
+
+;; 1.0 - Initial release.
+;; 1.1 - Stop tracking each delimiter's depth independently.
+;;       This had lead to confusing results when viewing clojure
+;;       code. Instead, just color based on current nesting inside
+;;       all delimiters combined.
+;;     - Added 'all-delimiters' faces to apply a color scheme to
+;;       all delimiters at once. Other faces inherit from this group.
+;; 1.1.1 - Change color scheme to a lighter, more subtle style.
+;; 1.1.2: (2011-03-25)
+;;  - Add an unmatched-delimiter face and correct problem with
+;;    coloring of text following unmatched closing delims.
+;; 1.2: (2011-03-28)
+;;  - Unify delimiter faces: all delimiter types now use the same depth
+;;    faces, of form 'rainbow-delimiters-depth-#-face'.
+;; 1.2.1: (2011-03-29)
+;;  - Conform to ELPA conventions.
+;; 1.3: (2011-05-24)
+;;  - Add separate color schemes for light and dark background modes.
+;;  - Checkboxes to enable/disable highlighting for each delimiter type.
+;;  - Improvements to Customize interface.
+;;  - Infinite depth support by cycling through defined faces repeatedly.
+;;  - Documentation changes.
+;; 1.3.1 (2011-05-25)
+;;  - Light color theme appears entirely grey on SRGB monitors. Revert to
+;;    old color theme until a nicer light background theme can be added.
+;;  - Correct typo in the installation step for users of dark backgrounds.
+;; 1.3.2 (2011-10-14)
+;;  - Add 'global-rainbow-delimiters-mode'.
+;;  - Respect syntax of current buffer major-mode so delimiters
+;;    highlight correctly in non-lisp languages.
+;; 1.3.3 (2011-11-25)
+;;  - Backwards compatibility with Emacs versions prior to 23.2.
+;;    Defines "with-silent-modifications" if undefined.
+;; 1.3.4 (2012-04-27)
+;;  - Further optimize highlighting speed. Benchmarks show 2x improvement.
+;;  - Color scheme for light backgrounds.
+;;  - Eliminate bottleneck seen in certain large files.
+;;    A large file which revealed this bottleneck now highlights ~40x faster.
+;;  - Correct broken/incorrect highlighting reported in certain languages.
+
+;;; TODO:
+
+;; - Add support for independent depth tracking of each delimiter type
+;;   for users of C-like languages.
+;; - Python style - increase depth with each new indentation.
+;; - Add support for nested tags (XML, HTML)
+;; - Set up proper example defthemes for rainbow-delimiters faces.
+;; - Intelligent support for other languages: Ruby, LaTeX tags, et al.
+
+;;; Issues:
+
+;; - Rainbow-delimiters mode does not appear to change the color of
+;;   delimiters when Org-mode is also enabled.
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+
+;; Note: some of the functions in this file have been inlined for speed.
+;; Inlining functions can cause problems with debugging. To debug these
+;; functions more easily, change defsubst -> defun.
+;; http://www.gnu.org/s/emacs/manual/html_node/elisp/Compilation-Tips.html
+
+;;; Customize interface:
+
+(defgroup rainbow-delimiters nil
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  :prefix "rainbow-delimiters-"
+  :link '(url-link :tag "Website for rainbow-delimiters (EmacsWiki)"
+                   "http://www.emacswiki.org/emacs/RainbowDelimiters")
+  :group 'applications)
+
+(defgroup rainbow-delimiters-faces nil
+  "Faces for successively nested pairs of delimiters.
+
+When depth exceeds innermost defined face, colors cycle back through."
+  :tag "Color Scheme"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Toggle Delimiters" "rainbow-delimiters-toggle-delimiter-highlighting")
+  :prefix 'rainbow-delimiters-faces-)
+
+;; Choose which delimiters you want to highlight in your preferred language:
+
+(defgroup rainbow-delimiters-toggle-delimiter-highlighting nil
+  "Choose which delimiters to highlight."
+  :tag "Toggle Delimiters"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Color Scheme" "rainbow-delimiters-faces"))
+
+(defcustom rainbow-delimiters-highlight-parens-p t
+  "Enable highlighting of nested parentheses -- ().
+
+Non-nil (default) enables highlighting of parentheses.
+Nil disables parentheses highlighting."
+  :tag "Highlight Parentheses?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-brackets-p t
+  "Enable highlighting of nested brackets -- [].
+
+Non-nil (default) enables highlighting of brackets.
+Nil disables bracket highlighting."
+  :tag "Highlight Brackets?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-braces-p t
+  "Enable highlighting of nested braces -- {}.
+
+Non-nil (default) enables highlighting of braces.
+Nil disables brace highlighting."
+  :tag "Highlight Braces?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+
+;;; Faces:
+
+;; Unmatched delimiter face:
+(defface rainbow-delimiters-unmatched-face
+  '((((background light)) (:foreground "#88090B"))
+    (((background dark)) (:foreground "#88090B")))
+  "Face to highlight unmatched closing delimiters in."
+  :group 'rainbow-delimiters-faces)
+
+;; Faces for highlighting delimiters by nested level:
+(defface rainbow-delimiters-depth-1-face
+  '((((background light)) (:foreground "#707183"))
+    (((background dark)) (:foreground "grey55")))
+  "Nested delimiters face, depth 1 - outermost set."
+  :tag "Rainbow Delimiters Depth 1 Face -- OUTERMOST"
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-2-face
+  '((((background light)) (:foreground "#7388d6"))
+    (((background dark)) (:foreground "#93a8c6")))
+  "Nested delimiters face, depth 2."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-3-face
+  '((((background light)) (:foreground "#909183"))
+    (((background dark)) (:foreground "#b0b1a3")))
+  "Nested delimiters face, depth 3."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-4-face
+  '((((background light)) (:foreground "#709870"))
+    (((background dark)) (:foreground "#97b098")))
+  "Nested delimiters face, depth 4."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-5-face
+  '((((background light)) (:foreground "#907373"))
+    (((background dark)) (:foreground "#aebed8")))
+  "Nested delimiters face, depth 5."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-6-face
+  '((((background light)) (:foreground "#6276ba"))
+    (((background dark)) (:foreground "#b0b0b3")))
+  "Nested delimiters face, depth 6."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-7-face
+  '((((background light)) (:foreground "#858580"))
+    (((background dark)) (:foreground "#90a890")))
+  "Nested delimiters face, depth 7."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-8-face
+  '((((background light)) (:foreground "#80a880"))
+    (((background dark)) (:foreground "#a2b6da")))
+  "Nested delimiters face, depth 8."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-9-face
+  '((((background light)) (:foreground "#887070"))
+    (((background dark)) (:foreground "#9cb6ad")))
+  "Nested delimiters face, depth 9."
+  :group 'rainbow-delimiters-faces)
+
+;;; Faces 10+:
+;; NOTE: Currently unused. Additional faces for depths 9+ can be added on request.
+
+(defconst rainbow-delimiters-max-face-count 9
+  "Number of faces defined for highlighting delimiter levels.
+
+Determines depth at which to cycle through faces again.")
+
+(defvar rainbow-delimiters-outermost-only-face-count 0
+  "Number of faces to be used only for N outermost delimiter levels.
+
+This should be smaller than `rainbow-delimiters-max-face-count'.")
+
+;;; Face utility functions
+
+(defsubst rainbow-delimiters-depth-face (depth)
+  "Return face-name for DEPTH as a string 'rainbow-delimiters-depth-DEPTH-face'.
+
+For example: 'rainbow-delimiters-depth-1-face'."
+  (intern-soft
+   (concat "rainbow-delimiters-depth-"
+           (number-to-string
+            (or
+             ;; Our nesting depth has a face defined for it.
+             (and (<= depth rainbow-delimiters-max-face-count)
+                  depth)
+             ;; Deeper than # of defined faces; cycle back through to
+             ;; `rainbow-delimiters-outermost-only-face-count' + 1.
+             ;; Return face # that corresponds to current nesting level.
+             (+ 1 rainbow-delimiters-outermost-only-face-count
+                (mod (- depth rainbow-delimiters-max-face-count 1)
+                     (- rainbow-delimiters-max-face-count
+                        rainbow-delimiters-outermost-only-face-count)))))
+           "-face")))
+
+;;; Nesting level
+
+(defvar rainbow-delimiters-syntax-table nil
+  "Syntax table (inherited from buffer major-mode) which uses all delimiters.
+
+When rainbow-delimiters-minor-mode is first activated, it sets this variable and
+the other rainbow-delimiters specific syntax tables based on the current
+major-mode. The syntax table is constructed by the function
+'rainbow-delimiters-make-syntax-table'.")
+
+;; syntax-table: used with syntax-ppss for determining current depth.
+(defun rainbow-delimiters-make-syntax-table (syntax-table)
+  "Inherit SYNTAX-TABLE and add delimiters intended to be highlighted by mode."
+  (let ((table (copy-syntax-table syntax-table)))
+    (modify-syntax-entry ?\( "()  " table)
+    (modify-syntax-entry ?\) ")(  " table)
+    (modify-syntax-entry ?\[ "(]" table)
+    (modify-syntax-entry ?\] ")[" table)
+    (modify-syntax-entry ?\{ "(}" table)
+    (modify-syntax-entry ?\} "){" table)
+    table))
+
+(defsubst rainbow-delimiters-depth (loc)
+  "Return # of nested levels of parens, brackets, braces LOC is inside of."
+  (let ((depth
+         (with-syntax-table rainbow-delimiters-syntax-table
+           (car (syntax-ppss loc)))))
+    (if (>= depth 0)
+        depth
+      0))) ; ignore negative depths created by unmatched closing parens.
+
+
+;;; Text properties
+
+;; Backwards compatibility: Emacs < v23.2 lack macro 'with-silent-modifications'.
+(eval-and-compile
+  (unless (fboundp 'with-silent-modifications)
+    (defmacro with-silent-modifications (&rest body)
+      "Defined by rainbow-delimiters.el for backwards compatibility with Emacs < 23.2.
+ Execute BODY, pretending it does not modify the buffer.
+If BODY performs real modifications to the buffer's text, other
+than cosmetic ones, undo data may become corrupted.
+
+This macro will run BODY normally, but doesn't count its buffer
+modifications as being buffer modifications.  This affects things
+like buffer-modified-p, checking whether the file is locked by
+someone else, running buffer modification hooks, and other things
+of that nature.
+
+Typically used around modifications of text-properties which do
+not really affect the buffer's content."
+      (declare (debug t) (indent 0))
+      (let ((modified (make-symbol "modified")))
+        `(let* ((,modified (buffer-modified-p))
+                (buffer-undo-list t)
+                (inhibit-read-only t)
+                (inhibit-modification-hooks t)
+                deactivate-mark
+                ;; Avoid setting and removing file locks and checking
+                ;; buffer's uptodate-ness w.r.t the underlying file.
+                buffer-file-name
+                buffer-file-truename)
+           (unwind-protect
+               (progn
+                 ,@body)
+             (unless ,modified
+               (restore-buffer-modified-p nil))))))))
+
+(defsubst rainbow-delimiters-propertize-delimiter (loc depth)
+  "Highlight a single delimiter at LOC according to DEPTH.
+
+LOC is the location of the character to add text properties to.
+DEPTH is the nested depth at LOC, which determines the face to use.
+
+Sets text properties:
+`font-lock-face' to the appropriate delimiter face.
+`rear-nonsticky' to prevent color from bleeding into subsequent characters typed by the user."
+  (with-silent-modifications
+    (let ((delim-face (if (<= depth 0)
+                          'rainbow-delimiters-unmatched-face
+                        (rainbow-delimiters-depth-face depth))))
+      ;; (when (eq depth -1) (message "Unmatched delimiter at char %s." loc))
+      (add-text-properties loc (1+ loc)
+                           `(font-lock-face ,delim-face
+                             rear-nonsticky t)))))
+
+
+(defsubst rainbow-delimiters-unpropertize-delimiter (loc)
+  "Remove text properties set by rainbow-delimiters mode from char at LOC."
+  (with-silent-modifications
+    (remove-text-properties loc (1+ loc)
+                            '(font-lock-face nil
+                              rear-nonsticky nil))))
+
+(defvar rainbow-delimiters-escaped-char-predicate nil)
+(make-variable-buffer-local 'rainbow-delimiters-escaped-char-predicate)
+
+(defvar rainbow-delimiters-escaped-char-predicate-list
+  '((emacs-lisp-mode . rainbow-delimiters-escaped-char-predicate-emacs-lisp)
+    (inferior-emacs-lisp-mode . rainbow-delimiters-escaped-char-predicate-emacs-lisp)
+    (lisp-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    (scheme-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    (clojure-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    (inferior-scheme-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    ))
+
+(defun rainbow-delimiters-escaped-char-predicate-emacs-lisp (loc)
+  (or (and (eq (char-before loc) ?\?) ; e.g. ?) - deprecated, but people use it
+           (not (and (eq (char-before (1- loc)) ?\\) ; special case: ignore ?\?
+                     (eq (char-before (- loc 2)) ?\?))))
+      (and (eq (char-before loc) ?\\) ; escaped char, e.g. ?\) - not counted
+           (eq (char-before (1- loc)) ?\?))))
+
+(defun rainbow-delimiters-escaped-char-predicate-lisp (loc)
+  (eq (char-before loc) ?\\))
+
+(defsubst rainbow-delimiters-char-ineligible-p (loc)
+  "Return t if char at LOC should be skipped, e.g. if inside a comment.
+
+Returns t if char at loc meets one of the following conditions:
+- Inside a string.
+- Inside a comment.
+- Is an escaped char, e.g. ?\)"
+  (let ((parse-state (syntax-ppss loc)))
+    (or
+     (nth 3 parse-state)                ; inside string?
+     (nth 4 parse-state)                ; inside comment?
+     (and rainbow-delimiters-escaped-char-predicate
+          (funcall rainbow-delimiters-escaped-char-predicate loc)))))
+
+
+(defsubst rainbow-delimiters-apply-color (delim depth loc)
+  "Apply color for DEPTH to DELIM at LOC following user settings.
+
+DELIM is a string specifying delimiter type.
+DEPTH is the delimiter depth, or corresponding face # if colors are repeating.
+LOC is location of character (delimiter) to be colorized."
+  (and
+   ;; Ensure user has enabled highlighting of this delimiter type.
+   (symbol-value (intern-soft
+                  (concat "rainbow-delimiters-highlight-" delim "s-p")))
+   (rainbow-delimiters-propertize-delimiter loc
+                                            depth)))
+
+
+;;; JIT-Lock functionality
+
+;; Used to skip delimiter-by-delimiter `rainbow-delimiters-propertize-region'.
+(defconst rainbow-delimiters-delim-regex "\\(\(\\|\)\\|\\[\\|\\]\\|\{\\|\}\\)"
+  "Regex matching all opening and closing delimiters the mode highlights.")
+
+;; main function called by jit-lock:
+(defsubst rainbow-delimiters-propertize-region (start end)
+  "Highlight delimiters in region between START and END.
+
+Used by jit-lock for dynamic highlighting."
+  (setq rainbow-delimiters-escaped-char-predicate
+        (cdr (assoc major-mode rainbow-delimiters-escaped-char-predicate-list)))
+  (save-excursion
+    (goto-char start)
+    ;; START can be anywhere in buffer; determine the nesting depth at START loc
+    (let ((depth (rainbow-delimiters-depth start)))
+      (while (and (< (point) end)
+                  (re-search-forward rainbow-delimiters-delim-regex end t))
+        (backward-char) ; re-search-forward places point after delim; go back.
+        (unless (rainbow-delimiters-char-ineligible-p (point))
+          (let ((delim (char-after (point))))
+            (cond ((eq ?\( delim)       ; (
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "paren" depth (point)))
+                  ((eq ?\) delim)       ; )
+                   (rainbow-delimiters-apply-color "paren" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched paren
+                                   (1- depth))))
+                  ((eq ?\[ delim)       ; [
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "bracket" depth (point)))
+                  ((eq ?\] delim)       ; ]
+                   (rainbow-delimiters-apply-color "bracket" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched bracket
+                                   (1- depth))))
+                  ((eq ?\{ delim)       ; {
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "brace" depth (point)))
+                  ((eq ?\} delim)       ; }
+                   (rainbow-delimiters-apply-color "brace" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched brace
+                                   (1- depth)))))))
+        ;; move past delimiter so re-search-forward doesn't pick it up again
+        (forward-char)))))
+
+(defun rainbow-delimiters-unpropertize-region (start end)
+  "Remove highlighting from delimiters between START and END."
+  (save-excursion
+    (goto-char start)
+    (while (and (< (point) end)
+                (re-search-forward rainbow-delimiters-delim-regex end t))
+      ;; re-search-forward places point 1 further than the delim matched:
+      (rainbow-delimiters-unpropertize-delimiter (1- (point))))))
+
+
+;;; Minor mode:
+
+;;;###autoload
+(define-minor-mode rainbow-delimiters-mode
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  nil "" nil ; No modeline lighter - it's already obvious when the mode is on.
+  (if (not rainbow-delimiters-mode)
+      (progn
+        (jit-lock-unregister 'rainbow-delimiters-propertize-region)
+        (rainbow-delimiters-unpropertize-region (point-min) (point-max)))
+    (jit-lock-register 'rainbow-delimiters-propertize-region t)
+    ;; Create necessary syntax tables inheriting from current major-mode.
+    (set (make-local-variable 'rainbow-delimiters-syntax-table)
+         (rainbow-delimiters-make-syntax-table (syntax-table)))))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-enable ()
+  (rainbow-delimiters-mode 1))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-disable ()
+  (rainbow-delimiters-mode 0))
+
+;;;###autoload
+(define-globalized-minor-mode global-rainbow-delimiters-mode
+  rainbow-delimiters-mode rainbow-delimiters-mode-enable)
+
+(provide 'rainbow-delimiters)
+
+;;; rainbow-delimiters.el ends here.
diff --git a/elpa/s-1.7.0/s-autoloads.el b/elpa/s-1.7.0/s-autoloads.el
new file mode 100644
index 000000000..b832d58a6
--- /dev/null
+++ b/elpa/s-1.7.0/s-autoloads.el
@@ -0,0 +1,18 @@
+;;; s-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil nil ("s-pkg.el" "s.el") (21077 32440 527954
+;;;;;;  0))
+
+;;;***
+
+(provide 's-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; s-autoloads.el ends here
diff --git a/elpa/s-1.7.0/s-pkg.el b/elpa/s-1.7.0/s-pkg.el
new file mode 100644
index 000000000..94c1d0179
--- /dev/null
+++ b/elpa/s-1.7.0/s-pkg.el
@@ -0,0 +1 @@
+(define-package "s" "1.7.0" "The long lost Emacs string manipulation library." (quote nil))
diff --git a/elpa/s-1.7.0/s.el b/elpa/s-1.7.0/s.el
new file mode 100644
index 000000000..995f620b0
--- /dev/null
+++ b/elpa/s-1.7.0/s.el
@@ -0,0 +1,538 @@
+;;; s.el --- The long lost Emacs string manipulation library.
+
+;; Copyright (C) 2012 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 1.7.0
+;; Keywords: strings
+
+;; 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/>.
+
+;;; Commentary:
+
+;; The long lost Emacs string manipulation library.
+;;
+;; See documentation on https://github.com/magnars/s.el#functions
+
+;;; Code:
+
+(defun s-trim-left (s)
+  "Remove whitespace at the beginning of S."
+  (if (string-match "\\`[ \t\n\r]+" s)
+      (replace-match "" t t s)
+    s))
+
+(defun s-trim-right (s)
+  "Remove whitespace at the end of S."
+  (if (string-match "[ \t\n\r]+\\'" s)
+      (replace-match "" t t s)
+    s))
+
+(defun s-trim (s)
+  "Remove whitespace at the beginning and end of S."
+  (s-trim-left (s-trim-right s)))
+
+(defun s-collapse-whitespace (s)
+  "Convert all adjacent whitespace characters to a single space."
+  (replace-regexp-in-string "[ \t\n\r]+" " " s))
+
+(defun s-split (separator s &optional omit-nulls)
+  "Split S into substrings bounded by matches for regexp SEPARATOR.
+If OMIT-NULLS is t, zero-length substrings are omitted.
+
+This is a simple wrapper around the built-in `split-string'."
+  (split-string s separator omit-nulls))
+
+(defun s-lines (s)
+  "Splits S into a list of strings on newline characters."
+  (s-split "\\(\r\n\\|[\n\r]\\)" s))
+
+(defun s-join (separator strings)
+  "Join all the strings in STRINGS with SEPARATOR in between."
+  (mapconcat 'identity strings separator))
+
+(defun s-concat (&rest strings)
+  "Join all the string arguments into one string."
+  (apply 'concat strings))
+
+(defun s-prepend (prefix s)
+  "Concatenate PREFIX and S."
+  (concat prefix s))
+
+(defun s-append (suffix s)
+  "Concatenate S and SUFFIX."
+  (concat s suffix))
+
+(defun s-repeat (num s)
+  "Make a string of S repeated NUM times."
+  (let (ss)
+    (while (> num 0)
+      (setq ss (cons s ss))
+      (setq num (1- num)))
+    (apply 'concat ss)))
+
+(defun s-chop-suffix (suffix s)
+  "Remove SUFFIX if it is at end of S."
+  (let ((pos (- (length suffix))))
+    (if (and (>= (length s) (length suffix))
+             (string= suffix (substring s pos)))
+        (substring s 0 pos)
+      s)))
+
+(defun s-chop-suffixes (suffixes s)
+  "Remove SUFFIXES one by one in order, if they are at the end of S."
+  (while suffixes
+    (setq s (s-chop-suffix (car suffixes) s))
+    (setq suffixes (cdr suffixes)))
+  s)
+
+(defun s-chop-prefix (prefix s)
+  "Remove PREFIX if it is at the start of S."
+  (let ((pos (length prefix)))
+    (if (and (>= (length s) (length prefix))
+             (string= prefix (substring s 0 pos)))
+        (substring s pos)
+      s)))
+
+(defun s-chop-prefixes (prefixes s)
+  "Remove PREFIXES one by one in order, if they are at the start of S."
+  (while prefixes
+    (setq s (s-chop-prefix (car prefixes) s))
+    (setq prefixes (cdr prefixes)))
+  s)
+
+(defun s-shared-start (s1 s2)
+  "Returns the longest prefix S1 and S2 have in common."
+  (let ((search-length (min (length s1) (length s2)))
+        (i 0))
+    (while (and (< i search-length)
+                (= (aref s1 i) (aref s2 i)))
+      (setq i (1+ i)))
+    (substring s1 0 i)))
+
+(defun s-shared-end (s1 s2)
+  "Returns the longest suffix S1 and S2 have in common."
+  (let* ((l1 (length s1))
+         (l2 (length s2))
+         (search-length (min l1 l2))
+         (i 0))
+    (while (and (< i search-length)
+                (= (aref s1 (- l1 i 1)) (aref s2 (- l2 i 1))))
+      (setq i (1+ i)))
+    ;; If I is 0, then it means that there's no common suffix between
+    ;; S1 and S2.
+    ;;
+    ;; However, since (substring s (- 0)) will return the whole
+    ;; string, `s-shared-end' should simply return the empty string
+    ;; when I is 0.
+    (if (zerop i)
+        ""
+      (substring s1 (- i)))))
+
+(defun s-chomp (s)
+  "Remove one trailing `\\n`, `\\r` or `\\r\\n` from S."
+  (s-chop-suffixes '("\n" "\r") s))
+
+(defun s-truncate (len s)
+  "If S is longer than LEN, cut it down to LEN - 3 and add ... at the end."
+  (if (> (length s) len)
+      (format "%s..." (substring s 0 (- len 3)))
+    s))
+
+(defun s-word-wrap (len s)
+  "If S is longer than LEN, wrap the words with newlines."
+  (with-temp-buffer
+    (insert s)
+    (let ((fill-column len))
+      (fill-region (point-min) (point-max)))
+    (buffer-substring-no-properties (point-min) (point-max))))
+
+(defun s-center (len s)
+  "If S is shorter than LEN, pad it with spaces so it is centered."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat
+     (make-string (ceiling extra 2) ? )
+     s
+     (make-string (floor extra 2) ? ))))
+
+(defun s-pad-left (len padding s)
+  "If S is shorter than LEN, pad it with PADDING on the left."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat (make-string extra (string-to-char padding))
+            s)))
+
+(defun s-pad-right (len padding s)
+  "If S is shorter than LEN, pad it with PADDING on the right."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat s
+            (make-string extra (string-to-char padding)))))
+
+(defun s-left (len s)
+  "Returns up to the LEN first chars of S."
+  (if (> (length s) len)
+      (substring s 0 len)
+    s))
+
+(defun s-right (len s)
+  "Returns up to the LEN last chars of S."
+  (let ((l (length s)))
+    (if (> l len)
+        (substring s (- l len) l)
+      s)))
+
+(defun s-ends-with? (suffix s &optional ignore-case)
+  "Does S end with SUFFIX?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences.
+
+Alias: `s-suffix?'"
+  (let ((start-pos (- (length s) (length suffix))))
+    (and (>= start-pos 0)
+         (eq t (compare-strings suffix nil nil
+                                s start-pos nil ignore-case)))))
+
+(defalias 's-ends-with-p 's-ends-with?)
+
+(defun s-starts-with? (prefix s &optional ignore-case)
+  "Does S start with PREFIX?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences.
+
+Alias: `s-prefix?'. This is a simple wrapper around the built-in
+`string-prefix-p'."
+  (string-prefix-p prefix s ignore-case))
+
+(defalias 's-starts-with-p 's-starts-with?)
+
+(defalias 's-suffix? 's-ends-with?)
+(defalias 's-prefix? 's-starts-with?)
+(defalias 's-suffix-p 's-ends-with?)
+(defalias 's-prefix-p 's-starts-with?)
+
+(defun s--truthy? (val)
+  (not (null val)))
+
+(defun s-contains? (needle s &optional ignore-case)
+  "Does S contain NEEDLE?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+  (let ((case-fold-search ignore-case))
+    (s--truthy? (string-match-p (regexp-quote needle) s))))
+
+(defalias 's-contains-p 's-contains?)
+
+(defun s-equals? (s1 s2)
+  "Is S1 equal to S2?
+
+This is a simple wrapper around the built-in `string-equal'."
+  (string-equal s1 s2))
+
+(defalias 's-equals-p 's-equals?)
+
+(defun s-less? (s1 s2)
+  "Is S1 less than S2?
+
+This is a simple wrapper around the built-in `string-lessp'."
+  (string-lessp s1 s2))
+
+(defalias 's-less-p 's-less?)
+
+(defun s-matches? (regexp s &optional start)
+  "Does REGEXP match S?
+If START is non-nil the search starts at that index.
+
+This is a simple wrapper around the built-in `string-match-p'."
+  (s--truthy? (string-match-p regexp s start)))
+
+(defalias 's-matches-p 's-matches?)
+
+(defun s-blank? (s)
+  "Is S nil or the empty string?"
+  (or (null s) (string= "" s)))
+
+(defun s-lowercase? (s)
+  "Are all the letters in S in lower case?"
+  (let ((case-fold-search nil))
+    (not (string-match-p "[[:upper:]]" s))))
+
+(defun s-uppercase? (s)
+  "Are all the letters in S in upper case?"
+  (let ((case-fold-search nil))
+    (not (string-match-p "[[:lower:]]" s))))
+
+(defun s-mixedcase? (s)
+  "Are there both lower case and upper case letters in S?"
+  (let ((case-fold-search nil))
+    (s--truthy?
+     (and (string-match-p "[[:lower:]]" s)
+          (string-match-p "[[:upper:]]" s)))))
+
+(defun s-capitalized? (s)
+  "In S, is the first letter upper case, and all other letters lower case?"
+  (let ((case-fold-search nil))
+    (s--truthy?
+     (string-match-p "^[[:upper:]][^[:upper:]]*$" s))))
+
+(defun s-numeric? (s)
+  "Is S a number?"
+  (s--truthy?
+   (string-match-p "^[0-9]+$" s)))
+
+(defun s-replace (old new s)
+  "Replaces OLD with NEW in S."
+  (replace-regexp-in-string (regexp-quote old) new s t t))
+
+(defun s--aget (alist key)
+  (cdr (assoc key alist)))
+
+(defun s-replace-all (replacements s)
+  "REPLACEMENTS is a list of cons-cells. Each `car` is replaced with `cdr` in S."
+  (replace-regexp-in-string (regexp-opt (mapcar 'car replacements))
+                            (lambda (it) (s--aget replacements it))
+                            s))
+
+(defun s-downcase (s)
+  "Convert S to lower case.
+
+This is a simple wrapper around the built-in `downcase'."
+  (downcase s))
+
+(defun s-upcase (s)
+  "Convert S to upper case.
+
+This is a simple wrapper around the built-in `upcase'."
+  (upcase s))
+
+(defun s-capitalize (s)
+  "Convert the first word's first character to upper case and the rest to lower case in S."
+  (concat (upcase (substring s 0 1)) (downcase (substring s 1))))
+
+(defun s-titleize (s)
+  "Convert each word's first character to upper case and the rest to lower case in S.
+
+This is a simple wrapper around the built-in `capitalize'."
+  (capitalize s))
+
+(defmacro s-with (s form &rest more)
+  "Threads S through the forms. Inserts S as the last item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, inserts the first form as the
+last item in second form, etc."
+  (if (null more)
+      (if (listp form)
+          `(,(car form) ,@(cdr form) ,s)
+        (list form s))
+    `(s-with (s-with ,s ,form) ,@more)))
+
+(put 's-with 'lisp-indent-function 1)
+
+(defun s-index-of (needle s &optional ignore-case)
+  "Returns first index of NEEDLE in S, or nil.
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+  (let ((case-fold-search ignore-case))
+    (string-match-p (regexp-quote needle) s)))
+
+(defun s-reverse (s) ;; from org-babel-reverse-string
+  "Return the reverse of S."
+  (apply 'string (nreverse (string-to-list s))))
+
+(defun s-match-strings-all (regex string)
+  "Return a list of matches for REGEX in STRING.
+
+Each element itself is a list of matches, as per
+`match-string'. Multiple matches at the same position will be
+ignored after the first."
+  (let ((all-strings ())
+  (i 0))
+    (while (and (< i (length string))
+                (string-match regex string i))
+      (setq i (1+ (match-beginning 0)))
+      (let (strings
+            (num-matches (/ (length (match-data)) 2))
+            (match 0))
+        (while (/= match num-matches)
+          (push (match-string match string) strings)
+          (setq match (1+ match)))
+        (push (nreverse strings) all-strings)))
+    (nreverse all-strings)))
+
+(defun s-match (regexp s &optional start)
+  "When the given expression matches the string, this function returns a list
+of the whole matching string and a string for each matched subexpressions.
+If it did not match the returned value is an empty list (nil).
+
+When START is non-nil the search will start at that index."
+  (save-match-data
+    (if (string-match regexp s start)
+        (let ((match-data-list (match-data))
+              result)
+          (while match-data-list
+            (let* ((beg (car match-data-list))
+                   (end (cadr match-data-list))
+                   (subs (if (and beg end) (substring s beg end) nil)))
+              (setq result (cons subs result))
+              (setq match-data-list
+                    (cddr match-data-list))))
+          (nreverse result)))))
+
+(defun s-slice-at (regexp s)
+  "Slices S up at every index matching REGEXP."
+  (save-match-data
+    (let (i)
+      (setq i (string-match regexp s 1))
+      (if i
+          (cons (substring s 0 i)
+                (s-slice-at regexp (substring s i)))
+        (list s)))))
+
+(defun s-split-words (s)
+  "Split S into list of words."
+  (s-split
+   "[^[:lower:][:upper:]0-9]+"
+   (let ((case-fold-search nil))
+     (replace-regexp-in-string
+      "\\([[:lower:]]\\)\\([[:upper:]]\\)" "\\1 \\2"
+      (replace-regexp-in-string "\\([[:upper:]]\\)\\([[:upper:]][0-9[:lower:]]\\)" "\\1 \\2" s)))
+   t))
+
+(defun s--mapcar-head (fn-head fn-rest list)
+  "Like MAPCAR, but applies a different function to the first element."
+  (if list
+      (cons (funcall fn-head (car list)) (mapcar fn-rest (cdr list)))))
+
+(defun s-lower-camel-case (s)
+  "Convert S to lowerCamelCase."
+  (s-join "" (s--mapcar-head 'downcase 'capitalize (s-split-words s))))
+
+(defun s-upper-camel-case (s)
+  "Convert S to UpperCamelCase."
+  (s-join "" (mapcar 'capitalize (s-split-words s))))
+
+(defun s-snake-case (s)
+  "Convert S to snake_case."
+  (s-join "_" (mapcar 'downcase (s-split-words s))))
+
+(defun s-dashed-words (s)
+  "Convert S to dashed-words."
+  (s-join "-" (mapcar 'downcase (s-split-words s))))
+
+(defun s-capitalized-words (s)
+  "Convert S to Capitalized words."
+  (let ((words (s-split-words s)))
+    (s-join " " (cons (capitalize (car words)) (mapcar 'downcase (cdr words))))))
+
+(defun s-titleized-words (s)
+  "Convert S to Titleized Words."
+  (s-join " " (mapcar 's-titleize (s-split-words s))))
+
+(defun s-word-initials (s)
+  "Convert S to its initials."
+  (s-join "" (mapcar (lambda (ss) (substring ss 0 1))
+                     (s-split-words s))))
+
+;; Errors for s-format
+(progn
+  (put 's-format-resolve
+       'error-conditions
+       '(error s-format s-format-resolve))
+  (put 's-format-resolve
+       'error-message
+       "Cannot resolve a template to values"))
+
+(defun s-format (template replacer &optional extra)
+  "Format TEMPLATE with the function REPLACER.
+
+REPLACER takes an argument of the format variable and optionally
+an extra argument which is the EXTRA value from the call to
+`s-format'.
+
+Several standard `s-format' helper functions are recognized and
+adapted for this:
+
+    (s-format \"${name}\" 'gethash hash-table)
+    (s-format \"${name}\" 'aget alist)
+    (s-format \"$0\" 'elt sequence)
+
+The REPLACER function may be used to do any other kind of
+transformation."
+  (let ((saved-match-data (match-data)))
+    (unwind-protect
+        (replace-regexp-in-string
+         "\\$\\({\\([^}]+\\)}\\|[0-9]+\\)"
+         (lambda (md)
+           (let ((var
+                  (let ((m (match-string 2 md)))
+                    (if m m
+                      (string-to-number (match-string 1 md)))))
+                 (replacer-match-data (match-data)))
+             (unwind-protect
+                 (let ((v
+                        (cond
+                         ((eq replacer 'gethash)
+                          (funcall replacer var extra))
+                         ((eq replacer 'aget)
+                          (funcall 's--aget extra var))
+                         ((eq replacer 'elt)
+                          (funcall replacer extra var))
+                         (t
+                          (set-match-data saved-match-data)
+                          (if extra
+                              (funcall replacer var extra)
+                            (funcall replacer var))))))
+                   (if v v (signal 's-format-resolve md)))
+               (set-match-data replacer-match-data)))) template
+               ;; Need literal to make sure it works
+               t t)
+      (set-match-data saved-match-data))))
+
+(defvar s-lex-value-as-lisp nil
+  "If `t' interpolate lisp values as lisp.
+
+`s-lex-format' inserts values with (format \"%S\").")
+
+(defun s-lex-fmt|expand (fmt)
+  "Expand FMT into lisp."
+  (list 's-format fmt (quote 'aget)
+        (append '(list)
+                (mapcar
+                 (lambda (matches)
+                   (list
+                    'cons
+                    (cadr matches)
+                    `(format
+                      (if s-lex-value-as-lisp "%S" "%s")
+                      ,(intern (cadr matches)))))
+                 (s-match-strings-all "${\\([^}]+\\)}" fmt)))))
+
+(defmacro s-lex-format (format-str)
+  "`s-format` with the current environment.
+
+FORMAT-STR may use the `s-format' variable reference to refer to
+any variable:
+
+ (let ((x 1))
+   (s-lex-format \"x is: ${x}\"))
+
+The values of the variables are interpolated with \"%s\" unless
+the variable `s-lex-value-as-lisp' is `t' and then they are
+interpolated with \"%S\"."
+  (s-lex-fmt|expand format-str))
+
+(provide 's)
+;;; s.el ends here
diff --git a/elpa/smex-2.1/smex-autoloads.el b/elpa/smex-1.1.1/smex-autoloads.el
similarity index 65%
rename from elpa/smex-2.1/smex-autoloads.el
rename to elpa/smex-1.1.1/smex-autoloads.el
index bed11cf11..b466f5214 100644
--- a/elpa/smex-2.1/smex-autoloads.el
+++ b/elpa/smex-1.1.1/smex-autoloads.el
@@ -3,15 +3,9 @@
 ;;; Code:
 
 
-;;;### (autoloads (smex-initialize smex) "smex" "smex.el" (21031
-;;;;;;  23277 0 0))
+;;;### (autoloads (smex-initialize) "smex" "smex.el" (20166 22147))
 ;;; Generated autoloads from smex.el
 
-(autoload 'smex "smex" "\
-
-
-\(fn)" t nil)
-
 (autoload 'smex-initialize "smex" "\
 
 
@@ -19,7 +13,7 @@
 
 ;;;***
 
-;;;### (autoloads nil nil ("smex-pkg.el") (21031 23277 451780 0))
+;;;### (autoloads nil nil ("smex-pkg.el") (20166 22147 529156))
 
 ;;;***
 
diff --git a/elpa/smex-1.1.1/smex-pkg.el b/elpa/smex-1.1.1/smex-pkg.el
new file mode 100644
index 000000000..7456ac0e5
--- /dev/null
+++ b/elpa/smex-1.1.1/smex-pkg.el
@@ -0,0 +1 @@
+(define-package "smex" "1.1.1" "M-x interface with Ido-style fuzzy matching." (quote nil))
diff --git a/elpa/clojure-mode-2.1.0/clojure-mode-pkg.elc b/elpa/smex-1.1.1/smex-pkg.elc
similarity index 60%
rename from elpa/clojure-mode-2.1.0/clojure-mode-pkg.elc
rename to elpa/smex-1.1.1/smex-pkg.elc
index 00e50c23c..bec545ebb 100644
Binary files a/elpa/clojure-mode-2.1.0/clojure-mode-pkg.elc and b/elpa/smex-1.1.1/smex-pkg.elc differ
diff --git a/elpa/smex-2.1/smex.el b/elpa/smex-1.1.1/smex.el
similarity index 78%
rename from elpa/smex-2.1/smex.el
rename to elpa/smex-1.1.1/smex.el
index 35b1a0c6c..db2105fdd 100644
--- a/elpa/smex-2.1/smex.el
+++ b/elpa/smex-1.1.1/smex.el
@@ -1,10 +1,10 @@
 ;;; smex.el --- M-x interface with Ido-style fuzzy matching.
 
-;; Copyright (C) 2009-2013 Cornelius Mika and contributors
+;; Copyright (C) 2009, 2010 Cornelius Mika
 ;;
-;; Author: Cornelius Mika <cornelius.mika@gmail.com> and contributors
+;; Author: Cornelius Mika <cornelius.mika@gmail.com>
 ;; URL: http://github.com/nonsequitur/smex/
-;; Version: 2.1
+;; Version: 1.1.1
 ;; Keywords: convenience, usability
 
 ;; This file is not part of GNU Emacs.
@@ -24,14 +24,15 @@
 ;; For a detailed introduction see:
 ;; http://github.com/nonsequitur/smex/blob/master/README.markdown
 
-;;; Code:
-
 (require 'ido)
+;; Provides `union' and `dolist'.
+(require 'cl)
 
 (defgroup smex nil
   "M-x interface with Ido-style fuzzy matching and ranking heuristics."
   :group 'extensions
   :group 'convenience
+  :version "1.1"
   :link '(emacs-library-link :tag "Lisp File" "smex.el"))
 
 (defcustom smex-auto-update t
@@ -59,18 +60,6 @@ Must be set before initializing Smex."
   :type 'string
   :group 'smex)
 
-(defcustom smex-key-advice-ignore-menu-bar nil
-  "If non-nil, `smex-key-advice' ignores `menu-bar' bindings"
-  :type 'boolean
-  :group 'smex)
-
-(defcustom smex-flex-matching t
-  "Enables Ido flex matching. On by default.
-Set this to nil to disable fuzzy matching."
-  :type 'boolean
-  :group 'smex)
-
-(defvar smex-initialized-p nil)
 (defvar smex-cache)
 (defvar smex-ido-cache)
 (defvar smex-data)
@@ -81,25 +70,17 @@ Set this to nil to disable fuzzy matching."
 ;;--------------------------------------------------------------------------------
 ;; Smex Interface
 
-;;;###autoload
 (defun smex ()
   (interactive)
-  (unless smex-initialized-p
-    (smex-initialize))
   (if (smex-already-running)
-      (smex-update-and-rerun)
-    (and smex-auto-update
-         (smex-detect-new-commands)
-         (smex-update))
+      (smex-do-with-selected-item
+       (lambda (ignore) (smex-update) (smex-read-and-run smex-ido-cache ido-text)))
+    (and smex-auto-update (smex-detect-new-commands) (smex-update))
     (smex-read-and-run smex-ido-cache)))
 
 (defsubst smex-already-running ()
   (and (boundp 'ido-choice-list) (eql ido-choice-list smex-ido-cache)))
 
-(defsubst smex-update-and-rerun ()
-  (smex-do-with-selected-item
-   (lambda (ignore) (smex-update) (smex-read-and-run smex-ido-cache ido-text))))
-
 (defun smex-read-and-run (commands &optional initial-input)
   (let ((chosen-item (intern (smex-completing-read commands initial-input))))
     (if smex-custom-action
@@ -108,55 +89,33 @@ Set this to nil to disable fuzzy matching."
           (funcall action chosen-item))
       (unwind-protect
           (progn (setq prefix-arg current-prefix-arg)
-                 ;; Set the chosen command as the current command, like in
-                 ;; `execute-extended-command'
-                 (setq this-command chosen-item)
-                 (setq real-this-command chosen-item)
                  (command-execute chosen-item 'record))
         (smex-rank chosen-item)
         (smex-show-key-advice chosen-item)
         ;; Todo: Is there a better way to manipulate 'last-repeatable-command'
         ;; from the inside of an interactively called function?
-        ;; (This is unneeded in Emacs >=24.3 when `real-this-command' has been set.)
         (run-at-time 0.01 nil (lambda (cmd) (setq last-repeatable-command cmd))
                      chosen-item)))))
 
 (defun smex-major-mode-commands ()
   "Like `smex', but limited to commands that are relevant to the active major mode."
   (interactive)
-  (let ((commands (delete-dups (append (smex-extract-commands-from-keymap (current-local-map))
-                                       (smex-extract-commands-from-features major-mode)))))
+  (let ((commands (union (extract-commands-from-keymap (current-local-map))
+                         (extract-commands-from-features major-mode))))
     (setq commands (smex-sort-according-to-cache commands))
-    (setq commands (mapcar #'symbol-name commands))
+    (setq commands (mapcar (lambda (command) (symbol-name command)) commands))
     (smex-read-and-run commands)))
 
 (defun smex-completing-read (choices initial-input)
   (let ((ido-completion-map ido-completion-map)
         (ido-setup-hook (cons 'smex-prepare-ido-bindings ido-setup-hook))
         (ido-enable-prefix nil)
-        (ido-enable-flex-matching smex-flex-matching)
-        (ido-max-prospects 10)
-        (minibuffer-completion-table choices))
-    (ido-completing-read (smex-prompt-with-prefix-arg) choices nil nil
-                         initial-input nil (car choices))))
-
-(defun smex-prompt-with-prefix-arg ()
-  (if (not current-prefix-arg)
-      smex-prompt-string
-    (concat
-     (if (eq current-prefix-arg '-)
-         "- "
-       (if (integerp current-prefix-arg)
-           (format "%d " current-prefix-arg)
-         (if (= (car current-prefix-arg) 4)
-             "C-u "
-           (format "%d " (car current-prefix-arg)))))
-     smex-prompt-string)))
+        (ido-enable-flex-matching t)
+        (ido-max-prospects 10))
+    (ido-completing-read smex-prompt-string choices nil nil initial-input)))
 
 (defun smex-prepare-ido-bindings ()
-  (define-key ido-completion-map (kbd "TAB") 'minibuffer-complete)
   (define-key ido-completion-map (kbd "C-h f") 'smex-describe-function)
-  (define-key ido-completion-map (kbd "C-h w") 'smex-where-is)
   (define-key ido-completion-map (kbd "M-.") 'smex-find-function)
   (define-key ido-completion-map (kbd "C-a") 'move-beginning-of-line))
 
@@ -201,16 +160,6 @@ Set this to nil to disable fuzzy matching."
                   (setq smex-cache command-cell))))))
         (reverse smex-history)))
 
-(defun smex-sort-according-to-cache (list)
-  "Sorts a list of commands by their order in `smex-cache'"
-  (let (sorted)
-    (dolist (command-item smex-cache)
-      (let ((command (car command-item)))
-        (when (memq command list)
-          (setq sorted (cons command sorted))
-          (setq list (delq command list)))))
-    (nreverse (append list sorted))))
-
 (defun smex-update ()
   (interactive)
   (smex-save-history)
@@ -228,40 +177,37 @@ Set this to nil to disable fuzzy matching."
   (run-with-idle-timer idle-time t
                        '(lambda () (if (smex-detect-new-commands) (smex-update)))))
 
+(defun smex-detect-legacy-save-file ()
+  "The default value of `smex-save-file' was changed in between releases.
+This function provides temporary means to aid the transition."
+  (unless (file-readable-p smex-save-file)
+    (let ((legacy-save-file "~/smex.save"))
+      (when (file-readable-p legacy-save-file)
+        (message (format "%s not found. Falling back to %s"
+                         smex-save-file legacy-save-file))
+        (setq smex-save-file legacy-save-file)))))
+
 ;;;###autoload
 (defun smex-initialize ()
   (interactive)
   (unless ido-mode (smex-initialize-ido))
-  (smex-load-save-file)
-  (smex-detect-new-commands)
-  (smex-rebuild-cache)
-  (add-hook 'kill-emacs-hook 'smex-save-to-file)
-  (setq smex-initialized-p t))
+  (smex-detect-legacy-save-file)
+  (let ((save-file (expand-file-name smex-save-file)))
+    (if (file-readable-p save-file)
+        (with-temp-buffer
+          (insert-file-contents save-file)
+          (setq smex-history (read (current-buffer))
+                smex-data (read (current-buffer))))
+      (setq smex-history nil smex-data nil))
+    (smex-detect-new-commands)
+    (smex-rebuild-cache)
+    (add-hook 'kill-emacs-hook 'smex-save-to-file)))
 
 (defun smex-initialize-ido ()
   "Sets up a minimal Ido environment for `ido-completing-read'."
   (ido-init-completion-maps)
   (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup))
 
-(defun smex-load-save-file ()
-  "Loads `smex-history' and `smex-data' from `smex-save-file'"
-  (let ((save-file (expand-file-name smex-save-file)))
-    (if (file-readable-p save-file)
-        (with-temp-buffer
-          (insert-file-contents save-file)
-          (condition-case nil
-              (setq smex-history (read (current-buffer))
-                    smex-data    (read (current-buffer)))
-            (error (if (smex-save-file-not-empty-p)
-                       (error "Invalid data in smex-save-file (%s). Can't restore history."
-                              smex-save-file)
-                     (if (not (boundp 'smex-history)) (setq smex-history))
-                     (if (not (boundp 'smex-data))    (setq smex-data))))))
-      (setq smex-history nil smex-data nil))))
-
-(defsubst save-file-not-empty-p ()
-  (string-match-p "\[^[:space:]\]" (buffer-string)))
-
 (defun smex-save-history ()
   "Updates `smex-history'"
   (setq smex-history nil)
@@ -394,10 +340,6 @@ Returns nil when reaching the end of the list."
                            (describe-function chosen)
                            (pop-to-buffer "*Help*"))))
 
-(defun smex-where-is ()
-  (interactive)
-  (smex-do-with-selected-item 'where-is))
-
 (defun smex-find-function ()
   (interactive)
   (smex-do-with-selected-item 'find-function))
@@ -422,49 +364,41 @@ Returns nil when reaching the end of the list."
 
 (defun smex-key-advice (command)
   (let ((keys (where-is-internal command)))
-    (if smex-key-advice-ignore-menu-bar
-        (setq keys (smex-filter-out-menu-bar-bindings keys)))
     (if keys
         (format "You can run the command `%s' with %s"
                 command
                 (mapconcat 'key-description keys ", ")))))
 
-(defsubst smex-filter-out-menu-bar-bindings (keys)
-  (delq nil (mapcar (lambda (key-vec)
-                      (unless (equal (aref key-vec 0) 'menu-bar)
-                        key-vec))
-                    keys)))
-
 (defun smex-unlogged-message (string)
   "Bypasses logging in *Messages*"
   (let (message-log-max)
     (message "%s" string)))
 
-(defun smex-extract-commands-from-keymap (map)
+(defun extract-commands-from-keymap (map)
   (let (commands)
-    (smex-parse-keymap map commands)
+    (parse-keymap map)
     commands))
 
-(defun smex-parse-keymap (map commands)
+(defun parse-keymap (map)
   (map-keymap (lambda (binding element)
                 (if (and (listp element) (eq 'keymap (car element)))
-                    (smex-parse-keymap element commands)
+                    (parse-keymap element)
                           ; Strings are commands, too. Reject them.
                   (if (and (symbolp element) (commandp element))
-                      (push element commands))))
+                      (setq commands (cons element commands)))))
               map))
 
-(defun smex-extract-commands-from-features (mode)
+(defun extract-commands-from-features (mode)
   (let ((library-path (symbol-file mode))
         (mode-name (symbol-name mode))
         commands)
-
+    
     (string-match "\\(.+?\\)\\(-mode\\)?$" mode-name)
     ;; 'lisp-mode' -> 'lisp'
     (setq mode-name (match-string 1 mode-name))
     (if (string= mode-name "c") (setq mode-name "cc"))
     (setq mode-name (regexp-quote mode-name))
-
+    
     (dolist (feature load-history)
       (let ((feature-path (car feature)))
         (when (and feature-path (or (equal feature-path library-path)
@@ -477,6 +411,15 @@ Returns nil when reaching the end of the list."
                     (setq commands (append commands (list function))))))))))
     commands))
 
+(defun smex-sort-according-to-cache (list)
+  (let (sorted)
+    (dolist (command-item smex-cache)
+      (let ((command (car command-item)))
+        (when (memq command list)
+          (setq sorted (cons command sorted))
+          (setq list (delq command list)))))
+    (nreverse (append list sorted))))
+
 (defun smex-show-unbound-commands ()
   "Shows unbound commands in a new buffer,
 sorted by frequency of use."
@@ -488,12 +431,10 @@ sorted by frequency of use."
                                             command-item))
                                         smex-data))))
     (view-buffer-other-window "*Smex: Unbound Commands*")
-    (setq buffer-read-only t)
-    (let ((inhibit-read-only t))
-      (erase-buffer)
-      (ido-pp 'unbound-commands))
-    (set-buffer-modified-p nil)
-    (goto-char (point-min))))
+    (toggle-read-only nil)
+    (erase-buffer)
+    (ido-pp 'unbound-commands)
+    (beginning-of-buffer)))
 
 (provide 'smex)
 ;;; smex.el ends here
diff --git a/elpa/smex-1.1.1/smex.elc b/elpa/smex-1.1.1/smex.elc
new file mode 100644
index 000000000..ca574008b
Binary files /dev/null and b/elpa/smex-1.1.1/smex.elc differ
diff --git a/elpa/smex-2.1/smex-autoloads.el~ b/elpa/smex-2.1/smex-autoloads.el~
deleted file mode 100644
index 305567a57..000000000
--- a/elpa/smex-2.1/smex-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; smex-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'smex-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; smex-autoloads.el ends here
diff --git a/elpa/smex-2.1/smex-pkg.el b/elpa/smex-2.1/smex-pkg.el
deleted file mode 100644
index 9524fbe6f..000000000
--- a/elpa/smex-2.1/smex-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "smex" "2.1" "M-x interface with Ido-style fuzzy matching." (quote nil))
diff --git a/elpa/smex-2.1/smex.elc b/elpa/smex-2.1/smex.elc
deleted file mode 100644
index 9e8ac274c..000000000
Binary files a/elpa/smex-2.1/smex.elc and /dev/null differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el b/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
index d5c4b15fb..5e9d36e5e 100644
--- a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
+++ b/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
@@ -3,8 +3,7 @@
 ;;; Code:
 
 
-;;;### (autoloads nil "starter-kit" "starter-kit.el" (21031 23285
-;;;;;;  0 0))
+;;;### (autoloads nil "starter-kit" "starter-kit.el" (20166 22154))
 ;;; Generated autoloads from starter-kit.el
 
 (dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode)) (when (fboundp mode) (funcall mode -1)))
@@ -30,7 +29,7 @@
 ;;;***
 
 ;;;### (autoloads nil nil ("starter-kit-defuns.el" "starter-kit-misc.el"
-;;;;;;  "starter-kit-pkg.el") (21031 23285 877636 0))
+;;;;;;  "starter-kit-pkg.el") (20166 22154 260459))
 
 ;;;***
 
diff --git a/elpa/starter-kit-2.0.3/starter-kit-defuns.elc b/elpa/starter-kit-2.0.3/starter-kit-defuns.elc
index 734892f40..db515b49e 100644
Binary files a/elpa/starter-kit-2.0.3/starter-kit-defuns.elc and b/elpa/starter-kit-2.0.3/starter-kit-defuns.elc differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit-misc.elc b/elpa/starter-kit-2.0.3/starter-kit-misc.elc
index 83f98daa5..0b08c039b 100644
Binary files a/elpa/starter-kit-2.0.3/starter-kit-misc.elc and b/elpa/starter-kit-2.0.3/starter-kit-misc.elc differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit-pkg.elc b/elpa/starter-kit-2.0.3/starter-kit-pkg.elc
index 0fd2ea910..5a22d2301 100644
Binary files a/elpa/starter-kit-2.0.3/starter-kit-pkg.elc and b/elpa/starter-kit-2.0.3/starter-kit-pkg.elc differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit.elc b/elpa/starter-kit-2.0.3/starter-kit.elc
index 6243ee89e..3ff2af4fa 100644
Binary files a/elpa/starter-kit-2.0.3/starter-kit.elc and b/elpa/starter-kit-2.0.3/starter-kit.elc differ
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
index 2a20af0a5..5d5d0104c 100644
--- a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
+++ b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads nil "starter-kit-bindings" "starter-kit-bindings.el"
-;;;;;;  (21031 23289 0 0))
+;;;;;;  (20184 56041))
 ;;; Generated autoloads from starter-kit-bindings.el
 
 (global-set-key (kbd "C-c f") 'find-file-in-project)
@@ -65,8 +65,8 @@
 
 ;;;***
 
-;;;### (autoloads nil nil ("starter-kit-bindings-pkg.el") (21031
-;;;;;;  23289 123404 0))
+;;;### (autoloads nil nil ("starter-kit-bindings-pkg.el") (20184
+;;;;;;  56041 900829))
 
 ;;;***
 
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.elc b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.elc
index 09781b65e..56121e496 100644
Binary files a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.elc and b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.elc differ
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc
index 11b5f8473..f8e41f68d 100644
Binary files a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc and b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc differ
diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
index 4b011183e..5db145386 100644
--- a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
+++ b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads nil "starter-kit-lisp" "starter-kit-lisp.el" (21031
-;;;;;;  23288 0 0))
+;;;### (autoloads nil "starter-kit-lisp" "starter-kit-lisp.el" (20184
+;;;;;;  56040))
 ;;; Generated autoloads from starter-kit-lisp.el
 
 (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
@@ -37,8 +37,8 @@ Face used to dim parentheses." :group (quote starter-kit-faces))
 
 ;;;***
 
-;;;### (autoloads nil nil ("starter-kit-lisp-pkg.el") (21031 23288
-;;;;;;  270704 0))
+;;;### (autoloads nil nil ("starter-kit-lisp-pkg.el") (20184 56040
+;;;;;;  964735))
 
 ;;;***
 
diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.elc b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.elc
index 51299714e..01164c403 100644
Binary files a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.elc and b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.elc differ
diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.elc b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.elc
index 12ac2d13f..fef3ddd81 100644
Binary files a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.elc and b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.elc differ
diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el
deleted file mode 100644
index af4ad9ffc..000000000
--- a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "starter-kit-ruby" "2.0.3" "Saner defaults and goodies for Ruby" (quote ((inf-ruby "2.2.3") (starter-kit "2.0.1"))))
diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.elc b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.elc
deleted file mode 100644
index 0f9620d7f..000000000
Binary files a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.elc and /dev/null differ
diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc
deleted file mode 100644
index cc8fb9685..000000000
Binary files a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc and /dev/null differ
diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
similarity index 80%
rename from elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el
rename to elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
index 6eeadd102..939affa50 100644
--- a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el
+++ b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
@@ -3,26 +3,22 @@
 ;;; Code:
 
 
-;;;### (autoloads nil "starter-kit-ruby" "starter-kit-ruby.el" (21031
-;;;;;;  23291 0 0))
+;;;### (autoloads nil "starter-kit-ruby" "starter-kit-ruby.el" (20184
+;;;;;;  56042))
 ;;; Generated autoloads from starter-kit-ruby.el
 
-(eval-after-load 'ruby-mode '(progn (ignore-errors (require 'ruby-compilation)) (setq ruby-use-encoding-map nil) (add-hook 'ruby-mode-hook 'inf-ruby-keys) (define-key ruby-mode-map (kbd "RET") 'reindent-then-newline-and-indent) (define-key ruby-mode-map (kbd "C-M-h") 'backward-kill-word)))
+(eval-after-load 'ruby-mode '(progn (ignore-errors (require 'ruby-compilation)) (setq ruby-use-encoding-map nil) (define-key ruby-mode-map (kbd "RET") 'reindent-then-newline-and-indent) (define-key ruby-mode-map (kbd "C-M-h") 'backward-kill-word)))
 
 (global-set-key (kbd "C-h S-r") 'ri)
 
 (add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
 
-(add-to-list 'auto-mode-alist '("\\.thor$" . ruby-mode))
-
 (add-to-list 'auto-mode-alist '("\\.gemspec$" . ruby-mode))
 
 (add-to-list 'auto-mode-alist '("\\.ru$" . ruby-mode))
 
 (add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
 
-(add-to-list 'auto-mode-alist '("Thorfile$" . ruby-mode))
-
 (add-to-list 'auto-mode-alist '("Gemfile$" . ruby-mode))
 
 (add-to-list 'auto-mode-alist '("Capfile$" . ruby-mode))
@@ -31,8 +27,6 @@
 
 (add-to-list 'completion-ignored-extensions ".rbc")
 
-(add-to-list 'completion-ignored-extensions ".rbo")
-
 (defun pcomplete/rake nil "\
 Completion rules for the `ssh' command." (pcomplete-here (pcmpl-rake-tasks)))
 
@@ -46,12 +40,16 @@ exec-to-string command, but it works and seems fast" (delq nil (mapcar (quote (l
 
 (eval-after-load 'ruby-compilation '(progn (defadvice ruby-do-run-w/compilation (before kill-buffer (name cmdlist)) (let ((comp-buffer-name (format "*%s*" name))) (when (get-buffer comp-buffer-name) (with-current-buffer comp-buffer-name (delete-region (point-min) (point-max)))))) (ad-activate 'ruby-do-run-w/compilation)))
 
+(add-hook 'ruby-mode-hook 'esk-run-coding-hook)
+
+(add-hook 'ruby-mode-hook 'esk-paredit-nonlisp)
+
 (setq rinari-major-modes (list 'mumamo-after-change-major-mode-hook 'dired-mode-hook 'ruby-mode-hook 'css-mode-hook 'yaml-mode-hook 'javascript-mode-hook))
 
 ;;;***
 
-;;;### (autoloads nil nil ("starter-kit-ruby-pkg.el") (21031 23291
-;;;;;;  328751 0))
+;;;### (autoloads nil nil ("starter-kit-ruby-pkg.el") (20184 56042
+;;;;;;  635313))
 
 ;;;***
 
diff --git a/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el
new file mode 100644
index 000000000..8f99a5a5b
--- /dev/null
+++ b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el
@@ -0,0 +1 @@
+(define-package "starter-kit-ruby" "2.0" "Saner defaults and goodies for Ruby" (quote nil))
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby-pkg.elc b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc
similarity index 59%
rename from elpa/inf-ruby-2.3.0/inf-ruby-pkg.elc
rename to elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc
index 210a1cb85..3ee9d9314 100644
Binary files a/elpa/inf-ruby-2.3.0/inf-ruby-pkg.elc and b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc differ
diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el b/elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
similarity index 90%
rename from elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el
rename to elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
index 63c71d4bc..ef5e11aa4 100644
--- a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el
+++ b/elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
@@ -4,9 +4,9 @@
 ;;
 ;; Author: Phil Hagelberg <technomancy@gmail.com>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/StarterKit
-;; Version: 2.0.3
+;; Version: 2.0
 ;; Keywords: convenience
-;; Package-Requires: ((inf-ruby "2.2.3") (starter-kit "2.0.1"))
+
 ;; This file is not part of GNU Emacs.
 
 ;;; Commentary:
@@ -18,8 +18,6 @@
 
 ;; This file contains tweaks specific to Ruby.
 
-;; This file is in need of a maintainer.
-
 ;;; License:
 
 ;; This program is free software; you can redistribute it and/or
@@ -46,7 +44,7 @@
        ;; work around possible elpa bug
        (ignore-errors (require 'ruby-compilation))
        (setq ruby-use-encoding-map nil)
-       (add-hook 'ruby-mode-hook 'inf-ruby-keys)
+       ;; (add-hook 'ruby-mode-hook 'inf-ruby-keys)
        (define-key ruby-mode-map (kbd "RET") 'reindent-then-newline-and-indent)
        (define-key ruby-mode-map (kbd "C-M-h") 'backward-kill-word)))
 
@@ -54,18 +52,15 @@
 
   ;; Rake files are ruby, too, as are gemspecs, rackup files, etc.
   (add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
-  (add-to-list 'auto-mode-alist '("\\.thor$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("\\.gemspec$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("\\.ru$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
-  (add-to-list 'auto-mode-alist '("Thorfile$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Gemfile$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Capfile$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Vagrantfile$" . ruby-mode))
 
-  ;; We never want to edit Rubinius bytecode or MacRuby binaries
+  ;; We never want to edit Rubinius bytecode
   (add-to-list 'completion-ignored-extensions ".rbc")
-  (add-to-list 'completion-ignored-extensions ".rbo")
 
 ;;; Rake
 
@@ -97,6 +92,9 @@ exec-to-string command, but it works and seems fast"
                (delete-region (point-min) (point-max))))))
        (ad-activate 'ruby-do-run-w/compilation)))
 
+  (add-hook 'ruby-mode-hook 'esk-run-coding-hook)
+  (add-hook 'ruby-mode-hook 'esk-paredit-nonlisp)
+
   ;; Rinari (Minor Mode for Ruby On Rails)
   (setq rinari-major-modes
         (list 'mumamo-after-change-major-mode-hook 'dired-mode-hook 'ruby-mode-hook
diff --git a/init.el b/init.el
index 36e0b335a..87937bb72 100644
--- a/init.el
+++ b/init.el
@@ -8,19 +8,4 @@
 (when (not package-archive-contents)
   (package-refresh-contents))
 
-;; Add in your own as you wish:
-(defvar my-packages '(starter-kit
-                      starter-kit-lisp
-                      starter-kit-bindings
-                      starter-kit-ruby
-                      clojure-mode
-                      clojure-test-mode
-                      nrepl
-                      )
-  "A list of packages to ensure are installed at launch.")
-
-(dolist (p my-packages)
-  (when (not (package-installed-p p))
-    (package-install p)))
-
 (load "~/.emacs.d/user.el")
diff --git a/nrepl-history b/nrepl-history
deleted file mode 100644
index c661085f2..000000000
--- a/nrepl-history
+++ /dev/null
@@ -1,5 +0,0 @@
-;; -*- coding: utf-8-unix -*-
-;; Automatically written history of nREPL session
-;; Edit at your own risk
-
-nil
\ No newline at end of file
diff --git a/user.el b/user.el
index e3748154d..3e7cd97c8 100644
--- a/user.el
+++ b/user.el
@@ -40,20 +40,7 @@
 ;; Flyspell often slows down editing so it's turned off
 (remove-hook 'text-mode-hook 'turn-on-flyspell)
 
-;; Clojure
-(add-to-list 'auto-mode-alist '("\\.edn$" . clojure-mode))
-(setq nrepl-history-file "~/.emacs.d/nrepl-history")
-(setq nrepl-popup-stacktraces t)
-(setq nrepl-popup-stacktraces-in-repl t)
-(add-hook 'nrepl-connected-hook
-          (defun pnh-clojure-mode-eldoc-hook ()
-            (add-hook 'clojure-mode-hook 'turn-on-eldoc-mode)
-            (add-hook 'nrepl-interaction-mode-hook 'nrepl-turn-on-eldoc-mode)
-            (nrepl-enable-on-existing-clojure-buffers)))
-(add-hook 'nrepl-mode-hook 'subword-mode)
-(eval-after-load "auto-complete"
-  '(add-to-list 'ac-modes 'nrepl-mode))
-(add-hook 'nrepl-mode-hook 'ac-nrepl-setup)
+(load "~/.emacs.d/vendor/clojure")
 
 ;; hippie expand - don't try to complete with file names
 (setq hippie-expand-try-functions-list (delete 'try-complete-file-name hippie-expand-try-functions-list))
diff --git a/vendor/clojure.el b/vendor/clojure.el
new file mode 100644
index 000000000..d9cfbd3cd
--- /dev/null
+++ b/vendor/clojure.el
@@ -0,0 +1,15 @@
+;; clojure
+(add-to-list 'auto-mode-alist '("\\.edn$" . clojure-mode))
+
+;; cider
+(add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)
+(setq cider-repl-pop-to-buffer-on-connect t)
+(setq cider-popup-stacktraces t)
+(setq cider-repl-popup-stacktraces t)
+(setq cider-auto-select-error-buffer t)
+(setq cider-repl-history-file "~/.emacs.d/cider-history")
+(setq cider-repl-wrap-history t)
+
+(add-hook 'cider-repl-mode-hook 'subword-mode)
+(add-hook 'cider-repl-mode-hook 'paredit-mode)
+(add-hook 'cider-repl-mode-hook 'rainbow-delimiters-mode)