From 6274a6366e482988cb0bfd1f1dcd5d8a28befb83 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Tue, 14 Jan 2014 18:22:02 +0100
Subject: [PATCH] added package.el, added magit

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---
 custom.el                                     |    2 +
 elpa/archives/gnu/archive-contents            |  337 +
 elpa/archives/marmalade/archive-contents      |    1 +
 elpa/magit-1.2.0/dir                          |   18 +
 elpa/magit-1.2.0/magit-autoloads.el           |  158 +
 elpa/magit-1.2.0/magit-bisect.el              |  195 +
 elpa/magit-1.2.0/magit-bisect.elc             |  Bin 0 -> 7655 bytes
 elpa/magit-1.2.0/magit-blame.el               |  303 +
 elpa/magit-1.2.0/magit-blame.elc              |  Bin 0 -> 9008 bytes
 elpa/magit-1.2.0/magit-key-mode.el            |  521 ++
 elpa/magit-1.2.0/magit-key-mode.elc           |  Bin 0 -> 16936 bytes
 elpa/magit-1.2.0/magit-pkg.el                 |    1 +
 elpa/magit-1.2.0/magit-pkg.elc                |  Bin 0 -> 655 bytes
 elpa/magit-1.2.0/magit-stgit.el               |  288 +
 elpa/magit-1.2.0/magit-stgit.elc              |  Bin 0 -> 11966 bytes
 elpa/magit-1.2.0/magit-svn.el                 |  240 +
 elpa/magit-1.2.0/magit-svn.elc                |  Bin 0 -> 10088 bytes
 elpa/magit-1.2.0/magit-topgit.el              |  191 +
 elpa/magit-1.2.0/magit-topgit.elc             |  Bin 0 -> 8367 bytes
 elpa/magit-1.2.0/magit-wip.el                 |  153 +
 elpa/magit-1.2.0/magit-wip.elc                |  Bin 0 -> 9450 bytes
 elpa/magit-1.2.0/magit.el                     | 6001 +++++++++++++++++
 elpa/magit-1.2.0/magit.el-e                   | 6001 +++++++++++++++++
 elpa/magit-1.2.0/magit.elc                    |  Bin 0 -> 269536 bytes
 elpa/magit-1.2.0/magit.info                   | 1359 ++++
 elpa/magit-1.2.0/rebase-mode.el               |  322 +
 elpa/magit-1.2.0/rebase-mode.elc              |  Bin 0 -> 10551 bytes
 elpa/package.el                               | 1760 +++++
 .../tabulated-list-autoloads.el               |   61 +
 elpa/tabulated-list-0/tabulated-list-pkg.el   |    1 +
 elpa/tabulated-list-0/tabulated-list-pkg.elc  |  Bin 0 -> 703 bytes
 elpa/tabulated-list-0/tabulated-list.el       |  372 +
 elpa/tabulated-list-0/tabulated-list.elc      |  Bin 0 -> 13334 bytes
 elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el   |   34 +
 elpa/yaml-mode-0.0.9/yaml-mode-pkg.el         |    1 +
 elpa/yaml-mode-0.0.9/yaml-mode-pkg.elc        |  Bin 0 -> 685 bytes
 elpa/yaml-mode-0.0.9/yaml-mode.el             |  415 ++
 elpa/yaml-mode-0.0.9/yaml-mode.elc            |  Bin 0 -> 13062 bytes
 init.el                                       |   14 +-
 39 files changed, 18745 insertions(+), 4 deletions(-)
 create mode 100644 elpa/archives/gnu/archive-contents
 create mode 100644 elpa/archives/marmalade/archive-contents
 create mode 100644 elpa/magit-1.2.0/dir
 create mode 100644 elpa/magit-1.2.0/magit-autoloads.el
 create mode 100644 elpa/magit-1.2.0/magit-bisect.el
 create mode 100644 elpa/magit-1.2.0/magit-bisect.elc
 create mode 100644 elpa/magit-1.2.0/magit-blame.el
 create mode 100644 elpa/magit-1.2.0/magit-blame.elc
 create mode 100644 elpa/magit-1.2.0/magit-key-mode.el
 create mode 100644 elpa/magit-1.2.0/magit-key-mode.elc
 create mode 100644 elpa/magit-1.2.0/magit-pkg.el
 create mode 100644 elpa/magit-1.2.0/magit-pkg.elc
 create mode 100644 elpa/magit-1.2.0/magit-stgit.el
 create mode 100644 elpa/magit-1.2.0/magit-stgit.elc
 create mode 100644 elpa/magit-1.2.0/magit-svn.el
 create mode 100644 elpa/magit-1.2.0/magit-svn.elc
 create mode 100644 elpa/magit-1.2.0/magit-topgit.el
 create mode 100644 elpa/magit-1.2.0/magit-topgit.elc
 create mode 100644 elpa/magit-1.2.0/magit-wip.el
 create mode 100644 elpa/magit-1.2.0/magit-wip.elc
 create mode 100644 elpa/magit-1.2.0/magit.el
 create mode 100644 elpa/magit-1.2.0/magit.el-e
 create mode 100644 elpa/magit-1.2.0/magit.elc
 create mode 100644 elpa/magit-1.2.0/magit.info
 create mode 100644 elpa/magit-1.2.0/rebase-mode.el
 create mode 100644 elpa/magit-1.2.0/rebase-mode.elc
 create mode 100644 elpa/package.el
 create mode 100644 elpa/tabulated-list-0/tabulated-list-autoloads.el
 create mode 100644 elpa/tabulated-list-0/tabulated-list-pkg.el
 create mode 100644 elpa/tabulated-list-0/tabulated-list-pkg.elc
 create mode 100644 elpa/tabulated-list-0/tabulated-list.el
 create mode 100644 elpa/tabulated-list-0/tabulated-list.elc
 create mode 100644 elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el
 create mode 100644 elpa/yaml-mode-0.0.9/yaml-mode-pkg.el
 create mode 100644 elpa/yaml-mode-0.0.9/yaml-mode-pkg.elc
 create mode 100644 elpa/yaml-mode-0.0.9/yaml-mode.el
 create mode 100644 elpa/yaml-mode-0.0.9/yaml-mode.elc

diff --git a/custom.el b/custom.el
index 7a430b37..ee60ae32 100644
--- a/custom.el
+++ b/custom.el
@@ -6,6 +6,8 @@
  '(gnuserv-program (concat exec-directory "/gnuserv"))
  '(history-length 1000)
  '(org-agenda-files (quote ("~/org/emacs.org" "~/org/work.org" "~/org/private.org" "~/org/it.org")))
+ '(package-archives (quote (("gnu" . "http://elpa.gnu.org/packages/") ("marmalade" . "http://marmalade-repo.org/packages/") ("melpa" . "http://melpa.milkbox.net/packages"))))
+ '(package-user-dir "/home/baron/.xemacs/elpa")
  '(recentf-max-saved-items 42)
  '(savehist-mode t nil (savehist))
  '(toolbar-visible-p nil)
diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents
new file mode 100644
index 00000000..e20ff3af
--- /dev/null
+++ b/elpa/archives/gnu/archive-contents
@@ -0,0 +1,337 @@
+(1
+ (ack .
+      [(1 3)
+       nil "Interface to ack-like source code search tools" tar
+       ((: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")
+		  (:keywords))])
+ (adjust-parens .
+		[(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")
+	(:keywords "matching"))])
+ (auctex .
+	 [(11 87 2)
+	  nil "Integrated environment for *TeX*" tar
+	  ((:url . "http://www.gnu.org/software/auctex/"))])
+ (cl-lib .
+	 [(0 3)
+	  nil "Properly prefixed CL functions and macros" single
+	  ((: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")
+		(:keywords "CoffeeScript major mode"))])
+ (company .
+	  [(0 6 12)
+	   nil "Modular in-buffer completion framework" tar
+	   ((: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/")
+	     (:keywords "convenience"))])
+ (debbugs .
+	  [(0 5)
+	   nil "SOAP library to access debbugs servers" tar
+	   ((:keywords "comm" "hypermedia")
+	    (:url . "http://elpa.gnu.org/packages/debbugs.html"))])
+ (dict-tree .
+	    [(0 12 8)
+	     ((trie
+	       (0 2 5))
+	      (tNFA
+	       (0 1 1))
+	      (heap
+	       (0 3)))
+	     "Dictionary data structure" single
+	     ((: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
+	   ((:keywords "vc" "diff")
+	    (:url . "https://github.com/dgutov/diff-hl"))])
+ (dismal .
+	 [(1 5)
+	  ((cl-lib
+	    (0)))
+	  "Dis Mode Ain't Lotus: Spreadsheet program Emacs" tar
+	  ((:url . "http://elpa.gnu.org/packages/dismal.html"))])
+ (djvu .
+       [(0 5)
+	nil "Edit and view Djvu files via djvused" single
+	((: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")
+	    (:keywords "docs" "help"))])
+ (ediprolog .
+	    [(1 0)
+	     nil "Emacs Does Interactive Prolog" single
+	     ((: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")
+	       (:keywords))])
+ (enwc .
+       [(1 0)
+	nil "The Emacs Network Client" tar
+	((: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")
+	       (:keywords "data" "timestamp" "epoch" "unix"))])
+ (f90-interface-browser .
+			[(1 1)
+			 nil "Parse and browse f90 interfaces" single
+			 ((: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 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")
+	 (:keywords "extensions" "data structures" "heap" "priority queue"))])
+ (ioccur .
+	 [(2 4)
+	  nil "Incremental occur" single
+	  ((: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")
+		(:keywords "tex" "wp"))])
+ (js2-mode .
+	   [(20140114)
+	    ((emacs
+	      (24 1)))
+	    "Improved JavaScript editing mode" tar
+	    ((: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")
+	  (:keywords))])
+ (lex .
+      [(1 1)
+       nil "Lexical analyser construction" tar
+       ((:url . "http://elpa.gnu.org/packages/lex.html"))])
+ (lmc .
+      [(1 2)
+       nil "Little Man Computer in Elisp" single
+       ((: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")
+	     (:keywords "lisp" "files" "convenience"))])
+ (markchars .
+	    [(0 2 0)
+	     nil "Mark chars fitting certain characteristics" single
+	     ((: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")
+		 (:keywords "maint"))])
+ (minimap .
+	  [(1 0)
+	   nil "Sidebar showing a \"mini-map\" of a buffer" single
+	   ((:url . "http://elpa.gnu.org/packages/minimap.html")
+	    (:keywords))])
+ (muse .
+       [(3 20)
+	nil "Authoring and publishing tool for Emacs" tar
+	((: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")
+	       (:keywords "data"))])
+ (nlinum .
+	 [(1 2)
+	  nil "Show line numbers in the margin" single
+	  ((:url . "http://elpa.gnu.org/packages/nlinum.html")
+	   (:keywords "convenience"))])
+ (notes-mode .
+	     [(1 30)
+	      nil "Indexing system for on-line note-taking" tar
+	      ((:url . "http://elpa.gnu.org/packages/notes-mode.html"))])
+ (num3-mode .
+	    [(1 1)
+	     nil "highlight groups of digits in long numbers" single
+	     ((: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")
+	   (:keywords "comm"))])
+ (omn-mode .
+	   [(1 0)
+	    nil "Support for OWL Manchester Notation" single
+	    ((:url . "http://elpa.gnu.org/packages/omn-mode.html")
+	     (:keywords))])
+ (org .
+      [(20140113)
+       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")
+		  (:keywords "convenience wp"))])
+ (queue .
+	[(0 1)
+	 nil "Queue data structure" single
+	 ((: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")
+		 (:keywords "faces"))])
+ (register-list .
+		[(0 1)
+		 nil "Interactively list/edit registers" single
+		 ((: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
+	     ((: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")
+	      (: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")
+		   (:keywords))])
+ (sml-mode .
+	   [(6 4)
+	    nil "Major mode for editing (Standard) ML" single
+	    ((: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")
+	      (: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")
+	 (: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")
+		       (:keywords "convenience"))])
+ (trie .
+       [(0 2 6)
+	((tNFA
+	  (0 1 1))
+	 (heap
+	  (0 3)))
+	"Trie data structure" single
+	((:url . "http://www.dr-qubit.org/emacs.php")
+	 (:keywords "extensions" "matching" "data structures"))])
+ (undo-tree .
+	    [(0 6 5)
+	     nil "Treat undo history as a tree" single
+	     ((: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 .
+      [(1 2)
+       nil "View Large Files" single
+       ((:url . "https://github.com/m00natic/vlfi")
+	(:keywords "large files" "utilities"))])
+ (w3 .
+     [(4 0 49)
+      nil "Fully customizable, largely undocumented web browser for Emacs" tar
+      ((: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
+	     ((: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")
+	       (: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"))])
+ (wpuzzle .
+	  [(1 0)
+	   nil "find as many word in a given time" single
+	   ((:url . "http://elpa.gnu.org/packages/wpuzzle.html")
+	    (:keywords))])
+ (xclip .
+	[(1 3)
+	 nil "use xclip to copy&paste" single
+	 ((:url . "http://elpa.gnu.org/packages/xclip.html")
+	  (:keywords "convenience" "tools"))])
+ (yasnippet .
+	    [(0 8 0)
+	     nil "Yet another snippet extension for Emacs." tar
+	     ((:keywords "convenience" "emulation")
+	      (:url . "http://github.com/capitaomorte/yasnippet"))]))
diff --git a/elpa/archives/marmalade/archive-contents b/elpa/archives/marmalade/archive-contents
new file mode 100644
index 00000000..797ab417
--- /dev/null
+++ b/elpa/archives/marmalade/archive-contents
@@ -0,0 +1 @@
+(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])(guru-mode .[(0 2)()"Become an Emacs guru   -*- lexical-binding:t -*-"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])(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])(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 8)((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])(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])(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])(wisp-mode .[(0 1 5)()"Tools for wisp: the Whitespace-to-Lisp preprocessor"single])(cmake-mode .[(20110824)()"Major mode for editing CMake sources."single])(initchart .[(0 1 1)((cl-lib (0 3)))"Emacs' init process performance visualization  -*- lexical-binding: t -*-"single])(immutant-server .[(1 0 1)()"Run your Immutant server in Emacs"single])(dummy-package .[(0 0 3)((timeclock (2 6 1)))"a fake package for the marmalade test suite"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])(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 4 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])(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])(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])(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 19)()"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 2)()"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 6)((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 16)((s (1 9 0)) (dash (2 4 0)) (f (0 11 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 1)()"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 3 0)((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 6 0)((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])(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 8)((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 .[(8 0 0)()"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])(heroku-theme .[(1 1 0)()"Heroku color theme"single])(god-mode .[(2 12 0)()"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])(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])(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])(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)((cider (0 5 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])(multi-project .[(0 0 15)()"Easily work with multiple projects."single])(wisp .[(0 1 3)()"Supporting tools for editing wisp: The Whitespace-to-Lisp preprocesor"single])(project-explorer .[(0 11 2)((cl-lib (0 3)) (es-lib (0 3)))"A project explorer sidebar -*- lexical-binding: t -*-"single])(insert-shebang .[(0 9 3)()"Insert shebang line automatically."single])(steady-theme .[(0 1 0)()"A steady theme for Emacs  -*- lexical-binding: t -*-"single])(smex .[(3 0)()"M-x interface with Ido-style fuzzy matching."single])(paste-kde .[(0 6)((web (0 3 6)))"paste text to KDE's pastebin service"single])(less-css-mode .[(0 18)()"Major mode for editing LESS CSS files (lesscss.org)"single])(downplay-mode .[(0 1)()"focus attention on a region of the buffer"single])(nose-mode .[(0 1)((nose (0 1 1)))"Minor mode for running nose tests."tar])(refheap .[(0 0 6)((json (1 2)))"A library for pasting to https://refheap.com"single])(jam-mode .[(0 3)()"Font-lock support for Jam files"single])(fakir .[(0 1 8)((noflet (0 0 8)) (dash (1 3 2)) (kv (0 0 19)))"fakeing bits of Emacs -*- lexical-binding: t -*-"single])(flycheck-haskell .[(0 1)((flycheck (0 16)) (haskell-mode (13 7)) (dash (2 4 0)) (f (0 11 0)))"Flycheck: Haskell configuration"tar]))
\ No newline at end of file
diff --git a/elpa/magit-1.2.0/dir b/elpa/magit-1.2.0/dir
new file mode 100644
index 00000000..2e646dbd
--- /dev/null
+++ b/elpa/magit-1.2.0/dir
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 00000000..98afb1c2
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-autoloads.el
@@ -0,0 +1,158 @@
+;;; magit-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (magit-status) "magit" "magit.el" (21205 9255))
+;;; 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"
+;;;;;;  (21205 9255))
+;;; 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" (21205 9255))
+;;; 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" (21205 9255))
+;;; 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" (21205 9255))
+;;; 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" (21205 9255))
+;;; 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 every possible buffer.
+With prefix ARG, turn Global-Magit-Wip-Save mode on if and only if ARG is positive.
+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" (21205
+;;;;;;  9256))
+;;; 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") (21205 9256 127962))
+
+;;;***
+
+(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
new file mode 100644
index 00000000..cdb6455e
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-bisect.el
@@ -0,0 +1,195 @@
+(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
new file mode 100644
index 0000000000000000000000000000000000000000..e69463d1f02f9082123c05acbc5eac116bec907c
GIT binary patch
literal 7655
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
XC7nA0bh8W^Y<CjjPi{-Ks9F0j7X4cm

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit-blame.el b/elpa/magit-1.2.0/magit-blame.el
new file mode 100644
index 00000000..8518dcb4
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-blame.el
@@ -0,0 +1,303 @@
+;;; 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
new file mode 100644
index 0000000000000000000000000000000000000000..cb367b45f1f54be767c2374d147d973ca31356d8
GIT binary patch
literal 9008
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

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit-key-mode.el b/elpa/magit-1.2.0/magit-key-mode.el
new file mode 100644
index 00000000..2fcf2964
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-key-mode.el
@@ -0,0 +1,521 @@
+(require 'magit)
+
+(eval-when-compile (require 'cl))
+
+(defvar magit-key-mode-key-maps '()
+  "This will be filled lazily with proper `define-key' built
+  keymaps as they're requested.")
+
+(defvar magit-key-mode-buf-name "*magit-key*"
+  "Name of the buffer.")
+
+(defvar magit-key-mode-current-args '()
+  "Will contain the arguments to be passed to git.")
+
+(defvar magit-key-mode-current-options '()
+  "Will contain the arguments to be passed to git.")
+
+(defvar magit-log-mode-window-conf nil
+  "Will hold the pre-menu configuration of magit.")
+
+(defvar magit-key-mode-groups
+  '((logging
+     (man-page "git-log")
+     (actions
+      ("l" "Short" magit-log)
+      ("L" "Long" magit-log-long)
+      ("h" "Reflog" magit-reflog)
+      ("rl" "Ranged short" magit-log-ranged)
+      ("rL" "Ranged long" magit-log-long-ranged)
+      ("rh" "Ranged reflog" magit-reflog-ranged))
+     (switches
+      ("-m" "Only merge commits" "--merges")
+      ("-f" "First parent" "--first-parent")
+      ("-i" "Case insensitive patterns" "-i")
+      ("-pr" "Pickaxe regex" "--pickaxe-regex")
+      ("-n" "Name only" "--name-only")
+      ("-am" "All match" "--all-match")
+      ("-al" "All" "--all"))
+     (arguments
+      ("=r" "Relative" "--relative=" read-directory-name)
+      ("=c" "Committer" "--committer=" read-from-minibuffer)
+      ("=>" "Since" "--since=" read-from-minibuffer)
+      ("=<" "Before" "--before=" read-from-minibuffer)
+      ("=s" "Pickaxe search" "-S" read-from-minibuffer)
+      ("=a" "Author" "--author=" read-from-minibuffer)
+      ("=g" "Grep" "--grep=" read-from-minibuffer)))
+
+    (running
+     (actions
+      ("!" "Command from root" magit-shell-command)
+      (":" "Git command" magit-git-command)
+      ("g" "git gui" magit-run-git-gui)
+      ("k" "gitk" magit-run-gitk)))
+
+    (fetching
+     (man-page "git-fetch")
+     (actions
+      ("f" "Current" magit-fetch-current)
+      ("a" "All" magit-remote-update)
+      ("o" "Other" magit-fetch))
+     (switches
+      ("-p" "Prune" "--prune")))
+
+    (pushing
+     (man-page "git-push")
+     (actions
+      ("P" "Push" magit-push)
+      ("t" "Push tags" magit-push-tags))
+     (switches
+      ("-f" "Force" "--force")
+      ("-d" "Dry run" "-n")
+      ("-u" "Set upstream" "-u")))
+
+    (pulling
+     (man-page "git-pull")
+     (actions
+      ("F" "Pull" magit-pull))
+     (switches
+      ("-r" "Rebase" "--rebase")))
+
+    (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)
+      ("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
+      ("t" "Lightweight" magit-tag)
+      ("a" "Annotated" magit-annotated-tag))
+     (switches
+      ("-f" "Force" "-f")))
+
+    (stashing
+     (man-page "git-stash")
+     (actions
+      ("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")))
+
+    (merging
+     (man-page "git-merge")
+     (actions
+      ("m" "Merge" magit-manual-merge))
+     (switches
+      ("-ff" "Fast-forward only" "--ff-only")
+      ("-nf" "No fast-forward" "--no-ff")
+      ("-sq" "Squash" "--squash"))
+     (arguments
+      ("-st" "Strategy" "--strategy=" read-from-minibuffer)))
+
+    (rewriting
+     (actions
+      ("b" "Begin" magit-rewrite-start)
+      ("s" "Stop" magit-rewrite-stop)
+      ("a" "Abort" magit-rewrite-abort)
+      ("f" "Finish" magit-rewrite-finish)
+      ("*" "Set unused" magit-rewrite-set-unused)
+      ("." "Set used" magit-rewrite-set-used)))
+
+    (submodule
+     (man-page "git-submodule")
+     (actions
+      ("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))))
+  "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.")
+
+(defun magit-key-mode-delete-group (group)
+  "Delete a group from `magit-key-mode-key-maps'."
+  (let ((items (assoc group magit-key-mode-groups)))
+    (when items
+      ;; reset the cache
+      (setq magit-key-mode-key-maps nil)
+      ;; delete the whole group
+      (setq magit-key-mode-groups
+            (delq items magit-key-mode-groups))
+      ;; unbind the defun
+      (magit-key-mode-de-generate group))
+    magit-key-mode-groups))
+
+(defun magit-key-mode-add-group (group)
+  "Add a new group to `magit-key-mode-key-maps'. If there's
+already a group of that name then this will completely remove it
+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)))
+
+(defun magit-key-mode-key-defined-p (for-group key)
+  "If KEY is defined as any of switch, argument or action within
+FOR-GROUP then return t"
+  (catch 'result
+    (let ((options (magit-key-mode-options-for-group for-group)))
+      (dolist (type '(actions switches arguments))
+        (when (assoc key (assoc type options))
+          (throw 'result t))))))
+
+(defun magit-key-mode-update-group (for-group thing &rest args)
+  "Abstraction for setting values in `magit-key-mode-key-maps'."
+  (let* ((options (magit-key-mode-options-for-group for-group))
+         (things (assoc thing options))
+         (key (car args)))
+    (if (cdr things)
+        (if (magit-key-mode-key-defined-p for-group key)
+            (error "%s is already defined in the %s group." key for-group)
+          (setcdr (cdr things) (cons args (cddr things))))
+      (setcdr things (list args)))
+    (setq magit-key-mode-key-maps nil)
+    things))
+
+(defun magit-key-mode-insert-argument (for-group key desc arg read-func)
+  "Add a new binding (KEY) in FOR-GROUP which will use READ-FUNC
+to receive input to apply to argument ARG git is run. DESC should
+be a brief description of the binding."
+  (magit-key-mode-update-group for-group 'arguments key desc arg read-func))
+
+(defun magit-key-mode-insert-switch (for-group key desc switch)
+  "Add a new binding (KEY) in FOR-GROUP which will add SWITCH to git's
+command line when it runs. DESC should be a brief description of
+the binding."
+  (magit-key-mode-update-group for-group 'switches key desc switch))
+
+(defun magit-key-mode-insert-action (for-group key desc func)
+  "Add a new binding (KEY) in FOR-GROUP which will run command
+FUNC. DESC should be a brief description of the binding."
+  (magit-key-mode-update-group for-group 'actions key desc func))
+
+(defun magit-key-mode-options-for-group (for-group)
+  "Retrieve the options (switches, commands and arguments) for
+the group FOR-GROUP."
+  (or (cdr (assoc for-group magit-key-mode-groups))
+      (error "Unknown group '%s'" for-group)))
+
+(defun magit-key-mode-help (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)
+                         ""))))
+         (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)))))
+
+(defun magit-key-mode-exec-at-point ()
+  "Run action/args/option at point."
+  (interactive)
+  (let* ((key (or (get-text-property (point) 'key-group-executor)
+                  (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
+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))))
+      (when actions
+        (dolist (k actions)
+          (defkey k `(magit-key-mode-command ',(nth 2 k)))))
+      (when switches
+        (dolist (k switches)
+          (defkey k `(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.")
+
+(defun magit-key-mode-command (func)
+  (let ((args '()))
+    ;; why can't maphash return a list?!
+    (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)))
+      (set-window-configuration magit-log-mode-window-conf)
+      (when func
+        (call-interactively func))
+      (magit-key-mode-kill-buffer))))
+
+(defvar magit-key-mode-current-args nil
+  "A hash-table of current argument set (which will eventually
+  make it to the git command-line).")
+
+(defun magit-key-mode-add-argument (for-group arg-name input-func)
+  (let ((input (funcall input-func (concat arg-name ": "))))
+    (puthash arg-name input magit-key-mode-current-args)
+   (magit-key-mode-redraw for-group)))
+
+(defvar magit-key-mode-current-options '()
+  "Current option set (which will eventually make it to the git
+  command-line).")
+
+(defun magit-key-mode-add-option (for-group option-name)
+  "Toggles the appearance of OPTION-NAME in
+`magit-key-mode-current-options'."
+  (if (not (member option-name magit-key-mode-current-options))
+      (add-to-list 'magit-key-mode-current-options option-name)
+    (setq magit-key-mode-current-options
+          (delete option-name magit-key-mode-current-options)))
+  (magit-key-mode-redraw for-group))
+
+(defun magit-key-mode-kill-buffer ()
+  (interactive)
+  (kill-buffer magit-key-mode-buf-name))
+
+(defvar magit-log-mode-window-conf nil
+  "Pre-popup window configuration.")
+
+(defun magit-key-mode (for-group &optional original-opts)
+  "Mode for magit key selection. All commands, switches and
+options can be toggled/actioned with the key combination
+highlighted before the description."
+  (interactive)
+  ;; save the window config to restore it as was (no need to make this
+  ;; buffer local)
+  (setq magit-log-mode-window-conf
+        (current-window-configuration))
+  ;; setup the mode, draw the buffer
+  (let ((buf (get-buffer-create magit-key-mode-buf-name)))
+    (delete-other-windows)
+    (split-window-vertically)
+    (other-window 1)
+    (switch-to-buffer buf)
+    (kill-all-local-variables)
+    (set (make-local-variable
+          'magit-key-mode-current-options)
+         original-opts)
+    (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
+    "Type a prefix key to toggle it. Run 'actions' with their prefixes. "
+    "'?' for more help.")))
+
+(defun magit-key-mode-get-key-map (for-group)
+  "Get or build the keymap for FOR-GROUP."
+  (or (cdr (assoc for-group magit-key-mode-key-maps))
+      (magit-key-mode-build-keymap for-group)))
+
+(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))
+    (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))
+    (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)))
+  (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"))
+
+(defvar magit-key-mode-args-in-cols nil
+  "When true, draw arguments in columns as with switches and
+  options.")
+
+(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)))
+
+(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))))))
+
+(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)
+  "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."
+  (let ((longest-act (apply 'max (mapcar 'length strings))))
+    (while strings
+      (let ((str (car strings)))
+        (let ((padding (make-string (- (+ longest-act 3) (length str)) ? )))
+          (insert str)
+          (if (or one-col-each
+                  (and (> (+ (length padding) ;
+                             (current-column)
+                             longest-act)
+                          (window-width))
+                       (cdr strings)))
+              (insert "\n")
+            (insert padding))))
+      (setq strings (cdr strings))))
+  (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."
+  (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))
+    (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))
+
+(defun magit-key-mode-de-generate (group)
+  "Unbind the function for GROUP."
+  (fmakunbound
+   (intern (concat "magit-key-mode-popup-" (symbol-name group)))))
+
+(defun magit-key-mode-generate (group)
+  "Generate the key-group menu for GROUP"
+  (let ((opts (magit-key-mode-options-for-group group)))
+    (eval
+     `(defun ,(intern (concat "magit-key-mode-popup-" (symbol-name group))) nil
+        ,(concat "Key menu for " (symbol-name group))
+        (interactive)
+        (magit-key-mode (quote ,group))))))
+
+;; create the interactive functions for the key mode popups (which are
+;; applied in the top-level key maps)
+(mapc (lambda (g)
+        (magit-key-mode-generate (car g)))
+      magit-key-mode-groups)
+
+(provide 'magit-key-mode)
diff --git a/elpa/magit-1.2.0/magit-key-mode.elc b/elpa/magit-1.2.0/magit-key-mode.elc
new file mode 100644
index 0000000000000000000000000000000000000000..9642990123bdd9485ac26270b88303a1cc4c0f13
GIT binary patch
literal 16936
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

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit-pkg.el b/elpa/magit-1.2.0/magit-pkg.el
new file mode 100644
index 00000000..11ad3243
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-pkg.el
@@ -0,0 +1 @@
+(define-package "magit" "1.2.0" "Control Git from Emacs.")
diff --git a/elpa/magit-1.2.0/magit-pkg.elc b/elpa/magit-1.2.0/magit-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..e5c24733cffe49ae37e420e9fa18ed96c2e28202
GIT binary patch
literal 655
zcmbtSL2lbH5cD<tK(7N`A^{a;slM0_kQ7Expy)9VC@rpJA`~f*bkpSZSyO2N_gY>g
zVrFNCySsn<arm@at;Bx6$H7mtv7~W)g&HYX3J;_AdQ=m|bk@d4+4~9J;pt5Ht{mD8
z+HSYm?$#Z;b-T$rLtxUtN@z}gqUNZAca8i_lj>tbc2>=#Mw9ARc5?mkKR=I>Y_2yB
zj~6O_QHX}!x-YVoZN^?qIzd?rKPNMpH<g$WrO4pZ$;8F@94SJ-IyIRd+V?R9<Hq=z
z(GU}q*8I%BKJ8X^TPaF2pj1wyJo>ZKGj4O@`XfdqZcyGaBhY{=1Z7*JwB$w(cZF0{
zh5N6$(uaS=XWyT8yFcon>pQz$PPs&{EyXxri=)WF3pNp%N+GaI@pI|!($QPIs0be0
zGTMO&OLKEA_-a+6z#_Saya)evgb<~s!8odC)j#tZp~!IxPJ0<Qe-GZJ;4QwHguE*`
IkSr?k4(?OOr~m)}

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit-stgit.el b/elpa/magit-1.2.0/magit-stgit.el
new file mode 100644
index 00000000..b105b71f
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-stgit.el
@@ -0,0 +1,288 @@
+;;; 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
new file mode 100644
index 0000000000000000000000000000000000000000..e95ef19511129e98cddbca3d1ad17c4b17fa65b5
GIT binary patch
literal 11966
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
DN&0@X

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit-svn.el b/elpa/magit-1.2.0/magit-svn.el
new file mode 100644
index 00000000..d08c048d
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-svn.el
@@ -0,0 +1,240 @@
+;;; magit-svn.el --- git-svn plug-in for Magit
+
+;; Copyright (C) 2008  Alex Ott
+;; 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
+;; 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 git-svn functionality as a separate component of Magit
+
+;;; Code:
+
+(require 'magit)
+(eval-when-compile
+  (require 'cl))
+
+;; git svn commands
+
+(defun magit-svn-find-rev (rev &optional branch)
+  (interactive
+   (list (read-string "SVN revision: ")
+         (if current-prefix-arg
+             (read-string "In branch: "))))
+  (let* ((sha (apply 'magit-git-string
+                     `("svn"
+                       "find-rev"
+                       ,(concat "r" rev)
+                       ,@(when branch (list branch))))))
+    (if sha
+        (magit-show-commit
+         (magit-with-section sha 'commit
+           (magit-set-section-info sha)
+           sha))
+      (error "Revision %s could not be mapped to a commit" rev))))
+
+(defun magit-svn-create-branch (name)
+  (interactive "sBranch name: ")
+  (magit-run-git "svn" "branch" name))
+
+(defun magit-svn-rebase ()
+  (interactive)
+  (magit-run-git-async "svn" "rebase"))
+
+(defun magit-svn-dcommit ()
+  (interactive)
+  (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))))
+
+(defun magit-svn-get-local-ref (url)
+  (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
+      (let* ((pats (split-string (pop branches) ":"))
+             (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 "$")))))
+        (cond ((string-match pat1 url)
+               (setq result (replace-match dst nil nil url))
+               (setq branches nil))
+              ((string-match pat2 url)
+               (setq result (replace-match dst nil nil url))
+               (setq branches nil)))))
+    result))
+
+(defvar magit-svn-get-ref-info-cache nil
+  "A cache for svn-ref-info.
+As `magit-get-svn-ref-info' might be considered a quite
+expensive operation a cache is taken so that `magit-status'
+doesn't repeatedly call it.")
+
+(defun magit-svn-get-ref-info (&optional use-cache)
+  "Gather details about the current git-svn repository.
+Return nil if there isn't one.  Keys of the alist are ref-path,
+trunk-ref-name and local-ref-name.
+If USE-CACHE is non-nil then return the value of `magit-get-svn-ref-info-cache'."
+  (if (and use-cache magit-svn-get-ref-info-cache)
+      magit-svn-get-ref-info-cache
+    (let* ((fetch (magit-get "svn-remote" "svn" "fetch"))
+           (url)
+           (revision))
+      (when fetch
+        (let* ((ref (cadr (split-string fetch ":")))
+               (ref-path (file-name-directory ref))
+               (trunk-ref-name (file-name-nondirectory ref)))
+          (set (make-local-variable
+                'magit-svn-get-ref-info-cache)
+                (list
+                 (cons 'ref-path ref-path)
+                 (cons 'trunk-ref-name trunk-ref-name)
+                 ;; get the local ref from the log. This is actually
+                 ;; 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")
+                                     ""))
+                         (goto-char (point-min))
+                         (cond ((re-search-forward "git-svn-id: \\(.+/.+?\\)@\\([0-9]+\\)" nil t)
+                                (setq url (match-string 1)
+                                      revision (match-string 2))
+                                (magit-svn-get-local-ref url))
+                               (t
+                                (setq url (magit-get "svn-remote" "svn" "url"))
+                                nil))))
+                 (cons 'revision revision)
+                 (cons 'url url))))))))
+
+(defun magit-svn-get-ref (&optional use-cache)
+  "Get the best guess remote ref for the current git-svn based branch.
+If USE-CACHE is non nil, use the cached information."
+  (let ((info (magit-svn-get-ref-info use-cache)))
+    (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)))))))
+
+(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)))))))
+
+(magit-define-section-jumper svn-unpushed  "Unpushed commits (SVN)")
+
+(defun magit-svn-remote-string ()
+  (let ((svn-info (magit-svn-get-ref-info)))
+    (when svn-info
+      (concat (cdr (assoc 'url svn-info))
+              " @ "
+              (cdr (assoc 'revision svn-info))))))
+
+(defun magit-svn-remote-update ()
+  (interactive)
+  (when (magit-svn-enabled)
+    (magit-run-git-async "svn" "fetch")))
+
+(easy-menu-define magit-svn-extension-menu
+  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)]
+    ["Commit" magit-svn-dcommit (magit-svn-enabled)]))
+
+(easy-menu-add-item 'magit-mode-menu
+                    '("Extensions")
+                    magit-svn-extension-menu)
+
+;; add the group and its keys
+(progn
+  ;; (re-)create the group
+  (magit-key-mode-add-group 'svn)
+
+  (magit-key-mode-insert-action 'svn "r" "Rebase" 'magit-svn-rebase)
+  (magit-key-mode-insert-action 'svn "c" "DCommit" 'magit-svn-dcommit)
+  (magit-key-mode-insert-action 'svn "f" "Fetch" 'magit-svn-remote-update)
+  (magit-key-mode-insert-action 'svn "s" "Find rev" 'magit-svn-find-rev)
+  (magit-key-mode-insert-action 'svn "B" "Create branch" 'magit-svn-create-branch)
+
+  ;; 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))
+
+(provide 'magit-svn)
+;;; magit-svn.el ends here
diff --git a/elpa/magit-1.2.0/magit-svn.elc b/elpa/magit-1.2.0/magit-svn.elc
new file mode 100644
index 0000000000000000000000000000000000000000..38e9c81006c8379e4a3474e10fcd90fa564cf952
GIT binary patch
literal 10088
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

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit-topgit.el b/elpa/magit-1.2.0/magit-topgit.el
new file mode 100644
index 00000000..6f0080cc
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-topgit.el
@@ -0,0 +1,191 @@
+;;; 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
new file mode 100644
index 0000000000000000000000000000000000000000..b95cc5e6fa86cf0b520a7fabb4bf5df50bd85c04
GIT binary patch
literal 8367
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
MmLkb_a%zA3zb4o?(EtDd

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit-wip.el b/elpa/magit-1.2.0/magit-wip.el
new file mode 100644
index 00000000..5c198404
--- /dev/null
+++ b/elpa/magit-1.2.0/magit-wip.el
@@ -0,0 +1,153 @@
+;;; 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
new file mode 100644
index 0000000000000000000000000000000000000000..d1acb16f1c01471f1290b2313dacff051f2e00a0
GIT binary patch
literal 9450
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
WN%P!sE`~bRWa<S|u*<jVcH_STb>3tE

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit.el b/elpa/magit-1.2.0/magit.el
new file mode 100644
index 00000000..121ec9c7
--- /dev/null
+++ b/elpa/magit-1.2.0/magit.el
@@ -0,0 +1,6001 @@
+;;; 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
new file mode 100644
index 00000000..5923afc1
--- /dev/null
+++ b/elpa/magit-1.2.0/magit.el-e
@@ -0,0 +1,6001 @@
+;;; 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
new file mode 100644
index 0000000000000000000000000000000000000000..098e099b26f18cc13661e5a9dff64b745c3c6a51
GIT binary patch
literal 269536
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

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit.info b/elpa/magit-1.2.0/magit.info
new file mode 100644
index 00000000..deda92f0
--- /dev/null
+++ b/elpa/magit-1.2.0/magit.info
@@ -0,0 +1,1359 @@
+This is magit.info, produced by makeinfo version 4.8 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.)
+
+     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.
+
+
+File: magit.info,  Node: Top,  Next: Introduction,  Up: (dir)
+
+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.
+
+* Menu:
+
+* Introduction::
+* Acknowledgments::
+* Sections::
+* Status::
+* Untracked files::
+* Staging and Committing::
+* History::
+* Reflogs::
+* Commit Buffer::
+* Diffing::
+* Tagging::
+* Resetting::
+* Stashing::
+* Branching::
+* The Branch Manager::
+* 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
+
+1 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
+an 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
+is probably a good idea to bind `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 `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 `git' command to do most of the work.  The
+`*magit-process*' buffer contains the transcript of the most recent
+command.  You can switch to it with `$'.
+
+
+File: magit.info,  Node: Acknowledgments,  Next: Sections,  Prev: Introduction,  Up: Top
+
+2 Acknowledgments
+*****************
+
+Marius Vollmer started the whole project.  Thanks !
+
+   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!
+
+
+File: magit.info,  Node: Sections,  Next: Status,  Prev: Acknowledgments,  Up: Top
+
+3 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 `TAB' key.  It will to toggle the current section (the section that
+contains point) between being hidden and being shown.
+
+   Typing `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 `1', `2', `3', and `4' control the visibility of
+sections based on levels.  Hitting `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 `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 `M-1', `M-2', `M-3', and `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, `M-1' will only show the first lines of the top-level
+sections and will hide everything else.  Typing `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 `2' to collapse the
+diff of the current file, and `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 `2' and `M-2' are so common in the status buffer, they are
+bound to additional, more mnemonic keys: `M-h' (hide) and `M-H' (hide
+all).  Likewise `4' and `M-4' are also available as `M-s' (show) and
+`M-S' (show all).
+
+   In other buffers than the status buffer, `M-h', `M-H', `M-s', and
+`M-S' might work on different levels than on 2 and 4, but they keep
+their general meaning: `M-H' hides all detail, and `M-S' shows
+everything.
+
+
+File: magit.info,  Node: Status,  Next: Untracked files,  Prev: Sections,  Up: Top
+
+4 Status
+********
+
+Running `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 `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 `magit-repo-dirs' to customize how `magit-status' asks
+for the repository to work on.  When `magit-repo-dirs' is nil,
+`magit-status' will simply ask for a directory.
+
+   If you specify a directory that is not a Git repository, `M-x
+magit-status' will offer to initialize it as one.
+
+   When `magit-repo-dirs' is not nil, it is treated as a list of
+directory names, and `magit-status' will find all Git repositories in
+those directories and offer them for completion.  (Magit will only look
+`magit-repo-dirs-depth' levels deep, however.)
+
+   With two prefix arguments, `magit-status' will always prompt for a
+raw directory.
+
+   Thus, you would normally set `magit-repo-dirs' to the places where
+you keep most of your Git repositories and switch between them with
+`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 `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 `g' in
+the status buffer itself, or just use `M-x magit-status' instead of
+`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 _Untracked files_, if there are any.  See
+*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::.
+
+   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
+information.
+
+   During a history rewriting session, the status buffer shows the
+_Pending changes_ and _Pending commits_ sections.  See *Note
+Rewriting:: for more details.
+
+
+File: magit.info,  Node: Untracked files,  Next: Staging and Committing,  Prev: Status,  Up: Top
+
+5 Untracked files
+*****************
+
+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
+untracked files are staged.
+
+   Typing `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 `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
+are deleted.
+
+
+File: magit.info,  Node: Staging and Committing,  Next: History,  Prev: Untracked files,  Up: Top
+
+6 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 _Changes_.
+
+   When the staging area is in use, Magit uses two sections: _Unstaged
+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
+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.
+
+   If the region is active when you type `s' or `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.)
+
+   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.
+
+   To move all hunks of all diffs into the staging area in one go, type
+`S'.  To unstage everything, type `U'.
+
+   Typing `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 `k'.  The changes to discard are selected as with `s' and `u'.
+
+   Before committing, you should write a short description of the
+changes.
+
+   Type `c' to pop up a buffer where you can write your change
+description.  Once you are happy with the description, type `C-c C-c'
+in that buffer to perform the commit.
+
+   If you want to write changes in a `ChangeLog' file, you can use `C-x
+4 a' on a diff hunk.
+
+   Typing `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
+`magit-commit-all-when-nothing-staged' variable.  One choice is to
+instruct the subsequent `C-c C-c' to commit all changes.  Another
+choice is stage everything at the time of hitting `c'.
+
+   You can type `C-c C-a' in the buffer with the change description to
+toggle a flag that determines whether the next commit will _amend_ the
+current commit in HEAD.
+
+   Typing `C-c C-s' will toggle the `--signoff' option.  The default is
+determined by the `magit-commit-signoff' customization variable.
+
+   Typing `C-c C-e' will toggle the `--allow-empty' option.  This
+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
+until you are happy, and then return to the `*magit-log-edit*' buffer,
+maybe via `C-x b', or by hitting `c' again in a Magit buffer.
+
+   If you want to erase the `*magit-log-edit*' buffer and bury it, you
+can hit `C-c C-k' in it.
+
+   Typing `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.
+
+
+File: magit.info,  Node: History,  Next: Reflogs,  Prev: Staging and Committing,  Up: Top
+
+7 History
+*********
+
+To show the repository history of your current head, type `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.
+
+   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.
+
+   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.
+
+   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,
+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.
+
+   Typing `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 `A' will cherry-pick the current commit and will also commit
+the changes automatically when there have not been any conflicts.
+
+   Typing `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 `a', you
+need to commit the changes explicitly.
+
+   Typing `C-w' will copy the sha1 of the current commit into the kill
+ring.
+
+   Typing `=' will show the differences from the current commit to the
+"marked" commit.
+
+   You can mark the current commit by typing `.'.  When the current
+commit is already marked, typing `.' will unmark it.  To unmark the
+marked commit no matter where point is, use `C-u .'.
+
+   Some commands, such as `=', 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.
+
+
+File: magit.info,  Node: Reflogs,  Next: Commit Buffer,  Prev: History,  Up: Top
+
+8 Reflogs
+*********
+
+You can use `l h' and `l H' to browse your _reflog_, the local history
+of changes made to your repository heads.  Typing `H' will ask for a
+head, while `l h' will show the reflog of `HEAD'.
+
+   The resulting buffer is just like the buffer produced by `l l' and
+`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.
+
+   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.
+
+   To show the changes from your 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
+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 `v' will apply the selected changes in reverse.
+
+
+File: magit.info,  Node: Tagging,  Next: Resetting,  Prev: Diffing,  Up: Top
+
+11 Tagging
+**********
+
+Typing `t t' will make a lighweight tag.  Typing `t a' will make an
+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
+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
+************
+
+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 `v', for example).
+
+   Typing `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 _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 `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 _Unpushed commits_ section and
+hit `x RET' to reset your current head to it.
+
+   Type `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 `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 `x' to reset only the head, and then using
+`X'.
+
+
+File: magit.info,  Node: Stashing,  Next: Branching,  Prev: Resetting,  Up: Top
+
+13 Stashing
+***********
+
+You can create a new stash with `z z'.  Your stashes will be listed in
+the status buffer, and you can apply them with `a' and pop them with
+`A'.  To drop a stash, use `k'.
+
+   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.
+
+   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
+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
+
+14 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
+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 `b b' 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 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.
+
+
+File: magit.info,  Node: The Branch Manager,  Next: Wazzup,  Prev: Branching,  Up: Top
+
+15 The Branch Manager
+*********************
+
+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.
+
+   To check out a branch, move your cursor to the desired branch and
+press `RET'.
+
+   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.
+
+
+File: magit.info,  Node: Wazzup,  Next: Merging,  Prev: The Branch Manager,  Up: Top
+
+16 Wazzup
+*********
+
+Typing `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 `TAB' (or
+similar) to show the lists of commits.
+
+   When point is on a _N unmerged commits in ..._ title, the
+corresponding branch will be offered as the default for a merge.
+
+   Hitting `i' on a branch title will ignore this branch in the wazzup
+view.  You can use `C-u w' to show all branches, including the ignored
+ones.  Hitting `i' on an already ignored branch in that view will
+unignore it.
+
+
+File: magit.info,  Node: Merging,  Next: Rebasing,  Prev: Wazzup,  Up: Top
+
+17 Merging
+**********
+
+Magit offers two ways to merge branches: manual 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
+and commit them immediately.
+
+   Type `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 `X'.
+
+   Merges can fail if the two branches you want to merge 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
+example with `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.
+
+
+File: magit.info,  Node: Rebasing,  Next: Interactive Rebasing,  Prev: Merging,  Up: Top
+
+18 Rebasing
+***********
+
+Typing `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 `R c' to
+continue the rebase.  Alternatively, hitting `c' or `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 `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
+
+20 Rewriting
+************
+
+As hinted at earlier, you can rewrite your commit history.  For
+example, you can reset the current head to an earlier commit with `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 `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.
+
+   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
+applied.  Magit shows which commits have been applied by changing their
+marker from `*' to `.'.
+
+   Using `A' will immediately commit the commit (as usual).  If you
+want to combine multiple previous commits into a single new one, use
+`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 `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
+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'.
+
+   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.
+
+   You can change the `*' and `.' marks of a pending commit explicitly
+with `r *' and `r .'.
+
+   In addition to a list of pending commits, the status buffer will show
+the _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.
+
+
+File: magit.info,  Node: Pushing and Pulling,  Next: Bisecting,  Prev: Rewriting,  Up: Top
+
+21 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.
+When no default remote repository has been configured yet for the
+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>'.
+
+   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.
+
+   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 _Unpushed commits_
+section that shows the commits on your current head that are not in the
+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'.
+
+   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.
+
+
+File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Bisecting,  Up: Top
+
+22 Submodules
+*************
+
+`M u'
+     Update the submodules, with a prefix argument it will initializing.
+
+`M i'
+     Initialize the submodules.
+
+`M b'
+     Update and initialize the submodules in one go.
+
+`M s'
+     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
+*******************
+
+* 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
+
+24.2 Interfacing with Subversion
+================================
+
+Typing `N r' runs `git svn rebase', typing `N c' runs `git svn dcommit'
+and typing `N f' runs `git svn fetch'.
+
+   `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 (`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
+
+24.3 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.
+
+   `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
+`.topdeps' and `.topmsg'.
+
+   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
+
+24.5 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:
+
+   * Define sections to display specific informations about the current
+     state of the repository, and place them relatively to existing
+     sections.
+
+     `magit-define-inserter' automagically defines two hooks called
+     `magit-before-insert-SECTION-hook' and
+     `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.
+
+          (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)
+
+   * Define new types of objects in those sections.
+
+     The function `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:
+
+          (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))))
+
+     In this case, every line of the command output is transformed into
+     an object of type `'foo'.
+
+   * Alter behavior of generic commands to dispatch them correctly to
+     the relevant system, optionally making use of the newly defined
+     types.
+
+          (magit-add-action (item info "discard")
+            ((foo)
+             (do-something-meaningful-for-discarding-a-foo)))
+
+     This will alter the behavior of `k', when applied to those objects.
+
+   * Plug a different logic into basic commands, to reflect the
+     presence of the extension.
+
+     `magit-define-command' automagically defines a
+     `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.
+
+          (add-hook 'magit-create-branch-command-hook 'foo-create-branch)
+
+     The function `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.
+
+   * Define new commands and associated menu.
+
+     This part is not really specific to extensions, except that menus
+     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
+
+25 Using Git Directly
+*********************
+
+For situations when Magit doesn't do everything you need, you can run
+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
+
+End Tag Table
diff --git a/elpa/magit-1.2.0/rebase-mode.el b/elpa/magit-1.2.0/rebase-mode.el
new file mode 100644
index 00000000..1ccfb540
--- /dev/null
+++ b/elpa/magit-1.2.0/rebase-mode.el
@@ -0,0 +1,322 @@
+;;; 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
new file mode 100644
index 0000000000000000000000000000000000000000..e304c1232a8e6ddee5e4512c91fdadd12d710d12
GIT binary patch
literal 10551
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

literal 0
HcmV?d00001

diff --git a/elpa/package.el b/elpa/package.el
new file mode 100644
index 00000000..6a00b382
--- /dev/null
+++ b/elpa/package.el
@@ -0,0 +1,1760 @@
+;;; package.el --- Simple package system for Emacs
+
+;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
+
+;; Author: Tom Tromey <tromey@redhat.com>
+;; Created: 10 Mar 2007
+;; Version: 1.0
+;; Keywords: tools
+;; Package-Requires: ((tabulated-list "0"))
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Change Log:
+
+;;  2 Apr 2007 - now using ChangeLog file
+;; 15 Mar 2007 - updated documentation
+;; 14 Mar 2007 - Changed how obsolete packages are handled
+;; 13 Mar 2007 - Wrote package-install-from-buffer
+;; 12 Mar 2007 - Wrote package-menu mode
+
+;;; Commentary:
+
+;; The idea behind package.el is to be able to download packages and
+;; install them.  Packages are versioned and have versioned
+;; dependencies.  Furthermore, this supports built-in packages which
+;; may or may not be newer than user-specified packages.  This makes
+;; it possible to upgrade Emacs and automatically disable packages
+;; which have moved from external to core.  (Note though that we don't
+;; currently register any of these, so this feature does not actually
+;; work.)
+
+;; A package is described by its name and version.  The distribution
+;; format is either  a tar file or a single .el file.
+
+;; A tar file should be named "NAME-VERSION.tar".  The tar file must
+;; unpack into a directory named after the package and version:
+;; "NAME-VERSION".  It must contain a file named "PACKAGE-pkg.el"
+;; which consists of a call to define-package.  It may also contain a
+;; "dir" file and the info files it references.
+
+;; A .el file is named "NAME-VERSION.el" in the remote archive, but is
+;; installed as simply "NAME.el" in a directory named "NAME-VERSION".
+
+;; The downloader downloads all dependent packages.  By default,
+;; packages come from the official GNU sources, but others may be
+;; added by customizing the `package-archives' alist.  Packages get
+;; byte-compiled at install time.
+
+;; At activation time we will set up the load-path and the info path,
+;; and we will load the package's autoloads.  If a package's
+;; dependencies are not available, we will not activate that package.
+
+;; Conceptually a package has multiple state transitions:
+;;
+;; * Download.  Fetching the package from ELPA.
+;; * Install.  Untar the package, or write the .el file, into
+;;   ~/.emacs.d/elpa/ directory.
+;; * Byte compile.  Currently this phase is done during install,
+;;   but we may change this.
+;; * Activate.  Evaluate the autoloads for the package to make it
+;;   available to the user.
+;; * Load.  Actually load the package and run some code from it.
+
+;; Other external functions you may want to use:
+;;
+;; M-x list-packages
+;;    Enters a mode similar to buffer-menu which lets you manage
+;;    packages.  You can choose packages for install (mark with "i",
+;;    then "x" to execute) or deletion (not implemented yet), and you
+;;    can see what packages are available.  This will automatically
+;;    fetch the latest list of packages from ELPA.
+;;
+;; M-x package-install-from-buffer
+;;    Install a package consisting of a single .el file that appears
+;;    in the current buffer.  This only works for packages which
+;;    define a Version header properly; package.el also supports the
+;;    extension headers Package-Version (in case Version is an RCS id
+;;    or similar), and Package-Requires (if the package requires other
+;;    packages).
+;;
+;; M-x package-install-file
+;;    Install a package from the indicated file.  The package can be
+;;    either a tar file or a .el file.  A tar file must contain an
+;;    appropriately-named "-pkg.el" file; a .el file must be properly
+;;    formatted as with package-install-from-buffer.
+
+;;; Thanks:
+;;; (sorted by sort-lines):
+
+;; Jim Blandy <jimb@red-bean.com>
+;; Karl Fogel <kfogel@red-bean.com>
+;; Kevin Ryde <user42@zip.com.au>
+;; Lawrence Mitchell
+;; Michael Olson <mwolson@member.fsf.org>
+;; Sebastian Tennant <sebyte@smolny.plus.com>
+;; Stefan Monnier <monnier@iro.umontreal.ca>
+;; Vinicius Jose Latorre <viniciusjl@ig.com.br>
+;; Phil Hagelberg <phil@hagelb.org>
+
+;;; ToDo:
+
+;; - a trust mechanism, since compiling a package can run arbitrary code.
+;;   For example, download package signatures and check that they match.
+;; - putting info dirs at the start of the info path means
+;;   users see a weird ordering of categories.  OTOH we want to
+;;   override later entries.  maybe emacs needs to enforce
+;;   the standard layout?
+;; - put bytecode in a separate directory tree
+;; - perhaps give users a way to recompile their bytecode
+;;   or do it automatically when emacs changes
+;; - give users a way to know whether a package is installed ok
+;; - give users a way to view a package's documentation when it
+;;   only appears in the .el
+;; - use/extend checkdoc so people can tell if their package will work
+;; - "installed" instead of a blank in the status column
+;; - tramp needs its files to be compiled in a certain order.
+;;   how to handle this?  fix tramp?
+;; - on emacs 21 we don't kill the -autoloads.el buffer.  what about 22?
+;; - maybe we need separate .elc directories for various emacs versions
+;;   and also emacs-vs-xemacs.  That way conditional compilation can
+;;   work.  But would this break anything?
+;; - should store the package's keywords in archive-contents, then
+;;   let the users filter the package-menu by keyword.  See
+;;   finder-by-keyword.  (We could also let people view the
+;;   Commentary, but it isn't clear how useful this is.)
+;; - William Xu suggests being able to open a package file without
+;;   installing it
+;; - Interface with desktop.el so that restarting after an install
+;;   works properly
+;; - Implement M-x package-upgrade, to upgrade any/all existing packages
+;; - Use hierarchical layout.  PKG/etc PKG/lisp PKG/info
+;;   ... except maybe lisp?
+;; - It may be nice to have a macro that expands to the package's
+;;   private data dir, aka ".../etc".  Or, maybe data-directory
+;;   needs to be a list (though this would be less nice)
+;;   a few packages want this, eg sokoban
+;; - package menu needs:
+;;     ability to know which packages are built-in & thus not deletable
+;;     it can sometimes print odd results, like 0.3 available but 0.4 active
+;;        why is that?
+;; - Allow multiple versions on the server...?
+;;   [ why bother? ]
+;; - Don't install a package which will invalidate dependencies overall
+;; - Allow something like (or (>= emacs 21.0) (>= xemacs 21.5))
+;;   [ currently thinking, why bother.. KISS ]
+;; - Allow optional package dependencies
+;;   then if we require 'bbdb', bbdb-specific lisp in lisp/bbdb
+;;   and just don't compile to add to load path ...?
+;; - Have a list of archive URLs?  [ maybe there's no point ]
+;; - David Kastrup pointed out on the xemacs list that for GPL it
+;;   is friendlier to ship the source tree.  We could "support" that
+;;   by just having a "src" subdir in the package.  This isn't ideal
+;;   but it probably is not worth trying to support random source
+;;   tree layouts, build schemes, etc.
+;; - Our treatment of the info path is somewhat bogus
+;; - perhaps have an "unstable" tree in ELPA as well as a stable one
+
+;;; Code:
+
+(require 'tabulated-list)
+
+(defgroup package nil
+  "Manager for Emacs Lisp packages."
+  :group 'applications
+  :version "24.1")
+
+;;;###autoload
+(defcustom package-enable-at-startup t
+  "Whether to activate installed packages when Emacs starts.
+If non-nil, packages are activated after reading the init file
+and before `after-init-hook'.  Activation is not done if
+`user-init-file' is nil (e.g. Emacs was started with \"-q\").
+
+Even if the value is nil, you can type \\[package-initialize] to
+activate the package system at any time."
+  :type 'boolean
+  :group 'package
+  :version "24.1")
+
+(defcustom package-load-list '(all)
+  "List of packages for `package-initialize' to load.
+Each element in this list should be a list (NAME VERSION), or the
+symbol `all'.  The symbol `all' says to load the latest installed
+versions of all packages not specified by other elements.
+
+For an element (NAME VERSION), NAME is a package name (a symbol).
+VERSION should be t, a string, or nil.
+If VERSION is t, all versions are loaded, though obsolete ones
+ will be put in `package-obsolete-alist' and not activated.
+If VERSION is a string, only that version is ever loaded.
+ Any other version, even if newer, is silently ignored.
+ Hence, the package is \"held\" at that version.
+If VERSION is nil, the package is not loaded (it is \"disabled\")."
+  :type '(repeat symbol)
+  :risky t
+  :group 'package
+  :version "24.1")
+
+(defvar Info-directory-list)
+(declare-function info-initialize "info" ())
+(declare-function url-http-parse-response "url-http" ())
+(declare-function lm-header "lisp-mnt" (header))
+(declare-function lm-commentary "lisp-mnt" (&optional file))
+(defvar url-http-end-of-headers)
+
+(defcustom package-archives '(("gnu" . "http://elpa.gnu.org/packages/"))
+  "An alist of archives from which to fetch.
+The default value points to the GNU Emacs package repository.
+
+Each element has the form (ID . LOCATION).
+ ID is an archive name, as a string.
+ LOCATION specifies the base location for the archive.
+  If it starts with \"http:\", it is treated as a HTTP URL;
+  otherwise it should be an absolute directory name.
+  (Other types of URL are currently not supported.)
+
+Only add locations that you trust, since fetching and installing
+a package can run arbitrary code."
+  :type '(alist :key-type (string :tag "Archive name")
+                :value-type (string :tag "URL or directory name"))
+  :risky t
+  :group 'package
+  :version "24.1")
+
+(defconst package-archive-version 1
+  "Version number of the package archive understood by this file.
+Lower version numbers than this will probably be understood as well.")
+
+(defconst package-el-version "1.0"
+  "Version of package.el.")
+
+;; We don't prime the cache since it tends to get out of date.
+(defvar package-archive-contents nil
+  "Cache of the contents of the Emacs Lisp Package Archive.
+This is an alist mapping package names (symbols) to package
+descriptor vectors.  These are like the vectors for `package-alist'
+but have extra entries: one which is 'tar for tar packages and
+'single for single-file packages, and one which is the name of
+the archive from which it came.")
+(put 'package-archive-contents 'risky-local-variable t)
+
+(defcustom package-user-dir (locate-user-emacs-file "elpa")
+  "Directory containing the user's Emacs Lisp packages.
+The directory name should be absolute.
+Apart from this directory, Emacs also looks for system-wide
+packages in `package-directory-list'."
+  :type 'directory
+  :risky t
+  :group 'package
+  :version "24.1")
+
+(defcustom package-directory-list
+  ;; Defaults are subdirs named "elpa" in the site-lisp dirs.
+  (let (result)
+    (dolist (f load-path)
+      (and (stringp f)
+	   (equal (file-name-nondirectory f) "site-lisp")
+	   (push (expand-file-name "elpa" f) result)))
+    (nreverse result))
+  "List of additional directories containing Emacs Lisp packages.
+Each directory name should be absolute.
+
+These directories contain packages intended for system-wide; in
+contrast, `package-user-dir' contains packages for personal use."
+  :type '(repeat directory)
+  :risky t
+  :group 'package
+  :version "24.1")
+
+;; The value is precomputed in finder-inf.el, but don't load that
+;; until it's needed (i.e. when `package-initialize' is called).
+(defvar package--builtins nil
+  "Alist of built-in packages.
+The actual value is initialized by loading the library
+`finder-inf'; this is not done until it is needed, e.g. by the
+function `package-built-in-p'.
+
+Each element has the form (PKG . DESC), where PKG is a package
+name (a symbol) and DESC is a vector that describes the package.
+The vector DESC has the form [VERSION-LIST REQS DOCSTRING].
+  VERSION-LIST is a version list.
+  REQS is a list of packages required by the package, each
+   requirement having the form (NAME VL), where NAME is a string
+   and VL is a version list.
+  DOCSTRING is a brief description of the package.")
+(put 'package--builtins 'risky-local-variable t)
+
+(defvar package-alist nil
+  "Alist of all packages available for activation.
+Each element has the form (PKG . DESC), where PKG is a package
+name (a symbol) and DESC is a vector that describes the package.
+
+The vector DESC has the form [VERSION-LIST REQS DOCSTRING].
+  VERSION-LIST is a version list.
+  REQS is a list of packages required by the package, each
+   requirement having the form (NAME VL) where NAME is a string
+   and VL is a version list.
+  DOCSTRING is a brief description of the package.
+
+This variable is set automatically by `package-load-descriptor',
+called via `package-initialize'.  To change which packages are
+loaded and/or activated, customize `package-load-list'.")
+(put 'package-alist 'risky-local-variable t)
+
+(defvar package-activated-list nil
+  "List of the names of currently activated packages.")
+(put 'package-activated-list 'risky-local-variable t)
+
+(defvar package-obsolete-alist nil
+  "Representation of obsolete packages.
+Like `package-alist', but maps package name to a second alist.
+The inner alist is keyed by version.")
+(put 'package-obsolete-alist 'risky-local-variable t)
+
+(defun package-version-join (vlist)
+  "Return the version string corresponding to the list VLIST.
+This is, approximately, the inverse of `version-to-list'.
+\(Actually, it returns only one of the possible inverses, since
+`version-to-list' is a many-to-one operation.)"
+  (if (null vlist)
+      ""
+    (let ((str-list (list "." (int-to-string (car vlist)))))
+      (dolist (num (cdr vlist))
+	(cond
+	 ((>= num 0)
+	  (push (int-to-string num) str-list)
+	  (push "." str-list))
+	 ((< num -3)
+	  (error "Invalid version list `%s'" vlist))
+	 (t
+	  ;; pre, or beta, or alpha
+	  (cond ((equal "." (car str-list))
+		 (pop str-list))
+		((not (string-match "[0-9]+" (car str-list)))
+		 (error "Invalid version list `%s'" vlist)))
+	  (push (cond ((= num -1) "pre")
+		      ((= num -2) "beta")
+		      ((= num -3) "alpha"))
+		str-list))))
+      (if (equal "." (car str-list))
+	  (pop str-list))
+      (apply 'concat (nreverse str-list)))))
+
+(defun package-strip-version (dirname)
+  "Strip the version from a combined package name and version.
+E.g., if given \"quux-23.0\", will return \"quux\""
+  (if (string-match (concat "\\`" package-subdirectory-regexp "\\'") dirname)
+      (match-string 1 dirname)))
+
+(defun package-load-descriptor (dir package)
+  "Load the description file in directory DIR for package PACKAGE.
+Here, PACKAGE is a string of the form NAME-VERSION, where NAME is
+the package name and VERSION is its version."
+  (let* ((pkg-dir (expand-file-name package dir))
+	 (pkg-file (expand-file-name
+		    (concat (package-strip-version package) "-pkg")
+		    pkg-dir)))
+    (when (and (file-directory-p pkg-dir)
+	       (file-exists-p (concat pkg-file ".el")))
+      (load pkg-file nil t))))
+
+(defun package-load-all-descriptors ()
+  "Load descriptors for installed Emacs Lisp packages.
+This looks for package subdirectories in `package-user-dir' and
+`package-directory-list'.  The variable `package-load-list'
+controls which package subdirectories may be loaded.
+
+In each valid package subdirectory, this function loads the
+description file containing a call to `define-package', which
+updates `package-alist' and `package-obsolete-alist'."
+  (let ((regexp (concat "\\`" package-subdirectory-regexp "\\'")))
+    (dolist (dir (cons package-user-dir package-directory-list))
+      (when (file-directory-p dir)
+	(dolist (subdir (directory-files dir))
+	  (when (string-match regexp subdir)
+	    (package-maybe-load-descriptor (match-string 1 subdir)
+					   (match-string 2 subdir)
+					   dir)))))))
+
+(defun package-maybe-load-descriptor (name version dir)
+  "Maybe load a specific package from directory DIR.
+NAME and VERSION are the package's name and version strings.
+This function checks `package-load-list', before actually loading
+the package by calling `package-load-descriptor'."
+  (let ((force (assq (intern name) package-load-list))
+	(subdir (concat name "-" version)))
+    (and (file-directory-p (expand-file-name subdir dir))
+	 ;; Check `package-load-list':
+	 (cond ((null force)
+		(memq 'all package-load-list))
+	       ((null (setq force (cadr force)))
+		nil) ; disabled
+	       ((eq force t)
+		t)
+	       ((stringp force) ; held
+		(version-list-= (version-to-list version)
+				(version-to-list force)))
+	       (t
+		(error "Invalid element in `package-load-list'")))
+	 ;; Actually load the descriptor:
+	 (package-load-descriptor dir subdir))))
+
+(defsubst package-desc-vers (desc)
+  "Extract version from a package description vector."
+  (aref desc 0))
+
+(defsubst package-desc-reqs (desc)
+  "Extract requirements from a package description vector."
+  (aref desc 1))
+
+(defsubst package-desc-doc (desc)
+  "Extract doc string from a package description vector."
+  (aref desc 2))
+
+(defsubst package-desc-kind (desc)
+  "Extract the kind of download from an archive package description vector."
+  (aref desc 3))
+
+(defun package--dir (name version)
+  "Return the directory where a package is installed, or nil if none.
+NAME and VERSION are both strings."
+  (let* ((subdir (concat name "-" version))
+	 (dir-list (cons package-user-dir package-directory-list))
+	 pkg-dir)
+    (while dir-list
+      (let ((subdir-full (expand-file-name subdir (car dir-list))))
+	(if (file-directory-p subdir-full)
+	    (setq pkg-dir  subdir-full
+		  dir-list nil)
+	  (setq dir-list (cdr dir-list)))))
+    pkg-dir))
+
+(defun package-activate-1 (package pkg-vec)
+  (let* ((name (symbol-name package))
+	 (version-str (package-version-join (package-desc-vers pkg-vec)))
+	 (pkg-dir (package--dir name version-str)))
+    (unless pkg-dir
+      (error "Internal error: unable to find directory for `%s-%s'"
+	     name version-str))
+    ;; Add info node.
+    (when (file-exists-p (expand-file-name "dir" pkg-dir))
+      ;; FIXME: not the friendliest, but simple.
+      (require 'info)
+      (info-initialize)
+      (push pkg-dir Info-directory-list))
+    ;; Add to load path, add autoloads, and activate the package.
+    (push pkg-dir load-path)
+    (load (expand-file-name (concat name "-autoloads") pkg-dir) nil t)
+    (push package package-activated-list)
+    ;; Don't return nil.
+    t))
+
+(defun package-built-in-p (package &optional min-version)
+  "Return true if PACKAGE is built-in to Emacs.
+Optional arg MIN-VERSION, if non-nil, should be a version list
+specifying the minimum acceptable version."
+  (require 'finder-inf nil t) ; For `package--builtins'.
+  (if (eq package 'emacs)
+      (version-list-<= min-version (version-to-list emacs-version))
+    (let ((elt (assq package package--builtins)))
+      (and elt (version-list-<= min-version
+				(package-desc-vers (cdr elt)))))))
+
+;; This function goes ahead and activates a newer version of a package
+;; if an older one was already activated.  This is not ideal; we'd at
+;; least need to check to see if the package has actually been loaded,
+;; and not merely activated.
+(defun package-activate (package min-version)
+  "Activate package PACKAGE, of version MIN-VERSION or newer.
+MIN-VERSION should be a version list.
+If PACKAGE has any dependencies, recursively activate them.
+Return nil if the package could not be activated."
+  (let ((pkg-vec (cdr (assq package package-alist)))
+	available-version found)
+    ;; Check if PACKAGE is available in `package-alist'.
+    (when pkg-vec
+      (setq available-version (package-desc-vers pkg-vec)
+	    found (version-list-<= min-version available-version)))
+    (cond
+     ;; If no such package is found, maybe it's built-in.
+     ((null found)
+      (package-built-in-p package min-version))
+     ;; If the package is already activated, just return t.
+     ((memq package package-activated-list)
+      t)
+     ;; Otherwise, proceed with activation.
+     (t
+      (let ((fail (catch 'dep-failure
+		    ;; Activate its dependencies recursively.
+		    (dolist (req (package-desc-reqs pkg-vec))
+		      (unless (package-activate (car req) (cadr req))
+			(throw 'dep-failure req))))))
+	(if fail
+	    (warn "Unable to activate package `%s'.
+Required package `%s-%s' is unavailable"
+		  package (car fail) (package-version-join (cadr fail)))
+	  ;; If all goes well, activate the package itself.
+	  (package-activate-1 package pkg-vec)))))))
+
+(defun package-mark-obsolete (package pkg-vec)
+  "Put package on the obsolete list, if not already there."
+  (let ((elt (assq package package-obsolete-alist)))
+    (if elt
+	;; If this obsolete version does not exist in the list, update
+	;; it the list.
+	(unless (assoc (package-desc-vers pkg-vec) (cdr elt))
+	  (setcdr elt (cons (cons (package-desc-vers pkg-vec) pkg-vec)
+			    (cdr elt))))
+      ;; Make a new association.
+      (push (cons package (list (cons (package-desc-vers pkg-vec)
+				      pkg-vec)))
+	    package-obsolete-alist))))
+
+(defun define-package (name-string version-string
+				&optional docstring requirements
+				&rest _extra-properties)
+  "Define a new package.
+NAME-STRING is the name of the package, as a string.
+VERSION-STRING is the version of the package, as a string.
+DOCSTRING is a short description of the package, a string.
+REQUIREMENTS is a list of dependencies on other packages.
+ Each requirement is of the form (OTHER-PACKAGE OTHER-VERSION),
+ where OTHER-VERSION is a string.
+
+EXTRA-PROPERTIES is currently unused."
+  (let* ((name (intern name-string))
+	 (version (version-to-list version-string))
+	 (new-pkg-desc
+	  (cons name
+		(vector version
+			(mapcar
+			 (lambda (elt)
+			   (list (car elt)
+				 (version-to-list (car (cdr elt)))))
+			 requirements)
+			docstring)))
+	 (old-pkg (assq name package-alist)))
+    (cond
+     ;; If there's no old package, just add this to `package-alist'.
+     ((null old-pkg)
+      (push new-pkg-desc package-alist))
+     ((version-list-< (package-desc-vers (cdr old-pkg)) version)
+      ;; Remove the old package and declare it obsolete.
+      (package-mark-obsolete name (cdr old-pkg))
+      (setq package-alist (cons new-pkg-desc
+				(delq old-pkg package-alist))))
+     ;; You can have two packages with the same version, e.g. one in
+     ;; the system package directory and one in your private
+     ;; directory.  We just let the first one win.
+     ((not (version-list-= (package-desc-vers (cdr old-pkg)) version))
+      ;; The package is born obsolete.
+      (package-mark-obsolete name (cdr new-pkg-desc))))))
+
+;; From Emacs 22.
+(defun package-autoload-ensure-default-file (file)
+  "Make sure that the autoload file FILE exists and if not create it."
+  (unless (file-exists-p file)
+    (write-region
+     (concat ";;; " (file-name-nondirectory file)
+	     " --- automatically extracted autoloads\n"
+	     ";;\n"
+	     ";;; Code:\n\n"
+	     "\n;; Local Variables:\n"
+	     ";; version-control: never\n"
+	     ";; no-byte-compile: t\n"
+	     ";; no-update-autoloads: t\n"
+	     ";; End:\n"
+	     ";;; " (file-name-nondirectory file)
+	     " ends here\n")
+     nil file))
+  file)
+
+(defun package-generate-autoloads (name pkg-dir)
+  (require 'autoload)         ;Load before we let-bind generated-autoload-file!
+  (let* ((auto-name (concat name "-autoloads.el"))
+	 ;;(ignore-name (concat name "-pkg.el"))
+	 (generated-autoload-file (expand-file-name auto-name pkg-dir))
+	 (version-control 'never))
+    (unless (fboundp 'autoload-ensure-default-file)
+      (package-autoload-ensure-default-file generated-autoload-file))
+    (update-directory-autoloads pkg-dir)
+    (let ((buf (find-buffer-visiting generated-autoload-file)))
+      (when buf (kill-buffer buf)))))
+
+(defvar tar-parse-info)
+(declare-function tar-untar-buffer "tar-mode" ())
+(declare-function tar-header-name "tar-mode" (tar-header))
+(declare-function tar-header-link-type "tar-mode" (tar-header))
+
+(defun package-untar-buffer (dir)
+  "Untar the current buffer.
+This uses `tar-untar-buffer' from Tar mode.  All files should
+untar into a directory named DIR; otherwise, signal an error."
+  (require 'tar-mode)
+  (tar-mode)
+  ;; Make sure everything extracts into DIR.
+  (let ((regexp (concat "\\`" (regexp-quote (expand-file-name dir)) "/"))
+	(case-fold-search (memq system-type '(windows-nt ms-dos cygwin))))
+    (dolist (tar-data tar-parse-info)
+      (let ((name (expand-file-name (tar-header-name tar-data))))
+	(or (string-match regexp name)
+	    ;; Tarballs created by some utilities don't list
+	    ;; directories with a trailing slash (Bug#13136).
+	    (and (string-equal dir name)
+		 (eq (tar-header-link-type tar-data) 5))
+	    (error "Package does not untar cleanly into directory %s/" dir)))))
+  (tar-untar-buffer))
+
+(defun package-unpack (package version)
+  (let* ((name (symbol-name package))
+	 (dirname (concat name "-" version))
+	 (pkg-dir (expand-file-name dirname package-user-dir)))
+    (make-directory package-user-dir t)
+    ;; FIXME: should we delete PKG-DIR if it exists?
+    (let* ((default-directory (file-name-as-directory package-user-dir)))
+      (package-untar-buffer dirname)
+      (package--make-autoloads-and-compile name pkg-dir))))
+
+(defun package--make-autoloads-and-compile (name pkg-dir)
+  "Generate autoloads and do byte-compilation for package named NAME.
+PKG-DIR is the name of the package directory."
+  (package-generate-autoloads name pkg-dir)
+  (let ((load-path (cons pkg-dir load-path)))
+    ;; We must load the autoloads file before byte compiling, in
+    ;; case there are magic cookies to set up non-trivial paths.
+    (load (expand-file-name (concat name "-autoloads") pkg-dir) nil t)
+    (byte-recompile-directory pkg-dir 0 t)))
+
+(defun package--write-file-no-coding (file-name)
+  (let ((buffer-file-coding-system 'no-conversion))
+    (write-region (point-min) (point-max) file-name)))
+
+(defun package-unpack-single (file-name version desc requires)
+  "Install the contents of the current buffer as a package."
+  ;; Special case "package".
+  (if (string= file-name "package")
+      (package--write-file-no-coding
+       (expand-file-name (concat file-name ".el") package-user-dir))
+    (let* ((pkg-dir  (expand-file-name (concat file-name "-"
+					       (package-version-join
+						(version-to-list version)))
+				       package-user-dir))
+	   (el-file  (expand-file-name (concat file-name ".el") pkg-dir))
+	   (pkg-file (expand-file-name (concat file-name "-pkg.el") pkg-dir)))
+      (make-directory pkg-dir t)
+      (package--write-file-no-coding el-file)
+      (let ((print-level nil)
+	    (print-length nil))
+	(write-region
+	 (concat
+	  (prin1-to-string
+	   (list 'define-package
+		 file-name
+		 version
+		 desc
+		 (list 'quote
+		       ;; Turn version lists into string form.
+		       (mapcar
+			(lambda (elt)
+			  (list (car elt)
+				(package-version-join (cadr elt))))
+			requires))))
+	  "\n")
+	 nil
+	 pkg-file
+	 nil nil nil 'excl))
+      (package--make-autoloads-and-compile file-name pkg-dir))))
+
+(defmacro package--with-work-buffer (location file &rest body)
+  "Run BODY in a buffer containing the contents of FILE at LOCATION.
+LOCATION is the base location of a package archive, and should be
+one of the URLs (or file names) specified in `package-archives'.
+FILE is the name of a file relative to that base location.
+
+This macro retrieves FILE from LOCATION into a temporary buffer,
+and evaluates BODY while that buffer is current.  This work
+buffer is killed afterwards.  Return the last value in BODY."
+  `(let* ((http (string-match "\\`https?:" ,location))
+	  (buffer
+	   (if http
+	       (url-retrieve-synchronously (concat ,location ,file))
+	     (generate-new-buffer "*package work buffer*"))))
+     (prog1
+	 (with-current-buffer buffer
+	   (if http
+	       (progn (package-handle-response)
+		      (re-search-forward "^$" nil 'move)
+		      (forward-char)
+		      (delete-region (point-min) (point)))
+	     (unless (file-name-absolute-p ,location)
+	       (error "Archive location %s is not an absolute file name"
+		      ,location))
+	     (insert-file-contents (expand-file-name ,file ,location)))
+	   ,@body)
+       (kill-buffer buffer))))
+
+(defun package-handle-response ()
+  "Handle the response from a `url-retrieve-synchronously' call.
+Parse the HTTP response and throw if an error occurred.
+The url package seems to require extra processing for this.
+This should be called in a `save-excursion', in the download buffer.
+It will move point to somewhere in the headers."
+  ;; We assume HTTP here.
+  (require 'url-http)
+  (let ((response (url-http-parse-response)))
+    (when (or (< response 200) (>= response 300))
+      (error "Error during download request:%s"
+	     (buffer-substring-no-properties (point) (progn
+						       (end-of-line)
+						       (point)))))))
+
+(defun package-download-single (name version desc requires)
+  "Download and install a single-file package."
+  (let ((location (package-archive-base name))
+	(file (concat (symbol-name name) "-" version ".el")))
+    (package--with-work-buffer location file
+      (package-unpack-single (symbol-name name) version desc requires))))
+
+(defun package-download-tar (name version)
+  "Download and install a tar package."
+  (let ((location (package-archive-base name))
+	(file (concat (symbol-name name) "-" version ".tar")))
+    (package--with-work-buffer location file
+      (package-unpack name version))))
+
+(defvar package--initialized nil)
+
+(defun package-installed-p (package &optional min-version)
+  "Return true if PACKAGE, of MIN-VERSION or newer, is installed.
+MIN-VERSION should be a version list."
+  (unless package--initialized (error "package.el is not yet initialized!"))
+  (let ((pkg-desc (assq package package-alist)))
+    (if pkg-desc
+	(version-list-<= min-version
+			 (package-desc-vers (cdr pkg-desc)))
+      ;; Also check built-in packages.
+      (package-built-in-p package min-version))))
+
+(defun package-compute-transaction (package-list requirements)
+  "Return a list of packages to be installed, including PACKAGE-LIST.
+PACKAGE-LIST should be a list of package names (symbols).
+
+REQUIREMENTS should be a list of additional requirements; each
+element in this list should have the form (PACKAGE VERSION-LIST),
+where PACKAGE is a package name and VERSION-LIST is the required
+version of that package.
+
+This function recursively computes the requirements of the
+packages in REQUIREMENTS, and returns a list of all the packages
+that must be installed.  Packages that are already installed are
+not included in this list."
+  (dolist (elt requirements)
+    (let* ((next-pkg (car elt))
+	   (next-version (cadr elt)))
+      (unless (package-installed-p next-pkg next-version)
+	;; A package is required, but not installed.  It might also be
+	;; blocked via `package-load-list'.
+	(let ((pkg-desc (assq next-pkg package-archive-contents))
+	      hold)
+	  (when (setq hold (assq next-pkg package-load-list))
+	    (setq hold (cadr hold))
+	    (cond ((eq hold t))
+		  ((eq hold nil)
+		   (error "Required package '%s' is disabled"
+			  (symbol-name next-pkg)))
+		  ((null (stringp hold))
+		   (error "Invalid element in `package-load-list'"))
+		  ((version-list-< (version-to-list hold) next-version)
+		   (error "Package `%s' held at version %s, \
+but version %s required"
+			  (symbol-name next-pkg) hold
+			  (package-version-join next-version)))))
+	  (unless pkg-desc
+	    (error "Package `%s-%s' is unavailable"
+		   (symbol-name next-pkg)
+		   (package-version-join next-version)))
+	  (unless (version-list-<= next-version
+				   (package-desc-vers (cdr pkg-desc)))
+	    (error
+	     "Need package `%s-%s', but only %s is available"
+	     (symbol-name next-pkg) (package-version-join next-version)
+	     (package-version-join (package-desc-vers (cdr pkg-desc)))))
+	  ;; Only add to the transaction if we don't already have it.
+	  (unless (memq next-pkg package-list)
+	    (push next-pkg package-list))
+	  (setq package-list
+		(package-compute-transaction package-list
+					     (package-desc-reqs
+					      (cdr pkg-desc))))))))
+  package-list)
+
+(defun package-read-from-string (str)
+  "Read a Lisp expression from STR.
+Signal an error if the entire string was not used."
+  (let* ((read-data (read-from-string str))
+	 (more-left
+	  (condition-case nil
+	      ;; The call to `ignore' suppresses a compiler warning.
+	      (progn (ignore (read-from-string
+			      (substring str (cdr read-data))))
+		     t)
+	    (end-of-file nil))))
+    (if more-left
+        (error "Can't read whole string")
+      (car read-data))))
+
+(defun package--read-archive-file (file)
+  "Re-read archive file FILE, if it exists.
+Will return the data from the file, or nil if the file does not exist.
+Will throw an error if the archive version is too new."
+  (let ((filename (expand-file-name file package-user-dir)))
+    (when (file-exists-p filename)
+      (with-temp-buffer
+	(insert-file-contents-literally filename)
+	(let ((contents (read (current-buffer))))
+	  (if (> (car contents) package-archive-version)
+	      (error "Package archive version %d is higher than %d"
+		     (car contents) package-archive-version))
+	  (cdr contents))))))
+
+(defun package-read-all-archive-contents ()
+  "Re-read `archive-contents', if it exists.
+If successful, set `package-archive-contents'."
+  (setq package-archive-contents nil)
+  (dolist (archive package-archives)
+    (package-read-archive-contents (car archive))))
+
+(defun package-read-archive-contents (archive)
+  "Re-read archive contents for ARCHIVE.
+If successful, set the variable `package-archive-contents'.
+If the archive version is too new, signal an error."
+  ;; Version 1 of 'archive-contents' is identical to our internal
+  ;; representation.
+  (let* ((dir (concat "archives/" archive))
+	 (contents-file (concat dir "/archive-contents"))
+	 contents)
+    (when (setq contents (package--read-archive-file contents-file))
+      (dolist (package contents)
+	(package--add-to-archive-contents package archive)))))
+
+(defun package--add-to-archive-contents (package archive)
+  "Add the PACKAGE from the given ARCHIVE if necessary.
+Also, add the originating archive to the end of the package vector."
+  (let* ((name    (car package))
+         (version (package-desc-vers (cdr package)))
+         (entry   (cons name
+			(vconcat (cdr package) (vector archive))))
+         (existing-package (assq name package-archive-contents)))
+    (cond ((not existing-package)
+	   (add-to-list 'package-archive-contents entry))
+	  ((version-list-< (package-desc-vers (cdr existing-package))
+			   version)
+	   ;; Replace the entry with this one.
+	   (setq package-archive-contents
+		 (cons entry
+		       (delq existing-package
+			     package-archive-contents)))))))
+
+(defun package-download-transaction (package-list)
+  "Download and install all the packages in PACKAGE-LIST.
+PACKAGE-LIST should be a list of package names (symbols).
+This function assumes that all package requirements in
+PACKAGE-LIST are satisfied, i.e. that PACKAGE-LIST is computed
+using `package-compute-transaction'."
+  (dolist (elt package-list)
+    (let* ((desc (cdr (assq elt package-archive-contents)))
+	   ;; As an exception, if package is "held" in
+	   ;; `package-load-list', download the held version.
+	   (hold (cadr (assq elt package-load-list)))
+	   (v-string (or (and (stringp hold) hold)
+			 (package-version-join (package-desc-vers desc))))
+	   (kind (package-desc-kind desc)))
+      (cond
+       ((eq kind 'tar)
+	(package-download-tar elt v-string))
+       ((eq kind 'single)
+	(package-download-single elt v-string
+				 (package-desc-doc desc)
+				 (package-desc-reqs desc)))
+       (t
+	(error "Unknown package kind: %s" (symbol-name kind))))
+      ;; If package A depends on package B, then A may `require' B
+      ;; during byte compilation.  So we need to activate B before
+      ;; unpacking A.
+      (package-maybe-load-descriptor (symbol-name elt) v-string
+				     package-user-dir)
+      (package-activate elt (version-to-list v-string)))))
+
+;;;###autoload
+(defun package-install (name)
+  "Install the package named NAME.
+NAME should be the name of one of the available packages in an
+archive in `package-archives'.  Interactively, prompt for NAME."
+  (interactive
+   (progn
+     ;; Initialize the package system to get the list of package
+     ;; symbols for completion.
+     (unless package--initialized
+       (package-initialize t))
+     (unless package-archive-contents
+       (package-refresh-contents))
+     (list (intern (completing-read
+		    "Install package: "
+		    (mapcar (lambda (elt)
+			      (cons (symbol-name (car elt))
+				    nil))
+			    package-archive-contents)
+		    nil t)))))
+  (let ((pkg-desc (assq name package-archive-contents)))
+    (unless pkg-desc
+      (error "Package `%s' is not available for installation"
+	     (symbol-name name)))
+    (package-download-transaction
+     (package-compute-transaction (list name)
+				  (package-desc-reqs (cdr pkg-desc))))))
+
+(defun package-strip-rcs-id (str)
+  "Strip RCS version ID from the version string STR.
+If the result looks like a dotted numeric version, return it.
+Otherwise return nil."
+  (when str
+    (when (string-match "\\`[ \t]*[$]Revision:[ \t]+" str)
+      (setq str (substring str (match-end 0))))
+    (condition-case nil
+	(if (version-to-list str)
+	    str)
+      (error nil))))
+
+(defun package-buffer-info ()
+  "Return a vector describing the package in the current buffer.
+The vector has the form
+
+   [FILENAME REQUIRES DESCRIPTION VERSION COMMENTARY]
+
+FILENAME is the file name, a string, sans the \".el\" extension.
+REQUIRES is a list of requirements, each requirement having the
+ form (NAME VER); NAME is a string and VER is a version list.
+DESCRIPTION is the package description, a string.
+VERSION is the version, a string.
+COMMENTARY is the commentary section, a string, or nil if none.
+
+If the buffer does not contain a conforming package, signal an
+error.  If there is a package, narrow the buffer to the file's
+boundaries."
+  (goto-char (point-min))
+  (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
+    (error "Packages lacks a file header"))
+  (let ((file-name (match-string-no-properties 1))
+	(desc      (match-string-no-properties 2))
+	(start     (line-beginning-position)))
+    (unless (search-forward (concat ";;; " file-name ".el ends here"))
+      (error "Package lacks a terminating comment"))
+    ;; Try to include a trailing newline.
+    (forward-line)
+    (narrow-to-region start (point))
+    (require 'lisp-mnt)
+    ;; Use some headers we've invented to drive the process.
+    (let* ((requires-str (lm-header "package-requires"))
+	   (requires (if requires-str
+			 (package-read-from-string requires-str)))
+	   ;; Prefer Package-Version; if defined, the package author
+	   ;; probably wants us to use it.  Otherwise try Version.
+	   (pkg-version
+	    (or (package-strip-rcs-id (lm-header "package-version"))
+		(package-strip-rcs-id (lm-header "version"))))
+	   (commentary (lm-commentary)))
+      (unless pkg-version
+	(error
+	 "Package lacks a \"Version\" or \"Package-Version\" header"))
+      ;; Turn string version numbers into list form.
+      (setq requires
+	    (mapcar
+	     (lambda (elt)
+	       (list (car elt)
+		     (version-to-list (car (cdr elt)))))
+	     requires))
+      (vector file-name requires desc pkg-version commentary))))
+
+(defun package-tar-file-info (file)
+  "Find package information for a tar file.
+FILE is the name of the tar file to examine.
+The return result is a vector like `package-buffer-info'."
+  (let ((default-directory (file-name-directory file))
+	(file (file-name-nondirectory file)))
+    (unless (string-match (concat "\\`" package-subdirectory-regexp "\\.tar\\'")
+			  file)
+      (error "Invalid package name `%s'" file))
+    (let* ((pkg-name (match-string-no-properties 1 file))
+	   (pkg-version (match-string-no-properties 2 file))
+	   ;; Extract the package descriptor.
+	   (pkg-def-contents (shell-command-to-string
+			      ;; Requires GNU tar.
+			      (concat "tar -xOf " file " "
+
+				      pkg-name "-" pkg-version "/"
+				      pkg-name "-pkg.el")))
+	   (pkg-def-parsed (package-read-from-string pkg-def-contents)))
+      (unless (eq (car pkg-def-parsed) 'define-package)
+	(error "No `define-package' sexp is present in `%s-pkg.el'" pkg-name))
+      (let ((name-str       (nth 1 pkg-def-parsed))
+	    (version-string (nth 2 pkg-def-parsed))
+	    (docstring      (nth 3 pkg-def-parsed))
+	    (requires       (nth 4 pkg-def-parsed))
+	    (readme (shell-command-to-string
+		     ;; Requires GNU tar.
+		     (concat "tar -xOf " file " "
+			     pkg-name "-" pkg-version "/README"))))
+	(unless (equal pkg-version version-string)
+	  (error "Package has inconsistent versions"))
+	(unless (equal pkg-name name-str)
+	  (error "Package has inconsistent names"))
+	;; Kind of a hack.
+	(if (string-match ": Not found in archive" readme)
+	    (setq readme nil))
+	;; Turn string version numbers into list form.
+	(if (eq (car requires) 'quote)
+	    (setq requires (car (cdr requires))))
+	(setq requires
+	      (mapcar (lambda (elt)
+			(list (car elt)
+			      (version-to-list (cadr elt))))
+		      requires))
+	(vector pkg-name requires docstring version-string readme)))))
+
+;;;###autoload
+(defun package-install-from-buffer (pkg-info type)
+  "Install a package from the current buffer.
+When called interactively, the current buffer is assumed to be a
+single .el file that follows the packaging guidelines; see info
+node `(elisp)Packaging'.
+
+When called from Lisp, PKG-INFO is a vector describing the
+information, of the type returned by `package-buffer-info'; and
+TYPE is the package type (either `single' or `tar')."
+  (interactive (list (package-buffer-info) 'single))
+  (save-excursion
+    (save-restriction
+      (let* ((file-name (aref pkg-info 0))
+	     (requires  (aref pkg-info 1))
+	     (desc (if (string= (aref pkg-info 2) "")
+		       "No description available."
+		     (aref pkg-info 2)))
+	     (pkg-version (aref pkg-info 3)))
+	;; Download and install the dependencies.
+	(let ((transaction (package-compute-transaction nil requires)))
+	  (package-download-transaction transaction))
+	;; Install the package itself.
+	(cond
+	 ((eq type 'single)
+	  (package-unpack-single file-name pkg-version desc requires))
+	 ((eq type 'tar)
+	  (package-unpack (intern file-name) pkg-version))
+	 (t
+	  (error "Unknown type: %s" (symbol-name type))))
+	;; Try to activate it.
+	(package-initialize)))))
+
+;;;###autoload
+(defun package-install-file (file)
+  "Install a package from a file.
+The file can either be a tar file or an Emacs Lisp file."
+  (interactive "fPackage file name: ")
+  (with-temp-buffer
+    (insert-file-contents-literally file)
+    (cond
+     ((string-match "\\.el$" file)
+      (package-install-from-buffer (package-buffer-info) 'single))
+     ((string-match "\\.tar$" file)
+      (package-install-from-buffer (package-tar-file-info file) 'tar))
+     (t (error "Unrecognized extension `%s'" (file-name-extension file))))))
+
+(defun package-delete (name version)
+  (let ((dir (package--dir name version)))
+    (if (string-equal (file-name-directory dir)
+		      (file-name-as-directory
+		       (expand-file-name package-user-dir)))
+	(progn
+	  (delete-directory dir t t)
+	  (message "Package `%s-%s' deleted." name version))
+      ;; Don't delete "system" packages
+      (error "Package `%s-%s' is a system package, not deleting"
+	     name version))))
+
+(defun package-archive-base (name)
+  "Return the archive containing the package NAME."
+  (let ((desc (cdr (assq (intern-soft name) package-archive-contents))))
+    (cdr (assoc (aref desc (- (length desc) 1)) package-archives))))
+
+(defun package--download-one-archive (archive file)
+  "Retrieve an archive file FILE from ARCHIVE, and cache it.
+ARCHIVE should be a cons cell of the form (NAME . LOCATION),
+similar to an entry in `package-alist'.  Save the cached copy to
+\"archives/NAME/archive-contents\" in `package-user-dir'."
+  (let* ((dir (expand-file-name "archives" package-user-dir))
+	 (dir (expand-file-name (car archive) dir)))
+    (package--with-work-buffer (cdr archive) file
+      ;; Read the retrieved buffer to make sure it is valid (e.g. it
+      ;; may fetch a URL redirect page).
+      (when (listp (read buffer))
+	(make-directory dir t)
+	(setq buffer-file-name (expand-file-name file dir))
+	(let ((version-control 'never))
+	  (save-buffer))))))
+
+;;;###autoload
+(defun package-refresh-contents ()
+  "Download the ELPA archive description if needed.
+This informs Emacs about the latest versions of all packages, and
+makes them available for download."
+  (interactive)
+  (unless (file-exists-p package-user-dir)
+    (make-directory package-user-dir t))
+  (dolist (archive package-archives)
+    (condition-case-unless-debug nil
+	(package--download-one-archive archive "archive-contents")
+      (error (message "Failed to download `%s' archive."
+		      (car archive)))))
+  (package-read-all-archive-contents))
+
+;;;###autoload
+(defun package-initialize (&optional no-activate)
+  "Load Emacs Lisp packages, and activate them.
+The variable `package-load-list' controls which packages to load.
+If optional arg NO-ACTIVATE is non-nil, don't activate packages."
+  (interactive)
+  (setq package-alist nil
+	package-obsolete-alist nil)
+  (package-load-all-descriptors)
+  (package-read-all-archive-contents)
+  (unless no-activate
+    (dolist (elt package-alist)
+      (package-activate (car elt) (package-desc-vers (cdr elt)))))
+  (setq package--initialized t))
+
+
+;;;; Package description buffer.
+
+;;;###autoload
+(defun describe-package (package)
+  "Display the full documentation of PACKAGE (a symbol)."
+  (interactive
+   (let* ((guess (function-called-at-point))
+	  packages val)
+     (require 'finder-inf nil t)
+     ;; Load the package list if necessary (but don't activate them).
+     (unless package--initialized
+       (package-initialize t))
+     (setq packages (append (mapcar 'car package-alist)
+			    (mapcar 'car package-archive-contents)
+			    (mapcar 'car package--builtins)))
+     (unless (memq guess packages)
+       (setq guess nil))
+     (setq packages (mapcar 'symbol-name packages))
+     (setq val
+	   (completing-read (if guess
+				(format "Describe package (default %s): "
+					guess)
+			      "Describe package: ")
+			    packages nil t nil nil guess))
+     (list (if (equal val "") guess (intern val)))))
+  (if (or (null package) (not (symbolp package)))
+      (message "No package specified")
+    (help-setup-xref (list #'describe-package package)
+		     (called-interactively-p 'interactive))
+    (with-help-window (help-buffer)
+      (with-current-buffer standard-output
+	(describe-package-1 package)))))
+
+(defun describe-package-1 (package)
+  (require 'lisp-mnt)
+  (let ((package-name (symbol-name package))
+	(built-in (assq package package--builtins))
+	desc pkg-dir reqs version installable archive)
+    (prin1 package)
+    (princ " is ")
+    (cond
+     ;; Loaded packages are in `package-alist'.
+     ((setq desc (cdr (assq package package-alist)))
+      (setq version (package-version-join (package-desc-vers desc)))
+      (if (setq pkg-dir (package--dir package-name version))
+	  (insert "an installed package.\n\n")
+	;; This normally does not happen.
+	(insert "a deleted package.\n\n")))
+     ;; Available packages are in `package-archive-contents'.
+     ((setq desc (cdr (assq package package-archive-contents)))
+      (setq version (package-version-join (package-desc-vers desc))
+	    archive (aref desc (- (length desc) 1))
+	    installable t)
+      (if built-in
+	  (insert "a built-in package.\n\n")
+	(insert "an uninstalled package.\n\n")))
+     (built-in
+      (setq desc (cdr built-in)
+	    version (package-version-join (package-desc-vers desc)))
+      (insert "a built-in package.\n\n"))
+     (t
+      (insert "an orphan package.\n\n")))
+
+    (insert "     " (propertize "Status" 'font-lock-face 'bold) ": ")
+    (cond (pkg-dir
+	   (insert (propertize "Installed"
+			       'font-lock-face 'font-lock-comment-face))
+	   (insert " in `")
+	   ;; Todo: Add button for uninstalling.
+	   (help-insert-xref-button (file-name-as-directory pkg-dir)
+				    'help-package-def pkg-dir)
+	   (if built-in
+	       (insert "',\n             shadowing a "
+		       (propertize "built-in package"
+				   'font-lock-face 'font-lock-builtin-face)
+		       ".")
+	     (insert "'.")))
+	  (installable
+	   (if built-in
+	       (insert (propertize "Built-in." 'font-lock-face 'font-lock-builtin-face)
+		       "  Alternate version available")
+	     (insert "Available"))
+	   (insert " from " archive)
+	   (insert " -- ")
+	   (let ((button-text (if (display-graphic-p) "Install" "[Install]"))
+		 (button-face (if (display-graphic-p)
+				  '(:box (:line-width 2 :color "dark grey")
+					 :background "light grey"
+					 :foreground "black")
+				'link)))
+	     (insert-text-button button-text 'face button-face 'follow-link t
+				 'package-symbol package
+				 'action 'package-install-button-action)))
+	  (built-in
+	   (insert (propertize "Built-in." 'font-lock-face 'font-lock-builtin-face)))
+	  (t (insert "Deleted.")))
+    (insert "\n")
+    (and version (> (length version) 0)
+	 (insert "    "
+		 (propertize "Version" 'font-lock-face 'bold) ": " version "\n"))
+
+    (setq reqs (if desc (package-desc-reqs desc)))
+    (when reqs
+      (insert "   " (propertize "Requires" 'font-lock-face 'bold) ": ")
+      (let ((first t)
+	    name vers text)
+	(dolist (req reqs)
+	  (setq name (car req)
+		vers (cadr req)
+		text (format "%s-%s" (symbol-name name)
+			     (package-version-join vers)))
+	  (cond (first (setq first nil))
+		((>= (+ 2 (current-column) (length text))
+		     (window-width))
+		 (insert ",\n               "))
+		(t (insert ", ")))
+	  (help-insert-xref-button text 'help-package name))
+	(insert "\n")))
+    (insert "    " (propertize "Summary" 'font-lock-face 'bold)
+	    ": " (if desc (package-desc-doc desc)) "\n\n")
+
+    (if built-in
+	;; For built-in packages, insert the commentary.
+	(let ((fn (locate-file (concat package-name ".el") load-path
+			       load-file-rep-suffixes))
+	      (opoint (point)))
+	  (insert (or (lm-commentary fn) ""))
+	  (save-excursion
+	    (goto-char opoint)
+	    (when (re-search-forward "^;;; Commentary:\n" nil t)
+	      (replace-match ""))
+	    (while (re-search-forward "^\\(;+ ?\\)" nil t)
+	      (replace-match ""))))
+      (let ((readme (expand-file-name (concat package-name "-readme.txt")
+				      package-user-dir))
+	    readme-string)
+	;; For elpa packages, try downloading the commentary.  If that
+	;; fails, try an existing readme file in `package-user-dir'.
+	(cond ((condition-case nil
+		   (package--with-work-buffer (package-archive-base package)
+					      (concat package-name "-readme.txt")
+		     (setq buffer-file-name
+			   (expand-file-name readme package-user-dir))
+		     (let ((version-control 'never))
+		       (save-buffer))
+		     (setq readme-string (buffer-string))
+		     t)
+		 (error nil))
+	       (insert readme-string))
+	      ((file-readable-p readme)
+	       (insert-file-contents readme)
+	       (goto-char (point-max))))))))
+
+(defun package-install-button-action (button)
+  (let ((package (button-get button 'package-symbol)))
+    (when (y-or-n-p (format "Install package `%s'? " package))
+      (package-install package)
+      (revert-buffer nil t)
+      (goto-char (point-min)))))
+
+
+;;;; Package menu mode.
+
+(defvar package-menu-mode-map
+  (let ((map (make-sparse-keymap))
+	(menu-map (make-sparse-keymap "Package")))
+    (set-keymap-parent map tabulated-list-mode-map)
+    (define-key map "\C-m" 'package-menu-describe-package)
+    (define-key map "u" 'package-menu-mark-unmark)
+    (define-key map "\177" 'package-menu-backup-unmark)
+    (define-key map "d" 'package-menu-mark-delete)
+    (define-key map "i" 'package-menu-mark-install)
+    (define-key map "U" 'package-menu-mark-upgrades)
+    (define-key map "r" 'package-menu-refresh)
+    (define-key map "~" 'package-menu-mark-obsolete-for-deletion)
+    (define-key map "x" 'package-menu-execute)
+    (define-key map "h" 'package-menu-quick-help)
+    (define-key map "?" 'package-menu-describe-package)
+    (define-key map [menu-bar package-menu] (cons "Package" menu-map))
+    (define-key menu-map [mq]
+      '(menu-item "Quit" quit-window
+		  :help "Quit package selection"))
+    (define-key menu-map [s1] '("--"))
+    (define-key menu-map [mn]
+      '(menu-item "Next" next-line
+		  :help "Next Line"))
+    (define-key menu-map [mp]
+      '(menu-item "Previous" previous-line
+		  :help "Previous Line"))
+    (define-key menu-map [s2] '("--"))
+    (define-key menu-map [mu]
+      '(menu-item "Unmark" package-menu-mark-unmark
+		  :help "Clear any marks on a package and move to the next line"))
+    (define-key menu-map [munm]
+      '(menu-item "Unmark Backwards" package-menu-backup-unmark
+		  :help "Back up one line and clear any marks on that package"))
+    (define-key menu-map [md]
+      '(menu-item "Mark for Deletion" package-menu-mark-delete
+		  :help "Mark a package for deletion and move to the next line"))
+    (define-key menu-map [mi]
+      '(menu-item "Mark for Install" package-menu-mark-install
+		  :help "Mark a package for installation and move to the next line"))
+    (define-key menu-map [mupgrades]
+      '(menu-item "Mark Upgradable Packages" package-menu-mark-upgrades
+		  :help "Mark packages that have a newer version for upgrading"))
+    (define-key menu-map [s3] '("--"))
+    (define-key menu-map [mg]
+      '(menu-item "Update Package List" revert-buffer
+		  :help "Update the list of packages"))
+    (define-key menu-map [mr]
+      '(menu-item "Refresh Package List" package-menu-refresh
+		  :help "Download the ELPA archive"))
+    (define-key menu-map [s4] '("--"))
+    (define-key menu-map [mt]
+      '(menu-item "Mark Obsolete Packages" package-menu-mark-obsolete-for-deletion
+		  :help "Mark all obsolete packages for deletion"))
+    (define-key menu-map [mx]
+      '(menu-item "Execute Actions" package-menu-execute
+		  :help "Perform all the marked actions"))
+    (define-key menu-map [s5] '("--"))
+    (define-key menu-map [mh]
+      '(menu-item "Help" package-menu-quick-help
+		  :help "Show short key binding help for package-menu-mode"))
+    (define-key menu-map [mc]
+      '(menu-item "View Commentary" package-menu-view-commentary
+		  :help "Display information about this package"))
+    map)
+  "Local keymap for `package-menu-mode' buffers.")
+
+(defvar package-menu--new-package-list nil
+  "List of newly-available packages since `list-packages' was last called.")
+
+(define-derived-mode package-menu-mode tabulated-list-mode "Package Menu"
+  "Major mode for browsing a list of packages.
+Letters do not insert themselves; instead, they are commands.
+\\<package-menu-mode-map>
+\\{package-menu-mode-map}"
+  (setq tabulated-list-format [("Package" 18 package-menu--name-predicate)
+			       ("Version" 12 nil)
+			       ("Status"  10 package-menu--status-predicate)
+			       ("Description" 0 nil)])
+  (setq tabulated-list-padding 2)
+  (setq tabulated-list-sort-key (cons "Status" nil))
+  (tabulated-list-init-header))
+
+(defmacro package--push (package desc status listname)
+  "Convenience macro for `package-menu--generate'.
+If the alist stored in the symbol LISTNAME lacks an entry for a
+package PACKAGE with descriptor DESC, add one.  The alist is
+keyed with cons cells (PACKAGE . VERSION-LIST), where PACKAGE is
+a symbol and VERSION-LIST is a version list."
+  `(let* ((version (package-desc-vers ,desc))
+	  (key (cons ,package version)))
+     (unless (assoc key ,listname)
+       (push (list key ,status (package-desc-doc ,desc)) ,listname))))
+
+(defun package-menu--generate (remember-pos packages)
+  "Populate the Package Menu.
+If REMEMBER-POS is non-nil, keep point on the same entry.
+PACKAGES should be t, which means to display all known packages,
+or a list of package names (symbols) to display."
+  ;; Construct list of ((PACKAGE . VERSION) STATUS DESCRIPTION).
+  (let (info-list name)
+    ;; Installed packages:
+    (dolist (elt package-alist)
+      (setq name (car elt))
+      (when (or (eq packages t) (memq name packages))
+	(package--push name (cdr elt)
+		       (if (stringp (cadr (assq name package-load-list)))
+			   "held" "installed")
+		       info-list)))
+
+    ;; Built-in packages:
+    (dolist (elt package--builtins)
+      (setq name (car elt))
+      (when (and (not (eq name 'emacs)) ; Hide the `emacs' package.
+		 (or (eq packages t) (memq name packages)))
+    	(package--push name (cdr elt) "built-in" info-list)))
+
+    ;; Available and disabled packages:
+    (dolist (elt package-archive-contents)
+      (setq name (car elt))
+      (when (or (eq packages t) (memq name packages))
+	(let ((hold (assq name package-load-list)))
+	  (package--push name (cdr elt)
+			 (cond
+			  ((and hold (null (cadr hold))) "disabled")
+			  ((memq name package-menu--new-package-list) "new")
+			  (t "available"))
+			 info-list))))
+
+    ;; Obsolete packages:
+    (dolist (elt package-obsolete-alist)
+      (dolist (inner-elt (cdr elt))
+	(when (or (eq packages t) (memq (car elt) packages))
+	  (package--push (car elt) (cdr inner-elt) "obsolete" info-list))))
+
+    ;; Print the result.
+    (setq tabulated-list-entries (mapcar 'package-menu--print-info info-list))
+    (tabulated-list-print remember-pos)))
+
+(defun package-menu--print-info (pkg)
+  "Return a package entry suitable for `tabulated-list-entries'.
+PKG has the form ((PACKAGE . VERSION) STATUS DOC).
+Return (KEY [NAME VERSION STATUS DOC]), where KEY is the
+identifier (NAME . VERSION-LIST)."
+  (let* ((package (caar pkg))
+	 (version (cdr (car pkg)))
+	 (status  (nth 1 pkg))
+	 (doc (or (nth 2 pkg) ""))
+	 (face (cond
+		((string= status "built-in")  'font-lock-builtin-face)
+		((string= status "available") 'default)
+		((string= status "new") 'bold)
+		((string= status "held")      'font-lock-constant-face)
+		((string= status "disabled")  'font-lock-warning-face)
+		((string= status "installed") 'font-lock-comment-face)
+		(t 'font-lock-warning-face)))) ; obsolete.
+    (list (cons package version)
+	  (vector (list (symbol-name package)
+			'face 'link
+			'follow-link t
+			'package-symbol package
+			'action 'package-menu-describe-package)
+		  (propertize (package-version-join version)
+			      'font-lock-face face)
+		  (propertize status 'font-lock-face face)
+		  (propertize doc 'font-lock-face face)))))
+
+(defun package-menu-refresh ()
+  "Download the Emacs Lisp package archive.
+This fetches the contents of each archive specified in
+`package-archives', and then refreshes the package menu."
+  (interactive)
+  (unless (derived-mode-p 'package-menu-mode)
+    (error "The current buffer is not a Package Menu"))
+  (package-refresh-contents)
+  (package-menu--generate t t))
+
+(defun package-menu-describe-package (&optional button)
+  "Describe the current package.
+If optional arg BUTTON is non-nil, describe its associated package."
+  (interactive)
+  (let ((package (if button (button-get button 'package-symbol)
+		   (car (tabulated-list-get-id)))))
+    (if package
+	(describe-package package))))
+
+;; fixme numeric argument
+(defun package-menu-mark-delete (&optional _num)
+  "Mark a package for deletion and move to the next line."
+  (interactive "p")
+  (if (member (package-menu-get-status) '("installed" "obsolete"))
+      (tabulated-list-put-tag "D" t)
+    (forward-line)))
+
+(defun package-menu-mark-install (&optional _num)
+  "Mark a package for installation and move to the next line."
+  (interactive "p")
+  (if (member (package-menu-get-status) '("available" "new"))
+      (tabulated-list-put-tag "I" t)
+    (forward-line)))
+
+(defun package-menu-mark-unmark (&optional _num)
+  "Clear any marks on a package and move to the next line."
+  (interactive "p")
+  (tabulated-list-put-tag " " t))
+
+(defun package-menu-backup-unmark ()
+  "Back up one line and clear any marks on that package."
+  (interactive)
+  (forward-line -1)
+  (tabulated-list-put-tag " "))
+
+(defun package-menu-mark-obsolete-for-deletion ()
+  "Mark all obsolete packages for deletion."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (while (not (eobp))
+      (if (equal (package-menu-get-status) "obsolete")
+	  (tabulated-list-put-tag "D" t)
+	(forward-line 1)))))
+
+(defun package-menu-quick-help ()
+  "Show short key binding help for package-menu-mode."
+  (interactive)
+  (message "n-ext, i-nstall, d-elete, u-nmark, x-ecute, r-efresh, h-elp"))
+
+(define-obsolete-function-alias
+  'package-menu-view-commentary 'package-menu-describe-package "24.1")
+
+(defun package-menu-get-status ()
+  (let* ((pkg (tabulated-list-get-id))
+	 (entry (and pkg (assq pkg tabulated-list-entries))))
+    (if entry
+	(aref (cadr entry) 2)
+      "")))
+
+(defun package-menu--find-upgrades ()
+  (let (installed available upgrades)
+    ;; Build list of installed/available packages in this buffer.
+    (dolist (entry tabulated-list-entries)
+      ;; ENTRY is ((NAME . VERSION) [NAME VERSION STATUS DOC])
+      (let ((pkg (car entry))
+	    (status (aref (cadr entry) 2)))
+	(cond ((equal status "installed")
+	       (push pkg installed))
+	      ((member status '("available" "new"))
+	       (push pkg available)))))
+    ;; Loop through list of installed packages, finding upgrades
+    (dolist (pkg installed)
+      (let ((avail-pkg (assq (car pkg) available)))
+	(and avail-pkg
+	     (version-list-< (cdr pkg) (cdr avail-pkg))
+	     (push avail-pkg upgrades))))
+    upgrades))
+
+(defun package-menu-mark-upgrades ()
+  "Mark all upgradable packages in the Package Menu.
+For each installed package with a newer version available, place
+an (I)nstall flag on the available version and a (D)elete flag on
+the installed version.  A subsequent \\[package-menu-execute]
+call will upgrade the package."
+  (interactive)
+  (unless (derived-mode-p 'package-menu-mode)
+    (error "The current buffer is not a Package Menu"))
+  (let ((upgrades (package-menu--find-upgrades)))
+    (if (null upgrades)
+	(message "No packages to upgrade.")
+      (widen)
+      (save-excursion
+	(goto-char (point-min))
+	(while (not (eobp))
+	  (let* ((pkg (tabulated-list-get-id))
+		 (upgrade (assq (car pkg) upgrades)))
+	    (cond ((null upgrade)
+		   (forward-line 1))
+		  ((equal pkg upgrade)
+		   (package-menu-mark-install))
+		  (t
+		   (package-menu-mark-delete))))))
+      (message "%d package%s marked for upgrading."
+	       (length upgrades)
+	       (if (= (length upgrades) 1) "" "s")))))
+
+(defun package-menu-execute (&optional noquery)
+  "Perform marked Package Menu actions.
+Packages marked for installation are downloaded and installed;
+packages marked for deletion are removed.
+Optional argument NOQUERY non-nil means do not ask the user to confirm."
+  (interactive)
+  (unless (derived-mode-p 'package-menu-mode)
+    (error "The current buffer is not in Package Menu mode"))
+  (let (install-list delete-list cmd id)
+    (save-excursion
+      (goto-char (point-min))
+      (while (not (eobp))
+	(setq cmd (char-after))
+	(unless (eq cmd ?\s)
+	  ;; This is the key (PACKAGE . VERSION-LIST).
+	  (setq id (tabulated-list-get-id))
+	  (cond ((eq cmd ?D)
+		 (push (cons (symbol-name (car id))
+			     (package-version-join (cdr id)))
+		       delete-list))
+		((eq cmd ?I)
+		 (push (car id) install-list))))
+	(forward-line)))
+    (when install-list
+      (if (or
+           noquery
+           (yes-or-no-p
+	   (if (= (length install-list) 1)
+	       (format "Install package `%s'? " (car install-list))
+	     (format "Install these %d packages (%s)? "
+		     (length install-list)
+                      (mapconcat 'symbol-name install-list ", ")))))
+	  (mapc 'package-install install-list)))
+    ;; Delete packages, prompting if necessary.
+    (when delete-list
+      (if (or
+           noquery
+           (yes-or-no-p
+	   (if (= (length delete-list) 1)
+	       (format "Delete package `%s-%s'? "
+		       (caar delete-list)
+		       (cdr (car delete-list)))
+	     (format "Delete these %d packages (%s)? "
+		     (length delete-list)
+		     (mapconcat (lambda (elt)
+				  (concat (car elt) "-" (cdr elt)))
+				delete-list
+                                 ", ")))))
+	  (dolist (elt delete-list)
+	    (condition-case-unless-debug err
+		(package-delete (car elt) (cdr elt))
+	      (error (message (cadr err)))))
+	(error "Aborted")))
+    ;; If we deleted anything, regenerate `package-alist'.  This is done
+    ;; automatically if we installed a package.
+    (and delete-list (null install-list)
+	 (package-initialize))
+    (if (or delete-list install-list)
+	(package-menu--generate t t)
+      (message "No operations specified."))))
+
+(defun package-menu--version-predicate (A B)
+  (let ((vA (or (aref (cadr A) 1)  '(0)))
+	(vB (or (aref (cadr B) 1) '(0))))
+    (if (version-list-= vA vB)
+	(package-menu--name-predicate A B)
+      (version-list-< vA vB))))
+
+(defun package-menu--status-predicate (A B)
+  (let ((sA (aref (cadr A) 2))
+	(sB (aref (cadr B) 2)))
+    (cond ((string= sA sB)
+	   (package-menu--name-predicate A B))
+	  ((string= sA "new") t)
+	  ((string= sB "new") nil)
+	  ((string= sA "available") t)
+	  ((string= sB "available") nil)
+	  ((string= sA "installed") t)
+	  ((string= sB "installed") nil)
+	  ((string= sA "held") t)
+	  ((string= sB "held") nil)
+	  ((string= sA "built-in") t)
+	  ((string= sB "built-in") nil)
+	  ((string= sA "obsolete") t)
+	  ((string= sB "obsolete") nil)
+	  (t (string< sA sB)))))
+
+(defun package-menu--description-predicate (A B)
+  (let ((dA (aref (cadr A) 3))
+	(dB (aref (cadr B) 3)))
+    (if (string= dA dB)
+	(package-menu--name-predicate A B)
+      (string< dA dB))))
+
+(defun package-menu--name-predicate (A B)
+  (string< (symbol-name (caar A))
+	   (symbol-name (caar B))))
+
+;;;###autoload
+(defun list-packages (&optional no-fetch)
+  "Display a list of packages.
+This first fetches the updated list of packages before
+displaying, unless a prefix argument NO-FETCH is specified.
+The list is displayed in a buffer named `*Packages*'."
+  (interactive "P")
+  (require 'finder-inf nil t)
+  ;; Initialize the package system if necessary.
+  (unless package--initialized
+    (package-initialize t))
+  (let (old-archives new-packages)
+    (unless no-fetch
+      ;; Read the locally-cached archive-contents.
+      (package-read-all-archive-contents)
+      (setq old-archives package-archive-contents)
+      ;; Fetch the remote list of packages.
+      (package-refresh-contents)
+      ;; Find which packages are new.
+      (dolist (elt package-archive-contents)
+	(unless (assq (car elt) old-archives)
+	  (push (car elt) new-packages))))
+
+    ;; Generate the Package Menu.
+    (let ((buf (get-buffer-create "*Packages*")))
+      (with-current-buffer buf
+	(package-menu-mode)
+	(set (make-local-variable 'package-menu--new-package-list)
+	     new-packages)
+	(package-menu--generate nil t))
+      ;; The package menu buffer has keybindings.  If the user types
+      ;; `M-x list-packages', that suggests it should become current.
+      (switch-to-buffer buf))
+
+    (let ((upgrades (package-menu--find-upgrades)))
+      (if upgrades
+	  (message "%d package%s can be upgraded; type `%s' to mark %s for upgrading."
+		   (length upgrades)
+		   (if (= (length upgrades) 1) "" "s")
+		   (substitute-command-keys "\\[package-menu-mark-upgrades]")
+		   (if (= (length upgrades) 1) "it" "them"))))))
+
+;;;###autoload
+(defalias 'package-list-packages 'list-packages)
+
+;; Used in finder.el
+(defun package-show-package-list (packages)
+  "Display PACKAGES in a *Packages* buffer.
+This is similar to `list-packages', but it does not fetch the
+updated list of packages, and it only displays packages with
+names in PACKAGES (which should be a list of symbols)."
+  (require 'finder-inf nil t)
+  (let ((buf (get-buffer-create "*Packages*")))
+    (with-current-buffer buf
+      (package-menu-mode)
+      (package-menu--generate nil packages))
+    (switch-to-buffer buf)))
+
+(defun package-list-packages-no-fetch ()
+  "Display a list of packages.
+Does not fetch the updated list of packages before displaying.
+The list is displayed in a buffer named `*Packages*'."
+  (interactive)
+  (list-packages t))
+
+(provide 'package)
+
+;;; package.el ends here
diff --git a/elpa/tabulated-list-0/tabulated-list-autoloads.el b/elpa/tabulated-list-0/tabulated-list-autoloads.el
new file mode 100644
index 00000000..019d94ea
--- /dev/null
+++ b/elpa/tabulated-list-0/tabulated-list-autoloads.el
@@ -0,0 +1,61 @@
+;;; tabulated-list-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (tabulated-list-mode) "tabulated-list" "tabulated-list.el"
+;;;;;;  (21205 13642))
+;;; Generated autoloads from tabulated-list.el
+
+(autoload 'tabulated-list-mode "tabulated-list" "\
+Generic major mode for browsing a list of items.
+This mode is usually not used directly; instead, other major
+modes are derived from it, using `define-derived-mode'.
+
+In this major mode, the buffer is divided into multiple columns,
+which are labeled using the header line.  Each non-empty line
+belongs to one \"entry\", and the entries can be sorted according
+to their column values.
+
+An inheriting mode should usually do the following in their body:
+
+ - Set `tabulated-list-format', specifying the column format.
+ - Set `tabulated-list-revert-hook', if the buffer contents need
+   to be specially recomputed prior to `revert-buffer'.
+ - Maybe set a `tabulated-list-entries' function (see below).
+ - Maybe set `tabulated-list-printer' (see below).
+ - Maybe set `tabulated-list-padding'.
+ - Call `tabulated-list-init-header' to initialize `header-line-format'
+   according to `tabulated-list-format'.
+
+An inheriting mode is usually accompanied by a \"list-FOO\"
+command (e.g. `list-packages', `list-processes').  This command
+creates or switches to a buffer and enables the major mode in
+that buffer.  If `tabulated-list-entries' is not a function, the
+command should initialize it to a list of entries for displaying.
+Finally, it should call `tabulated-list-print'.
+
+`tabulated-list-print' calls the printer function specified by
+`tabulated-list-printer', once for each entry.  The default
+printer is `tabulated-list-print-entry', but a mode that keeps
+data in an ewoc may instead specify a printer function (e.g., one
+that calls `ewoc-enter-last'), with `tabulated-list-print-entry'
+as the ewoc pretty-printer.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("tabulated-list-pkg.el") (21205 13642
+;;;;;;  931937))
+
+;;;***
+
+(provide 'tabulated-list-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; tabulated-list-autoloads.el ends here
diff --git a/elpa/tabulated-list-0/tabulated-list-pkg.el b/elpa/tabulated-list-0/tabulated-list-pkg.el
new file mode 100644
index 00000000..348f4463
--- /dev/null
+++ b/elpa/tabulated-list-0/tabulated-list-pkg.el
@@ -0,0 +1 @@
+(define-package "tabulated-list" "0" "generic major mode for tabulated lists." (quote nil))
diff --git a/elpa/tabulated-list-0/tabulated-list-pkg.elc b/elpa/tabulated-list-0/tabulated-list-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..c120b8333d18429c580d16173946bc7a4a2a2ea8
GIT binary patch
literal 703
zcmbtSyH3O~5WE)u0PQLbiA0>_py3V)5TZepd;q?9lQZ}c*$%I-XXC(0xfUxfoEguI
zcX#{nbbq>9t=M+Eg?ncPrBTA}3q+4zqrdH)lf5t);wY61ymbbgh366BQCMg$>D$!n
zO??6Dy17g`ohMR9N>J^c!D=VGvlahDBic}*9z+$zZqy>8EVT-;tdD;TZ#_qy)RcvX
z=_0(N4~o3k7rfz3!ah{ogU}k>5S3BiA`&5RmcZw|3UiDxU;z1Lg;6a?*M{ho?ZY{t
zK12{w(xVSP%@to?ah9tNa$zOpJ2zT6z*)*){>CWS3FOzr@YulufxIap*JyhRw?K-b
zfSbE?)A?iZ!L|F%=1(1Pc_z1M<#Y5>V+g}i9I_NVBNLXW=sme)FGsbWOM3<%A^>%B
z?s!Mcxynfd=s2~<lUgb!jmN(hV=R~0DU0PG+Bcdm$d<V>$ZFa>TJ+Q<BVH+kaS~z5
PcHqJ^FM(%Zl`hy1v?JUe

literal 0
HcmV?d00001

diff --git a/elpa/tabulated-list-0/tabulated-list.el b/elpa/tabulated-list-0/tabulated-list.el
new file mode 100644
index 00000000..8dee3000
--- /dev/null
+++ b/elpa/tabulated-list-0/tabulated-list.el
@@ -0,0 +1,372 @@
+;;; tabulated-list.el --- generic major mode for tabulated lists.
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Chong Yidong <cyd@stupidchicken.com>
+;; Keywords: extensions, lisp
+;; Version: 0
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This package is a backport of a native functionality of GNU Emacs 24.
+
+;; This file defines `tabulated-list-mode', a generic major mode for displaying
+;; lists of tabulated data, intended for other major modes to inherit from.  It
+;; provides several utility routines, e.g. for pretty-printing lines of
+;; tabulated data to fit into the appropriate columns.
+
+;; For usage information, see the documentation of `tabulated-list-mode'.
+
+;; This package originated from Tom Tromey's Package Menu mode, extended and
+;; generalized to be used by other modes.
+
+;;; Code:
+
+(defvar tabulated-list-format nil
+  "The format of the current Tabulated List mode buffer.
+This should be a vector of elements (NAME WIDTH SORT), where:
+ - NAME is a string describing the column.
+ - WIDTH is the width to reserve for the column.
+   For the final element, its numerical value is ignored.
+ - SORT specifies how to sort entries by this column.
+   If nil, this column cannot be used for sorting.
+   If t, sort by comparing the string value printed in the column.
+   Otherwise, it should be a predicate function suitable for
+   `sort', accepting arguments with the same form as the elements
+   of `tabulated-list-entries'.")
+(make-variable-buffer-local 'tabulated-list-format)
+
+(defvar tabulated-list-entries nil
+  "Entries displayed in the current Tabulated List buffer.
+This should be either a function, or a list.
+If a list, each element has the form (ID [DESC1 ... DESCN]),
+where:
+ - ID is nil, or a Lisp object uniquely identifying this entry,
+   which is used to keep the cursor on the \"same\" entry when
+   rearranging the list.  Comparison is done with `equal'.
+
+ - Each DESC is a column descriptor, one for each column
+   specified in `tabulated-list-format'.  A descriptor is either
+   a string, which is printed as-is, or a list (LABEL . PROPS),
+   which means to use `insert-text-button' to insert a text
+   button with label LABEL and button properties PROPS.
+   The string, or button label, must not contain any newline.
+
+If `tabulated-list-entries' is a function, it is called with no
+arguments and must return a list of the above form.")
+(make-variable-buffer-local 'tabulated-list-entries)
+
+(defvar tabulated-list-padding 0
+  "Number of characters preceding each Tabulated List mode entry.
+By default, lines are padded with spaces, but you can use the
+function `tabulated-list-put-tag' to change this.")
+(make-variable-buffer-local 'tabulated-list-padding)
+
+(defvar tabulated-list-revert-hook nil
+  "Hook run before reverting a Tabulated List buffer.
+This is commonly used to recompute `tabulated-list-entries'.")
+
+(defvar tabulated-list-printer 'tabulated-list-print-entry
+  "Function for inserting a Tabulated List entry at point.
+It is called with two arguments, ID and COLS.  ID is a Lisp
+object identifying the entry, and COLS is a vector of column
+descriptors, as documented in `tabulated-list-entries'.")
+(make-variable-buffer-local 'tabulated-list-printer)
+
+(defvar tabulated-list-sort-key nil
+  "Sort key for the current Tabulated List mode buffer.
+If nil, no additional sorting is performed.
+Otherwise, this should be a cons cell (NAME . FLIP).
+NAME is a string matching one of the column names in
+`tabulated-list-format' (the corresponding SORT entry in
+`tabulated-list-format' then specifies how to sort).  FLIP, if
+non-nil, means to invert the resulting sort.")
+(make-variable-buffer-local 'tabulated-list-sort-key)
+
+(defun tabulated-list-get-id (&optional pos)
+  "Obtain the entry ID of the Tabulated List mode entry at POS.
+This is an ID object from `tabulated-list-entries', or nil.
+POS, if omitted or nil, defaults to point."
+  (get-text-property (or pos (point)) 'tabulated-list-id))
+
+(defun tabulated-list-put-tag (tag &optional advance)
+  "Put TAG in the padding area of the current line.
+TAG should be a string, with length <= `tabulated-list-padding'.
+If ADVANCE is non-nil, move forward by one line afterwards."
+  (unless (stringp tag)
+    (error "Invalid argument to `tabulated-list-put-tag'"))
+  (unless (> tabulated-list-padding 0)
+    (error "Unable to tag the current line"))
+  (save-excursion
+    (beginning-of-line)
+    (when (get-text-property (point) 'tabulated-list-id)
+      (let ((beg (point))
+	    (inhibit-read-only t))
+	(forward-char tabulated-list-padding)
+	(insert-and-inherit
+	 (if (<= (length tag) tabulated-list-padding)
+	     (concat tag
+		     (make-string (- tabulated-list-padding (length tag))
+				  ?\s))
+	   (substring tag 0 tabulated-list-padding)))
+	(delete-region beg (+ beg tabulated-list-padding)))))
+  (if advance
+      (forward-line)))
+
+(defvar tabulated-list-mode-map
+  (let ((map (copy-keymap special-mode-map)))
+    (set-keymap-parent map button-buffer-map)
+    (define-key map "n" 'next-line)
+    (define-key map "p" 'previous-line)
+    (define-key map [follow-link] 'mouse-face)
+    (define-key map [mouse-2] 'mouse-select-window)
+    map)
+  "Local keymap for `tabulated-list-mode' buffers.")
+
+(defvar tabulated-list-sort-button-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [header-line mouse-1] 'tabulated-list-col-sort)
+    (define-key map [header-line mouse-2] 'tabulated-list-col-sort)
+    (define-key map [follow-link] 'mouse-face)
+    map)
+  "Local keymap for `tabulated-list-mode' sort buttons.")
+
+(defvar tabulated-list-glyphless-char-display
+  (when (boundp 'glyphless-char-display)
+    (let ((table (make-char-table 'glyphless-char-display nil)))
+      (set-char-table-parent table glyphless-char-display)
+      ;; Some text terminals can't display the unicode arrows; be safe.
+      (aset table 9650 (cons nil "^"))
+      (aset table 9660 (cons nil "v"))
+      table))
+  "The `glyphless-char-display' table in Tabulated List buffers.")
+
+(defun tabulated-list-init-header ()
+  "Set up header line for the Tabulated List buffer."
+  (let ((x tabulated-list-padding)
+	(button-props `(help-echo "Click to sort by column"
+			mouse-face highlight
+			keymap ,tabulated-list-sort-button-map))
+	(cols nil))
+    (if (> tabulated-list-padding 0)
+	(push (propertize " " 'display `(space :align-to ,x)) cols))
+    (dotimes (n (length tabulated-list-format))
+      (let* ((col (aref tabulated-list-format n))
+	     (width (nth 1 col))
+	     (label (car col)))
+	(setq x (+ x 1 width))
+	(and (<= tabulated-list-padding 0)
+	     (= n 0)
+	     (setq label (concat " " label)))
+	(push
+	 (cond
+	  ;; An unsortable column
+	  ((not (nth 2 col)) label)
+	  ;; The selected sort column
+	  ((equal (car col) (car tabulated-list-sort-key))
+	   (apply 'propertize
+		  (concat label
+			  (cond
+			   ((> (+ 2 (length label)) width)
+			    "")
+			   ((cdr tabulated-list-sort-key)
+			    " ²")
+			   (t " ¼")))
+		  'face 'bold
+		  'tabulated-list-column-name (car col)
+		  button-props))
+	  ;; Unselected sortable column.
+	  (t (apply 'propertize label
+		    'tabulated-list-column-name (car col)
+		    button-props)))
+	 cols))
+      (push (propertize " "
+			'display (list 'space :align-to x)
+			'face 'fixed-pitch)
+	    cols))
+    (setq header-line-format (mapconcat 'identity (nreverse cols) ""))))
+
+(defun tabulated-list-revert (&rest ignored)
+  "The `revert-buffer-function' for `tabulated-list-mode'.
+It runs `tabulated-list-revert-hook', then calls `tabulated-list-print'."
+  (interactive)
+  (unless (derived-mode-p 'tabulated-list-mode)
+    (error "The current buffer is not in Tabulated List mode"))
+  (run-hooks 'tabulated-list-revert-hook)
+  (tabulated-list-print t))
+
+(defun tabulated-list-print (&optional remember-pos)
+  "Populate the current Tabulated List mode buffer.
+This sorts the `tabulated-list-entries' list if sorting is
+specified by `tabulated-list-sort-key'.  It then erases the
+buffer and inserts the entries with `tabulated-list-printer'.
+
+Optional argument REMEMBER-POS, if non-nil, means to move point
+to the entry with the same ID element as the current line."
+  (let ((inhibit-read-only t)
+	(entries (if (functionp tabulated-list-entries)
+		     (funcall tabulated-list-entries)
+		   tabulated-list-entries))
+	entry-id saved-pt saved-col)
+    (and remember-pos
+	 (setq entry-id (tabulated-list-get-id))
+	 (setq saved-col (current-column)))
+    (erase-buffer)
+    ;; Sort the buffers, if necessary.
+    (when tabulated-list-sort-key
+      (let ((sort-column (car tabulated-list-sort-key))
+	    (len (length tabulated-list-format))
+	    (n 0)
+	    sorter)
+	;; Which column is to be sorted?
+	(while (and (< n len)
+		    (not (equal (car (aref tabulated-list-format n))
+				sort-column)))
+	  (setq n (1+ n)))
+	(when (< n len)
+	  (setq sorter (nth 2 (aref tabulated-list-format n)))
+	  (when (eq sorter t)
+	    (setq sorter ; Default sorter checks column N:
+		  (lambda (A B)
+		    (setq A (aref (cadr A) n))
+		    (setq B (aref (cadr B) n))
+		    (string< (if (stringp A) A (car A))
+			     (if (stringp B) B (car B))))))
+	  (setq entries (sort entries sorter))
+	  (if (cdr tabulated-list-sort-key)
+	      (setq entries (nreverse entries)))
+	  (unless (functionp tabulated-list-entries)
+	    (setq tabulated-list-entries entries)))))
+    ;; Print the resulting list.
+    (dolist (elt entries)
+      (and entry-id
+	   (equal entry-id (car elt))
+	   (setq saved-pt (point)))
+      (apply tabulated-list-printer elt))
+    (set-buffer-modified-p nil)
+    ;; If REMEMBER-POS was specified, move to the "old" location.
+    (if saved-pt
+	(progn (goto-char saved-pt)
+	       (move-to-column saved-col)
+	       (recenter))
+      (goto-char (point-min)))))
+
+(defun tabulated-list-print-entry (id cols)
+  "Insert a Tabulated List entry at point.
+This is the default `tabulated-list-printer' function.  ID is a
+Lisp object identifying the entry to print, and COLS is a vector
+of column descriptors."
+  (let ((beg (point))
+	(x (max tabulated-list-padding 0))
+	(len (length tabulated-list-format)))
+    (if (> tabulated-list-padding 0)
+	(insert (make-string x ?\s)))
+    (dotimes (n len)
+      (let* ((format (aref tabulated-list-format n))
+	     (desc   (aref cols n))
+	     (width  (nth 1 format))
+	     (label  (if (stringp desc) desc (car desc)))
+	     (help-echo (concat (car format) ": " label)))
+	;; Truncate labels if necessary (except last column).
+	(and (< (1+ n) len)
+	     (> (string-width label) width)
+	     (setq label (truncate-string-to-width label width nil nil t)))
+        (when (fboundp 'bidi-string-mark-left-to-right)
+          (setq label (bidi-string-mark-left-to-right label)))
+	(if (stringp desc)
+	    (insert (propertize label 'help-echo help-echo))
+	  (apply 'insert-text-button label (cdr desc)))
+	(setq x (+ x 1 width)))
+      ;; No need to append any spaces if this is the last column.
+      (if (< (1+ n) len)
+	  (indent-to x 1)))
+    (insert ?\n)
+    (put-text-property beg (point) 'tabulated-list-id id)))
+
+(defun tabulated-list-col-sort (&optional e)
+  "Sort Tabulated List entries by the column of the mouse click E."
+  (interactive "e")
+  (let* ((pos (event-start e))
+	 (obj (posn-object pos))
+	 (name (get-text-property (if obj (cdr obj) (posn-point pos))
+				  'tabulated-list-column-name
+				  (car obj))))
+    (with-current-buffer (window-buffer (posn-window pos))
+      (when (derived-mode-p 'tabulated-list-mode)
+	;; Flip the sort order on a second click.
+	(if (equal name (car tabulated-list-sort-key))
+	    (setcdr tabulated-list-sort-key
+		    (not (cdr tabulated-list-sort-key)))
+	  (setq tabulated-list-sort-key (cons name nil)))
+	(tabulated-list-init-header)
+	(tabulated-list-print t)))))
+
+;;; The mode definition:
+
+;;;###autoload
+(define-derived-mode tabulated-list-mode special-mode "Tabulated"
+  "Generic major mode for browsing a list of items.
+This mode is usually not used directly; instead, other major
+modes are derived from it, using `define-derived-mode'.
+
+In this major mode, the buffer is divided into multiple columns,
+which are labeled using the header line.  Each non-empty line
+belongs to one \"entry\", and the entries can be sorted according
+to their column values.
+
+An inheriting mode should usually do the following in their body:
+
+ - Set `tabulated-list-format', specifying the column format.
+ - Set `tabulated-list-revert-hook', if the buffer contents need
+   to be specially recomputed prior to `revert-buffer'.
+ - Maybe set a `tabulated-list-entries' function (see below).
+ - Maybe set `tabulated-list-printer' (see below).
+ - Maybe set `tabulated-list-padding'.
+ - Call `tabulated-list-init-header' to initialize `header-line-format'
+   according to `tabulated-list-format'.
+
+An inheriting mode is usually accompanied by a \"list-FOO\"
+command (e.g. `list-packages', `list-processes').  This command
+creates or switches to a buffer and enables the major mode in
+that buffer.  If `tabulated-list-entries' is not a function, the
+command should initialize it to a list of entries for displaying.
+Finally, it should call `tabulated-list-print'.
+
+`tabulated-list-print' calls the printer function specified by
+`tabulated-list-printer', once for each entry.  The default
+printer is `tabulated-list-print-entry', but a mode that keeps
+data in an ewoc may instead specify a printer function (e.g., one
+that calls `ewoc-enter-last'), with `tabulated-list-print-entry'
+as the ewoc pretty-printer."
+  (setq truncate-lines t)
+  (setq buffer-read-only t)
+  (set (make-local-variable 'revert-buffer-function)
+       'tabulated-list-revert)
+  (when (boundp 'glyphless-char-display)
+    (set (make-local-variable 'glyphless-char-display)
+         tabulated-list-glyphless-char-display)))
+
+(put 'tabulated-list-mode 'mode-class 'special)
+
+(provide 'tabulated-list)
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;;; tabulated-list.el ends here
diff --git a/elpa/tabulated-list-0/tabulated-list.elc b/elpa/tabulated-list-0/tabulated-list.elc
new file mode 100644
index 0000000000000000000000000000000000000000..3fb93207dd3e2be985a1fb300e8a472988292239
GIT binary patch
literal 13334
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
M@nNAmubRvM2jZx>82|tP

literal 0
HcmV?d00001

diff --git a/elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el b/elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el
new file mode 100644
index 00000000..3eacac41
--- /dev/null
+++ b/elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el
@@ -0,0 +1,34 @@
+;;; yaml-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (yaml-mode yaml) "yaml-mode" "yaml-mode.el" (21205
+;;;;;;  13955))
+;;; Generated autoloads from yaml-mode.el
+
+(let ((loads (get 'yaml 'custom-loads))) (if (member '"yaml-mode" loads) nil (put 'yaml 'custom-loads (cons '"yaml-mode" loads))))
+
+(autoload 'yaml-mode "yaml-mode" "\
+Simple mode to edit YAML.
+
+\\{yaml-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.ya?ml$" . yaml-mode))
+
+;;;***
+
+;;;### (autoloads nil nil ("yaml-mode-pkg.el") (21205 13955 546345))
+
+;;;***
+
+(provide 'yaml-mode-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; yaml-mode-autoloads.el ends here
diff --git a/elpa/yaml-mode-0.0.9/yaml-mode-pkg.el b/elpa/yaml-mode-0.0.9/yaml-mode-pkg.el
new file mode 100644
index 00000000..b7c8a87e
--- /dev/null
+++ b/elpa/yaml-mode-0.0.9/yaml-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "yaml-mode" "0.0.9" "Major mode for editing YAML files" (quote nil))
diff --git a/elpa/yaml-mode-0.0.9/yaml-mode-pkg.elc b/elpa/yaml-mode-0.0.9/yaml-mode-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..cf8802663387a7be504bba42d881cf44faf8ac7f
GIT binary patch
literal 685
zcmbtS%Wm5+5cIYDfnEo?L;@<xa#9qw3$#IyOOf1i>8-T5lG*SfkaAP^>$|4Xw9d5z
z0b((`GsE58-rn83T`U%2yWQd@xY1bB*d3t;ik9N%Ap|`rM`=1}6O!zLL-2Sw5WXmn
z_KNRj`C-$($7<PLWu88AQqN3i_Q6rJQ!)5P{v@Zm)Q}xjb5zdOE@-Nkaw*sU#N*>2
z$z~qoaeFGk4~ogK>grOqvd!3&nf6fDB8-!9=9ii{AxV+JhrLO&fkUDMee}wi4mxyc
zipCG=9iuT#P+IeMUv%2FT&<-jO^;G}jdB+bUXQrQ&g*9zm3V{lBWFbFafYC5Ym}D!
zz~;`7s;cnmI#-7HntTl1ezW<*4myun?R3i7dTlAC@thn*HeRrZ$f*<~s}$e<c6sjV
z1)fv_k8mDy&q;HGb3Hh;YNE(QxsSXP|8;~ArKa9^sz=p5@=Bq2u~eYQqv!WteP`*@
YHsEB5w3&EF_<DVRm#3Htcw;N^8&(|BVgLXD

literal 0
HcmV?d00001

diff --git a/elpa/yaml-mode-0.0.9/yaml-mode.el b/elpa/yaml-mode-0.0.9/yaml-mode.el
new file mode 100644
index 00000000..66ea331e
--- /dev/null
+++ b/elpa/yaml-mode-0.0.9/yaml-mode.el
@@ -0,0 +1,415 @@
+;;; yaml-mode.el --- Major mode for editing YAML files
+
+;; Copyright (C) 2010-2013 Yoshiki Kurihara
+
+;; Author: Yoshiki Kurihara <clouder@gmail.com>
+;;         Marshall T. Vandegrift <llasram@gmail.com>
+;; Keywords: data yaml
+;; Version: 0.0.9
+
+;; This file is not part of Emacs
+
+;; This file 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, or (at your option)
+;; any later version.
+
+;; This file 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., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This is a major mode for editing files in the YAML data
+;; serialization format.  It was initially developed by Yoshiki
+;; Kurihara and many features were added by Marshall Vandegrift.  As
+;; YAML and Python share the fact that indentation determines
+;; structure, this mode provides indentation and indentation command
+;; behavior very similar to that of python-mode.
+
+;;; Installation:
+
+;; To install, just drop this file into a directory in your
+;; `load-path' and (optionally) byte-compile it.  To automatically
+;; handle files ending in '.yml', add something like:
+;;
+;;    (require 'yaml-mode)
+;;    (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+;;
+;; to your .emacs file.
+;;
+;; Unlike python-mode, this mode follows the Emacs convention of not
+;; binding the ENTER key to `newline-and-indent'.  To get this
+;; behavior, add the key definition to `yaml-mode-hook':
+;;
+;;    (add-hook 'yaml-mode-hook
+;;     '(lambda ()
+;;        (define-key yaml-mode-map "\C-m" 'newline-and-indent)))
+
+;;; Known Bugs:
+
+;; YAML is easy to write but complex to parse, and this mode doesn't
+;; even really try.  Indentation and highlighting will break on
+;; abnormally complicated structures.
+
+;;; Code:
+
+
+;; User definable variables
+
+;;;###autoload
+(defgroup yaml nil
+  "Support for the YAML serialization format"
+  :group 'languages
+  :prefix "yaml-")
+
+(defcustom yaml-mode-hook nil
+  "*Hook run by `yaml-mode'."
+  :type 'hook
+  :group 'yaml)
+
+(defcustom yaml-indent-offset 2
+  "*Amount of offset per level of indentation."
+  :type 'integer
+  :group 'yaml)
+
+(defcustom yaml-backspace-function 'backward-delete-char-untabify
+  "*Function called by `yaml-electric-backspace' when deleting backwards.
+It will receive one argument, the numeric prefix value."
+  :type 'function
+  :group 'yaml)
+
+(defcustom yaml-block-literal-search-lines 100
+  "*Maximum number of lines to search for start of block literals."
+  :type 'integer
+  :group 'yaml)
+
+(defcustom yaml-block-literal-electric-alist
+  '((?| . "") (?> . "-"))
+  "*Characters for which to provide electric behavior.
+The association list key should be a key code and the associated value
+should be a string containing additional characters to insert when
+that key is pressed to begin a block literal."
+  :type 'alist
+  :group 'yaml)
+
+(defface yaml-tab-face
+   '((((class color)) (:background "red" :foreground "red" :bold t))
+     (t (:reverse-video t)))
+  "Face to use for highlighting tabs in YAML files."
+  :group 'faces
+  :group 'yaml)
+
+(defcustom yaml-imenu-generic-expression
+  '((nil  "^\\(:?[a-zA-Z_-]+\\):"          1))
+  "The imenu regex to parse an outline of the yaml file."
+  :type 'string
+  :group 'yaml)
+
+
+;; Constants
+
+(defconst yaml-mode-version "0.0.9" "Version of `yaml-mode'.")
+
+(defconst yaml-blank-line-re "^ *$"
+  "Regexp matching a line containing only (valid) whitespace.")
+
+(defconst yaml-comment-re "\\(?:^\\|\\s-+\\)\\(#.*\\)"
+  "Regexp matching a line containing a YAML comment or delimiter.")
+
+(defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)"
+  "Regexp matching a line contatining a YAML directive.")
+
+(defconst yaml-document-delimiter-re "^ *\\(?:---\\|[.][.][.]\\)"
+  "Rexexp matching a YAML document delimiter line.")
+
+(defconst yaml-node-anchor-alias-re "[&*][a-zA-Z0-9_-]+"
+  "Regexp matching a YAML node anchor or alias.")
+
+(defconst yaml-tag-re "!!?[^ \n]+"
+  "Rexexp matching a YAML tag.")
+
+(defconst yaml-bare-scalar-re
+  "\\(?:[^-:,#!\n{\\[ ]\\|[^#!\n{\\[ ]\\S-\\)[^#\n]*?"
+  "Rexexp matching a YAML bare scalar.")
+
+(defconst yaml-hash-key-re
+  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
+          "\\(?:" yaml-tag-re " +\\)?"
+          "\\(" yaml-bare-scalar-re "\\) *:"
+          "\\(?: +\\|$\\)")
+  "Regexp matching a single YAML hash key.")
+
+(defconst yaml-scalar-context-re
+  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
+          "\\(?:" yaml-bare-scalar-re " *: \\)?")
+  "Regexp indicating the begininng of a scalar context.")
+
+(defconst yaml-nested-map-re
+  (concat ".*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$")
+  "Regexp matching a line beginning a YAML nested structure.")
+
+(defconst yaml-block-literal-base-re " *[>|][-+0-9]* *\\(?:\n\\|\\'\\)"
+  "Regexp matching the substring start of a block literal.")
+
+(defconst yaml-block-literal-re
+  (concat yaml-scalar-context-re
+          "\\(?:" yaml-tag-re "\\)?"
+          yaml-block-literal-base-re)
+  "Regexp matching a line beginning a YAML block literal.")
+
+(defconst yaml-nested-sequence-re
+  (concat "^\\(?: *- +\\)+"
+          "\\(?:" yaml-bare-scalar-re " *:\\(?: +.*\\)?\\)?$")
+  "Regexp matching a line containing one or more nested YAML sequences.")
+
+(defconst yaml-constant-scalars-re
+  (concat "\\(?:^\\|\\(?::\\|-\\|,\\|{\\|\\[\\) +\\) *"
+          (regexp-opt
+           '("~" "null" "Null" "NULL"
+             ".nan" ".NaN" ".NAN"
+             ".inf" ".Inf" ".INF"
+             "-.inf" "-.Inf" "-.INF"
+             "y" "Y" "yes" "Yes" "YES" "n" "N" "no" "No" "NO"
+             "true" "True" "TRUE" "false" "False" "FALSE"
+             "on" "On" "ON" "off" "Off" "OFF") t)
+          " *$")
+  "Regexp matching certain scalar constants in scalar context.")
+
+
+;; Mode setup
+
+(defvar yaml-mode-map ()
+  "Keymap used in `yaml-mode' buffers.")
+(if yaml-mode-map
+    nil
+  (setq yaml-mode-map (make-sparse-keymap))
+  (define-key yaml-mode-map "|" 'yaml-electric-bar-and-angle)
+  (define-key yaml-mode-map ">" 'yaml-electric-bar-and-angle)
+  (define-key yaml-mode-map "-" 'yaml-electric-dash-and-dot)
+  (define-key yaml-mode-map "." 'yaml-electric-dash-and-dot)
+  (define-key yaml-mode-map [backspace] 'yaml-electric-backspace)
+  (define-key yaml-mode-map "\C-j" 'newline-and-indent))
+
+(defvar yaml-mode-syntax-table nil
+  "Syntax table in use in `yaml-mode' buffers.")
+(if yaml-mode-syntax-table
+    nil
+  (setq yaml-mode-syntax-table (make-syntax-table))
+  (modify-syntax-entry ?\' "\"" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\" "\"" yaml-mode-syntax-table)
+  (modify-syntax-entry ?# "<" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\n ">" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\\ "\\" yaml-mode-syntax-table)
+  (modify-syntax-entry ?- "w" yaml-mode-syntax-table)
+  (modify-syntax-entry ?_ "_" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\( "." yaml-mode-syntax-table)
+  (modify-syntax-entry ?\) "." yaml-mode-syntax-table)
+  (modify-syntax-entry ?\{ "(}" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\} "){" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\[ "(]" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\] ")[" yaml-mode-syntax-table))
+
+;;;###autoload
+(define-derived-mode yaml-mode fundamental-mode "YAML"
+  "Simple mode to edit YAML.
+
+\\{yaml-mode-map}"
+  (set (make-local-variable 'comment-start) "# ")
+  (set (make-local-variable 'comment-start-skip) "#+ *")
+  (set (make-local-variable 'indent-line-function) 'yaml-indent-line)
+  (set (make-local-variable 'indent-tabs-mode) nil)
+  (set (make-local-variable 'font-lock-defaults)
+       '(yaml-font-lock-keywords
+         nil nil nil nil
+         (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords))))
+
+
+;; Font-lock support
+
+(defvar yaml-font-lock-keywords
+   (list
+    (cons yaml-comment-re '(1 font-lock-comment-face))
+    (cons yaml-constant-scalars-re '(1 font-lock-constant-face))
+    (cons yaml-tag-re '(0 font-lock-type-face))
+    (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face t))
+    (cons yaml-hash-key-re '(1 font-lock-variable-name-face t))
+    (cons yaml-document-delimiter-re '(0 font-lock-comment-face))
+    (cons yaml-directive-re '(1 font-lock-builtin-face))
+    '(yaml-font-lock-block-literals 0 font-lock-string-face t)
+    '("^[\t]+" 0 'yaml-tab-face t))
+   "Additional expressions to highlight in YAML mode.")
+
+(defvar yaml-font-lock-syntactic-keywords
+  (list '(yaml-syntactic-block-literals 0 "." t))
+  "Additional syntax features to highlight in YAML mode.")
+
+
+(defun yaml-font-lock-block-literals (bound)
+  "Find lines within block literals.
+Find the next line of the first (if any) block literal after point and
+prior to BOUND.  Returns the beginning and end of the block literal
+line in the match data, as consumed by `font-lock-keywords' matcher
+functions.  The function begins by searching backwards to determine
+whether or not the current line is within a block literal.  This could
+be time-consuming in large buffers, so the number of lines searched is
+artificially limitted to the value of
+`yaml-block-literal-search-lines'."
+  (if (eolp) (goto-char (1+ (point))))
+  (unless (or (eobp) (>= (point) bound))
+    (let ((begin (point))
+          (end (min (1+ (point-at-eol)) bound)))
+      (goto-char (point-at-bol))
+      (while (and (looking-at yaml-blank-line-re) (not (bobp)))
+        (forward-line -1))
+      (let ((nlines yaml-block-literal-search-lines)
+            (min-level (current-indentation)))
+      (forward-line -1)
+      (while (and (/= nlines 0)
+                  (/= min-level 0)
+                  (not (looking-at yaml-block-literal-re))
+                  (not (bobp)))
+        (set 'nlines (1- nlines))
+        (unless (looking-at yaml-blank-line-re)
+          (set 'min-level (min min-level (current-indentation))))
+        (forward-line -1))
+      (cond
+       ((and (< (current-indentation) min-level)
+             (looking-at yaml-block-literal-re))
+          (goto-char end) (set-match-data (list begin end)) t)
+         ((progn
+            (goto-char begin)
+            (re-search-forward (concat yaml-block-literal-re
+                                       " *\\(.*\\)\n")
+                               bound t))
+          (set-match-data (nthcdr 2 (match-data))) t))))))
+
+(defun yaml-syntactic-block-literals (bound)
+  "Find quote characters within block literals.
+Finds the first quote character within a block literal (if any) after
+point and prior to BOUND.  Returns the position of the quote character
+in the match data, as consumed by matcher functions in
+`font-lock-syntactic-keywords'.  This allows the mode to treat ['\"]
+characters in block literals as punctuation syntax instead of string
+syntax, preventing unmatched quotes in block literals from painting
+the entire buffer in `font-lock-string-face'."
+  (let ((found nil))
+    (while (and (not found)
+                (/= (point) bound)
+                (yaml-font-lock-block-literals bound))
+      (let ((begin (match-beginning 0)) (end (match-end 0)))
+        (goto-char begin)
+        (cond
+         ((re-search-forward "['\"]" end t) (setq found t))
+         ((goto-char end)))))
+    found))
+
+
+;; Indentation and electric keys
+
+(defun yaml-compute-indentation ()
+  "Calculate the maximum sensible indentation for the current line."
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at yaml-document-delimiter-re) 0
+      (forward-line -1)
+      (while (and (looking-at yaml-blank-line-re)
+                  (> (point) (point-min)))
+        (forward-line -1))
+      (+ (current-indentation)
+         (if (looking-at yaml-nested-map-re) yaml-indent-offset 0)
+         (if (looking-at yaml-nested-sequence-re) yaml-indent-offset 0)
+         (if (looking-at yaml-block-literal-re) yaml-indent-offset 0)))))
+
+(defun yaml-indent-line ()
+  "Indent the current line.
+The first time this command is used, the line will be indented to the
+maximum sensible indentation.  Each immediately subsequent usage will
+back-dent the line by `yaml-indent-offset' spaces.  On reaching column
+0, it will cycle back to the maximum sensible indentation."
+  (interactive "*")
+  (let ((ci (current-indentation))
+        (cc (current-column))
+        (need (yaml-compute-indentation)))
+    (save-excursion
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (if (and (equal last-command this-command) (/= ci 0))
+          (indent-to (* (/ (- ci 1) yaml-indent-offset) yaml-indent-offset))
+        (indent-to need)))
+      (if (< (current-column) (current-indentation))
+          (forward-to-indentation 0))))
+
+(defun yaml-electric-backspace (arg)
+  "Delete characters or back-dent the current line.
+If invoked following only whitespace on a line, will back-dent to the
+immediately previous multiple of `yaml-indent-offset' spaces."
+  (interactive "*p")
+  (if (or (/= (current-indentation) (current-column)) (bolp))
+      (funcall yaml-backspace-function arg)
+    (let ((ci (current-column)))
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (indent-to (* (/ (- ci (* arg yaml-indent-offset))
+                       yaml-indent-offset)
+                    yaml-indent-offset)))))
+
+(defun yaml-electric-bar-and-angle (arg)
+  "Insert the bound key and possibly begin a block literal.
+Inserts the bound key.  If inserting the bound key causes the current
+line to match the initial line of a block literal, then inserts the
+matching string from `yaml-block-literal-electric-alist', a newline,
+and indents appropriately."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (let ((extra-chars
+         (assoc last-command-event
+                yaml-block-literal-electric-alist)))
+    (cond
+     ((and extra-chars (not arg) (eolp)
+           (save-excursion
+             (beginning-of-line)
+             (looking-at yaml-block-literal-re)))
+      (insert (cdr extra-chars))
+      (newline-and-indent)))))
+
+(defun yaml-electric-dash-and-dot (arg)
+  "Insert the bound key and possibly de-dent line.
+Inserts the bound key.  If inserting the bound key causes the current
+line to match a document delimiter, de-dent the line to the left
+margin."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (save-excursion
+    (beginning-of-line)
+    (if (and (not arg) (looking-at yaml-document-delimiter-re))
+        (delete-horizontal-space))))
+
+
+(defun yaml-set-imenu-generic-expression ()
+  (make-local-variable 'imenu-generic-expression)
+  (make-local-variable 'imenu-create-index-function)
+  (setq imenu-create-index-function 'imenu-default-create-index-function)
+  (setq imenu-generic-expression yaml-imenu-generic-expression))
+
+(add-hook 'yaml-mode-hook 'yaml-set-imenu-generic-expression)
+
+
+(defun yaml-mode-version ()
+  "Diplay version of `yaml-mode'."
+  (interactive)
+  (message "yaml-mode %s" yaml-mode-version)
+  yaml-mode-version)
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.ya?ml$" . yaml-mode))
+
+(provide 'yaml-mode)
+
+;;; yaml-mode.el ends here
diff --git a/elpa/yaml-mode-0.0.9/yaml-mode.elc b/elpa/yaml-mode-0.0.9/yaml-mode.elc
new file mode 100644
index 0000000000000000000000000000000000000000..c25ad67fecdd67b7eaf5c40688a21854db40b95b
GIT binary patch
literal 13062
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

literal 0
HcmV?d00001

diff --git a/init.el b/init.el
index 248da8b5..2c27fea6 100644
--- a/init.el
+++ b/init.el
@@ -13,6 +13,12 @@ load-path))
 ;; http://www.emacswiki.org/emacs/EmacsNiftyTricks
 
 
+
+;; http://www.emacswiki.org/emacs/ELPA
+(require 'package)
+
+(package-initialize)
+
 (setq tex-dvi-view-command "(f=*; pdflatex \"${f%.dvi}.tex\" && open \"${f%.dvi}.pdf\")")
 
 (require 'centered-cursor-mode)
@@ -22,8 +28,8 @@ load-path))
 (template-initialize)
 
 ;; load yaml-mode
-(require 'yaml-mode)
-(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+;; (require 'yaml-mode)
+;; (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
 
 (require 'htmlize )
 
@@ -138,8 +144,8 @@ load-path))
 ;; example: [[bmap:space needle]]
 ;; load git support
 ; (require 'egg)
-(add-to-list 'load-path "~/.xemacs/xemacs-packages/lisp/egg")
-(load-library "egg")
+;; (add-to-list 'load-path "~/.xemacs/xemacs-packages/lisp/egg")
+;; (load-library "egg")
 
 (load-library "cfengine")
 ;; to enable mouse-wheel
-- 
2.47.3