From d0abbbd56d078cf2658c236f4b750dca8c6b68f2 Mon Sep 17 00:00:00 2001
From: Daniel Higginbotham <daniel@flyingmachinestudios.com>
Date: Mon, 30 Dec 2013 19:51:08 -0500
Subject: [PATCH] updated with cider and a bunch of other stuff

---
 .gitignore                                    |    2 +-
 elpa/Save-visited-files-readme.txt            |   40 +
 elpa/archives/gnu/archive-contents            |  190 +-
 elpa/archives/marmalade/archive-contents      |    2 +-
 elpa/archives/melpa/archive-contents          |    2 +
 .../auto-complete-autoloads.el                |    7 +-
 .../auto-complete-config.elc                  |  Bin 15317 -> 15331 bytes
 elpa/auto-complete-1.4/auto-complete-pkg.elc  |  Bin 606 -> 620 bytes
 elpa/auto-complete-1.4/auto-complete.elc      |  Bin 58904 -> 60173 bytes
 elpa/cider-20131221.1231/cider-autoloads.el   |   86 +
 elpa/cider-20131221.1231/cider-client.el      |  172 +
 elpa/cider-20131221.1231/cider-eldoc.el       |  119 +
 elpa/cider-20131221.1231/cider-interaction.el | 1211 ++++
 .../cider-macroexpansion.el                   |  165 +
 elpa/cider-20131221.1231/cider-mode.el        |  123 +
 elpa/cider-20131221.1231/cider-pkg.el         |    5 +
 elpa/cider-20131221.1231/cider-pkg.elc        |  Bin 0 -> 694 bytes
 elpa/cider-20131221.1231/cider-repl.el        | 1064 +++
 elpa/cider-20131221.1231/cider-selector.el    |  155 +
 elpa/cider-20131221.1231/cider-util.el        |   57 +
 elpa/cider-20131221.1231/cider-util.elc       |  Bin 0 -> 1239 bytes
 elpa/cider-20131221.1231/cider-version.el     |   78 +
 elpa/cider-20131221.1231/cider-version.elc    |  Bin 0 -> 2024 bytes
 elpa/cider-20131221.1231/cider.el             |  111 +
 elpa/cider-20131221.1231/nrepl-client.el      |  892 +++
 elpa/cl-lib-0.3/cl-lib-autoloads.el           |    4 +-
 elpa/cl-lib-0.3/cl-lib-pkg.elc                |  Bin 598 -> 598 bytes
 elpa/cl-lib-0.3/cl-lib.elc                    |  Bin 3814 -> 3819 bytes
 elpa/clojure-mode-2.1.0/clojure-mode-pkg.el   |    1 -
 elpa/clojure-mode-2.1.0/clojure-mode.elc      |  Bin 33182 -> 0 bytes
 .../clojure-mode-autoloads.el                 |   11 +-
 .../clojure-mode-pkg.el                       |    1 +
 .../clojure-mode-pkg.elc                      |  Bin 0 -> 622 bytes
 .../clojure-mode.el                           |  443 +-
 .../clojure-mode.elc                          |  Bin 0 -> 39396 bytes
 .../clojure-test-mode-pkg.el                  |    1 -
 .../clojure-test-mode.elc                     |  Bin 16219 -> 0 bytes
 .../clojure-test-mode-autoloads.el            |   16 +-
 .../clojure-test-mode-pkg.el                  |    1 +
 .../clojure-test-mode-pkg.elc                 |  Bin 0 -> 672 bytes
 .../clojure-test-mode.el                      |   70 +-
 elpa/dash-2.1.0/dash-autoloads.el             |   18 +
 elpa/dash-2.1.0/dash-pkg.el                   |    1 +
 elpa/dash-2.1.0/dash.el                       | 1125 +++
 .../elisp-slime-nav-autoloads.el              |   38 +
 .../elisp-slime-nav-pkg.el                    |    1 +
 .../elisp-slime-nav-pkg.elc                   |  Bin 636 -> 625 bytes
 elpa/elisp-slime-nav-0.2/elisp-slime-nav.el   |   81 +
 elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc  |  Bin 0 -> 3156 bytes
 .../elisp-slime-nav-autoloads.el              |   51 -
 .../elisp-slime-nav-pkg.el                    |    1 -
 elpa/elisp-slime-nav-0.6/elisp-slime-nav.el   |  109 -
 elpa/elisp-slime-nav-0.6/elisp-slime-nav.elc  |  Bin 3962 -> 0 bytes
 elpa/epl-0.4/epl-pkg.el                       |    1 -
 .../epl-autoloads.el                          |    2 +-
 elpa/epl-20131101.405/epl-pkg.el              |    1 +
 .../{epl-0.4 => epl-20131101.405}/epl-pkg.elc |  Bin 611 -> 601 bytes
 elpa/{epl-0.4 => epl-20131101.405}/epl.el     |    3 +-
 elpa/epl-20131101.405/epl.elc                 |  Bin 0 -> 31178 bytes
 .../find-file-in-project-autoloads.el         |    6 +-
 .../find-file-in-project-pkg.el               |    1 +
 .../find-file-in-project-pkg.elc              |  Bin 617 -> 634 bytes
 .../find-file-in-project.el                   |   48 +-
 .../find-file-in-project.elc                  |  Bin 4149 -> 3891 bytes
 .../find-file-in-project-autoloads.el~        |   13 -
 .../find-file-in-project-pkg.el               |    1 -
 .../highlight-indentation-autoloads.el        |   18 +
 .../highlight-indentation-pkg.el              |    1 +
 .../highlight-indentation-pkg.elc             |  Bin 0 -> 643 bytes
 .../highlight-indentation.el                  |   71 +
 .../highlight-indentation.elc                 |  Bin 0 -> 1948 bytes
 .../idle-highlight-mode-autoloads.el          |    6 +-
 .../idle-highlight-mode-autoloads.el~         |   13 -
 .../idle-highlight-mode-pkg.elc               |  Bin 620 -> 637 bytes
 .../idle-highlight-mode.elc                   |  Bin 2918 -> 2935 bytes
 .../ido-ubiquitous-autoloads.el               |   70 +
 elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el |    1 +
 .../ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc |  Bin 0 -> 612 bytes
 elpa/ido-ubiquitous-0.7/ido-ubiquitous.el     |  199 +
 elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc    |  Bin 0 -> 6614 bytes
 elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el     |   85 -
 elpa/inf-ruby-2.3.0/inf-ruby-pkg.el           |    1 -
 elpa/inf-ruby-2.3.0/inf-ruby.el               |  541 --
 elpa/inf-ruby-2.3.0/inf-ruby.elc              |  Bin 18790 -> 0 bytes
 elpa/magit-1.0.0/50magit.el                   |    3 +
 .../magit-pkg.elc => magit-1.0.0/50magit.elc} |  Bin 563 -> 558 bytes
 elpa/magit-1.0.0/Makefile                     |   47 +
 elpa/magit-1.0.0/README.md                    |   76 +
 elpa/magit-1.0.0/magit-autoloads.el           |   28 +
 .../magit-key-mode.el                         |  276 +-
 elpa/magit-1.0.0/magit-key-mode.elc           |  Bin 0 -> 14717 bytes
 elpa/magit-1.0.0/magit-pkg.el                 |    1 +
 elpa/magit-1.0.0/magit-pkg.el.in              |    1 +
 .../magit-pkg.elc}                            |  Bin 581 -> 580 bytes
 .../{magit-1.2.0 => magit-1.0.0}/magit-svn.el |   87 +-
 elpa/magit-1.0.0/magit-svn.elc                |  Bin 0 -> 6837 bytes
 elpa/magit-1.0.0/magit-topgit.el              |   88 +
 elpa/magit-1.0.0/magit-topgit.elc             |  Bin 0 -> 3679 bytes
 elpa/magit-1.0.0/magit.el                     | 4746 +++++++++++++
 elpa/magit-1.0.0/magit.elc                    |  Bin 0 -> 203288 bytes
 elpa/{magit-1.2.0 => magit-1.0.0}/magit.info  |  726 +-
 elpa/magit-1.0.0/magit.spec                   |   44 +
 elpa/magit-1.0.0/magit.spec.in                |   44 +
 elpa/magit-1.0.0/magit.texi                   |  847 +++
 elpa/magit-1.2.0/dir                          |   18 -
 elpa/magit-1.2.0/magit-autoloads.el           |  164 -
 elpa/magit-1.2.0/magit-autoloads.el~          |   13 -
 elpa/magit-1.2.0/magit-bisect.el              |  195 -
 elpa/magit-1.2.0/magit-bisect.elc             |  Bin 7493 -> 0 bytes
 elpa/magit-1.2.0/magit-blame.el               |  303 -
 elpa/magit-1.2.0/magit-blame.elc              |  Bin 8851 -> 0 bytes
 elpa/magit-1.2.0/magit-key-mode.elc           |  Bin 16825 -> 0 bytes
 elpa/magit-1.2.0/magit-pkg.el                 |    1 -
 elpa/magit-1.2.0/magit-stgit.el               |  288 -
 elpa/magit-1.2.0/magit-stgit.elc              |  Bin 11261 -> 0 bytes
 elpa/magit-1.2.0/magit-svn.elc                |  Bin 9564 -> 0 bytes
 elpa/magit-1.2.0/magit-topgit.el              |  191 -
 elpa/magit-1.2.0/magit-topgit.elc             |  Bin 7919 -> 0 bytes
 elpa/magit-1.2.0/magit-wip.el                 |  153 -
 elpa/magit-1.2.0/magit-wip.elc                |  Bin 8884 -> 0 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 263764 -> 0 bytes
 elpa/magit-1.2.0/rebase-mode.el               |  322 -
 elpa/magit-1.2.0/rebase-mode.elc              |  Bin 11078 -> 0 bytes
 elpa/paredit-22/paredit-autoloads.el          |    6 +-
 elpa/paredit-22/paredit-pkg.elc               |  Bin 604 -> 621 bytes
 elpa/paredit-22/paredit.elc                   |  Bin 70427 -> 70761 bytes
 elpa/pkg-info-0.4/pkg-info-pkg.el             |    1 -
 .../pkg-info-autoloads.el                     |    4 +-
 elpa/pkg-info-20131101.408/pkg-info-pkg.el    |    1 +
 .../pkg-info-pkg.elc                          |  Bin 649 -> 633 bytes
 .../pkg-info.el                               |    3 +-
 elpa/pkg-info-20131101.408/pkg-info.elc       |  Bin 0 -> 5549 bytes
 elpa/popup-0.5/popup-autoloads.el             |    4 +-
 elpa/popup-0.5/popup-pkg.elc                  |  Bin 567 -> 581 bytes
 elpa/popup-0.5/popup.elc                      |  Bin 68976 -> 78743 bytes
 elpa/projectile-0.9.2/projectile-autoloads.el |   52 +
 elpa/projectile-0.9.2/projectile-pkg.el       |    1 +
 elpa/projectile-0.9.2/projectile.el           | 1015 +++
 .../rainbow-delimiters-autoloads.el           |   61 +
 .../rainbow-delimiters-pkg.el                 |    1 +
 .../rainbow-delimiters-pkg.elc}               |  Bin 644 -> 671 bytes
 .../rainbow-delimiters.el                     |  520 ++
 .../rainbow-delimiters.elc                    |  Bin 0 -> 20154 bytes
 .../rainbow-delimiters-autoloads.el           |   61 +
 .../rainbow-delimiters-pkg.el                 |    1 +
 .../rainbow-delimiters.el                     |  544 ++
 elpa/s-1.7.0/s-autoloads.el                   |   18 +
 elpa/s-1.7.0/s-pkg.el                         |    1 +
 elpa/s-1.7.0/s.el                             |  538 ++
 .../smex-autoloads.el                         |   10 +-
 elpa/smex-1.1.1/smex-pkg.el                   |    1 +
 .../smex-pkg.elc}                             |  Bin 592 -> 602 bytes
 elpa/{smex-2.1 => smex-1.1.1}/smex.el         |  173 +-
 elpa/smex-1.1.1/smex.elc                      |  Bin 0 -> 12429 bytes
 elpa/smex-2.1/smex-autoloads.el~              |   13 -
 elpa/smex-2.1/smex-pkg.el                     |    1 -
 elpa/smex-2.1/smex.elc                        |  Bin 13931 -> 0 bytes
 .../starter-kit-autoloads.el                  |    5 +-
 elpa/starter-kit-2.0.3/starter-kit-defuns.elc |  Bin 4902 -> 4926 bytes
 elpa/starter-kit-2.0.3/starter-kit-misc.elc   |  Bin 2941 -> 2963 bytes
 elpa/starter-kit-2.0.3/starter-kit-pkg.elc    |  Bin 716 -> 733 bytes
 elpa/starter-kit-2.0.3/starter-kit.elc        |  Bin 1199 -> 1221 bytes
 .../starter-kit-bindings-autoloads.el         |    6 +-
 .../starter-kit-bindings-pkg.elc              |  Bin 646 -> 649 bytes
 .../starter-kit-bindings.elc                  |  Bin 2219 -> 2222 bytes
 .../starter-kit-lisp-autoloads.el             |    8 +-
 .../starter-kit-lisp-pkg.elc                  |  Bin 667 -> 670 bytes
 .../starter-kit-lisp.elc                      |  Bin 2257 -> 2265 bytes
 .../starter-kit-ruby-pkg.el                   |    1 -
 .../starter-kit-ruby-pkg.elc                  |  Bin 652 -> 0 bytes
 .../starter-kit-ruby.elc                      |  Bin 2748 -> 0 bytes
 .../starter-kit-ruby-autoloads.el             |   20 +-
 .../starter-kit-ruby-pkg.el                   |    1 +
 .../starter-kit-ruby-pkg.elc}                 |  Bin 583 -> 611 bytes
 .../starter-kit-ruby.el                       |   16 +-
 init.el                                       |   15 -
 nrepl-history                                 |    5 -
 user.el                                       |   15 +-
 vendor/clojure.el                             |   15 +
 181 files changed, 15584 insertions(+), 15753 deletions(-)
 create mode 100644 elpa/Save-visited-files-readme.txt
 create mode 100644 elpa/archives/melpa/archive-contents
 create mode 100644 elpa/cider-20131221.1231/cider-autoloads.el
 create mode 100644 elpa/cider-20131221.1231/cider-client.el
 create mode 100644 elpa/cider-20131221.1231/cider-eldoc.el
 create mode 100644 elpa/cider-20131221.1231/cider-interaction.el
 create mode 100644 elpa/cider-20131221.1231/cider-macroexpansion.el
 create mode 100644 elpa/cider-20131221.1231/cider-mode.el
 create mode 100644 elpa/cider-20131221.1231/cider-pkg.el
 create mode 100644 elpa/cider-20131221.1231/cider-pkg.elc
 create mode 100644 elpa/cider-20131221.1231/cider-repl.el
 create mode 100644 elpa/cider-20131221.1231/cider-selector.el
 create mode 100644 elpa/cider-20131221.1231/cider-util.el
 create mode 100644 elpa/cider-20131221.1231/cider-util.elc
 create mode 100644 elpa/cider-20131221.1231/cider-version.el
 create mode 100644 elpa/cider-20131221.1231/cider-version.elc
 create mode 100644 elpa/cider-20131221.1231/cider.el
 create mode 100644 elpa/cider-20131221.1231/nrepl-client.el
 delete mode 100644 elpa/clojure-mode-2.1.0/clojure-mode-pkg.el
 delete mode 100644 elpa/clojure-mode-2.1.0/clojure-mode.elc
 rename elpa/{clojure-mode-2.1.0 => clojure-mode-20131227.1044}/clojure-mode-autoloads.el (76%)
 create mode 100644 elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el
 create mode 100644 elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc
 rename elpa/{clojure-mode-2.1.0 => clojure-mode-20131227.1044}/clojure-mode.el (71%)
 create mode 100644 elpa/clojure-mode-20131227.1044/clojure-mode.elc
 delete mode 100644 elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.el
 delete mode 100644 elpa/clojure-test-mode-2.1.0/clojure-test-mode.elc
 rename elpa/{clojure-test-mode-2.1.0 => clojure-test-mode-20131227.805}/clojure-test-mode-autoloads.el (56%)
 create mode 100644 elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el
 create mode 100644 elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.elc
 rename elpa/{clojure-test-mode-2.1.0 => clojure-test-mode-20131227.805}/clojure-test-mode.el (93%)
 create mode 100644 elpa/dash-2.1.0/dash-autoloads.el
 create mode 100644 elpa/dash-2.1.0/dash-pkg.el
 create mode 100644 elpa/dash-2.1.0/dash.el
 create mode 100644 elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el
 create mode 100644 elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el
 rename elpa/{elisp-slime-nav-0.6 => elisp-slime-nav-0.2}/elisp-slime-nav-pkg.elc (60%)
 create mode 100644 elpa/elisp-slime-nav-0.2/elisp-slime-nav.el
 create mode 100644 elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc
 delete mode 100644 elpa/elisp-slime-nav-0.6/elisp-slime-nav-autoloads.el
 delete mode 100644 elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.el
 delete mode 100644 elpa/elisp-slime-nav-0.6/elisp-slime-nav.el
 delete mode 100644 elpa/elisp-slime-nav-0.6/elisp-slime-nav.elc
 delete mode 100644 elpa/epl-0.4/epl-pkg.el
 rename elpa/{epl-0.4 => epl-20131101.405}/epl-autoloads.el (78%)
 create mode 100644 elpa/epl-20131101.405/epl-pkg.el
 rename elpa/{epl-0.4 => epl-20131101.405}/epl-pkg.elc (64%)
 rename elpa/{epl-0.4 => epl-20131101.405}/epl.el (99%)
 create mode 100644 elpa/epl-20131101.405/epl.elc
 rename elpa/{find-file-in-project-3.2 => find-file-in-project-3.0}/find-file-in-project-autoloads.el (90%)
 create mode 100644 elpa/find-file-in-project-3.0/find-file-in-project-pkg.el
 rename elpa/{find-file-in-project-3.2 => find-file-in-project-3.0}/find-file-in-project-pkg.elc (70%)
 rename elpa/{find-file-in-project-3.2 => find-file-in-project-3.0}/find-file-in-project.el (78%)
 rename elpa/{find-file-in-project-3.2 => find-file-in-project-3.0}/find-file-in-project.elc (60%)
 delete mode 100644 elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el~
 delete mode 100644 elpa/find-file-in-project-3.2/find-file-in-project-pkg.el
 create mode 100644 elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el
 create mode 100644 elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el
 create mode 100644 elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.elc
 create mode 100644 elpa/highlight-indentation-0.5.0/highlight-indentation.el
 create mode 100644 elpa/highlight-indentation-0.5.0/highlight-indentation.elc
 delete mode 100644 elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el~
 create mode 100644 elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el
 create mode 100644 elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el
 create mode 100644 elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc
 create mode 100644 elpa/ido-ubiquitous-0.7/ido-ubiquitous.el
 create mode 100644 elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc
 delete mode 100644 elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el
 delete mode 100644 elpa/inf-ruby-2.3.0/inf-ruby-pkg.el
 delete mode 100644 elpa/inf-ruby-2.3.0/inf-ruby.el
 delete mode 100644 elpa/inf-ruby-2.3.0/inf-ruby.elc
 create mode 100644 elpa/magit-1.0.0/50magit.el
 rename elpa/{magit-1.2.0/magit-pkg.elc => magit-1.0.0/50magit.elc} (64%)
 create mode 100644 elpa/magit-1.0.0/Makefile
 create mode 100644 elpa/magit-1.0.0/README.md
 create mode 100644 elpa/magit-1.0.0/magit-autoloads.el
 rename elpa/{magit-1.2.0 => magit-1.0.0}/magit-key-mode.el (66%)
 create mode 100644 elpa/magit-1.0.0/magit-key-mode.elc
 create mode 100644 elpa/magit-1.0.0/magit-pkg.el
 create mode 100644 elpa/magit-1.0.0/magit-pkg.el.in
 rename elpa/{smex-2.1/smex-pkg.elc => magit-1.0.0/magit-pkg.elc} (62%)
 rename elpa/{magit-1.2.0 => magit-1.0.0}/magit-svn.el (71%)
 create mode 100644 elpa/magit-1.0.0/magit-svn.elc
 create mode 100644 elpa/magit-1.0.0/magit-topgit.el
 create mode 100644 elpa/magit-1.0.0/magit-topgit.elc
 create mode 100644 elpa/magit-1.0.0/magit.el
 create mode 100644 elpa/magit-1.0.0/magit.elc
 rename elpa/{magit-1.2.0 => magit-1.0.0}/magit.info (56%)
 create mode 100644 elpa/magit-1.0.0/magit.spec
 create mode 100644 elpa/magit-1.0.0/magit.spec.in
 create mode 100644 elpa/magit-1.0.0/magit.texi
 delete mode 100644 elpa/magit-1.2.0/dir
 delete mode 100644 elpa/magit-1.2.0/magit-autoloads.el
 delete mode 100644 elpa/magit-1.2.0/magit-autoloads.el~
 delete mode 100644 elpa/magit-1.2.0/magit-bisect.el
 delete mode 100644 elpa/magit-1.2.0/magit-bisect.elc
 delete mode 100644 elpa/magit-1.2.0/magit-blame.el
 delete mode 100644 elpa/magit-1.2.0/magit-blame.elc
 delete mode 100644 elpa/magit-1.2.0/magit-key-mode.elc
 delete mode 100644 elpa/magit-1.2.0/magit-pkg.el
 delete mode 100644 elpa/magit-1.2.0/magit-stgit.el
 delete mode 100644 elpa/magit-1.2.0/magit-stgit.elc
 delete mode 100644 elpa/magit-1.2.0/magit-svn.elc
 delete mode 100644 elpa/magit-1.2.0/magit-topgit.el
 delete mode 100644 elpa/magit-1.2.0/magit-topgit.elc
 delete mode 100644 elpa/magit-1.2.0/magit-wip.el
 delete mode 100644 elpa/magit-1.2.0/magit-wip.elc
 delete mode 100644 elpa/magit-1.2.0/magit.el
 delete mode 100644 elpa/magit-1.2.0/magit.el-e
 delete mode 100644 elpa/magit-1.2.0/magit.elc
 delete mode 100644 elpa/magit-1.2.0/rebase-mode.el
 delete mode 100644 elpa/magit-1.2.0/rebase-mode.elc
 delete mode 100644 elpa/pkg-info-0.4/pkg-info-pkg.el
 rename elpa/{pkg-info-0.4 => pkg-info-20131101.408}/pkg-info-autoloads.el (95%)
 create mode 100644 elpa/pkg-info-20131101.408/pkg-info-pkg.el
 rename elpa/{pkg-info-0.4 => pkg-info-20131101.408}/pkg-info-pkg.elc (60%)
 rename elpa/{pkg-info-0.4 => pkg-info-20131101.408}/pkg-info.el (99%)
 create mode 100644 elpa/pkg-info-20131101.408/pkg-info.elc
 create mode 100644 elpa/projectile-0.9.2/projectile-autoloads.el
 create mode 100644 elpa/projectile-0.9.2/projectile-pkg.el
 create mode 100644 elpa/projectile-0.9.2/projectile.el
 create mode 100644 elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el
 create mode 100644 elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el
 rename elpa/{clojure-test-mode-2.1.0/clojure-test-mode-pkg.elc => rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc} (54%)
 create mode 100644 elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el
 create mode 100644 elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.elc
 create mode 100644 elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el
 create mode 100644 elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el
 create mode 100644 elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el
 create mode 100644 elpa/s-1.7.0/s-autoloads.el
 create mode 100644 elpa/s-1.7.0/s-pkg.el
 create mode 100644 elpa/s-1.7.0/s.el
 rename elpa/{smex-2.1 => smex-1.1.1}/smex-autoloads.el (65%)
 create mode 100644 elpa/smex-1.1.1/smex-pkg.el
 rename elpa/{clojure-mode-2.1.0/clojure-mode-pkg.elc => smex-1.1.1/smex-pkg.elc} (60%)
 rename elpa/{smex-2.1 => smex-1.1.1}/smex.el (78%)
 create mode 100644 elpa/smex-1.1.1/smex.elc
 delete mode 100644 elpa/smex-2.1/smex-autoloads.el~
 delete mode 100644 elpa/smex-2.1/smex-pkg.el
 delete mode 100644 elpa/smex-2.1/smex.elc
 delete mode 100644 elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el
 delete mode 100644 elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.elc
 delete mode 100644 elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc
 rename elpa/{starter-kit-ruby-2.0.3 => starter-kit-ruby-2.0}/starter-kit-ruby-autoloads.el (80%)
 create mode 100644 elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el
 rename elpa/{inf-ruby-2.3.0/inf-ruby-pkg.elc => starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc} (59%)
 rename elpa/{starter-kit-ruby-2.0.3 => starter-kit-ruby-2.0}/starter-kit-ruby.el (90%)
 delete mode 100644 nrepl-history
 create mode 100644 vendor/clojure.el

diff --git a/.gitignore b/.gitignore
index 48ef436b2..604bc7aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *~*
 *#*
-
+*-history
 .smex-items
 places
\ No newline at end of file
diff --git a/elpa/Save-visited-files-readme.txt b/elpa/Save-visited-files-readme.txt
new file mode 100644
index 000000000..44ff71312
--- /dev/null
+++ b/elpa/Save-visited-files-readme.txt
@@ -0,0 +1,40 @@
+;;; Commentary:
+
+;; save-visited-files is a lightweight version of Desktop.el that
+;; only save the files you have open(currently).  This was created because I
+;; couldn't ever get Desktop to work and wanted to persist open files across
+;; sessions.  This file is the result.
+
+;;; Installation:
+
+;; To install, put this file somewhere in your load-path and add the following
+;; to your .emacs file:
+;;
+;; (require 'save-visited-files)
+;; (turn-on-save-visited-files-mode)
+;;
+;; This will load the set of saved files on startup, as well as updating this
+;; list whenever the auto-save-timer is run.  This does not wait to save on
+;; closing emacs because I wanted it to be useful even if emacs crashed.  To
+;; save the visited files at any time, you can call M-x save-visited-files-save.
+;; M-x save-visited-files-restore will open all files saved this way.  To turn
+;; off the saving of files, you need to run (turn-off-save-visited-files-mode)
+
+;; Changelog:
+;; 1.2
+;;  * Changed default value of save-visited-files-location to ~/.emacs.d/emacs-visisted-files
+;;  * Improvements/rewriting by Jonathan Kotta
+;;  ** Checks save-visited-files-location is writable, and gives a message if not
+;;  ** Changed to use define-minor-mode
+;;  ** Moved (setq save-visited-files-already-restored t) to the end of
+;;  ** save-visited-files-restore from save-visited-files-mode.
+;;  ** Doesn't print a message in the echo area every time it saves the file list.
+;; 1.1
+;;  * Improvements/rewriting by Ryan Thomson
+;;  ** Use auto-save-hook instead of a periodic timer
+;;  ** More consistent naming conventions
+;;  ** Customization ability via M-x customize-group save-visited-files
+;;  ** Better handling of the temp buffer
+;; 1.0
+;;  * Initial Release
+
diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents
index 9e6d8c95f..78f93ebe5 100644
--- a/elpa/archives/gnu/archive-contents
+++ b/elpa/archives/gnu/archive-contents
@@ -2,19 +2,28 @@
  (ack .
       [(1 3)
        nil "Interface to ack-like source code search tools" tar
-       ((:url . "https://github.com/leoliu/ack-el"))])
+       ((:keywords "tools" "processes" "convenience")
+	(:url . "https://github.com/leoliu/ack-el"))])
+ (ada-mode .
+	   [(5 0)
+	    ((wisi
+	      (1 0)))
+	    "major-mode for editing Ada sources" tar
+	    ((:url . "http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html"))])
  (adaptive-wrap .
 		[(0 5)
 		 nil "Smart line-wrapping with wrap-prefix" single
-		 ((:url . "http://elpa.gnu.org/packages/adaptive-wrap.html"))])
+		 ((:url . "http://elpa.gnu.org/packages/adaptive-wrap.html")
+		  (:keywords))])
  (adjust-parens .
-		[(1 3)
+		[(3 0)
 		 nil "Indent and dedent Lisp code, automatically adjust close parens" tar
 		 ((:url . "http://elpa.gnu.org/packages/adjust-parens.html"))])
  (all .
       [(1 0)
        nil "Edit all lines matching a given regexp" single
-       ((:url . "http://elpa.gnu.org/packages/all.html"))])
+       ((:url . "http://elpa.gnu.org/packages/all.html")
+	(:keywords "matching"))])
  (auctex .
 	 [(11 87 2)
 	  nil "Integrated environment for *TeX*" tar
@@ -22,23 +31,28 @@
  (cl-lib .
 	 [(0 3)
 	  nil "Properly prefixed CL functions and macros" single
-	  ((:url . "http://elpa.gnu.org/packages/cl-lib.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/cl-lib.html")
+	   (:keywords))])
  (coffee-mode .
 	      [(0 4 1 1)
 	       nil "Major mode for CoffeeScript files" single
-	       ((:url . "http://github.com/defunkt/coffee-mode"))])
+	       ((:url . "http://github.com/defunkt/coffee-mode")
+		(:keywords "CoffeeScript major mode"))])
  (company .
 	  [(0 6 12)
 	   nil "Modular in-buffer completion framework" tar
-	   ((:url . "http://company-mode.github.io/"))])
+	   ((:keywords "abbrev" "convenience" "matching")
+	    (:url . "http://company-mode.github.io/"))])
  (csv-mode .
 	   [(1 2)
 	    nil "Major mode for editing comma/char separated values" single
-	    ((:url . "http://centaur.maths.qmul.ac.uk/Emacs/"))])
+	    ((:url . "http://centaur.maths.qmul.ac.uk/Emacs/")
+	     (:keywords "convenience"))])
  (debbugs .
 	  [(0 5)
 	   nil "SOAP library to access debbugs servers" tar
-	   ((:url . "http://elpa.gnu.org/packages/debbugs.html"))])
+	   ((:keywords "comm" "hypermedia")
+	    (:url . "http://elpa.gnu.org/packages/debbugs.html"))])
  (dict-tree .
 	    [(0 12 8)
 	     ((trie
@@ -48,13 +62,15 @@
 	      (heap
 	       (0 3)))
 	     "Dictionary data structure" single
-	     ((:url . "http://www.dr-qubit.org/emacs.php"))])
+	     ((:url . "http://www.dr-qubit.org/emacs.php")
+	      (:keywords "extensions" "matching" "data structures"))])
  (diff-hl .
 	  [(1 5 1)
 	   ((cl-lib
 	     (0 2)))
 	   "Highlight uncommitted changes" tar
-	   ((:url . "https://github.com/dgutov/diff-hl"))])
+	   ((:keywords "vc" "diff")
+	    (:url . "https://github.com/dgutov/diff-hl"))])
  (dismal .
 	 [(1 5)
 	  ((cl-lib
@@ -64,57 +80,77 @@
  (djvu .
        [(0 5)
 	nil "Edit and view Djvu files via djvused" single
-	((:url . "http://elpa.gnu.org/packages/djvu.html"))])
+	((:url . "http://elpa.gnu.org/packages/djvu.html")
+	 (:keywords "files" "wp"))])
  (docbook .
 	  [(0 1)
 	   nil "Info-like viewer for DocBook" single
-	   ((:url . "http://elpa.gnu.org/packages/docbook.html"))])
+	   ((:url . "http://elpa.gnu.org/packages/docbook.html")
+	    (:keywords "docs" "help"))])
  (ediprolog .
 	    [(1 0)
 	     nil "Emacs Does Interactive Prolog" single
-	     ((:url . "http://elpa.gnu.org/packages/ediprolog.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/ediprolog.html")
+	      (:keywords "languages" "processes"))])
  (eldoc-eval .
 	     [(0 1)
 	      nil "Enable eldoc support when minibuffer is in use." single
-	      ((:url . "http://elpa.gnu.org/packages/eldoc-eval.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/eldoc-eval.html")
+	       (:keywords))])
  (enwc .
        [(1 0)
 	nil "The Emacs Network Client" tar
-	((:url . "http://elpa.gnu.org/packages/enwc.html"))])
+	((:keywords "enwc" "network" "wicd" "manager" "nm")
+	 (:url . "http://elpa.gnu.org/packages/enwc.html"))])
  (epoch-view .
 	     [(0 0 1)
 	      nil "Minor mode to visualize epoch timestamps" single
-	      ((:url . "http://elpa.gnu.org/packages/epoch-view.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/epoch-view.html")
+	       (:keywords "data" "timestamp" "epoch" "unix"))])
  (f90-interface-browser .
 			[(1 1)
 			 nil "Parse and browse f90 interfaces" single
-			 ((:url . "http://github.com/wence-/f90-iface/"))])
+			 ((:url . "http://github.com/wence-/f90-iface/")
+			  (:keywords))])
+ (flylisp .
+	  [(0 2)
+	   nil "Color unbalanced parentheses and parentheses inconsistent with indentation" single
+	   ((:url . "http://elpa.gnu.org/packages/flylisp.html")
+	    (:keywords))])
  (ggtags .
-	 [(0 7 5)
-	  nil "GNU Global source code tagging system" single
-	  ((:url . "https://github.com/leoliu/ggtags"))])
+	 [(0 7 8)
+	  ((emacs
+	    (24)))
+	  "emacs frontend to GNU Global source code tagging system" single
+	  ((:url . "https://github.com/leoliu/ggtags")
+	   (:keywords "tools" "convenience"))])
  (heap .
        [(0 3)
 	nil "Heap (a.k.a. priority queue) data structure" single
-	((:url . "http://www.dr-qubit.org/emacs.php"))])
+	((:url . "http://www.dr-qubit.org/emacs.php")
+	 (:keywords "extensions" "data structures" "heap" "priority queue"))])
  (ioccur .
 	 [(2 4)
 	  nil "Incremental occur" single
-	  ((:url . "http://elpa.gnu.org/packages/ioccur.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/ioccur.html")
+	   (:keywords))])
  (jgraph-mode .
 	      [(1 0)
 	       nil "Major mode for Jgraph files" single
-	       ((:url . "http://elpa.gnu.org/packages/jgraph-mode.html"))])
+	       ((:url . "http://elpa.gnu.org/packages/jgraph-mode.html")
+		(:keywords "tex" "wp"))])
  (js2-mode .
 	   [(20131106)
 	    ((emacs
 	      (24 1)))
 	    "Improved JavaScript editing mode" tar
-	    ((:url . "https://github.com/mooz/js2-mode/"))])
+	    ((:keywords "languages" "javascript")
+	     (:url . "https://github.com/mooz/js2-mode/"))])
  (jumpc .
 	[(3 0)
 	 nil "jump to previous insertion points" single
-	 ((:url . "http://elpa.gnu.org/packages/jumpc.html"))])
+	 ((:url . "http://elpa.gnu.org/packages/jumpc.html")
+	  (:keywords))])
  (lex .
       [(1 1)
        nil "Lexical analyser construction" tar
@@ -122,35 +158,43 @@
  (lmc .
       [(1 2)
        nil "Little Man Computer in Elisp" single
-       ((:url . "http://elpa.gnu.org/packages/lmc.html"))])
+       ((:url . "http://elpa.gnu.org/packages/lmc.html")
+	(:keywords))])
  (load-dir .
 	   [(0 0 3)
 	    nil "Load all Emacs Lisp files in a given directory" single
-	    ((:url . "http://elpa.gnu.org/packages/load-dir.html"))])
+	    ((:url . "http://elpa.gnu.org/packages/load-dir.html")
+	     (:keywords "lisp" "files" "convenience"))])
  (markchars .
 	    [(0 2 0)
 	     nil "Mark chars fitting certain characteristics" single
-	     ((:url . "http://elpa.gnu.org/packages/markchars.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/markchars.html")
+	      (:keywords))])
  (memory-usage .
 	       [(0 2)
 		nil "Analyze the memory usage of Emacs in various ways" single
-		((:url . "http://elpa.gnu.org/packages/memory-usage.html"))])
+		((:url . "http://elpa.gnu.org/packages/memory-usage.html")
+		 (:keywords "maint"))])
  (minimap .
 	  [(1 0)
 	   nil "Sidebar showing a \"mini-map\" of a buffer" single
-	   ((:url . "http://elpa.gnu.org/packages/minimap.html"))])
+	   ((:url . "http://elpa.gnu.org/packages/minimap.html")
+	    (:keywords))])
  (muse .
        [(3 20)
 	nil "Authoring and publishing tool for Emacs" tar
-	((:url . "http://mwolson.org/projects/EmacsMuse.html"))])
+	((:keywords "hypermedia")
+	 (:url . "http://mwolson.org/projects/EmacsMuse.html"))])
  (nhexl-mode .
 	     [(0 1)
 	      nil "Minor mode to edit files via hex-dump format" single
-	      ((:url . "http://elpa.gnu.org/packages/nhexl-mode.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/nhexl-mode.html")
+	       (:keywords "data"))])
  (nlinum .
 	 [(1 1)
 	  nil "Show line numbers in the margin" single
-	  ((:url . "http://elpa.gnu.org/packages/nlinum.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/nlinum.html")
+	   (:keywords "convenience"))])
  (notes-mode .
 	     [(1 30)
 	      nil "Indexing system for on-line note-taking" tar
@@ -158,67 +202,81 @@
  (num3-mode .
 	    [(1 1)
 	     nil "highlight groups of digits in long numbers" single
-	     ((:url . "http://elpa.gnu.org/packages/num3-mode.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/num3-mode.html")
+	      (:keywords))])
  (oauth2 .
 	 [(0 9)
 	  nil "OAuth 2.0 Authorization Protocol" single
-	  ((:url . "http://elpa.gnu.org/packages/oauth2.html"))])
+	  ((:url . "http://elpa.gnu.org/packages/oauth2.html")
+	   (:keywords "comm"))])
  (omn-mode .
 	   [(1 0)
 	    nil "Support for OWL Manchester Notation" single
-	    ((:url . "http://elpa.gnu.org/packages/omn-mode.html"))])
+	    ((:url . "http://elpa.gnu.org/packages/omn-mode.html")
+	     (:keywords))])
  (org .
-      [(20131112)
+      [(20131223)
        nil "Outline-based notes management and organizer" tar nil])
  (quarter-plane .
 		[(0 1)
 		 nil "Minor mode for quarter-plane style editing" single
-		 ((:url . "http://elpa.gnu.org/packages/quarter-plane.html"))])
+		 ((:url . "http://elpa.gnu.org/packages/quarter-plane.html")
+		  (:keywords "convenience wp"))])
  (queue .
 	[(0 1)
 	 nil "Queue data structure" single
-	 ((:url . "http://www.dr-qubit.org/emacs.php"))])
+	 ((:url . "http://www.dr-qubit.org/emacs.php")
+	  (:keywords "extensions" "data structures" "queue"))])
  (rainbow-mode .
 	       [(0 9)
 		nil "Colorize color names in buffers" single
-		((:url . "http://elpa.gnu.org/packages/rainbow-mode.html"))])
+		((:url . "http://elpa.gnu.org/packages/rainbow-mode.html")
+		 (:keywords "faces"))])
  (register-list .
 		[(0 1)
 		 nil "Interactively list/edit registers" single
-		 ((:url . "http://elpa.gnu.org/packages/register-list.html"))])
+		 ((:url . "http://elpa.gnu.org/packages/register-list.html")
+		  (:keywords "register"))])
  (shen-mode .
 	    [(0 1)
 	     nil "A major mode for editing shen source code" tar
-	     ((:url . "http://elpa.gnu.org/packages/shen-mode.html"))])
+	     ((:keywords "languages" "shen")
+	      (:url . "http://elpa.gnu.org/packages/shen-mode.html"))])
  (sisu-mode .
 	    [(3 0 3)
 	     nil "Major mode for SiSU markup text" single
-	     ((:url . "http://elpa.gnu.org/packages/sisu-mode.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/sisu-mode.html")
+	      (:keywords "text" "processes" "tools"))])
  (smart-operator .
 		 [(4 0)
 		  nil "Insert operators with surrounding spaces smartly" single
-		  ((:url . "http://xwl.appspot.com/ref/smart-operator.el"))])
+		  ((:url . "http://xwl.appspot.com/ref/smart-operator.el")
+		   (:keywords))])
  (sml-mode .
 	   [(6 4)
 	    nil "Major mode for editing (Standard) ML" single
-	    ((:url . "http://elpa.gnu.org/packages/sml-mode.html"))])
+	    ((:url . "http://elpa.gnu.org/packages/sml-mode.html")
+	     (:keywords "SML"))])
  (sokoban .
 	  [(1 0 4)
 	   nil "Sokoban game for emacs" tar nil])
  (svg-clock .
 	    [(0 5)
 	     nil "Analog clock using Scalable Vector Graphics" single
-	     ((:url . "http://elpa.gnu.org/packages/svg-clock.html"))])
+	     ((:url . "http://elpa.gnu.org/packages/svg-clock.html")
+	      (:keywords "demo" "svg" "clock"))])
  (tNFA .
        [(0 1 1)
 	((queue
 	  (0 1)))
 	"Tagged non-deterministic finite-state automata" single
-	((:url . "http://www.dr-qubit.org/emacs.php"))])
+	((:url . "http://www.dr-qubit.org/emacs.php")
+	 (:keywords "extensions" "matching" "data structures"))])
  (temp-buffer-browse .
 		     [(1 1)
 		      nil "temp buffer browse mode" single
-		      ((:url . "http://elpa.gnu.org/packages/temp-buffer-browse.html"))])
+		      ((:url . "http://elpa.gnu.org/packages/temp-buffer-browse.html")
+		       (:keywords "convenience"))])
  (trie .
        [(0 2 6)
 	((tNFA
@@ -226,35 +284,49 @@
 	 (heap
 	  (0 3)))
 	"Trie data structure" single
-	((:url . "http://www.dr-qubit.org/emacs.php"))])
+	((:url . "http://www.dr-qubit.org/emacs.php")
+	 (:keywords "extensions" "matching" "data structures"))])
  (undo-tree .
-	    [(0 6 3)
+	    [(0 6 5)
 	     nil "Treat undo history as a tree" single
-	     ((:url . "http://www.dr-qubit.org/emacs.php"))])
+	     ((:url . "http://www.dr-qubit.org/emacs.php")
+	      (:keywords "convenience" "files" "undo" "redo" "history" "tree"))])
  (uni-confusables .
 		  [(0 1)
 		   nil "Unicode confusables table" tar nil])
  (vlf .
-      [(0 9 1)
+      [(1 2)
        nil "View Large Files" single
-       ((:url . "https://github.com/m00natic/vlfi"))])
+       ((:url . "https://github.com/m00natic/vlfi")
+	(:keywords "large files" "utilities"))])
  (w3 .
      [(4 0 49)
       nil "Fully customizable, largely undocumented web browser for Emacs" tar
-      ((:url . "http://elpa.gnu.org/packages/w3.html"))])
+      ((:keywords "faces" "help" "comm" "news" "mail" "processes" "mouse" "hypermedia")
+       (:url . "http://elpa.gnu.org/packages/w3.html"))])
  (websocket .
 	    [(1 1)
 	     nil "Emacs WebSocket client and server" tar
-	     ((:url . "http://elpa.gnu.org/packages/websocket.html"))])
+	     ((:keywords "Communication" "Websocket" "Server")
+	      (:url . "http://elpa.gnu.org/packages/websocket.html"))])
  (windresize .
 	     [(0 1)
 	      nil "Resize windows interactively" single
-	      ((:url . "http://elpa.gnu.org/packages/windresize.html"))])
+	      ((:url . "http://elpa.gnu.org/packages/windresize.html")
+	       (:keywords "window"))])
+ (wisi .
+       [(1 0)
+	((cl-lib
+	  (0)))
+	"Utilities for implementing an indentation/navigation engine using a generalized LALR parser" tar
+	((:url . "http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html"))])
  (xclip .
 	[(1 3)
 	 nil "use xclip to copy&paste" single
-	 ((:url . "http://elpa.gnu.org/packages/xclip.html"))])
+	 ((:url . "http://elpa.gnu.org/packages/xclip.html")
+	  (:keywords "convenience" "tools"))])
  (yasnippet .
 	    [(0 8 0)
 	     nil "Yet another snippet extension for Emacs." tar
-	     ((:url . "http://github.com/capitaomorte/yasnippet"))]))
+	     ((:keywords "convenience" "emulation")
+	      (:url . "http://github.com/capitaomorte/yasnippet"))]))
diff --git a/elpa/archives/marmalade/archive-contents b/elpa/archives/marmalade/archive-contents
index 8f75773c0..f381f7159 100644
--- a/elpa/archives/marmalade/archive-contents
+++ b/elpa/archives/marmalade/archive-contents
@@ -1 +1 @@
-(1(paredit .[(22)()"minor mode for editing parentheses  -*- Mode: Emacs-Lisp -*-"single])(sass-mode .[(3 0 14)((haml-mode (3 0 14)))"Major mode for editing Sass files"single])(perspective .[(1 9)()"switch between named \"perspectives\" of the editor"single])(slime .[(20100404 1)()"Superior Lisp Interaction Mode for Emacs"single])(slime-repl .[(20100404)((slime (20100404)))"Read-Eval-Print Loop written in Emacs Lisp"single])(scpaste .[(0 6)((htmlize (1 39)))"Paste to the web via scp."single])(idle-highlight .[(1 0)()"highlight the word the point is on"single])(magit .[(1 2 0)()"Control Git from Emacs."tar])(durendal .[(0 2)((clojure-mode (1 7)) (slime (20100404)) (paredit (22)))"A bucket of tricks for Clojure and Slime."single])(htmlize .[(1 39)()"Convert buffer text and decorations to HTML."single])(furl .[(0 0 2)()"Friendly URL retrieval"single])(marmalade .[(0 0 4)((furl (0 0 2)))"Elisp interface for the Emacs Lisp package server."single])(yari .[(0 6)()"Yet Another RI interface for Emacs"single])(enclose .[(0 0 2)()"Enclose cursor within punctuation pairs"single])(html-script-src .[(0 0 2)()"Insert <script src=\"..\"> for popular JavaScript libraries"single])(mactag .[(0 0 1)()"Mode for automatically handle multiple tags files with Mactag rubygem"single])(undo-tree .[(0 3 1)()"Treat undo history as a tree"single])(diminish .[(0 44)()"Diminished modes are minor modes with no modeline display"single])(notify .[(2010 8 20)()"notification front-end"single])(keywiz .[(1 4)()"Emacs key sequence quiz"single])(descbinds-anything .[(1 5)((anything (1 287)))"Yet Another `describe-bindings' with `anything'."single])(scrolloff .[(1 0)()"This mode ofers vim-like scrolloff function"single])(el-init .[(20130416)()"Loader for configuration files"tar])(autopair .[(0 3)()"Automagically pair braces and quotes like TextMate"single])(highlight-parentheses .[(1 0 1)()"highlight surrounding parentheses"single])(anything .[(1 287)()"open anything / QuickSilver-like candidate-selection framework"single])(anything-config .[(0 4 1)()"Predefined configurations for `anything.el'"single])(anything-match-plugin .[(1 27)()"Humane match plug-in for anything"single])(closure-template-html-mode .[(0 1)()"highlighting for google closure templates"single])(gist .[(1 1 1)((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0)))"Emacs integration for gist.github.com"single])(highlight-symbol .[(1 1)()"automatic and manual symbol highlighting"single])(color-theme-twilight .[(0 1)()"Twilight Colour Theme for Emacs."single])(browse-kill-ring .[(1 3 1)()"interactively insert items from kill-ring -*- coding: utf-8 -*-"single])(buffer-move .[(0 4)()"swap buffers between windows"single])(dired-single .[(1 7 0)()"reuse the current dired buffer to visit another directory"single])(php-mode .[(1 5 0)()"major mode for editing PHP code"single])(c-eldoc .[(0 5)()"helpful description of the arguments to C functions"single])(full-ack .[(0 2 3)()"a front-end for ack"single])(find-file-in-project .[(3 2)()"Find files in a project quickly."single])(project .[(1 0)()"Keep track of the current project"single])(goto-last-change .[(1 2)()"Move point through buffer-undo-list positions -*-unibyte: t; coding: iso-8859-1;-*-"single])(http-twiddle .[(1 0)()"send & twiddle & resend HTTP requests"single])(mac-key-mode .[(2010 1 3)()"provide mac-style key bindings on Carbon Emacs"single])(flymake-cursor .[(1 0 2)((flymake (0 3)))"Show flymake messages in the minibuffer after delay"tar])(multi-term .[(0 8 8)()"Managing multiple terminal buffers in Emacs."single])(parenface .[(1 1)()"Provide a face for parens in lisp modes."single])(gnuplot .[(0 6 0)()"drive gnuplot from within emacs"single])(speck .[(2010 5 25)()"minor mode for spell checking"single])(hexrgb .[(21 0)()"Functions to manipulate colors, including RGB hex strings."single])(icomplete+ .[(21 0)()"Extensions to `icomplete.el'."single])(lacarte .[(22 0)()"Execute menu items as commands, with completion."single])(synonyms .[(1 0)()"Look up synonyms for a word or phrase in a thesaurus."single])(ecb .[(2 40)()"Emacs Code Browser"tar])(predictive .[(0 19 5)()"Predictive Mode (Contains Dependencies)"tar])(rw-hunspell .[(0 2)()"special functions for Hunspell in ispell.el"single])(rw-ispell .[(0 1)()"additional functions for ispell.el"single])(rw-language-and-country-codes .[(0 1)()"Language & Country Codes"single])(yas-jit .[(0 8 3)()"Loads Yasnippets on demand (makes start up faster)"single])(ntcmd .[(1 0)()"major mode for editing cmd scripts"single])(org-table-comment .[(0 2)()" Org table comment modes."single])(anything-extension .[(0 2)()"Extension functions for anything.el"single])(powershell .[(0 2 1)()"run powershell as an inferior shell in emacs"single])(cdlatex .[(4 0)()"Fast input methods for LaTeX environments and math"single])(anything-R .[(0 1 2010)()"anything-sources and some utilities for GNU R."single])(anything-el-swank-fuzzy .[(0 1 2009)()"anything-sources for el-swank-fuzzy.el"single])(anything-ipython .[(0 1 2009)()" Ipython anything"single])(color-file-completion .[(1 0 1)()"add colors to file completion"single])(color-theme-emacs-revert-theme .[(0 1)()"Color-theme revert to emacs colors"single])(anything-complete .[(1 86)()"completion with anything"single])(anything-obsolete .[(0 1)()"obsolete functions of anything"single])(ipython .[(2927)()"Adds support for IPython to python-mode.el"single])(el-swank-fuzzy .[(0 1)()"fuzzy symbol completion."single])(fold-dwim .[(1 2)()"Unified user interface for Emacs folding modes"single])(fold-dwim-org .[(0 2)((fold-dwim (1 2)))"Fold DWIM bound to org key-strokes."single])(fuzzy-match .[(1 4)()"fuzzy matching"single])(w32-browser .[(21 0)()"Run Windows application associated with a file."single])(crosshairs .[(22 0)()"Highlight the current line and column."single])(csv-mode .[(1 50)()"major mode for editing comma-separated value files"single])(vline .[(1 10)()"show vertical line (column highlighting) mode."single])(hl-line+ .[(22 0)()"Extensions to hl-line.el."single])(col-highlight .[(22 0)((vline (1 10)))"Highlight the current column."single])(color-theme-vim-insert-mode .[(0 1)()"Color theme VIM insert mode"single])(cursor-chg .[(20 1)()"Change cursor dynamically, depending on the context."single])(cygwin-mount .[(2001)()"Teach EMACS about cygwin styles and mount points."single])(header2 .[(21 0)()"Support for creation and update of file headers."single])(lib-requires .[(21 0)()"Commands to list Emacs Lisp library dependencies."single])(linum-off .[(0 1)()"Provides an interface for turning line-numbering off"single])(pos-tip .[(0 4 5)()"Show tooltip at point -*- coding: utf-8 -*-"single])(key-choices .[(0 201)((color-theme-vim-insert-mode (0 1)) (color-theme-emacs-revert-theme (0 1)))"Key Choices -- Also Viper has different colors in different modes"single])(tabbar .[(2 0 1)()"Display a tab bar in the header line  -*-no-byte-compile: t; -*-"single])(elein .[(0 2 2)()"running leiningen commands from emacs"single])(sumatra-forward .[(2008 10 8)()"Provides Sumatra Forward search"single])(org-outlook .[(0 3)()"Outlook org"single])(slime-fuzzy .[(20100404)((slime (20100404)))"Fuzzy symbol completion for Slime"single])(color-theme-complexity .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(starter-kit .[(2 0 3)((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 1)) (ido-ubiquitous (0 3)) (magit (0 8 1)))"Saner defaults and goodies."tar])(starter-kit-lisp .[(2 0 3)((starter-kit (2 0 2)) (elisp-slime-nav (0 1)))"Saner defaults and goodies for lisp languages"single])(starter-kit-js .[(2 0 1)((starter-kit (2 0 1)))"Saner defaults and goodies for Javascript"single])(starter-kit-ruby .[(2 0 3)((inf-ruby (2 2 3)) (starter-kit (2 0 1)))"Saner defaults and goodies for Ruby"single])(geben .[(0 26)()"A remote debugging environment for Emacs."tar])(maxframe .[(0 5 1)()"maximize the emacs frame based on display size"single])(mode-compile .[(2 29)()" Smart command for compiling files"single])(swank-cdt .[(1 0 1)()"swank-cdt helper functions"single])(find-file-in-git-repo .[(0 1 2)()"Utility to find files in a git repo"single])(idle-highlight-mode .[(1 1 2)()"highlight the word the point is on"single])(smex .[(2 1)()"M-x interface with Ido-style fuzzy matching."single])(protobuf-mode .[(0 3)()"major mode for editing protocol buffers."single])(haskell-mode .[(13 7)()"A Haskell editing mode"tar])(znc .[(0 0 2)((cl (2 2)) (erc (5 3)))"ZNC + ERC "single])(slime-clj .[(0 1 5)()"slime extensions for swank-clj"single])(go-mode .[(12869)()"Major mode for the Go programming language."tar])(scala-mode .[(0 0 2)()"Scala major mode"tar])(json .[(1 2)()"JavaScript Object Notation parser / generator"single])(magit-simple-keys .[(1 0 0)((magit (1 0 0)))"simple keybindings for Magit"single])(rainbow-delimiters .[(1 3 4)()"Highlight nested parens, brackets, braces a different color at each depth."single])(nyan-mode .[(0 1)()"Nyan Cat shows position in current buffer in mode-line."single])(anything-git .[(1 1 1)()"Show git files in anything"single])(xml-gen .[(0 4)()"A DSL for generating XML."single])(jump .[(2 3)((findr (0 7)) (inflections (1 1)))"build functions which contextually jump between files"single])(dotassoc .[(0 0 1)()"dot access embedded alists"single])(rcirc-ssh .[(0 0 7)((kv (0 0 3)))"do irc over ssh sessions -*- lexical-binding: t -*-"single])(weather-metno .[(20121023)()"Weather data from met.no in Emacs"tar])(systemtap-mode .[(0 2)()"A mode for SystemTap"single])(mocker .[(0 3 0)((eieio (1 3)) (el-x (0 2 4)))"mocking framework for emacs"single])(kpm-list .[(1 0)()"An emacs buffer list that tries to intelligently group together buffers."single])(weechat .[(0 2)((s (1 3 1)) (cl-lib (0 2)) (emacs (24)) (tracking (1 2)))"Chat via WeeChat's relay protocol in Emacs"tar])(batch-mode .[(1 0)()"major mode for editing ESRI batch scrips"single])(osx-pseudo-daemon .[(1 0)()"Daemon mode that plays nice with OSX."single])(switch-window .[(0 9)()"A *visual* way to choose a window to switch to"single])(yaml-mode .[(0 0 9)()"Major mode for editing YAML files"single])(prolog .[(1 22)()"major mode for editing and running Prolog (and Mercury) code"single])(graphviz-dot-mode .[(0 3 7)()"Mode for the dot-language used by graphviz (att)."single])(perlcritic .[(1 10)()"minor mode for Perl::Critic integration"single])(gh .[(0 7 2)((eieio (1 3)) (pcache (0 2 3)) (logito (0 1)))"A GitHub library for Emacs"tar])(vala-mode .[(0 1)()"Vala mode derived mode"single])(alpha .[(1 0)()"increase frame transparency"single])(color-theme-ir-black .[(1 0 1)((color-theme (6 6 1)))"pastel color theme "single])(calfw-gcal .[(0 0 1)()"edit Google calendar for calfw.el."single])(python .[(20120402)()"Python's flying circus support for Emacs"single])(htmlfontify .[(0 21)()"htmlise a buffer/source tree with optional hyperlinks"single])(oddmuse .[(20090222)()"edit pages on an Oddmuse wiki"single])(wgrep .[(2 1 3)()"Writable grep buffer and apply the changes to files"single])(langtool .[(1 2 1)()"Grammar check utility using LanguageTool"single])(starter-kit-bindings .[(2 0 2)((starter-kit (2 0 2)))"Saner defaults and goodies: bindings"single])(hl-sentence .[(2)()"highlight a sentence based on customizable face"single])(color-theme-eclipse .[(0 0 2)((color-theme (6 6 1)))"Eclipse color theme for GNU Emacs."single])(bm .[(1 53)()"Visible bookmarks in buffer."single])(color-theme-railscasts .[(0 0 2)((color-theme (6 6 1)))"Railscasts color theme for GNU Emacs."single])(color-theme-tango .[(0 0 2)((color-theme (6 6 1)))"Tango palette color theme for GNU Emacs."single])(color-theme-github .[(0 0 3)((color-theme (6 6 1)))"Github color theme for GNU Emacs."single])(color-theme-dpaste .[(0 0 1)((color-theme (6 6 1)))"Dpaste color theme for GNU Emacs."single])(nose .[(0 1 1)()"Easy Python test running in Emacs"single])(dpaste .[(0 2)()"Emacs integration for dpaste.com"single])(offlineimap .[(0 1)()"Run OfflineIMAP from Emacs"single])(scss-mode .[(0 5 0)()"Major mode for editing SCSS files"single])(highlight-indentation .[(0 5 0)()"Function for highlighting indentation"single])(feature-mode .[(0 4)()"Major mode for editing Gherkin (i.e. Cucumber) user stories"tar])(dired-details .[(1 3 1)()"make file details hide-able in dired"single])(dired-details+ .[(1 0)()"Enhancements to library `dired-details+.el'."single])(python-pep8 .[(1 1)()"minor mode for running `pep8'"single])(python-pylint .[(1 1)()"minor mode for running `pylint'"single])(workgroups .[(0 2 0)()"workgroups for windows (for Emacs)"single])(closure-lint-mode .[(0 1)()"minor mode for the Closure Linter"single])(httpd .[(1 0 1)()"HTTP/1.0 web server for emacs"single])(pep8 .[(1 2)()"run the python pep8 checker putting hits in a grep buffer"single])(cppcheck .[(1 0)()"run cppcheck putting hits in a grep buffer"single])(grin .[(1 0)()"run grin and grind (python replacements for grep and find) putting hits in a grep buffer"single])(pyflakes .[(1 0)()"run the python pyflakes checker putting hits in a grep buffer"single])(pylint .[(1 0)()"run the python pylint checker putting hits in a grep buffer"single])(fastnav .[(1 0 7)()"Fast navigation and editing routines."single])(confluence .[(1 6)((xml-rpc (1 6 7)))"Confluence major mode"tar])(tuareg .[(2 0 5)((caml (3 12 0 1)))"OCaml mode for Emacs."tar])(pp-c-l .[(1 0)()"Display Control-l characters in a pretty way"single])(js-comint .[(0 0 1)()"Run javascript in an inferior process window."single])(magithub .[(0 2)((magit (0 8)) (json (1 2)))"Magit extensions for using GitHub"single])(smart-operator .[(1 9 20110812)()"Insert operators with surrounding spaces smartly"single])(org-magit .[(0 2 0)((magit (0 8)) (org (6 1)))"basic support for magit links"single])(whole-line-or-region .[(1 3 1)()"operate on current line if region undefined"single])(ido-ubiquitous .[(2 9)((emacs (24 1)))"Use ido (nearly) everywhere."single])(bigint .[(1 0 0)()"A simple bigint package for emacs"single])(dizzee .[(0 1 1)()"A more pleasant way to manage your project's subprocesses in Emacs."tar])(color-theme-dg .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(gimme .[(2 1)()"The XMMS2 interface we all love! Check out http://gimmeplayer.org for more info."tar])(deft .[(0 3)()"quickly browse, filter, and edit plain text notes"single])(pony-mode .[(0 2)()"Minor mode for working with Django Projects"tar])(clojurescript-mode .[(0 5)()"Major mode for ClojureScript code"single])(fsvn .[(0 9 13)()"Another frontend of subversion."tar])(starter-kit-eshell .[(2 0 3)()"Saner defaults and goodies: eshell tweaks"single])(yasnippet-bundle .[(0 6 1)()"Yet another snippet extension (Auto compiled bundle)"single])(yasnippet .[(0 6 1)()"Yasnippet template engine"tar])(ido-yes-or-no .[(1 1)((ido (0)))"Use Ido to answer yes-or-no questions"single])(caml .[(3 12 0 1)()"OCaml code editing commands for Emacs"tar])(dtrt-indent .[(0 2 0)()"Adapt to foreign indentation offsets"single])(windsize .[(0 1)()"Simple, intuitive window resizing"single])(textmate .[(5)()"TextMate minor mode for Emacs"single])(xml-rpc .[(1 6 8)()"An elisp implementation of clientside XML-RPC"single])(coffee-mode .[(0 3 0)()"Major mode to edit CoffeeScript files in Emacs"single])(sr-speedbar .[(0 1 8)()"Same frame speedbar"single])(desktop .[(0 1)()"save partial status of Emacs when killed"single])(evil-numbers .[(0 3)()"increment/decrement numbers like in vim"single])(lolcode-mode .[(0 2)()"Major mode for editing LOLCODE"single])(dedicated .[(1 0 0)()"A very simple minor mode for dedicated buffers"single])(csharp-mode .[(0 8 6)()"C# mode derived mode"single])(color-theme-actress .[(0 2 2)((color-theme (6 6 1)))"A dark color theme for GNU Emacs."single])(ghc .[(1 10 2)((haskell-mode (2 8 0)))"Happy Haskell programming on Emacs"tar])(org-email .[(1 0)()"use org for an email database -*- lexical-binding: t -*-"single])(ahg .[(0 99)()"Alberto's Emacs interface for Mercurial (Hg)"single])(lua-mode .[(20110428)()"a major-mode for editing Lua scripts"single])(vc-darcs .[(1 12)()"a VC backend for darcs"single])(elisp-cache .[(1 15)()"Faster emacs startup through byte-compiling."single])(scratch .[(20110708)()"Mode-specific scratch buffers"single])(hl-sexp .[(1 0 0)()"highlight the current sexp"single])(dsvn .[(922257)()"Subversion interface"single])(crontab-mode .[(1 2)()"Mode for editing crontab files"single])(popwin .[(0 4)()"Popup Window Manager."single])(session .[(2 2 1)()"use variables, registers and buffer places across sessions"single])(smart-tab .[(0 3)()"Intelligent tab completion and indentation."single])(ac-ja .[(0 0 1)()"auto-complete-mode source for Japanese "single])(rcirc-notify .[(0 6)()"libnotify popups"single])(jira .[(0 3 3)()"Connect to JIRA issue tracking software"single])(color-theme-blackboard .[(0 0 2)((color-theme (6 6 1)))"Blackboard Colour Theme for Emacs."single])(color-theme-wombat .[(0 0 1)((color-theme (6 6 1)))"The wombat color theme for Emacs."single])(color-theme-wombat+ .[(0 0 2)((color-theme (6 6 1)))"wombat with improvements and many more faces"single])(color-theme-active .[(0 0 1)((color-theme (6 6 1)))"Active theme inspired by jEdit theme of the same name"single])(color-theme-colorful-obsolescence .[(0 0 1)((color-theme (6 6 1)))"Colorful Obsolescence theme designed for partially transparent windows"single])(apache-mode .[(2 0)()"major mode for editing Apache configuration files"single])(highline .[(7 2 2)()"minor mode to highlight current line in buffer"single])(mic-paren .[(3 8)()"advanced highlighting of matching parentheses"single])(pytest .[(0 2 1)()"Easy Python test running in Emacs"single])(wikidoc .[(0 8 1)()"use elisp doc strings to make other documentation"single])(regex-tool .[(1 2)()"A regular expression evaluation tool for programmers"single])(tabkey2 .[(1 40)()"Use second tab key pressed for what you want"single])(ioccur .[(0 2)()"Incremental occur."single])(javadoc-help .[(1 0)()"Javadoc-Help.  Look up Java class on online javadocs in browser."single])(macro-math .[(1 0)()"in-buffer mathematical operations"single])(winpoint .[(1 4)()"Remember buffer positions per-window, not per buffer"single])(scheme-complete .[(0 8 2)()"Smart tab completion for Emacs"single])(flymake-jshint .[(1 0)()"making flymake work with JSHint"single])(doc-mode .[(0 2)()"convenient editing of in-code documentation"single])(gccsense .[(0 2)()"GCCSense client for Emacs"single])(p4 .[(11 0)()"Perforce-Emacs Integration Library"single])(pager .[(2 0)()"windows-scroll commands"single])(pastebin .[(0 1)()"A simple interface to the www.pastebin.com webservice"single])(cache .[(0 1)()"implementation of a hash table whose key-value pairs expire"single])(command-frequency .[(1 1)()"Track command frequencies"single])(guess-offset .[(0 1 1)()"Automatically determine c-basic-offset"single])(loccur .[(1 1 1)()"Perform an occur-like folding in current buffer"single])(recursive-narrow .[(1 0)()"narrow-to-region that operates recursively"single])(member-function .[(0 3 1)()"expand member functions for C++ classes"single])(window-number .[(1 0 1)()"Jump to a window by number"single])(gtags .[(3 3)()"gtags facility for Emacs"single])(pymacs .[(0 25)()"Interface between Emacs Lisp and Python"single])(pysmell .[(0 7 2)()"Complete python code using heuristic static analysis"single])(eieio .[(1 4)()"Enhanced Implememntation of Emacs Interpreted Objects"tar])(rudel .[(0 3)((eieio (1 4)))"A collaborative editing framework for Emacs"tar])(jabber .[(0 8 90)()"A Jabber client for Emacs."tar])(citrus-mode .[(0 0 2)()"Major mode for editing Citrus files"single])(lineno .[(0 1)()"Alternate mode to display line numbers."single])(emacsd-tile .[(0 1)()"tiling windows for emacs"single])(iy-go-to-char .[(1 0)()"Go to next CHAR which is similar to \"f\" in vim"single])(jenkins-watch .[(1 2)()"Watch continuous integration build status -*- indent-tabs-mode: t; tab-width: 8 -*-"single])(peepopen .[(0 1 0)()"Graphical file chooser for Emacs on Mac OS X."single])(levenshtein .[(1 0)()"Edit distance between two strings."single])(gopher .[(0 0 2)()"easily access and navigate Gopher servers"single])(clojure-project-mode .[(1 0)((project-mode (1 0)))"Extends project-mode for Clojure projects"single])(ruby-block .[(0 0 11)()"highlight matching block"single])(pretty-lambdada .[(22 0)()"Show the word `lambda' as the Greek letter."single])(rect-mark .[(1 4)()"Mark a rectangle of text with highlighting."single])(evernote-mode .[(0 41)()"Evernote client for Emacs"tar])(centered-cursor-mode .[(0 5 1)()"cursor stays vertically centered"single])(elixir-mode .[(1 0 0)()"Major mode for editing Elixir files"single])(wget .[(1 94)()"Emacs-wget is an interface program of GNU wget on Emacs."tar])(mldonkey .[(0 0 4)()"Multi-networks peer-to-peer client."tar])(sml-modeline .[(0 5)()"Show position in a scrollbar like way in mode-line"single])(mwe-log-commands .[(20041106)()"log keyboard commands to buffer"single])(move-text .[(1 0)()"Move current line or region with M-up or M-down."single])(hippie-expand-slime .[(0 1)()"Hook slime's completion into hippie-expand"single])(boxquote .[(1 23)()"Quote text with a semi-box."single])(gnugo .[(2 2 12)()"Play a game of Go against gnugo"single])(project-mode .[(1 0)((levenshtein (1 0)))"Define code projects. Full-text search, etc."single])(n3-mode .[(20071215)()"mode for Notation 3"single])(org2blog .[(0 5)((org (7 7)) (xml-rpc (1 6 8)))"Blog from Org mode to wordpress"tar])(pcache .[(0 2 3)((eieio (1 3)))"persistent caching for Emacs"single])(idle-require .[(1 0)()"load elisp libraries while Emacs is idle"single])(find-things-fast .[(20111123)()"An emacs mode to find things fast and move around in a project quickly"tar])(color-theme-gruber-darker .[(1)((color-theme (6 6 1)))"Gruber Darker color theme for Emacs by Jason Blevins"single])(dna-mode .[(1 44)()"a major mode for editing dna sequences"single])(perl-myvar .[(1 25)()"Declare lexicaly scoped vars as my()."single])(nlet .[(1 10)()"schemes 'named let' for emacs."single])(ssh-config-mode .[(1 13)()"Mode for fontification of ~/.ssh/config"single])(win-switch .[(1 0 8)()"fast, dynamic bindings for window-switching/resizing"single])(j-mode .[(0 3)()"Major mode for editing J programs"single])(nginx-mode .[(1 1)()"major mode for editing nginx config files"single])(vimgolf .[(0 9 2)()"VimGolf interface for the One True Editor"single])(flymake-csslint .[(1 1 0)((flymake (0 3)))"making flymake work with CSSLint"tar])(typing .[(1 1 4)()"A game for fast typers, inspired by The Typing Of The Dead."single])(zenburn-theme .[(2 1)()"A low contrast color theme for Emacs."single])(solarized-theme .[(1 0 0)()"The Solarized color theme, ported to Emacs."tar])(etags-select .[(1 13)()"Select from multiple tags"single])(etags-table .[(1 1)()"Set tags table(s) based on current file"single])(tintin-mode .[(1 0 0)()"Mayor mode for editing tintin++ scripts"single])(org-cua-dwim .[(0 5)()"Org-mode and Cua mode compatibility layer"single])(otp .[(1 0)()"a one-time password creator"single])(bookmark+ .[(20111214)()"Bookmark Plus"tar])(sentence-highlight .[(0 1)()"highlight the current sentence"single])(smartrep .[(0 0 3)()"Support sequential operation which omitted prefix keys."single])(tabula-rasa-mode .[(0 1 0)()"Distraction free writing mode"single])(abl-mode .[(0 9 0)()"Python TDD minor mode"single])(grails-mode .[(0 1)()"minor-mode that adds some Grails project management to a grails project"single])(inf-groovy .[(2 0)()"minor-mode that adds some Grails project management to a grails project"single])(tidy .[(2 12)()"Interface to the HTML Tidy program"single])(httpcode .[(0 1)()"explains the meaning of an HTTP status code"single])(d-mode .[(2 0 4)()"D Programming Language mode for (X)Emacs"tar])(git-commit .[(0 1)()"Major mode for editing git commit messages"single])(color-theme-library .[(0 0 10)((color-theme (6 6 1)))"The real color theme functions"single])(sauron .[(0 8)()"Track (erc/org/dbus/...) events and react to them."tar])(rcirc-ucomplete .[(1 0 1)()"Unambiguous non-cycling completion for rcirc"single])(cl-format .[(1 1)()"CL format routine."tar])(color-theme-cobalt .[(0 0 2)((color-theme (6 6 1)))"Cobalt Color Theme for Emacs"single])(refheap .[(0 0 3)()"A library for pasting to https://refheap.com"single])(ctags-update .[(0 1 2)()"auto update TAGS in parent directory using exuberant-ctags -*- coding:utf-8 -*-"single])(peep-open .[(0 0 2)()"PeepOpen plugin for emacs."single])(org-mime .[(20120112)()"org html export for text/html MIME emails"single])(eh-basic .[(0 0 2)((starter-kit (2 0 2)) (browse-kill-ring (1 3 1)))"tuamshu's emacs basic configure"tar])(eh-gnus .[(0 0 6)()"tuamshu's gnus configure"tar])(eh-functions .[(0 0 1)((starter-kit (2 0 2)))"tuamshu's emacs functions"tar])(eh-keybindings .[(0 0 1)((eh-functions (0 0 1)) (starter-kit-bindings (2 0 2)))"tuamshu's emacs keybindings"tar])(magit-gh-pulls .[(0 3)((gh (0 4 3)) (magit (1 1 0)))"GitHub pull requests extension for Magit"single])(highlight-80+ .[(1 0)()"highlight characters beyond column 80"single])(jump-char .[(0 1)()"navigation by char"single])(color-theme-molokai .[(0 1)()"Molokai color theme by Lloyd"single])(pointback .[(0 2)()"Restore window points when returning to buffers"single])(uci-mode .[(1 0 0)()"Major mode for UCI configuration files"single])(erlang .[(2 4 1)()"Major modes for editing and running Erlang"single])(thumb-through .[(0 3)()"Plain text reader of HTML documents"single])(unbound .[(0 1)()"find convenient unbound keystrokes"single])(ido-better-flex .[(0 0 2)()"A better flex (fuzzy) algorithm for Ido."single])(popup .[(0 5)()"Visual Popup User Interface"single])(fancy-mode .[(0 1)()"Major mode for programming with the Fancy language."single])(haxe-mode .[(0 3 1)()"An Emacs major mode for haXe"single])(expand-region .[(0 8 0)()"Increase selected region by semantic units."tar])(ack-and-a-half .[(1 2 0)()"Yet another front-end for ack"single])(test-case-mode .[(0 1 8)()"unit test front-end"single])(multi-eshell .[(0 0 1)()"makes it easier to use multiple shells within emacs"single])(mo-git-blame .[(0 1 0)()"An interactive, iterative 'git blame' mode for Emacs"single])(slime-js .[(0 0 1)((slime-repl (20100404)) (slime (20100404)))"Slime extension for swank-js."single])(smooth-scroll .[(1 2)()"Minor mode for smooth scrolling and in-place scrolling."single])(xlicense .[(1 1)()"Insert pre-defined license text"tar])(flymake-d .[(0 1)()"A flymake handler for d-mode files"single])(flymake-tuareg .[(0 1)()"A flymake handler for tuareg-mode files"tar])(track-closed-files .[(0 1)()"Keep track of recently closed files"single])(color-theme-monokai .[(0 0 5)((color-theme (6 5 5)))"Monokai Color Theme for Emacs."single])(drupal-mode .[(0 2 0)((php-mode (1 5 0)))"Advanced minor mode for Drupal development"tar])(screen-lines .[(0 55)()"a minor mode for screen-line-based point motion"single])(ctypes .[(1 2)()"Enhanced Font lock support for custom defined types."single])(moinmoin-mode .[(1 0)((screen-lines (0 55)))"a major mode to edit MoinMoin wiki pages"single])(pc-mode .[(0 1)()"major mode for editing PC code,"single])(mediawiki .[(2 2 3)()"mediawiki frontend"single])(workspaces .[(0 1)()"Workspaces for Emacsen "single])(pivotal-tracker .[(1 2 0)()"Interact with Pivotal Tracker through its API"single])(sublime .[(0 0 7)((coffee-mode (0 3 0)) (find-file-in-project (3 0)) (haml-mode (3 0 14)) (ido-ubiquitous (1 0)) (less-css-mode (0 6)) (magit (1 1 1)) (markdown-mode (1 8 1)) (monokai-theme (0 0 6)) (paredit (22)) (sass-mode (3 0 14)) (smex (1 1 2)) (yaml-mode (0 0 7)) (yasnippet (0 6 1)))"REQUIRES EMACS 24 - Sublime Text 2 Emulation for Emacs"tar])(logito .[(0 1)((eieio (1 3)))"logging library for Emacs"single])(jade-mode .[(0 1)()"Major mode for editing jade templates."single])(stylus-mode .[(0 1)()"Major mode for editing stylus templates."single])(sws-mode .[(0 1)()"SWS mode"single])(javap .[(8)()"Javap major mode"single])(javap-mode .[(9)()"Javap major mode"single])(anything-show-completion .[(20091119)()"Show selection in buffer for anything completion"single])(pastels-on-dark-theme .[(0 3)()"Pastels on Dark theme for Emacs 24"single])(color-theme-solarized .[(20120301)()"Solarized themes for Emacs"tar])(deferred .[(0 3 1)()"Simple asynchronous functions for emacs lisp"single])(concurrent .[(0 3 1)((deferred (0 3 1)))"Concurrent utility functions for emacs lisp"single])(epc .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)))"A RPC stack for the Emacs Lisp"single])(edbi .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)) (epc (0 1 1)))"Emacs Database Interface"tar])(color-theme .[(6 5 5)()"install color themes"single])(cacoo .[(2 1 2)((concurrent (0 3 1)))"Minor mode for Cacoo : http://cacoo.com"tar])(imgur .[(0 1)((anything (1 287)))"imgur client for Emacs"single])(tango-2-theme .[(1 0 0)()"Tango 2 color theme for GNU Emacs 24"single])(puppet-mode .[(0 2)()"A simple mode for editing puppet manifests"single])(po.foo .[(3 0 20)((haml-mode (3 0 20)))"Sass major mode"single])(po.elscreen .[(1 4 6)()" Screen for Emacsen(this is not original)"single])(po-elscreen .[(1 4 6)()" Screen for Emacsen(this is not original. original is http://www.morishima.net/~naoto/elscreen-en/?lang=en)"single])(quack .[(0 42)()"enhanced support for editing and running Scheme code"single])(dired+ .[(21 2)()"Extensions to Dired."single])(emstar .[(1 4)()"Casual game, like a brainy Pac-Man"tar])(igrep .[(2 113)()"An improved interface to `grep` and `find`"single])(cljdoc .[(0 1 0)()"eldoc mode for clojure"single])(real-auto-save .[(0 3)()"enable real auto save"single])(fuzzy .[(0 1)()"Fuzzy Matching"single])(auto-complete .[(1 4)((popup (0 5)))"Auto Completion for GNU Emacs"tar])(bitlbee .[(1 0)()"Help get Bitlbee (http://www.bitlbee.org) up and running"single])(lorem-ipsum .[(0 1)()"Insert dummy pseudo Latin text."single])(typopunct .[(1 0)()"Automatic typographical punctuation marks"single])(twittering-mode .[(2 0 0)()"Major mode for Twitter"single])(flymake-phpcs .[(1 0 5)((flymake (0 3)))"Flymake handler for PHP to invoke PHP-CodeSniffer"tar])(flex-autopair .[(0 3)()"Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable."single])(color-theme-dawn-night .[(1 0)()"color theme of dawn and night."single])(weather .[(2012 3 27 2)()"Get weather reports via worldweatheronline.com"single])(flymake-perlcritic .[(1 0 3)((flymake (0 3)))"Flymake handler for Perl to invoke Perl::Critic"tar])(jsshell-bundle .[(2012 4 7)()"JSShell generated bundle"single])(rfringe .[(1 0 1)()"indicate relative locations in the fringe"single])(flyphpcs .[(1 0 1)()"Flymake for PHP via PHP-CodeSniffer"single])(defaultcontent .[(1 4)()"a templating tool. Fill new files with default content."single])(flymake-for-jslint-for-wsh .[(1 3 0)((flymake (0 3)))"use flymake with js code, on Windows"single])(tfs .[(0 2 7)()"MS Team Foundation Server commands for Emacs."single])(dropdown-list .[(1 45)()"Drop-down menu interface"single])(thesaurus .[(2012 4 7)()"replace a word with a synonym looked up in a web service."single])(fly-jshint-wsh .[(2 0 3)((flymake (0 3)))"use flymake with jshint on js code, on Windows"single])(watch-buffer .[(1 0 1)()"run a shell command when saving a buffer"single])(smarter-compile .[(2012 4 9)()"a smarter wrapper for `compile'"single])(hungry-delete .[(1 0)()"hungry delete minor mode"single])(align-cljlet .[(0 3)((clojure-mode (1 11 5)))"Space align various Clojure forms "single])(idomenu .[(0 1)()"imenu tag selection with ido"single])(drag-stuff .[(0 0 4)()"Drag stuff (lines, words, region, etc...) around"single])(w32-registry .[(2012 4 6)()"read the registry from elisp"single])(jsshell .[(2012 4 7)()"Run a javascript command interpreter in emacs on Windows."single])(shadchen .[(1 0)()"pattern matching for elisp"single])(cycbuf .[(0 5 0)()"Cycle buffers code by Martin Pohlack, inspired by"single])(yascroll .[(0 2 0)()"Yet Another Scroll Bar Mode"single])(anything-exuberant-ctags .[(0 1 2)()"Exuberant ctags anything.el interface"single])(ess .[(5 14)()"Edit and interact with statistical programs like R, S-Plus, SAS, Stata and JAGS"tar])(anything-git-goto .[(0 1 0)()"Quick listing of:"single])(twilight-theme .[(1 0 0)()"Twilight theme for GNU Emacs 24 (deftheme)"single])(jtags .[(0 97)()"enhanced tags functionality for Java development"single])(jtags-extras .[(0 3 0)()"jtags related functionality for Java development"single])(phantomjs .[(0 0 11)()"Control phantomjs from Emacs			"tar])(oz .[(16513)()"Major mode for editing Oz programs"tar])(load-theme-buffer-local .[(0 0 2)()"Install emacs24 color themes by buffer."single])(color-theme-buffer-local .[(0 0 2)()"Install color-themes by buffer."single])(elisp-depend .[(1 0 2)()"Parse depend libraries of elisp file."single])(key-chord .[(0 5 20080915)()"map pairs of simultaneously pressed keys to commands"single])(shell-here .[(1 1)()"Open a shell relative to the working directory"single])(symbols-mode .[(0 3)()"List symbols of object files"single])(handlebars-mode .[(1 3)()"A major mode for editing Handlebars files."single])(dircmp .[(1)()"Compare and sync directories."single])(ascii .[(3 1)()"ASCII code display."single])(frame-tag .[(0 1 0)()"Minor mode that assigns a unique number to each frame for easy switching"single])(org-blog .[(1 18 1 1)()"create and publish a blog with org-mode"single])(ruby-tools .[(0 1 0)()"Collection of handy functions for ruby-mode"single])(unfill .[(0 1)()"The inverse of fill-paragraph and fill-region"single])(modeline-posn .[(22 0)()"Set up `mode-line-position'."single])(mark-multiple .[(1 0)()"A library that sorta lets you mark several regions at once"single])(mark-more-like-this .[(1 0)()"Mark additional regions in buffer matching current region."single])(openwith .[(20120531)()"Open files with external programs"single])(isearch+ .[(21 0)()"Extensions to `isearch.el'."single])(mouse+ .[(21 0)()"Extensions to `mouse.el'."single])(zencoding-mode .[(0 5 1)()"Unfold CSS-selector-like expressions to markup"single])(smart-mode-line .[(1 7 1)()"A color coded smart mode-line."single])(flymake .[(0 4 16)()"a universal on-the-fly syntax checker"single])(slime-ritz .[(0 6 0)()"slime extensions for ritz"single])(r-autoyas .[(0 28)()"Provides automatically created yasnippets for R function argument lists."single])(key-combo .[(1 5 1)()"map key sequence to commands"single])(ujelly-theme .[(1 0 35)()"Ujelly theme for GNU Emacs 24 (deftheme)"single])(guru-mode .[(0 1)()"Become an Emacs guru"single])(zen-and-art-theme .[(1 0 1)()"zen and art color theme for GNU Emacs 24"single])(save-visited-files .[(1 3)()"save opened files across sessions"single])(git-auto-commit-mode .[(4 2 2)()"Emacs Minor mode to automatically commit and push"single])(haste .[(1)((json (1 2)))"Emacs client for hastebin (http://hastebin.com/about.md)"single])(my-packages .[(0 1 0)()"Package Initialization."single])(zen-mode .[(20120627)()"remove/restore Emacs distractions quickly"tar])(heroku .[(1 1 0)()"Interface to Heroku apps."single])(repository-root .[(1 0 4)()"deduce the repository root directory for a given file"single])(grep-a-lot .[(1 0 7)()"manages multiple search results buffers for grep.el"single])(grep-o-matic .[(1 0 6)()"auto grep word under cursor"single])(el-spec .[(0 2)()"ruby's rspec like syntax test frame work"single])(wc-mode .[(1 1)()"Running word count with goals (minor mode)"single])(legalese .[(1 0)()"Add legalese to your program files"single])(scad-mode .[(90 0)()"SCAD mode derived mode"single])(android-mode .[(0 2 5)()"Minor mode for Android application development"single])(ttl-mode .[(0 1)()"mode for Turtle(RDF)"single])(zeitgeist .[(0 1)()"integrates Emacs with Zeitgeist."single])(dispass .[(1 1 2)()"Emacs wrapper for DisPass"single])(writegood-mode .[(1 2)()"Polish up poor writing on the fly"single])(nrepl .[(0 2 0)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 1)))"Client for Clojure nREPL"single])(fill-column-indicator .[(1 85)()"Graphically indicate the fill column"single])(shell-switcher .[(0 1 5 1)()"Easily switch between shell buffers, like with alt+tab."tar])(github-theme .[(0 0 3)()"Github color theme for GNU Emacs 24"single])(sokoban .[(1 23)()"Play the Sokoban game in emacs"single])(package-store .[(0 3)()"a package cache"single])(python-mode .[(6 0 10)()"Python major mode"tar])(code-headers .[(0 7)()"Navigate code with headers embedded in comments.  -*- mode: Emacs-Lisp; lexical-binding: t; -*"single])(dix .[(0 1 0)()"minor mode for editing Apertium XML dictionary files"single])(tron-theme .[(12)()"A theme loosely based on Tron: Legacy colors"single])(no-easy-keys .[(1 0 2)()"Learn the proper Emacs movement keys"single])(makefile-runner .[(1 1 2)()"Searches for Makefile and fetches targets"single])(elnode .[(0 9 9 7 6)((web (0 1 4)) (dash (1 1 0)) (noflet (0 0 7)) (s (1 5 0)) (creole (0 8 14)) (fakir (0 1 6)) (db (0 0 5)) (kv (0 0 17)))"The Emacs webserver."tar])(midje-mode .[(0 1 2)((slime (1 0)) (clojure-mode (1 0)))"Minor mode for running Midje tests in emacs, see: https://github.com/dnaumov/midje-mode"tar])(gnusnotes .[(0 9 2)()"Adding per-message notes in gnus summary buffer"single])(rinari .[(2 10)((ruby-mode (1 0)) (inf-ruby (2 2 1)) (ruby-compilation (0 8)) (jump (2 0)))"Rinari Is Not A Rails IDE"single])(web .[(0 3 7)()"useful HTTP client -*- lexical-binding: t -*-"single])(eredis .[(0 5 0)()"eredis, a Redis client in emacs lisp"single])(multi-project .[(0 0 8)()"Easily work with multiple projects."single])(egison-mode .[(0 1 4)()"Egison editing mode"single])(mongo .[(0 5)()"A MongoDB client."tar])(cm-mode .[(0 1 0)()"Wrapper for CodeMirror-style Emacs modes"single])(ruby-test-mode .[(1 7)((ruby-mode (1 0)))"Minor mode for Behaviour and Test Driven"single])(marmalade-test .[(0 0 1)()"A test tarball package."tar])(ruby-mode .[(1 1)()"ruby-mode package"tar])(hjkl-mode .[(0 1)((key-chord (0 5)))"import some vim's key bindings"tar])(edit-list .[(0 4)()"edit a single list"single])(persistent-soft .[(0 8 8)((pcache (0 2 3)) (list-utils (0 4 2)))"Persistent storage, returning nil on failure"single])(hippie-namespace .[(0 5 8)()"Special treatment for namespace prefixes in hippie-expand"single])(nav-flash .[(1 1 0)()"Briefly highlight the current line"single])(ucs-utils .[(0 7 6)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utilities for Unicode characters"single])(back-button .[(0 6 6)((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Visual navigation through mark rings"single])(nsis-mode .[(0 44)()"NSIS-mode"single])(window-end-visible .[(0 1 0)()"Find the last visible point in a window"single])(unicode-enbox .[(0 1 4)((string-utils (0 3 2)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Surround a string with box-drawing characters"single])(dynamic-fonts .[(0 6 4)((font-utils (0 7 0)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Set faces based on available fonts"single])(minimal-session-saver .[(0 6 2)()"Very lean session saver"single])(unicode-progress-reporter .[(0 5 4)((emacs (24 1 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Progress-reporter with fancy characters"single])(mongo-elnode .[(0 5 0)((mongo (0 5)) (elnode (0 9 9)))"elnode adapter for mongo-el"single])(eimp .[(1 4 0)()"Emacs Image Manipulation Package"single])(org-presie .[(0 0 5)((framesize (0 0 1)) (eimp (1 4 0)) (org (7 8 9)))"simple presentation with an org file"single])(ido-load-library .[(0 2 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Load-library alternative using ido-completing-read"single])(ac-nrepl .[(0 21)((cider (0 1)) (auto-complete (1 4)))"auto-complete sources for Clojure using nrepl completions"single])(applescript-mode .[(1 1)()"major mode for editing AppleScript source"single])(ssh .[(1 2)()"Support for remote logins using ssh."single])(nrepl-ritz .[(0 6 0)((nrepl (0 1 5)))"nrepl extensions for ritz"single])(doctags .[(0 1)()"Generation of tags documentation in Doxygen syntax"single])(buffer-utils .[(0 1 0)()"Buffer-manipulation utility functions"single])(lisp-editing .[(0 0 5)()"lisp editing tools"single])(exec-path-from-shell .[(1 6)()"Get environment variables such as $PATH from the shell"single])(go-play .[(0 0 1)()"Paste to play.golang.org"single])(yagist .[(0 8 6)((json (1 2 0)))"Yet Another Emacs integration for gist.github.com"single])(margo .[(2012 9 18)((web (0 1 8)) (json (1 2)))"Client for MarGo, providing Go utilities"single])(shoes-off .[(0 1 8)((kv (0 0 5)) (anaphora (0 0 4)))"irc bouncer"single])(multiple-cursors .[(1 2 1)()"Multiple cursors for Emacs."tar])(eshell-manual .[(0 0 2)()"An updated manual for Eshell."tar])(plantuml-mode .[(0 2)()"Major mode for plantuml"single])(hackernews .[(0 1)((json (1 2)))"Access the hackernews aggregator from Emacs"tar])(esk .[(0 1)()"Emacs Search Kit - An easy way to find files and/or strings in a project"tar])(hide-comnt .[(40)()"Hide/show comments in code."tar])(pretty-mode-plus .[(1 0)()"Redisplay parts of the buffer as pretty symbols."tar])(s .[(1 8 0)()"The long lost Emacs string manipulation library."single])(git-commit-mode .[(0 13)()"Major mode for editing git commit messages -*- lexical-binding: t; -*-"single])(db .[(0 0 6)((kv (0 0 11)))"A database for EmacsLisp  -*- lexical-binding: t -*-"single])(notmuch-labeler .[(0 1)()"Improves notmuch way of displaying labels through fonts, pictures, and hyperlinks."tar])(gitignore-mode .[(0 1)()"Major mode for editing .gitconfig files"single])(save-packages .[(0 20121012)()"save and restore installed packages"single])(cmake-project .[(0 6)()"Integrates CMake build process with Emacs"single])(combinators .[(0 0 1)()"-*- lexical-binding: t; -*-"single])(livescript-mode .[(0 0 1)()"Major mode for LiveScript files in Emacs"single])(visible-color-code .[(0 0 1)()"color code strings in current buffer, this elisp show you one as real color."single])(dash .[(2 3 0)()"A modern list library for Emacs"single])(seclusion-mode .[(1 1 1)()"Edit in seclusion. A Dark Room mode."single])(pde .[(0 2 16)()"Perl Development Environment"tar])(tt-mode .[(20121117 2045)()"Emacs major mode for editing Template Toolkit files."tar])(pod-mode .[(20121117 2120)()"Major mode for editing .pod-files."tar])(ercn .[(1 0 2)()"Flexible ERC notifications"single])(bufshow .[(0 1 0)()"A simple presentation tool for Emacs."tar])(parenface-plus .[(1 1)()"Provide a face for parens in lispy modes."tar])(el-x .[(0 2 4)((cl-lib (0 2)))"Emacs-lisp extensions."tar])(json-mode .[(1 1 0)()"Major mode for editing JSON files"single])(buffer-stack .[(1 5)()"Enhanced intelligent switch-to-other-buffer replacement."single])(gnomenm .[(0 0 3)()"Emacs interface to Gnome nmcli command"single])(sequence .[(0 0 1)()"makes sequences of numbers -*- lexical-binding: t -*-"single])(rvm .[(1 3 0)()"Emacs integration for rvm"single])(soothe-theme .[(0 3 16)((emacs (24 1)))"a dark colorful theme for Emacs24."single])(macro-utils .[(1 0)()"Utilities for writing macros."single])(toml-mode .[(0 1 3)()"Mojor mode for editing TOML files"single])(cryptol-mode .[(0 0 2)()"Cryptol major mode for Emacs"single])(proc-net .[(0 0 1)()"network process tools"single])(drupal-spell .[(0 2 2)()"Aspell extra dictionary for Drupal"tar])(thread-dump .[(1 0)()"java thread dump viewer"single])(bitly .[(1 0)()"Shorten URLs using the bitly.com shortener service"single])(color-theme-heroku .[(1 0 0)()"Heroku color theme"single])(github-browse-file .[(0 2 1)()"View the file you're editing on GitHub"single])(lispyscript-mode .[(0 3 0)()"Major mode for LispyScript code."single])(toxi-theme .[(0 1 0)()"REQUIRES EMACS 24"single])(helm-ag .[(0 4)((helm (1 0)))"the silver search with helm interface"single])(perlbrew .[(0 1)((cl (0)))"basic support for perlbrew environments"single])(monokai-theme .[(0 0 10)()"REQUIRES EMACS 24: Monokai Color Theme for Emacs."single])(theme-park-mode .[(0 1 2)()"Take your themes for a ride!"single])(handlebars-sgml-mode .[(0 1 0)()"Add Handlebars contextual indenting support to sgml-mode"single])(issue-tracker .[(0 0 1)()"Poor man's issue tracker"tar])(ido-gnus .[(0 4)((gnus (5 13)))"Access gnus groups or servers using ido"single])(command-t .[(0 0 1)((find-file-in-project (3 2)) (popwin (0 4)))"Finds file in project using fuzzy search."single])(hide-lines .[(20130623 1701)()"Commands for hiding lines based on a regexp"single])(assemblage-theme .[(20130715 621)()"a dark theme for Emacs 24"single])(parenface1.1 .[(1 1)()"Provide a face for parens in lisp modes."single])(rings .[(1 0 1)()"Buffer rings. Like tabs, but better."single])(discord .[(0 5)()"Discordian dates for calendar"single])(zone-matrix .[(0 0 1)()"Matrix themed Zone mode"tar])(anzu .[(0 22)()"Show number of matches in mode-line while searching"single])(org-readme .[(20130322 926)((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0)))"Integrates Readme.org and Commentary/Change-logs."single])(yaoddmuse .[(0 1 1)()"Yet another oddmuse for Emacs"single])(unicode-fonts .[(0 3 8)((font-utils (0 7 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Configure Unicode fonts"single])(button-lock .[(1 0 0)()"Clickable text defined by regular expression"single])(wiki-nav .[(1 0 0)((button-lock (1 0 0)) (nav-flash (1 0 0)))"Simple file navigation using [[WikiStrings]]"single])(unicode-whitespace .[(0 2 4)((ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"teach whitespace-mode about fancy characters"single])(ecb-snapshot .[(20120830)()"Emacs Code Browser CVS snapshot"tar])(pabbrev .[(3 1)()"Predictive abbreviation expansion"single])(ignoramus .[(0 7 0)()"Ignore backups, build files, et al."single])(flyspell-lazy .[(0 6 6)()"Improve flyspell responsiveness using idle timers"single])(browse-url-dwim .[(0 6 6)((string-utils (0 3 2)))"Context-sensitive external browse URL or Internet search"single])(fixmee .[(0 8 4)((button-lock (1 0 0)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 3 2)) (tabulated-list (0)))"Quickly navigate to FIXME notices in code"single])(kv .[(0 0 17)()"key/value data structure functions"single])(less-css-mode .[(0 17)()"Major mode for editing LESS CSS files (lesscss.org)"single])(oauth .[(1 0 3)()"An Emacs oauth client. See https://github.com/psanford/emacs-oauth/"tar])(tumblesocks .[(0 0 7)((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1)))"An Emacs tumblr client."tar])(uuid .[(0 0 3)()"UUID's for EmacsLisp"single])(mustache-mode .[(1 2)()"A major mode for editing Mustache files."single])(erc-hl-nicks .[(1 3 1)()"ERC nick highlighter that ignores uniquifying chars when colorizing"single])(pcmpl-args .[(0 1 1)()"Enhanced shell command completion    -*- lexical-binding: t -*-"single])(el-autoyas .[(0 5)()"Automatically create Emacs-Lisp Yasnippets"single])(anaphora .[(1 0 0)()"anaphoric macros providing implicit temp variables"single])(textmate-to-yas .[(0 21)()"Import Textmate macros into yasnippet syntax"single])(ghci-completion .[(0 1 3)()"Completion for GHCi commands in inferior-haskell buffers -*- lexical-binding: t; -*-"single])(slim-mode .[(1 1)()"Major mode for editing Slim files"single])(google-translate .[(0 4)()"Emacs interface to Google Translate"single])(list-utils .[(0 4 2)()"List-manipulation utility functions"single])(pcre2el .[(1 5)((cl-lib (0 3)))"parse, convert, and font-lock PCRE, Emacs and rx regexps"single])(font-utils .[(0 7 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utility functions for working with fonts"single])(rcirc-robots .[(0 0 7)((kv (0 0 8)) (anaphora (0 0 5)))"robots based on rcirc irc -*- lexical-binding: t -*-"single])(org-ehtml .[(0 20131014)((elnode (20130416 1626)) (org-plus-contrib (20131007)))"Export Org-mode files as editable web pages"tar])(geiser .[(0 4)()"GNU Emacs and Scheme talk to each other"tar])(virtualenv .[(1 2)()"Virtualenv for Python  -*- coding: utf-8 -*-"single])(sprintly-mode .[(0 0 4)((furl (0 0 2)))"Major mode for dealing with sprint.ly"single])(text-language .[(0 20121008)()"tracking, setting, guessing language of text"single])(color-theme-sanityinc-solarized .[(2 25)()"A version of Ethan Schoonover's Solarized themes"tar])(typo .[(1 1)()"Minor mode for typographic editing"single])(ws-trim .[(1 4)()"Tools and minor mode to trim whitespace on text lines"single])(flymake-checkers .[(0 2)()"Flymake reloaded with useful checkers"single])(hardhat .[(0 4 2)((ignoramus (0 7 0)))"Protect against clobbering user-writable files"single])(string-utils .[(0 3 2)((list-utils (0 4 2)))"String-manipulation utilities"single])(smooth-scrolling .[(1 0 1)()"Make emacs scroll smoothly"single])(flymake-go .[(2013 3 14)((flymake (0 4 13)))"A flymake handler for go-mode files"single])(gitty .[(1 0)()"vc-mode extension for fast git interaction"single])(mote-mode .[(1 0 0)((ruby-mode (1 1)))"Mote minor mode"single])(hideshowvis .[(0 5)()"Add markers to the fringe for regions foldable by hideshow.el"single])(inflections .[(1 1)()"convert english words between singular and plural"single])(findr .[(0 7)()"Breadth-first file-finding facility for (X)Emacs"single])(smart-forward .[(1 0 0)((expand-region (0 8 0)))"Semantic navigatioin"single])(osx-browse .[(0 8 8)((string-utils (0 3 2)) (browse-url-dwim (0 6 6)))"Web browsing helpers for OS X"single])(cljsbuild-mode .[(0 2 0)()"A minor mode for the ClojureScript 'lein cljsbuild' command"single])(vector-utils .[(0 1 2)()"Vector-manipulation utility functions"single])(config-block .[(0 0 1)()"config-block is utility for individual settings (e.g. .emacs)."single])(namakemono .[(0 0 1)()"utility function set for namakemono"single])(bang .[(0 1 0)()"A modern list library for Emacs"single])(roy-mode .[(0 1 0)()"Roy major mode"single])(pcsv .[(1 3 3)()"Parser of csv -*- lexical-binding: t -*-"single])(wgrep-ack .[(0 1 1)((wgrep (2 1 1)))"Writable ack-and-a-half buffer and apply the changes to files"single])(flymake-lua .[(1 0)()"Flymake for Lua"single])(rcirc-color .[(0 2)()"color nicks"single])(inform-mode .[(1 6 2)()"Major mode for Inform 6 interactive fiction code"single])(expectations-mode .[(0 0 4)((nrepl (0 1 5)) (clojure-mode (1 11)))"Minor mode for expectations tests"single])(octomacs .[(0 0 1)()"Octopress interface for Emacs"single])(highlight .[(21 0)()"Highlighting commands."single])(region-list-edit .[(20100530 808)()"Add/delete a region into/from a region list, such as ‘((4 . 7) (11 . 15) (17 . 17) (20 . 25))."single])(zjl-hl .[(20121028 1901)((highlight (21 0)) (region-list-edit (20100530 808)))"Highlight variable and function call and others in c/emacs, make life easy."single])(simp .[(0 2 0)()"Simple project definition, chiefly for project file finding and grepping."tar])(truthy .[(0 2 8)((list-utils (0 4 2)))"Test the content of a value"single])(syntactic-sugar .[(0 9 4)()"Effect-free forms such as if/then/else"single])(elpakit .[(1 0 7)((anaphora (0 0 6)) (dash (1 0 3)))"package archive builder"single])(bug-reference-github .[(0 2 0)()"Automatically set `bug-reference-url-format' in Github repositories."single])(color-theme-sanityinc-tomorrow .[(1 10)()"A version of Chris Kempson's various Tomorrow themes"tar])(macrostep .[(0 6)()"interactive macro stepper for Emacs Lisp"single])(qsimpleq-theme .[(0 1 3)()"Based on solarized color theme for Emacs."single])(flymake-easy .[(0 9)()"Helpers for easily building flymake checkers"single])(flymake-ruby .[(0 8)((flymake-easy (0 1)))"A flymake handler for ruby-mode files"single])(flymake-shell .[(0 8)((flymake-easy (0 1)))"A flymake syntax-checker for shell scripts"single])(flymake-coffee .[(0 12)((flymake-easy (0 1)))"A flymake handler for coffee script"single])(flymake-php .[(0 5)((flymake-easy (0 1)))"A flymake handler for php-mode files"single])(flymake-sass .[(0 6)((flymake-easy (0 1)))"Flymake handler for sass files"single])(flymake-css .[(0 3)((flymake-easy (0 1)))"Flymake support for css using csslint"single])(flymake-haml .[(0 7)((flymake-easy (0 1)))"A flymake handler for haml files"single])(flymake-jslint .[(0 10)((flymake-easy (0 1)))"A flymake handler for javascript using jslint"single])(ess-smart-underscore .[(0 79)()"Ess Smart Underscore"single])(skinny .[(0 0 3)((elnode (0 9 9 6 1)) (creole (0 8 17)))"a blog engine with elnode -*- lexical-binding: t -*-"single])(auto-indent-mode .[(0 115)()"Auto indent Minor mode"single])(pyvirtualenv .[(1 1)()"Python Pyvirtualenv support"single])(find-file-in-repository .[(1 3)()"Quickly find files in a git, mercurial or other repository"single])(paredit-menu .[(1 0)()"Adds a menu to paredit.el as memory aid"single])(elpy .[(1 2 1)((auto-complete (1 4)) (find-file-in-project (3 2)) (fuzzy (0 1)) (highlight-indentation (0 5 0)) (idomenu (0 1)) (iedit (0 97)) (nose (0 1 1)) (virtualenv (1 2)) (yasnippet (0 8 0)))"Emacs Python Development Environment"tar])(ace-jump-mode .[(2 0 0 0)()"a quick cursor location minor mode for emacs -*- coding: utf-8-unix -*-"single])(osx-location .[(0 2)()"Watch and respond to changes in geographical location on OS X"tar])(elpa-audit .[(0 4)()"Handy functions for inspecting and comparing package archives"single])(multi-web-mode .[(0 1)()"multiple major mode support for web editing"single])(flycheck .[(0 14 1)((s (1 6 0)) (dash (1 6 0)) (f (0 5 0)) (cl-lib (0 1)) (emacs (24 1)))"On-the-fly syntax checking (Flymake done right)"tar])(chicken-scheme .[(1 0 6)()"Scheme-mode extensions for Chicken Scheme"single])(minimap .[(1 0)()"Sidebar showing a \"mini-map\" of a buffer"single])(session-manager .[(0 5)()"Support for the Gnome Session Manager"single])(ctable .[(0 1 1)()"Table component for Emacs Lisp"single])(grr .[(1 0 0)()"Simple Growl notifications for Emacs and Mac OS X"single])(simpleclip .[(1 0 0)()"Simplified access to the system clipboard"single])(esxml .[(0 3 0)((db (0 0 1)))"Handle HTML with lists."tar])(cpputils-cmake .[(0 4 0)()"Easy real time C++ syntax check and intellisense if you use CMake."tar])(lcs .[(1 1)()"find out the longest common sequence"single])(tracking .[(1 3)((shorten (0 2)))"Buffer modification tracking"single])(lui .[(1 2)((tracking (1 3)))"Linewise User Interface"tar])(circe .[(1 2)((lui (1 2)) (lcs (1 1)))"Client for IRC in Emacs"tar])(iedit .[(0 97)()"Edit multiple regions in the same way simultaneously."tar])(let-recur .[(0 0 5)()"Simplified implementation of recur -*- lexical-binding:t -*-"single])(wgrep-helm .[(0 1 0)((wgrep (2 1 1)))"Writable helm-grep-mode buffer and apply the changes to files"single])(otter-mode .[(1 2)()"Major mode for source files of the Otter automated theorem prover"single])(sql-indent .[(1 10)()"indentation of SQL statements"single])(maildir .[(0 0 20)((kv (0 0 17)))"Simple maildir based MUA."tar])(huskie .[(0 0 2)((anaphora (0 0 6)))"chainsaw powered logging"single])(color-theme-x .[(1 3)()"convert color themes to X11 resource settings"single])(gplusify .[(1 0)()"Add Google Plus markup to a piece of code"single])(diatheke .[(1 0)()"A minor mode using the diatheke command-line Bible tool"single])(inf-ruby .[(2 3 2)()"Run a Ruby process in a buffer"single])(extend-dnd .[(0 5)()"R drag and Drop"single])(wxwidgets-help .[(0 0 3)()"Look up wxWidgets API by using local html manual."tar])(sudden-death .[(0 2)()"Totsuzen-no-Shi"single])(fold-this .[(0 1 0)()"Just fold this region please"single])(dart-mode .[(0 9)()"Major mode for editing Dart files"single])(subshell-proc .[(0 2)()"Functions for working with comints"single])(pg .[(0 12)()"Emacs Lisp interface to the PostgreSQL RDBMS"single])(db-pg .[(0 0 3)((pg (0 12)) (db (0 0 6)))"A PostgreSQL adapter for emacs-db"single])(hippie-expand-haskell .[(0 0 1)()"Hippie expand try function using ghc's completion function."single])(slamhound .[(2 0 0)()"Rip Clojure namespaces apart and rebuild them."single])(clojure-mode .[(2 1 0)()"Major mode for Clojure code"single])(clojure-test-mode .[(2 1 0)((clojure-mode (1 7)) (nrepl (0 1 7)))"Minor mode for Clojure tests"single])(late-night-theme .[(0 0)()"Late Night theme for Emacs 24"single])(creole-mode .[(0 0 5)()"a markup mode for creole"single])(evil-paredit .[(0 0 1)((evil (0 0 0)) (paredit (1)))"Paredit support for evil keybindings"single])(websocket .[(1 0)()"Emacs WebSocket client and server"single])(evil-nerd-commenter .[(1 2 4)()"Comment/uncomment lines efficiently. Like Nerd Commenter in Vim"tar])(projectile .[(0 9 2)((s (1 0 0)) (dash (1 0 0)))"Manage and navigate projects in Emacs easily"single])(keyfreq .[(0 0 3)((json (1 2)))"track command frequencies"single])(robe .[(0 7 6)((inf-ruby (2 3 0)))"Code navigation, documentation lookup and completion for Ruby"tar])(dropbox .[(0 9 1)((json (1 2)) (oauth (1 0 3)))"Emacs backend for dropbox"single])(simple-mode-line .[(0 3)()"Simplified Mode Line for Emacs 24"single])(pov-mode .[(3 3)()"Major mode for editing POV-Ray scene files."tar])(creole .[(1 0 3)((noflet (0 0 3)) (kv (0 0 17)))"A parser for the Creole Wiki language"single])(tup-mode .[(1 2)()"Major mode for editing files for Tup"single])(bbcode-mode .[(1 1 0)()"Major mode for writing BBCode markup"single])(markup-faces .[(1 0 0)()"collection of faces for markup language modes"single])(flymake-json .[(0 1)((flymake-easy (0 1)))"A flymake handler for json using jsonlint"single])(adoc-mode .[(0 6 2)((markup-faces (1 0 0)))"a major-mode for editing AsciiDoc files in Emacs"single])(hardcore-mode .[(1 0 0)()"Disable arrow keys + optionally backspace and return"single])(spotify .[(0 2)()"Control the spotify application from emacs"single])(hlinum .[(1 0)()"Extension for linum.el to highlight current line number"single])(aes .[(0 5)()"Implementation of AES"single])(kwin .[(0 1)()"communcate with the KWin window manager"single])(clj-refactor .[(0 2 0)((s (1 3 1)) (dash (1 0 3)) (yasnippet (0 6 1)))"A collection of clojure refactoring functions"single])(nemerle .[(0 2)()"major mode for editing nemerle programs"single])(markdown-mode .[(1 9)()"Emacs Major mode for Markdown-formatted text files"single])(nimrod-mode .[(0 1 5)((auto-complete (1 4)))"A major mode for the Nimrod programming language"single])(rbenv .[(0 0 3)()"Emacs integration for rbenv"single])(evil .[(1 0 7)((undo-tree (0 5 1)))"Extensible Vi layer for Emacs."tar])(world-time-mode .[(0 0 2)()"show whole days of world-time diffs"single])(inline-crypt .[(0 1 4)()"Simple inline encryption via openssl"tar])(tagedit .[(1 4 0)((s (1 3 1)) (dash (1 0 3)))"Some paredit-like features for html-mode"single])(vertica .[(0 1 0)((sql (3 0)))"Vertica SQL mode extension"single])(hive .[(0 1 1)((sql (3 0)))"Hive SQL mode extension"single])(smart-window .[(0 6)()"vim-like window controlling plugin"single])(requirejs-mode .[(1 1)()"Improved AMD module management"single])(gruber-darker-theme .[(0 6)()"Gruber Darker color theme for Emacs 24."single])(rust-mode .[(0 1 0)((cm-mode (0 1 0)))"A major emacs mode for editing Rust source code"single])(framesize .[(0 0 5)((key-chord (0 5 20080915)))"change the size of frames in Emacs"single])(deep-thought-theme .[(0 1 1)()"Emacs 24 theme with the Answer to The Ultimate Question"single])(image-dired+ .[(0 6 0)()"Image-dired extensions"single])(erefactor .[(0 6 10)()"Emacs-Lisp refactoring utilities"single])(generate-autoloads .[(0 0 10)()"A package to help you lazy-load everything"single])(lisp-infection .[(0 0 10)()"Commands to *enhance* S-exp editing"single])(backtrace-mode .[(0 0 10)()"A better way to browse /var/log/messages files"single])(tabulated-list .[(0)()"generic major mode for tabulated lists."single])(package .[(1 0)((tabulated-list (0)))"Simple package system for Emacs"single])(ert .[(0)()"Emacs Lisp Regression Testing"single])(nurumacs .[(3 4 1)()"smooth-scrolling and minimap"single])(mark-tools .[(0 3)()"Some simple tools to access the mark-ring in Emacs"single])(todotxt .[(0 2 3)()"A major mode for editing todo.txt files"single])(git-gutter .[(0 42)()"Port of Sublime Text plugin GitGutter"single])(vimrc-mode .[(0 3 1)()"Major mode for vimrc files"single])(control-lock .[(1 1 2)()"Like caps-lock, but for your control key.  Give your pinky a rest!"single])(fic-ext-mode .[(0 1)()"Show FIXME/TODO/BUG(...) in special face only in comments and strings"single])(cups .[(0 1)()"CUPS features for Emacs"single])(vcard .[(0 1)()"vcard parsing and display routines"single])(babcore .[(0 0 5)()"Core Emacs configuration. This should be the minimum in every emacs config."single])(edebug-x .[(1 2)((dash (1 1 0)))"Extensions for Edebug"single])(loop .[(1 1)()"friendly imperative loop structures"single])(tex-smart-umlauts .[(1 2 0)()"Smart umlaut conversion for TeX."single])(ht .[(0 8)()"The missing hash table library for Emacs"single])(haml-mode .[(3 1 3)((ruby-mode (1 0)))"Major mode for editing Haml files"single])(flymake-hlint .[(0 2)((flymake-easy (0 1)))"A flymake handler for haskell-mode files using hlint"single])(django-theme .[(1 3 0)()"Custom face theme for Emacs"single])(pinboard .[(0 0 1)()"get stuff from pinboard -*- lexical-binding: t -*-"single])(isea .[(0 0 2)((elpakit (0 0 18)))"interactive server eval at mode, a comint for a daemonized emacs -*- lexical-binding: t -*-"single])(wrap-region .[(0 7 1)()"Wrap text with punctation or tag"single])(lexbind-mode .[(0 8)()"Puts the value of lexical-binding in the mode line"single])(auto-highlight-symbol .[(1 55)()"Automatic highlighting current symbol minor mode"single])(dot-mode .[(1 12)()"minor mode to repeat typing or commands"single])(main-line .[(1 2 8)()"modeline replacement forked from an early version of powerline.el"single])(show-css .[(1 1)()"Show the css of the html attribute the cursor is on"single])(supergenpass .[(0 1)()"SuperGenPass for Emacs"single])(with-namespace .[(1 1)()"Poor-man's namespaces for elisp"single])(flymake-haskell-multi .[(0 3)((flymake-easy (0 1)))"Syntax-check haskell-mode using both ghc and hlint"tar])(sackspace .[(0 8 2)()"A better backspace"single])(volatile-highlights .[(1 10)()"Minor mode for visual feedback on some operations."single])(everything .[(0 1 5)()"Bridge to MS Windows desktop-search engine Everything"single])(grapnel .[(0 5 3)()"HTTP request lib with flexible callback dispatch"single])(tumble .[(1 5)()"an Tumblr mode for Emacs"single])(rubyinterpol .[(0 1)()"Ruby-like String Interpolation for format"single])(smartparens .[(1 6 1)((cl-lib (0 1)) (dash (2 3 0)))"Automatic insertion, wrapping and paredit-like navigation with user defined pairs."tar])(latest-clojars .[(0 3)()"Clojure dependency resolver"single])(helm-gtags .[(0 9 2)((helm (1 0)))"GNU GLOBAL helm interface"single])(quickrun .[(1 8 4)()"Run commands quickly"single])(git-gutter-fringe .[(0 12)((git-gutter (0 42)) (fringe-helper (0 1 1)))"Fringe version of git-gutter.el"single])(center-text .[(0 8)()"Center the text in a fixed-width column"single])(ert-x .[(0)((ert (0)))"Staging area for experimental extensions to ERT"single])(clj-mode .[(0 9)()"basic Major mode (clj) for Clojure code"single])(ruby-hash-syntax .[(0 3)()"Toggle ruby hash syntax between classic and 1.9 styles"single])(psgml .[(1 4 1)()"Lennart Staflin's Psgml package, with Elisp syntax and sgml-validate fixed for Emacsen >=24."tar])(swarmhacker .[(0 0 1)()"simple swarm chat"single])(theme-changer .[(2 1 0)()"Sunrise/Sunset Theme Changer for Emacs"single])(ttrss .[(1 7 5)((emacs (23 1)))"Tiny Tiny RSS elisp bindings"single])(emacs-droid .[(0 0 0)()"Android application development tools for Emacs"single])(sea-before-storm-theme .[(0 3)()"Sea Before Storm color theme for Emacs 24"single])(flymake-python-pyflakes .[(0 8)((flymake-easy (0 8)))"A flymake handler for python-mode files using pyflakes (or flake8)"single])(ibuffer-vc .[(0 7)((cl-lib (0 2)))"Group ibuffer's list by VC project, or show VC status"single])(letcheck .[(0 2)()"Check the erroneous assignments in let forms"single])(clippy .[(1 0)((pos-tip (1 0)))"Show tooltip with function documentation at point"single])(wacspace .[(0 4 1)((dash (1 2 0)) (cl-lib (0 2)))"The WACky WorkSPACE manager for emACS"tar])(kanban .[(0 1 2)()"Parse org-todo headlines to use org-tables as Kanban tables"single])(flymake-elixir .[(0 5)()"A flymake handler for elixir-mode .ex files.     "single])(surround .[(0 1)()"emulate surround.vim from Vim"single])(marmalade-service .[(2 0 9)((dash (1 1 0)) (s (1 6 0)) (elnode (0 9 9 6 10)))"The Marmalade package store service."tar])(wcheck-mode .[(2013 6 25)()"General interface for text checkers"tar])(rubocop .[(0 3)((dash (1 0 0)))"An Emacs interface for RuboCop"single])(indent-guide .[(1 0 1)()"show vertical lines to guide indentation"single])(suomalainen-kalenteri .[(2013 4 18)()"Finnish national and Christian holidays for calendar"tar])(simplezen .[(0 1 1)()"A simple subset of zencoding-mode for Emacs."single])(company-cmake .[(0 1)((company (0 6 8)))"company-mode completion back-end for CMake"single])(groovy-mode .[(201203310931)()"Groovy mode derived mode"single])(ruby-compilation .[(0 17)((inf-ruby (2 2 1)))"run a ruby process in a compilation buffer"single])(better-defaults .[(0 1 2)()"Fixing weird quirks and poor defaults"single])(gather .[(1 0 4)()"Gather string in buffer."single])(typing-practice .[(0 1)()"Typing practice"single])(ag .[(0 32)()"A front-end for ag ('the silver searcher'), the C ack replacement."single])(helm-projectile .[(0 9 2)((helm (1 4 0)) (projectile (0 9 2)))"Helm integration for Projectile"single])(r5rs .[(1 0)()"Browse documentation from the R5RS Revised5 Report"single])(paredit-everywhere .[(0 3)((paredit (22)))"Enable some paredit features in non-lisp buffers"single])(region-bindings-mode .[(0 1)()"Enable custom bindings when mark is active."single])(string-edit .[(0 1 0)((dash (1 2 0)))"Avoid escape nightmares by editing string in separate buffer"single])(flycheck-color-mode-line .[(0 2)((flycheck (0 13)) (dash (1 2)) (emacs (24 1)))"Change mode line color with Flycheck status -*- lexical-binding: t -*-"single])(angular-snippets .[(0 2 3)((s (1 4 0)) (dash (1 2 0)))"Yasnippets for AngularJS"tar])(command-stats .[(0 1)()"Track frequency of commands executed in emacs"single])(stripe-buffer .[(0 2 2)((cl-lib (1 0)))"Use a different background for even and odd lines"single])(sparql-mode .[(0 7 2)()"Edit and interactively evaluate SPARQL queries."single])(butler .[(0 1 3)((web (0 3 7)))"Client for Jenkins"single])(colour-region .[(0 4)()"Toggle regions of the buffer with different text snippets"single])(org-dotemacs .[(0 3)((org (7 9 3)) (cl-lib (1 0)))"Store your emacs config as an org file, and choose which bits to load."single])(fm .[(20130612 1)()"follow mode for compilation/output buffers"single])(bs-ext .[(0 2)()"Extensions to emacs buffer-selection library (bs.el)"single])(look-mode .[(1 0)()"quick file viewer for image and text file browsing"single])(look-dired .[(0 1)((look-mode (1 0)))"Extensions to look-mode for dired buffers"single])(dired-dups .[(0 3)()"Find duplicate files and display them in a dired buffer"single])(nzenburn-theme .[(20130513)()"A low contrast color theme for Emacs."single])(noflet .[(0 0 10)()"locally override functions"single])(simple-call-tree+ .[(1 3)()"Extensions to simple-call-tree"single])(eviews .[(0 1)()"Major-mode for editing eviews program files"single])(bbdb-ext .[(0 1)((bbdb (2 36)))"Extra commands for BBDB"single])(bar-cursor .[(1 1)()"package used to switch block cursor to a bar"single])(s-buffer .[(0 0 4)((s (1 6 0)) (noflet (0 0 3)))"s operations for buffers"single])(nodejs-repl .[(0 0 2 1)()"Run Node.js REPL"single])(evil-leader .[(0 4 1)((evil (0)))"let there be <leader>"single])(fuzzy-format .[(0 1 1)()"select indent-tabs-mode and format code automatically."single])(psvn .[(1 1 1)()"Subversion interface for emacs"single])(javarun .[(0 1 1)()"Minor mode for quick development of Java programs"single])(slough .[(0 1)((nrepl (0 1 7)) (smartparens (1 4 3)))"package for slough - this is for a secret TW thing"single])(express .[(0 6 0)((string-utils (0 3 2)))"Alternatives to `message'"single])(elisp-slime-nav .[(0 6)((cl-lib (0 2)))"Make M-. and M-, work in elisp like they do in slime"single])(fullscreen-mode .[(0 0 1)()"fullscreen window support for Emacs"single])(current-story .[(0 1 0)()"Track and insert current Pivotal Tracker"single])(kmacro-decision .[(1 5)((el-x (1 0)) (jb-misc-macros (0 2)))"Add conditional branching to keyboard macros"single])(jedi .[(0 1 2)((epc (0 1 0)) (auto-complete (1 4)))"Python auto-completion for Emacs"tar])(request .[(0 2 0)()"Compatible layer for URL request in Emacs"single])(request-deferred .[(0 2 0)((deferred (0 3 1)) (request (0 2 0)))"Wrap request.el by deferred"single])(show-marks .[(0 4)((fm (1 0)))"Navigate and visualize the mark-ring"single])(irfc .[(0 5 6)()"Interface for IETF RFC document."single])(apt-utils-ido .[(0 2)((apt-utils (1 212)))"Ido commands for apt-utils"single])(apt-utils .[(1 212)()"Emacs interface to APT (Debian package management)"single])(emms-mark-ext .[(0 3)((emms (3 0)))"Extra functions for emms-mark-mode and emms-tag-edit-mode"single])(emamux .[(0 1)()"Interact with tmux"single])(mustache .[(0 20)((ht (0 9)) (s (1 3 0)) (dash (1 2 0)))"a mustache templating library in emacs lisp"tar])(esup .[(0 3)()"the Emacs StartUp Profiler (ESUP)"single])(subatomic-enhanced-theme .[(20130226 2229)()"Nice looking emacs 24 theme"single])(highlight-escape-sequences .[(0 1)()"Highlight escape sequences -*- lexical-binding: t -*-"single])(jinja2-mode .[(0 1)()"A major mode for jinja2"single])(mode-icons .[(0 1 0)()"Show icons for modes"tar])(shorten .[(0 2)()"component-wise string shortener"single])(fakir .[(0 1 7)((noflet (0 0 3)) (dash (1 3 2)))"fakeing bits of Emacs -*- lexical-binding: t -*-"single])(desktop-registry .[(1 1 0)()"Keep a central registry of desktop files -*- lexical-binding: t -*-"single])(tabbar-ruler .[(0 40)((tabbar (2 0 1)))"Pretty tabbar, autohide, use both tabbar/ruler"single])(org-journal .[(1 4 6)()"a simple org-mode based journaling mode"single])(editorconfig .[(0 2)()"EditorConfig Emacs extension"single])(flymake-less .[(0 3)((less-css-mode (0 15)))"Flymake handler for LESS stylesheets (lesscss.org)"single])(sawfish .[(1 32)()"Sawfish mode."single])(ob-sml .[(0 1)((sml-mode (6 4)))"org-babel functions for template evaluation"single])(dired-efap .[(0 8)()"Edit Filename At Point in a dired buffer"single])(occur-x .[(0 1 1)()"Extra functionality for occur"single])(php-extras .[(1 0 0 20130923)((php-mode (1 5 0)))"Extra features for `php-mode'"tar])(rspec-mode .[(1 7)((ruby-mode (1 0)))"Enhance ruby-mode for RSpec"single])(syslog-mode .[(2 2)((hide-lines (20130623)))"Major-mode for viewing log files"single])(jb-misc-macros .[(0 4)((macro-utils (1 0)))"Miscellaneous macros"single])(man-commands .[(1 1)()"Add interactive commands for every manpages installed in your computer."single])(cloud-to-butt-erc .[(1 0 0)()"Replace 'the cloud' with 'my butt'"single])(pager-default-keybindings .[(1 1)()"Add the default keybindings suggested for pager.el"single])(hook-utils .[(1 0)()"Add a few utility functions for manipulating hooks"single])(occur-default-current-word .[(1 0)()"Have M-x occur default to the word at point"single])(scratch-persist .[(1 1)()"persist the scratch buffer across sessions"single])(company-inf-ruby .[(0 2)((company (0 6 10)) (inf-ruby (2 2 7)))"company-mode completion back-end for inf-ruby"single])(debian-changelog-mode .[(1 96)()"major mode for Debian changelog files."single])(sourcetalk .[(1 1 0)((request (0 2 0)))"SourceTalk (http://sourcetalk.net) plugin for Emacs"single])(chm-view .[(0 2 2)()"View CHM file."single])(org-trello .[(0 2 2)((org (8 0 7)) (dash (1 5 0)) (request (0 2 0)) (cl-lib (0 3 0)) (json (1 2)) (elnode (0 9 9 7 6)) (esxml (0 3 0)) (s (1 7 0)) (kv (0 0 17)))"Org minor mode to synchronize with trello"tar])(remember-theme .[(20130807 1251)()"Remembers the last theme in use and re-loads for the next session."single])(parscope .[(0 1 0)()"Minor mode for showing the current scope in Lisp-like languages."single])(grizzl .[(0 1 1)((cl-lib (0 1)))"Fuzzy Search Library & Completing Read"tar])(flx .[(0 1)()"fuzzy matching with good sorting"single])(flx-ido .[(0 2)((flx (0 1)))"flx integration for ido"single])(parenface-reversion .[(1 2)()"Provide a face for parens in lisp modes."single])(git-gutter-fringe+ .[(0 0 2)((git-gutter+ (0 1)) (fringe-helper (20130519 1641)))"Fringe version of git-gutter+.el"single])(fringe-helper .[(1 0 1)()"helper functions for fringe bitmaps"single])(org-protocol-jekyll .[(0 1)()"Jekyll's handler for org-protocol"single])(gandalf-theme .[(0 1)()"Gandalf color theme"single])(processing-mode .[(1 2 1)()"Major mode for Processing 2.0"single])(gitconfig .[(1 0 0)()"Emacs lisp interface to work with git-config variables"single])(processing-snippets .[(1 0 0)((yasnippet (0 8 0)))"Snippets for the Processing major mode"tar])(modtime-skip-mode .[(0 9)()"Minor mode for disabling modtime and supersession checks on files."single])(web-mode .[(7 0 50)()"major mode for editing html templates"single])(nrepl-decompile .[(0 0 1)((nrepl (0 1 7)) (javap-mode (9)))"decompilation extension for nrepl.el"single])(fit-frame .[(0)()"Resize a frame.  In particular, fit a frame to its buffers."single])(pickup .[(0 0 3)()"pickup file. "single])(cubicle-mode .[(0 1)()"Cubicle major mode for emacs"single])(py-import-check .[(0 2)()"Finds the unused python imports using importchecker"single])(palimpsest .[(0 8)()"Various deletion strategies when editing"single])(flymake-puppet .[(1 0 0)((flymake-easy (0 9)))"An Emacs flymake handler for syntax-checking puppet using puppet-lint"single])(sparkline .[(0 3 0)()"Make sparkline images from a list of numbers"single])(wedge-ws .[(0 1 2)()"Wedge whitespace between columns in text"tar])(emmet-mode .[(1 0 5)()"Unofficial Emmet's support for emacs"single])(helm-delicious .[(1 3)()"helm extensions for delicious bookmarks"single])(ample-theme .[(0 2 4)()"Calm Dark Theme for Emacs "single])(frame-restore .[(0 4)((dash (1 2)) (f (0 11)) (emacs (24 1)))"Restore Emacs frame -*- lexical-binding: t; -*-"single])(tsql .[(1 0)()"customizes sql.el for T-SQL"single])(wisp-mode .[(0 1 2)()"Major mode for editing wisp: Whitespace-to-Lisp"single])(heroku-theme .[(1 1 0)()"Heroku color theme"single])(god-mode .[(2 7 3)()"God-like command entering minor mode"single])(helm-recoll .[(20130905 2330)((helm (1 5 4)))"helm interface for the recoll desktop search tool."single])(magit-tramp .[(0 1 0)((magit (1 2 0)))"git method for TRAMP"single])(aok .[(0 1)()"various useful ways to do `multi-occur'"single])(pkg-info .[(0 4)((dash (1 6 0)) (epl (0 4)))"Information about packages       -*- lexical-binding: t; -*-"single])(dash-functional .[(1 0 0)((dash (2 0 0)) (emacs (24)))"Collection of useful combinators for Emacs Lisp  -*- lexical-binding: t -*-"single])(flycheck-cask .[(0 1)((flycheck (0 14)) (dash (2 0 0)) (f (0 6 0)))"Cask support in Flycheck -*- lexical-binding: t; -*-"single])(openstack-cgit-browse-file .[(0 2)()"Browse the current file in OpenStack cgit"single])(tronesque-theme .[(1 3)()"Color Theme based on Tron universe."single])(smtpmail-multi .[(0 6)()"Use different smtp servers for sending mail"single])(figlet .[(289)()"banner generator"single])(smart-whitespace-comment-fixup .[(1 0)()"Enables advice around yanking/killing lines that auto-indents and formats properly"single])(insert-shebang .[(0 9 2)()"Inserts shebang line automatically"tar])(tox .[(0 1)()"Launch current python test with tox."single])(winpoint-ignore-dired .[(1 1)((winpoint (1 0)))"Have winpoint ignore dired-mode buffers"single])(comint-better-defaults .[(1 0)()"better defaults for comint-derived modes"single])(waher-theme .[(20130917 7)((emacs (24 1)))"Emacs 24 theme based on waher for st2 by dduckster"single])(gerrit-download .[(0 2)((magit (20130828 1540)))"Show gerrit reviews in a diff buffer."single])(multi .[(2 0 1)((emacs (24)))"Clojure-style multi-methods for emacs lisp -*- lexical-binding: t -*-"single])(evil-indent-textobject .[(0 2)((evil (0)))"evil textobjects based on indentation"single])(git-gutter+ .[(0 1)((git-commit-mode (1 0)))"Manage Git hunks straight from the buffer"single])(helm-helm-commands .[(0 2)((helm (1 5 4)))"List all helm commands with helm"single])(paste-kde .[(0 5)((web (0 3 6)))"paste text to KDE's pastebin service"single])(jujube-theme .[(0 1)()"Pastel theme loosely based on jellybeans"single])(purple-haze-theme .[(20130930 36)((emacs (24 0)))"an overtly purple color theme for Emacs24."single])(clues-theme .[(20130908 801)((emacs (24 0)))"an Emacs 24 theme which may well be fully awesome..."single])(wonderland .[(0 1 1)((dash (2 0 0)) (dash-functional (1 0 0)) (multi (2 0 0)) (emacs (24)))"declarative configuration for Emacsen -*- lexical-binding: t -*-"single])(simple-httpd .[(1 4 4)()"pure elisp HTTP server"single])(elfeed .[(1 0 1)((emacs (24 1)))"an Emacs web feed reader"tar])(elfeed-web .[(1 0 1)((simple-httpd (1 4 3)) (elfeed (1 0 1)) (emacs (24 1)))"web interface to Elfeed"tar])(skewer-mode .[(1 5 3)((simple-httpd (1 4 0)) (js2-mode (20090723)))"live browser JavaScript, CSS, and HTML interaction"tar])(shell-pop .[(0 2)()"helps you to use shell easily on Emacs. Only one key action to work."single])(page-break-lines .[(0 8)()"Display ugly ^L page breaks as tidy horizontal lines"single])(awk-it .[(0 77)()"Run AWK interactively on region!"single])(f .[(0 11 0)((s (1 7 0)) (dash (2 2 0)))"Modern API for working with files and directories"single])(hl-spotlight .[(0)()"Extension of hl-line.el to spotlight current few lines."single])(highlight-current-line .[(0 57)()"highlight line where the cursor is."single])(whitespace-cleanup-mode .[(0 8)()"Intelligently call whitespace-cleanup on save"single])(isgd .[(20130927)()"Shorten URLs using the isgd.com shortener service"single])(java-file-create .[(1 0)()"automatically insert contents of empty java files"single])(ac-geiser .[(0 1)((geiser (0 5)) (auto-complete (1 4)))"Auto-complete backend for geiser"tar])(iasm-mode .[(0 1)()"interactive assembly major mode."single])(ample-zen-theme .[(0 1)()"AmpleZen Theme for Emacs 24"single])(tommyh-theme .[(1 2)()"A bright, bold-colored theme for emacs."single])(ac-slime .[(0 5)()"An auto-complete source using slime completions"single])(pbcopy .[(0 1 0)()"OS X clipboard integration for Emacs"single])(timestamper .[(0 1 0)()"A minor mode for easy timelogging"single])(tbemail .[(0 2)()"Provide syntax highlighting for email editing via"single])(evil-matchit .[(0 0 7)()"Vim matchit ported into Emacs (requires EVIL)"tar])(ruby-end .[(0 3 1)()"Automatic insertion of end blocks for Ruby"single])(dpaste_de .[(0 2)((web (0 3 7)))"Emacs mode to paste to dpaste.de"single])(skewer-less .[(0 2)((skewer-mode (1 5 3)))"Skewer support for live LESS stylesheet updates"single])(sensitive .[(1 0 1)((emacs (24)) (sequences (0 1 0)))"A dead simple way to load sensitive information"single])(sequences .[(0 1 0)((emacs (24)))"Ports of some Clojure sequence functions."single])(epl .[(0 4)((cl-lib (0 3)))"Emacs Package Library -*- lexical-binding: t; -*-"single])(magit-find-file .[(1 0 4)((magit (1 2 0)))"completing-read over all files in Git"single])(list-register .[(2 2)()"List register"single])(project-explorer .[(0 9)((cl-lib (0 3)) (es-lib (0 3)))"A project explorer sidebar -*- lexical-binding: t -*-"single])(charmap .[(0 0 1)()"Unicode table for Emacs"single])(latex-preview-pane .[(20131020)()"Makes LaTeX editing less painful by providing a updatable preview pane"tar])(latest-clojure-libraries .[(0 5)()"Clojure dependency resolver"single])(proxy-mode .[(0 9)()"Provides proxy minor mode."single])(elixir-mix .[(0 2 4)()"Emacs integration for Elixir's mix"single])(lyskom .[(20131008)()"LysKOM elisp client."single])(cider .[(0 3 1)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 3)))"Clojure IDE and REPL"tar])(relax .[(0 2)((json (1 2)))"For browsing and interacting with CouchDB"single])(flatland-theme .[(0 1 2)()"A simple theme for Emacs."single])(immutant-server .[(1 0 0)()"Run your Immutant server in Emacs"single])(ac-inf-ruby .[(0 4)((inf-ruby (2 3 2)) (auto-complete (1 4)))"Enable auto-complete in inf-ruby sessions"single])(json-snatcher .[(1 0)()"Grabs the path to JSON values in a JSON file."single])(nrepl-discover .[(0 0 1)()"Client to load commands from nrepl server"single])(cmake-mode .[(20110824)()"major-mode for editing CMake sources"single])(ido-vertical-mode .[(0 1 1)()"Makes ido-mode display vertically."single]))
\ No newline at end of file
+(1(haml-mode .[(3 1 3)((ruby-mode (1 0)))"Major mode for editing Haml files"single])(paredit .[(22)()"minor mode for editing parentheses  -*- Mode: Emacs-Lisp -*-"single])(sass-mode .[(3 0 14)((haml-mode (3 0 14)))"Major mode for editing Sass files"single])(perspective .[(1 9)()"switch between named \"perspectives\" of the editor"single])(slime .[(20100404 1)()"Superior Lisp Interaction Mode for Emacs"single])(slime-repl .[(20100404)((slime (20100404)))"Read-Eval-Print Loop written in Emacs Lisp"single])(scpaste .[(0 6)((htmlize (1 39)))"Paste to the web via scp."single])(idle-highlight .[(1 0)()"highlight the word the point is on"single])(magit .[(1 2 0)()"Control Git from Emacs."tar])(durendal .[(0 2)((clojure-mode (1 7)) (slime (20100404)) (paredit (22)))"A bucket of tricks for Clojure and Slime."single])(htmlize .[(1 39)()"Convert buffer text and decorations to HTML."single])(furl .[(0 0 2)()"Friendly URL retrieval"single])(marmalade .[(0 0 4)((furl (0 0 2)))"Elisp interface for the Emacs Lisp package server."single])(yari .[(0 7)()"Yet Another RI interface for Emacs"single])(html-script-src .[(0 0 2)()"Insert <script src=\"..\"> for popular JavaScript libraries"single])(enclose .[(0 0 2)()"Enclose cursor within punctuation pairs"single])(mactag .[(0 0 1)()"Mode for automatically handle multiple tags files with Mactag rubygem"single])(undo-tree .[(0 3 1)()"Treat undo history as a tree"single])(diminish .[(0 44)()"Diminished modes are minor modes with no modeline display"single])(notify .[(2010 8 20)()"notification front-end"single])(keywiz .[(1 4)()"Emacs key sequence quiz"single])(descbinds-anything .[(1 5)((anything (1 287)))"Yet Another `describe-bindings' with `anything'."single])(autopair .[(0 3)()"Automagically pair braces and quotes like TextMate"single])(highlight-parentheses .[(1 0 1)()"highlight surrounding parentheses"single])(rvm .[(1 3 0)()"Emacs integration for rvm"single])(anything .[(1 287)()"open anything / QuickSilver-like candidate-selection framework"single])(anything-config .[(0 4 1)()"Predefined configurations for `anything.el'"single])(anything-match-plugin .[(1 27)()"Humane match plug-in for anything"single])(closure-template-html-mode .[(0 1)()"highlighting for google closure templates"single])(gist .[(1 1 1)((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0)))"Emacs integration for gist.github.com"single])(highlight-symbol .[(1 1)()"automatic and manual symbol highlighting"single])(color-theme-twilight .[(0 1)()"Twilight Colour Theme for Emacs."single])(browse-kill-ring .[(1 3 1)()"interactively insert items from kill-ring -*- coding: utf-8 -*-"single])(buffer-move .[(0 4)()"swap buffers between windows"single])(dired-single .[(1 7 0)()"reuse the current dired buffer to visit another directory"single])(php-mode .[(1 5 0)()"major mode for editing PHP code"single])(c-eldoc .[(0 5)()"helpful description of the arguments to C functions"single])(full-ack .[(0 2 3)()"a front-end for ack"single])(find-file-in-project .[(3 2)()"Find files in a project quickly."single])(project .[(1 0)()"Keep track of the current project"single])(goto-last-change .[(1 2)()"Move point through buffer-undo-list positions -*-unibyte: t; coding: iso-8859-1;-*-"single])(http-twiddle .[(1 0)()"send & twiddle & resend HTTP requests"single])(mac-key-mode .[(2010 1 3)()"provide mac-style key bindings on Carbon Emacs"single])(flymake-cursor .[(1 0 2)((flymake (0 3)))"Show flymake messages in the minibuffer after delay"tar])(multi-term .[(0 8 8)()"Managing multiple terminal buffers in Emacs."single])(parenface .[(1 1)()"Provide a face for parens in lisp modes."single])(gnuplot .[(0 6 0)()"drive gnuplot from within emacs"single])(auto-indent-mode .[(0 123)()"Auto indent Minor mode"single])(nsis-mode .[(0 44)()"NSIS-mode"single])(ecb .[(2 40)()"Emacs Code Browser"tar])(speck .[(2010 5 25)()"minor mode for spell checking"single])(hexrgb .[(21 0)()"Functions to manipulate colors, including RGB hex strings."single])(icomplete+ .[(21 0)()"Extensions to `icomplete.el'."single])(lacarte .[(22 0)()"Execute menu items as commands, with completion."single])(synonyms .[(1 0)()"Look up synonyms for a word or phrase in a thesaurus."single])(predictive .[(0 19 5)()"Predictive Mode (Contains Dependencies)"tar])(rw-hunspell .[(0 2)()"special functions for Hunspell in ispell.el"single])(rw-ispell .[(0 1)()"additional functions for ispell.el"single])(rw-language-and-country-codes .[(0 1)()"Language & Country Codes"single])(yas-jit .[(0 8 3)()"Loads Yasnippets on demand (makes start up faster)"single])(textmate-to-yas .[(0 21)()"Import Textmate macros into yasnippet syntax"single])(ntcmd .[(1 0)()"major mode for editing cmd scripts"single])(org-table-comment .[(0 2)()" Org table comment modes."single])(anything-extension .[(0 2)()"Extension functions for anything.el"single])(powershell .[(0 2 1)()"run powershell as an inferior shell in emacs"single])(cdlatex .[(4 0)()"Fast input methods for LaTeX environments and math"single])(anything-R .[(0 1 2010)()"anything-sources and some utilities for GNU R."single])(anything-el-swank-fuzzy .[(0 1 2009)()"anything-sources for el-swank-fuzzy.el"single])(anything-ipython .[(0 1 2009)()" Ipython anything"single])(color-file-completion .[(1 0 1)()"add colors to file completion"single])(color-theme-emacs-revert-theme .[(0 1)()"Color-theme revert to emacs colors"single])(anything-complete .[(1 86)()"completion with anything"single])(anything-obsolete .[(0 1)()"obsolete functions of anything"single])(ipython .[(2927)()"Adds support for IPython to python-mode.el"single])(el-swank-fuzzy .[(0 1)()"fuzzy symbol completion."single])(fold-dwim .[(1 2)()"Unified user interface for Emacs folding modes"single])(fold-dwim-org .[(0 5)((fold-dwim (1 2)))"Fold DWIM bound to org key-strokes."single])(fuzzy-match .[(1 4)()"fuzzy matching"single])(w32-browser .[(21 0)()"Run Windows application associated with a file."single])(crosshairs .[(22 0)()"Highlight the current line and column."single])(csv-mode .[(1 50)()"major mode for editing comma-separated value files"single])(vline .[(1 10)()"show vertical line (column highlighting) mode."single])(hl-line+ .[(22 0)()"Extensions to hl-line.el."single])(col-highlight .[(22 0)((vline (1 10)))"Highlight the current column."single])(color-theme-vim-insert-mode .[(0 1)()"Color theme VIM insert mode"single])(cursor-chg .[(20 1)()"Change cursor dynamically, depending on the context."single])(cygwin-mount .[(2001)()"Teach EMACS about cygwin styles and mount points."single])(header2 .[(21 0)()"Support for creation and update of file headers."single])(lib-requires .[(21 0)()"Commands to list Emacs Lisp library dependencies."single])(linum-off .[(0 1)()"Provides an interface for turning line-numbering off"single])(pos-tip .[(0 4 5)()"Show tooltip at point -*- coding: utf-8 -*-"single])(key-choices .[(0 201)((color-theme-vim-insert-mode (0 1)) (color-theme-emacs-revert-theme (0 1)))"Key Choices -- Also Viper has different colors in different modes"single])(tabbar .[(2 0 1)()"Display a tab bar in the header line  -*-no-byte-compile: t; -*-"single])(tabbar-ruler .[(0 40)((tabbar (2 0 1)))"Pretty tabbar, autohide, use both tabbar/ruler"single])(android-mode .[(0 2 5)()"Minor mode for Android application development"single])(elein .[(0 2 2)()"running leiningen commands from emacs"single])(sumatra-forward .[(2008 10 8)()"Provides Sumatra Forward search"single])(org-outlook .[(0 3)()"Outlook org"single])(clojure-test-mode .[(3 0 0)((clojure-mode (1 7)) (cider (0 4 0)))"Minor mode for Clojure tests"single])(slime-fuzzy .[(20100404)((slime (20100404)))"Fuzzy symbol completion for Slime"single])(r-autoyas .[(0 28)()"Provides automatically created yasnippets for R function argument lists."single])(color-theme-complexity .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(starter-kit .[(2 0 3)((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 1)) (ido-ubiquitous (0 3)) (magit (0 8 1)))"Saner defaults and goodies."tar])(starter-kit-lisp .[(2 0 3)((starter-kit (2 0 2)) (elisp-slime-nav (0 1)))"Saner defaults and goodies for lisp languages"single])(starter-kit-js .[(2 0 1)((starter-kit (2 0 1)))"Saner defaults and goodies for Javascript"single])(starter-kit-ruby .[(2 0 3)((inf-ruby (2 2 3)) (starter-kit (2 0 1)))"Saner defaults and goodies for Ruby"single])(geben .[(0 26)()"A remote debugging environment for Emacs."tar])(maxframe .[(0 5 1)()"maximize the emacs frame based on display size"single])(mode-compile .[(2 29)()" Smart command for compiling files"single])(swank-cdt .[(1 0 1)()"swank-cdt helper functions"single])(find-file-in-git-repo .[(0 1 2)()"Utility to find files in a git repo"single])(idle-highlight-mode .[(1 1 2)()"highlight the word the point is on"single])(inf-ruby .[(2 3 2)()"Run a Ruby process in a buffer"single])(smex .[(2 1)()"M-x interface with Ido-style fuzzy matching."single])(protobuf-mode .[(0 3)()"major mode for editing protocol buffers."single])(haskell-mode .[(13 7)()"A Haskell editing mode"tar])(znc .[(0 0 2)((cl (2 2)) (erc (5 3)))"ZNC + ERC "single])(slime-clj .[(0 1 5)()"slime extensions for swank-clj"single])(scala-mode .[(0 0 2)()"Scala major mode"tar])(keyfreq .[(0 0 3)((json (1 2)))"track command frequencies"single])(json .[(1 2)()"JavaScript Object Notation parser / generator"single])(magit-simple-keys .[(1 0 0)((magit (1 0 0)))"simple keybindings for Magit"single])(rainbow-delimiters .[(1 3 4)()"Highlight nested parens, brackets, braces a different color at each depth."single])(switch-window .[(0 9)()"A *visual* way to choose a window to switch to"single])(yaml-mode .[(0 0 9)()"Major mode for editing YAML files"single])(prolog .[(1 22)()"major mode for editing and running Prolog (and Mercury) code"single])(graphviz-dot-mode .[(0 3 7)()"Mode for the dot-language used by graphviz (att)."single])(perlcritic .[(1 10)()"minor mode for Perl::Critic integration"single])(button-lock .[(1 0 0)()"Clickable text defined by regular expression"single])(wiki-nav .[(1 0 0)((button-lock (1 0 0)) (nav-flash (1 0 0)))"Simple file navigation using [[WikiStrings]]"single])(gh .[(0 8 0)((eieio (1 3)) (pcache (0 2 4)) (logito (0 1)))"A GitHub library for Emacs"tar])(vala-mode .[(0 1)()"Vala mode derived mode"single])(fill-column-indicator .[(1 85)()"Graphically indicate the fill column"single])(alpha .[(1 0)()"increase frame transparency"single])(color-theme-ir-black .[(1 0 1)((color-theme (6 6 1)))"pastel color theme "single])(calfw-gcal .[(0 0 1)()"edit Google calendar for calfw.el."single])(python .[(20120402)()"Python's flying circus support for Emacs"single])(htmlfontify .[(0 21)()"htmlise a buffer/source tree with optional hyperlinks"single])(oddmuse .[(20090222)()"edit pages on an Oddmuse wiki"single])(wgrep .[(2 1 3)()"Writable grep buffer and apply the changes to files"single])(langtool .[(1 2 1)()"Grammar check utility using LanguageTool"single])(pcsv .[(1 3 3)()"Parser of csv -*- lexical-binding: t -*-"single])(gather .[(1 0 4)()"Gather string in buffer."single])(erefactor .[(0 6 10)()"Emacs-Lisp refactoring utilities"single])(starter-kit-bindings .[(2 0 2)((starter-kit (2 0 2)))"Saner defaults and goodies: bindings"single])(slime-ritz .[(0 6 0)()"slime extensions for ritz"single])(hl-sentence .[(2)()"highlight a sentence based on customizable face"single])(mustache-mode .[(1 2)()"A major mode for editing Mustache files."single])(color-theme-eclipse .[(0 0 2)((color-theme (6 6 1)))"Eclipse color theme for GNU Emacs."single])(bm .[(1 53)()"Visible bookmarks in buffer."single])(color-theme-railscasts .[(0 0 2)((color-theme (6 6 1)))"Railscasts color theme for GNU Emacs."single])(color-theme-tango .[(0 0 2)((color-theme (6 6 1)))"Tango palette color theme for GNU Emacs."single])(color-theme-github .[(0 0 3)((color-theme (6 6 1)))"Github color theme for GNU Emacs."single])(color-theme-dpaste .[(0 0 1)((color-theme (6 6 1)))"Dpaste color theme for GNU Emacs."single])(nose .[(0 1 1)()"Easy Python test running in Emacs"single])(dpaste .[(0 2)()"Emacs integration for dpaste.com"single])(offlineimap .[(0 1)()"Run OfflineIMAP from Emacs"single])(virtualenv .[(1 2)()"Virtualenv for Python  -*- coding: utf-8 -*-"single])(scss-mode .[(0 5 0)()"Major mode for editing SCSS files"single])(highlight-indentation .[(0 5 0)()"Function for highlighting indentation"single])(feature-mode .[(0 4)()"Major mode for editing Gherkin (i.e. Cucumber) user stories"tar])(dired-details .[(1 3 1)()"make file details hide-able in dired"single])(dired-details+ .[(1 0)()"Enhancements to library `dired-details+.el'."single])(python-pep8 .[(1 1)()"minor mode for running `pep8'"single])(python-pylint .[(1 1)()"minor mode for running `pylint'"single])(workgroups .[(0 2 0)()"workgroups for windows (for Emacs)"single])(closure-lint-mode .[(0 1)()"minor mode for the Closure Linter"single])(ruby-test-mode .[(1 7)((ruby-mode (1 0)))"Minor mode for Behaviour and Test Driven"single])(httpd .[(1 0 1)()"HTTP/1.0 web server for emacs"single])(pep8 .[(1 2)()"run the python pep8 checker putting hits in a grep buffer"single])(cppcheck .[(1 0)()"run cppcheck putting hits in a grep buffer"single])(grin .[(1 0)()"run grin and grind (python replacements for grep and find) putting hits in a grep buffer"single])(pyflakes .[(1 0)()"run the python pyflakes checker putting hits in a grep buffer"single])(pylint .[(1 0)()"run the python pylint checker putting hits in a grep buffer"single])(midje-mode .[(0 1 2)((slime (1 0)) (clojure-mode (1 0)))"Minor mode for running Midje tests in emacs, see: https://github.com/dnaumov/midje-mode"tar])(python-mode .[(6 0 10)()"Python major mode"tar])(fastnav .[(1 0 7)()"Fast navigation and editing routines."single])(confluence .[(1 6)((xml-rpc (1 6 7)))"Confluence major mode"tar])(tuareg .[(2 0 5)((caml (3 12 0 1)))"OCaml mode for Emacs."tar])(pp-c-l .[(1 0)()"Display Control-l characters in a pretty way"single])(js-comint .[(0 0 1)()"Run javascript in an inferior process window."single])(magithub .[(0 2)((magit (0 8)) (json (1 2)))"Magit extensions for using GitHub"single])(cmake-mode .[(20110824)()"major-mode for editing CMake sources"single])(smart-operator .[(1 9 20110812)()"Insert operators with surrounding spaces smartly"single])(less-css-mode .[(0 17)()"Major mode for editing LESS CSS files (lesscss.org)"single])(ibuffer-vc .[(0 7)((cl-lib (0 2)))"Group ibuffer's list by VC project, or show VC status"single])(color-theme-sanityinc-solarized .[(2 25)()"A version of Ethan Schoonover's Solarized themes"tar])(elisp-slime-nav .[(0 6)((cl-lib (0 2)))"Make M-. and M-, work in elisp like they do in slime"single])(erc-hl-nicks .[(1 3 1)()"ERC nick highlighter that ignores uniquifying chars when colorizing"single])(multi-project .[(0 0 14)()"Easily work with multiple projects."single])(org-magit .[(0 2 0)((magit (0 8)) (org (6 1)))"basic support for magit links"single])(whole-line-or-region .[(1 3 1)()"operate on current line if region undefined"single])(ido-ubiquitous .[(2 9)((emacs (24 1)))"Use ido (nearly) everywhere."single])(bigint .[(1 0 0)()"A simple bigint package for emacs"single])(dizzee .[(0 1 1)()"A more pleasant way to manage your project's subprocesses in Emacs."tar])(color-theme-dg .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(gimme .[(2 1)()"The XMMS2 interface we all love! Check out http://gimmeplayer.org for more info."tar])(deft .[(0 3)()"quickly browse, filter, and edit plain text notes"single])(pony-mode .[(0 2)()"Minor mode for working with Django Projects"tar])(clojurescript-mode .[(0 5)()"Major mode for ClojureScript code"single])(flymake-ruby .[(0 8)((flymake-easy (0 1)))"A flymake handler for ruby-mode files"single])(django-theme .[(1 3 0)()"Custom face theme for Emacs"single])(fsvn .[(0 9 13)()"Another frontend of subversion."tar])(starter-kit-eshell .[(2 0 3)()"Saner defaults and goodies: eshell tweaks"single])(yasnippet-bundle .[(0 6 1)()"Yet another snippet extension (Auto compiled bundle)"single])(yasnippet .[(0 6 1)()"Yasnippet template engine"tar])(flymake-coffee .[(0 12)((flymake-easy (0 1)))"A flymake handler for coffee script"single])(flymake-haml .[(0 7)((flymake-easy (0 1)))"A flymake handler for haml files"single])(markdown-mode .[(2 0)()"Emacs Major mode for Markdown-formatted text files"single])(ido-yes-or-no .[(1 1)((ido (0)))"Use Ido to answer yes-or-no questions"single])(caml .[(3 12 0 1)()"OCaml code editing commands for Emacs"tar])(dtrt-indent .[(0 2 0)()"Adapt to foreign indentation offsets"single])(windsize .[(0 1)()"Simple, intuitive window resizing"single])(jira .[(0 3 3)()"Connect to JIRA issue tracking software"single])(textmate .[(5)()"TextMate minor mode for Emacs"single])(xml-rpc .[(1 6 8)()"An elisp implementation of clientside XML-RPC"single])(coffee-mode .[(0 3 0)()"Major mode to edit CoffeeScript files in Emacs"single])(sr-speedbar .[(0 1 8)()"Same frame speedbar"single])(desktop .[(0 1)()"save partial status of Emacs when killed"single])(evil-numbers .[(0 3)()"increment/decrement numbers like in vim"single])(lolcode-mode .[(0 2)()"Major mode for editing LOLCODE"single])(projectile .[(0 10 0)((s (1 6 0)) (dash (1 5 0)) (pkg-info (0 4)))"Manage and navigate projects in Emacs easily"single])(dedicated .[(1 0 0)()"A very simple minor mode for dedicated buffers"single])(csharp-mode .[(0 8 6)()"C# mode derived mode"single])(color-theme-actress .[(0 2 2)((color-theme (6 6 1)))"A dark color theme for GNU Emacs."single])(ghc .[(1 10 2)((haskell-mode (2 8 0)))"Happy Haskell programming on Emacs"tar])(org-email .[(1 0)()"use org for an email database -*- lexical-binding: t -*-"single])(ahg .[(0 99)()"Alberto's Emacs interface for Mercurial (Hg)"single])(elnode .[(0 9 9 7 6)((web (0 1 4)) (dash (1 1 0)) (noflet (0 0 7)) (s (1 5 0)) (creole (0 8 14)) (fakir (0 1 6)) (db (0 0 5)) (kv (0 0 17)))"The Emacs webserver."tar])(lua-mode .[(20110428)()"a major-mode for editing Lua scripts"single])(ac-slime .[(0 5)()"An auto-complete source using slime completions"single])(vc-darcs .[(1 12)()"a VC backend for darcs"single])(elisp-cache .[(1 15)()"Faster emacs startup through byte-compiling."single])(scratch .[(20110708)()"Mode-specific scratch buffers"single])(hl-sexp .[(1 0 0)()"highlight the current sexp"single])(dsvn .[(922257)()"Subversion interface"single])(crontab-mode .[(1 2)()"Mode for editing crontab files"single])(popwin .[(0 4)()"Popup Window Manager."single])(session .[(2 2 1)()"use variables, registers and buffer places across sessions"single])(smart-tab .[(0 3)()"Intelligent tab completion and indentation."single])(flymake-shell .[(0 8)((flymake-easy (0 1)))"A flymake syntax-checker for shell scripts"single])(ac-ja .[(0 0 1)()"auto-complete-mode source for Japanese "single])(rcirc-notify .[(0 6)()"libnotify popups"single])(flymake-jslint .[(0 10)((flymake-easy (0 1)))"A flymake handler for javascript using jslint"single])(dart-mode .[(0 9)()"Major mode for editing Dart files"single])(color-theme-blackboard .[(0 0 2)((color-theme (6 6 1)))"Blackboard Colour Theme for Emacs."single])(color-theme-wombat .[(0 0 1)((color-theme (6 6 1)))"The wombat color theme for Emacs."single])(color-theme-wombat+ .[(0 0 2)((color-theme (6 6 1)))"wombat with improvements and many more faces"single])(color-theme-active .[(0 0 1)((color-theme (6 6 1)))"Active theme inspired by jEdit theme of the same name"single])(color-theme-colorful-obsolescence .[(0 0 1)((color-theme (6 6 1)))"Colorful Obsolescence theme designed for partially transparent windows"single])(apache-mode .[(2 0)()"major mode for editing Apache configuration files"single])(highline .[(7 2 2)()"minor mode to highlight current line in buffer"single])(mic-paren .[(3 8)()"advanced highlighting of matching parentheses"single])(pytest .[(0 2 1)()"Easy Python test running in Emacs"single])(wikidoc .[(0 8 1)()"use elisp doc strings to make other documentation"single])(flymake-sass .[(0 6)((flymake-easy (0 1)))"Flymake handler for sass files"single])(regex-tool .[(1 2)()"A regular expression evaluation tool for programmers"single])(tabkey2 .[(1 40)()"Use second tab key pressed for what you want"single])(save-visited-files .[(1 3)()"save opened files across sessions"single])(ioccur .[(0 2)()"Incremental occur."single])(javadoc-help .[(1 0)()"Javadoc-Help.  Look up Java class on online javadocs in browser."single])(macro-math .[(1 0)()"in-buffer mathematical operations"single])(winpoint .[(1 4)()"Remember buffer positions per-window, not per buffer"single])(scheme-complete .[(0 8 2)()"Smart tab completion for Emacs"single])(ruby-compilation .[(0 17)((inf-ruby (2 2 1)))"run a ruby process in a compilation buffer"single])(rinari .[(2 10)((ruby-mode (1 0)) (inf-ruby (2 2 1)) (ruby-compilation (0 8)) (jump (2 0)))"Rinari Is Not A Rails IDE"single])(flymake-php .[(0 5)((flymake-easy (0 1)))"A flymake handler for php-mode files"single])(flymake-jshint .[(1 0)()"making flymake work with JSHint"single])(doc-mode .[(0 2)()"convenient editing of in-code documentation"single])(gccsense .[(0 2)()"GCCSense client for Emacs"single])(p4 .[(11 0)()"Perforce-Emacs Integration Library"single])(pager .[(2 0)()"windows-scroll commands"single])(pastebin .[(0 1)()"A simple interface to the www.pastebin.com webservice"single])(cache .[(0 1)()"implementation of a hash table whose key-value pairs expire"single])(command-frequency .[(1 1)()"Track command frequencies"single])(guess-offset .[(0 1 1)()"Automatically determine c-basic-offset"single])(loccur .[(1 1 1)()"Perform an occur-like folding in current buffer"single])(recursive-narrow .[(1 0)()"narrow-to-region that operates recursively"single])(member-function .[(0 3 1)()"expand member functions for C++ classes"single])(window-number .[(1 0 1)()"Jump to a window by number"single])(gtags .[(3 3)()"gtags facility for Emacs"single])(pymacs .[(0 25)()"Interface between Emacs Lisp and Python"single])(pysmell .[(0 7 2)()"Complete python code using heuristic static analysis"single])(eieio .[(1 4)()"Enhanced Implememntation of Emacs Interpreted Objects"tar])(rudel .[(0 3)((eieio (1 4)))"A collaborative editing framework for Emacs"tar])(jabber .[(0 8 90)()"A Jabber client for Emacs."tar])(citrus-mode .[(0 0 2)()"Major mode for editing Citrus files"single])(lineno .[(0 1)()"Alternate mode to display line numbers."single])(emacsd-tile .[(0 1)()"tiling windows for emacs"single])(iy-go-to-char .[(1 0)()"Go to next CHAR which is similar to \"f\" in vim"single])(creole .[(1 0 3)((noflet (0 0 3)) (kv (0 0 17)))"A parser for the Creole Wiki language"single])(jenkins-watch .[(1 2)()"Watch continuous integration build status -*- indent-tabs-mode: t; tab-width: 8 -*-"single])(peepopen .[(0 1 0)()"Graphical file chooser for Emacs on Mac OS X."single])(levenshtein .[(1 0)()"Edit distance between two strings."single])(gopher .[(0 0 2)()"easily access and navigate Gopher servers"single])(clojure-project-mode .[(1 0)((project-mode (1 0)))"Extends project-mode for Clojure projects"single])(ruby-block .[(0 0 11)()"highlight matching block"single])(pretty-lambdada .[(22 0)()"Show the word `lambda' as the Greek letter."single])(rect-mark .[(1 4)()"Mark a rectangle of text with highlighting."single])(evernote-mode .[(0 41)()"Evernote client for Emacs"tar])(centered-cursor-mode .[(0 5 1)()"cursor stays vertically centered"single])(elixir-mode .[(1 0 0)()"Major mode for editing Elixir files"single])(wget .[(1 94)()"Emacs-wget is an interface program of GNU wget on Emacs."tar])(mldonkey .[(0 0 4)()"Multi-networks peer-to-peer client."tar])(sml-modeline .[(0 5)()"Show position in a scrollbar like way in mode-line"single])(mwe-log-commands .[(20041106)()"log keyboard commands to buffer"single])(move-text .[(1 0)()"Move current line or region with M-up or M-down."single])(hippie-expand-slime .[(0 1)()"Hook slime's completion into hippie-expand"single])(boxquote .[(1 23)()"Quote text with a semi-box."single])(gnugo .[(2 2 12)()"Play a game of Go against gnugo"single])(project-mode .[(1 0)((levenshtein (1 0)))"Define code projects. Full-text search, etc."single])(n3-mode .[(20071215)()"mode for Notation 3"single])(wcheck-mode .[(2013 6 25)()"General interface for text checkers"tar])(el-autoyas .[(0 5)()"Automatically create Emacs-Lisp Yasnippets"single])(org2blog .[(0 5)((org (7 7)) (xml-rpc (1 6 8)))"Blog from Org mode to wordpress"tar])(pcache .[(0 2 4)((eieio (1 3)))"persistent caching for Emacs"single])(mocker .[(0 3 0)((eieio (1 3)) (el-x (0 2 4)))"mocking framework for emacs"single])(idle-require .[(1 0)()"load elisp libraries while Emacs is idle"single])(find-things-fast .[(20111123)()"An emacs mode to find things fast and move around in a project quickly"tar])(color-theme-gruber-darker .[(1)((color-theme (6 6 1)))"Gruber Darker color theme for Emacs by Jason Blevins"single])(dna-mode .[(1 44)()"a major mode for editing dna sequences"single])(perl-myvar .[(1 25)()"Declare lexicaly scoped vars as my()."single])(nlet .[(1 10)()"schemes 'named let' for emacs."single])(ssh-config-mode .[(1 13)()"Mode for fontification of ~/.ssh/config"single])(win-switch .[(1 0 8)()"fast, dynamic bindings for window-switching/resizing"single])(j-mode .[(0 3)()"Major mode for editing J programs"single])(key-combo .[(1 5 1)()"map key sequence to commands"single])(nginx-mode .[(1 1)()"major mode for editing nginx config files"single])(vimgolf .[(0 9 2)()"VimGolf interface for the One True Editor"single])(flymake-csslint .[(1 1 0)((flymake (0 3)))"making flymake work with CSSLint"tar])(typing .[(1 1 4)()"A game for fast typers, inspired by The Typing Of The Dead."single])(zenburn-theme .[(2 1)()"A low contrast color theme for Emacs."single])(solarized-theme .[(1 0 0)()"The Solarized color theme, ported to Emacs."tar])(etags-select .[(1 13)()"Select from multiple tags"single])(etags-table .[(1 1)()"Set tags table(s) based on current file"single])(flymake-css .[(0 3)((flymake-easy (0 1)))"Flymake support for css using csslint"single])(tintin-mode .[(1 0 0)()"Mayor mode for editing tintin++ scripts"single])(org-cua-dwim .[(0 5)()"Org-mode and Cua mode compatibility layer"single])(otp .[(1 0)()"a one-time password creator"single])(bookmark+ .[(20111214)()"Bookmark Plus"tar])(sentence-highlight .[(0 1)()"highlight the current sentence"single])(smartrep .[(0 0 3)()"Support sequential operation which omitted prefix keys."single])(tabula-rasa-mode .[(0 1 0)()"Distraction free writing mode"single])(abl-mode .[(0 9 0)()"Python TDD minor mode"single])(grails-mode .[(0 1)()"minor-mode that adds some Grails project management to a grails project"single])(inf-groovy .[(2 0)()"minor-mode that adds some Grails project management to a grails project"single])(tidy .[(2 12)()"Interface to the HTML Tidy program"single])(simp .[(0 2 0)()"Simple project definition, chiefly for project file finding and grepping."tar])(httpcode .[(0 1)()"explains the meaning of an HTTP status code"single])(d-mode .[(2 0 4)()"D Programming Language mode for (X)Emacs"tar])(git-commit .[(0 1)()"Major mode for editing git commit messages"single])(color-theme-library .[(0 0 10)((color-theme (6 6 1)))"The real color theme functions"single])(sauron .[(0 8)()"Track (erc/org/dbus/...) events and react to them."tar])(quickrun .[(1 8 4)()"Run commands quickly"single])(rcirc-color .[(0 2)()"color nicks"single])(rcirc-ucomplete .[(1 0 1)()"Unambiguous non-cycling completion for rcirc"single])(color-theme-sanityinc-tomorrow .[(1 10)()"A version of Chris Kempson's various Tomorrow themes"tar])(cl-format .[(1 1)()"CL format routine."tar])(color-theme-cobalt .[(0 0 2)((color-theme (6 6 1)))"Cobalt Color Theme for Emacs"single])(refheap .[(0 0 3)()"A library for pasting to https://refheap.com"single])(ctags-update .[(0 1 2)()"auto update TAGS in parent directory using exuberant-ctags -*- coding:utf-8 -*-"single])(peep-open .[(0 0 2)()"PeepOpen plugin for emacs."single])(org-mime .[(20120112)()"org html export for text/html MIME emails"single])(eh-basic .[(0 0 2)((starter-kit (2 0 2)) (browse-kill-ring (1 3 1)))"tuamshu's emacs basic configure"tar])(eh-gnus .[(0 0 6)()"tuamshu's gnus configure"tar])(eh-functions .[(0 0 1)((starter-kit (2 0 2)))"tuamshu's emacs functions"tar])(eh-keybindings .[(0 0 1)((eh-functions (0 0 1)) (starter-kit-bindings (2 0 2)))"tuamshu's emacs keybindings"tar])(magit-gh-pulls .[(0 3)((gh (0 4 3)) (magit (1 1 0)))"GitHub pull requests extension for Magit"single])(highlight-80+ .[(1 0)()"highlight characters beyond column 80"single])(jump-char .[(0 1)()"navigation by char"single])(color-theme-molokai .[(0 1)()"Molokai color theme by Lloyd"single])(pointback .[(0 2)()"Restore window points when returning to buffers"single])(uci-mode .[(1 0 0)()"Major mode for UCI configuration files"single])(erlang .[(2 4 1)()"Major modes for editing and running Erlang"single])(thumb-through .[(0 3)()"Plain text reader of HTML documents"single])(unbound .[(0 1)()"find convenient unbound keystrokes"single])(ido-better-flex .[(0 0 2)()"A better flex (fuzzy) algorithm for Ido."single])(slim-mode .[(1 1)()"Major mode for editing Slim files"single])(flymake .[(0 4 16)()"a universal on-the-fly syntax checker"single])(popup .[(0 5)()"Visual Popup User Interface"single])(fancy-mode .[(0 1)()"Major mode for programming with the Fancy language."single])(haxe-mode .[(0 3 1)()"An Emacs major mode for haXe"single])(expand-region .[(0 8 0)()"Increase selected region by semantic units."tar])(ack-and-a-half .[(1 2 0)()"Yet another front-end for ack"single])(test-case-mode .[(0 1 8)()"unit test front-end"single])(multi-eshell .[(0 0 1)()"makes it easier to use multiple shells within emacs"single])(mo-git-blame .[(0 1 0)()"An interactive, iterative 'git blame' mode for Emacs"single])(slime-js .[(0 0 1)((slime-repl (20100404)) (slime (20100404)))"Slime extension for swank-js."single])(volatile-highlights .[(1 10)()"Minor mode for visual feedback on some operations."single])(smooth-scroll .[(1 2)()"Minor mode for smooth scrolling and in-place scrolling."single])(xlicense .[(1 1)()"Insert pre-defined license text"tar])(flymake-d .[(0 1)()"A flymake handler for d-mode files"single])(flymake-tuareg .[(0 1)()"A flymake handler for tuareg-mode files"tar])(track-closed-files .[(0 1)()"Keep track of recently closed files"single])(color-theme-monokai .[(0 0 5)((color-theme (6 5 5)))"Monokai Color Theme for Emacs."single])(drupal-mode .[(0 3 1)((php-mode (1 5 0)))"Advanced minor mode for Drupal development"tar])(screen-lines .[(0 55)()"a minor mode for screen-line-based point motion"single])(ctypes .[(1 2)()"Enhanced Font lock support for custom defined types."single])(moinmoin-mode .[(1 0)((screen-lines (0 55)))"a major mode to edit MoinMoin wiki pages"single])(pc-mode .[(0 1)()"major mode for editing PC code,"single])(mediawiki .[(2 2 3)()"mediawiki frontend"single])(workspaces .[(0 1)()"Workspaces for Emacsen "single])(pivotal-tracker .[(1 2 0)()"Interact with Pivotal Tracker through its API"single])(tron-theme .[(12)()"A theme loosely based on Tron: Legacy colors"single])(sublime .[(0 0 7)((coffee-mode (0 3 0)) (find-file-in-project (3 0)) (haml-mode (3 0 14)) (ido-ubiquitous (1 0)) (less-css-mode (0 6)) (magit (1 1 1)) (markdown-mode (1 8 1)) (monokai-theme (0 0 6)) (paredit (22)) (sass-mode (3 0 14)) (smex (1 1 2)) (yaml-mode (0 0 7)) (yasnippet (0 6 1)))"REQUIRES EMACS 24 - Sublime Text 2 Emulation for Emacs"tar])(logito .[(0 1)((eieio (1 3)))"logging library for Emacs"single])(jade-mode .[(0 1)()"Major mode for editing jade templates."single])(stylus-mode .[(0 1)()"Major mode for editing stylus templates."single])(sws-mode .[(0 1)()"SWS mode"single])(ess-smart-underscore .[(0 79)()"Ess Smart Underscore"single])(ghci-completion .[(0 1 3)()"Completion for GHCi commands in inferior-haskell buffers -*- lexical-binding: t; -*-"single])(google-translate .[(0 5)()"Emacs interface to Google Translate"single])(javap .[(8)()"Javap major mode"single])(javap-mode .[(9)()"Javap major mode"single])(anything-show-completion .[(20091119)()"Show selection in buffer for anything completion"single])(pastels-on-dark-theme .[(0 3)()"Pastels on Dark theme for Emacs 24"single])(color-theme-solarized .[(20120301)()"Solarized themes for Emacs"tar])(image-dired+ .[(0 6 0)()"Image-dired extensions"single])(deferred .[(0 3 1)()"Simple asynchronous functions for emacs lisp"single])(concurrent .[(0 3 1)((deferred (0 3 1)))"Concurrent utility functions for emacs lisp"single])(ctable .[(0 1 1)()"Table component for Emacs Lisp"single])(epc .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)))"A RPC stack for the Emacs Lisp"single])(edbi .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)) (epc (0 1 1)))"Emacs Database Interface"tar])(color-theme .[(6 5 5)()"install color themes"single])(cacoo .[(2 1 2)((concurrent (0 3 1)))"Minor mode for Cacoo : http://cacoo.com"tar])(imgur .[(0 1)((anything (1 287)))"imgur client for Emacs"single])(tango-2-theme .[(1 0 0)()"Tango 2 color theme for GNU Emacs 24"single])(po.foo .[(3 0 20)((haml-mode (3 0 20)))"Sass major mode"single])(po.elscreen .[(1 4 6)()" Screen for Emacsen(this is not original)"single])(po-elscreen .[(1 4 6)()" Screen for Emacsen(this is not original. original is http://www.morishima.net/~naoto/elscreen-en/?lang=en)"single])(quack .[(0 42)()"enhanced support for editing and running Scheme code"single])(dired+ .[(21 2)()"Extensions to Dired."single])(evil-leader .[(0 4 1)((evil (0)))"let there be <leader>"single])(rspec-mode .[(1 7)((ruby-mode (1 0)))"Enhance ruby-mode for RSpec"single])(fakir .[(0 1 7)((noflet (0 0 3)) (dash (1 3 2)))"fakeing bits of Emacs -*- lexical-binding: t -*-"single])(emstar .[(1 4)()"Casual game, like a brainy Pac-Man"tar])(igrep .[(2 113)()"An improved interface to `grep` and `find`"single])(cljdoc .[(0 1 0)()"eldoc mode for clojure"single])(real-auto-save .[(0 3)()"enable real auto save"single])(monokai-theme .[(0 0 10)()"REQUIRES EMACS 24: Monokai Color Theme for Emacs."single])(wrap-region .[(0 7 1)()"Wrap text with punctation or tag"single])(fuzzy .[(0 1)()"Fuzzy Matching"single])(auto-complete .[(1 4)((popup (0 5)))"Auto Completion for GNU Emacs"tar])(bitlbee .[(1 0)()"Help get Bitlbee (http://www.bitlbee.org) up and running"single])(lorem-ipsum .[(0 1)()"Insert dummy pseudo Latin text."single])(typopunct .[(1 0)()"Automatic typographical punctuation marks"single])(twittering-mode .[(2 0 0)()"Major mode for Twitter"single])(flymake-phpcs .[(1 0 5)((flymake (0 3)))"Flymake handler for PHP to invoke PHP-CodeSniffer"tar])(flex-autopair .[(0 3)()"Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable."single])(color-theme-dawn-night .[(1 0)()"color theme of dawn and night."single])(weather .[(2012 3 27 2)()"Get weather reports via worldweatheronline.com"single])(flymake-perlcritic .[(1 0 3)((flymake (0 3)))"Flymake handler for Perl to invoke Perl::Critic"tar])(jsshell-bundle .[(2012 4 7)()"JSShell generated bundle"single])(rfringe .[(1 0 1)()"indicate relative locations in the fringe"single])(flyphpcs .[(1 0 1)()"Flymake for PHP via PHP-CodeSniffer"single])(defaultcontent .[(1 4)()"a templating tool. Fill new files with default content."single])(flymake-for-jslint-for-wsh .[(1 3 0)((flymake (0 3)))"use flymake with js code, on Windows"single])(tfs .[(0 2 7)()"MS Team Foundation Server commands for Emacs."single])(dropdown-list .[(1 45)()"Drop-down menu interface"single])(thesaurus .[(2012 4 7)()"replace a word with a synonym looked up in a web service."single])(fly-jshint-wsh .[(2 0 3)((flymake (0 3)))"use flymake with jshint on js code, on Windows"single])(watch-buffer .[(1 0 1)()"run a shell command when saving a buffer"single])(smarter-compile .[(2012 4 9)()"a smarter wrapper for `compile'"single])(hungry-delete .[(1 0)()"hungry delete minor mode"single])(align-cljlet .[(0 3)((clojure-mode (1 11 5)))"Space align various Clojure forms "single])(idomenu .[(0 1)()"imenu tag selection with ido"single])(drag-stuff .[(0 0 4)()"Drag stuff (lines, words, region, etc...) around"single])(w32-registry .[(2012 4 6)()"read the registry from elisp"single])(jsshell .[(2012 4 7)()"Run a javascript command interpreter in emacs on Windows."single])(shadchen .[(1 0)()"pattern matching for elisp"single])(cycbuf .[(0 5 0)()"Cycle buffers code by Martin Pohlack, inspired by"single])(yascroll .[(0 2 0)()"Yet Another Scroll Bar Mode"single])(anything-exuberant-ctags .[(0 1 2)()"Exuberant ctags anything.el interface"single])(ess .[(5 14)()"Edit and interact with statistical programs like R, S-Plus, SAS, Stata and JAGS"tar])(anything-git-goto .[(0 1 0)()"Quick listing of:"single])(expectations-mode .[(0 0 4)((nrepl (0 1 5)) (clojure-mode (1 11)))"Minor mode for expectations tests"single])(twilight-theme .[(1 0 0)()"Twilight theme for GNU Emacs 24 (deftheme)"single])(jtags .[(0 97)()"enhanced tags functionality for Java development"single])(jtags-extras .[(0 3 0)()"jtags related functionality for Java development"single])(phantomjs .[(0 0 11)()"Control phantomjs from Emacs			"tar])(oz .[(16513)()"Major mode for editing Oz programs"tar])(load-theme-buffer-local .[(0 0 2)()"Install emacs24 color themes by buffer."single])(color-theme-buffer-local .[(0 0 2)()"Install color-themes by buffer."single])(elisp-depend .[(1 0 2)()"Parse depend libraries of elisp file."single])(key-chord .[(0 5 20080915)()"map pairs of simultaneously pressed keys to commands"single])(shell-here .[(1 1)()"Open a shell relative to the working directory"single])(symbols-mode .[(0 3)()"List symbols of object files"single])(handlebars-mode .[(1 3)()"A major mode for editing Handlebars files."single])(dircmp .[(1)()"Compare and sync directories."single])(ascii .[(3 1)()"ASCII code display."single])(frame-tag .[(0 1 0)()"Minor mode that assigns a unique number to each frame for easy switching"single])(org-blog .[(1 18 1 1)()"create and publish a blog with org-mode"single])(ruby-tools .[(0 1 0)()"Collection of handy functions for ruby-mode"single])(unfill .[(0 1)()"The inverse of fill-paragraph and fill-region"single])(modeline-posn .[(22 0)()"Set up `mode-line-position'."single])(mark-multiple .[(1 0)()"A library that sorta lets you mark several regions at once"single])(mark-more-like-this .[(1 0)()"Mark additional regions in buffer matching current region."single])(openwith .[(20120531)()"Open files with external programs"single])(isearch+ .[(21 0)()"Extensions to `isearch.el'."single])(mouse+ .[(21 0)()"Extensions to `mouse.el'."single])(zencoding-mode .[(0 5 1)()"Unfold CSS-selector-like expressions to markup"single])(smart-mode-line .[(1 7 1)()"A color coded smart mode-line."single])(nyan-mode .[(0 1)()"Nyan Cat shows position in current buffer in mode-line."single])(ujelly-theme .[(1 0 35)()"Ujelly theme for GNU Emacs 24 (deftheme)"single])(guru-mode .[(0 1)()"Become an Emacs guru"single])(zen-and-art-theme .[(1 0 1)()"zen and art color theme for GNU Emacs 24"single])(git-auto-commit-mode .[(4 2 2)()"Emacs Minor mode to automatically commit and push"single])(haste .[(1)((json (1 2)))"Emacs client for hastebin (http://hastebin.com/about.md)"single])(my-packages .[(0 1 0)()"Package Initialization."single])(zen-mode .[(20120627)()"remove/restore Emacs distractions quickly"tar])(heroku .[(1 1 0)()"Interface to Heroku apps."single])(php-extras .[(1 0 0 20130923)((php-mode (1 5 0)))"Extra features for `php-mode'"tar])(repository-root .[(1 0 4)()"deduce the repository root directory for a given file"single])(grep-a-lot .[(1 0 7)()"manages multiple search results buffers for grep.el"single])(grep-o-matic .[(1 0 6)()"auto grep word under cursor"single])(el-spec .[(0 2)()"ruby's rspec like syntax test frame work"single])(wc-mode .[(1 3)()"Running word count with goals (minor mode)"single])(legalese .[(1 0)()"Add legalese to your program files"single])(scad-mode .[(90 0)()"SCAD mode derived mode"single])(ttl-mode .[(0 1)()"mode for Turtle(RDF)"single])(zeitgeist .[(0 1)()"integrates Emacs with Zeitgeist."single])(anything-git .[(1 1 1)()"Show git files in anything"single])(dispass .[(1 1 2)()"Emacs wrapper for DisPass"single])(writegood-mode .[(20130406 2316)()"Polish up poor writing on the fly"single])(nrepl .[(0 2 0)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 1)))"Client for Clojure nREPL"single])(shell-switcher .[(0 1 5 1)()"Easily switch between shell buffers, like with alt+tab."tar])(github-theme .[(0 0 3)()"Github color theme for GNU Emacs 24"single])(sokoban .[(1 23)()"Play the Sokoban game in emacs"single])(package-store .[(0 3)()"a package cache"single])(code-headers .[(0 7)()"Navigate code with headers embedded in comments.  -*- mode: Emacs-Lisp; lexical-binding: t; -*"single])(dix .[(0 1 0)()"minor mode for editing Apertium XML dictionary files"single])(no-easy-keys .[(1 0 2)()"Learn the proper Emacs movement keys"single])(makefile-runner .[(1 1 2)()"Searches for Makefile and fetches targets"single])(gnusnotes .[(0 9 2)()"Adding per-message notes in gnus summary buffer"single])(web .[(0 3 7)()"useful HTTP client -*- lexical-binding: t -*-"single])(eredis .[(0 5 0)()"eredis, a Redis client in emacs lisp"single])(org-readme .[(20130322 926)((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0)))"Integrates Readme.org and Commentary/Change-logs."single])(egison-mode .[(0 1 4)()"Egison editing mode"single])(mongo .[(0 5)()"A MongoDB client."tar])(cm-mode .[(0 1 0)()"Wrapper for CodeMirror-style Emacs modes"single])(marmalade-test .[(0 0 1)()"A test tarball package."tar])(ruby-mode .[(1 1)()"ruby-mode package"tar])(hjkl-mode .[(0 1)((key-chord (0 5)))"import some vim's key bindings"tar])(edit-list .[(0 4)()"edit a single list"single])(persistent-soft .[(0 8 8)((pcache (0 2 3)) (list-utils (0 4 2)))"Persistent storage, returning nil on failure"single])(hippie-namespace .[(0 5 8)()"Special treatment for namespace prefixes in hippie-expand"single])(nav-flash .[(1 1 0)()"Briefly highlight the current line"single])(ucs-utils .[(0 7 6)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utilities for Unicode characters"single])(back-button .[(0 6 6)((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Visual navigation through mark rings"single])(xml-gen .[(0 4)()"A DSL for generating XML."single])(yaoddmuse .[(0 1 1)()"Yet another oddmuse for Emacs"single])(window-end-visible .[(0 1 0)()"Find the last visible point in a window"single])(string-utils .[(0 3 2)((list-utils (0 4 2)))"String-manipulation utilities"single])(unicode-enbox .[(0 1 4)((string-utils (0 3 2)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Surround a string with box-drawing characters"single])(dynamic-fonts .[(0 6 4)((font-utils (0 7 0)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Set faces based on available fonts"single])(minimal-session-saver .[(0 6 2)()"Very lean session saver"single])(unicode-progress-reporter .[(0 5 4)((emacs (24 1 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Progress-reporter with fancy characters"single])(unicode-fonts .[(0 3 8)((font-utils (0 7 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"Configure Unicode fonts"single])(jump .[(2 3)((findr (0 7)) (inflections (1 1)))"build functions which contextually jump between files"single])(mongo-elnode .[(0 5 0)((mongo (0 5)) (elnode (0 9 9)))"elnode adapter for mongo-el"single])(dotassoc .[(0 0 1)()"dot access embedded alists"single])(eimp .[(1 4 0)()"Emacs Image Manipulation Package"single])(org-presie .[(0 0 5)((framesize (0 0 1)) (eimp (1 4 0)) (org (7 8 9)))"simple presentation with an org file"single])(ido-load-library .[(0 2 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Load-library alternative using ido-completing-read"single])(esxml .[(0 3 0)((db (0 0 1)))"Handle HTML with lists."tar])(ac-nrepl .[(0 21)((cider (0 1)) (auto-complete (1 4)))"auto-complete sources for Clojure using nrepl completions"single])(unicode-whitespace .[(0 2 4)((ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3)))"teach whitespace-mode about fancy characters"single])(ecb-snapshot .[(20120830)()"Emacs Code Browser CVS snapshot"tar])(pabbrev .[(3 1)()"Predictive abbreviation expansion"single])(applescript-mode .[(1 1)()"major mode for editing AppleScript source"single])(ssh .[(1 2)()"Support for remote logins using ssh."single])(nrepl-ritz .[(0 6 0)((nrepl (0 1 5)))"nrepl extensions for ritz"single])(doctags .[(0 1)()"Generation of tags documentation in Doxygen syntax"single])(ignoramus .[(0 7 0)()"Ignore backups, build files, et al."single])(flyspell-lazy .[(0 6 6)()"Improve flyspell responsiveness using idle timers"single])(buffer-utils .[(0 1 0)()"Buffer-manipulation utility functions"single])(browse-url-dwim .[(0 6 6)((string-utils (0 3 2)))"Context-sensitive external browse URL or Internet search"single])(fixmee .[(0 8 4)((button-lock (1 0 0)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 3 2)) (tabulated-list (0)))"Quickly navigate to FIXME notices in code"single])(kv .[(0 0 17)()"key/value data structure functions"single])(lisp-editing .[(0 0 5)()"lisp editing tools"single])(oauth .[(1 0 3)()"An Emacs oauth client. See https://github.com/psanford/emacs-oauth/"tar])(tumblesocks .[(0 0 7)((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1)))"An Emacs tumblr client."tar])(uuid .[(0 0 3)()"UUID's for EmacsLisp"single])(pcmpl-args .[(0 1 1)()"Enhanced shell command completion    -*- lexical-binding: t -*-"single])(anaphora .[(1 0 0)()"anaphoric macros providing implicit temp variables"single])(exec-path-from-shell .[(1 6)()"Get environment variables such as $PATH from the shell"single])(rcirc-ssh .[(0 0 7)((kv (0 0 3)))"do irc over ssh sessions -*- lexical-binding: t -*-"single])(go-play .[(0 0 1)()"Paste to play.golang.org"single])(yagist .[(0 8 6)((json (1 2 0)))"Yet Another Emacs integration for gist.github.com"single])(list-utils .[(0 4 2)()"List-manipulation utility functions"single])(margo .[(2012 9 18)((web (0 1 8)) (json (1 2)))"Client for MarGo, providing Go utilities"single])(shoes-off .[(0 1 8)((kv (0 0 5)) (anaphora (0 0 4)))"irc bouncer"single])(multiple-cursors .[(1 3 0)()"Multiple cursors for Emacs."tar])(pcre2el .[(1 5)((cl-lib (0 3)))"parse, convert, and font-lock PCRE, Emacs and rx regexps"single])(eshell-manual .[(0 0 2)()"An updated manual for Eshell."tar])(font-utils .[(0 7 0)((persistent-soft (0 8 8)) (pcache (0 2 3)))"Utility functions for working with fonts"single])(rcirc-robots .[(0 0 7)((kv (0 0 8)) (anaphora (0 0 5)))"robots based on rcirc irc -*- lexical-binding: t -*-"single])(plantuml-mode .[(0 2)()"Major mode for plantuml"single])(hackernews .[(0 1)((json (1 2)))"Access the hackernews aggregator from Emacs"tar])(org-ehtml .[(0 20131014)((elnode (20130416 1626)) (org-plus-contrib (20131007)))"Export Org-mode files as editable web pages"tar])(esk .[(0 1)()"Emacs Search Kit - An easy way to find files and/or strings in a project"tar])(hide-comnt .[(40)()"Hide/show comments in code."tar])(pretty-mode-plus .[(1 0)()"Redisplay parts of the buffer as pretty symbols."tar])(s .[(1 9 0)()"The long lost Emacs string manipulation library."single])(sprintly-mode .[(0 0 4)((furl (0 0 2)))"Major mode for dealing with sprint.ly"single])(git-commit-mode .[(0 13)()"Major mode for editing git commit messages -*- lexical-binding: t; -*-"single])(db .[(0 0 6)((kv (0 0 11)))"A database for EmacsLisp  -*- lexical-binding: t -*-"single])(notmuch-labeler .[(0 1)()"Improves notmuch way of displaying labels through fonts, pictures, and hyperlinks."tar])(text-language .[(0 20121008)()"tracking, setting, guessing language of text"single])(gitignore-mode .[(0 1)()"Major mode for editing .gitconfig files"single])(typo .[(1 1)()"Minor mode for typographic editing"single])(ws-trim .[(1 4)()"Tools and minor mode to trim whitespace on text lines"single])(flymake-checkers .[(0 2)()"Flymake reloaded with useful checkers"single])(hardhat .[(0 4 2)((ignoramus (0 7 0)))"Protect against clobbering user-writable files"single])(save-packages .[(0 20121012)()"save and restore installed packages"single])(smooth-scrolling .[(1 0 1)()"Make emacs scroll smoothly"single])(flymake-go .[(2013 3 14)((flymake (0 4 13)))"A flymake handler for go-mode files"single])(cmake-project .[(0 7)()"Integrates CMake build process with Emacs"single])(combinators .[(0 0 1)()"-*- lexical-binding: t; -*-"single])(gitty .[(1 0)()"vc-mode extension for fast git interaction"single])(mote-mode .[(1 0 0)((ruby-mode (1 1)))"Mote minor mode"single])(hideshowvis .[(0 5)()"Add markers to the fringe for regions foldable by hideshow.el"single])(inflections .[(1 1)()"convert english words between singular and plural"single])(findr .[(0 7)()"Breadth-first file-finding facility for (X)Emacs"single])(livescript-mode .[(0 0 1)()"Major mode for LiveScript files in Emacs"single])(smart-forward .[(1 0 0)((expand-region (0 8 0)))"Semantic navigatioin"single])(osx-browse .[(0 8 8)((string-utils (0 3 2)) (browse-url-dwim (0 6 6)))"Web browsing helpers for OS X"single])(cljsbuild-mode .[(0 2 0)()"A minor mode for the ClojureScript 'lein cljsbuild' command"single])(vector-utils .[(0 1 2)()"Vector-manipulation utility functions"single])(config-block .[(0 0 1)()"config-block is utility for individual settings (e.g. .emacs)."single])(visible-color-code .[(0 0 1)()"color code strings in current buffer, this elisp show you one as real color."single])(namakemono .[(0 0 1)()"utility function set for namakemono"single])(bang .[(0 1 0)()"A modern list library for Emacs"single])(roy-mode .[(0 1 0)()"Roy major mode"single])(wgrep-ack .[(0 1 1)((wgrep (2 1 1)))"Writable ack-and-a-half buffer and apply the changes to files"single])(flymake-lua .[(1 0)()"Flymake for Lua"single])(dash .[(2 4 0)()"A modern list library for Emacs"single])(inform-mode .[(1 6 2)()"Major mode for Inform 6 interactive fiction code"single])(weather-metno .[(20121023)()"Weather data from met.no in Emacs"tar])(octomacs .[(0 0 1)()"Octopress interface for Emacs"single])(highlight .[(21 0)()"Highlighting commands."single])(region-list-edit .[(20100530 808)()"Add/delete a region into/from a region list, such as ‘((4 . 7) (11 . 15) (17 . 17) (20 . 25))."single])(zjl-hl .[(20121028 1901)((highlight (21 0)) (region-list-edit (20100530 808)))"Highlight variable and function call and others in c/emacs, make life easy."single])(truthy .[(0 2 8)((list-utils (0 4 2)))"Test the content of a value"single])(syntactic-sugar .[(0 9 4)()"Effect-free forms such as if/then/else"single])(elpakit .[(1 0 7)((anaphora (0 0 6)) (dash (1 0 3)))"package archive builder"single])(bug-reference-github .[(0 2 0)()"Automatically set `bug-reference-url-format' in Github repositories."single])(macrostep .[(0 6)()"interactive macro stepper for Emacs Lisp"single])(qsimpleq-theme .[(0 1 3)()"Based on solarized color theme for Emacs."single])(flymake-easy .[(0 9)()"Helpers for easily building flymake checkers"single])(seclusion-mode .[(1 1 1)()"Edit in seclusion. A Dark Room mode."single])(skinny .[(0 0 3)((elnode (0 9 9 6 1)) (creole (0 8 17)))"a blog engine with elnode -*- lexical-binding: t -*-"single])(flymake-python-pyflakes .[(0 9)((flymake-easy (0 8)))"A flymake handler for python-mode files using pyflakes (or flake8)"single])(pyvirtualenv .[(1 1)()"Python Pyvirtualenv support"single])(find-file-in-repository .[(1 3)()"Quickly find files in a git, mercurial or other repository"single])(page-break-lines .[(0 8)()"Display ugly ^L page breaks as tidy horizontal lines"single])(paredit-menu .[(1 0)()"Adds a menu to paredit.el as memory aid"single])(elpy .[(1 2 1)((auto-complete (1 4)) (find-file-in-project (3 2)) (fuzzy (0 1)) (highlight-indentation (0 5 0)) (idomenu (0 1)) (iedit (0 97)) (nose (0 1 1)) (virtualenv (1 2)) (yasnippet (0 8 0)))"Emacs Python Development Environment"tar])(ace-jump-mode .[(2 0 0 0)()"a quick cursor location minor mode for emacs -*- coding: utf-8-unix -*-"single])(osx-location .[(0 2)()"Watch and respond to changes in geographical location on OS X"tar])(elpa-audit .[(0 4)()"Handy functions for inspecting and comparing package archives"single])(pde .[(0 2 16)()"Perl Development Environment"tar])(tt-mode .[(20121117 2045)()"Emacs major mode for editing Template Toolkit files."tar])(pod-mode .[(20121117 2120)()"Major mode for editing .pod-files."tar])(multi-web-mode .[(0 1)()"multiple major mode support for web editing"single])(flycheck .[(0 15)((s (1 6 0)) (dash (2 0 0)) (f (0 6 0)) (pkg-info (0 4)) (cl-lib (0 3)) (emacs (24 1)))"On-the-fly syntax checking (Flymake done right)"tar])(chicken-scheme .[(1 1 0)()"Scheme-mode extensions for Chicken Scheme"single])(minimap .[(1 0)()"Sidebar showing a \"mini-map\" of a buffer"single])(session-manager .[(0 5)()"Support for the Gnome Session Manager"single])(ercn .[(1 0 2)()"Flexible ERC notifications"single])(grr .[(1 0 0)()"Simple Growl notifications for Emacs and Mac OS X"single])(simpleclip .[(1 0 0)()"Simplified access to the system clipboard"single])(bufshow .[(0 1 0)()"A simple presentation tool for Emacs."tar])(cpputils-cmake .[(0 4 0)()"Easy real time C++ syntax check and intellisense if you use CMake."tar])(lcs .[(1 1)()"find out the longest common sequence"single])(tracking .[(1 4)((shorten (0 3)))"Buffer modification tracking"single])(lui .[(1 3)((tracking (1 4)))"Linewise User Interface"tar])(circe .[(1 3)((lui (1 3)) (lcs (1 1)))"Client for IRC in Emacs"tar])(iedit .[(0 97)()"Edit multiple regions in the same way simultaneously."tar])(let-recur .[(0 0 5)()"Simplified implementation of recur -*- lexical-binding:t -*-"single])(wgrep-helm .[(0 1 0)((wgrep (2 1 1)))"Writable helm-grep-mode buffer and apply the changes to files"single])(otter-mode .[(1 2)()"Major mode for source files of the Otter automated theorem prover"single])(sql-indent .[(1 10)()"indentation of SQL statements"single])(parenface-plus .[(1 1)()"Provide a face for parens in lispy modes."tar])(maildir .[(0 0 20)((kv (0 0 17)))"Simple maildir based MUA."tar])(huskie .[(0 0 2)((anaphora (0 0 6)))"chainsaw powered logging"single])(color-theme-x .[(1 3)()"convert color themes to X11 resource settings"single])(systemtap-mode .[(0 2)()"A mode for SystemTap"single])(gplusify .[(1 0)()"Add Google Plus markup to a piece of code"single])(diatheke .[(1 0)()"A minor mode using the diatheke command-line Bible tool"single])(extend-dnd .[(0 5)()"R drag and Drop"single])(wxwidgets-help .[(0 0 3)()"Look up wxWidgets API by using local html manual."tar])(sudden-death .[(0 2)()"Totsuzen-no-Shi"single])(fold-this .[(0 1 0)()"Just fold this region please"single])(subshell-proc .[(0 2)()"Functions for working with comints"single])(pg .[(0 12)()"Emacs Lisp interface to the PostgreSQL RDBMS"single])(db-pg .[(0 0 3)((pg (0 12)) (db (0 0 6)))"A PostgreSQL adapter for emacs-db"single])(el-x .[(0 2 4)((cl-lib (0 2)))"Emacs-lisp extensions."tar])(hippie-expand-haskell .[(0 0 1)()"Hippie expand try function using ghc's completion function."single])(slamhound .[(2 0 0)()"Rip Clojure namespaces apart and rebuild them."single])(late-night-theme .[(0 0)()"Late Night theme for Emacs 24"single])(json-mode .[(1 1 0)()"Major mode for editing JSON files"single])(creole-mode .[(0 0 5)()"a markup mode for creole"single])(evil-paredit .[(0 0 1)((evil (0 0 0)) (paredit (1)))"Paredit support for evil keybindings"single])(websocket .[(1 0)()"Emacs WebSocket client and server"single])(evil-nerd-commenter .[(1 2 7)()"Comment/uncomment lines efficiently. Like Nerd Commenter in Vim"tar])(robe .[(0 7 7)((inf-ruby (2 3 0)))"Code navigation, documentation lookup and completion for Ruby"tar])(dropbox .[(0 9 1)((json (1 2)) (oauth (1 0 3)))"Emacs backend for dropbox"single])(simple-mode-line .[(0 3)()"Simplified Mode Line for Emacs 24"single])(pov-mode .[(3 3)()"Major mode for editing POV-Ray scene files."tar])(tup-mode .[(1 2)()"Major mode for editing files for Tup"single])(bbcode-mode .[(1 1 0)()"Major mode for writing BBCode markup"single])(markup-faces .[(1 0 0)()"collection of faces for markup language modes"single])(flymake-json .[(0 1)((flymake-easy (0 1)))"A flymake handler for json using jsonlint"single])(adoc-mode .[(0 6 2)((markup-faces (1 0 0)))"a major-mode for editing AsciiDoc files in Emacs"single])(hardcore-mode .[(1 0 0)()"Disable arrow keys + optionally backspace and return"single])(spotify .[(0 2)()"Control the spotify application from emacs"single])(buffer-stack .[(1 5)()"Enhanced intelligent switch-to-other-buffer replacement."single])(hlinum .[(1 0)()"Extension for linum.el to highlight current line number"single])(aes .[(0 5)()"Implementation of AES"single])(kpm-list .[(1 0)()"An emacs buffer list that tries to intelligently group together buffers."single])(kwin .[(0 1)()"communcate with the KWin window manager"single])(clj-refactor .[(0 4 2)((s (1 8 0)) (dash (2 4 0)) (yasnippet (0 6 1)) (paredit (22)) (multiple-cursors (1 2 2)))"A collection of clojure refactoring functions"single])(nemerle .[(0 2)()"major mode for editing nemerle programs"single])(ag .[(0 36)()"A front-end for ag ('the silver searcher'), the C ack replacement."single])(nimrod-mode .[(0 1 5)((auto-complete (1 4)))"A major mode for the Nimrod programming language"single])(gnomenm .[(0 0 3)()"Emacs interface to Gnome nmcli command"single])(sequence .[(0 0 1)()"makes sequences of numbers -*- lexical-binding: t -*-"single])(rbenv .[(0 0 3)()"Emacs integration for rbenv"single])(evil .[(1 0 8)((undo-tree (0 6 3)) (goto-last-change (1 2)))"Extensible Vi layer for Emacs."tar])(world-time-mode .[(0 0 2)()"show whole days of world-time diffs"single])(inline-crypt .[(0 1 4)()"Simple inline encryption via openssl"tar])(tagedit .[(1 4 0)((s (1 3 1)) (dash (1 0 3)))"Some paredit-like features for html-mode"single])(vertica .[(0 1 0)((sql (3 0)))"Vertica SQL mode extension"single])(hive .[(0 1 1)((sql (3 0)))"Hive SQL mode extension"single])(smart-window .[(0 6)()"vim-like window controlling plugin"single])(requirejs-mode .[(1 1)()"Improved AMD module management"single])(soothe-theme .[(0 3 16)((emacs (24 1)))"a dark colorful theme for Emacs24."single])(purple-haze-theme .[(20130930 36)((emacs (24 0)))"an overtly purple color theme for Emacs24."single])(gruber-darker-theme .[(0 6)()"Gruber Darker color theme for Emacs 24."single])(rust-mode .[(0 1 0)((cm-mode (0 1 0)))"A major emacs mode for editing Rust source code"single])(framesize .[(0 0 5)((key-chord (0 5 20080915)))"change the size of frames in Emacs"single])(deep-thought-theme .[(0 1 1)()"Emacs 24 theme with the Answer to The Ultimate Question"single])(generate-autoloads .[(0 0 10)()"A package to help you lazy-load everything"single])(lisp-infection .[(0 0 10)()"Commands to *enhance* S-exp editing"single])(backtrace-mode .[(0 0 10)()"A better way to browse /var/log/messages files"single])(tabulated-list .[(0)()"generic major mode for tabulated lists."single])(package .[(1 0)((tabulated-list (0)))"Simple package system for Emacs"single])(ert .[(0)()"Emacs Lisp Regression Testing"single])(macro-utils .[(1 0)()"Utilities for writing macros."single])(nurumacs .[(3 4 1)()"smooth-scrolling and minimap"single])(mark-tools .[(0 3)()"Some simple tools to access the mark-ring in Emacs"single])(weechat .[(0 2)((s (1 3 1)) (cl-lib (0 2)) (emacs (24)) (tracking (1 2)))"Chat via WeeChat's relay protocol in Emacs"tar])(todotxt .[(0 2 3)()"A major mode for editing todo.txt files"single])(toml-mode .[(0 1 3)()"Mojor mode for editing TOML files"single])(git-gutter .[(0 42)()"Port of Sublime Text plugin GitGutter"single])(vimrc-mode .[(0 3 1)()"Major mode for vimrc files"single])(control-lock .[(1 1 2)()"Like caps-lock, but for your control key.  Give your pinky a rest!"single])(fic-ext-mode .[(0 1)()"Show FIXME/TODO/BUG(...) in special face only in comments and strings"single])(cups .[(0 1)()"CUPS features for Emacs"single])(vcard .[(0 1)()"vcard parsing and display routines"single])(babcore .[(0 0 5)()"Core Emacs configuration. This should be the minimum in every emacs config."single])(edebug-x .[(1 2)((dash (1 1 0)))"Extensions for Edebug"single])(cryptol-mode .[(0 0 2)()"Cryptol major mode for Emacs"single])(loop .[(1 1)()"friendly imperative loop structures"single])(tex-smart-umlauts .[(1 2 0)()"Smart umlaut conversion for TeX."single])(ht .[(1 5)()"The missing hash table library for Emacs"single])(flymake-hlint .[(0 2)((flymake-easy (0 1)))"A flymake handler for haskell-mode files using hlint"single])(pinboard .[(0 0 1)()"get stuff from pinboard -*- lexical-binding: t -*-"single])(isea .[(0 0 2)((elpakit (0 0 18)))"interactive server eval at mode, a comint for a daemonized emacs -*- lexical-binding: t -*-"single])(lexbind-mode .[(0 8)()"Puts the value of lexical-binding in the mode line"single])(auto-highlight-symbol .[(1 55)()"Automatic highlighting current symbol minor mode"single])(dot-mode .[(1 12)()"minor mode to repeat typing or commands"single])(paste-kde .[(0 5 1)((web (0 3 6)))"paste text to KDE's pastebin service"single])(sackspace .[(0 8 2)()"A better backspace"single])(main-line .[(1 2 8)()"modeline replacement forked from an early version of powerline.el"single])(show-css .[(1 1)()"Show the css of the html attribute the cursor is on"single])(supergenpass .[(0 1)()"SuperGenPass for Emacs"single])(with-namespace .[(1 1)()"Poor-man's namespaces for elisp"single])(flymake-haskell-multi .[(0 3)((flymake-easy (0 1)))"Syntax-check haskell-mode using both ghc and hlint"tar])(proc-net .[(0 0 1)()"network process tools"single])(drupal-spell .[(0 2 2)()"Aspell extra dictionary for Drupal"tar])(everything .[(0 1 5)()"Bridge to MS Windows desktop-search engine Everything"single])(thread-dump .[(1 0)()"java thread dump viewer"single])(bitly .[(1 0)()"Shorten URLs using the bitly.com shortener service"single])(grapnel .[(0 5 3)()"HTTP request lib with flexible callback dispatch"single])(tumble .[(1 5)()"an Tumblr mode for Emacs"single])(batch-mode .[(1 0)()"major mode for editing ESRI batch scrips"single])(rubyinterpol .[(0 1)()"Ruby-like String Interpolation for format"single])(smartparens .[(1 6 1)((cl-lib (0 1)) (dash (2 3 0)))"Automatic insertion, wrapping and paredit-like navigation with user defined pairs."tar])(latest-clojars .[(0 3)()"Clojure dependency resolver"single])(helm-gtags .[(0 9 2)((helm (1 0)))"GNU GLOBAL helm interface"single])(git-gutter-fringe .[(0 12)((git-gutter (0 42)) (fringe-helper (0 1 1)))"Fringe version of git-gutter.el"single])(center-text .[(0 8)()"Center the text in a fixed-width column"single])(ert-x .[(0)((ert (0)))"Staging area for experimental extensions to ERT"single])(clj-mode .[(0 9)()"basic Major mode (clj) for Clojure code"single])(color-theme-heroku .[(1 0 0)()"Heroku color theme"single])(ruby-hash-syntax .[(0 3)()"Toggle ruby hash syntax between classic and 1.9 styles"single])(psgml .[(1 4 1)()"Lennart Staflin's Psgml package, with Elisp syntax and sgml-validate fixed for Emacsen >=24."tar])(swarmhacker .[(0 0 1)()"simple swarm chat"single])(theme-changer .[(2 1 0)()"Sunrise/Sunset Theme Changer for Emacs"single])(ttrss .[(1 7 5)((emacs (23 1)))"Tiny Tiny RSS elisp bindings"single])(emacs-droid .[(0 0 0)()"Android application development tools for Emacs"single])(github-browse-file .[(0 2 1)()"View the file you're editing on GitHub"single])(sea-before-storm-theme .[(0 3)()"Sea Before Storm color theme for Emacs 24"single])(letcheck .[(0 2)()"Check the erroneous assignments in let forms"single])(clippy .[(1 0)((pos-tip (1 0)))"Show tooltip with function documentation at point"single])(wacspace .[(0 4 1)((dash (1 2 0)) (cl-lib (0 2)))"The WACky WorkSPACE manager for emACS"tar])(kanban .[(0 1 2)()"Parse org-todo headlines to use org-tables as Kanban tables"single])(flymake-elixir .[(0 5)()"A flymake handler for elixir-mode .ex files.     "single])(surround .[(0 1)()"emulate surround.vim from Vim"single])(marmalade-service .[(2 0 9)((dash (1 1 0)) (s (1 6 0)) (elnode (0 9 9 6 10)))"The Marmalade package store service."tar])(suomalainen-kalenteri .[(2013 4 18)()"Finnish national and Christian holidays for calendar"tar])(rubocop .[(0 3)((dash (1 0 0)))"An Emacs interface for RuboCop"single])(lispyscript-mode .[(0 3 0)()"Major mode for LispyScript code."single])(indent-guide .[(1 0 1)()"show vertical lines to guide indentation"single])(toxi-theme .[(0 1 0)()"REQUIRES EMACS 24"single])(simplezen .[(0 1 1)()"A simple subset of zencoding-mode for Emacs."single])(company-cmake .[(0 1)((company (0 6 8)))"company-mode completion back-end for CMake"single])(helm-ag .[(0 4)((helm (1 0)))"the silver search with helm interface"single])(better-defaults .[(0 1 2)()"Fixing weird quirks and poor defaults"single])(typing-practice .[(0 1)()"Typing practice"single])(helm-projectile .[(0 10 0)((helm (1 4 0)) (projectile (0 10 0)))"Helm integration for Projectile"single])(perlbrew .[(0 1)((cl (0)))"basic support for perlbrew environments"single])(paredit-everywhere .[(0 3)((paredit (22)))"Enable some paredit features in non-lisp buffers"single])(string-edit .[(0 1 0)((dash (1 2 0)))"Avoid escape nightmares by editing string in separate buffer"single])(flycheck-color-mode-line .[(0 3)((flycheck (0 15)) (dash (1 2)) (emacs (24 1)))"Change mode line color with Flycheck status -*- lexical-binding: t -*-"single])(angular-snippets .[(0 2 3)((s (1 4 0)) (dash (1 2 0)))"Yasnippets for AngularJS"tar])(command-stats .[(0 1)()"Track frequency of commands executed in emacs"single])(stripe-buffer .[(0 2 2)((cl-lib (1 0)))"Use a different background for even and odd lines"single])(sparql-mode .[(0 7 2)()"Edit and interactively evaluate SPARQL queries."single])(butler .[(0 2 0)((deferred (3 1)) (json (1 2)))"Emacs client for Jenkins"tar])(theme-park-mode .[(0 1 2)()"Take your themes for a ride!"single])(colour-region .[(0 4)()"Toggle regions of the buffer with different text snippets"single])(org-dotemacs .[(0 3)((org (7 9 3)) (cl-lib (1 0)))"Store your emacs config as an org file, and choose which bits to load."single])(fm .[(20130612 1)()"follow mode for compilation/output buffers"single])(bs-ext .[(0 2)()"Extensions to emacs buffer-selection library (bs.el)"single])(look-mode .[(1 0)()"quick file viewer for image and text file browsing"single])(look-dired .[(0 1)((look-mode (1 0)))"Extensions to look-mode for dired buffers"single])(dired-dups .[(0 3)()"Find duplicate files and display them in a dired buffer"single])(nzenburn-theme .[(20130513)()"A low contrast color theme for Emacs."single])(noflet .[(0 0 10)()"locally override functions"single])(simple-call-tree+ .[(1 3)()"Extensions to simple-call-tree"single])(eviews .[(0 1)()"Major-mode for editing eviews program files"single])(bbdb-ext .[(0 1)((bbdb (2 36)))"Extra commands for BBDB"single])(bar-cursor .[(1 1)()"package used to switch block cursor to a bar"single])(s-buffer .[(0 0 4)((s (1 6 0)) (noflet (0 0 3)))"s operations for buffers"single])(nodejs-repl .[(0 0 2 1)()"Run Node.js REPL"single])(fuzzy-format .[(0 1 1)()"select indent-tabs-mode and format code automatically."single])(psvn .[(1 1 1)()"Subversion interface for emacs"single])(javarun .[(0 1 1)()"Minor mode for quick development of Java programs"single])(slough .[(0 1)((nrepl (0 1 7)) (smartparens (1 4 3)))"package for slough - this is for a secret TW thing"single])(express .[(0 6 0)((string-utils (0 3 2)))"Alternatives to `message'"single])(fullscreen-mode .[(0 0 1)()"fullscreen window support for Emacs"single])(current-story .[(0 1 0)()"Track and insert current Pivotal Tracker"single])(kmacro-decision .[(1 5)((el-x (1 0)) (jb-misc-macros (0 2)))"Add conditional branching to keyboard macros"single])(jedi .[(0 1 2)((epc (0 1 0)) (auto-complete (1 4)))"Python auto-completion for Emacs"tar])(request .[(0 2 0)()"Compatible layer for URL request in Emacs"single])(request-deferred .[(0 2 0)((deferred (0 3 1)) (request (0 2 0)))"Wrap request.el by deferred"single])(show-marks .[(0 4)((fm (1 0)))"Navigate and visualize the mark-ring"single])(irfc .[(0 5 6)()"Interface for IETF RFC document."single])(apt-utils-ido .[(0 2)((apt-utils (1 212)))"Ido commands for apt-utils"single])(apt-utils .[(1 212)()"Emacs interface to APT (Debian package management)"single])(emms-mark-ext .[(0 3)((emms (3 0)))"Extra functions for emms-mark-mode and emms-tag-edit-mode"single])(emamux .[(0 1)()"Interact with tmux"single])(mustache .[(0 20)((ht (0 9)) (s (1 3 0)) (dash (1 2 0)))"a mustache templating library in emacs lisp"tar])(esup .[(0 3)()"the Emacs StartUp Profiler (ESUP)"single])(subatomic-enhanced-theme .[(20130226 2229)()"Nice looking emacs 24 theme"single])(highlight-escape-sequences .[(0 1)()"Highlight escape sequences -*- lexical-binding: t -*-"single])(mode-icons .[(0 1 0)()"Show icons for modes"tar])(shorten .[(0 3)()"component-wise string shortener"single])(desktop-registry .[(1 1 0)()"Keep a central registry of desktop files -*- lexical-binding: t -*-"single])(org-journal .[(1 4 6)()"a simple org-mode based journaling mode"single])(editorconfig .[(0 2)()"EditorConfig Emacs extension"single])(handlebars-sgml-mode .[(0 1 0)()"Add Handlebars contextual indenting support to sgml-mode"single])(flymake-less .[(0 3)((less-css-mode (0 15)))"Flymake handler for LESS stylesheets (lesscss.org)"single])(sawfish .[(1 32)()"Sawfish mode."single])(ob-sml .[(0 1)((sml-mode (6 4)))"org-babel functions for template evaluation"single])(dired-efap .[(0 8)()"Edit Filename At Point in a dired buffer"single])(occur-x .[(0 1 1)()"Extra functionality for occur"single])(scrolloff .[(1 0)()"This mode ofers vim-like scrolloff function"single])(issue-tracker .[(0 0 1)()"Poor man's issue tracker"tar])(ido-gnus .[(0 4)((gnus (5 13)))"Access gnus groups or servers using ido"single])(command-t .[(0 0 1)((find-file-in-project (3 2)) (popwin (0 4)))"Finds file in project using fuzzy search."single])(hide-lines .[(20130623 1701)()"Commands for hiding lines based on a regexp"single])(syslog-mode .[(2 2)((hide-lines (20130623)))"Major-mode for viewing log files"single])(jb-misc-macros .[(0 4)((macro-utils (1 0)))"Miscellaneous macros"single])(man-commands .[(1 1)()"Add interactive commands for every manpages installed in your computer."single])(cloud-to-butt-erc .[(1 0 0)()"Replace 'the cloud' with 'my butt'"single])(pager-default-keybindings .[(1 1)()"Add the default keybindings suggested for pager.el"single])(hook-utils .[(1 0)()"Add a few utility functions for manipulating hooks"single])(occur-default-current-word .[(1 0)()"Have M-x occur default to the word at point"single])(scratch-persist .[(1 1)()"persist the scratch buffer across sessions"single])(company-inf-ruby .[(0 2)((company (0 6 10)) (inf-ruby (2 2 7)))"company-mode completion back-end for inf-ruby"single])(frame-restore .[(0 4)((dash (1 2)) (f (0 11)) (emacs (24 1)))"Restore Emacs frame -*- lexical-binding: t; -*-"single])(debian-changelog-mode .[(1 96)()"major mode for Debian changelog files."single])(sourcetalk .[(1 1 0)((request (0 2 0)))"SourceTalk (http://sourcetalk.net) plugin for Emacs"single])(chm-view .[(0 2 2)()"View CHM file."single])(org-trello .[(0 2 6)((org (8 0 7)) (dash (1 5 0)) (request (0 2 0)) (cl-lib (0 3 0)) (json (1 2)) (elnode (0 9 9 7 6)) (esxml (0 3 0)) (s (1 7 0)) (kv (0 0 17)))"Org minor mode to synchronize with trello"tar])(clues-theme .[(20130908 801)((emacs (24 0)))"an Emacs 24 theme which may well be fully awesome..."single])(remember-theme .[(20131215 441)()"Remembers the last theme in use and re-loads for the next session."single])(assemblage-theme .[(20130715 621)()"a dark theme for Emacs 24"single])(parscope .[(0 1 0)()"Minor mode for showing the current scope in Lisp-like languages."single])(grizzl .[(0 1 1)((cl-lib (0 1)))"Fuzzy Search Library & Completing Read"tar])(flx .[(0 1)()"fuzzy matching with good sorting"single])(flx-ido .[(0 2)((flx (0 1)))"flx integration for ido"single])(parenface1.1 .[(1 1)()"Provide a face for parens in lisp modes."single])(git-gutter-fringe+ .[(0 0 2)((git-gutter+ (0 1)) (fringe-helper (20130519 1641)))"Fringe version of git-gutter+.el"single])(fringe-helper .[(1 0 1)()"helper functions for fringe bitmaps"single])(org-protocol-jekyll .[(0 1)()"Jekyll's handler for org-protocol"single])(gandalf-theme .[(0 1)()"Gandalf color theme"single])(processing-mode .[(1 2 1)()"Major mode for Processing 2.0"single])(gitconfig .[(1 0 0)()"Emacs lisp interface to work with git-config variables"single])(processing-snippets .[(1 0 0)((yasnippet (0 8 0)))"Snippets for the Processing major mode"tar])(rings .[(1 0 1)()"Buffer rings. Like tabs, but better."single])(modtime-skip-mode .[(0 9)()"Minor mode for disabling modtime and supersession checks on files."single])(web-mode .[(7 0 79)()"major mode for editing html templates"single])(nrepl-decompile .[(0 0 1)((nrepl (0 1 7)) (javap-mode (9)))"decompilation extension for nrepl.el"single])(pickup .[(0 0 3)()"pickup file. "single])(cubicle-mode .[(0 1)()"Cubicle major mode for emacs"single])(py-import-check .[(0 2)()"Finds the unused python imports using importchecker"single])(palimpsest .[(0 8)()"Various deletion strategies when editing"single])(flymake-puppet .[(1 0 0)((flymake-easy (0 9)))"An Emacs flymake handler for syntax-checking puppet using puppet-lint"single])(sparkline .[(0 3 0)()"Make sparkline images from a list of numbers"single])(wedge-ws .[(0 1 2)()"Wedge whitespace between columns in text"tar])(emmet-mode .[(1 0 5)()"Unofficial Emmet's support for emacs"single])(helm-delicious .[(1 3)()"helm extensions for delicious bookmarks"single])(tsql .[(1 0)()"customizes sql.el for T-SQL"single])(wisp-mode .[(0 1 2)()"Major mode for editing wisp: Whitespace-to-Lisp"single])(heroku-theme .[(1 1 0)()"Heroku color theme"single])(god-mode .[(2 10 1)()"God-like command entering minor mode"single])(helm-recoll .[(20130905 2330)((helm (1 5 4)))"helm interface for the recoll desktop search tool."single])(tronesque-theme .[(1 3)()"Color Theme based on Tron universe."single])(magit-tramp .[(0 1 0)((magit (1 2 0)))"git method for TRAMP"single])(aok .[(0 1)()"various useful ways to do `multi-occur'"single])(discord .[(0 5)()"Discordian dates for calendar"single])(pkg-info .[(0 4)((dash (1 6 0)) (epl (0 4)))"Information about packages       -*- lexical-binding: t; -*-"single])(dash-functional .[(1 0 0)((dash (2 0 0)) (emacs (24)))"Collection of useful combinators for Emacs Lisp  -*- lexical-binding: t -*-"single])(flycheck-cask .[(0 1)((flycheck (0 14)) (dash (2 0 0)) (f (0 6 0)))"Cask support in Flycheck -*- lexical-binding: t; -*-"single])(openstack-cgit-browse-file .[(0 2)()"Browse the current file in OpenStack cgit"single])(smtpmail-multi .[(0 6)()"Use different smtp servers for sending mail"single])(figlet .[(289)()"banner generator"single])(smart-whitespace-comment-fixup .[(1 0)()"Enables advice around yanking/killing lines that auto-indents and formats properly"single])(insert-shebang .[(0 9 2)()"Inserts shebang line automatically"tar])(tox .[(0 1)()"Launch current python test with tox."single])(winpoint-ignore-dired .[(1 1)((winpoint (1 0)))"Have winpoint ignore dired-mode buffers"single])(comint-better-defaults .[(1 0)()"better defaults for comint-derived modes"single])(waher-theme .[(20130917 7)((emacs (24 1)))"Emacs 24 theme based on waher for st2 by dduckster"single])(gerrit-download .[(0 2)((magit (20130828 1540)))"Show gerrit reviews in a diff buffer."single])(multi .[(2 0 1)((emacs (24)))"Clojure-style multi-methods for emacs lisp -*- lexical-binding: t -*-"single])(evil-indent-textobject .[(0 2)((evil (0)))"evil textobjects based on indentation"single])(git-gutter+ .[(0 1)((git-commit-mode (1 0)))"Manage Git hunks straight from the buffer"single])(helm-helm-commands .[(0 2)((helm (1 5 4)))"List all helm commands with helm"single])(jujube-theme .[(0 1)()"Pastel theme loosely based on jellybeans"single])(wonderland .[(0 1 1)((dash (2 0 0)) (dash-functional (1 0 0)) (multi (2 0 0)) (emacs (24)))"declarative configuration for Emacsen -*- lexical-binding: t -*-"single])(simple-httpd .[(1 4 4)()"pure elisp HTTP server"single])(elfeed .[(1 0 1)((emacs (24 1)))"an Emacs web feed reader"tar])(elfeed-web .[(1 0 1)((simple-httpd (1 4 3)) (elfeed (1 0 1)) (emacs (24 1)))"web interface to Elfeed"tar])(skewer-mode .[(1 5 3)((simple-httpd (1 4 0)) (js2-mode (20090723)))"live browser JavaScript, CSS, and HTML interaction"tar])(zone-matrix .[(0 0 1)()"Matrix themed Zone mode"tar])(shell-pop .[(0 3)()"helps you to use shell easily on Emacs. Only one key action to work."single])(awk-it .[(0 77)()"Run AWK interactively on region!"single])(osx-pseudo-daemon .[(1 0)()"Daemon mode that plays nice with OSX."single])(f .[(0 11 0)((s (1 7 0)) (dash (2 2 0)))"Modern API for working with files and directories"single])(whitespace-cleanup-mode .[(0 8)()"Intelligently call whitespace-cleanup on save"single])(isgd .[(20130927)()"Shorten URLs using the isgd.com shortener service"single])(java-file-create .[(1 0)()"automatically insert contents of empty java files"single])(ac-geiser .[(0 1)((geiser (0 5)) (auto-complete (1 4)))"Auto-complete backend for geiser"tar])(iasm-mode .[(0 1)()"interactive assembly major mode."single])(ample-zen-theme .[(0 2)()"AmpleZen Theme for Emacs 24"single])(tommyh-theme .[(1 2)()"A bright, bold-colored theme for emacs."single])(pbcopy .[(0 1 0)()"OS X clipboard integration for Emacs"single])(timestamper .[(0 1 0)()"A minor mode for easy timelogging"single])(tbemail .[(0 2)()"Provide syntax highlighting for email editing via"single])(evil-matchit .[(1 2 4)()"Vim matchit ported into Emacs (requires EVIL)"tar])(ruby-end .[(0 3 1)()"Automatic insertion of end blocks for Ruby"single])(dpaste_de .[(0 2)((web (0 3 7)))"Emacs mode to paste to dpaste.de"single])(skewer-less .[(0 2)((skewer-mode (1 5 3)))"Skewer support for live LESS stylesheet updates"single])(sensitive .[(1 0 1)((emacs (24)) (sequences (0 1 0)))"A dead simple way to load sensitive information"single])(sequences .[(0 1 0)((emacs (24)))"Ports of some Clojure sequence functions."single])(epl .[(0 4)((cl-lib (0 3)))"Emacs Package Library -*- lexical-binding: t; -*-"single])(magit-find-file .[(1 0 4)((magit (1 2 0)))"completing-read over all files in Git"single])(anzu .[(0 22)()"Show number of matches in mode-line while searching"single])(list-register .[(2 2)()"List register"single])(project-explorer .[(0 10 1)((cl-lib (0 3)) (es-lib (0 3)))"A project explorer sidebar -*- lexical-binding: t -*-"single])(charmap .[(0 0 1)()"Unicode table for Emacs"single])(latex-preview-pane .[(20131020)()"Makes LaTeX editing less painful by providing a updatable preview pane"tar])(latest-clojure-libraries .[(0 5)()"Clojure dependency resolver"single])(proxy-mode .[(0 9)()"Provides proxy minor mode."single])(lyskom .[(20131008)()"LysKOM elisp client."single])(el-init .[(20130416)()"Loader for configuration files"tar])(relax .[(0 2)((json (1 2)))"For browsing and interacting with CouchDB"single])(immutant-server .[(1 0 0)()"Run your Immutant server in Emacs"single])(ac-inf-ruby .[(0 4)((inf-ruby (2 3 2)) (auto-complete (1 4)))"Enable auto-complete in inf-ruby sessions"single])(json-snatcher .[(1 0)()"Grabs the path to JSON values in a JSON file."single])(nrepl-discover .[(0 0 1)()"Client to load commands from nrepl server"single])(ido-vertical-mode .[(0 1 1)()"Makes ido-mode display vertically."single])(minitest .[(0 5)((dash (1 0 0)))"An Emacs mode for ruby minitest files"single])(livid-mode .[(0 1 0)((skewer-mode (1 5 3)) (s (1 8 0)))"Live browser eval of JavaScript every time a buffer changes"single])(bert .[(0 1)()"BERT serialization library for Emacs"single])(ariadne .[(0 1)((bert (0 1)))"Ariadne plugin for Emacs"single])(prognth .[(1 0)()"Extend prog1 to arbitrary index"single])(free-keys .[(0 1)((cl-lib (0 3)))"Show free keybindings for modkeys or prefixes"single])(troncle .[(0 1 2)((nrepl (0 2 0)))"Emacs convenience functions for tracing clojure code"single])(tdd-status-mode-line .[(0 1 2)()"TDD status on the mode-line"single])(elixir-mix .[(0 3 0)()"Emacs integration for Elixir's mix"single])(zeal-at-point .[(0 0 3)()"Search the word at point with Zeal"single])(flycheck-hdevtools .[(0 2)((flycheck (0 15)))"A flycheck checker for Haskell using hdevtools"single])(ix .[(0 7)((grapnel (0 5 3)))"Emacs client for http://ix.io pastebin"single])(column-enforce-mode .[(1 0 3)()"Highlight text that extends beyond a  column"single])(pinboard-api .[(0 1)()"Rudimentary http://pinboard.in integration"single])(flycheck-ledger .[(0 2)((flycheck (0 15)))"Flycheck integration for ledger files"single])(gvpr-mode .[(0 1 0)()"A major mode offering basic syntax coloring for gvpr scripts."single])(telepathy .[(0 1)()"Access Telepathy from Emacs"single])(org-gnome .[(0 1)((notify (2010 8 20)) (telepathy (0 1)))"Orgmode integration with the GNOME desktop"single])(flymake-racket .[(0 40)((flymake-easy (0 1)))"A flymake handler for scheme-mode files"single])(dakrone-theme .[(0 0 2)()"dakrone's custom dark theme"single])(cider .[(0 4 0)((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 3)))"Clojure Integrated Development Environment and REPL"tar])(geiser .[(0 5)()"GNU Emacs and Scheme talk to each other"tar])(puppet-mode .[(0 2)()"A simple mode for editing puppet manifests"single])(groovy-mode .[(20131129)()"Groovy mode derived mode"single])(ido-select-window .[(0 1 0)()"Select a window using ido and buffer names."tar])(bubbleberry-theme .[(0 1 2)((emacs (24 1)))"A theme based on LightTable for Emacs24"single])(go-mode .[(20131222)()"Major mode for the Go programming language"single])(gnus-summary-ext .[(0 1)((macro-utils (1 0)))"Extra limit and process mark commands for the gnus summary buffer"single])(clojure-mode .[(2 1 1)()"Major mode for Clojure code"single])(goto-chg .[(1 6)()"goto last change"single]))
\ No newline at end of file
diff --git a/elpa/archives/melpa/archive-contents b/elpa/archives/melpa/archive-contents
new file mode 100644
index 000000000..9f21aa941
--- /dev/null
+++ b/elpa/archives/melpa/archive-contents
@@ -0,0 +1,2 @@
+
+(1 (zotelo . [(20130428 604) nil "Manage Zotero collections from emacs" single]) (zossima . [(20121123 1635) ((inf-ruby (2 2 3))) "Ruby from Emacs" tar]) (zoom-frm . [(20131227 212) ((frame-fns (0)) (frame-cmds (0))) "Commands to zoom frame font size." single]) (znc . [(20130811 2058) ((cl-lib (0 2)) (erc (5 3))) "ZNC + ERC" single]) (zlc . [(20130427 43) nil "Provides zsh like completion system to Emacs" single]) (zencoding-mode . [(20111230 2020) nil "Unfold CSS-selector-like expressions to markup" single]) (zenburn-theme . [(20131228 1447) nil "A low contrast color theme for Emacs." single]) (zen-and-art-theme . [(20120622 737) nil "zen and art color theme for GNU Emacs 24" single]) (zeitgeist . [(20120211 1210) nil "No description available." single]) (zeal-at-point . [(20131210 503) nil "Search the word at point with Zeal" single]) (yaxception . [(20130430 1527) nil "provide framework about exception like Java for elisp" single]) (yasnippet . [(20131224 143) nil "Yet another snippet extension for Emacs." tar]) (yascroll . [(20130320 1134) nil "Yet Another Scroll Bar Mode" single]) (yari . [(20131207 511) nil "Yet Another RI interface for Emacs" single]) (yard-mode . [(20130402 1727) nil "Minor mode for Ruby YARD comments" single]) (yaoddmuse . [(20130225 1711) nil "Yet another oddmuse for Emacs" single]) (yaml-mode . [(20130310 2101) nil "Major mode for editing YAML files" single]) (yalinum . [(20130217 243) nil "yet another display line numbers." single]) (yagist . [(20131025 140) ((json (1 2 0))) "Yet Another Emacs integration for gist.github.com" single]) (xterm-frobs . [(20091211 1555) nil "manipulate xterm when running emacs in tty mode" single]) (xmlgen . [(20130219 219) nil "A DSL for generating XML." single]) (xml-rpc . [(20130423 1356) nil "An elisp implementation of clientside XML-RPC" single]) (xcscope . [(20131102 1402) nil "cscope interface for (X)Emacs" single]) (x-dict . [(20091203 1023) nil "emacs interface for several online dictionaries" single]) (writeroom-mode . [(20130315 1207) nil "Minor mode for distraction-free writing" tar]) (writegood-mode . [(20130408 718) nil "Polish up poor writing on the fly" single]) (wrap-region . [(20130528 2228) ((dash (1 0 3))) "Wrap text with punctation or tag" single]) (world-time-mode . [(20130331 1829) nil "show whole days of world-time diffs" single]) (workgroups2 . [(20131224 657) nil "New workspaces for Emacs" tar]) (workgroups . [(20110726 941) nil "workgroups for windows (for Emacs)" single]) (wonderland . [(20130912 1819) ((dash (2 0 0)) (dash-functional (1 0 0)) (multi (2 0 0)) (emacs (24))) "declarative configuration for Emacsen" single]) (with-namespace . [(20130407 1122) ((dash (1 1 0)) (loop (1 1))) "interoperable elisp namespaces" single]) (wisp-mode . [(20130828 720) ((clojure-mode (0))) "Major mode for Wisp code." single]) (winpoint . [(20131023 1013) nil "Remember buffer positions per-window, not per buffer" single]) (windsize . [(20110728 1336) nil "Simple, intuitive window resizing" single]) (window-numbering . [(20130902 930) nil "Numbered window shortcuts" single]) (window-number . [(20100803 1327) nil "Select windows by numbers" single]) (window-layout . [(20130805 1854) nil "window layout manager" single]) (window-jump . [(20130224 114) nil "Move left/right/up/down through your windows." single]) (window-end-visible . [(20131106 706) nil "Find the last visible point in a window" single]) (window+ . [(20131227 211) nil "Extensions to `window.el'." single]) (win-switch . [(20130202 937) nil "fast, dynamic bindings for window-switching/resizing" single]) (wimpy-del . [(20131227 211) nil "Require confirmation for large region deletion." single]) (wiki-nav . [(20131106 706) ((button-lock (1 0 0)) (nav-flash (1 0 0))) "Simple file navigation using [[WikiStrings]]" single]) (wiki . [(20120807 1458) nil "hypertext authoring the WikiWay" single]) (widget-mvc . [(20130430 757) nil "MVC framework for the emacs widgets" single]) (wide-n . [(20131227 210) nil "Cycle among buffer restrictions" single]) (wide-column . [(20120814 112) nil "Calls functions dependant on column position." single]) (wid-edit+ . [(20131227 210) nil "Extensions to standard library `wid-edit.el'." single]) (whole-line-or-region . [(20110901 130) nil "operate on current line if region undefined" single]) (whitespace-cleanup-mode . [(20131205 1117) nil "Intelligently call whitespace-cleanup on save" single]) (wgrep-helm . [(20121201 530) ((wgrep (2 1 1))) "Writable helm-grep-mode buffer and apply the changes to files" single]) (wgrep-ag . [(20131209 659) ((wgrep (2 1 5))) "Writable ag buffer and apply the changes to files" single]) (wgrep-ack . [(20121201 530) ((wgrep (2 1 1))) "Writable ack-and-a-half buffer and apply the changes to files" single]) (wgrep . [(20131209 659) nil "Writable grep buffer and apply the changes to files" single]) (weechat . [(20131117 358) ((s (1 3 1)) (cl-lib (0 2)) (emacs (24)) (tracking (1 2))) "Chat via WeeChat's relay protocol in Emacs" tar]) (wedge-ws . [(20130930 647) nil "Wedge whitespace between columns in text" single]) (websocket . [(20131224 618) nil "Emacs WebSocket client and server" single]) (weblogger . [(20110926 918) ((xml-rpc (1 6 8))) "Weblog maintenance via XML-RPC APIs" single]) (web-mode . [(20131228 1439) nil "major mode for editing html templates" tar]) (web-beautify . [(20131118 226) nil "Format HTML, CSS and JavaScript/JSON by js-beautify" single]) (web . [(20130827 512) nil "useful HTTP client" single]) (weather-metno . [(20131228 1128) ((emacs (24))) "Weather data from met.no in Emacs" tar]) (wcheck-mode . [(20130613 808) nil "General interface for text checkers" single]) (wc-mode . [(20120531 1344) nil "show wc-like information in status bar" single]) (watch-buffer . [(20120331 1344) nil "run a shell command when saving a buffer" single]) (wakatime-mode . [(20131223 617) nil "Automatic time tracking extension based on WakaTime" single]) (wacspace . [(20130726 1007) ((dash (1 2 0)) (cl-lib (0 2))) "The WACky WorkSPACE manager for emACS" tar]) (w3m . [(20131203 1429) nil "an Emacs interface to w3m" tar]) (w32browser-dlgopen . [(20131227 209) nil "Use w32browser with standard Windows Open File box." single]) (w32-browser . [(20131227 208) nil "Run Windows application associated with a file." single]) (volatile-highlights . [(20130321 641) nil "Minor mode for visual feedback on some operations." single]) (vline . [(20120108 1245) nil "show vertical line (column highlighting) mode." single]) (vlf . [(20131217 1404) nil "View Large Files" single]) (vkill . [(20091203 1022) nil "view and kill Unix processes from within Emacs" single]) (visual-regexp-steroids . [(20131217 854) ((visual-regexp (0 5))) "Extends visual-regexp to support other regexp engines" tar]) (visual-regexp . [(20131217 857) ((cl-lib (0 2))) "A regexp/replace command for Emacs with interactive visual feedback" single]) (visible-mark . [(20080221 651) nil "Make marks visible." single]) (virtualenvwrapper . [(20131120 1008) ((dash (1 5 0)) (s (1 6 1))) "a modern virtualenv tool for Emacs" single]) (virtualenv . [(20120930 1034) nil "Virtualenv for Python" single]) (vimrc-mode . [(20130228 1244) nil "Major mode for vimrc files" single]) (vimgolf . [(20120228 550) nil "VimGolf interface for the One True Editor" single]) (vim-region . [(20131214 747) nil "Select region as vim" single]) (viewer . [(20130314 2337) nil "View-mode extension" single]) (vertica . [(20131217 711) ((sql (3 0))) "Vertica SQL mode extension" single]) (vector-utils . [(20131106 706) nil "Vector-manipulation utility functions" single]) (vcomp . [(20121231 248) nil "compare version strings" single]) (vcl-mode . [(20121129 1314) nil "Syntax highlighting for Varnish Command Language" single]) (vc-osc . [(20120910 211) nil "non-resident support for osc version-control" single]) (vc-darcs . [(20090617 1105) nil "a VC backend for darcs" single]) (vc-check-status . [(20130814 522) nil "Warn you when quitting emacs and leaving repo dirty." tar]) (vagrant . [(20130808 618) nil "Manage a vagrant box from emacs" single]) (uuid . [(20120910 151) nil "UUID's for EmacsLisp" single]) (use-package . [(20131216 954) ((bind-key (1 0)) (diminish (0 44))) "A use-package declaration for simplifying your .emacs" single]) (usage-memo . [(20110722 1551) nil "integration of Emacs help system and memo" single]) (url-shortener . [(20131218 353) nil "shorten long url and expand tinyurl" single]) (unicode-whitespace . [(20131122 1001) ((ucs-utils (0 7 6)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "teach whitespace-mode about fancy characters" single]) (unicode-progress-reporter . [(20131106 706) ((emacs (24 1 0)) (ucs-utils (0 7 6)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Progress-reporter with fancy characters" single]) (unicode-fonts . [(20131122 1001) ((font-utils (0 7 0)) (ucs-utils (0 7 6)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Configure Unicode fonts" single]) (unicode-enbox . [(20131122 1000) ((string-utils (0 3 2)) (ucs-utils (0 7 6)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Surround a string with box-drawing characters" single]) (unfill . [(20131103 213) nil "The inverse of fill-paragraph and fill-region" single]) (undohist . [(20110331 1623) nil "Persistent Undo History for GNU Emacs" single]) (undo-tree . [(20131118 1744) nil "Treat undo history as a tree" single]) (underwater-theme . [(20131117 1602) nil "A gentle, deep blue color theme" single]) (uncrustify-mode . [(20130707 659) nil "Minor mode to automatically uncrustify." single]) (ukrainian-holidays . [(20130720 649) nil "Ukrainian holidays for Emacs calendar." single]) (ujelly-theme . [(20131211 1552) nil "Ujelly theme for GNU Emacs 24 (deftheme)" single]) (ucs-utils . [(20131122 1636) ((persistent-soft (0 8 8)) (pcache (0 2 3)) (list-utils (0 4 2))) "Utilities for Unicode characters" tar]) (ucs-cmds . [(20131227 204) nil "Macro to create commands that insert Unicode chars." single]) (typo . [(20130323 340) nil "Minor mode for typographic editing" single]) (typing . [(20121026 2118) nil "The Typing Of Emacs" single]) (twittering-mode . [(20131211 1017) nil "Major mode for Twitter" single]) (twilight-theme . [(20120412 603) nil "Twilight theme for GNU Emacs 24 (deftheme)" single]) (twilight-bright-theme . [(20130605 143) nil "A Emacs 24 faces port of the TextMate theme" single]) (twilight-anti-bright-theme . [(20120713 316) nil "A soothing Emacs 24 light-on-dark theme" single]) (twig-mode . [(20130220 1050) nil "A major mode for twig" single]) (tup-mode . [(20131009 2213) nil "Major mode for editing files for Tup" single]) (tumblesocks . [(20131104 1917) ((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1))) "An Emacs tumblr client." tar]) (tumble . [(20130327 1007) ((http-post-simple (0))) "an Tumblr mode for Emacs" single]) (tuareg . [(20131112 447) ((caml (3 12 0 1))) "OCaml mode for Emacs." tar]) (ttrss . [(20130409 1049) ((emacs (23 1))) "Tiny Tiny RSS elisp bindings" single]) (tt-mode . [(20130804 410) nil "Emacs major mode for editing Template Toolkit files." single]) (tss . [(20131120 906) ((auto-complete (1 4 0)) (json-mode (1 1 0)) (log4e (0 2 0)) (yaxception (0 1))) "provide a interface for auto-complete.el/flymake.el on typescript-mode." tar]) (truthy . [(20131106 706) ((list-utils (0 4 2))) "Test the content of a value" single]) (tronesque-theme . [(20130822 1536) nil "Color Theme based on Tron universe." single]) (trident-mode . [(20130726 1207) ((emacs (24)) (slime (20130526)) (skewer-mode (1 5 0)) (dash (1 0 3))) "Live Parenscript interaction" single]) (tree-mode . [(20121207 1538) nil "A mode to manage tree widgets" single]) (tracwiki-mode . [(20131026 2205) ((xml-rpc (1 6 8))) "Emacs Major mode for working with Trac" single]) (tracking . [(20131201 620) ((shorten (0 1))) "Buffer modification tracking" single]) (toxi-theme . [(20130418 1239) ((emacs (24))) "A dark color theme by toxi" single]) (tox . [(20130925 731) nil "Launch current python test with tox" single]) (top-mode . [(20130605 1739) nil "run \"top\" from emacs" single]) (tool-bar+ . [(20131227 203) nil "Extensions to standard library tool-bar.el" single]) (tommyh-theme . [(20131004 1630) nil "A bright, bold-colored theme for emacs" single]) (toml-mode . [(20130302 748) nil "Mojor mode for editing TOML files" single]) (toml . [(20130903 555) nil "TOML (Tom's Obvious, Minimal Language) parser" single]) (tomatinho . [(20130824 943) nil "Tomatinho" tar]) (todotxt . [(20130527 851) nil "A major mode for editing todo.txt files" single]) (todochiku . [(20120202 2005) nil "A mode for interfacing with Growl, Snarl, and the like." single]) (tmmofl . [(20121025 401) nil "Calls functions dependant on font lock highlighting at point" single]) (tiny . [(20131224 433) nil "Quickly generate linear ranges in Emacs" single]) (time-ext . [(20130130 2151) nil "more function for time/date" single]) (tidy . [(20111222 1756) nil "Interface to the HTML Tidy program" single]) (thumb-through . [(20120118 2134) nil "Plain text reader of HTML documents" single]) (thumb-frm . [(20131227 201) ((frame-fns (0)) (frame-cmds (0))) "Commands for thumbnail frames." single]) (thrift . [(20130910 912) nil "Major mode for Apache Thrift files" single]) (thread-dump . [(20130323 1025) nil "Java thread dump viewer" single]) (thingopt . [(20120717 826) nil "Thing at Point optional utilities" single]) (thingatpt+ . [(20131227 200) nil "Extensions to `thingatpt.el'." single]) (thing-cmds . [(20131227 159) ((hide-comnt (0))) "Commands that use things, as defined by `thingatpt.el'." single]) (thesaurus . [(20121125 1937) nil "replace a word with a synonym looked up in a web service." single]) (theme-changer . [(20130725 1919) nil "Sunrise/Sunset Theme Changer for Emacs" single]) (tfs . [(20120508 1820) nil "MS Team Foundation Server commands for Emacs." single]) (textmate-to-yas . [(20130509 854) nil "Import Textmate macros into yasnippet syntax" tar]) (textmate . [(20110816 1446) nil "TextMate minor mode for Emacs" single]) (textile-mode . [(20120721 1258) nil "Textile markup editing major mode" single]) (tex-smart-umlauts . [(20131210 2346) nil "Smart umlaut conversion for TeX." single]) (test-simple . [(20130710 826) nil "Simple Unit Test Framework for Emacs Lisp" single]) (test-case-mode . [(20131223 556) nil "unit test front-end" single]) (tern-auto-complete . [(20130809 229) ((tern (0 0 1)) (auto-complete (1 4)) (emacs (24))) "Tern Completion by auto-complete.el" single]) (tern . [(20130828 716) ((json (1 2)) (emacs (24))) "Tern-powered JavaScript integration" single]) (telepathy . [(20131209 458) nil "Access Telepathy from Emacs" single]) (tea-time . [(20120331 120) nil "Simple timer package, useful to make perfect tea." single]) (tdd-status-mode-line . [(20131123 916) nil "TDD status on the mode-line" single]) (tc . [(20131028 149) nil "a Japanese input method with T-Code on Emacs" tar]) (tangotango-theme . [(20130827 321) nil "Tango Palette color theme for Emacs 24." single]) (tango-2-theme . [(20120312 1325) nil "Tango 2 color theme for GNU Emacs 24" single]) (tagedit . [(20130816 510) ((s (1 3 1)) (dash (1 0 3))) "Some paredit-like features for html-mode" single]) (tabulated-list . [(20120406 1351) nil "generic major mode for tabulated lists." single]) (tabbar-ruler . [(20130701 2153) ((tabbar (2 0 1))) "Pretty tabbar, autohide, use both tabbar/ruler" tar]) (tabbar . [(20131106 1524) nil "No description available." tar]) (systemtap-mode . [(20121209 1510) nil "A mode for SystemTap" single]) (syslog-mode . [(20131020 1702) ((hide-lines (20130623))) "Major-mode for viewing log files" single]) (syntactic-sugar . [(20131106 706) nil "Effect-free forms such as if/then/else" single]) (synonyms . [(20131227 159) nil "Look up synonyms for a word or phrase in a thesaurus." single]) (sws-mode . [(20120802 1052) nil "(S)ignificant (W)hite(S)pace mode" single]) (switch-window . [(20130914 640) nil "A *visual* way to choose a window to switch to" single]) (swbuff-x . [(20130607 1014) ((swbuff (19991231 1800))) "Modifications to David Ponce's swbuff" single]) (swbuff . [(20041012 718) nil "Quick switch between Emacs buffers." single]) (svg-mode-line-themes . [(20130922 1230) ((xmlgen (0 4))) "SVG-based themes for mode-line" tar]) (surround . [(20130927 737) nil "emulate surround.vim from Vim" single]) (supergenpass . [(20130328 2248) nil "SuperGenPass for Emacs" single]) (suomalainen-kalenteri . [(20130414 635) nil "Finnish holidays for Emacs calendar." single]) (sunny-day-theme . [(20131203 1250) nil "Emacs24 theme with a light background." single]) (summarye . [(20130328 1027) nil "list up matched strings from a buffer, and display them in summary buffer" single]) (sudo-ext . [(20130130 2151) nil "sudo support" single]) (sudden-death . [(20121218 549) nil "Totsuzen-no-Shi" single]) (subshell-proc . [(20130122 1322) nil "Functions for working with comints" single]) (sublimity . [(20131111 2311) nil "smooth-scrolling and minimap, like sublime editor" tar]) (sublime-themes . [(20131203 623) nil "A collection of themes based on Sublime Text" tar]) (subatomic256-theme . [(20130620 1910) nil "Fork of subatomic-theme for terminals." single]) (subatomic-theme . [(20131011 1048) nil "Nice looking emacs 24 theme" single]) (stylus-mode . [(20120802 1052) ((sws-mode (0))) "Major mode for editing .jade files" single]) (stupid-indent-mode . [(20130816 1354) nil "Plain stupid indentation minor mode" single]) (stumpwm-mode . [(20111113 431) nil "special lisp mode for evaluating code into running stumpwm" single]) (stripe-buffer . [(20131010 1526) ((cl-lib (1 0))) "Use a different background for even and odd lines" single]) (strings . [(20131227 158) nil "Miscellaneous string functions." single]) (string-utils . [(20131106 706) ((list-utils (0 4 2))) "String-manipulation utilities" single]) (string-edit . [(20130815 2115) ((dash (1 2 0))) "Avoid escape nightmares by editing string in separate buffer" single]) (sticky . [(20101130 252) nil "Sticky key for capital letters" single]) (stem . [(20131102 409) nil "Routines for stemming" single]) (starter-kit-ruby . [(20120202 1132) ((inf-ruby (2 2 3)) (starter-kit (2 0 1))) "Saner defaults and goodies for Ruby" single]) (starter-kit-perl . [(20120202 1132) nil "Some helpful Perl code" single]) (starter-kit-lisp . [(20120504 1225) ((starter-kit (2 0 2)) (elisp-slime-nav (0 1))) "Saner defaults and goodies for lisp languages" single]) (starter-kit-js . [(20111009 2054) ((starter-kit (2 0 1))) "Saner defaults and goodies for Javascript" single]) (starter-kit-eshell . [(20121001 1714) nil "Saner defaults and goodies: eshell tweaks" single]) (starter-kit-bindings . [(20120101 1955) ((starter-kit (2 0 2))) "Saner defaults and goodies: bindings" single]) (starter-kit . [(20130904 1547) ((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 2)) (ido-ubiquitous (0 3)) (magit (0 8 1))) "Saner defaults and goodies." tar]) (stan-mode . [(20131007 2012) nil "Major mode for editing STAN files" tar]) (ssh-config-mode . [(20120513 2233) nil "Mode for fontification of ~/.ssh/config" single]) (ssh . [(20120904 1342) nil "Support for remote logins using ssh." single]) (sr-speedbar . [(20131207 2049) nil "Same frame speedbar" single]) (sqlite . [(20131226 619) nil "use sqlite via elisp" single]) (sql-indent . [(20090325 2254) nil "indentation of SQL statements" single]) (sprintly-mode . [(20121005 2234) ((furl (0 0 2))) "Major mode for dealing with sprint.ly" single]) (spotify . [(20130520 258) nil "Control the spotify application from emacs" single]) (splitter . [(20130705 50) nil "Manage window splits" single]) (sphinx-frontend . [(20131223 329) nil "Launch build process for rst documents via sphinx." single]) (speechd-el . [(20130828 1209) nil "Client to speech synthesizers and Braille displays." tar]) (sparql-mode . [(20131129 226) nil "Edit and interactively evaluate SPARQL queries." single]) (sparkline . [(20130803 542) nil "Make sparkline images from a list of numbers" single]) (spaces . [(20130610 49) nil "Create and switch between named window configurations." single]) (sourcetalk . [(20130908 957) ((request (0 2 0))) "SourceTalk (http://sourcetalk.net) plugin for Emacs" single]) (soundcloud . [(20131210 1103) ((emms (20131016)) (json (1 2)) (deferred (0 3 1)) (string-utils (0 3 2))) "a SoundCloud client for Emacs" single]) (soothe-theme . [(20130805 0) ((emacs (24 1))) "a dark colorful theme for Emacs24." single]) (solarized-theme . [(20131221 1216) nil "The Solarized color theme, ported to Emacs." tar]) (soft-stone-theme . [(20131227 701) ((emacs (24))) "Emacs 24 theme with a light background." single]) (soft-morning-theme . [(20131211 1342) nil "Emacs24 theme with a light background." single]) (soft-charcoal-theme . [(20130924 1206) nil "Dark charcoal theme with soft colors" single]) (snippet . [(20130210 1515) nil "Insert snippets of text into a buffer" single]) (smotitah . [(20131127 152) nil "Modular emacs configuration framework" tar]) (smooth-scrolling . [(20131219 2039) nil "Make emacs scroll smoothly" single]) (smooth-scroll . [(20130321 2114) nil "Minor mode for smooth scrolling and in-place scrolling." single]) (smex . [(20131210 700) nil "M-x interface with Ido-style fuzzy matching." single]) (smarty-mode . [(20100703 458) nil "major mode for editing smarty templates" single]) (smartscan . [(20131213 632) nil "Jumps between other symbols found at point" single]) (smartrep . [(20130316 1716) nil "Support sequential operation which omitted prefix keys." single]) (smartparens . [(20131227 423) ((cl-lib (0 3)) (dash (2 4 0))) "Automatic insertion, wrapping and paredit-like navigation with user defined pairs." tar]) (smart-window . [(20130214 1142) nil "vim-like window controlling plugin" single]) (smart-tabs-mode . [(20130718 939) nil "Intelligently indent with tabs, align with spaces!" single]) (smart-tab . [(20130317 1157) nil "Intelligent tab completion and indentation." single]) (smart-operator . [(20051013 1756) nil "Beautify the operators in codes" single]) (smart-newline . [(20131207 1940) nil "Provide smart newline for one keybind." single]) (smart-mode-line . [(20131217 1354) ((emacs (24 3)) (dash (2 2 0))) "A color coded smart mode-line." single]) (smart-forward . [(20130205 452) ((expand-region (0 8 0))) "Semantic navigatioin" single]) (smart-compile . [(20130917 347) nil "an interface to `compile'" single]) (slime-ritz . [(20130218 1537) nil "slime extensions for ritz" single]) (slime . [(20131116 2359) nil "Superior Lisp Interaction Mode for Emacs" tar]) (slim-mode . [(20131202 2302) nil "Major mode for editing Slim files" single]) (slideview . [(20130512 2142) nil "File slideshow" single]) (slamhound . [(20131107 927) nil "Rip Clojure namespaces apart and rebuild them." single]) (skewer-mode . [(20131117 808) ((simple-httpd (1 4 0)) (js2-mode (20090723)) (emacs (24))) "live browser JavaScript, CSS, and HTML interaction" tar]) (skewer-less . [(20131015 622) ((skewer-mode (1 5 3))) "Skewer support for live LESS stylesheet updates" single]) (simplezen . [(20130421 300) ((s (1 4 0)) (dash (1 1 0))) "A simple subset of zencoding-mode for Emacs." single]) (simplenote . [(20130416 1502) nil "Interact with simple-note.appspot.com" single]) (simpleclip . [(20131106 706) nil "Simplified access to the system clipboard" single]) (simple-httpd . [(20130908 1304) nil "pure elisp HTTP server" single]) (simple-call-tree . [(20130330 940) nil "analyze source code based on font-lock text-properties" single]) (simple-call-tree+ . [(20131009 1412) nil "Extensions to simple-call-tree" single]) (simple+ . [(20131227 154) ((strings (0))) "Extensions to standard library `simple.el'." single]) (simp . [(20130602 1301) nil "Simple project definition, chiefly for file finding, and grepping" tar]) (sicp . [(20121014 1314) nil "No description available." tar]) (shut-up . [(20131225 658) nil "Shut up would you!" single]) (show-marks . [(20130805 749) ((fm (1 0))) "Navigate and visualize the mark-ring" single]) (show-css . [(20130605 1524) nil "Show the css of the html attribute the cursor is on" tar]) (shorten . [(20131201 620) nil "component-wise string shortener" single]) (shimbun . [(20120718 2038) nil "interfacing with web newspapers" tar]) (shift-text . [(20130831 955) ((cl-lib (1 0)) (es-lib (0 3))) "Move the region in 4 directions, in a way similar to Eclipse's" single]) (shell-switcher . [(20130711 933) nil "Provide fast switching between shell buffers" tar]) (shell-pop . [(20131223 1828) nil "helps you to use shell easily on Emacs. Only one key action to work." single]) (shell-history . [(20100504 850) nil "integration with shell history" single]) (shell-here . [(20120807 1913) nil "Open a shell relative to the working directory" single]) (shell-command . [(20090621 1332) nil "enables tab-completion for `shell-command'" single]) (session . [(20120510 1700) nil "use variables, registers and buffer places across sessions" single]) (servant . [(20131021 355) ((s (1 8 0)) (dash (2 2 0)) (f (0 11 0)) (ansi (0 3 0)) (commander (0 5 0)) (elnode (0 9 9 7 6)) (epl (0 2))) "ELPA server written in Emacs Lisp" tar]) (sequential-command . [(20100504 855) nil "Many commands into one command" tar]) (sequences . [(20130908 1122) ((emacs (24))) "Ports of some Clojure sequence functions." single]) (sentence-highlight . [(20121026 1450) nil "highlight the current sentence" single]) (sensitive . [(20131015 635) ((emacs (24)) (sequences (0 1 0))) "A dead simple way to load sensitive information" single]) (second-sel . [(20131227 151) nil "Secondary selection commands" single]) (scss-mode . [(20130105 1411) nil "Major mode for editing SCSS files" single]) (screenshot . [(20120509 1105) nil "Take a screenshot in Emacs" single]) (scratch-pop . [(20131108 330) nil "popup \"scratch\"es" single]) (scratch-palette . [(20131108 329) nil "save scratch notes on each file" single]) (scratch-log . [(20120130 1521) nil "Utility for *scratch* buffer." single]) (scratch . [(20120830 1028) nil "Mode-specific scratch buffers" tar]) (scpaste . [(20110617 1856) ((htmlfontify (0 21))) "Paste to the web via scp." single]) (sclang-snippets . [(20130513 51) ((yasnippet (0 8 0))) "Snippets for the SuperCollider Emacs mode" tar]) (sclang-extensions . [(20131117 1439) ((auto-complete (1 4 0)) (s (1 3 1)) (dash (1 2 0)) (emacs (24 1))) "Extensions for the SuperCollider Emacs mode." tar]) (scion . [(20130315 555) nil "Haskell Minor Mode for Interacting with the Scion Library" single]) (scheme-here . [(20131105 338) nil "cmuscheme extension for multiple inferior processes" single]) (scheme-complete . [(20130220 403) nil "Smart tab completion for Scheme in Emacs" single]) (scf-mode . [(20111202 707) nil "shorten file-names in compilation type buffers" single]) (scala-mode2 . [(20131115 2347) nil "Major mode for editing Scala >= 2.9" tar]) (scala-mode . [(20131018 1325) nil "Major mode for editing Scala code." tar]) (sbt-mode . [(20131123 129) ((scala-mode2 (0 22))) "Major mode for sbt >= 0.12 with scala >= 2.9" tar]) (savekill . [(20130130 2151) nil "Save kill ring to disk" single]) (save-visited-files . [(20131224 1528) nil "save opened files across sessions" single]) (save-sexp . [(20130106 642) nil "save variables in files using setter forms like `setq'" tar]) (save-load-path . [(20131228 1952) nil "save load-path and reuse it to test" single]) (sauron . [(20130818 1134) nil "Track (erc/org/dbus/...) events and react to them." tar]) (sass-mode . [(20120224 1117) ((haml-mode (3 0 15))) "Major mode for editing Sass files" single]) (sackspace . [(20130719 256) nil "A better backspace" single]) (s-buffer . [(20130605 1424) ((s (1 6 0)) (noflet (0 0 3))) "s operations for buffers" single]) (s . [(20131223 944) nil "The long lost Emacs string manipulation library." single]) (rvm . [(20131217 324) nil "Emacs integration for rvm" single]) (rust-mode . [(20131214 1941) nil "A major emacs mode for editing Rust source code" single]) (runner . [(20131021 1409) nil "Improved \"open with\" suggestions for dired" single]) (ruby-tools . [(20131121 605) nil "Collection of handy functions for ruby-mode." tar]) (ruby-test-mode . [(20131205 209) ((ruby-mode (1 0))) "Minor mode for Behaviour and Test Driven" single]) (ruby-refactor . [(20130810 543) ((ruby-mode (1 2))) "A minor mode which presents various Ruby refactoring helpers." single]) (ruby-interpolation . [(20131112 852) nil "Ruby string interpolation helpers" single]) (ruby-hash-syntax . [(20131113 1032) nil "Toggle ruby hash syntax between classic and 1.9 styles" single]) (ruby-end . [(20131016 37) nil "Automatic insertion of end blocks for Ruby" single]) (ruby-electric . [(20131217 33) nil "Minor mode for electrically editing ruby code" single]) (ruby-dev . [(20130811 151) nil "Interactive developement environment for Ruby." tar]) (ruby-compilation . [(20130429 611) ((inf-ruby (2 2 1))) "run a ruby process in a compilation buffer" single]) (ruby-block . [(20131211 331) nil "highlight matching block" single]) (ruby-additional . [(20131030 2113) ((emacs (24 3)) (ruby-mode (1 2))) "ruby-mode extensions yet to be merged into Emacs" tar]) (rubocop . [(20131101 1142) ((dash (1 0 0))) "An Emacs interface for RuboCop" single]) (rspec-mode . [(20131127 1747) ((ruby-mode (1 0))) "Enhance ruby-mode for RSpec" tar]) (rsense . [(20100510 2105) nil "RSense client for Emacs" single]) (rpm-spec-mode . [(20130922 2348) nil "RPM spec file editing commands for Emacs/XEmacs" single]) (roy-mode . [(20121208 358) nil "Roy major mode" single]) (robe . [(20131228 424) ((inf-ruby (2 3 0))) "Code navigation, documentation lookup and completion for Ruby" tar]) (rnc-mode . [(20121227 1502) nil "A major mode for editing RELAX NG Compact syntax." single]) (rings . [(20130721 1905) nil "Buffer rings. Like tabs, but better." single]) (rinari . [(20131117 737) ((ruby-mode (1 0)) (inf-ruby (2 2 5)) (ruby-compilation (0 16)) (jump (2 0))) "Rinari Is Not A Rails IDE" single]) (rhtml-mode . [(20130422 611) nil "major mode for editing RHTML files" tar]) (rfringe . [(20110405 1520) nil "display the relative location of the region, in the fringe." single]) (revive . [(20121022 411) nil "Resume Emacs" single]) (reverse-theme . [(20130402 312) nil "Reverse theme for Emacs" single]) (restclient . [(20131204 607) nil "An interactive HTTP client for Emacs" tar]) (requirejs-mode . [(20130215 1304) nil "Improved AMD module management" single]) (request . [(20130526 1015) nil "Compatible layer for URL request in Emacs" tar]) (req-package . [(20131229 316) ((use-package (1 0))) "A use-package wrapper for package runtime dependencies management" single]) (replace-from-region . [(20130918 308) nil "Replace commands whose query is from region" single]) (replace+ . [(20131227 149) nil "Extensions to `replace.el'." single]) (repl-toggle . [(20131218 412) ((fullframe (0 0 1))) "Switch to/from repl buffer for current major-mode" single]) (relax . [(20131029 1434) ((json (1 2))) "For browsing and interacting with CouchDB" single]) (region-bindings-mode . [(20130430 1447) nil "Enable custom bindings when mark is active." single]) (regex-tool . [(20131104 1434) nil "A regular expression evaluation tool for programmers" single]) (regex-dsl . [(20100124 228) nil "lisp syntax for regexps" single]) (refheap . [(20131209 912) ((json (1 2))) "A library for pasting to https://refheap.com" single]) (redshank . [(20120510 1230) nil "No description available." tar]) (redo+ . [(20131117 1151) nil "Redo/undo system for Emacs" single]) (recursive-narrow . [(20111019 1608) nil "narrow-to-region that operates recursively" single]) (rect+ . [(20130811 1744) nil "Extensions to rect.el" single]) (recentf-ext . [(20130130 2150) nil "Recentf extensions" single]) (rebox2 . [(20121113 500) nil "Handling of comment boxes in various styles." single]) (realgud . [(20131222 249) nil "A modular front-end for interacting with external debuggers" tar]) (readline-complete . [(20120705 243) nil "offers completions in shell mode" single]) (rdp . [(20120928 1854) nil "Recursive Descent Parser library" single]) (rcirc-notify . [(20131101 1505) nil "No description available." single]) (rcirc-groups . [(20131223 404) nil "an emacs buffer in rcirc-groups major mode" single]) (rbenv . [(20130807 7) nil "Emacs integration for rbenv" single]) (rase . [(20120928 1345) nil "Run At Sun Event daemon" single]) (rainbow-delimiters . [(20131015 404) nil "Highlight nested parens, brackets, braces a different color at each depth." single]) (railgun . [(20121016 2257) nil "No description available." single]) (racket-mode . [(20131227 900) nil "Major mode for Racket language." tar]) (quickrun . [(20131206 1613) nil "Run commands quickly" single]) (quickref . [(20130113 1500) ((dash (1 0 3)) (s (1 0 0))) "Display relevant notes-to-self in the echo area" single]) (quick-buffer-switch . [(20130303 1629) nil "Quick switch to file or dir buffers." single]) (qml-mode . [(20130417 744) nil "Major mode for editing QT Declarative (QML) code." single]) (python-magic . [(20120505 1355) nil "outline mode extension for python mode" single]) (python-info . [(20130916 620) nil "Python info manual for Emacs" tar]) (python-environment . [(20130624 339) ((deferred (0 3 1))) "virtualenv API for Emacs Lisp" tar]) (python-django . [(20131214 1841) nil "A Jazzy package for managing Django projects" single]) (python-cell . [(20131029 1616) nil "Support for MATLAB-like cells in python mode" single]) (pylint . [(20121112 435) nil "minor mode for running `pylint'" single]) (pydoc-info . [(20110301 34) nil "Better Python support for info-lookup-symbol." tar]) (py-import-check . [(20130802 411) nil "Finds the unused python imports using importchecker" single]) (purty-mode . [(20131004 1559) nil "Safely pretty-print greek letters, mathematical symbols, or anything else." single]) (purple-haze-theme . [(20130929 1751) ((emacs (24 0))) "an overtly purple color theme for Emacs24." single]) (puppetfile-mode . [(20131017 833) nil "Syntax highlighting for Puppetfiles" single]) (puppet-mode . [(20130819 1046) nil "Major mode for Puppet manifests" single]) (psvn . [(20120401 1440) nil "Subversion interface for emacs" single]) (protobuf-mode . [(20091217 1755) nil "major mode for editing protocol buffers." single]) (projmake-mode . [(20130614 335) nil "Project oriented automatic builder and error highlighter, flymake for projects" tar]) (projector . [(20131121 804) ((alert (1 1))) "Lightweight library for managing project/repository-aware shell and command buffers" single]) (projectile-rails . [(20131223 1234) ((projectile (1 0 0 -3)) (inflections (1 1)) (inf-ruby (2 2 6))) "Minor mode for Rails projects based on projectile-mode" single]) (projectile . [(20131218 1425) ((s (1 6 0)) (dash (1 5 0)) (pkg-info (0 4))) "Manage and navigate projects in Emacs easily" single]) (project-persist . [(20131030 1208) nil "A minor mode to allow loading and saving of project settings." tar]) (project-local-variables . [(20080502 1652) nil "Set project-local variables from a file." single]) (project-explorer . [(20131124 831) ((cl-lib (0 3)) (es-lib (0 3))) "A project explorer sidebar" single]) (prognth . [(20130920 1059) nil "Extend prog1 to arbitrary index" single]) (prodigy . [(20131227 925) ((s (1 8 0)) (dash (2 4 0)) (f (0 14 0)) (emacs (24))) "Manage external services from within Emacs" single]) (processing-snippets . [(20130718 1152) ((yasnippet (0 8 0))) "Snippets for processing-mode" tar]) (processing-mode . [(20130912 1336) nil "Major mode for Processing 2.0" single]) (proc-net . [(20130321 1712) nil "network process tools" single]) (pretty-symbols . [(20131125 26) nil "Draw tokens as Unicode glyphs." single]) (pretty-mode . [(20131118 2248) nil "Redisplay parts of the buffer as pretty symbols." single]) (pretty-lambdada . [(20131227 148) nil "Show the word `lambda' as the Greek letter." single]) (pp-c-l . [(20131227 147) nil "Display Control-l characters in a pretty way" single]) (pp+ . [(20131227 147) nil "Extensions to `pp.el'." single]) (powershell-mode . [(20100203 258) nil "Mode for editing Powershell scripts" single]) (powershell . [(20130824 1206) nil "run powershell as an inferior shell in emacs" single]) (powerline . [(20131126 1817) ((cl-lib (0 2))) "Rewrite of Powerline" tar]) (pov-mode . [(20120825 716) nil "Major mode for editing POV-Ray scene files." tar]) (pos-tip . [(20121128 615) nil "Show tooltip at point" single]) (popwin . [(20130329 435) nil "Popup Window Manager." single]) (popup-switcher . [(20131220 514) ((popup (0 5 0))) "switch to other buffers and files via popup." single]) (popup-kill-ring . [(20131020 1154) ((popup (0 4)) (pos-tip (0 4))) "interactively insert item from kill-ring" single]) (popup . [(20130901 2255) nil "Visual Popup User Interface" single]) (pophint . [(20130914 753) ((popup (0 5 0)) (log4e (0 2 0)) (yaxception (0 1))) "Provide navigation using pop-up tips, like Firefox's Vimperator Hint Mode" tar]) (pony-mode . [(20131211 809) nil "Minor mode for working with Django Projects" tar]) (pomodoro . [(20130117 1935) nil "A timer for the Pomodoro Technique" single]) (pointback . [(20100210 752) nil "Restore window points when returning to buffers" single]) (point-undo . [(20100504 829) nil "undo/redo position" single]) (plsense . [(20130919 1912) ((auto-complete (1 4 0)) (log4e (0 2 0)) (yaxception (0 1))) "provide interface for PlSense that is a development tool for Perl." single]) (plenv . [(20130706 2316) nil "A plenv wrapper for Emacs" single]) (plantuml-mode . [(20131031 1632) ((auto-complete (1 4))) "Major mode for plantuml" single]) (pkgbuild-mode . [(20130816 120) nil "Interface to the ArchLinux package manager" single]) (pkg-info . [(20131101 408) ((dash (1 6 0)) (epl (0 4))) "Information about packages" single]) (pivotal-tracker . [(20130319 1933) nil "Interact with Pivotal Tracker through its API" single]) (pinot . [(20130918 1054) nil "Emacs interface to pinot-search" tar]) (pinboard-api . [(20131207 1124) nil "Rudimentary http://pinboard.in integration" single]) (pig-snippets . [(20130912 2324) ((yasnippet (0 8 0))) "Snippets for pig-mode" tar]) (pig-mode . [(20130912 2324) nil "Major mode for Pig files" single]) (pier-mode . [(20131021 840) ((magit (1 2 0))) "Emacs Major mode for Pier-formatted text files" single]) (pianobar . [(20120128 1301) nil "thin wrapper for Pianobar, a Pandora Radio client" single]) (php-mode . [(20131203 1308) nil "Major mode for editing PHP code" single]) (php-eldoc . [(20130328 826) nil "eldoc backend for php" tar]) (php-boris . [(20130527 121) nil "Run boris php REPL" single]) (php-auto-yasnippets . [(20131212 350) ((php-mode (1 11)) (yasnippet (0 8 0))) "Creates snippets for PHP functions" tar]) (php+-mode . [(20121129 1252) nil "A better PHP mode with Zend Framework 1 support." tar]) (phoenix-dark-pink-theme . [(20130905 941) nil "Port of the Sublime Text 2 theme of the same name" single]) (phoenix-dark-mono-theme . [(20130306 1215) nil "Monochromatic version of the Phoenix theme" single]) (phi-search-mc . [(20131010 358) ((phi-search (2 0 0)) (multiple-cursors (1 2 1))) "multiple-cursors extension for phi-search" single]) (phi-search . [(20131207 730) nil "another incremental search command, compatible with \"multiple-cursors\"" tar]) (phi-rectangle . [(20131028 2106) nil "another rectangle-mark command (rewrite of rect-mark)" single]) (ph . [(20130312 1137) ((emacs (24 3))) "A global minor mode for managing multiple projects." tar]) (pgdevenv . [(20130527 257) nil "Manage your PostgreSQL development envs" tar]) (pg . [(20130731 1442) nil "Emacs Lisp interface to the PostgreSQL RDBMS" single]) (perspective . [(20131004 1658) nil "switch between named \"perspectives\" of the editor" single]) (persp-mode . [(20131205 1259) ((workgroups (0 2 0))) "\"perspectives\" + save/load + shared among frames - bugs." single]) (persistent-soft . [(20131106 706) ((pcache (0 2 3)) (list-utils (0 4 2))) "Persistent storage, returning nil on failure" single]) (perlbrew . [(20130127 324) nil "A perlbrew wrapper for Emacs" single]) (perl-completion . [(20090527 2336) nil "No description available." single]) (peg . [(20130320 158) nil "Parsing Expression Grammars in Emacs Lisp" single]) (peek-mode . [(20130620 1246) ((elnode (0 9 8 1))) "Serve buffers live over HTTP with elnode backend" tar]) (pcsv . [(20131110 750) nil "Parser of csv" single]) (pcre2el . [(20130620 1810) ((cl-lib (0 3))) "parse, convert, and font-lock PCRE, Emacs and rx regexps" single]) (pcmpl-git . [(20130408 951) nil "pcomplete for git" tar]) (pcmpl-args . [(20120911 2224) nil "Enhanced shell command completion" single]) (pcache . [(20131201 1159) ((eieio (1 3))) "persistent caching for Emacs" single]) (path-headerline-mode . [(20130912 1519) nil "Displaying file path on headerline." single]) (pastels-on-dark-theme . [(20120304 1022) nil "Pastels on Dark theme for Emacs 24" single]) (pastehub . [(20130509 830) nil "A client for the PasteHub cloud service" single]) (pastebin . [(20101125 1955) nil "A simple interface to the www.pastebin.com webservice" single]) (paste-kde . [(20131210 1703) ((web (0 3 6))) "paste text to KDE's pastebin service" single]) (password-vault . [(20131105 1703) ((cl-lib (0 2)) (emacs (24))) "A Password manager for Emacs." single]) (parse-csv . [(20131107 200) nil "Parse strings with CSV fields into s-expressions" single]) (parenface . [(20091203 1017) nil "Provide a face for parens in lisp modes." single]) (paren-face . [(20131209 800) nil "a face for parentheses in lisp modes" single]) (paredit-menu . [(20130923 1254) nil "Adds a menu to paredit.el as memory aid" single]) (paredit-everywhere . [(20131010 318) ((paredit (22))) "Enable some paredit features in non-lisp buffers" single]) (paredit . [(20130722 624) nil "minor mode for editing parentheses" single]) (pangu-spacing . [(20131228 733) nil "Minor-mode to add space between Chinese and English characters." single]) (pandoc-mode . [(20131206 1846) nil "Minor mode for interacting with Pandoc" tar]) (pallet . [(20131117 525) ((cask (0 5 0))) "A package management tool for Emacs, using Cask." tar]) (palimpsest . [(20130731 821) nil "Various deletion strategies when editing" single]) (palette . [(20131227 146) ((hexrgb (0))) "Color palette useful with RGB, HSV, and color names" single]) (pager-default-keybindings . [(20130719 1357) ((pager (1 0))) "Add the default keybindings suggested for pager.el" single]) (pager . [(20100330 1131) nil "windows-scroll commands" single]) (page-break-lines . [(20130917 804) nil "Display ugly ^L page breaks as tidy horizontal lines" single]) (packed . [(20130907 744) ((cl-lib (0 2)) (magit (1 1 1))) "Package manager agnostic Emacs Lisp package utilities" tar]) (package-build . [(20131228 423) ((cl-lib (0 2))) "Tools for assembling a package archive" tar]) (package+ . [(20131010 1412) nil "Extensions for the package library." single]) (pabbrev . [(20130923 1257) nil "Predictive abbreviation expansion" single]) (p4 . [(20131014 1044) nil "Simple Perforce-Emacs Integration" single]) (ox-twiki . [(20131125 108) ((org (8))) "org Twiki and Foswiki export" single]) (ox-tiddly . [(20131124 804) ((org (8))) "org TiddlyWiki exporter" single]) (ox-reveal . [(20131111 1703) ((org (8 0))) "reveal.js Presentation Back-End for Org Export Engine" single]) (ox-html5slide . [(20131227 2206) ((org (8 0))) "Export org-mode to HTML5 slide." single]) (outshine . [(20131008 1033) nil "outline with outshine outshines outline" single]) (outorg . [(20131023 335) nil "Org-style comment editing" single]) (outlined-elisp-mode . [(20131108 327) nil "outline-minor-mode settings for emacs lisp" single]) (outline-magic . [(20130813 1333) nil "outline mode extensions for Emacs" single]) (otter-mode . [(20121202 903) nil "Major mode for source files of the Otter automated theorem prover" single]) (osx-pseudo-daemon . [(20131026 1730) nil "Daemon mode that plays nice with OSX." single]) (osx-plist . [(20101130 448) nil "Apple plist file parser" single]) (osx-location . [(20130907 133) nil "Watch and respond to changes in geographical location on OS X" tar]) (osx-browse . [(20131106 706) ((string-utils (0 3 2)) (browse-url-dwim (0 6 6))) "Web browsing helpers for OS X" single]) (orglue . [(20130912 1842) ((org (8 1)) (epic (0 1)) (org-mac-link (1 2))) "more functionality to org-mode." tar]) (orglink . [(20131209 1844) ((dash (1 3 2)) (org (8 0))) "use Org Mode links in other modes" single]) (org2blog . [(20130707 323) ((org (7 8)) (xml-rpc (1 6 8)) (metaweblog (0 1))) "Blog from Org mode to wordpress" tar]) (org-trello . [(20131124 1343) ((org (8 0 7)) (dash (1 5 0)) (request (0 2 0)) (cl-lib (0 3 0)) (json (1 2)) (elnode (0 9 9 7 6)) (esxml (0 3 0)) (s (1 7 0)) (kv (0 0 17))) "Org minor mode to synchronize with trello" tar]) (org-toodledo . [(20130928 1132) nil "Toodledo integration for Emacs Org mode" tar]) (org-screenshot . [(20131102 1715) ((org (7))) "screenshots integrated with org attachment dirs" single]) (org-readme . [(20130508 705) ((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0))) "Integrates Readme.org and Commentary/Change-logs." tar]) (org-protocol-jekyll . [(20130810 1450) nil "Jekyll's handler for org-protocol" single]) (org-present . [(20130426 1155) ((org (7))) "Minimalist presentation minor-mode for Emacs org-mode." single]) (org-pomodoro . [(20131117 35) ((alert (0 5 10))) "Pomodoro implementation for org-mode." tar]) (org-pandoc . [(20130729 1850) nil "Export from Org using Pandoc" tar]) (org-page . [(20131214 2328) ((ht (1 5)) (mustache (0 22)) (htmlize (1 47)) (org (8 0)) (dash (2 0 0))) "a static site generator based on org mode" tar]) (org-outlook . [(20121212 1458) nil "Outlook org" tar]) (org-octopress . [(20130809 1754) ((org (8 0)) (orglue (0 1)) (ctable (0 1 1))) "Compose octopress articles using org-mode." tar]) (org-mobile-sync . [(20131118 1116) ((emacs (24 3 50)) (org (8 0))) "automatically sync org-mobile on changes" single]) (org-magit . [(20120820 1156) ((magit (0 8)) (org (6 1))) "basic support for magit links" single]) (org-mac-link . [(20131222 19) nil "Grab links and url from various mac" single]) (org-mac-iCal . [(20130418 900) nil "Imports events from iCal.app to the Emacs diary" single]) (org-journal . [(20131111 648) nil "a simple org-mode based journaling mode" single]) (org-jira . [(20130427 616) nil "Syncing between Jira and Org-mode." tar]) (org-jekyll . [(20130508 239) ((org (8 0))) "Export jekyll-ready posts form org-mode entries" single]) (org-gnome . [(20131209 537) ((notify (2010 8 20)) (telepathy (0 1))) "Orgmode integration with the GNOME desktop" single]) (org-fstree . [(20090723 819) nil "include a filesystem subtree into an org file" single]) (org-elisp-help . [(20130423 1545) ((cl-lib (0 2)) (org (8 0))) "org links to emacs-lisp documentation" single]) (org-dotemacs . [(20130908 1756) ((org (7 9 3)) (cl-lib (1 0))) "Store your emacs config as an org file, and choose which bits to load." single]) (org-cua-dwim . [(20120202 2134) nil "Org-mode and Cua mode compatibility layer" single]) (org-context . [(20130903 1458) ((org (7))) "Contextual capture and agenda commands for Org-mode" single]) (org-bullets . [(20131106 1108) nil "Show bullets in org-mode as UTF-8 characters" single]) (org-agenda-property . [(20131007 1013) ((emacs (24 2))) "Display org properties in the agenda buffer." single]) (openwith . [(20120531 1436) nil "Open files with external programs" single]) (openstack-cgit-browse-file . [(20130819 227) nil "Browse the current file in OpenStack cgit" single]) (open-junk-file . [(20130131 720) nil "Open a junk (memo) file to try-and-error" single]) (oneonone . [(20131227 143) ((hexrgb (0))) "Frame configuration that uses one frame per window." single]) (on-screen . [(20131212 1954) nil "guide your eyes while scrolling" single]) (omnisharp . [(20131203 647) ((json (1 2)) (dash (1 8 0)) (popup (0 5)) (auto-complete (1 4)) (flycheck (0 13))) "Omnicompletion (intellisense) and more for C#" single]) (offlineimap . [(20130331 741) nil "Run OfflineIMAP from Emacs" single]) (octomacs . [(20130919 1915) nil "Octopress interface for Emacs" single]) (occur-x . [(20130610 643) nil "Extra functionality for occur" single]) (occidental-theme . [(20130312 1258) nil "Custom theme for faces based on Adwaita" single]) (obsidian-theme . [(20130920 937) nil "port of the eclipse obsidian theme" single]) (object-registry . [(20130521 1213) ((cl-lib (0 2))) "OBSOLETE track data items by various instance slots" single]) (ob-translate . [(20130718 729) ((google-translate (0 4)) (org (8))) "Translation of text blocks in org-mode." single]) (ob-sml . [(20130829 1143) ((sml-mode (6 4))) "org-babel functions for template evaluation" single]) (ob-mongo . [(20130718 732) ((org (8))) "Execute mongodb queries within org-mode blocks." single]) (ob-browser . [(20130724 902) ((org (8))) "Translation of text blocks in org-mode." tar]) (oauth . [(20130127 1751) nil "Oauth library." tar]) (o-blog . [(20130904 1426) nil "Org-blog exporter" tar]) (nyan-prompt . [(20130721 311) nil "Nyan Cat on the eshell prompt." tar]) (nyan-mode . [(20120710 2200) nil "Nyan Cat shows position in current buffer in mode-line." tar]) (nvm . [(20131219 805) ((s (1 8 0)) (dash (2 4 0)) (f (0 14 0))) "Manage Node versions within Emacs" single]) (nummm-mode . [(20131117 214) nil "Display the number of minor modes instead of their names" single]) (number-font-lock-mode . [(20131027 913) ((emacs (24))) "Syntax highlighting of numeric literals" single]) (nsis-mode . [(20130723 1928) nil "NSIS-mode" tar]) (nrepl-ritz . [(20130516 1039) ((nrepl (0 1 7)) (fringe-helper (0 1 1))) "nrepl extensions for ritz" single]) (nrepl-eval-sexp-fu . [(20131015 513) nil "No description available." single]) (novice+ . [(20131227 143) nil "Extensions to `novice.el'." single]) (notmuch . [(20131209 1152) nil "No description available." tar]) (nose . [(20110804 619) nil "Easy Python test running in Emacs" single]) (noflet . [(20130901 922) nil "locally override functions" single]) (nodejs-repl . [(20130520 842) nil "Run Node.js REPL" single]) (noctilux-theme . [(20131019 31) nil "Dark theme inspired by LightTable" tar]) (nimrod-mode . [(20110125 1504) nil "A major mode for the Nimrod programming language" single]) (nginx-mode . [(20131223 44) nil "major mode for editing nginx config files" single]) (nexus . [(20130829 722) nil "REST Client for Nexus Maven Repository servers" tar]) (never-comment . [(20131228 1518) nil "Never blocks are comment" single]) (nemerle . [(20130328 746) nil "major mode for editing nemerle programs" single]) (nclip . [(20130617 1315) nil "Network (HTTP) Clipboard" tar]) (ncl-mode . [(20130527 1545) nil "Major Mode for editing NCL scripts and other goodies" tar]) (navi-mode . [(20131001 1125) nil "major-mode for easy buffer-navigation" single]) (nav-flash . [(20131106 706) nil "Briefly highlight the current line" single]) (nav . [(20120507 7) nil "Emacs mode for filesystem navigation" tar]) (naquadah-theme . [(20131210 1123) nil "A theme based on Tango color set" single]) (nanowrimo . [(20131130 2140) nil "Track progress for nanowrimo" single]) (namespaces . [(20130326 1550) nil "An implementation of namespaces for Elisp, with an emphasis on immutabilty." single]) (naked . [(20131227 142) nil "Provide for naked key descriptions: no angle brackets." single]) (n3-mode . [(20130116 1429) nil "mode for Notation 3" single]) (mysql2sqlite . [(20120514 731) nil "Convert mysql databases into sqlite databases." single]) (mykie . [(20131228 1057) nil "Command multiplexer: Register multiple functions to a keybind" single]) (mwe-log-commands . [(20100703 541) nil "log keyboard commands to buffer" single]) (mvn . [(20131227 2312) nil "helpers for compiling with maven" single]) (muttrc-mode . [(20090804 2252) nil "Major mode to edit muttrc under Emacs" single]) (mustang-theme . [(20130920 939) nil "port of vim's mustang theme" single]) (mustache-mode . [(20111003 1103) nil "A major mode for editing Mustache files." single]) (mustache . [(20131117 1407) ((ht (0 9)) (s (1 3 0)) (dash (1 2 0))) "a mustache templating library in emacs lisp" tar]) (multiple-cursors . [(20131215 1047) nil "Multiple cursors for Emacs." tar]) (multifiles . [(20130615 1433) nil "View and edit parts of multiple files in one buffer" single]) (multi-web-mode . [(20130823 2054) nil "multiple major mode support for web editing" tar]) (multi-term . [(20130108 2305) nil "Managing multiple terminal buffers in Emacs." single]) (multi-project . [(20131222 1308) nil "Easily work with multiple projects." single]) (multi-eshell . [(20120608 1835) nil "Create and manage multiple shells within Emacs" single]) (multi . [(20131013 844) ((emacs (24))) "Clojure-style multi-methods for emacs lisp" single]) (mu4e-maildirs-extension . [(20131223 1051) nil "Show mu4e maildirs summary in mu4e-main-view" single]) (move-text . [(20130506 1826) nil "Move current line or region with M-up or M-down." single]) (mouse3 . [(20131227 142) nil "Customizable behavior for `mouse-3'." single]) (mouse-slider-mode . [(20130609 826) nil "scale numbers dragged under the mouse" single]) (mouse+ . [(20131227 141) nil "Extensions to `mouse.el'." single]) (motion-mode . [(20131104 908) ((flymake-easy (0 7)) (flymake-cursor (1 0 2))) "major mode for RubyMotion enviroment" tar]) (mote-mode . [(20121014 2119) ((ruby-mode (1 1))) "Mote minor mode" single]) (morlock . [(20131211 821) nil "more font-lock keywords for elisp" single]) (monokai-theme . [(20131027 127) nil "A fruity color theme for Emacs." single]) (monky . [(20130513 513) nil "Control Hg from Emacs." tar]) (mongo . [(20120904 2005) nil "MongoDB driver for Emacs Lisp" tar]) (molokai-theme . [(20130828 0) nil "molokai theme with Emacs theme engine" single]) (moe-theme . [(20131223 2054) nil "A colorful eye-candy theme. Moe, moe, kyun!" tar]) (modtime-skip-mode . [(20130723 2222) nil "Minor mode for disabling modtime and supersession checks on files." single]) (modeline-posn . [(20131227 140) nil "Set up `mode-line-position'." single]) (mode-line-debug . [(20121207 744) nil "show status of `debug-on-error' in the mode-line" single]) (mode-icons . [(20130602 548) nil "Show icons for modes" tar]) (mocker . [(20131006 934) ((eieio (1 3)) (el-x (0 2 4))) "mocking framework for emacs" single]) (mo-vi-ment-mode . [(20131028 2333) nil "Provide vi-like cursor movement that's easy on the fingers" single]) (mo-git-blame . [(20131218 1407) nil "An interactive, iterative 'git blame' mode for Emacs" single]) (mmm-mode . [(20131027 1439) nil "Allow Multiple Major Modes in a buffer" tar]) (mmm-mako . [(20121019 2351) ((mmm-mode (0 4 8))) "MMM submode class for Mako Templates" single]) (misc-fns . [(20131227 139) nil "Miscellaneous non-interactive functions." single]) (misc-cmds . [(20131227 138) nil "Miscellaneous commands (interactive functions)." single]) (minor-mode-hack . [(20130212 1228) nil "Change priority of minor-mode keymaps" single]) (minitest . [(20131217 735) ((dash (1 0 0))) "An Emacs mode for ruby minitest files" single]) (minimal-session-saver . [(20131106 706) nil "Very lean session saver" single]) (minibuffer-cua . [(20130906 434) nil "Make CUA mode's S-up/S-down work in minibuffer" single]) (minibuffer-complete-cycle . [(20130813 945) nil "Cycle through the *Completions* buffer" single]) (migemo . [(20130310 712) nil "Japanese incremental search through dynamic pattern expansion" single]) (midje-test-mode . [(20131208 914) ((clojure-mode (1 7)) (cider (0 3 0))) "Minor mode for midje" single]) (midje-mode . [(20131019 1357) ((cider (0 1 4)) (clojure-mode (1 0))) "Minor mode for running Midje tests in emacs" tar]) (mic-paren . [(20120716 1647) nil "advanced highlighting of matching parentheses" single]) (mew . [(20131120 457) nil "Messaging in the Emacs World" tar]) (metaweblog . [(20130707 431) ((xml-rpc (1 6 8))) "An emacs library to access metaweblog based weblogs" tar]) (menu-bar+ . [(20131227 137) nil "Extensions to `menu-bar.el'." single]) (mentor . [(20130519 1540) ((xml-rpc (1 6 9))) "Frontend for the rTorrent bittorrent client" tar]) (memoize . [(20130421 1234) nil "Memoization functions" single]) (melpa-upstream-visit . [(20130720 333) ((s (1 6 0))) "A set of kludges to visit a melpa-hosted package's homepage" single]) (melpa . [(20130815 2147) nil "special handling for the MELPA repository" single]) (mediawiki . [(20130223 1141) nil "mediawiki frontend" single]) (mc-extras . [(20130909 27) ((multiple-cursors (1 2 1))) "Extra functions for multiple-cursors mode." tar]) (mb-depth+ . [(20131227 137) nil "Indicate minibuffer-depth in prompt" single]) (maxframe . [(20120725 639) nil "maximize the emacs frame based on display size" single]) (maude-mode . [(20130604 725) nil "Emacs mode for the programming language Maude" single]) (math-symbols . [(20130910 31) ((helm (1 0))) "Math Symbol Input methods and conversion tools" tar]) (markup-faces . [(20130117 246) nil "collection of faces for markup language modes" single]) (markup . [(20130207 1309) nil "Simple markup generation helpers." single]) (markdown-mode . [(20131210 700) nil "Emacs Major mode for Markdown-formatted text files" single]) (markdown-mode+ . [(20120829 510) ((markdown-mode (20111229))) "extra functions for markdown-mode" tar]) (mark-tools . [(20130614 325) nil "Some simple tools to access the mark-ring in Emacs" single]) (mark-multiple . [(20121118 754) nil "Sorta lets you mark several regions at once." tar]) (map-regexp . [(20130522 1403) ((cl-lib (0 2))) "map over matches of a regular expression" single]) (map-progress . [(20120927 939) nil "mapping macros that report progress" tar]) (man-commands . [(20130627 1653) nil "Add interactive commands for every manpages installed in your computer." single]) (mallard-snippets . [(20131023 1151) ((yasnippet (0 8 0)) (mallard-mode (0 1 1))) "Yasnippets for Mallard" tar]) (mallard-mode . [(20131203 2025) nil "Major mode for editing Mallard files" tar]) (malabar-mode . [(20131227 2018) ((fringe-helper (1 0 1)) (cl-lib (0 3))) "A better Java mode for Emacs" tar]) (makey . [(20131221 1612) ((cl-lib (0 2))) "interactive commandline mode" single]) (main-line . [(20130404 1904) nil "modeline replacement forked from an early version of powerline.el" single]) (magit-tramp . [(20131224 1023) ((magit (1 2 0))) "git method for TRAMP" tar]) (magit-topgit . [(20131224 1700) ((cl-lib (0 3)) (magit (1 3 0))) "topgit plug-in for Magit" single]) (magit-svn . [(20131210 1547) ((cl-lib (0 3)) (magit (1 3 0))) "git-svn plug-in for Magit" single]) (magit-stgit . [(20131224 1700) ((cl-lib (0 3)) (magit (1 3 0))) "StGit plug-in for Magit" single]) (magit-push-remote . [(20130905 1635) ((magit (1 3 0))) "Push remote support for Magit." tar]) (magit-log-edit . [(20131220 757) ((cl-lib (0 3)) (magit (1 3 0))) "[SEMI-OBSOLETE] major mode for editing Git commit messages" single]) (magit-gh-pulls . [(20130405 928) ((gh (0 4 3)) (magit (1 1 0))) "GitHub pull requests extension for Magit" single]) (magit-find-file . [(20130915 423) ((magit (1 2 0))) "completing-read over all files in Git" single]) (magit-filenotify . [(20131018 255) ((magit (1 3 0))) "Refresh status buffer when git tree changes" single]) (magit-commit-training-wheels . [(20130730 1121) nil "Advice for magit-log-edit-commit" single]) (magit . [(20131226 2100) ((cl-lib (0 3)) (git-commit-mode (0 14 0)) (git-rebase-mode (0 14 0))) "control Git from Emacs" tar]) (mag-menu . [(20130224 56) ((splitter (0 1 0))) "Intuitive keyboard-centric menu system" single]) (macrostep . [(20131219 1002) nil "interactive macro stepper for Emacs Lisp" single]) (macros+ . [(20131227 136) nil "Extensions to `macros.el'." single]) (macro-math . [(20130328 904) nil "in-buffer mathematical operations" single]) (lusty-explorer . [(20130407 1056) nil "Dynamic filesystem explorer and buffer switcher" single]) (lui . [(20131201 620) ((tracking (0))) "Linewise User Interface" tar]) (lua-mode . [(20131018 2259) nil "a major-mode for editing Lua scripts" single]) (love-minor-mode . [(20130429 1459) ((lua-mode (20130419))) "Minor mode for working on L\303\226VE projects" single]) (lorem-ipsum . [(20051013 1756) nil "Insert dummy pseudo Latin text." single]) (loop . [(20130309 805) nil "friendly imperative loop structures" single]) (look-mode . [(20130824 1206) nil "quick file viewer for image and text file browsing" single]) (look-dired . [(20130511 1624) ((look-mode (1 0))) "Extensions to look-mode for dired buffers" single]) (lolcode-mode . [(20111002 147) nil "Major mode for editing LOLCODE" single]) (logito . [(20120225 1255) ((eieio (1 3))) "logging library for Emacs" single]) (logalimacs . [(20131021 1129) ((popwin (0 6 2)) (popup (0 5 0)) (stem (20130120))) "Front-end to logaling-command for Ruby gems" single]) (log4j-mode . [(20101016 822) nil "major mode for viewing log files" single]) (log4e . [(20130514 912) nil "provide logging framework for elisp" single]) (loccur . [(20131022 219) nil "Performs an occur-like folding in current buffer." single]) (loc-changes . [(20130723 1930) nil "Helps users and programs keep track of positions even after buffer changes." single]) (load-theme-buffer-local . [(20120702 1336) nil "Install emacs24 color themes by buffer." single]) (load-relative . [(20130410 249) nil "relative file load (within a multi-file Emacs package)" single]) (livid-mode . [(20131116 544) ((skewer-mode (1 5 3)) (s (1 8 0))) "Live browser eval of JavaScript every time a buffer changes" single]) (livescript-mode . [(20131206 2300) nil "Major mode for editing LiveScript files" single]) (lively . [(20120728 1413) nil "Interactively updating text" single]) (litable . [(20131017 1400) ((dash (1 1 0))) "dynamic evaluation replacement with emacs" single]) (list-utils . [(20131106 706) nil "List-manipulation utility functions" single]) (list-register . [(20130824 1200) nil "List register" single]) (list-processes+ . [(20131117 1935) nil "Add process management to `list-processes'" single]) (list-packages-ext . [(20130927 908) ((s (1 6 0)) (ht (1 5 0)) (persistent-soft (0 8 6))) "Extras for list-packages" single]) (lispyscript-mode . [(20130828 719) nil "Major mode for LispyScript code." single]) (lispxmp . [(20130824 1207) nil "Automagic emacs lisp code annotation" single]) (linum-relative . [(20131210 2053) nil "display relative line number in emacs." single]) (linphone . [(20130524 409) nil "Emacs interface to Linphone" tar]) (link . [(20131005 526) nil "Hypertext links in text buffers" single]) (lib-requires . [(20131227 130) nil "Commands to list Emacs Lisp library dependencies." single]) (lexbind-mode . [(20130327 1801) nil "Puts the value of lexical-binding in the mode line" single]) (levenshtein . [(20051013 1756) nil "Edit distance between two strings." single]) (leuven-theme . [(20131219 1216) nil "Awesome Emacs color theme on white background" single]) (letcheck . [(20130213 1605) nil "Check the erroneous assignments in let forms" single]) (less-css-mode . [(20131001 836) nil "Major mode for editing LESS CSS files (lesscss.org)" single]) (lemon-mode . [(20130216 504) nil "A major mode for editing lemon grammar files" single]) (lein . [(20130406 1312) ((nrepl (0 1 7))) "Eshell interface to Leiningen" single]) (legalese . [(20100119 2148) nil "Add legalese to your program files" single]) (ledger-mode . [(20131228 1611) nil "Helper code for use with the \"ledger\" command-line tool" tar]) (lcs . [(20121201 555) nil "find out the longest common sequence" single]) (launch . [(20130619 1504) nil "launch files with OS-standard associated applications." single]) (latex-pretty-symbols . [(20111011 546) nil "Display many latex symbols as their unicode counterparts" single]) (latex-extra . [(20131201 1453) ((auctex (11 86 1))) "Adds several useful functionalities to LaTeX-mode." single]) (latest-clojure-libraries . [(20131023 543) nil "Clojure dependency resolver" single]) (langtool . [(20130920 407) nil "Grammar check utility using LanguageTool" single]) (langdoc . [(20130605 1631) ((cl-lib (0 2))) "Help to define help document mode for various languages" single]) (lang-refactor-perl . [(20131122 1327) nil "Simple refactorings, primarily for Perl" single]) (lacarte . [(20131227 130) nil "Execute menu items as commands, with completion." single]) (kwin . [(20130206 2231) nil "communcate with the KWin window manager" single]) (kv . [(20130818 337) nil "key/value data structure functions" single]) (know-your-http-well . [(20131125 1540) nil "Look up the meaning of HTTP headers, methods, relations, status codes" tar]) (kmacro-decision . [(20130919 826) ((el-x (1 0)) (jb-misc-macros (0 2))) "Add conditional branching to keyboard macros" single]) (kivy-mode . [(20130712 546) nil "Emacs major mode for editing Kivy files" single]) (kite . [(20130201 1138) ((json (1 2)) (websocket (0 93 1))) "WebKit inspector front-end" tar]) (killer . [(20120808 422) nil "kill and delete text" single]) (kill-ring-search . [(20110605 844) nil "incremental search for the kill ring" tar]) (kibit-mode . [(20131108 1341) nil "No description available." tar]) (keymap-utils . [(20130427 1026) ((cl-lib (0 2))) "keymap utilities" single]) (keyfreq . [(20131109 926) nil "track command frequencies" single]) (keydef . [(20090428 1231) nil "a simpler way to define keys, with kbd syntax" single]) (keychain-environment . [(20121026 1246) nil "load keychain environment variables" single]) (key-combo . [(20131205 1338) nil "map key sequence to commands" tar]) (key-chord . [(20080915 2156) nil "map pairs of simultaneously pressed keys to commands" single]) (kanban . [(20130815 48) nil "Parse org-todo headlines to use org-tables as Kanban tables" single]) (kaesar-mode . [(20130911 745) ((kaesar (0 1 4))) "Encrypt/Decrypt buffer by AES with password." single]) (kaesar-file . [(20130912 212) ((kaesar (0 1 1))) "Encrypt/Decrypt file by AES with password." single]) (kaesar . [(20130914 1709) nil "Another AES algorithm encrypt/decrypt string with password." single]) (jump-to-line . [(20130122 853) nil "Jump to line number at point." single]) (jump-char . [(20130529 1652) nil "navigation by char" single]) (jump . [(20130702 33) ((findr (0 7)) (inflections (1 1))) "build functions which contextually jump between files" single]) (jumblr . [(20131005 1810) ((s (1 8 0)) (dash (2 2 0))) "an anagram game for emacs" tar]) (jtags . [(20111208 1022) nil "enhanced tags functionality for Java development" tar]) (jsx-mode . [(20130908 1024) nil "major mode for JSX" single]) (jss . [(20130508 723) ((emacs (24 1)) (websocket (0)) (js2-mode (0))) "An emacs interface to webkit and mozilla debuggers" tar]) (json-snatcher . [(20131110 1107) ((emacs (24))) "Grabs the path to JSON values in a JSON file" single]) (json-mode . [(20131016 1225) nil "Major mode for editing JSON files" single]) (js3-mode . [(20130904 1444) nil "An improved JavaScript editing mode" tar]) (js2-refactor . [(20131221 501) ((js2-mode (20101228)) (multiple-cursors (1 0 0)) (dash (1 0 0)) (s (1 0 0)) (yasnippet (20130218))) "A JavaScript refactoring library for emacs." tar]) (js2-mode . [(20131221 1908) ((emacs (24 1))) "Improved JavaScript editing mode" tar]) (js-doc . [(20131215 519) nil "Insert JsDoc style comment easily" single]) (js-comint . [(20080530 757) nil "Run javascript in an inferior process window." single]) (jquery-doc . [(20131223 845) nil "jQuery api documentation interface for emacs" tar]) (jknav . [(20121006 1325) nil "Automatically enable j/k keys for line-based navigation" single]) (jira . [(20131210 1822) nil "Connect to JIRA issue tracking software" single]) (jinja2-mode . [(20120827 203) nil "A major mode for jinja2" single]) (jenkins-watch . [(20121004 1626) nil "Watch continuous integration build status" single]) (jedi-direx . [(20130525 1039) ((jedi (0 1 2)) (direx (0 1 -3))) "Tree style source code viewer for Python buffer" single]) (jedi . [(20130714 1228) ((epc (0 1 0)) (auto-complete (1 4))) "Python auto-completion for Emacs" tar]) (javap-mode . [(20120223 1408) nil "Javap major mode" single]) (javadoc-lookup . [(20130618 1736) nil "Javadoc Emacs integration with Maven" tar]) (jaunte . [(20130413 219) nil "Emacs Hit a Hint" single]) (japanlaw . [(20131109 224) ((revive (20121022 1311))) "Japan law from law.e-gov.go.jp" single]) (japanese-holidays . [(20130928 949) ((cl-lib (0 3))) "calendar functions for the Japanese calendar" single]) (jade-mode . [(20131018 1010) ((sws-mode (0))) "Major mode for editing .jade files" single]) (jabber . [(20131130 425) nil "A Jabber client for Emacs." tar]) (j-mode . [(20131224 1309) nil "Major mode for editing J programs" tar]) (iy-go-to-char . [(20130901 729) nil "Go to next CHAR which is similar to \"f\" and \"t\" in vim" single]) (ix . [(20131027 929) ((grapnel (0 5 3))) "Emacs client for http://ix.io pastebin" single]) (itail . [(20130102 1159) nil "An interactive tail mode" single]) (isgd . [(20130927 657) nil "Shorten URLs using the isgd.com shortener service" single]) (isend-mode . [(20130419 258) nil "Interactively send parts of an Emacs buffer to an interpreter" single]) (isearch-symbol-at-point . [(20130728 1521) nil "Use isearch to search for the symbol at point" single]) (isearch-prop . [(20131227 127) nil "Search text-property or overlay-property contexts." single]) (isearch+ . [(20131226 1952) nil "Extensions to `isearch.el' (incremental search)." single]) (irfc . [(20130824 1207) nil "Interface for IETF RFC document." single]) (ir-black-theme . [(20130302 2355) nil "Port of ir-black theme" single]) (iplayer . [(20131228 956) nil "Browse and download BBC TV/radio shows" single]) (interval-tree . [(20130325 707) ((dash (1 1 0))) "Interval tree data structure for 1D range queries" single]) (interaction-log . [(20131106 1757) nil "exhaustive log of interactions with Emacs" single]) (instapaper . [(20130104 621) nil "add URLs to instapaper from emacs" single]) (insfactor . [(20131115 2359) nil "No description available." single]) (insert-shebang . [(20131130 1237) nil "Insert shebang line automatically." single]) (inlineR . [(20120520 732) nil "insert Tag for inline image of R graphics" single]) (inline-crypt . [(20130409 507) nil "Simple inline encryption via openssl" tar]) (inkpot-theme . [(20120505 708) nil "port of vim's inkpot theme" single]) (initsplit . [(20120630 944) nil "code to split customizations into different files" single]) (init-loader . [(20130217 1910) nil "Loader for configuration files" single]) (inform7-mode . [(20131009 2354) ((sws-mode (0 1))) "Major mode for editing Inform 7 source files" single]) (info+ . [(20131226 1951) nil "Extensions to `info.el'." single]) (inflections . [(20121016 157) nil "convert english words between singular and plural" single]) (inf-ruby . [(20131222 1633) nil "Run a Ruby process in a buffer" single]) (inf-php . [(20130414 21) ((php-mode (1 5 0))) "Run a php interactive shell in a buffer" single]) (inf-mongo . [(20131216 228) nil "Run a MongoDB shell process in a buffer" single]) (indent-guide . [(20131227 1854) nil "show vertical lines to guide indentation" single]) (import-popwin . [(20130819 1929) ((popwin (0 6))) "popwin buffer near by import statements with popwin" single]) (impatient-mode . [(20131109 1329) ((simple-httpd (1 4 0)) (htmlize (1 40))) "Serve buffers live over HTTP" tar]) (imenu-anywhere . [(20131210 1130) nil "ido/helm imenu tag selection across all buffers with the same mode" single]) (imenu+ . [(20131226 1948) nil "Extensions to `imenu.el'." single]) (image-dired+ . [(20130604 2309) nil "Image-dired extensions" single]) (image+ . [(20130221 820) nil "Image manupulation extensions for Emacs" single]) (igrep . [(20130824 1207) nil "An improved interface to `grep` and `find`" single]) (ignoramus . [(20131125 1146) nil "Ignore backups, build files, et al." single]) (iflipb . [(20130331 1108) nil "interactively flip between recently visited buffers" single]) (iedit . [(20131021 116) nil "Edit multiple regions in the same way simultaneously." tar]) (idris-mode . [(20131221 1125) nil "Major mode for editing Idris code" tar]) (idomenu . [(20111122 1048) nil "imenu tag selection a la ido" single]) (ido-vertical-mode . [(20131209 938) nil "Makes ido-mode display vertically." single]) (ido-ubiquitous . [(20131009 1047) ((emacs (24 1))) "Use ido (nearly) everywhere." single]) (ido-sort-mtime . [(20131117 530) nil "Sort Ido's file list by modification time" single]) (ido-select-window . [(20131220 1247) ((emacs (24 1))) "Select a window using ido and buffer names" single]) (ido-load-library . [(20131106 706) ((persistent-soft (0 8 8)) (pcache (0 2 3))) "Load-library alternative using ido-completing-read" single]) (ido-hacks . [(20130411 1859) nil "Put more IDO in your IDO" single]) (ido-gnus . [(20130726 1010) ((gnus (5 13))) "Access gnus groups or servers using ido" single]) (ido-complete-space-or-hyphen . [(20130228 208) nil "Complete SPACE or HYPHEN when type SPACE in ido" single]) (ido-at-point . [(20131221 1344) ((emacs (24))) "ido-style completion-at-point" single]) (idle-require . [(20090715 1503) nil "load elisp libraries while Emacs is idle" single]) (idle-highlight-mode . [(20120920 948) nil "highlight the word the point is on" single]) (identica-mode . [(20130204 1453) nil "Major mode API client for status.net open microblogging" tar]) (icomplete+ . [(20131228 51) nil "Extensions to `icomplete.el'." single]) (icicles . [(20131227 2224) nil "Minibuffer input completion and cycling." tar]) (ibuffer-vc . [(20130924 608) ((cl-lib (0 2))) "Group ibuffer's list by VC project, or show VC status" single]) (ibuffer-git . [(20110508 31) nil "show git status in ibuffer column" single]) (iasm-mode . [(20131004 1644) nil "interactive assembly major mode." tar]) (hy-mode . [(20131122 839) nil "Major mode for Hy code" single]) (hungry-delete . [(20120128 1153) nil "hungry delete minor mode" single]) (httpcode . [(20121001 2045) nil "explains the meaning of an HTTP status code" single]) (http-twiddle . [(20121117 812) nil "send & twiddle & resend HTTP requests" single]) (http-post-simple . [(20131011 358) nil "HTTP POST requests using the url library" single]) (htmlize . [(20130207 1202) nil "Convert buffer text and decorations to HTML." single]) (html-to-markdown . [(20131212 1441) nil "HTML to Markdown converter written in Emacs-lisp." single]) (html-script-src . [(20120403 1115) nil "Insert <script src=\"..\"> for popular JavaScript libraries" single]) (ht . [(20131217 610) nil "The missing hash table library for Emacs" single]) (hlinum . [(20130615 834) ((cl-lib (0 2))) "Extension for linum.el to highlight current line number" single]) (hl-todo . [(20130503 1859) nil "highlight TODO keywords in comments" single]) (hl-spotlight . [(20131226 1913) nil "Extension of hl-line.el to spotlight current few lines." single]) (hl-sexp . [(20101130 443) nil "highlight the current sexp" single]) (hl-sentence . [(20110815 954) nil "highlight a sentence based on customizable face" single]) (hl-line+ . [(20131226 1913) nil "Extensions to hl-line.el." single]) (hl-defined . [(20131226 1912) nil "Highlight defined or undefined symbols in Emacs-Lisp." single]) (hive . [(20131217 712) ((sql (3 0))) "Hive SQL mode extension" single]) (historyf . [(20131203 22) nil "file history library like browser" single]) (hippie-namespace . [(20131106 706) nil "Special treatment for namespace prefixes in hippie-expand" single]) (hippie-expand-slime . [(20130907 132) nil "Hook slime's completion into hippie-expand" single]) (hippie-exp-ext . [(20130824 1207) nil "Extension of hippie-expand" single]) (highlight-unique-symbol . [(20130611 2242) ((deferred (0 3 2))) "highlight symbols which not appear in the repository" single]) (highlight-symbol . [(20131103 1336) nil "automatic and manual symbol highlighting" tar]) (highlight-parentheses . [(20130523 852) nil "highlight surrounding parentheses" tar]) (highlight-indentation . [(20131207 835) nil "Minor modes for highlighting indentation" single]) (highlight-escape-sequences . [(20130531 1512) nil "Highlight escape sequences" single]) (highlight-current-line . [(20051013 1756) nil "highlight line where the cursor is." single]) (highlight-cl . [(20091012 1730) nil "Highlighting `cl' functions." single]) (highlight-chars . [(20131226 1906) nil "Highlight specified sets of characters, including whitespace." single]) (highlight . [(20131226 1911) nil "Highlighting commands." single]) (hide-lines . [(20130824 1207) nil "Commands for hiding lines based on a regexp" single]) (hide-comnt . [(20131227 116) nil "Hide/show comments in code." single]) (hi2 . [(20130925 558) nil "indentation module for Haskell Mode" single]) (hexrgb . [(20131226 1855) nil "Functions to manipulate colors, including RGB hex strings." single]) (heroku-theme . [(20130809 2143) nil "Heroku color theme" single]) (heroku . [(20120629 1113) nil "Interface to Heroku apps." single]) (hemisu-theme . [(20130508 1144) nil "Hemisu for Emacs." tar]) (help-mode+ . [(20131226 1855) nil "Extensions to `help-mode.el'" single]) (help-fns+ . [(20131226 1854) nil "Extensions to `help-fns.el'." single]) (help+ . [(20131226 1852) nil "Extensions to `help.el'." single]) (helm-themes . [(20130905 731) ((helm (1 0))) "Color theme selection with helm interface" single]) (helm-swoop . [(20131215 1002) ((helm (1 0)) (emacs (24))) "Efficiently hopping squeezed lines powered by helm interface" tar]) (helm-spotify . [(20131014 1421) ((helm (0 0 0)) (multi (2 0 0))) "Control Spotify with Helm." single]) (helm-spaces . [(20130605 900) ((helm (1 0)) (spaces (0 1 0))) "helm sources for spaces" single]) (helm-sheet . [(20130630 539) ((helm (1 0))) "helm sources for sheet" single]) (helm-rubygems-local . [(20130711 1811) ((helm (1 5 3))) "Installed local rubygems find-file for helm" single]) (helm-recoll . [(20130905 1822) ((helm (1 5 4))) "helm interface for the recoll desktop search tool." single]) (helm-rb . [(20131123 839) ((helm (1 0)) (helm-ag-r (20131123))) "Search Ruby's method by ag and display helm" tar]) (helm-rails . [(20130424 819) ((helm (1 5 1)) (inflections (1 1))) "Helm extension for Rails projects." single]) (helm-pydoc . [(20131204 756) ((helm (1 0))) "pydoc with helm interface" tar]) (helm-projectile . [(20131209 505) ((helm (1 4 0)) (projectile (0 10 0))) "Helm integration for Projectile" single]) (helm-project-persist . [(20130601 1328) ((helm (1 5 2)) (project-persist (0 1 4))) "Helm integration for project-persist package" single]) (helm-orgcard . [(20130608 430) ((helm (1 5 2))) "browse the orgcard by helm" single]) (helm-open-github . [(20131117 2013) ((helm (1 0)) (gh (1 0))) "Utilities of Opening Github Page" single]) (helm-migemo . [(20130820 440) ((helm (1 5 3)) (migemo (1 9))) "Migemo plug-in for helm" single]) (helm-ls-hg . [(20131121 52) nil "List hg files in hg project." single]) (helm-ls-git . [(20131213 110) nil "list git files." single]) (helm-j-cheatsheet . [(20131228 441) ((helm (1 5 3))) "Quick J reference for Emacs" single]) (helm-helm-commands . [(20130902 1048) ((helm (1 5 4))) "List all helm commands with helm" single]) (helm-hatena-bookmark . [(20131128 557) ((helm (1 5 6))) "Hatena::Bookmark helm.el interface" single]) (helm-gtags . [(20131226 711) ((helm (1 5 6))) "GNU GLOBAL helm interface" single]) (helm-go-package . [(20130929 804) ((helm (1 0)) (go-mode (9)) (deferred (0 3 2))) "helm sources for Go programming language's package" single]) (helm-github-stars . [(20131123 817) ((helm (1 5 5))) "Helm integration for your starred repositories on github" single]) (helm-git-grep . [(20131118 437) ((helm (1 0))) "helm for git grep, an incremental git-grep(1)" single]) (helm-git . [(20120630 1403) nil "Helm extension for Git." single]) (helm-gist . [(20120819 1735) ((helm (20120811)) (gist (1 0 1))) "helm-sources and some utilities for gist." single]) (helm-flymake . [(20130716 2244) ((helm (1 0))) "helm interface for flymake" single]) (helm-flycheck . [(20131226 427) ((dash (2 4 0)) (flycheck (0 15)) (helm (1 5 7))) "Show flycheck errors with helm" single]) (helm-emmet . [(20131013 2329) ((helm (1 0)) (emmet-mode (1 0 2))) "helm sources for emmet-mode's snippets" single]) (helm-dired-recent-dirs . [(20131228 614) ((helm (1 0))) "Show recent dirs with helm.el support." single]) (helm-dictionary . [(20131212 410) ((helm (1 5 5))) "Helm source for looking up dictionaries" single]) (helm-descbinds . [(20131102 901) ((helm (1 5))) "Yet Another `describe-bindings' with `helm'." single]) (helm-dash . [(20131228 815) ((sqlite (0 1)) (helm (0 0 0))) "Helm extension to search dash docsets" single]) (helm-css-scss . [(20131110 1830) ((helm (1 0)) (emacs (24))) "CSS/SCSS selector with helm interface" single]) (helm-company . [(20131112 804) ((helm (1 0)) (company (0 6 12))) "Helm interface for company-mode" single]) (helm-cmd-t . [(20131030 1241) nil "cmd-t style completion" tar]) (helm-c-yasnippet . [(20131126 2333) nil "helm source for yasnippet.el" single]) (helm-bm . [(20131224 705) ((bm (1 0)) (cl-lib (0 3)) (helm (1 5 7)) (s (1 8 0))) "helm sources for bm.el" single]) (helm-backup . [(20131227 409) ((helm (1 5 5)) (s (1 8 0))) "Backup each file change using git" single]) (helm-anything . [(20131217 1832) ((helm (20130406)) (anything (20120101))) "Bridge between anything and helm" single]) (helm-ag-r . [(20131123 731) ((helm (1 0))) "Search something by ag and display by helm" single]) (helm-ag . [(20131125 1834) ((helm (1 5 6))) "the silver search with helm interface" single]) (helm-ack . [(20131102 155) ((helm (1 0))) "Ack command with helm interface" single]) (helm-R . [(20120819 1714) ((helm (20120517)) (ess (20120509))) "helm-sources and some utilities for GNU R." single]) (helm . [(20131228 2313) nil "Helm is an Emacs incremental and narrowing framework" tar]) (header2 . [(20131226 1851) nil "Support for creation and update of file headers." single]) (header-button . [(20130110 851) nil "clickable buttons in header lines" single]) (haxe-mode . [(20131004 142) nil "An Emacs major mode for Haxe" single]) (haste . [(20131203 1340) ((json (1 2))) "Emacs client for hastebin (http://hastebin.com/about.md)" single]) (haskell-mode . [(20131222 350) nil "A Haskell editing mode" tar]) (hardhat . [(20131125 1143) ((ignoramus (0 7 0))) "Protect against clobbering user-writable files" single]) (hardcore-mode . [(20111204 2216) nil "Disable arrow keys + optionally backspace and return" single]) (handlebars-sgml-mode . [(20130623 1633) nil "Add Handlebars contextual indenting support to sgml-mode" single]) (handlebars-mode . [(20131122 1406) nil "A major mode for editing Handlebars files." single]) (hamlet-mode . [(20131207 2324) ((cl-lib (0 3)) (dash (2 3 0)) (s (1 7 0))) "Hamlet editing mode" single]) (haml-mode . [(20131015 306) ((ruby-mode (1 0))) "Major mode for editing Haml files" single]) (ham-mode . [(20131209 656) ((html-to-markdown (1 2)) (markdown-mode (2 0))) "Html As Markdown. Transparently edit an html file using markdown." single]) (hackernews . [(20131018 2207) ((json (1 2))) "Access the hackernews aggregator from Emacs" tar]) (gvpr-mode . [(20131208 918) nil "A major mode offering basic syntax coloring for gvpr scripts." single]) (guru-mode . [(20121016 452) nil "Become an Emacs guru" single]) (guide-key . [(20131214 1140) ((popwin (0 3 0))) "Guide the following key bindings automatically and dynamically" single]) (gruvbox-theme . [(20131228 1041) nil "A retro-groove colour theme for Emacs" single]) (gruber-darker-theme . [(20131126 1805) nil "Gruber Darker color theme for Emacs 24." single]) (groovy-mode . [(20131129 409) nil "Groovy mode derived mode" tar]) (grizzl . [(20130810 202) ((cl-lib (0 1))) "Fuzzy Search Library & Completing Read" tar]) (grin . [(20110805 2358) nil "run grin and grind (python replacements for grep and find) putting hits in a grep buffer" single]) (grep-a-lot . [(20131006 647) nil "manages multiple search results buffers for grep.el" single]) (grep+ . [(20131226 1851) nil "Extensions to standard library `grep.el'." single]) (grass-mode . [(20131208 1404) ((cl-lib (0 2))) "Provides Emacs modes for interacting with the GRASS GIS program" single]) (grapnel . [(20131001 834) nil "HTTP request lib with flexible callback dispatch" single]) (graphviz-dot-mode . [(20120821 1441) nil "Mode for the dot-language used by graphviz (att)." single]) (graphene . [(20131203 1152) ((auto-complete (20131121)) (flycheck (20131129)) (smartparens (20131123)) (web-mode (20131125)) (smex (20130707)) (sr-speedbar (20130309)) (project-persist (20131030)) (exec-path-from-shell (20131002)) (scss-mode (20121203)) (markdown-mode (20131005)) (feature-mode (20130714))) "Friendly Emacs defaults." tar]) (grandshell-theme . [(20131228 343) nil "Dark color theme for Emacs > 24 with intensive colors." tar]) (gplusify . [(20121211 522) nil "Add Google Plus markup to a piece of code" single]) (goto-last-change . [(20121115 1014) nil "Move point through buffer-undo-list positions" single]) (goto-chg . [(20131228 1459) nil "goto last change" single]) (gore-mode . [(20131027 2227) nil "Simple mode for gore, a command-line evaluator for golang." single]) (google-weather . [(20110930 155) nil "Fetch Google Weather forecasts." tar]) (google-translate . [(20131124 1319) nil "Emacs interface to Google Translate" single]) (google-this . [(20131031 315) nil "A set of functions and bindings to google under point." single]) (google-maps . [(20130412 230) nil "Access Google Maps from Emacs" tar]) (google-contacts . [(20130430 820) ((oauth2 (0 7))) "Support for Google Contacts in Emacs" tar]) (google-c-style . [(20130412 1415) nil "Google's C/C++ style for c-mode" single]) (golden-ratio . [(20130921 144) nil "Automatic resizing of Emacs windows to the golden ratio" single]) (god-mode . [(20131223 149) nil "God-like command entering minor mode" single]) (go-snippets . [(20130821 844) ((yasnippet (0 8 0))) "Yasnippets for go" tar]) (go-play . [(20120914 1248) nil "Paste to play.golang.org" single]) (go-mode . [(20131112 1935) nil "Major mode for the Go programming language" tar]) (go-errcheck . [(20130308 857) nil "errcheck integration for go-mode" single]) (go-eldoc . [(20131216 511) ((go-mode (0))) "eldoc for go-mode" single]) (go-direx . [(20130808 624) ((direx (0 1 -3))) "Tree style source code viewer for Go language" single]) (go-autocomplete . [(20130809 151) ((auto-complete (1 4 0))) "auto-complete-mode backend for go-mode" single]) (gnus-summary-ext . [(20131222 2021) ((macro-utils (1 0))) "Extra limit and process mark commands for the gnus summary buffer" single]) (gnus-spotlight . [(20130901 1435) nil "Search mail with Spotlight" single]) (gnus-alias . [(20130824 1206) nil "an alternative to gnus-posting-styles" single]) (gnuplot-mode . [(20131203 2159) nil "Major mode for editing gnuplot scripts" single]) (gnuplot . [(20130206 1701) nil "drive gnuplot from within emacs" tar]) (gmail-message-mode . [(20131213 1156) ((ham-mode (1 0))) "A major-mode for editing gmail messages using markdown syntax." single]) (glsl-mode . [(20130815 1435) nil "major mode for Open GLSL shader files" single]) (gitty . [(20121014 742) nil "vc-mode extension for fast git interaction" single]) (gitignore-mode . [(20131222 833) nil "Major mode for editing .gitignore files" single]) (github-browse-file . [(20130515 1247) nil "View the file you're editing on GitHub" single]) (gitconfig-mode . [(20131221 230) nil "Major mode for editing .gitconfig files" single]) (gitconfig . [(20130718 235) nil "Emacs lisp interface to work with git-config variables" single]) (gitattributes-mode . [(20131221 220) nil "Major mode for editing .gitattributes files" single]) (git-rebase-mode . [(20131223 1820) nil "Major mode for editing git rebase files" single]) (git-messenger . [(20130717 1459) ((popup (0 5 0))) "Port of gitmessenger.vim" single]) (git-gutter-fringe . [(20131117 635) ((git-gutter (0 42)) (fringe-helper (0 1 1))) "Fringe version of git-gutter.el" single]) (git-gutter-fringe+ . [(20130902 229) ((git-gutter+ (0 1)) (fringe-helper (20130519 1641))) "Fringe version of git-gutter+.el" single]) (git-gutter . [(20131002 256) nil "Port of Sublime Text plugin GitGutter" single]) (git-gutter+ . [(20130918 435) ((git-commit-mode (1 0))) "Manage Git hunks straight from the buffer" single]) (git-dwim . [(20130130 2150) nil "Context-aware git commands such as branch handling" single]) (git-commit-training-wheels-mode . [(20131121 544) ((git-commit-mode (0 14 0))) "Helps you craft well formed commit messages with git-commit-mode" single]) (git-commit-mode . [(20131124 1840) nil "Major mode for editing git commit messages" single]) (git-blame . [(20110509 926) nil "Minor mode for incremental blame for Git" single]) (git-auto-commit-mode . [(20131007 1423) nil "Emacs Minor mode to automatically commit and push" single]) (git-annex . [(20131119 1445) nil "Mode for easy editing of git-annex'd files" single]) (git . [(20130915 32) ((s (1 7 0)) (dash (2 2 0)) (f (0 10 0))) "An Elisp API for programmatically using Git" single]) (gist . [(20131109 2155) ((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0))) "Emacs integration for gist.github.com" single]) (ghci-completion . [(20130310 836) ((emacs (24 1))) "Completion for GHCi commands in inferior-haskell buffers" single]) (ghc . [(20131217 2253) nil "Sub mode for Haskell mode" tar]) (gh . [(20131223 2140) ((eieio (1 3)) (pcache (0 2 4)) (logito (0 1))) "A GitHub library for Emacs" tar]) (ggtags . [(20131221 36) ((emacs (24))) "emacs frontend to GNU Global source code tagging system" single]) (ggo-mode . [(20130524 443) nil "Gengetopt major mode" single]) (genrnc . [(20130711 2251) ((deferred (0 3 1)) (log4e (0 2 0)) (yaxception (0 1))) "generate RELAX NG Compact Schema from RELAX NG Schema, XML Schema and DTD." tar]) (geiser . [(20131208 1817) nil "GNU Emacs and Scheme talk to each other" tar]) (gedit-mode . [(20131117 55) ((tabbar (0)) (sr-speedbar (0)) (shell-pop (0)) (move-text (0)) (whole-line-or-region (0))) "Emulate the look & feel of GEdit in Emacs" single]) (geben . [(20100330 343) nil "DBGp protocol frontend, a script debugger" tar]) (gather . [(20130422 1550) nil "Gather string in buffer." single]) (gap-mode . [(20131212 2130) nil "Major mode for editing files in the GAP programing language." tar]) (gandalf-theme . [(20130809 247) nil "Gandalf color theme" single]) (fyure . [(20130216 514) nil "An interface to fix Japanese hyoki-yure" tar]) (fwb-cmds . [(20131209 1600) nil "misc frame, window and buffer commands" single]) (fuzzy-match . [(20131226 1850) nil "fuzzy matching" single]) (fuzzy-format . [(20130824 1200) nil "select indent-tabs-mode and format code automatically." single]) (fuzzy . [(20131025 2343) nil "Fuzzy Matching" single]) (furl . [(20110112 1707) nil "Friendly URL retrieval" single]) (fullscreen-mode . [(20130524 956) nil "fullscreen window support for Emacs" single]) (fullframe . [(20131219 652) nil "Generalized automatic execution in a single frame" single]) (full-ack . [(20130423 1304) nil "a front-end for ack" tar]) (fuel . [(20131212 824) ((cl-lib (0 2)) (emacs (24 2))) "Major mode for the Factor programming language." tar]) (fsharp-mode . [(20131108 1322) ((auto-complete (1 4)) (popup (0 5)) (pos-tip (0 4 5)) (s (1 3 1)) (dash (1 1 0))) "F# mode for Emacs" tar]) (fringe-helper . [(20130519 741) nil "helper functions for fringe bitmaps" tar]) (free-keys . [(20131222 740) ((cl-lib (0 3))) "Show free keybindings for modkeys or prefixes" single]) (framesize . [(20131017 1432) ((key-chord (0 5 20080915))) "change the size of frames in Emacs" single]) (framemove . [(20130328 1133) nil "directional frame selection routines" single]) (frame-tag . [(20120527 136) nil "Minor mode that assigns a unique number to each frame for easy switching" single]) (frame-restore . [(20130922 735) ((dash (1 2)) (f (0 11)) (emacs (24 1))) "Restore Emacs frame" single]) (frame-fns . [(20131226 1849) nil "Non-interactive frame and window functions." single]) (frame-cmds . [(20131226 1849) nil "Frame and window commands (interactive functions)." single]) (foreign-regexp . [(20130618 321) nil "search and replace by foreign regexp." tar]) (font-utils . [(20131106 706) ((persistent-soft (0 8 8)) (pcache (0 2 3))) "Utility functions for working with fonts" single]) (font-lock-menus . [(20131226 1847) nil "Font-lock menus: enhanced `font-menus.el'" single]) (font-lock+ . [(20131226 1846) nil "Enhancements to standard library `font-lock.el'." single]) (fold-this . [(20131113 247) nil "Just fold this region please" single]) (fold-dwim-org . [(20131203 551) ((fold-dwim (1 2))) "Fold DWIM bound to org key-strokes." single]) (fold-dwim . [(20120926 336) nil "No description available." single]) (fm . [(20130126 1618) nil "follow mode for compilation/output buffers" single]) (flyspell-lazy . [(20131106 706) nil "Improve flyspell responsiveness using idle timers" single]) (flymake-yaml . [(20130423 848) ((flymake-easy (0 1))) "A flymake handler for YAML" single]) (flymake-shell . [(20121104 1100) ((flymake-easy (0 1))) "A flymake syntax-checker for shell scripts" single]) (flymake-sass . [(20121218 12) ((flymake-easy (0 1))) "Flymake handler for sass and scss files" single]) (flymake-rust . [(20131020 345) ((flymake-easy (0 1))) "A flymake handler for rust-mode files" single]) (flymake-ruby . [(20121104 1059) ((flymake-easy (0 1))) "A flymake handler for ruby-mode files" single]) (flymake-racket . [(20131209 2157) ((flymake-easy (0 1))) "A flymake handler for scheme-mode files" single]) (flymake-python-pyflakes . [(20131127 6) ((flymake-easy (0 8))) "A flymake handler for python-mode files using pyflakes (or flake8)" single]) (flymake-puppet . [(20130731 2203) ((flymake-easy (0 9))) "An Emacs flymake handler for syntax-checking puppet using puppet-lint" single]) (flymake-php . [(20121104 1102) ((flymake-easy (0 1))) "A flymake handler for php-mode files" single]) (flymake-perlcritic . [(20120328 114) ((flymake (0 3))) "Flymake handler for Perl to invoke Perl::Critic" tar]) (flymake-lua . [(20130329 310) nil "Flymake for Lua" single]) (flymake-json . [(20130423 2357) ((flymake-easy (0 1))) "A flymake handler for json using jsonlint" single]) (flymake-jslint . [(20130613 202) ((flymake-easy (0 1))) "A flymake handler for javascript using jslint" single]) (flymake-jshint . [(20130610 257) ((flymake-easy (0 1))) "making flymake work with JSHint" single]) (flymake-hlint . [(20130309 145) ((flymake-easy (0 1))) "A flymake handler for haskell-mode files using hlint" single]) (flymake-haskell-multi . [(20130620 422) ((flymake-easy (0 1))) "Syntax-check haskell-mode using both ghc and hlint" tar]) (flymake-haml . [(20130324 351) ((flymake-easy (0 1))) "A flymake handler for haml files" single]) (flymake-go . [(20130314 741) ((flymake (0 4 13))) "A flymake handler for go-mode files" single]) (flymake-gjshint . [(20130327 532) nil "A flymake handler for javascript using both jshint and gjslint" single]) (flymake-elixir . [(20130810 717) nil "A flymake handler for elixir-mode .ex files." single]) (flymake-easy . [(20130907 131) nil "Helpers for easily building flymake checkers" single]) (flymake-cursor . [(20130822 1032) nil "displays flymake error msg in minibuffer after delay" single]) (flymake-css . [(20121104 1104) ((flymake-easy (0 1))) "Flymake support for css using csslint" single]) (flymake-coffee . [(20130828 258) ((flymake-easy (0 1))) "A flymake handler for coffee script" single]) (flycheck-tip . [(20131025 320) ((flycheck (0 13)) (dash (1 2)) (emacs (24 1)) (popup (0 5 0))) "show flycheck's error by popup-tip" single]) (flycheck-ledger . [(20131218 324) ((flycheck (0 15))) "Flycheck integration for ledger files" single]) (flycheck-hdevtools . [(20131130 1105) ((flycheck (0 15))) "A flycheck checker for Haskell using hdevtools" single]) (flycheck-d-unittest . [(20131017 1652) ((flycheck (0 14)) (dash (1 4 0))) "Add D unittest support to flycheck" single]) (flycheck-color-mode-line . [(20131125 2138) ((flycheck (0 15)) (dash (1 2)) (emacs (24 1))) "Change mode line color with Flycheck status" single]) (flycheck-cask . [(20130818 253) ((flycheck (0 14)) (dash (2 0 0)) (f (0 6 0))) "Cask support in Flycheck" single]) (flycheck . [(20131224 546) ((s (1 6 0)) (dash (2 0 0)) (f (0 6 0)) (pkg-info (0 4)) (cl-lib (0 3)) (emacs (24 1))) "On-the-fly syntax checking (Flymake done right)" tar]) (flx-ido . [(20131030 1243) ((flx (0 1)) (cl-lib (0 3))) "flx integration for ido" single]) (flx . [(20130728 820) ((cl-lib (0 3))) "fuzzy matching with good sorting" single]) (floobits . [(20131223 1310) ((json (1 2)) (highlight (0))) "Floobits plugin for real-time collaborative editing" tar]) (fliptext . [(20131114 218) nil "Input method for flipping characters upside down" single]) (flex-isearch . [(20130508 1503) nil "Flex matching (like ido) in isearch." single]) (flex-autopair . [(20120809 518) nil "Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable." single]) (flatland-theme . [(20131204 858) nil "A simple theme for Emacs based on the Flatland theme for Sublime Text" single]) (flash-region . [(20130923 1117) nil "Flash a region" single]) (fixmee . [(20131106 706) ((button-lock (1 0 0)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 3 2)) (tabulated-list (0))) "Quickly navigate to FIXME notices in code" single]) (fit-frame . [(20131226 1844) nil "Resize a frame.  In particular, fit a frame to its buffers." single]) (fiplr . [(20130810 141) ((grizzl (0 1 0)) (cl-lib (0 1))) "Fuzzy Search for Files in Projects" tar]) (findr . [(20130824 1207) nil "Breadth-first file-finding facility for (X)Emacs" single]) (finder+ . [(20131226 1844) nil "Extensions to standard library finder.el" single]) (find-things-fast . [(20120920 1804) nil "Find things fast, leveraging the power of git" single]) (find-file-in-repository . [(20130221 511) nil "Quickly find files in a git, mercurial or other repository" single]) (find-file-in-project . [(20120716 1655) nil "Find files in a project quickly." single]) (fill-column-indicator . [(20130807 619) nil "Graphically indicate the fill column" tar]) (filesets+ . [(20131226 1842) nil "Extensions to `filesets.el'." single]) (files+ . [(20131226 1841) nil "Enhancements of standard library `files.el'." single]) (figlet . [(20120601 1315) nil "Annoy people with big, ascii art text" single]) (fic-mode . [(20130824 1158) nil "Show FIXME/TODO/BUG/KLUDGE in special face only in comments and strings" single]) (fetch . [(20131130 2330) nil "Fetch and unpack resources" single]) (feature-mode . [(20130714 1319) nil "Major mode for editing Gherkin (i.e. Cucumber) user stories" tar]) (fastnav . [(20120211 657) nil "Fast navigation and editing routines." single]) (fasm-mode . [(20131029 611) nil "Fasm major mode" single]) (fasd . [(20130831 1003) ((grizzl (0))) "Emacs integration for the command-line productivity booster `fasd'" single]) (fakir . [(20130711 1322) ((noflet (0 0 8)) (dash (1 3 2))) "fakeing bits of Emacs" single]) (fakespace . [(20120817 1706) nil "fake namespaces with defpackage" single]) (factlog . [(20130209 1740) ((deferred (0 3 1))) "File activity logger" single]) (faces+ . [(20131226 1840) nil "Extensions to `faces.el'." single]) (facemenu+ . [(20131226 1839) nil "Extensions to `facemenu.el'." single]) (face-remap+ . [(20131226 1839) nil "Extensions to standard library `face-remap.el'." single]) (f . [(20131225 721) ((s (1 7 0)) (dash (2 2 0))) "Modern API for working with files and directories" single]) (ez-query-replace . [(20130925 1014) ((dash (1 2 0))) "A helpful query-replace." single]) (eyedropper . [(20131226 1838) ((hexrgb (0))) "Pick foreground and background colors at cursor or pointer." single]) (extend-dnd . [(20130328 1034) nil "R drag and Drop" tar]) (express . [(20131106 706) ((string-utils (0 3 2))) "Alternatives to `message'" single]) (expand-region . [(20131111 329) nil "Increase selected region by semantic units." tar]) (exec-path-from-shell . [(20131205 1210) nil "Get environment variables such as $PATH from the shell" single]) (evm . [(20131201 619) ((dash (2 3 0)) (f (0 13 0))) "Emacs Version Manager" single]) (evil-visualstar . [(20130925 1114) ((evil (0))) "Starts a * or # search from the visual selection" single]) (evil-tabs . [(20131011 433) ((evil (0 0 0)) (elscreen (0 0 0))) "Integrating Vim-style tabs for Evil mode users." single]) (evil-paredit . [(20130408 47) ((evil (0 0 0)) (paredit (1))) "Paredit support for evil keybindings" single]) (evil-numbers . [(20121108 1738) nil "increment/decrement numbers like in vim" single]) (evil-nerd-commenter . [(20131225 2138) nil "Comment/uncomment lines efficiently. Like Nerd Commenter in Vim" tar]) (evil-matchit . [(20131220 609) nil "Vim matchit ported into Emacs (requires EVIL)" tar]) (evil-leader . [(20130921 454) ((evil (0))) "let there be <leader>" single]) (evil-indent-textobject . [(20130831 1519) ((evil (0))) "evil textobjects based on indentation" single]) (evil . [(20131227 724) ((undo-tree (0 6 3)) (goto-last-change (1 2))) "Extensible Vi layer for Emacs." tar]) (ethan-wspace . [(20130518 708) nil "whitespace customizations for emacs" single]) (etags-table . [(20130824 1157) nil "Set tags table(s) based on current file" single]) (esxml . [(20130512 1547) ((kv (0 0 5))) "Library for working with xml via esxml and sxml" single]) (esup . [(20130607 1350) nil "the Emacs StartUp Profiler (ESUP)" single]) (ess-R-object-popup . [(20130302 336) ((popup (20130117 1954)) (ess (20130225 1754))) "popup description of R object" single]) (ess-R-data-view . [(20130509 458) ((ctable (20130313 1743)) (popup (20130324 1305)) (ess (20130225 1754))) "Data viewer for GNU R" single]) (ess . [(20131207 1141) nil "No description available." tar]) (espuds . [(20131026 1121) ((s (1 7 0)) (dash (2 2 0)) (noflet (0 0 10)) (f (0 12 1))) "Ecukes step definitions" single]) (espresso-theme . [(20130228 2348) nil "Espresso Tutti Colori port for Emacs" single]) (esh-help . [(20130908 1850) ((dash (1 4 0))) "Add some help functions and support for Eshell" single]) (esh-buf-stack . [(20130620 754) nil "Add a buffer stack feature to Eshell" single]) (escreen . [(20091203 1013) nil "emacs window session manager" single]) (es-lib . [(20131029 107) ((cl-lib (0 3))) "A collection of emacs utilities" tar]) (ert-runner . [(20131219 905) ((s (1 6 1)) (dash (1 8 0)) (f (0 10 0)) (commander (0 2 0)) (ansi (0 1 0))) "Opinionated Ert testing workflow" tar]) (ert-expectations . [(20130824 1200) nil "The simplest unit test framework in the world" single]) (erlang . [(20131025 6) nil "Erlang major mode" tar]) (ergoemacs-mode . [(20131223 839) nil "Emacs mode based on common modern software interface and ergonomics." tar]) (erefactor . [(20130521 238) nil "Emacs-Lisp refactoring utilities" single]) (eredis . [(20120808 2007) nil "eredis, a Redis client in emacs lisp" single]) (ercn . [(20121230 1013) nil "Flexible ERC notifications" single]) (erc-tweet . [(20130618 1301) ((erc (5 3))) "shows text of a tweet when an url is posted in erc buffers" single]) (erc-track-score . [(20130328 515) nil "Add score support to tracked channel buffers" single]) (erc-terminal-notifier . [(20131028 343) nil "OSX notifications via the terminal-notifier gem for Emacs ERC." single]) (erc-image . [(20131125 1151) ((erc (5 3))) "Show received image urls in the ERC buffer" single]) (erc-hl-nicks . [(20130114 1348) nil "ERC nick highlighter that ignores uniquifying chars when colorizing" single]) (eproject . [(20130220 1109) nil "assign files to projects, programatically" tar]) (epl . [(20131101 405) ((cl-lib (0 3))) "Emacs Package Library" single]) (epic . [(20130319 2340) ((htmlize (1 47))) "Evernote Picker" tar]) (epc . [(20130803 2228) ((concurrent (0 3 1)) (ctable (0 1 2))) "A RPC stack for the Emacs Lisp" tar]) (ensime . [(20131030 1503) ((s (1 3 0)) (dash (1 0 3)) (popup (0 5 0)) (auto-complete (1 4 0)) (scala-mode2 (0 21))) "ENhanced Scala Interaction Mode for Emacs" tar]) (enotify . [(20130407 648) nil "A networked notification system for emacs" tar]) (enh-ruby-mode . [(20131129 1833) nil "Major mode for editing Ruby files" tar]) (enclose . [(20121008 914) nil "Enclose cursor within punctuation pairs." tar]) (emr . [(20130619 316) ((s (1 3 1)) (dash (1 2 0)) (cl-lib (0 2)) (popup (0 5 0)) (emacs (24 1)) (list-utils (0 3 0)) (redshank (1 0 0)) (paredit (24 0 0)) (projectile (0 9 1))) "Emacs refactoring system." tar]) (emms-soundcloud . [(20131221 345) ((emms (20131016)) (json (1 2))) "EMMS source for Soundcloud audio sharing platform" single]) (emms-mark-ext . [(20130528 2027) ((emms (3 0))) "Extra functions for emms-mark-mode and emms-tag-edit-mode" single]) (emms-info-mediainfo . [(20131223 500) ((emms (0))) "Info-method for EMMS using medianfo" single]) (emms . [(20131016 932) nil "The Emacs Multimedia System" tar]) (emmet-mode . [(20130915 1708) nil "Unofficial Emmet's support for emacs" single]) (emamux-ruby-test . [(20130812 939) ((emamux (0 1)) (projectile (0 9 1))) "Ruby test with emamux" single]) (emamux . [(20130331 753) nil "Interact with tmux" single]) (emagician-fix-spell-memory . [(20130415 1244) nil "Simple hack into ispell to fix (muscle) memory problems" single]) (emacsc . [(20131027 225) nil "helper for emacsc(1)" tar]) (emacs-setup . [(20120727 726) nil "Package for maintaining your emacs configuration. Clean up your .emacs!" tar]) (emacs-eclim . [(20131021 1136) ((json (1 2))) "An interface to the Eclipse IDE." tar]) (elx . [(20131209 922) ((emacs (24 3 50))) "extract information from Emacs Lisp libraries" single]) (elscreen-mew . [(20131201 36) ((elscreen (20120413 1107))) "ElScreen Add-On for Mew" single]) (elscreen . [(20120413 807) nil "Emacs window session manager" single]) (elpy . [(20131109 1120) ((auto-complete (1 4)) (find-file-in-project (3 2)) (fuzzy (0 1)) (highlight-indentation (0 5 0)) (idomenu (0 1)) (iedit (0 97)) (nose (0 1 1)) (virtualenv (1 2)) (yasnippet (0 8 0))) "Emacs Python Development Environment" tar]) (elpa-audit . [(20130514 409) nil "Handy functions for inspecting and comparing package archives" single]) (elnode . [(20130416 826) ((web (0 1 4)) (creole (0 8 14)) (fakir (0 0 14)) (db (0 0 5)) (kv (0 0 15))) "The Emacs webserver." tar]) (elmine . [(20130330 1300) nil "Redmine API access via elisp." single]) (elixir-yasnippets . [(20130908 1930) ((yasnippet (0 8 0))) "Yasnippets for Elixir" tar]) (elixir-mode . [(20131126 924) nil "Major mode for editing Elixir files" tar]) (elixir-mix . [(20131126 4) nil "Emacs integration for Elixir's mix" single]) (elisp-slime-nav . [(20130612 446) ((cl-lib (0 2))) "Make M-. and M-, work in elisp like they do in slime" single]) (elisp-sandbox . [(20131116 1042) nil "Evaluate EmacsLisp expressions in a sandbox" single]) (elisp-depend . [(20120427 123) nil "Parse depend libraries of elisp file." single]) (elhome . [(20131202 1108) ((initsplit (20120630))) "A framework for a \"home\" Emacs configuration" tar]) (elfeed-web . [(20130908 1434) ((simple-httpd (1 4 3)) (elfeed (1 0 1)) (emacs (24 1))) "web interface to Elfeed" tar]) (elfeed . [(20131220 1720) ((emacs (24 1))) "an Emacs Atom/RSS feed reader" tar]) (elein . [(20120120 316) nil "running leiningen commands from emacs" single]) (electric-case . [(20130620 154) nil "insert camelCase, snake_case words without \"Shift\"ing" single]) (eldoc-extension . [(20130824 1156) nil "Some extension for eldoc" single]) (eldoc-eval . [(20131108 612) nil "Enable eldoc support when minibuffer is in use." single]) (el-x . [(20131006 923) nil "main entry point for el-x package" tar]) (el-swank-fuzzy . [(20130824 1157) nil "fuzzy symbol completion." single]) (el-spy . [(20131226 1208) nil "Mocking framework for Emacs lisp. It also support spy, proxy." single]) (el-spice . [(20131105 1211) ((thingatpt+ (0))) "Extra spice for emacs lisp programming" tar]) (el-spec . [(20121018 4) nil "ruby's rspec like syntax test frame work" single]) (el-mock . [(20130806 1348) nil "Tiny Mock and Stub framework in Emacs Lisp" single]) (el-autoyas . [(20120918 617) nil "Automatically create Emacs-Lisp Yasnippets" tar]) (ein . [(20130711 104) ((websocket (0 9)) (request (0 2)) (auto-complete (1 4))) "Emacs IPython Notebook" tar]) (eimp . [(20091025 922) nil "Emacs Image Manipulation Package" single]) (egison-mode . [(20131118 1726) nil "Egison editing mode" single]) (egg . [(20130701 1725) nil "Emacs Got Git - Emacs interface to Git" tar]) (efire . [(20130811 1649) ((circe (1 2))) "Use campfire from Emacs" single]) (editorconfig . [(20131024 119) nil "EditorConfig Emacs extension" single]) (edit-server-htmlize . [(20130329 1548) ((edit-server (1 9))) "(de)HTMLization hooks for edit-server.el" single]) (edit-server . [(20131229 441) nil "server that responds to edit requests from Chrome" single]) (edit-list . [(20100930 743) nil "edit a single list" single]) (edit-color-stamp . [(20130529 1033) ((es-lib (0 2)) (cl-lib (1 0))) "Edit a hex color stamp, using a QT or the internal color picker" tar]) (edebug-x . [(20130615 2155) nil "Extensions for Edebug" single]) (edbi . [(20130809 556) ((concurrent (0 3 1)) (ctable (0 1 2)) (epc (0 1 1))) "Emacs Database Interface" tar]) (ecukes . [(20131225 758) ((f (0 11 0)) (s (1 8 0)) (dash (2 2 0)) (ansi (0 3 0)) (espuds (0 2 2)) (commander (0 5 1))) "Cucumber for Emacs." tar]) (ecb . [(20131116 1319) nil "a code browser for Emacs" tar]) (ebib . [(20131206 1914) nil "a BibTeX database manager" tar]) (easy-kill . [(20131212 156) ((emacs (24))) "kill things easily" single]) (easy-after-load . [(20121224 1849) nil "eval-after-load for all files in a directory" single]) (e2wm-svg-clock . [(20130303 1326) ((e2wm (20130225 1602)) (svg-clock (0 4))) "e2wm plugin for svg-clock" single]) (e2wm-bookmark . [(20120811 2350) ((e2wm (1 2))) "Bookmark plugin for e2wm.el" single]) (e2wm-R . [(20130505 2208) ((e2wm (20130225 1602)) (inlineR (20120520 2332)) (ess (20130225 1754))) "some e2wm plugin and perspective for GNU R" single]) (e2wm . [(20130909 2314) ((window-layout (1 2))) "simple window manager for emacs" tar]) (dynamic-fonts . [(20131106 706) ((font-utils (0 7 0)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Set faces based on available fonts" single]) (dylan-mode . [(20131020 1953) nil "Major mode for editing Dylan programs." tar]) (duplicate-thing . [(20120515 948) nil "Duplicate current line & selection" single]) (dummy-h-mode . [(20130824 1159) nil "switch major mode to c-/c++-/objc-mode on .h file" single]) (dsvn . [(20130120 1257) nil "Subversion interface" single]) (drupal-spell . [(20130520 955) nil "Aspell extra dictionary for Drupal" tar]) (drupal-mode . [(20131209 3) ((php-mode (1 5 0))) "Advanced minor mode for Drupal development" tar]) (dropdown-list . [(20120329 1636) nil "Drop-down menu interface" single]) (dropbox . [(20130513 1537) ((json (1 2)) (oauth (1 0 3))) "Emacs backend for dropbox" single]) (drill-instructor-AZIK-force . [(20120907 1817) ((popup (0 5))) "Support AZIK input" tar]) (drag-stuff . [(20130412 212) nil "Drag stuff (lines, words, region, etc...) around" tar]) (dpaste_de . [(20131015 525) ((web (0 3 7))) "Emacs mode to paste to dpaste.de" single]) (dpaste . [(20120823 1136) nil "Emacs integration for dpaste.com" single]) (dot-mode . [(20100803 1208) nil "Minor mode to repeat typing or commands" single]) (doremi-mac . [(20131226 1835) nil "A macro for defining Do Re Mi commands." single]) (doremi-frm . [(20131226 1834) ((doremi (0)) (faces+ (0)) (frame-fns (0)) (hexrgb (0))) "Incrementally adjust face attributes and frame parameters." single]) (doremi-cmd . [(20131226 1833) ((doremi (0))) "Miscellaneous Do Re Mi commands" single]) (doremi . [(20131226 1835) nil "Do Re Mi: Incremental change using arrow keys or mouse wheel." single]) (dom . [(20091224 1827) nil "DOM implementation" single]) (dollaro . [(20130620 1325) ((s (1 6 0))) "simple text templates" single]) (dockerfile-mode . [(20131118 620) nil "Major mode for editing Docker's Dockerfiles" single]) (docbook-snippets . [(20130716 1849) ((yasnippet (0 8 0))) "Yasnippets for DocBook" tar]) (dna-mode . [(20130821 1105) nil "a major mode for editing dna sequences" tar]) (dkmisc . [(20131110 315) ((emacs (24 1))) "Miscellaneous functions required by dk* packages." tar]) (dklrt . [(20131110 541) ((dkmisc (0 50)) (ledger-mode (20130908 1357)) (emacs (24 1))) "Ledger Recurring Transactions." tar]) (dkdo . [(20131110 319) ((dkmisc (0 50)) (emacs (24 1))) "Do List major mode based on org-mode." tar]) (django-theme . [(20131022 202) nil "Custom face theme for Emacs" single]) (dizzee . [(20111009 616) nil "A more pleasant way to manage your project's subprocesses in Emacs." tar]) (dispass . [(20130525 434) nil "Emacs wrapper for DisPass" single]) (disk . [(20081128 1506) nil "simplified find-file, revert-file, save-buffer interface" single]) (discover . [(20131226 1534) ((makey (0 2))) "discover more of Emacs" single]) (disaster . [(20130509 1055) nil "Disassemble C/C++ code under cursor in Emacs" single]) (direx . [(20130930 1224) nil "Simple Directory Explorer" tar]) (dired-toggle-sudo . [(20131022 626) nil "Browse directory with sudo privileges." single]) (dired-toggle . [(20131023 110) nil "provide a simple way to toggle dired buffer for current directory" single]) (dired-sort-menu . [(20130824 1207) nil "provide menu/dialogue for dired sort options" single]) (dired-sort-menu+ . [(20131226 1833) ((dired-sort-menu (0))) "Extensions to `dired-sort-menu.el'" single]) (dired-single . [(20130824 1200) nil "Reuse the current dired buffer to visit another directory" single]) (dired-efap . [(20131121 209) nil "Edit Filename At Point in a dired buffer" single]) (dired-dups . [(20130527 1425) nil "Find duplicate files and display them in a dired buffer" single]) (dired-details . [(20130824 1158) nil "make file details hide-able in dired" single]) (dired-details+ . [(20131226 1832) ((dired-details (0))) "Enhancements to library `dired-details+.el'." single]) (dired+ . [(20131226 1831) nil "Extensions to Dired." single]) (dircmp . [(20130806 1157) nil "Compare and sync directories." tar]) (diminish . [(20091203 1012) nil "Diminished modes are minor modes with no modeline display" single]) (dim-autoload . [(20131019 120) nil "dim complete autoload cookie lines" single]) (diff-hl . [(20131114 53) ((cl-lib (0 2))) "Highlight uncommitted changes" tar]) (dictionary . [(20131005 526) ((connection (1 10)) (link (1 10))) "Client for rfc2229 dictionary servers" single]) (dic-lookup-w3m . [(20121101 1033) ((w3m (20120723 324)) (stem (20120826))) "look up dictionaries on the Internet" tar]) (desktop-registry . [(20130807 1327) nil "Keep a central registry of desktop files" single]) (delim-kill . [(20100516 2320) nil "Kill text between delimiters." single]) (deft . [(20131027 757) nil "quickly browse, filter, and edit plain text notes" single]) (deferred . [(20130930 607) nil "Simple asynchronous functions for emacs lisp" single]) (dedukti-mode . [(20131114 1216) nil "Major mode for Dedukti files" single]) (dedicated . [(20090428 1231) nil "A very simple minor mode for dedicated buffers" single]) (debpaste . [(20131226 732) ((xml-rpc (1 6 7))) "Interface for getting/posting/deleting pastes from paste.debian.net" single]) (db-pg . [(20130131 1102) ((pg (0 12)) (db (0 0 6))) "A PostgreSQL adapter for emacs-db" single]) (db . [(20130125 1029) ((kv (0 0 11))) "A database for EmacsLisp" single]) (dayone . [(20131117 255) ((uuid (0 0 3)) (mustache (0 22)) (ht (1 5))) "Utility script for Day One" tar]) (datomic-snippets . [(20130707 1315) ((s (1 4 0)) (dash (1 2 0)) (yasnippet (0 6 1))) "Yasnippets for Datomic" tar]) (dash-functional . [(20130831 1340) ((dash (2 0 0)) (emacs (24))) "Collection of useful combinators for Emacs Lisp" single]) (dash-at-point . [(20131218 1724) nil "Search the word at point with Dash" single]) (dash . [(20131223 933) nil "A modern list library for Emacs" single]) (dart-mode . [(20130906 1244) nil "Major mode for editing Dart files" single]) (darcsum . [(20131103 1031) nil "a pcl-cvs like interface for managing darcs patches" tar]) (dakrone-theme . [(20131212 1159) nil "dakrone's custom dark theme" single]) (d-mode . [(20130909 150) nil "D Programming Language mode for (X)Emacs" single]) (cycbuf . [(20131203 1237) nil "Cycle buffers, inspired by swbuff.el, swbuff-x.el, and bs.el" single]) (cyberpunk-theme . [(20131205 1256) nil "Cyberpunk Color Theme" single]) (cus-edit+ . [(20131226 1825) nil "Enhancements to `cus-edit.el'." single]) (cursor-test . [(20131207 932) ((emacs (24))) "testing library for cursor position in emacs." single]) (cursor-chg . [(20131226 1824) nil "Change cursor dynamically, depending on the context." single]) (cucumber-goto-step . [(20131209 2119) ((pcre2el (1 5))) "Jump to cucumber step definition" single]) (ctags-update . [(20131125 743) nil "(auto) update TAGS in parent directory using exuberant-ctags" single]) (ctags . [(20110911 304) nil "Exuberant Ctags utilities for Emacs" single]) (ctable . [(20131202 2114) nil "Table component for Emacs Lisp" single]) (csv-nav . [(20130407 1820) nil "navigate and edit CSV files" single]) (cssh . [(20120823 1241) nil "clusterssh implementation for emacs" single]) (css-eldoc . [(20130902 135) nil "an eldoc-mode plugin for CSS source code" tar]) (csharp-mode . [(20130824 1200) nil "C# mode derived mode" single]) (cryptol-mode . [(20131010 1354) nil "Cryptol major mode for Emacs" single]) (crosshairs . [(20131226 1823) ((hl-line+ (0)) (col-highlight (0)) (vline (0))) "Highlight the current line and column." single]) (crontab-mode . [(20090510 1355) nil "Mode for editing crontab files" single]) (creole-mode . [(20130721 1750) nil "a markup mode for creole" single]) (creole . [(20130802 122) ((noflet (0 0 3)) (kv (0 0 17))) "A parser for the Creole Wiki language" single]) (crappy-jsp-mode . [(20121117 956) nil "A pretty crappy major-mode for jsp." single]) (crab . [(20130609 958) ((websocket (1 0)) (json (1 2))) "WebSocket server to remotely control a browser" single]) (cperl-mode . [(20131022 1349) nil "Perl code editing commands for Emacs" single]) (control-mode . [(20131010 2052) nil "A \"control\" mode, similar to vim's \"normal\" mode" single]) (connection . [(20131005 526) nil "TCP-based client connection" single]) (conkeror-minor-mode . [(20131218 334) nil "Mode for editing conkeror javascript files." single]) (confluence . [(20130814 535) ((xml-rpc (1 6 4))) "Emacs mode for interacting with confluence wikis" tar]) (concurrent . [(20130914 536) ((deferred (0 3 1))) "Concurrent utility functions for emacs lisp" single]) (company-jedi . [(20131224 405) ((company (0 6 12))) "Jedi backend for company-mode" tar]) (company-inf-ruby . [(20130630 1130) ((company (0 6 10)) (inf-ruby (2 2 7))) "company-mode completion back-end for inf-ruby" single]) (company-go . [(20131120 5) ((company (0 6 12))) "company-mode backend for Go (using gocode)" single]) (company . [(20131223 610) nil "Modular in-buffer completion framework" tar]) (commander . [(20131229 244) ((s (1 6 0)) (dash (2 0 0)) (cl-lib (0 3)) (f (0 6 1))) "Emacs command line parser" single]) (command-log-mode . [(20120329 629) nil "log keyboard commands to buffer" single]) (column-marker . [(20121128 843) nil "Highlight certain character columns" single]) (column-enforce-mode . [(20131209 956) nil "Highlight text that extends beyond a  column" single]) (colorsarenice-theme . [(20131128 1106) ((emacs (24))) "A color theme." tar]) (color-theme-solarized . [(20130307 1350) ((color-theme (6 5 5))) "Solarized themes for Emacs" tar]) (color-theme-sanityinc-tomorrow . [(20131204 1113) nil "A version of Chris Kempson's various Tomorrow themes" tar]) (color-theme-sanityinc-solarized . [(20131204 1112) nil "A version of Ethan Schoonover's Solarized themes" tar]) (color-theme-buffer-local . [(20120702 1336) nil "Install color-themes by buffer." single]) (color-theme-approximate . [(20130328 1933) nil "Makes Emacs theme works on terminal transparently" single]) (color-theme . [(20080305 34) nil "install color themes" tar]) (color-moccur . [(20120811 527) nil "multi-buffer occur (grep) mode" single]) (col-highlight . [(20131226 1817) ((vline (0))) "Highlight the current column." single]) (coffee-mode . [(20131226 1919) ((emacs (24 1))) "Major mode to edit CoffeeScript files in Emacs" single]) (coffee-fof . [(20131012 530) ((coffee-mode (0 4 1))) "A coffee-mode configuration for `ff-find-other-file'." single]) (cn-outline . [(20100321 914) nil "No description available." single]) (cmds-menu . [(20131226 1816) nil "`Recent Commands' submenu for the menu-bar `Tools' menu." single]) (cm-mode . [(20130306 6) nil "Minor mode for CriticMarkup" single]) (clues-theme . [(20130908 101) ((emacs (24 0))) "an Emacs 24 theme which may well be fully awesome..." single]) (cloud-to-butt-erc . [(20130627 1608) nil "Replace 'the cloud' with 'my butt'" single]) (closure-lint-mode . [(20101118 1324) nil "minor mode for the Closure Linter" single]) (clojure-test-mode . [(20131227 805) ((clojure-mode (1 7)) (cider (0 4 0))) "Minor mode for Clojure tests" single]) (clojure-snippets . [(20130403 1146) ((yasnippet (0 8 0))) "Yasnippets for clojure" tar]) (clojure-mode . [(20131227 1044) nil "Major mode for Clojure code" single]) (clojure-cheatsheet . [(20131213 9) ((helm (1 5 3)) (cider (0 1 8))) "The Clojure Cheatsheet for Emacs" single]) (cljsbuild-mode . [(20130110 732) nil "A minor mode for the ClojureScript 'lein cljsbuild' command" single]) (clj-refactor . [(20131217 216) ((s (1 8 0)) (dash (2 4 0)) (yasnippet (0 6 1)) (paredit (22)) (multiple-cursors (1 2 2))) "A collection of clojure refactoring functions" single]) (clips-mode . [(20131012 1401) nil "Major mode for editing CLIPS code and REPL" tar]) (clippy . [(20131210 258) ((pos-tip (1 0))) "Show tooltip with function documentation at point" single]) (clevercss . [(20131228 1755) nil "A major mode for editing CleverCSS files" single]) (cl-lib-highlight . [(20131019 751) ((cl-lib (0 3))) "full cl-lib font-lock highlighting" single]) (circe . [(20131210 409) ((lui (0)) (lcs (0))) "Client for IRC in Emacs" tar]) (cider-tracing . [(20131018 738) ((cider (0 3 0)) (clojure-mode (2 1 0))) "Tracing extension for CIDER" single]) (cider-decompile . [(20131116 1002) ((cider (0 3 0)) (javap-mode (9))) "decompilation extension for cider" single]) (cider . [(20131221 1231) ((clojure-mode (2 0 0)) (cl-lib (0 3)) (dash (2 1 0)) (pkg-info (0 4))) "Clojure Integrated Development Environment and REPL" tar]) (chruby . [(20131212 556) nil "Emacs integration for chruby" single]) (chm-view . [(20110616 1719) nil "View CHM file." single]) (chicken-scheme . [(20131116 1228) nil "Scheme-mode extensions for Chicken Scheme" single]) (charmap . [(20131019 2158) nil "Unicode table for Emacs" single]) (change-inner . [(20130208 1130) ((expand-region (0 7))) "Change contents based on semantic units" single]) (cg . [(20131210 455) nil "major mode for editing Constraint Grammar files" single]) (cfengine-code-style . [(20131209 411) nil "C code style for CFEngine project." single]) (centered-cursor-mode . [(20131121 1237) nil "cursor stays vertically centered" single]) (cedit . [(20131224 1929) nil "paredit-like commands for c-like languages" single]) (cask . [(20131225 628) ((s (1 8 0)) (dash (2 2 0)) (f (0 10 0)) (epl (0 0 1))) "Cask: Emacs dependency management made easy" tar]) (capture . [(20130828 944) nil "screencasting with \"avconv\" or \"ffmpeg\"" tar]) (caml . [(20130904 812) nil "No description available." tar]) (calmer-forest-theme . [(20130925 2210) nil "Darkish theme with green/orange tint" single]) (calfw-gcal . [(20120111 200) nil "edit Google calendar for calfw.el." tar]) (calfw . [(20131026 400) nil "Calendar view framework on Emacs" tar]) (cacoo . [(20120319 1659) ((concurrent (0 3 1))) "Minor mode for Cacoo : http://cacoo.com" tar]) (cache . [(20111019 1600) nil "implementation of a hash table whose key-value pairs expire" single]) (c-eldoc . [(20130821 1146) nil "helpful description of the arguments to C functions" single]) (button-lock . [(20131106 706) nil "Clickable text defined by regular expression" single]) (butler . [(20131221 946) ((deferred (3 1)) (json (1 2))) "Emacs client for Jenkins" tar]) (busybee-theme . [(20130920 942) nil "port of vim's mustang theme" single]) (buster-snippets . [(20130714 540) nil "Yasnippets for the Buster javascript testing framework" tar]) (buster-mode . [(20121219 522) nil "Minor mode to speed up development when writing tests with Buster.js" single]) (bundler . [(20131213 357) ((inf-ruby (2 1))) "Interact with Bundler from Emacs" single]) (bug-reference-github . [(20131202 1303) nil "Automatically set `bug-reference-url-format' in Github repositories." tar]) (bufshow . [(20130711 1039) ((emacs (24 1))) "A simple presentation tool for Emacs." single]) (buffer-utils . [(20131106 706) nil "Buffer-manipulation utility functions" single]) (buffer-stack . [(20101223 1020) nil "Enhanced intelligent switch-to-other-buffer replacement." single]) (buffer-move . [(20130923 1653) nil "Swap buffers without typing C-x b on each window" single]) (buffer-buttons . [(20131127 946) nil "Define, save, and load code-safe buttons in files for emacs" single]) (bubbleberry-theme . [(20131223 349) ((emacs (24 1))) "A theme based on LightTable for Emacs24" single]) (bs-ext . [(20130824 1159) nil "Extensions to emacs buffer-selection library (bs.el)" single]) (browse-url-dwim . [(20131106 706) ((string-utils (0 3 2))) "Context-sensitive external browse URL or Internet search" single]) (browse-kill-ring . [(20131116 2113) nil "interactively insert items from kill-ring" single]) (bpe . [(20131227 2120) nil "Blog from Org mode to Blogger" single]) (boxquote . [(20081011 1326) nil "Quote text with a semi-box." single]) (bookmark+ . [(20131226 1812) nil "Bookmark+: extensions to standard library `bookmark.el'." tar]) (bm . [(20131214 1405) nil "Visible bookmarks in buffer." single]) (blank-mode . [(20130824 1159) nil "minor mode to visualize TAB, (HARD) SPACE, NEWLINE" single]) (bitly . [(20130503 149) nil "Shorten URLs using the bitly.com shortener service" single]) (bitlbee . [(20130328 1018) nil "Help get Bitlbee (http://www.bitlbee.org) up and running." single]) (birds-of-paradise-plus-theme . [(20130419 1429) nil "A brown/orange light-on-dark theme for Emacs 24 (deftheme)." single]) (bind-key . [(20131012 1138) nil "A simple way to manage personal keybindings" single]) (bibslurp . [(20130904 1053) ((s (1 6 0)) (dash (1 5 0))) "retrieve BibTeX entries from NASA ADS" single]) (bibretrieve . [(20131013 1132) ((auctex (11 87)) (emacs (24 3))) "Retrieving BibTeX entries from the web" tar]) (bf-mode . [(20130403 742) nil "Browse file persistently on dired" single]) (better-defaults . [(20130422 1322) nil "Fixing weird quirks and poor defaults" single]) (bert . [(20131117 214) nil "BERT serialization library for Emacs" single]) (bdo . [(20130910 126) nil "Do things to a browser page from Emacs. BETA!" tar]) (bbdb2erc . [(20130606 2329) ((bbdb (3 0))) "make bbdb show if pal is online with ERC, click i to chat" single]) (bbdb-vcard . [(20130605 1139) ((bbdb (3 0))) "vCard import/export for BBDB" tar]) (bbdb-ext . [(20130513 1152) ((bbdb (2 36))) "Extra commands for BBDB" single]) (bbdb . [(20131116 930) nil "The Insidious Big Brother Database for GNU Emacs" tar]) (bbcode-mode . [(20130227 1137) nil "Major mode for writing BBCode markup" single]) (batch-mode . [(20130824 1158) nil "major mode for editing ESRI batch scrips" single]) (bash-completion . [(20130526 544) nil "BASH completion for the shell buffer" tar]) (base16-theme . [(20130413 1655) nil "No description available." tar]) (backup-walker . [(20130720 816) nil "quickly traverse all backups of a file" single]) (backup-each-save . [(20130704 1432) nil "backup each savepoint of a file" single]) (backtrace-mode . [(20130223 1154) nil "A better way to browse /var/log/messages files" single]) (back-button . [(20131122 959) ((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (list-utils (0 4 2)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Visual navigation through mark rings" single]) (babel . [(20131228 754) nil "interface to web translation services such as Babelfish" single]) (awk-it . [(20130917 1848) nil "Run AWK interactively on region!" single]) (autopair . [(20131206 1059) ((cl-lib (0 3))) "Automagically pair braces and quotes like TextMate" single]) (automargin . [(20131112 14) nil "add margins to windows not-splitted, and center them" single]) (autofit-frame . [(20131226 1804) ((fit-frame (0))) "Automatically resize one-window frames to fit" single]) (auto-yasnippet . [(20131002 129) ((yasnippet (0 8 0))) "Quickly create disposable yasnippets" single]) (auto-shell-command . [(20130404 923) ((deferred (20130312)) (popwin (20130329))) "Run the shell command asynchronously that you specified when you save the file." single]) (auto-save-buffers-enhanced . [(20130607 1949) nil "Automatically save buffers in a decent way" single]) (auto-install . [(20130824 1206) nil "Auto install elisp file" single]) (auto-indent-mode . [(20131220 1220) nil "Auto indent Minor mode" tar]) (auto-dim-other-buffers . [(20130429 1126) nil "Visually makes non-current buffers less prominent" single]) (auto-dictionary . [(20130628 253) nil "automatic dictionary switcher for flyspell" tar]) (auto-complete-nxml . [(20130917 2019) ((auto-complete (1 4))) "do completion by auto-complete.el on nXML-mode" single]) (auto-complete-clang-async . [(20130526 814) nil "Auto Completion source for clang for GNU Emacs" single]) (auto-complete-clang . [(20120614 610) nil "Auto Completion source for clang for GNU Emacs" single]) (auto-complete-c-headers . [(20131215 506) ((auto-complete (1 4))) "An auto-complete source for C/C++ header files" single]) (auto-complete . [(20131128 233) ((popup (0 5 0))) "Auto Completion for GNU Emacs" tar]) (auto-compile . [(20131106 631) ((cl-lib (0 2)) (packed (0 3 4))) "automatically compile Emacs Lisp libraries" single]) (auto-capitalize . [(20131014 505) nil "Automatically capitalize (or upcase) words" single]) (auto-auto-indent . [(20131106 1103) ((es-lib (0 1)) (cl-lib (1 0))) "Indents code as you type" single]) (auto-async-byte-compile . [(20130824 1158) nil "Automatically byte-compile when saved" single]) (audio-notes-mode . [(20130909 146) nil "Play audio notes synced from somewhere else." single]) (auctex-lua . [(20130818 1120) nil "Lua editing support for AUCTeX" single]) (auctex-latexmk . [(20131108 2133) ((auctex (11 87))) "Add LatexMk support to AUCTeX" single]) (async . [(20131117 2035) nil "Asynchronous processing in Emacs" tar]) (ascope . [(20130824 1158) nil "Another cscope interface for emacs" single]) (ascii . [(20130824 1200) nil "ASCII code display." single]) (ariadne . [(20131117 911) ((bert (0 1))) "Ariadne plugin for Emacs" single]) (arduino-mode . [(20120212 719) nil "Major mode for the Arduino language" single]) (archive-region . [(20130824 1207) nil "Move region to archive file instead of killing" single]) (apt-utils-ido . [(20130527 1345) ((apt-utils (1 212))) "Ido commands for apt-utils" single]) (apt-utils . [(20130824 1200) nil "Emacs interface to APT (Debian package management)" single]) (apropos-fn+var . [(20131226 1803) nil "Apropos for functions and variables" single]) (applescript-mode . [(20090320 2332) nil "major mode for editing AppleScript source" single]) (apples-mode . [(20110120 2018) nil "Major mode for editing and executing AppleScript code" tar]) (apache-mode . [(20080905 553) nil "major mode for editing Apache configuration files" single]) (aok . [(20130824 1127) nil "various useful ways to do `multi-occur'" single]) (anzu . [(20131119 1848) nil "Show number of matches in mode-line while searching" single]) (anything-git-grep . [(20130608 1940) ((anything (1 3 9))) "anything for git grep" tar]) (anything-git-files . [(20130609 243) ((anything (1 3 9))) "anything for git files" single]) (anything . [(20130605 1746) nil "open anything / QuickSilver-like candidate-selection framework" tar]) (anyins . [(20131229 241) nil "Insert content at multiple places from shell command or kill-ring" single]) (anti-zenburn-theme . [(20131228 1348) nil "Low-contrast Zenburn-inverted theme" single]) (ant . [(20131227 2307) nil "helpers for compiling with ant" single]) (ansi . [(20130827 753) ((s (1 6 1)) (dash (1 5 0))) "Turn string into ansi strings" single]) (annoying-arrows-mode . [(20130515 1000) nil "Ring the bell if using arrows too much" single]) (angular-snippets . [(20131125 314) ((s (1 4 0)) (dash (1 2 0))) "Yasnippets for AngularJS" tar]) (angry-police-captain . [(20120829 552) nil "Show quote from http://theangrypolicecaptain.com in the minibuffer" single]) (android-mode . [(20131104 748) nil "Minor mode for Android application development" single]) (anaphora . [(20131022 450) nil "anaphoric macros providing implicit temp variables" single]) (ample-zen-theme . [(20131129 440) nil "AmpleZen Theme for Emacs 24" single]) (ample-theme . [(20131208 2116) nil "Calm Dark Theme for Emacs" single]) (all-ext . [(20130824 1206) ((all (1 0))) "Extension of M-x all" single]) (align-cljlet . [(20131016 2356) ((clojure-mode (1 11 5))) "Space align various Clojure forms" single]) (alert . [(20130510 20) nil "Growl-style notification system for Emacs" single]) (alect-themes . [(20131229 151) nil "4 configurable color themes for Emacs 24" tar]) (airplay . [(20130212 426) ((request (20130110 2144)) (simple-httpd (1 4 1)) (deferred (0 3 1))) "Airplay bindings to Emacs" tar]) (ahg . [(20131121 558) nil "Alberto's Emacs interface for Mercurial (Hg)" single]) (ag . [(20131220 643) nil "A front-end for ag ('the silver searcher'), the C ack replacement." single]) (afternoon-theme . [(20131225 24) ((emacs (24 1))) "Dark color theme with a deep blue background" single]) (aes . [(20130120 1913) nil "Implementation of AES" single]) (adoc-mode . [(20130917 0) ((markup-faces (1 0 0))) "a major-mode for editing AsciiDoc files in Emacs" single]) (actionscript-mode . [(20130328 838) nil "A simple mode for editing Actionscript 3 files" single]) (ack-menu . [(20130312 131) ((mag-menu (0 1 0))) "A menu-based front-end for ack" tar]) (ack-and-a-half . [(20130815 1917) nil "Yet another front-end for ack" single]) (achievements . [(20131111 2351) ((keyfreq (0 0 3))) "Achievements for emacs usage." tar]) (ace-jump-mode . [(20130719 2053) nil "a quick cursor location minor mode for emacs" single]) (ace-jump-buffer . [(20131221 759) ((ace-jump-mode (1 0)) (dash (2 4 0))) "fast buffer switching extension to `ace-jump-mode'" single]) (ac-slime . [(20131005 326) nil "An auto-complete source using slime completions" single]) (ac-octave . [(20131228 538) ((auto-complete (1 4 0))) "An auto-complete source for Octave" single]) (ac-nrepl . [(20131031 346) ((cider (0 1)) (auto-complete (1 4))) "auto-complete sources for Clojure using nrepl completions" single]) (ac-math . [(20131003 1604) ((auto-complete (1 4))) "Auto-complete sources for input of mathematical symbols and latex tags" single]) (ac-js2 . [(20131112 403) ((js2-mode (20090723)) (skewer-mode (1 4))) "Auto-complete source for Js2-mode, with navigation" tar]) (ac-ispell . [(20131124 2044) ((auto-complete (1 4))) "ispell completion source for auto-complete" single]) (ac-inf-ruby . [(20131115 350) ((inf-ruby (2 3 2)) (auto-complete (1 4))) "Enable auto-complete in inf-ruby sessions" single]) (ac-helm . [(20131224 647) ((helm (20130328)) (auto-complete (1 4 0)) (popup (0 5 0))) "Helm interface for auto-complete" single]) (ac-geiser . [(20130928 2347) ((geiser (0 5)) (auto-complete (1 4))) "Auto-complete backend for geiser" tar]) (ac-etags . [(20131127 311) ((auto-complete (1 4))) "etags/ctags completion source for auto-complete" single]) (ac-emmet . [(20131015 858) ((emmet-mode (1 0 2)) (auto-complete (1 4))) "auto-complete sources for emmet-mode's snippets" single]) (ac-dabbrev . [(20130906 518) nil "auto-complete.el source for dabbrev" single]) (ac-c-headers . [(20131015 2339) nil "auto-complete source for C headers" single]) (abl-mode . [(20131205 445) nil "Python TDD minor mode" tar]) (abc-mode . [(20130607 717) nil "Major mode for editing abc music files" single]) (4clojure . [(20131014 1507) ((json (1 2)) (request (0 2 0))) "Open and evaluate 4clojure.com questions" single]))
diff --git a/elpa/auto-complete-1.4/auto-complete-autoloads.el b/elpa/auto-complete-1.4/auto-complete-autoloads.el
index 8f0b63486..ce322acf1 100644
--- a/elpa/auto-complete-1.4/auto-complete-autoloads.el
+++ b/elpa/auto-complete-1.4/auto-complete-autoloads.el
@@ -3,8 +3,11 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("auto-complete-config.el" "auto-complete-pkg.el"
-;;;;;;  "auto-complete.el") (21031 23311 211584 0))
+;;;### (autoloads nil nil ("../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-autoloads.el"
+;;;;;;  "../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-config.el"
+;;;;;;  "../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete-pkg.el"
+;;;;;;  "../../../../.emacs.d/elpa/auto-complete-1.4/auto-complete.el")
+;;;;;;  (21102 24455 619326 0))
 
 ;;;***
 
diff --git a/elpa/auto-complete-1.4/auto-complete-config.elc b/elpa/auto-complete-1.4/auto-complete-config.elc
index 66ed1eb0e9b7190bcc0c9a843eb0f1b8ddcad2eb..eb2ba599d6a0642d20e093ecd902a6af5d58fda0 100644
GIT binary patch
delta 85
zcmcaw{<wUCq-siHUS?{JLrGD7dP;tgLVlitFA)1DmnaxnC>U5+nF5jFMuQ$rCUb+$
m`!shkF`FA$Os>{>&un5~IXPF?gW1$jb8@4e*yeM(?0f(WksIp(

delta 71
zcmaD{ezkmpq_{$Uo<ewPib8N|fr5gGf}xR>frXWc`9`}QO(s*b&1W=sF)^E2noRE0
bdCzQYX*#)D*Mr&ETyt{2p4jF)y6k)aL_QX9

diff --git a/elpa/auto-complete-1.4/auto-complete-pkg.elc b/elpa/auto-complete-1.4/auto-complete-pkg.elc
index 8d0696c0ff05ddd474d6789249fe96f8e2aa9fe4..0da54964df129da7b10c9359c53557e5f9b943aa 100644
GIT binary patch
delta 48
zcmcb|@`h!Cq-siHUS?{JLrGD7dP;tgLVlitFA)1DmnaxnC>U5+nF5i~Mgu)20Hll$
AM*si-

delta 34
pcmaFEa*t(#q_{$Uo<ewPib8N|fr5gGf}xR>frXWc`9?cECIGnj33UJf

diff --git a/elpa/auto-complete-1.4/auto-complete.elc b/elpa/auto-complete-1.4/auto-complete.elc
index 80da1da0678fe56800d7f47d3e8bf3055d3281b9..05eef8c74b96def3289701833a3dbe4d6553f6bc 100644
GIT binary patch
delta 6533
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
CR_!<d

delta 5049
zcmaJ_X>45874~?Zw-}ETJ6^`?_47JTp8fX4i9^x^5|fz3S#Tg@lJU&5Gh{q7nZ=0%
z!SDmrpoRdaY!#}YYN#jznmmyN6)2@_6>CeIwkm2tty&7A1*uh~qN+Xj&UidtK=NDW
z-tT_jx#ygF?|D9b+5OO4?t8p-Bo-y3c8Kh;<AkV0k_SX{KsE2(aKxpY`(e6}Q*_@L
zw2`hAenr&rGP+8DoUfntE0TskRlKCG62B~o*g`J^NrqpM={xqy(sC$S#vTPPL@?B{
zTrzSo6!I-X&E`oeD5ao`f}|9tAn{Ve6lx6iC@8gvET1bYsVtSuL#ZOpUqwkZE2%Ck
zsb(eBua#6$Qbjo}>#^nis-c>OY8on``LoLMk{U{i6qc3LkbJ2xG?dd(PDfJe3mr!+
zMCmA_V-F(v`QYlvsw1Or(D-Awfg}qD(i||5mb%)=dPl}#%b+NNa%4?ie%=Pk8HQgL
zrHutl6W=x!;QSX7qP^Jh4TRu;d5f`aa{=wy!tPh)Q!HXY!x48iBG7bv+nT{DOO2;m
zv!b+(QR09Fazi)_1AqkAe2rMf-0h43M=W62!CHse{n{MIPRfhk%C5Fqnk>xXT?{zF
z?z=Pa<#Pi~+QU$L*?nJ*`nrYGIp$G@+t2RT=g>DWG{%3yx<~Q@4Cwc>$5;-3<5#dB
zr0vX6hcehatEu|}jAy){t1Op)*cxQ5p@LZov2!95Um-G?6FHp2hL>P7(YT3G<A?>(
zID+U*LPRnQnS_{~4@J&jQ;Z<W?y;O)e2H8pZbx&(iG1Q^c$1WYc`B7dQvWXlP3NG~
zIp`uJ`t2Aq@i@EBu=@!*j`4LeZ|6Wav+i5i{bU|!FWvBSs9Rb8EW2Z?m<L>dqa)@(
z^4yD(L&JATUGZchmW~rx?_TQ-#-`#CI~B$=Y9OAlC&I@G9|#IO0atOo2j4<=Brrq7
zK8f(~O?P)EPX<ymahps;Vu2JvKp>rp3CY8;W5SdjO(W7oq=y?QM2>r!d*L~bhX?QL
zb*HfT-`u7$o{Yz05jzltx9@9m@$g*HRn<Ht3Wbw_@rW%<1cG*wzz4;fu{U14LE=eI
z!j9W0mz<dzk41bGolM2z!bD_dDsaRWVo_mkBGF0IIap$>WSr?F@}*Cln8C*K(zaIC
z$Qp!TI+2Vea9kvoAbi3O@rb#nw6TFF$y6eYJg7p)Q|80rB(=Y>OhTJJjMWv1eFpw^
z%7l#Va~NSF9I**Jv|<`@!z-F+=d4KJ^n%pQfdtyJFKH)82)!M}x?sK|Z=%csHqrTR
zMxG?yJ^ZcxeYBbP5q`@&E!9r;Eg<Q|dHAT(bRZFkgagU!r1H(l(!#q}G{7fUTprA)
z422VRFcnLL7ZWqytb>lG!@(oMVLK8h{C%G0AvWjv#%u~neHvQJvMCiKG+_wC5IPX8
zMlzZ}$P=DCoFbBl{#{Yo+{Tk|G-Xes!w?Y+L_^_FAZ6!aVdGtOtun%g1ILk!jgCz$
zBnRnKGe%^`%3U-qrByYx#~0E?!c$=y;kCX7h^}gGV)o>zAvHBH7Q)nYPF9_FA={d&
zwX5>Hoyko&_+)D-e<OlvKE+lKB5?2tFWg_#fp48P>#CLvA#kv^rmiPxM<#@D6jLKb
zb8ZT!it&XvYX@7CsX!t{Fi)egRDOW7%K_B7cGzEc4GO$jJIpT?Kx;6eCeew)5u2`s
zFPmFow0?DY3KN@PQ=dNyq<&{1KH~LTk*CgkYZaYwW_2@p8OM1zFI@1pP~5M*yXoUe
zua7=<H)!(<z5@Q&;H|{bY>^&|B|=FYt2XkDd8W;0cz7}zOW5$)5RbxtZ`|%>&d;=B
z#FIAZPEJt=@Nlk)sr|lb0~Kv(?$3zsEJLx-vG5d|+WO3zq-&RD)KmZy6CP+8rr>v5
z>83N>IzfLtPU6m*woX@}B*F+k!Wo)wz~j81GjvUX;`Tw#FjNb+wr}DLQ&Qnu?J~ZY
z3cTDt#2J=iKxM~GoGD`0$&NwJlw=iNq%D$Z!P?FpoGDut+|s#@GZn*vA9oIMrmD(N
z+NE-)CRwntE6SO=B*FQvJMaZZt?Ry%Gfi2C*SfcHrlqS;-LsCfL{)@6JzF?S5*2u)
z=W2X0H27<e>9$a_-M5>w6w!hczCnDkRCwOEpR-iW0&nkL&eAjq61~@RmabUvUhlU#
z%TQz|yr!$LQV>G1RCvlx3Tz2DXNC7&Zp$>`%B~vc-u{<eoM@rasPqd?(qs|V${%x*
zE*em;1Ubo66_`~{aFS&j@Lwgt$)X`cQr*SLk|o0H>KRT}R1LoPum(O~Uj%PyWzI>>
z?S`FJv8W03STf4mR<S}WT80m)9S=vTv8lA#KT&~y+x8C8)3O)4WO&A0v$9<pY#*2=
z?J|3a1a5!3-ub7wZAAs0Nd)(4Ar%NmoRQ4~#hig<v~y-?iwonZnedxyUdO1Js`I_=
zr(75$bVmR18yE>ihcAae<xB&;{K>Vy#Ccf;oO`0$d4K2c+;!BVg0hWO)L4JC4Nq8F
zy~^;y9x~fRZKlStW_l`1@^;#bhp-|k&3IFByzZZ%KL_bpEUnpx9UH@rc$pQ=vVUTj
z&J}yHAjc29sGo1C#L`IgRBrOru$oC~sihQHxS<YSI}A^4wwOZABL$vH>{e+(#k%nu
z1V0X0v4tMQFT$u_R&+X_ma0v(=wb$)Eb!pmFpX~8>+hb9+Q&${ir$SyLL?fF&|M%I
zODBT15ST{KvNJjk59~VxE&FO`gAqYUN5^C7Xo&RmjL+cK9K>Cc@TKT3iSbvUIrM``
zRM1J839q6}N@;e!qJ&l(JUP&=wv&9q2|V5B$OEB}5J=&!F`iD@V?_4(2zHmw^~1mR
zO&5uxVftXzl{L;C*Zqm>)KNv2J<W8&<$k}PuWc%2lW+Aj`DGQWD@pXhod;T06Pk8n
zIT~d!ll`)x!=(dKp`tjS9=P6B&(bc)&Wv;-VMkK}?kZ!%fOl@Jcc#V$ui!Mz(442k
zcNcTIfy;Me{1l8Ny|XCYfYDIOSsweSSM+UV8)%q1s1q<mEaX@jN;0#8nMm_WtH_M;
z)NRFI`o7wF59VSvfs9%&PEI7$Zfun4x0EcgMmf`n;U)eJv>RhvibGi*cp9j5pdd@S
zpAyn^lC@Hr!iJ|2?;0)OWxccw{+8@$%`Ul2!8Et>lEFkQ5)rTpgTB;u=ue!07ms@3
zY+`MNMta&iNFR}L&8f~G66J-s51NwmS?Ucp?row8&mA8vk}bm&otl}43-Q%LKRY+~
zyNX0jm3{D0sM`6@Efp)_w;L<r(9RM#aJmYfJ^gS|Je?xlFmk%7o^<0{kK=h6qQRI*
zM_F}6WQd<?fcTkGXX@@(IZneR?dWjX#p$Xg!OHu8#p#x=!N>RinKLA`>AeT43OPfS
z6z4Awsjec!QVkz`epe0r=z}t6@H?;IHi4U+Q}oEo9Nivtc=OSjBE_<F6NVl;gb8P<
z4DbBxv1i=X3$`FZpvwpDeQGuQ@%tWl>G2Zh!r89EMf=njKX}1~+o!BK=b!k8i<4DL
zan3&ZN)e}unuvRAn{)TMyWE^AYpT=q>@F9l$#_b{FNn}Vs)5^7<yJ%uo*E@(UF9@>
zxQgKDxkfnpQZ<~pP)^HuNW9=JW=olek1mMx<gB_lLLZ@vDt$bBaXo!pz9^Mod7rdX
z1g^Wp!_1|&R(AepYim1O`e*C+G5lASbMexnZgz&`c3we%&kI+>ai`xo_k3j`r%Q?q
zP0wz2N`7+6wQ{kC=InG{d+AHANX32Ea$b9N+EuPvs;>E{)nm?2UmtauDsJ40Z_MXg
p(ZjNUp7^YS&hAcMkr0wYejZ$E;_b$2=jpc|bS;X;4evNj{|DePlP&-N

diff --git a/elpa/cider-20131221.1231/cider-autoloads.el b/elpa/cider-20131221.1231/cider-autoloads.el
new file mode 100644
index 000000000..8e962ef09
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-autoloads.el
@@ -0,0 +1,86 @@
+;;; cider-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (cider cider-jack-in) "cider" "cider.el" (21184
+;;;;;;  20187))
+;;; Generated autoloads from cider.el
+
+(autoload 'cider-jack-in "cider" "\
+Start a nREPL server for the current project and connect to it.
+If PROMPT-PROJECT is t, then prompt for the project for which to
+start the server.
+
+\(fn &optional PROMPT-PROJECT)" t nil)
+
+(autoload 'cider "cider" "\
+Connect to an nREPL server identified by HOST and PORT.
+
+\(fn HOST PORT)" t nil)
+
+(eval-after-load 'clojure-mode '(progn (define-key clojure-mode-map (kbd "C-c M-j") 'cider-jack-in) (define-key clojure-mode-map (kbd "C-c M-c") 'cider)))
+
+;;;***
+
+;;;### (autoloads (cider-macroexpand-all cider-macroexpand-1) "cider-macroexpansion"
+;;;;;;  "cider-macroexpansion.el" (21184 20187))
+;;; Generated autoloads from cider-macroexpansion.el
+
+(autoload 'cider-macroexpand-1 "cider-macroexpansion" "\
+Invoke 'macroexpand-1' on the expression at point.
+If invoked with a PREFIX argument, use 'macroexpand' instead of
+'macroexpand-1'.
+
+\(fn &optional PREFIX)" t nil)
+
+(autoload 'cider-macroexpand-all "cider-macroexpansion" "\
+Invoke 'clojure.walk/macroexpand-all' on the expression at point.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (cider-mode) "cider-mode" "cider-mode.el" (21184
+;;;;;;  20187))
+;;; Generated autoloads from cider-mode.el
+
+(autoload 'cider-mode "cider-mode" "\
+Minor mode for REPL interaction from a Clojure buffer.
+
+\\{cider-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (cider-selector) "cider-selector" "cider-selector.el"
+;;;;;;  (21184 20187))
+;;; Generated autoloads from cider-selector.el
+
+(autoload 'cider-selector "cider-selector" "\
+Select a new buffer by type, indicated by a single character.
+The user is prompted for a single character indicating the method by
+which to choose a new buffer.  The `?' character describes then
+available methods.  OTHER-WINDOW provides an optional target.
+
+See `def-cider-selector-method' for defining new methods.
+
+\(fn &optional OTHER-WINDOW)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("cider-client.el" "cider-eldoc.el" "cider-interaction.el"
+;;;;;;  "cider-pkg.el" "cider-repl.el" "cider-util.el" "cider-version.el"
+;;;;;;  "nrepl-client.el") (21184 20188 56838))
+
+;;;***
+
+(provide 'cider-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; cider-autoloads.el ends here
diff --git a/elpa/cider-20131221.1231/cider-client.el b/elpa/cider-20131221.1231/cider-client.el
new file mode 100644
index 000000000..6371231d4
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-client.el
@@ -0,0 +1,172 @@
+;;; cider-client.el --- A layer of abstraction above the actual client code.
+
+;; Copyright © 2013 Bozhidar Batsov
+;;
+;; Author: Bozhidar Batsov <bozhidar@batsov.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; A layer of abstraction above the actual client code.
+
+;;; Code:
+
+(require 'nrepl-client)
+
+;;; Words of inspiration
+(defun cider-user-first-name ()
+  "Find the current user's first name."
+  (let ((name (if (string= (user-full-name) "")
+                  (user-login-name)
+                (user-full-name))))
+    (string-match "^[^ ]*" name)
+    (capitalize (match-string 0 name))))
+
+(defvar cider-words-of-inspiration
+  `("The best way to predict the future is to invent it. -Alan Kay"
+    "A point of view is worth 80 IQ points. -Alan Kay"
+    "Lisp isn't a language, it's a building material. -Alan Kay"
+    "Simple things should be simple, complex things should be possible. -Alan Kay"
+    "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. -Bill Gates"
+    "Controlling complexity is the essence of computer programming. -Brian Kernighan"
+    "The unavoidable price of reliability is simplicity. -C.A.R. Hoare"
+    "You're bound to be unhappy if you optimize everything. -Donald Knuth"
+    "Simplicity is prerequisite for reliability. -Edsger W. Dijkstra"
+    "Deleted code is debugged code. -Jeff Sickel"
+    "The key to performance is elegance, not battalions of special cases. -Jon Bentley and Doug McIlroy"
+    "First, solve the problem. Then, write the code. -John Johnson"
+    "Simplicity is the ultimate sophistication. -Leonardo da Vinci"
+    "Programming is not about typing... it's about thinking. -Rich Hickey"
+    "Design is about pulling things apart. -Rich Hickey"
+    "Programmers know the benefits of everything and the tradeoffs of nothing. -Rich Hickey"
+    "Code never lies, comments sometimes do. -Ron Jeffries"
+    "The true delight is in the finding out rather than in the knowing.  -Isaac Asimov"
+    "Take this REPL, fellow hacker, and may it serve you well."
+    "Let the hacking commence!"
+    "Hacks and glory await!"
+    "Hack and be merry!"
+    "Your hacking starts... NOW!"
+    "May the Source be with you!"
+    "May the Source shine upon thy REPL!"
+    "Code long and prosper!"
+    "Happy hacking!"
+    "Backend is up, REPL is operational!"
+    "Your imagination is the only limit to what you can do with this REPL!"
+    "This REPL is yours to command!"
+    "Fame is but a hack away!"
+    ,(format "%s, this could be the start of a beautiful program."
+             (cider-user-first-name)))
+  "Scientifically-proven optimal words of hackerish encouragement.")
+
+(defun cider-random-words-of-inspiration ()
+  "Select a random entry from `cider-words-of-inspiration'."
+  (eval (nth (random (length cider-words-of-inspiration))
+             cider-words-of-inspiration)))
+
+(defun cider-display-connected-message ()
+  "Message displayed on successful connection."
+  (message "Connected.  %s" (cider-random-words-of-inspiration)))
+
+(add-hook 'nrepl-connected-hook 'cider-display-connected-message)
+
+;;; Evaluation helpers
+(defun cider-ns-form-p (form)
+  "Check if FORM is an ns form."
+  (string-match "^[[:space:]]*\(ns\\([[:space:]]*$\\|[[:space:]]+\\)" form))
+
+(defun cider-eval (input callback &optional ns session)
+  "Send the request INPUT and register the CALLBACK as the response handler.
+NS & SESSION specify the context in which to evaluate the request."
+  ;; namespace forms are always evaluated in the "user" namespace
+  (let ((ns (if (cider-ns-form-p input)
+                "user"
+              ns)))
+    ;; prevent forms from being evaluated in the wrong or a non-existing namespace
+    (when (and ns
+               (derived-mode-p 'clojure-mode)
+               (not (string= ns nrepl-buffer-ns))
+               (not (cider-ns-form-p input)))
+      (cider-eval-ns-form))
+    (nrepl-send-string input callback ns session)))
+
+(defun cider-tooling-eval (input callback &optional ns)
+  "Send the request INPUT and register the CALLBACK as the response handler.
+NS specifies the namespace in which to evaluate the request."
+  ;; namespace forms are always evaluated in the "user" namespace
+  (cider-eval input callback ns (nrepl-current-tooling-session)))
+
+(defun cider-eval-sync (input &optional ns session)
+  "Send the INPUT to the backend synchronously.
+NS & SESSION specify the evaluation context."
+  (nrepl-send-string-sync input ns session))
+
+(defun cider-eval-and-get-value (input &optional ns session)
+  "Send the INPUT to the backend synchronously and return the value.
+NS & SESSION specify the evaluation context."
+  (cider-get-value (cider-eval-sync input ns session)))
+
+(defun cider-tooling-eval-sync (input &optional ns)
+  "Send the INPUT to the backend using a tooling session synchronously.
+NS specifies the namespace in which to evaluate the request."
+  (cider-eval-sync input ns (nrepl-current-tooling-session)))
+
+(defun cider-get-raw-value (eval-result)
+  "Get the raw value (as string) from EVAL-RESULT."
+  (plist-get eval-result :value))
+
+(defun cider-get-value (eval-result)
+  "Get the value from EVAL-RESULT."
+  (read (cider-get-raw-value eval-result)))
+
+(defun cider-send-op (op attributes handler)
+  "Send the specified OP with ATTRIBUTES and response HANDLER."
+  (let ((buffer (current-buffer)))
+    (nrepl-send-request (append
+                         (list "op" op
+                               "session" (nrepl-current-session)
+                               "ns" nrepl-buffer-ns)
+                         attributes)
+                        handler)))
+
+(defun cider-send-load-file (file-contents file-path file-name)
+  "Perform the nREPL \"load-file\" op.
+FILE-CONTENTS, FILE-PATH and FILE-NAME are details of the file to be
+loaded."
+  (let ((buffer (current-buffer)))
+    (nrepl-send-request (list "op" "load-file"
+                              "session" (nrepl-current-session)
+                              "file" file-contents
+                              "file-path" file-path
+                              "file-name" file-name)
+                        (cider-load-file-handler buffer))))
+
+(defun cider-interrupt ()
+  "Interrupt any pending evaluations."
+  (interactive)
+  (let ((pending-request-ids (cider-util--hash-keys nrepl-pending-requests)))
+    (dolist (request-id pending-request-ids)
+      (nrepl-send-interrupt request-id (cider-interrupt-handler (current-buffer))))))
+
+(defun cider-current-repl-buffer ()
+  "The current REPL buffer."
+  (when (nrepl-current-connection-buffer)
+    (buffer-local-value 'nrepl-repl-buffer
+                        (get-buffer (nrepl-current-connection-buffer)))))
+
+(provide 'cider-client)
+
+;;; cider-client.el ends here
diff --git a/elpa/cider-20131221.1231/cider-eldoc.el b/elpa/cider-20131221.1231/cider-eldoc.el
new file mode 100644
index 000000000..a2c8c9d0f
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-eldoc.el
@@ -0,0 +1,119 @@
+;;; cider-eldoc.el --- eldoc support for Clojure
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; eldoc support for Clojure.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-interaction) ; for cider-symbol-at-point
+
+(require 'eldoc)
+(require 'dash)
+
+(defvar cider-extra-eldoc-commands '("cider-complete" "yas/expand")
+  "Extra commands to be added to eldoc's safe commands list.")
+
+(defun cider-eldoc-format-thing (thing)
+  "Format the eldoc THING."
+  (propertize thing 'face 'font-lock-function-name-face))
+
+(defun cider-highlight-args (arglist pos)
+  "Format the the function ARGLIST for eldoc.
+POS is the index of the currently highlighted argument."
+  (let* ((rest-pos (cider--find-rest-args-position arglist))
+         (i 0))
+    (mapconcat
+     (lambda (arg)
+       (let ((argstr (format "%s" arg)))
+         (if (eq arg '&)
+             argstr
+           (prog1
+               (if (or (= (1+ i) pos)
+                       (and rest-pos (> (+ 1 i) rest-pos)
+                            (> pos rest-pos)))
+                   (propertize argstr 'face
+                               'eldoc-highlight-function-argument)
+                 argstr)
+             (setq i (1+ i)))))) arglist " ")))
+
+(defun cider--find-rest-args-position (arglist)
+  "Find the position of & in the ARGLIST vector."
+  (-elem-index '& (append arglist ())))
+
+(defun cider-highlight-arglist (arglist pos)
+  "Format the ARGLIST for eldoc.
+POS is the index of the argument to highlight."
+  (concat "[" (cider-highlight-args arglist pos) "]"))
+
+(defun cider-eldoc-format-arglist (arglist pos)
+  "Format all the ARGLIST for eldoc.
+POS is the index of current argument."
+  (concat "("
+          (mapconcat (lambda (args) (cider-highlight-arglist args pos))
+                     (read arglist) " ") ")"))
+
+(defun cider-eldoc-info-in-current-sexp ()
+  "Return a list of the current sexp and the current argument index."
+  (save-excursion
+    (let ((argument-index (1- (eldoc-beginning-of-sexp))))
+      ;; If we are at the beginning of function name, this will be -1.
+      (when (< argument-index 0)
+        (setq argument-index 0))
+      ;; Don't do anything if current word is inside a string.
+      (if (= (or (char-after (1- (point))) 0) ?\")
+          nil
+        (list (cider-symbol-at-point) argument-index)))))
+
+(defun cider-eldoc ()
+  "Backend function for eldoc to show argument list in the echo area."
+  (when (cider-connected-p)
+    (let* ((info (cider-eldoc-info-in-current-sexp))
+           (thing (car info))
+           (pos (cadr info))
+           (form (format "(try
+                           (:arglists
+                            (clojure.core/meta
+                             (clojure.core/resolve
+                              (clojure.core/read-string \"%s\"))))
+                           (catch Throwable t nil))" thing))
+           (value (when thing
+                    (cider-get-raw-value (cider-tooling-eval-sync form nrepl-buffer-ns)))))
+      (unless (string= value "nil")
+        (format "%s: %s"
+                (cider-eldoc-format-thing thing)
+                (cider-eldoc-format-arglist value pos))))))
+
+(defun cider-turn-on-eldoc-mode ()
+  "Turn on eldoc mode in the current buffer."
+  (setq-local eldoc-documentation-function 'cider-eldoc)
+  (apply 'eldoc-add-command cider-extra-eldoc-commands)
+  (turn-on-eldoc-mode))
+
+(provide 'cider-eldoc)
+;;; cider-eldoc ends here
diff --git a/elpa/cider-20131221.1231/cider-interaction.el b/elpa/cider-20131221.1231/cider-interaction.el
new file mode 100644
index 000000000..230bf6f4f
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-interaction.el
@@ -0,0 +1,1211 @@
+;;; cider-interaction.el --- IDE for Clojure
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Provides an Emacs Lisp client to connect to Clojure nREPL servers.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-util)
+
+(require 'clojure-mode)
+(require 'dash)
+(require 'thingatpt)
+(require 'etags)
+(require 'arc-mode)
+(require 'ansi-color)
+(require 'cl-lib)
+(require 'compile)
+(require 'tramp)
+
+(defconst cider-error-buffer "*cider-error*")
+(defconst cider-doc-buffer "*cider-doc*")
+(defconst cider-src-buffer "*cider-src*")
+(defconst cider-result-buffer "*cider-result*")
+
+(defcustom cider-use-local-resources t
+  "Use local resources under HOME if possible."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-popup-stacktraces t
+  "Non-nil means pop-up error stacktraces for evaluation errors.
+Nil means show only an error message in the minibuffer.  See also
+`cider-repl-popup-stacktraces', which overrides this setting
+for REPL buffers."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-popup-on-error t
+  "When `cider-popup-on-error' is set to t, stacktraces will be displayed.
+When set to nil, stactraces will not be displayed, but will be available
+in the `cider-error-buffer', which defaults to *cider-error*."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-auto-select-error-buffer nil
+  "Controls whether to auto-select the error popup buffer."
+  :type 'boolean
+  :group 'cider)
+
+(defface cider-error-highlight-face
+  '((((supports :underline (:style wave)))
+     (:underline (:style wave :color "red") :inherit unspecified))
+    (t (:inherit font-lock-warning-face :underline t)))
+  "Face used to highlight compilation errors in Clojure buffers."
+  :group 'cider)
+
+(defface cider-warning-highlight-face
+  '((((supports :underline (:style wave)))
+     (:underline (:style wave :color "yellow") :inherit unspecified))
+    (t (:inherit font-lock-warning-face :underline (:color "yellow"))))
+  "Face used to highlight compilation warnings in Clojure buffers."
+  :group 'cider)
+
+;;; Connection info
+(defun cider--clojure-version ()
+  "Retrieve the underlying connection's Clojure version."
+  (cider-eval-and-get-value "(clojure-version)"))
+
+(defun cider--backend-version ()
+  "Retrieve the underlying connection's nREPL version."
+  (cider-eval-and-get-value "(:version-string clojure.tools.nrepl/version)"))
+
+(defun cider--connection-info (nrepl-connection-buffer)
+  "Return info about NREPL-CONNECTION-BUFFER.
+
+Info contains project name, current REPL namespace, host:port endpoint and Clojure version."
+  (with-current-buffer (get-buffer nrepl-connection-buffer)
+    (format "Active nREPL connection: %s:%s, %s:%s (Clojure %s, nREPL %s)"
+            (or (nrepl--project-name nrepl-project-dir) "<no project>")
+            nrepl-buffer-ns
+            (car nrepl-endpoint)
+            (cadr nrepl-endpoint)
+            (cider--clojure-version)
+            (cider--backend-version))))
+
+(defun cider-display-current-connection-info ()
+  "Display information about the current connection."
+  (interactive)
+  (message (cider--connection-info (nrepl-current-connection-buffer))))
+
+(defun cider-rotate-connection ()
+  "Rotate and display the current nREPL connection."
+  (interactive)
+  (setq nrepl-connection-list
+        (append (cdr nrepl-connection-list)
+                (list (car nrepl-connection-list))))
+  (message (cider--connection-info (car nrepl-connection-list))))
+
+;;; Switching between REPL & source buffers
+(make-variable-buffer-local
+ (defvar cider-last-clojure-buffer nil
+   "A buffer-local variable holding the last Clojure source buffer.
+`cider-switch-to-last-clojure-buffer' uses this variable to jump
+back to last Clojure source buffer."))
+
+(defvar cider-current-clojure-buffer nil
+  "This variable holds current buffer temporarily when connecting to a REPL.
+It is set to current buffer when `nrepl' or `cider-jack-in' is called.
+After the REPL buffer is created, the value of this variable is used
+to call `cider-remember-clojure-buffer'.")
+
+(defun cider-remember-clojure-buffer (buffer)
+  "Try to remember the BUFFER from which the user jumps.
+The BUFFER needs to be a Clojure buffer and current major mode needs
+to be `cider-repl-mode'.  The user can use `cider-switch-to-last-clojure-buffer'
+to jump back to the last Clojure source buffer."
+  (when (and buffer
+             (with-current-buffer buffer
+               (derived-mode-p 'clojure-mode))
+             (derived-mode-p 'cider-repl-mode))
+    (setq cider-last-clojure-buffer buffer)))
+
+(defun cider-switch-to-repl-buffer (&optional arg)
+  "Select the REPL buffer, when possible in an existing window.
+
+Hint: You can use `display-buffer-reuse-frames' and
+`special-display-buffer-names' to customize the frame in which
+the buffer should appear.
+
+With a prefix ARG sets the name of the REPL buffer to the one
+of the current source file."
+  (interactive "P")
+  (if (not (cider-connected-p))
+      (message "No active nREPL connection.")
+    (let ((buffer (current-buffer)))
+      (when arg
+        (cider-repl-set-ns (cider-current-ns)))
+      (pop-to-buffer (cider-find-or-create-repl-buffer))
+      (cider-remember-clojure-buffer buffer)
+      (goto-char (point-max)))))
+
+(defun cider-switch-to-relevant-repl-buffer (arg)
+  "Select the REPL buffer, when possible in an existing window.
+The buffer chosen is based on the file open in the current buffer.
+
+Hint: You can use `display-buffer-reuse-frames' and
+`special-display-buffer-names' to customize the frame in which
+the buffer should appear.
+
+With a prefix ARG sets the name of the REPL buffer to the one
+of the current source file.
+
+With a second prefix ARG the chosen REPL buffer is based on a
+supplied project directory."
+  (interactive "P")
+  (if (not (cider-connected-p))
+      (message "No active nREPL connection.")
+    (let ((project-directory
+           (or (when arg
+                 (ido-read-directory-name "Project: "))
+               (nrepl-project-directory-for (nrepl-current-dir)))))
+      (if project-directory
+          (let ((buf (car (-filter
+                           (lambda (conn)
+                             (let ((conn-proj-dir (with-current-buffer (get-buffer conn)
+                                                    nrepl-project-dir)))
+                               (when conn-proj-dir
+                                 (equal (file-truename project-directory)
+                                        (file-truename conn-proj-dir)))))
+                           nrepl-connection-list))))
+            (if buf
+                (setq nrepl-connection-list
+                      (cons buf (delq buf nrepl-connection-list)))
+              (message "No relevant nREPL connection found. Switching to default connection.")))
+        (message "No project directory found. Switching to default nREPL connection.")))
+    (cider-switch-to-repl-buffer '())))
+
+(defun cider-switch-to-last-clojure-buffer ()
+  "Switch to the last Clojure buffer.
+The default keybinding for this command is
+the same as `cider-switch-to-repl-buffer',
+so that it is very convenient to jump between a
+Clojure buffer and the REPL buffer."
+  (interactive)
+  (if (and (derived-mode-p 'cider-repl-mode)
+           (buffer-live-p cider-last-clojure-buffer))
+      (pop-to-buffer cider-last-clojure-buffer)
+    (message "Don't know the original Clojure buffer")))
+
+(defun cider-find-and-clear-repl-buffer ()
+  "Find the current REPL buffer and clear it.
+Returns to the buffer in which the command was invoked."
+  (interactive)
+  (let ((origin-buffer (current-buffer)))
+    (switch-to-buffer (cider-current-repl-buffer))
+    (cider-repl-clear-buffer)
+    (switch-to-buffer origin-buffer)))
+
+;;; Minibuffer eval
+(defvar cider-minibuffer-history '()
+  "History list of expressions read from the minibuffer.")
+
+(defvar cider-minibuffer-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map minibuffer-local-map)
+    (define-key map "TAB" 'complete-symbol)
+    (define-key map "M-TAB" 'complete-symbol)
+    map)
+  "Minibuffer keymap used for reading Clojure expressions.")
+
+(defun cider-read-from-minibuffer (prompt &optional initial-value history)
+  "Read a string from the minibuffer, prompting with PROMPT.
+If INITIAL-VALUE is non-nil, it is inserted into the minibuffer before
+reading input."
+  (minibuffer-with-setup-hook
+      (lambda ()
+        (add-hook 'completion-at-point-functions
+                  #'cider-complete-at-point nil t)
+        (run-hooks 'eval-expression-minibuffer-setup-hook))
+    (read-from-minibuffer prompt initial-value
+                          cider-minibuffer-map nil
+                          'cider-minibuffer-history)))
+
+(defun cider-read-and-eval ()
+  "Read a sexp from the minibuffer and output its result to the echo area."
+  (interactive)
+  (cider-interactive-eval (cider-read-from-minibuffer "CIDER Eval: ")))
+
+;;; Eval
+(defun cider-eval-region (start end)
+  "Evaluate the region.
+The two arguments START and END are character positions;
+they can be in either order."
+  (interactive "r")
+  (cider-interactive-eval (buffer-substring-no-properties start end)))
+
+(defun cider-eval-buffer ()
+  "Evaluate the current buffer."
+  (interactive)
+  (cider-eval-region (point-min) (point-max)))
+
+(defun cider-defun-at-point ()
+  "Return the text of the top-level sexp at point."
+  (apply #'buffer-substring-no-properties
+         (cider--region-for-defun-at-point)))
+
+(defun cider--region-for-defun-at-point ()
+  "Return the start and end position of defun at point."
+  (save-excursion
+    (save-match-data
+      (end-of-defun)
+      (let ((end (point)))
+        (beginning-of-defun)
+        (list (point) end)))))
+
+(defun cider-eval-defun-at-point (&optional prefix)
+  "Evaluate the current toplevel form, and print result in the minibuffer.
+With a PREFIX argument, print the result in the current buffer."
+  (interactive "P")
+  (let ((form (cider-defun-at-point)))
+    (if prefix
+        (cider-interactive-eval-print form)
+      (cider-interactive-eval form))))
+
+(define-obsolete-function-alias
+  'cider-eval-expression-at-point
+  'cider-eval-defun-at-point)
+
+(defun cider-eval-ns-form ()
+  "Evaluate the current buffer's namespace form."
+  (interactive)
+  (when (clojure-find-ns)
+    (save-excursion
+      (goto-char (match-beginning 0))
+      (cider-eval-defun-at-point))))
+
+(defun cider-bounds-of-sexp-at-point ()
+  "Return the bounds sexp at point as a pair (or nil)."
+  (or (and (equal (char-after) ?\()
+           (member (char-before) '(?\' ?\, ?\@))
+           ;; hide stuff before ( to avoid quirks with '( etc.
+           (save-restriction
+             (narrow-to-region (point) (point-max))
+             (bounds-of-thing-at-point 'sexp)))
+      (bounds-of-thing-at-point 'sexp)))
+
+(defun cider-symbol-at-point ()
+  "Return the name of the symbol at point, otherwise nil."
+  (let ((str (substring-no-properties (or (thing-at-point 'symbol) ""))))
+    (and str
+         (not (equal str (concat (cider-find-ns) "> ")))
+         (not (equal str ""))
+         (substring-no-properties str))))
+
+(defun cider-sexp-at-point ()
+  "Return the sexp at point as a string, otherwise nil."
+  (let ((bounds (cider-bounds-of-sexp-at-point)))
+    (if bounds
+        (buffer-substring-no-properties (car bounds)
+                                        (cdr bounds)))))
+
+(defun cider-sexp-at-point-with-bounds ()
+  "Return a list containing the sexp at point and its bounds."
+  (let ((bounds (cider-bounds-of-sexp-at-point)))
+    (if bounds
+        (let ((start (car bounds))
+              (end (cdr bounds)))
+          (list (buffer-substring-no-properties start end)
+                (cons (set-marker (make-marker) start)
+                      (set-marker (make-marker) end)))))))
+
+(defun cider-last-sexp ()
+  "Return the last sexp."
+  (buffer-substring-no-properties
+   (save-excursion (backward-sexp) (point))
+   (point)))
+
+;;;
+(defun cider-tramp-prefix ()
+  "Top element on `find-tag-marker-ring' used to determine Clojure host."
+  (let ((jump-origin (buffer-file-name
+                      (marker-buffer
+                       (ring-ref find-tag-marker-ring 0)))))
+    (when (tramp-tramp-file-p jump-origin)
+      (let ((vec (tramp-dissect-file-name jump-origin)))
+        (tramp-make-tramp-file-name (tramp-file-name-method vec)
+                                    (tramp-file-name-user vec)
+                                    (tramp-file-name-host vec)
+                                    nil)))))
+
+(defun cider-home-prefix-adjustment (resource)
+  "System-dependent HOME location will be adjusted in RESOURCE.
+Removes any leading slash if on Windows."
+  (save-match-data
+    (cond ((string-match "^\\/\\(Users\\|home\\)\\/\\w+\\(\\/.+\\)" resource)
+           (concat (getenv "HOME") (match-string 2 resource)))
+          ((and (eq system-type 'windows-nt)
+                (string-match "^/" resource)
+                (not (tramp-tramp-file-p resource)))
+           (substring resource 1))
+          (t
+           resource))))
+
+(defun cider-emacs-or-clojure-side-adjustment (resource)
+  "Fix the RESOURCE path depending on `cider-use-local-resources`."
+  (let ((resource         (cider-home-prefix-adjustment resource))
+        (clojure-side-res (concat (cider-tramp-prefix) resource))
+        (emacs-side-res   resource))
+    (cond ((equal resource "") resource)
+          ((and cider-use-local-resources
+                (file-exists-p emacs-side-res))
+           emacs-side-res)
+          ((file-exists-p clojure-side-res)
+           clojure-side-res)
+          (t
+           resource))))
+
+(defun cider-find-file (filename)
+  "Switch to a buffer visiting FILENAME.
+Adjusts for HOME location using `cider-home-prefix-adjustment'.
+Uses `find-file'."
+  (find-file (cider-emacs-or-clojure-side-adjustment filename)))
+
+(defun cider-find-resource (resource)
+  "Find and display RESOURCE."
+  (cond ((string-match "^file:\\(.+\\)" resource)
+         (cider-find-file (match-string 1 resource)))
+        ((string-match "^\\(jar\\|zip\\):file:\\(.+\\)!/\\(.+\\)" resource)
+         (let* ((jar (match-string 2 resource))
+                (path (match-string 3 resource))
+                (buffer-already-open (get-buffer (file-name-nondirectory jar))))
+           (cider-find-file jar)
+           (goto-char (point-min))
+           (search-forward path)
+           (let ((opened-buffer (current-buffer)))
+             (archive-extract)
+             (unless buffer-already-open
+               (kill-buffer opened-buffer)))))
+        (t (error "Unknown resource path %s" resource))))
+
+(defun cider-jump-to-def-for (location)
+  "Jump to LOCATION's definition in the source code."
+  ;; ugh; elisp destructuring doesn't work for vectors
+  (let ((resource (aref location 0))
+        (path (aref location 1))
+        (line (aref location 2)))
+    (if (and path (file-exists-p path))
+        (find-file path)
+      (cider-find-resource resource))
+    (goto-char (point-min))
+    (forward-line (1- line))))
+
+(defun cider-jump-to-def-handler (buffer)
+  "Create a handler for jump-to-def in BUFFER."
+  ;; TODO: got to be a simpler way to do this
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (with-current-buffer buffer
+                                   (ring-insert find-tag-marker-ring (point-marker)))
+                                 (cider-jump-to-def-for
+                                  (car (read-from-string value))))
+                               (lambda (buffer out) (message out))
+                               (lambda (buffer err) (message err))
+                               nil))
+
+(defun cider-jump-to-def (var)
+  "Jump to the definition of the VAR at point."
+  (let ((form (format "(let [ns-symbol    '%s
+                             ns-var       '%s
+                             ns-file      (clojure.core/comp :file
+                                                             clojure.core/meta
+                                                             clojure.core/second
+                                                             clojure.core/first
+                                                             clojure.core/ns-publics)
+                             resource-str (clojure.core/comp clojure.core/str
+                                                             clojure.java.io/resource
+                                                             ns-file)
+                             file-str     (clojure.core/comp clojure.core/str
+                                                             clojure.java.io/file
+                                                             ns-file)]
+                         (cond ((clojure.core/ns-aliases ns-symbol) ns-var)
+                               (let [resolved-ns ((clojure.core/ns-aliases ns-symbol) ns-var)]
+                                 [(resource-str resolved-ns)
+                                  (file-str resolved-ns)
+                                  1])
+
+                               (find-ns ns-var)
+                               [(resource-str ns-var)
+                                (file-str ns-var)
+                                1]
+
+                               (clojure.core/ns-resolve ns-symbol ns-var)
+                               ((clojure.core/juxt
+                                 (clojure.core/comp clojure.core/str
+                                                    clojure.java.io/resource
+                                                    :file)
+                                 (clojure.core/comp clojure.core/str
+                                                    clojure.java.io/file
+                                                    :file)
+                                 :line)
+                                (clojure.core/meta (clojure.core/ns-resolve ns-symbol ns-var)))))"
+                      (cider-current-ns) var)))
+    (cider-tooling-eval form
+                        (cider-jump-to-def-handler (current-buffer))
+                        nrepl-buffer-ns)))
+
+(defun cider-jump (query)
+  "Jump to the definition of QUERY."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-jump-to-def query))
+
+(defalias 'cider-jump-back 'pop-tag-mark)
+
+(defun cider-completion-complete-core-fn (str)
+  "Return a list of completions for STR using complete.core/completions."
+  (cider-eval-and-get-value
+   (format "(clojure.core/require 'complete.core) (complete.core/completions \"%s\" *ns*)" str)
+   nrepl-buffer-ns
+   (nrepl-current-tooling-session)))
+
+(defun cider-completion-complete-op-fn (str)
+  "Return a list of completions for STR using the nREPL \"complete\" op."
+  (let ((strlst (plist-get
+                 (nrepl-send-request-sync
+                  (list "op" "complete"
+                        "session" (nrepl-current-tooling-session)
+                        "ns" nrepl-buffer-ns
+                        "symbol" str))
+                 :value)))
+    (when strlst
+      (car strlst))))
+
+(defun cider-dispatch-complete-symbol (str)
+  "Return a list of completions for STR.
+Dispatch to the nREPL \"complete\" op if supported,
+otherwise dispatch to internal completion function."
+  (if (nrepl-op-supported-p "complete")
+      (cider-completion-complete-op-fn str)
+    (cider-completion-complete-core-fn str)))
+
+(defun cider-complete-at-point ()
+  "Complete the symbol at point."
+  (let ((sap (symbol-at-point)))
+    (when (and sap (not (in-string-p)))
+      (let ((bounds (bounds-of-thing-at-point 'symbol)))
+        (list (car bounds) (cdr bounds)
+              (completion-table-dynamic #'cider-dispatch-complete-symbol))))))
+
+
+;;; JavaDoc Browsing
+;;; Assumes local-paths are accessible in the VM.
+(defvar cider-javadoc-local-paths nil
+  "List of paths to directories with Javadoc.")
+
+(defun cider-javadoc-op (symbol-name)
+  "Invoke the nREPL \"javadoc\" op on SYMBOL-NAME."
+  (cider-send-op
+   "javadoc"
+   `("symbol" ,symbol-name "ns" ,nrepl-buffer-ns
+     "local-paths" ,(mapconcat #'identity cider-javadoc-local-paths " "))
+   (nrepl-make-response-handler
+    (current-buffer)
+    (lambda (buffer url)
+      (if url
+          (browse-url url)
+        (error "No javadoc url for %s" symbol-name)))
+    nil nil nil)))
+
+(defun cider-javadoc-handler (symbol-name)
+  "Invoke the nREPL \"javadoc\" op on SYMBOL-NAME if available."
+  (when symbol-name
+    (let ((bounds (bounds-of-thing-at-point 'symbol)))
+      (if (nrepl-op-supported-p "javadoc")
+          (cider-javadoc-op symbol-name)
+        (message "No Javadoc middleware available")))))
+
+(defun cider-javadoc (query)
+  "Browse Javadoc on the Java class QUERY at point."
+  (interactive "P")
+  (cider-read-symbol-name "Javadoc for: " 'cider-javadoc-handler query))
+
+(defun cider-stdin-handler (buffer)
+  "Make a stdin response handler for BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (cider-repl-emit-result buffer value t))
+                               (lambda (buffer out)
+                                 (cider-repl-emit-output buffer out t))
+                               (lambda (buffer err)
+                                 (cider-repl-emit-output buffer err t))
+                               nil))
+
+(defun cider-insert-eval-handler (buffer)
+  "Make a nREPL evaluation handler for the BUFFER.
+The handler simply inserts the result value in BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (with-current-buffer buffer
+                                   (insert value)))
+                               (lambda (buffer out)
+                                 (cider-repl-emit-interactive-output out))
+                               (lambda (buffer err)
+                                 (message "%s" err)
+                                 (cider-highlight-compilation-errors
+                                  buffer err))
+                               '()))
+
+(defun cider-interactive-eval-handler (buffer)
+  "Make an interactive eval handler for BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (message "%s" value))
+                               (lambda (buffer value)
+                                 (cider-repl-emit-interactive-output value))
+                               (lambda (buffer err)
+                                 (message "%s" err)
+                                 (cider-highlight-compilation-errors
+                                  buffer err))
+                               '()))
+
+(defun cider-load-file-handler (buffer)
+  "Make a load file handler for BUFFER."
+  (let (current-ns (cider-current-ns))
+    (nrepl-make-response-handler buffer
+                                 (lambda (buffer value)
+                                   (message "%s" value)
+                                   (with-current-buffer buffer
+                                     (setq nrepl-buffer-ns (clojure-find-ns))
+                                     (run-hooks 'cider-file-loaded-hook)))
+                                 (lambda (buffer value)
+                                   (cider-repl-emit-interactive-output value))
+                                 (lambda (buffer err)
+                                   (message "%s" err)
+                                   (cider-highlight-compilation-errors
+                                    buffer err))
+                                 '()
+                                 (lambda (buffer ex root-ex session)
+                                   (let ((cider-popup-on-error nil))
+                                     (funcall nrepl-err-handler
+                                              buffer ex root-ex session))))))
+
+(defun cider-interactive-eval-print-handler (buffer)
+  "Make a handler for evaluating and printing result in BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (with-current-buffer buffer
+                                   (insert (format "%s" value))))
+                               '()
+                               (lambda (buffer err)
+                                 (message "%s" err))
+                               '()))
+
+(defun cider-popup-eval-print-handler (buffer)
+  "Make a handler for evaluating and printing result in popup BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               '()
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               '()))
+
+(defun cider-popup-eval-out-handler (buffer)
+  "Make a handler for evaluating and printing stdout/stderr in popup BUFFER."
+  (nrepl-make-response-handler buffer
+                               '()
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               (lambda (buffer str)
+                                 (cider-emit-into-popup-buffer buffer str))
+                               '()))
+
+(defun cider-visit-error-buffer ()
+  "Visit the `cider-error-buffer' (usually *cider-error*) if it exists."
+  (interactive)
+  (let ((buffer (get-buffer cider-error-buffer)))
+    (when buffer
+      (cider-popup-buffer-display buffer))))
+
+(defun cider-find-property (property &optional backward)
+  "Find the next text region which has the specified PROPERTY.
+If BACKWARD is t, then search backward.
+Returns the position at which PROPERTY was found, or nil if not found."
+  (let ((p (if backward
+              (previous-single-char-property-change (point) property)
+             (next-single-char-property-change (point) property))))
+    (when (and (not (= p (point-min))) (not (= p (point-max))))
+      p)))
+
+(defun cider-jump-to-compilation-error (&optional arg reset)
+  "Jump to the line causing the current compilation error.
+
+ARG and RESET are ignored, as there is only ever one compilation error.
+They exist for compatibility with `next-error'."
+  (interactive)
+  (cl-labels ((goto-next-note-boundary
+               ()
+               (let ((p (or (cider-find-property 'cider-note-p)
+                            (cider-find-property 'cider-note-p t))))
+                 (when p
+                   (goto-char p)
+                   (message (get-char-property p 'cider-note))))))
+    ;; if we're already on a compilation error, first jump to the end of
+    ;; it, so that we find the next error.
+    (when (get-char-property (point) 'cider-note-p)
+      (goto-next-note-boundary))
+    (goto-next-note-boundary)))
+
+(defun cider-default-err-handler (buffer ex root-ex session)
+  "Make an error handler for BUFFER, EX, ROOT-EX and SESSION."
+  ;; TODO: use ex and root-ex as fallback values to display when pst/print-stack-trace-not-found
+  (let ((replp (with-current-buffer buffer (derived-mode-p 'cider-repl-mode))))
+    (if (or (and cider-repl-popup-stacktraces replp)
+            (and cider-popup-stacktraces (not replp)))
+      (lexical-let ((cider-popup-on-error cider-popup-on-error))
+        (with-current-buffer buffer
+          (cider-eval "(if-let [pst+ (clojure.core/resolve 'clj-stacktrace.repl/pst+)]
+                        (pst+ *e) (clojure.stacktrace/print-stack-trace *e))"
+                      (nrepl-make-response-handler
+                       (cider-make-popup-buffer cider-error-buffer)
+                       nil
+                       (lambda (buffer value)
+                         (cider-emit-into-color-buffer buffer value)
+                         (when cider-popup-on-error
+                           (cider-popup-buffer-display buffer cider-auto-select-error-buffer)))
+                       nil nil) nil session))
+        (with-current-buffer cider-error-buffer
+          (compilation-minor-mode +1))))))
+
+(defvar cider-compilation-regexp
+  '("\\(?:.*\\(warning, \\)\\|.*?\\(, compiling\\):(\\)\\([^:]*\\):\\([[:digit:]]+\\)\\(?::\\([[:digit:]]+\\)\\)?\\(\\(?: - \\(.*\\)\\)\\|)\\)" 3 4 5 (1))
+  "Specifications for matching errors and warnings in Clojure stacktraces.
+See `compilation-error-regexp-alist' for help on their format.")
+
+(add-to-list 'compilation-error-regexp-alist-alist
+             (cons 'cider cider-compilation-regexp))
+(add-to-list 'compilation-error-regexp-alist 'cider)
+
+(defun cider-extract-error-info (regexp message)
+  "Extract error information with REGEXP against MESSAGE."
+  (let ((file (nth 1 regexp))
+        (line (nth 2 regexp))
+        (col (nth 3 regexp))
+        (type (nth 4 regexp))
+        (pat (car regexp)))
+    (when (string-match pat message)
+      ;; special processing for type (1.2) style
+      (setq type (if (consp type)
+                     (or (and (car type) (match-end (car type)) 1)
+                         (and (cdr type) (match-end (cdr type)) 0)
+                         2)))
+      (list
+       (when file
+         (let ((val (match-string-no-properties file message)))
+           (unless (string= val "NO_SOURCE_PATH") val)))
+       (when line (string-to-number (match-string-no-properties line message)))
+       (when col
+         (let ((val (match-string-no-properties col message)))
+           (when val (string-to-number val))))
+       (aref [cider-warning-highlight-face
+              cider-warning-highlight-face
+              cider-error-highlight-face]
+             (or type 2))
+       message))))
+
+(defun cider-highlight-compilation-errors (buffer message)
+  "Highlight compilation error line in BUFFER, using MESSAGE."
+  (with-current-buffer buffer
+    (let ((info (cider-extract-error-info cider-compilation-regexp message)))
+      (when info
+        (let ((file (nth 0 info))
+              (line (nth 1 info))
+              (col (nth 2 info))
+              (face (nth 3 info))
+              (note (nth 4 info)))
+          (save-excursion
+            ;; when we don't have a filename the line number
+            ;; is relative to form start
+            (if file
+                (goto-char (point-min)) ; start of file
+              (beginning-of-defun))
+            (forward-line (1- line))
+            ;; if have column, highlight sexp at that point otherwise whole line.
+            (move-to-column (or col 0))
+            (let ((begin (progn (if col (backward-up-list) (back-to-indentation)) (point)))
+                  (end (progn (if col (forward-sexp) (move-end-of-line nil)) (point))))
+              (let ((overlay (make-overlay begin end)))
+                (overlay-put overlay 'cider-note-p t)
+                (overlay-put overlay 'face face)
+                (overlay-put overlay 'cider-note note)
+                (overlay-put overlay 'help-echo note)))))))))
+
+(defun cider-need-input (buffer)
+  "Handle an need-input request from BUFFER."
+  (with-current-buffer buffer
+    (nrepl-send-stdin (concat (read-from-minibuffer "Stdin: ") "\n")
+                      (cider-stdin-handler buffer))))
+
+
+;;;; Popup buffers
+(define-minor-mode cider-popup-buffer-mode
+  "Mode for CIDER popup buffers"
+  nil
+  (" cider-tmp")
+  '(("q" .  cider-popup-buffer-quit-function)))
+
+(make-variable-buffer-local
+ (defvar cider-popup-buffer-quit-function 'cider-popup-buffer-quit
+   "The function that is used to quit a temporary popup buffer."))
+
+(defun cider-popup-buffer-quit-function (&optional kill-buffer-p)
+  "Wrapper to invoke the function `cider-popup-buffer-quit-function'.
+KILL-BUFFER-P is passed along."
+  (interactive)
+  (funcall cider-popup-buffer-quit-function kill-buffer-p))
+
+(defun cider-popup-buffer (name &optional select)
+  "Create new popup buffer called NAME.
+If SELECT is non-nil, select the newly created window"
+  (with-current-buffer (cider-make-popup-buffer name)
+    (setq buffer-read-only t)
+    (cider-popup-buffer-display (current-buffer) select)))
+
+(defun cider-popup-buffer-display (popup-buffer &optional select)
+  "Display POPUP-BUFFER.
+If SELECT is non-nil, select the newly created window"
+  (with-current-buffer popup-buffer
+    (let ((new-window (display-buffer (current-buffer))))
+      (set-window-point new-window (point))
+      (when select
+        (select-window new-window))
+      (current-buffer))))
+
+(defun cider-popup-buffer-quit (&optional kill-buffer-p)
+  "Quit the current (temp) window and bury its buffer using `quit-window'.
+If prefix argument KILL-BUFFER-P is non-nil, kill the buffer instead of burying it."
+  (interactive)
+  (quit-window kill-buffer-p (selected-window)))
+
+(defun cider-make-popup-buffer (name)
+  "Create a temporary buffer called NAME."
+  (with-current-buffer (get-buffer-create name)
+    (kill-all-local-variables)
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (set-syntax-table clojure-mode-syntax-table)
+    (cider-popup-buffer-mode 1)
+    (current-buffer)))
+
+(defun cider-emit-into-popup-buffer (buffer value)
+  "Emit into BUFFER the provided VALUE."
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t)
+          (buffer-undo-list t))
+      (insert (format "%s" value))
+      (indent-sexp)
+      (font-lock-fontify-buffer))))
+
+(defun cider-emit-into-color-buffer (buffer value)
+  "Emit into color BUFFER the provided VALUE."
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t)
+          (buffer-undo-list t))
+      (goto-char (point-max))
+      (insert (format "%s" value))
+      (ansi-color-apply-on-region (point-min) (point-max)))
+    (goto-char (point-min))))
+
+;;; Namespace handling
+(defun cider-find-ns ()
+  "Return the ns of the current buffer.
+
+For Clojure buffers the ns is extracted from the ns header.  If
+it's missing \"user\" is used as fallback."
+  (cond
+   ((derived-mode-p 'clojure-mode)
+    (or (save-restriction
+          (widen)
+          (clojure-find-ns))
+        "user"))
+   ((derived-mode-p 'cider-repl-mode)
+    nrepl-buffer-ns)))
+
+(defun cider-current-ns ()
+  "Return the ns in the current context.
+If `nrepl-buffer-ns' has a value then return that, otherwise
+search for and read a `ns' form."
+  (let ((ns nrepl-buffer-ns))
+    (or (and (string= ns "user")
+             (cider-find-ns))
+        ns)))
+
+
+;;; Evaluation
+(defun cider-popup-eval-print (form)
+  "Evaluate the given FORM and print value in current buffer."
+  (let ((buffer (current-buffer)))
+    (cider-eval form
+                (cider-popup-eval-print-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-interactive-eval-print (form)
+  "Evaluate the given FORM and print value in current buffer."
+  (let ((buffer (current-buffer)))
+    (cider-eval form
+                (cider-interactive-eval-print-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-interactive-eval (form)
+  "Evaluate the given FORM and print value in minibuffer."
+  (remove-overlays (point-min) (point-max) 'cider-note-p t)
+  (let ((buffer (current-buffer)))
+    (cider-eval form
+                (cider-interactive-eval-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-interactive-eval-to-repl (form)
+  "Evaluate the given FORM and print it's value in REPL buffer."
+  (let ((buffer (cider-current-repl-buffer)))
+    (cider-eval form
+                (cider-insert-eval-handler buffer)
+                (cider-current-ns))))
+
+(defun cider-eval-last-sexp (&optional prefix)
+  "Evaluate the expression preceding point.
+If invoked with a PREFIX argument, print the result in the current buffer."
+  (interactive "P")
+  (if prefix
+      (cider-interactive-eval-print (cider-last-sexp))
+    (cider-interactive-eval (cider-last-sexp))))
+
+(define-obsolete-function-alias
+  'cider-eval-last-expression
+  'cider-eval-last-sexp)
+
+(defun cider-eval-last-sexp-and-replace ()
+  "Evaluate the expression preceding point and replace it with its result."
+  (interactive)
+  (let ((last-sexp (cider-last-sexp)))
+    ;; we have to be sure the evaluation won't result in an error
+    (cider-eval-and-get-value last-sexp)
+    ;; seems like the sexp is valid, so we can safely kill it
+    (backward-kill-sexp)
+    (cider-interactive-eval-print last-sexp)))
+
+(defun cider-eval-last-sexp-to-repl (&optional prefix)
+  "Evaluate the expression preceding point and insert its result in the REPL.
+If invoked with a PREFIX argument, switch to the REPL buffer."
+  (interactive "P")
+  (cider-interactive-eval-to-repl (cider-last-sexp))
+  (when prefix
+    (cider-switch-to-repl-buffer)))
+
+(defun cider-eval-print-last-sexp ()
+  "Evaluate the expression preceding point.
+Print its value into the current buffer"
+  (interactive)
+  (cider-interactive-eval-print (cider-last-sexp)))
+
+(defun cider-pprint-eval-last-sexp ()
+  "Evaluate the expression preceding point and pprint its value in a popup buffer."
+  (interactive)
+  (let ((form (cider-last-sexp))
+        (result-buffer (cider-popup-buffer cider-result-buffer nil)))
+    (cider-tooling-eval (format "(clojure.pprint/pprint %s)" form)
+                        (cider-popup-eval-out-handler result-buffer)
+                        (cider-current-ns))))
+
+(defun cider-insert-last-sexp-in-repl (&optional arg)
+  "Insert the expression preceding point in the REPL buffer.
+If invoked with a prefix ARG eval the expression after inserting it."
+  (interactive "P")
+  (let ((form (cider-last-sexp))
+        (start-pos (point)))
+    (with-current-buffer (cider-current-repl-buffer)
+      (insert form)
+      (indent-region start-pos (point))
+      (when arg
+        (cider-repl-return))))
+  (cider-switch-to-repl-buffer))
+
+(defun cider-ping ()
+  "Check that communication with the server works."
+  (interactive)
+  (message "%s" (cider-eval-and-get-value "\"PONG\"")))
+
+(defun clojure-enable-cider ()
+  "Turn on CIDER mode (see command `cider-mode').
+Useful in hooks."
+  (cider-mode 1)
+  (setq next-error-function 'cider-jump-to-compilation-error))
+
+(defun clojure-disable-cider ()
+  "Turn off CIDER mode (see command `cider-mode').
+Useful in hooks."
+  (cider-mode -1))
+
+(defun cider-connected-p ()
+  "Return t if CIDER is currently connected, nil otherwise."
+  (condition-case nil
+      (nrepl-current-connection-buffer)
+    (error nil)))
+
+(defun cider-enable-on-existing-clojure-buffers ()
+  "Enable interaction mode on existing Clojure buffers.
+See command `cider-mode'."
+  (interactive)
+  (add-hook 'clojure-mode-hook 'clojure-enable-cider)
+  (dolist (buffer (cider-util--clojure-buffers))
+    (with-current-buffer buffer
+      (clojure-enable-cider))))
+
+(defun cider-disable-on-existing-clojure-buffers ()
+  "Disable `cider-mode' on existing Clojure buffers.
+See command `cider-mode'."
+  (interactive)
+  (dolist (buffer (cider-util--clojure-buffers))
+    (with-current-buffer buffer
+      (setq nrepl-buffer-ns "user")
+      (clojure-disable-cider))))
+
+(defun cider-possibly-disable-on-existing-clojure-buffers ()
+  "If not connected, disable `cider-mode' on existing Clojure buffers."
+  (unless (cider-connected-p)
+    (cider-disable-on-existing-clojure-buffers)))
+
+;; this is horrible, but with async callbacks we can't rely on dynamic scope
+(defvar cider-ido-ns nil)
+(defvar cider-ido-var-callback nil)
+
+(defun cider-ido-form (ns)
+  "Construct a Clojure form for ido read using NS."
+  `(concat (if (find-ns (symbol ,ns))
+               (map name (concat (keys (ns-interns (symbol ,ns)))
+                                 (keys (ns-refers (symbol ,ns))))))
+           (if (not= "" ,ns) [".."])
+           (->> (all-ns)
+             (map (fn [n]
+                      (re-find (re-pattern (str "^" (if (not= ,ns "")
+                                                        (str ,ns "\\."))
+                                                "[^\\.]+"))
+                               (str n))))
+             (filter identity)
+             (map (fn [n] (str n "/")))
+             (into (hash-set)))))
+
+(defun cider-ido-up-ns (ns)
+  "Perform up using NS."
+  (mapconcat 'identity (butlast (split-string ns "\\.")) "."))
+
+(defun cider-ido-var-select (selected targets)
+  "Peform ido select using SELECTED and TARGETS."
+  ;; TODO: immediate RET gives "" as selected for some reason
+  ;; this is an OK workaround though
+  (cond ((equal "" selected)
+         (cider-ido-var-select (car targets) targets))
+        ((equal "/" (substring selected -1)) ; selected a namespace
+         (cider-ido-read-var (substring selected 0 -1) cider-ido-var-callback))
+        ((equal ".." selected)
+         (cider-ido-read-var (cider-ido-up-ns cider-ido-ns) cider-ido-var-callback))
+        ;; non ido variable selection techniques don't return qualified symbols, so this shouldn't either
+        (t (funcall cider-ido-var-callback selected))))
+
+(defun cider-ido-read-sym-handler (label ido-select buffer)
+  "Create an ido read var handler with IDO-SELECT for BUFFER."
+  (lexical-let ((ido-select ido-select)
+                (label label))
+    (nrepl-make-response-handler buffer
+                                 (lambda (buffer value)
+                                   ;; make sure to eval the callback in the buffer that the symbol was requested from so we get the right namespace
+                                   (with-current-buffer buffer
+                                     (let* ((targets (car (read-from-string value)))
+                                            (selected (ido-completing-read label targets nil t)))
+                                       (funcall ido-select selected targets))))
+                                 nil nil nil)))
+
+(defun cider-ido-read-var (ns ido-callback)
+  "Perform ido read var in NS using IDO-CALLBACK."
+  ;; Have to be stateful =(
+  (setq cider-ido-ns ns)
+  (setq cider-ido-var-callback ido-callback)
+  (cider-tooling-eval (prin1-to-string (cider-ido-form cider-ido-ns))
+                      (cider-ido-read-sym-handler "Var:" 'cider-ido-var-select (current-buffer))
+                      nrepl-buffer-ns))
+
+(defun cider-ido-fns-form (ns)
+  "Construct a Clojure form for reading fns using supplied NS."
+  (format "(let [fn-pred (fn [[k v]] (and (fn? (.get v))
+                                     (not (re-find #\"clojure.\" (str v)))))]
+              (sort
+                (map (comp name key)
+                     (filter fn-pred
+                         (concat
+                           (ns-interns '%s)
+                           (ns-refers '%s))))))" ns ns))
+
+(defun cider-ido-fn-callback (f targets)
+  (with-current-buffer (cider-current-repl-buffer)
+    (cider-repl--replace-input (format "(%s)" f))
+    (goto-char (- (point-max) 1))))
+
+(defun cider-load-fn-into-repl-buffer ()
+  "Browse functions available in current repl buffer using ido.
+Once selected, the name of the fn will appear in the repl buffer in parens
+ready to call."
+  (interactive)
+  (cider-tooling-eval (cider-ido-fns-form (cider-current-ns))
+                      (cider-ido-read-sym-handler (format "Fn: %s/" nrepl-buffer-ns)
+                                                  'cider-ido-fn-callback (current-buffer))
+                      nrepl-buffer-ns))
+
+(defun cider-read-symbol-name (prompt callback &optional query)
+  "Either read a symbol name using PROMPT or choose the one at point.
+Use CALLBACK as the ido read var callback.
+The user is prompted with PROMPT if a prefix argument is in effect,
+if there is no symbol at point, or if QUERY is non-nil."
+  (let ((symbol-name (cider-symbol-at-point)))
+    (cond ((not (or current-prefix-arg query (not symbol-name)))
+           (funcall callback symbol-name))
+          (ido-mode (cider-ido-read-var nrepl-buffer-ns callback))
+          (t (funcall callback (read-from-minibuffer prompt symbol-name))))))
+
+(defun cider-doc-handler (symbol)
+  "Create a handler to lookup documentation for SYMBOL."
+  (let ((form (format "(clojure.repl/doc %s)" symbol))
+        (doc-buffer (cider-popup-buffer cider-doc-buffer t)))
+    (cider-tooling-eval form
+                        (cider-popup-eval-out-handler doc-buffer)
+                        nrepl-buffer-ns)))
+
+(defun cider-doc (query)
+  "Open a window with the docstring for the given QUERY.
+Defaults to the symbol at point.  With prefix arg or no symbol
+under point, prompts for a var."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-doc-handler query))
+
+(defun cider-src-handler (symbol)
+  "Create a handler to lookup source for SYMBOL."
+  (let ((form (format "(clojure.repl/source %s)" symbol))
+        (src-buffer (cider-popup-buffer cider-src-buffer t)))
+    (with-current-buffer src-buffer
+      (clojure-mode)
+      (cider-popup-buffer-mode +1))
+    (cider-tooling-eval form
+                        (cider-popup-eval-out-handler src-buffer)
+                        nrepl-buffer-ns)))
+
+(defun cider-src (query)
+  "Open a window with the source for the given QUERY.
+Defaults to the symbol at point.  With prefix arg or no symbol
+under point, prompts for a var."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-src-handler query))
+
+;; TODO: implement reloading ns
+(defun cider-eval-load-file (form)
+  "Load FORM."
+  (let ((buffer (current-buffer)))
+    (cider-eval form (cider-interactive-eval-handler buffer))))
+
+(defun cider-file-string (file)
+  "Read the contents of a FILE and return as a string."
+  (with-current-buffer (find-file-noselect file)
+    (buffer-string)))
+
+(defun cider-load-file-op (filename)
+  "Send \"load-file\" op for FILENAME."
+  (cider-send-load-file (cider-file-string filename)
+                        filename
+                        (file-name-nondirectory filename)))
+
+(defun cider-load-file (filename)
+  "Load the Clojure file FILENAME."
+  (interactive (list
+                (read-file-name "Load file: " nil nil
+                                nil (if (buffer-file-name)
+                                        (file-name-nondirectory
+                                         (buffer-file-name))))))
+  (remove-overlays (point-min) (point-max) 'cider-note-p t)
+  (cider-load-file-op filename)
+  (message "Loading %s..." filename))
+
+(defun cider-load-current-buffer ()
+  "Load current buffer's file."
+  (interactive)
+  (check-parens)
+  (unless buffer-file-name
+    (error "Buffer %s is not associated with a file" (buffer-name)))
+  (when (and (buffer-modified-p)
+             (y-or-n-p (format "Save file %s? " (buffer-file-name))))
+    (save-buffer))
+  (cider-load-file (buffer-file-name)))
+
+;;; interrupt evaluation
+(defun cider-interrupt-handler (buffer)
+  "Create an interrupt response handler for BUFFER."
+  (nrepl-make-response-handler buffer nil nil nil nil))
+
+;;; quiting
+(defun cider--close-buffer (buffer)
+  "Close the BUFFER and kill its associated process (if any)."
+  (when (get-buffer-process buffer)
+    (delete-process (get-buffer-process buffer)))
+  (when (get-buffer buffer)
+    (kill-buffer buffer)))
+
+(defvar cider-ancilliary-buffers
+  (list cider-error-buffer
+        cider-doc-buffer
+        cider-src-buffer
+        nrepl-event-buffer-name))
+
+(defun cider-close-ancilliary-buffers ()
+  "Close buffers that are shared across connections."
+  (interactive)
+  (dolist (buf-name cider-ancilliary-buffers)
+    (cider--close-buffer buf-name)))
+
+(defun cider-quit ()
+  "Quit CIDER.
+
+Quitting closes all active nREPL connections and kills all CIDER buffers."
+  (interactive)
+  (when (y-or-n-p "Are you sure you want to quit CIDER? ")
+    (dolist (connection nrepl-connection-list)
+      (when connection
+        (nrepl-close connection)))
+    (message "All active nREPL connections were closed")
+    (cider-close-ancilliary-buffers)))
+
+(defun cider-restart (&optional prompt-project)
+  "Quit CIDER and restart it.
+If PROMPT-PROJECT is t, then prompt for the project in which to
+restart the server."
+  (interactive)
+  (cider-quit)
+  (cider-jack-in current-prefix-arg))
+
+(add-hook 'nrepl-connected-hook 'cider-enable-on-existing-clojure-buffers)
+(add-hook 'nrepl-disconnected-hook
+          'cider-possibly-disable-on-existing-clojure-buffers)
+
+(provide 'cider-interaction)
+;;; cider-interaction.el ends here
diff --git a/elpa/cider-20131221.1231/cider-macroexpansion.el b/elpa/cider-20131221.1231/cider-macroexpansion.el
new file mode 100644
index 000000000..7620090da
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-macroexpansion.el
@@ -0,0 +1,165 @@
+;;; cider-macroexpansion.el --- Macro expansion support
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Macro expansion support.
+
+;;; Code:
+
+(require 'cider-mode)
+
+(defconst cider-macroexpansion-buffer "*cider-macroexpansion*")
+
+(push cider-macroexpansion-buffer cider-ancilliary-buffers)
+
+(defun cider-macroexpand-undo (&optional arg)
+  "Undo the last macroexpansion, using `undo-only'.
+ARG is passed along to `undo-only'."
+  (interactive)
+  (let ((inhibit-read-only t))
+    (undo-only arg)))
+
+(defvar cider-last-macroexpand-expression nil
+  "Specify the last macroexpansion preformed.
+This variable specifies both what was expanded and the expander.")
+
+(defun cider-macroexpand-form (expander expr)
+  "Macroexpand, using EXPANDER, the given EXPR."
+  (format
+   "(clojure.pprint/write (%s '%s) :suppress-namespaces false :dispatch clojure.pprint/code-dispatch)"
+   expander expr))
+
+(defun cider-macroexpand-expr (expander expr &optional buffer)
+  "Macroexpand, use EXPANDER, the given EXPR from BUFFER."
+  (let* ((form (cider-macroexpand-form expander expr))
+         (expansion (plist-get (cider-eval-sync form nrepl-buffer-ns) :stdout)))
+    (setq cider-last-macroexpand-expression form)
+    (cider-initialize-macroexpansion-buffer expansion nrepl-buffer-ns)))
+
+(defun cider-macroexpand-expr-inplace (expander)
+  "Substitute the current form at point with its macroexpansion using EXPANDER."
+  (interactive)
+  (let ((form-with-bounds (cider-sexp-at-point-with-bounds)))
+    (if form-with-bounds
+        (destructuring-bind (expr bounds) form-with-bounds
+          (let* ((form (cider-macroexpand-form expander expr))
+                 (expansion (plist-get (cider-eval-sync form nrepl-buffer-ns) :stdout)))
+            (cider-redraw-macroexpansion-buffer
+             expansion (current-buffer) (car bounds) (cdr bounds) (point)))))))
+
+(defun cider-macroexpand-again ()
+  "Repeat the last macroexpansion."
+  (interactive)
+  (let ((expansion
+         (plist-get (cider-eval-sync cider-last-macroexpand-expression nrepl-buffer-ns) :stdout)))
+    (cider-initialize-macroexpansion-buffer expansion nrepl-buffer-ns)))
+
+;;;###autoload
+(defun cider-macroexpand-1 (&optional prefix)
+  "Invoke 'macroexpand-1' on the expression at point.
+If invoked with a PREFIX argument, use 'macroexpand' instead of
+'macroexpand-1'."
+  (interactive "P")
+  (let ((expander (if prefix 'macroexpand 'macroexpand-1)))
+    (cider-macroexpand-expr expander (cider-sexp-at-point))))
+
+(defun cider-macroexpand-1-inplace (&optional prefix)
+  "Perform inplace 'macroexpand-1' on the expression at point.
+If invoked with a PREFIX argument, use 'macroexpand' instead of
+'macroexpand-1'."
+  (interactive "P")
+  (let ((expander (if prefix 'macroexpand 'macroexpand-1)))
+    (cider-macroexpand-expr-inplace expander)))
+
+;;;###autoload
+(defun cider-macroexpand-all ()
+  "Invoke 'clojure.walk/macroexpand-all' on the expression at point."
+  (interactive)
+  (cider-macroexpand-expr
+   'clojure.walk/macroexpand-all (cider-sexp-at-point)))
+
+(defun cider-macroexpand-all-inplace ()
+  "Perform inplace 'clojure.walk/macroexpand-all' on the expression at point."
+  (interactive)
+  (cider-macroexpand-expr-inplace 'clojure.walk/macroexpand-all))
+
+(defun cider-initialize-macroexpansion-buffer (expansion ns)
+  "Create a new Macroexpansion buffer with EXPANSION and namespace NS."
+  (pop-to-buffer (cider-create-macroexpansion-buffer))
+  (setq nrepl-buffer-ns ns)
+  (setq buffer-undo-list nil)
+  (let ((inhibit-read-only t)
+        (buffer-undo-list t))
+    (erase-buffer)
+    (insert (format "%s" expansion))
+    (goto-char (point-min))
+    (font-lock-fontify-buffer)))
+
+(defun cider-redraw-macroexpansion-buffer (expansion buffer start end current-point)
+  "Redraw the macroexpansion with new EXPANSION.
+Text in BUFFER from START to END is replaced with new expansion,
+and point is placed at CURRENT-POINT."
+  (with-current-buffer buffer
+    (let ((buffer-read-only nil))
+      (goto-char start)
+      (delete-region start end)
+      (insert (format "%s" expansion))
+      (goto-char start)
+      (indent-sexp)
+      (goto-char current-point))))
+
+(defun cider-create-macroexpansion-buffer ()
+  "Create a new macroexpansion buffer."
+  (with-current-buffer (cider-popup-buffer cider-macroexpansion-buffer t)
+    (clojure-mode)
+    (clojure-disable-cider)
+    (cider-macroexpansion-minor-mode 1)
+    (current-buffer)))
+
+(defvar cider-macroexpansion-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "g") 'cider-macroexpand-again)
+    (define-key map (kbd "q") 'cider-popup-buffer-quit-function)
+    (cl-labels ((redefine-key (from to)
+                              (dolist (mapping (where-is-internal from cider-mode-map))
+                                (define-key map mapping to))))
+      (redefine-key 'cider-macroexpand-1 'cider-macroexpand-1-inplace)
+      (redefine-key 'cider-macroexpand-all 'cider-macroexpand-all-inplace)
+      (redefine-key 'advertised-undo 'cider-macroexpand-undo)
+      (redefine-key 'undo 'cider-macroexpand-undo))
+    map))
+
+(define-minor-mode cider-macroexpansion-minor-mode
+  "Minor mode for nrepl macroexpansion.
+
+\\{cider-macroexpansion-minor-mode-map}"
+  nil
+  " Macroexpand"
+  cider-macroexpansion-minor-mode-map)
+
+(provide 'cider-macroexpansion)
+;;; cider-macroexpansion.el ends here
diff --git a/elpa/cider-20131221.1231/cider-mode.el b/elpa/cider-20131221.1231/cider-mode.el
new file mode 100644
index 000000000..32b09c0b7
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-mode.el
@@ -0,0 +1,123 @@
+;;; cider-mode.el --- Minor mode for REPL interactions
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Minor mode for REPL interactions.
+
+;;; Code:
+
+(require 'cider-interaction)
+
+(defvar cider-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "M-.") 'cider-jump)
+    (define-key map (kbd "M-,") 'cider-jump-back)
+    (define-key map (kbd "M-TAB") 'complete-symbol)
+    (define-key map (kbd "C-M-x") 'cider-eval-defun-at-point)
+    (define-key map (kbd "C-c C-c") 'cider-eval-defun-at-point)
+    (define-key map (kbd "C-x C-e") 'cider-eval-last-sexp)
+    (define-key map (kbd "C-c C-e") 'cider-eval-last-sexp)
+    (define-key map (kbd "C-c C-w") 'cider-eval-last-sexp-and-replace)
+    (define-key map (kbd "C-c M-e") 'cider-eval-last-sexp-to-repl)
+    (define-key map (kbd "C-c M-p") 'cider-insert-last-sexp-in-repl)
+    (define-key map (kbd "C-c C-p") 'cider-pprint-eval-last-sexp)
+    (define-key map (kbd "C-c C-r") 'cider-eval-region)
+    (define-key map (kbd "C-c C-n") 'cider-eval-ns-form)
+    (define-key map (kbd "C-c M-:") 'cider-read-and-eval)
+    (define-key map (kbd "C-c C-m") 'cider-macroexpand-1)
+    (define-key map (kbd "C-c M-m") 'cider-macroexpand-all)
+    (define-key map (kbd "C-c M-n") 'cider-repl-set-ns)
+    (define-key map (kbd "C-c C-d") 'cider-doc)
+    (define-key map (kbd "C-c C-s") 'cider-src)
+    (define-key map (kbd "C-c C-z") 'cider-switch-to-repl-buffer)
+    (define-key map (kbd "C-c C-Z") 'cider-switch-to-relevant-repl-buffer)
+    (define-key map (kbd "C-c M-o") 'cider-find-and-clear-repl-buffer)
+    (define-key map (kbd "C-c C-k") 'cider-load-current-buffer)
+    (define-key map (kbd "C-c C-l") 'cider-load-file)
+    (define-key map (kbd "C-c C-b") 'cider-interrupt)
+    (define-key map (kbd "C-c C-j") 'cider-javadoc)
+    (define-key map (kbd "C-c M-s") 'cider-selector)
+    (define-key map (kbd "C-c M-r") 'cider-rotate-connection)
+    (define-key map (kbd "C-c M-d") 'cider-display-current-connection-info)
+    (define-key map (kbd "C-c C-q") 'cider-quit)
+    map))
+
+;;;###autoload
+(define-minor-mode cider-mode
+  "Minor mode for REPL interaction from a Clojure buffer.
+
+\\{cider-mode-map}"
+  nil
+  " cider"
+  cider-mode-map
+  (make-local-variable 'completion-at-point-functions)
+  (add-to-list 'completion-at-point-functions
+               'cider-complete-at-point))
+
+(easy-menu-define cider-mode-menu cider-mode-map
+  "Menu for CIDER mode"
+  '("CIDER"
+    ["Jump" cider-jump]
+    ["Jump back" cider-jump-back]
+    "--"
+    ["Complete symbol" complete-symbol]
+    "--"
+    ["Eval top-level sexp at point" cider-eval-defun-at-point]
+    ["Eval last sexp" cider-eval-last-sexp]
+    ["Eval last sexp in popup buffer" cider-pprint-eval-last-sexp]
+    ["Eval last sexp to REPL buffer" cider-eval-last-sexp-to-repl]
+    ["Eval last sexp and replace it with its result" cider-eval-last-sexp-and-replace]
+    ["Eval region" cider-eval-region]
+    ["Eval ns form" cider-eval-ns-form]
+    ["Insert last sexp in REPL" cider-insert-last-sexp-in-repl]
+    "--"
+    ["Load current buffer" cider-load-current-buffer]
+    ["Load file" cider-load-file]
+    "--"
+    ["Macroexpand-1 last expression" cider-macroexpand-1]
+    ["Macroexpand-all last expression" cider-macroexpand-all]
+    "--"
+    ["Display documentation" cider-doc]
+    ["Display source" cider-src]
+    ["Display JavaDoc" cider-javadoc]
+    "--"
+    ["Set ns" cider-repl-set-ns]
+    ["Switch to REPL" cider-switch-to-repl-buffer]
+    ["Switch to Relevant REPL" cider-switch-to-relevant-repl-buffer]
+    ["Toggle REPL Pretty Print" cider-pretty-toggle]
+    ["Clear REPL" cider-find-and-clear-repl-buffer]
+    ["Interrupt" cider-interrupt]
+    ["Quit" cider-quit]
+    ["Restart" cider-restart]
+    "--"
+    ["Display current nREPL connection" cider-display-current-connection-info]
+    ["Rotate current nREPL connection" cider-rotate-connection]
+    "--"
+    ["Version info" cider-version]))
+
+(provide 'cider-mode)
+;;; cider-mode.el ends here
diff --git a/elpa/cider-20131221.1231/cider-pkg.el b/elpa/cider-20131221.1231/cider-pkg.el
new file mode 100644
index 000000000..867de7311
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-pkg.el
@@ -0,0 +1,5 @@
+(define-package "cider" "20131221.1231" "Clojure Integrated Development Environment and REPL"
+  '((clojure-mode "2.0.0")
+    (cl-lib "0.3")
+    (dash "2.1.0")
+    (pkg-info "0.4")))
diff --git a/elpa/cider-20131221.1231/cider-pkg.elc b/elpa/cider-20131221.1231/cider-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..dda6ce10e3ca3cc6e298c90f63c07a64ab7f5df2
GIT binary patch
literal 694
zcmbtSO;6)65bZgCV6UTGXeHv*4hKpvtV$1+IINcC2TbirV{q)qc8lQG?<7Ghp*`Z0
zJ#XH7^Wp9Oara}fSQOjs7IvW@tRn-*cQEKJx%)S4TSp0kho`fL2hyN6Amv@t+%*c+
zS~e54jiHB@$xuHhim9IYwV)n#5~e0MV6Cm8SdAp9loV1m@-sHPo&>o`%6iz3B)G7S
zWn*<CICsL{Z0-P^gD_;<+Yii~kVG+oe>$7y8qSGJHt!yLtHA`Fa<u-Gt{IIf0~*6k
z{_~L=p*H_%n7|r7WYEE9<m7X1t6Prv>gUt$Z~)z5M4h?F>&YIyffPWaha-Ut_{HS2
znFNH<S&EQ5PE^h8%hUhX84LLCDT-ogsI{J|0re}M2+C<;C6r%Q#_ydAFXu>b@R?2#
zGmrCuF66?{lh3gC7aN10?&DZ~?|(g(aJ5|OnOF6}u(}d!u`XA@;mX+~lxxw9PlKr&
UQ8}ahH!ADfFyc4mYPBl<0<r$eKmY&$

literal 0
HcmV?d00001

diff --git a/elpa/cider-20131221.1231/cider-repl.el b/elpa/cider-20131221.1231/cider-repl.el
new file mode 100644
index 000000000..d39c474d7
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-repl.el
@@ -0,0 +1,1064 @@
+;;; cider-repl.el --- REPL interactions
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; REPL interactions.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-interaction)
+(require 'cider-version)
+(require 'cider-eldoc) ; for cider-turn-on-eldoc-mode
+
+(require 'clojure-mode)
+(require 'easymenu)
+
+(eval-when-compile
+  (defvar paredit-version)
+  (defvar paredit-space-for-delimiter-predicates))
+
+(defgroup cider-repl nil
+  "Interaction with the REPL."
+  :prefix "cider-repl-"
+  :group 'cider)
+
+(defface cider-repl-prompt-face
+  '((t (:inherit font-lock-keyword-face)))
+  "Face for the prompt in the REPL buffer."
+  :group 'cider-repl)
+
+(defface cider-repl-output-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for output in the REPL buffer."
+  :group 'cider-repl)
+
+(defface cider-repl-input-face
+  '((t (:bold t)))
+  "Face for previous input in the REPL buffer."
+  :group 'cider-repl)
+
+(defface cider-repl-result-face
+  '((t ()))
+  "Face for the result of an evaluation in the REPL buffer."
+  :group 'cider-repl)
+
+(defcustom cider-repl-popup-stacktraces nil
+  "Non-nil means pop-up error stacktraces in the REPL buffer.
+Nil means show only an error message in the minibuffer.  This variable
+overrides `cider-popup-stacktraces' in REPL buffers."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-pop-to-buffer-on-connect t
+  "Controls whether to pop to the REPL buffer on connect.
+
+When set to nil the buffer will only be created."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-display-in-current-window nil
+  "Controls whether the REPL buffer is displayed in the current window."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-use-pretty-printing nil
+  "Control whether the results in REPL are pretty-printed or not.
+The `cider-toggle-pretty-printing' command can be used to interactively
+change the setting's value."
+  :type 'boolean
+  :group 'cider-repl)
+
+(defcustom cider-repl-print-length nil
+  "Non-nil means limit the number of objects printed in REPL to this value.
+This is implemented by setting the value of the Clojure var
+*print-length*.  The `cider-repl-toggle-print-length-limiting'
+command can be used to interactively change whether this setting
+is enforced or not."
+  :type 'integer
+  :group 'cider-repl)
+
+(defcustom cider-repl-tab-command 'cider-repl-indent-and-complete-symbol
+  "Select the command to be invoked by the TAB key.
+The default option is `cider-repl-indent-and-complete-symbol'.  If
+you'd like to use the default Emacs behavior use
+`indent-for-tab-command'."
+  :type 'symbol
+  :group 'cider-repl)
+
+(defcustom cider-lein-command
+  "lein"
+  "The command used to execute leiningen 2.x."
+  :type 'string
+  :group 'cider-repl)
+
+(defcustom cider-server-command
+  (if (or (locate-file cider-lein-command exec-path)
+          (locate-file (format "%s.bat" cider-lein-command) exec-path))
+      (format "%s repl :headless" cider-lein-command)
+    (format "echo \"%s repl :headless\" | eval $SHELL -l" cider-lein-command))
+  "The command used to start the nREPL via command `cider-jack-in'.
+For a remote nREPL server lein must be in your PATH.  The remote
+proc is launched via sh rather than bash, so it might be necessary
+to specific the full path to it.  Localhost is assumed."
+  :type 'string
+  :group 'cider-repl)
+
+;;;; REPL buffer local variables
+(defvar cider-repl-input-start-mark)
+
+(defvar cider-repl-prompt-start-mark)
+
+(defvar cider-repl-old-input-counter 0
+  "Counter used to generate unique `cider-old-input' properties.
+This property value must be unique to avoid having adjacent inputs be
+joined together.")
+
+(defvar cider-repl-input-history '()
+  "History list of strings read from the nREPL buffer.")
+
+(defvar cider-repl-input-history-items-added 0
+  "Variable counting the items added in the current session.")
+
+(defvar cider-repl-output-start nil
+  "Marker for the start of output.")
+
+(defvar cider-repl-output-end nil
+  "Marker for the end of output.")
+
+(nrepl-make-variables-buffer-local
+ 'cider-repl-input-start-mark
+ 'cider-repl-prompt-start-mark
+ 'cider-repl-old-input-counter
+ 'cider-repl-input-history
+ 'cider-repl-input-history-items-added
+ 'cider-repl-output-start
+ 'cider-repl-output-end)
+
+(defun cider-repl-tab ()
+  "Invoked on TAB keystrokes in `cider-repl-mode' buffers."
+  (interactive)
+  (funcall cider-repl-tab-command))
+
+(defun cider-repl-reset-markers ()
+  "Reset all REPL markers."
+  (dolist (markname '(cider-repl-output-start
+                      cider-repl-output-end
+                      cider-repl-prompt-start-mark
+                      cider-repl-input-start-mark))
+    (set markname (make-marker))
+    (set-marker (symbol-value markname) (point))))
+
+(defmacro cider-propertize-region (props &rest body)
+  "Add PROPS to all text inserted by executing BODY.
+More precisely, PROPS are added to the region between the point's
+positions before and after executing BODY."
+  (let ((start (make-symbol "start-pos")))
+    `(let ((,start (point)))
+       (prog1 (progn ,@body)
+         (add-text-properties ,start (point) ,props)))))
+
+(put 'cider-propertize-region 'lisp-indent-function 1)
+
+;;; REPL init
+(defun cider-repl-buffer-name ()
+  "Generate a REPL buffer name based on current connection buffer."
+  (with-current-buffer (get-buffer (nrepl-current-connection-buffer))
+    (nrepl-buffer-name nrepl-repl-buffer-name-template)))
+
+(defun cider-create-repl-buffer (process)
+  "Create a REPL buffer for PROCESS."
+  (cider-init-repl-buffer
+   process
+   (let ((buffer-name (cider-repl-buffer-name)))
+     (if cider-repl-display-in-current-window
+         (add-to-list 'same-window-buffer-names buffer-name))
+     (if cider-repl-pop-to-buffer-on-connect
+         (pop-to-buffer buffer-name)
+       (generate-new-buffer buffer-name))
+     buffer-name)))
+
+(defun cider-make-repl (process)
+  "Make a REPL for the connection PROCESS."
+  (let ((connection-buffer (process-buffer process))
+        (repl-buffer (cider-create-repl-buffer process)))
+    (with-current-buffer repl-buffer
+      (setq nrepl-connection-buffer (buffer-name connection-buffer)))
+    (with-current-buffer connection-buffer
+      (setq nrepl-repl-buffer (buffer-name repl-buffer)))))
+
+(defun cider-repl--banner ()
+  "Generate the welcome REPL buffer banner."
+  (format "; CIDER %s (Clojure %s, nREPL %s)"
+          (cider-version)
+          (cider--clojure-version)
+          (cider--backend-version)))
+
+(defun cider-repl--insert-banner-and-prompt (ns)
+  "Insert REPL banner and REPL prompt, taking into account NS."
+  (when (zerop (buffer-size))
+    (insert (propertize (cider-repl--banner) 'face 'font-lock-comment-face)))
+  (goto-char (point-max))
+  (cider-repl--mark-output-start)
+  (cider-repl--mark-input-start)
+  (cider-repl--insert-prompt ns))
+
+(defun cider-init-repl-buffer (connection buffer &optional noprompt)
+  "Initialize the REPL for CONNECTION in BUFFER.
+Insert a banner, unless NOPROMPT is non-nil."
+  (with-current-buffer buffer
+    (unless (eq major-mode 'cider-repl-mode)
+      (cider-repl-mode))
+    ;; use the same requires by default as clojure.main does
+    (cider-eval-sync nrepl-repl-requires-sexp)
+    (when cider-repl-print-length
+      (cider-repl-set-print-length cider-repl-print-length))
+    (cider-repl-reset-markers)
+    ;; honor :init-ns from lein's :repl-options on startup
+    (setq nrepl-buffer-ns (cider-eval-and-get-value "(str *ns*)"))
+    (unless noprompt
+      (cider-repl--insert-banner-and-prompt nrepl-buffer-ns))
+    (cider-remember-clojure-buffer cider-current-clojure-buffer)
+    (current-buffer)))
+
+(defun cider-find-or-create-repl-buffer ()
+  "Return the REPL buffer, create it if necessary."
+  (let ((buffer (cider-current-repl-buffer)))
+        (if (null buffer)
+                (error "No active nREPL connection")
+          (let ((buffer (get-buffer buffer)))
+                (or (when (buffer-live-p buffer) buffer)
+                        (let ((buffer (nrepl-current-connection-buffer)))
+                          (if (null buffer)
+                                  (error "No active nREPL connection")
+                                (cider-init-repl-buffer
+                                 (get-process buffer)
+                                 (get-buffer-create
+                                  (cider-repl-buffer-name))))))))))
+
+;;; REPL interaction
+(defun cider-property-bounds (prop)
+  "Return the the positions of the previous and next change to PROP.
+PROP is the name of a text property."
+  (assert (get-text-property (point) prop))
+  (let ((end (next-single-char-property-change (point) prop)))
+    (list (previous-single-char-property-change end prop) end)))
+
+(defun cider-repl--in-input-area-p ()
+  "Return t if in input area."
+  (<= cider-repl-input-start-mark (point)))
+
+(defun cider-repl--current-input (&optional until-point-p)
+  "Return the current input as string.
+The input is the region from after the last prompt to the end of
+buffer.  If UNTIL-POINT-P is non-nil, the input is until the current
+point."
+  (buffer-substring-no-properties cider-repl-input-start-mark
+                                  (if until-point-p
+                                      (point)
+                                    (point-max))))
+
+(defun cider-repl-previous-prompt ()
+  "Move backward to the previous prompt."
+  (interactive)
+  (cider-repl--find-prompt t))
+
+(defun cider-repl-next-prompt ()
+  "Move forward to the next prompt."
+  (interactive)
+  (cider-repl--find-prompt))
+
+(defun cider-repl--find-prompt (&optional backward)
+  "Find the next prompt.
+If BACKWARD is non-nil look backward."
+  (let ((origin (point))
+        (prop 'cider-prompt))
+    (while (progn
+             (cider-search-property-change prop backward)
+             (not (or (cider-end-of-proprange-p prop) (bobp) (eobp)))))
+    (unless (cider-end-of-proprange-p prop)
+      (goto-char origin))))
+
+(defun cider-search-property-change (prop &optional backward)
+  "Search forward for a property change to PROP.
+If BACKWARD is non-nil search backward."
+  (cond (backward
+         (goto-char (previous-single-char-property-change (point) prop)))
+        (t
+         (goto-char (next-single-char-property-change (point) prop)))))
+
+(defun cider-end-of-proprange-p (property)
+  "Return t if at the the end of a property range for PROPERTY."
+  (and (get-char-property (max 1 (1- (point))) property)
+       (not (get-char-property (point) property))))
+
+(defun cider-repl--mark-input-start ()
+  "Mark the input start."
+  (set-marker cider-repl-input-start-mark (point) (current-buffer)))
+
+(defun cider-repl--mark-output-start ()
+  "Mark the output start."
+  (set-marker cider-repl-output-start (point))
+  (set-marker cider-repl-output-end (point)))
+
+(defun cider-repl--mark-output-end ()
+  "Mark the output end."
+  (add-text-properties cider-repl-output-start cider-repl-output-end
+                       '(face cider-repl-output-face
+                              rear-nonsticky (face))))
+
+(defun cider-repl--same-line-p (pos1 pos2)
+  "Return t if buffer positions POS1 and POS2 are on the same line."
+  (save-excursion (goto-char (min pos1 pos2))
+                  (<= (max pos1 pos2) (line-end-position))))
+
+(defun cider-repl--bol-internal ()
+  "Go to the beginning of line or the prompt."
+  (cond ((and (>= (point) cider-repl-input-start-mark)
+              (cider-repl--same-line-p (point) cider-repl-input-start-mark))
+         (goto-char cider-repl-input-start-mark))
+        (t (beginning-of-line 1))))
+
+(defun cider-repl-bol ()
+  "Go to the beginning of line or the prompt."
+  (interactive)
+  (deactivate-mark)
+  (cider-repl--bol-internal))
+
+(defun cider-repl-bol-mark ()
+  "Set the mark and go to the beginning of line or the prompt."
+  (interactive)
+  (unless mark-active
+    (set-mark (point)))
+  (cider-repl--bol-internal))
+
+(defun cider-repl--at-prompt-start-p ()
+  "Return t if point is at the start of prompt.
+This will not work on non-current prompts."
+  (= (point) cider-repl-input-start-mark))
+
+(defun cider-repl--show-maximum-output ()
+  "Put the end of the buffer at the bottom of the window."
+  (when (eobp)
+    (let ((win (get-buffer-window (current-buffer))))
+      (when win
+        (with-selected-window win
+          (set-window-point win (point-max))
+          (recenter -1))))))
+
+(defmacro cider-save-marker (marker &rest body)
+  "Save MARKER and execute BODY."
+  (let ((pos (make-symbol "pos")))
+    `(let ((,pos (marker-position ,marker)))
+       (prog1 (progn . ,body)
+         (set-marker ,marker ,pos)))))
+
+(put 'cider-save-marker 'lisp-indent-function 1)
+
+(defun cider-repl--insert-prompt (namespace)
+  "Insert the prompt (before markers!), taking into account NAMESPACE.
+Set point after the prompt.
+Return the position of the prompt beginning."
+  (goto-char cider-repl-input-start-mark)
+  (cider-save-marker cider-repl-output-start
+    (cider-save-marker cider-repl-output-end
+      (unless (bolp) (insert-before-markers "\n"))
+      (let ((prompt-start (point))
+            (prompt (format "%s> " namespace)))
+        (cider-propertize-region
+            '(face cider-repl-prompt-face read-only t intangible t
+                   cider-prompt t
+                   rear-nonsticky (cider-prompt read-only face intangible))
+          (insert-before-markers prompt))
+        (set-marker cider-repl-prompt-start-mark prompt-start)
+        prompt-start))))
+
+(defun cider-repl-emit-output-at-pos (buffer string position &optional bol)
+  "Using BUFFER, insert STRING at POSITION and mark it as output.
+If BOL is non-nil insert at the beginning of line."
+  (with-current-buffer buffer
+    (save-excursion
+      (cider-save-marker cider-repl-output-start
+        (cider-save-marker cider-repl-output-end
+          (goto-char position)
+          ;; TODO: Review the need for bol
+          (when (and bol (not (bolp))) (insert-before-markers "\n"))
+          (cider-propertize-region `(face cider-repl-output-face
+                                          rear-nonsticky (face))
+            (insert-before-markers string)
+            (when (and (= (point) cider-repl-prompt-start-mark)
+                       (not (bolp)))
+              (insert-before-markers "\n")
+              (set-marker cider-repl-output-end (1- (point))))))))
+    (cider-repl--show-maximum-output)))
+
+(defun cider-repl-emit-interactive-output (string)
+  "Emit STRING as interactive output."
+  (with-current-buffer (cider-current-repl-buffer)
+    (let ((pos (1- (cider-repl--input-line-beginning-position))))
+      (cider-repl-emit-output-at-pos (current-buffer) string pos t)
+      (ansi-color-apply-on-region pos (point-max)))))
+
+(defun cider-repl-emit-output (buffer string &optional bol)
+  "Using BUFFER, emit STRING.
+If BOL is non-nil, emit at the beginning of the line."
+  (with-current-buffer buffer
+    (let ((pos (1- (cider-repl--input-line-beginning-position))))
+      (cider-repl-emit-output-at-pos buffer string cider-repl-input-start-mark bol)
+      (ansi-color-apply-on-region pos (point-max)))))
+
+(defun cider-repl-emit-prompt (buffer)
+  "Emit the REPL prompt into BUFFER."
+  (with-current-buffer buffer
+    (save-excursion
+      (cider-save-marker cider-repl-output-start
+        (cider-save-marker cider-repl-output-end
+          (cider-repl--insert-prompt nrepl-buffer-ns))))
+    (cider-repl--show-maximum-output)))
+
+(defun cider-repl-emit-result (buffer string &optional bol)
+  "Emit into BUFFER the result STRING and mark it as an evaluation result.
+If BOL is non-nil insert at the beginning of the line."
+  (with-current-buffer buffer
+    (save-excursion
+      (cider-save-marker cider-repl-output-start
+        (cider-save-marker cider-repl-output-end
+          (goto-char cider-repl-input-start-mark)
+          (when (and bol (not (bolp))) (insert-before-markers "\n"))
+          (cider-propertize-region `(face cider-repl-result-face
+                                          rear-nonsticky (face))
+            (insert-before-markers string)))))
+    (cider-repl--show-maximum-output)))
+
+(defun cider-repl-newline-and-indent ()
+  "Insert a newline, then indent the next line.
+Restrict the buffer from the prompt for indentation, to avoid being
+confused by strange characters (like unmatched quotes) appearing
+earlier in the buffer."
+  (interactive)
+  (save-restriction
+    (narrow-to-region cider-repl-prompt-start-mark (point-max))
+    (insert "\n")
+    (lisp-indent-line)))
+
+(defun cider-repl-indent-and-complete-symbol ()
+  "Indent the current line and perform symbol completion.
+First indent the line.  If indenting doesn't move point, complete
+the symbol."
+  (interactive)
+  (let ((pos (point)))
+    (lisp-indent-line)
+    (when (= pos (point))
+      (if (save-excursion (re-search-backward "[^() \n\t\r]+\\=" nil t))
+          (completion-at-point)))))
+
+(defun cider-repl-kill-input ()
+  "Kill all text from the prompt to point."
+  (interactive)
+  (cond ((< (marker-position cider-repl-input-start-mark) (point))
+         (kill-region cider-repl-input-start-mark (point)))
+        ((= (point) (marker-position cider-repl-input-start-mark))
+         (cider-repl-delete-current-input))))
+
+(defun cider-repl--input-complete-p (start end)
+  "Return t if the region from START to END is a complete sexp."
+  (save-excursion
+    (goto-char start)
+    (cond ((looking-at "\\s *[@'`#]?[(\"]")
+           (ignore-errors
+             (save-restriction
+               (narrow-to-region start end)
+               ;; Keep stepping over blanks and sexps until the end of
+               ;; buffer is reached or an error occurs. Tolerate extra
+               ;; close parens.
+               (loop do (skip-chars-forward " \t\r\n)")
+                     until (eobp)
+                     do (forward-sexp))
+               t)))
+          (t t))))
+
+(defun cider-repl-handler (buffer)
+  "Make a nREPL evaluation handler for the REPL BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (cider-repl-emit-result buffer value t))
+                               (lambda (buffer out)
+                                 (cider-repl-emit-output buffer out))
+                               (lambda (buffer err)
+                                 (cider-repl-emit-output buffer err))
+                               (lambda (buffer)
+                                 (cider-repl-emit-prompt buffer))))
+
+(defun cider-repl--send-input (&optional newline)
+  "Go to the end of the input and send the current input.
+If NEWLINE is true then add a newline at the end of the input."
+  (unless (cider-repl--in-input-area-p)
+    (error "No input at point"))
+  (goto-char (point-max))
+  (let ((end (point)))             ; end of input, without the newline
+    (cider-repl--add-to-input-history (buffer-substring cider-repl-input-start-mark end))
+    (when newline
+      (insert "\n")
+      (cider-repl--show-maximum-output))
+    (let ((inhibit-modification-hooks t))
+      (add-text-properties cider-repl-input-start-mark
+                           (point)
+                           `(cider-old-input
+                             ,(incf cider-repl-old-input-counter))))
+    (let ((overlay (make-overlay cider-repl-input-start-mark end)))
+      ;; These properties are on an overlay so that they won't be taken
+      ;; by kill/yank.
+      (overlay-put overlay 'read-only t)
+      (overlay-put overlay 'face 'cider-repl-input-face)))
+  (let* ((input (cider-repl--current-input))
+         (form (if (and (not (string-match "\\`[ \t\r\n]*\\'" input)) cider-repl-use-pretty-printing)
+                   (format "(clojure.pprint/pprint %s)" input) input)))
+    (goto-char (point-max))
+    (cider-repl--mark-input-start)
+    (cider-repl--mark-output-start)
+    (cider-eval form (cider-repl-handler (current-buffer)) nrepl-buffer-ns)))
+
+(defun cider-repl-return (&optional end-of-input)
+  "Evaluate the current input string, or insert a newline.
+Send the current input ony if a whole expression has been entered,
+i.e. the parenthesis are matched.
+When END-OF-INPUT is non-nil, send the input even if the parentheses
+are not balanced."
+  (interactive "P")
+  (cond
+   (end-of-input
+    (cider-repl--send-input))
+   ((and (get-text-property (point) 'cider-old-input)
+         (< (point) cider-repl-input-start-mark))
+    (cider-repl--grab-old-input end-of-input)
+    (cider-repl--recenter-if-needed))
+   ((cider-repl--input-complete-p cider-repl-input-start-mark (point-max))
+    (cider-repl--send-input t))
+   (t
+    (cider-repl-newline-and-indent)
+    (message "[input not complete]"))))
+
+(defun cider-repl--recenter-if-needed ()
+  "Make sure that the point is visible."
+  (unless (pos-visible-in-window-p (point-max))
+    (save-excursion
+      (goto-char (point-max))
+      (recenter -1))))
+
+(defun cider-repl--grab-old-input (replace)
+  "Resend the old REPL input at point.
+If REPLACE is non-nil the current input is replaced with the old
+input; otherwise the new input is appended.  The old input has the
+text property `cider-old-input'."
+  (multiple-value-bind (beg end) (cider-property-bounds 'cider-old-input)
+    (let ((old-input (buffer-substring beg end)) ;;preserve
+          ;;properties, they will be removed later
+          (offset (- (point) beg)))
+      ;; Append the old input or replace the current input
+      (cond (replace (goto-char cider-repl-input-start-mark))
+            (t (goto-char (point-max))
+               (unless (eq (char-before) ?\ )
+                 (insert " "))))
+      (delete-region (point) (point-max))
+      (save-excursion
+        (insert old-input)
+        (when (equal (char-before) ?\n)
+          (delete-char -1)))
+      (forward-char offset))))
+
+(defun cider-repl-closing-return ()
+  "Evaluate the current input string after closing all open lists."
+  (interactive)
+  (goto-char (point-max))
+  (save-restriction
+    (narrow-to-region cider-repl-input-start-mark (point))
+    (while (ignore-errors (save-excursion (backward-up-list 1)) t)
+      (insert ")")))
+  (cider-repl-return))
+
+(defun cider-repl-toggle-pretty-printing ()
+  "Toggle pretty-printing in the REPL."
+  (interactive)
+  (setq cider-repl-use-pretty-printing (not cider-repl-use-pretty-printing))
+  (message "Pretty printing in nREPL %s."
+           (if cider-repl-use-pretty-printing "enabled" "disabled")))
+
+(defun cider-repl-set-print-length (print-length)
+  "Set the clojure var *print-length* to PRINT-LENGTH."
+  (let* ((form (format "(set! *print-length* %d)"
+                       print-length)))
+    (cider-eval-sync form)))
+
+(defun cider-repl-toggle-print-length-limiting ()
+  "Toggle the enforcement of `cider-repl-print-length'."
+  (interactive)
+  (when (integerp cider-repl-print-length)
+    (let* ((form (format "(set! *print-length* (if *print-length* nil %d))"
+                         cider-repl-print-length))
+           (print-length (cider-eval-and-get-value form)))
+      (if print-length
+          (message "*print-length* limited to %d" print-length)
+        (message "*print-length* unlimited")))))
+
+(defvar cider-repl-clear-buffer-hook)
+
+(defun cider-repl-clear-buffer ()
+  "Delete the output generated by the Clojure process."
+  (interactive)
+  (let ((inhibit-read-only t))
+    (delete-region (point-min) cider-repl-prompt-start-mark)
+    (delete-region cider-repl-output-start cider-repl-output-end)
+    (when (< (point) cider-repl-input-start-mark)
+      (goto-char cider-repl-input-start-mark))
+    (recenter t))
+  (run-hooks 'cider-repl-clear-buffer-hook))
+
+(defun cider-repl--input-line-beginning-position ()
+  "Return the position of the beginning of input."
+  (save-excursion
+    (goto-char cider-repl-input-start-mark)
+    (line-beginning-position)))
+
+(defun cider-repl-clear-output ()
+  "Delete the output inserted since the last input."
+  (interactive)
+  (let ((start (save-excursion
+                 (cider-repl-previous-prompt)
+                 (ignore-errors (forward-sexp))
+                 (forward-line)
+                 (point)))
+        (end (1- (cider-repl--input-line-beginning-position))))
+    (when (< start end)
+      (let ((inhibit-read-only t))
+        (delete-region start end)
+        (save-excursion
+          (goto-char start)
+          (insert
+           (propertize ";;; output cleared" 'face 'font-lock-comment-face)))))))
+
+(defun cider--all-ns ()
+  "Get a list of the available namespaces."
+  (cider-eval-and-get-value
+   "(clojure.core/map clojure.core/str (clojure.core/all-ns))"))
+
+(defun cider-repl-set-ns (ns)
+  "Switch the namespace of the REPL buffer to NS.
+
+If invoked in a REPL buffer the command will prompt you for the name of the
+namespace to switch to."
+  (interactive (list (if (derived-mode-p 'cider-repl-mode)
+                         (completing-read "Switch to namespace: "
+                                          (cider--all-ns))
+                       (cider-current-ns))))
+  (if ns
+      (with-current-buffer (cider-current-repl-buffer)
+        (cider-eval
+         (format "(in-ns '%s)" ns)
+         (cider-repl-handler (current-buffer))))
+    (error "Cannot determine the current namespace")))
+
+;;;;; History
+
+(defcustom cider-repl-wrap-history nil
+  "T to wrap history around when the end is reached."
+  :type 'boolean
+  :group 'cider-repl)
+
+(define-obsolete-variable-alias 'cider-wrap-history 'cider-repl-wrap-history)
+
+;; These two vars contain the state of the last history search.  We
+;; only use them if `last-command' was `cider-repl--history-replace',
+;; otherwise we reinitialize them.
+
+(defvar cider-repl-input-history-position -1
+  "Newer items have smaller indices.")
+
+(defvar cider-repl-history-pattern nil
+  "The regexp most recently used for finding input history.")
+
+(defun cider-repl--add-to-input-history (string)
+  "Add STRING to the input history.
+Empty strings and duplicates are ignored."
+  (unless (or (equal string "")
+              (equal string (car cider-repl-input-history)))
+    (push string cider-repl-input-history)
+    (incf cider-repl-input-history-items-added)))
+
+(defun cider-repl-delete-current-input ()
+  "Delete all text after the prompt."
+  (goto-char (point-max))
+  (delete-region cider-repl-input-start-mark (point-max)))
+
+(defun cider-repl--replace-input (string)
+  "Replace the current REPL input with STRING."
+  (cider-repl-delete-current-input)
+  (insert-and-inherit string))
+
+(defun cider-repl--position-in-history (start-pos direction regexp)
+  "Return the position of the history item starting at START-POS.
+Search in DIRECTION for REGEXP.
+Return -1 resp the length of the history if no item matches."
+  ;; Loop through the history list looking for a matching line
+  (let* ((step (ecase direction
+                 (forward -1)
+                 (backward 1)))
+         (history cider-repl-input-history)
+         (len (length history)))
+    (loop for pos = (+ start-pos step) then (+ pos step)
+          if (< pos 0) return -1
+          if (<= len pos) return len
+          if (string-match regexp (nth pos history)) return pos)))
+
+(defun cider-repl--history-replace (direction &optional regexp)
+  "Replace the current input with the next line in DIRECTION.
+DIRECTION is 'forward' or 'backward' (in the history list).
+If REGEXP is non-nil, only lines matching REGEXP are considered."
+  (setq cider-repl-history-pattern regexp)
+  (let* ((min-pos -1)
+         (max-pos (length cider-repl-input-history))
+         (pos0 (cond ((cider-history-search-in-progress-p)
+                      cider-repl-input-history-position)
+                     (t min-pos)))
+         (pos (cider-repl--position-in-history pos0 direction (or regexp "")))
+         (msg nil))
+    (cond ((and (< min-pos pos) (< pos max-pos))
+           (cider-repl--replace-input (nth pos cider-repl-input-history))
+           (setq msg (format "History item: %d" pos)))
+          ((not cider-repl-wrap-history)
+           (setq msg (cond ((= pos min-pos) "End of history")
+                           ((= pos max-pos) "Beginning of history"))))
+          (cider-repl-wrap-history
+           (setq pos (if (= pos min-pos) max-pos min-pos))
+           (setq msg "Wrapped history")))
+    (when (or (<= pos min-pos) (<= max-pos pos))
+      (when regexp
+        (setq msg (concat msg "; no matching item"))))
+    (message "%s%s" msg (cond ((not regexp) "")
+                              (t (format "; current regexp: %s" regexp))))
+    (setq cider-repl-input-history-position pos)
+    (setq this-command 'cider-repl--history-replace)))
+
+(defun cider-history-search-in-progress-p ()
+  "Return t if a current history search is in progress."
+  (eq last-command 'cider-repl--history-replace))
+
+(defun cider-terminate-history-search ()
+  "Terminate the current history search."
+  (setq last-command this-command))
+
+(defun cider-repl-previous-input ()
+  "Cycle backwards through input history.
+If the `last-command' was a history navigation command use the
+same search pattern for this command.
+Otherwise use the current input as search pattern."
+  (interactive)
+  (cider-repl--history-replace 'backward (cider-repl-history-pattern t)))
+
+(defun cider-repl-next-input ()
+  "Cycle forwards through input history.
+See `cider-previous-input'."
+  (interactive)
+  (cider-repl--history-replace 'forward (cider-repl-history-pattern t)))
+
+(defun cider-repl-forward-input ()
+  "Cycle forwards through input history."
+  (interactive)
+  (cider-repl--history-replace 'forward (cider-repl-history-pattern)))
+
+(defun cider-repl-backward-input ()
+  "Cycle backwards through input history."
+  (interactive)
+  (cider-repl--history-replace 'backward (cider-repl-history-pattern)))
+
+(defun cider-repl-previous-matching-input (regexp)
+  "Find the previous input matching REGEXP."
+  (interactive "sPrevious element matching (regexp): ")
+  (cider-terminate-history-search)
+  (cider-repl--history-replace 'backward regexp))
+
+(defun cider-repl-next-matching-input (regexp)
+  "Find then next input matching REGEXP."
+  (interactive "sNext element matching (regexp): ")
+  (cider-terminate-history-search)
+  (cider-repl--history-replace 'forward regexp))
+
+(defun cider-repl-history-pattern (&optional use-current-input)
+  "Return the regexp for the navigation commands.
+If USE-CURRENT-INPUT is non-nil, use the current input."
+  (cond ((cider-history-search-in-progress-p)
+         cider-repl-history-pattern)
+        (use-current-input
+         (assert (<= cider-repl-input-start-mark (point)))
+         (let ((str (cider-repl--current-input t)))
+           (cond ((string-match "^[ \n]*$" str) nil)
+                 (t (concat "^" (regexp-quote str))))))
+        (t nil)))
+
+;;; persistent history
+(defcustom cider-repl-history-size 500
+  "The maximum number of items to keep in the REPL history."
+  :type 'integer
+  :safe 'integerp
+  :group 'cider-repl-mode)
+
+(define-obsolete-variable-alias 'cider-history-size 'cider-repl-history-size)
+
+(defcustom cider-repl-history-file nil
+  "File to save the persistent REPL history to."
+  :type 'string
+  :safe 'stringp
+  :group 'cider-repl-mode)
+
+(define-obsolete-variable-alias 'cider-history-file 'cider-repl-history-file)
+
+(defun cider-repl--history-read-filename ()
+  "Ask the user which file to use, defaulting `cider-repl-history-file'."
+  (read-file-name "Use CIDER REPL history file: "
+                  cider-repl-history-file))
+
+(defun cider-repl--history-read (filename)
+  "Read history from FILENAME and return it.
+It does not yet set the input history."
+  (if (file-readable-p filename)
+      (with-temp-buffer
+        (insert-file-contents filename)
+        (read (current-buffer)))
+    '()))
+
+(defun cider-repl-history-load (&optional filename)
+  "Load history from FILENAME into current session.
+FILENAME defaults to the value of `cider-repl-history-file' but user
+defined filenames can be used to read special history files.
+
+The value of `cider-repl-input-history' is set by this function."
+  (interactive (list (cider-repl--history-read-filename)))
+  (let ((f (or filename cider-repl-history-file)))
+    ;; TODO: probably need to set cider-repl-input-history-position as well.
+    ;; in a fresh connection the newest item in the list is currently
+    ;; not available.  After sending one input, everything seems to work.
+    (setq cider-repl-input-history (cider-repl--history-read f))))
+
+(defun cider-repl--history-write (filename)
+  "Write history to FILENAME.
+Currently coding system for writing the contents is hardwired to
+utf-8-unix."
+  (let* ((mhist (cider-repl--histories-merge cider-repl-input-history
+                                             cider-repl-input-history-items-added
+                                             (cider-repl--history-read filename)))
+         ;; newest items are at the beginning of the list, thus 0
+         (hist (cl-subseq mhist 0 (min (length mhist) cider-repl-history-size))))
+    (unless (file-writable-p filename)
+      (error (format "History file not writable: %s" filename)))
+    (let ((print-length nil) (print-level nil))
+      (with-temp-file filename
+        ;; TODO: really set cs for output
+        ;; TODO: does cs need to be customizable?
+        (insert ";; -*- coding: utf-8-unix -*-\n")
+        (insert ";; Automatically written history of CIDER REPL session\n")
+        (insert ";; Edit at your own risk\n\n")
+        (prin1 (mapcar #'substring-no-properties hist) (current-buffer))))))
+
+(defun cider-repl-history-save (&optional filename)
+  "Save the current REPL input history to FILENAME.
+FILENAME defaults to the value of `cider-repl-history-file'."
+  (interactive (list (cider-repl--history-read-filename)))
+  (let* ((file (or filename cider-repl-history-file)))
+    (cider-repl--history-write file)))
+
+(defun cider-repl-history-just-save ()
+  "Just save the history to `cider-repl-history-file'.
+This function is meant to be used in hooks to avoid lambda
+constructs."
+  (cider-repl-history-save cider-repl-history-file))
+
+;; SLIME has different semantics and will not save any duplicates.
+;; we keep track of how many items were added to the history in the
+;; current session in `cider-repl--add-to-input-history' and merge only the
+;; new items with the current history found in the file, which may
+;; have been changed in the meantime by another session.
+(defun cider-repl--histories-merge (session-hist n-added-items file-hist)
+  "Merge histories from SESSION-HIST adding N-ADDED-ITEMS into FILE-HIST."
+  (append (cl-subseq session-hist 0 n-added-items)
+          file-hist))
+
+;;; REPL shortcuts
+(defcustom cider-repl-shortcut-dispatch-char ?\,
+  "Character used to distinguish REPL commands from Lisp forms."
+  :type '(character)
+  :group 'cider-repl)
+
+(defvar cider-repl-shortcuts (make-hash-table :test 'equal))
+
+(defun cider-repl-add-shortcut (name handler)
+  "Add a REPL shortcut command, defined by NAME and HANDLER."
+  (puthash name handler cider-repl-shortcuts))
+
+(cider-repl-add-shortcut "hasta la vista" 'cider-quit)
+(cider-repl-add-shortcut "version" 'cider-version)
+(cider-repl-add-shortcut "conn-info" 'cider-display-current-connection-info)
+(cider-repl-add-shortcut "conn-rotate" 'cider-rotate-connection)
+(cider-repl-add-shortcut "clear" 'cider-repl-clear-buffer)
+(cider-repl-add-shortcut "ns" 'cider-repl-set-ns)
+
+(defun cider-repl--available-shortcuts ()
+  "Return the available REPL shortcuts."
+  (cider-util--hash-keys cider-repl-shortcuts))
+
+(defun cider-repl-handle-shortcut ()
+  "Execute a REPL shortcut."
+  (interactive)
+  (if (> (point) cider-repl-input-start-mark)
+      (insert (string cider-repl-shortcut-dispatch-char))
+    (let ((command (completing-read "Command: "
+                                   (cider-repl--available-shortcuts))))
+     (if (not (equal command ""))
+         (call-interactively (gethash command cider-repl-shortcuts))
+       (error "No command selected")))))
+
+
+;;;;; CIDER REPL mode
+
+;;; Prevent paredit from inserting some inappropriate spaces.
+;;; C.f. clojure-mode.el
+(defun cider-space-for-delimiter-p (endp delim)
+  "Hook for paredit's `paredit-space-for-delimiter-predicates'.
+
+Decides if paredit should insert a space after/before (if/unless
+ENDP) DELIM."
+  (if (derived-mode-p 'cider-repl-mode)
+      (save-excursion
+        (backward-char)
+        (if (and (or (char-equal delim ?\()
+                     (char-equal delim ?\")
+                     (char-equal delim ?{))
+                 (not endp))
+            (if (char-equal (char-after) ?#)
+                (and (not (bobp))
+                     (or (char-equal ?w (char-syntax (char-before)))
+                         (char-equal ?_ (char-syntax (char-before)))))
+              t)
+          t))
+    t))
+
+(defvar cider-repl-mode-hook nil
+  "Hook executed when entering `cider-repl-mode'.")
+
+(defvar cider-repl-mode-syntax-table
+  (copy-syntax-table clojure-mode-syntax-table))
+
+(defvar cider-repl-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map clojure-mode-map)
+    (define-key map (kbd "M-.") 'cider-jump)
+    (define-key map (kbd "M-,") 'cider-jump-back)
+    (define-key map (kbd "RET") 'cider-repl-return)
+    (define-key map (kbd "TAB") 'cider-repl-tab)
+    (define-key map (kbd "C-<return>") 'cider-repl-closing-return)
+    (define-key map (kbd "C-j") 'cider-repl-newline-and-indent)
+    (define-key map (kbd "C-c C-d") 'cider-doc)
+    (define-key map (kbd "C-c C-s") 'cider-src)
+    (define-key map (kbd "C-c C-o") 'cider-repl-clear-output)
+    (define-key map (kbd "C-c M-o") 'cider-repl-clear-buffer)
+    (define-key map (kbd "C-c M-n") 'cider-repl-set-ns)
+    (define-key map (kbd "C-c C-u") 'cider-repl-kill-input)
+    (define-key map (kbd "C-a") 'cider-repl-bol)
+    (define-key map (kbd "C-S-a") 'cider-repl-bol-mark)
+    (define-key map [home] 'cider-repl-bol)
+    (define-key map [S-home] 'cider-repl-bol-mark)
+    (define-key map (kbd "C-<up>") 'cider-repl-backward-input)
+    (define-key map (kbd "C-<down>") 'cider-repl-forward-input)
+    (define-key map (kbd "M-p") 'cider-repl-previous-input)
+    (define-key map (kbd "M-n") 'cider-repl-next-input)
+    (define-key map (kbd "M-r") 'cider-repl-previous-matching-input)
+    (define-key map (kbd "M-s") 'cider-repl-next-matching-input)
+    (define-key map (kbd "C-c C-n") 'cider-repl-next-prompt)
+    (define-key map (kbd "C-c C-p") 'cider-repl-previous-prompt)
+    (define-key map (kbd "C-c C-b") 'cider-interrupt)
+    (define-key map (kbd "C-c C-c") 'cider-interrupt)
+    (define-key map (kbd "C-c C-j") 'cider-javadoc)
+    (define-key map (kbd "C-c C-m") 'cider-macroexpand-1)
+    (define-key map (kbd "C-c M-m") 'cider-macroexpand-all)
+    (define-key map (kbd "C-c C-z") 'cider-switch-to-last-clojure-buffer)
+    (define-key map (kbd "C-c M-s") 'cider-selector)
+    (define-key map (kbd "C-c M-r") 'cider-rotate-connection)
+    (define-key map (kbd "C-c M-d") 'cider-display-current-connection-info)
+    (define-key map (kbd "C-c M-f") 'cider-load-fn-into-repl-buffer)
+    (define-key map (kbd "C-c C-q") 'cider-quit)
+    (define-key map (string cider-repl-shortcut-dispatch-char) 'cider-repl-handle-shortcut)
+    map))
+
+(define-derived-mode cider-repl-mode fundamental-mode "REPL"
+  "Major mode for Clojure REPL interactions.
+
+\\{cider-repl-mode-map}"
+  (setq-local lisp-indent-function 'clojure-indent-function)
+  (setq-local indent-line-function 'lisp-indent-line)
+  (make-local-variable 'completion-at-point-functions)
+  (add-to-list 'completion-at-point-functions
+               'cider-complete-at-point)
+  (set-syntax-table cider-repl-mode-syntax-table)
+  (cider-turn-on-eldoc-mode)
+  (if (fboundp 'hack-dir-local-variables-non-file-buffer)
+      (hack-dir-local-variables-non-file-buffer))
+  (when cider-repl-history-file
+    (cider-repl-history-load cider-repl-history-file)
+    (add-hook 'kill-buffer-hook 'cider-repl-history-just-save t t)
+    (add-hook 'kill-emacs-hook 'cider-repl-history-just-save))
+  (add-hook 'paredit-mode-hook
+            (lambda ()
+              (when (>= paredit-version 21)
+                (define-key cider-repl-mode-map "{" 'paredit-open-curly)
+                (define-key cider-repl-mode-map "}" 'paredit-close-curly)
+                (add-to-list 'paredit-space-for-delimiter-predicates
+                             'cider-space-for-delimiter-p)))))
+
+(easy-menu-define cider-repl-mode-menu cider-repl-mode-map
+  "Menu for CIDER's REPL mode"
+  '("REPL"
+    ["Jump" cider-jump]
+    ["Jump back" cider-jump-back]
+    "--"
+    ["Complete symbol" complete-symbol]
+    "--"
+    ["Display documentation" cider-doc]
+    ["Display source" cider-src]
+    ["Display JavaDoc" cider-javadoc]
+    "--"
+    ["Set REPL ns" cider-repl-set-ns]
+    ["Toggle pretty printing of results" cider-repl-toggle-pretty-printing]
+    ["Clear output" cider-repl-clear-output]
+    ["Clear buffer" cider-repl-clear-buffer]
+    ["Kill input" cider-repl-kill-input]
+    ["Interrupt" cider-interrupt]
+    ["Quit" cider-quit]
+    ["Restart" cider-restart]
+    "--"
+    ["Version info" cider-version]))
+
+
+(provide 'cider-repl)
+;;; cider-repl.el ends here
diff --git a/elpa/cider-20131221.1231/cider-selector.el b/elpa/cider-20131221.1231/cider-selector.el
new file mode 100644
index 000000000..0e02cdb61
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-selector.el
@@ -0,0 +1,155 @@
+;;; cider-selector.el --- Buffer selection command inspired by SLIME's selector
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Buffer selection command inspired by SLIME's selector.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-interaction)
+(require 'cider-repl) ; for cider-find-or-create-repl-buffer
+
+(defconst cider-selector-help-buffer "*Selector Help*"
+  "The name of the selector's help buffer.")
+
+(defvar cider-selector-methods nil
+  "List of buffer-selection methods for the `cider-selector' command.
+Each element is a list (KEY DESCRIPTION FUNCTION).
+DESCRIPTION is a one-line description of what the key selects.")
+
+(defvar cider-selector-other-window nil
+  "If non-nil use `switch-to-buffer-other-window'.")
+
+(defun cider--recently-visited-buffer (mode)
+  "Return the most recently visited buffer whose `major-mode' is MODE.
+Only considers buffers that are not already visible."
+  (loop for buffer in (buffer-list)
+        when (and (with-current-buffer buffer (eq major-mode mode))
+                  (not (string-match "^ " (buffer-name buffer)))
+                  (null (get-buffer-window buffer 'visible)))
+        return buffer
+        finally (error "Can't find unshown buffer in %S" mode)))
+
+;;;###autoload
+(defun cider-selector (&optional other-window)
+  "Select a new buffer by type, indicated by a single character.
+The user is prompted for a single character indicating the method by
+which to choose a new buffer.  The `?' character describes then
+available methods.  OTHER-WINDOW provides an optional target.
+
+See `def-cider-selector-method' for defining new methods."
+  (interactive)
+  (message "Select [%s]: "
+           (apply #'string (mapcar #'car cider-selector-methods)))
+  (let* ((cider-selector-other-window other-window)
+         (ch (save-window-excursion
+               (select-window (minibuffer-window))
+               (read-char)))
+         (method (cl-find ch cider-selector-methods :key #'car)))
+    (cond (method
+           (funcall (cl-caddr method)))
+          (t
+           (message "No method for character: ?\\%c" ch)
+           (ding)
+           (sleep-for 1)
+           (discard-input)
+           (cider-selector)))))
+
+(defmacro def-cider-selector-method (key description &rest body)
+  "Define a new `cider-select' buffer selection method.
+
+KEY is the key the user will enter to choose this method.
+
+DESCRIPTION is a one-line sentence describing how the method
+selects a buffer.
+
+BODY is a series of forms which are evaluated when the selector
+is chosen.  The returned buffer is selected with
+`switch-to-buffer'."
+  (let ((method `(lambda ()
+                   (let ((buffer (progn ,@body)))
+                     (cond ((not (get-buffer buffer))
+                            (message "No such buffer: %S" buffer)
+                            (ding))
+                           ((get-buffer-window buffer)
+                            (select-window (get-buffer-window buffer)))
+                           (cider-selector-other-window
+                            (switch-to-buffer-other-window buffer))
+                           (t
+                            (switch-to-buffer buffer)))))))
+    `(setq cider-selector-methods
+           (cl-sort (cons (list ,key ,description ,method)
+                          (cl-remove ,key cider-selector-methods :key #'car))
+                  #'< :key #'car))))
+
+(def-cider-selector-method ?? "Selector help buffer."
+  (ignore-errors (kill-buffer cider-selector-help-buffer))
+  (with-current-buffer (get-buffer-create cider-selector-help-buffer)
+    (insert "CIDER Selector Methods:\n\n")
+    (loop for (key line nil) in cider-selector-methods
+          do (insert (format "%c:\t%s\n" key line)))
+    (goto-char (point-min))
+    (help-mode)
+    (display-buffer (current-buffer) t))
+  (cider-selector)
+  (current-buffer))
+
+(pushnew (list ?4 "Select in other window" (lambda () (cider-selector t)))
+         cider-selector-methods :key #'car)
+
+(def-cider-selector-method ?c
+  "Most recently visited clojure-mode buffer."
+  (cider--recently-visited-buffer 'clojure-mode))
+
+(def-cider-selector-method ?e
+  "Most recently visited emacs-lisp-mode buffer."
+  (cider--recently-visited-buffer 'emacs-lisp-mode))
+
+(def-cider-selector-method ?q "Abort."
+  (top-level))
+
+(def-cider-selector-method ?r
+  "Current REPL buffer."
+  (cider-find-or-create-repl-buffer))
+
+(def-cider-selector-method ?n
+  "Connections browser buffer."
+  (nrepl-connection-browser)
+  nrepl--connection-browser-buffer-name)
+
+(def-cider-selector-method ?v
+  "*nrepl-events* buffer."
+  nrepl-event-buffer-name)
+
+(def-cider-selector-method ?s
+ "Cycle to the next CIDER connection's REPL."
+ (cider-rotate-connection)
+ (cider-find-or-create-repl-buffer))
+
+(provide 'cider-selector)
+;;; cider-selector.el ends here
diff --git a/elpa/cider-20131221.1231/cider-util.el b/elpa/cider-20131221.1231/cider-util.el
new file mode 100644
index 000000000..e6fe66a6d
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-util.el
@@ -0,0 +1,57 @@
+;;; cider-util.el --- Common utility functions that don't belong anywhere else
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Common utility functions that don't belong anywhere else
+
+;;; Code:
+
+(require 'dash)
+
+;;; Compatibility
+(eval-and-compile
+  ;; `setq-local' for Emacs 24.2 and below
+  (unless (fboundp 'setq-local)
+    (defmacro setq-local (var val)
+      "Set variable VAR to value VAL in current buffer."
+      `(set (make-local-variable ',var) ,val))))
+
+(defun cider-util--hash-keys (hashtable)
+  "Return a list of keys in HASHTABLE."
+  (let ((keys '()))
+    (maphash (lambda (k v) (setq keys (cons k keys))) hashtable)
+    keys))
+
+(defun cider-util--clojure-buffers ()
+  "Return a list of all existing `clojure-mode' buffers."
+  (-filter
+   (lambda (buffer) (with-current-buffer buffer (derived-mode-p 'clojure-mode)))
+   (buffer-list)))
+
+(provide 'cider-util)
+
+;;; cider-util.el ends here
diff --git a/elpa/cider-20131221.1231/cider-util.elc b/elpa/cider-20131221.1231/cider-util.elc
new file mode 100644
index 0000000000000000000000000000000000000000..3d7965ace30b3a1353f3b2121ee0cc98975ad7f3
GIT binary patch
literal 1239
zcmbtUQBT`25bk5i%e1HMZAY0zE0MHG%AoXx0+m4Gi85ZG(%j^-dN_7!J7wLk-#JOU
zO=wR<u@s-byZgSobH>x#%MYzq%Nvi!aH;Zw3ru0Lfs{#(;{1hWnLq<d!mN~Vg$YC>
z2*a~DrWc|?7+0>DRykzk4E?VLwdvRX{Qz^8m>}(=C|Ez?DQe$2g;5j+VHAgrt+ZSO
zD5_Xo!qj=engVgk91Q~kS7$HWE`bRFs<1rgznCR}3B2m?e#uQuqBO)g-AI=61X7h4
ztGWDcj_6by3oK1Z<t|S+3Zl`g7^$KdQdvlpw2Z)|&HPicNPjZByt#p7$uvtWkvyu>
zGns->kT3}g1fkeJNg6Q*kZHkDgIy9ZitD^o{x?02z*`^B^SX<TML$s~Lgy(S3}}V>
zPf_STB3dzR2E%tP`W(6~t>dRo0~pZRNe3P^u1c<vM#wB7Tc}c|1sJp|U#Nr$NHJrA
zGXq`fvQ`kl!DDyLG_0BERe7saE=T+7YH!+vZ4fRJ<m?&iXg--aThQRGN@Z~lL+H#1
zu`@qR?!YP+yF_@H+`6_WrPe4dEXpiH9dzcsImA8h;5<HoJG7;iz(8=C6qUg<Zj5uf
zp3JWACl|NV;FH(gX*jHB+Rd-;FG;aq;YpF(SjVi<^sy<}aIdadyVnS-9Cm1sT#&xP
z8C+qWVNC(rdlyvY@cq`MVl{_oPQ;;m@R^Eua{8q=cOs6DUyE>827i(wx(4tq5$Z>&
z(a)*ThfNjC|7C6Ab-4_&avXO9Lb@VwnyT*m^cSEz;i%VmVz1k)W=28>-rp*(0W=Vr
muQ9FY_yug!Id)EBL(q2(`6G998auh&LaR0XR^YEj^t|7p?QxX=

literal 0
HcmV?d00001

diff --git a/elpa/cider-20131221.1231/cider-version.el b/elpa/cider-20131221.1231/cider-version.el
new file mode 100644
index 000000000..f7b7d0695
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider-version.el
@@ -0,0 +1,78 @@
+;;; cider-version.el --- Version information utilities
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Contains several functions for extracting and displaying version information.
+
+;;; Code:
+
+(require 'pkg-info)
+
+(defun cider--library-version ()
+  "Get the version in the CIDER library header."
+  (-when-let (version (pkg-info-library-version 'cider))
+    (pkg-info-format-version version)))
+
+(defun cider--package-version ()
+  "Get the package version of CIDER.
+
+This is the version number of the installed CIDER package.
+Returns nil if CIDER was not installed via package.el."
+  (condition-case nil
+      (-when-let (version (pkg-info-package-version 'cider))
+        (pkg-info-format-version version))
+    (error nil)))
+
+(defun cider-version (&optional show-version)
+  "Get the CIDER version as string.
+
+If called interactively or if SHOW-VERSION is non-nil, show the
+version in the echo area and the messages buffer.
+
+The returned string includes both, the version from package.el
+and the library version, if both a present and different.
+
+If the version number could not be determined, signal an error,
+if called interactively, or if SHOW-VERSION is non-nil, otherwise
+just return nil."
+  (interactive (list (not (or executing-kbd-macro noninteractive))))
+  (let* ((lib-version (cider--library-version))
+         (pkg-version (cider--package-version))
+         (version (cond
+                   ((and lib-version pkg-version
+                         (not (string= lib-version pkg-version)))
+                    (format "%s (package: %s)" lib-version pkg-version))
+                   ((or pkg-version lib-version)
+                    (format "%s" (or pkg-version lib-version))))))
+    (when show-version
+      (unless version
+        (error "Could not find out CIDER version"))
+      (message "CIDER version: %s" version))
+    version))
+
+(provide 'cider-version)
+;;; cider-version.el ends here
diff --git a/elpa/cider-20131221.1231/cider-version.elc b/elpa/cider-20131221.1231/cider-version.elc
new file mode 100644
index 0000000000000000000000000000000000000000..05cd794c8ed07ffe63d90c6c0ffe8ac881295712
GIT binary patch
literal 2024
zcmbtV+iu%N5Y?l@d_dD8Kqqw4kcdc$7ui(|6e$#=6;L#Q-OGdJhZVWBHl}vfUDB%h
z^*zgr<RmTvG=d0{yE8j8=bRayo&PfXYA_f$XJ=<LQ|pZ=c}~k6<xC1*zS**(D7hge
z>9UsemS+@CDT-bv3H}t1qoi>yv|3XEXBz!(xHhBKe-!dH%S@P$c)4MtOypb#)+vhP
zD2(DH>elYyBa{qz*&HV%om)rh)+tUy*f)DyQLTuTC8<p%*5V&l!O?_Hv-#Ufm^P2v
zAnkl7*;-_jtISkd$Qv`nt~M31JV&AXIMFnWr=OgWE1V%!MVXQngK=FI!S`5^!H<`-
z`JA#9(=4ly{IChnWKKp=#w0B{m5O~3q$|b{XSx(zQ?-I&oV0Plz!&{&0$=)b9LLlA
zuUcqMFE_V0fslpro#Qv@3H`(?B+U1e01o>)o4-B3pi(R~(>q#ml&r&V9WUnvD+M$3
zvSmH!OoE=$<0~mjau>-s!WBPT#8LEQ5sxR22Y648p80q=b?K^i==1sHq$U9Ew+p4$
ztm@-jQ$pVHa|&rPnfTYXm}oNISF>T+ExS2XrHZy9aMEZAa=Kr%tk+8r2P?ZOq^Y1p
z2&qM(J1lfAcvWi&?Vv)@ok&}NVa0Utx)Y3gA6`C)TDRR-LkHBxJ#ql<w1djV^On1c
z2bs$G{{r{pfS&``C(q+rEA9ISs83I#7V0#b?xAim>e&PsZA${_d4ZN`a1;{FgpLw-
zyxft}7QM@#-~Ac<aei?*fA=ea58HkybVz2Uww4E{KeLl0&sK_<=8SAVTB6q67_e+;
zSr-NLY02fJ8<xOcn+S->$~w1Js#*;{;Juk|2dbR@;9mD#21A>#^(GLjx#1F%207%y
zhQ(W3tWBxUxl>f8>N0QSfx(e;ps*H_=O|L#NLJz$YET|Ji0}|t!_T3Gthn9^!=3jv
z24GvfRp>*y>$5w)^1ickR@odZ-n|h0MqDX9feI(|^$`S^JRLl0Z%4Q%V?3u%Z7-kT
zIz4)HjD>jE*rd+~)?+g4wxhB2Jb8sx_nXIfOnw+FB<|@H77+$S)C>q{K1y(<*mR-$
z@j||Wm7Nk`qR*`v1$_nm{eJTFA0w$-{<sC&fkN&JLteM{nqC;+wM%Zx3%RpBgM|R)
zs;;`J&}HEEDuih>GrM(rlzUBSH>IK|PSI1P07sr37aqER|IM?y!uKn<UFHG4j9S??
YxYsQ{+Rt~qjaGN~$o50G3*kHe0!j&Zy#N3J

literal 0
HcmV?d00001

diff --git a/elpa/cider-20131221.1231/cider.el b/elpa/cider-20131221.1231/cider.el
new file mode 100644
index 000000000..78e752e79
--- /dev/null
+++ b/elpa/cider-20131221.1231/cider.el
@@ -0,0 +1,111 @@
+;;; cider.el --- Clojure Integrated Development Environment and REPL
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+;; URL: http://www.github.com/clojure-emacs/cider
+;; Version: 0.5.0-cvs
+;; Package-Requires: ((clojure-mode "2.0.0") (cl-lib "0.3") (dash "2.1.0") (pkg-info "0.4"))
+;; Keywords: languages, clojure, cider
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Provides a Clojure IDE and REPL for Emacs, built on top of nREPL.
+
+;;; Installation:
+
+;; Available as a package in marmalade-repo.org and melpa.milkbox.net.
+
+;; (add-to-list 'package-archives
+;;              '("marmalade" . "http://marmalade-repo.org/packages/"))
+;;
+;; or
+;;
+;; (add-to-list 'package-archives
+;;              '("melpa" . "http://melpa.milkbox.net/packages/") t)
+;;
+;; M-x package-install cider
+
+;;; Usage:
+
+;; M-x cider-jack-in
+
+;;; Code:
+
+(defgroup cider nil
+  "Clojure Integrated Development Environment and REPL."
+  :prefix "cider-"
+  :group 'applications)
+
+(require 'cider-client)
+(require 'cider-version)
+(require 'cider-interaction)
+(require 'cider-eldoc)
+(require 'cider-repl)
+(require 'cider-mode)
+
+;;;###autoload
+(defun cider-jack-in (&optional prompt-project)
+  "Start a nREPL server for the current project and connect to it.
+If PROMPT-PROJECT is t, then prompt for the project for which to
+start the server."
+  (interactive "P")
+  (setq cider-current-clojure-buffer (current-buffer))
+  (let* ((project (when prompt-project
+                    (ido-read-directory-name "Project: ")))
+         (project-dir (nrepl-project-directory-for
+                       (or project (nrepl-current-dir)))))
+    (when (nrepl-check-for-repl-buffer nil project-dir)
+      (let* ((nrepl-project-dir project-dir)
+             (cmd (if project
+                      (format "cd %s && %s" project cider-server-command)
+                    cider-server-command))
+             (process (start-process-shell-command
+                       "nrepl-server"
+                       (generate-new-buffer-name (nrepl-server-buffer-name))
+                       cmd)))
+        (set-process-filter process 'nrepl-server-filter)
+        (set-process-sentinel process 'nrepl-server-sentinel)
+        (set-process-coding-system process 'utf-8-unix 'utf-8-unix)
+        (with-current-buffer (process-buffer process)
+          (setq nrepl-project-dir project-dir))
+        (message "Starting nREPL server...")))))
+
+;;;###autoload
+(defun cider (host port)
+  "Connect to an nREPL server identified by HOST and PORT."
+  (interactive (list (read-string "Host: " (nrepl-current-host) nil (nrepl-current-host))
+                     (string-to-number (let ((port (nrepl-default-port)))
+                                         (read-string "Port: " port nil port)))))
+  (setq cider-current-clojure-buffer (current-buffer))
+  (when (nrepl-check-for-repl-buffer `(,host ,port) nil)
+    (nrepl-connect host port)))
+
+;;;###autoload
+(eval-after-load 'clojure-mode
+  '(progn
+     (define-key clojure-mode-map (kbd "C-c M-j") 'cider-jack-in)
+     (define-key clojure-mode-map (kbd "C-c M-c") 'cider)))
+
+(provide 'cider)
+;;; cider.el ends here
diff --git a/elpa/cider-20131221.1231/nrepl-client.el b/elpa/cider-20131221.1231/nrepl-client.el
new file mode 100644
index 000000000..a3a89a5f3
--- /dev/null
+++ b/elpa/cider-20131221.1231/nrepl-client.el
@@ -0,0 +1,892 @@
+;;; nrepl-client.el --- Client for Clojure nREPL
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg
+;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;;
+;; Author: Tim King <kingtim@gmail.com>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;;         Bozhidar Batsov <bozhidar@batsov.com>
+;;         Hugo Duncan <hugo@hugoduncan.org>
+;;         Steve Purcell <steve@sanityinc.com>
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Provides an Emacs Lisp client to connect to Clojure nREPL servers.
+
+;;; Code:
+(require 'clojure-mode)
+(require 'dash)
+(require 'thingatpt)
+(require 'etags)
+(require 'ansi-color)
+(require 'ewoc)
+(require 'cl-lib)
+(require 'cider-util)
+
+
+(defgroup nrepl nil
+  "Interaction with the Clojure nREPL Server."
+  :prefix "nrepl-"
+  :group 'applications)
+
+(defcustom nrepl-buffer-name-separator " "
+  "Used in constructing the REPL buffer name.
+The `nrepl-buffer-name-separator' separates `nrepl' from the project name."
+  :type '(string)
+  :group 'nrepl)
+
+(defcustom nrepl-buffer-name-show-port nil
+  "Show the connection port in the nrepl REPL buffer name, if set to t."
+  :type 'boolean
+  :group 'nrepl)
+
+(defcustom nrepl-connected-hook nil
+  "List of functions to call when connecting to the nREPL server."
+  :type 'hook
+  :group 'nrepl)
+
+(defcustom nrepl-disconnected-hook nil
+  "List of functions to call when disconnected from the nREPL server."
+  :type 'hook
+  :group 'nrepl)
+
+(defcustom nrepl-file-loaded-hook nil
+  "List of functions to call when a load file has completed."
+  :type 'hook
+  :group 'nrepl)
+
+(defcustom nrepl-host "127.0.0.1"
+  "The default hostname (or IP address) to connect to."
+  :type 'string
+  :group 'nrepl)
+
+(defcustom nrepl-port nil
+  "The default port to connect to."
+  :type 'string
+  :group 'nrepl)
+
+(defvar nrepl-repl-requires-sexp "(clojure.core/apply clojure.core/require '[[clojure.repl :refer (source apropos dir pst doc find-doc)] [clojure.java.javadoc :refer (javadoc)] [clojure.pprint :refer (pp pprint)]])"
+  "Things to require in the tooling session and the REPL buffer.")
+
+(defvar nrepl-connection-buffer nil)
+(defvar nrepl-server-buffer nil)
+(defvar nrepl-repl-buffer nil)
+(defvar nrepl-endpoint nil)
+(defvar nrepl-project-dir nil)
+
+(defconst nrepl-repl-buffer-name-template "*cider-repl%s*")
+(defconst nrepl-connection-buffer-name-template "*nrepl-connection%s*")
+(defconst nrepl-server-buffer-name-template "*nrepl-server%s*")
+
+(defcustom nrepl-hide-special-buffers nil
+  "Control the display of some special buffers in buffer switching commands.
+When true some special buffers like the connection and the server
+buffer will be hidden.")
+
+(defun nrepl-apply-hide-special-buffers (buffer-name)
+  "Apply a prefix to BUFFER-NAME that will hide the buffer."
+  (concat (if nrepl-hide-special-buffers " " "") buffer-name))
+
+(defun nrepl-buffer-name (buffer-name-template)
+  "Generate a buffer name using BUFFER-NAME-TEMPLATE.
+
+The name will include the project name if available.  The name will
+also include the connection port if `nrepl-buffer-name-show-port' is true."
+  (generate-new-buffer-name
+   (let ((project-name (nrepl--project-name nrepl-project-dir))
+         (nrepl-proj-port (cadr nrepl-endpoint)))
+     (format
+      buffer-name-template
+      (concat (if project-name
+                  (format "%s%s" nrepl-buffer-name-separator project-name) "")
+              (if (and nrepl-proj-port nrepl-buffer-name-show-port)
+                  (format ":%s" nrepl-proj-port) ""))))))
+
+(defun nrepl-connection-buffer-name ()
+  "Return the name of the connection buffer."
+  (nrepl-apply-hide-special-buffers
+   (nrepl-buffer-name nrepl-connection-buffer-name-template)))
+
+(defun nrepl-server-buffer-name ()
+  "Return the name of the server buffer."
+  (nrepl-apply-hide-special-buffers
+   (nrepl-buffer-name nrepl-server-buffer-name-template)))
+
+;; buffer local declarations
+(defvar nrepl-session nil
+  "Current nREPL session id.")
+
+(defvar nrepl-tooling-session nil
+  "Current nREPL tooling session id.
+To be used for tooling calls (i.e. completion, eldoc, etc)")
+
+(defvar nrepl-request-counter 0
+  "Continuation serial number counter.")
+
+(defvar nrepl-pending-requests (make-hash-table :test 'equal))
+
+(defvar nrepl-completed-requests (make-hash-table :test 'equal))
+
+(defvar nrepl-buffer-ns "user"
+  "Current Clojure namespace of this buffer.")
+
+(defvar nrepl-sync-response nil
+  "Result of the last sync request.")
+
+(defvar nrepl-err-handler 'cider-default-err-handler
+  "Evaluation error handler.")
+
+(defvar nrepl-ops nil
+  "Available nREPL server ops (from describe).")
+
+(defun nrepl-make-variables-buffer-local (&rest variables)
+  "Make all VARIABLES buffer local."
+  (mapcar #'make-variable-buffer-local variables))
+
+(nrepl-make-variables-buffer-local
+ 'nrepl-connection-buffer
+ 'nrepl-repl-buffer
+ 'nrepl-server-buffer
+ 'nrepl-endpoint
+ 'nrepl-project-dir
+ 'nrepl-ops
+ 'nrepl-session
+ 'nrepl-tooling-session
+ 'nrepl-request-counter
+ 'nrepl-pending-requests
+ 'nrepl-completed-requests
+ 'nrepl-done-requests
+ 'nrepl-buffer-ns
+ 'nrepl-sync-response)
+
+;;; Bencode
+;;; Adapted from http://www.emacswiki.org/emacs-en/bencode.el
+;;; and modified to work with utf-8
+(defun nrepl-bdecode-buffer ()
+  "Decode a bencoded string in the current buffer starting at point."
+  (cond ((looking-at "i\\([0-9]+\\)e")
+         (goto-char (match-end 0))
+         (string-to-number (match-string 1)))
+        ((looking-at "\\([0-9]+\\):")
+         (goto-char (match-end 0))
+         (let ((start (point))
+               (end (byte-to-position (+ (position-bytes (point))
+                                         (string-to-number (match-string 1))))))
+           (goto-char end)
+           (buffer-substring-no-properties start end)))
+        ((looking-at "l")
+         (goto-char (match-end 0))
+         (let (result item)
+           (while (setq item (nrepl-bdecode-buffer))
+             (setq result (cons item result)))
+           (nreverse result)))
+        ((looking-at "d")
+         (goto-char (match-end 0))
+         (let (dict key item)
+           (while (setq item (nrepl-bdecode-buffer))
+             (if key
+                 (setq dict (cons (cons key item) dict)
+                       key nil)
+               (unless (stringp item)
+                 (error "Dictionary keys have to be strings: %s" item))
+               (setq key item)))
+           (cons 'dict (nreverse dict))))
+        ((looking-at "e")
+         (goto-char (match-end 0))
+         nil)
+        (t
+         (error "Cannot decode object: %d" (point)))))
+
+(defun nrepl-decode (str)
+  "Decode bencoded STR."
+  (with-temp-buffer
+    (save-excursion
+      (insert str))
+    (let ((result '()))
+      (while (not (eobp))
+        (setq result (cons (nrepl-bdecode-buffer) result)))
+      (nreverse result))))
+
+(defun nrepl-netstring (string)
+  "Encode STRING in bencode."
+  (let ((size (string-bytes string)))
+    (format "%s:%s" size string)))
+
+(defun nrepl-bencode (message)
+  "Encode with bencode MESSAGE."
+  (concat "d" (apply 'concat (mapcar 'nrepl-netstring message)) "e"))
+
+;;; Response handlers
+(defmacro nrepl-dbind-response (response keys &rest body)
+  "Destructure an nREPL RESPONSE dict.
+Bind the value of the provided KEYS and execute BODY."
+  `(let ,(loop for key in keys
+               collect `(,key (cdr (assoc ,(format "%s" key) ,response))))
+     ,@body))
+
+(put 'nrepl-dbind-response 'lisp-indent-function 2)
+
+(defun nrepl-make-response-handler
+ (buffer value-handler stdout-handler stderr-handler done-handler
+         &optional eval-error-handler)
+  "Make a response handler for BUFFER.
+Uses the specified VALUE-HANDLER, STDOUT-HANDLER, STDERR-HANDLER,
+DONE-HANDLER, and EVAL-ERROR-HANDLER as appropriate."
+  (lexical-let ((buffer buffer)
+                (value-handler value-handler)
+                (stdout-handler stdout-handler)
+                (stderr-handler stderr-handler)
+                (done-handler done-handler)
+                (eval-error-handler eval-error-handler))
+    (lambda (response)
+      (nrepl-dbind-response response (value ns out err status id ex root-ex
+                                            session)
+        (cond (value
+               (with-current-buffer buffer
+                 (if ns
+                     (setq nrepl-buffer-ns ns)))
+               (if value-handler
+                   (funcall value-handler buffer value)))
+              (out
+               (if stdout-handler
+                   (funcall stdout-handler buffer out)))
+              (err
+               (if stderr-handler
+                   (funcall stderr-handler buffer err)))
+              (status
+               (if (member "interrupted" status)
+                   (message "Evaluation interrupted."))
+               (if (member "eval-error" status)
+                   (funcall (or eval-error-handler nrepl-err-handler)
+                            buffer ex root-ex session))
+               (if (member "namespace-not-found" status)
+                   (message "Namespace not found."))
+               (if (member "need-input" status)
+                   (cider-need-input buffer))
+               (if (member "done" status)
+                   (progn
+                     (puthash id (gethash id nrepl-pending-requests) nrepl-completed-requests)
+                     (remhash id nrepl-pending-requests)
+                     (if done-handler
+                         (funcall done-handler buffer))))))))))
+
+;;; communication
+(defun nrepl-default-handler (response)
+  "Default handler which is invoked when no handler is found.
+Handles message contained in RESPONSE."
+  (nrepl-dbind-response response (out value)
+    (cond
+     (out
+      (cider-repl-emit-interactive-output out)))))
+
+(defun nrepl-dispatch (response)
+  "Dispatch the RESPONSE to associated callback.
+
+First we check the list of pending requests for the callback to invoke
+and afterwards we check the completed requests as well, since responses
+could be received even for requests with status \"done\"."
+  (nrepl-log-event response)
+  (nrepl-dbind-response response (id)
+    (let ((callback (or (gethash id nrepl-pending-requests)
+                        (gethash id nrepl-completed-requests))))
+      (if callback
+          (funcall callback response)
+        (nrepl-default-handler response)))))
+
+(defun nrepl-net-decode ()
+  "Decode the data in the current buffer.
+Remove the processed data from the buffer if the decode successful."
+  (let* ((start (point-min))
+         (end (point-max))
+         (data (buffer-substring start end)))
+    (prog1
+        (nrepl-decode data)
+      (delete-region start end))))
+
+(defun nrepl-net-process-input (process)
+  "Handle all complete messages from PROCESS.
+Assume that any error during decoding indicates an incomplete message."
+  (with-current-buffer (process-buffer process)
+    (let ((nrepl-connection-dispatch (current-buffer)))
+      (ignore-errors
+        (while (> (buffer-size) 1)
+          (let ((responses (nrepl-net-decode)))
+            (dolist (response responses)
+              (nrepl-dispatch response))))))))
+
+(defun nrepl-net-filter (process string)
+  "Decode the message(s) from PROCESS contained in STRING and dispatch."
+  (with-current-buffer (process-buffer process)
+    (goto-char (point-max))
+    (insert string))
+  (nrepl-net-process-input process))
+
+(defun nrepl-sentinel (process message)
+  "Handle sentinel events from PROCESS.
+Display MESSAGE and if the process is closed kill the
+process buffer and run the hook `nrepl-disconnected-hook'."
+  (message "nREPL connection closed: %s" message)
+  (if (equal (process-status process) 'closed)
+      (progn
+        (with-current-buffer (process-buffer process)
+          (when (get-buffer nrepl-repl-buffer)
+            (kill-buffer nrepl-repl-buffer))
+          (kill-buffer (current-buffer)))
+        (run-hooks 'nrepl-disconnected-hook))))
+
+(defun nrepl-write-message (process message)
+  "Send the PROCESS the MESSAGE."
+  (process-send-string process message))
+
+;;; Log nREPL events
+
+(defcustom nrepl-log-events nil
+  "Log protocol events to the *nrepl-events* buffer."
+  :type 'boolean
+  :group 'nrepl)
+
+(defconst nrepl-event-buffer-name "*nrepl-events*"
+  "Event buffer for nREPL message logging.")
+
+(defconst nrepl-event-buffer-max-size 50000
+  "Maximum size for the nREPL event buffer.
+Defaults to 50000 characters, which should be an insignificant
+memory burdon, while providing reasonable history.")
+
+(defconst nrepl-event-buffer-reduce-denominator 4
+  "Divisor by which to reduce event buffer size.
+When the maximum size for the nREPL event buffer is exceed, the
+size of the buffer is reduced by one over this value.  Defaults
+to 4, so that 1/4 of the buffer is removed, which should ensure
+the buffer's maximum is reasonably utilised, while limiting the
+number of buffer shrinking operations.")
+
+(defun nrepl-log-event (msg)
+  "Log the given MSG to the buffer given by `nrepl-event-buffer-name'.
+The default buffer name is *nrepl-events*."
+  (when nrepl-log-events
+    (with-current-buffer (nrepl-events-buffer)
+      (when (> (buffer-size) nrepl-event-buffer-max-size)
+        (goto-char (/ (buffer-size) nrepl-event-buffer-reduce-denominator))
+        (re-search-forward "^(" nil t)
+        (delete-region (point-min) (- (point) 1)))
+      (goto-char (point-max))
+      (pp msg (current-buffer)))))
+
+(defun nrepl-events-buffer ()
+  "Return or create the buffer given by `nrepl-event-buffer-name'.
+The default buffer name is *nrepl-events*."
+  (or (get-buffer nrepl-event-buffer-name)
+      (let ((buffer (get-buffer-create nrepl-event-buffer-name)))
+        (with-current-buffer buffer
+          (buffer-disable-undo)
+          (setq-local comment-start ";")
+          (setq-local comment-end ""))
+        buffer)))
+
+(defun nrepl-log-events (&optional disable)
+  "Turn on event logging to *nrepl-events*.
+With a prefix argument DISABLE, turn it off."
+  (interactive "P")
+  (setq nrepl-log-events (not disable)))
+
+
+;;; Connections
+
+;;; A connection is the communication between the nrepl.el client and an nrepl
+;;; server.
+
+(defvar nrepl-connection-dispatch nil
+  "Bound to the connection a message was received on.
+This is bound for the duration of the handling of that message")
+
+(defvar nrepl-connection-list nil
+  "A list of connections.")
+
+
+(defun nrepl-current-host ()
+  (if (and (stringp buffer-file-name)
+           (file-remote-p buffer-file-name))
+      tramp-current-host nrepl-host))
+
+(defun nrepl-make-connection-buffer ()
+  "Create an nREPL connection buffer."
+  (let ((buffer (generate-new-buffer (nrepl-connection-buffer-name))))
+    (with-current-buffer buffer
+      (buffer-disable-undo)
+      (setq-local kill-buffer-query-functions nil))
+    buffer))
+
+(defun nrepl-current-connection-buffer ()
+  "The connection to use for nREPL interaction."
+  (or nrepl-connection-dispatch
+      nrepl-connection-buffer
+      (car (nrepl-connection-buffers))
+      (error "No nREPL connection")))
+
+(defun nrepl-connection-buffers ()
+  "Clean up dead buffers from the `nrepl-connection-list'.
+Return the connection list."
+  (nrepl--connection-list-purge)
+  nrepl-connection-list)
+
+(defun nrepl--connection-list-purge ()
+  "Clean up dead buffers from the `nrepl-connection-list'."
+  (setq nrepl-connection-list
+        (-remove (lambda (buffer)
+                   (not (buffer-live-p (get-buffer buffer))))
+                 nrepl-connection-list)))
+
+(defun nrepl-make-repl-connection-default (connection-buffer)
+  "Make the nREPL CONNECTION-BUFFER the default connection.
+Moves CONNECITON-BUFFER to the front of `nrepl-connection-list'."
+  (interactive (list nrepl-connection-buffer))
+  (if connection-buffer
+      ;; maintain the connection list in most recently used order
+      (let ((buf-name (buffer-name (get-buffer connection-buffer))))
+        (setq nrepl-connection-list
+              (cons buf-name (delq buf-name nrepl-connection-list)))
+        (nrepl--connections-refresh))
+    (message "Not in an nREPL REPL buffer.")))
+
+(defun nrepl--close-connection-buffer (connection-buffer)
+  "Closes CONNECTION-BUFFER, removing it from `nrepl-connection-list'.
+Also closes associated REPL and server buffers."
+  (let ((nrepl-connection-dispatch connection-buffer))
+     (let ((buffer (get-buffer connection-buffer)))
+       (setq nrepl-connection-list
+             (delq (buffer-name buffer) nrepl-connection-list))
+       (when (buffer-live-p buffer)
+         (dolist (buf-name `(,(buffer-local-value 'nrepl-repl-buffer buffer)
+                             ,(buffer-local-value 'nrepl-server-buffer buffer)
+                             ,buffer))
+           (when buf-name
+             (cider--close-buffer buf-name)))))))
+
+;;; Connection browser
+(defvar nrepl-connections-buffer-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "d" 'nrepl-connections-make-default)
+    (define-key map "g" 'nrepl-connection-browser)
+    (define-key map (kbd "C-k") 'nrepl-connections-close-connection)
+    (define-key map (kbd "RET") 'nrepl-connections-goto-connection)
+    map))
+
+(define-derived-mode nrepl-connections-buffer-mode cider-popup-buffer-mode
+  "nREPL-Connections"
+  "nREPL Connections Buffer Mode.
+\\{nrepl-connections-buffer-mode-map}
+\\{cider-popup-buffer-mode-map}"
+  (setq-local truncate-lines t))
+
+(defvar nrepl--connection-ewoc)
+(defconst nrepl--connection-browser-buffer-name "*nrepl-connections*")
+
+(defun nrepl-connection-browser ()
+  "Open a browser buffer for nREPL connections."
+  (interactive)
+  (let ((buffer (get-buffer nrepl--connection-browser-buffer-name)))
+    (if buffer
+        (progn
+          (nrepl--connections-refresh-buffer buffer)
+          (unless (get-buffer-window buffer)
+            (select-window (display-buffer buffer))))
+      (nrepl--setup-connection-browser))))
+
+(defun nrepl--connections-refresh ()
+  "Refresh the connections buffer, if the buffer exists.
+The connections buffer is determined by
+`nrepl--connection-browser-buffer-name'"
+  (let ((buffer (get-buffer nrepl--connection-browser-buffer-name)))
+    (when buffer
+      (nrepl--connections-refresh-buffer buffer))))
+
+(defun nrepl--connections-refresh-buffer (buffer)
+  "Refresh the connections BUFFER."
+  (nrepl--update-connections-display
+   (buffer-local-value 'nrepl--connection-ewoc buffer)
+   nrepl-connection-list))
+
+(defun nrepl--setup-connection-browser ()
+  "Create a browser buffer for nREPL connections."
+  (with-current-buffer (get-buffer-create nrepl--connection-browser-buffer-name)
+    (let ((ewoc (ewoc-create
+                         'nrepl--connection-pp
+                         "  Host              Port   Project\n")))
+      (setq-local nrepl--connection-ewoc ewoc)
+      (nrepl--update-connections-display ewoc nrepl-connection-list)
+      (setq buffer-read-only t)
+      (nrepl-connections-buffer-mode)
+      (display-buffer (current-buffer)))))
+
+(defun nrepl--connection-pp (connection)
+  "Print an nREPL CONNECTION to the current buffer."
+  (let* ((buffer-read-only nil)
+                 (buffer (get-buffer connection))
+                 (endpoint (buffer-local-value 'nrepl-endpoint buffer)))
+    (insert
+     (format "%s %-16s %5s   %s"
+             (if (equal connection (car nrepl-connection-list)) "*" " ")
+             (car endpoint)
+             (prin1-to-string (cadr endpoint))
+             (or (nrepl--project-name
+                  (buffer-local-value 'nrepl-project-dir buffer))
+                 "")))))
+
+(defun nrepl--project-name (path)
+  "Extracts a project name from PATH, possibly nil.
+The project name is the final component of PATH if not nil."
+  (when path
+    (file-name-nondirectory (directory-file-name path))))
+
+(defun nrepl--update-connections-display (ewoc connections)
+  "Update the connections EWOC to show CONNECTIONS."
+  (ewoc-filter ewoc (lambda (n) (member n connections)))
+  (let ((existing))
+    (ewoc-map (lambda (n) (setq existing (cons n existing))) ewoc)
+    (let ((added (-difference connections existing)))
+      (mapc (apply-partially 'ewoc-enter-last ewoc) added)
+      (save-excursion (ewoc-refresh ewoc)))))
+
+(defun nrepl--ewoc-apply-at-point (f)
+  "Apply function F to the ewoc node at point.
+F is a function of two arguments, the ewoc and the data at point."
+  (let* ((ewoc nrepl--connection-ewoc)
+                 (node (and ewoc (ewoc-locate ewoc))))
+    (when node
+      (funcall f ewoc (ewoc-data node)))))
+
+(defun nrepl-connections-make-default ()
+  "Make default the connection at point in the connection browser."
+  (interactive)
+  (save-excursion
+    (nrepl--ewoc-apply-at-point #'nrepl--connections-make-default)))
+
+(defun nrepl--connections-make-default (ewoc data)
+  "Make the connection in EWOC specified by DATA default.
+Refreshes EWOC."
+  (interactive)
+  (nrepl-make-repl-connection-default data)
+  (ewoc-refresh ewoc))
+
+(defun nrepl-connections-close-connection ()
+  "Close connection at point in the connection browser."
+  (interactive)
+  (nrepl--ewoc-apply-at-point #'nrepl--connections-close-connection))
+
+(defun nrepl--connections-close-connection (ewoc data)
+  "Close the connection in EWOC specified by DATA."
+  (nrepl-close (get-buffer data))
+  (nrepl--update-connections-display ewoc nrepl-connection-list))
+
+(defun nrepl-connections-goto-connection ()
+  "Goto connection at point in the connection browser."
+  (interactive)
+  (nrepl--ewoc-apply-at-point #'nrepl--connections-goto-connection))
+
+(defun nrepl--connections-goto-connection (ewoc data)
+  "Goto the REPL for the connection in EWOC specified by DATA."
+  (let ((buffer (buffer-local-value 'nrepl-repl-buffer (get-buffer data))))
+    (when buffer
+      (select-window (display-buffer buffer)))))
+
+;;; server messages
+
+(defun nrepl-current-session ()
+  "Return the current session."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    nrepl-session))
+
+(defun nrepl-current-tooling-session ()
+  "Return the current tooling session."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    nrepl-tooling-session))
+
+(defun nrepl-next-request-id ()
+  "Return the next request id."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (number-to-string (incf nrepl-request-counter))))
+
+(defun nrepl-send-request (request callback)
+  "Send REQUEST and register response handler CALLBACK."
+  (let* ((request-id (nrepl-next-request-id))
+         (request (append (list "id" request-id) request))
+         (message (nrepl-bencode request)))
+    (nrepl-log-event request)
+    (puthash request-id callback nrepl-pending-requests)
+    (nrepl-write-message (nrepl-current-connection-buffer) message)))
+
+(defun nrepl-create-client-session (callback)
+  "Sent a request to create a new client session.
+Response will be handled by CALLBACK."
+  (nrepl-send-request '("op" "clone")
+                      callback))
+
+(defun nrepl-send-stdin (input callback)
+  "Send a stdin message with INPUT.
+Register CALLBACK as the response handler."
+  (nrepl-send-request (list "op" "stdin"
+                            "stdin" input
+                            "session" (nrepl-current-session))
+                      callback))
+
+(defun nrepl-send-interrupt (pending-request-id callback)
+  "Send an interrupt message for PENDING-REQUEST-ID.
+Register CALLBACK as the response handler."
+  (nrepl-send-request (list "op" "interrupt"
+                            "session" (nrepl-current-session)
+                            "interrupt-id" pending-request-id)
+                      callback))
+
+(defun nrepl-eval-request (input &optional ns session)
+  "Send a request to eval INPUT.
+If NS is non-nil, include it in the request.
+Use SESSION if it is non-nil, otherwise use the current session."
+  (append (if ns (list "ns" ns))
+          (list
+           "op" "eval"
+           "session" (or session (nrepl-current-session))
+           "code" input)))
+
+(defun nrepl-send-string (input callback &optional ns session)
+  "Send the request INPUT and register the CALLBACK as the response handler.
+See command `nrepl-eval-request' for details on how NS and SESSION are processed."
+  (nrepl-send-request (nrepl-eval-request input ns session) callback))
+
+(defun nrepl-sync-request-handler (buffer)
+  "Make a synchronous request handler for BUFFER."
+  (nrepl-make-response-handler buffer
+                               (lambda (buffer value)
+                                 (setq nrepl-sync-response
+                                       (plist-put nrepl-sync-response :value value)))
+                               (lambda (buffer out)
+                                 (let ((so-far (plist-get nrepl-sync-response :stdout)))
+                                   (setq nrepl-sync-response
+                                         (plist-put nrepl-sync-response
+                                                    :stdout (concat so-far out)))))
+                               (lambda (buffer err)
+                                 (let ((so-far (plist-get nrepl-sync-response :stderr)))
+                                   (setq nrepl-sync-response
+                                         (plist-put nrepl-sync-response
+                                                    :stderr (concat so-far err)))))
+                               (lambda (buffer)
+                                 (setq nrepl-sync-response
+                                       (plist-put nrepl-sync-response :done t)))))
+
+(defun nrepl-send-request-sync (request)
+  "Send REQUEST to the backend synchronously (discouraged).
+The result is a plist with keys :value, :stderr and :stdout."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (setq nrepl-sync-response nil)
+    (nrepl-send-request request (nrepl-sync-request-handler (current-buffer)))
+    (while (or (null nrepl-sync-response)
+               (null (plist-get nrepl-sync-response :done)))
+      (accept-process-output nil 0.005))
+    nrepl-sync-response))
+
+(defun nrepl-send-string-sync (input &optional ns session)
+  "Send the INPUT to the backend synchronously.
+See command `nrepl-eval-request' for details about how NS and SESSION
+are processed."
+  (nrepl-send-request-sync (nrepl-eval-request input ns session)))
+
+;;; server
+(defun nrepl-server-filter (process output)
+  "Process nREPL server output from PROCESS contained in OUTPUT."
+  (with-current-buffer (process-buffer process)
+    (save-excursion
+      (goto-char (point-max))
+      (insert output)))
+  (when (string-match "nREPL server started on port \\([0-9]+\\)" output)
+    (let ((port (string-to-number (match-string 1 output))))
+      (message (format "nREPL server started on %s" port))
+      (with-current-buffer (process-buffer process)
+        (let ((nrepl-process (nrepl-connect "localhost" port)))
+          (setq nrepl-connection-buffer
+                (buffer-name (process-buffer nrepl-process)))
+          (with-current-buffer (process-buffer nrepl-process)
+            (setq nrepl-server-buffer
+                  (buffer-name (process-buffer process))
+                  nrepl-project-dir
+                  (buffer-local-value
+                   'nrepl-project-dir (process-buffer process)))))))))
+
+(defun nrepl-server-sentinel (process event)
+  "Handle nREPL server PROCESS EVENT."
+  (let* ((b (process-buffer process))
+         (connection-buffer (buffer-local-value 'nrepl-connection-buffer b))
+         (problem (if (and b (buffer-live-p b))
+                      (with-current-buffer b
+                        (buffer-substring (point-min) (point-max)))
+                    "")))
+    (when b
+      (kill-buffer b))
+    (cond
+     ((string-match "^killed" event)
+      nil)
+     ((string-match "^hangup" event)
+      (when connection-buffer
+        (nrepl-close connection-buffer)))
+     ((string-match "Wrong number of arguments to repl task" problem)
+      (error "Leiningen 2.x is required by nREPL.el"))
+     (t (error "Could not start nREPL server: %s" problem)))))
+
+(defun nrepl-current-dir ()
+  "Return the directory of the current buffer."
+  (let ((file-name (buffer-file-name (current-buffer))))
+    (or (when file-name
+          (file-name-directory file-name))
+        list-buffers-directory)))
+
+(defun nrepl-project-directory-for (dir-name)
+  "Return the project directory for the specified DIR-NAME."
+  (when dir-name
+    (locate-dominating-file dir-name "project.clj")))
+
+(defun nrepl-check-for-repl-buffer (endpoint project-directory)
+  "Check whether a matching connection buffer already exists.
+Looks for buffers where `nrepl-endpoint' matches ENDPOINT,
+or `nrepl-project-dir' matches PROJECT-DIRECTORY.
+If so ask the user for confirmation."
+  (if (cl-find-if
+       (lambda (buffer)
+         (let ((buffer (get-buffer buffer)))
+           (or (and endpoint
+                    (equal endpoint
+                           (buffer-local-value 'nrepl-endpoint buffer)))
+               (and project-directory
+                    (equal project-directory
+                           (buffer-local-value 'nrepl-project-dir buffer))))))
+       (nrepl-connection-buffers))
+      (y-or-n-p
+       "An nREPL connection buffer already exists.  Do you really want to create a new one? ")
+    t))
+
+(defun nrepl-close (connection-buffer)
+  "Close the nrepl connection for CONNECTION-BUFFER."
+  (interactive (list (nrepl-current-connection-buffer)))
+  (nrepl--close-connection-buffer connection-buffer)
+  (run-hooks 'nrepl-disconnected-hook)
+  (nrepl--connections-refresh))
+
+;;; client
+(defun nrepl-op-supported-p (op)
+  "Return t iff the given operation OP is supported by nREPL server."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (if (and nrepl-ops (assoc op nrepl-ops))
+        t)))
+
+(defun nrepl-describe-handler (process-buffer)
+  "Return a handler to describe into PROCESS-BUFFER."
+  (lexical-let ((buffer process-buffer))
+    (lambda (response)
+      (nrepl-dbind-response response (ops)
+        (cond (ops
+               (with-current-buffer buffer
+                 (setq nrepl-ops ops))))))))
+
+(defun nrepl-describe-session (process)
+  "Peform describe for the given server PROCESS."
+  (let ((buffer (process-buffer process)))
+    (nrepl-send-request (list "op" "describe")
+                        (nrepl-describe-handler buffer))))
+
+(defun nrepl-setup-default-namespaces (process)
+  "Setup default namespaces for PROCESS."
+  (let ((buffer (process-buffer process)))
+    (with-current-buffer buffer
+      (nrepl-send-string
+       nrepl-repl-requires-sexp
+       (nrepl-make-response-handler
+        buffer nil
+        (lambda (buffer out) (message out))
+        (lambda (buffer err) (message err))
+        nil)
+       nrepl-buffer-ns
+       nrepl-tooling-session))))
+
+(defun nrepl-new-tooling-session-handler (process)
+  "Create a new tooling session handler for PROCESS."
+  (lexical-let ((process process))
+    (lambda (response)
+      (nrepl-dbind-response response (id new-session)
+        (cond (new-session
+               (with-current-buffer (process-buffer process)
+                 (setq nrepl-tooling-session new-session)
+                 (remhash id nrepl-pending-requests)
+                 (nrepl-setup-default-namespaces process))))))))
+
+(defun nrepl-new-session-handler (process no-repl-p)
+  "Create a new session handler for PROCESS.
+When NO-REPL-P is truthy, suppress creation of a REPL buffer."
+  (lexical-let ((process process)
+                (no-repl-p no-repl-p))
+    (lambda (response)
+      (nrepl-dbind-response response (id new-session)
+        (remhash id nrepl-pending-requests)
+        (cond (new-session
+               (lexical-let ((connection-buffer (process-buffer process)))
+                 (setq nrepl-session new-session
+                       nrepl-connection-buffer connection-buffer)
+                 (unless no-repl-p
+                   (cider-make-repl process)
+                   (nrepl-make-repl-connection-default connection-buffer))
+                 (run-hooks 'nrepl-connected-hook))))))))
+
+(defun nrepl-init-client-sessions (process no-repl-p)
+  "Initialize client sessions for PROCESS.
+When NO-REPL-P is truthy, suppress creation of a REPL buffer."
+  (nrepl-create-client-session (nrepl-new-session-handler process no-repl-p))
+  (nrepl-create-client-session (nrepl-new-tooling-session-handler process)))
+
+(defun nrepl-connect (host port &optional no-repl-p)
+  "Connect to a running nREPL server running on HOST and PORT.
+When NO-REPL-P is truthy, suppress creation of a REPL buffer."
+  (message "Connecting to nREPL on %s:%s..." host port)
+  (let* ((nrepl-endpoint `(,host ,port))
+         (process (open-network-stream "nrepl"
+                                       (nrepl-make-connection-buffer) host
+                                       port)))
+    (set-process-filter process 'nrepl-net-filter)
+    (set-process-sentinel process 'nrepl-sentinel)
+    (set-process-coding-system process 'utf-8-unix 'utf-8-unix)
+    (with-current-buffer (process-buffer process)
+      (setq nrepl-endpoint `(,host ,port)))
+    (let ((nrepl-connection-dispatch (buffer-name (process-buffer process))))
+      (nrepl-init-client-sessions process no-repl-p)
+      (nrepl-describe-session process))
+    process))
+
+(defun nrepl--port-from-file (file)
+  "Attempts to read port from a file named by FILE."
+  (let* ((dir (nrepl-project-directory-for (nrepl-current-dir)))
+         (f (expand-file-name file dir)))
+    (when (file-exists-p f)
+      (with-temp-buffer
+        (insert-file-contents f)
+        (buffer-string)))))
+
+(defun nrepl-default-port ()
+  "Attempt to read port from .nrepl-port or target/repl-port.
+Falls back to `nrepl-port' if not found."
+  (or (nrepl--port-from-file ".nrepl-port")
+      (nrepl--port-from-file "target/repl-port")
+      nrepl-port))
+
+(provide 'nrepl-client)
+;;; nrepl-client.el ends here
diff --git a/elpa/cl-lib-0.3/cl-lib-autoloads.el b/elpa/cl-lib-0.3/cl-lib-autoloads.el
index 621a7c328..7bc29b5a9 100644
--- a/elpa/cl-lib-0.3/cl-lib-autoloads.el
+++ b/elpa/cl-lib-0.3/cl-lib-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("cl-lib-pkg.el" "cl-lib.el") (21124 57424
-;;;;;;  300260))
+;;;### (autoloads nil nil ("cl-lib-pkg.el" "cl-lib.el") (21016 60933
+;;;;;;  954335))
 
 ;;;***
 
diff --git a/elpa/cl-lib-0.3/cl-lib-pkg.elc b/elpa/cl-lib-0.3/cl-lib-pkg.elc
index 406e667f6e72a39088de2eb542d45ce6e7465b11..005eecc0d919f3e4658727be82904b24d9ffd5dc 100644
GIT binary patch
delta 30
lcmcb{a*btzws3G_iGpKkx`L63f}ydMv7wcz!A3g?CIFDO2si)$

delta 30
lcmcb{a*btzws1&Bse)gAnS!B-f`O%#v4xd^#YQ^`CIFLf2xR~O

diff --git a/elpa/cl-lib-0.3/cl-lib.elc b/elpa/cl-lib-0.3/cl-lib.elc
index f4c19e0a07bd900f60d8b7525cb1b61d9efdcab1..2fa851b5127333aa0c05dfb0bea3a72515f261a1 100644
GIT binary patch
delta 39
vcmaDR`&xE_ws3G_iGpKkx`L63f}ydMv7wcz!A84v%#%0piEjSG{E7<z0?iFF

delta 49
zcmaDY`%HF%ws1&Bse)gAnS!B-f`O%#v4xd^#YVez%)Gj~Dfu~>#U;8WiJ3W@|1rPi
F0sxSw5X%4n

diff --git a/elpa/clojure-mode-2.1.0/clojure-mode-pkg.el b/elpa/clojure-mode-2.1.0/clojure-mode-pkg.el
deleted file mode 100644
index 08a51aff3..000000000
--- a/elpa/clojure-mode-2.1.0/clojure-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "clojure-mode" "2.1.0" "Major mode for Clojure code" (quote nil))
diff --git a/elpa/clojure-mode-2.1.0/clojure-mode.elc b/elpa/clojure-mode-2.1.0/clojure-mode.elc
deleted file mode 100644
index 8959f0e31ac107c23838d81c4a7942a7f18e8b7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33182
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

diff --git a/elpa/clojure-mode-2.1.0/clojure-mode-autoloads.el b/elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
similarity index 76%
rename from elpa/clojure-mode-2.1.0/clojure-mode-autoloads.el
rename to elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
index 9e9a22859..cbb749e23 100644
--- a/elpa/clojure-mode-2.1.0/clojure-mode-autoloads.el
+++ b/elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads (clojure-mode) "clojure-mode" "clojure-mode.el"
-;;;;;;  (21031 23292 0 0))
+;;;;;;  (21184 20178))
 ;;; Generated autoloads from clojure-mode.el
 
 (autoload 'clojure-mode "clojure-mode" "\
@@ -21,11 +21,11 @@ if that value is non-nil.
 
 \(fn)" t nil)
 
-(put 'clojure-test-ns-segment-position 'safe-local-variable 'integerp)
+(add-to-list 'auto-mode-alist '("\\.clj[sx]?\\'" . clojure-mode))
 
-(put 'clojure-mode-load-command 'safe-local-variable 'stringp)
+(add-to-list 'auto-mode-alist '("\\.dtm\\'" . clojure-mode))
 
-(add-to-list 'auto-mode-alist '("\\.clj\\'" . clojure-mode))
+(add-to-list 'auto-mode-alist '("\\.edn\\'" . clojure-mode))
 
 (add-to-list 'interpreter-mode-alist '("jark" . clojure-mode))
 
@@ -33,8 +33,7 @@ if that value is non-nil.
 
 ;;;***
 
-;;;### (autoloads nil nil ("clojure-mode-pkg.el") (21031 23292 849530
-;;;;;;  0))
+;;;### (autoloads nil nil ("clojure-mode-pkg.el") (21184 20178 859650))
 
 ;;;***
 
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el
new file mode 100644
index 000000000..eebb5c9d0
--- /dev/null
+++ b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "clojure-mode" "20131227.1044" "Major mode for Clojure code" (quote nil))
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..dc4b7615043674863a11a6f973acf6411fa7279f
GIT binary patch
literal 622
zcmbtRK~BRk5bQZ0;JV5Qq$a78O3>y43O!VU6Yzkoy=mM!c4RwL<@GoTLR1{PC)=|-
zGwUfgFV)R#HjB!#gvzv?R3u<`27y|VdOTrWD{^2oy!9HMi9@~u#@0o#&I`yFtQbdY
zYg(woFk~N&tjnhPETtB?OGQSi!;C9)=q)9!5tIzGEYI&#wpcDNq3*a(NsYu(!)Bm>
z&%i2!jeME1l#SR)`UX%bFrAmJ{6ZfZTpEqwdn4WCsCQujan{&M4#IHft<-xr52$q>
zP>8VduMS(K`RX5sFo8oG58P;vp}F^U@(^Bh^7K}1x4;{;$bB$5ALUUCa0WPP*byj$
z7a~8)I3To2k_F#{#=MwxLl#%nVBp${qUcsoEj1+_@+0mE;=l355MKls?yq<-7KUu0
R4u@(AJN%fS7_?M((KpyLxJv*4

literal 0
HcmV?d00001

diff --git a/elpa/clojure-mode-2.1.0/clojure-mode.el b/elpa/clojure-mode-20131227.1044/clojure-mode.el
similarity index 71%
rename from elpa/clojure-mode-2.1.0/clojure-mode.el
rename to elpa/clojure-mode-20131227.1044/clojure-mode.el
index 83f59c681..27967f20b 100644
--- a/elpa/clojure-mode-2.1.0/clojure-mode.el
+++ b/elpa/clojure-mode-20131227.1044/clojure-mode.el
@@ -1,12 +1,13 @@
 ;;; clojure-mode.el --- Major mode for Clojure code
 
-;; Copyright © 2007-2013 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
+;; Copyright © 2007-2013 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
 ;;
-;; Authors: Jeffrey Chu <jochu0@gmail.com>
-;;          Lennart Staflin <lenst@lysator.liu.se>
-;;          Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://github.com/technomancy/clojure-mode
-;; Version: 2.1.0
+;; Author: Jeffrey Chu <jochu0@gmail.com>
+;;         Lennart Staflin <lenst@lysator.liu.se>
+;;         Phil Hagelberg <technomancy@gmail.com>
+;; URL: http://github.com/clojure-emacs/clojure-mode
+;; Version: 20131227.1044
+;; X-Original-Version: 2.1.1
 ;; Keywords: languages, lisp
 
 ;; This file is not part of GNU Emacs.
@@ -14,20 +15,20 @@
 ;;; Commentary:
 
 ;; Provides font-lock, indentation, and navigation for the Clojure
-;; language. (http://clojure.org)
+;; programming language (http://clojure.org).
 
 ;; Users of older Emacs (pre-22) should get version 1.4:
-;; http://github.com/technomancy/clojure-mode/tree/1.4
+;; http://github.com/clojure-emacs/clojure-mode/tree/1.4
 
 ;; Slime integration has been removed; see the 1.x releases if you need it.
 
-;; Using clojure-mode with paredit is highly recommended. Use paredit
+;; Using clojure-mode with paredit is highly recommended.  Use paredit
 ;; as you would with any other minor mode; for instance:
 ;;
 ;;   ;; require or autoload paredit-mode
 ;;   (add-hook 'clojure-mode-hook 'paredit-mode)
 
-;; See nREPL.el (http://github.com/kingtim/nrepl.el) for
+;; See CIDER (http://github.com/clojure-emacs/cider) for
 ;; better interaction with subprocesses via nREPL.
 
 ;;; License:
@@ -49,10 +50,20 @@
 
 ;;; Code:
 
+
+;;; Compatibility
+(eval-and-compile
+  ;; `setq-local' for Emacs 24.2 and below
+  (unless (fboundp 'setq-local)
+    (defmacro setq-local (var val)
+      "Set variable VAR to value VAL in current buffer."
+      `(set (make-local-variable ',var) ,val))))
+
 (eval-when-compile
   (defvar calculate-lisp-indent-last-sexp)
   (defvar font-lock-beg)
   (defvar font-lock-end)
+  (defvar paredit-space-for-delimiter-predicates)
   (defvar paredit-version)
   (defvar paredit-mode))
 
@@ -60,6 +71,7 @@
 (require 'tramp)
 (require 'inf-lisp)
 (require 'imenu)
+(require 'easymenu)
 
 (declare-function clojure-test-jump-to-implementation  "clojure-test-mode.el")
 
@@ -89,7 +101,7 @@
        (1 font-lock-keyword-face)
        (2 font-lock-function-name-face nil t))
 
-      (,(concat "(\\(\\(?:[a-z\.-]+/\\)?def\[a-z\]*-?\\)"
+      (,(concat "(\\(\\(?:[a-z\.-]+/\\)?def\[a-z\-\]*-?\\)"
                 ;; Function declarations.
                 "\\>"
                 ;; Any whitespace
@@ -140,7 +152,7 @@
         ">=" "accessor" "aclone"
         "agent" "agent-errors" "aget" "alength" "alias"
         "all-ns" "alter" "alter-meta!" "alter-var-root" "amap"
-        "ancestors" "and" "apply" "areduce" "array-map"
+        "ancestors" "and" "apply" "areduce" "array-map" "as->"
         "aset" "aset-boolean" "aset-byte" "aset-char" "aset-double"
         "aset-float" "aset-int" "aset-long" "aset-short" "assert"
         "assoc" "assoc!" "assoc-in" "associative?" "atom"
@@ -155,7 +167,7 @@
         "chunk-next" "chunk-rest" "chunked-seq?" "class" "class?"
         "clear-agent-errors" "clojure-version" "coll?" "comment" "commute"
         "comp" "comparator" "compare" "compare-and-set!" "compile"
-        "complement" "concat" "cond" "condp" "conj"
+        "complement" "concat" "cond" "condp" "cond->" "cond->>" "conj"
         "conj!" "cons" "constantly" "construct-proxy" "contains?"
         "count" "counted?" "create-ns" "create-struct" "cycle"
         "dec" "decimal?" "declare" "definline" "defmacro"
@@ -167,8 +179,8 @@
         "doto" "double" "double-array" "doubles" "drop"
         "drop-last" "drop-while" "empty" "empty?" "ensure"
         "enumeration-seq" "eval" "even?" "every?"
-        "extend" "extend-protocol" "extend-type" "extends?" "extenders"
-        "false?" "ffirst" "file-seq" "filter" "find" "find-doc"
+        "extend" "extend-protocol" "extend-type" "extends?" "extenders" "ex-info" "ex-data"
+        "false?" "ffirst" "file-seq" "filter" "filterv" "find" "find-doc"
         "find-ns" "find-var" "first" "flatten" "float" "float-array"
         "float?" "floats" "flush" "fn" "fn?"
         "fnext" "for" "force" "format" "future"
@@ -185,7 +197,7 @@
         "line-seq" "list" "list*" "list?" "load"
         "load-file" "load-reader" "load-string" "loaded-libs" "locking"
         "long" "long-array" "longs" "loop" "macroexpand"
-        "macroexpand-1" "make-array" "make-hierarchy" "map" "map?"
+        "macroexpand-1" "make-array" "make-hierarchy" "map" "mapv" "map?"
         "map-indexed" "mapcat" "max" "max-key" "memfn" "memoize"
         "merge" "merge-with" "meta" "method-sig" "methods"
         "min" "min-key" "mod" "name" "namespace"
@@ -205,16 +217,17 @@
         "pvalues" "quot" "rand" "rand-int" "range"
         "ratio?" "rational?" "rationalize" "re-find" "re-groups"
         "re-matcher" "re-matches" "re-pattern" "re-seq" "read"
-        "read-line" "read-string" "reify" "reduce" "ref" "ref-history-count"
+        "read-line" "read-string" "reify" "reduce" "reduce-kv" "ref" "ref-history-count"
         "ref-max-history" "ref-min-history" "ref-set" "refer" "refer-clojure"
         "release-pending-sends" "rem" "remove" "remove-method" "remove-ns"
         "repeat" "repeatedly" "replace" "replicate"
         "require" "reset!" "reset-meta!" "resolve" "rest"
         "resultset-seq" "reverse" "reversible?" "rseq" "rsubseq"
-        "satisfies?" "second" "select-keys" "send" "send-off" "seq"
+        "satisfies?" "second" "select-keys" "send" "send-off" "send-via" "seq"
         "seq?" "seque" "sequence" "sequential?" "set"
+        "set-agent-send-executor!" "set-agent-send-off-executor!"
         "set-validator!" "set?" "short" "short-array" "shorts"
-        "shutdown-agents" "slurp" "some" "sort" "sort-by"
+        "shutdown-agents" "slurp" "some" "some->" "some->>" "sort" "sort-by"
         "sorted-map" "sorted-map-by" "sorted-set" "sorted-set-by" "sorted?"
         "special-form-anchor" "special-symbol?" "spit" "split-at" "split-with" "str"
         "stream?" "string?" "struct" "struct-map" "subs"
@@ -229,7 +242,8 @@
         "var?" "vary-meta" "vec" "vector" "vector?"
         "when" "when-first" "when-let" "when-not" "while"
         "with-bindings" "with-bindings*" "with-in-str" "with-loading-context" "with-local-vars"
-        "with-meta" "with-open" "with-out-str" "with-precision" "xml-seq" "zipmap"
+        "with-meta" "with-open" "with-out-str" "with-precision"
+        "with-redefs" "with-redefs-fn" "xml-seq" "zero?" "zipmap"
         ) t)
          "\\>")
        1 font-lock-builtin-face)
@@ -272,57 +286,86 @@
         "rightmost" "rights" "root" "seq-zip" "up"
         ) t)
          "\\>")
-       1 font-lock-type-face)
+       1 font-lock-builtin-face)
       ;; Constant values (keywords), including as metadata e.g. ^:static
-      ("\\<^?:\\(\\sw\\|#\\)+\\>" 0 font-lock-constant-face)
-      ;; Meta type annotation #^Type or ^Type
-      ("#?^\\sw+" 0 font-lock-preprocessor-face)
-      ("\\<io\\!\\>" 0 font-lock-warning-face)
+      ("\\<^?:\\(\\sw\\|\\s_\\)+\\(\\>\\|\\_>\\)" 0 font-lock-constant-face)
+      ;; Meta type hint #^Type or ^Type
+      ("\\(#?^\\)\\(\\(\\sw\\|\\s_\\)+\\)"
+       (1 font-lock-preprocessor-face)
+       (2 font-lock-type-face))
 
       ;;Java interop highlighting
       ("\\<\\.-?[a-z][a-zA-Z0-9]*\\>" 0 font-lock-preprocessor-face) ;; .foo .barBaz .qux01 .-flibble .-flibbleWobble
       ("\\<[A-Z][a-zA-Z0-9_]*[a-zA-Z0-9/$_]+\\>" 0 font-lock-preprocessor-face) ;; Foo Bar$Baz Qux_ World_OpenUDP
       ("\\<[a-zA-Z]+\\.[a-zA-Z0-9._]*[A-Z]+[a-zA-Z0-9/.$]*\\>" 0 font-lock-preprocessor-face) ;; Foo/Bar foo.bar.Baz foo.Bar/baz
       ("[a-z]*[A-Z]+[a-z][a-zA-Z0-9$]*\\>" 0 font-lock-preprocessor-face) ;; fooBar
-      ("\\<[A-Z][a-zA-Z0-9$]*\\.\\>" 0 font-lock-preprocessor-face))) ;; Foo. BarBaz. Qux$Quux. Corge9.
-
-
+      ("\\<[A-Z][a-zA-Z0-9$]*\\.\\>" 0 font-lock-type-face) ;; Foo. BarBaz. Qux$Quux. Corge9.
+      ;; Highlight grouping constructs in regular expressions
+      (clojure-mode-font-lock-regexp-groups
+       (1 'font-lock-regexp-grouping-construct prepend))))
   "Default expressions to highlight in Clojure mode.")
 
-(defgroup clojure-mode nil
+(defgroup clojure nil
   "A mode for Clojure"
-  :prefix "clojure-mode-"
-  :group 'applications)
+  :prefix "clojure-"
+  :group 'languages
+  :link '(url-link :tag "Github" "https://github.com/clojure-emacs/clojure-mode")
+  :link '(emacs-commentary-link :tag "Commentary" "clojure-mode"))
 
-(defcustom clojure-mode-font-lock-comment-sexp nil
+(defcustom clojure-font-lock-comment-sexp nil
   "Set to non-nil in order to enable font-lock of (comment...)
-forms. This option is experimental. Changing this will require a
+forms.  This option is experimental.  Changing this will require a
 restart (ie. M-x clojure-mode) of existing clojure mode buffers."
   :type 'boolean
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'booleanp)
 
-(defcustom clojure-mode-load-command  "(clojure.core/load-file \"%s\")\n"
+(defcustom clojure-load-command  "(clojure.core/load-file \"%s\")\n"
   "*Format-string for building a Clojure expression to load a file.
 This format string should use `%s' to substitute a file name
 and should result in a Clojure expression that will command the inferior
 Clojure to load that file."
   :type 'string
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'stringp)
 
-(defcustom clojure-mode-inf-lisp-command "lein repl"
+(defcustom clojure-inf-lisp-command "lein repl"
   "The command used by `inferior-lisp-program'."
   :type 'string
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'stringp)
+
+(defcustom clojure-defun-style-default-indent nil
+  "Default indenting of function and macro forms using defun rules unless
+otherwise defined via `put-clojure-indent`, `define-clojure-indent`, etc."
+  :type 'boolean
+  :group 'clojure
+  :safe 'booleanp)
 
-(defcustom clojure-mode-use-backtracking-indent t
+(defcustom clojure-use-backtracking-indent t
   "Set to non-nil to enable backtracking/context sensitive indentation."
   :type 'boolean
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'booleanp)
 
 (defcustom clojure-max-backtracking 3
   "Maximum amount to backtrack up a list to check for context."
   :type 'integer
-  :group 'clojure-mode)
+  :group 'clojure
+  :safe 'integerp)
+
+(defcustom clojure-omit-space-between-tag-and-delimiters (list ?\[ ?\{)
+  "List of opening delimiter characters allowed to appear
+immediately after a reader literal tag with no space, as
+in :db/id[:db.part/user]"
+  :type '(set (const :tag "[" ?\[)
+              (const :tag "{" ?\{)
+              (const :tag "(" ?\()
+              (const :tag "\"" ?\"))
+  :group 'clojure
+  :safe (lambda (value)
+          (and (listp value)
+               (every 'characterp value))))
 
 (defvar clojure-mode-map
   (let ((map (make-sparse-keymap)))
@@ -335,8 +378,24 @@ Clojure to load that file."
     (define-key map (kbd "C-c C-t") 'clojure-jump-between-tests-and-code)
     (define-key map (kbd "C-c C-z") 'clojure-display-inferior-lisp-buffer)
     (define-key map (kbd "C-c M-q") 'clojure-fill-docstring)
+    (define-key map (kbd "C-:") 'clojure-toggle-keyword-string)
     map)
-  "Keymap for Clojure mode. Inherits from `lisp-mode-shared-map'.")
+  "Keymap for Clojure mode.  Inherits from `lisp-mode-shared-map'.")
+
+(easy-menu-define clojure-mode-menu clojure-mode-map
+  "Menu for Clojure mode."
+  '("Clojure"
+    ["Eval Function Definition" lisp-eval-defun]
+    ["Eval Last Sexp" lisp-eval-last-sexp]
+    ["Eval Region" lisp-eval-region]
+    "--"
+    ["Run Inferior Lisp" clojure-display-inferior-lisp-buffer]
+    ["Display Inferior Lisp Buffer" clojure-display-inferior-lisp-buffer]
+    ["Load File" clojure-load-file]
+    "--"
+    ["Toggle between string & keyword" clojure-toggle-keyword-string]
+    ["Fill Docstring" clojure-fill-docstring]
+    ["Jump Between Test and Code" clojure-jump-between-tests-and-code]))
 
 (defvar clojure-mode-syntax-table
   (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
@@ -349,13 +408,10 @@ Clojure to load that file."
     (modify-syntax-entry ?\[ "(]" table)
     (modify-syntax-entry ?\] ")[" table)
     (modify-syntax-entry ?^ "'" table)
+    ;; Make hash a usual word character
+    (modify-syntax-entry ?# "_ p" table)
     table))
 
-(defvar clojure-mode-abbrev-table nil
-  "Abbrev table used in clojure-mode buffers.")
-
-(define-abbrev-table 'clojure-mode-abbrev-table ())
-
 (defvar clojure-prev-l/c-dir/file nil
   "Record last directory and file used in loading or compiling.
 This holds a cons cell of the form `(DIRECTORY . FILE)'
@@ -370,7 +426,7 @@ numbers count from the end:
   leiningen.compile -> leiningen.test.compile (uses 1)
   clojure.http.client -> clojure.http.test.client (uses -1)")
 
-(defvar clojure-mode-version "2.1.0"
+(defconst clojure-mode-version "2.1.0"
   "The current version of `clojure-mode'.")
 
 (defun clojure-mode-display-version ()
@@ -382,6 +438,40 @@ numbers count from the end:
 (defalias 'clojure-parent-mode
   (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
 
+(defun clojure-space-for-delimiter-p (endp delim)
+  "Prevent paredit from inserting unneeded spaces."
+  (if (derived-mode-p 'clojure-mode)
+      (save-excursion
+        (backward-char)
+        (if (and (or (char-equal delim ?\()
+                     (char-equal delim ?\")
+                     (char-equal delim ?{))
+                 (not endp))
+            (if (char-equal (char-after) ?#)
+                (and (not (bobp))
+                     (or (char-equal ?w (char-syntax (char-before)))
+                         (char-equal ?_ (char-syntax (char-before)))))
+              t)
+          t))
+    t))
+
+(defun clojure-no-space-after-tag (endp delimiter)
+  "Do not insert a space between a reader-literal tag and an
+  opening delimiter in the list
+  clojure-omit-space-between-tag-and-delimiters. Allows you to
+  write things like #db/id[:db.part/user] without inserting a
+  space between the tag and the opening bracket."
+  (if endp
+      t
+    (or (not (member delimiter clojure-omit-space-between-tag-and-delimiters))
+        (save-excursion
+          (let ((orig-point (point)))
+            (not (and (re-search-backward
+                       "#\\([a-zA-Z0-9._-]+/\\)?[a-zA-Z0-9._-]+"
+                       (line-beginning-position)
+                       t)
+                      (= orig-point (match-end 0)))))))))
+
 ;;;###autoload
 (define-derived-mode clojure-mode clojure-parent-mode "Clojure"
   "Major mode for editing Clojure code - similar to Lisp mode.
@@ -394,29 +484,31 @@ or to switch back to an existing one.
 
 Entry to this mode calls the value of `clojure-mode-hook'
 if that value is non-nil."
-  (set (make-local-variable 'imenu-create-index-function)
-       (lambda ()
-         (imenu--generic-function '((nil clojure-match-next-def 0)))))
-  (set (make-local-variable 'indent-tabs-mode) nil)
+  (setq-local imenu-create-index-function
+              (lambda ()
+                (imenu--generic-function '((nil clojure-match-next-def 0)))))
+  (setq-local indent-tabs-mode nil)
   (lisp-mode-variables nil)
-  (set (make-local-variable 'comment-start-skip)
-       "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
-  (set (make-local-variable 'lisp-indent-function)
-       'clojure-indent-function)
+  (setq-local comment-start-skip
+              "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
+  (setq-local lisp-indent-function 'clojure-indent-function)
   (when (< emacs-major-version 24)
-    (set (make-local-variable 'forward-sexp-function)
-         'clojure-forward-sexp))
-  (set (make-local-variable 'lisp-doc-string-elt-property)
-       'clojure-doc-string-elt)
-  (set (make-local-variable 'inferior-lisp-program) clojure-mode-inf-lisp-command)
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+    (setq-local forward-sexp-function 'clojure-forward-sexp))
+  (setq-local lisp-doc-string-elt-property 'clojure-doc-string-elt)
+  (setq-local inferior-lisp-program clojure-inf-lisp-command)
+  (setq-local parse-sexp-ignore-comments t)
 
   (clojure-mode-font-lock-setup)
+  (setq-local open-paren-in-column-0-is-defun-start nil)
   (add-hook 'paredit-mode-hook
             (lambda ()
               (when (>= paredit-version 21)
                 (define-key clojure-mode-map "{" 'paredit-open-curly)
-                (define-key clojure-mode-map "}" 'paredit-close-curly)))))
+                (define-key clojure-mode-map "}" 'paredit-close-curly)
+                (add-to-list 'paredit-space-for-delimiter-predicates
+                             'clojure-space-for-delimiter-p)
+                (add-to-list 'paredit-space-for-delimiter-predicates
+                             'clojure-no-space-after-tag)))))
 
 (defun clojure-display-inferior-lisp-buffer ()
   "Display a buffer bound to `inferior-lisp-buffer'."
@@ -426,7 +518,7 @@ if that value is non-nil."
       (run-lisp inferior-lisp-program)))
 
 (defun clojure-load-file (file-name)
-  "Load a Lisp file into the inferior Lisp process."
+  "Load a Clojure file FILE-NAME into the inferior Clojure process."
   (interactive (comint-get-source "Load Clojure file: "
                                   clojure-prev-l/c-dir/file
                                   '(clojure-mode) t))
@@ -434,7 +526,7 @@ if that value is non-nil."
   (setq clojure-prev-l/c-dir/file (cons (file-name-directory file-name)
                                         (file-name-nondirectory file-name)))
   (comint-send-string (inferior-lisp-proc)
-                      (format clojure-mode-load-command file-name))
+                      (format clojure-load-command file-name))
   (switch-to-lisp t))
 
 
@@ -442,28 +534,39 @@ if that value is non-nil."
 (defun clojure-match-next-def ()
   "Scans the buffer backwards for the next top-level definition.
 Called by `imenu--generic-function'."
-  (when (re-search-backward "^\\s *(def\\S *[ \n\t]+" nil t)
+  (when (re-search-backward "^(def\sw*" nil t)
     (save-excursion
-      (goto-char (match-end 0))
-      (when (looking-at "#?\\^")
-        (let (forward-sexp-function) ; using the built-in one
-          (forward-sexp)))           ; skip the metadata
-      (re-search-forward "[^ \n\t)]+"))))
+      (let (found?
+            (start (point)))
+        (down-list)
+        (forward-sexp)
+        (while (not found?)
+          (forward-sexp)
+          (or (if (char-equal ?[ (char-after (point)))
+                              (backward-sexp))
+                  (if (char-equal ?) (char-after (point)))
+                (backward-sexp)))
+          (destructuring-bind (def-beg . def-end) (bounds-of-thing-at-point 'sexp)
+            (if (char-equal ?^ (char-after def-beg))
+                (progn (forward-sexp) (backward-sexp))
+              (setq found? t)
+              (set-match-data (list def-beg def-end)))))
+        (goto-char start)))))
 
 (defun clojure-mode-font-lock-setup ()
   "Configures font-lock for editing Clojure code."
   (interactive)
-  (set (make-local-variable 'font-lock-multiline) t)
+  (setq-local font-lock-multiline t)
   (add-to-list 'font-lock-extend-region-functions
                'clojure-font-lock-extend-region-def t)
 
-  (when clojure-mode-font-lock-comment-sexp
+  (when clojure-font-lock-comment-sexp
     (add-to-list 'font-lock-extend-region-functions
                  'clojure-font-lock-extend-region-comment t)
     (make-local-variable 'clojure-font-lock-keywords)
     (add-to-list 'clojure-font-lock-keywords
                  'clojure-font-lock-mark-comment t)
-    (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil))
+    (setq-local open-paren-in-column-0-is-defun-start nil))
 
   (setq font-lock-defaults
         '(clojure-font-lock-keywords    ; keywords
@@ -476,9 +579,9 @@ Called by `imenu--generic-function'."
 
 (defun clojure-font-lock-def-at-point (point)
   "Find the position range between the top-most def* and the
-fourth element afterwards. Note that this means there's no
-gaurantee of proper font locking in def* forms that are not at
-top-level."
+fourth element afterwards using POINT.  Note that this means there's no
+guarantee of proper font locking in def* forms that are not at
+top level."
   (goto-char point)
   (condition-case nil
       (beginning-of-defun)
@@ -517,19 +620,54 @@ elements of a def* forms."
                   changed t)))))
     changed))
 
+(defun clojure-mode-font-lock-regexp-groups (bound)
+  "Highlight grouping constructs in regular expression.
+
+BOUND denotes the maximum number of characters (relative to the point) to check."
+  (catch 'found
+    (while (re-search-forward (concat
+                               ;; A group may start using several alternatives:
+                               "\\(\\(?:"
+                               ;; 1. (? special groups
+                               "(\\?\\(?:"
+                               ;; a) non-capturing group (?:X)
+                               ;; b) independent non-capturing group (?>X)
+                               ;; c) zero-width positive lookahead (?=X)
+                               ;; d) zero-width negative lookahead (?!X)
+                               "[:=!>]\\|"
+                               ;; e) zero-width positive lookbehind (?<=X)
+                               ;; f) zero-width negative lookbehind (?<!X)
+                               "<[=!]\\|"
+                               ;; g) named capturing group (?<name>X)
+                               "<[[:alnum:]]+>"
+                               "\\)\\|" ;; end of special groups
+                               ;; 2. normal capturing groups (
+                               ;; 3. we also highlight alternative
+                               ;; separarators |, and closing parens )
+                               "[|()]"
+                               "\\)\\)") bound t)
+      (let ((face (get-text-property (1- (point)) 'face)))
+        (when (and (or (and (listp face)
+                            (memq 'font-lock-string-face face))
+                       (eq 'font-lock-string-face face))
+                   (clojure-string-start t))
+          (throw 'found t))))))
+
 (defun clojure-find-block-comment-start (limit)
-  "Search for (comment...) or #_ style block comments and put
-  point at the beginning of the expression."
+  "Search for (comment...) or #_ style block comments.
+Places point at the beginning of the expression.
+
+LIMIT denotes the maximum number of characters (relative to the point) to check."
   (let ((pos (re-search-forward "\\((comment\\>\\|#_\\)" limit t)))
     (when pos
       (forward-char (- (length (match-string 1))))
       pos)))
 
 (defun clojure-font-lock-extend-region-comment ()
-  "Move fontification boundaries to always contain
-  entire (comment ..) and #_ sexp. Does not work if you have a
-  white-space between ( and comment, but that is omitted to make
-  this run faster."
+  "Move fontification boundaries to always contain entire (comment ..) and #_ sexp.
+
+Does not work if you have a  whitespace between ( and comment, but that is omitted to make
+this run faster."
   (let ((changed nil))
     (goto-char font-lock-beg)
     (condition-case nil (beginning-of-defun) (error nil))
@@ -545,7 +683,9 @@ elements of a def* forms."
     changed))
 
 (defun clojure-font-lock-mark-comment (limit)
-  "Marks all (comment ..) and #_ forms with font-lock-comment-face."
+  "Mark all (comment ..) and #_ forms with `font-lock-comment-face'.
+
+LIMIT denotes the maximum number of characters (relative to the point) to check."
   (let (pos)
     (while (and (< (point) limit)
                 (setq pos (clojure-find-block-comment-start limit)))
@@ -644,6 +784,10 @@ This function also returns nil meaning don't specify the indentation."
                (goto-char open-paren)
                (1+ (current-column)))
               ((or (eq method 'defun)
+                   (and clojure-defun-style-default-indent
+                        ;; largely to preserve useful alignment of :require, etc in ns
+                        (not (string-match "^:" function))
+                        (not method))
                    (and (null method)
                         (> (length function) 3)
                         (string-match "\\`\\(?:\\S +/\\)?\\(def\\|with-\\)"
@@ -655,13 +799,14 @@ This function also returns nil meaning don't specify the indentation."
                                      indent-point normal-indent))
               (method
                (funcall method indent-point state))
-              (clojure-mode-use-backtracking-indent
+              (clojure-use-backtracking-indent
                (clojure-backtracking-indent
                 indent-point state normal-indent)))))))
 
 (defun clojure-backtracking-indent (indent-point state normal-indent)
-  "Experimental backtracking support. Will upwards in an sexp to
-check for contextual indenting."
+  "Experimental backtracking support.
+
+Will upwards in an sexp to check for contextual indenting."
   (let (indent (path) (depth 0))
     (goto-char (elt state 1))
     (while (and (not indent)
@@ -736,7 +881,7 @@ get emacs to indent your own macros the same as it does the
 built-ins like with-open. To set manually from lisp code,
 use (put-clojure-indent 'some-symbol 'defun)."
   :type '(repeat symbol)
-  :group 'clojure-mode
+  :group 'clojure
   :set 'add-custom-clojure-indents)
 
 (define-clojure-indent
@@ -797,6 +942,7 @@ use (put-clojure-indent 'some-symbol 'defun)."
   ;; clojure.test
   (testing 1)
   (deftest 'defun)
+  (are 1)
   (use-fixtures 'defun))
 
 
@@ -807,14 +953,23 @@ use (put-clojure-indent 'some-symbol 'defun)."
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun clojure-string-start ()
-  "Return the position of the \" that begins the string at point."
-  (save-excursion
-    (save-match-data
-      ;; Find a quote that appears immediately after whitespace,
-      ;; beginning of line, or an open paren, brace, or bracket
-      (re-search-backward "\\(\\s-\\|^\\|(\\|\\[\\|{\\)\\(\"\\)")
-      (match-beginning 2))))
+(defun clojure-string-start (&optional regex)
+  "Return the position of the \" that begins the string at point.
+If REGEX is non-nil, return the position of the # that begins
+the regex at point.  If point is not inside a string or regex,
+return nil."
+  (when (nth 3 (syntax-ppss)) ;; Are we really in a string?
+    (save-excursion
+      (save-match-data
+        ;; Find a quote that appears immediately after whitespace,
+        ;; beginning of line, hash, or an open paren, brace, or bracket
+        (re-search-backward "\\(\\s-\\|^\\|#\\|(\\|\\[\\|{\\)\\(\"\\)")
+        (let ((beg (match-beginning 2)))
+          (when beg
+            (if regex
+                (and (char-equal ?# (char-before beg)) (1- beg))
+              (when (not (char-equal ?# (char-before beg)))
+                beg))))))))
 
 (defun clojure-char-at-point ()
   "Return the char at point or nil if at buffer end."
@@ -861,14 +1016,42 @@ returned."
   (forward-char)
   (set-mark (clojure-string-end)))
 
-(defun clojure-fill-docstring (&optional argument)
+(defun clojure-toggle-keyword-string ()
+  "Convert the string or keyword at (point) from string->keyword or keyword->string."
+  (interactive)
+  (let* ((original-point (point)))
+    (while (and (> (point) 1)
+                (not (equal "\"" (buffer-substring-no-properties (point) (+ 1 (point)))))
+                (not (equal ":" (buffer-substring-no-properties (point) (+ 1 (point))))))
+      (backward-char))
+    (cond
+     ((equal 1 (point))
+      (message "beginning of file reached, this was probably a mistake."))
+     ((equal "\"" (buffer-substring-no-properties (point) (+ 1 (point))))
+      (insert ":" (substring (clojure-delete-and-extract-sexp) 1 -1)))
+     ((equal ":" (buffer-substring-no-properties (point) (+ 1 (point))))
+      (insert "\"" (substring (clojure-delete-and-extract-sexp) 1) "\"")))
+    (goto-char original-point)))
+
+(defun clojure-delete-and-extract-sexp ()
+  "Delete the sexp and return it."
+  (interactive)
+  (let* ((begin (point)))
+    (forward-sexp)
+    (let* ((result (buffer-substring-no-properties begin (point))))
+      (delete-region begin (point))
+      result)))
+
+(defvar clojure-docstring-indent-level 2)
+
+(defun clojure-fill-docstring ()
   "Fill the definition that the point is on appropriate for Clojure.
 
-  Fills so that every paragraph has a minimum of two initial spaces,
-  with the exception of the first line. Fill margins are taken from
-  paragraph start, so a paragraph that begins with four spaces will
-  remain indented by four spaces after refilling."
-  (interactive "P")
+Fills so that every paragraph has a minimum of two initial spaces,
+with the exception of the first line.  Fill margins are taken from
+paragraph start, so a paragraph that begins with four spaces will
+remain indented by four spaces after refilling."
+  (interactive)
   (if (and (fboundp 'paredit-in-string-p) paredit-mode)
       (unless (paredit-in-string-p)
         (error "Must be inside a string")))
@@ -877,25 +1060,28 @@ returned."
   (let ((old-point (point)))
     (save-restriction
       (save-excursion
-        (let* ((string-region (clojure-docstring-start+end-points))
-               (string-start (1+ (car string-region)))
+        (let* ((clojure-fill-column fill-column)
+               (string-region (clojure-docstring-start+end-points))
+               (string-start (car string-region))
                (string-end (cdr string-region))
-               (string (buffer-substring-no-properties (1+ (car string-region))
-                                                       (cdr string-region))))
+               (string (buffer-substring-no-properties string-start
+                                                       string-end)))
           (delete-region string-start string-end)
           (insert
            (with-temp-buffer
              (insert string)
-             (let ((left-margin 2))
+             (let ((left-margin clojure-docstring-indent-level))
                (delete-trailing-whitespace)
+               (setq fill-column clojure-fill-column)
                (fill-region (point-min) (point-max))
-               (buffer-substring-no-properties (+ 2 (point-min)) (point-max))))))))
+               (buffer-substring-no-properties (+ clojure-docstring-indent-level (point-min)) (point-max))))))))
     (goto-char old-point)))
 
 
 
 (defconst clojure-namespace-name-regex
   (rx line-start
+      (zero-or-more whitespace)
       "("
       (zero-or-one (group (regexp "clojure.core/")))
       (zero-or-one (submatch "in-"))
@@ -939,21 +1125,30 @@ returned."
 
 
 (defun clojure-expected-ns ()
-  "Returns the namespace name that the file should have."
+  "Return the namespace name that the file should have."
   (let* ((project-dir (file-truename
                        (locate-dominating-file default-directory
                                                "project.clj")))
-         (relative (substring (file-truename (buffer-file-name)) (length project-dir) -4)))
+         (relative (substring (file-truename (buffer-file-name))
+                              (length project-dir)
+                              (- (length (file-name-extension (buffer-file-name) t))))))
     (replace-regexp-in-string
      "_" "-" (mapconcat 'identity (cdr (split-string relative "/")) "."))))
 
+(defun clojure-insert-ns-form-at-point ()
+  "Insert a namespace form at point."
+  (interactive)
+  (insert (format "(ns %s)" (clojure-expected-ns))))
+
 (defun clojure-insert-ns-form ()
+  "Insert a namespace form at the beginning of the buffer."
   (interactive)
   (goto-char (point-min))
-  (insert (format "(ns %s)" (clojure-expected-ns))))
+  (clojure-insert-ns-form-at-point))
 
 (defun clojure-update-ns ()
-  "Updates the namespace of the current buffer. Useful if a file has been renamed."
+  "Update the namespace of the current buffer.
+Useful if a file has been renamed."
   (interactive)
   (let ((nsname (clojure-expected-ns)))
     (when nsname
@@ -965,6 +1160,7 @@ returned."
               (error "Namespace not found"))))))))
 
 (defun clojure-find-ns ()
+  "Find the namespace of the current Clojure buffer."
   (let ((regexp clojure-namespace-name-regex))
     (save-restriction
       (save-excursion
@@ -972,18 +1168,23 @@ returned."
         (when (re-search-forward regexp nil t)
           (match-string-no-properties 4))))))
 
-(defalias 'clojure-find-package 'clojure-find-ns)
+(define-obsolete-function-alias 'clojure-find-package 'clojure-find-ns)
 
 ;; Test navigation:
 (defun clojure-in-tests-p ()
+  "Check whether the current file is a test file.
+
+Two checks are made - whether the namespace of the file has the
+word test in it and whether the file lives under the test/ directory."
   (or (string-match-p "test\." (clojure-find-ns))
       (string-match-p "/test" (buffer-file-name))))
 
 (defun clojure-underscores-for-hyphens (namespace)
+  "Replace all hyphens in NAMESPACE with underscores."
   (replace-regexp-in-string "-" "_" namespace))
 
 (defun clojure-test-for (namespace)
-  "Returns the path of the test file for the given namespace."
+  "Return the path of the test file for the given NAMESPACE."
   (let* ((namespace (clojure-underscores-for-hyphens namespace))
          (segments (split-string namespace "\\.")))
     (format "%stest/%s_test.clj"
@@ -992,15 +1193,18 @@ returned."
             (mapconcat 'identity segments "/"))))
 
 (defvar clojure-test-for-fn 'clojure-test-for
-  "Var pointing to the function that will return the full path of the
-Clojure test file for the given namespace.")
+  "The function that will return the full path of the Clojure test file for the given namespace.")
 
 (defun clojure-jump-to-test ()
   "Jump from implementation file to test."
   (interactive)
   (find-file (funcall clojure-test-for-fn (clojure-find-ns))))
 
+(make-obsolete 'clojure-jump-to-test
+               "use projectile or toggle.el instead." "2.1.1")
+
 (defun clojure-jump-between-tests-and-code ()
+  "Jump between implementation and related test file."
   (interactive)
   (if (clojure-in-tests-p)
       (clojure-test-jump-to-implementation)
@@ -1008,10 +1212,9 @@ Clojure test file for the given namespace.")
 
 ;;;###autoload
 (progn
-  (put 'clojure-test-ns-segment-position 'safe-local-variable 'integerp)
-  (put 'clojure-mode-load-command 'safe-local-variable 'stringp)
-
-  (add-to-list 'auto-mode-alist '("\\.clj\\'" . clojure-mode))
+  (add-to-list 'auto-mode-alist '("\\.clj[sx]?\\'" . clojure-mode))
+  (add-to-list 'auto-mode-alist '("\\.dtm\\'" . clojure-mode))
+  (add-to-list 'auto-mode-alist '("\\.edn\\'" . clojure-mode))
   (add-to-list 'interpreter-mode-alist '("jark" . clojure-mode))
   (add-to-list 'interpreter-mode-alist '("cake" . clojure-mode)))
 
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode.elc b/elpa/clojure-mode-20131227.1044/clojure-mode.elc
new file mode 100644
index 0000000000000000000000000000000000000000..b60d097e09dc3277fedf6f346c7e8743e194ed5c
GIT binary patch
literal 39396
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
PQ2LG75?D~_=IZ|ikVexA

literal 0
HcmV?d00001

diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.el b/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.el
deleted file mode 100644
index 7902a228a..000000000
--- a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "clojure-test-mode" "2.1.0" "Minor mode for Clojure tests" (quote ((clojure-mode "1.7") (nrepl "0.1.7"))))
diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode.elc b/elpa/clojure-test-mode-2.1.0/clojure-test-mode.elc
deleted file mode 100644
index b766238e8dfa1c3ee8406e2b6153af5dece2e13c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16219
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

diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-autoloads.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
similarity index 56%
rename from elpa/clojure-test-mode-2.1.0/clojure-test-mode-autoloads.el
rename to elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
index 69c8c694e..92cb91055 100644
--- a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-autoloads.el
+++ b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads (clojure-test-mode) "clojure-test-mode" "clojure-test-mode.el"
-;;;;;;  (21031 23301 0 0))
+;;;### (autoloads (clojure-find-clojure-test clojure-test-mode) "clojure-test-mode"
+;;;;;;  "clojure-test-mode.el" (21184 20189))
 ;;; Generated autoloads from clojure-test-mode.el
 
 (autoload 'clojure-test-mode "clojure-test-mode" "\
@@ -14,16 +14,20 @@ A minor mode for running Clojure tests.
 
 \(fn &optional ARG)" t nil)
 
+(autoload 'clojure-find-clojure-test "clojure-test-mode" "\
+
+
+\(fn)" nil nil)
+
 (defun clojure-test-maybe-enable nil "\
-Enable clojure-test-mode if the current buffer contains a namespace
-with a \"test.\" bit on it." (let ((ns (clojure-find-package))) (when (and ns (string-match "test\\(\\.\\|$\\)" ns)) (save-window-excursion (clojure-test-mode t)))))
+Enable clojure-test-mode if the current buffer contains a \"clojure.test\" bit in it." (when (clojure-find-clojure-test) (save-window-excursion (clojure-test-mode t))))
 
 (add-hook 'clojure-mode-hook 'clojure-test-maybe-enable)
 
 ;;;***
 
-;;;### (autoloads nil nil ("clojure-test-mode-pkg.el") (21031 23301
-;;;;;;  774339 0))
+;;;### (autoloads nil nil ("clojure-test-mode-pkg.el") (21184 20189
+;;;;;;  750997))
 
 ;;;***
 
diff --git a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el
new file mode 100644
index 000000000..5b4e2f9ea
--- /dev/null
+++ b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "clojure-test-mode" "20131227.805" "Minor mode for Clojure tests" (quote ((clojure-mode "1.7") (cider "0.4.0"))))
diff --git a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.elc b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..37d2ef2b39169a85c823291f3791984f928715be
GIT binary patch
literal 672
zcmbtRK~BRk5bQZ0;JV6%Mj}p=g4&V`sBl1n6Yzk=-ZTcsj%=5zyq--82n07QA8gO=
z%&e!rzFi+pCX=MDYgoIk*M<~4?Lnc{WG;5tG=>5=3-?<KS0tfYL0O*9=e(hsmGiN+
z@vei0o1u6N<U?`jF9dZcgHQ#T9t&yQ^VU-yDa5>Uit>S=tg3}r&d&aT`<IO%Gb(5c
z*8>;4GQDO$)u|{&Ibu5<TR>yL^-*{F4I>u>k&NI&tHZ(CHt-~BZ?V%7l#?NPZ8zbB
zQ6D0pQat;YPPr1*>KBJ{%wb&w>1;$U-o_?h@{7$c@7FgsAY1e(Bbz)K<<Tk#4kTK5
zA}|hrh<pqafY2LF9%9Rd)%>8#q5NwN2L8K}B$+B|w57a9`GOmQ^jD54q~DX|>z%gF
q!;mpFd{`fnhavfp!tr$a$uX9srC6jHOr=)*2kA_lidmXvS@I6Q2*+^%

literal 0
HcmV?d00001

diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
similarity index 93%
rename from elpa/clojure-test-mode-2.1.0/clojure-test-mode.el
rename to elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
index 6d39c6779..127578b2a 100644
--- a/elpa/clojure-test-mode-2.1.0/clojure-test-mode.el
+++ b/elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
@@ -1,12 +1,13 @@
 ;;; clojure-test-mode.el --- Minor mode for Clojure tests
 
-;; Copyright © 2009-2011 Phil Hagelberg
+;; Copyright © 2009-2011 Phil Hagelberg
 
 ;; Author: Phil Hagelberg <technomancy@gmail.com>
 ;; URL: http://emacswiki.org/cgi-bin/wiki/ClojureTestMode
-;; Version: 2.1.0
+;; Version: 20131227.805
+;; X-Original-Version: 3.0.0
 ;; Keywords: languages, lisp, test
-;; Package-Requires: ((clojure-mode "1.7") (nrepl "0.1.7"))
+;; Package-Requires: ((clojure-mode "1.7") (cider "0.4.0"))
 
 ;; This file is not part of GNU Emacs.
 
@@ -95,6 +96,11 @@
 ;; 2.0.0 2012-12-29
 ;;  * Replace slime with nrepl.el
 
+;; 3.0.0 2013-12-27
+;;  * Replace nrepl.el with cider
+;;  * Improve clojure-test-maybe-enable heuristic
+;;  * Obsolete clojure-test-jump-to-implementation in favour of other libs
+
 ;;; TODO:
 
 ;; * Prefix arg to jump-to-impl should open in other window
@@ -109,14 +115,8 @@
 (require 'cl)
 (require 'clojure-mode)
 (require 'which-func)
-(require 'nrepl)
-
-(declare-function nrepl-repl-buffer            "nrepl.el")
-(declare-function nrepl-make-response-handler  "nrepl.el")
-(declare-function nrepl-send-string            "nrepl.el")
-(declare-function nrepl-current-ns             "nrepl.el")
-(declare-function nrepl-current-tooling-session "nrepl.el")
-(declare-function nrepl-current-connection-buffer "nrepl.el")
+(require 'nrepl-client)
+(require 'cider-interaction)
 
 ;; Faces
 
@@ -160,9 +160,6 @@
 
 ;; Support Functions
 
-(defun clojure-test-nrepl-connected-p ()
-  (nrepl-current-connection-buffer))
-
 (defun clojure-test-make-handler (callback)
   (lexical-let ((buffer (current-buffer))
                 (callback callback))
@@ -170,20 +167,20 @@
                                  (lambda (buffer value)
                                    (funcall callback buffer value))
                                  (lambda (buffer value)
-                                   (nrepl-emit-interactive-output value))
+                                   (cider-repl-emit-interactive-output value))
                                  (lambda (buffer err)
-                                   (nrepl-emit-interactive-output err))
+                                   (cider-repl-emit-interactive-output err))
                                  '())))
 
 (defun clojure-test-eval (string &optional handler)
   (nrepl-send-string string
                      (clojure-test-make-handler (or handler #'identity))
-                     (or (nrepl-current-ns) "user")
+                     (or (cider-current-ns) "user")
                      (nrepl-current-tooling-session)))
 
 (defun clojure-test-load-reporting ()
   "Redefine the test-is report function to store results in metadata."
-  (when (clojure-test-nrepl-connected-p)
+  (when (cider-connected-p)
     (nrepl-send-string-sync
      "(ns clojure.test.mode
         (:use [clojure.test :only [file-position *testing-vars* *test-out*
@@ -239,7 +236,7 @@
             (clojure-test-mode-test-one-var ns test-name))
           (do-report {:type :end-test-ns, :ns ns-obj}))
         (do-report (assoc @*report-counters* :type :summary))))"
-     (or (nrepl-current-ns) "user")
+     (or (cider-current-ns) "user")
      (nrepl-current-tooling-session))))
 
 (defun clojure-test-get-results (buffer result)
@@ -295,6 +292,7 @@
         (overlay-put overlay 'face (if (equal event :fail)
                                        'clojure-test-failure-face
                                      'clojure-test-error-face))
+        (overlay-put overlay 'help-echo message)
         (overlay-put overlay 'message message)
         (overlay-put overlay 'actual pp-actual)))))
 
@@ -352,7 +350,7 @@ Clojure src file for the given test namespace.")
   (save-some-buffers nil (lambda () (equal major-mode 'clojure-mode)))
   (message "Testing...")
   (if (not (clojure-in-tests-p))
-      (nrepl-load-file (buffer-file-name)))
+      (cider-load-file (buffer-file-name)))
   (save-window-excursion
     (if (not (clojure-in-tests-p))
         (clojure-jump-to-test))
@@ -460,7 +458,7 @@ Clojure src file for the given test namespace.")
                          (clojure-find-ns))))
     (nrepl-send-string-sync command)))
 
-(defun clojure-test-clear (&optional callback)
+(defun clojure-test-clear ()
   "Remove overlays and clear stored results."
   (interactive)
   (remove-overlays)
@@ -493,7 +491,10 @@ Clojure src file for the given test namespace.")
   "Jump from test file to implementation."
   (interactive)
   (find-file (funcall clojure-test-implementation-for-fn
-                      (clojure-find-package))))
+                      (clojure-find-ns))))
+
+(make-obsolete 'clojure-test-jump-to-implementation
+               "use projectile or toggle.el instead." "3.0.0")
 
 (defvar clojure-test-mode-map
   (let ((map (make-sparse-keymap)))
@@ -516,20 +517,31 @@ Clojure src file for the given test namespace.")
 
 \\{clojure-test-mode-map}"
   nil " Test" clojure-test-mode-map
-  (when (clojure-test-nrepl-connected-p)
+  (when (cider-connected-p)
     (clojure-test-load-reporting)))
 
 (add-hook 'nrepl-connected-hook 'clojure-test-load-reporting)
 
+(defconst clojure-test-regex
+  (rx "clojure.test"))
+
+;;;###autoload
+(defun clojure-find-clojure-test ()
+  (let ((regexp clojure-test-regex))
+    (save-restriction
+      (save-excursion
+        (save-match-data
+          (goto-char (point-min))
+          (when (re-search-forward regexp nil t)
+            (match-string-no-properties 0)))))))
+
 ;;;###autoload
 (progn
   (defun clojure-test-maybe-enable ()
-    "Enable clojure-test-mode if the current buffer contains a namespace
-with a \"test.\" bit on it."
-    (let ((ns (clojure-find-package))) ; defined in clojure-mode.el
-      (when (and ns (string-match "test\\(\\.\\|$\\)" ns))
-        (save-window-excursion
-          (clojure-test-mode t)))))
+    "Enable clojure-test-mode if the current buffer contains a \"clojure.test\" bit in it."
+    (when (clojure-find-clojure-test)
+      (save-window-excursion
+        (clojure-test-mode t))))
 
   (add-hook 'clojure-mode-hook 'clojure-test-maybe-enable))
 
diff --git a/elpa/dash-2.1.0/dash-autoloads.el b/elpa/dash-2.1.0/dash-autoloads.el
new file mode 100644
index 000000000..f055b0ccf
--- /dev/null
+++ b/elpa/dash-2.1.0/dash-autoloads.el
@@ -0,0 +1,18 @@
+;;; dash-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil nil ("dash-pkg.el" "dash.el") (21077 32433
+;;;;;;  641771 0))
+
+;;;***
+
+(provide 'dash-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; dash-autoloads.el ends here
diff --git a/elpa/dash-2.1.0/dash-pkg.el b/elpa/dash-2.1.0/dash-pkg.el
new file mode 100644
index 000000000..823fdf14e
--- /dev/null
+++ b/elpa/dash-2.1.0/dash-pkg.el
@@ -0,0 +1 @@
+(define-package "dash" "2.1.0" "A modern list library for Emacs" (quote nil))
diff --git a/elpa/dash-2.1.0/dash.el b/elpa/dash-2.1.0/dash.el
new file mode 100644
index 000000000..9e803c6db
--- /dev/null
+++ b/elpa/dash-2.1.0/dash.el
@@ -0,0 +1,1125 @@
+;;; dash.el --- A modern list library for Emacs
+
+;; Copyright (C) 2012 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 2.1.0
+;; Keywords: lists
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; A modern list api for Emacs.
+;;
+;; See documentation on https://github.com/magnars/dash.el#functions
+
+;;; Code:
+
+(defmacro !cons (car cdr)
+  "Destructive: Sets CDR to the cons of CAR and CDR."
+  `(setq ,cdr (cons ,car ,cdr)))
+
+(defmacro !cdr (list)
+  "Destructive: Sets LIST to the cdr of LIST."
+  `(setq ,list (cdr ,list)))
+
+(defmacro --each (list &rest body)
+  "Anaphoric form of `-each'."
+  (declare (debug t))
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list)
+           (it-index 0))
+       (while ,l
+         (let ((it (car ,l)))
+           ,@body)
+         (setq it-index (1+ it-index))
+         (!cdr ,l)))))
+
+(put '--each 'lisp-indent-function 1)
+
+(defun -each (list fn)
+  "Calls FN with every item in LIST. Returns nil, used for side-effects only."
+  (--each list (funcall fn it)))
+
+(defmacro --each-while (list pred &rest body)
+  "Anaphoric form of `-each-while'."
+  (let ((l (make-symbol "list"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,c t))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred) (setq ,c nil) ,@body))
+         (!cdr ,l)))))
+
+(put '--each-while 'lisp-indent-function 2)
+
+(defun -each-while (list pred fn)
+  "Calls FN with every item in LIST while (PRED item) is non-nil.
+Returns nil, used for side-effects only."
+  (--each-while list (funcall pred it) (funcall fn it)))
+
+(defmacro --dotimes (num &rest body)
+  "Repeatedly executes BODY (presumably for side-effects) with `it` bound to integers from 0 through n-1."
+  `(let ((it 0))
+     (while (< it ,num)
+       ,@body
+       (setq it (1+ it)))))
+
+(put '--dotimes 'lisp-indent-function 1)
+
+(defun -dotimes (num fn)
+  "Repeatedly calls FN (presumably for side-effects) passing in integers from 0 through n-1."
+  (--dotimes num (funcall fn it)))
+
+(defun -map (fn list)
+  "Returns a new list consisting of the result of applying FN to the items in LIST."
+  (mapcar fn list))
+
+(defmacro --map (form list)
+  "Anaphoric form of `-map'."
+  (declare (debug t))
+  `(mapcar (lambda (it) ,form) ,list))
+
+(defmacro --reduce-from (form initial-value list)
+  "Anaphoric form of `-reduce-from'."
+  `(let ((acc ,initial-value))
+     (--each ,list (setq acc ,form))
+     acc))
+
+(defun -reduce-from (fn initial-value list)
+  "Returns the result of applying FN to INITIAL-VALUE and the
+first item in LIST, then applying FN to that result and the 2nd
+item, etc. If LIST contains no items, returns INITIAL-VALUE and
+FN is not called.
+
+In the anaphoric form `--reduce-from', the accumulated value is
+exposed as `acc`."
+  (--reduce-from (funcall fn acc it) initial-value list))
+
+(defmacro --reduce (form list)
+  "Anaphoric form of `-reduce'."
+  (let ((lv (make-symbol "list-value")))
+    `(let ((,lv ,list))
+       (if ,lv
+           (--reduce-from ,form (car ,lv) (cdr ,lv))
+         (let (acc it) ,form)))))
+
+(defun -reduce (fn list)
+  "Returns the result of applying FN to the first 2 items in LIST,
+then applying FN to that result and the 3rd item, etc. If LIST
+contains no items, FN must accept no arguments as well, and
+reduce returns the result of calling FN with no arguments. If
+LIST has only 1 item, it is returned and FN is not called.
+
+In the anaphoric form `--reduce', the accumulated value is
+exposed as `acc`."
+  (if list
+      (-reduce-from fn (car list) (cdr list))
+    (funcall fn)))
+
+(defun -reduce-r-from (fn initial-value list)
+  "Replace conses with FN, nil with INITIAL-VALUE and evaluate
+the resulting expression. If LIST is empty, INITIAL-VALUE is
+returned and FN is not called.
+
+Note: this function works the same as `-reduce-from' but the
+operation associates from right instead of from left."
+  (if (not list) initial-value
+    (funcall fn (car list) (-reduce-r-from fn initial-value (cdr list)))))
+
+(defmacro --reduce-r-from (form initial-value list)
+  "Anaphoric version of `-reduce-r-from'."
+  `(-reduce-r-from (lambda (&optional it acc) ,form) ,initial-value ,list))
+
+(defun -reduce-r (fn list)
+  "Replace conses with FN and evaluate the resulting expression.
+The final nil is ignored. If LIST contains no items, FN must
+accept no arguments as well, and reduce returns the result of
+calling FN with no arguments. If LIST has only 1 item, it is
+returned and FN is not called.
+
+The first argument of FN is the new item, the second is the
+accumulated value.
+
+Note: this function works the same as `-reduce' but the operation
+associates from right instead of from left."
+  (cond
+   ((not list) (funcall fn))
+   ((not (cdr list)) (car list))
+   (t (funcall fn (car list) (-reduce-r fn (cdr list))))))
+
+(defmacro --reduce-r (form list)
+  "Anaphoric version of `-reduce-r'."
+  `(-reduce-r (lambda (&optional it acc) ,form) ,list))
+
+(defmacro --filter (form list)
+  "Anaphoric form of `-filter'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (when ,form (!cons it ,r)))
+       (nreverse ,r))))
+
+(defun -filter (pred list)
+  "Returns a new list of the items in LIST for which PRED returns a non-nil value.
+
+Alias: `-select'"
+  (--filter (funcall pred it) list))
+
+(defalias '-select '-filter)
+(defalias '--select '--filter)
+
+(defmacro --remove (form list)
+  "Anaphoric form of `-remove'."
+  (declare (debug t))
+  `(--filter (not ,form) ,list))
+
+(defun -remove (pred list)
+  "Returns a new list of the items in LIST for which PRED returns nil.
+
+Alias: `-reject'"
+  (--remove (funcall pred it) list))
+
+(defalias '-reject '-remove)
+(defalias '--reject '--remove)
+
+(defmacro --keep (form list)
+  "Anaphoric form of `-keep'."
+  (let ((r (make-symbol "result"))
+        (m (make-symbol "mapped")))
+    `(let (,r)
+       (--each ,list (let ((,m ,form)) (when ,m (!cons ,m ,r))))
+       (nreverse ,r))))
+
+(defun -keep (fn list)
+  "Returns a new list of the non-nil results of applying FN to the items in LIST."
+  (--keep (funcall fn it) list))
+
+(defmacro --map-when (pred rep list)
+  "Anaphoric form of `-map-when'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (!cons (if ,pred ,rep it) ,r))
+       (nreverse ,r))))
+
+(defmacro --map-indexed (form list)
+  "Anaphoric form of `-map-indexed'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list
+         (!cons ,form ,r))
+       (nreverse ,r))))
+
+(defun -map-indexed (fn list)
+  "Returns a new list consisting of the result of (FN index item) for each item in LIST.
+
+In the anaphoric form `--map-indexed', the index is exposed as `it-index`."
+  (--map-indexed (funcall fn it-index it) list))
+
+(defun -map-when (pred rep list)
+  "Returns a new list where the elements in LIST that does not match the PRED function
+are unchanged, and where the elements in LIST that do match the PRED function are mapped
+through the REP function."
+  (--map-when (funcall pred it) (funcall rep it) list))
+
+(defalias '--replace-where '--map-when)
+(defalias '-replace-where '-map-when)
+
+(defun -flatten (l)
+  "Takes a nested list L and returns its contents as a single, flat list."
+  (if (and (listp l) (listp (cdr l)))
+      (-mapcat '-flatten l)
+    (list l)))
+
+(defun -concat (&rest lists)
+  "Returns a new list with the concatenation of the elements in the supplied LISTS."
+  (apply 'append lists))
+
+(defmacro --mapcat (form list)
+  "Anaphoric form of `-mapcat'."
+  (declare (debug t))
+  `(apply 'append (--map ,form ,list)))
+
+(defun -mapcat (fn list)
+  "Returns the concatenation of the result of mapping FN over LIST.
+Thus function FN should return a list."
+  (--mapcat (funcall fn it) list))
+
+(defun -cons* (&rest args)
+  "Makes a new list from the elements of ARGS.
+
+The last 2 members of ARGS are used as the final cons of the
+result so if the final member of ARGS is not a list the result is
+a dotted list."
+  (let (res)
+    (--each
+        args
+      (cond
+       ((not res)
+        (setq res it))
+       ((consp res)
+        (setcdr res (cons (cdr res) it)))
+       (t
+        (setq res (cons res it)))))
+    res))
+
+(defmacro --first (form list)
+  "Anaphoric form of `-first'."
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each-while ,list (not ,n)
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -first (pred list)
+  "Returns the first x in LIST where (PRED x) is non-nil, else nil.
+
+To get the first item in the list no questions asked, use `car'."
+  (--first (funcall pred it) list))
+
+(defmacro --last (form list)
+  "Anaphoric form of `-last'."
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each ,list
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -last (pred list)
+  "Return the last x in LIST where (PRED x) is non-nil, else nil."
+  (--last (funcall pred it) list))
+
+(defalias '-first-item 'car
+  "Returns the first item of LIST, or nil on an empty list.")
+
+(defun -last-item (list)
+  "Returns the first item of LIST, or nil on an empty list."
+  (car (last list)))
+
+(defmacro --count (pred list)
+  "Anaphoric form of `-count'."
+  (let ((r (make-symbol "result")))
+    `(let ((,r 0))
+       (--each ,list (when ,pred (setq ,r (1+ ,r))))
+       ,r)))
+
+(defun -count (pred list)
+  "Counts the number of items in LIST where (PRED item) is non-nil."
+  (--count (funcall pred it) list))
+
+(defun ---truthy? (val)
+  (not (null val)))
+
+(defmacro --any? (form list)
+  "Anaphoric form of `-any?'."
+  `(---truthy? (--first ,form ,list)))
+
+(defun -any? (pred list)
+  "Returns t if (PRED x) is non-nil for any x in LIST, else nil.
+
+Alias: `-some?'"
+  (--any? (funcall pred it) list))
+
+(defalias '-some? '-any?)
+(defalias '--some? '--any?)
+
+(defalias '-any-p '-any?)
+(defalias '--any-p '--any?)
+(defalias '-some-p '-any?)
+(defalias '--some-p '--any?)
+
+(defmacro --all? (form list)
+  "Anaphoric form of `-all?'."
+  (let ((a (make-symbol "all")))
+    `(let ((,a t))
+       (--each-while ,list ,a (setq ,a ,form))
+       (---truthy? ,a))))
+
+(defun -all? (pred list)
+  "Returns t if (PRED x) is non-nil for all x in LIST, else nil.
+
+Alias: `-every?'"
+  (--all? (funcall pred it) list))
+
+(defalias '-every? '-all?)
+(defalias '--every? '--all?)
+
+(defalias '-all-p '-all?)
+(defalias '--all-p '--all?)
+(defalias '-every-p '-all?)
+(defalias '--every-p '--all?)
+
+(defmacro --none? (form list)
+  "Anaphoric form of `-none?'."
+  `(--all? (not ,form) ,list))
+
+(defun -none? (pred list)
+  "Returns t if (PRED x) is nil for all x in LIST, else nil."
+  (--none? (funcall pred it) list))
+
+(defalias '-none-p '-none?)
+(defalias '--none-p '--none?)
+
+(defmacro --only-some? (form list)
+  "Anaphoric form of `-only-some?'."
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each-while ,list (not (and ,y ,n))
+         (if ,form (setq ,y t) (setq ,n t)))
+       (---truthy? (and ,y ,n)))))
+
+(defun -only-some? (pred list)
+  "Returns `t` if there is a mix of items in LIST that matches and does not match PRED.
+Returns `nil` both if all items match the predicate, and if none of the items match the predicate."
+  (--only-some? (funcall pred it) list))
+
+(defalias '-only-some-p '-only-some?)
+(defalias '--only-some-p '--only-some?)
+
+(defun -slice (list from &optional to)
+  "Return copy of LIST, starting from index FROM to index TO.
+FROM or TO may be negative."
+  (let ((length (length list))
+        (new-list nil)
+        (index 0))
+    ;; to defaults to the end of the list
+    (setq to (or to length))
+    ;; handle negative indices
+    (when (< from 0)
+      (setq from (mod from length)))
+    (when (< to 0)
+      (setq to (mod to length)))
+
+    ;; iterate through the list, keeping the elements we want
+    (while (< index to)
+      (when (>= index from)
+        (!cons (car list) new-list))
+      (!cdr list)
+      (setq index (1+ index)))
+    (nreverse new-list)))
+
+(defun -take (n list)
+  "Returns a new list of the first N items in LIST, or all items if there are fewer than N."
+  (let (result)
+    (--dotimes n
+      (when list
+        (!cons (car list) result)
+        (!cdr list)))
+    (nreverse result)))
+
+(defun -drop (n list)
+  "Returns the tail of LIST without the first N items."
+  (--dotimes n (!cdr list))
+  list)
+
+(defmacro --take-while (form list)
+  "Anaphoric form of `-take-while'."
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each-while ,list ,form (!cons it ,r))
+       (nreverse ,r))))
+
+(defun -take-while (pred list)
+  "Returns a new list of successive items from LIST while (PRED item) returns a non-nil value."
+  (--take-while (funcall pred it) list))
+
+(defmacro --drop-while (form list)
+  "Anaphoric form of `-drop-while'."
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list))
+       (while (and ,l (let ((it (car ,l))) ,form))
+         (!cdr ,l))
+       ,l)))
+
+(defun -drop-while (pred list)
+  "Returns the tail of LIST starting from the first item for which (PRED item) returns nil."
+  (--drop-while (funcall pred it) list))
+
+(defun -split-at (n list)
+  "Returns a list of ((-take N LIST) (-drop N LIST)), in no more than one pass through the list."
+  (let (result)
+    (--dotimes n
+      (when list
+        (!cons (car list) result)
+        (!cdr list)))
+    (list (nreverse result) list)))
+
+(defun -rotate (n list)
+  "Rotate LIST N places to the right.  With N negative, rotate to the left.
+The time complexity is O(n)."
+  (if (> n 0)
+      (append (last list n) (butlast list n))
+    (append (-drop (- n) list) (-take (- n) list))))
+
+(defun -insert-at (n x list)
+  "Returns a list with X inserted into LIST at position N."
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cadr split-list)))))
+
+(defmacro --split-with (pred list)
+  "Anaphoric form of `-split-with'."
+  (let ((l (make-symbol "list"))
+        (r (make-symbol "result"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,r nil)
+           (,c t))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred)
+               (setq ,c nil)
+             (!cons it ,r)
+             (!cdr ,l))))
+       (list (nreverse ,r) ,l))))
+
+(defun -split-with (pred list)
+  "Returns a list of ((-take-while PRED LIST) (-drop-while PRED LIST)), in no more than one pass through the list."
+  (--split-with (funcall pred it) list))
+
+(defmacro --separate (form list)
+  "Anaphoric form of `-separate'."
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each ,list (if ,form (!cons it ,y) (!cons it ,n)))
+       (list (nreverse ,y) (nreverse ,n)))))
+
+(defun -separate (pred list)
+  "Returns a list of ((-filter PRED LIST) (-remove PRED LIST)), in one pass through the list."
+  (--separate (funcall pred it) list))
+
+(defun ---partition-all-in-steps-reversed (n step list)
+  "Private: Used by -partition-all-in-steps and -partition-in-steps."
+  (when (< step 1)
+    (error "Step must be a positive number, or you're looking at some juicy infinite loops."))
+  (let ((result nil)
+        (len 0))
+    (while list
+      (!cons (-take n list) result)
+      (setq list (-drop step list)))
+    result))
+
+(defun -partition-all-in-steps (n step list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
+The last groups may contain less than N items."
+  (nreverse (---partition-all-in-steps-reversed n step list)))
+
+(defun -partition-in-steps (n step list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
+If there are not enough items to make the last group N-sized,
+those items are discarded."
+  (let ((result (---partition-all-in-steps-reversed n step list)))
+    (while (and result (< (length (car result)) n))
+      (!cdr result))
+    (nreverse result)))
+
+(defun -partition-all (n list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists.
+The last group may contain less than N items."
+  (-partition-all-in-steps n n list))
+
+(defun -partition (n list)
+  "Returns a new list with the items in LIST grouped into N-sized sublists.
+If there are not enough items to make the last group N-sized,
+those items are discarded."
+  (-partition-in-steps n n list))
+
+(defmacro --partition-by (form list)
+  "Anaphoric form of `-partition-by'."
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (v (make-symbol "value"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,v ,form)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (unless (equal ,v ,n)
+                 (!cons (nreverse ,s) ,r)
+                 (setq ,s nil)
+                 (setq ,v ,n))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by (fn list)
+  "Applies FN to each item in LIST, splitting it each time FN returns a new value."
+  (--partition-by (funcall fn it) list))
+
+(defmacro --partition-by-header (form list)
+  "Anaphoric form of `-partition-by-header'."
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (h (make-symbol "header-value"))
+        (b (make-symbol "seen-body?"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,h ,form)
+                (,b nil)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (if (equal ,h ,n)
+                   (when ,b
+                     (!cons (nreverse ,s) ,r)
+                     (setq ,s nil)
+                     (setq ,b nil))
+                 (setq ,b t))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by-header (fn list)
+  "Applies FN to the first item in LIST. That is the header
+  value. Applies FN to each item in LIST, splitting it each time
+  FN returns the header value, but only after seeing at least one
+  other value (the body)."
+  (--partition-by-header (funcall fn it) list))
+
+(defmacro --group-by (form list)
+  "Anaphoric form of `-group-by'."
+  (let ((l (make-symbol "list"))
+        (v (make-symbol "value"))
+        (k (make-symbol "key"))
+        (r (make-symbol "result")))
+    `(let ((,l ,list)
+           ,r)
+       ;; Convert `list' to an alist and store it in `r'.
+       (while ,l
+         (let* ((,v (car ,l))
+                (it ,v)
+                (,k ,form)
+                (kv (assoc ,k ,r)))
+           (if kv
+               (setcdr kv (cons ,v (cdr kv)))
+             (push (list ,k ,v) ,r))
+           (setq ,l (cdr ,l))))
+       ;; Reverse lists in each group.
+       (let ((rest ,r))
+         (while rest
+           (let ((kv (car rest)))
+             (setcdr kv (nreverse (cdr kv))))
+           (setq rest (cdr rest))))
+       ;; Reverse order of keys.
+       (nreverse ,r))))
+
+(defun -group-by (fn list)
+  "Separate LIST into an alist whose keys are FN applied to the
+elements of LIST.  Keys are compared by `equal'."
+  (--group-by (funcall fn it) list))
+
+(defun -interpose (sep list)
+  "Returns a new list of all elements in LIST separated by SEP."
+  (let (result)
+    (when list
+      (!cons (car list) result)
+      (!cdr list))
+    (while list
+      (setq result (cons (car list) (cons sep result)))
+      (!cdr list))
+    (nreverse result)))
+
+(defun -interleave (&rest lists)
+  "Returns a new list of the first item in each list, then the second etc."
+  (let (result)
+    (while (-none? 'null lists)
+      (--each lists (!cons (car it) result))
+      (setq lists (-map 'cdr lists)))
+    (nreverse result)))
+
+(defmacro --zip-with (form list1 list2)
+  "Anaphoric form of `-zip-with'.
+
+The elements in list1 is bound as `it`, the elements in list2 as `other`."
+  (let ((r (make-symbol "result"))
+        (l1 (make-symbol "list1"))
+        (l2 (make-symbol "list2")))
+    `(let ((,r nil)
+           (,l1 ,list1)
+           (,l2 ,list2))
+       (while (and ,l1 ,l2)
+         (let ((it (car ,l1))
+               (other (car ,l2)))
+           (!cons ,form ,r)
+           (!cdr ,l1)
+           (!cdr ,l2)))
+       (nreverse ,r))))
+
+(defun -zip-with (fn list1 list2)
+  "Zip the two lists LIST1 and LIST2 using a function FN.  This
+function is applied pairwise taking as first argument element of
+LIST1 and as second argument element of LIST2 at corresponding
+position.
+
+The anaphoric form `--zip-with' binds the elements from LIST1 as `it`,
+and the elements from LIST2 as `other`."
+  (--zip-with (funcall fn it other) list1 list2))
+
+(defun -zip (list1 list2)
+  "Zip the two lists together.  Return the list where elements
+are cons pairs with car being element from LIST1 and cdr being
+element from LIST2.  The length of the returned list is the
+length of the shorter one."
+  (-zip-with 'cons list1 list2))
+
+(defun -partial (fn &rest args)
+  "Takes a function FN and fewer than the normal arguments to FN,
+and returns a fn that takes a variable number of additional ARGS.
+When called, the returned function calls FN with ARGS first and
+then additional args."
+  (apply 'apply-partially fn args))
+
+(defun -elem-index (elem list)
+  "Return the index of the first element in the given LIST which
+is equal to the query element ELEM, or nil if there is no
+such element."
+  (car (-elem-indices elem list)))
+
+(defun -elem-indices (elem list)
+  "Return the indices of all elements in LIST equal to the query
+element ELEM, in ascending order."
+  (-find-indices (-partial 'equal elem) list))
+
+(defun -find-indices (pred list)
+  "Take a predicate PRED and a LIST and return the index of the
+first element in the list satisfying the predicate, or nil if
+there is no such element."
+  (let ((i 0))
+    (apply 'append (--map-indexed (when (funcall pred it) (list it-index)) list))))
+
+(defmacro --find-indices (form list)
+  "Anaphoric version of `-find-indices'."
+  `(-find-indices (lambda (it) ,form) ,list))
+
+(defun -find-index (pred list)
+  "Return the indices of all elements in LIST satisfying the
+predicate PRED, in ascending order."
+  (car (-find-indices pred list)))
+
+(defmacro --find-index (form list)
+  "Anaphoric version of `-find-index'."
+  `(-find-index (lambda (it) ,form) ,list))
+
+(defun -select-by-indices (indices list)
+  "Return a list whose elements are elements from LIST selected
+as `(nth i list)` for all i from INDICES."
+  (let (r)
+    (--each indices
+      (!cons (nth it list) r))
+    (nreverse r)))
+
+(defun -grade-up (comparator list)
+  "Grades elements of LIST using COMPARATOR relation, yielding a
+permutation vector such that applying this permutation to LIST
+sorts it in ascending order."
+  ;; ugly hack to "fix" lack of lexical scope
+  (let ((comp `(lambda (it other) (funcall ',comparator (car it) (car other)))))
+    (->> (--map-indexed (cons it it-index) list)
+      (-sort comp)
+      (-map 'cdr))))
+
+(defun -grade-down (comparator list)
+  "Grades elements of LIST using COMPARATOR relation, yielding a
+permutation vector such that applying this permutation to LIST
+sorts it in descending order."
+  ;; ugly hack to "fix" lack of lexical scope
+  (let ((comp `(lambda (it other) (funcall ',comparator (car other) (car it)))))
+    (->> (--map-indexed (cons it it-index) list)
+      (-sort comp)
+      (-map 'cdr))))
+
+(defmacro -> (x &optional form &rest more)
+  "Threads the expr through the forms. Inserts X as the second
+item in the first form, making a list of it if it is not a list
+already. If there are more forms, inserts the first form as the
+second item in second form, etc."
+  (cond
+   ((null form) x)
+   ((null more) (if (listp form)
+                    `(,(car form) ,x ,@(cdr form))
+                  (list form x)))
+   (:else `(-> (-> ,x ,form) ,@more))))
+
+(defmacro ->> (x form &rest more)
+  "Threads the expr through the forms. Inserts X as the last item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, inserts the first form as the
+last item in second form, etc."
+  (if (null more)
+      (if (listp form)
+          `(,(car form) ,@(cdr form) ,x)
+        (list form x))
+    `(->> (->> ,x ,form) ,@more)))
+
+(defmacro --> (x form &rest more)
+  "Threads the expr through the forms. Inserts X at the position
+signified by the token `it' in the first form. If there are more
+forms, inserts the first form at the position signified by `it'
+in in second form, etc."
+  (if (null more)
+      (if (listp form)
+          (--map-when (eq it 'it) x form)
+        (list form x))
+    `(--> (--> ,x ,form) ,@more)))
+
+(put '-> 'lisp-indent-function 1)
+(put '->> 'lisp-indent-function 1)
+(put '--> 'lisp-indent-function 1)
+
+(defmacro -when-let (var-val &rest body)
+  "If VAL evaluates to non-nil, bind it to VAR and execute body.
+VAR-VAL should be a (VAR VAL) pair."
+  (let ((var (car var-val))
+        (val (cadr var-val)))
+    `(let ((,var ,val))
+       (when ,var
+         ,@body))))
+
+(defmacro -when-let* (vars-vals &rest body)
+  "If all VALS evaluate to true, bind them to their corresponding
+  VARS and execute body. VARS-VALS should be a list of (VAR VAL)
+  pairs (corresponding to bindings of `let*')."
+  (if (= (length vars-vals) 1)
+      `(-when-let ,(car vars-vals)
+         ,@body)
+    `(-when-let ,(car vars-vals)
+       (-when-let* ,(cdr vars-vals)
+         ,@body))))
+
+(defmacro --when-let (val &rest body)
+  "If VAL evaluates to non-nil, bind it to `it' and execute
+body."
+  `(let ((it ,val))
+     (when it
+       ,@body)))
+
+(defmacro -if-let (var-val then &optional else)
+  "If VAL evaluates to non-nil, bind it to VAR and do THEN,
+otherwise do ELSE. VAR-VAL should be a (VAR VAL) pair."
+  (let ((var (car var-val))
+        (val (cadr var-val)))
+    `(let ((,var ,val))
+       (if ,var ,then ,else))))
+
+(defmacro -if-let* (vars-vals then &optional else)
+  "If all VALS evaluate to true, bind them to their corresponding
+  VARS and do THEN, otherwise do ELSE. VARS-VALS should be a list
+  of (VAR VAL) pairs (corresponding to the bindings of `let*')."
+  (let ((first-pair (car vars-vals))
+        (rest (cdr vars-vals)))
+    (if (= (length vars-vals) 1)
+        `(-if-let ,first-pair ,then ,else)
+      `(-if-let ,first-pair
+         (-if-let* ,rest ,then ,else)
+         ,else))))
+
+(defmacro --if-let (val then &optional else)
+  "If VAL evaluates to non-nil, bind it to `it' and do THEN,
+otherwise do ELSE."
+  `(let ((it ,val))
+     (if it ,then ,else)))
+
+(put '-when-let 'lisp-indent-function 1)
+(put '-when-let* 'lisp-indent-function 1)
+(put '--when-let 'lisp-indent-function 1)
+(put '-if-let 'lisp-indent-function 1)
+(put '-if-let* 'lisp-indent-function 1)
+(put '--if-let 'lisp-indent-function 1)
+
+(defun -distinct (list)
+  "Return a new list with all duplicates removed.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil.
+
+Alias: `-uniq'"
+  (let (result)
+    (--each list (unless (-contains? result it) (!cons it result)))
+    (nreverse result)))
+
+(defun -union (list list2)
+  "Return a new list containing the elements of LIST1 and elements of LIST2 that are not in LIST1.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (let (result)
+    (--each list (!cons it result))
+    (--each list2 (unless (-contains? result it) (!cons it result)))
+    (nreverse result)))
+
+(defalias '-uniq '-distinct)
+
+(defun -intersection (list list2)
+  "Return a new list containing only the elements that are members of both LIST and LIST2.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (--filter (-contains? list2 it) list))
+
+(defun -difference (list list2)
+  "Return a new list with only the members of LIST that are not in LIST2.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (--filter (not (-contains? list2 it)) list))
+
+(defvar -compare-fn nil
+  "Tests for equality use this function or `equal' if this is nil.
+It should only be set using dynamic scope with a let, like:
+(let ((-compare-fn =)) (-union numbers1 numbers2 numbers3)")
+
+(defun -contains? (list element)
+  "Return whether LIST contains ELEMENT.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (not
+   (null
+    (cond
+     ((null -compare-fn)    (member element list))
+     ((eq -compare-fn 'eq)  (memq element list))
+     ((eq -compare-fn 'eql) (memql element list))
+     (t
+      (let ((lst list))
+        (while (and lst
+                    (not (funcall -compare-fn element (car lst))))
+          (setq lst (cdr lst)))
+        lst))))))
+
+(defalias '-contains-p '-contains?)
+
+(defun -sort (comparator list)
+  "Sort LIST, stably, comparing elements using COMPARATOR.
+Returns the sorted list.  LIST is NOT modified by side effects.
+COMPARATOR is called with two elements of LIST, and should return non-nil
+if the first element should sort before the second."
+  (sort (copy-sequence list) comparator))
+
+(defmacro --sort (form list)
+  "Anaphoric form of `-sort'."
+  (declare (debug t))
+  `(-sort (lambda (it other) ,form) ,list))
+
+(defun -repeat (n x)
+  "Return a list with X repeated N times.
+Returns nil if N is less than 1."
+  (let (ret)
+    (--dotimes n (!cons x ret))
+    ret))
+
+(defun -sum (list)
+  "Return the sum of LIST."
+  (apply '+ list))
+
+(defun -product (list)
+  "Return the product of LIST."
+  (apply '* list))
+
+(defun -max (list)
+  "Return the largest value from LIST of numbers or markers."
+  (apply 'max list))
+
+(defun -min (list)
+  "Return the smallest value from LIST of numbers or markers."
+  (apply 'min list))
+
+(defun -max-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the greatest element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (--reduce (if (funcall comparator it acc) it acc) list))
+
+(defun -min-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the least element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (--reduce (if (funcall comparator it acc) acc it) list))
+
+(defmacro --max-by (form list)
+  "Anaphoric version of `-max-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  `(-max-by (lambda (it other) ,form) ,list))
+
+(defmacro --min-by (form list)
+  "Anaphoric version of `-min-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  `(-min-by (lambda (it other) ,form) ,list))
+
+(eval-after-load "lisp-mode"
+  '(progn
+     (let ((new-keywords '(
+                           "--each"
+                           "-each"
+                           "--each-while"
+                           "-each-while"
+                           "--dotimes"
+                           "-dotimes"
+                           "-map"
+                           "--map"
+                           "--reduce-from"
+                           "-reduce-from"
+                           "--reduce"
+                           "-reduce"
+                           "--reduce-r-from"
+                           "-reduce-r-from"
+                           "--reduce-r"
+                           "-reduce-r"
+                           "--filter"
+                           "-filter"
+                           "-select"
+                           "--select"
+                           "--remove"
+                           "-remove"
+                           "-reject"
+                           "--reject"
+                           "--keep"
+                           "-keep"
+                           "-flatten"
+                           "-concat"
+                           "--mapcat"
+                           "-mapcat"
+                           "--first"
+                           "-first"
+                           "--any?"
+                           "-any?"
+                           "-some?"
+                           "--some?"
+                           "-any-p"
+                           "--any-p"
+                           "-some-p"
+                           "--some-p"
+                           "--all?"
+                           "-all?"
+                           "-every?"
+                           "--every?"
+                           "-all-p"
+                           "--all-p"
+                           "-every-p"
+                           "--every-p"
+                           "--none?"
+                           "-none?"
+                           "-none-p"
+                           "--none-p"
+                           "-only-some?"
+                           "--only-some?"
+                           "-only-some-p"
+                           "--only-some-p"
+                           "-take"
+                           "-drop"
+                           "--take-while"
+                           "-take-while"
+                           "--drop-while"
+                           "-drop-while"
+                           "-split-at"
+                           "-rotate"
+                           "-insert-at"
+                           "--split-with"
+                           "-split-with"
+                           "-partition"
+                           "-partition-in-steps"
+                           "-partition-all"
+                           "-partition-all-in-steps"
+                           "-interpose"
+                           "-interleave"
+                           "--zip-with"
+                           "-zip-with"
+                           "-zip"
+                           "--map-indexed"
+                           "-map-indexed"
+                           "--map-when"
+                           "-map-when"
+                           "--replace-where"
+                           "-replace-where"
+                           "-partial"
+                           "-rpartial"
+                           "-juxt"
+                           "-applify"
+                           "-on"
+                           "-flip"
+                           "-const"
+                           "-cut"
+                           "-orfn"
+                           "-andfn"
+                           "-elem-index"
+                           "-elem-indices"
+                           "-find-indices"
+                           "--find-indices"
+                           "-find-index"
+                           "--find-index"
+                           "-select-by-indices"
+                           "-grade-up"
+                           "-grade-down"
+                           "->"
+                           "->>"
+                           "-->"
+                           "-when-let"
+                           "-when-let*"
+                           "--when-let"
+                           "-if-let"
+                           "-if-let*"
+                           "--if-let"
+                           "-union"
+                           "-distinct"
+                           "-intersection"
+                           "-difference"
+                           "-contains?"
+                           "-contains-p"
+                           "-repeat"
+                           "-cons*"
+                           "-sum"
+                           "-product"
+                           "-min"
+                           "-min-by"
+                           "--min-by"
+                           "-max"
+                           "-max-by"
+                           "--max-by"
+                           ))
+           (special-variables '(
+                                "it"
+                                "it-index"
+                                "acc"
+                                "other"
+                                )))
+       (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "\\<" (regexp-opt special-variables 'paren) "\\>")
+                                                   1 font-lock-variable-name-face)) 'append)
+       (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "(\\s-*" (regexp-opt new-keywords 'paren) "\\>")
+                                                   1 font-lock-keyword-face)) 'append))
+     (--each (buffer-list)
+       (with-current-buffer it
+         (when (and (eq major-mode 'emacs-lisp-mode)
+                    (boundp 'font-lock-mode)
+                    font-lock-mode)
+           (font-lock-refresh-defaults))))))
+
+(provide 'dash)
+;;; dash.el ends here
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el
new file mode 100644
index 000000000..9f9b20fc0
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el
@@ -0,0 +1,38 @@
+;;; elisp-slime-nav-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (elisp-slime-nav-find-elisp-thing-at-point elisp-slime-nav-mode)
+;;;;;;  "elisp-slime-nav" "elisp-slime-nav.el" (20184 56040))
+;;; Generated autoloads from elisp-slime-nav.el
+
+(autoload 'elisp-slime-nav-mode "elisp-slime-nav" "\
+Enable Slime-style navigation of elisp symbols using M-. and M-,
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'elisp-slime-nav-find-elisp-thing-at-point "elisp-slime-nav" "\
+Jump to the elisp thing at point, be it a function,variable, library or face.
+
+With a prefix arg, prompt for the symbol to jump to.
+
+Argument SYM-NAME thing to find.
+
+\(fn SYM-NAME)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("elisp-slime-nav-pkg.el") (20184 56040
+;;;;;;  300769))
+
+;;;***
+
+(provide 'elisp-slime-nav-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; elisp-slime-nav-autoloads.el ends here
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el
new file mode 100644
index 000000000..92a54aba1
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el
@@ -0,0 +1 @@
+(define-package "elisp-slime-nav" "0.2" "Make M-. and M-, work in elisp like they do in slime" (quote nil))
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.elc b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.elc
similarity index 60%
rename from elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.elc
rename to elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.elc
index 5cd05de43f9300e14935376c8830bc1bd01a2135..57dd135361c934148637e09ae4b4620c9c5ae9d7 100644
GIT binary patch
delta 60
zcmeyv@{whNtb|)prh-dqvVww<f`O%#fr*uoiGq=Vq2WYRTSlXa#Re<}dX|P8mvl2S
Q8cjA}vSiK6%+cfm0046j=l}o!

delta 71
zcmey!@`q)DtVDQfib8N|fr5gGf}xR>frXWkv4W9-q47jhTSl{q#RiPV8<%%8GMY^`
bX0jAk*U(7L(ap(BQcyC`Gg8vj)Z_vH$#fDm

diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el
new file mode 100644
index 000000000..7e76e5dfb
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el
@@ -0,0 +1,81 @@
+
+;;; elisp-slime-nav.el --- Make M-. and M-, work in elisp like they do in slime
+;;
+;; Author: Steve Purcell <steve@sanityinc.com>
+;; Keywords: navigation slime elisp emacs-lisp
+;; URL: https://github.com/purcell/elisp-slime-nav
+;; Version: 0.2
+;;
+;;; Commentary
+;;
+;; This package provides Slime's convenient "M-." and "M-," navigation
+;; in `emacs-lisp-mode'.
+;;
+;; Additionally, C-u M-. will prompt for the symbol to which to jump.
+;;
+;; Usage:
+;;
+;;   (require 'elisp-slime-nav)
+;;   (add-hook 'emacs-lisp-mode-hook (lambda () (elisp-slime-nav-mode t)))
+;;
+;; Known issues:
+;;
+;;   When navigating into Emacs' C source, "M-," will not be bound to
+;;   the same command, but "M-*" will typically do the trick.
+;;
+;;; Code
+(defvar elisp-slime-nav-mode-map (make-keymap))
+
+;;;###autoload
+(define-minor-mode elisp-slime-nav-mode
+  "Enable Slime-style navigation of elisp symbols using M-. and M-,"
+  nil " SliNav" elisp-slime-nav-mode-map)
+
+(require 'etags)
+
+
+(defun elisp-slime-nav--all-navigable-symbol-names ()
+  "Return a list of strings for the symbols to which navigation is possible."
+  (loop for x being the symbols
+        if (or (fboundp x) (boundp x) (symbol-plist x) (facep x))
+        collect (symbol-name x)))
+
+;;;###autoload
+(defun elisp-slime-nav-find-elisp-thing-at-point (sym-name)
+  "Jump to the elisp thing at point, be it a function,variable, library or face.
+
+With a prefix arg, prompt for the symbol to jump to.
+
+Argument SYM-NAME thing to find."
+  (interactive
+   (list
+    (let* ((sym-at-point (symbol-at-point))
+           (at-point (and sym-at-point (symbol-name sym-at-point))))
+      (if current-prefix-arg
+          (completing-read "Symbol: "
+                           (elisp-slime-nav--all-navigable-symbol-names)
+                           nil t at-point)
+        at-point))))
+  (when sym-name
+    (let ((sym (intern sym-name)))
+      (message "search for %s" (pp-to-string sym))
+      (ring-insert find-tag-marker-ring (point-marker))
+      (cond
+       ((fboundp sym) (find-function sym))
+       ((boundp sym) (find-variable sym))
+       ((or (featurep sym) (locate-library sym-name))
+        (find-library sym-name))
+       ((facep sym)
+        (find-face-definition sym))
+       (:else
+        (progn
+          (pop-tag-mark)
+          (error "Don't know how to find '%s'" sym)))))))
+
+
+(define-key elisp-slime-nav-mode-map (kbd "M-.") 'elisp-slime-nav-find-elisp-thing-at-point)
+(define-key elisp-slime-nav-mode-map (kbd "M-,") 'pop-tag-mark)
+
+
+(provide 'elisp-slime-nav)
+;;; elisp-slime-nav.el ends here
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc
new file mode 100644
index 0000000000000000000000000000000000000000..0929a286b2fc461abd961fe009c905d5d42054a2
GIT binary patch
literal 3156
zcmbtWNpIUm6!y{9p-9_9(@Xm-)wNW3WG=E8+eovzK-xNoxC@F{Ku6?InwlK4T%4%C
zzTX>?vg0VZM1Z8n;hXJ!%gpK7ug|{P+S=-!o}SXPEX{SIBATy=GDANVnx3nW$Rp?Y
z#F?CU6Y?C_waIajr4%Eb4u3CIQ65IpXq6m}RVu@B93848m-x|TF3LowN*H-9oUwPe
zZLAVIpf+^IUFjO5X-w};#?JWI9XIp6(bbY<l2DdcI@SNl3OVJtXZ!xP)Mc}nx>O}a
zD<e}KQj~>dRcNy)5Ae1qE0R%!{jH~RkH_Bedt*cy#xPk$VP-0c<hqK*1GE_N<l@<j
z7ZfgKA;SvmJh0PC6H%E_C=JaOC7FC@l6F5ODOn_16;v&e==sgODEudVcmbdK>GgWU
z`KnSP%pyhoOW$#~pWeft$Kmd!=S=QxA@unX-w9pzFFn_>kDe3s>2+8ag))`k%?p5D
z(Ou|Mj4e``Q>0>9CzY6IwTW^nRVCUcO68RjS89c{8Tq5$;IZo*(@PZI=!A4kXO>SF
zmQOF`HSwSX?3IyoFn8Po7g1jY=+cy7`Fqnc_Nf9|Kw-hj=zc8=%>#_T?G3ROJZ@Y*
z@hXOc?`TZZAQ+8$L%ZOvx0u&)tP0d1lnL!`nwhsWozj_IE;aios})oPb?Aj9HDz%#
zJC&<+o+TyKB{)pyVobcHb8*ltQzlxLo9Cgy>*4pTl+0i$vRI5PtUle}Vf-EfQvb89
zOY;bU_a$R{w6lxf=^tO<H@NfxuHmF_@XmEP>syYz4tN(_a3@R+|FNY8ap-Stqq~pT
z_qtc^5i+OEXb*XefJgfgk>@m{jS#x%)6U6s8n_P!Cy6X8k*czkzzKWUj7i75F0slM
z3)C|&RIJ|$Q>UuXp}3Ywt;nIGHe#7&SD?%tYqI?0SDW8}gCBVr$IV*+4;l(>U=DBy
zeXWv}$N}4my7l!pa(J(_1nyH`8T>@L>{FZ-Atb}PNwiU-&LdeV2&3iTg9pKghE{CD
zte~zC?asMi`%N)MqZzn*N8td9<?S<K6BOUwYb6c5oGByAKy0iMs~AoyQf;!rE^uSb
zsLu?CO#4<ih5EPFg(6kSMLDA>YauwISE{NDLz3)9!2Q;;dHYt%oeH4YH%lEZZ%YN*
z&9k!9H`@JxC<K7v69^hZu4u+Y15klhSl8C}?srwezuT~L8)ObfZ8<D2g$NT6su05N
z3)PTSmhw2mw~fxcZEKqMtuk)KlUwnTjgMGX&UAZs=P6_Gc{|Tr8n^?BTZ`<R(%ON@
zZJ}ZrDwt=}#QT_$H@o46JDmoMIvjKw(9d<6v*)ohT146QU@5Xf`9RhKKDRWEM~Z6$
z+GggUGqnTYGB0GYBEZ3u;@JArp2e-iSeXZiae1ijV8&Da(@c$CPl^S^Xezq+>s-8i
za(>n>0!gtpQR}@Qz>hOTLq@xFAuC~*&Q(VhER-ld&~lD0+PZ&@(oXQTjE28;hgJYL
zg2Sy(G1tXQ*w-%lxt@)^R~-9IyWn_otDVgfhvG4}13T{fh~vP<wy)<jeSbl_*Noq^
zdyUii9vsx0>|FLcZgsn0P;Es7gn|>ZxWbvjw;0@8U@PXvNlM%(pa&Mp9{eKDMU{z0
zKExg1L%5o?7`G#>No6bA!A&j2Y-0yK#Y#e(pc$WNxE^#&uvzN|OT=b0gnX83qnShC
z7FN{mfmBgoo&D#T*{|rzWN&DRZwo%{@0I)g8BJPi!wKQ9y)9AI4>YtWuTkeGoQ-Q5
zjF5fv(q70wikp@;orS{nUB4OOLqpswHn`^ymxvsbb0rHUBkEt+Nl##G!@I`#5rY|7
zn}E7n%8qWLjn2%DY^{0FI<nh%G>F`_Opy{W?>_3$77BZzqSvlJ@!TK?CbRdv+G4j+
XTkBrl>|HP+_iK%-*PSW=z)|miV1UvL

literal 0
HcmV?d00001

diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-autoloads.el b/elpa/elisp-slime-nav-0.6/elisp-slime-nav-autoloads.el
deleted file mode 100644
index 2a4bf4dc2..000000000
--- a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-autoloads.el
+++ /dev/null
@@ -1,51 +0,0 @@
-;;; elisp-slime-nav-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads (elisp-slime-nav-describe-elisp-thing-at-point
-;;;;;;  elisp-slime-nav-find-elisp-thing-at-point turn-on-elisp-slime-nav-mode
-;;;;;;  elisp-slime-nav-mode) "elisp-slime-nav" "elisp-slime-nav.el"
-;;;;;;  (21031 23287 0 0))
-;;; Generated autoloads from elisp-slime-nav.el
-
-(autoload 'elisp-slime-nav-mode "elisp-slime-nav" "\
-Enable Slime-style navigation of elisp symbols using M-. and M-,
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-elisp-slime-nav-mode "elisp-slime-nav" "\
-Explicitly enable `elisp-slime-nav-mode'.
-
-\(fn)" nil nil)
-
-(autoload 'elisp-slime-nav-find-elisp-thing-at-point "elisp-slime-nav" "\
-Jump to the elisp thing at point, be it a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find.
-
-\(fn SYM-NAME)" t nil)
-
-(autoload 'elisp-slime-nav-describe-elisp-thing-at-point "elisp-slime-nav" "\
-Display the full documentation of the elisp thing at point.
-The named subject may be a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find.
-
-\(fn SYM-NAME)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("elisp-slime-nav-pkg.el") (21031 23287
-;;;;;;  452073 0))
-
-;;;***
-
-(provide 'elisp-slime-nav-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; elisp-slime-nav-autoloads.el ends here
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.el b/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.el
deleted file mode 100644
index 2d60624b0..000000000
--- a/elpa/elisp-slime-nav-0.6/elisp-slime-nav-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "elisp-slime-nav" "0.6" "Make M-. and M-, work in elisp like they do in slime" (quote ((cl-lib "0.2"))))
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav.el b/elpa/elisp-slime-nav-0.6/elisp-slime-nav.el
deleted file mode 100644
index 3629a15de..000000000
--- a/elpa/elisp-slime-nav-0.6/elisp-slime-nav.el
+++ /dev/null
@@ -1,109 +0,0 @@
-
-;;; elisp-slime-nav.el --- Make M-. and M-, work in elisp like they do in slime
-;;
-;; Author: Steve Purcell <steve@sanityinc.com>
-;; Keywords: navigation slime elisp emacs-lisp
-;; URL: https://github.com/purcell/elisp-slime-nav
-;; Version: 0.6
-;; Package-Requires: ((cl-lib "0.2"))
-;;
-;;; Commentary:
-;;
-;; This package provides Slime's convenient "M-." and "M-," navigation
-;; in `emacs-lisp-mode', together with an elisp equivalent of
-;; `slime-describe-symbol', bound by default to `C-c C-d d`.
-;;
-;; When the main functions are given a prefix argument, they will
-;; prompt for the symbol upon which to operate.
-;;
-;; Usage:
-;;
-;; Enable the package in elisp and ielm modes as follows:
-;;
-;;   (require 'elisp-slime-nav) ;; optional if installed via package.el
-;;   (dolist (hook '(emacs-lisp-mode-hook ielm-mode-hook))
-;;     (add-hook hook 'turn-on-elisp-slime-nav-mode))
-;;
-;; Known issues:
-;;
-;;   When navigating into Emacs' C source, "M-," will not be bound to
-;;   the same command, but "M-*" will typically do the trick.
-;;
-;;; Code:
-
-(eval-when-compile (require 'cl-lib))
-(require 'etags)
-(require 'help-mode)
-
-(defvar elisp-slime-nav-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "M-.")         'elisp-slime-nav-find-elisp-thing-at-point)
-    (define-key map (kbd "M-,")         'pop-tag-mark)
-    (define-key map (kbd "C-c C-d d")   'elisp-slime-nav-describe-elisp-thing-at-point)
-    (define-key map (kbd "C-c C-d C-d") 'elisp-slime-nav-describe-elisp-thing-at-point)
-    map))
-
-;;;###autoload
-(define-minor-mode elisp-slime-nav-mode
-  "Enable Slime-style navigation of elisp symbols using M-. and M-,"
-  nil " SliNav" elisp-slime-nav-mode-map)
-
-;;;###autoload
-(defun turn-on-elisp-slime-nav-mode ()
-  "Explicitly enable `elisp-slime-nav-mode'."
-  (elisp-slime-nav-mode 1))
-
-(defun elisp-slime-nav--all-navigable-symbol-names ()
-  "Return a list of strings for the symbols to which navigation is possible."
-  (cl-loop for x being the symbols
-           if (or (fboundp x) (boundp x) (symbol-plist x) (facep x))
-           collect (symbol-name x)))
-
-(defun elisp-slime-nav--read-symbol-at-point ()
-  "Return the symbol at point as a string.
-If `current-prefix-arg' is not nil, the user is prompted for the symbol."
-  (let* ((sym-at-point (symbol-at-point))
-           (at-point (and sym-at-point (symbol-name sym-at-point))))
-      (if current-prefix-arg
-          (completing-read "Symbol: "
-                           (elisp-slime-nav--all-navigable-symbol-names)
-                           nil t at-point)
-        at-point)))
-
-;;;###autoload
-(defun elisp-slime-nav-find-elisp-thing-at-point (sym-name)
-  "Jump to the elisp thing at point, be it a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find."
-  (interactive (list (elisp-slime-nav--read-symbol-at-point)))
-  (when sym-name
-    (let ((sym (intern sym-name)))
-      (message "Searching for %s..." (pp-to-string sym))
-      (ring-insert find-tag-marker-ring (point-marker))
-      (cond
-       ((fboundp sym) (find-function sym))
-       ((boundp sym) (find-variable sym))
-       ((or (featurep sym) (locate-library sym-name))
-        (find-library sym-name))
-       ((facep sym)
-        (find-face-definition sym))
-       (:else
-        (progn
-          (pop-tag-mark)
-          (error "Don't know how to find '%s'" sym)))))))
-
-;;;###autoload
-(defun elisp-slime-nav-describe-elisp-thing-at-point (sym-name)
-  "Display the full documentation of the elisp thing at point.
-The named subject may be a function, variable, library or face.
-With a prefix arg, prompt for the symbol to jump to.
-Argument SYM-NAME thing to find."
-  (interactive (list (elisp-slime-nav--read-symbol-at-point)))
-  (help-xref-interned (intern sym-name)))
-
-
-(provide 'elisp-slime-nav)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-;;; elisp-slime-nav.el ends here
diff --git a/elpa/elisp-slime-nav-0.6/elisp-slime-nav.elc b/elpa/elisp-slime-nav-0.6/elisp-slime-nav.elc
deleted file mode 100644
index 9ce448514ab87f03f4075850bd882fac57ba3d19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3962
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

diff --git a/elpa/epl-0.4/epl-pkg.el b/elpa/epl-0.4/epl-pkg.el
deleted file mode 100644
index cd4214488..000000000
--- a/elpa/epl-0.4/epl-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "epl" "0.4" "Emacs Package Library -*- lexical-binding: t; -*-" (quote ((cl-lib "0.3"))))
diff --git a/elpa/epl-0.4/epl-autoloads.el b/elpa/epl-20131101.405/epl-autoloads.el
similarity index 78%
rename from elpa/epl-0.4/epl-autoloads.el
rename to elpa/epl-20131101.405/epl-autoloads.el
index 97d23c51b..308a221c2 100644
--- a/elpa/epl-0.4/epl-autoloads.el
+++ b/elpa/epl-20131101.405/epl-autoloads.el
@@ -3,7 +3,7 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("epl-pkg.el" "epl.el") (21124 57414 901749))
+;;;### (autoloads nil nil ("epl-pkg.el" "epl.el") (21184 20185 12190))
 
 ;;;***
 
diff --git a/elpa/epl-20131101.405/epl-pkg.el b/elpa/epl-20131101.405/epl-pkg.el
new file mode 100644
index 000000000..f3b8d5ecd
--- /dev/null
+++ b/elpa/epl-20131101.405/epl-pkg.el
@@ -0,0 +1 @@
+(define-package "epl" "20131101.405" "Emacs Package Library" (quote ((cl-lib "0.3"))))
diff --git a/elpa/epl-0.4/epl-pkg.elc b/elpa/epl-20131101.405/epl-pkg.elc
similarity index 64%
rename from elpa/epl-0.4/epl-pkg.elc
rename to elpa/epl-20131101.405/epl-pkg.elc
index 3ac6822dbf2d4cbe5be4a3c09f6146c95e1e523a..677d17581ddba08abfb7e85caace8c467403bdb0 100644
GIT binary patch
delta 103
zcmaFNa+76(woq_so`OqivVxJNf}x?6v9XoWL|aoHBLhQYLqh{YJre`djirkiEs+J3
w6qH<Z6O)S-0uqz66Vp=_d@_@Y5{oL86x1~|l5=!(GLsaP4D^hZG&ME30I7r<G5`Po

delta 94
zcmcb~@|b0Uwoph$se)gAnS!B-f`O%#vALD$L|ap413i<Cb&D85^kf|-2}1>4EnS72
t)QZgH#2nqE%)FG$ymTvt5^IpSl7hO1MskjBPG*vVl7XJFlBT967Xa;N836zQ

diff --git a/elpa/epl-0.4/epl.el b/elpa/epl-20131101.405/epl.el
similarity index 99%
rename from elpa/epl-0.4/epl.el
rename to elpa/epl-20131101.405/epl.el
index 121dbe5a3..5ccca2dfe 100644
--- a/elpa/epl-0.4/epl.el
+++ b/elpa/epl-20131101.405/epl.el
@@ -5,7 +5,8 @@
 ;; Author: Sebastian Wiesner <lunaryorn@gmail.com>
 ;; Maintainer: Johan Andersson <johan.rejeep@gmail.com>
 ;;     Sebastian Wiesner <lunaryorn@gmail.com>
-;; Version: 0.4
+;; Version: 20131101.405
+;; X-Original-Version: 0.5-cvs
 ;; Package-Requires: ((cl-lib "0.3"))
 ;; Keywords: convenience
 ;; URL: http://github.com/cask/epl
diff --git a/elpa/epl-20131101.405/epl.elc b/elpa/epl-20131101.405/epl.elc
new file mode 100644
index 0000000000000000000000000000000000000000..9bc99ce2ba99622742347120d8a1782dbbe07115
GIT binary patch
literal 31178
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

literal 0
HcmV?d00001

diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el b/elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
similarity index 90%
rename from elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el
rename to elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
index e02fd1b4f..4a517d883 100644
--- a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el
+++ b/elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads (find-file-in-project) "find-file-in-project" "find-file-in-project.el"
-;;;;;;  (21031 23279 0 0))
+;;;;;;  (20166 22148))
 ;;; Generated autoloads from find-file-in-project.el
 
 (autoload 'find-file-in-project "find-file-in-project" "\
@@ -32,8 +32,8 @@ setting the variable `ffip-project-root'.
 
 ;;;***
 
-;;;### (autoloads nil nil ("find-file-in-project-pkg.el") (21031
-;;;;;;  23279 264879 0))
+;;;### (autoloads nil nil ("find-file-in-project-pkg.el") (20166
+;;;;;;  22148 967146))
 
 ;;;***
 
diff --git a/elpa/find-file-in-project-3.0/find-file-in-project-pkg.el b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.el
new file mode 100644
index 000000000..87214941a
--- /dev/null
+++ b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.el
@@ -0,0 +1 @@
+(define-package "find-file-in-project" "3.0" "Find files in a project quickly." (quote nil))
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-pkg.elc b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.elc
similarity index 70%
rename from elpa/find-file-in-project-3.2/find-file-in-project-pkg.elc
rename to elpa/find-file-in-project-3.0/find-file-in-project-pkg.elc
index bb63f4d4e80f9e69803dcd086b022cbf5f56c516..712bbcb5c8655528054780736fe0b1873a6ef14f 100644
GIT binary patch
delta 75
zcmaFK@{47Hq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm5Hf>k%6J%
fL{le5gNgBC6Z_;@4D>7wH?Et&$Y?Oxo=FP;tL+w~

delta 55
zcmeyx@{(nOq>Ms-o<ewPib8N|fr5gGf}xR>frXW!se+M#q47j#Cq|=*ZKjOI8~0CO
LWHg!_z@!BL!R!xV

diff --git a/elpa/find-file-in-project-3.2/find-file-in-project.el b/elpa/find-file-in-project-3.0/find-file-in-project.el
similarity index 78%
rename from elpa/find-file-in-project-3.2/find-file-in-project.el
rename to elpa/find-file-in-project-3.0/find-file-in-project.el
index fcbd050c7..795e547e8 100644
--- a/elpa/find-file-in-project-3.2/find-file-in-project.el
+++ b/elpa/find-file-in-project-3.0/find-file-in-project.el
@@ -1,12 +1,13 @@
+
 ;;; find-file-in-project.el --- Find files in a project quickly.
 
-;; Copyright (C) 2006-2009, 2011-2012
+;; Copyright (C) 2006-2009, 2011
 ;;   Phil Hagelberg, Doug Alcorn, and Will Farrington
 
 ;; Author: Phil Hagelberg, Doug Alcorn, and Will Farrington
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/FindFileInProject
 ;; Git: git://github.com/technomancy/find-file-in-project.git
-;; Version: 3.2
+;; Version: 3.0
 ;; Created: 2008-03-18
 ;; Keywords: project, convenience
 ;; EmacsWiki: FindFileInProject
@@ -63,7 +64,7 @@
 (defvar ffip-project-file ".git"
   "The file that should be used to define a project root.
 
-May be set using .dir-locals.el. Checks each entry if set to a list.")
+May be set using .dir-locals.el.")
 
 (defvar ffip-patterns
   '("*.html" "*.org" "*.txt" "*.md" "*.el" "*.clj" "*.py" "*.rb" "*.js" "*.pl"
@@ -86,26 +87,20 @@ This overrides variable `ffip-project-root' when set.")
 (defvar ffip-limit 512
   "Limit results to this many files.")
 
-(defvar ffip-full-paths nil
-  "If non-nil, show fully project-relative paths.")
-
 (defun ffip-project-root ()
   "Return the root of the project."
   (let ((project-root (or ffip-project-root
                           (if (functionp ffip-project-root-function)
                               (funcall ffip-project-root-function)
-                            (if (listp ffip-project-file)
-                                (some (apply-partially 'locate-dominating-file
-                                                       default-directory)
-                                      ffip-project-file)
-                              (locate-dominating-file default-directory
-                                                      ffip-project-file))))))
+                            (locate-dominating-file default-directory
+                                                    ffip-project-file)))))
     (or project-root
         (progn (message "No project was defined for the current file.")
                nil))))
 
 (defun ffip-uniqueify (file-cons)
   "Set the car of FILE-CONS to include the directory name plus the file name."
+  ;; TODO: see if we can use uniquify.el
   (setcar file-cons
           (concat (cadr (reverse (split-string (cdr file-cons) "/"))) "/"
                   (car file-cons))))
@@ -120,24 +115,23 @@ This overrides variable `ffip-project-root' when set.")
 
 Files with duplicate filenames are suffixed with the name of the
 directory they are found in so that they are unique."
-  (let ((file-alist nil)
-        (root (expand-file-name (or ffip-project-root (ffip-project-root)
-                                    (error "No project root found")))))
+  (let ((file-alist nil))
     (mapcar (lambda (file)
-              (if ffip-full-paths
-                  (cons (substring (expand-file-name file) (length root))
-                        (expand-file-name file))
-                (let ((file-cons (cons (file-name-nondirectory file)
-                                       (expand-file-name file))))
-                  (when (assoc (car file-cons) file-alist)
-                    (ffip-uniqueify (assoc (car file-cons) file-alist))
-                    (ffip-uniqueify file-cons))
-                  (add-to-list 'file-alist file-cons)
-                  file-cons)))
+              (let ((file-cons (cons (file-name-nondirectory file)
+                                     (expand-file-name file))))
+                (when (assoc (car file-cons) file-alist)
+                  (ffip-uniqueify (assoc (car file-cons) file-alist))
+                  (ffip-uniqueify file-cons))
+                (add-to-list 'file-alist file-cons)
+                file-cons))
             (split-string (shell-command-to-string
                            (format "find %s -type f \\( %s \\) %s | head -n %s"
-                                   root (ffip-join-patterns)
-                                   ffip-find-options ffip-limit))))))
+                                   (or ffip-project-root
+                                       (ffip-project-root)
+                                       (error "No project root found"))
+                                   (ffip-join-patterns)
+                                   ffip-find-options
+                                   ffip-limit))))))
 
 ;;;###autoload
 (defun find-file-in-project ()
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project.elc b/elpa/find-file-in-project-3.0/find-file-in-project.elc
similarity index 60%
rename from elpa/find-file-in-project-3.2/find-file-in-project.elc
rename to elpa/find-file-in-project-3.0/find-file-in-project.elc
index eec8f7fd2fecaa8cc1f5e44ef71b197869282dab..16b1b8bb870b0ccd52f7ee4dbc7481bc6fe318cf 100644
GIT binary patch
delta 571
zcmYjOO>Yx15N(}6vLqsh7L=kbn%#i<A#H2#_x4m32_%qu04}I|S#@{GR;itu6v2rT
z9FUL*^DE#2XvGPMGvXg`pg({c{{TBm1qXY^Z^nLap1(kS{q4$Tp7E*}?M|e4oC^tp
z!);l?zIX~O1{&=I@s1yWOBtI6dxUP|NpE@j#%$89gnj-nTqFs_E94QrBby|k_>KG^
zVS=w4UrC(co#qjtG1kqRumpz}?vcpDrHl7(EiI%T4Gb%Fsn=UDKt*?kg(>f(cIq-_
zDlA;peNpN$s#+OU3ENP3WWxcT^_)Rol-cQM;^dVq4ktoBhqA23&RB{gb#}^XRN!i>
zk9S)Sx<0HAZon2W-%s#;>t`cMVtm;?Yfu(rY5acZ_q8as!gEs1r<QAIEz4R9(^6+C
z^HjyR)E0meebcg1`&^smb+S?QWP-nXef)mO93E%m!%V{9U|knCz*diWZFQacZEJ5u
z#lYB2xt^VRrl!&==Gc6A8fwS14cZf`WND|U@joqo>Rer$@$>AsaJb<AyeXcIGoH^}
vadZ{`bY7T+l<ME@eF1aVKngK|Qk?P}c^4Y4@7L4rHPUpGFsVOYezo`)*8!jC

delta 824
zcmZ8fF>ljA6mFb0G%=J)Oet0Sl2EBZb-436c2hA_?SO!x5>!H{mZ+7S6&Lqx*=`_H
zx2{l~7!hJcVn7iK{ReD}UHAd~2PEFPb&)!}^Yi!K-F@HpZnE?p-q#l)67Yf#;5m;0
zETHBFS>K>tFbQR++gl~`^n{k!x3giXOif#^XfK<vJ>>n@DR8ep1TL~<41o_R&mfDy
zgD^-X%+%!v?T*GQ`9=GwIaH3yXIhU+HhrK`B0o(}G?U8RnWy_b)^68Yo7Or!_CZ9#
z5J9*G=`eZ&{!ti?Ax@$L-p`DLhh7$pIK*ByOgqc9)dBZMUIM-!#D?lM@(SPqu-du@
z9iW!olb>gv?Yqq>myvF@;hKcqo~i<VO$CaF3RzNB8^duKCA!;m1;%Adj^zK8E+S~J
zVK=21CLTu#CQNoJ-JP6A!PXB#4oJ{D3NvF6B&Z-lql$78MH%W7{Va$?3~6-8!HeT?
zj2e<G@KCt?SlPYVEtGU^CjVB>%RPt4^Bcd*v`6HR**{OZiutUfHK#-nrR*ZjwKN*_
zg@UajieX{kE^1eCaX@$dl}5vD-j@$5^|=dP$ldVN9ILg~JbxQ|VqhpihVTx#+|ieh
z552gL*0=Un72bxXqQK@0m&GGRYX=wfd<#oRhB#>d1#lN{Ci<r9=Pt7=LoczyR;m}7
zi5o377xY_iyXGt6G-2=h;B(LaE9gfeg`Bq1lEHN$`9ryqW#HSpnv?uhJC;IUDqGZ^
Rywex7X=a+v<m;`I(mw{I?+^e0

diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el~ b/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el~
deleted file mode 100644
index a3cd25c61..000000000
--- a/elpa/find-file-in-project-3.2/find-file-in-project-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; find-file-in-project-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'find-file-in-project-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; find-file-in-project-autoloads.el ends here
diff --git a/elpa/find-file-in-project-3.2/find-file-in-project-pkg.el b/elpa/find-file-in-project-3.2/find-file-in-project-pkg.el
deleted file mode 100644
index 35a311fec..000000000
--- a/elpa/find-file-in-project-3.2/find-file-in-project-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "find-file-in-project" "3.2" "Find files in a project quickly." (quote nil))
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el b/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el
new file mode 100644
index 000000000..b30b27926
--- /dev/null
+++ b/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el
@@ -0,0 +1,18 @@
+;;; highlight-indentation-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil nil ("highlight-indentation-pkg.el" "highlight-indentation.el")
+;;;;;;  (20794 33002 979251))
+
+;;;***
+
+(provide 'highlight-indentation-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; highlight-indentation-autoloads.el ends here
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el b/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el
new file mode 100644
index 000000000..dec836ad9
--- /dev/null
+++ b/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el
@@ -0,0 +1 @@
+(define-package "highlight-indentation" "0.5.0" "Function for highlighting indentation" (quote nil))
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.elc b/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..1491b26712d8cab6b8d10675bc59596ed5b02751
GIT binary patch
literal 643
zcmbtR(MrQG6y0-wz}G{c6xMX@6t?w6nHviFq<+9%lD1)KQj$!WUvJjQK-8xNLLld!
zbMC#TT0Jc<Mx#+uRTY-D>y?%Qn>_>>CH3w71M4<a!Wyid!ZSHwhGM=br;DOQIVq+C
zwRW~c9m&YwymUT4@^dCT;+~0I>YnmeHLZ>}WXcF>0tIDFHeokx@(<Q;8z%K&p$t|B
zF}z3p$U}L}3RVo*hYBr7YuG-hPJIr-o+ShL+A4qSZRe$j*c<8;hp^lSr%dC=5p_O*
zgowkRe2O_M=f5<BjT*)Va2p4R#k){vv-o4OyO-tTBX~=Wc!*7o2YWIC-hz|CMnYTq
zVe&nUha{(!bO>!MET>1`n95n_(7?GTNs>z;Yh`5C6W>xJk^UKEigbuFzU!Ughip+>
Shf{Ifb=>YL_!LIztK<uoN5mii

literal 0
HcmV?d00001

diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation.el b/elpa/highlight-indentation-0.5.0/highlight-indentation.el
new file mode 100644
index 000000000..bc3d61016
--- /dev/null
+++ b/elpa/highlight-indentation-0.5.0/highlight-indentation.el
@@ -0,0 +1,71 @@
+;;; highlight-indentation.el --- Function for highlighting indentation
+;; Author: Anton Johansson <anton.johansson@gmail.com> - http://antonj.se
+;; Created: Dec 15 23:42:04 2010
+;; Version: 0.5.0
+;; URL: https://github.com/antonj/Highlight-Indentation-for-Emacs
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+;;
+;;; Commentary:
+;; Customize `highlight-indent-face' to suit your theme.
+
+;;; Code:
+
+(defface highlight-indent-face
+  ;; Fringe has non intrusive color in most color-themes
+  '((t :inherit fringe))
+  "Basic face for highlighting indentation guides."
+  :group 'basic-faces)
+
+;; Used buffer-local to toggle on-off
+(setq-default highlight-indent-active nil)
+;; Needed to to remove font-lock-keywords
+(setq-default highlight-indent-offset 4)
+
+(defun highlight-indentation (&optional indent-width)
+  "Toggle highlight indentation.
+Optional argument INDENT-WIDTH specifies which indentation
+level (spaces only) should be highlighted, if omitted
+indent-width will be guessed from current major-mode"
+  (interactive "P")
+  (when (not highlight-indent-active)
+    (set (make-local-variable 'highlight-indent-offset)
+         (if indent-width
+             indent-width
+           ;; Set indentation offset according to major mode
+           (cond ((eq major-mode 'python-mode)
+                  (if (boundp 'python-indent)
+                      python-indent
+                    py-indent-offset))
+                 ((eq major-mode 'ruby-mode)
+                  ruby-indent-level)
+                 ((eq major-mode 'nxml-mode)
+                  nxml-child-indent)
+                 ((local-variable-p 'c-basic-offset)
+                  c-basic-offset)
+                 (t
+                  (default-value 'highlight-indent-offset))))))
+  (let ((re (format "\\( \\) \\{%s\\}" (- highlight-indent-offset 1))))
+    (if highlight-indent-active
+        (progn ;; Toggle off
+          (set (make-local-variable 'highlight-indent-active) nil)
+          (font-lock-remove-keywords nil `((,re (1 'highlight-indent-face))))
+          (message "highlight-indentation OFF"))
+      (progn ;; Toggle on
+        (set (make-local-variable 'highlight-indent-active) t)
+        (font-lock-add-keywords nil `((,re (1 'highlight-indent-face))))
+        (message (format "highlight-indentation with indent-width %s"
+                         highlight-indent-offset))))
+    (font-lock-fontify-buffer)))
+
+(provide 'highlight-indentation)
+
+;;; highlight-indentation.el ends here
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation.elc b/elpa/highlight-indentation-0.5.0/highlight-indentation.elc
new file mode 100644
index 0000000000000000000000000000000000000000..1aaa80bd214c07f7b7a6e9ee2b60f3911d5e9506
GIT binary patch
literal 1948
zcmbtV>u=*k5cju&5z&2u51e4my@Dgvt{>?mt&ooEgNp=rNLR#%b3bhCb-Z-#wRYDD
z0r9^xyLr@YKtei8<0SL=&Fs!^CKuN~U4H2}j(c%&0hgj~8K(tImr#&~QU2=cO;}G!
z0-}K%$>3)q0nQ*EpC{>goIn!AsSPcqsG-DQIQmslsg73hM<K0AuEOGo@|GM`Y*uj;
z9k8aLjV79jCWyl0F#2~}NV$b)4O|-_m?JjEKr#yBFt)Y@(-jcTLA09H>`x1-Lf0B^
zE2dU;b&4t|mJO*{4u!~-maLhnL$pezffNNEe48g8hsk&cqY#ME2o1Tw;?cR&WpIX?
zCivm~<zxbRMI^~J7I|pXlcoSAASVq>DR4m^C0QRv0VR?%DnVE1n53(`*pZKVOaUMJ
zxUTC@mzoB-C@6SY8bv5EN`jK2j8KjbvLrT!6O_{|#qZvOCPw!-F`DSqgAaM9w5WrE
z=A1|xlq9F{lou<l?`t?`O+_WsP?~Ph;SjvnL}3SQTq)#3EZVVuTUx=aV+B>A2j?>>
zx)!D;&LS&NRAU7t>9~FXSd%iq2C_MYhVfmSC`*im(H)!&-Thbb_!Mr%Y=*qwo}phv
z=)OZziiU6?a@N(zd6>Mtx_)~b{5H9|eFLhcIV%~`YEiMg>c_gA&M609wRlAeCy+0P
zpeoUE9ME1qS{wo^LDWoZTDYq#2o|isu~;yi3v`}!R4L@Q9n-v%(iBpY--Qfn?CdwL
zZ*GG#qTsvjLHa`q`yc#o&4Agn^mAZGKEc+GCeDTcFHG-0MP2&LF(1i~PSzM!d~b9w
z(a%sKO3^P$!TD_MQubUE>l!+r_jIY%jh(?)Yh@ZE`Ql>>bL9*+zG-Y}_~MH_v?3dm
zXt4J_^S*v=%1rM!Wk$A4G{?{Ig>+8h!E=14uP-<3O%OjZ_(*6xhLN4<6BBK+*yuER
z9BuNa@nA3W*4feohKOSZ;pshZc-Oz&UXP$%>IxUl%8b7@bX`+YcGInD#hjYl(}0Vd
z@L*0PBhx-hpG2?04H;l6x~6Es0$N4$N6jryaD(;Hf)?^%HCF2))-#3qct-)pvnCqX
zM&?774N?9&P+9i3XJ@O#9cs$E4<xO{oCf!Fxe&5Y;QR3|4ejLO{MX22GQ(x`^#1JL
zhj%wO9^kszg5zTUpUD4#X#ZaxHRV8gy#yu|E0@8vD@)wr_OkMd@nX{|N$+3;{{Bk{
a;VeDIf%(O|8@hfg#T-}E?osVYhVDNQL1Lu<

literal 0
HcmV?d00001

diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
index 968938ff8..15c89e8e0 100644
--- a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
+++ b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads (idle-highlight-mode) "idle-highlight-mode" "idle-highlight-mode.el"
-;;;;;;  (21031 23280 0 0))
+;;;;;;  (20166 22149))
 ;;; Generated autoloads from idle-highlight-mode.el
 
 (autoload 'idle-highlight-mode "idle-highlight-mode" "\
@@ -14,8 +14,8 @@ Idle-Highlight Minor Mode
 
 ;;;***
 
-;;;### (autoloads nil nil ("idle-highlight-mode-pkg.el") (21031 23280
-;;;;;;  195148 0))
+;;;### (autoloads nil nil ("idle-highlight-mode-pkg.el") (20166 22149
+;;;;;;  568029))
 
 ;;;***
 
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el~ b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el~
deleted file mode 100644
index 038380155..000000000
--- a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; idle-highlight-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'idle-highlight-mode-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; idle-highlight-mode-autoloads.el ends here
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.elc b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.elc
index 047d410b205039100038c89a5e2e63e81c09eb5a..52cba8f6794a1d22c3096df9140f3c3cc6ee4b6c 100644
GIT binary patch
delta 61
zcmaFE@|R_Tq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm5Hf>k%6J%
RMAHfu13gQ_jqCO?0sx4&6KVhe

delta 44
zcmey%@`h!Cq>Ms-o<ewPib8N|fr5gGf}xR>frXW!nSzmlq47lL3P$6N`}Z*d04m)L
A3jhEB

diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc
index 9c61efacce06149121b9f8a5120e52e810b5b76b..7ae0cd2385250f26ff3ce2fa1abed3df39b32ff4 100644
GIT binary patch
delta 99
zcmaDR_FZg(q*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm5Hf>k%6J%
zMAH%$13gQ_jjNcMnaqtQuV)TtGPBss!SaWZ$<%x^8(S2Rw%DA+ZqLkQW;%H>*I@t<
CRUEkh

delta 82
zcmew^_DpPoq>Ms-o<ewPib8N|fr5gGf}xR>frXW!nSzmlq47lL5=P^VyP27pOid>r
lU=C+8HQX%8@`sVh#9*^HTNIEs++56V&&*_EF?kEuVF1G)7MTD5

diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el
new file mode 100644
index 000000000..acc3c2798
--- /dev/null
+++ b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el
@@ -0,0 +1,70 @@
+;;; ido-ubiquitous-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (ido-ubiquitous-function-exceptions ido-ubiquitous-command-exceptions
+;;;;;;  ido-ubiquitous ido-ubiquitous) "ido-ubiquitous" "ido-ubiquitous.el"
+;;;;;;  (20166 22146))
+;;; Generated autoloads from ido-ubiquitous.el
+
+(let ((loads (get 'ido-ubiquitous 'custom-loads))) (if (member '"ido-ubiquitous" loads) nil (put 'ido-ubiquitous 'custom-loads (cons '"ido-ubiquitous" loads))))
+
+(defvar ido-ubiquitous nil "\
+Non-nil if Ido-Ubiquitous mode is enabled.
+See the command `ido-ubiquitous' for a description of this minor mode.")
+
+(custom-autoload 'ido-ubiquitous "ido-ubiquitous" nil)
+
+(autoload 'ido-ubiquitous "ido-ubiquitous" "\
+Use `ido-completing-read' instead of `completing-read' almost everywhere.
+
+  This mode has no effect unles `ido-mode' is also enabled.
+
+  If this mode causes problems for a function, you can force the
+  function to use the original completing read by using the macro
+  `ido-ubiquitous-disable-in'. For example, if a
+  function `foo' cannot work with ido-style completion, evaluate
+  the following (for example by putting it in your .emacs file):
+
+    (ido-ubiquitous-disable-in foo)
+
+\(fn &optional ARG)" t nil)
+
+(defvar ido-ubiquitous-command-exceptions 'nil "\
+List of commands that should not be affected by `ido-ubiquitous'.
+
+Even when `ido-ubiquitous' mode is enabled, these commands will
+continue to use `completing-read' instead of
+`ido-completing-read'.
+
+Only *interactive* commands should go here. To disable
+ido-ubiquitous in non-interactive functions, customize
+`ido-ubiquitous-function-exceptions'.")
+
+(custom-autoload 'ido-ubiquitous-command-exceptions "ido-ubiquitous" t)
+
+(defvar ido-ubiquitous-function-exceptions '(grep-read-files) "\
+List of functions in which to disable ido-ubiquitous.
+
+Certain functions, such as `read-file-name', always have
+ido-ubiquitous disabled, and cannot be added here. (They are
+effectively permanently part of this list already.)")
+
+(custom-autoload 'ido-ubiquitous-function-exceptions "ido-ubiquitous" nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("ido-ubiquitous-pkg.el") (20166 22146
+;;;;;;  727855))
+
+;;;***
+
+(provide 'ido-ubiquitous-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; ido-ubiquitous-autoloads.el ends here
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el
new file mode 100644
index 000000000..6575d4ca0
--- /dev/null
+++ b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el
@@ -0,0 +1 @@
+(define-package "ido-ubiquitous" "0.7" "Use ido (nearly) everywhere." (quote nil))
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..c68d5ddddf223ed236450805badde2cad664169b
GIT binary patch
literal 612
zcmbtR$xg#C5bZfXz;%>UD>cqSQI}jmRgo$oF2D!4v6GDI*ui#Mg|BCtAf&>vbMV14
zZ_~?nFWbAxWD?|g4qMZ-sHA{H4}xoy>d{+M31h)%c(w?y<^<^qlI7-MwOM44C22Z9
zOKTb^2@LUvlh(x}K4!Avg<~R?s^u{X6Lkmt?9iLeMG0H}{c4XDlWL$u4Z8~%PQ-^~
zAX~76ty4BCp3&F9l>*axZ19VFx^XNRu<tdx(N5>21JP^VU;)Au&Rf)#o72`h4_pY!
z`zw{MS+@SiAq;V7<DoFxb2{#P8Lj9?M^A6t{T_;%TV8nbIUnS?7T^pNT*E<vGW<&9
zCyxWktwL$R*L0ZOkGfREO>;4D>jXhC6|zJvqm~y(UP%bAy9*(t_UNUyfmSfpmo)th
QB*p8`wX~9jpi#|&Z$-wqY5)KL

literal 0
HcmV?d00001

diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el
new file mode 100644
index 000000000..679cc447d
--- /dev/null
+++ b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el
@@ -0,0 +1,199 @@
+
+;;; ido-ubiquitous.el --- Use ido (nearly) everywhere.
+
+;; Author: Ryan C. Thompson
+;; URL: https://github.com/DarwinAwardWinner/ido-ubiquitous
+;; Version: 0.7
+;; Created: 2011-09-01
+;; Keywords: convenience
+;; EmacsWiki: InteractivelyDoThings
+
+;; This file is NOT part of GNU Emacs.
+
+;;; Commentary:
+
+;; You may have seen the `ido-everywhere' variable in ido.el and got
+;; excited that you could use ido completion for everything. Then you
+;; were probably disappointed when you realized that it only applied
+;; to *file names* and nothing else. Well, ido-ubiquitous is here to
+;; fulfill the original promise and let you use ido completion for
+;; (almost) any command that uses `completing-read' to offer you a
+;; choice of several alternatives.
+
+;; This even works in M-x, but for that, you might prefer the "smex"
+;; package instead.
+
+;;; License:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+(require 'ido)
+
+;;;###autoload
+(defgroup ido-ubiquitous nil
+  "Use ido for (almost) all completion."
+  :group 'ido)
+
+;;;###autoload
+(define-minor-mode ido-ubiquitous
+  "Use `ido-completing-read' instead of `completing-read' almost everywhere.
+
+  This mode has no effect unles `ido-mode' is also enabled.
+
+  If this mode causes problems for a function, you can force the
+  function to use the original completing read by using the macro
+  `ido-ubiquitous-disable-in'. For example, if a
+  function `foo' cannot work with ido-style completion, evaluate
+  the following (for example by putting it in your .emacs file):
+
+    (ido-ubiquitous-disable-in foo)"
+
+  nil
+  :global t
+  :group 'ido-ubiquitous)
+
+;;;###autoload
+(defcustom ido-ubiquitous-command-exceptions '()
+  "List of commands that should not be affected by `ido-ubiquitous'.
+
+Even when `ido-ubiquitous' mode is enabled, these commands will
+continue to use `completing-read' instead of
+`ido-completing-read'.
+
+Only *interactive* commands should go here. To disable
+ido-ubiquitous in non-interactive functions, customize
+`ido-ubiquitous-function-exceptions'."
+  :type '(repeat (symbol :tag "Command"))
+  :group 'ido-ubiquitous)
+
+(define-obsolete-variable-alias 'ido-ubiquitous-exceptions
+  'ido-ubiquitous-command-exceptions "0.4")
+
+(defadvice completing-read (around ido-ubiquitous activate)
+  (if (or (not ido-mode)
+          (not ido-ubiquitous)
+          (memq this-command ido-ubiquitous-command-exceptions)
+          ;; Avoid infinite recursion from ido calling completing-read
+          (boundp 'ido-cur-item))
+      ad-do-it
+    (let ((allcomp (all-completions "" collection predicate)))
+      ;; Only use ido completion if there are actually any completions
+      ;; to offer.
+      (if allcomp
+          (setq ad-return-value
+                (ido-completing-read prompt allcomp
+                                     nil require-match initial-input hist def))
+        ad-do-it))))
+
+(defmacro ido-ubiquitous-disable-in (func)
+  "Disable ido-ubiquitous in FUNC."
+  (let ((docstring
+         (format "Disable ido-ubiquitous in %s" func)))
+    `(defadvice ,func (around disable-ido-ubiquitous activate)
+       ,docstring
+       (let (ido-ubiquitous) ad-do-it))))
+
+(define-obsolete-function-alias
+  'disable-ido-ubiquitous-in
+  'ido-ubiquitous-disable-in
+  "0.4")
+
+(defmacro ido-ubiquitous-enable-in (func)
+  "Re-enable ido-ubiquitous in FUNC.
+
+  This reverses the effect of `ido-ubiquitous-disable-in'."
+  ;; In my experience, simply using `ad-remove-advice' or
+  ;; `ad-disable-advice' doesn't work correctly (in Emacs 23).
+  ;; Instead, I've found that one must redefine the advice under the
+  ;; same name ("disable-ido-ubiquitous") to simply call the original
+  ;; function with no modifications. This has the same effect
+  ;; (disables the advice), but is presumably less efficient.
+  (let ((docstring
+         (format "DO NOT disable ido-ubiquitous in %s" func)))
+    `(defadvice ,func (around disable-ido-ubiquitous activate)
+       ,docstring
+       ad-do-it)))
+
+(define-obsolete-function-alias
+  'enable-ido-ubiquitous-in
+  'ido-ubiquitous-enable-in
+  "0.4")
+
+;; Always disable ido-ubiquitous in `find-file' and similar functions,
+;; because they are not supposed to use ido.
+(defvar ido-ubiquitous-permanent-function-exceptions
+  '(read-file-name)
+  "Functions in which ido-ubiquitous should always be disabled.
+
+If you want to disable ido in a specific function or command, do
+not modify this variable. Instead, try `M-x customize-group
+ido-ubiquitous..")
+
+(dolist (func ido-ubiquitous-permanent-function-exceptions)
+  (eval `(ido-ubiquitous-disable-in ,func)))
+
+(defun ido-ubiquitous--set-difference (list1 list2)
+  "Replacement for `set-difference' from `cl'."
+  (apply #'nconc
+         (mapcar (lambda (elt) (unless (memq elt list2) (list elt)))
+                 list1)))
+
+(defun ido-ubiquitous-set-function-exceptions (sym newval)
+  (let* ((oldval (when (boundp sym) (eval sym))))
+    ;; Filter out permanent fixtures
+    (setq oldval (ido-ubiquitous--set-difference oldval ido-ubiquitous-permanent-function-exceptions))
+    (setq newval (ido-ubiquitous--set-difference newval ido-ubiquitous-permanent-function-exceptions))
+    ;; Re-enable ido-ubiquitous on all old functions, in case they
+    ;; were removed from the list.
+    (dolist (oldfun oldval)
+      (eval `(ido-ubiquitous-enable-in ,oldfun)))
+    ;; Set the new value
+    (set-default sym newval)
+    ;; Disable ido-ubiquitous on all new functions
+    (dolist (newfun newval)
+      (eval `(ido-ubiquitous-disable-in ,newfun)))))
+
+;;;###autoload
+(defcustom ido-ubiquitous-function-exceptions
+  '(grep-read-files)
+  "List of functions in which to disable ido-ubiquitous.
+
+Certain functions, such as `read-file-name', always have
+ido-ubiquitous disabled, and cannot be added here. (They are
+effectively permanently part of this list already.)"
+  :group 'ido-ubiquitous
+  :type '(repeat :tag "Functions"
+                 (symbol :tag "Function"))
+  :set 'ido-ubiquitous-set-function-exceptions)
+
+(defadvice ido-exit-minibuffer (around required-allow-empty-string activate)
+  "Emulate a quirk of `completing-read'.
+
+Apparently, `completing-read' used to request the default item by
+returning an empty string when RET was pressed with an empty input.
+This forces `ido-completing-read' to do the same (instead of returning
+the first choice in the list).
+
+This has no effect when ido is completing buffers or files."
+  (if (and (eq ido-cur-item 'list)
+           ido-require-match
+           (string= ido-text ""))
+      (ido-select-text)
+    ad-do-it))
+
+(provide 'ido-ubiquitous) ;;; ido-ubiquitous.el ends here
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc
new file mode 100644
index 0000000000000000000000000000000000000000..b695c899b6a9134a141d16d162fb79cac5fdd3da
GIT binary patch
literal 6614
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
XByo%sZ3cHRSB59uD+C7BqgDGiqrG$Z

literal 0
HcmV?d00001

diff --git a/elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el b/elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el
deleted file mode 100644
index b4dc3b05b..000000000
--- a/elpa/inf-ruby-2.3.0/inf-ruby-autoloads.el
+++ /dev/null
@@ -1,85 +0,0 @@
-;;; inf-ruby-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads (inf-ruby-console-default inf-ruby-console-gem
-;;;;;;  inf-ruby-console-rails inf-ruby-console-auto inf-ruby-switch-setup
-;;;;;;  run-ruby inf-ruby inf-ruby-minor-mode inf-ruby-setup-keybindings)
-;;;;;;  "inf-ruby" "inf-ruby.el" (21031 23290 0 0))
-;;; Generated autoloads from inf-ruby.el
-
-(autoload 'inf-ruby-setup-keybindings "inf-ruby" "\
-Hook up `inf-ruby-minor-mode' to each of `ruby-source-modes'.
-
-\(fn)" nil nil)
-
-(autoload 'inf-ruby-minor-mode "inf-ruby" "\
-Minor mode for interacting with the inferior process buffer.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'inf-ruby "inf-ruby" "\
-Run an inferior Ruby process in a buffer.
-With prefix argument, prompts for which Ruby implementation
-\(from the list `inf-ruby-implementations') to use. Runs the
-hooks `inf-ruby-mode-hook' (after the `comint-mode-hook' is
-run).
-
-\(fn &optional IMPL)" t nil)
-
-(autoload 'run-ruby "inf-ruby" "\
-Run an inferior Ruby process, input and output via buffer *ruby*.
-If there is a process already running in `*ruby*', switch to that buffer.
-With argument, allows you to edit the command line (default is value
-of `ruby-program-name').  Runs the hooks `inferior-ruby-mode-hook'
-\(after the `comint-mode-hook' is run).
-\(Type \\[describe-mode] in the process buffer for a list of commands.)
-
-\(fn &optional COMMAND NAME)" t nil)
-
-(autoload 'inf-ruby-switch-setup "inf-ruby" "\
-Modify `rspec-compilation-mode' and `ruby-compilation-mode'
-keymaps to bind `inf-ruby-switch-from-compilation' to `!-x C-q'.
-
-\(fn)" nil nil)
-
-(autoload 'inf-ruby-console-auto "inf-ruby" "\
-Automatically determine the appropriate Ruby console command
-and the directory to run it from.
-
-\(fn)" t nil)
-
-(autoload 'inf-ruby-console-rails "inf-ruby" "\
-Run Rails console in DIR.
-
-\(fn DIR)" t nil)
-
-(autoload 'inf-ruby-console-gem "inf-ruby" "\
-Run IRB console for the gem in DIR.
-The main module should be loaded automatically. If DIR contains a
-Gemfile, it should use the `gemspec' instruction.
-
-\(fn DIR)" t nil)
-
-(autoload 'inf-ruby-console-default "inf-ruby" "\
-Run racksh, custom console.rb, or just IRB, in DIR.
-
-\(fn DIR)" t nil)
- (inf-ruby-setup-keybindings)
-
-;;;***
-
-;;;### (autoloads nil nil ("inf-ruby-pkg.el") (21031 23290 158755
-;;;;;;  0))
-
-;;;***
-
-(provide 'inf-ruby-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; inf-ruby-autoloads.el ends here
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby-pkg.el b/elpa/inf-ruby-2.3.0/inf-ruby-pkg.el
deleted file mode 100644
index dd9bfb4b2..000000000
--- a/elpa/inf-ruby-2.3.0/inf-ruby-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "inf-ruby" "2.3.0" "Run a ruby process in a buffer" (quote nil))
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby.el b/elpa/inf-ruby-2.3.0/inf-ruby.el
deleted file mode 100644
index 176918876..000000000
--- a/elpa/inf-ruby-2.3.0/inf-ruby.el
+++ /dev/null
@@ -1,541 +0,0 @@
-;;; inf-ruby.el --- Run a ruby process in a buffer
-
-;; Copyright (C) 1999-2008 Yukihiro Matsumoto, Nobuyoshi Nakada
-
-;; Author: Yukihiro Matsumoto
-;;         Nobuyoshi Nakada
-;;         Cornelius Mika <cornelius.mika@gmail.com>
-;;         Dmitry Gutov <dgutov@yandex.ru>
-;;         Kyle Hargraves <pd@krh.me>
-;; URL: http://github.com/nonsequitur/inf-ruby
-;; Created: 8 April 1998
-;; Keywords: languages ruby
-;; Version: 2.3.0
-
-;;; Commentary:
-;;
-;; inf-ruby.el provides a REPL buffer connected to an IRB subprocess.
-;;
-;; If you're installing manually, you'll need to:
-;; * drop the file somewhere on your load path (perhaps ~/.emacs.d)
-;; * Add the following lines to your .emacs file:
-;;
-;;    (autoload 'inf-ruby "inf-ruby" "Run an inferior Ruby process" t)
-;;    (autoload 'inf-ruby-setup-keybindings "inf-ruby" "" t)
-;;    (eval-after-load 'ruby-mode
-;;      '(add-hook 'ruby-mode-hook 'inf-ruby-setup-keybindings))
-;;
-;; Additionally, consider adding
-;;
-;;    (inf-ruby-switch-setup)
-;;
-;; to your init file to easily switch from common Ruby compilation
-;; modes to interact with a debugger.
-
-(require 'comint)
-(require 'compile)
-(require 'ruby-mode)
-
-(defvar inf-ruby-default-implementation "ruby"
-  "Which Ruby implementation to use if none is specified.")
-
-(defconst inf-ruby-prompt-format
-  (concat
-   (mapconcat
-    #'identity
-    '("\\(^%s> *\\)"                      ; Simple
-      "\\(^(rdb:1) *\\)"                  ; Debugger
-      "\\(^\\(irb([^)]+)"                 ; IRB default
-      "\\([[0-9]+] \\)?[Pp]ry ?([^)]+)"   ; Pry
-      "\\(jruby-\\|JRUBY-\\)?[1-9]\\.[0-9]\\.[0-9]+\\(-?p?[0-9]+\\)?" ; RVM
-      "^rbx-head\\)")                     ; RVM continued
-    "\\|")
-   ;; Statement and nesting counters, common to the last four.
-   " ?[0-9:]* ?%s *\\)")
-  "Format string for the prompt regexp pattern.
-Two placeholders: first char in the Simple prompt, and the last
-graphical char in all other prompts.")
-
-(defvar inf-ruby-first-prompt-pattern (format inf-ruby-prompt-format ">" ">")
-  "First prompt regex pattern of Ruby interpreter.")
-
-(defvar inf-ruby-prompt-pattern (format inf-ruby-prompt-format "[?>]" "[\]>*\"'/`]")
-  "Prompt regex pattern of Ruby interpreter.")
-
-(defvar inf-ruby-mode-hook nil
-  "Hook for customizing inf-ruby mode.")
-
-(defvar inf-ruby-mode-map
-  (let ((map (copy-keymap comint-mode-map)))
-    (define-key map (kbd "C-c C-l") 'ruby-load-file)
-    (define-key map (kbd "C-x C-e") 'ruby-send-last-sexp)
-    (define-key map (kbd "TAB") 'inf-ruby-complete)
-    map)
-  "Mode map for inf-ruby-mode")
-
-(defvar inf-ruby-implementations
-  '(("ruby"     . "irb --prompt default -r irb/completion")
-    ("jruby"    . "jruby -S irb --prompt default -r irb/completion")
-    ("rubinius" . "rbx -r irb/completion")
-    ("yarv"     . "irb1.9 -r irb/completion")
-    ("macruby"  . "macirb -r irb/completion"))
-  "An alist of ruby implementations to irb executable names.")
-
-(defvar ruby-source-modes '(ruby-mode enh-ruby-mode)
-  "Used to determine if a buffer contains Ruby source code.
-If it's loaded into a buffer that is in one of these major modes, it's
-considered a ruby source file by `ruby-load-file'.
-Used by these commands to determine defaults.")
-
-(defvar ruby-prev-l/c-dir/file nil
-  "Caches the last (directory . file) pair.
-Caches the last pair used in the last ruby-load-file command.
-Used for determining the default in the
-next one.")
-
-(defvar inf-ruby-at-top-level-prompt-p t)
-
-(defconst inf-ruby-error-regexp-alist
-  '(("SyntaxError: \\(?:compile error\n\\)?\\([^\(].*\\):\\([1-9][0-9]*\\):" 1 2)
-    ("^\tfrom \\([^\(].*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?$" 1 2)))
-
-;;;###autoload
-(defun inf-ruby-setup-keybindings ()
-  "Hook up `inf-ruby-minor-mode' to each of `ruby-source-modes'."
-  (dolist (mode ruby-source-modes)
-    (add-hook (intern (format "%s-hook" mode)) 'inf-ruby-minor-mode)))
-
-(defvar inf-ruby-minor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-M-x") 'ruby-send-definition)
-    (define-key map (kbd "C-x C-e") 'ruby-send-last-sexp)
-    (define-key map (kbd "C-c C-b") 'ruby-send-block)
-    (define-key map (kbd "C-c M-b") 'ruby-send-block-and-go)
-    (define-key map (kbd "C-c C-x") 'ruby-send-definition)
-    (define-key map (kbd "C-c M-x") 'ruby-send-definition-and-go)
-    (define-key map (kbd "C-c C-r") 'ruby-send-region)
-    (define-key map (kbd "C-c M-r") 'ruby-send-region-and-go)
-    (define-key map (kbd "C-c C-z") 'ruby-switch-to-inf)
-    (define-key map (kbd "C-c C-l") 'ruby-load-file)
-    (define-key map (kbd "C-c C-s") 'inf-ruby)
-    map))
-
-;;;###autoload
-(define-minor-mode inf-ruby-minor-mode
-  "Minor mode for interacting with the inferior process buffer."
-  :lighter "" :keymap inf-ruby-minor-mode-map)
-
-(defvar inf-ruby-buffer nil "Current irb process buffer.")
-
-(defun inf-ruby-mode ()
-  "Major mode for interacting with an inferior Ruby (irb) process.
-
-The following commands are available:
-\\{inf-ruby-mode-map}
-
-A Ruby process can be fired up with M-x inf-ruby.
-
-Customization: When entered, this mode runs `comint-mode-hook' and
-`inf-ruby-mode-hook' (in that order).
-
-You can send text to the inferior ruby process from other buffers containing
-Ruby source.
-
-    `ruby-switch-to-inf' switches the current buffer to the ruby process buffer.
-    `ruby-send-definition' sends the current definition to the ruby process.
-    `ruby-send-region' sends the current region to the ruby process.
-    `ruby-send-definition-and-go' and `ruby-send-region-and-go'
-        switch to the ruby process buffer after sending their text.
-
-Commands:
-Return after the end of the process' output sends the text from the
-    end of process to point.
-Return before the end of the process' output copies the sexp ending at point
-    to the end of the process' output, and sends it.
-Delete converts tabs to spaces as it moves back.
-Tab indents for ruby; with argument, shifts rest
-    of expression rigidly with the current line.
-C-M-q does Tab on each line starting within following expression.
-Paragraphs are separated only by blank lines.  # start comments.
-If you accidentally suspend your process, use \\[comint-continue-subjob]
-to continue it."
-  (interactive)
-  (comint-mode)
-  (setq comint-prompt-regexp inf-ruby-prompt-pattern)
-  (ruby-mode-variables)
-  (setq major-mode 'inf-ruby-mode)
-  (setq mode-name "Inf-Ruby")
-  (setq mode-line-process '(":%s"))
-  (use-local-map inf-ruby-mode-map)
-  (add-hook 'comint-output-filter-functions 'inf-ruby-output-filter nil t)
-  (setq comint-get-old-input (function inf-ruby-get-old-input))
-  (make-local-variable 'compilation-error-regexp-alist)
-  (setq compilation-error-regexp-alist inf-ruby-error-regexp-alist)
-  (when (eq system-type 'windows-nt)
-    (setq comint-process-echoes t))
-  (compilation-shell-minor-mode t)
-  (run-hooks 'inf-ruby-mode-hook))
-
-(defun inf-ruby-output-filter (output)
-  "Check if the current prompt is a top-level prompt"
-  (unless (zerop (length output))
-    (setq inf-ruby-at-top-level-prompt-p
-          (string-match inf-ruby-first-prompt-pattern
-                        (car (last (split-string output "\n")))))))
-
-;; adapted from replace-in-string in XEmacs (subr.el)
-(defun inf-ruby-remove-in-string (str regexp)
-  "Remove all matches in STR for REGEXP and returns the new string."
-  (let ((rtn-str "") (start 0) match prev-start)
-    (while (setq match (string-match regexp str start))
-      (setq prev-start start
-            start (match-end 0)
-            rtn-str (concat rtn-str (substring str prev-start match))))
-    (concat rtn-str (substring str start))))
-
-(defun inf-ruby-get-old-input ()
-  "Snarf the sexp ending at point"
-  (save-excursion
-    (let ((end (point)))
-      (re-search-backward inf-ruby-first-prompt-pattern)
-      (inf-ruby-remove-in-string (buffer-substring (point) end)
-                                 inf-ruby-prompt-pattern))))
-
-;;;###autoload
-(defun inf-ruby (&optional impl)
-  "Run an inferior Ruby process in a buffer.
-With prefix argument, prompts for which Ruby implementation
-\(from the list `inf-ruby-implementations') to use. Runs the
-hooks `inf-ruby-mode-hook' \(after the `comint-mode-hook' is
-run)."
-
-  (interactive (list (if current-prefix-arg
-                         (completing-read "Ruby Implementation: "
-                                          (mapc #'car inf-ruby-implementations))
-                       inf-ruby-default-implementation)))
-  (setq impl (or impl "ruby"))
-
-  (let ((command (cdr (assoc impl inf-ruby-implementations))))
-    (run-ruby command impl)))
-
-;;;###autoload
-(defun run-ruby (&optional command name)
-  "Run an inferior Ruby process, input and output via buffer *ruby*.
-If there is a process already running in `*ruby*', switch to that buffer.
-With argument, allows you to edit the command line (default is value
-of `ruby-program-name').  Runs the hooks `inferior-ruby-mode-hook'
-\(after the `comint-mode-hook' is run).
-\(Type \\[describe-mode] in the process buffer for a list of commands.)"
-
-  (interactive)
-  (setq command (or command (cdr (assoc inf-ruby-default-implementation
-                                        inf-ruby-implementations))))
-  (setq name (or name "ruby"))
-
-  (if (not (comint-check-proc inf-ruby-buffer))
-      (let ((commandlist (split-string-and-unquote command)))
-        (set-buffer (apply 'make-comint name (car commandlist)
-                           nil (cdr commandlist)))
-        (inf-ruby-mode)))
-  (pop-to-buffer (setq inf-ruby-buffer (format "*%s*" name))))
-
-(defun inf-ruby-proc ()
-  "Returns the current IRB process. See variable inf-ruby-buffer."
-  (or (get-buffer-process (if (eq major-mode 'inf-ruby-mode)
-                              (current-buffer)
-                            inf-ruby-buffer))
-      (error "No current process. See variable inf-ruby-buffer")))
-
-;; These commands are added to the ruby-mode keymap:
-
-(defconst ruby-send-terminator "--inf-ruby-%x-%d-%d-%d--"
-  "Template for irb here document terminator.
-Must not contain ruby meta characters.")
-
-(defconst inf-ruby-eval-binding "IRB.conf[:MAIN_CONTEXT].workspace.binding")
-
-(defconst ruby-eval-separator "")
-
-(defun ruby-send-region (start end)
-  "Send the current region to the inferior Ruby process."
-  (interactive "r")
-  (let (term (file (or buffer-file-name (buffer-name))) line)
-    (save-excursion
-      (save-restriction
-        (widen)
-        (goto-char start)
-        (setq line (+ start (forward-line (- start)) 1))
-        (goto-char start)
-        (while (progn
-                 (setq term (apply 'format ruby-send-terminator (random) (current-time)))
-                 (re-search-forward (concat "^" (regexp-quote term) "$") end t)))))
-    ;; compilation-parse-errors parses from second line.
-    (save-excursion
-      (let ((m (process-mark (inf-ruby-proc))))
-        (set-buffer (marker-buffer m))
-        (goto-char m)
-        (insert ruby-eval-separator "\n")
-        (set-marker m (point))))
-    (comint-send-string (inf-ruby-proc) (format "eval <<'%s', %s, %S, %d\n"
-                                                term inf-ruby-eval-binding
-                                                file line))
-    (comint-send-region (inf-ruby-proc) start end)
-    (comint-send-string (inf-ruby-proc) (concat "\n" term "\n"))))
-
-(defun ruby-send-definition ()
-  "Send the current definition to the inferior Ruby process."
-  (interactive)
-  (save-excursion
-    (ruby-end-of-defun)
-    (let ((end (point)))
-      (ruby-beginning-of-defun)
-      (ruby-send-region (point) end))))
-
-(defun ruby-send-last-sexp ()
-  "Send the previous sexp to the inferior Ruby process."
-  (interactive)
-  (ruby-send-region (save-excursion (ruby-backward-sexp) (point)) (point)))
-
-(defun ruby-send-block ()
-  "Send the current block to the inferior Ruby process."
-  (interactive)
-  (save-excursion
-    (ruby-end-of-block)
-    (end-of-line)
-    (let ((end (point)))
-      (ruby-beginning-of-block)
-      (ruby-send-region (point) end))))
-
-(defun ruby-switch-to-inf (eob-p)
-  "Switch to the ruby process buffer.
-With argument, positions cursor at end of buffer."
-  (interactive "P")
-  (if (get-buffer inf-ruby-buffer)
-      (pop-to-buffer inf-ruby-buffer)
-    (error "No current process buffer. See variable inf-ruby-buffer."))
-  (cond (eob-p
-         (push-mark)
-         (goto-char (point-max)))))
-
-(defun ruby-send-region-and-go (start end)
-  "Send the current region to the inferior Ruby process.
-Then switch to the process buffer."
-  (interactive "r")
-  (ruby-send-region start end)
-  (ruby-switch-to-inf t))
-
-(defun ruby-send-definition-and-go ()
-  "Send the current definition to the inferior Ruby.
-Then switch to the process buffer."
-  (interactive)
-  (ruby-send-definition)
-  (ruby-switch-to-inf t))
-
-(defun ruby-send-block-and-go ()
-  "Send the current block to the inferior Ruby.
-Then switch to the process buffer."
-  (interactive)
-  (ruby-send-block)
-  (ruby-switch-to-inf t))
-
-(defun ruby-load-file (file-name)
-  "Load a Ruby file into the inferior Ruby process."
-  (interactive (comint-get-source "Load Ruby file: " ruby-prev-l/c-dir/file
-                                  ruby-source-modes t)) ;; T because LOAD needs an exact name
-  (comint-check-source file-name) ; Check to see if buffer needs saved.
-  (setq ruby-prev-l/c-dir/file (cons (file-name-directory    file-name)
-                                     (file-name-nondirectory file-name)))
-  (comint-send-string (inf-ruby-proc) (concat "(load \""
-                                              file-name
-                                              "\"\)\n")))
-
-(defun ruby-escape-single-quoted (str)
-  (replace-regexp-in-string "'" "\\\\'"
-    (replace-regexp-in-string "\n" "\\\\n"
-      (replace-regexp-in-string "\\\\" "\\\\\\\\" str))))
-
-(defsubst inf-ruby-fix-completions-on-windows (completions)
-  "On Windows, the string received by `accept-process-output'
-starts with the last line that was sent to the Ruby process.
-The reason for this is unknown. Remove this line from `completions'."
-  (if (eq system-type 'windows-nt)
-      (cdr completions)
-    completions))
-
-(defun inf-ruby-completions (expr)
-  "Return a list of completions for the Ruby expression starting with EXPR."
-  (let* ((proc (inf-ruby-proc))
-         (line (buffer-substring (save-excursion (beginning-of-thing 'line))
-                                 (point)))
-	 (comint-filt (process-filter proc))
-	 (kept "") completions)
-    (set-process-filter proc (lambda (proc string) (setq kept (concat kept string))))
-    (process-send-string
-     proc
-     (format (concat "if defined?(Pry.config) then "
-                     "completor = Pry.config.completer"
-                     ".build_completion_proc(binding, defined?(_pry_) ? _pry_ : Pry.new)"
-                     " elsif defined?(Bond.agent) && Bond.started? then "
-                     "completor = Bond.agent"
-                     " elsif defined?(IRB::InputCompletor::CompletionProc) then "
-                     "completor = IRB::InputCompletor::CompletionProc "
-                     "end and "
-                     "puts completor.call('%s', '%s').compact\n")
-             (ruby-escape-single-quoted expr)
-             (ruby-escape-single-quoted line)))
-    (while (and (not (string-match inf-ruby-prompt-pattern kept))
-                (accept-process-output proc 2)))
-    (setq completions (butlast (split-string kept "\r?\n") 2))
-    (setq completions (inf-ruby-fix-completions-on-windows completions))
-    (set-process-filter proc comint-filt)
-    completions))
-
-(defconst inf-ruby-ruby-expr-break-chars " \t\n\"\'`><,;|&{(")
-
-(defun inf-ruby-completion-bounds-of-expr-at-point ()
-  (save-excursion
-    (let ((end (point)))
-      (skip-chars-backward (concat "^" inf-ruby-ruby-expr-break-chars))
-      (cons (point) end))))
-
-(defun inf-ruby-completion-expr-at-point ()
-  (let ((bounds (inf-ruby-completion-bounds-of-expr-at-point)))
-    (buffer-substring (car bounds) (cdr bounds))))
-
-(defun inf-ruby-completion-at-point ()
-  (if inf-ruby-at-top-level-prompt-p
-      (let* ((expr (inf-ruby-completion-expr-at-point))
-             (completions (inf-ruby-completions expr)))
-        (if completions
-            (if (= (length completions) 1)
-                (car completions)
-              (completing-read "possible completions: "
-                               completions nil t expr))))
-    (message "Completion aborted: Not at a top-level prompt")
-    nil))
-
-(defun inf-ruby-complete (command)
-  "Complete the Ruby code at point.
-Uses the first one available of Pry, Bond and the default IRB
-completion."
-  (interactive (list (inf-ruby-completion-at-point)))
-  (when command
-    (let ((bounds (inf-ruby-completion-bounds-of-expr-at-point)))
-      (delete-region (car bounds) (cdr bounds)))
-    (insert command)))
-
-(defun inf-ruby-complete-or-tab (&optional command)
-  "Either complete the ruby code at point or call
-`indent-for-tab-command' if no completion is available."
-  (interactive (list (inf-ruby-completion-at-point)))
-  (if (not command)
-      (call-interactively 'indent-for-tab-command)
-    (inf-ruby-complete command)))
-
-(defun inf-ruby-switch-from-compilation ()
-  "Make the buffer writable and switch to `inf-ruby-mode'.
-Recommended for use when the program being executed enters
-interactive mode, i.e. hits a debugger breakpoint."
-  (interactive)
-  (setq buffer-read-only nil)
-  (buffer-enable-undo)
-  (inf-ruby-mode)
-  (let ((proc (get-buffer-process (current-buffer))))
-    (set-process-filter proc 'comint-output-filter)
-    (when (looking-back inf-ruby-prompt-pattern (line-beginning-position))
-      (let ((line (match-string 0)))
-        (delete-region (match-beginning 0) (point))
-        (comint-output-filter proc line)))))
-
-;;;###autoload
-(defun inf-ruby-switch-setup ()
-  "Modify `rspec-compilation-mode' and `ruby-compilation-mode'
-keymaps to bind `inf-ruby-switch-from-compilation' to `!-x C-q'."
-  (eval-after-load 'rspec-mode
-    '(define-key rspec-compilation-mode-map (kbd "C-x C-q")
-       'inf-ruby-switch-from-compilation))
-  (eval-after-load 'ruby-compilation
-    '(define-key ruby-compilation-mode-map (kbd "C-x C-q")
-       'inf-ruby-switch-from-compilation)))
-
-(defvar inf-ruby-console-patterns-alist
-  '(("config/application.rb" . rails)
-    ("*.gemspec" . gem)
-    ("Gemfile" . default))
-  "Mapping from file name patterns to name symbols.
-`inf-ruby-console-auto' walks up from the current directory until
-one of the patterns matches, then calls `inf-ruby-console-NAME',
-passing it the found directory.")
-
-(defun inf-ruby-console-match (dir)
-  (catch 'type
-    (dolist (pair inf-ruby-console-patterns-alist)
-      (let ((default-directory dir))
-        (when (file-expand-wildcards (car pair))
-          (throw 'type (cdr pair)))))))
-
-;;;###autoload
-(defun inf-ruby-console-auto ()
-  "Automatically determine the appropriate Ruby console command
-and the directory to run it from."
-  (interactive)
-  (let* ((dir (locate-dominating-file default-directory
-                                      #'inf-ruby-console-match))
-         (type (inf-ruby-console-match dir))
-         (fun (intern (format "inf-ruby-console-%s" type))))
-    (unless type (error "No matching directory found"))
-    (funcall fun dir)))
-
-;;;###autoload
-(defun inf-ruby-console-rails (dir)
-  "Run Rails console in DIR."
-  (interactive "D")
-  (let ((default-directory dir))
-    (run-ruby "rails console" "rails")))
-
-;;;###autoload
-(defun inf-ruby-console-gem (dir)
-  "Run IRB console for the gem in DIR.
-The main module should be loaded automatically. If DIR contains a
-Gemfile, it should use the `gemspec' instruction."
-  (interactive "D")
-  (let ((default-directory dir))
-    (if (file-exists-p "Gemfile")
-        (run-ruby "bundle exec irb" "gem")
-      (unless (file-exists-p "lib")
-        (error "The directory must contain a 'lib' subdirectory"))
-      (let (files)
-        (dolist (item (directory-files "lib"))
-          (unless (file-directory-p item)
-            (setq files (cons item files))))
-        (run-ruby (concat "irb -I lib"
-                          ;; If there are several files under 'lib'
-                          ;; (unlikely), load them all.
-                          (mapconcat
-                           (lambda (file)
-                             (concat " -r " (file-name-sans-extension file)))
-                           files
-                           ""))
-                  "gem")))))
-
-;;;###autoload
-(defun inf-ruby-console-default (dir)
-  "Run racksh, custom console.rb, or just IRB, in DIR."
-  (interactive "D")
-  (let ((default-directory dir))
-    (unless (file-exists-p "Gemfile")
-      (error "The directory must contain a Gemfile"))
-    (cond
-     ((with-temp-buffer
-        (insert-file-contents "Gemfile")
-        (re-search-forward "[\"']racksh[\"']" nil t))
-      (run-ruby "bundle exec racksh" "racksh"))
-     ((file-exists-p "console.rb")
-      (run-ruby "ruby console.rb" "console.rb"))
-     (t
-      (run-ruby "bundle exec irb")))))
-
-;;;###autoload (inf-ruby-setup-keybindings)
-
-(provide 'inf-ruby)
-;;; inf-ruby.el ends here
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby.elc b/elpa/inf-ruby-2.3.0/inf-ruby.elc
deleted file mode 100644
index 8256b6a24383ba69af934ad06d8294162be10bca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18790
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
JgVJj0{{i7ek?;Tj

diff --git a/elpa/magit-1.0.0/50magit.el b/elpa/magit-1.0.0/50magit.el
new file mode 100644
index 000000000..b04034db0
--- /dev/null
+++ b/elpa/magit-1.0.0/50magit.el
@@ -0,0 +1,3 @@
+;;; Autoloads for magit
+
+(autoload 'magit-status "magit" nil t)
diff --git a/elpa/magit-1.2.0/magit-pkg.elc b/elpa/magit-1.0.0/50magit.elc
similarity index 64%
rename from elpa/magit-1.2.0/magit-pkg.elc
rename to elpa/magit-1.0.0/50magit.elc
index b8ce200d44d995be8f562b199226f5d2a78d7334..8a38ba6ac7121bf1f0125d85613a631a5e25ea01 100644
GIT binary patch
delta 139
zcmdnYvW{hfq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm9dF}k%6J%
zL{npJ13d$MQ-j>Z^vn{y)Eq8rYiotfJO$U>#N=XyvecsDOrU-v6FmbxOT&$m(iznf
jOH1-|@)J`O)WLdmi%SwqN{bbgz&s^|yv!Vh5=|}uzQ`+J

delta 120
zcmZ3-vYBOqq>Ms-o<ewPib8N|fr5gGf}xR>frXWUiGq=Vq47j#V_qXY1O42@^vn|7
zg6#B(jWUeJ8yBWCTBW3>W#*;o79=KTC#I(=D1ntIDJU800W|<==lr~qqWl~M_skN7
Sw4(f61=rlf<YGM~O)da5CL?bE

diff --git a/elpa/magit-1.0.0/Makefile b/elpa/magit-1.0.0/Makefile
new file mode 100644
index 000000000..274c5d952
--- /dev/null
+++ b/elpa/magit-1.0.0/Makefile
@@ -0,0 +1,47 @@
+VERSION=1.0.0
+EMACS=emacs
+PREFIX=/usr/local
+ELS=magit.el magit-svn.el magit-topgit.el magit-key-mode.el
+ELCS=$(ELS:.el=.elc)
+DIST_FILES=$(ELS) Makefile magit.texi README.md magit.spec.in magit-pkg.el.in 50magit.el
+
+.PHONY=install
+
+BATCH=$(EMACS) -batch -q -no-site-file -eval \
+  "(setq load-path (cons (expand-file-name \".\") load-path))"
+
+%.elc: %.el
+	$(BATCH) --eval '(byte-compile-file "$<")'
+
+all: $(ELCS) magit.info magit.spec magit-pkg.el
+
+magit.spec: magit.spec.in
+	sed -e s/@VERSION@/$(VERSION)/ < $< > $@
+
+magit-pkg.el: magit-pkg.el.in
+	sed -e s/@VERSION@/$(VERSION)/ < $< > $@
+
+magit.elc:
+magit-key-mode.elc:
+magit-svn.elc:
+magit-topgit.elc:
+magit.info:
+
+# yuck - this needs cleaning up a bit...
+dist: $(DIST_FILES)
+	mkdir -p magit-$(VERSION)
+	cp $(DIST_FILES) magit-$(VERSION)
+	tar -cvzf magit-$(VERSION).tar.gz magit-$(VERSION)
+	rm -rf magit-$(VERSION)
+
+install: all
+	mkdir -p $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+	install -m 644 $(ELS) $(ELCS) $(DESTDIR)/$(PREFIX)/share/emacs/site-lisp
+	mkdir -p $(DESTDIR)/$(PREFIX)/share/info
+	install -m 644 magit.info $(DESTDIR)/$(PREFIX)/share/info
+	install-info --info-dir=$(DESTDIR)/$(PREFIX)/share/info $(DESTDIR)/$(PREFIX)/share/info/magit.info
+	mkdir -p $(DESTDIR)/etc/emacs/site-start.d
+	install -m 644 50magit.el $(DESTDIR)/etc/emacs/site-start.d/50magit.el
+
+clean:
+	rm -fr magit-pkg.el magit.spec magit.info $(ELCS) *.tar.gz magit-$(VERSION)
diff --git a/elpa/magit-1.0.0/README.md b/elpa/magit-1.0.0/README.md
new file mode 100644
index 000000000..47bdf7043
--- /dev/null
+++ b/elpa/magit-1.0.0/README.md
@@ -0,0 +1,76 @@
+It's Magit!  A Emacs mode for Git.
+==================================
+
+Magit is an interface to Git for Emacs. Unlike Emacs's native
+[version control support][vc], Magit can take advantage of Git's
+native features without breaking compatibility with other systems.
+
+To get started see the [Magit User Manual][manual] or perhaps the
+[cheatsheet][cheatsheet] if you're in a hurry. There's also an
+excellent [Magit screencast][screencast] by Alex Vollmer which
+demonstrates some of the major features.
+
+Installing
+----------
+
+Download the latest tarball from [the github download page][download],
+then Magit can be installed with the popular recipe of:
+
+make && sudo make install
+
+This will put magit.el into `/usr/local/share/emacs/site-lisp`, where
+Emacs should be able to find it.  Then add
+
+    (require 'magit)
+
+to your `.emacs` file.
+
+Magit also now supports extensions:
+
+### git-svn
+
+`(require 'magit-svn)` - integrates with git-svn. Hit 'N' to see your
+options.
+
+### git-topgit
+
+`(require 'magit-topgit)` - integrates with topgit.
+
+Getting started
+---------------
+
+To get started with Magit, open any file in a Git repository in Emacs
+and run `M-x magit-status`.  Read the short help for magit-mode (`C-h
+m` in the Magit buffer), make some changes to your files, and try to
+commit them.
+
+Learning more
+-------------
+
+The [Magit User Manual][manual] describes things with more words than
+the online help.  You can read it in Emacs with `C-u C-h i
+magit.info`, or [on the web][manual].
+
+If you have any questions, please use [the mailing list][google group]
+at Google Groups.
+
+Magit's website is currently hosted [on GitHub][website].
+
+Development
+-----------
+
+Magit was started by Marius Vollmer. Phil Jackson is the lead
+developer. For a full list of contributors have a look at `magit.el`
+in the source distribution.
+
+Magit's canonical source repository is currently
+[hosted on GitHub][development].
+
+[vc]: http://www.gnu.org/software/emacs/manual/html_node/emacs/Version-Control.html#Version-Control
+[website]: http://philjackson.github.com/magit
+[development]: http://github.com/philjackson/magit
+[manual]: http://philjackson.github.com/magit/magit.html
+[cheatsheet]: http://daemianmack.com/magit-cheatsheet.html
+[screencast]: http://vimeo.com/2871241
+[download]: http://github.com/philjackson/magit/downloads
+[google group]: http://groups.google.com/group/magit/
diff --git a/elpa/magit-1.0.0/magit-autoloads.el b/elpa/magit-1.0.0/magit-autoloads.el
new file mode 100644
index 000000000..f1a90aa7a
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-autoloads.el
@@ -0,0 +1,28 @@
+;;; magit-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (magit-status) "magit" "magit.el" (20166 22135))
+;;; Generated autoloads from magit.el
+
+(autoload 'magit-status "magit" "\
+
+
+\(fn DIR)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("50magit.el" "magit-key-mode.el" "magit-pkg.el"
+;;;;;;  "magit-svn.el" "magit-topgit.el") (20166 22135 600465))
+
+;;;***
+
+(provide 'magit-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; magit-autoloads.el ends here
diff --git a/elpa/magit-1.2.0/magit-key-mode.el b/elpa/magit-1.0.0/magit-key-mode.el
similarity index 66%
rename from elpa/magit-1.2.0/magit-key-mode.el
rename to elpa/magit-1.0.0/magit-key-mode.el
index 2fcf2964c..21d523690 100644
--- a/elpa/magit-1.2.0/magit-key-mode.el
+++ b/elpa/magit-1.0.0/magit-key-mode.el
@@ -1,6 +1,4 @@
-(require 'magit)
-
-(eval-when-compile (require 'cl))
+(require 'assoc)
 
 (defvar magit-key-mode-key-maps '()
   "This will be filled lazily with proper `define-key' built
@@ -22,10 +20,10 @@
   '((logging
      (man-page "git-log")
      (actions
-      ("l" "Short" magit-log)
+      ("l" "Short" magit-display-log)
       ("L" "Long" magit-log-long)
       ("h" "Reflog" magit-reflog)
-      ("rl" "Ranged short" magit-log-ranged)
+      ("rl" "Ranged short" magit-display-log-ranged)
       ("rL" "Ranged long" magit-log-long-ranged)
       ("rh" "Ranged reflog" magit-reflog-ranged))
      (switches
@@ -57,9 +55,7 @@
      (actions
       ("f" "Current" magit-fetch-current)
       ("a" "All" magit-remote-update)
-      ("o" "Other" magit-fetch))
-     (switches
-      ("-p" "Prune" "--prune")))
+      ("o" "Other" magit-fetch)))
 
     (pushing
      (man-page "git-push")
@@ -68,8 +64,7 @@
       ("t" "Push tags" magit-push-tags))
      (switches
       ("-f" "Force" "--force")
-      ("-d" "Dry run" "-n")
-      ("-u" "Set upstream" "-u")))
+      ("-d" "Dry run" "-n")))
 
     (pulling
      (man-page "git-pull")
@@ -81,20 +76,12 @@
     (branching
      (man-page "git-branch")
      (actions
-      ("v" "Branch manager" magit-branch-manager)
-      ("c" "Create" magit-create-branch)
-      ("r" "Rename" magit-move-branch)
-      ("k" "Delete" magit-delete-branch)
+      ("v" "Branch manager" magit-show-branches)
+      ("n" "New" magit-create-branch)
+      ("m" "Move" magit-move-branch)
+      ("d" "Delete" magit-delete-branch)
       ("b" "Checkout" magit-checkout)))
 
-    (remoting
-     (man-page "git-remote")
-     (actions
-      ("v" "Branch manager" magit-branch-manager)
-      ("a" "Add" magit-add-remote)
-      ("r" "Rename" magit-rename-remote)
-      ("k" "Remove" magit-remove-remote)))
-
     (tagging
      (man-page "git-tag")
      (actions
@@ -109,20 +96,19 @@
       ("z" "Save" magit-stash)
       ("s" "Snapshot" magit-stash-snapshot))
      (switches
-      ("-k" "Keep index" "--keep-index")
-      ("-u" "Include untracked files" "--include-untracked")
-      ("-a" "Include all files" "--all")))
+      ("-k" "Keep index" "--keep-index")))
 
     (merging
      (man-page "git-merge")
      (actions
-      ("m" "Merge" magit-manual-merge))
+      ("m" "Merge" magit-merge))
      (switches
       ("-ff" "Fast-forward only" "--ff-only")
       ("-nf" "No fast-forward" "--no-ff")
+      ("-nc" "No commit" "--no-commit")
       ("-sq" "Squash" "--squash"))
      (arguments
-      ("-st" "Strategy" "--strategy=" read-from-minibuffer)))
+      ("-st" "Strategy" "--strategy" read-from-minibuffer)))
 
     (rewriting
      (actions
@@ -139,19 +125,7 @@
       ("u" "Update" magit-submodule-update)
       ("b" "Both update and init" magit-submodule-update-init)
       ("i" "Init" magit-submodule-init)
-      ("s" "Sync" magit-submodule-sync)))
-
-    (bisecting
-     (man-page "git-bisect")
-     (actions
-      ("b" "Bad" magit-bisect-bad)
-      ("g" "Good" magit-bisect-good)
-      ("k" "Skip" magit-bisect-skip)
-      ("l" "Log" magit-bisect-log)
-      ("r" "Reset" magit-bisect-reset)
-      ("s" "Start" magit-bisect-start)
-      ("u" "Run" magit-bisect-run)
-      ("v" "Visualize" magit-bisect-visualize))))
+      ("s" "Sync" magit-submodule-sync))))
   "Holds the key, help, function mapping for the log-mode. If you
   modify this make sure you reset `magit-key-mode-key-maps' to
   nil.")
@@ -176,7 +150,7 @@ and put in its place an empty one of the same name."
   (when (assoc group magit-key-mode-groups)
     (magit-key-mode-delete-group group))
   (setq magit-key-mode-groups
-        (cons (list group (list 'actions)) magit-key-mode-groups)))
+        (cons (list group '(actions)) magit-key-mode-groups)))
 
 (defun magit-key-mode-key-defined-p (for-group key)
   "If KEY is defined as any of switch, argument or action within
@@ -227,22 +201,15 @@ the group FOR-GROUP."
   "Provide help for a key (which the user is prompted for) within
 FOR-GROUP."
   (let* ((opts (magit-key-mode-options-for-group for-group))
-         (man-page (cadr (assoc 'man-page opts)))
-         (seq (read-key-sequence
-               (format "Enter command prefix%s: "
-                       (if man-page
-                         (format ", `?' for man `%s'" man-page)
-                         ""))))
+         (seq (read-key-sequence "Enter command prefix: "))
          (actions (cdr (assoc 'actions opts))))
-    (cond
-      ;; if it is an action popup the help for the to-be-run function
-      ((assoc seq actions) (describe-function (nth 2 (assoc seq actions))))
-      ;; if there is "?" show a man page if there is one
-      ((equal seq "?")
-       (if man-page
-         (man man-page)
-         (error "No man page associated with `%s'" for-group)))
-      (t (error "No help associated with `%s'" seq)))))
+    ;; is it an action? If so popup the help for the to-be-run
+    ;; function
+    (if (assoc seq actions)
+        (describe-function (nth 2 (assoc seq actions)))
+      ;; otherwise give the user a man page
+      (man (or (cadr (assoc 'man-page opts))
+               (error "No help associated with %s" seq))))))
 
 (defun magit-key-mode-exec-at-point ()
   "Run action/args/option at point."
@@ -251,17 +218,6 @@ FOR-GROUP."
                   (error "Nothing at point to do.")))
          (def (lookup-key (current-local-map) key)))
     (call-interactively def)))
-(defun magit-key-mode-jump-to-next-exec ()
-  "Jump to the next action/args/option point."
-  (interactive)
-  (let* ((oldp (point))
-         (old  (get-text-property oldp 'key-group-executor))
-         (p    (if (= oldp (point-max)) (point-min) (1+ oldp))))
-    (while (let ((new (get-text-property p 'key-group-executor)))
-             (and (not (= p oldp)) (or (not new) (eq new old))))
-      (setq p (if (= p (point-max)) (point-min) (1+ p))))
-    (goto-char p)
-    (skip-chars-forward " ")))
 
 (defun magit-key-mode-build-keymap (for-group)
   "Construct a normal looking keymap for the key mode to use and
@@ -269,53 +225,42 @@ put it in magit-key-mode-key-maps for fast lookup."
   (let* ((options (magit-key-mode-options-for-group for-group))
          (actions (cdr (assoc 'actions options)))
          (switches (cdr (assoc 'switches options)))
-         (arguments (cdr (assoc 'arguments options)))
-         (map (make-sparse-keymap)))
-    (suppress-keymap map 'nodigits)
-    ;; ret dwim
-    (define-key map (kbd "RET") 'magit-key-mode-exec-at-point)
-    ;; tab jumps to the next "button"
-    (define-key map (kbd "TAB") 'magit-key-mode-jump-to-next-exec)
-
-    ;; all maps should `quit' with `C-g' or `q'
-    (define-key map (kbd "C-g") `(lambda ()
-                                   (interactive)
-                                   (magit-key-mode-command nil)))
-    (define-key map (kbd "q")   `(lambda ()
-                                   (interactive)
-                                   (magit-key-mode-command nil)))
-    ;; run help
-    (define-key map (kbd "?") `(lambda ()
-                                 (interactive)
-                                 (magit-key-mode-help ',for-group)))
-
-    (flet ((defkey (k action)
-             (when (and (lookup-key map (car k))
-                        (not (numberp (lookup-key map (car k)))))
-               (message "Warning: overriding binding for `%s' in %S"
-                        (car k) for-group)
-               (ding)
-               (sit-for 2))
-             (define-key map (car k)
-               `(lambda () (interactive) ,action))))
+         (arguments (cdr (assoc 'arguments options))))
+    (let ((map (make-sparse-keymap)))
+      ;; ret dwim
+      (define-key map (kbd "RET") 'magit-key-mode-exec-at-point)
+
+      ;; all maps should 'quit' with C-g
+      (define-key map (kbd "C-g") (lambda ()
+                                    (interactive)
+                                    (magit-key-mode-command nil)))
+      ;; run help
+      (define-key map (kbd "?") `(lambda ()
+                                  (interactive)
+                                  (magit-key-mode-help ',for-group)))
+
       (when actions
         (dolist (k actions)
-          (defkey k `(magit-key-mode-command ',(nth 2 k)))))
+          (define-key map (car k) `(lambda ()
+                                     (interactive)
+                                     (magit-key-mode-command ',(nth 2 k))))))
       (when switches
         (dolist (k switches)
-          (defkey k `(magit-key-mode-add-option ',for-group ,(nth 2 k)))))
+          (define-key map (car k) `(lambda ()
+                                     (interactive)
+                                     (magit-key-mode-add-option
+                                      ',for-group
+                                      ,(nth 2 k))))))
       (when arguments
         (dolist (k arguments)
-          (defkey k `(magit-key-mode-add-argument
-                      ',for-group ,(nth 2 k) ',(nth 3 k))))))
-
-    (push (cons for-group map) magit-key-mode-key-maps)
-    map))
-
-(defvar magit-key-mode-prefix nil
-  "For internal use.  Holds the prefix argument to the command
-that brought up the key-mode window, so it can be used by the
-command that's eventually invoked.")
+          (define-key map (car k) `(lambda ()
+                                     (interactive)
+                                     (magit-key-mode-add-argument
+                                      ',for-group
+                                      ,(nth 2 k)
+                                      ',(nth 3 k))))))
+      (aput 'magit-key-mode-key-maps for-group map)
+      map)))
 
 (defun magit-key-mode-command (func)
   (let ((args '()))
@@ -323,8 +268,7 @@ command that's eventually invoked.")
     (maphash (lambda (k v)
                (push (concat k (shell-quote-argument v)) args))
              magit-key-mode-current-args)
-    (let ((magit-custom-options (append args magit-key-mode-current-options))
-          (current-prefix-arg (or current-prefix-arg magit-key-mode-prefix)))
+    (let ((magit-custom-options (append args magit-key-mode-current-options)))
       (set-window-configuration magit-log-mode-window-conf)
       (when func
         (call-interactively func))
@@ -381,7 +325,6 @@ highlighted before the description."
     (set (make-local-variable
           'magit-key-mode-current-args)
          (make-hash-table))
-    (set (make-local-variable 'magit-key-mode-prefix) current-prefix-arg)
     (magit-key-mode-redraw for-group))
   (message
    (concat
@@ -396,25 +339,20 @@ highlighted before the description."
 (defun magit-key-mode-redraw (for-group)
   "(re)draw the magit key buffer."
   (let ((buffer-read-only nil)
-        (old-point (point))
-        (is-first (zerop (buffer-size)))
-        (actions-p nil))
+        (old-point (point)))
     (erase-buffer)
     (make-local-variable 'font-lock-defaults)
     (use-local-map (magit-key-mode-get-key-map for-group))
-    (setq actions-p (magit-key-mode-draw for-group))
+    (magit-key-mode-draw for-group)
     (delete-trailing-whitespace)
     (setq mode-name "magit-key-mode" major-mode 'magit-key-mode)
-    (if (and is-first actions-p)
-      (progn (goto-char actions-p)
-             (magit-key-mode-jump-to-next-exec))
-      (goto-char old-point)))
+    (goto-char old-point))
   (setq buffer-read-only t)
   (fit-window-to-buffer))
 
 (defun magit-key-mode-draw-header (header)
   "Draw a header with the correct face."
-  (insert (propertize header 'face 'font-lock-keyword-face) "\n"))
+  (insert (propertize header 'face 'font-lock-keyword-face)))
 
 (defvar magit-key-mode-args-in-cols nil
   "When true, draw arguments in columns as with switches and
@@ -422,47 +360,64 @@ highlighted before the description."
 
 (defun magit-key-mode-draw-args (args)
   "Draw the args part of the menu."
-  (magit-key-mode-draw-buttons
-   "Args"
-   args
-   (lambda (x)
-     (format "(%s) %s"
-             (nth 2 x)
-             (propertize (gethash (nth 2 x) magit-key-mode-current-args "")
-                         'face 'widget-field)))
-   (not magit-key-mode-args-in-cols)))
+  (when args
+    (let ((strs (mapcar
+                 (lambda (argument)
+                   (propertize
+                    (format " %s: %s (%s) %s"
+                            (propertize
+                             (car argument)
+                             'face 'font-lock-builtin-face)
+                            (nth 1 argument)
+                            (nth 2 argument)
+                            (propertize
+                             (gethash (nth 2 argument)
+                                      magit-key-mode-current-args
+                                      "")
+                             'face 'widget-field))
+                    'key-group-executor (car argument)))
+                 args)))
+      (magit-key-mode-draw-header "Args\n")
+      (magit-key-mode-draw-in-cols strs (not magit-key-mode-args-in-cols)))))
 
 (defun magit-key-mode-draw-switches (switches)
   "Draw the switches part of the menu."
-  (magit-key-mode-draw-buttons
-   "Switches"
-   switches
-   (lambda (x)
-     (format "(%s)" (let ((s (nth 2 x)))
-                      (if (member s magit-key-mode-current-options)
-                        (propertize s 'face 'font-lock-warning-face)
-                        s))))))
+  (when switches
+    (let ((switch-strs (mapcar
+                        (lambda (s)
+                          (let ((option (nth 2 s)))
+                            (propertize
+                             (format " %s: %s (%s)"
+                                     (propertize (car s)
+                                                 'face 'font-lock-builtin-face)
+                                     (nth 1 s)
+                                     (if (member option magit-key-mode-current-options)
+                                         (propertize
+                                          option
+                                          'face 'font-lock-warning-face)
+                                       option))
+                             'key-group-executor (car s))))
+                        switches)))
+      (magit-key-mode-draw-header "Switches\n")
+      (magit-key-mode-draw-in-cols switch-strs))))
 
 (defun magit-key-mode-draw-actions (actions)
   "Draw the actions part of the menu."
-  (magit-key-mode-draw-buttons "Actions" actions nil))
-
-(defun magit-key-mode-draw-buttons (section xs maker
-                                    &optional one-col-each)
-  (when xs
-    (magit-key-mode-draw-header section)
-    (magit-key-mode-draw-in-cols
-     (mapcar (lambda (x)
-               (let* ((head (propertize (car x) 'face 'font-lock-builtin-face))
-                      (desc (nth 1 x))
-                      (more (and maker (funcall maker x)))
-                      (text (format " %s: %s%s%s"
-                                    head desc (if more " " "") (or more ""))))
-                 (propertize text 'key-group-executor (car x))))
-             xs)
-     one-col-each)))
-
-(defun magit-key-mode-draw-in-cols (strings one-col-each)
+  (when actions
+    (let ((action-strs (mapcar
+                        (lambda (a)
+                          (propertize
+                           (format
+                            " %s: %s"
+                            (propertize (car a)
+                                        'face 'font-lock-builtin-face)
+                            (nth 1 a))
+                           'key-group-executor (car a)))
+                       actions)))
+    (magit-key-mode-draw-header "Actions\n")
+    (magit-key-mode-draw-in-cols action-strs))))
+
+(defun magit-key-mode-draw-in-cols (strings &optional one-col-each)
   "Given a list of strings, print in columns (using `insert'). If
 ONE-COL-EACH is true then don't columify, but rather, draw each
 item on one line."
@@ -483,20 +438,15 @@ item on one line."
   (insert "\n"))
 
 (defun magit-key-mode-draw (for-group)
-  "Function used to draw actions, switches and parameters.
-
-Returns the point before the actions part, if any."
+  "Function used to draw actions, switches and parameters."
   (let* ((options (magit-key-mode-options-for-group for-group))
          (switches (cdr (assoc 'switches options)))
          (arguments (cdr (assoc 'arguments options)))
-         (actions (cdr (assoc 'actions options)))
-         (p nil))
+         (actions (cdr (assoc 'actions options))))
     (magit-key-mode-draw-switches switches)
     (magit-key-mode-draw-args arguments)
-    (when actions (setq p (point-marker)))
     (magit-key-mode-draw-actions actions)
-    (insert "\n")
-    p))
+    (insert "\n")))
 
 (defun magit-key-mode-de-generate (group)
   "Unbind the function for GROUP."
diff --git a/elpa/magit-1.0.0/magit-key-mode.elc b/elpa/magit-1.0.0/magit-key-mode.elc
new file mode 100644
index 0000000000000000000000000000000000000000..0ae053edf3c08f980cd8b10d9dcbc643134ffa61
GIT binary patch
literal 14717
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

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.0.0/magit-pkg.el b/elpa/magit-1.0.0/magit-pkg.el
new file mode 100644
index 000000000..edb7ee7ea
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-pkg.el
@@ -0,0 +1 @@
+(define-package "magit" "1.0.0" "Control Git from Emacs.")
diff --git a/elpa/magit-1.0.0/magit-pkg.el.in b/elpa/magit-1.0.0/magit-pkg.el.in
new file mode 100644
index 000000000..59335e594
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-pkg.el.in
@@ -0,0 +1 @@
+(define-package "magit" "@VERSION@" "Control Git from Emacs.")
diff --git a/elpa/smex-2.1/smex-pkg.elc b/elpa/magit-1.0.0/magit-pkg.elc
similarity index 62%
rename from elpa/smex-2.1/smex-pkg.elc
rename to elpa/magit-1.0.0/magit-pkg.elc
index 5efd7d2d17a1d6462b77338667ab2fe57d40d68a..39c7e7a3dbeeb212356e2e2641319eed38668ab5 100644
GIT binary patch
delta 125
zcmX@ga)f1qq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm9eRUk%6J%
zL{n|S+{E<E5?w<*13d$MFneOI0*is3rQycDaz-t%h?0U5SRP0_=jQ><%~5dAEKx`+
R%Fk7B%}q=$)>G2t0swk{C1(Ht

delta 126
zcmX@Ya+GC)q>Ms-o<ewPib8N|fr5gGf}xR>frXW!v4W9-q47j#ZQkPC)CyfAJwtsE
zV`9Amqw&VY<%|v>o|1wRPy$H$>Q*RZ=9Q!tr6ne(DwJoIWGHy1<m(ofROX~Aq?J}x
XRVw5rmLz9n=B4W?Ddc75XmSAnGc+dT

diff --git a/elpa/magit-1.2.0/magit-svn.el b/elpa/magit-1.0.0/magit-svn.el
similarity index 71%
rename from elpa/magit-1.2.0/magit-svn.el
rename to elpa/magit-1.0.0/magit-svn.el
index d08c048d7..ebf55768a 100644
--- a/elpa/magit-1.2.0/magit-svn.el
+++ b/elpa/magit-1.0.0/magit-svn.el
@@ -1,11 +1,11 @@
 ;;; magit-svn.el --- git-svn plug-in for Magit
 
+;; Copyright (C) 2008, 2009  Marius Vollmer
+;; Copyright (C) 2008  Linh Dang
 ;; Copyright (C) 2008  Alex Ott
+;; Copyright (C) 2008  Marcin Bachry
 ;; Copyright (C) 2009  Alexey Voinov
 ;; Copyright (C) 2009  John Wiegley
-;; Copyright (C) 2008  Linh Dang
-;; Copyright (C) 2008  Marcin Bachry
-;; Copyright (C) 2008, 2009  Marius Vollmer
 ;; Copyright (C) 2010  Yann Hodique
 ;;
 ;; Magit is free software; you can redistribute it and/or modify it
@@ -63,23 +63,11 @@
   (magit-run-git-async "svn" "dcommit"))
 
 (defun magit-svn-enabled ()
-  (not (null (magit-svn-get-ref-info t))))
-
-(defun magit-svn-expand-braces-in-branches (branch)
-  (if (not (string-match "\\(.+\\){\\(.+,.+\\)}\\(.*\\):\\(.*\\)\\\*" branch))
-      (list branch)
-    (let ((prefix (match-string 1 branch))
-          (suffix (match-string 3 branch))
-          (rhs (match-string 4 branch))
-          (pieces (split-string (match-string 2 branch) ",")))
-      (mapcar (lambda (p) (concat prefix p suffix ":" rhs p)) pieces))))
+  (not (null (magit-svn-get-ref-info))))
 
 (defun magit-svn-get-local-ref (url)
-  (let* ((branches (cons (magit-get "svn-remote" "svn" "fetch")
+  (let ((branches (cons (magit-get "svn-remote" "svn" "fetch")
                         (magit-get-all "svn-remote" "svn" "branches")))
-         (branches (apply 'nconc
-                          (mapcar 'magit-svn-expand-braces-in-branches
-                                  branches)))
         (base-url (magit-get "svn-remote" "svn" "url"))
         (result nil))
     (while branches
@@ -87,7 +75,6 @@
              (src (replace-regexp-in-string "\\*" "\\\\(.*\\\\)" (car pats)))
              (dst (replace-regexp-in-string "\\*" "\\\\1" (cadr pats)))
              (base-url (replace-regexp-in-string "\\+" "\\\\+" base-url))
-             (base-url (replace-regexp-in-string "//.+@" "//" base-url))
              (pat1 (concat "^" src "$"))
              (pat2 (cond ((equal src "") (concat "^" base-url "$"))
                          (t (concat "^" base-url "/" src "$")))))
@@ -128,8 +115,7 @@ If USE-CACHE is non-nil then return the value of `magit-get-svn-ref-info-cache'.
                  ;; the way that git-svn does it.
                  (cons 'local-ref
                        (with-temp-buffer
-                         (insert (or (magit-git-string "log" "--first-parent"
-                                                       "--grep" "git-svn" "-1")
+                         (insert (or (magit-git-string "log" "--first-parent")
                                      ""))
                          (goto-char (point-min))
                          (cond ((re-search-forward "git-svn-id: \\(.+/.+?\\)@\\([0-9]+\\)" nil t)
@@ -149,20 +135,18 @@ If USE-CACHE is non nil, use the cached information."
     (cdr (assoc 'local-ref info))))
 
 (magit-define-inserter svn-unpulled (&optional use-cache)
-  (when (magit-svn-enabled)
-    (apply #'magit-git-section
-           'svn-unpulled "Unpulled commits (SVN):" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "HEAD..%s" (magit-svn-get-ref use-cache)))))))
+  (when (magit-svn-get-ref-info t)
+    (magit-git-section 'svn-unpulled
+                       "Unpulled commits (SVN):" 'magit-wash-log
+                       "log" "--pretty=format:* %H %s"
+                       (format "HEAD..%s" (magit-svn-get-ref use-cache)))))
 
 (magit-define-inserter svn-unpushed (&optional use-cache)
-  (when (magit-svn-enabled)
-    (apply #'magit-git-section
-           'svn-unpushed "Unpushed commits (SVN):" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "%s..HEAD" (magit-svn-get-ref use-cache)))))))
+  (when (magit-svn-get-ref-info t)
+    (magit-git-section 'svn-unpushed
+                       "Unpushed commits (SVN):" 'magit-wash-log
+                       "log" "--pretty=format:* %H %s"
+                       (format "%s..HEAD" (magit-svn-get-ref use-cache)))))
 
 (magit-define-section-jumper svn-unpushed  "Unpushed commits (SVN)")
 
@@ -182,7 +166,6 @@ If USE-CACHE is non nil, use the cached information."
   nil
   "Git SVN extension menu"
   '("Git SVN"
-    :visible magit-svn-mode
     ["Create branch" magit-svn-create-branch (magit-svn-enabled)]
     ["Rebase" magit-svn-rebase (magit-svn-enabled)]
     ["Fetch" magit-svn-remote-update (magit-svn-enabled)]
@@ -192,6 +175,14 @@ If USE-CACHE is non nil, use the cached information."
                     '("Extensions")
                     magit-svn-extension-menu)
 
+(add-hook 'magit-after-insert-unpulled-commits-hook
+          (lambda () (magit-insert-svn-unpulled t)))
+
+(add-hook 'magit-after-insert-unpushed-commits-hook
+          (lambda () (magit-insert-svn-unpushed t)))
+
+(add-hook 'magit-remote-string-hook 'magit-svn-remote-string)
+
 ;; add the group and its keys
 (progn
   ;; (re-)create the group
@@ -206,35 +197,7 @@ If USE-CACHE is non nil, use the cached information."
   ;; generate and bind the menu popup function
   (magit-key-mode-generate 'svn))
 
-(defvar magit-svn-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "N") 'magit-key-mode-popup-svn)
-    map))
-
-;;;###autoload
-(define-minor-mode magit-svn-mode "SVN support for Magit"
-  :lighter " SVN" :require 'magit-svn :keymap 'magit-svn-mode-map
-  (or (derived-mode-p 'magit-mode)
-      (error "This mode only makes sense with magit"))
-  (let ((unpulled-hook (lambda () (magit-insert-svn-unpulled t)))
-        (unpushed-hook (lambda () (magit-insert-svn-unpushed t)))
-        (remote-hook 'magit-svn-remote-string))
-    (if magit-svn-mode
-        (progn
-          (add-hook 'magit-after-insert-unpulled-commits-hook unpulled-hook nil t)
-          (add-hook 'magit-after-insert-unpushed-commits-hook unpushed-hook nil t)
-          (add-hook 'magit-remote-string-hook remote-hook nil t))
-      (progn
-        (remove-hook 'magit-after-insert-unpulled-commits-hook unpulled-hook t)
-        (remove-hook 'magit-after-insert-unpushed-commits-hook unpushed-hook t)
-        (remove-hook 'magit-remote-string-hook remote-hook t)))
-    (when (called-interactively-p 'any)
-      (magit-refresh))))
-
-;;;###autoload
-(defun turn-on-magit-svn ()
-  "Unconditionally turn on `magit-svn-mode'."
-  (magit-svn-mode 1))
+(define-key magit-mode-map (kbd "N") 'magit-key-mode-popup-svn)
 
 (provide 'magit-svn)
 ;;; magit-svn.el ends here
diff --git a/elpa/magit-1.0.0/magit-svn.elc b/elpa/magit-1.0.0/magit-svn.elc
new file mode 100644
index 0000000000000000000000000000000000000000..db50b5c588ab47cc493f1f3b7c8e265bf40fc8f3
GIT binary patch
literal 6837
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
b(|M9krZ@(NF(z4hh64$06nr_McC+?hu)IIV

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.0.0/magit-topgit.el b/elpa/magit-1.0.0/magit-topgit.el
new file mode 100644
index 000000000..c4e320084
--- /dev/null
+++ b/elpa/magit-1.0.0/magit-topgit.el
@@ -0,0 +1,88 @@
+;;; magit-topgit.el --- topgit plug-in for Magit
+
+;; Copyright (C) 2010  Nathan Weizenbaum
+;; Copyright (C) 2010  Yann Hodique
+;;
+;; Magit is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; Magit is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+;; License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This plug-in provides topgit functionality as a separate component of Magit
+
+;;; Code:
+
+(require 'magit)
+(eval-when-compile
+  (require 'cl))
+
+(defcustom magit-topgit-executable "tg"
+  "The name of the TopGit executable."
+  :group 'magit
+  :type 'string)
+
+;;; Topic branches (using topgit)
+
+(defun magit-topgit-create-branch (branch parent)
+  (when (zerop (or (string-match "t/" branch) -1))
+    (magit-run* (list magit-topgit-executable "create"
+                      branch (magit-rev-to-git parent))
+                nil nil nil t)
+    t))
+
+(defun magit-topgit-pull ()
+  (when (file-exists-p ".topdeps")
+    (magit-run* (list magit-topgit-executable "update")
+                nil nil nil t)
+    t))
+
+(defun magit-topgit-wash-topic ()
+  (if (search-forward-regexp "^..\\(t/\\S-+\\)\\s-+\\(\\S-+\\)\\s-+\\(\\S-+\\)"
+                             (line-end-position) t)
+      (let ((topic (match-string 1)))
+        (delete-region (match-beginning 2) (match-end 2))
+        (goto-char (line-beginning-position))
+        (delete-char 4)
+        (insert "\t")
+        (goto-char (line-beginning-position))
+        (magit-with-section topic 'topic
+          (magit-set-section-info topic)
+          (forward-line)))
+    (delete-region (line-beginning-position) (1+ (line-end-position))))
+  t)
+
+(defun magit-topgit-wash-topics ()
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-topgit-wash-topic)))
+
+(magit-define-inserter topics ()
+  (magit-git-section 'topics
+                     "Topics:" 'magit-topgit-wash-topics
+                     "branch" "-v"))
+
+(magit-add-action (item info "discard")
+  ((topic)
+   (when (yes-or-no-p "Discard topic? ")
+     (magit-run* (list magit-topgit-executable "delete" "-f" info)
+                 nil nil nil t))))
+
+(magit-add-action (item info "visit")
+  ((topic)
+   (magit-checkout info)))
+
+(add-hook 'magit-after-insert-stashes-hook 'magit-insert-topics)
+(add-hook 'magit-create-branch-command-hook 'magit-topgit-create-branch)
+(add-hook 'magit-pull-command-hook 'magit-topgit-pull)
+
+(provide 'magit-topgit)
+;;; magit-topgit.el ends here
diff --git a/elpa/magit-1.0.0/magit-topgit.elc b/elpa/magit-1.0.0/magit-topgit.elc
new file mode 100644
index 0000000000000000000000000000000000000000..43949ae5705686fbb34e06505fe2ec9625f66dd9
GIT binary patch
literal 3679
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
E2Qcw$ZvX%Q

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.0.0/magit.el b/elpa/magit-1.0.0/magit.el
new file mode 100644
index 000000000..01442d672
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.el
@@ -0,0 +1,4746 @@
+;;; magit.el -- control Git from Emacs.
+
+;; Copyright (C) 2010 Aaron Culich.
+;; Copyright (C) 2010 Alan Falloon.
+;; Copyright (C) 2008, 2010 Alex Ott.
+;; Copyright (C) 2008, 2009, 2010 Alexey Voinov.
+;; Copyright (C) 2010 Ben Walton.
+;; Copyright (C) 2010 Chris Bernard.
+;; Copyright (C) 2010 Christian Kluge.
+;; Copyright (C) 2008 Daniel Farina.
+;; Copyright (C) 2010 David Abrahams.
+;; Copyright (C) 2009 David Wallin.
+;; Copyright (C) 2009, 2010 Hannu Koivisto.
+;; Copyright (C) 2009 Ian Eure.
+;; Copyright (C) 2009 Jesse Alama.
+;; Copyright (C) 2009 John Wiegley.
+;; Copyright (C) 2010 Leo.
+;; Copyright (C) 2008, 2009 Marcin Bachry.
+;; Copyright (C) 2008, 2009 Marius Vollmer.
+;; Copyright (C) 2010 Mark Hepburn.
+;; Copyright (C) 2010 Moritz Bunkus.
+;; Copyright (C) 2010 Nathan Weizenbaum.
+;; Copyright (C) 2010 Oscar Fuentes.
+;; Copyright (C) 2009 Pavel Holejsovsky.
+;; Copyright (C) 2009, 2010 Phil Jackson.
+;; Copyright (C) 2010 Philip Weaver.
+;; Copyright (C) 2010 Ramkumar Ramachandra.
+;; Copyright (C) 2010 Remco van 't Veer.
+;; Copyright (C) 2009 René Stadler.
+;; Copyright (C) 2010 Robin Green.
+;; Copyright (C) 2010 Roger Crew.
+;; Copyright (C) 2009, 2010, 2011 Rémi Vanicat.
+;; Copyright (C) 2010 Sean Bryant.
+;; Copyright (C) 2009 Steve Purcell.
+;; Copyright (C) 2010 Timo Juhani Lindfors.
+;; Copyright (C) 2010 Yann Hodique.
+;; Copyright (C) 2010 oscar.
+;; Copyright (C) 2010 Ævar Arnfjörð Bjarmason.
+;; Copyright (C) 2010 Óscar Fuentes.
+
+;; Original Author: Marius Vollmer <marius.vollmer@nokia.com>
+;; Lead developer: Phil Jackson <phil@shellarchive.co.uk>
+;; Version: 1.0.0
+;; Keywords: tools
+
+;;
+;; Magit is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; Magit is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+;; License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Invoking the magit-status function will show a buffer with the
+;; status of the current git repository and its working tree.  That
+;; buffer offers key bindings for manipulating the status in simple
+;; ways.
+;;
+;; The status buffer mainly shows the difference between the working
+;; tree and the index, and the difference between the index and the
+;; current HEAD.  You can add individual hunks from the working tree
+;; to the index, and you can commit the index.
+;;
+;; See the Magit User Manual for more information.
+
+;;; Code:
+
+;; magit core
+(require 'magit-key-mode)
+
+(eval-when-compile (require 'cl))
+(require 'log-edit)
+(require 'easymenu)
+(require 'diff-mode)
+
+;; Silences byte-compiler warnings
+(eval-when-compile  (require 'view))
+(eval-when-compile (require 'iswitchb))
+
+;;; Code:
+(defgroup magit nil
+  "Controlling Git from Emacs."
+  :prefix "magit-"
+  :group 'tools)
+
+(defcustom magit-git-executable "git"
+  "The name of the Git executable."
+  :group 'magit
+  :type 'string)
+
+(defcustom magit-git-standard-options '("--no-pager")
+  "Standard options when running Git."
+  :group 'magit
+  :type '(repeat string))
+
+(defcustom magit-repo-dirs nil
+  "Directories containing Git repositories.
+Magit will look into these directories for Git repositories and
+offer them as choices for `magit-status'."
+  :group 'magit
+  :type '(repeat string))
+
+(defcustom magit-repo-dirs-depth 3
+  "The maximum depth to look for Git repos.
+When looking for a Git repository below the directories in `magit-repo-dirs',
+Magit will only descend this many levels deep."
+  :group 'magit
+  :type 'integer)
+
+(defcustom magit-save-some-buffers t
+  "Non-nil means that \\[magit-status] will save modified buffers before running.
+Setting this to t will ask which buffers to save, setting it to 'dontask will
+save all modified buffers without asking."
+  :group 'magit
+  :type '(choice (const :tag "Never" nil)
+		 (const :tag "Ask" t)
+		 (const :tag "Save without asking" dontask)))
+
+(defcustom magit-save-some-buffers-predicate
+  'magit-save-buffers-predicate-tree-only
+  "Specifies a predicate function on \\[magit-save-some-buffers] to determine which
+   unsaved buffers should be prompted for saving."
+
+  :group 'magit
+  :type '(radio (function-item magit-save-buffers-predicate-tree-only)
+                (function-item magit-save-buffers-predicate-all)
+		(function :tag "Other")))
+
+(defcustom magit-commit-all-when-nothing-staged 'ask
+  "Determines what \\[magit-log-edit] does when nothing is staged.
+Setting this to nil will make it do nothing, setting it to t will
+arrange things so that the actual commit command will use the \"--all\" option,
+setting it to 'ask will first ask for confirmation whether to do this,
+and setting it to 'ask-stage will cause all changes to be staged,
+after a confirmation."
+  :group 'magit
+  :type '(choice (const :tag "No" nil)
+		 (const :tag "Always" t)
+		 (const :tag "Ask" ask)
+		 (const :tag "Ask to stage everything" ask-stage)))
+
+(defcustom magit-commit-signoff nil
+  "When performing git commit adds --signoff."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-log-cutoff-length 100
+  "The maximum number of commits to show in the log and whazzup buffers."
+  :group 'magit
+  :type 'integer)
+
+(defcustom magit-log-infinite-length 99999
+  "Number of log used to show as maximum for `magit-log-cutoff-length'."
+  :group 'magit
+  :type 'integer)
+
+(defcustom magit-process-popup-time -1
+  "Popup the process buffer if a command takes longer than this many seconds."
+  :group 'magit
+  :type '(choice (const :tag "Never" -1)
+		 (const :tag "Immediately" 0)
+		 (integer :tag "After this many seconds")))
+
+(defcustom magit-revert-item-confirm t
+  "Require acknowledgment before reverting an item."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-log-edit-confirm-cancellation nil
+  "Require acknowledgment before canceling the log edit buffer."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-remote-ref-format 'branch-then-remote
+  "What format to use for autocompleting refs, in pariticular for remotes.
+
+Autocompletion is used by functions like `magit-checkout',
+`magit-interactive-rebase' and others which offer branch name
+completion.
+
+The value 'name-then-remote means remotes will be of the
+form \"name (remote)\", while the value 'remote-slash-name
+means that they'll be of the form \"remote/name\". I.e. something that's
+listed as \"remotes/upstream/next\" by \"git branch -l -a\"
+will be \"upstream/next\"."
+  :group 'magit
+  :type '(choice (const :tag "name (remote)" branch-then-remote)
+                 (const :tag "remote/name" remote-slash-branch)))
+
+(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
+  "Connection type used for the git process.
+
+nil mean pipe, it is usually faster and more efficient, and work on cygwin.
+t mean pty, it enable magit to prompt for passphrase when needed."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-completing-read-function 'magit-builtin-completing-read
+  "Function to be called when requesting input from the user."
+  :group 'magit
+  :type '(radio (function-item magit-iswitchb-completing-read)
+		(function-item magit-builtin-completing-read)
+		(function :tag "Other")))
+
+(defgroup magit-faces nil
+  "Customize the appearance of Magit"
+  :prefix "magit-"
+  :group 'faces
+  :group 'magit)
+
+(defface magit-header
+  '((t))
+  "Face for generic header lines.
+
+Many Magit faces inherit from this one by default."
+  :group 'magit-faces)
+
+(defface magit-section-title
+  '((t :weight bold :inherit magit-header))
+  "Face for section titles."
+  :group 'magit-faces)
+
+(defface magit-branch
+  '((t :weight bold :inherit magit-header))
+  "Face for the current branch."
+  :group 'magit-faces)
+
+(defface magit-diff-file-header
+  '((t :inherit magit-header))
+  "Face for diff file header lines."
+  :group 'magit-faces)
+
+(defface magit-diff-hunk-header
+  '((t :slant italic :inherit magit-header))
+  "Face for diff hunk header lines."
+  :group 'magit-faces)
+
+(defface magit-diff-add
+  '((((class color) (background light))
+     :foreground "blue1")
+    (((class color) (background dark))
+     :foreground "white"))
+  "Face for lines in a diff that have been added."
+  :group 'magit-faces)
+
+(defface magit-diff-none
+  '((t))
+  "Face for lines in a diff that are unchanged."
+  :group 'magit-faces)
+
+(defface magit-diff-del
+  '((((class color) (background light))
+     :foreground "red")
+    (((class color) (background dark))
+     :foreground "OrangeRed"))
+  "Face for lines in a diff that have been deleted."
+  :group 'magit-faces)
+
+(defface magit-log-graph
+  '((((class color) (background light))
+     :foreground "grey11")
+    (((class color) (background dark))
+     :foreground "grey80"))
+  "Face for the graph element of the log output."
+  :group 'magit-faces)
+
+(defface magit-log-sha1
+  '((((class color) (background light))
+     :foreground "firebrick")
+    (((class color) (background dark))
+     :foreground "tomato"))
+  "Face for the sha1 element of the log output."
+  :group 'magit-faces)
+
+(defface magit-log-message
+  '((t))
+  "Face for the message element of the log output."
+  :group 'magit-faces)
+
+(defface magit-item-highlight
+  '((((class color) (background light))
+     :background "gray95")
+    (((class color) (background dark))
+     :background "dim gray"))
+  "Face for highlighting the current item."
+  :group 'magit-faces)
+
+(defface magit-item-mark
+  '((((class color) (background light))
+     :foreground "red")
+    (((class color) (background dark))
+     :foreground "orange"))
+  "Face for highlighting marked item."
+  :group 'magit-faces)
+
+(defface magit-log-tag-label
+  '((((class color) (background light))
+     :background "LightGoldenRod")
+    (((class color) (background dark))
+     :background "DarkGoldenRod"))
+  "Face for git tag labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-log-head-label-bisect-good
+  '((((class color) (background light))
+     :box t
+     :background "light green"
+     :foreground "dark olive green")
+    (((class color) (background dark))
+     :box t
+     :background "light green"
+     :foreground "dark olive green"))
+  "Face for good bisect refs"
+  :group 'magit-faces)
+
+(defface magit-log-head-label-bisect-bad
+  '((((class color) (background light))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4")
+    (((class color) (background dark))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4"))
+  "Face for bad bisect refs"
+  :group 'magit-faces)
+
+(defface magit-log-head-label-remote
+  '((((class color) (background light))
+     :box t
+     :background "Grey85"
+     :foreground "OliveDrab4")
+    (((class color) (background dark))
+     :box t
+     :background "Grey11"
+     :foreground "DarkSeaGreen2"))
+  "Face for remote branch head labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-log-head-label-tags
+  '((((class color) (background light))
+     :box t
+     :background "LemonChiffon1"
+     :foreground "goldenrod4")
+    (((class color) (background dark))
+     :box t
+     :background "LemonChiffon1"
+     :foreground "goldenrod4"))
+  "Face for tag labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-log-head-label-patches
+  '((((class color) (background light))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4")
+    (((class color) (background dark))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4"))
+  "Face for Stacked Git patches"
+  :group 'magit-faces)
+
+(defvar magit-custom-options '()
+  "List of custom options to pass git. Do not customise this.")
+
+(defvar magit-read-rev-history nil
+  "The history of inputs to `magit-read-rev'.")
+
+(defvar magit-omit-untracked-dir-contents nil
+  "When non-nil magit will only list an untracked directory, not its contents.")
+
+(defface magit-log-head-label-local
+  '((((class color) (background light))
+     :box t
+     :background "Grey85"
+     :foreground "LightSkyBlue4")
+    (((class color) (background dark))
+     :box t
+     :background "Grey13"
+     :foreground "LightSkyBlue1"))
+  "Face for local branch head labels shown in log buffer."
+  :group 'magit-faces)
+
+(defface magit-menu-selected-option
+  '((((class color) (background light))
+     :foreground "red")
+    (((class color) (background dark))
+     :foreground "orange"))
+  "Face for selected options on magit's menu"
+  :group 'magit-faces)
+
+(defvar magit-mode-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map t)
+    (define-key map (kbd "n") 'magit-goto-next-section)
+    (define-key map (kbd "p") 'magit-goto-previous-section)
+    (define-key map (kbd "TAB") 'magit-toggle-section)
+    (define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
+    (define-key map (kbd "1") 'magit-show-level-1)
+    (define-key map (kbd "2") 'magit-show-level-2)
+    (define-key map (kbd "3") 'magit-show-level-3)
+    (define-key map (kbd "4") 'magit-show-level-4)
+    (define-key map (kbd "M-1") 'magit-show-level-1-all)
+    (define-key map (kbd "M-2") 'magit-show-level-2-all)
+    (define-key map (kbd "M-3") 'magit-show-level-3-all)
+    (define-key map (kbd "M-4") 'magit-show-level-4-all)
+    (define-key map (kbd "M-h") 'magit-show-only-files)
+    (define-key map (kbd "M-H") 'magit-show-only-files-all)
+    (define-key map (kbd "M-s") 'magit-show-level-4)
+    (define-key map (kbd "M-S") 'magit-show-level-4-all)
+    (define-key map (kbd "<M-left>") 'magit-goto-parent-section)
+    (define-key map (kbd "g") 'magit-refresh)
+    (define-key map (kbd "G") 'magit-refresh-all)
+    (define-key map (kbd "?") 'magit-describe-item)
+    (define-key map (kbd "!") 'magit-key-mode-popup-running)
+    (define-key map (kbd ":") 'magit-git-command)
+    (define-key map (kbd "C-x 4 a") 'magit-add-change-log-entry-other-window)
+    (define-key map (kbd "RET") 'magit-visit-item)
+    (define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
+    (define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
+    (define-key map (kbd "C-w") 'magit-copy-item-as-kill)
+    (define-key map (kbd "R") 'magit-rebase-step)
+    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
+    (define-key map (kbd "r") 'magit-key-mode-popup-rewriting)
+    (define-key map (kbd "P") 'magit-key-mode-popup-pushing)
+    (define-key map (kbd "f") 'magit-key-mode-popup-fetching)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "F") 'magit-key-mode-popup-pulling)
+    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
+    (define-key map (kbd "$") 'magit-display-process)
+    (define-key map (kbd "c") 'magit-log-edit)
+    (define-key map (kbd "E") 'magit-interactive-rebase)
+    (define-key map (kbd "w") 'magit-wazzup)
+    (define-key map (kbd "q") 'quit-window)
+    map))
+
+(defvar magit-commit-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    map))
+
+(defvar magit-status-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
+    (define-key map (kbd "+") 'magit-diff-larger-hunks)
+    (define-key map (kbd "0") 'magit-diff-default-hunks)
+    (define-key map (kbd "s") 'magit-stage-item)
+    (define-key map (kbd "S") 'magit-stage-all)
+    (define-key map (kbd "u") 'magit-unstage-item)
+    (define-key map (kbd "U") 'magit-unstage-all)
+    (define-key map (kbd "i") 'magit-ignore-item)
+    (define-key map (kbd "I") 'magit-ignore-item-locally)
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
+    (define-key map (kbd "M") 'magit-key-mode-popup-submodule)
+    (define-key map (kbd "k") 'magit-discard-item)
+    (define-key map (kbd "e") 'magit-interactive-resolve-item)
+    (define-key map (kbd "C") 'magit-add-log)
+    (define-key map (kbd "x") 'magit-reset-head)
+    (define-key map (kbd "X") 'magit-reset-working-tree)
+    (define-key map (kbd "z") 'magit-key-mode-popup-stashing)
+    map))
+
+(defvar magit-stash-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
+    (define-key map (kbd "+") 'magit-diff-larger-hunks)
+    (define-key map (kbd "0") 'magit-diff-default-hunks)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    map))
+
+(defvar magit-log-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
+    (define-key map (kbd "x") 'magit-reset-head)
+    (define-key map (kbd "e") 'magit-log-show-more-entries)
+    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
+    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
+    map))
+
+(defvar magit-reflog-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "x") 'magit-reset-head)
+    map))
+
+(defvar magit-diff-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
+    (define-key map (kbd "+") 'magit-diff-larger-hunks)
+    (define-key map (kbd "0") 'magit-diff-default-hunks)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    map))
+
+(defvar magit-wazzup-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "d") 'magit-diff-working-tree)
+    (define-key map (kbd "D") 'magit-diff)
+    (define-key map (kbd "a") 'magit-apply-item)
+    (define-key map (kbd "A") 'magit-cherry-pick-item)
+    (define-key map (kbd "v") 'magit-revert-item)
+    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
+    (define-key map (kbd "x") 'magit-reset-head)
+    (define-key map (kbd "i") 'magit-ignore-item)
+    map))
+
+(defvar magit-show-branches-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "RET") 'magit-branches-window-checkout)
+    (define-key map (kbd "b") 'magit-branches-window-checkout)
+    (define-key map (kbd "k") 'magit-remove-branch)
+    (define-key map (kbd "K") 'magit-remove-branch-in-remote-repo)
+    (define-key map (kbd "$") 'magit-display-process)
+    (define-key map (kbd "q") 'magit-quit-branches-window)
+    (define-key map (kbd "g") 'magit-show-branches)
+    (define-key map (kbd "v") 'magit-show-branches)
+    (define-key map (kbd "T") 'magit-change-what-branch-tracks)
+    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
+    (define-key map (kbd "n") 'next-line)
+    (define-key map (kbd "p") 'previous-line)
+    map))
+
+(defvar magit-bug-report-url
+  "http://github.com/philjackson/magit/issues")
+
+(defun magit-bug-report (str)
+  (message (concat
+            "Unknown error: %s\nPlease, with as much "
+            "information as possible, file a bug at %s")
+           str magit-bug-report-url))
+
+(defun magit-buffer-switch (buf)
+  (if (string-match "magit" (buffer-name))
+      (switch-to-buffer buf)
+      (pop-to-buffer buf)))
+
+;;; Macros
+
+(defmacro magit-with-refresh (&rest body)
+  (declare (indent 0))
+  `(magit-refresh-wrapper (lambda () ,@body)))
+
+(eval-when-compile
+  (when (< emacs-major-version 23)
+    (defvar line-move-visual nil)))
+
+;;; Compatibilities
+
+(if (functionp 'start-file-process)
+    (defalias 'magit-start-process 'start-file-process)
+    (defalias 'magit-start-process 'start-process))
+
+;;; Utilities
+
+(defvar magit-submode nil)
+(make-variable-buffer-local 'magit-submode)
+(put 'magit-submode 'permanent-local t)
+
+(defun magit-iswitchb-completing-read (prompt choices &optional predicate require-match
+                                       initial-input hist def)
+  "iswitchb-based completing-read almost-replacement."
+  (require 'iswitchb)
+  (let ((iswitchb-make-buflist-hook
+         (lambda ()
+           (setq iswitchb-temp-buflist (if (consp (first choices))
+                                           (mapcar #'car choices)
+                                         choices)))))
+    (iswitchb-read-buffer prompt (or initial-input def) require-match)))
+
+(defun magit-builtin-completing-read (prompt choices &optional predicate require-match
+                                      initial-input hist def)
+  "Magit wrapper for standard completing-read function."
+  (completing-read (if (and def (> (length prompt) 2)
+                            (string-equal ": " (substring prompt -2)))
+                       (format "%s (default %s): " (substring prompt 0 -2) def)
+                     prompt)
+                   choices predicate require-match initial-input hist def))
+
+(defun magit-completing-read (prompt choices &optional predicate require-match
+                              initial-input hist def)
+  (funcall magit-completing-read-function prompt choices predicate require-match
+           initial-input hist def))
+
+(defun magit-use-region-p ()
+  (if (fboundp 'use-region-p)
+      (use-region-p)
+    (and transient-mark-mode mark-active)))
+
+(defun magit-goto-line (line)
+  "Like `goto-line' but doesn't set the mark."
+  (save-restriction
+    (widen)
+    (goto-char 1)
+    (forward-line (1- line))))
+
+(defun magit-trim-line (str)
+  (if (string= str "")
+      nil
+    (if (equal (elt str (- (length str) 1)) ?\n)
+	(substring str 0 (- (length str) 1))
+      str)))
+
+(defun magit-split-lines (str)
+  (if (string= str "")
+      nil
+    (let ((lines (nreverse (split-string str "\n"))))
+      (if (string= (car lines) "")
+	  (setq lines (cdr lines)))
+      (nreverse lines))))
+
+(defun magit-git-insert (args)
+  (apply #'process-file
+	 magit-git-executable
+	 nil (list t nil) nil
+	 (append magit-git-standard-options args)))
+
+(defun magit-git-output (args)
+  (with-output-to-string
+    (with-current-buffer
+        standard-output
+      (magit-git-insert args))))
+
+(defun magit-git-string (&rest args)
+  (magit-trim-line (magit-git-output args)))
+
+(defun magit-git-lines (&rest args)
+  (magit-split-lines (magit-git-output args)))
+
+(defun magit-git-exit-code (&rest args)
+  (apply #'process-file magit-git-executable nil nil nil
+	 (append magit-git-standard-options args)))
+
+(defun magit-file-lines (file)
+  (when (file-exists-p file)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (let ((rev (nreverse (split-string (buffer-string) "\n"))))
+	(nreverse (if (equal (car rev) "")
+		      (cdr rev)
+		    rev))))))
+
+(defun magit-write-file-lines (file lines)
+  (with-temp-buffer
+    (dolist (l lines)
+      (insert l "\n"))
+    (write-file file)))
+
+(defun magit-concat-with-delim (delim seqs)
+  (cond ((null seqs)
+	 nil)
+	((null (cdr seqs))
+	 (car seqs))
+	(t
+	 (concat (car seqs) delim (magit-concat-with-delim delim (cdr seqs))))))
+
+(defun magit-get (&rest keys)
+  (magit-git-string "config" (magit-concat-with-delim "." keys)))
+
+(defun magit-get-all (&rest keys)
+  (magit-git-lines "config" "--get-all" (magit-concat-with-delim "." keys)))
+
+(defun magit-set (val &rest keys)
+  (if val
+      (magit-git-string "config" (magit-concat-with-delim "." keys) val)
+    (magit-git-string "config" "--unset" (magit-concat-with-delim "." keys))))
+
+(defun magit-remove-conflicts (alist)
+  (let ((dict (make-hash-table :test 'equal))
+	(result nil))
+    (dolist (a alist)
+      (puthash (car a) (cons (cdr a) (gethash (car a) dict))
+	       dict))
+    (maphash (lambda (key value)
+	       (if (= (length value) 1)
+		   (push (cons key (car value)) result)
+		 (let ((sub (magit-remove-conflicts
+			     (mapcar (lambda (entry)
+				       (let ((dir (directory-file-name
+						   (substring entry 0 (- (length key))))))
+					 (cons (concat (file-name-nondirectory dir) "/" key)
+					       entry)))
+				     value))))
+		   (setq result (append result sub)))))
+	     dict)
+    result))
+
+(defun magit-git-repo-p (dir)
+  (file-exists-p (expand-file-name ".git" dir)))
+
+(defun magit-no-commit-p ()
+  "return non-nil if there is no commit in the current git repository"
+  (not (magit-git-string
+        "rev-list" "HEAD" "--max-count=1")))
+
+(defun magit-list-repos* (dir level)
+  (if (magit-git-repo-p dir)
+      (list dir)
+    (apply #'append
+	   (mapcar (lambda (entry)
+		     (unless (or (string= (substring entry -3) "/..")
+				 (string= (substring entry -2) "/."))
+		       (magit-list-repos* entry (+ level 1))))
+		   (and (file-directory-p dir)
+			(< level magit-repo-dirs-depth)
+			(directory-files dir t nil t))))))
+
+(defun magit-list-repos (dirs)
+  (magit-remove-conflicts
+   (apply #'append
+	  (mapcar (lambda (dir)
+		    (mapcar #'(lambda (repo)
+				(cons (file-name-nondirectory repo)
+				      repo))
+			    (magit-list-repos* dir 0)))
+		  dirs))))
+
+(defun magit-get-top-dir (cwd)
+  (let ((cwd (expand-file-name (file-truename cwd))))
+    (when (file-directory-p cwd)
+      (let* ((default-directory (file-name-as-directory cwd))
+             (cdup (magit-git-string "rev-parse" "--show-cdup")))
+        (when cdup
+          (file-name-as-directory (expand-file-name cdup cwd)))))))
+
+(defun magit-get-ref (ref)
+  (magit-git-string "symbolic-ref" "-q" ref))
+
+(defun magit-get-current-branch ()
+  (let* ((head (magit-get-ref "HEAD"))
+	 (pos (and head (string-match "^refs/heads/" head))))
+    (if pos
+	(substring head 11)
+      nil)))
+
+(defun magit-get-remote (branch)
+  "Return the name of the remote for BRANCH.
+If branch is nil or it has no remote, but a remote named
+\"origin\" exists, return that. Otherwise, return nil."
+  (let ((remote (or (and branch (magit-get "branch" branch "remote"))
+                    (and (magit-get "remote" "origin" "url") "origin"))))
+    (if (string= remote "") nil remote)))
+
+(defun magit-get-current-remote ()
+  "Return the name of the remote for the current branch.
+If there is no current branch, or no remote for that branch,
+but a remote named \"origin\" is configured, return that.
+Otherwise, return nil."
+  (magit-get-remote (magit-get-current-branch)))
+
+(defun magit-ref-exists-p (ref)
+  (= (magit-git-exit-code "show-ref" "--verify" ref) 0))
+
+(defun magit-read-top-dir (rawp)
+  (if (and (not rawp) magit-repo-dirs)
+      (let* ((repos (magit-list-repos magit-repo-dirs))
+	     (reply (magit-completing-read "Git repository: "
+                                           (magit-list-repos magit-repo-dirs))))
+	(file-name-as-directory
+	 (cdr (assoc reply repos))))
+    (file-name-as-directory
+     (read-directory-name "Git repository: "
+			  (or (magit-get-top-dir default-directory)
+			      default-directory)))))
+
+(defun magit-rev-parse (ref)
+  "Return the SHA hash for REF."
+  (magit-git-string "rev-parse" ref))
+
+(defun magit-ref-ambiguous-p (ref)
+  "Return whether or not REF is ambiguous."
+  ;; If REF is ambiguous, rev-parse just prints errors,
+  ;; so magit-git-string returns nil.
+  (not (magit-git-string "rev-parse" "--abbrev-ref" ref)))
+
+(defun magit-name-rev (rev)
+  "Return a human-readable name for REV.
+Unlike git name-rev, this will remove tags/ and remotes/ prefixes
+if that can be done unambiguously.  In addition, it will filter
+out revs involving HEAD."
+  (when rev
+    (let ((name (magit-git-string "name-rev" "--no-undefined" "--name-only" rev)))
+      ;; There doesn't seem to be a way of filtering HEAD out from name-rev,
+      ;; so we have to do it manually.
+      ;; HEAD-based names are too transient to allow.
+      (when (and (stringp name)
+                 (string-match "^\\(.*\\<HEAD\\)\\([~^].*\\|$\\)" name))
+        (let ((head-ref (match-string 1 name))
+              (modifier (match-string 2 name)))
+          ;; Sometimes when name-rev gives a HEAD-based name,
+          ;; rev-parse will give an actual branch or remote name.
+          (setq name (concat (magit-git-string "rev-parse" "--abbrev-ref" head-ref)
+                             modifier))
+          ;; If rev-parse doesn't give us what we want, just use the SHA.
+          (when (or (null name) (string-match-p "\\<HEAD\\>" name))
+            (setq name (magit-rev-parse rev)))))
+      (setq rev (or name rev))
+      (when (string-match "^\\(?:tags\\|remotes\\)/\\(.*\\)" rev)
+        (let ((plain-name (match-string 1 rev)))
+          (unless (magit-ref-ambiguous-p plain-name)
+            (setq rev plain-name))))
+      rev)))
+
+(defun magit-put-line-property (prop val)
+  (put-text-property (line-beginning-position) (line-beginning-position 2)
+		     prop val))
+
+(defun magit-format-commit (commit format)
+  (magit-git-string "log" "--max-count=1"
+		    (concat "--pretty=format:" format)
+		    commit))
+
+(defun magit-current-line ()
+  (buffer-substring-no-properties (line-beginning-position)
+				  (line-end-position)))
+
+(defun magit-insert-region (beg end buf)
+  (let ((text (buffer-substring-no-properties beg end)))
+    (with-current-buffer buf
+      (insert text))))
+
+(defun magit-insert-current-line (buf)
+  (let ((text (buffer-substring-no-properties
+	       (line-beginning-position) (line-beginning-position 2))))
+    (with-current-buffer buf
+      (insert text))))
+
+(defun magit-file-uptodate-p (file)
+  (eq (magit-git-exit-code "diff" "--quiet" "--" file) 0))
+
+(defun magit-anything-staged-p ()
+  (not (eq (magit-git-exit-code "diff" "--quiet" "--cached") 0)))
+
+(defun magit-everything-clean-p ()
+  (and (not (magit-anything-staged-p))
+       (eq (magit-git-exit-code "diff" "--quiet") 0)))
+
+(defun magit-commit-parents (commit)
+  (cdr (split-string (magit-git-string "rev-list" "-1" "--parents" commit))))
+
+;; XXX - let the user choose the parent
+
+(defun magit-choose-parent-id (commit op)
+  (let* ((parents (magit-commit-parents commit)))
+    (if (> (length parents) 1)
+	(error "Can't %s merge commits" op)
+      nil)))
+
+;;; Revisions and ranges
+
+(defvar magit-current-range nil
+  "The range described by the current buffer.
+This is only non-nil in diff and log buffers.
+
+This has three possible (non-nil) forms.  If it's a string REF or
+a singleton list (REF), then the range is from REF to the current
+working directory state (or HEAD in a log buffer).  If it's a
+pair (START . END), then the range is START..END.")
+(make-variable-buffer-local 'magit-current-range)
+
+(defun magit-list-interesting-refs (&optional uninteresting)
+  "Return interesting references as given by `git show-ref'.
+Removes references matching UNINTERESTING from the
+results. UNINTERESTING can be either a function taking a single
+argument or a list of strings used as regexps."
+  (let ((refs ()))
+    (dolist (line (magit-git-lines "show-ref"))
+      (if (string-match "[^ ]+ +\\(.*\\)" line)
+          (let ((ref (match-string 1 line)))
+            (cond ((and (functionp uninteresting)
+                        (funcall uninteresting ref)))
+                  ((and (not (functionp uninteresting))
+                        (loop for i in uninteresting thereis (string-match i ref))))
+                  ((string-match "refs/heads/\\(.*\\)" ref)
+                   (let ((branch (match-string 1 ref)))
+                     (push (cons branch branch) refs)))
+                  ((string-match "refs/tags/\\(.*\\)" ref)
+                   (push (cons (format
+                                (if (eq magit-remote-ref-format 'branch-then-remote)
+                                    "%s (tag)" "%s")
+                                (match-string 1 ref))
+                               ref)
+                         refs))
+                  ((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref)
+                   (push (cons (if (eq magit-remote-ref-format 'branch-then-remote)
+                                   (format "%s (%s)"
+                                           (match-string 2 ref)
+                                           (match-string 1 ref))
+                                 (format "%s/%s"
+                                         (match-string 1 ref)
+                                         (match-string 2 ref)))
+                               ref)
+                         refs))))))
+    (nreverse refs)))
+
+(defvar magit-uninteresting-refs '("refs/remotes/\\([^/]+\\)/HEAD$"))
+
+;; TODO: fix this so that def can (must?) be git rev instead of, say, "master (origin)"
+;; which involves a particular display strategy and shouldn't be visible to callers
+;; of magit-read-rev
+(defun magit-read-rev (prompt &optional def uninteresting)
+  (let* ((interesting-refs (magit-list-interesting-refs
+                            (or uninteresting magit-uninteresting-refs)))
+	 (reply (magit-completing-read (concat prompt ": ") interesting-refs
+                                       nil nil nil 'magit-read-rev-history def))
+	 (rev (or (cdr (assoc reply interesting-refs)) reply)))
+    (if (string= rev "")
+	nil
+      rev)))
+
+(defun magit-read-rev-range (op &optional def-beg def-end)
+  (let ((beg (magit-read-rev (format "%s start" op)
+			     def-beg)))
+    (if (not beg)
+	nil
+      (save-match-data
+	(if (string-match "^\\(.+\\)\\.\\.\\(.+\\)$" beg)
+	    (cons (match-string 1 beg) (match-string 2 beg))
+	  (let ((end (magit-read-rev (format "%s end" op) def-end)))
+	    (cons beg end)))))))
+
+(defun magit-rev-to-git (rev)
+  (or rev
+      (error "No revision specified"))
+  (if (string= rev ".")
+      (magit-marked-commit)
+    rev))
+
+(defun magit-rev-range-to-git (range)
+  (or range
+      (error "No revision range specified"))
+  (if (stringp range)
+      range
+    (if (cdr range)
+	(format "%s..%s"
+		(magit-rev-to-git (car range))
+		(magit-rev-to-git (cdr range)))
+      (format "%s" (magit-rev-to-git (car range))))))
+
+(defun magit-rev-describe (rev)
+  (or rev
+      (error "No revision specified"))
+  (if (string= rev ".")
+      "mark"
+    (magit-name-rev rev)))
+
+(defun magit-rev-range-describe (range things)
+  (or range
+      (error "No revision range specified"))
+  (if (stringp range)
+      (format "%s in %s" things range)
+    (if (cdr range)
+	(format "%s from %s to %s" things
+		(magit-rev-describe (car range))
+		(magit-rev-describe (cdr range)))
+      (format "%s at %s" things (magit-rev-describe (car range))))))
+
+(defun magit-default-rev ()
+  (or (magit-name-rev (magit-commit-at-point t))
+      (let ((branch (magit-guess-branch)))
+	(if branch
+	    (if (string-match "^refs/\\(.*\\)" branch)
+		(match-string 1 branch)
+		branch)))))
+
+(defun magit-read-remote (&optional prompt def)
+  "Read the name of a remote.
+PROMPT is used as the prompt, and defaults to \"Remote\".
+DEF is the default value, and defaults to the value of `magit-get-current-branch'."
+  (let* ((prompt (or prompt "Remote: "))
+         (def (or def (magit-get-current-remote)))
+	 (remotes (magit-git-lines "remote"))
+	 (reply (magit-completing-read prompt remotes
+                                       nil nil nil nil def)))
+    (if (string= reply "") nil reply)))
+
+;;; Sections
+
+;; A buffer in magit-mode is organized into hierarchical sections.
+;; These sections are used for navigation and for hiding parts of the
+;; buffer.
+;;
+;; Most sections also represent the objects that Magit works with,
+;; such as files, diffs, hunks, commits, etc.  The 'type' of a section
+;; identifies what kind of object it represents (if any), and the
+;; parent and grand-parent, etc provide the context.
+
+(defstruct magit-section
+  parent title beginning end children hidden type info
+  needs-refresh-on-show)
+
+(defvar magit-top-section nil
+  "The top section of the current buffer.")
+(make-variable-buffer-local 'magit-top-section)
+(put 'magit-top-section 'permanent-local t)
+
+(defvar magit-old-top-section nil)
+
+(defvar magit-section-hidden-default nil)
+
+(defun magit-new-section (title type)
+  "Create a new section with title TITLE and type TYPE in current buffer.
+
+If not `magit-top-section' exist, the new section will be the new top-section
+otherwise, the new-section will be a child of the current top-section.
+
+If TYPE is nil, the section won't be highlighted."
+  (let* ((s (make-magit-section :parent magit-top-section
+				:title title
+				:type type
+				:hidden magit-section-hidden-default))
+	 (old (and magit-old-top-section
+		   (magit-find-section (magit-section-path s)
+				       magit-old-top-section))))
+    (if magit-top-section
+	(push s (magit-section-children magit-top-section))
+	(setq magit-top-section s))
+    (if old
+	(setf (magit-section-hidden s) (magit-section-hidden old)))
+    s))
+
+(defun magit-cancel-section (section)
+  "Delete the section SECTION."
+  (delete-region (magit-section-beginning section)
+		 (magit-section-end section))
+  (let ((parent (magit-section-parent section)))
+    (if parent
+	(setf (magit-section-children parent)
+	      (delq section (magit-section-children parent)))
+	(setq magit-top-section nil))))
+
+(defmacro magit-with-section (title type &rest body)
+  "Create a new section of title TITLE and type TYPE and evaluate BODY there.
+
+Sections create into BODY will be child of the new section.
+BODY must leave point at the end of the created section.
+
+If TYPE is nil, the section won't be highlighted."
+  (declare (indent 2))
+  (let ((s (make-symbol "*section*")))
+    `(let* ((,s (magit-new-section ,title ,type))
+	    (magit-top-section ,s))
+       (setf (magit-section-beginning ,s) (point))
+       ,@body
+       (setf (magit-section-end ,s) (point))
+       (setf (magit-section-children ,s)
+	     (nreverse (magit-section-children ,s)))
+       ,s)))
+
+(defun magit-set-section-info (info &optional section)
+  (setf (magit-section-info (or section magit-top-section)) info))
+
+(defun magit-set-section-needs-refresh-on-show (flag &optional section)
+  (setf (magit-section-needs-refresh-on-show
+	 (or section magit-top-section))
+	flag))
+
+(defmacro magit-create-buffer-sections (&rest body)
+  "Empty current buffer of text and magit's section, and then evaluate BODY."
+  (declare (indent 0))
+  `(let ((inhibit-read-only t))
+     (erase-buffer)
+     (let ((magit-old-top-section magit-top-section))
+       (setq magit-top-section nil)
+       ,@body
+       (when (null magit-top-section)
+	 (magit-with-section 'top nil
+	   (insert "(empty)\n")))
+       (magit-propertize-section magit-top-section)
+       (magit-section-set-hidden magit-top-section
+				 (magit-section-hidden magit-top-section)))))
+
+(defun magit-propertize-section (section)
+  "Add text-property needed for SECTION."
+  (put-text-property (magit-section-beginning section)
+		     (magit-section-end section)
+		     'magit-section section)
+  (dolist (s (magit-section-children section))
+    (magit-propertize-section s)))
+
+(defun magit-find-section (path top)
+  "Find the section at the path PATH in subsection of section TOP."
+  (if (null path)
+      top
+    (let ((secs (magit-section-children top)))
+      (while (and secs (not (equal (car path)
+				   (magit-section-title (car secs)))))
+	(setq secs (cdr secs)))
+      (and (car secs)
+	   (magit-find-section (cdr path) (car secs))))))
+
+(defun magit-section-path (section)
+  "Return the path of SECTION."
+  (if (not (magit-section-parent section))
+      '()
+    (append (magit-section-path (magit-section-parent section))
+	    (list (magit-section-title section)))))
+
+;; Dead code:
+(defun magit-find-section-at (pos secs)
+  "Return the section at POS in SECS."
+  ;; Could use the text-property
+  (while (and secs
+	      (not (and (<= (magit-section-beginning (car secs)) pos)
+			(<  pos (magit-section-end (car secs))))))
+    (setq secs (cdr secs)))
+  (if secs
+      (or (magit-find-section-at pos (magit-section-children (car secs)))
+	  (car secs))
+    nil))
+
+(defun magit-find-section-after (pos secs)
+  "Find the first section that begins after POS in the list SECS."
+  (while (and secs
+	      (not (> (magit-section-beginning (car secs)) pos)))
+    (setq secs (cdr secs)))
+  (car secs))
+
+(defun magit-find-section-before (pos secs)
+  "Find the last section that begins before POS in the list SECS."
+  (let ((prev nil))
+    (while (and secs
+		(not (> (magit-section-beginning (car secs)) pos)))
+      (setq prev (car secs))
+      (setq secs (cdr secs)))
+    prev))
+
+(defun magit-current-section ()
+  "Return the magit section at point."
+  (or (get-text-property (point) 'magit-section)
+      magit-top-section))
+
+(defun magit-insert-section (section-title-and-type
+			     buffer-title washer cmd &rest args)
+  "Run CMD and put its result in a new section.
+
+SECTION-TITLE-AND-TYPE is either a string that is the title of the section
+or (TITLE . TYPE) where TITLE is the title of the section and TYPE is its type.
+
+If there is no type, or if type is nil, the section won't be highlighted.
+
+BUFFER-TITLE is the inserted title of the section
+
+WASHER is a function that will be run after CMD.
+The buffer will be narrowed to the inserted text.
+It should add sectioning as needed for magit interaction
+
+CMD is an external command that will be run with ARGS as arguments"
+  (let* ((body-beg nil)
+	 (section-title (if (consp section-title-and-type)
+			    (car section-title-and-type)
+			  section-title-and-type))
+	 (section-type (if (consp section-title-and-type)
+			   (cdr section-title-and-type)
+			 nil))
+	 (section
+	  (magit-with-section section-title section-type
+	    (if buffer-title
+		(insert (propertize buffer-title 'face 'magit-section-title)
+			"\n"))
+	    (setq body-beg (point))
+	    (apply 'process-file cmd nil t nil args)
+	    (if (not (eq (char-before) ?\n))
+		(insert "\n"))
+	    (if washer
+		(save-restriction
+		  (narrow-to-region body-beg (point))
+		  (goto-char (point-min))
+		  (funcall washer)
+		  (goto-char (point-max)))))))
+    (if (= body-beg (point))
+	(magit-cancel-section section)
+      (insert "\n"))
+    section))
+
+(defun magit-git-section (section-title-and-type
+			  buffer-title washer &rest args)
+  "Run git and put its result in a new section.
+
+see `magit-insert-section' for meaning of the arguments"
+  (apply #'magit-insert-section
+	 section-title-and-type
+	 buffer-title
+	 washer
+	 magit-git-executable
+	 (append magit-git-standard-options args)))
+
+(defun magit-next-section (section)
+  "Return the section that is after SECTION."
+  (let ((parent (magit-section-parent section)))
+    (if parent
+	(let ((next (cadr (memq section
+				(magit-section-children parent)))))
+	  (or next
+	      (magit-next-section parent))))))
+
+(defun magit-goto-next-section ()
+  "Go to the next magit section."
+  (interactive)
+  (let* ((section (magit-current-section))
+	 (next (or (and (not (magit-section-hidden section))
+			(magit-section-children section)
+			(magit-find-section-after (point)
+						  (magit-section-children
+						   section)))
+		   (magit-next-section section))))
+
+    (if next
+	(progn
+	  (goto-char (magit-section-beginning next))
+	  (if (memq magit-submode '(log reflog))
+	      (magit-show-commit next))
+	  (if (not (magit-section-hidden next))
+	      (let ((offset (- (line-number-at-pos
+				(magit-section-beginning next))
+			       (line-number-at-pos
+				(magit-section-end next)))))
+		(if (< offset (window-height))
+		    (recenter offset)))))
+      (message "No next section"))))
+
+(defun magit-prev-section (section)
+  "Return the section that is before SECTION."
+  (let ((parent (magit-section-parent section)))
+    (if parent
+	(let ((prev (cadr (memq section
+				(reverse (magit-section-children parent))))))
+	  (cond (prev
+		 (while (and (not (magit-section-hidden prev))
+			     (magit-section-children prev))
+		   (setq prev (car (reverse (magit-section-children prev)))))
+		 prev)
+		(t
+		 parent))))))
+
+(defun magit-goto-previous-section ()
+  "Goto the previous magit section."
+  (interactive)
+  (let ((section (magit-current-section)))
+    (cond ((= (point) (magit-section-beginning section))
+	   (let ((prev (magit-prev-section (magit-current-section))))
+	     (if prev
+		 (progn
+		   (if (memq magit-submode '(log reflog))
+		       (magit-show-commit (or prev section)))
+		   (goto-char (magit-section-beginning prev)))
+	       (message "No previous section"))))
+	  (t
+	   (let ((prev (magit-find-section-before (point)
+						  (magit-section-children
+						   section))))
+	     (if (memq magit-submode '(log reflog))
+		 (magit-show-commit (or prev section)))
+	     (goto-char (magit-section-beginning (or prev section))))))))
+
+(defun magit-goto-parent-section ()
+  "Goto the parent section."
+  (interactive)
+  (let ((parent (magit-section-parent (magit-current-section))))
+    (when parent
+      (goto-char (magit-section-beginning parent)))))
+
+(defun magit-goto-section (path)
+  "Goto the section describe by PATH."
+  (let ((sec (magit-find-section path magit-top-section)))
+    (if sec
+	(goto-char (magit-section-beginning sec))
+      (message "No such section"))))
+
+(defun magit-for-all-sections (func &optional top)
+  "Run FUNC on TOP and recursively on all its children.
+
+Default value for TOP is `magit-top-section'"
+  (let ((section (or top magit-top-section)))
+    (when section
+      (funcall func section)
+      (dolist (c (magit-section-children section))
+	(magit-for-all-sections func c)))))
+
+(defun magit-section-set-hidden (section hidden)
+  "Hide SECTION if HIDDEN is not nil, show it otherwise."
+  (setf (magit-section-hidden section) hidden)
+  (if (and (not hidden)
+	   (magit-section-needs-refresh-on-show section))
+      (magit-refresh)
+    (let ((inhibit-read-only t)
+	  (beg (save-excursion
+		 (goto-char (magit-section-beginning section))
+		 (forward-line)
+		 (point)))
+	  (end (magit-section-end section)))
+      (put-text-property beg end 'invisible hidden))
+    (if (not hidden)
+	(dolist (c (magit-section-children section))
+	  (magit-section-set-hidden c (magit-section-hidden c))))))
+
+(defun magit-section-any-hidden (section)
+  "Return true if SECTION or any of its children is hidden."
+  (or (magit-section-hidden section)
+      (let ((kids (magit-section-children section)))
+	(while (and kids (not (magit-section-any-hidden (car kids))))
+	  (setq kids (cdr kids)))
+	kids)))
+
+(defun magit-section-collapse (section)
+  "Show SECTION and hide all its children."
+  (dolist (c (magit-section-children section))
+    (setf (magit-section-hidden c) t))
+  (magit-section-set-hidden section nil))
+
+(defun magit-section-expand (section)
+  "Show SECTION and all its children."
+  (dolist (c (magit-section-children section))
+    (setf (magit-section-hidden c) nil))
+  (magit-section-set-hidden section nil))
+
+(defun magit-section-expand-all-aux (section)
+  "Show recursively all SECTION's children."
+  (dolist (c (magit-section-children section))
+    (setf (magit-section-hidden c) nil)
+    (magit-section-expand-all-aux c)))
+
+(defun magit-section-expand-all (section)
+  "Show SECTION and all its children."
+  (magit-section-expand-all-aux section)
+  (magit-section-set-hidden section nil))
+
+(defun magit-section-hideshow (flag-or-func)
+  "Show or hide current section depending on FLAG-OR-FUNC.
+
+If FLAG-OR-FUNC is a function, it will be ran on current section
+IF FLAG-OR-FUNC is a Boolean value, the section will be hidden if its true, shown otherwise"
+  (let ((section (magit-current-section)))
+    (when (magit-section-parent section)
+      (goto-char (magit-section-beginning section))
+      (if (functionp flag-or-func)
+	  (funcall flag-or-func section)
+	  (magit-section-set-hidden section flag-or-func)))))
+
+(defun magit-show-section ()
+  "Show current section."
+  (interactive)
+  (magit-section-hideshow nil))
+
+(defun magit-hide-section ()
+  "Hide current section."
+  (interactive)
+  (magit-section-hideshow t))
+
+(defun magit-collapse-section ()
+  "Hide all subsection of current section."
+  (interactive)
+  (magit-section-hideshow #'magit-section-collapse))
+
+(defun magit-expand-section ()
+  "Show all subsection of current section."
+  (interactive)
+  (magit-section-hideshow #'magit-section-expand))
+
+(defun magit-toggle-file-section ()
+  "Like `magit-toggle-section' but toggle at file granularity."
+  (interactive)
+  (when (eq 'hunk (first (magit-section-context-type (magit-current-section))))
+    (magit-goto-parent-section))
+  (magit-toggle-section))
+
+(defun magit-toggle-section ()
+  "Toggle hidden status of current section."
+  (interactive)
+  (magit-section-hideshow
+   (lambda (s)
+     (magit-section-set-hidden s (not (magit-section-hidden s))))))
+
+(defun magit-expand-collapse-section ()
+  "Toggle hidden status of subsections of current section."
+  (interactive)
+  (magit-section-hideshow
+   (lambda (s)
+     (cond ((magit-section-any-hidden s)
+	    (magit-section-expand-all s))
+	   (t
+	    (magit-section-collapse s))))))
+
+(defun magit-cycle-section ()
+  "Cycle between expanded, hidden and collapsed state for current section.
+
+Hidden: only the first line of the section is shown
+Collapsed: only the first line of the subsection is shown
+Expanded: everything is shown."
+  (interactive)
+  (magit-section-hideshow
+   (lambda (s)
+     (cond ((magit-section-hidden s)
+	    (magit-section-collapse s))
+	   ((notany #'magit-section-hidden (magit-section-children s))
+	    (magit-section-set-hidden s t))
+	   (t
+	    (magit-section-expand s))))))
+
+(defun magit-section-lineage (s)
+  "Return list of parent, grand-parents... for section S."
+  (when s
+    (cons s (magit-section-lineage (magit-section-parent s)))))
+
+(defun magit-section-show-level (section level threshold path)
+  (magit-section-set-hidden section (>= level threshold))
+  (when (and (< level threshold)
+             (not (magit-no-commit-p)))
+	(if path
+	    (magit-section-show-level (car path) (1+ level) threshold (cdr path))
+	    (dolist (c (magit-section-children section))
+	      (magit-section-show-level c (1+ level) threshold nil)))))
+
+(defun magit-show-level (level all)
+  "Show section whose level is less than LEVEL, hide the others.
+If ALL is non nil, do this in all sections,
+otherwise do it only on ancestors and descendants of current section."
+  (magit-with-refresh
+    (if all
+	(magit-section-show-level magit-top-section 0 level nil)
+      (let ((path (reverse (magit-section-lineage (magit-current-section)))))
+	(magit-section-show-level (car path) 0 level (cdr path))))))
+
+(defun magit-show-only-files ()
+  "Show section that are files, but not there subsection.
+
+Do this in on ancestors and descendants of current section."
+  (interactive)
+  (if (eq magit-submode 'status)
+      (call-interactively 'magit-show-level-2)
+    (call-interactively 'magit-show-level-1)))
+
+(defun magit-show-only-files-all ()
+  "Show section that are files, but not there subsection.
+
+Do this for all sections"
+  (interactive)
+  (if (eq magit-submode 'status)
+      (call-interactively 'magit-show-level-2-all)
+    (call-interactively 'magit-show-level-1-all)))
+
+(defmacro magit-define-level-shower-1 (level all)
+  "Define an interactive function to show function of level LEVEL.
+
+If ALL is non nil, this function will affect all section,
+otherwise it will affect only ancestors and descendants of current section."
+  (let ((fun (intern (format "magit-show-level-%s%s"
+			     level (if all "-all" ""))))
+	(doc (format "Show sections on level %s." level)))
+    `(defun ,fun ()
+       ,doc
+       (interactive)
+       (magit-show-level ,level ,all))))
+
+(defmacro magit-define-level-shower (level)
+  "Define two interactive function to show function of level LEVEL.
+one for all, one for current lineage."
+  `(progn
+     (magit-define-level-shower-1 ,level nil)
+     (magit-define-level-shower-1 ,level t)))
+
+(defmacro magit-define-section-jumper (sym title)
+  "Define an interactive function to go to section SYM.
+
+TITLE is the displayed title of the section."
+  (let ((fun (intern (format "magit-jump-to-%s" sym)))
+	(doc (format "Jump to section `%s'." title)))
+    `(defun ,fun ()
+       ,doc
+       (interactive)
+       (magit-goto-section '(,sym)))))
+
+(defmacro magit-define-inserter (sym arglist &rest body)
+  (declare (indent defun))
+  (let ((fun (intern (format "magit-insert-%s" sym)))
+        (before (intern (format "magit-before-insert-%s-hook" sym)))
+        (after (intern (format "magit-after-insert-%s-hook" sym)))
+        (doc (format "Insert items for `%s'." sym)))
+    `(defun ,fun ,arglist
+       ,doc
+       (run-hooks ',before)
+       ,@body
+       (run-hooks ',after))))
+
+(defvar magit-highlight-overlay nil)
+
+(defvar magit-highlighted-section nil)
+
+(defun magit-highlight-section ()
+  "Highlight current section if it have a type."
+  (let ((section (magit-current-section)))
+    (when (not (eq section magit-highlighted-section))
+      (setq magit-highlighted-section section)
+      (if (not magit-highlight-overlay)
+	  (let ((ov (make-overlay 1 1)))
+	    (overlay-put ov 'face 'magit-item-highlight)
+	    (setq magit-highlight-overlay ov)))
+      (if (and section (magit-section-type section))
+	  (move-overlay magit-highlight-overlay
+			(magit-section-beginning section)
+			(magit-section-end section)
+			(current-buffer))
+	(delete-overlay magit-highlight-overlay)))))
+
+(defun magit-section-context-type (section)
+  (if (null section)
+      '()
+    (let ((c (or (magit-section-type section)
+		 (if (symbolp (magit-section-title section))
+		     (magit-section-title section)))))
+      (if c
+	  (cons c (magit-section-context-type
+		   (magit-section-parent section)))
+	'()))))
+
+(defun magit-prefix-p (prefix list)
+  ;;; Very schemish...
+  (or (null prefix)
+      (if (eq (car prefix) '*)
+          (or (magit-prefix-p (cdr prefix) list)
+              (and (not (null list))
+                   (magit-prefix-p prefix (cdr list))))
+        (and (not (null list))
+             (equal (car prefix) (car list))
+             (magit-prefix-p (cdr prefix) (cdr list))))))
+
+(defmacro magit-section-case (head &rest clauses)
+  "Make different action depending of current section.
+
+HEAD is (SECTION INFO &optional OPNAME),
+  SECTION will be bind to the current section,
+  INFO will be bind to the info's of the current section,
+  OPNAME is a string that will be used to describe current action,
+
+CLAUSES is a list of CLAUSE, each clause is (SECTION-TYPE &BODY)
+where SECTION-TYPE describe section where BODY will be run.
+
+This returns non-nil if some section matches. If the
+corresponding body return a non-nil value, it is returned,
+otherwise it roturn t.
+
+If no section matches, this returns nil if no OPNAME was given
+and throws an error otherwise."
+  (declare (indent 1))
+  (let ((section (car head))
+        (info (cadr head))
+        (type (make-symbol "*type*"))
+        (context (make-symbol "*context*"))
+        (opname (caddr head)))
+    `(let* ((,section (magit-current-section))
+            (,info (magit-section-info ,section))
+            (,type (magit-section-type ,section))
+            (,context (magit-section-context-type ,section)))
+       (cond ,@(mapcar (lambda (clause)
+                         (if (eq (car clause) t)
+                             `(t (or (progn ,@(cdr clause))
+				     t))
+                           (let ((prefix (reverse (car clause)))
+                                 (body (cdr clause)))
+                             `((magit-prefix-p ',prefix ,context)
+                               (or (progn ,@body)
+				   t)))))
+                       clauses)
+             ,@(when opname
+                 `(((run-hook-with-args-until-success
+                     ',(intern (format "magit-%s-action-hook" opname))))
+                   ((not ,type)
+                    (error "Nothing to %s here" ,opname))
+                   (t
+                    (error "Can't %s a %s"
+                           ,opname
+                           (or (get ,type 'magit-description)
+                               ,type)))))))))
+
+(defmacro magit-section-action (head &rest clauses)
+  (declare (indent 1))
+  `(magit-with-refresh
+     (magit-section-case ,head ,@clauses)))
+
+(defmacro magit-add-action (head &rest clauses)
+  "Add additional actions to a pre-existing operator.
+The syntax is identical to `magit-section-case', except that
+OPNAME is mandatory and specifies the operation to which to add
+the actions."
+  (declare (indent 1))
+  (let ((section (car head))
+        (info (cadr head))
+        (type (caddr head)))
+    `(add-hook ',(intern (format "magit-%s-action-hook" type))
+               (lambda ()
+                 ,(macroexpand
+                   ;; Don't pass in the opname so we don't recursively
+                   ;; run the hook again, and so we don't throw an
+                   ;; error if no action matches.
+                   `(magit-section-case (,section ,info)
+                      ,@clauses))))))
+
+(defun magit-wash-sequence (func)
+  "Run FUNC until end of buffer is reached.
+
+FUNC should leave point at the end of the modified region"
+  (while (and (not (eobp))
+              (funcall func))))
+
+(defmacro magit-define-command (sym arglist &rest body)
+  "Macro to define a magit command.
+It will define the magit-SYM function having ARGLIST as argument.
+It will also define the magit-SYM-command-hook variable.
+
+The defined function will call the function in the hook in
+order until one return non nil. If they all return nil then body will be called.
+
+It used to define hookable magit command: command defined by this
+function can be enriched by magit extension like magit-topgit and magit-svn"
+  (declare (indent defun))
+  (let ((fun (intern (format "magit-%s" sym)))
+        (hook (intern (format "magit-%s-command-hook" sym)))
+        (doc (format "Command for `%s'." sym))
+        (inter nil)
+        (instr body))
+    (when (stringp (car body))
+      (setq doc (car body)
+            instr (cdr body)))
+    (let ((form (car instr)))
+      (when (eq (car form) 'interactive)
+        (setq inter form
+              instr (cdr instr))))
+    `(defun ,fun ,arglist
+       ,doc
+       ,inter
+       (or (run-hook-with-args-until-success
+            ',hook ,@(remq '&optional (remq '&rest arglist)))
+           ,@instr))))
+
+;;; Running commands
+
+(defun magit-set-mode-line-process (str)
+  (let ((pr (if str (concat " " str) "")))
+    (save-excursion
+      (magit-for-all-buffers (lambda ()
+			       (setq mode-line-process pr))))))
+
+(defun magit-process-indicator-from-command (comps)
+  (if (magit-prefix-p (cons magit-git-executable magit-git-standard-options)
+		      comps)
+      (setq comps (nthcdr (+ (length magit-git-standard-options) 1) comps)))
+  (cond ((or (null (cdr comps))
+	     (not (member (car comps) '("remote"))))
+	 (car comps))
+	(t
+	 (concat (car comps) " " (cadr comps)))))
+
+(defvar magit-process nil)
+(defvar magit-process-client-buffer nil)
+(defvar magit-process-buffer-name "*magit-process*"
+  "Buffer name for running git commands.")
+
+(defun magit-run* (cmd-and-args
+		   &optional logline noerase noerror nowait input)
+  (if (and magit-process
+	   (get-buffer magit-process-buffer-name))
+      (error "Git is already running"))
+  (let ((cmd (car cmd-and-args))
+	(args (cdr cmd-and-args))
+	(dir default-directory)
+	(buf (get-buffer-create magit-process-buffer-name))
+	(successp nil))
+    (magit-set-mode-line-process
+     (magit-process-indicator-from-command cmd-and-args))
+    (setq magit-process-client-buffer (current-buffer))
+    (with-current-buffer buf
+      (view-mode 1)
+      (set (make-local-variable 'view-no-disable-on-exit) t)
+      (setq view-exit-action
+	    (lambda (buffer)
+	      (with-current-buffer buffer
+		(bury-buffer))))
+      (setq buffer-read-only t)
+      (let ((inhibit-read-only t))
+	(setq default-directory dir)
+	(if noerase
+	    (goto-char (point-max))
+	  (erase-buffer))
+	(insert "$ " (or logline
+			 (magit-concat-with-delim " " cmd-and-args))
+		"\n")
+	(cond (nowait
+	       (setq magit-process
+		     (let ((process-connection-type magit-process-connection-type))
+		       (apply 'magit-start-process cmd buf cmd args)))
+	       (set-process-sentinel magit-process 'magit-process-sentinel)
+	       (set-process-filter magit-process 'magit-process-filter)
+	       (when input
+		 (with-current-buffer input
+		   (process-send-region magit-process
+					(point-min) (point-max)))
+		 (process-send-eof magit-process)
+		 (sit-for 0.1 t))
+	       (cond ((= magit-process-popup-time 0)
+		      (pop-to-buffer (process-buffer magit-process)))
+		     ((> magit-process-popup-time 0)
+		      (run-with-timer
+		       magit-process-popup-time nil
+		       (function
+			(lambda (buf)
+			  (with-current-buffer buf
+			    (when magit-process
+			      (display-buffer (process-buffer magit-process))
+			      (goto-char (point-max))))))
+		       (current-buffer))))
+	       (setq successp t))
+	      (input
+	       (with-current-buffer input
+		 (setq default-directory dir)
+		 (setq magit-process
+		       ;; Don't use a pty, because it would set icrnl
+		       ;; which would modify the input (issue #20).
+		       (let ((process-connection-type nil))
+			 (apply 'magit-start-process cmd buf cmd args)))
+		 (set-process-filter magit-process 'magit-process-filter)
+		 (process-send-region magit-process
+				      (point-min) (point-max))
+		 (process-send-eof magit-process)
+		 (while (equal (process-status magit-process) 'run)
+		   (sit-for 0.1 t))
+		 (setq successp
+		       (equal (process-exit-status magit-process) 0))
+		 (setq magit-process nil))
+	       (magit-set-mode-line-process nil)
+	       (magit-need-refresh magit-process-client-buffer))
+	      (t
+	       (setq successp
+		     (equal (apply 'process-file cmd nil buf nil args) 0))
+	       (magit-set-mode-line-process nil)
+	       (magit-need-refresh magit-process-client-buffer))))
+      (or successp
+	  noerror
+	  (error
+	   (or (with-current-buffer (get-buffer magit-process-buffer-name)
+		 (when (re-search-backward
+			(concat "^error: \\(.*\\)" paragraph-separate) nil t)
+		   (match-string 1)))
+	       "Git failed")))
+      successp)))
+
+(autoload 'dired-uncache "dired")
+(defun magit-process-sentinel (process event)
+  (let ((msg (format "Git %s." (substring event 0 -1)))
+	(successp (string-match "^finished" event)))
+    (with-current-buffer (process-buffer process)
+      (let ((inhibit-read-only t))
+	(goto-char (point-max))
+	(insert msg "\n")
+	(message msg))
+      (unless (memq (process-status process) '(run open))
+        (dired-uncache default-directory)))
+    (setq magit-process nil)
+    (magit-set-mode-line-process nil)
+    (magit-refresh-buffer magit-process-client-buffer)))
+
+(defun magit-password (proc string)
+  "Checks if git/ssh asks for a password and ask the user for it."
+  (when (or (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
+	    (string-match "^\\\(.*\\\)'s password:" string))
+    (process-send-string proc
+                         (concat (read-passwd
+                                  (format "Password for '%s': " (match-string 1 string))
+                                  nil) "\n"))))
+
+(defun magit-process-filter (proc string)
+  (save-current-buffer
+    (set-buffer (process-buffer proc))
+    (let ((inhibit-read-only t))
+      (magit-password proc string)
+      (goto-char (process-mark proc))
+      ;; Find last ^M in string.  If one was found, ignore everything
+      ;; before it and delete the current line.
+      (let ((ret-pos (length string)))
+	(while (and (>= (setq ret-pos (1- ret-pos)) 0)
+		    (/= ?\r (aref string ret-pos))))
+	(cond ((>= ret-pos 0)
+	       (goto-char (line-beginning-position))
+	       (delete-region (point) (line-end-position))
+	       (insert (substring string (+ ret-pos 1))))
+	      (t
+	       (insert string))))
+      (set-marker (process-mark proc) (point)))))
+
+(defun magit-run (cmd &rest args)
+  (magit-with-refresh
+    (magit-run* (cons cmd args))))
+
+(defun magit-run-git (&rest args)
+  (magit-with-refresh
+    (magit-run* (append (cons magit-git-executable
+			      magit-git-standard-options)
+			args))))
+
+(defun magit-run-with-input (input cmd &rest args)
+  (magit-with-refresh
+    (magit-run* (cons cmd args) nil nil nil nil input)))
+
+(defun magit-run-git-with-input (input &rest args)
+  (magit-with-refresh
+    (magit-run* (append (cons magit-git-executable
+			      magit-git-standard-options)
+			args)
+		nil nil nil nil input)))
+
+(defun magit-run-git-async (&rest args)
+  (message "Running %s %s" magit-git-executable (mapconcat 'identity args " "))
+  (magit-run* (append (cons magit-git-executable
+			    magit-git-standard-options)
+		      args)
+	      nil nil nil t))
+
+(defun magit-run-async-with-input (input cmd &rest args)
+  (magit-run* (cons cmd args) nil nil nil t input))
+
+(defun magit-display-process ()
+  "Display output from most recent git command."
+  (interactive)
+  (unless (get-buffer magit-process-buffer-name)
+    (error "No Git commands have run"))
+  (display-buffer magit-process-buffer-name))
+
+;;; Mode
+
+;; We define individual functions (instead of using lambda etc) so
+;; that the online help can show something meaningful.
+
+(magit-define-section-jumper untracked "Untracked files")
+(magit-define-section-jumper unstaged  "Unstaged changes")
+(magit-define-section-jumper staged    "Staged changes")
+(magit-define-section-jumper unpushed  "Unpushed commits")
+
+(magit-define-level-shower 1)
+(magit-define-level-shower 2)
+(magit-define-level-shower 3)
+(magit-define-level-shower 4)
+
+(defun magit-true (prompt)
+  "Dummy function for turning on options on menu."
+  t)
+
+(easy-menu-define magit-mode-menu magit-mode-map
+  "Magit menu"
+  '("Magit"
+    ["Refresh" magit-refresh t]
+    ["Refresh all" magit-refresh-all t]
+    "---"
+    ["Stage" magit-stage-item t]
+    ["Stage all" magit-stage-all t]
+    ["Unstage" magit-unstage-item t]
+    ["Unstage all" magit-unstage-all t]
+    ["Commit" magit-log-edit t]
+    ["Add log entry" magit-add-log t]
+    ["Tag" magit-tag t]
+    ["Annotated tag" magit-annotated-tag t]
+    "---"
+    ["Diff working tree" magit-diff-working-tree t]
+    ["Diff" magit-diff t]
+    ("Log"
+     ["Short Log" magit-display-log t]
+     ["Long Log" magit-log-long t]
+     ["Reflog" magit-reflog t]
+     ["Extended..." magit-key-mode-popup-logging t])
+    "---"
+    ["Cherry pick" magit-cherry-pick-item t]
+    ["Apply" magit-apply-item t]
+    ["Revert" magit-revert-item t]
+    "---"
+    ["Ignore" magit-ignore-item t]
+    ["Ignore locally" magit-ignore-item-locally t]
+    ["Discard" magit-discard-item t]
+    ["Reset head" magit-reset-head t]
+    ["Reset working tree" magit-reset-working-tree t]
+    ["Stash" magit-stash t]
+    ["Snapshot" magit-stash-snapshot t]
+    "---"
+    ["Branch..." magit-checkout t]
+    ["Merge" magit-automatic-merge t]
+    ["Interactive resolve" magit-interactive-resolve-item t]
+    ["Rebase" magit-rebase-step t]
+    ("Rewrite"
+     ["Start" magit-rewrite-start t]
+     ["Stop" magit-rewrite-stop t]
+     ["Finish" magit-rewrite-finish t]
+     ["Abort" magit-rewrite-abort t]
+     ["Set used" magit-rewrite-set-used t]
+     ["Set unused" magit-rewrite-set-unused t])
+    "---"
+    ["Push" magit-push t]
+    ["Pull" magit-pull t]
+    ["Remote update" magit-remote-update t]
+    ("Submodule"
+     ["Submodule update" magit-submodule-update t]
+     ["Submodule update and init" magit-submodule-update-init t]
+     ["Submodule init" magit-submodule-init t]
+     ["Submodule sync" magit-submodule-sync t])
+    "---"
+    ("Extensions")
+    "---"
+    ["Display Git output" magit-display-process t]
+    ["Quit Magit" quit-window t]))
+
+(defvar magit-mode-hook nil "Hook run by `magit-mode'.")
+
+(put 'magit-mode 'mode-class 'special)
+
+(defvar magit-refresh-function nil)
+(make-variable-buffer-local 'magit-refresh-function)
+(put 'magit-refresh-function 'permanent-local t)
+
+(defvar magit-refresh-args nil)
+(make-variable-buffer-local 'magit-refresh-args)
+(put 'magit-refresh-args 'permanent-local t)
+
+(defvar last-point)
+
+(defun magit-remember-point ()
+  (setq last-point (point)))
+
+(defun magit-invisible-region-end (pos)
+  (while (and (not (= pos (point-max))) (invisible-p pos))
+    (setq pos (next-char-property-change pos)))
+  pos)
+
+(defun magit-invisible-region-start (pos)
+  (while (and (not (= pos (point-min))) (invisible-p pos))
+    (setq pos (1- (previous-char-property-change pos))))
+  pos)
+
+(defun magit-correct-point-after-command ()
+  "Move point outside of invisible regions.
+
+Emacs often leaves point in invisible regions, it seems.  To fix
+this, we move point ourselves and never let Emacs do its own
+adjustments.
+
+When point has to be moved out of an invisible region, it can be
+moved to its end or its beginning.  We usually move it to its
+end, except when that would move point back to where it was
+before the last command."
+  (if (invisible-p (point))
+      (let ((end (magit-invisible-region-end (point))))
+	(goto-char (if (= end last-point)
+		       (magit-invisible-region-start (point))
+		     end))))
+  (setq disable-point-adjustment t))
+
+(defun magit-post-command-hook ()
+  (magit-correct-point-after-command)
+  (magit-highlight-section))
+
+(defun magit-mode ()
+  "Review the status of a git repository and act on it.
+
+Please see the manual for a complete description of Magit.
+
+\\{magit-mode-map}"
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+  (setq buffer-read-only t)
+  (make-local-variable 'line-move-visual)
+  (setq major-mode 'magit-mode
+	mode-name "Magit"
+	mode-line-process ""
+	truncate-lines t
+	line-move-visual nil)
+  (add-hook 'pre-command-hook #'magit-remember-point nil t)
+  (add-hook 'post-command-hook #'magit-post-command-hook t t)
+  (use-local-map magit-mode-map)
+  (run-mode-hooks 'magit-mode-hook))
+
+(defun magit-mode-init (dir submode refresh-func &rest refresh-args)
+  (setq default-directory dir
+	magit-submode submode
+	magit-refresh-function refresh-func
+	magit-refresh-args refresh-args)
+  (magit-mode)
+  (magit-refresh-buffer))
+
+(defun magit-find-buffer (submode &optional dir)
+  (let ((topdir (magit-get-top-dir (or dir default-directory))))
+    (dolist (buf (buffer-list))
+      (if (with-current-buffer buf
+	    (and default-directory
+		 (equal (expand-file-name default-directory) topdir)
+		 (eq major-mode 'magit-mode)
+		 (eq magit-submode submode)))
+	  (return buf)))))
+
+(defun magit-find-status-buffer (&optional dir)
+  (magit-find-buffer 'status dir))
+
+(defun magit-for-all-buffers (func &optional dir)
+  (dolist (buf (buffer-list))
+    (with-current-buffer buf
+      (if (and (eq major-mode 'magit-mode)
+	       (or (null dir)
+		   (equal default-directory dir)))
+	  (funcall func)))))
+
+(defun magit-refresh-buffer (&optional buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (let* ((old-line (line-number-at-pos))
+	   (old-section (magit-current-section))
+	   (old-path (and old-section
+			  (magit-section-path (magit-current-section))))
+	   (section-line (and old-section
+			      (count-lines
+			       (magit-section-beginning old-section)
+			       (point)))))
+      (if magit-refresh-function
+	  (apply magit-refresh-function
+		 magit-refresh-args))
+      (magit-refresh-marked-commits-in-buffer)
+      (let ((s (and old-path (magit-find-section old-path magit-top-section))))
+	(cond (s
+	       (goto-char (magit-section-beginning s))
+	       (forward-line section-line))
+	      (t
+	       (magit-goto-line old-line)))
+	(dolist (w (get-buffer-window-list (current-buffer)))
+	  (set-window-point w (point)))
+	(magit-highlight-section)))))
+
+(defun magit-string-has-prefix-p (string prefix)
+  (eq (compare-strings string nil (length prefix) prefix nil nil) t))
+
+(defun magit-revert-buffers (dir &optional ignore-modtime)
+  (dolist (buffer (buffer-list))
+    (when (and buffer
+	       (buffer-file-name buffer)
+	       (file-readable-p (buffer-file-name buffer))
+	       (magit-string-has-prefix-p (buffer-file-name buffer) dir)
+	       (or ignore-modtime (not (verify-visited-file-modtime buffer)))
+	       (not (buffer-modified-p buffer)))
+      (with-current-buffer buffer
+	(condition-case var
+	  (revert-buffer t t nil)
+	  (error (let ((signal-data (cadr var)))
+		   (cond (t (magit-bug-report signal-data))))))))))
+
+(defun magit-update-vc-modeline (dir)
+  "Update the modeline for buffers representable by magit."
+  (dolist (buffer (buffer-list))
+    (when (and buffer
+	       (buffer-file-name buffer)
+	       (magit-string-has-prefix-p (buffer-file-name buffer) dir))
+      (with-current-buffer buffer
+	(condition-case var
+	    (vc-find-file-hook)
+	  (error (let ((signal-data (cadr var)))
+		   (cond (t (magit-bug-report signal-data))))))))))
+
+(defvar magit-refresh-needing-buffers nil)
+(defvar magit-refresh-pending nil)
+
+(defun magit-refresh-wrapper (func)
+  (if magit-refresh-pending
+      (funcall func)
+    (let* ((dir default-directory)
+	   (status-buffer (magit-find-buffer 'status dir))
+	   (magit-refresh-needing-buffers nil)
+	   (magit-refresh-pending t))
+      (unwind-protect
+	  (funcall func)
+	(when magit-refresh-needing-buffers
+	  (magit-revert-buffers dir)
+	  (dolist (b (adjoin status-buffer
+			     magit-refresh-needing-buffers))
+	    (magit-refresh-buffer b)))))))
+
+(defun magit-need-refresh (&optional buffer)
+  (let ((buffer (or buffer (current-buffer))))
+    (when (not (memq buffer magit-refresh-needing-buffers))
+      (setq magit-refresh-needing-buffers
+	    (cons buffer magit-refresh-needing-buffers)))))
+
+(defun magit-refresh ()
+  "Refresh current buffer to match repository state.
+Also revert every unmodified buffer visiting files
+in the corresponding directory."
+  (interactive)
+  (magit-with-refresh
+    (magit-need-refresh)))
+
+(defun magit-refresh-all ()
+  "Refresh all magit buffers to match respective repository states.
+Also revert every unmodified buffer visiting files
+in the corresponding directories."
+  (interactive)
+  (magit-for-all-buffers #'magit-refresh-buffer default-directory))
+
+;;; Untracked files
+
+(defun magit-wash-untracked-file ()
+  (if (looking-at "^? \\(.*\\)$")
+      (let ((file (match-string-no-properties 1)))
+	(delete-region (point) (+ (line-end-position) 1))
+	(magit-with-section file 'file
+	  (magit-set-section-info file)
+	  (insert "\t" file "\n"))
+	t)
+    nil))
+
+(defun magit-wash-untracked-files ()
+  ;; Setting magit-old-top-section to nil speeds up washing: no time
+  ;; is wasted looking up the old visibility, which doesn't matter for
+  ;; untracked files.
+  ;;
+  ;; XXX - speed this up in a more general way.
+  ;;
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-wash-untracked-file)))
+
+(defun magit-insert-untracked-files ()
+  (unless (string= (magit-get "status" "showUntrackedFiles") "no")
+    (apply 'magit-git-section
+           `(untracked
+           "Untracked files:"
+           magit-wash-untracked-files
+           "ls-files" "--others" "-t" "--exclude-standard"
+           ,@(when magit-omit-untracked-dir-contents
+               '("--directory"))))))
+
+;;; Diffs and Hunks
+
+(defvar magit-diff-context-lines 3)
+
+(defun magit-diff-U-arg ()
+  (format "-U%d" magit-diff-context-lines))
+
+(defun magit-diff-smaller-hunks (&optional count)
+  "Decrease the context for diff hunks by COUNT."
+  (interactive "p")
+  (setq magit-diff-context-lines (max 0 (- magit-diff-context-lines count)))
+  (magit-refresh))
+
+(defun magit-diff-larger-hunks (&optional count)
+  "Increase the context for diff hunks by COUNT."
+  (interactive "p")
+  (setq magit-diff-context-lines (+ magit-diff-context-lines count))
+  (magit-refresh))
+
+(defun magit-diff-default-hunks ()
+  "Reset context for diff hunks to the default size."
+  (interactive "")
+  (setq magit-diff-context-lines 3)
+  (magit-refresh))
+
+(defun magit-diff-line-file ()
+  (cond ((looking-at "^diff --git ./\\(.*\\) ./\\(.*\\)$")
+	 (match-string-no-properties 2))
+	((looking-at "^diff --cc +\\(.*\\)$")
+	 (match-string-no-properties 1))
+	(t
+	 nil)))
+
+(defun magit-wash-diffs ()
+  (magit-wash-sequence #'magit-wash-diff-or-other-file))
+
+(defun magit-wash-diff-or-other-file ()
+  (or (magit-wash-diff)
+      (magit-wash-other-file)))
+
+(defun magit-wash-other-file ()
+  (if (looking-at "^? \\(.*\\)$")
+      (let ((file (match-string-no-properties 1)))
+	(delete-region (point) (+ (line-end-position) 1))
+	(magit-with-section file 'file
+	  (magit-set-section-info file)
+	  (insert "\tNew      " file "\n"))
+	t)
+    nil))
+
+(defvar magit-hide-diffs nil)
+
+(defun magit-insert-diff-title (status file file2)
+  (let ((status-text (case status
+		       ((unmerged)
+			(format "Unmerged %s" file))
+		       ((new)
+			(format "New      %s" file))
+		       ((deleted)
+			(format "Deleted  %s" file))
+		       ((renamed)
+			(format "Renamed  %s   (from %s)"
+				file file2))
+		       ((modified)
+			(format "Modified %s" file))
+		       (t
+			(format "?        %s" file)))))
+    (insert "\t" status-text "\n")))
+
+(defun magit-wash-diff-section ()
+  (cond ((looking-at "^\\* Unmerged path \\(.*\\)")
+	 (let ((file (match-string-no-properties 1)))
+	   (delete-region (point) (line-end-position))
+	   (insert "\tUnmerged " file "\n")
+	   (magit-set-section-info (list 'unmerged file nil))
+	   t))
+	((looking-at "^diff")
+	 (let ((file (magit-diff-line-file))
+	       (end (save-excursion
+		      (forward-line) ;; skip over "diff" line
+		      (if (search-forward-regexp "^diff\\|^@@" nil t)
+			  (goto-char (match-beginning 0))
+			(goto-char (point-max)))
+		      (point-marker))))
+	   (let* ((status (cond
+			   ((looking-at "^diff --cc")
+			    'unmerged)
+			   ((save-excursion
+			      (search-forward-regexp "^new file" end t))
+			    'new)
+			   ((save-excursion
+			      (search-forward-regexp "^deleted" end t))
+			    'deleted)
+			   ((save-excursion
+			      (search-forward-regexp "^rename" end t))
+			    'renamed)
+			   (t
+			    'modified)))
+		  (file2 (cond
+			  ((save-excursion
+			     (search-forward-regexp "^rename from \\(.*\\)"
+						    end t))
+			   (match-string-no-properties 1)))))
+	     (magit-set-section-info (list status file file2))
+	     (magit-insert-diff-title status file file2)
+	     (goto-char end)
+	     (let ((magit-section-hidden-default nil))
+	       (magit-wash-sequence #'magit-wash-hunk))))
+	 t)
+	(t
+	 nil)))
+
+(defun magit-wash-diff ()
+  (let ((magit-section-hidden-default magit-hide-diffs))
+    (magit-with-section (magit-current-line) 'diff
+      (magit-wash-diff-section))))
+
+(defun magit-diff-item-kind (diff)
+  (car (magit-section-info diff)))
+
+(defun magit-diff-item-file (diff)
+  (cadr (magit-section-info diff)))
+
+(defun magit-diff-item-file2 (diff)
+  (caddr (magit-section-info diff)))
+
+(defun magit-wash-hunk ()
+  (cond ((looking-at "\\(^@+\\)[^@]*@+")
+	 (let ((n-columns (1- (length (match-string 1))))
+	       (head (match-string 0)))
+	   (magit-with-section head 'hunk
+	     (add-text-properties (match-beginning 0) (match-end 0)
+				  '(face magit-diff-hunk-header))
+	     (forward-line)
+	     (while (not (or (eobp)
+			     (looking-at "^diff\\|^@@")))
+	       (let ((prefix (buffer-substring-no-properties
+			      (point) (min (+ (point) n-columns) (point-max)))))
+		 (cond ((string-match "\\+" prefix)
+			(magit-put-line-property 'face 'magit-diff-add))
+		       ((string-match "-" prefix)
+			(magit-put-line-property 'face 'magit-diff-del))
+		       (t
+			(magit-put-line-property 'face 'magit-diff-none))))
+	       (forward-line))))
+	 t)
+	(t
+	 nil)))
+
+(defvar magit-diff-options nil)
+
+(defun magit-insert-diff (file)
+  (let ((cmd magit-git-executable)
+	(args (append (list "diff")
+		      (list (magit-diff-U-arg))
+		      magit-diff-options
+		      (list "--" file))))
+    (let ((p (point)))
+      (magit-git-insert args)
+      (if (not (eq (char-before) ?\n))
+	  (insert "\n"))
+      (save-restriction
+	(narrow-to-region p (point))
+	(goto-char p)
+	(magit-wash-diff-section)
+	(goto-char (point-max))))))
+
+(defvar magit-last-raw-diff nil)
+(defvar magit-ignore-unmerged-raw-diffs nil)
+
+(defun magit-wash-raw-diffs ()
+  (let ((magit-last-raw-diff nil))
+    (magit-wash-sequence #'magit-wash-raw-diff)))
+
+(defun magit-wash-raw-diff ()
+  (if (looking-at
+       ":\\([0-7]+\\) \\([0-7]+\\) [0-9a-f]+ [0-9a-f]+ \\(.\\)[0-9]*\t\\([^\t\n]+\\)$")
+      (let ((old-perm (match-string-no-properties 1))
+	    (new-perm (match-string-no-properties 2))
+	    (status (case (string-to-char (match-string-no-properties 3))
+		      (?A 'new)
+		      (?D 'deleted)
+		      (?M 'modified)
+		      (?U 'unmerged)
+		      (?T 'new-type)
+		      (t     nil)))
+	    (file (match-string-no-properties 4)))
+	;; If this is for the same file as the last diff, ignore it.
+	;; Unmerged files seem to get two entries.
+	;; We also ignore unmerged files when told so.
+	(if (or (equal file magit-last-raw-diff)
+		(and magit-ignore-unmerged-raw-diffs (eq status 'unmerged)))
+	    (delete-region (point) (+ (line-end-position) 1))
+	  (setq magit-last-raw-diff file)
+	  ;; The 'diff' section that is created here will not work with
+	  ;; magit-insert-diff-item-patch etc when we leave it empty.
+	  ;; Luckily, raw diffs are only produced for staged and
+	  ;; unstaged changes, and we never call
+	  ;; magit-insert-diff-item-patch on them.  This is a bit
+	  ;; brittle, of course.
+	  (let ((magit-section-hidden-default magit-hide-diffs))
+	    (magit-with-section file 'diff
+	      (delete-region (point) (+ (line-end-position) 1))
+	      (if (not (magit-section-hidden magit-top-section))
+		  (magit-insert-diff file)
+		(magit-set-section-info (list status file nil))
+		(magit-set-section-needs-refresh-on-show t)
+		(magit-insert-diff-title status file nil)))))
+	t)
+    nil))
+
+(defun magit-hunk-item-diff (hunk)
+  (let ((diff (magit-section-parent hunk)))
+    (or (eq (magit-section-type diff) 'diff)
+	(error "Huh?  Parent of hunk not a diff"))
+    diff))
+
+(defun magit-diff-item-insert-header (diff buf)
+  (let ((beg (save-excursion
+	       (goto-char (magit-section-beginning diff))
+	       (forward-line)
+	       (point)))
+	(end (if (magit-section-children diff)
+		 (magit-section-beginning (car (magit-section-children diff)))
+	       (magit-section-end diff))))
+    (magit-insert-region beg end buf)))
+
+(defun magit-insert-diff-item-patch (diff buf)
+  (let ((beg (save-excursion
+	       (goto-char (magit-section-beginning diff))
+	       (forward-line)
+	       (point)))
+	(end (magit-section-end diff)))
+    (magit-insert-region beg end buf)))
+
+(defun magit-insert-hunk-item-patch (hunk buf)
+  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
+  (magit-insert-region (magit-section-beginning hunk) (magit-section-end hunk)
+		       buf))
+
+(defun magit-insert-hunk-item-region-patch (hunk reverse beg end buf)
+  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
+  (save-excursion
+    (goto-char (magit-section-beginning hunk))
+    (magit-insert-current-line buf)
+    (forward-line)
+    (let ((copy-op (if reverse "+" "-")))
+      (while (< (point) (magit-section-end hunk))
+	(if (and (<= beg (point)) (< (point) end))
+	    (magit-insert-current-line buf)
+	  (cond ((looking-at " ")
+		 (magit-insert-current-line buf))
+		((looking-at copy-op)
+		 (let ((text (buffer-substring-no-properties
+			      (+ (point) 1) (line-beginning-position 2))))
+		   (with-current-buffer buf
+		     (insert " " text))))))
+	(forward-line))))
+  (with-current-buffer buf
+    (diff-fixup-modifs (point-min) (point-max))))
+
+(defun magit-hunk-item-is-conflict-p (hunk)
+  ;;; XXX - Using the title is a bit too clever...
+  (string-match "^diff --cc"
+		(magit-section-title (magit-hunk-item-diff hunk))))
+
+(defun magit-hunk-item-target-line (hunk)
+  (save-excursion
+    (beginning-of-line)
+    (let ((line (line-number-at-pos)))
+      (if (looking-at "-")
+	  (error "Can't visit removed lines"))
+      (goto-char (magit-section-beginning hunk))
+      (if (not (looking-at "@@+ .* \\+\\([0-9]+\\),[0-9]+ @@+"))
+	  (error "Hunk header not found"))
+      (let ((target (string-to-number (match-string 1))))
+	(forward-line)
+	(while (< (line-number-at-pos) line)
+	  ;; XXX - deal with combined diffs
+	  (if (not (looking-at "-"))
+	      (setq target (+ target 1)))
+	  (forward-line))
+	target))))
+
+(defvar magit-tmp-buffer-name " *magit-tmp*")
+
+(defmacro with-magit-tmp-buffer (var &rest body)
+  (declare (indent 1)
+	   (debug (symbolp &rest form)))
+  `(let ((,var (generate-new-buffer magit-tmp-buffer-name)))
+     (unwind-protect
+	  (progn ,@body)
+       (kill-buffer ,var))))
+
+(defun magit-apply-diff-item (diff &rest args)
+  (when (zerop magit-diff-context-lines)
+    (setq args (cons "--unidiff-zero" args)))
+  (with-magit-tmp-buffer tmp
+    (magit-insert-diff-item-patch diff tmp)
+    (apply #'magit-run-git-with-input tmp
+	   "apply" (append args (list "-")))))
+
+(defun magit-apply-hunk-item* (hunk reverse &rest args)
+  (when (zerop magit-diff-context-lines)
+    (setq args (cons "--unidiff-zero" args)))
+  (with-magit-tmp-buffer tmp
+    (if (magit-use-region-p)
+	(magit-insert-hunk-item-region-patch
+	 hunk reverse (region-beginning) (region-end) tmp)
+	(magit-insert-hunk-item-patch hunk tmp))
+    (apply #'magit-run-git-with-input tmp
+	   "apply" (append args (list "-")))))
+
+(defun magit-apply-hunk-item (hunk &rest args)
+  (apply #'magit-apply-hunk-item* hunk nil args))
+
+(defun magit-apply-hunk-item-reverse (hunk &rest args)
+  (apply #'magit-apply-hunk-item* hunk t (cons "--reverse" args)))
+
+(magit-define-inserter unstaged-changes (title)
+  (let ((magit-hide-diffs t))
+    (let ((magit-diff-options (append '() magit-diff-options)))
+      (magit-git-section 'unstaged title 'magit-wash-raw-diffs
+                         "diff-files"))))
+
+(magit-define-inserter staged-changes (staged no-commit)
+  (when staged
+    (let ((magit-hide-diffs t)
+          (base (if no-commit
+                    (magit-git-string "mktree")
+                  "HEAD")))
+      (let ((magit-diff-options (append '("--cached") magit-diff-options))
+            (magit-ignore-unmerged-raw-diffs t))
+        (magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs
+                           "diff-index" "--cached"
+                           base)))))
+
+;;; Logs and Commits
+
+(defvar magit-log-oneline-re
+  (concat
+   "^\\([_\\*|/ -.]+\\)?"                                  ; graph   (1)
+   "\\(?:"
+   "\\([0-9a-fA-F]\\{40\\}\\) "                            ; sha1    (2)
+   "\\(?:\\((\\(?:[^ ]+?\\(?:[:,] \\)?\\)+)\\) \\)?"       ; refs    (3)
+   "\\(.*\\)"                                              ; msg     (4)
+   "\\)?$")
+  "Regexp used to extract elements of git log output.
+Those output are generated by --pretty=oneline with graph, or --pretty=format:* %H %s")
+
+(defvar magit-present-log-line-function 'magit-present-log-line
+  "The function to use when generating a log line.
+It takes four args: CHART, SHA1, REFS and MESSAGE.  The function
+must return a string which will represent the log line.")
+
+(defun magit-present-log-line (graph sha1 refs message)
+  "The default log line generator."
+  (let* ((ref-re "\\(?:tag: \\)?refs/\\(bisect\\|tags\\|remotes\\|patches/[^/]*\\|heads\\)/\\(.+\\)")
+         (string-refs
+          (when refs
+            (concat (mapconcat
+                     (lambda (r)
+                       (propertize
+                        (if (string-match ref-re r)
+                            (match-string 2 r)
+                          r)
+                        'face (cond
+                               ((string= r "refs/stash")
+                                'magit-log-head-label-local)
+                               ((not (match-string 1 r))
+                                nil)
+                               ((string= (match-string 1 r) "remotes")
+                                'magit-log-head-label-remote)
+                               ((and (not (null (match-string 1 r))) 
+                                     (string-match "^patches/[^/]*$" (match-string 1 r))) ; Stacked Git
+                                'magit-log-head-label-patches)
+                               ((string= (match-string 1 r) "bisect")
+                                (if (string= (match-string 2 r) "bad")
+                                    'magit-log-head-label-bisect-bad
+                                  'magit-log-head-label-bisect-good))
+                               ((string= (match-string 1 r) "tags")
+                                'magit-log-head-label-tags)
+                               ((string= (match-string 1 r) "heads")
+                                'magit-log-head-label-local)
+                               (t
+                                'magit-log-head-label-local))))
+                     refs
+                     " ")
+                    " "))))
+    (concat
+     (if sha1
+         (propertize (substring sha1 0 8) 'face 'magit-log-sha1)
+       (insert-char ? 8))
+     " "
+     (when graph
+       (propertize graph 'face 'magit-log-graph))
+     string-refs
+     (when message
+       (propertize message 'face 'magit-log-message)))))
+
+(defvar magit-log-count ()
+  "Internal var used to count the number of logs actually added in a buffer.")
+
+(defmacro magit-create-log-buffer-sections (&rest body)
+  "Empty current buffer of text and magit's section, and then evaluate BODY.
+
+if the number of logs inserted in the buffer is `magit-log-cutoff-length'
+insert a line to tell how to insert more of them"
+  (declare (indent 0))
+  `(let ((magit-log-count 0) (inhibit-read-only t))
+     (magit-create-buffer-sections
+       ,@body
+       (if (= magit-log-count magit-log-cutoff-length)
+	   (magit-with-section "longer"  'longer
+	     (insert "type \"e\" to show more logs\n"))))))
+
+
+(defun magit-wash-log-line ()
+  (beginning-of-line)
+  (let ((line-re magit-log-oneline-re))
+    (cond
+     ((looking-at magit-log-oneline-re)
+      (let ((chart (match-string 1))
+            (sha1 (match-string 2))
+            (msg (match-string 4))
+            (refs (when (match-string 3)
+		    (delq nil
+			  (mapcar
+			   (lambda (s)
+			     (and (not
+				   (or (string= s "tag:")
+				       (string= s "HEAD"))) ; as of 1.6.6
+				  s))
+			   (split-string (match-string 3) "[(), ]" t))))))
+        (delete-region (point-at-bol) (point-at-eol))
+        (insert (funcall magit-present-log-line-function chart sha1 refs msg))
+        (goto-char (point-at-bol))
+        (if sha1
+            (magit-with-section sha1 'commit
+              (when magit-log-count (setq magit-log-count (1+ magit-log-count)))
+              (magit-set-section-info sha1)
+              (forward-line))
+          (forward-line))))
+     (t
+      (forward-line)))
+    t))
+
+(defun magit-wash-log ()
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-wash-log-line)))
+
+(defvar magit-currently-shown-commit nil)
+
+(defun magit-wash-commit ()
+  (when (looking-at "^commit \\([0-9a-fA-F]\\{40\\}\\)")
+    (add-text-properties (match-beginning 1) (match-end 1)
+			 '(face magit-log-sha1)))
+  (when (search-forward-regexp "^diff" nil t)
+    (goto-char (match-beginning 0))
+    (magit-wash-diffs)))
+
+(defun magit-refresh-commit-buffer (commit)
+  (magit-create-buffer-sections
+    (magit-git-section nil nil
+		       'magit-wash-commit
+		       "log"
+		       "--decorate=full"
+		       "--max-count=1"
+		       "--pretty=medium"
+		       "--cc"
+		       "-p" commit)))
+
+(define-minor-mode magit-commit-mode
+    "Minor mode to view a git commit.
+
+\\{magit-commit-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-commit-mode-map)
+
+(defvar magit-commit-buffer-name "*magit-commit*"
+  "Buffer name for displaying commit log messages.")
+
+(defun magit-show-commit (commit &optional scroll)
+  (when (magit-section-p commit)
+    (setq commit (magit-section-info commit)))
+  (let ((dir default-directory)
+	(buf (get-buffer-create magit-commit-buffer-name)))
+    (cond ((and (equal magit-currently-shown-commit commit)
+		;; if it's empty then the buffer was killed
+		(with-current-buffer buf
+		  (> (length (buffer-string)) 1)))
+	   (let ((win (get-buffer-window buf)))
+	     (cond ((not win)
+		    (display-buffer buf))
+		   (scroll
+		    (with-selected-window win
+		      (funcall scroll))))))
+	  (t
+	   (setq magit-currently-shown-commit commit)
+	   (display-buffer buf)
+	   (with-current-buffer buf
+	     (set-buffer buf)
+	     (goto-char (point-min))
+	     (magit-mode-init dir 'commit
+			      #'magit-refresh-commit-buffer commit)
+	     (magit-commit-mode t))))))
+
+(defvar magit-marked-commit nil)
+
+(defvar magit-mark-overlay nil)
+(make-variable-buffer-local 'magit-mark-overlay)
+(put 'magit-mark-overlay 'permanent-local t)
+
+(defun magit-refresh-marked-commits ()
+  (magit-for-all-buffers #'magit-refresh-marked-commits-in-buffer))
+
+(defun magit-refresh-marked-commits-in-buffer ()
+  (if (not magit-mark-overlay)
+      (let ((ov (make-overlay 1 1)))
+	(overlay-put ov 'face 'magit-item-mark)
+	(setq magit-mark-overlay ov)))
+  (delete-overlay magit-mark-overlay)
+  (magit-for-all-sections
+   (lambda (section)
+     (when (and (eq (magit-section-type section) 'commit)
+		(equal (magit-section-info section)
+		       magit-marked-commit))
+       (move-overlay magit-mark-overlay
+		     (magit-section-beginning section)
+		     (magit-section-end section)
+		     (current-buffer))))))
+
+(defun magit-set-marked-commit (commit)
+  (setq magit-marked-commit commit)
+  (magit-refresh-marked-commits))
+
+(defun magit-marked-commit ()
+  (or magit-marked-commit
+      (error "No commit marked")))
+
+(defun magit-remote-branch-name (remote branch)
+  "Get the name of the branch BRANCH on remote REMOTE"
+  (if (string= remote ".")
+      branch
+    (concat remote "/" branch)))
+
+(magit-define-inserter unpulled-commits (remote branch)
+  (when remote
+    (magit-git-section 'unpulled
+		       "Unpulled commits:" 'magit-wash-log
+		       "log" "--pretty=format:* %H %s"
+		       (format "HEAD..%s"
+			     (magit-remote-branch-name remote branch)))))
+
+(magit-define-inserter unpushed-commits (remote branch)
+  (when remote
+    (magit-git-section 'unpushed
+		       "Unpushed commits:" 'magit-wash-log
+		       "log" "--pretty=format:* %H %s"
+		       (format "%s..HEAD"
+			     (magit-remote-branch-name remote branch)))))
+
+(defun magit-remote-branch-for (local-branch &optional prepend-remote-name)
+  "Guess the remote branch name that LOCAL-BRANCH is tracking.
+Prepend \"remotes/\", the remote's name and \"/\" if
+PREPEND-REMOTE-NAME is non-nil."
+  (let ((merge (magit-get "branch" local-branch "merge")))
+    (save-match-data
+      (if (and merge (string-match "^refs/heads/\\(.+\\)" merge))
+	  (concat (if prepend-remote-name
+                      (concat "remotes/"
+                              (magit-get "branch" local-branch "remote")
+                              "/"))
+                  (match-string 1 merge))))))
+
+;;; Status
+
+(defvar magit-remote-string-hook nil)
+
+(defun magit-remote-string (remote remote-branch)
+  (cond
+   ((string= "." remote)
+    (format "branch %s"
+	    (propertize remote-branch 'face 'magit-branch)))
+   (remote
+      (concat
+       (propertize remote-branch 'face 'magit-branch)
+       " @ "
+       remote
+       " ("
+       (magit-get "remote" remote "url")
+       ")"))
+   (t
+    (run-hook-with-args-until-success 'magit-remote-string-hook))))
+
+(defun magit-refresh-status ()
+  (magit-create-buffer-sections
+    (magit-with-section 'status nil
+      (let* ((branch (magit-get-current-branch))
+	     (remote (and branch (magit-get "branch" branch "remote")))
+	     (remote-branch (or (and branch (magit-remote-branch-for branch)) branch))
+	     (remote-string (magit-remote-string remote remote-branch))
+	     (head (magit-git-string
+		    "log" "--max-count=1" "--abbrev-commit" "--pretty=oneline"))
+	     (no-commit (not head)))
+	(when remote-string
+	  (insert "Remote:   " remote-string "\n"))
+	(insert (format "Local:    %s %s\n"
+			(propertize (or branch "(detached)")
+				    'face 'magit-branch)
+			(abbreviate-file-name default-directory)))
+	(insert (format "Head:     %s\n"
+			(if no-commit "nothing commited (yet)" head)))
+	(let ((merge-heads (magit-file-lines ".git/MERGE_HEAD")))
+	  (if merge-heads
+	      (insert (format "Merging:   %s\n"
+			      (magit-concat-with-delim
+			       ", "
+			       (mapcar 'magit-name-rev merge-heads))))))
+	(let ((rebase (magit-rebase-info)))
+	  (if rebase
+	      (insert (apply 'format "Rebasing: onto %s (%s of %s); Press \"R\" to Abort, Skip, or Continue\n" rebase))))
+	(insert "\n")
+	(magit-git-exit-code "update-index" "--refresh")
+	(magit-insert-untracked-files)
+	(magit-insert-stashes)
+	(magit-insert-pending-changes)
+	(magit-insert-pending-commits)
+	(magit-insert-unpulled-commits remote remote-branch)
+	(let ((staged (or no-commit (magit-anything-staged-p))))
+	  (magit-insert-unstaged-changes
+	   (if staged "Unstaged changes:" "Changes:"))
+	  (magit-insert-staged-changes staged no-commit))
+	(magit-insert-unpushed-commits remote remote-branch)
+	(run-hooks 'magit-refresh-status-hook)))))
+
+(defun magit-init (dir)
+  "Initialize git repository in the DIR directory."
+  (interactive (list (read-directory-name "Directory for Git repository: ")))
+  (let ((topdir (magit-get-top-dir dir)))
+    (when (or (not topdir)
+	      (yes-or-no-p
+	       (format
+		(if (string-equal topdir (expand-file-name dir))
+		    "There is already a Git repository in %s. Reinitialize? "
+		  "There is a Git repository in %s. Create another in %s? ")
+		topdir dir)))
+      (unless (file-directory-p dir)
+	(and (y-or-n-p (format "Directory %s does not exists.  Create it? " dir))
+	     (make-directory dir)))
+      (let ((default-directory dir))
+	(magit-run* (list "git" "init"))))))
+
+(define-minor-mode magit-status-mode
+    "Minor mode for looking at git status.
+
+\\{magit-status-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-status-mode-map)
+
+(defun magit-save-some-buffers (&optional msg pred)
+  "Save some buffers if variable `magit-save-some-buffers' is non-nil.
+If variable `magit-save-some-buffers' is set to 'dontask then
+don't ask the user before saving the buffers, just go ahead and
+do it.
+
+Optional argument MSG is displayed in the minibuffer if variable
+`magit-save-some-buffers' is nil.
+
+Optional second argument PRED determines which buffers are considered:
+If PRED is nil, all the file-visiting buffers are considered.
+If PRED is t, then certain non-file buffers will also be considered.
+If PRED is a zero-argument function, it indicates for each buffer whether
+to consider it or not when called with that buffer current."
+  (interactive)
+  (let ((predicate-function (or pred magit-save-some-buffers-predicate)))
+
+    (if magit-save-some-buffers
+        (save-some-buffers
+         (eq magit-save-some-buffers 'dontask)
+         predicate-function)
+      (when msg
+        (message msg)))))
+
+
+(defun magit-save-buffers-predicate-all ()
+  "Prompt to save all buffers with unsaved changes"
+  t)
+
+(defun magit-save-buffers-predicate-tree-only ()
+  "Only prompt to save buffers which are within the current git project (as
+  determined by the dir passed to `magit-status'."
+  (let ((current-buf-dir
+         (file-name-directory (buffer-file-name (current-buffer)))))
+    (let ((invoked-git-root-dir (magit-get-top-dir default-directory)))
+      (let ((save-this-buffer
+             (and
+              invoked-git-root-dir
+              (eq 0
+                  (string-match
+                   (regexp-quote invoked-git-root-dir)
+                   current-buf-dir)))))
+        save-this-buffer))))
+
+;;;###autoload
+(defun magit-status (dir)
+  (interactive (list (or (and (not current-prefix-arg)
+			      (magit-get-top-dir default-directory))
+			 (magit-read-top-dir (and (consp current-prefix-arg)
+						  (> (car current-prefix-arg) 4))))))
+  (magit-save-some-buffers)
+  (let ((topdir (magit-get-top-dir dir)))
+    (unless topdir
+      (when (y-or-n-p (format "There is no Git repository in %S.  Create one? "
+			      dir))
+	(magit-init dir)
+	(setq topdir (magit-get-top-dir dir))))
+    (when topdir
+      (let ((buf (or (magit-find-buffer 'status topdir)
+		     (generate-new-buffer
+		      (concat "*magit: "
+			      (file-name-nondirectory
+			       (directory-file-name topdir)) "*")))))
+        (pop-to-buffer buf)
+        (magit-mode-init topdir 'status #'magit-refresh-status)
+        (magit-status-mode t)))))
+
+(magit-define-command automatic-merge (revision)
+  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
+\('git merge REVISION')."
+  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
+  (if revision
+      (magit-run-git "merge" (magit-rev-to-git revision))))
+
+;;; Staging and Unstaging
+
+(defun magit-stage-item (&optional ask)
+  "Add the item at point to the staging area.
+If ASK is set, ask for the file name rather than picking the one
+at point."
+  (interactive "P")
+  (if ask
+      (magit-run-git "add" (read-file-name "File to stage: "))
+    (magit-section-action (item info "stage")
+      ((untracked file)
+       (magit-run-git "add" info))
+      ((untracked)
+       (apply #'magit-run-git "add" "--"
+              (magit-git-lines "ls-files" "--other" "--exclude-standard")))
+      ((unstaged diff hunk)
+       (if (magit-hunk-item-is-conflict-p item)
+           (error (concat "Can't stage individual resolution hunks.  "
+                          "Please stage the whole file.")))
+       (magit-apply-hunk-item item "--cached"))
+      ((unstaged diff)
+       (magit-run-git "add" "-u" (magit-diff-item-file item)))
+      ((staged *)
+       (error "Already staged"))
+      ((hunk)
+       (error "Can't stage this hunk"))
+      ((diff)
+       (error "Can't stage this diff")))))
+
+(defun magit-unstage-item ()
+  "Remove the item at point from the staging area."
+  (interactive)
+  (magit-section-action (item info "unstage")
+    ((staged diff hunk)
+     (magit-apply-hunk-item-reverse item "--cached"))
+    ((staged diff)
+     (if (eq (car info) 'unmerged)
+	 (error "Can't unstage a unmerged file.  Resolve it first"))
+     (if (magit-no-commit-p)
+     	 (magit-run-git "rm" "--cached" "--" (magit-diff-item-file item))
+         (magit-run-git "reset" "-q" "HEAD" "--" (magit-diff-item-file item))))
+    ((unstaged *)
+     (error "Already unstaged"))
+    ((hunk)
+     (error "Can't unstage this hunk"))
+    ((diff)
+     (error "Can't unstage this diff"))))
+
+(defun magit-stage-all (&optional also-untracked-p)
+  "Add all remaining changes in tracked files to staging area.
+With prefix argument, add remaining untracked files as well.
+\('git add -u .' or 'git add .', respectively)."
+  (interactive "P")
+  (if also-untracked-p
+      (magit-run-git "add" ".")
+    (magit-run-git "add" "-u" ".")))
+
+(defun magit-unstage-all ()
+  "Remove all changes from staging area.
+\('git reset --mixed HEAD')."
+  (interactive)
+  (magit-run-git "reset" "HEAD"))
+
+;;; Branches
+
+(defun magit-get-tracking-name (remote branch)
+  "Given a REMOTE and a BRANCH name, ask the user for a local
+tracking brach name suggesting a sensible default."
+  (when (yes-or-no-p
+         (format "Create local tracking branch for %s? " branch))
+    (let* ((default-name (concat remote
+                                 "-"
+                                 (replace-regexp-in-string "[/]" "-" branch)))
+           (chosen-name (read-string (format "Call local branch (%s): " default-name)
+                                     nil
+                                     nil
+                                     default-name)))
+      (when (magit-ref-exists-p (concat "refs/heads/" chosen-name))
+        (error "'%s' already exists." chosen-name))
+      chosen-name)))
+
+(defun magit-maybe-create-local-tracking-branch (rev)
+  "Depending on the users wishes, create a tracking branch for
+rev... maybe."
+  (if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
+      (let* ((remote (match-string 1 rev))
+             (branch (match-string 2 rev))
+             (tracker-name (magit-get-tracking-name remote branch)))
+        (when tracker-name
+          (magit-run-git "checkout" "-b" tracker-name rev)
+          t))
+    nil))
+
+(magit-define-command checkout (revision)
+  "Switch 'HEAD' to REVISION and update working tree.
+Fails if working tree or staging area contain uncommitted changes.
+If REVISION is a remote branch, offer to create a local tracking branch.
+\('git checkout [-b] REVISION')."
+  (interactive
+   (list (let ((current-branch (magit-get-current-branch))
+               (default (magit-default-rev)))
+           (magit-read-rev "Switch to"
+                           (unless (string= current-branch default)
+                             default)
+                           (if current-branch
+                               (cons (concat "refs/heads/" current-branch "$")
+                                     magit-uninteresting-refs)
+                             magit-uninteresting-refs)))))
+  (if revision
+      (when (not (magit-maybe-create-local-tracking-branch revision))
+	(magit-save-some-buffers)
+	(magit-run-git "checkout" (magit-rev-to-git revision))
+	(magit-update-vc-modeline default-directory))))
+
+(defun magit-read-create-branch-args ()
+  (let* ((cur-branch (magit-get-current-branch))
+	 (branch (read-string "Create branch: "))
+	 (parent (magit-read-rev "Parent" cur-branch)))
+    (list branch parent)))
+
+(magit-define-command create-branch (branch parent)
+  "Switch 'HEAD' to new BRANCH at revision PARENT and update working tree.
+Fails if working tree or staging area contain uncommitted changes.
+\('git checkout -b BRANCH REVISION')."
+  (interactive (magit-read-create-branch-args))
+  (when (and branch (not (string= branch ""))
+	     parent)
+    (magit-save-some-buffers)
+    (magit-run-git "checkout" "-b"
+		   branch
+		   (append
+		    magit-custom-options
+		    (magit-rev-to-git parent)))
+    (magit-update-vc-modeline default-directory)))
+
+(defun magit-delete-branch (branch)
+  "Asks for a branch and deletes it.
+If the branch is the current one, offers to switch to `master' first.
+\('git branch -d BRANCH')."
+  (interactive (list (magit-read-rev "Branch to delete" (magit-default-rev))))
+  (when (and branch (string= branch (magit-get-current-branch)))
+    (if (y-or-n-p "Cannot delete current branch. Switch to master first? ")
+	(magit-checkout "master")
+      (setq branch nil)))
+  (when branch
+    (magit-run-git "branch" "-d" (append magit-custom-options
+					 (magit-rev-to-git branch)))))
+
+(defun magit-move-branch (old new)
+  "Renames or moves a branch.
+If the branch is the current one, offers to switch to `master' first.
+\('git branch -m OLD NEW')."
+  (interactive (list (magit-read-rev "Old name" (magit-default-rev))
+		     (magit-read-rev "New name" (magit-default-rev))))
+  (magit-run-git "branch" "-m" (magit-rev-to-git old) new))
+
+;;; Merging
+
+(defun magit-guess-branch ()
+  (magit-section-case (item info)
+    ((wazzup commit)
+     (magit-section-info (magit-section-parent item)))
+    ((commit) (magit-name-rev (substring info 0 8)))
+    ((wazzup) info)))
+
+(defun magit-merge (revision)
+  "Merge REVISION into the current 'HEAD'; leave changes uncommitted.
+With a prefix-arg, the merge will be squashed.
+\('git merge --no-commit [--squash|--no-ff] REVISION')."
+  (interactive
+   (list (magit-read-rev "Merge" (magit-default-rev))))
+  (if revision
+      (apply 'magit-run-git
+             "merge"
+             (magit-rev-to-git revision)
+             magit-custom-options)))
+
+;;; Rebasing
+
+(defun magit-rebase-info ()
+  "Returns a list indicating the state of an in-progress rebase,
+if any."
+  (cond ((file-exists-p ".git/rebase-merge")
+         (list
+          ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
+          (magit-name-rev (car (magit-file-lines ".git/rebase-merge/onto")))
+
+          ;; How many commits we've gone through
+          (length (magit-file-lines ".git/rebase-merge/done"))
+
+          ;; How many commits we have in total, without the comments
+          ;; at the end of git-rebase-todo.backup
+          (let ((todo-lines-with-comments (magit-file-lines ".git/rebase-merge/git-rebase-todo.backup")))
+            (loop for i in todo-lines-with-comments
+                  until (string= "" i)
+                  count i))))
+        ((and (file-exists-p ".git/rebase-apply")
+              (file-exists-p ".git/rebase-apply/onto"))
+         ;; we might be here because a non-interactive rebase failed: the
+         ;; patches didn't apply cleanly
+         (list
+          ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
+          (magit-name-rev (car (magit-file-lines ".git/rebase-apply/onto")))
+
+          ;; How many commits we've gone through
+          (- (string-to-number (car (magit-file-lines ".git/rebase-apply/next"))) 1)
+
+          ;; How many commits we have in total
+          (string-to-number (car (magit-file-lines ".git/rebase-apply/last")))
+          ))
+        (t nil)))
+
+(defun magit-rebase-step ()
+  (interactive)
+  (let ((info (magit-rebase-info)))
+    (if (not info)
+	(let* ((current-branch (magit-get-current-branch))
+               (remote (when current-branch
+                         (magit-get "branch" current-branch "remote")))
+               (remote-branch (when remote
+                                (magit-get "branch" current-branch "merge")))
+               (rev (magit-read-rev "Rebase to"
+                                    (when (and remote-branch
+                                               (string-match "refs/heads/\\(.*\\)" remote-branch))
+                                      (concat (match-string 1 remote-branch)
+                                              " (" remote ")"))
+                                    (if current-branch
+                                        (cons (concat "refs/heads/" current-branch)
+                                              magit-uninteresting-refs)
+                                      magit-uninteresting-refs))))
+	  (if rev
+	      (magit-run-git "rebase" (magit-rev-to-git rev))))
+      (let ((cursor-in-echo-area t)
+            (message-log-max nil))
+        (message "Rebase in progress. [A]bort, [S]kip, or [C]ontinue? ")
+        (let ((reply (read-event)))
+          (case reply
+            ((?A ?a)
+             (magit-run-git-async "rebase" "--abort"))
+            ((?S ?s)
+             (magit-run-git-async "rebase" "--skip"))
+            ((?C ?c)
+             (magit-run-git-async "rebase" "--continue"))))))))
+
+;;; Resetting
+
+(magit-define-command reset-head (revision &optional hard)
+  "Switch 'HEAD' to REVISION, keeping prior working tree and staging area.
+Any differences from REVISION become new changes to be committed.
+With prefix argument, all uncommitted changes in working tree
+and staging area are lost.
+\('git reset [--soft|--hard] REVISION')."
+  (interactive (list (magit-read-rev (format "%s head to"
+					     (if current-prefix-arg
+						 "Hard reset"
+					       "Reset"))
+				     (or (magit-default-rev)
+					 "HEAD^"))
+		     current-prefix-arg))
+  (when revision
+    (magit-run-git "reset" (if hard "--hard" "--soft")
+		   (magit-rev-to-git revision))
+    (magit-update-vc-modeline default-directory)))
+
+(magit-define-command reset-head-hard (revision)
+  "Switch 'HEAD' to REVISION, losing all changes.
+Uncomitted changes in both working tree and staging area are lost.
+\('git reset --hard REVISION')."
+  (interactive (list (magit-read-rev (format "Hard reset head to")
+				     (or (magit-default-rev)
+					 "HEAD"))))
+  (magit-reset-head revision t))
+
+(magit-define-command reset-working-tree ()
+  "Revert working tree and clear changes from staging area.
+\('git reset --hard HEAD')."
+  (interactive)
+  (when (yes-or-no-p "Discard all uncommitted changes? ")
+    (magit-reset-head-hard "HEAD")))
+
+;;; Rewriting
+
+(defun magit-read-rewrite-info ()
+  (when (file-exists-p ".git/magit-rewrite-info")
+    (with-temp-buffer
+      (insert-file-contents ".git/magit-rewrite-info")
+      (goto-char (point-min))
+      (read (current-buffer)))))
+
+(defun magit-write-rewrite-info (info)
+  (with-temp-file ".git/magit-rewrite-info"
+    (prin1 info (current-buffer))
+    (princ "\n" (current-buffer))))
+
+(magit-define-inserter pending-commits ()
+  (let* ((info (magit-read-rewrite-info))
+	 (pending (cdr (assq 'pending info))))
+    (when pending
+      (magit-with-section 'pending nil
+	(insert (propertize "Pending commits:\n"
+			    'face 'magit-section-title))
+	(dolist (p pending)
+	  (let* ((commit (car p))
+		 (properties (cdr p))
+		 (used (plist-get properties 'used)))
+	    (magit-with-section commit 'commit
+	      (magit-set-section-info commit)
+	      (insert (magit-git-string
+		       "log" "--max-count=1"
+		       (if used
+			   "--pretty=format:. %s"
+			 "--pretty=format:* %s")
+		       commit "--")
+		      "\n")))))
+      (insert "\n"))))
+
+(defun magit-rewrite-set-commit-property (commit prop value)
+  (let* ((info (magit-read-rewrite-info))
+	 (pending (cdr (assq 'pending info)))
+	 (p (assoc commit pending)))
+    (when p
+      (setf (cdr p) (plist-put (cdr p) prop value))
+      (magit-write-rewrite-info info)
+      (magit-need-refresh))))
+
+(defun magit-rewrite-set-used ()
+  (interactive)
+  (magit-section-action (item info)
+    ((pending commit)
+     (magit-rewrite-set-commit-property info 'used t))))
+
+(defun magit-rewrite-set-unused ()
+  (interactive)
+  (magit-section-action (item info)
+    ((pending commit)
+     (magit-rewrite-set-commit-property info 'used nil))))
+
+(magit-define-inserter pending-changes ()
+  (let* ((info (magit-read-rewrite-info))
+	 (orig (cadr (assq 'orig info))))
+    (when orig
+      (let ((magit-hide-diffs t))
+	(magit-git-section 'pending-changes
+			   "Pending changes"
+			   'magit-wash-diffs
+			   "diff" (magit-diff-U-arg) "-R" orig)))))
+
+(defun magit-rewrite-start (from &optional onto)
+  (interactive (list (magit-read-rev "Rewrite from" (magit-default-rev))))
+  (or (magit-everything-clean-p)
+      (error "You have uncommitted changes"))
+  (or (not (magit-read-rewrite-info))
+      (error "Rewrite in progress"))
+  (let* ((orig (magit-rev-parse "HEAD"))
+	 (base (or (car (magit-commit-parents from))
+		   (error "Can't rewrite a commit without a parent, sorry")))
+	 (pending (magit-git-lines "rev-list" (concat base ".."))))
+    (magit-write-rewrite-info `((orig ,orig)
+				(pending ,@(mapcar #'list pending))))
+    (magit-run-git "reset" "--hard" base)))
+
+(defun magit-rewrite-stop (&optional noconfirm)
+  (interactive)
+  (let* ((info (magit-read-rewrite-info)))
+    (or info
+	(error "No rewrite in progress"))
+    (when (or noconfirm
+	      (yes-or-no-p "Stop rewrite? "))
+      (magit-write-rewrite-info nil)
+      (magit-refresh))))
+
+(defun magit-rewrite-abort ()
+  (interactive)
+  (let* ((info (magit-read-rewrite-info))
+	 (orig (cadr (assq 'orig info))))
+    (or info
+	(error "No rewrite in progress"))
+    (or (magit-everything-clean-p)
+	(error "You have uncommitted changes"))
+    (when (yes-or-no-p "Abort rewrite? ")
+      (magit-write-rewrite-info nil)
+      (magit-run-git "reset" "--hard" orig))))
+
+(defun magit-rewrite-finish ()
+  (interactive)
+  (magit-with-refresh
+    (magit-rewrite-finish-step t)))
+
+(defun magit-rewrite-finish-step (first-p)
+  (let ((info (magit-read-rewrite-info)))
+    (or info
+	(error "No rewrite in progress"))
+    (let* ((pending (cdr (assq 'pending info)))
+	   (first-unused
+	    (let ((rpend (reverse pending)))
+	      (while (and rpend (plist-get (cdr (car rpend)) 'used))
+		(setq rpend (cdr rpend)))
+	      (car rpend)))
+	   (commit (car first-unused)))
+      (cond ((not first-unused)
+	     (magit-rewrite-stop t))
+	    ((magit-apply-commit commit t (not first-p))
+	     (magit-rewrite-set-commit-property commit 'used t)
+	     (magit-rewrite-finish-step nil))))))
+
+;;; Updating, pull, and push
+
+(magit-define-command fetch ()
+  "Run fetch."
+  (interactive)
+  (magit-run-git-async "fetch" (magit-read-remote)))
+
+(magit-define-command fetch-current ()
+  "Run fetch."
+  (interactive)
+  (magit-run-git-async "fetch"))
+
+(magit-define-command remote-update ()
+  "Update all remotes."
+  (interactive)
+  (magit-run-git-async "remote" "update"))
+
+(magit-define-command pull ()
+  "Run git pull against the current remote."
+  (interactive)
+  (let* ((branch (magit-get-current-branch))
+	 (config-branch (and branch (magit-get "branch" branch "merge")))
+	 (merge-branch (or (and config-branch (not current-prefix-arg))
+			   (magit-read-rev (format "Pull from")))))
+    (if (and branch (not config-branch))
+	(magit-set merge-branch "branch" branch "merge"))
+    (apply 'magit-run-git-async "pull" "-v" magit-custom-options)))
+
+(eval-when-compile (require 'pcomplete))
+
+(defun magit-shell-command (command)
+  "Perform arbitrary shell COMMAND."
+  (interactive "sCommand: ")
+  (require 'pcomplete)
+  (let ((args (car (with-temp-buffer
+		     (insert command)
+		     (pcomplete-parse-buffer-arguments))))
+	(magit-process-popup-time 0))
+    (magit-run* args nil nil nil t)))
+
+(defun magit-git-command (command)
+  "Perform arbitrary Git COMMAND.
+
+Similar to `magit-shell-command', but involves slightly less
+typing and automatically refreshes the status buffer."
+  (interactive "sRun git like this: ")
+  (require 'pcomplete)
+  (let ((args (car (with-temp-buffer
+		     (insert command)
+		     (pcomplete-parse-buffer-arguments))))
+	(magit-process-popup-time 0))
+    (magit-with-refresh
+      (magit-run* (append (cons magit-git-executable
+                                magit-git-standard-options)
+                          args)
+                  nil nil nil t))))
+
+(magit-define-command push-tags ()
+  "Push tags."
+  (interactive)
+  (magit-run-git-async "push" "--tags"))
+
+(magit-define-command push ()
+  (interactive)
+  (let* ((branch (or (magit-get-current-branch)
+		     (error "Don't push a detached head.  That's gross")))
+	 (branch-remote (magit-get-remote branch))
+	 (push-remote (if (or current-prefix-arg
+			      (not branch-remote))
+			  (magit-read-remote (format "Push %s to: " branch)
+					     branch-remote)
+			branch-remote))
+	 (ref-branch (magit-get "branch" branch "merge")))
+    (if (and (not branch-remote)
+	     (not current-prefix-arg))
+	(magit-set push-remote "branch" branch "remote"))
+    (apply 'magit-run-git-async "push" "-v" push-remote
+           (if ref-branch
+               (format "%s:%s" branch ref-branch)
+             branch)
+           magit-custom-options)
+    ;; Although git will automatically set up the remote,
+    ;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1),
+    ;; so we have to do that manually.
+    (unless ref-branch
+      (magit-set (concat "refs/heads/" branch) "branch" branch "merge"))))
+
+;;; Log edit mode
+
+(defvar magit-log-edit-mode-hook nil
+  "Hook run by `magit-log-edit-mode'.")
+
+(defvar magit-log-edit-buffer-name "*magit-edit-log*"
+  "Buffer name for composing commit messages.")
+
+(defvar magit-log-edit-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-c") 'magit-log-edit-commit)
+    (define-key map (kbd "C-c C-a") 'magit-log-edit-toggle-amending)
+    (define-key map (kbd "C-c C-s") 'magit-log-edit-toggle-signoff)
+    (define-key map (kbd "C-c C-e") 'magit-log-edit-toggle-allow-empty)
+    (define-key map (kbd "M-p") 'log-edit-previous-comment)
+    (define-key map (kbd "M-n") 'log-edit-next-comment)
+    (define-key map (kbd "C-c C-k") 'magit-log-edit-cancel-log-message)
+    (define-key map (kbd "C-c C-]") 'magit-log-edit-cancel-log-message)
+    (define-key map (kbd "C-x C-s") (lambda ()
+				      (interactive)
+				      (message "Not saved. Use C-c C-c to finalize this commit message.")))
+    map))
+
+(defvar magit-pre-log-edit-window-configuration nil)
+
+(defun magit-log-fill-paragraph (&optional justify)
+  "Fill the paragraph, but preserve open parentheses at beginning of lines.
+Prefix arg means justify as well."
+  (interactive "P")
+  ;; Add lines starting with a left paren or an asterisk.
+  (let ((paragraph-start (concat paragraph-start "\\|*\\|(")))
+    (let ((end (progn (forward-paragraph) (point)))
+	  (beg (progn (backward-paragraph) (point)))
+	  (adaptive-fill-mode nil))
+      (fill-region beg end justify)
+      t)))
+
+(define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit"
+  (set (make-local-variable 'fill-paragraph-function)
+       'magit-log-fill-paragraph))
+
+(defun magit-log-edit-cleanup ()
+  (save-excursion
+    (goto-char (point-min))
+    (flush-lines "^#")
+    (goto-char (point-min))
+    (if (re-search-forward "[ \t\n]*\\'" nil t)
+	(replace-match "\n" nil nil))))
+
+(defun magit-log-edit-append (str)
+  (with-current-buffer (get-buffer-create magit-log-edit-buffer-name)
+    (goto-char (point-max))
+    (insert str "\n")))
+
+(defconst magit-log-header-end "-- End of Magit header --\n")
+
+(defun magit-log-edit-get-fields ()
+  (let ((buf (get-buffer magit-log-edit-buffer-name))
+	(result nil))
+    (if buf
+	(with-current-buffer buf
+	  (goto-char (point-min))
+	  (while (looking-at "^\\([A-Za-z0-9-_]+\\): *\\(.*\\)$")
+	    (setq result (acons (intern (downcase (match-string 1)))
+				(match-string 2)
+				result))
+	    (forward-line))
+	  (if (not (looking-at (regexp-quote magit-log-header-end)))
+	      (setq result nil))))
+    (nreverse result)))
+
+(defun magit-log-edit-set-fields (fields)
+  (let ((buf (get-buffer-create magit-log-edit-buffer-name)))
+    (with-current-buffer buf
+      (goto-char (point-min))
+      (if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)*%s"
+					 (regexp-quote magit-log-header-end))
+				 nil t)
+	  (delete-region (match-beginning 0) (match-end 0)))
+      (goto-char (point-min))
+      (when fields
+	(while fields
+	  (insert (capitalize (symbol-name (caar fields))) ": "
+		  (cdar fields) "\n")
+	  (setq fields (cdr fields)))
+	(insert magit-log-header-end)))))
+
+(defun magit-log-edit-set-field (name value)
+  (let* ((fields (magit-log-edit-get-fields))
+	 (cell (assq name fields)))
+    (cond (cell
+	   (if value
+	       (rplacd cell value)
+	     (setq fields (delq cell fields))))
+	  (t
+	   (if value
+	       (setq fields (append fields (list (cons name value)))))))
+    (magit-log-edit-set-fields fields)))
+
+(defun magit-log-edit-get-field (name)
+  (cdr (assq name (magit-log-edit-get-fields))))
+
+(defun magit-log-edit-toggle-field (name default)
+  "Toggle the log-edit field named NAME.
+If it's currently unset, set it to DEFAULT (t or nil).
+
+Return nil if the field is toggled off, and non-nil if it's
+toggled on.  When it's toggled on for the first time, return
+'first."
+  (let* ((fields (magit-log-edit-get-fields))
+	 (cell (assq name fields)) yesp)
+    (if cell
+        (progn
+          (setq yesp (equal (cdr cell) "yes"))
+          (rplacd cell (if yesp "no" "yes")))
+      (setq fields (acons name (if default "yes" "no") fields))
+      (setq yesp (if default 'first)))
+    (magit-log-edit-set-fields fields)
+    yesp))
+
+(defun magit-log-edit-setup-author-env (author)
+  (cond (author
+	 ;; XXX - this is a bit strict, probably.
+	 (or (string-match "\\(.*\\) <\\(.*\\)>" author)
+	     (error "Can't parse author string"))
+	 ;; Shucks, setenv destroys the match data.
+	 (let ((name (match-string 1 author))
+	       (email (match-string 2 author))
+	       (date  (match-string 3 author)))
+	   (setenv "GIT_AUTHOR_NAME" name)
+	   (setenv "GIT_AUTHOR_EMAIL" email)
+	   (setenv "GIT_AUTHOR_DATE" date)))
+	(t
+	 (setenv "GIT_AUTHOR_NAME")
+	 (setenv "GIT_AUTHOR_EMAIL")
+	 (setenv "GIT_AUTHOR_DATE"))))
+
+(defun magit-log-edit-push-to-comment-ring (comment)
+  (when (or (ring-empty-p log-edit-comment-ring)
+	    (not (equal comment (ring-ref log-edit-comment-ring 0))))
+    (ring-insert log-edit-comment-ring comment)))
+
+(defun magit-log-edit-commit ()
+  "Finish edits and create new commit object.
+\('git commit ...')"
+  (interactive)
+  (let* ((fields (magit-log-edit-get-fields))
+	 (amend (equal (cdr (assq 'amend fields)) "yes"))
+	 (allow-empty (equal (cdr (assq 'allow-empty fields)) "yes"))
+	 (commit-all (equal (cdr (assq 'commit-all fields)) "yes"))
+	 (sign-off-field (assq 'sign-off fields))
+	 (sign-off (if sign-off-field
+		       (equal (cdr sign-off-field) "yes")
+		     magit-commit-signoff))
+	 (tag-rev (cdr (assq 'tag-rev fields)))
+	 (tag-name (cdr (assq 'tag-name fields)))
+	 (author (cdr (assq 'author fields))))
+    (magit-log-edit-push-to-comment-ring (buffer-string))
+    (magit-log-edit-setup-author-env author)
+    (magit-log-edit-set-fields nil)
+    (magit-log-edit-cleanup)
+    (if (= (buffer-size) 0)
+	(insert "(Empty description)\n"))
+    (let ((commit-buf (current-buffer)))
+      (with-current-buffer (magit-find-buffer 'status default-directory)
+	(cond (tag-name
+	       (magit-run-git-with-input commit-buf "tag" tag-name "-a" "-F" "-" tag-rev))
+	      ((or (not (or allow-empty commit-all amend (magit-anything-staged-p)))
+		   (not (or allow-empty (not commit-all) amend (not (magit-everything-clean-p)))))
+	       (error "Refusing to create empty commit. Maybe you want to amend or allow-empty?"))
+	      (t
+	       (apply #'magit-run-async-with-input commit-buf
+		      magit-git-executable
+		      (append magit-git-standard-options
+			      (list "commit" "-F" "-")
+			      (if (and commit-all (not allow-empty)) '("--all") '())
+			      (if amend '("--amend") '())
+			      (if allow-empty '("--allow-empty"))
+			      (if sign-off '("--signoff") '())))))))
+    (erase-buffer)
+    (bury-buffer)
+    (when (file-exists-p ".git/MERGE_MSG")
+      (delete-file ".git/MERGE_MSG"))
+    (magit-update-vc-modeline default-directory)
+    (when magit-pre-log-edit-window-configuration
+      (set-window-configuration magit-pre-log-edit-window-configuration)
+      (setq magit-pre-log-edit-window-configuration nil))))
+
+(defun magit-log-edit-cancel-log-message ()
+  "Abort edits and erase commit message being composed."
+  (interactive)
+  (when (or (not magit-log-edit-confirm-cancellation)
+	    (yes-or-no-p
+	     "Really cancel editing the log (any changes will be lost)?"))
+    (erase-buffer)
+    (bury-buffer)
+    (when magit-pre-log-edit-window-configuration
+      (set-window-configuration magit-pre-log-edit-window-configuration)
+      (setq magit-pre-log-edit-window-configuration nil))))
+
+(defun magit-log-edit-toggle-amending ()
+  "Toggle whether this will be an amendment to the previous commit.
+\(i.e., whether eventual commit does 'git commit --amend')"
+  (interactive)
+  (when (eq (magit-log-edit-toggle-field 'amend t) 'first)
+    (magit-log-edit-append
+     (magit-format-commit "HEAD" "%s%n%n%b"))))
+
+(defun magit-log-edit-toggle-signoff ()
+  "Toggle whether this commit will include a signoff.
+\(i.e., whether eventual commit does 'git commit --signoff')"
+  (interactive)
+  (magit-log-edit-toggle-field 'sign-off (not magit-commit-signoff)))
+
+(defun magit-log-edit-toggle-allow-empty ()
+  "Toggle whether this commit is allowed to be empty.
+This means that the eventual commit does 'git commit --allow-empty'."
+  (interactive)
+  (magit-log-edit-toggle-field 'allow-empty t))
+
+(defun magit-pop-to-log-edit (operation)
+  (let ((dir default-directory)
+	(buf (get-buffer-create magit-log-edit-buffer-name)))
+    (setq magit-pre-log-edit-window-configuration
+	  (current-window-configuration))
+    (pop-to-buffer buf)
+    (when (file-exists-p ".git/MERGE_MSG")
+      (insert-file-contents ".git/MERGE_MSG"))
+    (setq default-directory dir)
+    (magit-log-edit-mode)
+    (message "Type C-c C-c to %s (C-c C-k to cancel)." operation)))
+
+(defun magit-log-edit (amend-p)
+  "Brings up a buffer to allow editing of commit messages. Given
+a prefix arg will set the amend flag for the commit buffer.
+
+If there is a rebase in progress offer the user the option to
+continue it.
+
+\\{magit-log-edit-mode-map}"
+  (interactive "P")
+  (cond ((magit-rebase-info)
+	 (if (y-or-n-p "Rebase in progress.  Continue it? ")
+	     (magit-run-git "rebase" "--continue")))
+	(t
+	 (when (and magit-commit-all-when-nothing-staged
+		    (not (magit-anything-staged-p)))
+	   (cond ((eq magit-commit-all-when-nothing-staged 'ask-stage)
+		  (if (and (not (magit-everything-clean-p))
+			   (y-or-n-p "Nothing staged.  Stage everything now? "))
+		      (magit-stage-all)))
+		 ((not (magit-log-edit-get-field 'commit-all))
+		  (magit-log-edit-set-field
+		   'commit-all
+		   (if (or (eq magit-commit-all-when-nothing-staged t)
+			   (y-or-n-p
+			    "Nothing staged.  Commit all unstaged changes? "))
+		       "yes" "no")))))
+	 (when amend-p (magit-log-edit-toggle-amending))
+	 (magit-pop-to-log-edit "commit"))))
+
+(defun magit-add-log ()
+  (interactive)
+  (cond ((magit-rebase-info)
+	 (if (y-or-n-p "Rebase in progress.  Continue it? ")
+	     (magit-run-git "rebase" "--continue")))
+	(t
+	 (let ((section (magit-current-section)))
+	   (let ((fun (if (eq (magit-section-type section) 'hunk)
+			  (save-window-excursion
+			    (save-excursion
+			      (magit-visit-item)
+			      (add-log-current-defun)))
+			nil))
+		 (file (magit-diff-item-file
+			(cond ((eq (magit-section-type section) 'hunk)
+			       (magit-hunk-item-diff section))
+			      ((eq (magit-section-type section) 'diff)
+			       section)
+			      (t
+			       (error "No change at point"))))))
+	     (magit-log-edit nil)
+	     (goto-char (point-min))
+	     (cond ((not (search-forward-regexp
+			  (format "^\\* %s" (regexp-quote file)) nil t))
+		    ;; No entry for file, create it.
+		    (goto-char (point-max))
+		    (insert (format "\n* %s" file))
+		    (if fun
+			(insert (format " (%s)" fun)))
+		    (insert ": "))
+		   (fun
+		    ;; found entry for file, look for fun
+		    (let ((limit (or (save-excursion
+				       (and (search-forward-regexp "^\\* "
+								   nil t)
+					    (match-beginning 0)))
+				     (point-max))))
+		      (cond ((search-forward-regexp (format "(.*\\<%s\\>.*):"
+							    (regexp-quote fun))
+						    limit t)
+			     ;; found it, goto end of current entry
+			     (if (search-forward-regexp "^(" limit t)
+				 (backward-char 2)
+			       (goto-char limit)))
+			    (t
+			     ;; not found, insert new entry
+			     (goto-char limit)
+			     (if (bolp)
+				 (open-line 1)
+			       (newline))
+			     (insert (format "(%s): " fun))))))))))))
+
+;;; Tags
+
+(magit-define-command tag (name rev)
+  "Create a new lightweight tag with the given NAME at REV.
+\('git tag NAME')."
+  (interactive
+   (list
+    (read-string "Tag name: ")
+    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
+  (magit-run-git "tag" name rev))
+
+(magit-define-command annotated-tag (name rev)
+  "Start composing an annotated tag with the given NAME.
+Tag will point to the current 'HEAD'."
+  (interactive
+   (list
+    (read-string "Tag name: ")
+    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
+  (magit-log-edit-set-field 'tag-name name)
+  (magit-log-edit-set-field 'tag-rev rev)
+  (magit-pop-to-log-edit "tag"))
+
+;;; Stashing
+
+(defun magit-wash-stash ()
+  (if (search-forward-regexp "stash@{\\(.*?\\)}" (line-end-position) t)
+      (let ((stash (match-string-no-properties 0))
+	    (name (match-string-no-properties 1)))
+	(delete-region (match-beginning 0) (match-end 0))
+	(goto-char (match-beginning 0))
+	(fixup-whitespace)
+	(goto-char (line-beginning-position))
+	(insert name)
+	(goto-char (line-beginning-position))
+	(magit-with-section stash 'stash
+	  (magit-set-section-info stash)
+	  (forward-line)))
+      (forward-line))
+  t)
+
+(defun magit-wash-stashes ()
+  (let ((magit-old-top-section nil))
+    (magit-wash-sequence #'magit-wash-stash)))
+
+(magit-define-inserter stashes ()
+  (magit-git-section 'stashes
+		     "Stashes:" 'magit-wash-stashes
+		     "stash" "list"))
+
+(magit-define-command stash (description)
+  "Create new stash of working tree and staging area named DESCRIPTION.
+Working tree and staging area revert to the current 'HEAD'.
+With prefix argument, changes in staging area are kept.
+\('git stash save [--keep-index] DESCRIPTION')"
+  (interactive "sStash description: ")
+  (apply 'magit-run-git `("stash" "save" ,@magit-custom-options "--" ,description)))
+
+(magit-define-command stash-snapshot ()
+  "Create new stash of working tree and staging area; keep changes in place.
+\('git stash save \"Snapshot...\"; git stash apply stash@{0}')"
+  (interactive)
+  (magit-with-refresh
+    (magit-run-git "stash" "save"
+		   (format-time-string "Snapshot taken at %Y-%m-%d %H:%M:%S"
+				       (current-time)))
+    (magit-run-git "stash" "apply" "stash@{0}")))
+
+(defvar magit-currently-shown-stash nil)
+
+(define-minor-mode magit-stash-mode
+    "Minor mode for looking at a git stash.
+
+\\{magit-stash-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-stash-mode-map)
+
+(defvar magit-stash-buffer-name "*magit-stash*"
+  "Buffer name for displaying a stash.")
+
+(defun magit-show-stash (stash &optional scroll)
+  (when (magit-section-p stash)
+    (setq stash (magit-section-info stash)))
+  (let ((dir default-directory)
+	(buf (get-buffer-create magit-stash-buffer-name))
+        (stash-id (magit-git-string "rev-list" "-1" stash)))
+    (cond ((and (equal magit-currently-shown-stash stash-id)
+                (with-current-buffer buf
+                  (> (length (buffer-string)) 1)))
+           (let ((win (get-buffer-window buf)))
+             (cond ((not win)
+                    (display-buffer buf))
+                   (scroll
+                    (with-selected-window win
+                      (funcall scroll))))))
+          (t
+           (setq magit-currently-shown-stash stash-id)
+           (display-buffer buf)
+           (with-current-buffer buf
+             (set-buffer buf)
+             (goto-char (point-min))
+             (let* ((range (cons (concat stash "^2^") stash))
+                    (args (magit-rev-range-to-git range)))
+               (magit-mode-init dir 'diff #'magit-refresh-diff-buffer
+                                range args)
+               (magit-stash-mode t)))))))
+
+;;; Commits
+
+(defun magit-commit-at-point (&optional nil-ok-p)
+  (let* ((section (magit-current-section))
+         (commit (or (and (not section)                          ; Places without a magit-section
+                          (get-text-property (point) 'revision)) ; but with a text property 'revision
+                     (and (eq (magit-section-type section) 'commit)
+                          (magit-section-info section)))))
+    (if nil-ok-p
+        commit
+      (or commit
+          (error "No commit at point")))))
+
+(defun magit-apply-commit (commit &optional docommit noerase revert)
+  (let* ((parent-id (magit-choose-parent-id commit "cherry-pick"))
+	 (success (magit-run* `(,magit-git-executable
+				,@magit-git-standard-options
+				,(if revert "revert" "cherry-pick")
+				,@(if parent-id
+				      (list "-m" (number-to-string parent-id)))
+				,@(if (not docommit) (list "--no-commit"))
+				,commit)
+			      nil noerase)))
+    (when (and (not docommit) success)
+      (cond (revert
+	     (magit-log-edit-append
+	      (magit-format-commit commit "Reverting \"%s\"")))
+	    (t
+	     (magit-log-edit-append
+	      (magit-format-commit commit "%s%n%n%b"))
+	     (magit-log-edit-set-field
+	      'author
+	      (magit-format-commit commit "%an <%ae>, %ai")))))
+    success))
+
+(defun magit-apply-item ()
+  (interactive)
+  (magit-section-action (item info "apply")
+    ((pending commit)
+     (magit-apply-commit info)
+     (magit-rewrite-set-commit-property info 'used t))
+    ((commit)
+     (magit-apply-commit info))
+    ((unstaged *)
+     (error "Change is already in your working tree"))
+    ((staged *)
+     (error "Change is already in your working tree"))
+    ((hunk)
+     (magit-apply-hunk-item item))
+    ((diff)
+     (magit-apply-diff-item item))
+    ((stash)
+     (magit-run-git "stash" "apply" info))))
+
+(defun magit-cherry-pick-item ()
+  (interactive)
+  (magit-section-action (item info "cherry-pick")
+    ((pending commit)
+     (magit-apply-commit info t)
+     (magit-rewrite-set-commit-property info 'used t))
+    ((commit)
+     (magit-apply-commit info t))
+    ((stash)
+     (magit-run-git "stash" "pop" info))))
+
+(defmacro magit-with-revert-confirmation (&rest body)
+  `(when (or (not magit-revert-item-confirm)
+             (yes-or-no-p "Really revert this item? "))
+     ,@body))
+
+(defun magit-revert-item ()
+  (interactive)
+  (magit-section-action (item info "revert")
+    ((pending commit)
+     (magit-with-revert-confirmation
+      (magit-apply-commit info nil nil t)
+      (magit-rewrite-set-commit-property info 'used nil)))
+    ((commit)
+     (magit-with-revert-confirmation
+      (magit-apply-commit info nil nil t)))
+    ;; Reverting unstaged changes cannot be undone
+    ((unstaged *)
+     (magit-discard-item))
+    ((hunk)
+     (magit-with-revert-confirmation
+      (magit-apply-hunk-item-reverse item)))
+    ((diff)
+     (magit-with-revert-confirmation
+      (magit-apply-diff-item item "--reverse")))))
+
+(defvar magit-have-graph 'unset)
+(defvar magit-have-decorate 'unset)
+(make-variable-buffer-local 'magit-have-graph)
+(put 'magit-have-graph 'permanent-local t)
+(make-variable-buffer-local 'magit-have-decorate)
+(put 'magit-have-decorate 'permanent-local t)
+
+(defun magit-configure-have-graph ()
+  (if (eq magit-have-graph 'unset)
+      (let ((res (magit-git-exit-code "log" "--graph" "--max-count=0")))
+	(setq magit-have-graph (eq res 0)))))
+
+(defun magit-configure-have-decorate ()
+  (if (eq magit-have-decorate 'unset)
+      (let ((res (magit-git-exit-code "log" "--decorate=full" "--max-count=0")))
+	(setq magit-have-decorate (eq res 0)))))
+
+(defun magit-log-show-more-entries (&optional arg)
+  "Grow the number of log entries shown.
+
+With no prefix optional ARG, show twice as much log entries.
+With a numerical prefix ARG, add this number to the number of shown log entries.
+With a non numeric prefix ARG, show all entries"
+  (interactive "P")
+  (make-local-variable 'magit-log-cutoff-length)
+  (cond
+    ((numberp arg)
+     (setq magit-log-cutoff-length (+ magit-log-cutoff-length arg)))
+    (arg
+     (setq magit-log-cutoff-length magit-log-infinite-length))
+    (t (setq magit-log-cutoff-length (* magit-log-cutoff-length 2))))
+  (magit-refresh))
+
+
+(defun magit-refresh-log-buffer (range style args)
+  (magit-configure-have-graph)
+  (magit-configure-have-decorate)
+  (setq magit-current-range range)
+  (magit-create-log-buffer-sections
+    (apply #'magit-git-section nil
+	   (magit-rev-range-describe range "Commits")
+	   'magit-wash-log
+	   `("log"
+	     ,(format "--max-count=%s" magit-log-cutoff-length)
+	     ,style
+	     ,@(if magit-have-decorate (list "--decorate=full"))
+	     ,@(if magit-have-graph (list "--graph"))
+	     ,@args
+	     "--"))))
+
+(define-minor-mode magit-log-mode
+    "Minor mode for looking at git log.
+
+\\{magit-log-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-log-mode-map)
+
+(defvar magit-log-buffer-name "*magit-log*"
+  "Buffer name for display of log entries.")
+(defvar magit-log-grep-buffer-name "*magit-grep-log*"
+  "Buffer name for display of log grep results.")
+
+(magit-define-command display-log-ranged ()
+  (interactive)
+  (magit-display-log t))
+
+(magit-define-command display-log (&optional ask-for-range &rest extra-args)
+  (interactive)
+  (let* ((log-range (if ask-for-range
+                        (magit-read-rev-range "Log" "HEAD")
+                      "HEAD"))
+	 (topdir (magit-get-top-dir default-directory))
+	 (args (nconc (list (magit-rev-range-to-git log-range))
+                      magit-custom-options
+                      extra-args)))
+    (magit-buffer-switch magit-log-buffer-name)
+    (magit-mode-init topdir 'log #'magit-refresh-log-buffer log-range
+		     "--pretty=oneline" args)
+    (magit-log-mode t)))
+
+(magit-define-command log-long-ranged ()
+  (interactive)
+  (magit-log-long t))
+
+(magit-define-command log-long (&optional ranged)
+  (interactive)
+  (let* ((range (if ranged
+		    (magit-read-rev-range "Long log" "HEAD")
+		  "HEAD"))
+	 (topdir (magit-get-top-dir default-directory))
+	 (args (append (list (magit-rev-range-to-git range))
+		       magit-custom-options)))
+    (magit-buffer-switch magit-log-buffer-name)
+    (magit-mode-init topdir 'log #'magit-refresh-log-buffer range
+		     "--stat" args)
+    (magit-log-mode t)))
+
+;;; Reflog
+
+(defvar magit-reflog-head nil
+  "The HEAD of the reflog in the current buffer.
+This is only non-nil in reflog buffers.")
+(make-variable-buffer-local 'magit-reflog-head)
+
+(defun magit-refresh-reflog-buffer (head args)
+  (setq magit-reflog-head head)
+  (magit-create-log-buffer-sections
+    (magit-git-section 'reflog
+		       (format "Local history of head %s" head)
+		       'magit-wash-log
+		       "log" "--walk-reflogs"
+		       (format "--max-count=%s" magit-log-cutoff-length)
+		       "--pretty=format:* %H %s"
+		       args)))
+
+(define-minor-mode magit-reflog-mode
+    "Minor mode for looking at git reflog.
+
+\\{magit-reflog-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-reflog-mode-map)
+
+(magit-define-command reflog (&optional ask-for-range)
+  (interactive)
+  (let ((at (or (if ask-for-range
+                    (magit-read-rev "Reflog of" (or (magit-guess-branch) "HEAD")))
+                "HEAD")))
+    (let* ((topdir (magit-get-top-dir default-directory))
+           (args (magit-rev-to-git at)))
+      (magit-buffer-switch "*magit-reflog*")
+      (magit-mode-init topdir 'reflog
+                       #'magit-refresh-reflog-buffer at args)
+      (magit-reflog-mode t))))
+
+(magit-define-command reflog-ranged ()
+  (interactive)
+  (magit-reflog t))
+
+;;; Diffing
+
+(defun magit-refresh-diff-buffer (range args)
+  (setq magit-current-range range)
+  (magit-create-buffer-sections
+    (magit-git-section 'diffbuf
+		       (magit-rev-range-describe range "Changes")
+		       'magit-wash-diffs
+		       "diff" (magit-diff-U-arg) args)))
+
+(define-minor-mode magit-diff-mode
+    "Minor mode for looking at a git diff.
+
+\\{magit-diff-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-diff-mode-map)
+
+(magit-define-command diff (range)
+  (interactive (list (magit-read-rev-range "Diff")))
+  (if range
+      (let* ((dir default-directory)
+             (args (magit-rev-range-to-git range))
+             (buf (get-buffer-create "*magit-diff*")))
+        (display-buffer buf)
+        (with-current-buffer buf
+          (magit-mode-init dir 'diff #'magit-refresh-diff-buffer range args)
+          (magit-diff-mode t)))))
+
+(magit-define-command diff-working-tree (rev)
+  (interactive (list (magit-read-rev "Diff with" (magit-default-rev))))
+  (magit-diff (or rev "HEAD")))
+
+(defun magit-diff-with-mark ()
+  (interactive)
+  (magit-diff (cons (magit-marked-commit)
+		    (magit-commit-at-point))))
+
+;;; Wazzup
+
+(defvar magit-wazzup-head nil
+  "The integration head for the current wazzup buffer.
+This is only non-nil in wazzup buffers.")
+(make-variable-buffer-local 'magit-wazzup-head)
+
+(defvar magit-wazzup-all-p nil
+  "Non-nil if the current wazzup buffer displays excluded branches.
+This is only meaningful in wazzup buffers.")
+(make-variable-buffer-local 'magit-wazzup-all-p)
+
+(defun magit-wazzup-toggle-ignore (branch edit)
+  (let ((ignore-file ".git/info/wazzup-exclude"))
+    (if edit
+	(setq branch (read-string "Branch to ignore for wazzup: " branch)))
+    (let ((ignored (magit-file-lines ignore-file)))
+      (cond ((member branch ignored)
+	     (when (or (not edit)
+		       (y-or-n-p "Branch %s is already ignored.  Unignore? "))
+	       (setq ignored (delete branch ignored))))
+	    (t
+	     (setq ignored (append ignored (list branch)))))
+      (magit-write-file-lines ignore-file ignored)
+      (magit-need-refresh))))
+
+(defun magit-refresh-wazzup-buffer (head all)
+  (setq magit-wazzup-head head)
+  (setq magit-wazzup-all-p all)
+  (let ((branch-desc (or head "(detached) HEAD")))
+    (unless head (setq head "HEAD"))
+    (magit-create-buffer-sections
+      (magit-with-section 'wazzupbuf nil
+	(insert (format "Wazzup, %s\n\n" branch-desc))
+	(let* ((excluded (magit-file-lines ".git/info/wazzup-exclude"))
+	       (all-branches (magit-list-interesting-refs))
+	       (branches (if all all-branches
+			   (delq nil (mapcar
+				      (lambda (b)
+					(and (not
+					      (member (cdr b) excluded))
+					     b))
+				      all-branches))))
+	       (reported (make-hash-table :test #'equal)))
+	  (dolist (branch branches)
+	    (let* ((name (car branch))
+		   (ref (cdr branch))
+		   (hash (magit-rev-parse ref))
+		   (reported-branch (gethash hash reported)))
+	      (unless (or (and reported-branch
+			       (string= (file-name-nondirectory ref)
+					reported-branch))
+			  (not (magit-git-string "merge-base" head ref)))
+		(puthash hash (file-name-nondirectory ref) reported)
+		(let* ((n (length (magit-git-lines "log" "--pretty=oneline"
+						   (concat head ".." ref))))
+		       (section
+			(let ((magit-section-hidden-default t))
+			  (magit-git-section
+			   (cons ref 'wazzup)
+			   (format "%s unmerged commits in %s%s"
+				   n name
+				   (if (member ref excluded)
+				       " (normally ignored)"
+				     ""))
+			   'magit-wash-log
+			   "log"
+			   (format "--max-count=%s" magit-log-cutoff-length)
+			   "--graph"
+			   "--pretty=oneline"
+			   (format "%s..%s" head ref)
+			   "--"))))
+		  (magit-set-section-info ref section))))))))))
+
+(define-minor-mode magit-wazzup-mode
+    "Minor mode for looking at commits that could be merged from other branches.
+
+\\{magit-wazzup-mode-map}"
+  :group magit
+  :init-value ()
+  :lighter ()
+  :keymap magit-wazzup-mode-map)
+
+(defun magit-wazzup (&optional all)
+  (interactive "P")
+  (let ((topdir (magit-get-top-dir default-directory))
+	(current-branch (magit-get-current-branch)))
+    (magit-buffer-switch "*magit-wazzup*")
+    (magit-mode-init topdir 'wazzup
+		     #'magit-refresh-wazzup-buffer
+		     current-branch all)
+    (magit-wazzup-mode t)))
+
+;;; Miscellaneous
+
+(defun magit-ignore-file (file edit local)
+  (let ((ignore-file (if local ".git/info/exclude" ".gitignore")))
+    (if edit
+	(setq file (read-string "File to ignore: " file)))
+    (with-temp-buffer
+      (when (file-exists-p ignore-file)
+        (insert-file-contents ignore-file))
+      (goto-char (point-max))
+      (unless (bolp)
+	(insert "\n"))
+      (insert "/" file "\n")
+      (write-region nil nil ignore-file))
+    (magit-need-refresh)))
+
+(defun magit-ignore-item ()
+  (interactive)
+  (magit-section-action (item info "ignore")
+    ((untracked file)
+     (magit-ignore-file info current-prefix-arg nil))
+    ((wazzup)
+     (magit-wazzup-toggle-ignore info current-prefix-arg))))
+
+(defun magit-ignore-item-locally ()
+  (interactive)
+  (magit-section-action (item info "ignore")
+    ((untracked file)
+     (magit-ignore-file info current-prefix-arg t))))
+
+(defun magit-discard-diff (diff stagedp)
+  (let ((kind (magit-diff-item-kind diff))
+	(file (magit-diff-item-file diff)))
+    (cond ((eq kind 'deleted)
+	   (when (yes-or-no-p (format "Resurrect %s? " file))
+	     (magit-run-git "reset" "-q" "--" file)
+	     (magit-run-git "checkout" "--" file)))
+	  ((eq kind 'new)
+	   (if (yes-or-no-p (format "Delete %s? " file))
+	       (magit-run-git "rm" "-f" "--" file)))
+	  (t
+	   (if (yes-or-no-p (format "Discard changes to %s? " file))
+	       (if stagedp
+		   (magit-run-git "checkout" "HEAD" "--" file)
+		 (magit-run-git "checkout" "--" file)))))))
+
+(defun magit-discard-item ()
+  (interactive)
+  (magit-section-action (item info "discard")
+    ((untracked file)
+     (if (yes-or-no-p (format "Delete %s? " info))
+	 (magit-run "rm" info)))
+    ((untracked)
+     (if (yes-or-no-p "Delete all untracked files and directories? ")
+	 (magit-run "git" "clean" "-df")))
+    ((unstaged diff hunk)
+     (when (yes-or-no-p (if (magit-use-region-p)
+			    "Discard changes in region? "
+			  "Discard hunk? "))
+       (magit-apply-hunk-item-reverse item)))
+    ((staged diff hunk)
+     (if (magit-file-uptodate-p (magit-diff-item-file
+				 (magit-hunk-item-diff item)))
+	 (when (yes-or-no-p (if (magit-use-region-p)
+				"Discard changes in region? "
+			      "Discard hunk? "))
+	   (magit-apply-hunk-item-reverse item "--index"))
+       (error "Can't discard this hunk.  Please unstage it first")))
+    ((unstaged diff)
+     (magit-discard-diff item nil))
+    ((staged diff)
+     (if (magit-file-uptodate-p (magit-diff-item-file item))
+	 (magit-discard-diff item t)
+       (error "Can't discard staged changes to this file.  Please unstage it first")))
+    ((hunk)
+     (error "Can't discard this hunk"))
+    ((diff)
+     (error "Can't discard this diff"))
+    ((stash)
+     (when (yes-or-no-p "Discard stash? ")
+       (magit-run-git "stash" "drop" info)))))
+
+(defun magit-add-change-log-entry (&optional whoami file-name other-window
+                                             new-entry put-new-entry-on-new-line)
+  "Add a change log entry for current change."
+  (interactive (list current-prefix-arg
+		     (prompt-for-change-log-name)))
+  (let ((marker
+         (save-window-excursion
+           (magit-visit-item)
+           (set-marker (make-marker) (point)))))
+    (save-excursion
+      (with-current-buffer (marker-buffer marker)
+        (goto-char marker)
+        (add-change-log-entry whoami file-name other-window
+                              new-entry put-new-entry-on-new-line)))))
+
+(defun magit-add-change-log-entry-other-window (&optional whoami file-name)
+  "Add a change log entry for current change in other window."
+  (interactive (if current-prefix-arg
+		   (list current-prefix-arg
+			 (prompt-for-change-log-name))))
+  (magit-add-change-log-entry whoami file-name t))
+
+(defun magit-visit-item (&optional other-window)
+  "Visit current item.
+With a prefix argument, visit in other window."
+  (interactive (list current-prefix-arg))
+  (magit-section-action (item info "visit")
+    ((untracked file)
+     (funcall
+      (if other-window 'find-file-other-window 'find-file)
+      info))
+    ((diff)
+     (funcall
+      (if other-window 'find-file-other-window 'find-file)
+      (magit-diff-item-file item)))
+    ((hunk)
+     (let ((file (magit-diff-item-file (magit-hunk-item-diff item)))
+	   (line (magit-hunk-item-target-line item)))
+       (funcall
+        (if other-window 'find-file-other-window 'find-file)
+        file)
+       (goto-char (point-min))
+       (forward-line (1- line))))
+    ((commit)
+     (magit-show-commit info)
+     (pop-to-buffer magit-commit-buffer-name))
+    ((stash)
+     (magit-show-stash info)
+     (pop-to-buffer magit-stash-buffer-name))
+    ((longer)
+     (magit-log-show-more-entries ()))))
+
+(defun magit-show-item-or-scroll-up ()
+  (interactive)
+  (magit-section-action (item info)
+    ((commit)
+     (magit-show-commit info #'scroll-up))
+    ((stash)
+     (magit-show-stash info #'scroll-up))
+    (t
+     (scroll-up))))
+
+(defun magit-show-item-or-scroll-down ()
+  (interactive)
+  (magit-section-action (item info)
+    ((commit)
+     (magit-show-commit info #'scroll-down))
+    ((stash)
+     (magit-show-stash info #'scroll-down))
+    (t
+     (scroll-down))))
+
+(defun magit-mark-item (&optional unmark)
+  (interactive "P")
+  (if unmark
+      (magit-set-marked-commit nil)
+    (magit-section-action (item info "mark")
+      ((commit)
+       (magit-set-marked-commit (if (eq magit-marked-commit info)
+				    nil
+				  info))))))
+
+(defun magit-describe-item ()
+  (interactive)
+  (let ((section (magit-current-section)))
+    (message "Section: %s %s-%s %S %S %S"
+	     (magit-section-type section)
+	     (magit-section-beginning section)
+	     (magit-section-end section)
+	     (magit-section-title section)
+	     (magit-section-info section)
+	     (magit-section-context-type section))))
+
+(defun magit-copy-item-as-kill ()
+  "Copy sha1 of commit at point into kill ring."
+  (interactive)
+  (magit-section-action (item info "copy")
+    ((commit)
+     (kill-new info)
+     (message "%s" info))))
+
+(eval-when-compile (require 'server))
+
+(defun magit-server-running-p ()
+  "Test whether server is running (works with < 23 as well).
+
+Return values:
+  nil		   the server is definitely not running.
+  t		   the server seems to be running.
+  something else   we cannot determine whether it's running without using
+		   commands which may have to wait for a long time."
+  (if (functionp 'server-running-p)
+      (server-running-p)
+    (condition-case nil
+	(if server-use-tcp
+	    (with-temp-buffer
+	      (insert-file-contents-literally (expand-file-name server-name server-auth-dir))
+	      (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
+		       (assq 'comm
+			     (process-attributes
+			      (string-to-number (match-string 1))))
+		       t)
+		  :other))
+	  (delete-process
+	   (make-network-process
+	    :name "server-client-test" :family 'local :server nil :noquery t
+	    :service (expand-file-name server-name server-socket-dir)))
+	  t)
+      (file-error nil))))
+
+(defun magit-interactive-rebase ()
+  "Start a git rebase -i session, old school-style."
+  (interactive)
+  (unless (magit-server-running-p)
+    (server-start))
+  (let* ((section (get-text-property (point) 'magit-section))
+	 (commit (and (member 'commit (magit-section-context-type section))
+		      (magit-section-info section)))
+	 (old-editor (getenv "GIT_EDITOR")))
+    (setenv "GIT_EDITOR" (locate-file "emacsclient" exec-path))
+    (unwind-protect
+	(magit-run-git-async "rebase" "-i"
+			     (or (and commit (concat commit "^"))
+				 (magit-read-rev "Interactively rebase to" (magit-guess-branch))))
+      (if old-editor
+	  (setenv "GIT_EDITOR" old-editor)))))
+
+(define-derived-mode magit-show-branches-mode fundamental-mode
+  "Magit Branches")
+
+(defun magit-quit-branches-window ()
+  "Bury the branches buffer and delete its window."
+  (interactive)
+  (quit-window)
+  (delete-window))
+
+(defun magit--branch-name-from-line (line)
+  "Extract the branch name from line LINE of 'git branch' output."
+  (get-text-property 0 'branch-name line))
+
+(defun magit--branch-name-at-point ()
+  "Get the branch name in the line at point."
+  (let ((branch (magit--branch-name-from-line (thing-at-point 'line))))
+    (or branch (error "No branch at point"))))
+
+(defun magit-branches-window-checkout ()
+  "Check out the branch in the line at point."
+  (interactive)
+  (magit-checkout (magit--branch-name-at-point))
+  (magit-show-branches))
+
+(defun magit-remove-remote (ref)
+  "Return REF with any remote part removed."
+  (if (string-match "^remotes/" ref)
+      (substring ref 8)
+    ref))
+
+(defun magit-remove-branch (&optional force)
+  "Remove the branch in the line at point.
+With prefix force the removal even it it hasn't been merged."
+  (interactive "P")
+  (let ((args (list "branch"
+		    (if force "-D" "-d")
+		    (when (magit--is-branch-at-point-remote) "-r")
+		    ;; remove the remotes part
+		    (magit-remove-remote
+                     (magit--branch-name-at-point)))))
+    (apply 'magit-run-git (remq nil args))
+    (if (and (magit--is-branch-at-point-remote)
+             (yes-or-no-p "Remove branch in remote repository as well? "))
+        (magit-remove-branch-in-remote-repo (magit--branch-name-at-point)))
+    (magit-show-branches)))
+
+(defun magit--remotes ()
+  "Return a list of names for known remotes."
+  (magit-git-lines "remote"))
+
+(defun magit--branches-for-remote-repo (remote)
+  "Return a list of remote branch names for REMOTE.
+These are the branch names with the remote name stripped."
+  (remq nil
+        (mapcar (lambda (line)
+                  (save-match-data
+                    (if (and (not (string-match-p " -> " line))
+                             (string-match (concat "^ +" remote "/\\([^ $]+\\)")
+                                           line))
+                        (match-string 1 line))))
+                (magit-git-lines "branch" "-r"))))
+
+(defun magit-remove-branch-in-remote-repo (&optional branch-name-at-local)
+  "Remove a branch in a remote repository by pushing nothing into it.
+If BRANCH-NAME-AT-LOCAL is not given then ask the user for the
+name of the remote and branch name. The remote must be known to git."
+  (interactive)
+  (let ((all-remotes (magit--remotes))
+        remote branch)
+    (unless all-remotes
+      (error "No remote has been  configured"))
+    (if branch-name-at-local
+        (save-match-data
+          (if (string-match "^remotes/\\([^/]+\\)/\\(.+\\)" branch-name-at-local)
+              (setq remote (match-string 1 branch-name-at-local)
+                    branch (match-string 2 branch-name-at-local))
+            (error "Cannot parse remote and branch name from `%s'" branch-name-at-local)))
+      (setq remote (magit-completing-read "Name of remote repository: " all-remotes nil t)
+            branch (magit-completing-read "Name of branch in remote repository: "
+                                          (magit--branches-for-remote-repo remote))))
+    (unless (magit-get "remote" remote "url")
+      (error "Unknown remote"))
+    (magit-run-git "push"
+                   remote
+                   (concat ":refs/heads/" branch))))
+
+(defvar magit-branches-buffer-name "*magit-branches*")
+
+(defun magit--is-branch-at-point-remote()
+  "Return t if the branch at point is a remote tracking branch"
+  (get-text-property (point) 'remote))
+
+(defun magit--branch-view-details (branch-line)
+  "Extract details from branch -va output."
+  (string-match (concat
+                 "^\\(\\*? \\{1,2\\}\\)"       ; 1: current branch marker (maybe)
+                 "\\(.+?\\) +"                 ; 2: branch name
+
+                 "\\(?:"
+                 "\\([0-9a-fA-F]\\{7,8\\}\\) " ; 3: sha1
+                 "\\|\\(-> \\)"                ; 4: or the pointer to a ref
+                 "\\)"
+
+                 "\\(.+\\)"                    ; 5: message or ref
+                 )
+                branch-line)
+  (let ((res (list (cons 'current (match-string 1 branch-line))
+                   (cons 'branch  (match-string 2 branch-line))
+                   (cons 'remote  (string-match-p "^remotes/" (match-string 2 branch-line))))))
+    (unless (cdr (assoc 'remote res))
+      (setq res (append (list (cons 'tracking
+                                    (magit-remote-branch-for (cdr (assoc 'branch res))
+                                                             t)))
+                        res)))
+    (if (match-string 4 branch-line)
+        (cons (cons 'other-ref (match-string 5 branch-line)) res)
+      (append
+       (list
+        (cons 'sha1 (match-string 3 branch-line))
+        (cons 'msg (match-string 5 branch-line)))
+       res))))
+
+(defun magit-show-branches ()
+  "Show all of the current branches."
+  (interactive)
+  (let ((buffer-existed (get-buffer magit-branches-buffer-name)))
+    (unless (eq major-mode 'magit-show-branches-mode)
+      (let ((topdir (magit-get-top-dir default-directory)))
+        (magit-buffer-switch magit-branches-buffer-name)
+        (setq default-directory topdir)))
+    (let ((inhibit-read-only t)
+          (goto-branch-line (line-number-at-pos))
+          (branches (mapcar 'magit--branch-view-details
+                            (apply 'magit-git-lines "branch" "-va"
+                                   magit-custom-options))))
+      (erase-buffer)
+      (insert
+       (mapconcat
+        (lambda (b)
+          (propertize
+           (concat
+            (cdr (assoc 'current b))
+            (propertize (or (cdr (assoc 'sha1 b))
+                            "       ")
+                        'face 'magit-log-sha1)
+            " "
+            (apply 'propertize (cdr (assoc 'branch b))
+                   (if (string-match-p "^\\*" (cdr (assoc 'current b)))
+                       '(face magit-branch)))
+            (when (assoc 'other-ref b)
+              (concat " (" (cdr (assoc 'other-ref b)) ")"))
+            (when (cdr (assoc 'tracking b))
+              (concat " [" (propertize (cdr (assoc 'tracking b)) 'face 'magit-log-head-label-remote) "]")))
+           'remote (cdr (assoc 'remote b))
+           'branch-name (cdr (assoc 'branch b))
+           'revision (cdr (assoc 'sha1 b))))
+        branches
+        "\n"))
+      (magit-show-branches-mode)
+      (goto-char (point-min))
+      (if buffer-existed
+          (forward-line (1- goto-branch-line))
+        (while (and (< (point)
+                       (point-max))
+                    (not (string= (buffer-substring-no-properties (point) (1+ (point)))
+                                  "*")))
+          (forward-line 1)))))
+  (setq buffer-read-only t))
+
+(defun magit-change-what-branch-tracks ()
+  "Change which remote branch the current branch tracks."
+  (interactive)
+  (if (magit--is-branch-at-point-remote)
+      (error "Cannot modify a remote branch"))
+  (let* ((local-branch (magit--branch-name-at-point))
+         (new-tracked (magit-read-rev  "Change tracked branch to"
+                                       nil
+                                       (lambda (ref)
+                                         (not (string-match-p "refs/remotes/"
+                                                              ref)))))
+         new-remote new-branch)
+    (unless (string= (or new-tracked "") "")
+      (if (string-match "^refs/remotes/\\([^/]+\\)/\\(.+\\)" ; 1: remote name; 2: branch name
+                        new-tracked)
+          (setq new-remote (match-string 1 new-tracked)
+                new-branch (concat "refs/heads/" (match-string 2 new-tracked)))
+        ;; Match refs that are unknown in the local repository. Can be
+        ;; useful if you want to create a new branch in a remote
+        ;; repository.
+        (if (string-match "^\\([^ ]+\\) +(\\(.+\\))$" ; 1: branch name; 2: remote name
+                          new-tracked)
+            (setq new-remote (match-string 2 new-tracked)
+                  new-branch (concat "refs/heads/" (match-string 1 new-tracked)))
+            (error "Cannot parse the remote and branch name"))))
+    (magit-set new-remote "branch" local-branch "remote")
+    (magit-set new-branch "branch" local-branch "merge")
+    (magit-show-branches)
+    (if (string= (magit-get-current-branch) local-branch)
+        (magit-refresh-buffer (magit-find-buffer 'status default-directory)))))
+
+(defvar magit-ediff-file)
+(defvar magit-ediff-windows)
+
+(eval-when-compile (require 'ediff))
+
+(defun magit-interactive-resolve (file)
+  (require 'ediff)
+  (let ((merge-status (magit-git-string "ls-files" "-u" "--" file))
+	(base-buffer (generate-new-buffer (concat file ".base")))
+	(our-buffer (generate-new-buffer (concat file ".current")))
+	(their-buffer (generate-new-buffer (concat file ".merged")))
+	(windows (current-window-configuration)))
+    (if (null merge-status)
+	(error "Cannot resolve %s" file))
+    (with-current-buffer base-buffer
+      (if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
+	  (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:" file))))))
+    (with-current-buffer our-buffer
+      (if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
+	  (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:" file))))))
+    (with-current-buffer their-buffer
+      (if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
+	  (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:" file))))))
+    ;; We have now created the 3 buffer with ours, theirs and the ancestor files
+    (with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer)
+      (make-local-variable 'magit-ediff-file)
+      (setq magit-ediff-file file)
+      (make-local-variable 'magit-ediff-windows)
+      (setq magit-ediff-windows windows)
+      (make-local-variable 'ediff-quit-hook)
+      (add-hook 'ediff-quit-hook
+		(lambda ()
+		  (let ((buffer-A ediff-buffer-A)
+			(buffer-B ediff-buffer-B)
+			(buffer-C ediff-buffer-C)
+			(buffer-Ancestor ediff-ancestor-buffer)
+			(file magit-ediff-file)
+			(file-buffer)
+			(windows magit-ediff-windows))
+		    (ediff-cleanup-mess)
+		    (find-file file)
+		    (setq file-buffer (current-buffer))
+		    (erase-buffer)
+		    (insert-buffer-substring buffer-C)
+		    (kill-buffer buffer-A)
+		    (kill-buffer buffer-B)
+		    (kill-buffer buffer-C)
+		    (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor))
+		    (set-window-configuration windows)
+		    (magit-save-some-buffers
+		     "Conflict resolution finished; you may save the buffer"
+		     (lambda () (eq (current-buffer) file-buffer)))))))))
+
+(defun magit-interactive-resolve-item ()
+  (interactive)
+  (magit-section-action (item info "resolv")
+    ((diff)
+     (magit-interactive-resolve (cadr info)))))
+
+(defun magit-list-buffers ()
+  "Return a list of magit buffers."
+  (delq nil (mapcar (lambda (b)
+                      (with-current-buffer b
+                        (when (eq major-mode 'magit-mode)
+                          b)))
+                    (buffer-list))))
+
+(defun remove-dupes (list)
+  "Remove the duplicate items in a sorted list."
+  (let (tmp-list head)
+    (while list
+      (setq head (pop list))
+      (unless (equal head (car list))
+        (push head tmp-list)))
+    (reverse tmp-list)))
+
+(defun magit-list-projects ()
+  "Return a list of directories with a magit representation."
+  (remove-dupes
+   (sort
+    (mapcar (lambda (b)
+              (with-current-buffer b
+                (directory-file-name default-directory)))
+            (magit-list-buffers))
+    'string=)))
+
+(defun magit-submodule-update (&optional init)
+  "Update the submodule of the current git repository
+
+With a prefix arg, do a submodule update --init"
+  (interactive "P")
+  (let ((default-directory (magit-get-top-dir default-directory)))
+    (apply #'magit-run-git-async "submodule" "update" (if init '("--init") ()))))
+
+(defun magit-submodule-update-init ()
+  "Update and init the submodule of the current git repository."
+  (interactive)
+  (magit-submodule-update t))
+
+(defun magit-submodule-init ()
+  "Initialize the submodules"
+  (interactive)
+  (let ((default-directory (magit-get-top-dir default-directory)))
+    (magit-run-git-async "submodule" "init")))
+
+(defun magit-submodule-sync ()
+  "Synchronizes submodules' remote URL configuration"
+  (interactive)
+  (let ((default-directory (magit-get-top-dir default-directory)))
+    (magit-run-git-async "submodule" "sync")))
+
+(defun magit-run-git-gui ()
+  "Run `git gui' for the current git repository"
+  (interactive)
+  (let* ((default-directory (magit-get-top-dir default-directory)))
+    (start-process "git gui" nil "git" "gui")))
+
+(defun magit-run-gitk ()
+  "Run `gitk --all' for the current git repository"
+  (interactive)
+  (let* ((default-directory (magit-get-top-dir default-directory)))
+    (start-process "gitk" nil "gitk" "--all")))
+
+;; for emacs 22 compatibility
+
+(defun magit-string-match-p (regexp string &optional start)
+  "Same as `string-match' except this function does not change
+the match data."
+  (let ((inhibit-changing-match-data t))
+    (string-match regexp string start)))
+
+(when (not (fboundp 'string-match-p))
+  (fset 'string-match-p (symbol-function 'magit-string-match-p)))
+
+(provide 'magit)
+;;; magit.el ends here
diff --git a/elpa/magit-1.0.0/magit.elc b/elpa/magit-1.0.0/magit.elc
new file mode 100644
index 0000000000000000000000000000000000000000..f3d8d1731b723e3f5a48bd382461c759e816460d
GIT binary patch
literal 203288
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

literal 0
HcmV?d00001

diff --git a/elpa/magit-1.2.0/magit.info b/elpa/magit-1.0.0/magit.info
similarity index 56%
rename from elpa/magit-1.2.0/magit.info
rename to elpa/magit-1.0.0/magit.info
index deda92f09..2da7e9737 100644
--- a/elpa/magit-1.2.0/magit.info
+++ b/elpa/magit-1.0.0/magit.info
@@ -1,12 +1,11 @@
-This is magit.info, produced by makeinfo version 4.8 from magit.texi.
+This is magit.info, produced by makeinfo version 4.13 from magit.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
 * Magit: (magit).        Using Git from Emacs with Magit.
 END-INFO-DIR-ENTRY
 
-   Copyright (C) 2008, 2009, 2010, 2011 Magit contributors. (See the
-header of magit.el for the lengthy list of Magit contributors.)
+   Copyright (C) 2008, 2009, 2011 Marius Vollmer
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -21,11 +20,7 @@ Magit User Manual
 *****************
 
 Magit is an interface to the version control system Git, implemented as
-an extension to Emacs.  Magit supports GNU Emacs version 22 or later.
-It may work with other emacsen, but Magit developers do not intend to
-investigate and fix bugs that only appear in unsupported versions.
-Patches to fix bugs in other emacsen or volunteers to maintain
-compatibility are still welcome.
+an extension to Emacs.
 
 * Menu:
 
@@ -37,25 +32,20 @@ compatibility are still welcome.
 * Staging and Committing::
 * History::
 * Reflogs::
-* Commit Buffer::
 * Diffing::
 * Tagging::
 * Resetting::
 * Stashing::
 * Branching::
-* The Branch Manager::
+* The branch list::
 * Wazzup::
 * Merging::
 * Rebasing::
-* Interactive Rebasing::
 * Rewriting::
 * Pushing and Pulling::
-* Bisecting::
 * Submodules::
 * Using Magit Extensions::
 * Using Git Directly::
-* Customization::
-* Frequently Asked Questions::
 
 
 File: magit.info,  Node: Introduction,  Next: Acknowledgments,  Prev: Top,  Up: Top
@@ -74,7 +64,7 @@ most common Git operations convenient.  Thus, Magit will likely not
 save you from learning Git itself.
 
    This manual provides a tour of all Magit features.  It does not give
-an introduction to version control in general, or to Git in particular.
+a introduction to version control in general, or to Git in particular.
 
    The main entry point to Magit is `M-x magit-status', which will put
 you in Magit's status buffer.  You will be using it frequently, so it
@@ -96,9 +86,7 @@ File: magit.info,  Node: Acknowledgments,  Next: Sections,  Prev: Introduction,
 2 Acknowledgments
 *****************
 
-Marius Vollmer started the whole project.  Thanks !
-
-   From day one of the first Magit announcement, John Wiegley has
+From day one of the first Magit announcement, John Wiegley has
 contributed numerous fixes, UI improvements, and new features.  Thanks!
 
    Linh Dang and Christian Neukirchen also contributed from day one.
@@ -221,18 +209,18 @@ the working tree and the staging area.  You can hide and show them as
 described in the previous section.
 
    The first section shows _Untracked files_, if there are any.  See
-*Note Untracked files:: for more details.
+*note Untracked files:: for more details.
 
-   The next two sections show your local changes.  They are explained
-fully in the next chapter, *Note Staging and Committing::.
+   Two section show your local changes.  They are explained fully in the
+next chapter, *note Staging and Committing::.
 
    If the current branch is associated with a remote tracking branch,
 the status buffer shows the differences between the current branch and
-the tracking branch.  See *Note Pushing and Pulling:: for more
+the tracking branch.  See *note Pushing and Pulling:: for more
 information.
 
    During a history rewriting session, the status buffer shows the
-_Pending changes_ and _Pending commits_ sections.  See *Note
+_Pending changes_ and _Pending commits_ sections.  See *note
 Rewriting:: for more details.
 
 
@@ -243,8 +231,8 @@ File: magit.info,  Node: Untracked files,  Next: Staging and Committing,  Prev:
 
 Untracked files are shown in the _Untracked files_ section.
 
-   You can add an untracked file to the staging area with `s'.  If
-point is on the _Untracked files_ section title when you hit `s', all
+   You can add a untracked file to the staging area with `s'.  If point
+is on the _Untracked files_ section title when you it `s', all
 untracked files are staged.
 
    Typing `C-u S' anywhere will also stage all untracked files,
@@ -253,15 +241,11 @@ together with all changes to the tracked files.
    You can instruct Git to ignore them by typing `i'.  This will add
 the filename to the `.gitignore' file.  Typing `C-u i' will ask you for
 the name of the file to ignore.  This is useful to ignore whole
-directories, for example.  In this case, the minibuffer's future history
-(accessible with `M-n') contains predefined values (such as wildcards)
-that might be of interest. If prefix argument is negative (for example
-after typing `C-- i'), the prompt proposes wildcard by default.  The
-`I' command is similar to `i' but will add the file to
-`.git/info/exclude' instead.
-
-   To delete an untracked file forever, use `k'.  If point is on the
-_Untracked files_ section title when you hit `k', all untracked files
+directories, for example.  The `I' command is similar to `i' but will
+add the file to `.git/info/exclude' instead.
+
+   To delete a untracked file forever, use `k'.  If point is on the
+_Untracked files_ section title when you it `k', all untracked files
 are deleted.
 
 
@@ -284,7 +268,7 @@ changes_ and _Staged changes_.  The _Staged changes_ section shows the
 changes that will be included in the next commit, while the _Unstaged
 changes_ section shows the changes that will be left out.
 
-   To move an unstaged hunk into the staging area, move point into the
+   To move a unstaged hunk into the staging area, move point into the
 hunk and type `s'.  Likewise, to unstage a hunk, move point into it and
 type `u'.  If point is in a diff header when you type `s' or `u', all
 hunks belonging to that diff are moved at the same time.
@@ -294,10 +278,6 @@ in the region are staged or unstaged.  (This works line by line: if the
 beginning of a line is in the region it is included in the changes,
 otherwise it is not.)
 
-   To change the size of the hunks, you can type `+' or `-' to increase
-and decrease, respectively.  Typing `0' will reset the hunk size to the
-default.
-
    Typing `C-u s' will ask you for a name of a file to be staged, for
 example to stage files that are hidden.
 
@@ -338,10 +318,6 @@ determined by the `magit-commit-signoff' customization variable.
 allows you to make commits that serve as notes, without including any
 changes.
 
-   Typing `C-c C-t' will toggle the option to specify the name and
-email address for the commit's author.  The default is determined by
-the `user.name' and `user.email' git configuration settings.
-
    If you change your mind and don't want to go ahead with your commit
 while you are in the `*magit-log-edit*' buffer, you can just switch to
 another buffer, continue editing there, staging and unstaging things
@@ -366,33 +342,28 @@ buffer will be shown that displays the history in a terse form.  The
 first paragraph of each commit message is displayed, next to a
 representation of the relationships between commits.
 
-   To show the repository history between two branches or between any
-two points of the history, type `l r l'.  You will be prompted to enter
-references for starting point and ending point of the history range; you
-can use auto-completion to specify them.  A typical use case for ranged
-history log display would be `l r l master RET new-feature RET' that
-will display commits on the new-feature branch that are not in master;
-these commits can then be inspected and cherry-picked, for example.
-
-   More thorough filtering can be done by supplying `l' with one or
-more suffix arguments, as displayed in its popup.  `=g' ('Grep') for
-example, limits the output to commits of which the log message matches
-a specific string/regex.
+   Giving a prefix argument to `l' will ask for the starting and end
+point of the history.  This can be used to show the commits that are in
+one branch, but not in another, for example.  The start point can also
+be a range of revisions "r1..r2".  In that case "r1" is used as the
+start and "r2" as the end point of the history.
 
    Typing `l L' (or `l C-u L') will show the log in a more verbose form.
 
    Magit will show only `magit-log-cutoff-length' entries. `e' will
 show twice as many entries. `C-u e' will show all entries, and given a
-numeric prefix argument, `e' will add this number of entries.
+numeric prefix argument, `e' will add this number of entries. You can
+also show more entries by typing `RET' on the text appended at the end
+of the buffer.
 
    You can move point to a commit and then cause various things to
-happen with it.  (The following commands work in any list of commits,
+happen with it.  (The following commands work in any list of commit,
 such as the one shown in the _Unpushed commits_ section.)
 
    Typing `RET' will pop up more information about the current commit
-and move point into the new buffer.  *Note Commit Buffer::.  Typing
-`SPC' and `DEL' will also show the information, but will scroll the new
-buffer up or down (respectively) when typed again.
+and move point into the new buffer.  Typing `SPC' and `DEL' will also
+show the information, but will scroll the new buffer up or down
+(respectively) when typed again.
 
    Typing `a' will apply the current commit to your current branch.
 This is useful when you are browsing the history of some other branch
@@ -423,8 +394,10 @@ marked commit no matter where point is, use `C-u .'.
 marked commit as implicit arguments.  Other commands will offer the
 marked commit as a default when prompting for their arguments.
 
+   To grep the history press `s'.
+
 
-File: magit.info,  Node: Reflogs,  Next: Commit Buffer,  Prev: History,  Up: Top
+File: magit.info,  Node: Reflogs,  Next: Diffing,  Prev: History,  Up: Top
 
 8 Reflogs
 *********
@@ -437,51 +410,12 @@ head, while `l h' will show the reflog of `HEAD'.
 `l L' that shows the commit history.
 
 
-File: magit.info,  Node: Commit Buffer,  Next: Diffing,  Prev: Reflogs,  Up: Top
-
-9 Commit Buffer
-***************
-
-When you view a commit (perhaps by selecting it in the log buffer,
-*Note History::), the "commit buffer" is displayed, showing you
-information about the commit and letting you interact with it.
-
-   By placing your cursor within the diff or hunk and typing `a', you
-can apply the same patch to your working copy.  This is useful when you
-want to copy a change from another branch, but don't necessarily want
-to cherry-pick the whole commit.
-
-   By typing `v' you can apply the patch in reverse, removing all the
-lines that were added and adding all the lines that were removed.  This
-is a convenient way to remove a change after determining that it
-introduced a bug.
+File: magit.info,  Node: Diffing,  Next: Tagging,  Prev: Reflogs,  Up: Top
 
-   If the commit message refers to any other commits in the repository
-by their unique hash, the hash will be highlighted and you will be able
-to visit the referenced commit either by clicking on it or by moving
-your cursor onto it and pressing `RET'.
-
-   The commit buffer maintains a history of the commits it has shown.
-After visiting a referenced commit you can type `C-c C-b' to get back
-to where you came from.  To go forward in the history, type `C-c C-f'.
-There are also `[back]' and `[forward]' buttons at the bottom of the
-buffer.
-
-
-File: magit.info,  Node: Diffing,  Next: Tagging,  Prev: Commit Buffer,  Up: Top
-
-10 Diffing
-**********
-
-Magit typically shows diffs in the "unified" format.
-
-   In any buffer that shows a diff, you can type `e' anywhere within
-the diff to show the two versions of the file in Ediff.  If the diff is
-of a file in the status buffer that needs to be merged, you will be
-able to use Ediff as an interactive merge tool.  Otherwise, Ediff will
-simply show the two versions of the file.
+9 Diffing
+*********
 
-   To show the changes from your working tree to another revision, type
+To show the changes from you working tree to another revision, type
 `d'.  To show the changes between two arbitrary revisions, type `D'.
 
    You can use `a' within the diff output to apply the changes to your
@@ -495,10 +429,10 @@ to that region.
 
 File: magit.info,  Node: Tagging,  Next: Resetting,  Prev: Diffing,  Up: Top
 
-11 Tagging
+10 Tagging
 **********
 
-Typing `t t' will make a lighweight tag.  Typing `t a' will make an
+Typing `t t' will make a lighweight tag.  Typing `t T' will make a
 annotated tag.  It will put you in the normal `*magit-log-edit' buffer
 for writing commit messages, but typing `C-c C-c' in it will make the
 tag instead.  This is controlled by the `Tag' field that will be added
@@ -507,7 +441,7 @@ to the `*magit-log-edit*' buffer.  You can edit it, if you like.
 
 File: magit.info,  Node: Resetting,  Next: Stashing,  Prev: Tagging,  Up: Top
 
-12 Resetting
+11 Resetting
 ************
 
 Once you have added a commit to your local repository, you can not
@@ -542,7 +476,7 @@ first using an unprefixed `x' to reset only the head, and then using
 
 File: magit.info,  Node: Stashing,  Next: Branching,  Prev: Resetting,  Up: Top
 
-13 Stashing
+12 Stashing
 ***********
 
 You can create a new stash with `z z'.  Your stashes will be listed in
@@ -552,13 +486,8 @@ the status buffer, and you can apply them with `a' and pop them with
    With a prefix argument, both `a' and `A' will attempt to reinstate
 the index as well as the working tree from the stash.
 
-   Typing `z -k z' will create a stash just like `z z', but will leave
-the changes in your working tree and index. This makes it easier to,
-for example, test multiple variations of the same change.
-
-   If you just want to make quick snapshots in between edits, you can
-use `z s', which automatically enters a timestamp as description, and
-keeps your working tree and index intact by default.
+   Typing `z Z' will create a stash just like `z z', but will leave the
+changes in your working tree and index.
 
    You can visit and show stashes in the usual way: Typing `SPC' and
 `DEL' will pop up a buffer with the description of the stash and scroll
@@ -566,13 +495,13 @@ it, typing `RET' will move point into that buffer. Using `C-u RET' will
 move point into that buffer in other window.
 
 
-File: magit.info,  Node: Branching,  Next: The Branch Manager,  Prev: Stashing,  Up: Top
+File: magit.info,  Node: Branching,  Next: The branch list,  Prev: Stashing,  Up: Top
 
-14 Branching
+13 Branching
 ************
 
 The current branch is indicated in the header of the status buffer.
-You can switch to a different branch by typing `b b'.  This will
+You can switch to a different branch by typing `b c'.  This will
 immediately checkout the branch into your working copy, so you
 shouldn't have any local modifications when switching branches.
 
@@ -580,51 +509,46 @@ shouldn't have any local modifications when switching branches.
 local tracking branch for it instead.  This way, you can easily start
 working on new branches that have appeared in a remote repository.
 
-   Typing `b b' while point is at a commit description will offer that
+   Typing `b c' while point is at a commit description will offer that
 commit as the default to switch to.  This will result in a detached
 head.
 
-   Typing  `b m' will let you rename a branch. Unless a branch with the
-same name already exists, obviously...
+   To create a new branch and switch to it immediately, type `b B'.
 
-   To create a new branch and switch to it immediately, type `b n'.
-
-   To delete a branch, type `b d'. If you're currently on that branch,
-Magit will offer to switch to the 'master' branch.
-
-   Deleting a branch is only possible if it's already fully merged into
-HEAD or its upstream branch. Unless you type `b D', that is.  Here be
-dragons...
-
-   Typing `b v' will list the local and remote branches in a new buffer
-called `*magit-branches*' from which you can work with them. See *Note
-The Branch Manager:: for more details.
+   Typing `b V' will list the local and remote branches in a new buffer
+called `*magit-branches*' from which you can work with them. See *note
+The branch list:: for more details.
 
 
-File: magit.info,  Node: The Branch Manager,  Next: Wazzup,  Prev: Branching,  Up: Top
-
-15 The Branch Manager
-*********************
+File: magit.info,  Node: The branch list,  Next: Wazzup,  Prev: Branching,  Up: Top
 
-The Branch Manager is a separate buffer called `*magit-branches*' with
-its own local key map. The buffer contains both local and remote
-branches. The current local branch is marked by a "*" in front of the
-name.
+14 The branch list
+******************
 
-   To check out a branch, move your cursor to the desired branch and
-press `RET'.
+The branch list is a separate buffer called `*magit-branches*' with its
+own local key map. The keybindings are modeled after magit's main
+buffer. The buffer contains both local and remote branches. The current
+local branch is marked by a "*" in front of the name.
 
    Typing `k' will delete the branch in the current line, and `C-u k'
 deletes it even if it hasn't been merged into the current local branch.
 Deleting works for both local and remote branches.
 
-   By typing `T' on a local branch, you can change which remote branch
-it's set to track.
+   You can merge the branch in the current line by typing `m m' for a
+manual merge and `m m' for an automatic merge.
+
+   With `RET' or `b b' you can check out the branch in the current line.
+
+   Typing `$' shows the `*magit-process*' buffer which contains the
+transcript of the most recent command.
+
+   Typing `V' will refresh the branch list. `q' buries the branch list
+buffer and deletes its window.
 
 
-File: magit.info,  Node: Wazzup,  Next: Merging,  Prev: The Branch Manager,  Up: Top
+File: magit.info,  Node: Wazzup,  Next: Merging,  Prev: The branch list,  Up: Top
 
-16 Wazzup
+15 Wazzup
 *********
 
 Typing `w' will show a summary of how your other branches relate to the
@@ -646,12 +570,12 @@ unignore it.
 
 File: magit.info,  Node: Merging,  Next: Rebasing,  Prev: Wazzup,  Up: Top
 
-17 Merging
+16 Merging
 **********
 
-Magit offers two ways to merge branches: manual and automatic.  A
+Magit offers two ways to merge branches: manually and automatic.  A
 manual merge will apply all changes to your working tree and staging
-area, but will not commit them, while an automatic merge will go ahead
+area, but will not commit them, while a automatic merge will go ahead
 and commit them immediately.
 
    Type `m m' to initiate merge.
@@ -661,7 +585,7 @@ remind you that the next commit will be a merge commit (with more than
 one parent).  If you want to abort a manual merge, just do a hard reset
 to HEAD with `X'.
 
-   Merges can fail if the two branches you want to merge introduce
+   Merges can fail if the two branches you merge want to introduce
 conflicting changes.  In that case, the automatic merge stops before the
 commit, essentially falling back to a manual merge.  You need to resolve
 the conflicts for example with `e' and stage the resolved files, for
@@ -672,9 +596,9 @@ you can only stage whole files once all conflicts in them have been
 resolved.
 
 
-File: magit.info,  Node: Rebasing,  Next: Interactive Rebasing,  Prev: Merging,  Up: Top
+File: magit.info,  Node: Rebasing,  Next: Rewriting,  Prev: Merging,  Up: Top
 
-18 Rebasing
+17 Rebasing
 ***********
 
 Typing `R' in the status buffer will initiate a rebase or, if one is
@@ -692,34 +616,9 @@ configuring `git pull' to rebase instead of merge, for example.  Such a
 rebase can be finished with `R' as well.
 
 
-File: magit.info,  Node: Interactive Rebasing,  Next: Rewriting,  Prev: Rebasing,  Up: Top
-
-19 Interactive Rebasing
-***********************
-
-Typing `E' in the status buffer will initiate an interactive rebase.
-This is equivalent to running `git rebase --interactive' at the command
-line. The `git-rebase-todo' file will be opened in an Emacs buffer for
-you to edit. This file is opened using `emacsclient', so just edit this
-file as you normally would, then call the `server-edit' function
-(typically bound to `C-x #') to tell Emacs you are finished editing,
-and the rebase will proceed as usual.
-
-   If you have loaded `rebase-mode.el' (which is included in the Magit
-distribution), the `git-rebase-todo' buffer will be in `rebase-mode'.
-This mode disables normal text editing but instead provides single-key
-commands (shown in the buffer) to perform all the edits that you would
-normally do manually, including changing the operation to be performed
-each commit ("pick", "squash", etc.), deleting (commenting out) commits
-from the list, and reordering commits. You can finish editing the
-buffer and proceed with the rebase by pressing `C-c C-c', which is
-bound to `server-edit' in this mode, and you can abort the rebase with
-`C-c C-k', just like when editing a commit message in Magit.
-
-
-File: magit.info,  Node: Rewriting,  Next: Pushing and Pulling,  Prev: Interactive Rebasing,  Up: Top
+File: magit.info,  Node: Rewriting,  Next: Pushing and Pulling,  Prev: Rebasing,  Up: Top
 
-20 Rewriting
+18 Rewriting
 ************
 
 As hinted at earlier, you can rewrite your commit history.  For
@@ -741,12 +640,10 @@ associated with rewriting.  These commands all start with the `r'
 prefix key.
 
    Typing `r b' will start a rewrite operation.  You will be prompted
-for a _base_ commit.  This commit and all subsequent commits up until
-the current head are then put in a list of _Pending commits_, after
-which the current head will be reset to the _parent_ of the base
-commit.  This can be configured to behave like `git rebase', i.e.
-exclude the selected base commit from the rewrite operation, with the
-`magit-rewrite-inclusive' variable.
+for a _base_ commit, and all commits between the current head and this
+commit are put in a list of _Pending commits_ (including the base
+commit).  The current head will then be reset to the parent of the base
+commit.
 
    You would then typically use `a' and `A' to cherry pick commits from
 the list of pending commits in the desired order, until all have been
@@ -766,12 +663,12 @@ explicitly.
    You can also use `v' to revert a commit when you have changed your
 mind.  This will change the `.' mark back to `*'.
 
-   Once you are done with the rewrite, type `r s' to remove the book
+   Once you are done with the rewrite, type `r t' to remove the book
 keeping information from the status buffer.
 
    If you rather wish to start over, type `r a'.  This will abort the
 rewriting, resetting the current head back to the value it had before
-the rewrite was started with `r b'.
+the rewrite was started with `r s'.
 
    Typing `r f' will _finish_ the rewrite: it will apply all unused
 commits one after the other, as if you would us `A' with all of them.
@@ -786,28 +683,24 @@ changes that you still need to rewrite, and you can apply hunks from
 it, like from any other diff.
 
 
-File: magit.info,  Node: Pushing and Pulling,  Next: Bisecting,  Prev: Rewriting,  Up: Top
+File: magit.info,  Node: Pushing and Pulling,  Next: Submodules,  Prev: Rewriting,  Up: Top
 
-21 Pushing and Pulling
+19 Pushing and Pulling
 **********************
 
-Magit will run `git push' when you type `P P'.  If you give a prefix
-argument to `P P', you will be prompted for the repository to push to.
+Magit will run `git push' when you type `P p'.  If you give a prefix
+argument to `P p', you will be prompted for the repository to push to.
 When no default remote repository has been configured yet for the
-current branch, you will be prompted as well.  Typing `P P' will only
+current branch, you will be prompted as well.  Typing `P p' will only
 push the current branch to the remote.  In other words, it will run
 `git push <remote> <branch>'.  The branch will be created in the remote
 if it doesn't exist already.  The local branch will be configured so
-that it pulls from the new remote branch. If you give a double prefix
-argument to `P P', you will be prompted in addition for the target
-branch to push to.  In other words, it will run `git push <remote>
-<branch>:<target>'.
+that it pulls from the new remote branch.
 
-   Typing `f f' will run `git fetch'.  It will prompt for the name of
-the remote to update if there is no default one.  Typing `f o' will
-always prompt for the remote.  Typing `F F' will run `git pull'.  When
-you don't have a default branch configured to be pulled into the
-current one, you will be asked for it.
+   Typing `f f' will run `git remote update'.  With a prefix arg, it
+will prompt for the name of the remote to update.  Typing `F p' will
+run `git pull'.  When you don't have a default branch configured to be
+pulled into the current one, you will be asked for it.
 
    If there is a default remote repository for the current branch, Magit
 will show that repository in the status buffer header.
@@ -818,16 +711,16 @@ branch named `<remote>/<branch>'.  This section works just like the
 history buffer: you can see details about a commit with `RET', compare
 two of them with `.' and `=', and you can reset your current head to
 one of them with `x', for example. If you want to push the changes then
-type `P P'.
+type `P p'.
 
    When the remote branch has changes that are not in the current
 branch, Magit shows them in a section called _Unpulled changes_.  Typing
-`F F' will fetch and merge them into the current branch.
+`F p' will merge them into the current branch.
 
 
-File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Bisecting,  Up: Top
+File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Pushing and Pulling,  Up: Top
 
-22 Submodules
+20 Submodules
 *************
 
 `M u'
@@ -843,92 +736,22 @@ File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Bisec
      Synchronizes submodules' remote URL configuration setting to the
      value specified in .gitmodules.
 
-
-File: magit.info,  Node: Bisecting,  Next: Submodules,  Prev: Pushing and Pulling,  Up: Top
-
-23 Bisecting
-************
-
-Magit supports bisecting by showing how many revisions and steps are
-left to be tested in the status buffer. You can control the bisect
-session from both the status and from log buffers with the `B' key menu.
-
-   Typing `B s' will start a bisect session.  You will be prompted for
-a revision that is known to be bad (defaults to _HEAD_) and for a
-revision that is known to be good (defaults to the revision at point if
-there is one). git will select a revision for you to test, and Magit
-will update its status buffer accordingly.
-
-   You can tell git that the current revision is good with `B g', that
-it is bad with `B b' or that git should skip it with `B k'. You can
-also tell git to go into full automatic mode by giving it the name of a
-script to run for each revision to test with `B u'.
-
-   The current status can be shown as a log with `B l'. It contains the
-revisions that have already been tested and your decisions about their
-state.
-
-   The revisions left to test can be visualized in gitk with `B v'.
-
-   When you're finished bisecting you have to reset the session with `B
-r'.
-
 
 File: magit.info,  Node: Using Magit Extensions,  Next: Using Git Directly,  Prev: Submodules,  Up: Top
 
-24 Magit Extensions
+21 Magit Extensions
 *******************
 
 * Menu:
 
-* Activating extensions::
 * Interfacing with Subversion::
 * Interfacing with Topgit::
-* Interfacing with StGit::
 * Developing Extensions::
 
 
-File: magit.info,  Node: Activating extensions,  Next: Interfacing with Subversion,  Up: Using Magit Extensions
-
-24.1 Activating extensions
-==========================
-
-Magit comes with a couple of shipped extensions that allow interaction
-with `git-svn', `topgit' and `stgit'. See following sections for
-specific details on how to use them.
-
-   Extensions can be activated globally or on a per-repository basis.
-Since those extensions are implemented as minor modes, one can use for
-example `M-x magit-topgit-mode' to toggle the `topgit' extension,
-making the corresponding section and commands (un)available.
-
-   In order to do that automatically (and for every repository), one can
-use for example:
-
-     (add-hook 'magit-mode-hook 'turn-on-magit-topgit)
-
-   Magit also allows configuring different extensions, based on the git
-repository configuration.
-
-     (add-hook 'magit-mode-hook 'magit-load-config-extensions)
-
-   This will read git configuration variables and activate the relevant
-extensions.
-
-   For example, after running the following commands, the `topgit'
-extension will be loaded for every repository, while the `svn' one will
-be loaded only for the current one.
-
-     $ git config --global --add magit.extension topgit
-     $ git config --add magit.extension svn
-
-   Note the `--add' flag, which means that each extension gets its own
-line in the `config' file.
-
-
-File: magit.info,  Node: Interfacing with Subversion,  Next: Interfacing with Topgit,  Prev: Activating extensions,  Up: Using Magit Extensions
+File: magit.info,  Node: Interfacing with Subversion,  Next: Interfacing with Topgit,  Up: Using Magit Extensions
 
-24.2 Interfacing with Subversion
+21.1 Interfacing with Subversion
 ================================
 
 Typing `N r' runs `git svn rebase', typing `N c' runs `git svn dcommit'
@@ -940,9 +763,9 @@ the path of the remote Subversion repository. With a prefix (`C-u N s'
 the user will also be prompted for a branch to search in.
 
 
-File: magit.info,  Node: Interfacing with Topgit,  Next: Interfacing with StGit,  Prev: Interfacing with Subversion,  Up: Using Magit Extensions
+File: magit.info,  Node: Interfacing with Topgit,  Next: Developing Extensions,  Prev: Interfacing with Subversion,  Up: Using Magit Extensions
 
-24.3 Interfacing with Topgit
+21.2 Interfacing with Topgit
 ============================
 
 Topgit (http://repo.or.cz/r/topgit.git) is a patch queue manager that
@@ -958,38 +781,15 @@ prefix by convention. So, creating a "t/foo" branch will actually
 populate the "Topics" section with one more branch after committing
 `.topdeps' and `.topmsg'.
 
-   Also, the way we pull (see *Note Pushing and Pulling::) such a
+   Also, the way we pull (see *note Pushing and Pulling::) such a
 branch is slightly different, since it requires updating the various
 dependencies of that branch. This should be mostly transparent, except
 in case of conflicts.
 
 
-File: magit.info,  Node: Interfacing with StGit,  Next: Developing Extensions,  Prev: Interfacing with Topgit,  Up: Using Magit Extensions
-
-24.4 Interfacing with StGit
-===========================
-
-StGit (http://www.procode.org/stgit) is a Python application providing
-similar functionality to Quilt (i.e. pushing/popping patches to/from a
-stack) on top of Git. These operations are performed using Git commands
-and the patches are stored as Git commit objects, allowing easy merging
-of the StGit patches into other repositories using standard Git
-functionality.
-
-   `magit-stgit.el' provides basic integration with Magit, mostly by
-providing a "Series" section, whose patches can be seen as regular
-commits through the "visit" action.
-
-   You can change the current patch in a series with the "apply" action,
-as well as you can delete them using the "discard" action.
-
-   Additionally, the `magit-stgit-refresh' and `magit-stgit-rebase'
-commands let you perform the respective StGit operations.
-
-
-File: magit.info,  Node: Developing Extensions,  Prev: Interfacing with StGit,  Up: Using Magit Extensions
+File: magit.info,  Node: Developing Extensions,  Prev: Interfacing with Topgit,  Up: Using Magit Extensions
 
-24.5 Developing Extensions
+21.3 Developing Extensions
 ==========================
 
 Magit provides a generic mechanism to allow cooperation with Git-related
@@ -1064,29 +864,10 @@ systems, such as foreign VCS, patch systems,…
      take place in the "Extensions" submenu.
 
 
-   It is suggested that Magit extensions authors stick to the
-convention of making extensions minor modes. This has many advantages,
-including the fact that users are able to toggle extensions, and that
-it's easy to configure a specific set of extensions for a given
-repository.
-
-   Shipped extensions can serve as an example of how to develop new
-extensions.
-
-   Basically a `foo' extension should provide a `magit-foo-mode' minor
-mode, as well as a `turn-on-magit-foo' function.  The main task of the
-minor mode is to register/unregister the various hooks that the
-extension requires. The registered actions on the other hand can be
-left alone and activated globally, since they can be run only on
-displayed items, which won't happen when the minor mode is off.
-
-   Don't forget to call `magit-refresh' when the minor mode is toggled
-interactively, so that the relevant sections can be shown or hidden.
-
 
-File: magit.info,  Node: Using Git Directly,  Next: Customization,  Prev: Using Magit Extensions,  Up: Top
+File: magit.info,  Node: Using Git Directly,  Prev: Using Magit Extensions,  Up: Top
 
-25 Using Git Directly
+22 Using Git Directly
 *********************
 
 For situations when Magit doesn't do everything you need, you can run
@@ -1094,266 +875,39 @@ raw Git commands using `:'.  This will prompt for a Git command, run
 it, and refresh the status buffer.  The output can be viewed by typing
 `$'.
 
-
-File: magit.info,  Node: Customization,  Next: Frequently Asked Questions,  Prev: Using Git Directly,  Up: Top
-
-26 Customization
-****************
-
-The following variables can be used to adapt Magit to your workflow:
-
-`magit-git-executable'
-     The name of the Git executable.
-
-`magit-git-standard-options'
-     Standard options when running Git.
-
-`magit-repo-dirs'
-     Directories containing Git repositories.
-
-     Magit will look into these directories for Git repositories and
-     offer them as choices for `magit-status'.
-
-`magit-repo-dirs-depth'
-     The maximum depth to look for Git repos.
-
-     When looking for a Git repository below the directories in
-     `magit-repo-dirs', Magit will only descend this many levels deep.
-
-`magit-save-some-buffers'
-     Non-nil means that `magit-status' will save modified buffers
-     before running.  Setting this to `t' will ask which buffers to
-     save, setting it to `'dontask' will save all modified buffers
-     without asking.
-
-`magit-save-some-buffers-predicate'
-     Specifies a predicate function on `magit-save-some-buffers' to
-     determine which unsaved buffers should be prompted for saving.
-
-`magit-commit-all-when-nothing-staged'
-     Determines what `magit-log-edit' does when nothing is staged.
-     Setting this to `nil' will make it do nothing, setting it to `t'
-     will arrange things so that the actual commit command will use the
-     `--all' option, setting it to `'ask' will first ask for
-     confirmation whether to do this, and setting it to `'ask-stage'
-     will cause all changes to be staged, after a confirmation.
-
-`magit-commit-signoff'
-     When performing `git commit' adds `--signoff'.
-
-`magit-log-cutoff-length'
-     The maximum number of commits to show in the `log' and `whazzup'
-     buffers.
-
-`magit-log-infinite-length'
-     Number of log used to show as maximum for
-     `magit-log-cutoff-length'.
-
-`magit-log-auto-more'
-     Insert more log entries automatically when moving past the last
-     entry.
-
-     Only considered when moving past the last entry with
-     `magit-goto-next-section'.
-
-`magit-process-popup-time'
-     Popup the process buffer if a command takes longer than this many
-     seconds.
-
-`magit-revert-item-confirm'
-     Require acknowledgment before reverting an item.
-
-`magit-log-edit-confirm-cancellation'
-     Require acknowledgment before canceling the log edit buffer.
-
-`magit-remote-ref-format'
-     What format to use for autocompleting refs, in pariticular for
-     remotes.
-
-     Autocompletion is used by functions like `magit-checkout',
-     `magit-interactive-rebase' and others which offer branch name
-     completion.
-
-     The value `'name-then-remote' means remotes will be of the form
-     `name (remote)', while the value `'remote-slash-name' means that
-     they'll be of the form `remote/name'. I.e. something that's listed
-     as `remotes/upstream/next' by `git branch -l -a' will be
-     `upstream/next'.
-
-`magit-process-connection-type'
-     Connection type used for the git process.
-
-     `nil' mean pipe, it is usually faster and more efficient, and work
-     on cygwin.  `t' mean pty, it enable magit to prompt for passphrase
-     when needed.
-
-`magit-completing-read-function'
-     Function to be called when requesting input from the user.
-
-`magit-create-branch-behaviour'
-     Where magit will create a new branch if not supplied a branchname
-     or ref.
-
-     The value `'at-head' means a new branch will be created at the tip
-     of your current branch, while the value `'at-point' means magit
-     will try to find a valid reference at point...
-
-`magit-status-buffer-switch-function'
-     Function for `magit-status' to use for switching to the status
-     buffer.
-
-     The function is given one argument, the status buffer.
-
-`magit-rewrite-inclusive'
-     Whether magit includes the selected base commit in a rewrite
-     operation.
-
-     `t' means both the selected commit as well as any subsequent
-     commits will be rewritten. This is magit's default behaviour,
-     equivalent to `git rebase -i ${REV~1}'
-
-
-       A'---B'---C'---D'
-       ^
-
-     `nil' means the selected commit will be literally used as `base',
-     so only subsequent commits will be rewritten. This is consistent
-     with git-rebase, equivalent to `git rebase -i ${REV}', yet more
-     cumbersome to use from the status buffer.
-
-
-       A---B'---C'---D'
-       ^
-
-`magit-topgit-executable'
-     The name of the TopGit executable.
-
-`magit-topgit-branch-prefix'
-     Convention prefix for topic branch creation.
-
-
-
-File: magit.info,  Node: Frequently Asked Questions,  Prev: Customization,  Up: Top
-
-27 Frequently Asked Questions
-*****************************
-
-* Menu:
-
-* FAQ - Changes::
-* FAQ 1 - Troubleshooting::
-* FAQ 2 - Display issues::
-
-
-File: magit.info,  Node: FAQ - Changes,  Next: FAQ 1 - Troubleshooting,  Up: Frequently Asked Questions
-
-27.1 Changes
-============
-
-   * v1.1: Changed the way extensions work. Previously, they were
-     enabled unconditionally once the library was loaded. Now they are
-     minor modes that need to be activated explicitly (potentially on a
-     per-repository basis). See *Note Activating extensions::.
-
-
-
-File: magit.info,  Node: FAQ 1 - Troubleshooting,  Next: FAQ 2 - Display issues,  Prev: FAQ - Changes,  Up: Frequently Asked Questions
-
-27.2 Troubleshooting
-====================
-
-* Menu:
-
-* FAQ 1-1::    How do I get raw error messages from git?
-
-
-File: magit.info,  Node: FAQ 1-1,  Up: FAQ 1 - Troubleshooting
-
-27.2.1 Question 1.1
--------------------
-
-How do I get raw error messages from git?
-
-Answer
-......
-
-If a command goes wrong, you can hit `$' to access the git process
-buffer. There, the entire trace for the latest operation is available.
-
-
-File: magit.info,  Node: FAQ 2 - Display issues,  Prev: FAQ 1 - Troubleshooting,  Up: Frequently Asked Questions
-
-27.3 Display issues
-===================
-
-* Menu:
-
-* FAQ 2-1::    How do I fix international characters display?
-
-
-File: magit.info,  Node: FAQ 2-1,  Up: FAQ 2 - Display issues
-
-27.3.1 Question 2.1
--------------------
-
-How do I fix international characters display?
-
-Answer
-......
-
-Please make sure your Magit buffer uses a compatible coding system.  In
-the particular case of file names, git itself quotes them by default.
-You can disable this with one of the following approaches:
-
-     $ git config core.quotepath false
-
-   or
-
-     (setq magit-git-standard-options (append magit-git-standard-options
-                                              '("-c" "core.quotepath=false")))
-
-   The latter might not work in old versions of git.
-
 
 
 Tag Table:
-Node: Top639
-Node: Introduction1592
-Node: Acknowledgments3064
-Node: Sections3744
-Node: Status6294
-Node: Untracked files9033
-Node: Staging and Committing10237
-Node: History14135
-Node: Reflogs17315
-Node: Commit Buffer17719
-Node: Diffing19045
-Node: Tagging20032
-Node: Resetting20481
-Node: Stashing22005
-Node: Branching23063
-Node: The Branch Manager24441
-Node: Wazzup25157
-Node: Merging25948
-Node: Rebasing26998
-Node: Interactive Rebasing27824
-Node: Rewriting29116
-Node: Pushing and Pulling32141
-Node: Submodules34068
-Node: Bisecting34488
-Node: Using Magit Extensions35703
-Node: Activating extensions36000
-Node: Interfacing with Subversion37384
-Node: Interfacing with Topgit37982
-Node: Interfacing with StGit39010
-Node: Developing Extensions40008
-Node: Using Git Directly43786
-Node: Customization44157
-Node: Frequently Asked Questions48703
-Node: FAQ - Changes48934
-Node: FAQ 1 - Troubleshooting49342
-Node: FAQ 1-149590
-Node: FAQ 2 - Display issues49894
-Node: FAQ 2-150123
+Node: Top556
+Node: Introduction1120
+Node: Acknowledgments2591
+Node: Sections3215
+Node: Status5765
+Node: Untracked files8494
+Node: Staging and Committing9441
+Node: History12986
+Node: Reflogs15869
+Node: Diffing16267
+Node: Tagging16865
+Node: Resetting17313
+Node: Stashing18837
+Node: Branching19615
+Node: The branch list20598
+Node: Wazzup21586
+Node: Merging22374
+Node: Rebasing23425
+Node: Rewriting24240
+Node: Pushing and Pulling27095
+Node: Submodules28782
+Node: Using Magit Extensions29212
+Node: Interfacing with Subversion29456
+Node: Interfacing with Topgit30024
+Node: Developing Extensions31051
+Node: Using Git Directly33924
 
 End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/elpa/magit-1.0.0/magit.spec b/elpa/magit-1.0.0/magit.spec
new file mode 100644
index 000000000..6c200866e
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.spec
@@ -0,0 +1,44 @@
+Name:		magit
+Version:	1.0.0
+Release:	1%{?dist}
+Summary:	An Emacs Extension for Git
+BuildArch: noarch
+Group:		Development/Tools
+License:	GPLv3
+URL:		http://zagadka.vm.bytemark.co.uk/magit
+Source0:	%{url}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	texinfo, autoconf, automake, emacs
+Requires:	git, emacs
+
+%description
+Magit is an interface to the version control system Git, implemented
+as an extension to Emacs.
+
+%prep
+%setup -q
+
+%build
+%configure --prefix=/usr --sysconfdir=/etc --with-site-start=/usr/share/emacs/site-lisp/site-start.d
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/usr/share/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/usr/share/emacs/site-lisp/site-start.d/50magit.el
+/usr/share/emacs/site-lisp/magit.el
+/usr/share/emacs/site-lisp/magit.elc
+%doc README.md
+/usr/share/info/magit.info.gz
+
+%changelog
+* Sun Mar 14 2010	Ben Walton <bwalton@artsci.utoronto.ca>
+- Initial spec file creation.
diff --git a/elpa/magit-1.0.0/magit.spec.in b/elpa/magit-1.0.0/magit.spec.in
new file mode 100644
index 000000000..ae7ec453d
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.spec.in
@@ -0,0 +1,44 @@
+Name:		magit
+Version:	@VERSION@
+Release:	1%{?dist}
+Summary:	An Emacs Extension for Git
+BuildArch: noarch
+Group:		Development/Tools
+License:	GPLv3
+URL:		http://zagadka.vm.bytemark.co.uk/magit
+Source0:	%{url}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	texinfo, autoconf, automake, emacs
+Requires:	git, emacs
+
+%description
+Magit is an interface to the version control system Git, implemented
+as an extension to Emacs.
+
+%prep
+%setup -q
+
+%build
+%configure --prefix=/usr --sysconfdir=/etc --with-site-start=/usr/share/emacs/site-lisp/site-start.d
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/usr/share/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+/usr/share/emacs/site-lisp/site-start.d/50magit.el
+/usr/share/emacs/site-lisp/magit.el
+/usr/share/emacs/site-lisp/magit.elc
+%doc README.md
+/usr/share/info/magit.info.gz
+
+%changelog
+* Sun Mar 14 2010	Ben Walton <bwalton@artsci.utoronto.ca>
+- Initial spec file creation.
diff --git a/elpa/magit-1.0.0/magit.texi b/elpa/magit-1.0.0/magit.texi
new file mode 100644
index 000000000..aeac0c271
--- /dev/null
+++ b/elpa/magit-1.0.0/magit.texi
@@ -0,0 +1,847 @@
+\input texinfo.tex    @c -*-texinfo-*-
+@c %**start of header
+@setfilename magit.info
+@settitle Magit User Manual
+@documentencoding utf-8
+@c %**end of header
+
+@dircategory Emacs
+@direntry
+* Magit: (magit).        Using Git from Emacs with Magit.
+@end direntry
+
+@copying
+Copyright @copyright{} 2008, 2009, 2011 Marius Vollmer
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.
+@end quotation
+@end copying
+
+@node Top
+@top Magit User Manual
+
+Magit is an interface to the version control system Git, implemented
+as an extension to Emacs.
+
+@menu
+* Introduction::
+* Acknowledgments::
+* Sections::
+* Status::
+* Untracked files::
+* Staging and Committing::
+* History::
+* Reflogs::
+* Diffing::
+* Tagging::
+* Resetting::
+* Stashing::
+* Branching::
+* The branch list::
+* Wazzup::
+* Merging::
+* Rebasing::
+* Rewriting::
+* Pushing and Pulling::
+* Submodules::         
+* Using Magit Extensions::
+* Using Git Directly::
+@end menu
+
+@node Introduction
+@chapter Introduction
+
+With Magit, you can inspect and modify your Git repositories with
+Emacs.  You can review and commit the changes you have made to the
+tracked files, for example, and you can browse the history of past
+changes.  There is support for cherry picking, reverting, merging,
+rebasing, and other common Git operations.
+
+Magit is not a complete interface to Git; it just aims to make the
+most common Git operations convenient.  Thus, Magit will likely not
+save you from learning Git itself.
+
+This manual provides a tour of all Magit features.  It does not give a
+introduction to version control in general, or to Git in particular.
+
+The main entry point to Magit is @kbd{M-x magit-status}, which will
+put you in Magit's status buffer.  You will be using it frequently, so
+it is probably a good idea to bind @code{magit-status} to a key of
+your choice.
+
+In addition to the status buffer, Magit will also create buffers that
+show lists of commits, buffers with diffs, and other kinds of buffers.
+All these buffers are in @code{magit-mode} and have the same key
+bindings.  Not all commands make sense in all contexts, but a given
+key will always do the same thing in all Magit buffers.
+
+Naturally, Magit runs the @code{git} command to do most of the work.
+The @code{*magit-process*} buffer contains the transcript of the most
+recent command.  You can switch to it with @kbd{$}.
+
+@node Acknowledgments
+@chapter Acknowledgments
+
+From day one of the first Magit announcement, John Wiegley has
+contributed numerous fixes, UI improvements, and new features.
+Thanks!
+
+Linh Dang and Christian Neukirchen also contributed from day one.
+Thanks!
+
+Phil Hagelberg joined a few days later.  Thanks!
+
+Alex Ott contributed support for git svn.  Thanks!
+
+Marcin Bachry contributed bug fixes and support for decorated logs.
+Thanks!
+
+Alexey Voinov fixed bugs.  Thanks!
+
+Rémi Vanicat helped with Tramp support.  Thanks!
+
+@node Sections
+@chapter Sections
+
+All Magit buffers are structured into nested 'sections'.  These
+sections can be hidden and shown individually.  When a section is
+hidden, only its first line is shown and all its children are
+completely invisible.
+
+The most fine-grained way to control the visibility of sections is the
+@kbd{TAB} key.  It will to toggle the current section (the section
+that contains point) between being hidden and being shown.
+
+Typing @kbd{S-TAB} toggles the visibility of the children of the
+current section.  When all of them are shown, they will all be hidden.
+Otherwise, when some or all are hidden, they will all be shown.
+
+The digit keys @kbd{1}, @kbd{2}, @kbd{3}, and @kbd{4} control the
+visibility of sections based on levels.  Hitting @kbd{2}, for example,
+will show sections on levels one and two, and will hide sections on
+level 3.  However, only sections that are a parent or child of the
+current section are affected.
+
+For example, when the current section is on level 3 and you hit
+@kbd{1}, the grand-parent of the current section (which is on level
+one) will be shown, and the parent of the current section (level 2)
+will be hidden.  The visibility of no other section will be changed.
+
+This sounds a bit complicated, but you'll figure it out.
+
+Using @kbd{M-1}, @kbd{M-2}, @kbd{M-3}, and @kbd{M-4} is similar to the
+unmodified digits, but now all sections on the respective level are
+affected, regardless of whether or not they are related to the current
+section.
+
+For example, @kbd{M-1} will only show the first lines of the top-level
+sections and will hide everything else.  Typing @kbd{M-4} on the other
+hand will show everything.
+
+Because of the way the status buffer is set up, some changes to
+section visibility are more common than others.  Files are on level 2
+and diff hunks are on level 4.  Thus, you can type @kbd{2} to collapse
+the diff of the current file, and @kbd{M-2} to collapse all files.
+This returns the status buffer to its default setup and is a quick way
+to unclutter it after drilling down into the modified files.
+
+Because @kbd{2} and @kbd{M-2} are so common in the status buffer, they
+are bound to additional, more mnemonic keys: @kbd{M-h} (hide) and
+@kbd{M-H} (hide all).  Likewise @kbd{4} and @kbd{M-4} are also
+available as @kbd{M-s} (show) and @kbd{M-S} (show all).
+
+In other buffers than the status buffer, @kbd{M-h}, @kbd{M-H},
+@kbd{M-s}, and @kbd{M-S} might work on different levels than on 2 and
+4, but they keep their general meaning: @kbd{M-H} hides all detail,
+and @kbd{M-S} shows everything.
+
+@node Status
+@chapter Status
+
+Running @kbd{M-x magit-status} displays the main interface of Magit,
+the status buffer.  You can have multiple status buffers active at the
+same time, each associated with its own Git repository.
+
+When invoking @kbd{M-x magit-status} from within a Git repository, it
+will switch to the status buffer of that repository.  Otherwise, it
+will prompt for a directory.  With a prefix argument, it will always
+prompt.
+
+You can set @code{magit-repo-dirs} to customize how
+@code{magit-status} asks for the repository to work on.  When
+@code{magit-repo-dirs} is nil, @code{magit-status} will simply ask for
+a directory.
+
+If you specify a directory that is not a Git repository, @kbd{M-x
+magit-status} will offer to initialize it as one.
+
+When @code{magit-repo-dirs} is not nil, it is treated as a list of
+directory names, and @code{magit-status} will find all Git
+repositories in those directories and offer them for completion.
+(Magit will only look @code{magit-repo-dirs-depth} levels deep,
+however.)
+
+With two prefix arguments, @code{magit-status} will always prompt for
+a raw directory.
+
+Thus, you would normally set @code{magit-repo-dirs} to the places
+where you keep most of your Git repositories and switch between them
+with @kbd{C-u M-x magit-status}.  If you want to go to a repository
+outside of your normal working areas, or if you want to create a new
+repository, you would use @kbd{C-u C-u M-x magit-status}.
+
+You need to explicitly refresh the status buffer when you have made
+changes to the repository from outside of Emacs.  You can type @kbd{g}
+in the status buffer itself, or just use @kbd{M-x magit-status}
+instead of @kbd{C-x b} when switching to it.  You also need to refresh
+the status buffer in this way after saving a file in Emacs.
+
+The header at the top of the status buffer shows a short summary of
+the repository state: where it is located, which branch is checked
+out, etc.  Below the header are a number of sections that show details
+about the working tree and the staging area.  You can hide and show
+them as described in the previous section.
+
+The first section shows @emph{Untracked files}, if there are any.  See
+@ref{Untracked files} for more details.
+
+Two section show your local changes.  They are explained fully in the
+next chapter, @ref{Staging and Committing}.
+
+If the current branch is associated with a remote tracking branch, the
+status buffer shows the differences between the current branch and the
+tracking branch.  See @ref{Pushing and Pulling} for more information.
+
+During a history rewriting session, the status buffer shows the
+@emph{Pending changes} and @emph{Pending commits} sections.  See
+@ref{Rewriting} for more details.
+
+@node Untracked files
+@chapter Untracked files
+
+Untracked files are shown in the @emph{Untracked files} section.
+
+You can add a untracked file to the staging area with @kbd{s}.  If
+point is on the @emph{Untracked files} section title when you it
+@kbd{s}, all untracked files are staged.
+
+Typing @kbd{C-u S} anywhere will also stage all untracked files,
+together with all changes to the tracked files.
+
+You can instruct Git to ignore them by typing @kbd{i}.  This will add
+the filename to the @code{.gitignore} file.  Typing @kbd{C-u i} will
+ask you for the name of the file to ignore.  This is useful to ignore
+whole directories, for example.  The @kbd{I} command is similar to
+@kbd{i} but will add the file to @code{.git/info/exclude} instead.
+
+To delete a untracked file forever, use @kbd{k}.  If point is on the
+@emph{Untracked files} section title when you it @kbd{k}, all
+untracked files are deleted.
+
+@node Staging and Committing
+@chapter Staging and Committing
+
+Comitting with Git is a two step process: first you add the changes
+you want to commit to a 'staging area', and then you commit them to
+the repository.  This allows you to only commit a subset of your local
+changes.
+
+Magit allows you to ignore the staging area if you wish.  As long as
+your staging area is unused, Magit will show your uncomitted changes
+in a section named @emph{Changes}.
+
+When the staging area is in use, Magit uses two sections:
+@emph{Unstaged changes} and @emph{Staged changes}.  The @emph{Staged
+changes} section shows the changes that will be included in the next
+commit, while the @emph{Unstaged changes} section shows the changes
+that will be left out.
+
+To move a unstaged hunk into the staging area, move point into the
+hunk and type @kbd{s}.  Likewise, to unstage a hunk, move point into
+it and type @kbd{u}.  If point is in a diff header when you type
+@kbd{s} or @kbd{u}, all hunks belonging to that diff are moved at the
+same time.
+
+If the region is active when you type @kbd{s} or @kbd{u}, only the
+changes in the region are staged or unstaged.  (This works line by
+line: if the beginning of a line is in the region it is included in
+the changes, otherwise it is not.)
+
+Typing @kbd{C-u s} will ask you for a name of a file to be staged, for
+example to stage files that are hidden.
+
+To move all hunks of all diffs into the staging area in one go, type
+@kbd{S}.  To unstage everything, type @kbd{U}.
+
+Typing @kbd{C-u S} will stage all untracked files in addition to the
+changes to tracked files.
+
+You can discard uncommitted changes by moving point into a hunk and
+typing @kbd{k}.  The changes to discard are selected as with @kbd{s}
+and @kbd{u}.
+
+Before committing, you should write a short description of the
+changes.
+
+Type @kbd{c} to pop up a buffer where you can write your change
+description.  Once you are happy with the description, type @kbd{C-c
+C-c} in that buffer to perform the commit.
+
+If you want to write changes in a @file{ChangeLog} file, you can use
+@kbd{C-x 4 a} on a diff hunk.
+
+Typing @kbd{c} when the staging area is unused is a special situation.
+Normally, the next commit would be empty, but you can configure Magit
+to do something more useful by customizing the
+@code{magit-commit-all-when-nothing-staged} variable.  One choice is
+to instruct the subsequent @kbd{C-c C-c} to commit all changes.
+Another choice is stage everything at the time of hitting @kbd{c}.
+
+You can type @kbd{C-c C-a} in the buffer with the change description
+to toggle a flag that determines whether the next commit will
+@emph{amend} the current commit in HEAD.
+
+Typing @kbd{C-c C-s} will toggle the @code{--signoff} option.  The
+default is determined by the @code{magit-commit-signoff} customization
+variable.
+
+Typing @kbd{C-c C-e} will toggle the @code{--allow-empty} option.  This
+allows you to make commits that serve as notes, without including any
+changes.
+
+If you change your mind and don't want to go ahead with your commit
+while you are in the @code{*magit-log-edit*} buffer, you can just
+switch to another buffer, continue editing there, staging and
+unstaging things until you are happy, and then return to the
+@code{*magit-log-edit*} buffer, maybe via @kbd{C-x b}, or by hitting
+@kbd{c} again in a Magit buffer.
+
+If you want to erase the @code{*magit-log-edit*} buffer and bury it,
+you can hit @kbd{C-c C-k} in it.
+
+Typing @kbd{C} will also pop up the change description buffer, but in
+addition, it will try to insert a ChangeLog-style entry for the change
+that point is in.
+
+@node History
+@chapter History
+
+To show the repository history of your current head, type @kbd{l l}.  A
+new buffer will be shown that displays the history in a terse form.
+The first paragraph of each commit message is displayed, next to a
+representation of the relationships between commits.
+
+Giving a prefix argument to @kbd{l} will ask for the starting and end
+point of the history.  This can be used to show the commits that are
+in one branch, but not in another, for example.  The start point can
+also be a range of revisions ``r1..r2''.  In that case ``r1'' is used
+as the start and ``r2'' as the end point of the history.
+
+Typing @kbd{l L} (or @kbd{l C-u L}) will show the log in a more verbose
+form.
+
+Magit will show only @code{magit-log-cutoff-length} entries. @kbd{e}
+will show twice as many entries. @kbd{C-u e} will show all entries,
+and given a numeric prefix argument, @kbd{e} will add this number of
+entries. You can also show more entries by typing @kbd{RET} on the
+text appended at the end of the buffer.
+
+You can move point to a commit and then cause various things to happen
+with it.  (The following commands work in any list of commit, such as
+the one shown in the @emph{Unpushed commits} section.)
+
+Typing @kbd{RET} will pop up more information about the current commit
+and move point into the new buffer.  Typing @kbd{SPC} and @kbd{DEL}
+will also show the information, but will scroll the new buffer up or
+down (respectively) when typed again.
+
+Typing @kbd{a} will apply the current commit to your current branch.
+This is useful when you are browsing the history of some other branch
+and you want to `cherry-pick' some changes from it.  A typical
+situation is applying selected bug fixes from the development version
+of a program to a release branch.  The cherry-picked changes will not
+be committed automatically; you need to do that explicitly.
+
+Typing @kbd{A} will cherry-pick the current commit and will also
+commit the changes automatically when there have not been any
+conflicts.
+
+Typing @kbd{v} will revert the current commit.  Thus, it will apply
+the changes made by that commit in reverse.  This is obviously useful
+to cleanly undo changes that turned out to be wrong.  As with @kbd{a},
+you need to commit the changes explicitly.
+
+Typing @kbd{C-w} will copy the sha1 of the current commit into the
+kill ring.
+
+Typing @kbd{=} will show the differences from the current commit to
+the @dfn{marked} commit.
+
+You can mark the current commit by typing @kbd{.}.  When the current
+commit is already marked, typing @kbd{.} will unmark it.  To unmark
+the marked commit no matter where point is, use @kbd{C-u .}.
+
+Some commands, such as @kbd{=}, will use the current commit and the
+marked commit as implicit arguments.  Other commands will offer the
+marked commit as a default when prompting for their arguments.
+
+To grep the history press @kbd{s}.
+
+@node Reflogs
+@chapter Reflogs
+
+You can use @kbd{l h} and @kbd{l H} to browse your @emph{reflog}, the
+local history of changes made to your repository heads.  Typing
+@kbd{H} will ask for a head, while @kbd{l h} will show the reflog of
+@code{HEAD}.
+
+The resulting buffer is just like the buffer produced by @kbd{l l} and
+@kbd{l L} that shows the commit history.
+
+@node Diffing
+@chapter Diffing
+
+To show the changes from you working tree to another revision, type
+@kbd{d}.  To show the changes between two arbitrary revisions, type
+@kbd{D}.
+
+You can use @kbd{a} within the diff output to apply the changes to
+your working tree.  As usual when point is in a diff header for a
+file, all changes for that file are applied, and when it is in a hunk,
+only that hunk is.  When the region is active, the applied changes are
+restricted to that region.
+
+Typing @kbd{v} will apply the selected changes in reverse.
+
+@node Tagging
+@chapter Tagging
+
+Typing @kbd{t t} will make a lighweight tag.  Typing @kbd{t T} will
+make a annotated tag.  It will put you in the normal
+@code{*magit-log-edit} buffer for writing commit messages, but typing
+@kbd{C-c C-c} in it will make the tag instead.  This is controlled by
+the @code{Tag} field that will be added to the @code{*magit-log-edit*}
+buffer.  You can edit it, if you like.
+
+@node Resetting
+@chapter Resetting
+
+Once you have added a commit to your local repository, you can not
+change that commit anymore in any way.  But you can reset your current
+head to an earlier commit and start over.
+
+If you have published your history already, rewriting it in this way
+can be confusing and should be avoided.  However, rewriting your local
+history is fine and it is often cleaner to fix mistakes this way than
+by reverting commits (with @kbd{v}, for example).
+
+Typing @kbd{x} will ask for a revision and reset your current head to
+it.  No changes will be made to your working tree and staging area.
+Thus, the @emph{Staged changes} section in the status buffer will show
+the changes that you have removed from your commit history.  You can
+commit the changes again as if you had just made them, thus rewriting
+history.
+
+Typing @kbd{x} while point is in a line that describes a commit will
+offer this commit as the default revision to reset to.  Thus, you can
+move point to one of the commits in the @emph{Unpushed commits}
+section and hit @kbd{x RET} to reset your current head to it.
+
+Type @kbd{X} to reset your working tree and staging area to the most
+recently committed state.  This will discard your local modifications,
+so be careful.
+
+You can give a prefix to @kbd{x} if you want to reset both the current
+head and your working tree to a given commit.  This is the same as
+first using an unprefixed @kbd{x} to reset only the head, and then
+using @kbd{X}.
+
+@node Stashing
+@chapter Stashing
+
+You can create a new stash with @kbd{z z}.  Your stashes will be listed
+in the status buffer, and you can apply them with @kbd{a} and pop them
+with @kbd{A}.  To drop a stash, use @kbd{k}.
+
+With a prefix argument, both @kbd{a} and @kbd{A} will attempt to
+reinstate the index as well as the working tree from the stash.
+
+Typing @kbd{z Z} will create a stash just like @kbd{z z}, but will
+leave the changes in your working tree and index.
+
+You can visit and show stashes in the usual way: Typing @kbd{SPC} and
+@kbd{DEL} will pop up a buffer with the description of the stash and
+scroll it, typing @kbd{RET} will move point into that buffer. Using
+@kbd{C-u RET} will move point into that buffer in other window.
+
+@node Branching
+@chapter Branching
+
+The current branch is indicated in the header of the status buffer.
+You can switch to a different branch by typing @kbd{b c}.  This will
+immediately checkout the branch into your working copy, so you
+shouldn't have any local modifications when switching branches.
+
+If you try to switch to a remote branch, Magit will offer to create a
+local tracking branch for it instead.  This way, you can easily start
+working on new branches that have appeared in a remote repository.
+
+Typing @kbd{b c} while point is at a commit description will offer
+that commit as the default to switch to.  This will result in a
+detached head.
+
+To create a new branch and switch to it immediately, type @kbd{b B}.
+
+Typing @kbd{b V} will list the local and remote branches in a new buffer
+called @code{*magit-branches*} from which you can work with them. See
+@ref{The branch list} for more details.
+
+
+@node The branch list
+@chapter The branch list
+
+The branch list is a separate buffer called @code{*magit-branches*}
+with its own local key map. The keybindings are modeled after magit's
+main buffer. The buffer contains both local and remote branches. The
+current local branch is marked by a ``*'' in front of the name.
+
+Typing @kbd{k} will delete the branch in the current line, and
+@kbd{C-u k} deletes it even if it hasn't been merged into the current
+local branch. Deleting works for both local and remote branches.
+
+You can merge the branch in the current line by typing @kbd{m m} for a
+manual merge and @kbd{m m} for an automatic merge.
+
+With @kbd{RET} or @kbd{b b} you can check out the branch in the current
+line.
+
+Typing @kbd{$} shows the @code{*magit-process*} buffer which contains
+the transcript of the most recent command.
+
+Typing @kbd{V} will refresh the branch list. @kbd{q} buries the branch
+list buffer and deletes its window.
+
+
+@node Wazzup
+@chapter Wazzup
+
+Typing @kbd{w} will show a summary of how your other branches relate
+to the current branch.
+
+For each branch, you will get a section that lists the commits in that
+branch that are not in the current branch.  The sections are initially
+collapsed; you need to explicitly open them with @kbd{TAB} (or
+similar) to show the lists of commits.
+
+When point is on a @emph{N unmerged commits in ...} title, the
+corresponding branch will be offered as the default for a merge.
+
+Hitting @kbd{i} on a branch title will ignore this branch in the
+wazzup view.  You can use @kbd{C-u w} to show all branches, including
+the ignored ones.  Hitting @kbd{i} on an already ignored branch in
+that view will unignore it.
+
+@node Merging
+@chapter Merging
+
+Magit offers two ways to merge branches: manually and automatic.  A
+manual merge will apply all changes to your working tree and staging
+area, but will not commit them, while a automatic merge will go ahead
+and commit them immediately.
+
+Type @kbd{m m} to initiate merge.
+
+After initiating a merge, the header of the status buffer might remind
+you that the next commit will be a merge commit (with more than one
+parent).  If you want to abort a manual merge, just do a hard reset to
+HEAD with @kbd{X}.
+
+Merges can fail if the two branches you merge want to introduce
+conflicting changes.  In that case, the automatic merge stops before the
+commit, essentially falling back to a manual merge.  You need to resolve
+the conflicts for example with @kbd{e} and stage the resolved files, for
+example with @kbd{S}.
+
+You can not stage individual hunks one by one as you resolve them, you
+can only stage whole files once all conflicts in them have been
+resolved.
+
+@node Rebasing
+@chapter Rebasing
+
+Typing @kbd{R} in the status buffer will initiate a rebase or, if one
+is already in progress, ask you how to continue.
+
+When a rebase is stopped in the middle because of a conflict, the
+header of the status buffer will indicate how far along you are in the
+series of commits that are being replayed.  When that happens, you
+should resolve the conflicts and stage everything and hit @kbd{R c} to
+continue the rebase.  Alternatively, hitting @kbd{c} or @kbd{C} while
+in the middle of a rebase will also ask you whether to continue the
+rebase.
+
+Of course, you can initiate a rebase in any number of ways, by
+configuring @code{git pull} to rebase instead of merge, for example.
+Such a rebase can be finished with @kbd{R} as well.
+
+@node Rewriting
+@chapter Rewriting
+
+As hinted at earlier, you can rewrite your commit history.  For
+example, you can reset the current head to an earlier commit with
+@kbd{x}.  This leaves the working tree unchanged, and the status
+buffer will show all the changes that have been made since that new
+value of the current head.  You can commit these changes again,
+possibly splitting them into multiple commits as you go along.
+
+Amending your last commit is a common special case of rewriting
+history like this.
+
+Another common way to rewrite history is to reset the head to an
+earlier commit, and then to cherry pick the previous commits in a
+different order.  You could pick them from the reflog, for example.
+
+Magit has several commands that can simplify the book keeping
+associated with rewriting.  These commands all start with the @kbd{r}
+prefix key.
+
+Typing @kbd{r b} will start a rewrite operation.  You will be prompted
+for a @emph{base} commit, and all commits between the current head and
+this commit are put in a list of @emph{Pending commits} (including the
+base commit).  The current head will then be reset to the parent of
+the base commit.
+
+You would then typically use @kbd{a} and @kbd{A} to cherry pick
+commits from the list of pending commits in the desired order, until
+all have been applied.  Magit shows which commits have been applied by
+changing their marker from @code{*} to @code{.}.
+
+Using @kbd{A} will immediately commit the commit (as usual).  If you
+want to combine multiple previous commits into a single new one, use
+@kbd{a} to apply them all to your working tree, and then commit them
+together.
+
+Magit has no explicit support for rewriting merge commits.  It will
+happily include merge commits in the list of pending commits, but
+there is no way of replaying them automatically.  You have to redo the
+merge explicitly.
+
+You can also use @kbd{v} to revert a commit when you have changed your
+mind.  This will change the @code{.} mark back to @code{*}.
+
+Once you are done with the rewrite, type @kbd{r t} to remove the book
+keeping information from the status buffer.
+
+If you rather wish to start over, type @kbd{r a}.  This will abort the
+rewriting, resetting the current head back to the value it had before
+the rewrite was started with @kbd{r s}.
+
+Typing @kbd{r f} will @emph{finish} the rewrite: it will apply all
+unused commits one after the other, as if you would us @kbd{A} with
+all of them.
+
+You can change the @kbd{*} and @kbd{.} marks of a pending commit
+explicitly with @kbd{r *} and @kbd{r .}.
+
+In addition to a list of pending commits, the status buffer will show
+the @emph{Pending changes}.  This section shows the diff between the
+original head and the current head.  You can use it to review the
+changes that you still need to rewrite, and you can apply hunks from
+it, like from any other diff.
+
+@node Pushing and Pulling
+@chapter Pushing and Pulling
+
+Magit will run @code{git push} when you type @kbd{P p}.  If you give a
+prefix argument to @kbd{P p}, you will be prompted for the repository to
+push to.  When no default remote repository has been configured yet for
+the current branch, you will be prompted as well.  Typing @kbd{P p} will
+only push the current branch to the remote.  In other words, it will run
+@code{git push <remote> <branch>}.  The branch will be created in the
+remote if it doesn't exist already.  The local branch will be configured
+so that it pulls from the new remote branch.
+
+Typing @kbd{f f} will run @code{git remote update}.  With a prefix
+arg, it will prompt for the name of the remote to update.  Typing
+@kbd{F p} will run @code{git pull}.  When you don't have a default
+branch configured to be pulled into the current one, you will be asked
+for it.
+
+If there is a default remote repository for the current branch, Magit
+will show that repository in the status buffer header.
+
+In this case, the status buffer will also have a @emph{Unpushed
+commits} section that shows the commits on your current head that are
+not in the branch named @code{<remote>/<branch>}.  This section works
+just like the history buffer: you can see details about a commit with
+@kbd{RET}, compare two of them with @kbd{.} and @kbd{=}, and you can
+reset your current head to one of them with @kbd{x}, for example. If
+you want to push the changes then type @kbd{P p}.
+
+When the remote branch has changes that are not in the current branch,
+Magit shows them in a section called @emph{Unpulled changes}.  Typing
+@kbd{F p} will merge them into the current branch.
+
+@node Submodules
+@chapter Submodules
+
+@table @kbd
+@item M u
+Update the submodules, with a prefix argument it will initializing.
+
+@item M i
+Initialize the submodules.
+
+@item M b
+Update and initialize the submodules in one go.
+
+@item M s
+Synchronizes submodules' remote URL configuration setting to the value
+specified in .gitmodules.
+@end table
+
+
+@node Using Magit Extensions
+@chapter Magit Extensions
+
+@menu
+* Interfacing with Subversion::
+* Interfacing with Topgit::
+* Developing Extensions::
+@end menu
+
+
+@node Interfacing with Subversion
+@section Interfacing with Subversion
+
+Typing @kbd{N r} runs @code{git svn rebase}, typing @kbd{N c} runs
+@code{git svn dcommit} and typing @kbd{N f} runs @code{git svn fetch}.
+
+@kbd{N s} will prompt you for a (numeric, Subversion) revision and
+then search for a corresponding Git sha1 for the commit. This is
+limited to the path of the remote Subversion repository. With a prefix
+(@kbd{C-u N s} the user will also be prompted for a branch to search
+in.
+
+@node Interfacing with Topgit
+@section Interfacing with Topgit
+
+Topgit (http://repo.or.cz/r/topgit.git) is a patch queue manager that
+aims at being close as possible to raw Git, which makes it easy to use
+with Magit. In particular, it does not require to use a different set of
+commands for ``commit'', ``update'',… operations.
+
+@file{magit-topgit.el} provides basic integration with Magit, mostly by
+providing a ``Topics'' section.
+
+Topgit branches can be created the regular way, by using a ``t/'' prefix
+by convention. So, creating a ``t/foo'' branch will actually populate
+the ``Topics'' section with one more branch after committing
+@file{.topdeps} and @file{.topmsg}.
+
+Also, the way we pull (see @ref{Pushing and Pulling}) such a branch is
+slightly different, since it requires updating the various dependencies
+of that branch. This should be mostly transparent, except in case
+of conflicts.
+
+@node Developing Extensions
+@section Developing Extensions
+
+Magit provides a generic mechanism to allow cooperation with Git-related
+systems, such as foreign VCS, patch systems,…
+
+In particular it allows to:
+
+@itemize @bullet
+@item
+Define sections to display specific informations about the current state
+of the repository, and place them relatively to existing sections.
+
+@code{magit-define-inserter} automagically defines two hooks called
+@code{magit-before-insert-SECTION-hook} and
+@code{magit-after-insert-SECTION-hook} that allow to generate and place
+more sections.
+
+In the following example, we use the builtin ``stashes'' section to
+place our own ``foo'' one.
+
+@example
+(magit-define-inserter foo ()
+  (magit-git-section 'foo
+                     "Foo:" 'foo-wash-function
+                     "foo" "arg1" "arg2"))
+(add-hook 'magit-after-insert-stashes-hook 'magit-insert-foo)
+@end example
+
+@item
+Define new types of objects in those sections.
+
+The function @code{foo-wash-function} defined above post-processes each
+line of the output of the ``git foo arg1 arg2'' command, and is able to
+associate a type to certain lines.
+
+A simple implementation could be:
+
+@example
+(defun foo-wash-function ()
+  (let ((foo (buffer-substring (line-beginning-position) (line-end-position))))
+    (goto-char (line-beginning-position))
+    (magit-with-section foo 'foo
+      (magit-set-section-info foo)
+      (forward-line))))
+@end example
+
+In this case, every line of the command output is transformed into an
+object of type @code{'foo}.
+
+@item
+Alter behavior of generic commands to dispatch them correctly to the
+relevant system, optionally making use of the newly defined types.
+
+@example
+(magit-add-action (item info "discard")
+  ((foo)
+   (do-something-meaningful-for-discarding-a-foo)))
+@end example
+
+This will alter the behavior of @kbd{k}, when applied to those objects.
+
+@item
+Plug a different logic into basic commands, to reflect the presence of
+the extension.
+
+@code{magit-define-command} automagically defines
+a @code{magit-CMD-command-hook} that can contain a list of functions to
+call before the actual core code. Execution stops after the first hook
+that returns a non-nil value. This leaves room for extension logic.
+
+@example
+(add-hook 'magit-create-branch-command-hook 'foo-create-branch)
+@end example
+
+The function @code{foo-create-branch} will be called each time an
+attempt is made to create a branch, and can, for example, react to
+a certain name convention.
+
+@item
+Define new commands and associated menu.
+
+This part is not really specific to extensions, except that menus take
+place in the ``Extensions'' submenu.
+
+@end itemize
+
+@node Using Git Directly
+@chapter Using Git Directly
+
+For situations when Magit doesn't do everything you need, you can run
+raw Git commands using @kbd{:}.  This will prompt for a Git command, run
+it, and refresh the status buffer.  The output can be viewed by typing
+@kbd{$}.
+
+@bye
diff --git a/elpa/magit-1.2.0/dir b/elpa/magit-1.2.0/dir
deleted file mode 100644
index 2e646dbd8..000000000
--- a/elpa/magit-1.2.0/dir
+++ /dev/null
@@ -1,18 +0,0 @@
-This is the file .../info/dir, which contains the
-topmost node of the Info hierarchy, called (dir)Top.
-The first time you invoke Info you start off looking at this node.
-
-File: dir,	Node: Top	This is the top of the INFO tree
-
-  This (the Directory node) gives a menu of major topics.
-  Typing "q" exits, "?" lists all Info commands, "d" returns here,
-  "h" gives a primer for first-timers,
-  "mEmacs<Return>" visits the Emacs manual, etc.
-
-  In Emacs, you can click mouse button 2 on a menu item or cross reference
-  to select it.
-
-* Menu:
-
-Emacs
-* Magit: (magit).        Using Git from Emacs with Magit.
diff --git a/elpa/magit-1.2.0/magit-autoloads.el b/elpa/magit-1.2.0/magit-autoloads.el
deleted file mode 100644
index c9dc02173..000000000
--- a/elpa/magit-1.2.0/magit-autoloads.el
+++ /dev/null
@@ -1,164 +0,0 @@
-;;; magit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads (magit-status) "magit" "magit.el" (21031 23266
-;;;;;;  0 0))
-;;; Generated autoloads from magit.el
-
-(autoload 'magit-status "magit" "\
-Open a Magit status buffer for the Git repository containing
-DIR.  If DIR is not within a Git repository, offer to create a
-Git repository in DIR.
-
-Interactively, a prefix argument means to ask the user which Git
-repository to use even if `default-directory' is under Git control.
-Two prefix arguments means to ignore `magit-repo-dirs' when asking for
-user input.
-
-\(fn DIR)" t nil)
-
-;;;***
-
-;;;### (autoloads (magit-blame-mode) "magit-blame" "magit-blame.el"
-;;;;;;  (21031 23265 0 0))
-;;; Generated autoloads from magit-blame.el
-
-(autoload 'magit-blame-mode "magit-blame" "\
-Display blame information inline.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads (turn-on-magit-stgit magit-stgit-mode) "magit-stgit"
-;;;;;;  "magit-stgit.el" (21031 23265 0 0))
-;;; Generated autoloads from magit-stgit.el
-
-(autoload 'magit-stgit-mode "magit-stgit" "\
-StGit support for Magit
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-magit-stgit "magit-stgit" "\
-Unconditionally turn on `magit-stgit-mode'.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (turn-on-magit-svn magit-svn-mode) "magit-svn"
-;;;;;;  "magit-svn.el" (21031 23265 0 0))
-;;; Generated autoloads from magit-svn.el
-
-(autoload 'magit-svn-mode "magit-svn" "\
-SVN support for Magit
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-magit-svn "magit-svn" "\
-Unconditionally turn on `magit-svn-mode'.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (turn-on-magit-topgit magit-topgit-mode) "magit-topgit"
-;;;;;;  "magit-topgit.el" (21031 23265 0 0))
-;;; Generated autoloads from magit-topgit.el
-
-(autoload 'magit-topgit-mode "magit-topgit" "\
-Topgit support for Magit
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-magit-topgit "magit-topgit" "\
-Unconditionally turn on `magit-topgit-mode'.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads (global-magit-wip-save-mode magit-wip-save-mode
-;;;;;;  magit-wip-mode) "magit-wip" "magit-wip.el" (21031 23265 0
-;;;;;;  0))
-;;; Generated autoloads from magit-wip.el
-
-(defvar magit-wip-mode nil "\
-Non-nil if Magit-Wip mode is enabled.
-See the command `magit-wip-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `magit-wip-mode'.")
-
-(custom-autoload 'magit-wip-mode "magit-wip" nil)
-
-(autoload 'magit-wip-mode "magit-wip" "\
-In Magit log buffers; give wip refs a special appearance.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'magit-wip-save-mode "magit-wip" "\
-Magit support for committing to a work-in-progress ref.
-
-When this minor mode is turned on and a file is saved inside a writable
-git repository then it is also committed to a special work-in-progress
-ref.
-
-\(fn &optional ARG)" t nil)
-
-(defvar global-magit-wip-save-mode nil "\
-Non-nil if Global-Magit-Wip-Save mode is enabled.
-See the command `global-magit-wip-save-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `global-magit-wip-save-mode'.")
-
-(custom-autoload 'global-magit-wip-save-mode "magit-wip" nil)
-
-(autoload 'global-magit-wip-save-mode "magit-wip" "\
-Toggle Magit-Wip-Save mode in all buffers.
-With prefix ARG, enable Global-Magit-Wip-Save mode if ARG is positive;
-otherwise, disable it.  If called from Lisp, enable the mode if
-ARG is omitted or nil.
-
-Magit-Wip-Save mode is enabled in all buffers where
-`turn-on-magit-wip-save' would do it.
-See `magit-wip-save-mode' for more information on Magit-Wip-Save mode.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads (rebase-mode) "rebase-mode" "rebase-mode.el" (21031
-;;;;;;  23266 0 0))
-;;; Generated autoloads from rebase-mode.el
-
-(autoload 'rebase-mode "rebase-mode" "\
-Major mode for editing of a Git rebase file.
-
-Rebase files are generated when you run 'git rebase -i' or run
-`magit-interactive-rebase'.  They describe how Git should perform
-the rebase.  See the documentation for git-rebase (e.g., by
-running 'man git-rebase' at the command line) for details.
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("git-rebase-todo" . rebase-mode))
-
-;;;***
-
-;;;### (autoloads nil nil ("magit-bisect.el" "magit-key-mode.el"
-;;;;;;  "magit-pkg.el") (21031 23266 146431 0))
-
-;;;***
-
-(provide 'magit-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; magit-autoloads.el ends here
diff --git a/elpa/magit-1.2.0/magit-autoloads.el~ b/elpa/magit-1.2.0/magit-autoloads.el~
deleted file mode 100644
index 280131311..000000000
--- a/elpa/magit-1.2.0/magit-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; magit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'magit-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; magit-autoloads.el ends here
diff --git a/elpa/magit-1.2.0/magit-bisect.el b/elpa/magit-1.2.0/magit-bisect.el
deleted file mode 100644
index cdb6455eb..000000000
--- a/elpa/magit-1.2.0/magit-bisect.el
+++ /dev/null
@@ -1,195 +0,0 @@
-(require 'magit)
-
-(defvar magit--bisect-last-pos)
-(defvar magit--bisect-tmp-file)
-(defvar magit--bisect-info nil)
-(make-variable-buffer-local 'magit--bisect-info)
-(put 'magit--bisect-info 'permanent-local t)
-
-(defun magit--bisecting-p (&optional required-status)
-  "Return t if a bisect session is running.
-If REQUIRED-STATUS is not nil then the current status must also
-match REQUIRED-STATUS."
-  (and (file-exists-p (concat (magit-git-dir) "BISECT_LOG"))
-       (or (not required-status)
-           (eq (plist-get (magit--bisect-info) :status)
-               required-status))))
-
-(defun magit--bisect-info ()
-  (with-current-buffer (magit-find-status-buffer)
-    (or (if (local-variable-p 'magit--bisect-info) magit--bisect-info)
-        (list :status (if (magit--bisecting-p) 'running 'not-running)))))
-
-(defun magit--bisect-cmd (&rest args)
-  "Run `git bisect ...' and update the status buffer"
-  (with-current-buffer (magit-find-status-buffer)
-    (let* ((output (apply 'magit-git-lines (append '("bisect") args)))
-           (cmd (car args))
-           (first-line (car output)))
-      (save-match-data
-        (setq magit--bisect-info
-              (cond ((string= cmd "reset")
-                     (list :status 'not-running))
-                    ;; Bisecting: 78 revisions left to test after this (roughly 6 steps)
-                    ((string-match "^Bisecting:\\s-+\\([0-9]+\\).+roughly\\s-+\\([0-9]+\\)" first-line)
-                     (list :status 'running
-                           :revs (match-string 1 first-line)
-                           :steps (match-string 2 first-line)))
-                    ;; e2596955d9253a80aec9071c18079705597fa102 is the first bad commit
-                    ((string-match "^\\([a-f0-9]+\\)\\s-.*first bad commit" first-line)
-                     (list :status 'finished
-                           :bad (match-string 1 first-line)))
-                    (t
-                     (list :status 'error)))))))
-  (magit-refresh))
-
-(defun magit--bisect-info-for-status (branch)
-  "Return bisect info suitable for display in the status buffer"
-  (let* ((info (magit--bisect-info))
-         (status (plist-get info :status)))
-    (cond ((eq status 'not-running)
-           (or branch "(detached)"))
-          ((eq status 'running)
-           (format "(bisecting; %s revisions & %s steps left)"
-                   (or (plist-get info :revs) "unknown number of")
-                   (or (plist-get info :steps) "unknown number of")))
-          ((eq status 'finished)
-           (format "(bisected: first bad revision is %s)" (plist-get info :bad)))
-          (t
-           "(bisecting; unknown error occured)"))))
-
-(defun magit-bisect-start ()
-  "Start a bisect session"
-  (interactive)
-  (if (magit--bisecting-p)
-      (error "Already bisecting"))
-  (let ((bad (magit-read-rev "Start bisect with known bad revision" "HEAD"))
-        (good (magit-read-rev "Good revision" (magit-default-rev))))
-    (magit--bisect-cmd "start" bad good)))
-
-(defun magit-bisect-reset ()
-  "Quit a bisect session"
-  (interactive)
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "reset"))
-
-(defun magit-bisect-good ()
-  "Tell git that the current revision is good during a bisect session"
-  (interactive)
-  (unless (magit--bisecting-p 'running)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "good"))
-
-(defun magit-bisect-bad ()
-  "Tell git that the current revision is bad during a bisect session"
-  (interactive)
-  (unless (magit--bisecting-p 'running)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "bad"))
-
-(defun magit-bisect-skip ()
-  "Tell git to skip the current revision during a bisect session."
-  (interactive)
-  (unless (magit--bisecting-p 'running)
-    (error "Not bisecting"))
-  (magit--bisect-cmd "skip"))
-
-(defun magit-bisect-log ()
-  "Show the bisect log"
-  (interactive)
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (magit-run-git "bisect" "log")
-  (magit-display-process))
-
-(defun magit-bisect-visualize ()
-  "Show the remaining suspects with gitk"
-  (interactive)
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (magit-run-git "bisect" "visualize")
-  (unless (getenv "DISPLAY")
-    (magit-display-process)))
-
-(easy-mmode-defmap magit-bisect-minibuffer-local-map
-  '(("\C-i" . comint-dynamic-complete-filename))
-  "Keymap for minibuffer prompting of rebase command."
-  :inherit minibuffer-local-map)
-
-(defvar magit-bisect-mode-history nil
-  "Previously run bisect commands.")
-
-(defun magit-bisect-run (command)
-  "Bisect automatically by running commands after each step"
-  (interactive
-   (list
-    (read-from-minibuffer "Run command (like this): "
-                          ""
-                          magit-bisect-minibuffer-local-map
-                          nil
-                          'magit-bisect-mode-history)))
-  (unless (magit--bisecting-p)
-    (error "Not bisecting"))
-  (let ((file (make-temp-file "magit-bisect-run"))
-        buffer)
-    (with-temp-buffer
-      (insert "#!/bin/sh\n" command "\n")
-      (write-region (point-min) (point-max) file))
-    (set-file-modes file #o755)
-    (magit-run-git-async "bisect" "run" file)
-    (magit-display-process)
-    (setq buffer (get-buffer magit-process-buffer-name))
-    (with-current-buffer buffer
-      (set (make-local-variable 'magit--bisect-last-pos) 0)
-      (set (make-local-variable 'magit--bisect-tmp-file) file))
-    (set-process-filter (get-buffer-process buffer) 'magit--bisect-run-filter)
-    (set-process-sentinel (get-buffer-process buffer) 'magit--bisect-run-sentinel)))
-
-(defun magit--bisect-run-filter (process output)
-  (with-current-buffer (process-buffer process)
-    (save-match-data
-      (let ((inhibit-read-only t)
-            line new-info)
-        (insert output)
-        (goto-char magit--bisect-last-pos)
-        (beginning-of-line)
-        (while (< (point) (point-max))
-          (cond ( ;; Bisecting: 78 revisions left to test after this (roughly 6 steps)
-                 (looking-at "^Bisecting:\\s-+\\([0-9]+\\).+roughly\\s-+\\([0-9]+\\)")
-                 (setq new-info (list :status 'running
-                                      :revs (match-string 1)
-                                      :steps (match-string 2))))
-                ( ;; e2596955d9253a80aec9071c18079705597fa102 is the first bad commit
-                 (looking-at "^\\([a-f0-9]+\\)\\s-.*first bad commit")
-                 (setq new-info (list :status 'finished
-                                      :bad (match-string 1)))))
-          (forward-line 1))
-        (goto-char (point-max))
-        (setq magit--bisect-last-pos (point))
-        (if new-info
-            (with-current-buffer (magit-find-status-buffer)
-              (setq magit--bisect-info new-info)
-              (magit--bisect-update-status-buffer)))))))
-
-(defun magit--bisect-run-sentinel (process event)
-  (if (string-match-p "^finish" event)
-      (with-current-buffer (process-buffer process)
-        (delete-file magit--bisect-tmp-file)))
-  (magit-process-sentinel process event))
-
-(defun magit--bisect-update-status-buffer ()
-  (with-current-buffer (magit-find-status-buffer)
-    (save-excursion
-      (save-match-data
-        (let ((inhibit-read-only t))
-          (goto-char (point-min))
-          (when (search-forward-regexp "Local:" nil t)
-            (beginning-of-line)
-            (kill-line)
-            (insert (format "Local:    %s %s"
-                            (propertize (magit--bisect-info-for-status (magit-get-current-branch))
-                                        'face 'magit-branch)
-                            (abbreviate-file-name default-directory)))))))))
-
-(provide 'magit-bisect)
diff --git a/elpa/magit-1.2.0/magit-bisect.elc b/elpa/magit-1.2.0/magit-bisect.elc
deleted file mode 100644
index 99710656998a831bd6fc2d3e7948242363d7ffb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7493
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

diff --git a/elpa/magit-1.2.0/magit-blame.el b/elpa/magit-1.2.0/magit-blame.el
deleted file mode 100644
index 8518dcb45..000000000
--- a/elpa/magit-1.2.0/magit-blame.el
+++ /dev/null
@@ -1,303 +0,0 @@
-;;; magit-blame.el --- blame support for magit
-
-;; Copyright (C) 2012  Rüdiger Sonderfeld
-;; Copyright (C) 2012  Yann Hodique
-;; Copyright (C) 2011  byplayer
-;; Copyright (C) 2010  Alexander Prusov
-;; Copyright (C) 2009  Tim Moore
-;; Copyright (C) 2008  Linh Dang
-;; Copyright (C) 2008  Marius Vollmer
-
-;; Author: Yann Hodique <yann.hodique@gmail.com>
-;; Keywords:
-
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This code has been backported from Egg (Magit fork) to Magit
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'magit)
-
-(defface magit-blame-header
-  '((t :inherit magit-header))
-  "Face for blame header."
-  :group 'magit-faces)
-
-(defface magit-blame-sha1
-  '((t :inherit (magit-log-sha1
-                 magit-blame-header)))
-  "Face for blame sha1."
-  :group 'magit-faces)
-
-(defface magit-blame-culprit
-  '((t :inherit magit-blame-header))
-  "Face for blame culprit."
-  :group 'magit-faces)
-
-(defface magit-blame-time
-  '((t :inherit magit-blame-header))
-  "Face for blame time."
-  :group 'magit-faces)
-
-(defface magit-blame-subject
-  '((t :inherit (magit-log-message magit-blame-header)))
-  "Face for blame tag line."
-  :group 'magit-faces)
-
-(defconst magit-blame-map
-  (let ((map (make-sparse-keymap "Magit:Blame")))
-    (define-key map (kbd "l") 'magit-blame-locate-commit)
-    (define-key map (kbd "RET") 'magit-blame-locate-commit)
-    (define-key map (kbd "q") 'magit-blame-mode)
-    (define-key map (kbd "n") 'magit-blame-next-chunk)
-    (define-key map (kbd "p") 'magit-blame-previous-chunk)
-    map)
-  "Keymap for an annotated section.\\{magit-blame-map}")
-
-(defvar magit-blame-buffer-read-only)
-(make-variable-buffer-local 'magit-blame-buffer-read-only)
-
-;;;###autoload
-(define-minor-mode magit-blame-mode
-  "Display blame information inline."
-  :keymap magit-blame-map
-  :lighter " blame"
-  (unless (buffer-file-name)
-    (error "Current buffer has no associated file!"))
-  (when (and (buffer-modified-p)
-             (y-or-n-p (format "save %s first? " (buffer-file-name))))
-    (save-buffer))
-
-  (if magit-blame-mode
-      (progn
-        (setq magit-blame-buffer-read-only buffer-read-only)
-        (magit-blame-file-on (current-buffer))
-        (set-buffer-modified-p nil)
-        (setq buffer-read-only t))
-    (magit-blame-file-off (current-buffer))
-    (set-buffer-modified-p nil)
-    (setq buffer-read-only magit-blame-buffer-read-only)))
-
-(defun magit-blame-file-off (buffer)
-  (save-excursion
-    (save-restriction
-      (with-current-buffer buffer
-        (widen)
-        (mapc (lambda (ov)
-                (if (overlay-get ov :blame)
-                    (delete-overlay ov)))
-              (overlays-in (point-min) (point-max)))))))
-
-(defun magit-blame-file-on (buffer)
-  (magit-blame-file-off buffer)
-  (save-excursion
-    (with-current-buffer buffer
-      (save-restriction
-        (with-temp-buffer
-          (magit-git-insert (list "blame" "--porcelain" "--"
-                                  (file-name-nondirectory
-                                   (buffer-file-name buffer))))
-          (magit-blame-parse buffer (current-buffer)))))))
-
-(defun magit-blame-locate-commit (pos)
-  "Jump to a commit in the branch history from an annotated blame section."
-  (interactive "d")
-  (let ((overlays (overlays-at pos))
-        sha1)
-    (dolist (ov overlays)
-      (if (overlay-get ov :blame)
-          (setq sha1 (plist-get (nth 3 (overlay-get ov :blame)) :sha1))))
-    (if sha1
-        (magit-show-commit sha1))))
-
-(defun magit-find-next-overlay-change (BEG END PROP)
-  "Return the next position after BEG where an overlay matching a
-property PROP starts or ends. If there are no matching overlay
-boundaries from BEG to END, the return value is nil."
-  (save-excursion
-    (goto-char BEG)
-    (catch 'found
-      (flet ((overlay-change (pos)
-                             (if (< BEG END) (next-overlay-change pos)
-                               (previous-overlay-change pos)))
-             (within-bounds-p (pos)
-                              (if (< BEG END) (< pos END)
-                                (> pos END))))
-        (let ((ov-pos BEG))
-          ;; iterate through overlay changes from BEG to END
-          (while (within-bounds-p ov-pos)
-            (let* ((next-ov-pos (overlay-change ov-pos))
-                   ;; search for an overlay with a PROP property
-                   (next-ov
-                    (let ((overlays (overlays-at next-ov-pos)))
-                      (while (and overlays
-                                  (not (overlay-get (car overlays) PROP)))
-                        (setq overlays (cdr overlays)))
-                      (car overlays))))
-              (if next-ov
-                  ;; found the next overlay with prop PROP at next-ov-pos
-                  (throw 'found next-ov-pos)
-                ;; no matching overlay found, keep looking
-                (setq ov-pos next-ov-pos)))))))))
-
-(defun magit-blame-next-chunk (pos)
-  "Go to the next blame chunk."
-  (interactive "d")
-  (let ((next-chunk-pos (magit-find-next-overlay-change pos (point-max) :blame)))
-    (when next-chunk-pos
-      (goto-char next-chunk-pos))))
-
-(defun magit-blame-previous-chunk (pos)
-  "Go to the previous blame chunk."
-  (interactive "d")
-  (let ((prev-chunk-pos (magit-find-next-overlay-change pos (point-min) :blame)))
-    (when prev-chunk-pos
-      (goto-char prev-chunk-pos))))
-
-(defcustom magit-time-format-string "%Y-%m-%dT%T%z"
-  "How to format time in magit-blame header."
-  :group 'magit
-  :type 'string)
-
-(defun magit-blame-decode-time (unixtime &optional tz)
-  "Decode UNIXTIME into (HIGH LOW) format.
-
-The second argument TZ can be used to add the timezone in (-)HHMM
-format to UNIXTIME.  UNIXTIME should be either a number
-containing seconds since epoch or Emacs's (HIGH LOW
-. IGNORED) format."
-  (when (numberp tz)
-    (unless (numberp unixtime)
-      (setq unixtime (float-time unixtime)))
-    (let* ((ptz (abs tz))
-           (min (+ (* (/ ptz 100) 60)
-                   (mod ptz 100))))
-      (setq unixtime (+ (* (if (< tz 0) (- min) min) 60) unixtime))))
-
-  (when (numberp unixtime)
-    (setq unixtime (seconds-to-time unixtime)))
-  unixtime)
-
-(defun magit-blame-format-time-string (format &optional unixtime tz)
-  "Use FORMAT to format the time UNIXTIME, or now if omitted.
-
-UNIXTIME is specified as a number containing seconds since epoch
-or Emacs's (HIGH LOW . IGNORED) format.  The optional argument TZ
-can be used to set the time zone.  If TZ is a number it is
-treated as a (-)HHMM offset to Universal Time.  If TZ is not
-a number and non-nil the time is printed in UTC.  If TZ is nil
-the local zime zone is used.  The format of the function is
-similar to `format-time-string' except for %Z which is not
-officially supported at the moment."
-  (unless unixtime
-    (setq unixtime (current-time)))
-  (when (numberp tz) ;; TODO add support for %Z
-    (setq format (replace-regexp-in-string "%z" (format "%+05d" tz) format)))
-  (format-time-string format (magit-blame-decode-time unixtime tz) tz))
-
-(defun magit-blame-parse (target-buf blame-buf)
-  "Parse blame-info in buffer BLAME-BUF and decorate TARGET-BUF buffer."
-  (save-match-data
-    (let ((blank (propertize " " 'face 'magit-blame-header))
-          (nl (propertize "\n" 'face 'magit-blame-header))
-          (commit-hash (make-hash-table :test 'equal :size 577))
-          commit commit-info old-line new-line num old-file subject author
-          author-time author-timezone info ov beg end blame)
-      (with-current-buffer blame-buf
-        (goto-char (point-min))
-        ;; search for a ful commit info
-        (while (re-search-forward "^\\([0-9a-f]\\{40\\}\\) \\([0-9]+\\) \\([0-9]+\\) \\([0-9]+\\)$" nil t)
-          (setq commit (match-string-no-properties 1)
-                old-line (string-to-number
-                          (match-string-no-properties 2))
-                new-line (string-to-number
-                          (match-string-no-properties 3))
-                num (string-to-number
-                     (match-string-no-properties 4)))
-          ;; was this commit already seen (and stored in the hash)?
-          (setq commit-info (gethash commit commit-hash))
-          ;; Nope, this is the 1st time, the full commit-info follow.
-          (unless commit-info
-            (re-search-forward "^author \\(.+\\)$")
-            (setq author (match-string-no-properties 1))
-            (re-search-forward "^author-time \\(.+\\)$")
-            (setq author-time (string-to-number
-                               (match-string-no-properties 1)))
-            (re-search-forward "^author-tz \\(.+\\)$")
-            (setq author-timezone (string-to-number
-                                   (match-string-no-properties 1)))
-            (re-search-forward "^summary \\(.+\\)$")
-            (setq subject (match-string-no-properties 1))
-            (re-search-forward "^filename \\(.+\\)$")
-            (setq old-file (match-string-no-properties 1))
-            (setq commit-info (list :sha1 commit :author author
-                                    :author-time author-time
-                                    :author-timezone author-timezone
-                                    :subject subject :file old-file))
-            ;; save it in the hash
-            (puthash commit commit-info commit-hash))
-          ;; add the current blame-block into the list INFO.
-          (setq info (cons (list old-line new-line num commit-info)
-                           info))))
-      ;; now do from beginning
-      (setq info (nreverse info))
-      (with-current-buffer target-buf
-        ;; for every blame chunk
-        (dolist (chunk info)
-          (setq commit-info (nth 3 chunk)
-                old-line (nth 0 chunk)
-                new-line (nth 1 chunk)
-                num (nth 2 chunk)
-                commit (plist-get commit-info :sha1)
-                author (plist-get commit-info :author)
-                author-time (plist-get commit-info :author-time)
-                author-timezone (plist-get commit-info :author-timezone)
-                subject (plist-get commit-info :subject))
-
-          (goto-char (point-min))
-          (forward-line (1- new-line))
-
-          (setq beg (line-beginning-position)
-                end (save-excursion
-                      (forward-line num)
-                      (line-beginning-position)))
-          ;; mark the blame chunk
-          (put-text-property beg end :blame chunk)
-
-          ;; make an overlay with blame info as 'before-string
-          ;; on the current chunk.
-          (setq ov (make-overlay beg end))
-          (overlay-put ov :blame chunk)
-          (setq blame (concat
-                       (propertize (substring-no-properties commit 0 8)
-                                   'face 'magit-blame-sha1)
-                       blank
-                       (propertize (format "%-20s" author)
-                                   'face 'magit-blame-culprit)
-                       blank
-                       (propertize (magit-blame-format-time-string
-                                    magit-time-format-string
-                                    author-time author-timezone)
-                                   'face 'magit-blame-time)
-                       blank
-                       (propertize subject 'face 'magit-blame-subject)
-                       blank nl))
-          (overlay-put ov 'before-string blame))))))
-
-(provide 'magit-blame)
-;;; magit-blame.el ends here
diff --git a/elpa/magit-1.2.0/magit-blame.elc b/elpa/magit-1.2.0/magit-blame.elc
deleted file mode 100644
index cf7ee259409710e7db9b134527705dd8c48e44fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8851
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
BWKRG9

diff --git a/elpa/magit-1.2.0/magit-key-mode.elc b/elpa/magit-1.2.0/magit-key-mode.elc
deleted file mode 100644
index 5aa4837524ba60e900dc264cb9a13edb3ba20a56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16825
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

diff --git a/elpa/magit-1.2.0/magit-pkg.el b/elpa/magit-1.2.0/magit-pkg.el
deleted file mode 100644
index 11ad3243c..000000000
--- a/elpa/magit-1.2.0/magit-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "magit" "1.2.0" "Control Git from Emacs.")
diff --git a/elpa/magit-1.2.0/magit-stgit.el b/elpa/magit-1.2.0/magit-stgit.el
deleted file mode 100644
index b105b71f4..000000000
--- a/elpa/magit-1.2.0/magit-stgit.el
+++ /dev/null
@@ -1,288 +0,0 @@
-;;; magit-stgit.el --- StGit plug-in for Magit
-
-;; Copyright (C) 2011  Lluis Vilanova
-;;
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This plug-in provides StGit functionality as a separate component of Magit.
-
-;; Available actions:
-;; - visit: Shows the patch at point in the series (stg show)
-;; - apply: Goes to the patch at point in the series (stg goto)
-;; - discard: Deletes the marked/at point patch in the series (stg delete)
-
-;; Available commands:
-;; - `magit-stgit-refresh': Refresh the marked/at point patch in the series
-;;   (stg refresh)
-;; - `magit-stgit-repair': Repair the StGit metadata (stg repair)
-;; - `magit-stgit-rebase': Rebase the whole series (stg rebase)
-
-;; TODO:
-;; - Let the user select which files must be included in a refresh.
-;; - Missing actions for `magit-show-item-or-scroll-up' and
-;;   `magit-show-item-or-scroll-down'.
-;; - Marking a patch is slow and refreshes all buffers, which resets their
-;;   position (i.e., the buffer is shown from its first line).
-
-;;; Code:
-
-(require 'magit)
-(eval-when-compile
-  (require 'cl))
-
-;;; Customizables:
-
-(defcustom magit-stgit-executable "stg"
-  "The name of the StGit executable."
-  :group 'magit
-  :type 'string)
-
-(defface magit-stgit-applied
-  '((t :inherit magit-diff-add))
-  "Face for an applied stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-current
-  '((t :inherit magit-item-highlight))
-  "Face for the current stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-other
-  '((t :inherit magit-diff-del))
-  "Face for a non-applied stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-marked
-  '((t :inherit magit-item-mark))
-  "Face for a marked stgit patch."
-  :group 'magit-faces)
-
-(defface magit-stgit-empty
-  '((t :inherit magit-item-mark))
-  "Face for an empty stgit patch."
-  :group 'magit-faces)
-
-;;; Common code:
-
-(defvar magit-stgit--enabled nil
-  "Whether this buffer has StGit support.")
-(make-variable-buffer-local 'magit-stgit--enabled)
-
-(defvar magit-stgit-mode)
-
-(defun magit-stgit--enabled ()
-  "Whether this buffer has StGit support enabled."
-  (if (assoc 'magit-stgit--enabled (buffer-local-variables))
-      magit-stgit--enabled
-    (setq magit-stgit--enabled
-          (and magit-stgit-mode
-               (not (null
-                     (member (concat (magit-get-current-branch) ".stgit")
-                             (mapcar #'(lambda (line)
-                                         (string-match "^\\*?\s*\\([^\s]*\\)"
-                                                       line)
-                                         (match-string 1 line))
-                                     (magit-git-lines "branch")))))))))
-
-(defun magit-stgit--enabled-reset ()
-  "Reset the StGit enabled state."
-  (kill-local-variable 'magit-stgit--enabled))
-
-(defvar magit-stgit--marked-patch nil
-  "The (per-buffer) currently marked patch in an StGit series.")
-(make-variable-buffer-local 'magit-stgit--marked-patch)
-
-;;; Menu:
-
-(easy-menu-define magit-stgit-extension-menu
-  nil
-  "StGit extension menu"
-  '("StGit"
-    :active (magit-stgit--enabled)
-
-    ["Refresh patch" magit-stgit-refresh
-     :help "Refresh the contents of a patch in an StGit series"]
-    ["Repair" magit-stgit-repair
-     :help "Repair StGit metadata if branch was modified with git commands"]
-    ["Rebase series" magit-stgit-rebase
-     :help "Rebase an StGit patch series"]
-    ))
-
-(easy-menu-add-item 'magit-mode-menu
-                    '("Extensions")
-                    magit-stgit-extension-menu)
-
-;;; Series section:
-
-(defun magit-stgit--wash-patch ()
-  (if (search-forward-regexp "^\\(.\\)\\(.\\) \\([^\s]*\\)\\(\s*# ?\\)\\(.*\\)"
-                             (line-end-position) t)
-      (let* ((empty-str "[empty] ")
-             (indent-str (make-string (string-bytes empty-str) ?\ ))
-             (empty (match-string 1))
-             (state (match-string 2))
-             (patch (match-string 3))
-             (descr (match-string 5)))
-        (delete-region (line-beginning-position) (line-end-position))
-        (insert
-         (cond ((string= empty "0")
-                (propertize (concat empty-str " " state " " descr) 'face 'magit-stgit-empty))
-               ((string= magit-stgit--marked-patch patch)
-                (propertize (concat indent-str " " state " " descr) 'face 'magit-stgit-marked))
-               ((string= state "+")
-                (concat indent-str " " (propertize state 'face 'magit-stgit-applied) " " descr))
-               ((string= state ">")
-                (propertize (concat indent-str " " state " " descr) 'face 'magit-stgit-current))
-               ((string= state "-")
-                (concat indent-str " " (propertize state 'face 'magit-stgit-other) " " descr))))
-        (goto-char (line-beginning-position))
-        (magit-with-section patch 'series
-          (magit-set-section-info patch)
-          (goto-char (line-end-position)))
-        (forward-line))
-    (delete-region (line-beginning-position) (1+ (line-end-position))))
-  t)
-
-(defun magit-stgit--wash-series ()
-    (let ((magit-old-top-section nil))
-      (magit-wash-sequence #'magit-stgit--wash-patch)))
-
-(magit-define-inserter series ()
-  (when (executable-find magit-stgit-executable)
-    (magit-insert-section 'series
-                          "Series:" 'magit-stgit--wash-series
-                          magit-stgit-executable "series" "-a" "-d" "-e")))
-
-;;; Actions:
-
-;; Copy of `magit-refresh-commit-buffer' (version 1.0.0)
-(defun magit-stgit--refresh-patch-buffer (patch)
-  (magit-create-buffer-sections
-    (magit-insert-section nil nil
-                       'magit-wash-commit
-                       magit-stgit-executable
-                       "show"
-                       patch)))
-
-;; Copy of `magit-show-commit' (version 1.0.0)
-(defun magit-stgit--show-patch (patch &optional scroll)
-  (when (magit-section-p patch)
-    (setq patch (magit-section-info patch)))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-commit-buffer-name)))
-    (cond ((and (equal magit-currently-shown-commit patch)
-                ;; if it's empty then the buffer was killed
-                (with-current-buffer buf
-                  (> (length (buffer-string)) 1)))
-           (let ((win (get-buffer-window buf)))
-             (cond ((not win)
-                    (display-buffer buf))
-                   (scroll
-                    (with-selected-window win
-                      (funcall scroll))))))
-          (t
-           (setq magit-currently-shown-commit patch)
-           (display-buffer buf)
-           (with-current-buffer buf
-             (set-buffer buf)
-             (goto-char (point-min))
-             (magit-mode-init dir 'magit-commit-mode
-                              #'magit-stgit--refresh-patch-buffer patch))))))
-
-(magit-add-action (item info "visit")
-  ((series)
-   (magit-stgit--show-patch info)
-   (pop-to-buffer magit-commit-buffer-name)))
-
-(magit-add-action (item info "apply")
-  ((series)
-   (magit-run magit-stgit-executable "goto" info)))
-
-(magit-add-action (item info "discard")
-  ((series)
-   (let ((patch (or magit-stgit--marked-patch info)))
-     (if (yes-or-no-p (format "Delete patch '%s' in series? " patch))
-         (progn
-           (if (string= magit-stgit--marked-patch patch)
-               (setq magit-stgit--marked-patch nil))
-           (magit-run magit-stgit-executable "delete" patch))))))
-
-(defun magit-stgit--set-marked-patch (patch)
-  (setq magit-stgit--marked-patch
-        (if (string= magit-stgit--marked-patch patch)
-            nil
-          patch)))
-
-(magit-add-action (item info "mark")
-  ((series)
-   (magit-stgit--set-marked-patch info)
-   (magit-refresh-all)))
-
-;;; Commands:
-
-(defun magit-stgit-refresh ()
-  "Refresh the contents of a patch in an StGit series.
-If there is no marked patch in the series, refreshes the current
-patch.
-Otherwise, refreshes the marked patch."
-  (interactive)
-  (if magit-stgit--marked-patch
-      (magit-run magit-stgit-executable "refresh" "-p" magit-stgit--marked-patch)
-    (magit-run magit-stgit-executable "refresh")))
-
-(defun magit-stgit-repair ()
-  "Repair StGit metadata if branch was modified with git commands.
-In the case of Git commits these will be imported as new patches
-into the series."
-  (interactive)
-  (message "Repairing series...")
-  (magit-run magit-stgit-executable "repair")
-  (message ""))
-
-(defun magit-stgit-rebase ()
-  "Rebase an StGit patch series."
-  (interactive)
-  (if (magit-get-current-remote)
-      (progn
-        (if (yes-or-no-p "Update remotes? ")
-            (progn
-              (message "Updating remotes...")
-              (magit-run-git-async "remote" "update")))
-        (magit-run magit-stgit-executable "rebase"
-                   (format "remotes/%s/%s"
-                           (magit-get-current-remote)
-                           (magit-get-current-branch))))))
-
-;;;###autoload
-(define-minor-mode magit-stgit-mode "StGit support for Magit"
-  :lighter " Stg" :require 'magit-stgit
-  (or (derived-mode-p 'magit-mode)
-      (error "This mode only makes sense with magit"))
-  (if magit-stgit-mode
-      (progn
-        (add-hook 'magit-after-insert-stashes-hook 'magit-insert-series nil t))
-    (progn
-      (remove-hook 'magit-after-insert-stashes-hook 'magit-insert-series t)))
-  (when (called-interactively-p 'any)
-    (magit-refresh)))
-
-;;;###autoload
-(defun turn-on-magit-stgit ()
-  "Unconditionally turn on `magit-stgit-mode'."
-  (magit-stgit-mode 1))
-
-(provide 'magit-stgit)
-;;; magit-stgit.el ends here
diff --git a/elpa/magit-1.2.0/magit-stgit.elc b/elpa/magit-1.2.0/magit-stgit.elc
deleted file mode 100644
index 298418c9d8d0acf1eaa583e3a1dfe1c501c7d374..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11261
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
U>v+r%<ZMq8n8M~wu<pix0V&Xy;s5{u

diff --git a/elpa/magit-1.2.0/magit-svn.elc b/elpa/magit-1.2.0/magit-svn.elc
deleted file mode 100644
index 3d340ff9df899a6c56d241002680b46d3a7ac6a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9564
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
A8~^|S

diff --git a/elpa/magit-1.2.0/magit-topgit.el b/elpa/magit-1.2.0/magit-topgit.el
deleted file mode 100644
index 6f0080cc2..000000000
--- a/elpa/magit-1.2.0/magit-topgit.el
+++ /dev/null
@@ -1,191 +0,0 @@
-;;; magit-topgit.el --- topgit plug-in for Magit
-
-;; Copyright (C) 2010  Nathan Weizenbaum
-;; Copyright (C) 2010  Yann Hodique
-;;
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This plug-in provides topgit functionality as a separate component of Magit
-
-;;; Code:
-
-(require 'magit)
-(eval-when-compile
-  (require 'cl))
-
-(defcustom magit-topgit-executable "tg"
-  "The name of the TopGit executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-topgit-branch-prefix "t/"
-  "Convention prefix for topic branch creation."
-  :group 'magit
-  :type 'string)
-
-(defface magit-topgit-current
-  '((t :weight bold :inherit magit-branch))
-  "Face for section titles."
-  :group 'magit-faces)
-
-;;; Topic branches (using topgit)
-
-(defun magit-topgit-in-topic-p ()
-  (and (file-exists-p ".topdeps")
-       (executable-find magit-topgit-executable)))
-
-(defun magit-topgit-create-branch (branch parent)
-  (when (zerop (or (string-match magit-topgit-branch-prefix branch) -1))
-    (magit-run* (list magit-topgit-executable "create"
-                      branch (magit-rev-to-git parent))
-                nil nil nil t)
-    t))
-
-(defun magit-topgit-pull ()
-  (when (magit-topgit-in-topic-p)
-    (magit-run* (list magit-topgit-executable "update")
-                nil nil nil t)
-    t))
-
-(defun magit-topgit-push ()
-  (when (magit-topgit-in-topic-p)
-    (let* ((branch (or (magit-get-current-branch)
-                       (error "Don't push a detached head.  That's gross")))
-           (remote (magit-get "topgit" "remote"))
-           (push-remote (if (or current-prefix-arg (not remote))
-                            (magit-read-remote (format "Push %s to" branch))
-                          remote)))
-      (when (and (not remote)
-                 (not current-prefix-arg))
-        (magit-set push-remote "topgit" "remote"))
-      (magit-run magit-topgit-executable "push" "-r" push-remote))
-    t))
-
-(defun magit-topgit-remote-update (&optional remote)
-  (when (magit-topgit-in-topic-p)
-    (let* ((remote (magit-get "topgit" "remote"))
-           (remote-update (if (or current-prefix-arg (not remote))
-                              (magit-read-remote)
-                            remote)))
-      (if (and (not remote)
-               (not current-prefix-arg))
-          (progn
-            (magit-set remote-update "topgit" "remote")
-            (magit-run magit-topgit-executable "remote"
-                       "--populate" remote-update)))
-      (magit-run magit-topgit-executable "remote" remote-update))
-    ;; We return nil anyway, as we also want regular "git remote update" to
-    ;; happen
-    nil))
-
-(defun magit-topgit-parse-flags (flags-string)
-  (let ((flags (string-to-list flags-string))
-        (void-flag ?\ ))
-    (list :current (not (eq (nth 0 flags) void-flag))
-          :empty (not (eq (nth 1 flags) void-flag)))))
-
-(defun magit-topgit-wash-topic ()
-  (let ((fmt "^\\(.\\{7\\}\\)\\s-\\(\\S-+\\)\\s-+\\(.*\\)"))
-    (if (search-forward-regexp fmt (line-end-position) t)
-        (let ((flags (magit-topgit-parse-flags (match-string 1)))
-              (topic (match-string 2)))
-          (goto-char (line-beginning-position))
-          (delete-char 8)
-          (insert "\t")
-          (goto-char (line-beginning-position))
-          (magit-with-section topic 'topic
-            (magit-set-section-info topic)
-            (let ((beg (1+ (line-beginning-position)))
-                  (end (line-end-position)))
-              (when (plist-get flags :current)
-                (put-text-property beg end 'face 'magit-topgit-current))
-              (when (plist-get flags :empty)
-                (put-text-property beg end 'face `(:strike-through t :inherit ,(get-text-property beg 'face)))))
-            (forward-line)))
-      (delete-region (line-beginning-position) (1+ (line-end-position))))
-    t))
-
-(defun magit-topgit-wash-topics ()
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-topgit-wash-topic)))
-
-(defun magit-topgit-section (section title washer &rest args)
-  (when (executable-find magit-topgit-executable)
-    (let ((magit-git-executable magit-topgit-executable)
-          (magit-git-standard-options nil))
-      (apply 'magit-git-section section title washer args))))
-
-(magit-define-inserter topics ()
-  (magit-topgit-section 'topics
-                        "Topics:" 'magit-topgit-wash-topics
-                        "summary"))
-
-(magit-add-action (item info "discard")
-  ((topic)
-   (when (yes-or-no-p "Discard topic? ")
-     (magit-run* (list magit-topgit-executable "delete" "-f" info)
-                 nil nil nil t))))
-
-(magit-add-action (item info "visit")
-  ((topic)
-   (magit-checkout info)))
-
-(defun magit-topgit-get-top-bases-color (suffix)
-  (list nil nil))
-
-(defun magit-topgit-get-remote-top-bases-color (suffix)
-  (when (string-match "^\\(?:[^/]+\\)/top-bases" suffix)
-    (list nil nil)))
-
-(defconst magit-topgit-ignored-namespace
-  '("top-bases" magit-topgit-get-top-bases-color))
-
-;;;###autoload
-(define-minor-mode magit-topgit-mode "Topgit support for Magit"
-  :lighter " Topgit" :require 'magit-topgit
-  (or (derived-mode-p 'magit-mode)
-      (error "This mode only makes sense with magit"))
-  (if magit-topgit-mode
-      (progn
-        (add-hook 'magit-after-insert-stashes-hook 'magit-insert-topics nil t)
-        (add-hook 'magit-create-branch-command-hook 'magit-topgit-create-branch nil t)
-        (add-hook 'magit-pull-command-hook 'magit-topgit-pull nil t)
-        (add-hook 'magit-remote-update-command-hook 'magit-topgit-remote-update nil t)
-        (add-hook 'magit-push-command-hook 'magit-topgit-push nil t)
-        ;; hide refs for top-bases namespace in any remote
-        (add-hook 'magit-log-remotes-color-hook
-                  'magit-topgit-get-remote-top-bases-color)
-        ;; hide refs in the top-bases namespace, as they're not meant for the user
-        (add-to-list 'magit-refs-namespaces magit-topgit-ignored-namespace))
-    (progn
-        (remove-hook 'magit-after-insert-stashes-hook 'magit-insert-topics t)
-        (remove-hook 'magit-create-branch-command-hook 'magit-topgit-create-branch t)
-        (remove-hook 'magit-pull-command-hook 'magit-topgit-pull t)
-        (remove-hook 'magit-remote-update-command-hook 'magit-topgit-remote-update t)
-        (remove-hook 'magit-push-command-hook 'magit-topgit-push t)
-        (remove-hook 'magit-log-remotes-color-hook
-                     'magit-topgit-get-remote-top-bases-color)
-        (delete magit-topgit-ignored-namespace magit-refs-namespaces)))
-  (when (called-interactively-p 'any)
-    (magit-refresh)))
-
-;;;###autoload
-(defun turn-on-magit-topgit ()
-  "Unconditionally turn on `magit-topgit-mode'."
-  (magit-topgit-mode 1))
-
-(provide 'magit-topgit)
-;;; magit-topgit.el ends here
diff --git a/elpa/magit-1.2.0/magit-topgit.elc b/elpa/magit-1.2.0/magit-topgit.elc
deleted file mode 100644
index 3998b5a0f502ab4247423b7e5e382e31a01fa254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7919
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
Gzx{7Km7swD

diff --git a/elpa/magit-1.2.0/magit-wip.el b/elpa/magit-1.2.0/magit-wip.el
deleted file mode 100644
index 5c198404d..000000000
--- a/elpa/magit-1.2.0/magit-wip.el
+++ /dev/null
@@ -1,153 +0,0 @@
-;;; magit-wip.el --- git-wip plug-in for Magit
-
-;; Copyright (C) 2012  Jonas Bernoulli
-;; Copyright (C) 2012  Ryan C. Thompson
-
-;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
-
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This plug-in provides support for special work-in-progress refs.
-
-;; This requires the third-party git command "git wip" which is available
-;; from https://github.com/bartman/git-wip.
-
-;; The global mode `magit-wip-mode' provides highlighting of wip refs in
-;; Magit buffers while the local mode `magit-wip-save-mode' commits to
-;; such a ref when saving a file-visiting buffer.
-
-;; To enable `magit-wip-save-mode' enable `global-magit-wip-save-mode'
-;; and use the Magit extension mechanism to select the repositories in
-;; which you want to use a work-in-progress ref.  Usually you also want
-;; to enable `magit-wip-mode'.
-;;
-;;   (magit-wip-mode 1)
-;;   (global-magit-wip-save-mode 1)
-;;
-;;   $ git config --add magit.extension wip-save           # or
-;;   $ git config --global --add magit.extension wip-save
-
-;; Note that `global-magit-wip-save-mode' is the only mode that uses the
-;; extension mechanism for file-visiting buffers all other global modes
-;; making use of it to turn on local modes in Magit buffers.
-
-;;; Code:
-
-(require 'magit)
-(require 'format-spec)
-
-;;; Magit Wip Mode.
-
-(defface magit-log-head-label-wip
-  '((((class color) (background light))
-     :box t
-     :background "Grey95"
-     :foreground "LightSkyBlue3")
-    (((class color) (background dark))
-     :box t
-     :background "Grey07"
-     :foreground "LightSkyBlue4"))
-  "Face for git-wip labels shown in log buffer."
-  :group 'magit-faces)
-
-(defun magit-log-get-wip-color (suffix)
-  (list (concat "(WIP) " suffix)
-        'magit-log-head-label-wip))
-
-(defconst magit-wip-refs-namespace
-  '("wip" magit-log-get-wip-color))
-
-;;;###autoload
-(define-minor-mode magit-wip-mode
-  "In Magit log buffers; give wip refs a special appearance."
-  :group 'magit
-  :global t
-  (if magit-wip-mode
-      (add-to-list 'magit-refs-namespaces magit-wip-refs-namespace 'append)
-    (setq magit-refs-namespaces
-          (delete magit-wip-refs-namespace magit-refs-namespaces))))
-
-;;; Magit Wip Save Mode.
-
-(defcustom magit-wip-commit-message "WIP %r"
-  "Commit message for git-wip commits.
-
-The following `format'-like specs are supported:
-%f the full name of the file being saved, and
-%r the name of the file being saved, relative to the repository root
-%g the root of the git repository."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-wip-echo-area-message "Wrote %f (wip)"
-  "Message shown in the echo area after creating a git-wip commit.
-
-The following `format'-like specs are supported:
-%f the full name of the file being saved, and
-%r the name of the file being saved, relative to the repository root.
-%g the root of the git repository."
-  :group 'magit
-  :type '(choice (const :tag "No message" nil) string))
-
-(defvar magit-wip-save-mode-lighter " Wip")
-
-;;;###autoload
-(define-minor-mode magit-wip-save-mode
-  "Magit support for committing to a work-in-progress ref.
-
-When this minor mode is turned on and a file is saved inside a writable
-git repository then it is also committed to a special work-in-progress
-ref."
-  :lighter magit-wip-save-mode-lighter
-  (if magit-wip-save-mode
-      (add-hook  'after-save-hook 'magit-wip-save-safe t t)
-    (remove-hook 'after-save-hook 'magit-wip-save-safe t)))
-
-;;;###autoload
-(define-globalized-minor-mode global-magit-wip-save-mode
-  magit-wip-save-mode turn-on-magit-wip-save
-  :group 'magit)
-
-(defun turn-on-magit-wip-save ()
-  (when (and (buffer-file-name)
-             (magit-get-top-dir default-directory)
-             (member "wip-save" (magit-get-all "magit.extension")))
-    (if (= (magit-git-exit-code "wip" "-h") 0)
-        (magit-wip-save-mode 1)
-      (message "Git command 'git wip' cannot be found"))))
-
-(defun magit-wip-save-safe ()
-  (condition-case err
-      (magit-wip-save)
-    (error
-     (message "Magit WIP got an error: %S" err))))
-
-(defun magit-wip-save ()
-  (let* ((top-dir (magit-get-top-dir default-directory))
-         (name (file-truename (buffer-file-name)))
-         (spec `((?r . ,(file-relative-name name top-dir))
-                 (?f . ,(buffer-file-name))
-                 (?g . ,top-dir))))
-    (when (and top-dir (file-writable-p top-dir))
-      (save-excursion ; kludge see https://github.com/magit/magit/issues/441
-        (magit-run-git "wip" "save"
-                       (format-spec magit-wip-commit-message spec)
-                       "--editor" "--" name))
-      (when magit-wip-echo-area-message
-        (message (format-spec magit-wip-echo-area-message spec))))))
-
-(provide 'magit-wip)
-;;; magit-wip.el ends here
diff --git a/elpa/magit-1.2.0/magit-wip.elc b/elpa/magit-1.2.0/magit-wip.elc
deleted file mode 100644
index a1ed255f029339176bf8ef6ddcfa6df1ac539ef4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8884
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
U`3pMIT$8HzT<=`IqqZCW1)QilQvd(}

diff --git a/elpa/magit-1.2.0/magit.el b/elpa/magit-1.2.0/magit.el
deleted file mode 100644
index 121ec9c72..000000000
--- a/elpa/magit-1.2.0/magit.el
+++ /dev/null
@@ -1,6001 +0,0 @@
-;;; magit.el --- control Git from Emacs
-
-;; Copyright (C) 2010 Aaron Culich.
-;; Copyright (C) 2010 Alan Falloon.
-;; Copyright (C) 2008, 2010 Alex Ott.
-;; Copyright (C) 2008, 2009, 2010 Alexey Voinov.
-;; Copyright (C) 2010 Ben Walton.
-;; Copyright (C) 2010 Chris Bernard.
-;; Copyright (C) 2010 Christian Kluge.
-;; Copyright (C) 2008 Daniel Farina.
-;; Copyright (C) 2010 David Abrahams.
-;; Copyright (C) 2009 David Wallin.
-;; Copyright (C) 2009, 2010 Hannu Koivisto.
-;; Copyright (C) 2009 Ian Eure.
-;; Copyright (C) 2009 Jesse Alama.
-;; Copyright (C) 2009 John Wiegley.
-;; Copyright (C) 2010 Leo.
-;; Copyright (C) 2008, 2009 Marcin Bachry.
-;; Copyright (C) 2008, 2009 Marius Vollmer.
-;; Copyright (C) 2010 Mark Hepburn.
-;; Copyright (C) 2010 Moritz Bunkus.
-;; Copyright (C) 2010 Nathan Weizenbaum.
-;; Copyright (C) 2010 Oscar Fuentes.
-;; Copyright (C) 2009 Pavel Holejsovsky.
-;; Copyright (C) 2011-2012 Peter J Weisberg
-;; Copyright (C) 2009, 2010 Phil Jackson.
-;; Copyright (C) 2010 Philip Weaver.
-;; Copyright (C) 2010 Ramkumar Ramachandra.
-;; Copyright (C) 2010 Remco van 't Veer.
-;; Copyright (C) 2009 René Stadler.
-;; Copyright (C) 2010 Robin Green.
-;; Copyright (C) 2010 Roger Crew.
-;; Copyright (C) 2009, 2010, 2011 Rémi Vanicat.
-;; Copyright (C) 2010 Sean Bryant.
-;; Copyright (C) 2009, 2011 Steve Purcell.
-;; Copyright (C) 2010 Timo Juhani Lindfors.
-;; Copyright (C) 2010, 2011 Yann Hodique.
-;; Copyright (C) 2010 Ævar Arnfjörð Bjarmason.
-;; Copyright (C) 2010 Óscar Fuentes.
-
-;; Original Author: Marius Vollmer <marius.vollmer@nokia.com>
-;; Former Maintainer: Phil Jackson <phil@shellarchive.co.uk>
-;; Maintenance Group: https://github.com/organizations/magit/teams/53130
-;;   Currently composed of:
-;;   - Phil Jackson
-;;   - Peter J Weisberg
-;;   - Yann Hodique
-;;   - Rémi Vanicat
-;; Version: 1.2.0
-;; Keywords: tools
-
-;;
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Invoking the magit-status function will show a buffer with the
-;; status of the current git repository and its working tree.  That
-;; buffer offers key bindings for manipulating the status in simple
-;; ways.
-;;
-;; The status buffer mainly shows the difference between the working
-;; tree and the index, and the difference between the index and the
-;; current HEAD.  You can add individual hunks from the working tree
-;; to the index, and you can commit the index.
-;;
-;; See the Magit User Manual for more information.
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'log-edit)
-(require 'easymenu)
-(require 'diff-mode)
-
-;; Silences byte-compiler warnings
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest args))))
-
-(eval-when-compile  (require 'view))
-(declare-function view-mode 'view)
-(eval-when-compile (require 'iswitchb))
-(eval-when-compile (require 'ido))
-(eval-when-compile (require 'ediff))
-
-;; Dummy to be used by the defcustoms when first loading the file.
-(eval-when (load eval)
-  (defalias 'magit-set-variable-and-refresh 'set-default))
-
-;;; Code:
-(defgroup magit nil
-  "Controlling Git from Emacs."
-  :prefix "magit-"
-  :group 'tools)
-
-(defcustom magit-git-executable "git"
-  "The name of the Git executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-gitk-executable (concat (file-name-directory magit-git-executable)
-                                         "gitk")
-  "The name of the Gitk executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-git-standard-options '("--no-pager")
-  "Standard options when running Git."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs nil
-  "Directories containing Git repositories.
-Magit will look into these directories for Git repositories and
-offer them as choices for `magit-status'."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs-depth 3
-  "The maximum depth to look for Git repos.
-When looking for a Git repository below the directories in `magit-repo-dirs',
-Magit will only descend this many levels deep."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-set-upstream-on-push nil
-  "Non-nil means that `magit-push' may use --set-upstream when pushing a branch.
-This only applies if the branch does not have an upstream set yet.
-Setting this to t will ask if --set-upstream should be used.
-Setting it to 'dontask will always use --set-upstream.
-Setting it to 'refuse will refuse to push unless a remote branch has already been set.
-
---set-upstream is supported with git > 1.7.0"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Refuse" refuse)
-                 (const :tag "Always" dontask)))
-
-(defcustom magit-save-some-buffers t
-  "Non-nil means that \\[magit-status] will save modified buffers before running.
-Setting this to t will ask which buffers to save, setting it to 'dontask will
-save all modified buffers without asking."
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Save without asking" dontask)))
-
-(defcustom magit-save-some-buffers-predicate
-  'magit-save-buffers-predicate-tree-only
-  "A predicate function to decide whether to save a buffer.
-
-Used by function `magit-save-some-buffers' when the variable of
-the same name is non-nil."
-
-  :group 'magit
-  :type '(radio (function-item magit-save-buffers-predicate-tree-only)
-                (function-item magit-save-buffers-predicate-all)
-                (function :tag "Other")))
-
-(defcustom magit-default-tracking-name-function
-  'magit-default-tracking-name-remote-plus-branch
-  "Specifies the function to use to generate default tracking branch names
-when doing a \\[magit-checkout].
-
-The default is magit-default-tracking-name-remote-plus-branch,
-which generates a tracking name of the form 'REMOTE-BRANCHNAME'."
-  :group 'magit
-  :type '(radio (function-item magit-default-tracking-name-remote-plus-branch)
-                (function-item magit-default-tracking-name-branch-only)
-                (function :tag "Other")))
-
-(defcustom magit-commit-all-when-nothing-staged 'ask
-  "Determines what \\[magit-log-edit] does when nothing is staged.
-Setting this to nil will make it do nothing, setting it to t will
-arrange things so that the actual commit command will use the \"--all\" option,
-setting it to 'ask will first ask for confirmation whether to do this,
-and setting it to 'ask-stage will cause all changes to be staged,
-after a confirmation."
-  :group 'magit
-  :type '(choice (const :tag "No" nil)
-                 (const :tag "Always" t)
-                 (const :tag "Ask" ask)
-                 (const :tag "Ask to stage everything" ask-stage)))
-
-(defcustom magit-commit-signoff nil
-  "Add the \"Signed-off-by:\" line when committing."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-sha1-abbrev-length 7
-  "The number of digits to show when a sha1 is displayed in abbreviated form."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-cutoff-length 100
-  "The maximum number of commits to show in the log and whazzup buffers."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-infinite-length 99999
-  "Number of log used to show as maximum for `magit-log-cutoff-length'."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-auto-more nil
-  "Insert more log entries automatically when moving past the last entry.
-
-Only considered when moving past the last entry with
-`magit-goto-*-section' commands."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-process-popup-time -1
-  "Popup the process buffer if a command takes longer than this many seconds."
-  :group 'magit
-  :type '(choice (const :tag "Never" -1)
-                 (const :tag "Immediately" 0)
-                 (integer :tag "After this many seconds")))
-
-(defcustom magit-revert-item-confirm t
-  "Require acknowledgment before reverting an item."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-log-edit-confirm-cancellation nil
-  "Require acknowledgment before canceling the log edit buffer."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-remote-ref-format 'branch-then-remote
-  "What format to use for autocompleting refs, in pariticular for remotes.
-
-Autocompletion is used by functions like `magit-checkout',
-`magit-interactive-rebase' and others which offer branch name
-completion.
-
-The value 'name-then-remote means remotes will be of the
-form \"name (remote)\", while the value 'remote-slash-name
-means that they'll be of the form \"remote/name\".  I.e. something that's
-listed as \"remotes/upstream/next\" by \"git branch -l -a\"
-will be \"upstream/next\"."
-  :group 'magit
-  :type '(choice (const :tag "name (remote)" branch-then-remote)
-                 (const :tag "remote/name" remote-slash-branch)))
-
-(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
-  "Connection type used for the git process.
-
-If nil, use pipes: this is usually more efficient, and works on Cygwin.
-If t, use ptys: this enables magit to prompt for passphrases when needed."
-  :group 'magit
-  :type '(choice (const :tag "pipe" nil)
-                 (const :tag "pty" t)))
-
-(defcustom magit-completing-read-function 'magit-builtin-completing-read
-  "Function to be called when requesting input from the user."
-  :group 'magit
-  :type '(radio (function-item magit-iswitchb-completing-read)
-                (function-item magit-ido-completing-read)
-                (function-item magit-builtin-completing-read)
-                (function :tag "Other")))
-
-(defcustom magit-create-branch-behaviour 'at-head
-  "Where magit will create a new branch if not supplied a branchname or ref.
-
-The value 'at-head means a new branch will be created at the tip
-of your current branch, while the value 'at-point means magit
-will try to find a valid reference at point..."
-  :group 'magit
-  :type '(choice (const :tag "at HEAD" at-head)
-                 (const :tag "at point" at-point)))
-
-(defcustom magit-status-buffer-switch-function 'pop-to-buffer
-  "Function for `magit-status' to use for switching to the status buffer.
-
-The function is given one argument, the status buffer."
-  :group 'magit
-  :type '(radio (function-item switch-to-buffer)
-                (function-item pop-to-buffer)
-                (function :tag "Other")))
-
-(defcustom magit-rewrite-inclusive t
-  "Whether magit includes the selected base commit in a rewrite operation.
-
-t means both the selected commit as well as any subsequent
-commits will be rewritten.  This is magit's default behaviour,
-equivalent to 'git rebase -i ${REV}~1'
-
-  A'---B'---C'---D'
-  ^
-
-nil means the selected commit will be literally used as 'base',
-so only subsequent commits will be rewritten.  This is consistent
-with git-rebase, equivalent to 'git rebase -i ${REV}', yet more
-cumbersome to use from the status buffer.
-
-  A---B'---C'---D'
-  ^"
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "Ask"   ask)))
-
-(defcustom magit-highlight-whitespace t
-  "Specifies where to highlight whitespace errors.
-See `magit-highlight-trailing-whitespace',
-`magit-highlight-indentation'.  The symbol t means in all diffs,
-'status means only in the status buffer, and nil means nowhere."
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "In status buffer" status))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-trailing-whitespace t
-  "Highlight whitespace at the end of a line in diffs.
-Used only when `magit-highlight-whitespace' is non-nil."
-  :group 'magit
-  :type 'boolean
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-indentation nil
-  "Highlight the \"wrong\" indentation style.
-Used only when `magit-highlight-whitespace' is non-nil.
-
-The value is a list of cons cells.  The car is a regular
-expression, and the cdr is the value that applies to repositories
-whose directory matches the regular expression.  If more than one
-item matches, then the *last* item in the list applies.  So, the
-default value should come first in the list.
-
-If the value is `tabs', highlight indentation with tabs.  If the
-value is an integer, highlight indentation with at least that
-many spaces.  Otherwise, highlight neither."
-  :group 'magit
-  :type `(repeat (cons (string :tag "Directory regexp")
-                       (choice (const :tag "Tabs" tabs)
-                               (integer :tag "Spaces" :value ,tab-width)
-                               (const :tag "Neither" nil))))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-diff-refine-hunk nil
-  "Show fine (word-granularity) differences within diff hunks.
-
-There are three possible settings:
-
-  nil means to never show fine differences
-
-  t means to only show fine differences for the currently
-  selected diff hunk
-
-  `all' means to always show fine differences for all displayed diff hunks"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Selected only" t)
-                 (const :tag "All" all))
-  :set 'magit-set-variable-and-refresh)
-
-(defvar magit-current-indentation nil
-  "Indentation highlight used in the current buffer.
-This is calculated from `magit-highlight-indentation'.")
-(make-variable-buffer-local 'magit-current-indentation)
-
-(defgroup magit-faces nil
-  "Customize the appearance of Magit."
-  :prefix "magit-"
-  :group 'faces
-  :group 'magit)
-
-(defface magit-header
-  '((t :inherit header-line))
-  "Face for generic header lines.
-
-Many Magit faces inherit from this one by default."
-  :group 'magit-faces)
-
-(defface magit-section-title
-  '((t :inherit magit-header))
-  "Face for section titles."
-  :group 'magit-faces)
-
-(defface magit-branch
-  '((t :inherit magit-header))
-  "Face for the current branch."
-  :group 'magit-faces)
-
-(defface magit-diff-file-header
-  '((t :inherit diff-file-header))
-  "Face for diff file header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-header
-  '((t :inherit diff-hunk-header))
-  "Face for diff hunk header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-add
-  '((t :inherit diff-added))
-  "Face for lines in a diff that have been added."
-  :group 'magit-faces)
-
-(defface magit-diff-none
-  '((t :inherit diff-context))
-  "Face for lines in a diff that are unchanged."
-  :group 'magit-faces)
-
-(defface magit-diff-del
-  '((t :inherit diff-removed))
-  "Face for lines in a diff that have been deleted."
-  :group 'magit-faces)
-
-(defface magit-log-graph
-  '((((class color) (background light))
-     :foreground "grey11")
-    (((class color) (background dark))
-     :foreground "grey80"))
-  "Face for the graph element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-sha1
-  '((((class color) (background light))
-     :foreground "firebrick")
-    (((class color) (background dark))
-     :foreground "tomato"))
-  "Face for the sha1 element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-message
-  '((t))
-  "Face for the message element of the log output."
-  :group 'magit-faces)
-
-(defface magit-item-highlight
-  '((t :inherit highlight))
-  "Face for highlighting the current item."
-  :group 'magit-faces)
-
-(defface magit-item-mark
-  '((t :inherit secondary-selection))
-  "Face for highlighting marked item."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-good
-  '((((class color) (background light))
-     :box t
-     :background "light green"
-     :foreground "dark olive green")
-    (((class color) (background dark))
-     :box t
-     :background "light green"
-     :foreground "dark olive green"))
-  "Face for good bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-bad
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for bad bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-remote
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "OliveDrab4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey11"
-     :foreground "DarkSeaGreen2"))
-  "Face for remote branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-tags
-  '((((class color) (background light))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4")
-    (((class color) (background dark))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4"))
-  "Face for tag labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-patches
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for Stacked Git patches."
-  :group 'magit-faces)
-
-(defface magit-whitespace-warning-face
-  '((t :inherit trailing-whitespace))
-  "Face for highlighting whitespace errors in Magit diffs."
-  :group 'magit-faces)
-
-(defvar magit-custom-options '()
-  "List of custom options to pass to Git.
-Do not customize this (used in the `magit-key-mode' implementation).")
-
-(defvar magit-read-rev-history nil
-  "The history of inputs to `magit-read-rev'.")
-
-(defvar magit-buffer-internal nil
-  "Track associated *magit* buffers.
-Do not customize this (used in the `magit-log-edit-mode' implementation
-to switch back to the *magit* buffer associated with a given commit
-operation after commit).")
-
-(defvar magit-back-navigation-history nil
-  "History items that will be visited by successively going \"back\".")
-(make-variable-buffer-local 'magit-back-navigation-history)
-(put 'magit-back-navigation-history 'permanent-local t)
-
-(defvar magit-forward-navigation-history nil
-  "History items that will be visited by successively going \"forward\".")
-(make-variable-buffer-local 'magit-forward-navigation-history)
-(put 'magit-forward-navigation-history 'permanent-local t)
-
-(defvar magit-omit-untracked-dir-contents nil
-  "When non-nil magit will only list an untracked directory, not its contents.")
-
-(defvar magit-tmp-buffer-name " *magit-tmp*")
-
-(defface magit-log-head-label-local
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "LightSkyBlue4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey13"
-     :foreground "LightSkyBlue1"))
-  "Face for local branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-default
-  '((((class color) (background light))
-     :box t
-     :background "Grey50")
-    (((class color) (background dark))
-     :box t
-     :background "Grey50"))
-  "Face for unknown ref labels shown in log buffer."
-  :group 'magit-faces)
-
-(defvar magit-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map t)
-    (define-key map (kbd "n") 'magit-goto-next-section)
-    (define-key map (kbd "p") 'magit-goto-previous-section)
-    (define-key map (kbd "^") 'magit-goto-parent-section)
-    (define-key map (kbd "M-n") 'magit-goto-next-sibling-section)
-    (define-key map (kbd "M-p") 'magit-goto-previous-sibling-section)
-    (define-key map (kbd "TAB") 'magit-toggle-section)
-    (define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
-    (define-key map (kbd "1") 'magit-show-level-1)
-    (define-key map (kbd "2") 'magit-show-level-2)
-    (define-key map (kbd "3") 'magit-show-level-3)
-    (define-key map (kbd "4") 'magit-show-level-4)
-    (define-key map (kbd "M-1") 'magit-show-level-1-all)
-    (define-key map (kbd "M-2") 'magit-show-level-2-all)
-    (define-key map (kbd "M-3") 'magit-show-level-3-all)
-    (define-key map (kbd "M-4") 'magit-show-level-4-all)
-    (define-key map (kbd "M-h") 'magit-show-only-files)
-    (define-key map (kbd "M-H") 'magit-show-only-files-all)
-    (define-key map (kbd "M-s") 'magit-show-level-4)
-    (define-key map (kbd "M-S") 'magit-show-level-4-all)
-    (define-key map (kbd "g") 'magit-refresh)
-    (define-key map (kbd "G") 'magit-refresh-all)
-    (define-key map (kbd "?") 'magit-describe-item)
-    (define-key map (kbd "!") 'magit-key-mode-popup-running)
-    (define-key map (kbd ":") 'magit-git-command)
-    (define-key map (kbd "C-x 4 a") 'magit-add-change-log-entry-other-window)
-    (define-key map (kbd "L") 'magit-add-change-log-entry-no-option)
-    (define-key map (kbd "RET") 'magit-visit-item)
-    (define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
-    (define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
-    (define-key map (kbd "C-w") 'magit-copy-item-as-kill)
-    (define-key map (kbd "R") 'magit-rebase-step)
-    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
-    (define-key map (kbd "r") 'magit-key-mode-popup-rewriting)
-    (define-key map (kbd "P") 'magit-key-mode-popup-pushing)
-    (define-key map (kbd "f") 'magit-key-mode-popup-fetching)
-    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
-    (define-key map (kbd "M") 'magit-key-mode-popup-remoting)
-    (define-key map (kbd "B") 'magit-key-mode-popup-bisecting)
-    (define-key map (kbd "F") 'magit-key-mode-popup-pulling)
-    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
-    (define-key map (kbd "$") 'magit-display-process)
-    (define-key map (kbd "c") 'magit-log-edit)
-    (define-key map (kbd "E") 'magit-interactive-rebase)
-    (define-key map (kbd "e") 'magit-ediff)
-    (define-key map (kbd "w") 'magit-wazzup)
-    (define-key map (kbd "q") 'magit-quit-window)
-    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
-    (define-key map (kbd "x") 'magit-reset-head)
-    (define-key map (kbd "v") 'magit-revert-item)
-    (define-key map (kbd "a") 'magit-apply-item)
-    (define-key map (kbd "A") 'magit-cherry-pick-item)
-    (define-key map (kbd "d") 'magit-diff-working-tree)
-    (define-key map (kbd "D") 'magit-diff)
-    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
-    (define-key map (kbd "+") 'magit-diff-larger-hunks)
-    (define-key map (kbd "0") 'magit-diff-default-hunks)
-    (define-key map (kbd "h") 'magit-toggle-diff-refine-hunk)
-    map))
-
-(defvar magit-commit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-b") 'magit-show-commit-backward)
-    (define-key map (kbd "C-c C-f") 'magit-show-commit-forward)
-    map))
-
-(defvar magit-status-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "s") 'magit-stage-item)
-    (define-key map (kbd "S") 'magit-stage-all)
-    (define-key map (kbd "u") 'magit-unstage-item)
-    (define-key map (kbd "U") 'magit-unstage-all)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    (define-key map (kbd "I") 'magit-ignore-item-locally)
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "C") 'magit-add-log)
-    (define-key map (kbd "X") 'magit-reset-working-tree)
-    (define-key map (kbd "z") 'magit-key-mode-popup-stashing)
-    map))
-
-(eval-after-load 'dired-x
-  '(define-key magit-status-mode-map [remap dired-jump] 'magit-dired-jump))
-
-(defvar magit-log-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "e") 'magit-log-show-more-entries)
-    map))
-
-(defvar magit-wazzup-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    map))
-
-(defvar magit-branch-manager-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "c") 'magit-create-branch)
-    (define-key map (kbd "a") 'magit-add-remote)
-    (define-key map (kbd "r") 'magit-move-item)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "T") 'magit-change-what-branch-tracks)
-    map))
-
-(defvar magit-bug-report-url
-  "http://github.com/magit/magit/issues")
-
-(defconst magit-version "1.2.0"
-  "The version of Magit that you're using.")
-
-(defun magit-bug-report (str)
-  "Asks the user to submit a bug report about the error described in STR."
-;; XXX - should propose more information to be included.
-  (message (concat
-            "Unknown error: %s\n"
-            "Please, with as much information as possible, file a bug at\n"
-            "%s\n"
-            "You are using Magit version %s.")
-           str magit-bug-report-url magit-version))
-
-(defun magit-buffer-switch (buf)
-  (if (string-match "magit" (buffer-name))
-      (switch-to-buffer buf)
-    (pop-to-buffer buf)))
-
-;;; Macros
-
-(defmacro magit-with-refresh (&rest body)
-  (declare (indent 0))
-  `(magit-refresh-wrapper (lambda () ,@body)))
-
-;;; Git features
-
-(defvar magit-have-graph 'unset)
-(defvar magit-have-decorate 'unset)
-(defvar magit-have-abbrev 'unset)
-(make-variable-buffer-local 'magit-have-graph)
-(put 'magit-have-graph 'permanent-local t)
-(make-variable-buffer-local 'magit-have-decorate)
-(put 'magit-have-decorate 'permanent-local t)
-(make-variable-buffer-local 'magit-have-abbrev)
-(put 'magit-have-abbrev 'permanent-local t)
-
-(defun magit-configure-have-graph ()
-  (if (eq magit-have-graph 'unset)
-      (let ((res (magit-git-exit-code "log" "--graph" "--max-count=0")))
-        (setq magit-have-graph (eq res 0)))))
-
-(defun magit-configure-have-decorate ()
-  (if (eq magit-have-decorate 'unset)
-      (let ((res (magit-git-exit-code "log" "--decorate=full" "--max-count=0")))
-        (setq magit-have-decorate (eq res 0)))))
-
-(defun magit-configure-have-abbrev ()
-  (if (eq magit-have-abbrev 'unset)
-      (let ((res (magit-git-exit-code "log" "--no-abbrev-commit" "--max-count=0")))
-        (setq magit-have-abbrev (eq res 0)))))
-
-;;; Compatibilities
-
-(eval-and-compile
-  (defun magit-max-args-internal (function)
-    "Returns the maximum number of arguments accepted by FUNCTION."
-    (if (symbolp function)
-        (setq function (symbol-function function)))
-    (if (subrp function)
-        (let ((max (cdr (subr-arity function))))
-          (if (eq 'many max)
-              most-positive-fixnum
-            max))
-      (if (eq 'macro (car-safe function))
-          (setq function (cdr function)))
-      (let ((arglist (if (byte-code-function-p function)
-                         (aref function 0)
-                       (second function))))
-        (if (memq '&rest arglist)
-            most-positive-fixnum
-          (length (remq '&optional arglist))))))
-
-  (if (functionp 'start-file-process)
-      (defalias 'magit-start-process 'start-file-process)
-    (defalias 'magit-start-process 'start-process))
-
-  (unless (fboundp 'string-match-p)
-    (defun string-match-p (regexp string &optional start)
-      "Same as `string-match' except this function does not
-change the match data."
-      (let ((inhibit-changing-match-data t))
-        (string-match regexp string start))))
-
-  (if (fboundp 'with-silent-modifications)
-      (defalias 'magit-with-silent-modifications 'with-silent-modifications)
-    (defmacro magit-with-silent-modifications (&rest body)
-      "Execute body without changing `buffer-modified-p'. Also, do not
-record undo information."
-      `(set-buffer-modified-p
-        (prog1 (buffer-modified-p)
-          (let ((buffer-undo-list t)
-                before-change-functions
-                after-change-functions)
-            ,@body)))))
-
-  (if (>= (magit-max-args-internal 'delete-directory) 2)
-      (defalias 'magit-delete-directory 'delete-directory)
-    (defun magit-delete-directory (directory &optional recursive)
-      "Deletes a directory named DIRECTORY.  If RECURSIVE is non-nil,
-recursively delete all of DIRECTORY's contents as well.
-
-Does not follow symlinks."
-      (if (or (file-symlink-p directory)
-              (not (file-directory-p directory)))
-          (delete-file directory)
-        (if recursive
-            ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23
-            (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
-              (magit-delete-directory file recursive)))
-        (delete-directory directory)))))
-
-;;; Utilities
-
-(defun magit-set-variable-and-refresh (symbol value)
-  "Set SYMBOL to VALUE and call `magit-refresh-all'"
-  (set-default symbol value)
-  (magit-refresh-all))
-
-(defun magit-iswitchb-completing-read (prompt choices &optional predicate require-match
-                                              initial-input hist def)
-  "iswitchb-based completing-read almost-replacement."
-  (require 'iswitchb)
-  (let ((iswitchb-make-buflist-hook
-         (lambda ()
-           (setq iswitchb-temp-buflist (if (consp (first choices))
-                                           (mapcar #'car choices)
-                                         choices)))))
-    (iswitchb-read-buffer prompt (or initial-input def) require-match)))
-
-(defun magit-ido-completing-read (prompt choices &optional predicate require-match initial-input hist def)
-  "ido-based completing-read almost-replacement."
-  (require 'ido)
-  (let ((selected (ido-completing-read prompt (if (consp (first choices))
-                                                  (mapcar #'car choices)
-                                                choices)
-                                       predicate require-match initial-input hist def)))
-    (if (consp (first choices))
-        (or (cdr (assoc selected choices))
-            selected)
-      selected)))
-
-(defun magit-builtin-completing-read (prompt choices &optional predicate require-match
-                                             initial-input hist def)
-  "Magit wrapper for standard `completing-read' function."
-  (completing-read (if (and def (> (length prompt) 2)
-                            (string-equal ": " (substring prompt -2)))
-                       (format "%s (default %s): " (substring prompt 0 -2) def)
-                     prompt)
-                   choices predicate require-match initial-input hist def))
-
-(defun magit-completing-read (prompt choices &optional predicate require-match
-                                     initial-input hist def)
-  (funcall magit-completing-read-function prompt choices predicate require-match
-           initial-input hist def))
-
-(defun magit-use-region-p ()
-  (if (fboundp 'use-region-p)
-      (use-region-p)
-    (and transient-mark-mode mark-active)))
-
-(defun magit-goto-line (line)
-  "Like `goto-line' but doesn't set the mark."
-  (save-restriction
-    (widen)
-    (goto-char 1)
-    (forward-line (1- line))))
-
-(defun magit-trim-line (str)
-  (if (string= str "")
-      nil
-    (if (equal (elt str (- (length str) 1)) ?\n)
-        (substring str 0 (- (length str) 1))
-      str)))
-
-(defun magit-split-lines (str)
-  (if (string= str "")
-      nil
-    (let ((lines (nreverse (split-string str "\n"))))
-      (if (string= (car lines) "")
-          (setq lines (cdr lines)))
-      (nreverse lines))))
-
-(defun magit-git-insert (args)
-  (insert (magit-git-output args)))
-
-(defun magit-git-output (args)
-  (magit-cmd-output magit-git-executable (append magit-git-standard-options args)))
-
-(defun magit-cmd-insert (cmd args)
-  (insert (magit-cmd-output cmd args)))
-
-(defun magit-cmd-output (cmd args)
-  (let ((cmd-output (with-output-to-string
-                      (with-current-buffer standard-output
-                        (apply #'process-file
-                               cmd
-                               nil (list t nil) nil
-                               args)))))
-    (replace-regexp-in-string "\e\\[.*?m" "" cmd-output)))
-
-(defun magit-git-string (&rest args)
-  (magit-trim-line (magit-git-output args)))
-
-(defun magit-git-lines (&rest args)
-  (magit-split-lines (magit-git-output args)))
-
-(defun magit-git-exit-code (&rest args)
-  (apply #'process-file magit-git-executable nil nil nil
-         (append magit-git-standard-options args)))
-
-(defun magit-file-lines (file)
-  (when (file-exists-p file)
-    (with-temp-buffer
-      (insert-file-contents file)
-      (let ((rev (nreverse (split-string (buffer-string) "\n"))))
-        (nreverse (if (equal (car rev) "")
-                      (cdr rev)
-                    rev))))))
-
-(defun magit-write-file-lines (file lines)
-  (with-temp-buffer
-    (dolist (l lines)
-      (insert l "\n"))
-    (write-file file)))
-
-(defun magit-get (&rest keys)
-  "Return the value of Git config entry specified by KEYS."
-  (magit-git-string "config" (mapconcat 'identity keys ".")))
-
-(defun magit-get-all (&rest keys)
-  "Return all values of the Git config entry specified by KEYS."
-  (magit-git-lines "config" "--get-all" (mapconcat 'identity keys ".")))
-
-(defun magit-get-boolean (&rest keys)
-  "Return the boolean value of Git config entry specified by KEYS."
-  (equal (magit-git-string "config" "--bool" (mapconcat 'identity keys "."))
-         "true"))
-
-(defun magit-set (val &rest keys)
-  "Set Git config settings specified by KEYS to VAL."
-  (if val
-      (magit-git-string "config" (mapconcat 'identity keys ".") val)
-    (magit-git-string "config" "--unset" (mapconcat 'identity keys "."))))
-
-(defun magit-remove-conflicts (alist)
-  (let ((dict (make-hash-table :test 'equal))
-        (result nil))
-    (dolist (a alist)
-      (puthash (car a) (cons (cdr a) (gethash (car a) dict))
-               dict))
-    (maphash (lambda (key value)
-               (if (= (length value) 1)
-                   (push (cons key (car value)) result)
-                 (let ((sub (magit-remove-conflicts
-                             (mapcar (lambda (entry)
-                                       (let ((dir (directory-file-name
-                                                   (substring entry 0 (- (length key))))))
-                                         (cons (concat (file-name-nondirectory dir) "/" key)
-                                               entry)))
-                                     value))))
-                   (setq result (append result sub)))))
-             dict)
-    result))
-
-(defun magit-git-repo-p (dir)
-  (file-exists-p (expand-file-name ".git" dir)))
-
-(defun magit-git-dir ()
-  "Returns the .git directory for the current repository."
-  (concat (expand-file-name (magit-git-string "rev-parse" "--git-dir")) "/"))
-
-(defun magit-no-commit-p ()
-  "Return non-nil if there is no commit in the current git repository."
-  (not (magit-git-string
-        "rev-list" "HEAD" "--max-count=1")))
-
-(defun magit-list-repos* (dir level)
-  (if (magit-git-repo-p dir)
-      (list dir)
-    (apply #'append
-           (mapcar (lambda (entry)
-                     (unless (or (string= (substring entry -3) "/..")
-                                 (string= (substring entry -2) "/."))
-                       (magit-list-repos* entry (+ level 1))))
-                   (and (file-directory-p dir)
-                        (< level magit-repo-dirs-depth)
-                        (directory-files dir t nil t))))))
-
-(defun magit-list-repos (dirs)
-  (magit-remove-conflicts
-   (apply #'append
-          (mapcar (lambda (dir)
-                    (mapcar #'(lambda (repo)
-                                (cons (file-name-nondirectory repo)
-                                      repo))
-                            (magit-list-repos* dir 0)))
-                  dirs))))
-
-(defun magit-get-top-dir (cwd)
-  (let ((cwd (expand-file-name (file-truename cwd))))
-    (when (file-directory-p cwd)
-      (let* ((default-directory (file-name-as-directory cwd))
-             (cdup (magit-git-string "rev-parse" "--show-cdup")))
-        (when cdup
-          (file-name-as-directory (expand-file-name cdup cwd)))))))
-
-(defun magit-get-ref (ref)
-  (magit-git-string "symbolic-ref" "-q" ref))
-
-(defun magit-get-current-branch ()
-  (let* ((head (magit-get-ref "HEAD"))
-         (pos (and head (string-match "^refs/heads/" head))))
-    (if pos
-        (substring head 11)
-      nil)))
-
-(defun magit-get-remote (branch)
-  "Return the name of the remote for BRANCH.
-If branch is nil or it has no remote, but a remote named
-\"origin\" exists, return that. Otherwise, return nil."
-  (let ((remote (or (and branch (magit-get "branch" branch "remote"))
-                    (and (magit-get "remote" "origin" "url") "origin"))))
-    (if (string= remote "") nil remote)))
-
-(defun magit-get-current-remote ()
-  "Return the name of the remote for the current branch.
-If there is no current branch, or no remote for that branch,
-but a remote named \"origin\" is configured, return that.
-Otherwise, return nil."
-  (magit-get-remote (magit-get-current-branch)))
-
-(defun magit-ref-exists-p (ref)
-  (= (magit-git-exit-code "show-ref" "--verify" ref) 0))
-
-(defun magit-read-top-dir (dir)
-  "Ask the user for a Git repository.  The choices offered by
-auto-completion will be the repositories under `magit-repo-dirs'.
-If `magit-repo-dirs' is nil or DIR is non-nill, then
-autocompletion will offer directory names."
-  (if (and (not dir) magit-repo-dirs)
-      (let* ((repos (magit-list-repos magit-repo-dirs))
-             (reply (magit-completing-read "Git repository: " repos)))
-        (file-name-as-directory
-         (or (cdr (assoc reply repos))
-             (if (file-directory-p reply)
-                 (expand-file-name reply)
-               (error "Not a repository or a directory: %s" reply)))))
-    (file-name-as-directory
-     (read-directory-name "Git repository: "
-                          (or (magit-get-top-dir default-directory)
-                              default-directory)))))
-
-(defun magit-rev-parse (ref)
-  "Return the SHA hash for REF."
-  (magit-git-string "rev-parse" ref))
-
-(defun magit-ref-ambiguous-p (ref)
-  "Return whether or not REF is ambiguous."
-  ;; If REF is ambiguous, rev-parse just prints errors,
-  ;; so magit-git-string returns nil.
-  (not (magit-git-string "rev-parse" "--abbrev-ref" ref)))
-
-(defun magit-name-rev (rev &optional no-trim)
-  "Return a human-readable name for REV.
-Unlike git name-rev, this will remove tags/ and remotes/ prefixes
-if that can be done unambiguously (unless optional arg NO-TRIM is
-non-nil).  In addition, it will filter out revs involving HEAD."
-  (when rev
-    (let ((name (magit-git-string "name-rev" "--no-undefined" "--name-only" rev)))
-      ;; There doesn't seem to be a way of filtering HEAD out from name-rev,
-      ;; so we have to do it manually.
-      ;; HEAD-based names are too transient to allow.
-      (when (and (stringp name)
-                 (string-match "^\\(.*\\<HEAD\\)\\([~^].*\\|$\\)" name))
-        (let ((head-ref (match-string 1 name))
-              (modifier (match-string 2 name)))
-          ;; Sometimes when name-rev gives a HEAD-based name,
-          ;; rev-parse will give an actual branch or remote name.
-          (setq name (concat (magit-git-string "rev-parse" "--abbrev-ref" head-ref)
-                             modifier))
-          ;; If rev-parse doesn't give us what we want, just use the SHA.
-          (when (or (null name) (string-match-p "\\<HEAD\\>" name))
-            (setq name (magit-rev-parse rev)))))
-      (setq rev (or name rev))
-      (when (string-match "^\\(?:tags\\|remotes\\)/\\(.*\\)" rev)
-        (let ((plain-name (match-string 1 rev)))
-          (unless (or no-trim (magit-ref-ambiguous-p plain-name))
-            (setq rev plain-name))))
-      rev)))
-
-(defun magit-highlight-line-whitespace ()
-  (when (and magit-highlight-whitespace
-             (or (derived-mode-p 'magit-status-mode)
-                 (not (eq magit-highlight-whitespace 'status))))
-    (if (and magit-highlight-trailing-whitespace
-             (looking-at "^[-+].*?\\([ \t]+\\)$"))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))
-    (if (or (and (eq magit-current-indentation 'tabs)
-                 (looking-at "^[-+]\\( *\t[ \t]*\\)"))
-            (and (integerp magit-current-indentation)
-                 (looking-at (format "^[-+]\\([ \t]* \\{%s,\\}[ \t]*\\)"
-                                     magit-current-indentation))))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))))
-
-(defun magit-put-line-property (prop val)
-  (put-text-property (line-beginning-position) (line-beginning-position 2)
-                     prop val))
-
-(defun magit-format-commit (commit format)
-  (magit-git-string "log" "--max-count=1"
-                    (concat "--pretty=format:" format)
-                    commit))
-
-(defun magit-current-line ()
-  (buffer-substring-no-properties (line-beginning-position)
-                                  (line-end-position)))
-
-(defun magit-insert-region (beg end buf)
-  (let ((text (buffer-substring-no-properties beg end)))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-insert-current-line (buf)
-  (let ((text (buffer-substring-no-properties
-               (line-beginning-position) (line-beginning-position 2))))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-file-uptodate-p (file)
-  (eq (magit-git-exit-code "diff" "--quiet" "--" file) 0))
-
-(defun magit-anything-staged-p ()
-  (not (eq (magit-git-exit-code "diff" "--quiet" "--cached") 0)))
-
-(defun magit-everything-clean-p ()
-  (and (not (magit-anything-staged-p))
-       (eq (magit-git-exit-code "diff" "--quiet") 0)))
-
-(defun magit-commit-parents (commit)
-  (cdr (split-string (magit-git-string "rev-list" "-1" "--parents" commit))))
-
-;; XXX - let the user choose the parent
-
-(defun magit-choose-parent-id (commit op)
-  (let* ((parents (magit-commit-parents commit)))
-    (if (> (length parents) 1)
-        (error "Can't %s merge commits" op)
-      nil)))
-
-;;; Revisions and ranges
-
-(defvar magit-current-range nil
-  "The range described by the current buffer.
-This is only non-nil in diff and log buffers.
-
-This has three possible (non-nil) forms.  If it's a string REF or
-a singleton list (REF), then the range is from REF to the current
-working directory state (or HEAD in a log buffer).  If it's a
-pair (START . END), then the range is START..END.")
-(make-variable-buffer-local 'magit-current-range)
-
-(defun magit-list-interesting-refs (&optional uninteresting)
-  "Return interesting references as given by `git show-ref'.
-Removes references matching UNINTERESTING from the
-results. UNINTERESTING can be either a function taking a single
-argument or a list of strings used as regexps."
-  (let ((refs ()))
-    (dolist (line (magit-git-lines "show-ref"))
-      (if (string-match "[^ ]+ +\\(.*\\)" line)
-          (let ((ref (match-string 1 line)))
-            (cond ((and (functionp uninteresting)
-                        (funcall uninteresting ref)))
-                  ((and (not (functionp uninteresting))
-                        (loop for i in uninteresting thereis (string-match i ref))))
-                  (t
-                   (let ((fmt-ref (magit-format-ref ref)))
-                     (when fmt-ref
-                       (push (cons fmt-ref
-                                   (replace-regexp-in-string "^refs/heads/"
-                                                             "" ref))
-                             refs))))))))
-    (nreverse refs)))
-
-(defun magit-format-ref (ref)
-  "Convert fully-specified ref REF into its displayable form
-according to `magit-remote-ref-format'"
-  (cond
-   ((null ref)
-    nil)
-   ((string-match "refs/heads/\\(.*\\)" ref)
-    (match-string 1 ref))
-   ((string-match "refs/tags/\\(.*\\)" ref)
-    (format (if (eq magit-remote-ref-format 'branch-then-remote)
-                "%s (tag)"
-              "%s")
-            (match-string 1 ref)))
-   ((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref)
-    (if (eq magit-remote-ref-format 'branch-then-remote)
-        (format "%s (%s)"
-                (match-string 2 ref)
-                (match-string 1 ref))
-      (format "%s/%s"
-              (match-string 1 ref)
-              (match-string 2 ref))))))
-
-(defun magit-tree-contents (treeish)
-  "Returns a list of all files under TREEISH.  TREEISH can be a tree,
-a commit, or any reference to one of those."
-  (let ((return-value nil))
-    (with-temp-buffer
-      (magit-git-insert (list "ls-tree" "-r" treeish))
-      (if (eql 0 (buffer-size))
-          (error "%s is not a commit or tree." treeish))
-      (goto-char (point-min))
-      (while (search-forward-regexp "\t\\(.*\\)" nil 'noerror)
-        (push (match-string 1) return-value)))
-    return-value))
-
-(defvar magit-uninteresting-refs '("refs/remotes/\\([^/]+\\)/HEAD$" "refs/stash"))
-
-(defun magit-read-file-from-rev (revision)
-  (magit-completing-read (format "Retrieve file from %s: " revision)
-                         (magit-tree-contents revision)
-                         nil
-                         'require-match
-                         nil
-                         'magit-read-file-hist
-                         (if buffer-file-name
-                             (let ((topdir-length (length (magit-get-top-dir default-directory))))
-                               (substring (buffer-file-name) topdir-length)))))
-
-(defun magit-read-rev (prompt &optional default uninteresting)
-  (let* ((interesting-refs (magit-list-interesting-refs
-                            (or uninteresting magit-uninteresting-refs)))
-         (reply (magit-completing-read (concat prompt ": ") interesting-refs
-                                       nil nil nil 'magit-read-rev-history default))
-         (rev (or (cdr (assoc reply interesting-refs)) reply)))
-    (if (string= rev "")
-        nil
-      rev)))
-
-(defun magit-read-rev-range (op &optional def-beg def-end)
-  (let ((beg (magit-read-rev (format "%s start" op)
-                             def-beg)))
-    (if (not beg)
-        nil
-      (save-match-data
-        (if (string-match "^\\(.+\\)\\.\\.\\(.+\\)$" beg)
-            (cons (match-string 1 beg) (match-string 2 beg))
-          (let ((end (magit-read-rev (format "%s end" op) def-end)))
-            (cons beg end)))))))
-
-(defun magit-rev-to-git (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      (magit-marked-commit)
-    rev))
-
-(defun magit-rev-range-to-git (range)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      range
-    (if (cdr range)
-        (format "%s..%s"
-                (magit-rev-to-git (car range))
-                (magit-rev-to-git (cdr range)))
-      (format "%s" (magit-rev-to-git (car range))))))
-
-(defun magit-rev-describe (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      "mark"
-    (magit-name-rev rev)))
-
-(defun magit-rev-range-describe (range things)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      (format "%s in %s" things range)
-    (if (cdr range)
-        (format "%s from %s to %s" things
-                (magit-rev-describe (car range))
-                (magit-rev-describe (cdr range)))
-      (format "%s at %s" things (magit-rev-describe (car range))))))
-
-(defun magit-default-rev (&optional no-trim)
-  (or (magit-name-rev (magit-commit-at-point t) no-trim)
-      (let ((branch (magit-guess-branch)))
-        (if branch
-            (if (string-match "^refs/\\(.*\\)" branch)
-                (match-string 1 branch)
-              branch)))))
-
-(defun magit-read-remote (&optional prompt def)
-  "Read the name of a remote.
-PROMPT is used as the prompt, and defaults to \"Remote\".
-DEF is the default value."
-  (let* ((prompt (or prompt "Remote"))
-         (def (or def (magit-guess-remote)))
-         (remotes (magit-git-lines "remote"))
-
-         (reply (magit-completing-read (concat prompt ": ") remotes
-                                       nil nil nil nil def)))
-    (if (string= reply "") nil reply)))
-
-(defun magit-read-remote-branch (remote &optional prompt default)
-  (let* ((prompt (or prompt (format "Remote branch (in %s)" remote)))
-         (branches (delete nil
-                           (mapcar
-                            (lambda (b)
-                              (and (not (string-match " -> " b))
-                                   (string-match (format "^ *%s/\\(.*\\)$"
-                                                         (regexp-quote remote)) b)
-                                   (match-string 1 b)))
-                            (magit-git-lines "branch" "-r"))))
-         (reply (magit-completing-read (concat prompt ": ") branches
-                                       nil nil nil nil default)))
-    (if (string= reply "") nil reply)))
-
-;;; Sections
-
-;; A buffer in magit-mode is organized into hierarchical sections.
-;; These sections are used for navigation and for hiding parts of the
-;; buffer.
-;;
-;; Most sections also represent the objects that Magit works with,
-;; such as files, diffs, hunks, commits, etc.  The 'type' of a section
-;; identifies what kind of object it represents (if any), and the
-;; parent and grand-parent, etc provide the context.
-
-(defstruct magit-section
-  parent title beginning end children hidden type info
-  needs-refresh-on-show)
-
-(defvar magit-top-section nil
-  "The top section of the current buffer.")
-(make-variable-buffer-local 'magit-top-section)
-(put 'magit-top-section 'permanent-local t)
-
-(defvar magit-old-top-section nil)
-
-(defvar magit-section-hidden-default nil)
-
-(defun magit-new-section (title type)
-  "Create a new section with title TITLE and type TYPE in current buffer.
-
-If not `magit-top-section' exist, the new section will be the new top-section
-otherwise, the new-section will be a child of the current top-section.
-
-If TYPE is nil, the section won't be highlighted."
-  (let* ((s (make-magit-section :parent magit-top-section
-                                :title title
-                                :type type
-                                :hidden magit-section-hidden-default))
-         (old (and magit-old-top-section
-                   (magit-find-section (magit-section-path s)
-                                       magit-old-top-section))))
-    (if magit-top-section
-        (push s (magit-section-children magit-top-section))
-      (setq magit-top-section s))
-    (if old
-        (setf (magit-section-hidden s) (magit-section-hidden old)))
-    s))
-
-(defun magit-cancel-section (section)
-  "Delete the section SECTION."
-  (delete-region (magit-section-beginning section)
-                 (magit-section-end section))
-  (let ((parent (magit-section-parent section)))
-    (if parent
-        (setf (magit-section-children parent)
-              (delq section (magit-section-children parent)))
-      (setq magit-top-section nil))))
-
-(defmacro magit-with-section (title type &rest body)
-  "Create a new section of title TITLE and type TYPE and evaluate BODY there.
-
-Sections created inside BODY will become children of the new
-section. BODY must leave point at the end of the created section.
-
-If TYPE is nil, the section won't be highlighted."
-  (declare (indent 2))
-  (let ((s (make-symbol "*section*")))
-    `(let* ((,s (magit-new-section ,title ,type))
-            (magit-top-section ,s))
-       (setf (magit-section-beginning ,s) (point))
-       ,@body
-       (setf (magit-section-end ,s) (point))
-       (setf (magit-section-children ,s)
-             (nreverse (magit-section-children ,s)))
-       ,s)))
-
-(defun magit-set-section (title type start end)
-  "Create a new section of title TITLE and type TYPE with specified start and
-end positions."
-  (let ((section (magit-new-section title type)))
-    (setf (magit-section-beginning section) start)
-    (setf (magit-section-end section) end)
-    section))
-
-(defun magit-set-section-info (info &optional section)
-  (setf (magit-section-info (or section magit-top-section)) info))
-
-(defun magit-set-section-needs-refresh-on-show (flag &optional section)
-  (setf (magit-section-needs-refresh-on-show
-         (or section magit-top-section))
-        flag))
-
-(defmacro magit-create-buffer-sections (&rest body)
-  "Empty current buffer of text and Magit's sections, and then evaluate BODY."
-  (declare (indent 0))
-  `(let ((inhibit-read-only t))
-     (erase-buffer)
-     (let ((magit-old-top-section magit-top-section))
-       (setq magit-top-section nil)
-       ,@body
-       (when (null magit-top-section)
-         (magit-with-section 'top nil
-           (insert "(empty)\n")))
-       (magit-propertize-section magit-top-section)
-       (magit-section-set-hidden magit-top-section
-                                 (magit-section-hidden magit-top-section)))))
-
-(defun magit-propertize-section (section)
-  "Add text-property needed for SECTION."
-  (put-text-property (magit-section-beginning section)
-                     (magit-section-end section)
-                     'magit-section section)
-  (dolist (s (magit-section-children section))
-    (magit-propertize-section s)))
-
-(defun magit-find-section (path top)
-  "Find the section at the path PATH in subsection of section TOP."
-  (if (null path)
-      top
-    (let ((secs (magit-section-children top)))
-      (while (and secs (not (equal (car path)
-                                   (magit-section-title (car secs)))))
-        (setq secs (cdr secs)))
-      (and (car secs)
-           (magit-find-section (cdr path) (car secs))))))
-
-(defun magit-section-path (section)
-  "Return the path of SECTION."
-  (if (not (magit-section-parent section))
-      '()
-    (append (magit-section-path (magit-section-parent section))
-            (list (magit-section-title section)))))
-
-(defun magit-find-section-after (pos)
-  "Find the first section that begins after POS."
-  (magit-find-section-after* pos (list magit-top-section)))
-
-(defun magit-find-section-after* (pos secs)
-  "Find the first section that begins after POS in the list SECS
-\(including children of sections in SECS)."
-  (while (and secs
-              (<= (magit-section-beginning (car secs)) pos))
-    (setq secs (if (magit-section-hidden (car secs))
-                   (cdr secs)
-                 (append (magit-section-children (car secs))
-                         (cdr secs)))))
-  (car secs))
-
-(defun magit-find-section-before (pos)
-  "Return the last section that begins before POS."
-  (let ((section (magit-find-section-at pos)))
-    (do* ((current (or (magit-section-parent section)
-                       section)
-                   next)
-          (next (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))
-                (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))))
-        ((null next) current))))
-
-(defun magit-find-section-before* (pos secs)
-  "Find the last section that begins before POS in the list SECS."
-  (let ((prev nil))
-    (while (and secs
-                (< (magit-section-beginning (car secs)) pos))
-      (setq prev (car secs))
-      (setq secs (cdr secs)))
-    prev))
-
-(defun magit-current-section ()
-  "Return the Magit section at point."
-  (magit-find-section-at (point)))
-
-(defun magit-find-section-at (pos)
-  "Return the Magit section at POS."
-  (or (get-text-property pos 'magit-section)
-      magit-top-section))
-
-(defun magit-insert-section (section-title-and-type
-                             buffer-title washer cmd &rest args)
-  "Run CMD and put its result in a new section.
-
-SECTION-TITLE-AND-TYPE is either a string that is the title of the section
-or (TITLE . TYPE) where TITLE is the title of the section and TYPE is its type.
-
-If there is no type, or if type is nil, the section won't be highlighted.
-
-BUFFER-TITLE is the inserted title of the section
-
-WASHER is a function that will be run after CMD.
-The buffer will be narrowed to the inserted text.
-It should add sectioning as needed for Magit interaction.
-
-CMD is an external command that will be run with ARGS as arguments."
-  (let* ((body-beg nil)
-         (section-title (if (consp section-title-and-type)
-                            (car section-title-and-type)
-                          section-title-and-type))
-         (section-type (if (consp section-title-and-type)
-                           (cdr section-title-and-type)
-                         nil))
-         (section
-          (magit-with-section section-title section-type
-            (if buffer-title
-                (insert (propertize buffer-title 'face 'magit-section-title)
-                        "\n"))
-            (setq body-beg (point))
-            (magit-cmd-insert cmd args)
-            (if (not (eq (char-before) ?\n))
-                (insert "\n"))
-            (if washer
-                (save-restriction
-                  (narrow-to-region body-beg (point))
-                  (goto-char (point-min))
-                  (funcall washer)
-                  (goto-char (point-max)))))))
-    (if (= body-beg (point))
-        (magit-cancel-section section)
-      (insert "\n"))
-    section))
-
-(defun magit-git-section (section-title-and-type
-                          buffer-title washer &rest args)
-  "Run git and put its result in a new section.
-
-see `magit-insert-section' for meaning of the arguments"
-  (apply #'magit-insert-section
-         section-title-and-type
-         buffer-title
-         washer
-         magit-git-executable
-         (append magit-git-standard-options args)))
-
-(defun magit-goto-next-section ()
-  "Go to the next section."
-  (interactive)
-  (let ((next (magit-find-section-after (point))))
-    (if next
-        (magit-goto-section next)
-      (message "No next section"))))
-
-(defun magit-goto-previous-section ()
-  "Go to the previous section."
-  (interactive)
-  (if (eq (point) 1)
-      (message "No previous section")
-    (magit-goto-section (magit-find-section-before (point)))))
-
-(defun magit-goto-parent-section ()
-  "Go to the parent section."
-  (interactive)
-  (let ((parent (magit-section-parent (magit-current-section))))
-    (when parent
-      (goto-char (magit-section-beginning parent)))))
-
-(defun magit-goto-next-sibling-section ()
-  "Go to the next sibling section."
-  (interactive)
-  (let* ((initial (point))
-         (section (magit-current-section))
-         (end (- (magit-section-end section) 1))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (next-sibling (magit-find-section-after* end siblings)))
-    (if next-sibling
-        (magit-goto-section next-sibling)
-      (magit-goto-next-section))))
-
-(defun magit-goto-previous-sibling-section ()
-  "Go to the previous sibling section."
-  (interactive)
-  (let* ((section (magit-current-section))
-         (beginning (magit-section-beginning section))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (previous-sibling (magit-find-section-before* beginning siblings)))
-    (if previous-sibling
-        (magit-goto-section previous-sibling)
-      (magit-goto-parent-section))))
-
-(defun magit-goto-section (section)
-  (goto-char (magit-section-beginning section))
-  (cond
-   ((and magit-log-auto-more
-         (eq (magit-section-type section) 'longer))
-    (magit-log-show-more-entries)
-    (forward-line -1)
-    (magit-goto-next-section))
-   ((and (eq (magit-section-type section) 'commit)
-         (derived-mode-p 'magit-log-mode))
-    (magit-show-commit section))))
-
-(defun magit-goto-section-at-path (path)
-  "Go to the section described by PATH."
-  (let ((sec (magit-find-section path magit-top-section)))
-    (if sec
-        (goto-char (magit-section-beginning sec))
-      (message "No such section"))))
-
-(defun magit-for-all-sections (func &optional top)
-  "Run FUNC on TOP and recursively on all its children.
-
-Default value for TOP is `magit-top-section'"
-  (let ((section (or top magit-top-section)))
-    (when section
-      (funcall func section)
-      (dolist (c (magit-section-children section))
-        (magit-for-all-sections func c)))))
-
-(defun magit-section-set-hidden (section hidden)
-  "Hide SECTION if HIDDEN is not nil, show it otherwise."
-  (setf (magit-section-hidden section) hidden)
-  (if (and (not hidden)
-           (magit-section-needs-refresh-on-show section))
-      (magit-refresh)
-    (let ((inhibit-read-only t)
-          (beg (save-excursion
-                 (goto-char (magit-section-beginning section))
-                 (forward-line)
-                 (point)))
-          (end (magit-section-end section)))
-      (if (< beg end)
-          (put-text-property beg end 'invisible hidden)))
-    (if (not hidden)
-        (dolist (c (magit-section-children section))
-          (magit-section-set-hidden c (magit-section-hidden c))))))
-
-(defun magit-section-any-hidden (section)
-  "Return true if SECTION or any of its children is hidden."
-  (or (magit-section-hidden section)
-      (let ((kids (magit-section-children section)))
-        (while (and kids (not (magit-section-any-hidden (car kids))))
-          (setq kids (cdr kids)))
-        kids)))
-
-(defun magit-section-collapse (section)
-  "Show SECTION and hide all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) t))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand (section)
-  "Show SECTION and all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand-all-aux (section)
-  "Show recursively all SECTION's children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil)
-    (magit-section-expand-all-aux c)))
-
-(defun magit-section-expand-all (section)
-  "Show SECTION and all its children."
-  (magit-section-expand-all-aux section)
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-hideshow (flag-or-func)
-  "Show or hide current section depending on FLAG-OR-FUNC.
-
-If FLAG-OR-FUNC is a function, it will be ran on current section
-IF FLAG-OR-FUNC is a Boolean value, the section will be hidden if its true, shown otherwise"
-  (let ((section (magit-current-section)))
-    (when (magit-section-parent section)
-      (goto-char (magit-section-beginning section))
-      (if (functionp flag-or-func)
-          (funcall flag-or-func section)
-        (magit-section-set-hidden section flag-or-func)))))
-
-(defun magit-show-section ()
-  "Show current section."
-  (interactive)
-  (magit-section-hideshow nil))
-
-(defun magit-hide-section ()
-  "Hide current section."
-  (interactive)
-  (magit-section-hideshow t))
-
-(defun magit-collapse-section ()
-  "Hide all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-collapse))
-
-(defun magit-expand-section ()
-  "Show all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-expand))
-
-(defun magit-toggle-file-section ()
-  "Like `magit-toggle-section' but toggle at file granularity."
-  (interactive)
-  (when (eq 'hunk (first (magit-section-context-type (magit-current-section))))
-    (magit-goto-parent-section))
-  (magit-toggle-section))
-
-(defun magit-toggle-section ()
-  "Toggle hidden status of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (magit-section-set-hidden s (not (magit-section-hidden s))))))
-
-(defun magit-expand-collapse-section ()
-  "Toggle hidden status of subsections of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-any-hidden s)
-            (magit-section-expand-all s))
-           (t
-            (magit-section-collapse s))))))
-
-(defun magit-cycle-section ()
-  "Cycle between expanded, hidden and collapsed state for current section.
-
-Hidden: only the first line of the section is shown
-Collapsed: only the first line of the subsection is shown
-Expanded: everything is shown."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-hidden s)
-            (magit-section-collapse s))
-           ((notany #'magit-section-hidden (magit-section-children s))
-            (magit-section-set-hidden s t))
-           (t
-            (magit-section-expand s))))))
-
-(defun magit-section-lineage (s)
-  "Return list of parent, grand-parents... for section S."
-  (when s
-    (cons s (magit-section-lineage (magit-section-parent s)))))
-
-(defun magit-section-show-level (section level threshold path)
-  (magit-section-set-hidden section (>= level threshold))
-  (when (and (< level threshold)
-             (not (magit-no-commit-p)))
-    (if path
-        (magit-section-show-level (car path) (1+ level) threshold (cdr path))
-      (dolist (c (magit-section-children section))
-        (magit-section-show-level c (1+ level) threshold nil)))))
-
-(defun magit-show-level (level all)
-  "Show section whose level is less than LEVEL, hide the others.
-If ALL is non nil, do this in all sections,
-otherwise do it only on ancestors and descendants of current section."
-  (magit-with-refresh
-    (if all
-        (magit-section-show-level magit-top-section 0 level nil)
-      (let ((path (reverse (magit-section-lineage (magit-current-section)))))
-        (magit-section-show-level (car path) 0 level (cdr path))))))
-
-(defun magit-show-only-files ()
-  "Show section that are files, but not there subsection.
-
-Do this in on ancestors and descendants of current section."
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2)
-    (call-interactively 'magit-show-level-1)))
-
-(defun magit-show-only-files-all ()
-  "Show section that are files, but not there subsection.
-
-Do this for all sections"
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2-all)
-    (call-interactively 'magit-show-level-1-all)))
-
-(defmacro magit-define-level-shower-1 (level all)
-  "Define an interactive function to show function of level LEVEL.
-
-If ALL is non nil, this function will affect all section,
-otherwise it will affect only ancestors and descendants of current section."
-  (let ((fun (intern (format "magit-show-level-%s%s"
-                             level (if all "-all" ""))))
-        (doc (format "Show sections on level %s." level)))
-    `(defun ,fun ()
-       ,doc
-       (interactive)
-       (magit-show-level ,level ,all))))
-
-(defmacro magit-define-level-shower (level)
-  "Define two interactive function to show function of level LEVEL.
-one for all, one for current lineage."
-  `(progn
-     (magit-define-level-shower-1 ,level nil)
-     (magit-define-level-shower-1 ,level t)))
-
-(defmacro magit-define-section-jumper (sym title)
-  "Define an interactive function to go to section SYM.
-
-TITLE is the displayed title of the section."
-  (let ((fun (intern (format "magit-jump-to-%s" sym)))
-        (doc (format "Jump to section `%s'." title)))
-    `(progn
-       (defun ,fun ()
-         ,doc
-         (interactive)
-         (magit-goto-section-at-path '(,sym)))
-       (put ',fun 'definition-name ',sym))))
-
-(defmacro magit-define-inserter (sym arglist &rest body)
-  (declare (indent defun))
-  (let ((fun (intern (format "magit-insert-%s" sym)))
-        (before (intern (format "magit-before-insert-%s-hook" sym)))
-        (after (intern (format "magit-after-insert-%s-hook" sym)))
-        (doc (format "Insert items for `%s'." sym)))
-    `(progn
-       (defvar ,before nil)
-       (defvar ,after nil)
-       (defun ,fun ,arglist
-         ,doc
-         (run-hooks ',before)
-         ,@body
-         (run-hooks ',after))
-       (put ',before 'definition-name ',sym)
-       (put ',after 'definition-name ',sym)
-       (put ',fun 'definition-name ',sym))))
-
-(defvar magit-highlighted-section nil)
-
-(defun magit-refine-section (section)
-  "Apply temporary refinements to the display of SECTION.
-Refinements can be undone with `magit-unrefine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; Refine the current hunk to show fine details, using
-           ;; diff-mode machinery.
-           (save-excursion
-             (goto-char (magit-section-beginning magit-highlighted-section))
-             (diff-refine-hunk))))))
-
-(defun magit-unrefine-section (section)
-  "Remove refinements to the display of SECTION done by `magit-refine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; XXX this should be in some diff-mode function, like
-           ;; `diff-unrefine-hunk'
-           (remove-overlays (magit-section-beginning section)
-                            (magit-section-end section)
-                            'diff-mode 'fine)))))
-
-(defvar magit-highlight-overlay nil)
-
-(defun magit-highlight-section ()
-  "Highlight current section if it has a type."
-  (let ((section (magit-current-section)))
-    (when (not (eq section magit-highlighted-section))
-      (when magit-highlighted-section
-        ;; remove any refinement from previous hunk
-        (magit-unrefine-section magit-highlighted-section))
-      (setq magit-highlighted-section section)
-      (if (not magit-highlight-overlay)
-          (let ((ov (make-overlay 1 1)))
-            (overlay-put ov 'face 'magit-item-highlight)
-            (setq magit-highlight-overlay ov)))
-      (if (and section (magit-section-type section))
-          (progn
-            (magit-refine-section section)
-            (move-overlay magit-highlight-overlay
-                          (magit-section-beginning section)
-                          (magit-section-end section)
-                          (current-buffer)))
-        (delete-overlay magit-highlight-overlay)))))
-
-(defun magit-section-context-type (section)
-  (if (null section)
-      '()
-    (let ((c (or (magit-section-type section)
-                 (if (symbolp (magit-section-title section))
-                     (magit-section-title section)))))
-      (if c
-          (cons c (magit-section-context-type
-                   (magit-section-parent section)))
-        '()))))
-
-(defun magit-prefix-p (prefix list)
-  "Returns non-nil if PREFIX is a prefix of LIST.  PREFIX and LIST should both be
-lists.
-
-If the car of PREFIX is the symbol '*, then return non-nil if the cdr of PREFIX
-is a sublist of LIST (as if '* matched zero or more arbitrary elements of LIST)"
-  ;;; Very schemish...
-  (or (null prefix)
-      (if (eq (car prefix) '*)
-          (or (magit-prefix-p (cdr prefix) list)
-              (and (not (null list))
-                   (magit-prefix-p prefix (cdr list))))
-        (and (not (null list))
-             (equal (car prefix) (car list))
-             (magit-prefix-p (cdr prefix) (cdr list))))))
-
-(defmacro magit-section-case (head &rest clauses)
-  "Make different action depending of current section.
-
-HEAD is (SECTION INFO &optional OPNAME),
-  SECTION will be bind to the current section,
-  INFO will be bind to the info's of the current section,
-  OPNAME is a string that will be used to describe current action,
-
-CLAUSES is a list of CLAUSE, each clause is (SECTION-TYPE &BODY)
-where SECTION-TYPE describe section where BODY will be run.
-
-This returns non-nil if some section matches. If the
-corresponding body return a non-nil value, it is returned,
-otherwise it returns t.
-
-If no section matches, this returns nil if no OPNAME was given
-and throws an error otherwise."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (make-symbol "*type*"))
-        (context (make-symbol "*context*"))
-        (opname (caddr head)))
-    `(let* ((,section (magit-current-section))
-            (,info (and ,section (magit-section-info ,section)))
-            (,type (and ,section (magit-section-type ,section)))
-            (,context (magit-section-context-type ,section)))
-       (cond ,@(mapcar (lambda (clause)
-                         (if (eq (car clause) t)
-                             `(t (or (progn ,@(cdr clause))
-                                     t))
-                           (let ((prefix (reverse (car clause)))
-                                 (body (cdr clause)))
-                             `((magit-prefix-p ',prefix ,context)
-                               (or (progn ,@body)
-                                   t)))))
-                       clauses)
-             ,@(when opname
-                 `(((run-hook-with-args-until-success
-                     ',(intern (format "magit-%s-action-hook" opname))))
-                   ((not ,type)
-                    (error "Nothing to %s here" ,opname))
-                   (t
-                    (error "Can't %s a %s"
-                           ,opname
-                           (or (get ,type 'magit-description)
-                               ,type)))))))))
-
-(defmacro magit-section-action (head &rest clauses)
-  (declare (indent 1))
-  `(magit-with-refresh
-     (magit-section-case ,head ,@clauses)))
-
-(defmacro magit-add-action (head &rest clauses)
-  "Add additional actions to a pre-existing operator.
-The syntax is identical to `magit-section-case', except that
-OPNAME is mandatory and specifies the operation to which to add
-the actions."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (caddr head)))
-    `(add-hook ',(intern (format "magit-%s-action-hook" type))
-               (lambda ()
-                 ,(macroexpand
-                   ;; Don't pass in the opname so we don't recursively
-                   ;; run the hook again, and so we don't throw an
-                   ;; error if no action matches.
-                   `(magit-section-case (,section ,info)
-                      ,@clauses))))))
-
-(defun magit-wash-sequence (func)
-  "Run FUNC until end of buffer is reached.
-
-FUNC should leave point at the end of the modified region"
-  (while (and (not (eobp))
-              (funcall func))))
-
-(defmacro magit-define-command (sym arglist &rest body)
-  "Macro to define a magit command.
-It will define the magit-SYM function having ARGLIST as argument.
-It will also define the magit-SYM-command-hook variable.
-
-The defined function will call the function in the hook in
-order until one return non nil. If they all return nil then body will be called.
-
-It is used to define hookable magit command: command defined by this
-function can be enriched by magit extension like magit-topgit and magit-svn"
-  (declare (indent defun)
-           (debug (&define name lambda-list
-                           [&optional stringp]        ; Match the doc string, if present.
-                           [&optional ("interactive" interactive)]
-                           def-body)))
-  (let ((fun (intern (format "magit-%s" sym)))
-        (hook (intern (format "magit-%s-command-hook" sym)))
-        (doc (format "Command for `%s'." sym))
-        (inter nil)
-        (instr body))
-    (when (stringp (car body))
-      (setq doc (car body)
-            instr (cdr body)))
-    (let ((form (car instr)))
-      (when (eq (car form) 'interactive)
-        (setq inter form
-              instr (cdr instr))))
-    `(progn
-       (defvar ,hook nil)
-       (defun ,fun ,arglist
-         ,doc
-         ,inter
-         (or (run-hook-with-args-until-success
-              ',hook ,@(remq '&optional (remq '&rest arglist)))
-             ,@instr))
-       (put ',fun 'definition-name ',sym)
-       (put ',hook 'definition-name ',sym))))
-
-;;; Running commands
-
-(defun magit-set-mode-line-process (str)
-  (let ((pr (if str (concat " " str) "")))
-    (save-excursion
-      (magit-for-all-buffers (lambda ()
-                               (setq mode-line-process pr))))))
-
-(defun magit-process-indicator-from-command (comps)
-  (if (magit-prefix-p (cons magit-git-executable magit-git-standard-options)
-                      comps)
-      (setq comps (nthcdr (+ (length magit-git-standard-options) 1) comps)))
-  (cond ((or (null (cdr comps))
-             (not (member (car comps) '("remote"))))
-         (car comps))
-        (t
-         (concat (car comps) " " (cadr comps)))))
-
-(defvar magit-process nil)
-(defvar magit-process-client-buffer nil)
-(defvar magit-process-buffer-name "*magit-process*"
-  "Buffer name for running git commands.")
-
-(defun magit-run* (cmd-and-args
-                   &optional logline noerase noerror nowait input)
-  (if (and magit-process
-           (get-buffer magit-process-buffer-name))
-      (error "Git is already running"))
-  (let ((cmd (car cmd-and-args))
-        (args (cdr cmd-and-args))
-        (dir default-directory)
-        (buf (get-buffer-create magit-process-buffer-name))
-        (successp nil))
-    (magit-set-mode-line-process
-     (magit-process-indicator-from-command cmd-and-args))
-    (setq magit-process-client-buffer (current-buffer))
-    (with-current-buffer buf
-      (view-mode 1)
-      (set (make-local-variable 'view-no-disable-on-exit) t)
-      (setq view-exit-action
-            (lambda (buffer)
-              (with-current-buffer buffer
-                (bury-buffer))))
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (setq default-directory dir)
-        (if noerase
-            (goto-char (point-max))
-          (erase-buffer))
-        (insert "$ " (or logline
-                         (mapconcat 'identity cmd-and-args " "))
-                "\n")
-        (cond (nowait
-               (setq magit-process
-                     (let ((process-connection-type magit-process-connection-type))
-                       (apply 'magit-start-process cmd buf cmd args)))
-               (set-process-sentinel magit-process 'magit-process-sentinel)
-               (set-process-filter magit-process 'magit-process-filter)
-               (when input
-                 (with-current-buffer input
-                   (process-send-region magit-process
-                                        (point-min) (point-max)))
-                 (process-send-eof magit-process)
-                 (sit-for 0.1 t))
-               (cond ((= magit-process-popup-time 0)
-                      (pop-to-buffer (process-buffer magit-process)))
-                     ((> magit-process-popup-time 0)
-                      (run-with-timer
-                       magit-process-popup-time nil
-                       (function
-                        (lambda (buf)
-                          (with-current-buffer buf
-                            (when magit-process
-                              (display-buffer (process-buffer magit-process))
-                              (goto-char (point-max))))))
-                       (current-buffer))))
-               (setq successp t))
-              (input
-               (with-current-buffer input
-                 (setq default-directory dir)
-                 (setq magit-process
-                       ;; Don't use a pty, because it would set icrnl
-                       ;; which would modify the input (issue #20).
-                       (let ((process-connection-type nil))
-                         (apply 'magit-start-process cmd buf cmd args)))
-                 (set-process-filter magit-process 'magit-process-filter)
-                 (process-send-region magit-process
-                                      (point-min) (point-max))
-                 (process-send-eof magit-process)
-                 (while (equal (process-status magit-process) 'run)
-                   (sit-for 0.1 t))
-                 (setq successp
-                       (equal (process-exit-status magit-process) 0))
-                 (setq magit-process nil))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))
-              (t
-               (setq successp
-                     (equal (apply 'process-file cmd nil buf nil args) 0))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))))
-      (or successp
-          noerror
-          (error
-           "%s ... [Hit %s or see buffer %s for details]"
-           (or (with-current-buffer (get-buffer magit-process-buffer-name)
-                 (when (re-search-backward
-                        (concat "^error: \\(.*\\)" paragraph-separate) nil t)
-                   (match-string 1)))
-               "Git failed")
-           (with-current-buffer magit-process-client-buffer
-             (key-description (car (where-is-internal
-                                    'magit-display-process))))
-           magit-process-buffer-name))
-      successp)))
-
-(autoload 'dired-uncache "dired")
-(defun magit-process-sentinel (process event)
-  (let ((msg (format "%s %s." (process-name process) (substring event 0 -1)))
-        (successp (string-match "^finished" event))
-        (key (with-current-buffer magit-process-client-buffer
-               (key-description (car (where-is-internal
-                                      'magit-display-process))))))
-    (with-current-buffer (process-buffer process)
-      (let ((inhibit-read-only t))
-        (goto-char (point-max))
-        (insert msg "\n")
-        (message (if successp msg
-                   (format "%s Hit %s or see buffer %s for details."
-                           msg key (current-buffer)))))
-      (unless (memq (process-status process) '(run open))
-        (dired-uncache default-directory)))
-    (setq magit-process nil)
-    (magit-set-mode-line-process nil)
-    (magit-refresh-buffer magit-process-client-buffer)))
-
-(defun magit-password (proc string)
-  "Checks if git/ssh asks for a password and ask the user for it."
-  (let (ask)
-    (cond ((or (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
-               (string-match "^\\\(.*\\\)'s password:" string)
-               (string-match "^Password for '\\\(.*\\\)':" string))
-           (setq ask (format "Password for '%s': " (match-string 1 string))))
-          ((string-match "^[pP]assword:" string)
-           (setq ask "Password:")))
-    (when ask
-      (process-send-string proc (concat (read-passwd ask nil) "\n")))))
-
-(defun magit-username (proc string)
-  "Checks if git asks for a username and ask the user for it."
-  (when (string-match "^Username for '\\\(.*\\\)':" string)
-    (process-send-string proc
-                         (concat
-                          (read-string (format "Username for '%s': "
-                                               (match-string 1 string))
-                                       nil nil (user-login-name))
-                          "\n"))))
-
-(defun magit-process-filter (proc string)
-  (save-current-buffer
-    (set-buffer (process-buffer proc))
-    (let ((inhibit-read-only t))
-      (magit-username proc string)
-      (magit-password proc string)
-      (goto-char (process-mark proc))
-      ;; Find last ^M in string.  If one was found, ignore everything
-      ;; before it and delete the current line.
-      (let ((ret-pos (length string)))
-        (while (and (>= (setq ret-pos (1- ret-pos)) 0)
-                    (/= ?\r (aref string ret-pos))))
-        (cond ((>= ret-pos 0)
-               (goto-char (line-beginning-position))
-               (delete-region (point) (line-end-position))
-               (insert (substring string (+ ret-pos 1))))
-              (t
-               (insert string))))
-      (set-marker (process-mark proc) (point)))))
-
-(defun magit-run (cmd &rest args)
-  (magit-with-refresh
-    (magit-run* (cons cmd args))))
-
-(defun magit-run-git (&rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args))))
-
-(defun magit-run-git-with-input (input &rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args)
-                nil nil nil nil input)))
-
-(defun magit-run-git-async (&rest args)
-  (message "Running %s %s" magit-git-executable (mapconcat 'identity args " "))
-  (magit-run* (append (cons magit-git-executable
-                            magit-git-standard-options)
-                      args)
-              nil nil nil t))
-
-(defun magit-run-async-with-input (input cmd &rest args)
-  (magit-run* (cons cmd args) nil nil nil t input))
-
-(defun magit-display-process ()
-  "Display output from most recent git command."
-  (interactive)
-  (unless (get-buffer magit-process-buffer-name)
-    (error "No Git commands have run"))
-  (display-buffer magit-process-buffer-name))
-
-;;; Mode
-
-;; We define individual functions (instead of using lambda etc) so
-;; that the online help can show something meaningful.
-
-(magit-define-section-jumper untracked "Untracked files")
-(magit-define-section-jumper unstaged  "Unstaged changes")
-(magit-define-section-jumper staged    "Staged changes")
-(magit-define-section-jumper unpushed  "Unpushed commits")
-
-(magit-define-level-shower 1)
-(magit-define-level-shower 2)
-(magit-define-level-shower 3)
-(magit-define-level-shower 4)
-
-(easy-menu-define magit-mode-menu magit-mode-map
-  "Magit menu"
-  '("Magit"
-    ["Refresh" magit-refresh t]
-    ["Refresh all" magit-refresh-all t]
-    "---"
-    ["Stage" magit-stage-item t]
-    ["Stage all" magit-stage-all t]
-    ["Unstage" magit-unstage-item t]
-    ["Unstage all" magit-unstage-all t]
-    ["Commit" magit-log-edit t]
-    ["Add log entry" magit-add-log t]
-    ["Tag" magit-tag t]
-    ["Annotated tag" magit-annotated-tag t]
-    "---"
-    ["Diff working tree" magit-diff-working-tree t]
-    ["Diff" magit-diff t]
-    ("Log"
-     ["Short Log" magit-log t]
-     ["Long Log" magit-log-long t]
-     ["Reflog" magit-reflog t]
-     ["Extended..." magit-key-mode-popup-logging t])
-    "---"
-    ["Cherry pick" magit-cherry-pick-item t]
-    ["Apply" magit-apply-item t]
-    ["Revert" magit-revert-item t]
-    "---"
-    ["Ignore" magit-ignore-item t]
-    ["Ignore locally" magit-ignore-item-locally t]
-    ["Discard" magit-discard-item t]
-    ["Reset head" magit-reset-head t]
-    ["Reset working tree" magit-reset-working-tree t]
-    ["Stash" magit-stash t]
-    ["Snapshot" magit-stash-snapshot t]
-    "---"
-    ["Branch..." magit-checkout t]
-    ["Merge" magit-manual-merge t]
-    ["Interactive resolve" magit-interactive-resolve-item t]
-    ["Rebase" magit-rebase-step t]
-    ("Rewrite"
-     ["Start" magit-rewrite-start t]
-     ["Stop" magit-rewrite-stop t]
-     ["Finish" magit-rewrite-finish t]
-     ["Abort" magit-rewrite-abort t]
-     ["Set used" magit-rewrite-set-used t]
-     ["Set unused" magit-rewrite-set-unused t])
-    "---"
-    ["Push" magit-push t]
-    ["Pull" magit-pull t]
-    ["Remote update" magit-remote-update t]
-    ("Submodule"
-     ["Submodule update" magit-submodule-update t]
-     ["Submodule update and init" magit-submodule-update-init t]
-     ["Submodule init" magit-submodule-init t]
-     ["Submodule sync" magit-submodule-sync t])
-    "---"
-    ("Extensions")
-    "---"
-    ["Display Git output" magit-display-process t]
-    ["Quit Magit" magit-quit-window t]))
-
-(defvar magit-mode-hook nil "Hook run by `magit-mode'.")
-
-(put 'magit-mode 'mode-class 'special)
-
-(defvar magit-refresh-function nil)
-(make-variable-buffer-local 'magit-refresh-function)
-(put 'magit-refresh-function 'permanent-local t)
-
-(defvar magit-refresh-args nil)
-(make-variable-buffer-local 'magit-refresh-args)
-(put 'magit-refresh-args 'permanent-local t)
-
-(defvar last-point)
-
-(defun magit-remember-point ()
-  (setq last-point (point)))
-
-(defun magit-invisible-region-end (pos)
-  (while (and (not (= pos (point-max))) (invisible-p pos))
-    (setq pos (next-char-property-change pos)))
-  pos)
-
-(defun magit-invisible-region-start (pos)
-  (while (and (not (= pos (point-min))) (invisible-p pos))
-    (setq pos (1- (previous-char-property-change pos))))
-  pos)
-
-(defun magit-correct-point-after-command ()
-  "Move point outside of invisible regions.
-
-Emacs often leaves point in invisible regions, it seems.  To fix
-this, we move point ourselves and never let Emacs do its own
-adjustments.
-
-When point has to be moved out of an invisible region, it can be
-moved to its end or its beginning.  We usually move it to its
-end, except when that would move point back to where it was
-before the last command."
-  (if (invisible-p (point))
-      (let ((end (magit-invisible-region-end (point))))
-        (goto-char (if (= end last-point)
-                       (magit-invisible-region-start (point))
-                     end))))
-  (setq disable-point-adjustment t))
-
-(defun magit-post-command-hook ()
-  (magit-correct-point-after-command)
-  (magit-highlight-section))
-
-(defun magit-mode ()
-  "Review the status of a git repository and act on it.
-
-Please see the manual for a complete description of Magit.
-
-\\{magit-mode-map}"
-  (kill-all-local-variables)
-  (buffer-disable-undo)
-  (setq buffer-read-only t
-        truncate-lines t
-        major-mode 'magit-mode
-        mode-name "Magit"
-        mode-line-process "")
-  (add-hook 'pre-command-hook #'magit-remember-point nil t)
-  (add-hook 'post-command-hook #'magit-post-command-hook t t)
-  (use-local-map magit-mode-map)
-  (setq magit-current-indentation (magit-indentation-for default-directory))
-  ;; Emacs' normal method of showing trailing whitespace gives weird
-  ;; results when `magit-whitespace-warning-face' is different from
-  ;; `trailing-whitespace'.
-  (if (and magit-highlight-whitespace magit-highlight-trailing-whitespace)
-      (setq show-trailing-whitespace nil))
-  (run-mode-hooks 'magit-mode-hook))
-
-(defun magit-mode-init (dir submode refresh-func &rest refresh-args)
-  (setq default-directory dir
-        magit-refresh-function refresh-func
-        magit-refresh-args refresh-args)
-  (funcall submode)
-  (magit-refresh-buffer))
-
-(defun magit-indentation-for (dir)
-  (let (result)
-    (dolist (pair magit-highlight-indentation)
-      (if (string-match-p (car pair) dir)
-          (setq result (cdr pair))))
-    result))
-
-(defun magit-find-buffer (submode &optional dir)
-  (let ((topdir (magit-get-top-dir (or dir default-directory))))
-    (dolist (buf (buffer-list))
-      (if (with-current-buffer buf
-            (and (eq major-mode submode)
-                 default-directory
-                 (equal (expand-file-name default-directory) topdir)))
-          (return buf)))))
-
-(defun magit-find-status-buffer (&optional dir)
-  (magit-find-buffer 'magit-status-mode dir))
-
-(defun magit-for-all-buffers (func &optional dir)
-  (dolist (buf (buffer-list))
-    (with-current-buffer buf
-      (if (and (derived-mode-p 'magit-mode)
-               (or (null dir)
-                   (equal default-directory dir)))
-          (funcall func)))))
-
-(defun magit-refresh-buffer (&optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (let* ((old-line (line-number-at-pos))
-           (old-point (point))
-           (old-section (magit-current-section))
-           (old-path (and old-section
-                          (magit-section-path (magit-current-section)))))
-      (beginning-of-line)
-      (let ((section-line (and old-section
-                               (count-lines
-                                (magit-section-beginning old-section)
-                                (point))))
-            (line-char (- old-point (point))))
-        (if magit-refresh-function
-            (apply magit-refresh-function
-                   magit-refresh-args))
-        (magit-refresh-marked-commits-in-buffer)
-        (let ((s (and old-path (magit-find-section old-path magit-top-section))))
-          (cond (s
-                 (goto-char (magit-section-beginning s))
-                 (forward-line section-line)
-                 (forward-char line-char))
-                (t
-                 (magit-goto-line old-line)))
-          (dolist (w (get-buffer-window-list (current-buffer)))
-            (set-window-point w (point)))
-          (magit-highlight-section))))))
-
-(defun magit-string-has-prefix-p (string prefix)
-  (eq (compare-strings string nil (length prefix) prefix nil nil) t))
-
-(defun magit-revert-buffers (dir &optional ignore-modtime)
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               ;; don't revert indirect buffers, as the parent will be reverted
-               (not (buffer-base-buffer buffer))
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir)
-               (file-readable-p (buffer-file-name buffer))
-               (or ignore-modtime (not (verify-visited-file-modtime buffer)))
-               (not (buffer-modified-p buffer)))
-      (with-current-buffer buffer
-        (condition-case var
-            (revert-buffer t t nil)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defun magit-update-vc-modeline (dir)
-  "Update the modeline for buffers representable by magit."
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir))
-      (with-current-buffer buffer
-        (condition-case var
-            (vc-find-file-hook)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defvar magit-refresh-needing-buffers nil)
-(defvar magit-refresh-pending nil)
-
-(defun magit-refresh-wrapper (func)
-  (if magit-refresh-pending
-      (funcall func)
-    (let* ((dir default-directory)
-           (status-buffer (magit-find-status-buffer dir))
-           (magit-refresh-needing-buffers nil)
-           (magit-refresh-pending t))
-      (unwind-protect
-          (funcall func)
-        (when magit-refresh-needing-buffers
-          (magit-revert-buffers dir)
-          (dolist (b (adjoin status-buffer
-                             magit-refresh-needing-buffers))
-            (magit-refresh-buffer b)))))))
-
-(defun magit-need-refresh (&optional buffer)
-  "Mark BUFFER as needing to be refreshed.  If BUFFER is nil, use the
-current buffer."
-  (pushnew (or buffer (current-buffer)) magit-refresh-needing-buffers :test 'eq))
-
-(defun magit-refresh ()
-  "Refresh current buffer to match repository state.
-Also revert every unmodified buffer visiting files
-in the corresponding directory."
-  (interactive)
-  (magit-with-refresh
-    (magit-need-refresh)))
-
-(defun magit-refresh-all ()
-  "Refresh all magit buffers to match respective repository states.
-Also revert every unmodified buffer visiting files
-in the corresponding directories."
-  (interactive)
-  (magit-for-all-buffers #'magit-refresh-buffer default-directory))
-
-;;; Untracked files
-
-(defun magit-wash-untracked-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\t" file "\n"))
-        t)
-    nil))
-
-(defun magit-wash-untracked-files ()
-  ;; Setting magit-old-top-section to nil speeds up washing: no time
-  ;; is wasted looking up the old visibility, which doesn't matter for
-  ;; untracked files.
-  ;;
-  ;; XXX - speed this up in a more general way.
-  ;;
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-untracked-file)))
-
-(defun magit-insert-untracked-files ()
-  (unless (string= (magit-get "status" "showUntrackedFiles") "no")
-    (apply 'magit-git-section
-           `(untracked
-             "Untracked files:"
-             magit-wash-untracked-files
-             "ls-files" "--others" "-t" "--exclude-standard"
-             ,@(when magit-omit-untracked-dir-contents
-                 '("--directory"))))))
-
-;;; Diffs and Hunks
-
-(defvar magit-diff-context-lines 3)
-
-(defun magit-diff-U-arg ()
-  (format "-U%d" magit-diff-context-lines))
-
-(defun magit-diff-smaller-hunks (&optional count)
-  "Decrease the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (max 0 (- magit-diff-context-lines count)))
-  (magit-refresh))
-
-(defun magit-diff-larger-hunks (&optional count)
-  "Increase the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (+ magit-diff-context-lines count))
-  (magit-refresh))
-
-(defun magit-diff-default-hunks ()
-  "Reset context for diff hunks to the default size."
-  (interactive "")
-  (setq magit-diff-context-lines 3)
-  (magit-refresh))
-
-(defun magit-toggle-diff-refine-hunk (&optional other)
-  (interactive "P")
-  "Turn diff-hunk refining on or off.
-
-If hunk refining is currently on, then hunk refining is turned off.
-If hunk refining is off, then hunk refining is turned on, in
-`selected' mode (only the currently selected hunk is refined).
-
-With a prefix argument, the \"third choice\" is used instead:
-If hunk refining is currently on, then refining is kept on, but
-the refining mode (`selected' or `all') is switched.
-If hunk refining is off, then hunk refining is turned on, in
-`all' mode (all hunks refined).
-
-Customize `magit-diff-refine-hunk' to change the default mode."
-  (let* ((old magit-diff-refine-hunk)
-         (new
-          (if other
-              (if (eq old 'all) t 'all)
-            (not old))))
-
-    ;; remove any old refining in currently highlighted section
-    (when (and magit-highlighted-section old (not (eq old 'all)))
-      (magit-unrefine-section magit-highlighted-section))
-
-    ;; set variable to new value locally
-    (set (make-local-variable 'magit-diff-refine-hunk) new)
-
-    ;; if now highlighting in "selected only" mode, turn refining back
-    ;; on in the current section
-    (when (and magit-highlighted-section new (not (eq new 'all)))
-      (magit-refine-section magit-highlighted-section))
-
-    ;; `all' mode being turned on or off needs a complete refresh
-    (when (or (eq old 'all) (eq new 'all))
-      (magit-refresh))))
-
-(defun magit-diff-line-file ()
-  (cond ((looking-at "^diff --git ./\\(.*\\) ./\\(.*\\)$")
-         (match-string-no-properties 2))
-        ((looking-at "^diff --cc +\\(.*\\)$")
-         (match-string-no-properties 1))
-        (t
-         nil)))
-
-(defun magit-wash-diffs ()
-  (magit-wash-sequence #'magit-wash-diff-or-other-file))
-
-(defun magit-wash-diff-or-other-file ()
-  (or (magit-wash-diff)
-      (magit-wash-other-file)))
-
-(defun magit-wash-other-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\tNew      " file "\n"))
-        t)
-    nil))
-
-(defvar magit-hide-diffs nil)
-
-(defvar magit-indentation-level 1)
-
-(defun magit-insert-diff-title (status file file2)
-  (let ((status-text (case status
-                       ((unmerged)
-                        (format "Unmerged   %s" file))
-                       ((new)
-                        (format "New        %s" file))
-                       ((deleted)
-                        (format "Deleted    %s" file))
-                       ((renamed)
-                        (format "Renamed    %s   (from %s)"
-                                file file2))
-                       ((modified)
-                        (format "Modified   %s" file))
-                       ((typechange)
-                        (format "Typechange %s" file))
-                       (t
-                        (format "?          %s" file)))))
-    (insert (make-string magit-indentation-level ?\t) status-text "\n")))
-
-(defvar magit-current-diff-range nil
-  "Used internally when setting up magit diff sections.")
-
-(defun magit-wash-typechange-section (file)
-  (magit-set-section-info (list 'typechange file))
-  (let ((first-start (point-marker))
-        (second-start (progn (forward-line 1)
-                             (search-forward-regexp "^diff")
-                             (beginning-of-line)
-                             (point-marker))))
-    (let ((magit-indentation-level (+ magit-indentation-level 1)))
-      (save-restriction
-        (narrow-to-region first-start second-start)
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section)))
-      (save-restriction
-        (narrow-to-region second-start (point-max))
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section))))))
-
-(defun magit-wash-diff-section ()
-  (cond ((looking-at "^\\* Unmerged path \\(.*\\)")
-         (let ((file (match-string-no-properties 1)))
-           (delete-region (point) (line-end-position))
-           (insert "\tUnmerged " file "\n")
-           (magit-set-section-info (list 'unmerged file nil))
-           t))
-        ((looking-at "^diff")
-         (let ((file (magit-diff-line-file))
-               (end (save-excursion
-                      (forward-line) ;; skip over "diff" line
-                      (if (search-forward-regexp "^diff\\|^@@" nil t)
-                          (goto-char (match-beginning 0))
-                        (goto-char (point-max)))
-                      (point-marker))))
-           (let* ((status (cond
-                           ((looking-at "^diff --cc")
-                            'unmerged)
-                           ((save-excursion
-                              (search-forward-regexp "^new file" end t))
-                            'new)
-                           ((save-excursion
-                              (search-forward-regexp "^deleted" end t))
-                            'deleted)
-                           ((save-excursion
-                              (search-forward-regexp "^rename" end t))
-                            'renamed)
-                           (t
-                            'modified)))
-                  (file2 (cond
-                          ((save-excursion
-                             (search-forward-regexp "^rename from \\(.*\\)"
-                                                    end t))
-                           (match-string-no-properties 1)))))
-             (magit-set-section-info (list status
-                                           file
-                                           (or file2 file)
-                                           magit-current-diff-range))
-             (magit-insert-diff-title status file file2)
-             (when (search-forward-regexp "\\(--- \\(.*\\)\n\\+\\+\\+ \\(.*\\)\n\\)" () t)
-               (when (match-string 1)
-                 (add-text-properties (match-beginning 1) (match-end 1)
-                                      '(face magit-diff-hunk-header))
-                 (add-text-properties (match-beginning 2) (match-end 2)
-                                      '(face magit-diff-file-header))
-                 (add-text-properties (match-beginning 3) (match-end 3)
-                                      '(face magit-diff-file-header))))
-             (goto-char end)
-             (let ((magit-section-hidden-default nil))
-               (magit-wash-sequence #'magit-wash-hunk))))
-         t)
-        (t
-         nil)))
-
-(defun magit-wash-diff ()
-  (let ((magit-section-hidden-default magit-hide-diffs))
-    (magit-with-section (magit-current-line) 'diff
-      (magit-wash-diff-section))))
-
-(defun magit-diff-item-kind (diff)
-  (car (magit-section-info diff)))
-
-(defun magit-diff-item-file (diff)
-  (cadr (magit-section-info diff)))
-
-(defun magit-diff-item-file2 (diff)
-  (caddr (magit-section-info diff)))
-
-(defun magit-diff-item-range (diff)
-  (nth 3 (magit-section-info diff)))
-
-(defun magit-wash-hunk ()
-  (cond ((looking-at "\\(^@+\\)[^@]*@+.*")
-         (let ((n-columns (1- (length (match-string 1))))
-               (head (match-string 0))
-               (hunk-start-pos (point)))
-           (magit-with-section head 'hunk
-             (add-text-properties (match-beginning 0) (match-end 0)
-                                  '(face magit-diff-hunk-header))
-             (forward-line)
-             (while (not (or (eobp)
-                             (looking-at "^diff\\|^@@")))
-               (magit-highlight-line-whitespace)
-               (let ((prefix (buffer-substring-no-properties
-                              (point) (min (+ (point) n-columns) (point-max)))))
-                 (cond ((string-match "\\+" prefix)
-                        (magit-put-line-property 'face 'magit-diff-add))
-                       ((string-match "-" prefix)
-                        (magit-put-line-property 'face 'magit-diff-del))
-                       (t
-                        (magit-put-line-property 'face 'magit-diff-none))))
-               (forward-line)))
-
-           (when (eq magit-diff-refine-hunk 'all)
-             (save-excursion
-               (goto-char hunk-start-pos)
-               (diff-refine-hunk))))
-         t)
-        (t
-         nil)))
-
-(defvar magit-diff-options nil)
-
-(defun magit-insert-diff (file status)
-  (let ((cmd magit-git-executable)
-        (args (append (list "diff")
-                      (list (magit-diff-U-arg))
-                      magit-diff-options
-                      (list "--" file))))
-    (let ((p (point)))
-      (magit-git-insert args)
-      (if (not (eq (char-before) ?\n))
-          (insert "\n"))
-      (save-restriction
-        (narrow-to-region p (point))
-        (goto-char p)
-        (cond
-         ((eq status 'typechange)
-          (magit-insert-diff-title status file file)
-          (magit-wash-typechange-section file))
-         (t
-          (magit-wash-diff-section)))
-        (goto-char (point-max))))))
-
-(defvar magit-last-raw-diff nil)
-(defvar magit-ignore-unmerged-raw-diffs nil)
-
-(defun magit-wash-raw-diffs ()
-  (let ((magit-last-raw-diff nil))
-    (magit-wash-sequence #'magit-wash-raw-diff)))
-
-(defun magit-wash-raw-diff ()
-  (if (looking-at
-       ":\\([0-7]+\\) \\([0-7]+\\) [0-9a-f]+ [0-9a-f]+ \\(.\\)[0-9]*\t\\([^\t\n]+\\)$")
-      (let ((old-perm (match-string-no-properties 1))
-            (new-perm (match-string-no-properties 2))
-            (status (case (string-to-char (match-string-no-properties 3))
-                      (?A 'new)
-                      (?D 'deleted)
-                      (?M 'modified)
-                      (?U 'unmerged)
-                      (?T 'typechange)
-                      (t     nil)))
-            (file (match-string-no-properties 4)))
-        ;; If this is for the same file as the last diff, ignore it.
-        ;; Unmerged files seem to get two entries.
-        ;; We also ignore unmerged files when told so.
-        (if (or (equal file magit-last-raw-diff)
-                (and magit-ignore-unmerged-raw-diffs (eq status 'unmerged)))
-            (delete-region (point) (+ (line-end-position) 1))
-          (setq magit-last-raw-diff file)
-          ;; The 'diff' section that is created here will not work with
-          ;; magit-insert-diff-item-patch etc when we leave it empty.
-          ;; Luckily, raw diffs are only produced for staged and
-          ;; unstaged changes, and we never call
-          ;; magit-insert-diff-item-patch on them.  This is a bit
-          ;; brittle, of course.
-          (let ((magit-section-hidden-default magit-hide-diffs))
-            (magit-with-section file 'diff
-              (delete-region (point) (+ (line-end-position) 1))
-              (if (not (magit-section-hidden magit-top-section))
-                  (magit-insert-diff file status)
-                (magit-set-section-info (list status file nil))
-                (magit-set-section-needs-refresh-on-show t)
-                (magit-insert-diff-title status file nil)))))
-        t)
-    nil))
-
-(defun magit-hunk-item-diff (hunk)
-  (let ((diff (magit-section-parent hunk)))
-    (or (eq (magit-section-type diff) 'diff)
-        (error "Huh?  Parent of hunk not a diff"))
-    diff))
-
-(defun magit-diff-item-insert-header (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (if (magit-section-children diff)
-                 (magit-section-beginning (car (magit-section-children diff)))
-               (magit-section-end diff))))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-diff-item-patch (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (magit-section-end diff)))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-hunk-item-patch (hunk buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (magit-insert-region (magit-section-beginning hunk) (magit-section-end hunk)
-                       buf))
-
-(defun magit-insert-hunk-item-region-patch (hunk reverse beg end buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (save-excursion
-    (goto-char (magit-section-beginning hunk))
-    (magit-insert-current-line buf)
-    (forward-line)
-    (let ((copy-op (if reverse "+" "-")))
-      (while (< (point) (magit-section-end hunk))
-        (if (and (<= beg (point)) (< (point) end))
-            (magit-insert-current-line buf)
-          (cond ((looking-at " ")
-                 (magit-insert-current-line buf))
-                ((looking-at copy-op)
-                 (let ((text (buffer-substring-no-properties
-                              (+ (point) 1) (line-beginning-position 2))))
-                   (with-current-buffer buf
-                     (insert " " text))))))
-        (forward-line))))
-  (with-current-buffer buf
-    (diff-fixup-modifs (point-min) (point-max))))
-
-(defun magit-hunk-item-is-conflict-p (hunk)
-  ;;; XXX - Using the title is a bit too clever...
-  (string-match "^diff --cc"
-                (magit-section-title (magit-hunk-item-diff hunk))))
-
-(defun magit-hunk-item-target-line (hunk)
-  (save-excursion
-    (beginning-of-line)
-    (let ((line (line-number-at-pos)))
-      (goto-char (magit-section-beginning hunk))
-      (if (not (looking-at "@@+ .* \\+\\([0-9]+\\)\\(,[0-9]+\\)? @@+"))
-          (error "Hunk header not found"))
-      (let ((target (string-to-number (match-string 1))))
-        (forward-line)
-        (while (< (line-number-at-pos) line)
-          ;; XXX - deal with combined diffs
-          (if (not (looking-at "-"))
-              (setq target (+ target 1)))
-          (forward-line))
-        target))))
-
-(defun magit-show (commit filename &optional select prefix)
-  "Returns a buffer containing the contents of the file FILENAME, as stored in
-COMMIT.  COMMIT may be one of the following:
-
-- A string with the name of a commit, such as \"head\" or \"dae86e\".  See 'git
-  help revisions' for syntax.
-- The symbol 'index, indicating that you want the version in Git's index or
-  staging area.
-- The symbol 'working, indicating that you want the version in the working
-  directory.  In this case you'll get a buffer visiting the file.  If there's
-  already a buffer visiting that file, you'll get that one.
-
-When called interactively or when SELECT is non-nil, make the buffer active,
-either in another window or (with a prefix argument) in the current window."
-  (interactive (let* ((revision (magit-read-rev "Retrieve file from revision"))
-                      (filename (magit-read-file-from-rev revision)))
-                 (list revision filename t current-prefix-arg)))
-  (if (eq commit 'working)
-      (find-file-noselect filename)
-    (let ((buffer (create-file-buffer (format "%s.%s" filename (replace-regexp-in-string ".*/" "" (prin1-to-string commit t))))))
-      (cond
-       ((eq commit 'index)
-        (let ((checkout-string (magit-git-string "checkout-index"
-                                                 "--temp"
-                                                 filename)))
-          (string-match "^\\(.*\\)\t" checkout-string)
-          (with-current-buffer buffer
-            (let ((tmpname (match-string 1 checkout-string)))
-              (magit-with-silent-modifications
-               (insert-file-contents tmpname nil nil nil t))
-              (delete-file tmpname)))))
-       (t
-        (with-current-buffer buffer
-          (magit-with-silent-modifications
-           (magit-git-insert (list "cat-file" "-p"
-                                   (concat commit ":" filename)))))))
-      (with-current-buffer buffer
-        (let ((buffer-file-name filename))
-          (normal-mode))
-        (goto-char (point-min)))
-      (if select
-          (if prefix
-              (switch-to-buffer buffer)
-            (switch-to-buffer-other-window buffer))
-        buffer))))
-
-(defmacro with-magit-tmp-buffer (var &rest body)
-  (declare (indent 1)
-           (debug (symbolp &rest form)))
-  `(let ((,var (generate-new-buffer magit-tmp-buffer-name)))
-     (unwind-protect
-         (progn ,@body)
-       (kill-buffer ,var))))
-
-(defun magit-apply-diff-item (diff &rest args)
-  (when (zerop magit-diff-context-lines)
-    (setq args (cons "--unidiff-zero" args)))
-  (with-magit-tmp-buffer tmp
-    (magit-insert-diff-item-patch diff tmp)
-    (apply #'magit-run-git-with-input tmp
-           "apply" (append args (list "-")))))
-
-(defun magit-apply-hunk-item* (hunk reverse &rest args)
-  "Apply single hunk or part of a hunk to the index or working file.
-
-This function is the core of magit's stage, unstage, apply, and
-revert operations.  HUNK (or the portion of it selected by the
-region) will be applied to either the index, if \"--cached\" is a
-member of ARGS, or to the working file otherwise."
-  (let ((zero-context (zerop magit-diff-context-lines))
-        (use-region (magit-use-region-p)))
-    (when zero-context
-      (setq args (cons "--unidiff-zero" args)))
-    (when reverse
-      (setq args (cons "--reverse" args)))
-    (when (and use-region zero-context)
-      (error (concat "Not enough context to partially apply hunk.  "
-                     "Use `+' to increase context.")))
-    (with-magit-tmp-buffer tmp
-      (if use-region
-          (magit-insert-hunk-item-region-patch
-           hunk reverse (region-beginning) (region-end) tmp)
-        (magit-insert-hunk-item-patch hunk tmp))
-      (apply #'magit-run-git-with-input tmp
-             "apply" (append args (list "-"))))))
-
-(defun magit-apply-hunk-item (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk nil args))
-
-(defun magit-apply-hunk-item-reverse (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk t args))
-
-(magit-define-inserter unstaged-changes (title)
-  (let ((magit-hide-diffs t)
-        (magit-current-diff-range (cons 'index 'working)))
-    (let ((magit-diff-options (append '() magit-diff-options)))
-      (magit-git-section 'unstaged title 'magit-wash-raw-diffs
-                         "diff-files"))))
-
-(magit-define-inserter staged-changes (staged no-commit)
-  (let ((magit-current-diff-range (cons "HEAD" 'index)))
-    (when staged
-      (let ((magit-hide-diffs t)
-            (base (if no-commit
-                      (magit-git-string "mktree")
-                    "HEAD")))
-        (let ((magit-diff-options (append '("--cached") magit-diff-options))
-              (magit-ignore-unmerged-raw-diffs t))
-          (magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs
-                             "diff-index" "--cached"
-                             base))))))
-
-;;; Logs and Commits
-
-                                        ; Note: making this a plain defcustom would probably let users break
-                                        ; the parser too easily
-(defvar magit-git-log-options
-  (list
-   "--pretty=format:* %h %s"
-   (format "--abbrev=%s" magit-sha1-abbrev-length)))
-                                        ; --decorate=full otherwise some ref prefixes are stripped
-                                        ;  '("--pretty=format:* %H%d %s" "--decorate=full"))
-
-;;
-;; Regexps for parsing ref names
-;;
-;; see the `git-check-ref-format' manpage for details
-
-(defconst magit-ref-nonchars "\000-\037\177 ~^:?*[\\"
-  "Characters specifically disallowed from appearing in Git symbolic refs.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-ref-nonslash-re
-  (concat "\\(?:"
-          ;; "no slash-separated component can begin with a dot ." (rule 1)
-          "[^" magit-ref-nonchars "./]"
-          ;; "cannot have two consecutive dots ..  anywhere." (rule 3)
-          "\\.?"
-          "\\)*")
-  "Regexp that matches the non-slash parts of a ref name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-refname-re
-  (concat
-   "\\(?:HEAD\\|"
-
-   "\\(?:tag: \\)?"
-
-   ;; optional non-slash sequence at the beginning
-   magit-ref-nonslash-re
-
-   ;; any number of slash-prefixed sequences
-   "\\(?:"
-   "/"
-   magit-ref-nonslash-re
-   "\\)*"
-
-   "/" ;; "must contain at least one /." (rule 2)
-   magit-ref-nonslash-re
-
-   ;; "cannot end with a slash / nor a dot .." (rule 5)
-   "[^" magit-ref-nonchars "./]"
-
-   "\\)"
-   )
-  "Regexp that matches a git symbolic reference name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-log-oneline-re
-  (concat
-   "^\\([_\\*|/ -.]+\\)?"                          ; graph   (1)
-   "\\(?:"
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defconst magit-log-longline-re
-  (concat
-   ;; use \0 delimiter (from -z option) to identify commits. this prevents
-   ;; commit messages containing lines like "commit 00000" from polluting the
-   ;; display
-   "\\(?:\\(?:\\`\\|\0\\)"
-   "\\([_\\*|/ -.]+\\)?"                           ; graph   (1)
-   "commit "
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "$\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defvar magit-present-log-line-function 'magit-present-log-line
-  "The function to use when generating a log line.
-It takes four args: CHART, SHA1, REFS and MESSAGE.  The function
-must return a string which will represent the log line.")
-
-(defun magit-log-get-bisect-state-color (suffix)
-  (if (string= suffix "bad")
-      (list suffix 'magit-log-head-label-bisect-bad)
-    (list suffix 'magit-log-head-label-bisect-good)))
-
-(defun magit-log-get-patches-color (suffix)
-  (list (and (string-match ".+/\\(.+\\)" suffix)
-             (match-string 1 suffix))
-        'magit-log-head-label-patches))
-
-(defvar magit-log-remotes-color-hook nil)
-
-(defun magit-log-get-remotes-color (suffix)
-  (or
-   (run-hook-with-args-until-success
-    'magit-log-remotes-color-hook suffix)
-   (list suffix 'magit-log-head-label-remote)))
-
-(defvar magit-refs-namespaces
-  '(("tags" . magit-log-head-label-tags)
-    ("remotes" magit-log-get-remotes-color)
-    ("heads" . magit-log-head-label-local)
-    ("patches" magit-log-get-patches-color)
-    ("bisect" magit-log-get-bisect-state-color)))
-
-(defun magit-ref-get-label-color (r)
-  (let ((uninteresting (loop for re in magit-uninteresting-refs
-                             thereis (string-match re r))))
-    (if uninteresting (list nil nil)
-      (let* ((ref-re "\\(?:tag: \\)?refs/\\(?:\\([^/]+\\)/\\)?\\(.+\\)")
-             (label (and (string-match ref-re r)
-                         (match-string 2 r)))
-             (res (let ((colorizer
-                         (cdr (assoc (match-string 1 r)
-                                     magit-refs-namespaces))))
-                    (cond ((null colorizer)
-                           (list r 'magit-log-head-label-default))
-                          ((symbolp colorizer)
-                           (list label colorizer))
-                          ((listp colorizer)
-                           (funcall (car colorizer)
-                                    (match-string 2 r)))
-                          (t
-                           (list r 'magit-log-head-label-default))))))
-        res))))
-
-(defun magit-present-log-line (graph sha1 refs message)
-  "The default log line generator."
-  (let ((string-refs
-         (when refs
-           (let ((colored-labels
-                  (delete nil
-                          (mapcar (lambda (r)
-                                    (destructuring-bind (label face)
-                                        (magit-ref-get-label-color r)
-                                      (and label
-                                           (propertize label 'face face))))
-                                  refs))))
-             (concat
-              (mapconcat 'identity colored-labels " ")
-              " ")))))
-
-    (concat
-     (if sha1
-         (propertize sha1 'face 'magit-log-sha1)
-       (insert-char ? magit-sha1-abbrev-length))
-     " "
-     (when graph
-       (propertize graph 'face 'magit-log-graph))
-     string-refs
-     (when message
-       (propertize message 'face 'magit-log-message)))))
-
-(defvar magit-log-count ()
-  "Internal var used to count the number of logs actually added in a buffer.")
-
-(defmacro magit-create-log-buffer-sections (&rest body)
-  "Empty current buffer of text and magit's section, and then evaluate BODY.
-
-if the number of logs inserted in the buffer is `magit-log-cutoff-length'
-insert a line to tell how to insert more of them"
-  (declare (indent 0))
-  `(let ((magit-log-count 0) (inhibit-read-only t))
-     (magit-create-buffer-sections
-       (magit-with-section 'log nil
-         ,@body
-         (if (= magit-log-count magit-log-cutoff-length)
-             (magit-with-section "longer"  'longer
-               (insert "type \"e\" to show more logs\n")))))))
-
-(defun magit-wash-log-line (style)
-  (beginning-of-line)
-  (let ((line-re (cond ((eq style 'long) magit-log-longline-re)
-                       (t magit-log-oneline-re))))
-    (cond
-     ((looking-at line-re)
-      (let ((chart (match-string 1))
-            (sha1 (match-string 2))
-            (msg (match-string 4))
-            (refs (when (match-string 3)
-                    (delq nil
-                          (mapcar
-                           (lambda (s)
-                             (and (not
-                                   (or (string= s "tag:")
-                                       (string= s "HEAD"))) ; as of 1.6.6
-                                  s))
-                           (split-string (match-string 3) "[(), ]" t))))))
-        (delete-region (point-at-bol) (point-at-eol))
-        (insert (funcall magit-present-log-line-function chart sha1 refs msg))
-        (goto-char (point-at-bol))
-        (if sha1
-            (magit-with-section sha1 'commit
-              (when magit-log-count (setq magit-log-count (1+ magit-log-count)))
-              (magit-set-section-info sha1)
-              (forward-line))
-          (forward-line))))
-     (t
-      (forward-line)))
-    t))
-
-(defun magit-wash-log (&optional style)
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence (apply-partially 'magit-wash-log-line style))))
-
-(defvar magit-currently-shown-commit nil)
-
-(defun magit-wash-commit ()
-  (let ((magit-current-diff-range))
-    (when (looking-at "^commit \\([0-9a-fA-F]\\{40\\}\\)")
-      (setq magit-current-diff-range (match-string 1))
-      (add-text-properties (match-beginning 1) (match-end 1)
-                           '(face magit-log-sha1)))
-    (cond
-     ((search-forward-regexp "^Merge: \\([0-9a-fA-F]+\\) \\([0-9a-fA-F]+\\)$" nil t)
-      (setq magit-current-diff-range (cons (cons (match-string 1)
-                                                 (match-string 2))
-                                           magit-current-diff-range))
-      (let ((first (magit-set-section nil 'commit (match-beginning 1) (match-end 1)))
-            (second (magit-set-section nil 'commit (match-beginning 2) (match-end 2))))
-        (magit-set-section-info (match-string 1) first)
-        (magit-set-section-info (match-string 2) second))
-      (make-commit-button (match-beginning 1) (match-end 1))
-      (make-commit-button (match-beginning 2) (match-end 2)))
-     (t
-      (setq magit-current-diff-range (cons (concat magit-current-diff-range "^")
-                                           magit-current-diff-range))))
-    (search-forward-regexp "^$")
-    (while (and
-            (search-forward-regexp "\\(\\b[0-9a-fA-F]\\{4,40\\}\\b\\)\\|\\(^diff\\)" nil 'noerror)
-            (not (match-string 2)))
-      (let ((sha1 (match-string 1))
-            (start (match-beginning 1))
-            (end (match-end 1)))
-        (when (string-equal "commit" (magit-git-string "cat-file" "-t" sha1))
-          (make-commit-button start end)
-          (let ((section (magit-set-section sha1 'commit start end)))
-            (magit-set-section-info sha1 section)))))
-    (beginning-of-line)
-    (when (looking-at "^diff")
-      (magit-wash-diffs))
-    (goto-char (point-max))
-    (insert "\n")
-    (if magit-back-navigation-history
-        (magit-with-section "[back]" 'button
-          (insert-text-button "[back]"
-                              'help-echo "Previous commit"
-                              'action 'magit-show-commit-backward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))
-    (insert " ")
-    (if magit-forward-navigation-history
-        (magit-with-section "[forward]" 'button
-          (insert-text-button "[forward]"
-                              'help-echo "Next commit"
-                              'action 'magit-show-commit-forward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))))
-
-(defun make-commit-button (start end)
-  (make-text-button start end
-                    'help-echo "Visit commit"
-                    'action (lambda (button)
-                              (save-excursion
-                                (goto-char button)
-                                (magit-visit-item)))
-                    'follow-link t
-                    'mouse-face 'magit-item-highlight
-                    'face 'magit-log-sha1))
-
-(defun magit-refresh-commit-buffer (commit)
-  (magit-configure-have-abbrev)
-  (magit-configure-have-decorate)
-  (magit-create-buffer-sections
-    (apply #'magit-git-section nil nil
-           'magit-wash-commit
-           "log"
-           "--max-count=1"
-           "--pretty=medium"
-           `(,@(if magit-have-abbrev (list "--no-abbrev-commit"))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             "--cc"
-             "-p" ,commit))))
-
-(define-derived-mode magit-commit-mode magit-mode "Magit"
-  "Mode to view a git commit.
-
-\\{magit-commit-mode-map}"
-  :group 'magit)
-
-(defvar magit-commit-buffer-name "*magit-commit*"
-  "Buffer name for displaying commit log messages.")
-
-(defun magit-show-commit (commit &optional scroll inhibit-history select)
-  "Show information about a commit in the buffer named by
-`magit-commit-buffer-name'.  COMMIT can be any valid name for a commit
-in the current Git repository.
-
-When called interactively or when SELECT is non-nil, switch to
-the commit buffer using `pop-to-buffer'.
-
-Unless INHIBIT-HISTORY is non-nil, the commit currently shown
-will be pushed onto `magit-back-navigation-history' and
-`magit-forward-navigation-history' will be cleared.
-
-Noninteractively, if the commit is already displayed and SCROLL
-is provided, call SCROLL's function definition in the commit
-window.  (`scroll-up' and `scroll-down' are typically passed in
-for this argument.)"
-  (interactive (list (magit-read-rev "Show commit (hash or ref)")
-                     nil nil t))
-  (when (magit-section-p commit)
-    (setq commit (magit-section-info commit)))
-  (unless (eql 0 (magit-git-exit-code "cat-file" "commit" commit))
-    (error "%s is not a commit" commit))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-commit-buffer-name)))
-    (cond
-     ((and (equal magit-currently-shown-commit commit)
-           ;; if it's empty then the buffer was killed
-           (with-current-buffer buf
-             (> (length (buffer-string)) 1)))
-      (let ((win (get-buffer-window buf)))
-        (cond ((not win)
-               (display-buffer buf))
-              (scroll
-               (with-selected-window win
-                 (funcall scroll))))))
-     (commit
-      (display-buffer buf)
-      (with-current-buffer buf
-        (unless inhibit-history
-          (push (cons default-directory magit-currently-shown-commit)
-                magit-back-navigation-history)
-          (setq magit-forward-navigation-history nil))
-        (setq magit-currently-shown-commit commit)
-        (goto-char (point-min))
-        (magit-mode-init dir 'magit-commit-mode
-                         #'magit-refresh-commit-buffer commit))))
-    (if select
-        (pop-to-buffer buf))))
-
-(defun magit-show-commit-backward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-back-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-back-navigation-history
-      (error "No previous commit."))
-    (let ((histitem (pop magit-back-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-forward-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defun magit-show-commit-forward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-forward-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-forward-navigation-history
-      (error "No next commit."))
-    (let ((histitem (pop magit-forward-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-back-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defvar magit-marked-commit nil)
-
-(defvar magit-mark-overlay nil)
-(make-variable-buffer-local 'magit-mark-overlay)
-(put 'magit-mark-overlay 'permanent-local t)
-
-(defun magit-refresh-marked-commits ()
-  (magit-for-all-buffers #'magit-refresh-marked-commits-in-buffer))
-
-(defun magit-refresh-marked-commits-in-buffer ()
-  (if (not magit-mark-overlay)
-      (let ((ov (make-overlay 1 1)))
-        (overlay-put ov 'face 'magit-item-mark)
-        (setq magit-mark-overlay ov)))
-  (delete-overlay magit-mark-overlay)
-  (magit-for-all-sections
-   (lambda (section)
-     (when (and (eq (magit-section-type section) 'commit)
-                (equal (magit-section-info section)
-                       magit-marked-commit))
-       (move-overlay magit-mark-overlay
-                     (magit-section-beginning section)
-                     (magit-section-end section)
-                     (current-buffer))))))
-
-(defun magit-set-marked-commit (commit)
-  (setq magit-marked-commit commit)
-  (magit-refresh-marked-commits))
-
-(defun magit-marked-commit ()
-  (or magit-marked-commit
-      (error "No commit marked")))
-
-(defun magit-remote-branch-name (remote branch)
-  "Get the name of the branch BRANCH on remote REMOTE"
-  (if (string= remote ".")
-      branch
-    (concat remote "/" branch)))
-
-(magit-define-inserter unpulled-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpulled "Unpulled commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "HEAD..%s" (magit-remote-branch-name remote branch)))))))
-
-(magit-define-inserter unpushed-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpushed "Unpushed commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "%s..HEAD" (magit-remote-branch-name remote branch)))))))
-
-(defun magit-remote-branch-for (local-branch &optional fully-qualified-name)
-  "Guess the remote branch name that LOCAL-BRANCH is tracking.
-Gives a fully qualified name (e.g., refs/remotes/origin/master) if
-FULLY-QUALIFIED-NAME is non-nil."
-  (let ((merge (magit-get "branch" local-branch "merge")))
-    (save-match-data
-      (if (and merge (string-match "^refs/heads/\\(.+\\)" merge))
-          (concat (if fully-qualified-name
-                      (let ((remote-name (magit-get "branch" local-branch "remote")))
-                        (if (string= "." remote-name)
-                            "refs/heads/"
-                          (concat "refs/remotes/" remote-name "/"))))
-                  (match-string 1 merge))))))
-
-;;; Status
-
-(defvar magit-remote-string-hook nil)
-
-(defun magit-remote-string (remote remote-branch remote-rebase)
-  (cond
-   ((string= "." remote)
-    (concat
-     (when remote-rebase "onto ")
-     "branch "
-     (propertize remote-branch 'face 'magit-branch)))
-   (remote
-    (concat
-     (when remote-rebase "onto ")
-     (propertize remote-branch 'face 'magit-branch)
-     " @ "
-     remote
-     " ("
-     (magit-get "remote" remote "url")
-     ")"))
-   (t
-    (run-hook-with-args-until-success 'magit-remote-string-hook))))
-
-(declare-function magit--bisect-info-for-status "magit-bisect" (branch))
-
-(defun magit-refresh-status ()
-  (magit-create-buffer-sections
-    (magit-with-section 'status nil
-      (let* ((branch (magit-get-current-branch))
-             (remote (and branch (magit-get "branch" branch "remote")))
-             (remote-rebase (and branch (magit-get-boolean "branch" branch "rebase")))
-             (remote-branch (or (and branch (magit-remote-branch-for branch)) branch))
-             (remote-string (magit-remote-string remote remote-branch remote-rebase))
-             (head (magit-git-string
-                    "log"
-                    "--max-count=1"
-                    "--abbrev-commit"
-                    (format "--abbrev=%s" magit-sha1-abbrev-length)
-                    "--pretty=oneline"))
-             (no-commit (not head)))
-        (when remote-string
-          (insert "Remote:   " remote-string "\n"))
-        (insert (format "Local:    %s %s\n"
-                        (propertize (magit--bisect-info-for-status branch)
-                                    'face 'magit-branch)
-                        (abbreviate-file-name default-directory)))
-        (insert (format "Head:     %s\n"
-                        (if no-commit "nothing commited (yet)" head)))
-        (let ((merge-heads (magit-file-lines (concat (magit-git-dir)
-                                                     "MERGE_HEAD"))))
-          (if merge-heads
-              (insert (format "Merging:   %s\n"
-                              (mapconcat 'identity
-                                         (mapcar 'magit-name-rev merge-heads)
-                                         ", ")))))
-        (let ((rebase (magit-rebase-info)))
-          (if rebase
-              (insert (apply 'format "Rebasing: onto %s (%s of %s); Press \"R\" to Abort, Skip, or Continue\n" rebase))))
-        (insert "\n")
-        (magit-git-exit-code "update-index" "--refresh")
-        (magit-insert-stashes)
-        (magit-insert-untracked-files)
-        (magit-insert-pending-changes)
-        (magit-insert-pending-commits)
-        (magit-insert-unpulled-commits remote remote-branch)
-        (let ((staged (or no-commit (magit-anything-staged-p))))
-          (magit-insert-unstaged-changes
-           (if staged "Unstaged changes:" "Changes:"))
-          (magit-insert-staged-changes staged no-commit))
-        (magit-insert-unpushed-commits remote remote-branch)
-        (run-hooks 'magit-refresh-status-hook)))))
-
-(defun magit-init (dir)
-  "Initialize git repository in the DIR directory."
-  (interactive (list (read-directory-name "Directory for Git repository: ")))
-  (let* ((dir (file-name-as-directory (expand-file-name dir)))
-         (topdir (magit-get-top-dir dir)))
-    (when (or (not topdir)
-              (yes-or-no-p
-               (format
-                (if (string-equal topdir dir)
-                    "There is already a Git repository in %s. Reinitialize? "
-                  "There is a Git repository in %s. Create another in %s? ")
-                topdir dir)))
-      (unless (file-directory-p dir)
-        (and (y-or-n-p (format "Directory %s does not exists.  Create it? " dir))
-             (make-directory dir)))
-      (let ((default-directory dir))
-        (magit-run* (list magit-git-executable "init"))))))
-
-(define-derived-mode magit-status-mode magit-mode "Magit"
-  "Mode for looking at git status.
-
-\\{magit-status-mode-map}"
-  :group 'magit)
-
-(defvar magit-default-directory nil)
-
-(defun magit-save-some-buffers (&optional msg pred)
-  "Save some buffers if variable `magit-save-some-buffers' is non-nil.
-If variable `magit-save-some-buffers' is set to 'dontask then
-don't ask the user before saving the buffers, just go ahead and
-do it.
-
-Optional argument MSG is displayed in the minibuffer if variable
-`magit-save-some-buffers' is nil.
-
-Optional second argument PRED determines which buffers are considered:
-If PRED is nil, all the file-visiting buffers are considered.
-If PRED is t, then certain non-file buffers will also be considered.
-If PRED is a zero-argument function, it indicates for each buffer whether
-to consider it or not when called with that buffer current."
-  (interactive)
-  (let ((predicate-function (or pred magit-save-some-buffers-predicate))
-        (magit-default-directory default-directory))
-    (if magit-save-some-buffers
-        (save-some-buffers
-         (eq magit-save-some-buffers 'dontask)
-         predicate-function)
-      (when msg
-        (message msg)))))
-
-(defun magit-save-buffers-predicate-all ()
-  "Prompt to save all buffers with unsaved changes"
-  t)
-
-(defun magit-save-buffers-predicate-tree-only ()
-  "Only prompt to save buffers which are within the current git project (as
-  determined by the dir passed to `magit-status'."
-  (and buffer-file-name
-       (string= (magit-get-top-dir magit-default-directory)
-                (magit-get-top-dir (file-name-directory buffer-file-name)))))
-
-;;;###autoload
-(defun magit-status (dir)
-  "Open a Magit status buffer for the Git repository containing
-DIR.  If DIR is not within a Git repository, offer to create a
-Git repository in DIR.
-
-Interactively, a prefix argument means to ask the user which Git
-repository to use even if `default-directory' is under Git control.
-Two prefix arguments means to ignore `magit-repo-dirs' when asking for
-user input."
-  (interactive (list (if current-prefix-arg
-                         (magit-read-top-dir
-                          (> (prefix-numeric-value current-prefix-arg)
-                             4))
-                       (or (magit-get-top-dir default-directory)
-                           (magit-read-top-dir nil)))))
-  (magit-save-some-buffers)
-  (let ((topdir (magit-get-top-dir dir)))
-    (unless topdir
-      (when (y-or-n-p (format "There is no Git repository in %S.  Create one? "
-                              dir))
-        (magit-init dir)
-        (setq topdir (magit-get-top-dir dir))))
-    (when topdir
-      (let ((buf (or (magit-find-status-buffer topdir)
-                     (generate-new-buffer
-                      (concat "*magit: "
-                              (file-name-nondirectory
-                               (directory-file-name topdir)) "*")))))
-        (funcall magit-status-buffer-switch-function buf)
-        (magit-mode-init topdir 'magit-status-mode #'magit-refresh-status)))))
-
-(magit-define-command automatic-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (if revision
-      (magit-run-git "merge" (magit-rev-to-git revision))))
-
-(magit-define-command manual-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (when revision
-    (apply 'magit-run-git
-           "merge" "--no-commit"
-           (magit-rev-to-git revision)
-           magit-custom-options)
-    (when (file-exists-p ".git/MERGE_MSG")
-        (magit-log-edit))))
-
-;;; Staging and Unstaging
-
-(defun magit-stage-item (&optional ask)
-  "Add the item at point to the staging area.
-If ASK is set, ask for the file name rather than picking the one
-at point."
-  (interactive "P")
-  (if ask
-      (magit-run-git "add" (read-file-name "File to stage: "))
-    (magit-section-action (item info "stage")
-      ((untracked file)
-       (magit-run-git "add" info))
-      ((untracked)
-       (apply #'magit-run-git "add" "--"
-              (magit-git-lines "ls-files" "--other" "--exclude-standard")))
-      ((unstaged diff hunk)
-       (if (magit-hunk-item-is-conflict-p item)
-           (error (concat "Can't stage individual resolution hunks.  "
-                          "Please stage the whole file.")))
-       (magit-apply-hunk-item item "--cached"))
-      ((unstaged diff)
-       (magit-run-git "add" "-u" (magit-diff-item-file item)))
-      ((staged *)
-       (error "Already staged"))
-      ((diff diff)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((diff diff hunk)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((hunk)
-       (error "Can't stage this hunk"))
-      ((diff)
-       (error "Can't stage this diff")))))
-
-(defun magit-unstage-item ()
-  "Remove the item at point from the staging area."
-  (interactive)
-  (magit-section-action (item info "unstage")
-    ((staged diff hunk)
-     (magit-apply-hunk-item-reverse item "--cached"))
-    ((staged diff)
-     (if (eq (car info) 'unmerged)
-         (error "Can't unstage an unmerged file.  Resolve it first"))
-     (if (magit-no-commit-p)
-         (magit-run-git "rm" "--cached" "--" (magit-diff-item-file item))
-       (magit-run-git "reset" "-q" "HEAD" "--" (magit-diff-item-file item))))
-    ((unstaged *)
-     (error "Already unstaged"))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((hunk)
-     (error "Can't unstage this hunk"))
-    ((diff)
-     (error "Can't unstage this diff"))))
-
-(defun magit-stage-all (&optional also-untracked-p)
-  "Add all remaining changes in tracked files to staging area.
-With prefix argument, add remaining untracked files as well.
-\('git add -u .' or 'git add .', respectively)."
-  (interactive "P")
-  (if also-untracked-p
-      (magit-run-git "add" ".")
-    (magit-run-git "add" "-u" ".")))
-
-(defun magit-unstage-all ()
-  "Remove all changes from staging area.
-\('git reset --mixed HEAD')."
-  (interactive)
-  (magit-run-git "reset" "HEAD"))
-
-;;; Branches
-
-(defun escape-branch-name (branch)
-  "Escapes branch names to remove problematic characters."
-  (replace-regexp-in-string "[/]" "-" branch))
-
-(defun magit-default-tracking-name-remote-plus-branch
-  (remote branch)
-  "Use the remote name plus a hyphen plus the escaped branch name for tracking branches."
-  (concat remote "-" (escape-branch-name branch)))
-
-(defun magit-default-tracking-name-branch-only
-  (remote branch)
-  "Use just the escaped branch name for tracking branches."
-  (escape-branch-name branch))
-
-(defun magit-get-tracking-name (remote branch)
-  "Given a REMOTE and a BRANCH name, ask the user for a local
-tracking brach name suggesting a sensible default."
-  (when (yes-or-no-p
-         (format "Create local tracking branch for %s? " branch))
-    (let* ((default-name
-             (funcall magit-default-tracking-name-function remote branch))
-           (chosen-name (read-string (format "Call local branch (%s): " default-name)
-                                     nil
-                                     nil
-                                     default-name)))
-      (when (magit-ref-exists-p (concat "refs/heads/" chosen-name))
-        (error "'%s' already exists." chosen-name))
-      chosen-name)))
-
-(defun magit-maybe-create-local-tracking-branch (rev)
-  "Depending on the users wishes, create a tracking branch for
-rev... maybe."
-  (if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
-      (let* ((remote (match-string 1 rev))
-             (branch (match-string 2 rev))
-             (tracker-name (magit-get-tracking-name remote branch)))
-        (when tracker-name
-          (magit-run-git "checkout" "-b" tracker-name rev)
-          t))
-    nil))
-
-(magit-define-command checkout (revision)
-  "Switch 'HEAD' to REVISION and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-If REVISION is a remote branch, offer to create a local tracking branch.
-\('git checkout [-b] REVISION')."
-  (interactive
-   (list (let ((current-branch (magit-get-current-branch))
-               (default (magit-default-rev)))
-           (magit-read-rev "Switch to"
-                           (unless (string= current-branch default)
-                             default)
-                           (if current-branch
-                               (cons (concat "refs/heads/" current-branch "$")
-                                     magit-uninteresting-refs)
-                             magit-uninteresting-refs)))))
-  (if revision
-      (when (not (magit-maybe-create-local-tracking-branch revision))
-        (magit-save-some-buffers)
-        (magit-run-git "checkout" (magit-rev-to-git revision))
-        (magit-update-vc-modeline default-directory))))
-
-(defun magit-read-create-branch-args ()
-  (let* ((cur-branch (magit-get-current-branch))
-         (cur-point (magit-default-rev))
-         (branch (read-string "Create branch: "))
-         (parent (magit-read-rev "Parent"
-                                 (cond
-                                  ((eq magit-create-branch-behaviour 'at-point) cur-point)
-                                  ((eq magit-create-branch-behaviour 'at-head) cur-branch)
-                                  (t cur-branch)))))
-    (list branch parent)))
-
-(magit-define-command create-branch (branch parent)
-  "Switch 'HEAD' to new BRANCH at revision PARENT and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-\('git checkout -b BRANCH REVISION')."
-  (interactive (magit-read-create-branch-args))
-  (when (and branch (not (string= branch ""))
-             parent)
-    (magit-save-some-buffers)
-    (magit-run-git "checkout" "-b"
-                   branch
-                   (append
-                    magit-custom-options
-                    (magit-rev-to-git parent)))
-    (magit-update-vc-modeline default-directory)))
-
-(defun magit-delete-branch (branch &optional force)
-  "Deletes a branch.
-If the branch is the current one, offers to switch to `master' first.
-With prefix, forces the removal even if it hasn't been merged.
-Works with local or remote branches.
-\('git branch [-d|-D] BRANCH' or 'git push <remote-part-of-BRANCH> :refs/heads/BRANCH')."
-  (interactive (list (magit-read-rev "Branch to delete" (magit-default-rev 'notrim))
-                     current-prefix-arg))
-  (let* ((remote (magit-remote-part-of-branch branch))
-         (is-current (string= branch (magit-get-current-branch)))
-         (args (list "branch"
-                     (if force "-D" "-d")
-                     branch)))
-    (cond
-     (remote
-      (magit-run-git "push" remote (concat ":refs/heads/" (magit-branch-no-remote branch))))
-     (is-current
-      (when (y-or-n-p "Cannot delete current branch. Switch to master first? ")
-          (progn
-            (magit-checkout "master")
-            (apply 'magit-run-git args))
-          (message "The current branch was not deleted.")))
-     (t
-            (apply 'magit-run-git args)))))
-
-(defun magit-move-branch (old new &optional force)
-  "Renames or moves a branch.
-With prefix, forces the move even if NEW already exists.
-\('git branch [-m|-M] OLD NEW')."
-  (interactive (list (magit-read-rev "Old name" (magit-default-rev))
-                     (read-string "New name: ")
-                     current-prefix-arg))
-  (magit-run-git "branch" (if force
-                              "-M"
-                            "-m")
-                 (magit-rev-to-git old) new))
-
-(defun magit-guess-branch ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-current-section)))
-    ((wazzup commit)
-     (magit-section-info (magit-section-parent item)))
-    ((commit) (magit-name-rev (substring info 0 magit-sha1-abbrev-length)))
-    ((wazzup) info)))
-
-;;; Remotes
-
-(defun magit-add-remote (remote url)
-  "Adds a remote and fetches it.
-\('git remote add REMOTE URL')."
-  (interactive (list (read-string "Add remote: ")
-                     (read-string "URL: ")))
-  (magit-run-git "remote" "add" "-f" remote url))
-
-(defun magit-remove-remote (remote)
-  "Deletes a remote.
-\('git remote rm REMOTE')."
-  (interactive (list (magit-read-remote "Remote to delete")))
-  (magit-run-git "remote" "rm" remote))
-
-(defun magit-rename-remote (old new)
-  "Renames a remote.
-\('git remote rename OLD NEW')."
-  (interactive (list (magit-read-remote "Old name")
-                     (read-string "New name: ")))
-  (magit-run-git "remote" "rename" old new))
-
-(defun magit-guess-remote ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-section-parent item)))
-    ((remote)
-     info)
-    (t
-     (if  (string= info ".")
-         info
-       (magit-get-current-remote)))))
-
-;;; Merging
-
-(defun magit-merge (revision)
-  "Merge REVISION into the current 'HEAD'; leave changes uncommitted.
-With a prefix-arg, the merge will be squashed.
-\('git merge --no-commit [--squash|--no-ff] REVISION')."
-  (interactive
-   (list (magit-read-rev "Merge" (magit-default-rev))))
-  (if revision
-      (apply 'magit-run-git
-             "merge"
-             (magit-rev-to-git revision)
-             magit-custom-options)))
-
-;;; Rebasing
-
-(defun magit-rebase-info ()
-  "Returns a list indicating the state of an in-progress rebase,
-if any."
-  (let ((git-dir (magit-git-dir)))
-    (cond ((file-exists-p (concat git-dir "rebase-merge"))
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-merge/onto"))))
-
-            ;; How many commits we've gone through
-            (length (magit-file-lines (concat git-dir "rebase-merge/done")))
-
-            ;; How many commits we have in total, without the comments
-            ;; at the end of git-rebase-todo.backup
-            (let ((todo-lines-with-comments (magit-file-lines (concat git-dir "rebase-merge/git-rebase-todo.backup"))))
-              (loop for i in todo-lines-with-comments
-                    until (string= "" i)
-                    count i))))
-          ((and (file-exists-p (concat git-dir "rebase-apply"))
-                (file-exists-p (concat git-dir "rebase-apply/onto")))
-           ;; we might be here because a non-interactive rebase failed: the
-           ;; patches didn't apply cleanly
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-apply/onto"))))
-
-            ;; How many commits we've gone through
-            (- (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/next")))) 1)
-
-            ;; How many commits we have in total
-            (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/last"))))
-            ))
-          (t nil))))
-
-(defun magit-rebase-step ()
-  (interactive)
-  (let ((info (magit-rebase-info)))
-    (if (not info)
-        (let* ((current-branch (magit-get-current-branch))
-               (rev (magit-read-rev "Rebase to"
-                                    (magit-format-ref (magit-remote-branch-for current-branch t))
-                                    (if current-branch
-                                        (cons (concat "refs/heads/" current-branch)
-                                              magit-uninteresting-refs)
-                                      magit-uninteresting-refs))))
-          (if rev
-              (magit-run-git "rebase" (magit-rev-to-git rev))))
-      (let ((cursor-in-echo-area t)
-            (message-log-max nil))
-        (message "Rebase in progress. [A]bort, [S]kip, or [C]ontinue? ")
-        (let ((reply (read-event)))
-          (case reply
-            ((?A ?a)
-             (magit-run-git-async "rebase" "--abort"))
-            ((?S ?s)
-             (magit-run-git-async "rebase" "--skip"))
-            ((?C ?c)
-             (magit-run-git-async "rebase" "--continue"))))))))
-
-;;; Resetting
-
-(magit-define-command reset-head (revision &optional hard)
-  "Switch 'HEAD' to REVISION, keeping prior working tree and staging area.
-Any differences from REVISION become new changes to be committed.
-With prefix argument, all uncommitted changes in working tree
-and staging area are lost.
-\('git reset [--soft|--hard] REVISION')."
-  (interactive (list (magit-read-rev (format "%s head to"
-                                             (if current-prefix-arg
-                                                 "Hard reset"
-                                               "Reset"))
-                                     (or (magit-default-rev)
-                                         "HEAD^"))
-                     current-prefix-arg))
-  (when revision
-    (magit-run-git "reset" (if hard "--hard" "--soft")
-                   (magit-rev-to-git revision))
-    (magit-update-vc-modeline default-directory)))
-
-(magit-define-command reset-head-hard (revision)
-  "Switch 'HEAD' to REVISION, losing all changes.
-Uncomitted changes in both working tree and staging area are lost.
-\('git reset --hard REVISION')."
-  (interactive (list (magit-read-rev (format "Hard reset head to")
-                                     (or (magit-default-rev)
-                                         "HEAD"))))
-  (magit-reset-head revision t))
-
-(magit-define-command reset-working-tree (&optional arg)
-  "Revert working tree and clear changes from staging area.
-\('git reset --hard HEAD').
-
-With a prefix arg, also remove untracked files.  With two prefix args, remove ignored files as well."
-  (interactive "p")
-  (let ((include-untracked (>= arg 4))
-        (include-ignored (>= arg 16)))
-    (when (yes-or-no-p (format "Discard all uncommitted changes%s%s? "
-                               (if include-untracked
-                                   ", untracked files"
-                                 "")
-                               (if include-ignored
-                                   ", ignored files"
-                                 "")))
-      (magit-reset-head-hard "HEAD")
-      (if include-untracked
-          (magit-run-git "clean" "-fd" (if include-ignored
-                                           "-x"
-                                         ""))))))
-
-;;; Rewriting
-
-(defun magit-read-rewrite-info ()
-  (when (file-exists-p (concat (magit-git-dir) "magit-rewrite-info"))
-    (with-temp-buffer
-      (insert-file-contents (concat (magit-git-dir) "magit-rewrite-info"))
-      (goto-char (point-min))
-      (read (current-buffer)))))
-
-(defun magit-write-rewrite-info (info)
-  (with-temp-file (concat (magit-git-dir) "magit-rewrite-info")
-    (prin1 info (current-buffer))
-    (princ "\n" (current-buffer))))
-
-(magit-define-inserter pending-commits ()
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info))))
-    (when pending
-      (magit-with-section 'pending nil
-        (insert (propertize "Pending commits:\n"
-                            'face 'magit-section-title))
-        (dolist (p pending)
-          (let* ((commit (car p))
-                 (properties (cdr p))
-                 (used (plist-get properties 'used)))
-            (magit-with-section commit 'commit
-              (magit-set-section-info commit)
-              (insert (magit-git-string
-                       "log" "--max-count=1"
-                       (if used
-                           "--pretty=format:. %s"
-                         "--pretty=format:* %s")
-                       commit "--")
-                      "\n")))))
-      (insert "\n"))))
-
-(defun magit-rewrite-set-commit-property (commit prop value)
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info)))
-         (p (assoc commit pending)))
-    (when p
-      (setf (cdr p) (plist-put (cdr p) prop value))
-      (magit-write-rewrite-info info)
-      (magit-need-refresh))))
-
-(defun magit-rewrite-set-used ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used t))))
-
-(defun magit-rewrite-set-unused ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used nil))))
-
-(magit-define-inserter pending-changes ()
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (when orig
-      (let ((magit-hide-diffs t))
-        (magit-git-section 'pending-changes
-                           "Pending changes"
-                           'magit-wash-diffs
-                           "diff" (magit-diff-U-arg) "-R" orig)))))
-
-(defun magit-rewrite-start (from &optional onto)
-  (interactive (list (magit-read-rev "Rewrite from" (magit-default-rev))))
-  (or (magit-everything-clean-p)
-      (error "You have uncommitted changes"))
-  (or (not (magit-read-rewrite-info))
-      (error "Rewrite in progress"))
-  (let* ((orig (magit-rev-parse "HEAD"))
-         (base
-          (if
-              (or
-               (eq magit-rewrite-inclusive t)
-               (and
-                (eq magit-rewrite-inclusive 'ask)
-                (y-or-n-p "Include selected revision in rewrite? ")))
-              (or
-               (car (magit-commit-parents from))
-               (error "Can't rewrite a parentless commit."))
-            from))
-         (pending (magit-git-lines "rev-list" (concat base ".."))))
-    (magit-write-rewrite-info `((orig ,orig)
-                                (pending ,@(mapcar #'list pending))))
-    (magit-run-git "reset" "--hard" base)))
-
-(defun magit-rewrite-stop (&optional noconfirm)
-  (interactive)
-  (let* ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (when (or noconfirm
-              (yes-or-no-p "Stop rewrite? "))
-      (magit-write-rewrite-info nil)
-      (magit-refresh))))
-
-(defun magit-rewrite-abort ()
-  (interactive)
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (or info
-        (error "No rewrite in progress"))
-    (or (magit-everything-clean-p)
-        (error "You have uncommitted changes"))
-    (when (yes-or-no-p "Abort rewrite? ")
-      (magit-write-rewrite-info nil)
-      (magit-run-git "reset" "--hard" orig))))
-
-(defun magit-rewrite-finish ()
-  (interactive)
-  (magit-with-refresh
-    (magit-rewrite-finish-step t)))
-
-(defun magit-rewrite-finish-step (first-p)
-  (let ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (let* ((pending (cdr (assq 'pending info)))
-           (first-unused
-            (let ((rpend (reverse pending)))
-              (while (and rpend (plist-get (cdr (car rpend)) 'used))
-                (setq rpend (cdr rpend)))
-              (car rpend)))
-           (commit (car first-unused)))
-      (cond ((not first-unused)
-             (magit-rewrite-stop t))
-            ((magit-apply-commit commit t (not first-p))
-             (magit-rewrite-set-commit-property commit 'used t)
-             (magit-rewrite-finish-step nil))))))
-
-;;; Updating, pull, and push
-
-(magit-define-command fetch (remote)
-  "Fetch from REMOTE."
-  (interactive (list (magit-read-remote)))
-  (apply 'magit-run-git-async "fetch" remote magit-custom-options))
-
-(magit-define-command fetch-current ()
-  "Run fetch for default remote.
-
-If there is no default remote, ask for one."
-  (interactive)
-  (magit-fetch (or (magit-get-current-remote)
-                   (magit-read-remote))))
-
-(magit-define-command remote-update ()
-  "Update all remotes."
-  (interactive)
-  (apply 'magit-run-git-async "remote" "update" magit-custom-options))
-
-(magit-define-command pull ()
-  "Run git pull against the current remote."
-  (interactive)
-  (let* ((branch (magit-get-current-branch))
-         (branch-remote (magit-get-remote branch))
-         (config-branch (and branch (magit-get "branch" branch "merge")))
-         (merge-branch (or (and config-branch (not current-prefix-arg))
-                           (magit-read-remote-branch
-                            branch-remote (format "Pull from: ")))))
-    (when (and branch (not config-branch))
-      (magit-set branch-remote "branch" branch "remote")
-      (magit-set (format "refs/heads/%s" merge-branch)
-                 "branch" branch "merge"))
-    (apply 'magit-run-git-async "pull" "-v" magit-custom-options)))
-
-(eval-when-compile (require 'eshell))
-
-(defun magit-parse-arguments (command)
-  (require 'eshell)
-  (with-temp-buffer
-    (insert command)
-    (mapcar 'eval (eshell-parse-arguments (point-min) (point-max)))))
-
-(defun magit-shell-command (command)
-  "Perform arbitrary shell COMMAND."
-  (interactive "sCommand: ")
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-run* args nil nil nil t)))
-
-(defvar magit-git-command-history nil)
-
-(defun magit-git-command (command)
-  "Perform arbitrary Git COMMAND.
-
-Similar to `magit-shell-command', but involves slightly less
-typing and automatically refreshes the status buffer."
-  (interactive
-   (list (read-string "Run git like this: " nil 'magit-git-command-history)))
-  (require 'pcomplete)
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-with-refresh
-      (magit-run* (append (cons magit-git-executable
-                                magit-git-standard-options)
-                          args)
-                  nil nil nil t))))
-
-(magit-define-command push-tags ()
-  "Push tags."
-  (interactive)
-  (magit-run-git-async "push" "--tags"))
-
-(magit-define-command push ()
-  "Push the current branch to a remote repository.
-
-With no prefix argument, ask `magit-get-remote' what remote to
-use for this branch.
-
-With a prefix arg \(e.g., \\[universal-argument] \\[magit-push]), \
-ask user instead.
-
-With \\[universal-argument] \\[universal-argument] as prefix, \
-also prompt user for the remote branch;
-otherwise, try to use the branch.<name>.merge git-config(1)
-option, falling back to something hairy if that is unset."
-  (interactive)
-  (let* ((branch (or (magit-get-current-branch)
-                     (error "Don't push a detached head.  That's gross")))
-         (branch-remote (magit-get-remote branch))
-         (push-remote (if (or current-prefix-arg
-                              (not branch-remote))
-                          (magit-read-remote (format "Push %s to remote"
-                                                     branch)
-                                             branch-remote)
-                        branch-remote))
-         (ref-branch (or (and (>= (prefix-numeric-value current-prefix-arg) 16)
-                              (magit-read-remote-branch
-                               push-remote (format "Push %s as branch" branch)))
-                         (magit-get "branch" branch "merge"))))
-    (if (and (not ref-branch)
-             (eq magit-set-upstream-on-push 'refuse))
-        (error "Not pushing since no upstream has been set.")
-      (let ((set-upstream-on-push (and (not ref-branch)
-                                       (or (eq magit-set-upstream-on-push 'dontask)
-                                           (and (eq magit-set-upstream-on-push t)
-                                                (yes-or-no-p "Set upstream while pushing? "))))))
-        (if (and (not branch-remote)
-                 (not current-prefix-arg))
-            (magit-set push-remote "branch" branch "remote"))
-        (apply 'magit-run-git-async "push" "-v" push-remote
-               (if ref-branch
-                   (format "%s:%s" branch ref-branch)
-                 branch)
-               (if set-upstream-on-push
-                   (cons "--set-upstream" magit-custom-options)
-                 magit-custom-options))
-        ;; Although git will automatically set up the remote,
-        ;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1),
-        ;; so we have to do that manually.
-        (unless ref-branch
-          (magit-set (concat "refs/heads/" branch) "branch" branch "merge"))))))
-
-;;; Log edit mode
-
-(defvar magit-log-edit-buffer-name "*magit-edit-log*"
-  "Buffer name for composing commit messages.")
-
-(defvar magit-log-edit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-c") 'magit-log-edit-commit)
-    (define-key map (kbd "C-x #") 'magit-log-edit-commit)
-    (define-key map (kbd "C-c C-a") 'magit-log-edit-toggle-amending)
-    (define-key map (kbd "C-c C-s") 'magit-log-edit-toggle-signoff)
-    (define-key map (kbd "C-c C-t") 'magit-log-edit-toggle-author)
-    (define-key map (kbd "C-c C-e") 'magit-log-edit-toggle-allow-empty)
-    (define-key map (kbd "M-p") 'log-edit-previous-comment)
-    (define-key map (kbd "M-n") 'log-edit-next-comment)
-    (define-key map (kbd "C-c C-k") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-c C-]") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-x C-s") (lambda ()
-                                      (interactive)
-                                      (message "Not saved. Use C-c C-c to finalize this commit message.")))
-    map))
-
-(defvar magit-pre-log-edit-window-configuration nil)
-
-(define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit"
-  ;; Recognize changelog-style paragraphs
-  (set (make-local-variable 'paragraph-start)
-       (concat paragraph-start "\\|*\\|(")))
-
-(defun magit-log-edit-cleanup ()
-  (save-excursion
-    (goto-char (point-min))
-    (goto-char (point-min))
-    (if (re-search-forward "[ \t\n]*\\'" nil t)
-        (replace-match "\n" nil nil))))
-
-(defun magit-log-edit-append (str)
-  (with-current-buffer (get-buffer-create magit-log-edit-buffer-name)
-    (goto-char (point-max))
-    (insert str "\n")))
-
-(defconst magit-log-header-end "-- End of Magit header --\n")
-
-(defun magit-log-edit-get-fields ()
-  (let ((buf (get-buffer magit-log-edit-buffer-name))
-        (result nil))
-    (if buf
-        (with-current-buffer buf
-          (goto-char (point-min))
-          (while (looking-at "^\\([A-Za-z0-9-_]+\\): *\\(.+\\)?$")
-            (setq result (acons (intern (downcase (match-string 1)))
-                                (read (or (match-string 2) "nil"))
-                                result))
-            (forward-line))
-          (if (not (looking-at (regexp-quote magit-log-header-end)))
-              (setq result nil))))
-    (nreverse result)))
-
-(defun magit-log-edit-set-fields (fields)
-  (let ((buf (get-buffer-create magit-log-edit-buffer-name)))
-    (with-current-buffer buf
-      (goto-char (point-min))
-      (if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)*%s"
-                                         (regexp-quote magit-log-header-end))
-                                 nil t)
-          (delete-region (match-beginning 0) (match-end 0)))
-      (goto-char (point-min))
-      (when fields
-        (while fields
-          (insert (capitalize (symbol-name (caar fields))) ": "
-                  (prin1-to-string (cdar fields)) "\n")
-          (setq fields (cdr fields)))
-        (insert magit-log-header-end)))))
-
-(defun magit-log-edit-set-field (name value)
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)))
-    (cond (cell
-           (if value
-               (rplacd cell value)
-             (setq fields (delq cell fields))))
-          (t
-           (if value
-               (setq fields (append fields (list (cons name value)))))))
-    (magit-log-edit-set-fields fields)))
-
-(defun magit-log-edit-get-field (name)
-  (cdr (assq name (magit-log-edit-get-fields))))
-
-(defun magit-log-edit-toggle-field (name default)
-  "Toggle the log-edit field named NAME.
-If it's currently unset, set it to DEFAULT (t or nil).
-
-Return nil if the field is toggled off, and non-nil if it's
-toggled on.  When it's toggled on for the first time, return
-'first."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)) yesp)
-    (if cell
-        (progn
-          (setq yesp (equal (cdr cell) "yes"))
-          (rplacd cell (if yesp "no" "yes")))
-      (setq fields (acons name (if default "yes" "no") fields))
-      (setq yesp (if default 'first)))
-    (magit-log-edit-set-fields fields)
-    yesp))
-
-(defun magit-log-edit-toggle-input (name default)
-  "Toggle the log-edit input named NAME.
-If it's currently unset, set it to DEFAULT (a string). If it is
-set remove it.
-
-Return nil if the input is toggled off, and its valud if it's
-toggled on."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields))
-         result)
-    (if cell
-        (progn
-          (setq fields (assq-delete-all name fields)
-                result (cdr cell)))
-      (setq fields (acons name default fields)))
-    (magit-log-edit-set-fields fields)
-    result))
-
-(defun magit-log-edit-setup-author-env (author)
-  "Set GIT_AUTHOR_* variables from AUTHOR spec.
-If AUTHOR is nil, honor default values from
-environment (potentially empty)."
-  (when author
-    ;; XXX - this is a bit strict, probably.
-    (or (string-match "\\(.*\\) <\\(.*\\)>\\(?:,\\s-*\\(.+\\)\\)?" author)
-        (error "Can't parse author string"))
-    ;; Shucks, setenv destroys the match data.
-    (let ((name (match-string 1 author))
-          (email (match-string 2 author))
-          (date  (match-string 3 author)))
-      (make-local-variable 'process-environment)
-      (setenv "GIT_AUTHOR_NAME" name)
-      (setenv "GIT_AUTHOR_EMAIL" email)
-      (if date
-          (setenv "GIT_AUTHOR_DATE" date)))))
-
-(defun magit-log-edit-push-to-comment-ring (comment)
-  (when (or (ring-empty-p log-edit-comment-ring)
-            (not (equal comment (ring-ref log-edit-comment-ring 0))))
-    (ring-insert log-edit-comment-ring comment)))
-
-(defun magit-log-edit-commit ()
-  "Finish edits and create new commit object.
-\('git commit ...')"
-  (interactive)
-  (let* ((fields (magit-log-edit-get-fields))
-         (amend (equal (cdr (assq 'amend fields)) "yes"))
-         (allow-empty (equal (cdr (assq 'allow-empty fields)) "yes"))
-         (commit-all (equal (cdr (assq 'commit-all fields)) "yes"))
-         (sign-off-field (assq 'sign-off fields))
-         (sign-off (if sign-off-field
-                       (equal (cdr sign-off-field) "yes")
-                     magit-commit-signoff))
-         (tag-rev (cdr (assq 'tag-rev fields)))
-         (tag-name (cdr (assq 'tag-name fields)))
-         (author (cdr (assq 'author fields)))
-         (tag-options (cdr (assq 'tag-options fields))))
-
-    (unless (or (magit-anything-staged-p)
-                allow-empty
-                amend
-                tag-name
-                (file-exists-p (concat (magit-git-dir) "MERGE_HEAD"))
-                (and commit-all
-                     (not (magit-everything-clean-p))))
-      (error "Refusing to create empty commit. Maybe you want to amend (%s) or allow-empty (%s)?"
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-amending)))
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-allow-empty)))))
-
-    (magit-log-edit-push-to-comment-ring (buffer-string))
-    (magit-log-edit-setup-author-env author)
-    (magit-log-edit-set-fields nil)
-    (magit-log-edit-cleanup)
-    (if (= (buffer-size) 0)
-        (insert "(Empty description)\n"))
-    (let ((env process-environment)
-          (commit-buf (current-buffer)))
-      (with-current-buffer (magit-find-status-buffer default-directory)
-        (let ((process-environment env))
-          (cond (tag-name
-                 (apply #'magit-run-git-with-input commit-buf
-                        "tag" (append tag-options (list tag-name "-a" "-F" "-" tag-rev))))
-                (t
-                 (apply #'magit-run-async-with-input commit-buf
-                        magit-git-executable
-                        (append magit-git-standard-options
-                                '("commit")
-                                magit-custom-options
-                                '("-F" "-")
-                                (if (and commit-all (not allow-empty)) '("--all") '())
-                                (if amend '("--amend") '())
-                                (if allow-empty '("--allow-empty"))
-                                (if sign-off '("--signoff") '()))))))))
-    ;; shouldn't we kill that buffer altogether?
-    (erase-buffer)
-    (let ((magit-buf magit-buffer-internal))
-      (bury-buffer)
-      (set-buffer magit-buf))
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (delete-file (concat (magit-git-dir) "MERGE_MSG")))
-    ;; potentially the local environment has been altered with settings that
-    ;; were specific to this commit. Let's revert it
-    (kill-local-variable 'process-environment)
-    (magit-update-vc-modeline default-directory)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-cancel-log-message ()
-  "Abort edits and erase commit message being composed."
-  (interactive)
-  (when (or (not magit-log-edit-confirm-cancellation)
-            (yes-or-no-p
-             "Really cancel editing the log (any changes will be lost)?"))
-    (erase-buffer)
-    (bury-buffer)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-toggle-amending ()
-  "Toggle whether this will be an amendment to the previous commit.
-\(i.e., whether eventual commit does 'git commit --amend')"
-  (interactive)
-  (when (eq (magit-log-edit-toggle-field 'amend t) 'first)
-    (magit-log-edit-append
-     (magit-trim-line (magit-format-commit "HEAD" "%s%n%n%b")))))
-
-(defun magit-log-edit-toggle-signoff ()
-  "Toggle whether this commit will include a signoff.
-\(i.e., whether eventual commit does 'git commit --signoff')"
-  (interactive)
-  (magit-log-edit-toggle-field 'sign-off (not magit-commit-signoff)))
-
-(defun magit-log-edit-toggle-author ()
-  "Toggle whether this commit will include an author.
-\(i.e., whether eventual commit is run with GIT_AUTHOR_NAME and
-GIT_AUTHOR_EMAIL set)"
-  (interactive)
-  (magit-log-edit-toggle-input 'author (format "%s <%s>"
-                                               (or (magit-get "user" "name") "Author Name")
-                                               (or (magit-get "user" "email") "author@email"))))
-
-(defun magit-log-edit-toggle-allow-empty ()
-  "Toggle whether this commit is allowed to be empty.
-This means that the eventual commit does 'git commit --allow-empty'."
-  (interactive)
-  (magit-log-edit-toggle-field 'allow-empty t))
-
-(defun magit-pop-to-log-edit (operation)
-  (let ((dir default-directory)
-        (magit-buf (current-buffer))
-        (buf (get-buffer-create magit-log-edit-buffer-name)))
-    (setq magit-pre-log-edit-window-configuration
-          (current-window-configuration))
-    (pop-to-buffer buf)
-    (setq default-directory dir)
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (insert-file-contents (concat (magit-git-dir) "MERGE_MSG")))
-    (magit-log-edit-mode)
-    (make-local-variable 'magit-buffer-internal)
-    (setq magit-buffer-internal magit-buf)
-    (message "Type C-c C-c to %s (C-c C-k to cancel)." operation)))
-
-(defun magit-log-edit (&optional arg)
-  "Brings up a buffer to allow editing of commit messages.
-
-Giving a simple prefix arg will amend a previous commit, while
-a double prefix arg will allow creating an empty one.
-
-If there is a rebase in progress, offer the user the option to
-continue it.
-
-\\{magit-log-edit-mode-map}"
-  (interactive "P")
-  ;; If repository is dirty there is no point in trying to
-  ;; suggest to continue the rebase. Git will rebuke you and exit with
-  ;; error code, so suggest it only if theres absolutely nothing else
-  ;; to do and rebase is ongoing.
-  (if (and (magit-everything-clean-p)
-           (magit-rebase-info)
-           (y-or-n-p "Rebase in progress.  Continue it? "))
-      (magit-run-git-async "rebase" "--continue")
-
-    ;; If there's nothing staged, set commit flag to `nil', thus
-    ;; avoiding unnescessary popping up of the log edit buffer in case
-    ;; when user chose to forgo commiting all unstaged changes
-    (let ((amend-p (= (prefix-numeric-value arg) 4))
-          (empty-p (= (prefix-numeric-value arg) 16)))
-      (when (and magit-commit-all-when-nothing-staged
-                 (not (magit-everything-clean-p))
-                 (not (magit-anything-staged-p)))
-        (cond ((eq magit-commit-all-when-nothing-staged 'ask-stage)
-               (when (y-or-n-p "Nothing staged.  Stage everything now? ")
-                 (magit-stage-all)))
-              ((not (magit-log-edit-get-field 'commit-all))
-               (when (or (eq magit-commit-all-when-nothing-staged t)
-                         (y-or-n-p
-                          "Nothing staged.  Commit all unstaged changes? "))
-                 (magit-log-edit-set-field 'commit-all "yes")))))
-      (when amend-p
-        (magit-log-edit-toggle-amending))
-      (when empty-p
-        (magit-log-edit-toggle-allow-empty))
-      (let ((author-email (or (getenv "GIT_AUTHOR_EMAIL") ""))
-            (author-name (or (getenv "GIT_AUTHOR_NAME") ""))
-            (author-date (or (getenv "GIT_AUTHOR_DATE") "")))
-        (if (not (string= author-email ""))
-            (magit-log-edit-set-field 'author (format "%s <%s>%s"
-                                                      (if (string= "" author-name) author-email author-name)
-                                                      author-email
-                                                      (if (string= "" author-date) "" (format ", %s" author-date))))))
-      (magit-pop-to-log-edit "commit"))))
-
-(defun magit-add-log ()
-  (interactive)
-  (cond ((magit-rebase-info)
-         (if (y-or-n-p "Rebase in progress.  Continue it? ")
-             (magit-run-git-async "rebase" "--continue")))
-        (t
-         (let ((section (magit-current-section)))
-           (let ((fun (if (eq (magit-section-type section) 'hunk)
-                          (save-window-excursion
-                            (save-excursion
-                              (magit-visit-item)
-                              (add-log-current-defun)))
-                        nil))
-                 (file (magit-diff-item-file
-                        (cond ((eq (magit-section-type section) 'hunk)
-                               (magit-hunk-item-diff section))
-                              ((eq (magit-section-type section) 'diff)
-                               section)
-                              (t
-                               (error "No change at point"))))))
-             (magit-log-edit nil)
-             (goto-char (point-min))
-             (cond ((not (search-forward-regexp
-                          (format "^\\* %s" (regexp-quote file)) nil t))
-                    ;; No entry for file, create it.
-                    (goto-char (point-max))
-                    (insert (format "\n* %s" file))
-                    (if fun
-                        (insert (format " (%s)" fun)))
-                    (insert ": "))
-                   (fun
-                    ;; found entry for file, look for fun
-                    (let ((limit (or (save-excursion
-                                       (and (search-forward-regexp "^\\* "
-                                                                   nil t)
-                                            (match-beginning 0)))
-                                     (point-max))))
-                      (cond ((search-forward-regexp (format "(.*\\<%s\\>.*):"
-                                                            (regexp-quote fun))
-                                                    limit t)
-                             ;; found it, goto end of current entry
-                             (if (search-forward-regexp "^(" limit t)
-                                 (backward-char 2)
-                               (goto-char limit)))
-                            (t
-                             ;; not found, insert new entry
-                             (goto-char limit)
-                             (if (bolp)
-                                 (open-line 1)
-                               (newline))
-                             (insert (format "(%s): " fun))))))
-                   (t
-                    ;; found entry for file, look for beginning  it
-                    (when (looking-at ":")
-                      (forward-char 2)))))))))
-
-;;; Tags
-
-(magit-define-command tag (name rev)
-  "Create a new lightweight tag with the given NAME at REV.
-\('git tag NAME')."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (apply #'magit-run-git "tag" (append magit-custom-options (list name rev))))
-
-(magit-define-command annotated-tag (name rev)
-  "Start composing an annotated tag with the given NAME.
-Tag will point to the current 'HEAD'."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (magit-log-edit-set-field 'tag-name name)
-  (magit-log-edit-set-field 'tag-rev rev)
-  (magit-log-edit-set-field 'tag-options magit-custom-options)
-  (magit-pop-to-log-edit "tag"))
-
-;;; Stashing
-
-(defun magit-wash-stash ()
-  (if (search-forward-regexp "stash@{\\(.*?\\)}" (line-end-position) t)
-      (let ((stash (match-string-no-properties 0))
-            (name (match-string-no-properties 1)))
-        (delete-region (match-beginning 0) (match-end 0))
-        (goto-char (match-beginning 0))
-        (fixup-whitespace)
-        (goto-char (line-beginning-position))
-        (insert name)
-        (goto-char (line-beginning-position))
-        (magit-with-section stash 'stash
-          (magit-set-section-info stash)
-          (forward-line)))
-    (forward-line))
-  t)
-
-(defun magit-wash-stashes ()
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-stash)))
-
-(magit-define-inserter stashes ()
-  (magit-git-section 'stashes
-                     "Stashes:" 'magit-wash-stashes
-                     "stash" "list"))
-
-(magit-define-command stash (description)
-  "Create new stash of working tree and staging area named DESCRIPTION.
-Working tree and staging area revert to the current 'HEAD'.
-With prefix argument, changes in staging area are kept.
-\('git stash save [--keep-index] DESCRIPTION')"
-  (interactive "sStash description: ")
-  (apply 'magit-run-git `("stash" "save" ,@magit-custom-options "--" ,description)))
-
-(magit-define-command stash-snapshot ()
-  "Create new stash of working tree and staging area; keep changes in place.
-\('git stash save \"Snapshot...\"; git stash apply stash@{0}')"
-  (interactive)
-  (magit-with-refresh
-    (apply 'magit-run-git `("stash" "save" ,@magit-custom-options
-                   ,(format-time-string "Snapshot taken at %Y-%m-%d %H:%M:%S"
-                                       (current-time))))
-    (magit-run-git "stash" "apply" "stash@{0}")))
-
-(defvar magit-currently-shown-stash nil)
-
-(define-derived-mode magit-stash-mode magit-mode "Magit Stash"
-  "Mode for looking at a git stash.
-
-\\{magit-stash-mode-map}"
-  :group 'magit)
-
-(defvar magit-stash-buffer-name "*magit-stash*"
-  "Buffer name for displaying a stash.")
-
-(defun magit-show-stash (stash &optional scroll)
-  (when (magit-section-p stash)
-    (setq stash (magit-section-info stash)))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-stash-buffer-name))
-        (stash-id (magit-git-string "rev-list" "-1" stash)))
-    (cond ((and (equal magit-currently-shown-stash stash-id)
-                (with-current-buffer buf
-                  (> (length (buffer-string)) 1)))
-           (let ((win (get-buffer-window buf)))
-             (cond ((not win)
-                    (display-buffer buf))
-                   (scroll
-                    (with-selected-window win
-                      (funcall scroll))))))
-          (t
-           (setq magit-currently-shown-stash stash-id)
-           (display-buffer buf)
-           (with-current-buffer buf
-             (set-buffer buf)
-             (goto-char (point-min))
-             (let* ((range (cons (concat stash "^2^") stash))
-                    (magit-current-diff-range range)
-                    (args (magit-rev-range-to-git range)))
-               (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer
-                                range args)))))))
-;;; Commits
-
-(defun magit-commit-at-point (&optional nil-ok-p)
-  (let* ((section (magit-current-section))
-         (commit (if (and section
-                          (eq (magit-section-type section) 'commit))
-                     (magit-section-info section)
-                 (get-text-property (point) 'revision))))
-    (if nil-ok-p
-        commit
-      (or commit
-          (error "No commit at point")))))
-
-(defun magit-apply-commit (commit &optional docommit noerase revert)
-  (let* ((parent-id (magit-choose-parent-id commit "cherry-pick"))
-         (success (magit-run* `(,magit-git-executable
-                                ,@magit-git-standard-options
-                                ,(if revert "revert" "cherry-pick")
-                                ,@(if parent-id
-                                      (list "-m" (number-to-string parent-id)))
-                                ,@(if (not docommit) (list "--no-commit"))
-                                ,commit)
-                              nil noerase)))
-    (when (and (not docommit) success)
-      (cond (revert
-             (magit-log-edit-append
-              (magit-format-commit commit "Reverting \"%s\"")))
-            (t
-             (magit-log-edit-append
-              (magit-format-commit commit "%s%n%n%b"))
-             (magit-log-edit-set-field
-              'author
-              (magit-format-commit commit "%an <%ae>, %ai")))))
-    success))
-
-(defun magit-apply-item ()
-  (interactive)
-  (magit-section-action (item info "apply")
-    ((pending commit)
-     (magit-apply-commit info)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info))
-    ((unstaged *)
-     (error "Change is already in your working tree"))
-    ((staged *)
-     (error "Change is already in your working tree"))
-    ((hunk)
-     (magit-apply-hunk-item item))
-    ((diff)
-     (magit-apply-diff-item item))
-    ((stash)
-     (magit-run-git "stash" "apply" info))))
-
-(defun magit-cherry-pick-item ()
-  (interactive)
-  (magit-section-action (item info "cherry-pick")
-    ((pending commit)
-     (magit-apply-commit info t)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info t))
-    ((stash)
-     (magit-run-git "stash" "pop" info))))
-
-(defmacro magit-with-revert-confirmation (&rest body)
-  `(when (or (not magit-revert-item-confirm)
-             (yes-or-no-p "Really revert this item? "))
-     ,@body))
-
-(defun magit-revert-item ()
-  (interactive)
-  (magit-section-action (item info "revert")
-    ((pending commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)
-      (magit-rewrite-set-commit-property info 'used nil)))
-    ((commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)))
-    ;; Reverting unstaged changes cannot be undone
-    ((unstaged *)
-     (magit-discard-item))
-    ((hunk)
-     (magit-with-revert-confirmation
-      (magit-apply-hunk-item-reverse item)))
-    ((diff)
-     (magit-with-revert-confirmation
-      (magit-apply-diff-item item "--reverse")))))
-
-(defun magit-log-show-more-entries (&optional arg)
-  "Grow the number of log entries shown.
-
-With no prefix optional ARG, show twice as many log entries.
-With a numerical prefix ARG, add this number to the number of shown log entries.
-With a non numeric prefix ARG, show all entries"
-  (interactive "P")
-  (make-local-variable 'magit-log-cutoff-length)
-  (cond
-   ((numberp arg)
-    (setq magit-log-cutoff-length (+ magit-log-cutoff-length arg)))
-   (arg
-    (setq magit-log-cutoff-length magit-log-infinite-length))
-   (t (setq magit-log-cutoff-length (* magit-log-cutoff-length 2))))
-  (let ((old-point (point)))
-    (magit-refresh)
-    (goto-char old-point)))
-
-(defun magit-refresh-log-buffer (range style args)
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range "Commits")
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             ,@args
-             "--"))))
-
-(define-derived-mode magit-log-mode magit-mode "Magit Log"
-  "Mode for looking at git log.
-
-\\{magit-log-mode-map}"
-  :group 'magit)
-
-(defvar magit-log-buffer-name "*magit-log*"
-  "Buffer name for display of log entries.")
-
-(magit-define-command log-ranged ()
-  (interactive)
-  (magit-log t))
-(define-obsolete-function-alias 'magit-display-log-ranged 'magit-log-ranged)
-
-(magit-define-command log (&optional ask-for-range &rest extra-args)
-  (interactive)
-  (let* ((log-range (if ask-for-range
-                        (magit-read-rev-range "Log" "HEAD")
-                      "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (nconc (list (magit-rev-range-to-git log-range))
-                      magit-custom-options
-                      extra-args)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer log-range
-                     'oneline args)))
-
-(define-obsolete-function-alias 'magit-display-log 'magit-log)
-
-(magit-define-command log-long-ranged ()
-  (interactive)
-  (magit-log-long t))
-
-(magit-define-command log-long (&optional ranged)
-  (interactive)
-  (let* ((range (if ranged
-                    (magit-read-rev-range "Long log" "HEAD")
-                  "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (append (list (magit-rev-range-to-git range))
-                       magit-custom-options)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer range
-                     'long args)))
-
-;;; Reflog
-
-(defvar magit-reflog-head nil
-  "The HEAD of the reflog in the current buffer.
-This is only non-nil in reflog buffers.")
-(make-variable-buffer-local 'magit-reflog-head)
-
-(defun magit-refresh-reflog-buffer (head args)
-  (setq magit-reflog-head head)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section
-           'reflog (format "Local history of head %s" head) 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    "--walk-reflogs"
-                    (format "--max-count=%s" magit-log-cutoff-length)
-                    args)))))
-
-(define-derived-mode magit-reflog-mode magit-log-mode "Magit Reflog"
-  "Mode for looking at git reflog.
-
-\\{magit-reflog-mode-map}"
-  :group 'magit)
-
-(magit-define-command reflog (&optional ask-for-range)
-  (interactive)
-  (let ((at (or (if ask-for-range
-                    (magit-read-rev "Reflog of" (or (magit-guess-branch) "HEAD")))
-                "HEAD")))
-    (let* ((topdir (magit-get-top-dir default-directory))
-           (args (magit-rev-to-git at)))
-      (magit-buffer-switch "*magit-reflog*")
-      (magit-mode-init topdir 'magit-reflog-mode
-                       #'magit-refresh-reflog-buffer at args))))
-
-(magit-define-command reflog-ranged ()
-  (interactive)
-  (magit-reflog t))
-
-;;; Diffing
-
-(defvar magit-ediff-buffers nil
-  "List of buffers that may be killed by `magit-ediff-restore'.")
-
-(defvar magit-ediff-windows nil
-  "The window configuration that will be restored when Ediff is finished.")
-
-(defun magit-ediff()
-  "View the current DIFF section in ediff."
-  (interactive)
-  (let ((diff (magit-current-section)))
-    (when (magit-section-hidden diff)
-      ;; Range is not set until the first time the diff is visible.
-      ;; This somewhat hackish code makes sure it's been visible at least once.
-      (magit-toggle-section)
-      (magit-toggle-section)
-      (setq diff (magit-current-section)))
-    (if (eq 'hunk (magit-section-type diff))
-        (setq diff (magit-section-parent diff)))
-    (unless (eq 'diff (magit-section-type diff))
-      (error "No diff at this location"))
-    (let* ((type (magit-diff-item-kind diff))
-           (file1 (magit-diff-item-file diff))
-           (file2 (magit-diff-item-file2 diff))
-           (range (magit-diff-item-range diff)))
-      (cond
-       ((memq type '(new deleted typechange))
-        (message "Why ediff a %s file?" type))
-       ((and (eq type 'unmerged)
-             (eq (cdr range) 'working))
-        (magit-interactive-resolve file1))
-       ((consp (car range))
-        (magit-ediff* (magit-show (caar range) file2)
-                      (magit-show (cdar range) file2)
-                      (magit-show (cdr range) file1)))
-       (t
-        (magit-ediff* (magit-show (car range) file2)
-                      (magit-show (cdr range) file1)))))))
-
-(defun magit-ediff* (a b &optional c)
-  (setq magit-ediff-buffers (list a b c))
-  (setq magit-ediff-windows (current-window-configuration))
-  (add-hook 'ediff-quit-hook 'magit-ediff-restore 'append)
-  (if c
-      (ediff-buffers3 a b c)
-    (ediff-buffers a b)))
-
-(defun magit-ediff-restore()
-  "Kill any buffers in `magit-ediff-buffers' that are not visiting files and
-restore the window state that was saved before ediff was called."
-  (dolist (buffer magit-ediff-buffers)
-    (if (and (null (buffer-file-name buffer))
-             (buffer-live-p buffer))
-        (kill-buffer buffer)))
-  (setq magit-ediff-buffers nil)
-  (set-window-configuration magit-ediff-windows)
-  (remove-hook 'ediff-quit-hook 'magit-ediff-restore))
-
-(defun magit-refresh-diff-buffer (range args)
-  (let ((magit-current-diff-range (cond
-                                   ((stringp range)
-                                    (cons range 'working))
-                                   ((null (cdr range))
-                                    (cons (car range) 'working))
-                                   (t
-                                    range))))
-    (setq magit-current-range range)
-    (magit-create-buffer-sections
-      (magit-git-section 'diffbuf
-                         (magit-rev-range-describe range "Changes")
-                         'magit-wash-diffs
-                         "diff" (magit-diff-U-arg) args "--"))))
-
-(define-derived-mode magit-diff-mode magit-mode "Magit Diff"
-  "Mode for looking at a git diff.
-
-\\{magit-diff-mode-map}"
-  :group 'magit)
-
-(magit-define-command diff (range)
-  (interactive (list (magit-read-rev-range "Diff")))
-  (if range
-      (let* ((dir default-directory)
-             (args (magit-rev-range-to-git range))
-             (buf (get-buffer-create "*magit-diff*")))
-        (display-buffer buf)
-        (with-current-buffer buf
-          (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer range args)))))
-
-(magit-define-command diff-working-tree (rev)
-  (interactive (list (magit-read-rev "Diff with" (magit-default-rev))))
-  (magit-diff (or rev "HEAD")))
-
-(defun magit-diff-with-mark ()
-  (interactive)
-  (magit-diff (cons (magit-marked-commit)
-                    (magit-commit-at-point))))
-
-;;; Wazzup
-
-(defvar magit-wazzup-head nil
-  "The integration head for the current wazzup buffer.
-This is only non-nil in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-head)
-
-(defvar magit-wazzup-all-p nil
-  "Non-nil if the current wazzup buffer displays excluded branches.
-This is only meaningful in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-all-p)
-
-(defun magit-wazzup-toggle-ignore (branch edit)
-  (let ((ignore-file (concat (magit-git-dir) "info/wazzup-exclude")))
-    (if edit
-        (setq branch (read-string "Branch to ignore for wazzup: " branch)))
-    (let ((ignored (magit-file-lines ignore-file)))
-      (cond ((member branch ignored)
-             (when (or (not edit)
-                       (y-or-n-p "Branch %s is already ignored.  Unignore? "))
-               (setq ignored (delete branch ignored))))
-            (t
-             (setq ignored (append ignored (list branch)))))
-      (magit-write-file-lines ignore-file ignored)
-      (magit-need-refresh))))
-
-(defun magit-refresh-wazzup-buffer (head all)
-  (setq magit-wazzup-head head)
-  (setq magit-wazzup-all-p all)
-  (let ((branch-desc (or head "(detached) HEAD")))
-    (unless head (setq head "HEAD"))
-    (magit-create-buffer-sections
-      (magit-with-section 'wazzupbuf nil
-        (insert (format "Wazzup, %s\n\n" branch-desc))
-        (let* ((excluded (magit-file-lines (concat (magit-git-dir) "info/wazzup-exclude")))
-               (all-branches (magit-list-interesting-refs))
-               (branches (if all all-branches
-                           (delq nil (mapcar
-                                      (lambda (b)
-                                        (and (not
-                                              (member (cdr b) excluded))
-                                             b))
-                                      all-branches))))
-               (reported (make-hash-table :test #'equal)))
-          (dolist (branch branches)
-            (let* ((name (car branch))
-                   (ref (cdr branch))
-                   (hash (magit-rev-parse ref))
-                   (reported-branch (gethash hash reported)))
-              (unless (or (and reported-branch
-                               (string= (file-name-nondirectory ref)
-                                        reported-branch))
-                          (not (magit-git-string "merge-base" head ref)))
-                (puthash hash (file-name-nondirectory ref) reported)
-                (let* ((n (length (magit-git-lines "log" "--pretty=oneline"
-                                                   (concat head ".." ref))))
-                       (section
-                        (let ((magit-section-hidden-default t))
-                          (magit-git-section
-                           (cons ref 'wazzup)
-                           (format "%s unmerged commits in %s%s"
-                                   n name
-                                   (if (member ref excluded)
-                                       " (normally ignored)"
-                                     ""))
-                           'magit-wash-log
-                           "log"
-                           (format "--max-count=%s" magit-log-cutoff-length)
-                           "--abbrev-commit"
-                           (format "--abbrev=%s" magit-sha1-abbrev-length)
-                           "--graph"
-                           "--pretty=oneline"
-                           (format "%s..%s" head ref)
-                           "--"))))
-                  (magit-set-section-info ref section))))))))))
-
-(define-derived-mode magit-wazzup-mode magit-mode "Magit Wazzup"
-  "Mode for looking at commits that could be merged from other branches.
-
-\\{magit-wazzup-mode-map}"
-  :group 'magit)
-
-(defun magit-wazzup (&optional all)
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-branch (magit-get-current-branch)))
-    (magit-buffer-switch "*magit-wazzup*")
-    (magit-mode-init topdir 'magit-wazzup-mode
-                     #'magit-refresh-wazzup-buffer
-                     current-branch all)))
-
-(defun magit-filename (filename)
-  "Return the path of FILENAME relative to its git repository.
-
-If FILENAME is absolute, return a path relative to the git
-repository containing it. Otherwise, return a path relative to
-the current git repository."
-  (let ((topdir (expand-file-name
-                 (magit-get-top-dir (or (file-name-directory filename)
-                                        default-directory))))
-        (file (file-truename filename)))
-    (when (and (not (string= topdir ""))
-               ;; FILE must start with the git repository path
-               (zerop (string-match-p (concat "\\`" topdir) file)))
-      (substring file (length topdir)))))
-
-;; This variable is used to keep track of the current file in the
-;; *magit-log* buffer when this one is dedicated to showing the log of
-;; just 1 file.
-(defvar magit-file-log-file nil)
-(make-variable-buffer-local 'magit-file-log-file)
-
-(defun magit-refresh-file-log-buffer (file range style)
-  "Refresh the current file-log buffer by calling git.
-
-FILE is the path of the file whose log must be displayed.
-
-`magit-current-range' will be set to the value of RANGE.
-
-STYLE controls the display. It is either `'long',  `'oneline', or something else.
- "
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (setq magit-file-log-file file)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range (format "Commits for file %s" file))
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             "--"
-             ,file))))
-
-(defun magit-file-log (&optional all)
-  "Display the log for the currently visited file or another one.
-
-With a prefix argument or if no file is currently visited, ask
-for the file whose log must be displayed."
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-file (magit-filename
-                       (if (or current-prefix-arg (not buffer-file-name))
-                           (magit-read-file-from-rev (magit-get-current-branch))
-                        buffer-file-name)))
-        (range "HEAD"))
-    (magit-buffer-switch "*magit-log*")
-    (magit-mode-init topdir 'magit-log-mode
-                     #'magit-refresh-file-log-buffer
-                     current-file range 'oneline)))
-
-(defun magit-show-file-revision ()
-  "Open a new buffer showing the current file in the revision at point."
-  (interactive)
-  (flet ((magit-show-file-from-diff (item)
-                                    (switch-to-buffer-other-window
-                                     (magit-show (cdr (magit-diff-item-range item))
-                                                 (magit-diff-item-file item)))))
-    (magit-section-action (item info "show")
-      ((commit)
-       (let ((current-file (or magit-file-log-file
-                               (magit-read-file-from-rev info))))
-         (switch-to-buffer-other-window
-          (magit-show info current-file))))
-      ((hunk) (magit-show-file-from-diff (magit-hunk-item-diff item)))
-      ((diff) (magit-show-file-from-diff item)))))
-
-;;; Miscellaneous
-
-(defun magit-ignore-modifiable-file (file edit)
-  "Prompt the user for the filename to be added to git ignore.
-\\<minibuffer-local-map>
-The minibuffer's future history (accessible with \\[next-history-element])
-contains predefined values (such as wildcards) that might
-be of interest.
-The history and default value are derived from the filename FILE.
-If EDIT argument is negative, the prompt proposes wildcard by default.
-"
-  (let* ((just-extension (concat "*." (file-name-extension file)))
-         (full-extension (concat (file-name-directory file) just-extension))
-         (just-file (file-name-nondirectory file))
-         ;; change the order in history depending on the negativity of
-         ;; EDIT.
-         (history (if (< (prefix-numeric-value edit) 0)
-                      (list full-extension just-extension file just-file)
-                    (list file full-extension just-extension just-file))))
-    (read-string
-     (format "File to ignore [%s]: " (car history))
-     nil nil history)))
-
-(defun magit-ignore-file (file edit local)
-  "Add FILE to the list of files to ignore.
-\\<minibuffer-local-map>
-If EDIT is non-`nil', prompt the user for the filename to
-be added to git ignore. In this case, the minibuffer's
-future history (accessible with \\[next-history-element]) contains predefined
-values (such as wildcards) that might be of interest.
-
-If LOCAL is nil, the `.gitignore' file is updated.
-Otherwise, it is `.git/info/exclude'."
-  (let* ((local-ignore-dir (concat (magit-git-dir) "info/"))
-         (ignore-file (if local
-                          (concat local-ignore-dir "exclude")
-                        ".gitignore")))
-    (if edit
-      (setq file (magit-ignore-modifiable-file file edit)))
-    (if (and local (not (file-exists-p local-ignore-dir)))
-        (make-directory local-ignore-dir t))
-    (with-temp-buffer
-      (when (file-exists-p ignore-file)
-        (insert-file-contents ignore-file))
-      (goto-char (point-max))
-      (unless (bolp)
-        (insert "\n"))
-      (insert file "\n")
-      (write-region nil nil ignore-file))
-    (magit-need-refresh)))
-
-(defun magit-ignore-item ()
-  "Add FILE to the `.gitignore' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-\(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg nil))
-    ((wazzup)
-     (magit-wazzup-toggle-ignore info current-prefix-arg))))
-
-(defun magit-ignore-item-locally ()
-  "Add FILE to the `.git/info/exclude' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg t))))
-
-(defun magit-discard-diff (diff stagedp)
-  (let ((kind (magit-diff-item-kind diff))
-        (file (magit-diff-item-file diff)))
-    (cond ((eq kind 'deleted)
-           (when (yes-or-no-p (format "Resurrect %s? " file))
-             (magit-run-git "reset" "-q" "--" file)
-             (magit-run-git "checkout" "--" file)))
-          ((eq kind 'new)
-           (if (yes-or-no-p (format "Delete %s? " file))
-               (magit-run-git "rm" "-f" "--" file)))
-          (t
-           (if (yes-or-no-p (format "Discard changes to %s? " file))
-               (if stagedp
-                   (magit-run-git "checkout" "HEAD" "--" file)
-                 (magit-run-git "checkout" "--" file)))))))
-
-(defun magit-discard-item ()
-  (interactive)
-  (magit-section-action (item info "discard")
-    ((untracked file)
-     (when (yes-or-no-p (format "Delete %s? " info))
-       (if (and (file-directory-p info)
-                (not (file-symlink-p info)))
-           (magit-delete-directory info 'recursive)
-         (delete-file info))
-       (magit-refresh-buffer)))
-    ((untracked)
-     (if (yes-or-no-p "Delete all untracked files and directories? ")
-         (magit-run-git "clean" "-df")))
-    ((unstaged diff hunk)
-     (when (yes-or-no-p (if (magit-use-region-p)
-                            "Discard changes in region? "
-                          "Discard hunk? "))
-       (magit-apply-hunk-item-reverse item)))
-    ((staged diff hunk)
-     (if (magit-file-uptodate-p (magit-diff-item-file
-                                 (magit-hunk-item-diff item)))
-         (when (yes-or-no-p (if (magit-use-region-p)
-                                "Discard changes in region? "
-                              "Discard hunk? "))
-           (magit-apply-hunk-item-reverse item "--index"))
-       (error "Can't discard this hunk.  Please unstage it first")))
-    ((unstaged diff)
-     (magit-discard-diff item nil))
-    ((staged diff)
-     (if (magit-file-uptodate-p (magit-diff-item-file item))
-         (magit-discard-diff item t)
-       (error "Can't discard staged changes to this file.  Please unstage it first")))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((hunk)
-     (error "Can't discard this hunk"))
-    ((diff)
-     (error "Can't discard this diff"))
-    ((stash)
-     (when (yes-or-no-p "Discard stash? ")
-       (magit-run-git "stash" "drop" info)))
-    ((branch)
-     (when (yes-or-no-p (if current-prefix-arg
-                            "Force delete branch?"
-                          "Delete branch? "))
-       (magit-delete-branch info current-prefix-arg)))
-    ((remote)
-     (when (yes-or-no-p "Remove remote? ")
-       (magit-remove-remote info)))))
-
-(defun magit-move-item ()
-  (interactive)
-  (magit-section-action (item info "move")
-    ((branch)
-     (call-interactively 'magit-move-branch))
-    ((remote)
-     (call-interactively 'magit-rename-remote))))
-
-(defmacro magit-visiting-file-item (&rest body)
-  `(let ((marker (save-window-excursion
-                   (magit-visit-file-item)
-                   (set-marker (make-marker) (point)))))
-     (save-excursion
-       (with-current-buffer (marker-buffer marker)
-         (goto-char marker)
-         ,@body))))
-
-(defun magit-add-change-log-entry-no-option (&optional other-window)
-  "Add a change log entry for current change.
-With a prefix argument, edit in other window.
-The name of the change log file is set by variable change-log-default-name."
-  (interactive "P")
-  (if other-window
-      (magit-visiting-file-item (add-change-log-entry-other-window))
-    (magit-visiting-file-item (add-change-log-entry))))
-
-(defun magit-add-change-log-entry-other-window ()
-  (interactive)
-  (magit-visiting-file-item (call-interactively 'add-change-log-entry-other-window)))
-
-(eval-after-load 'dired-x
-  '(defun magit-dired-jump (&optional other-window)
-    "Visit current item.
-With a prefix argument, visit in other window."
-    (interactive "P")
-    (require 'dired-x)
-    (magit-section-action (item info "dired-jump")
-      ((untracked file)
-       (dired-jump other-window (file-truename info)))
-      ((diff)
-       (dired-jump other-window (file-truename (magit-diff-item-file item))))
-      ((hunk)
-       (dired-jump other-window
-                   (file-truename (magit-diff-item-file
-                                   (magit-hunk-item-diff item))))))))
-
-(defun magit-visit-file-item (&optional other-window)
-  "Visit current file associated with item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit-file")
-    ((untracked file)
-     (funcall
-      (if other-window 'find-file-other-window 'find-file)
-      info))
-    ((diff)
-     (let ((file (magit-diff-item-file item)))
-       (cond ((not (file-exists-p file))
-              (error "Can't visit deleted file: %s" file))
-             ((file-directory-p file)
-              (magit-status file))
-             (t
-              (funcall
-               (if other-window 'find-file-other-window 'find-file)
-               file)))))
-    ((hunk)
-     (let ((file (magit-diff-item-file (magit-hunk-item-diff item)))
-           (line (magit-hunk-item-target-line item)))
-       (if (not (file-exists-p file))
-           (error "Can't visit deleted file: %s" file))
-       (funcall
-        (if other-window 'find-file-other-window 'find-file)
-        file)
-       (goto-char (point-min))
-       (forward-line (1- line))))))
-
-(defun magit-visit-item (&optional other-window)
-  "Visit current item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit")
-    ((untracked file)
-     (call-interactively 'magit-visit-file-item))
-    ((diff)
-     (call-interactively 'magit-visit-file-item))
-    ((hunk)
-     (call-interactively 'magit-visit-file-item))
-    ((commit)
-     (magit-show-commit info nil nil 'select))
-    ((stash)
-     (magit-show-stash info)
-     (pop-to-buffer magit-stash-buffer-name))
-    ((branch)
-     (magit-checkout info))
-    ((longer)
-     (magit-log-show-more-entries ()))))
-
-(defun magit-show-item-or-scroll-up ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-up))
-    ((stash)
-     (magit-show-stash info #'scroll-up))
-    (t
-     (scroll-up))))
-
-(defun magit-show-item-or-scroll-down ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-down))
-    ((stash)
-     (magit-show-stash info #'scroll-down))
-    (t
-     (scroll-down))))
-
-(defun magit-mark-item (&optional unmark)
-  (interactive "P")
-  (if unmark
-      (magit-set-marked-commit nil)
-    (magit-section-action (item info "mark")
-      ((commit)
-       (magit-set-marked-commit (if (eq magit-marked-commit info)
-                                    nil
-                                  info))))))
-
-(defun magit-describe-item ()
-  (interactive)
-  (let ((section (magit-current-section)))
-    (message "Section: %s %s-%s %S %S %S"
-             (magit-section-type section)
-             (magit-section-beginning section)
-             (magit-section-end section)
-             (magit-section-title section)
-             (magit-section-info section)
-             (magit-section-context-type section))))
-
-(defun magit-copy-item-as-kill ()
-  "Copy sha1 of commit at point into kill ring."
-  (interactive)
-  (magit-section-action (item info "copy")
-    ((commit)
-     (kill-new info)
-     (message "%s" info))))
-
-(eval-when-compile (require 'server))
-
-(defun magit-server-running-p ()
-  "Test whether server is running (works with < 23 as well).
-
-Return values:
-  nil              the server is definitely not running.
-  t                the server seems to be running.
-  something else   we cannot determine whether it's running without using
-                   commands which may have to wait for a long time."
-  (require 'server)
-  (if (functionp 'server-running-p)
-      (server-running-p)
-    (condition-case nil
-        (if server-use-tcp
-            (with-temp-buffer
-              (insert-file-contents-literally (expand-file-name server-name server-auth-dir))
-              (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
-                       (assq 'comm
-                             (process-attributes
-                              (string-to-number (match-string 1))))
-                       t)
-                  :other))
-          (delete-process
-           (make-network-process
-            :name "server-client-test" :family 'local :server nil :noquery t
-            :service (expand-file-name server-name server-socket-dir)))
-          t)
-      (file-error nil))))
-
-(defun magit-interactive-rebase ()
-  "Start a git rebase -i session, old school-style."
-  (interactive)
-  (unless (magit-server-running-p)
-    (server-start))
-  (let* ((section (get-text-property (point) 'magit-section))
-         (commit (and (member 'commit (magit-section-context-type section))
-                      (magit-section-info section)))
-         (old-editor (getenv "GIT_EDITOR")))
-    (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
-                                 " -s " server-name))
-    (unwind-protect
-        (magit-run-git-async "rebase" "-i"
-                             (or (and commit (concat commit "^"))
-                                 (magit-read-rev "Interactively rebase to" (magit-guess-branch))))
-      (if old-editor
-          (setenv "GIT_EDITOR" old-editor)))))
-
-(define-derived-mode magit-branch-manager-mode magit-mode "Magit Branch"
-  "Magit Branches")
-
-(defun magit-quit-window (&optional kill-buffer)
-  "Bury the buffer and delete its window.  With a prefix argument, kill the
-buffer instead."
-  (interactive "P")
-  (quit-window kill-buffer (selected-window)))
-
-(defun magit--branch-name-at-point ()
-  "Get the branch name in the line at point."
-  (let ((branch (magit-section-info (magit-current-section))))
-    (or branch (error "No branch at point"))))
-
-(defun magit--branches-for-remote-repo (remote)
-  "Return a list of remote branch names for REMOTE.
-These are the branch names with the remote name stripped."
-  (remq nil
-        (mapcar (lambda (line)
-                  (save-match-data
-                    (if (and (not (string-match-p " -> " line))
-                             (string-match (concat "^ +" remote "/\\([^ $]+\\)")
-                                           line))
-                        (match-string 1 line))))
-                (magit-git-lines "branch" "-r"))))
-
-(defvar magit-branches-buffer-name "*magit-branches*")
-
-(defun magit--is-branch-at-point-remote ()
-  "Return non-nil if the branch at point is a remote tracking branch"
-  (magit-remote-part-of-branch (magit--branch-name-at-point)))
-
-(defun magit-remote-part-of-branch (branch)
-  (when (string-match-p "^\\(?:refs/\\)?remotes\\/" branch)
-    (loop for remote in (magit-git-lines "remote")
-          when (string-match-p (format "^\\(?:refs/\\)?remotes\\/%s\\/" (regexp-quote remote)) branch) return remote)))
-
-(defun magit-branch-no-remote (branch)
-  (let ((remote (magit-remote-part-of-branch branch)))
-    (if remote
-        (progn
-          ;; This has to match if remote is non-nil
-          (assert (string-match (format "^\\(?:refs/\\)?remotes\\/%s\\/\\(.*\\)" (regexp-quote remote)) branch)
-                  'show-args "Unexpected string-match failure: %s %s")
-          (match-string 1 branch))
-      branch)))
-
-(defun magit-wash-branch-line (&optional remote-name)
-  (looking-at (concat
-               "^\\([ *] \\)"                 ; 1: current branch marker
-               "\\(.+?\\) +"                  ; 2: branch name
-
-               "\\(?:"
-
-               "\\([0-9a-fA-F]+\\)"           ; 3: sha1
-               " "
-               "\\(?:\\["
-               "\\([^:\n]+?\\)"               ; 4: tracking (non-greedy + to avoid matching \n)
-               "\\(?:: \\)?"
-               "\\(?:ahead \\([0-9]+\\)\\)?"  ; 5: ahead
-               "\\(?:, \\)?"
-               "\\(?:behind \\([0-9]+\\)\\)?" ; 6: behind
-               "\\] \\)?"
-               "\\(?:.*\\)"                   ; message
-
-               "\\|"                          ; or
-
-               "-> "                          ; the pointer to
-               "\\(.+\\)"                     ; 7: a ref
-
-               "\\)\n"))
-
-  (let* ((current-string (match-string 1))
-         (branch         (match-string 2))
-         (sha1           (match-string 3))
-         (tracking       (match-string 4))
-         (ahead          (match-string 5))
-         (behind         (match-string 6))
-         (other-ref      (match-string 7))
-         (current (string-match-p "^\\*" current-string)))
-
-    ; the current line is deleted before being reconstructed
-    (delete-region (point)
-                   (line-beginning-position 2))
-
-    (magit-with-section branch 'branch
-      (magit-set-section-info branch)
-      (insert-before-markers
-       ; sha1
-       (propertize (or sha1
-                       (make-string magit-sha1-abbrev-length ? ))
-                   'face 'magit-log-sha1)
-       " "
-       ; current marker
-       (if current
-           "# "
-         "  ")
-       ; branch name
-       (apply 'propertize (magit-branch-no-remote branch)
-              (if current
-                  '(face magit-branch)))
-       ; other ref that this branch is pointing to
-       (if other-ref
-           (concat " -> " (substring other-ref (+ 1 (length remote-name))))
-         "")
-       ; tracking information
-       (if (and tracking
-                (equal (magit-remote-branch-for branch t)
-                       (concat "refs/remotes/" tracking)))
-           (concat " ["
-                   ; getting rid of the tracking branch name if it is the same as the branch name
-                   (let* ((tracking-remote (magit-get "branch" branch "remote"))
-                          (tracking-branch (substring tracking (+ 1 (length tracking-remote)))))
-                     (propertize (if (string= branch tracking-branch)
-                                     (concat "@ " tracking-remote)
-                                   (concat tracking-branch " @ " tracking-remote))
-                                 'face 'magit-log-head-label-remote))
-                   ; ahead/behind information
-                   (if (or ahead
-                           behind)
-                       ": "
-                     "")
-                   (if ahead
-                       (concat "ahead "
-                               (propertize ahead
-                                           'face (if current
-                                                     'magit-branch))
-                               (if behind
-                                   ", "
-                                 ""))
-                     "")
-                   (if behind
-                       (concat "behind "
-                               (propertize behind
-                                           'face 'magit-log-head-label-remote))
-                     "")
-                   "]")
-         "")
-       "\n"))))
-
-(defun magit-wash-remote-branches-group (group)
-  (let* ((remote-name (first group))
-         (url (magit-get "remote" remote-name "url"))
-         (push-url (magit-get "remote" remote-name "pushurl"))
-         (urls (concat url (if push-url
-                               (concat ", "push-url)
-                             "")))
-         (marker (second group)))
-
-    (magit-with-section (concat "remote:" remote-name) 'remote
-      (magit-set-section-info remote-name)
-      (insert-before-markers (propertize (format "%s (%s):" remote-name urls) 'face 'magit-section-title) "\n")
-      (magit-wash-branches-between-point-and-marker marker remote-name))
-    (insert-before-markers "\n")))
-
-(defun magit-wash-branches-between-point-and-marker (marker &optional remote-name)
-  (save-restriction
-    (narrow-to-region (point) marker)
-    (magit-wash-sequence
-     (if remote-name
-         (apply-partially 'magit-wash-branch-line remote-name)
-       #'magit-wash-branch-line))))
-
-(defun magit-wash-branches ()
-         ; get the names of the remotes
-  (let* ((remotes (magit-git-lines "remote"))
-         ; get the location of remotes in the buffer
-         (markers
-          (append (mapcar (lambda (remote)
-                            (save-excursion
-                              (when (search-forward-regexp
-                                     (concat "^  remotes\\/" remote) nil t)
-                                (beginning-of-line)
-                                (point-marker))))
-                          remotes)
-                  (list (save-excursion
-                          (goto-char (point-max))
-                          (point-marker)))))
-         ; list of remote elements to display in the buffer
-         (remote-groups (loop for remote in remotes
-                              for end-markers on (cdr markers)
-                              for marker = (loop for x in end-markers thereis x)
-                              collect (list remote marker))))
-
-    ; actual displaying of information
-    (magit-with-section "local" nil
-      (insert-before-markers (propertize "Local:" 'face 'magit-section-title) "\n")
-      (magit-set-section-info ".")
-      (magit-wash-branches-between-point-and-marker
-       (loop for x in markers thereis x)))
-
-    (insert-before-markers "\n")
-
-    (mapc 'magit-wash-remote-branches-group remote-groups)
-
-    ; make sure markers point to nil so that they can be garbage collected
-    (mapc (lambda (marker)
-            (when marker
-             (set-marker marker nil)))
-          markers)))
-
-(defun magit-refresh-branch-manager ()
-  (magit-create-buffer-sections
-    (magit-git-section "branches" nil 'magit-wash-branches
-                       "branch"
-                       "-vva"
-                       (format "--abbrev=%s" magit-sha1-abbrev-length))))
-
-(magit-define-command branch-manager ()
-  (interactive)
-  (let ((topdir (magit-get-top-dir default-directory)))
-    (magit-buffer-switch magit-branches-buffer-name)
-    (magit-mode-init topdir 'magit-branch-manager-mode #'magit-refresh-branch-manager)))
-
-(defun magit-change-what-branch-tracks ()
-  "Change which remote branch the current branch tracks."
-  (interactive)
-  (if (magit--is-branch-at-point-remote)
-      (error "Cannot modify a remote branch"))
-  (let* ((local-branch (magit--branch-name-at-point))
-         (new-tracked (magit-read-rev  "Change tracked branch to"
-                                       nil
-                                       (lambda (ref)
-                                         (not (string-match-p "refs/remotes/"
-                                                              ref)))))
-         new-remote new-branch)
-    (unless (string= (or new-tracked "") "")
-      (cond (;; Match refs that are unknown in the local repository if
-             ;; `magit-remote-ref-format' is set to
-             ;; `name-then-remote'. Can be useful if you want to
-             ;; create a new branch in a remote repository.
-             (string-match "^\\([^ ]+\\) +(\\(.+\\))$" ; 1: branch name; 2: remote name
-                           new-tracked)
-             (setq new-remote (match-string 2 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 1 new-tracked))))
-            ((string-match "^\\(?:refs/remotes/\\)?\\([^/]+\\)/\\(.+\\)" ; 1: remote name; 2: branch name
-                           new-tracked)
-             (setq new-remote (match-string 1 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 2 new-tracked))))
-            (t (error "Cannot parse the remote and branch name"))))
-    (magit-set new-remote "branch" local-branch "remote")
-    (magit-set new-branch "branch" local-branch "merge")
-    (magit-branch-manager)
-    (if (string= (magit-get-current-branch) local-branch)
-        (magit-refresh-buffer (magit-find-status-buffer default-directory)))))
-
-(defvar magit-ediff-file)
-
-(defun magit-interactive-resolve (file)
-  (require 'ediff)
-  (let ((merge-status (magit-git-string "ls-files" "-u" "--" file))
-        (base-buffer (generate-new-buffer (concat file ".base")))
-        (our-buffer (generate-new-buffer (concat file ".current")))
-        (their-buffer (generate-new-buffer (concat file ".merged")))
-        (windows (current-window-configuration)))
-    (if (null merge-status)
-        (error "Cannot resolve %s" file))
-    (with-current-buffer base-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:" file))))))
-    (with-current-buffer our-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    (with-current-buffer their-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    ;; We have now created the 3 buffer with ours, theirs and the ancestor files
-    (with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer)
-      (make-local-variable 'magit-ediff-file)
-      (setq magit-ediff-file file)
-      (make-local-variable 'magit-ediff-windows)
-      (setq magit-ediff-windows windows)
-      (make-local-variable 'ediff-quit-hook)
-      (add-hook 'ediff-quit-hook
-                (lambda ()
-                  (let ((buffer-A ediff-buffer-A)
-                        (buffer-B ediff-buffer-B)
-                        (buffer-C ediff-buffer-C)
-                        (buffer-Ancestor ediff-ancestor-buffer)
-                        (file magit-ediff-file)
-                        (file-buffer)
-                        (windows magit-ediff-windows))
-                    (ediff-cleanup-mess)
-                    (find-file file)
-                    (setq file-buffer (current-buffer))
-                    (erase-buffer)
-                    (insert-buffer-substring buffer-C)
-                    (kill-buffer buffer-A)
-                    (kill-buffer buffer-B)
-                    (kill-buffer buffer-C)
-                    (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor))
-                    (set-window-configuration windows)
-                    (magit-save-some-buffers
-                     "Conflict resolution finished; you may save the buffer"
-                     (lambda () (eq (current-buffer) file-buffer)))))))))
-
-(defun magit-interactive-resolve-item ()
-  (interactive)
-  (magit-section-action (item info "resolv")
-    ((diff)
-     (magit-interactive-resolve (cadr info)))))
-
-(defun magit-submodule-update (&optional init)
-  "Update the submodule of the current git repository
-
-With a prefix arg, do a submodule update --init"
-  (interactive "P")
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (apply #'magit-run-git-async "submodule" "update" (if init '("--init") ()))))
-
-(defun magit-submodule-update-init ()
-  "Update and init the submodule of the current git repository."
-  (interactive)
-  (magit-submodule-update t))
-
-(defun magit-submodule-init ()
-  "Initialize the submodules"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "init")))
-
-(defun magit-submodule-sync ()
-  "Synchronizes submodules' remote URL configuration"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "sync")))
-
-(defun magit-run-git-gui ()
-  "Run `git gui' for the current git repository"
-  (interactive)
-  (let* ((default-directory (magit-get-top-dir default-directory)))
-    (magit-start-process "Git Gui" nil magit-git-executable "gui")))
-
-(defun magit-run-gitk ()
-  "Run `gitk --all' for the current git repository"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (cond
-     ((eq system-type 'windows-nt)
-      ;; Gitk is a shell script, and Windows doesn't know how to
-      ;; "execute" it.  The Windows version of Git comes with an
-      ;; implementation of "sh" and everything else it needs, but
-      ;; Windows users might not have added the directory where it's
-      ;; installed to their path
-      (let ((git-bin-dir (file-name-directory magit-gitk-executable))
-            (exec-path exec-path)
-            (process-environment process-environment))
-        (when git-bin-dir
-          ;; Adding it onto the end so that anything the user
-          ;; specified will get tried first.  Emacs looks in
-          ;; exec-path; PATH is the environment variable inherited by
-          ;; the process.  I need to change both.
-          (setq exec-path (append exec-path (list git-bin-dir)))
-          (push (format "PATH=%s;%s"
-                        (getenv "PATH")
-                        (replace-regexp-in-string "/" "\\\\" git-bin-dir))
-                process-environment))
-        (magit-start-process "Gitk" nil "sh" magit-gitk-executable "--all")))
-     (t
-      (magit-start-process "Gitk" nil magit-gitk-executable "--all")))))
-
-(defun magit-load-config-extensions ()
-  "Try to load magit extensions that are defined at git config
-layer. This can be added to `magit-mode-hook' for example"
-  (dolist (ext (magit-get-all "magit.extension"))
-    (let ((sym (intern (format "magit-%s-mode" ext))))
-      (when (and (fboundp sym)
-                 (not (eq sym 'magit-wip-save-mode)))
-        (funcall sym 1)))))
-
-(provide 'magit)
-
-;; rest of magit core
-(require 'magit-key-mode)
-(require 'magit-bisect)
-
-;;; magit.el ends here
diff --git a/elpa/magit-1.2.0/magit.el-e b/elpa/magit-1.2.0/magit.el-e
deleted file mode 100644
index 5923afc1a..000000000
--- a/elpa/magit-1.2.0/magit.el-e
+++ /dev/null
@@ -1,6001 +0,0 @@
-;;; magit.el --- control Git from Emacs
-
-;; Copyright (C) 2010 Aaron Culich.
-;; Copyright (C) 2010 Alan Falloon.
-;; Copyright (C) 2008, 2010 Alex Ott.
-;; Copyright (C) 2008, 2009, 2010 Alexey Voinov.
-;; Copyright (C) 2010 Ben Walton.
-;; Copyright (C) 2010 Chris Bernard.
-;; Copyright (C) 2010 Christian Kluge.
-;; Copyright (C) 2008 Daniel Farina.
-;; Copyright (C) 2010 David Abrahams.
-;; Copyright (C) 2009 David Wallin.
-;; Copyright (C) 2009, 2010 Hannu Koivisto.
-;; Copyright (C) 2009 Ian Eure.
-;; Copyright (C) 2009 Jesse Alama.
-;; Copyright (C) 2009 John Wiegley.
-;; Copyright (C) 2010 Leo.
-;; Copyright (C) 2008, 2009 Marcin Bachry.
-;; Copyright (C) 2008, 2009 Marius Vollmer.
-;; Copyright (C) 2010 Mark Hepburn.
-;; Copyright (C) 2010 Moritz Bunkus.
-;; Copyright (C) 2010 Nathan Weizenbaum.
-;; Copyright (C) 2010 Oscar Fuentes.
-;; Copyright (C) 2009 Pavel Holejsovsky.
-;; Copyright (C) 2011-2012 Peter J Weisberg
-;; Copyright (C) 2009, 2010 Phil Jackson.
-;; Copyright (C) 2010 Philip Weaver.
-;; Copyright (C) 2010 Ramkumar Ramachandra.
-;; Copyright (C) 2010 Remco van 't Veer.
-;; Copyright (C) 2009 René Stadler.
-;; Copyright (C) 2010 Robin Green.
-;; Copyright (C) 2010 Roger Crew.
-;; Copyright (C) 2009, 2010, 2011 Rémi Vanicat.
-;; Copyright (C) 2010 Sean Bryant.
-;; Copyright (C) 2009, 2011 Steve Purcell.
-;; Copyright (C) 2010 Timo Juhani Lindfors.
-;; Copyright (C) 2010, 2011 Yann Hodique.
-;; Copyright (C) 2010 Ævar Arnfjörð Bjarmason.
-;; Copyright (C) 2010 Óscar Fuentes.
-
-;; Original Author: Marius Vollmer <marius.vollmer@nokia.com>
-;; Former Maintainer: Phil Jackson <phil@shellarchive.co.uk>
-;; Maintenance Group: https://github.com/organizations/magit/teams/53130
-;;   Currently composed of:
-;;   - Phil Jackson
-;;   - Peter J Weisberg
-;;   - Yann Hodique
-;;   - Rémi Vanicat
-;; Version: @GIT_DEV_VERSION@
-;; Keywords: tools
-
-;;
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Invoking the magit-status function will show a buffer with the
-;; status of the current git repository and its working tree.  That
-;; buffer offers key bindings for manipulating the status in simple
-;; ways.
-;;
-;; The status buffer mainly shows the difference between the working
-;; tree and the index, and the difference between the index and the
-;; current HEAD.  You can add individual hunks from the working tree
-;; to the index, and you can commit the index.
-;;
-;; See the Magit User Manual for more information.
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-(require 'log-edit)
-(require 'easymenu)
-(require 'diff-mode)
-
-;; Silences byte-compiler warnings
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest args))))
-
-(eval-when-compile  (require 'view))
-(declare-function view-mode 'view)
-(eval-when-compile (require 'iswitchb))
-(eval-when-compile (require 'ido))
-(eval-when-compile (require 'ediff))
-
-;; Dummy to be used by the defcustoms when first loading the file.
-(eval-when (load eval)
-  (defalias 'magit-set-variable-and-refresh 'set-default))
-
-;;; Code:
-(defgroup magit nil
-  "Controlling Git from Emacs."
-  :prefix "magit-"
-  :group 'tools)
-
-(defcustom magit-git-executable "git"
-  "The name of the Git executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-gitk-executable (concat (file-name-directory magit-git-executable)
-                                         "gitk")
-  "The name of the Gitk executable."
-  :group 'magit
-  :type 'string)
-
-(defcustom magit-git-standard-options '("--no-pager")
-  "Standard options when running Git."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs nil
-  "Directories containing Git repositories.
-Magit will look into these directories for Git repositories and
-offer them as choices for `magit-status'."
-  :group 'magit
-  :type '(repeat string))
-
-(defcustom magit-repo-dirs-depth 3
-  "The maximum depth to look for Git repos.
-When looking for a Git repository below the directories in `magit-repo-dirs',
-Magit will only descend this many levels deep."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-set-upstream-on-push nil
-  "Non-nil means that `magit-push' may use --set-upstream when pushing a branch.
-This only applies if the branch does not have an upstream set yet.
-Setting this to t will ask if --set-upstream should be used.
-Setting it to 'dontask will always use --set-upstream.
-Setting it to 'refuse will refuse to push unless a remote branch has already been set.
-
---set-upstream is supported with git > 1.7.0"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Refuse" refuse)
-                 (const :tag "Always" dontask)))
-
-(defcustom magit-save-some-buffers t
-  "Non-nil means that \\[magit-status] will save modified buffers before running.
-Setting this to t will ask which buffers to save, setting it to 'dontask will
-save all modified buffers without asking."
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Save without asking" dontask)))
-
-(defcustom magit-save-some-buffers-predicate
-  'magit-save-buffers-predicate-tree-only
-  "A predicate function to decide whether to save a buffer.
-
-Used by function `magit-save-some-buffers' when the variable of
-the same name is non-nil."
-
-  :group 'magit
-  :type '(radio (function-item magit-save-buffers-predicate-tree-only)
-                (function-item magit-save-buffers-predicate-all)
-                (function :tag "Other")))
-
-(defcustom magit-default-tracking-name-function
-  'magit-default-tracking-name-remote-plus-branch
-  "Specifies the function to use to generate default tracking branch names
-when doing a \\[magit-checkout].
-
-The default is magit-default-tracking-name-remote-plus-branch,
-which generates a tracking name of the form 'REMOTE-BRANCHNAME'."
-  :group 'magit
-  :type '(radio (function-item magit-default-tracking-name-remote-plus-branch)
-                (function-item magit-default-tracking-name-branch-only)
-                (function :tag "Other")))
-
-(defcustom magit-commit-all-when-nothing-staged 'ask
-  "Determines what \\[magit-log-edit] does when nothing is staged.
-Setting this to nil will make it do nothing, setting it to t will
-arrange things so that the actual commit command will use the \"--all\" option,
-setting it to 'ask will first ask for confirmation whether to do this,
-and setting it to 'ask-stage will cause all changes to be staged,
-after a confirmation."
-  :group 'magit
-  :type '(choice (const :tag "No" nil)
-                 (const :tag "Always" t)
-                 (const :tag "Ask" ask)
-                 (const :tag "Ask to stage everything" ask-stage)))
-
-(defcustom magit-commit-signoff nil
-  "Add the \"Signed-off-by:\" line when committing."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-sha1-abbrev-length 7
-  "The number of digits to show when a sha1 is displayed in abbreviated form."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-cutoff-length 100
-  "The maximum number of commits to show in the log and whazzup buffers."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-infinite-length 99999
-  "Number of log used to show as maximum for `magit-log-cutoff-length'."
-  :group 'magit
-  :type 'integer)
-
-(defcustom magit-log-auto-more nil
-  "Insert more log entries automatically when moving past the last entry.
-
-Only considered when moving past the last entry with
-`magit-goto-*-section' commands."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-process-popup-time -1
-  "Popup the process buffer if a command takes longer than this many seconds."
-  :group 'magit
-  :type '(choice (const :tag "Never" -1)
-                 (const :tag "Immediately" 0)
-                 (integer :tag "After this many seconds")))
-
-(defcustom magit-revert-item-confirm t
-  "Require acknowledgment before reverting an item."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-log-edit-confirm-cancellation nil
-  "Require acknowledgment before canceling the log edit buffer."
-  :group 'magit
-  :type 'boolean)
-
-(defcustom magit-remote-ref-format 'branch-then-remote
-  "What format to use for autocompleting refs, in pariticular for remotes.
-
-Autocompletion is used by functions like `magit-checkout',
-`magit-interactive-rebase' and others which offer branch name
-completion.
-
-The value 'name-then-remote means remotes will be of the
-form \"name (remote)\", while the value 'remote-slash-name
-means that they'll be of the form \"remote/name\".  I.e. something that's
-listed as \"remotes/upstream/next\" by \"git branch -l -a\"
-will be \"upstream/next\"."
-  :group 'magit
-  :type '(choice (const :tag "name (remote)" branch-then-remote)
-                 (const :tag "remote/name" remote-slash-branch)))
-
-(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
-  "Connection type used for the git process.
-
-If nil, use pipes: this is usually more efficient, and works on Cygwin.
-If t, use ptys: this enables magit to prompt for passphrases when needed."
-  :group 'magit
-  :type '(choice (const :tag "pipe" nil)
-                 (const :tag "pty" t)))
-
-(defcustom magit-completing-read-function 'magit-builtin-completing-read
-  "Function to be called when requesting input from the user."
-  :group 'magit
-  :type '(radio (function-item magit-iswitchb-completing-read)
-                (function-item magit-ido-completing-read)
-                (function-item magit-builtin-completing-read)
-                (function :tag "Other")))
-
-(defcustom magit-create-branch-behaviour 'at-head
-  "Where magit will create a new branch if not supplied a branchname or ref.
-
-The value 'at-head means a new branch will be created at the tip
-of your current branch, while the value 'at-point means magit
-will try to find a valid reference at point..."
-  :group 'magit
-  :type '(choice (const :tag "at HEAD" at-head)
-                 (const :tag "at point" at-point)))
-
-(defcustom magit-status-buffer-switch-function 'pop-to-buffer
-  "Function for `magit-status' to use for switching to the status buffer.
-
-The function is given one argument, the status buffer."
-  :group 'magit
-  :type '(radio (function-item switch-to-buffer)
-                (function-item pop-to-buffer)
-                (function :tag "Other")))
-
-(defcustom magit-rewrite-inclusive t
-  "Whether magit includes the selected base commit in a rewrite operation.
-
-t means both the selected commit as well as any subsequent
-commits will be rewritten.  This is magit's default behaviour,
-equivalent to 'git rebase -i ${REV}~1'
-
-  A'---B'---C'---D'
-  ^
-
-nil means the selected commit will be literally used as 'base',
-so only subsequent commits will be rewritten.  This is consistent
-with git-rebase, equivalent to 'git rebase -i ${REV}', yet more
-cumbersome to use from the status buffer.
-
-  A---B'---C'---D'
-  ^"
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "Ask"   ask)))
-
-(defcustom magit-highlight-whitespace t
-  "Specifies where to highlight whitespace errors.
-See `magit-highlight-trailing-whitespace',
-`magit-highlight-indentation'.  The symbol t means in all diffs,
-'status means only in the status buffer, and nil means nowhere."
-  :group 'magit
-  :type '(choice (const :tag "Always" t)
-                 (const :tag "Never" nil)
-                 (const :tag "In status buffer" status))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-trailing-whitespace t
-  "Highlight whitespace at the end of a line in diffs.
-Used only when `magit-highlight-whitespace' is non-nil."
-  :group 'magit
-  :type 'boolean
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-highlight-indentation nil
-  "Highlight the \"wrong\" indentation style.
-Used only when `magit-highlight-whitespace' is non-nil.
-
-The value is a list of cons cells.  The car is a regular
-expression, and the cdr is the value that applies to repositories
-whose directory matches the regular expression.  If more than one
-item matches, then the *last* item in the list applies.  So, the
-default value should come first in the list.
-
-If the value is `tabs', highlight indentation with tabs.  If the
-value is an integer, highlight indentation with at least that
-many spaces.  Otherwise, highlight neither."
-  :group 'magit
-  :type `(repeat (cons (string :tag "Directory regexp")
-                       (choice (const :tag "Tabs" tabs)
-                               (integer :tag "Spaces" :value ,tab-width)
-                               (const :tag "Neither" nil))))
-  :set 'magit-set-variable-and-refresh)
-
-(defcustom magit-diff-refine-hunk nil
-  "Show fine (word-granularity) differences within diff hunks.
-
-There are three possible settings:
-
-  nil means to never show fine differences
-
-  t means to only show fine differences for the currently
-  selected diff hunk
-
-  `all' means to always show fine differences for all displayed diff hunks"
-  :group 'magit
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Selected only" t)
-                 (const :tag "All" all))
-  :set 'magit-set-variable-and-refresh)
-
-(defvar magit-current-indentation nil
-  "Indentation highlight used in the current buffer.
-This is calculated from `magit-highlight-indentation'.")
-(make-variable-buffer-local 'magit-current-indentation)
-
-(defgroup magit-faces nil
-  "Customize the appearance of Magit."
-  :prefix "magit-"
-  :group 'faces
-  :group 'magit)
-
-(defface magit-header
-  '((t :inherit header-line))
-  "Face for generic header lines.
-
-Many Magit faces inherit from this one by default."
-  :group 'magit-faces)
-
-(defface magit-section-title
-  '((t :inherit magit-header))
-  "Face for section titles."
-  :group 'magit-faces)
-
-(defface magit-branch
-  '((t :inherit magit-header))
-  "Face for the current branch."
-  :group 'magit-faces)
-
-(defface magit-diff-file-header
-  '((t :inherit diff-file-header))
-  "Face for diff file header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-header
-  '((t :inherit diff-hunk-header))
-  "Face for diff hunk header lines."
-  :group 'magit-faces)
-
-(defface magit-diff-add
-  '((t :inherit diff-added))
-  "Face for lines in a diff that have been added."
-  :group 'magit-faces)
-
-(defface magit-diff-none
-  '((t :inherit diff-context))
-  "Face for lines in a diff that are unchanged."
-  :group 'magit-faces)
-
-(defface magit-diff-del
-  '((t :inherit diff-removed))
-  "Face for lines in a diff that have been deleted."
-  :group 'magit-faces)
-
-(defface magit-log-graph
-  '((((class color) (background light))
-     :foreground "grey11")
-    (((class color) (background dark))
-     :foreground "grey80"))
-  "Face for the graph element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-sha1
-  '((((class color) (background light))
-     :foreground "firebrick")
-    (((class color) (background dark))
-     :foreground "tomato"))
-  "Face for the sha1 element of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-message
-  '((t))
-  "Face for the message element of the log output."
-  :group 'magit-faces)
-
-(defface magit-item-highlight
-  '((t :inherit highlight))
-  "Face for highlighting the current item."
-  :group 'magit-faces)
-
-(defface magit-item-mark
-  '((t :inherit secondary-selection))
-  "Face for highlighting marked item."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-good
-  '((((class color) (background light))
-     :box t
-     :background "light green"
-     :foreground "dark olive green")
-    (((class color) (background dark))
-     :box t
-     :background "light green"
-     :foreground "dark olive green"))
-  "Face for good bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-bisect-bad
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for bad bisect refs."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-remote
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "OliveDrab4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey11"
-     :foreground "DarkSeaGreen2"))
-  "Face for remote branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-tags
-  '((((class color) (background light))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4")
-    (((class color) (background dark))
-     :box t
-     :background "LemonChiffon1"
-     :foreground "goldenrod4"))
-  "Face for tag labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-patches
-  '((((class color) (background light))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4")
-    (((class color) (background dark))
-     :box t
-     :background "IndianRed1"
-     :foreground "IndianRed4"))
-  "Face for Stacked Git patches."
-  :group 'magit-faces)
-
-(defface magit-whitespace-warning-face
-  '((t :inherit trailing-whitespace))
-  "Face for highlighting whitespace errors in Magit diffs."
-  :group 'magit-faces)
-
-(defvar magit-custom-options '()
-  "List of custom options to pass to Git.
-Do not customize this (used in the `magit-key-mode' implementation).")
-
-(defvar magit-read-rev-history nil
-  "The history of inputs to `magit-read-rev'.")
-
-(defvar magit-buffer-internal nil
-  "Track associated *magit* buffers.
-Do not customize this (used in the `magit-log-edit-mode' implementation
-to switch back to the *magit* buffer associated with a given commit
-operation after commit).")
-
-(defvar magit-back-navigation-history nil
-  "History items that will be visited by successively going \"back\".")
-(make-variable-buffer-local 'magit-back-navigation-history)
-(put 'magit-back-navigation-history 'permanent-local t)
-
-(defvar magit-forward-navigation-history nil
-  "History items that will be visited by successively going \"forward\".")
-(make-variable-buffer-local 'magit-forward-navigation-history)
-(put 'magit-forward-navigation-history 'permanent-local t)
-
-(defvar magit-omit-untracked-dir-contents nil
-  "When non-nil magit will only list an untracked directory, not its contents.")
-
-(defvar magit-tmp-buffer-name " *magit-tmp*")
-
-(defface magit-log-head-label-local
-  '((((class color) (background light))
-     :box t
-     :background "Grey85"
-     :foreground "LightSkyBlue4")
-    (((class color) (background dark))
-     :box t
-     :background "Grey13"
-     :foreground "LightSkyBlue1"))
-  "Face for local branch head labels shown in log buffer."
-  :group 'magit-faces)
-
-(defface magit-log-head-label-default
-  '((((class color) (background light))
-     :box t
-     :background "Grey50")
-    (((class color) (background dark))
-     :box t
-     :background "Grey50"))
-  "Face for unknown ref labels shown in log buffer."
-  :group 'magit-faces)
-
-(defvar magit-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map t)
-    (define-key map (kbd "n") 'magit-goto-next-section)
-    (define-key map (kbd "p") 'magit-goto-previous-section)
-    (define-key map (kbd "^") 'magit-goto-parent-section)
-    (define-key map (kbd "M-n") 'magit-goto-next-sibling-section)
-    (define-key map (kbd "M-p") 'magit-goto-previous-sibling-section)
-    (define-key map (kbd "TAB") 'magit-toggle-section)
-    (define-key map (kbd "<backtab>") 'magit-expand-collapse-section)
-    (define-key map (kbd "1") 'magit-show-level-1)
-    (define-key map (kbd "2") 'magit-show-level-2)
-    (define-key map (kbd "3") 'magit-show-level-3)
-    (define-key map (kbd "4") 'magit-show-level-4)
-    (define-key map (kbd "M-1") 'magit-show-level-1-all)
-    (define-key map (kbd "M-2") 'magit-show-level-2-all)
-    (define-key map (kbd "M-3") 'magit-show-level-3-all)
-    (define-key map (kbd "M-4") 'magit-show-level-4-all)
-    (define-key map (kbd "M-h") 'magit-show-only-files)
-    (define-key map (kbd "M-H") 'magit-show-only-files-all)
-    (define-key map (kbd "M-s") 'magit-show-level-4)
-    (define-key map (kbd "M-S") 'magit-show-level-4-all)
-    (define-key map (kbd "g") 'magit-refresh)
-    (define-key map (kbd "G") 'magit-refresh-all)
-    (define-key map (kbd "?") 'magit-describe-item)
-    (define-key map (kbd "!") 'magit-key-mode-popup-running)
-    (define-key map (kbd ":") 'magit-git-command)
-    (define-key map (kbd "C-x 4 a") 'magit-add-change-log-entry-other-window)
-    (define-key map (kbd "L") 'magit-add-change-log-entry-no-option)
-    (define-key map (kbd "RET") 'magit-visit-item)
-    (define-key map (kbd "SPC") 'magit-show-item-or-scroll-up)
-    (define-key map (kbd "DEL") 'magit-show-item-or-scroll-down)
-    (define-key map (kbd "C-w") 'magit-copy-item-as-kill)
-    (define-key map (kbd "R") 'magit-rebase-step)
-    (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
-    (define-key map (kbd "r") 'magit-key-mode-popup-rewriting)
-    (define-key map (kbd "P") 'magit-key-mode-popup-pushing)
-    (define-key map (kbd "f") 'magit-key-mode-popup-fetching)
-    (define-key map (kbd "b") 'magit-key-mode-popup-branching)
-    (define-key map (kbd "M") 'magit-key-mode-popup-remoting)
-    (define-key map (kbd "B") 'magit-key-mode-popup-bisecting)
-    (define-key map (kbd "F") 'magit-key-mode-popup-pulling)
-    (define-key map (kbd "l") 'magit-key-mode-popup-logging)
-    (define-key map (kbd "$") 'magit-display-process)
-    (define-key map (kbd "c") 'magit-log-edit)
-    (define-key map (kbd "E") 'magit-interactive-rebase)
-    (define-key map (kbd "e") 'magit-ediff)
-    (define-key map (kbd "w") 'magit-wazzup)
-    (define-key map (kbd "q") 'magit-quit-window)
-    (define-key map (kbd "m") 'magit-key-mode-popup-merging)
-    (define-key map (kbd "x") 'magit-reset-head)
-    (define-key map (kbd "v") 'magit-revert-item)
-    (define-key map (kbd "a") 'magit-apply-item)
-    (define-key map (kbd "A") 'magit-cherry-pick-item)
-    (define-key map (kbd "d") 'magit-diff-working-tree)
-    (define-key map (kbd "D") 'magit-diff)
-    (define-key map (kbd "-") 'magit-diff-smaller-hunks)
-    (define-key map (kbd "+") 'magit-diff-larger-hunks)
-    (define-key map (kbd "0") 'magit-diff-default-hunks)
-    (define-key map (kbd "h") 'magit-toggle-diff-refine-hunk)
-    map))
-
-(defvar magit-commit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-b") 'magit-show-commit-backward)
-    (define-key map (kbd "C-c C-f") 'magit-show-commit-forward)
-    map))
-
-(defvar magit-status-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "s") 'magit-stage-item)
-    (define-key map (kbd "S") 'magit-stage-all)
-    (define-key map (kbd "u") 'magit-unstage-item)
-    (define-key map (kbd "U") 'magit-unstage-all)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    (define-key map (kbd "I") 'magit-ignore-item-locally)
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "C") 'magit-add-log)
-    (define-key map (kbd "X") 'magit-reset-working-tree)
-    (define-key map (kbd "z") 'magit-key-mode-popup-stashing)
-    map))
-
-(eval-after-load 'dired-x
-  '(define-key magit-status-mode-map [remap dired-jump] 'magit-dired-jump))
-
-(defvar magit-log-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "e") 'magit-log-show-more-entries)
-    map))
-
-(defvar magit-wazzup-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ".") 'magit-mark-item)
-    (define-key map (kbd "=") 'magit-diff-with-mark)
-    (define-key map (kbd "i") 'magit-ignore-item)
-    map))
-
-(defvar magit-branch-manager-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "c") 'magit-create-branch)
-    (define-key map (kbd "a") 'magit-add-remote)
-    (define-key map (kbd "r") 'magit-move-item)
-    (define-key map (kbd "k") 'magit-discard-item)
-    (define-key map (kbd "T") 'magit-change-what-branch-tracks)
-    map))
-
-(defvar magit-bug-report-url
-  "http://github.com/magit/magit/issues")
-
-(defconst magit-version "@GIT_DEV_VERSION@"
-  "The version of Magit that you're using.")
-
-(defun magit-bug-report (str)
-  "Asks the user to submit a bug report about the error described in STR."
-;; XXX - should propose more information to be included.
-  (message (concat
-            "Unknown error: %s\n"
-            "Please, with as much information as possible, file a bug at\n"
-            "%s\n"
-            "You are using Magit version %s.")
-           str magit-bug-report-url magit-version))
-
-(defun magit-buffer-switch (buf)
-  (if (string-match "magit" (buffer-name))
-      (switch-to-buffer buf)
-    (pop-to-buffer buf)))
-
-;;; Macros
-
-(defmacro magit-with-refresh (&rest body)
-  (declare (indent 0))
-  `(magit-refresh-wrapper (lambda () ,@body)))
-
-;;; Git features
-
-(defvar magit-have-graph 'unset)
-(defvar magit-have-decorate 'unset)
-(defvar magit-have-abbrev 'unset)
-(make-variable-buffer-local 'magit-have-graph)
-(put 'magit-have-graph 'permanent-local t)
-(make-variable-buffer-local 'magit-have-decorate)
-(put 'magit-have-decorate 'permanent-local t)
-(make-variable-buffer-local 'magit-have-abbrev)
-(put 'magit-have-abbrev 'permanent-local t)
-
-(defun magit-configure-have-graph ()
-  (if (eq magit-have-graph 'unset)
-      (let ((res (magit-git-exit-code "log" "--graph" "--max-count=0")))
-        (setq magit-have-graph (eq res 0)))))
-
-(defun magit-configure-have-decorate ()
-  (if (eq magit-have-decorate 'unset)
-      (let ((res (magit-git-exit-code "log" "--decorate=full" "--max-count=0")))
-        (setq magit-have-decorate (eq res 0)))))
-
-(defun magit-configure-have-abbrev ()
-  (if (eq magit-have-abbrev 'unset)
-      (let ((res (magit-git-exit-code "log" "--no-abbrev-commit" "--max-count=0")))
-        (setq magit-have-abbrev (eq res 0)))))
-
-;;; Compatibilities
-
-(eval-and-compile
-  (defun magit-max-args-internal (function)
-    "Returns the maximum number of arguments accepted by FUNCTION."
-    (if (symbolp function)
-        (setq function (symbol-function function)))
-    (if (subrp function)
-        (let ((max (cdr (subr-arity function))))
-          (if (eq 'many max)
-              most-positive-fixnum
-            max))
-      (if (eq 'macro (car-safe function))
-          (setq function (cdr function)))
-      (let ((arglist (if (byte-code-function-p function)
-                         (aref function 0)
-                       (second function))))
-        (if (memq '&rest arglist)
-            most-positive-fixnum
-          (length (remq '&optional arglist))))))
-
-  (if (functionp 'start-file-process)
-      (defalias 'magit-start-process 'start-file-process)
-    (defalias 'magit-start-process 'start-process))
-
-  (unless (fboundp 'string-match-p)
-    (defun string-match-p (regexp string &optional start)
-      "Same as `string-match' except this function does not
-change the match data."
-      (let ((inhibit-changing-match-data t))
-        (string-match regexp string start))))
-
-  (if (fboundp 'with-silent-modifications)
-      (defalias 'magit-with-silent-modifications 'with-silent-modifications)
-    (defmacro magit-with-silent-modifications (&rest body)
-      "Execute body without changing `buffer-modified-p'. Also, do not
-record undo information."
-      `(set-buffer-modified-p
-        (prog1 (buffer-modified-p)
-          (let ((buffer-undo-list t)
-                before-change-functions
-                after-change-functions)
-            ,@body)))))
-
-  (if (>= (magit-max-args-internal 'delete-directory) 2)
-      (defalias 'magit-delete-directory 'delete-directory)
-    (defun magit-delete-directory (directory &optional recursive)
-      "Deletes a directory named DIRECTORY.  If RECURSIVE is non-nil,
-recursively delete all of DIRECTORY's contents as well.
-
-Does not follow symlinks."
-      (if (or (file-symlink-p directory)
-              (not (file-directory-p directory)))
-          (delete-file directory)
-        (if recursive
-            ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23
-            (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
-              (magit-delete-directory file recursive)))
-        (delete-directory directory)))))
-
-;;; Utilities
-
-(defun magit-set-variable-and-refresh (symbol value)
-  "Set SYMBOL to VALUE and call `magit-refresh-all'"
-  (set-default symbol value)
-  (magit-refresh-all))
-
-(defun magit-iswitchb-completing-read (prompt choices &optional predicate require-match
-                                              initial-input hist def)
-  "iswitchb-based completing-read almost-replacement."
-  (require 'iswitchb)
-  (let ((iswitchb-make-buflist-hook
-         (lambda ()
-           (setq iswitchb-temp-buflist (if (consp (first choices))
-                                           (mapcar #'car choices)
-                                         choices)))))
-    (iswitchb-read-buffer prompt (or initial-input def) require-match)))
-
-(defun magit-ido-completing-read (prompt choices &optional predicate require-match initial-input hist def)
-  "ido-based completing-read almost-replacement."
-  (require 'ido)
-  (let ((selected (ido-completing-read prompt (if (consp (first choices))
-                                                  (mapcar #'car choices)
-                                                choices)
-                                       predicate require-match initial-input hist def)))
-    (if (consp (first choices))
-        (or (cdr (assoc selected choices))
-            selected)
-      selected)))
-
-(defun magit-builtin-completing-read (prompt choices &optional predicate require-match
-                                             initial-input hist def)
-  "Magit wrapper for standard `completing-read' function."
-  (completing-read (if (and def (> (length prompt) 2)
-                            (string-equal ": " (substring prompt -2)))
-                       (format "%s (default %s): " (substring prompt 0 -2) def)
-                     prompt)
-                   choices predicate require-match initial-input hist def))
-
-(defun magit-completing-read (prompt choices &optional predicate require-match
-                                     initial-input hist def)
-  (funcall magit-completing-read-function prompt choices predicate require-match
-           initial-input hist def))
-
-(defun magit-use-region-p ()
-  (if (fboundp 'use-region-p)
-      (use-region-p)
-    (and transient-mark-mode mark-active)))
-
-(defun magit-goto-line (line)
-  "Like `goto-line' but doesn't set the mark."
-  (save-restriction
-    (widen)
-    (goto-char 1)
-    (forward-line (1- line))))
-
-(defun magit-trim-line (str)
-  (if (string= str "")
-      nil
-    (if (equal (elt str (- (length str) 1)) ?\n)
-        (substring str 0 (- (length str) 1))
-      str)))
-
-(defun magit-split-lines (str)
-  (if (string= str "")
-      nil
-    (let ((lines (nreverse (split-string str "\n"))))
-      (if (string= (car lines) "")
-          (setq lines (cdr lines)))
-      (nreverse lines))))
-
-(defun magit-git-insert (args)
-  (insert (magit-git-output args)))
-
-(defun magit-git-output (args)
-  (magit-cmd-output magit-git-executable (append magit-git-standard-options args)))
-
-(defun magit-cmd-insert (cmd args)
-  (insert (magit-cmd-output cmd args)))
-
-(defun magit-cmd-output (cmd args)
-  (let ((cmd-output (with-output-to-string
-                      (with-current-buffer standard-output
-                        (apply #'process-file
-                               cmd
-                               nil (list t nil) nil
-                               args)))))
-    (replace-regexp-in-string "\e\\[.*?m" "" cmd-output)))
-
-(defun magit-git-string (&rest args)
-  (magit-trim-line (magit-git-output args)))
-
-(defun magit-git-lines (&rest args)
-  (magit-split-lines (magit-git-output args)))
-
-(defun magit-git-exit-code (&rest args)
-  (apply #'process-file magit-git-executable nil nil nil
-         (append magit-git-standard-options args)))
-
-(defun magit-file-lines (file)
-  (when (file-exists-p file)
-    (with-temp-buffer
-      (insert-file-contents file)
-      (let ((rev (nreverse (split-string (buffer-string) "\n"))))
-        (nreverse (if (equal (car rev) "")
-                      (cdr rev)
-                    rev))))))
-
-(defun magit-write-file-lines (file lines)
-  (with-temp-buffer
-    (dolist (l lines)
-      (insert l "\n"))
-    (write-file file)))
-
-(defun magit-get (&rest keys)
-  "Return the value of Git config entry specified by KEYS."
-  (magit-git-string "config" (mapconcat 'identity keys ".")))
-
-(defun magit-get-all (&rest keys)
-  "Return all values of the Git config entry specified by KEYS."
-  (magit-git-lines "config" "--get-all" (mapconcat 'identity keys ".")))
-
-(defun magit-get-boolean (&rest keys)
-  "Return the boolean value of Git config entry specified by KEYS."
-  (equal (magit-git-string "config" "--bool" (mapconcat 'identity keys "."))
-         "true"))
-
-(defun magit-set (val &rest keys)
-  "Set Git config settings specified by KEYS to VAL."
-  (if val
-      (magit-git-string "config" (mapconcat 'identity keys ".") val)
-    (magit-git-string "config" "--unset" (mapconcat 'identity keys "."))))
-
-(defun magit-remove-conflicts (alist)
-  (let ((dict (make-hash-table :test 'equal))
-        (result nil))
-    (dolist (a alist)
-      (puthash (car a) (cons (cdr a) (gethash (car a) dict))
-               dict))
-    (maphash (lambda (key value)
-               (if (= (length value) 1)
-                   (push (cons key (car value)) result)
-                 (let ((sub (magit-remove-conflicts
-                             (mapcar (lambda (entry)
-                                       (let ((dir (directory-file-name
-                                                   (substring entry 0 (- (length key))))))
-                                         (cons (concat (file-name-nondirectory dir) "/" key)
-                                               entry)))
-                                     value))))
-                   (setq result (append result sub)))))
-             dict)
-    result))
-
-(defun magit-git-repo-p (dir)
-  (file-exists-p (expand-file-name ".git" dir)))
-
-(defun magit-git-dir ()
-  "Returns the .git directory for the current repository."
-  (concat (expand-file-name (magit-git-string "rev-parse" "--git-dir")) "/"))
-
-(defun magit-no-commit-p ()
-  "Return non-nil if there is no commit in the current git repository."
-  (not (magit-git-string
-        "rev-list" "HEAD" "--max-count=1")))
-
-(defun magit-list-repos* (dir level)
-  (if (magit-git-repo-p dir)
-      (list dir)
-    (apply #'append
-           (mapcar (lambda (entry)
-                     (unless (or (string= (substring entry -3) "/..")
-                                 (string= (substring entry -2) "/."))
-                       (magit-list-repos* entry (+ level 1))))
-                   (and (file-directory-p dir)
-                        (< level magit-repo-dirs-depth)
-                        (directory-files dir t nil t))))))
-
-(defun magit-list-repos (dirs)
-  (magit-remove-conflicts
-   (apply #'append
-          (mapcar (lambda (dir)
-                    (mapcar #'(lambda (repo)
-                                (cons (file-name-nondirectory repo)
-                                      repo))
-                            (magit-list-repos* dir 0)))
-                  dirs))))
-
-(defun magit-get-top-dir (cwd)
-  (let ((cwd (expand-file-name (file-truename cwd))))
-    (when (file-directory-p cwd)
-      (let* ((default-directory (file-name-as-directory cwd))
-             (cdup (magit-git-string "rev-parse" "--show-cdup")))
-        (when cdup
-          (file-name-as-directory (expand-file-name cdup cwd)))))))
-
-(defun magit-get-ref (ref)
-  (magit-git-string "symbolic-ref" "-q" ref))
-
-(defun magit-get-current-branch ()
-  (let* ((head (magit-get-ref "HEAD"))
-         (pos (and head (string-match "^refs/heads/" head))))
-    (if pos
-        (substring head 11)
-      nil)))
-
-(defun magit-get-remote (branch)
-  "Return the name of the remote for BRANCH.
-If branch is nil or it has no remote, but a remote named
-\"origin\" exists, return that. Otherwise, return nil."
-  (let ((remote (or (and branch (magit-get "branch" branch "remote"))
-                    (and (magit-get "remote" "origin" "url") "origin"))))
-    (if (string= remote "") nil remote)))
-
-(defun magit-get-current-remote ()
-  "Return the name of the remote for the current branch.
-If there is no current branch, or no remote for that branch,
-but a remote named \"origin\" is configured, return that.
-Otherwise, return nil."
-  (magit-get-remote (magit-get-current-branch)))
-
-(defun magit-ref-exists-p (ref)
-  (= (magit-git-exit-code "show-ref" "--verify" ref) 0))
-
-(defun magit-read-top-dir (dir)
-  "Ask the user for a Git repository.  The choices offered by
-auto-completion will be the repositories under `magit-repo-dirs'.
-If `magit-repo-dirs' is nil or DIR is non-nill, then
-autocompletion will offer directory names."
-  (if (and (not dir) magit-repo-dirs)
-      (let* ((repos (magit-list-repos magit-repo-dirs))
-             (reply (magit-completing-read "Git repository: " repos)))
-        (file-name-as-directory
-         (or (cdr (assoc reply repos))
-             (if (file-directory-p reply)
-                 (expand-file-name reply)
-               (error "Not a repository or a directory: %s" reply)))))
-    (file-name-as-directory
-     (read-directory-name "Git repository: "
-                          (or (magit-get-top-dir default-directory)
-                              default-directory)))))
-
-(defun magit-rev-parse (ref)
-  "Return the SHA hash for REF."
-  (magit-git-string "rev-parse" ref))
-
-(defun magit-ref-ambiguous-p (ref)
-  "Return whether or not REF is ambiguous."
-  ;; If REF is ambiguous, rev-parse just prints errors,
-  ;; so magit-git-string returns nil.
-  (not (magit-git-string "rev-parse" "--abbrev-ref" ref)))
-
-(defun magit-name-rev (rev &optional no-trim)
-  "Return a human-readable name for REV.
-Unlike git name-rev, this will remove tags/ and remotes/ prefixes
-if that can be done unambiguously (unless optional arg NO-TRIM is
-non-nil).  In addition, it will filter out revs involving HEAD."
-  (when rev
-    (let ((name (magit-git-string "name-rev" "--no-undefined" "--name-only" rev)))
-      ;; There doesn't seem to be a way of filtering HEAD out from name-rev,
-      ;; so we have to do it manually.
-      ;; HEAD-based names are too transient to allow.
-      (when (and (stringp name)
-                 (string-match "^\\(.*\\<HEAD\\)\\([~^].*\\|$\\)" name))
-        (let ((head-ref (match-string 1 name))
-              (modifier (match-string 2 name)))
-          ;; Sometimes when name-rev gives a HEAD-based name,
-          ;; rev-parse will give an actual branch or remote name.
-          (setq name (concat (magit-git-string "rev-parse" "--abbrev-ref" head-ref)
-                             modifier))
-          ;; If rev-parse doesn't give us what we want, just use the SHA.
-          (when (or (null name) (string-match-p "\\<HEAD\\>" name))
-            (setq name (magit-rev-parse rev)))))
-      (setq rev (or name rev))
-      (when (string-match "^\\(?:tags\\|remotes\\)/\\(.*\\)" rev)
-        (let ((plain-name (match-string 1 rev)))
-          (unless (or no-trim (magit-ref-ambiguous-p plain-name))
-            (setq rev plain-name))))
-      rev)))
-
-(defun magit-highlight-line-whitespace ()
-  (when (and magit-highlight-whitespace
-             (or (derived-mode-p 'magit-status-mode)
-                 (not (eq magit-highlight-whitespace 'status))))
-    (if (and magit-highlight-trailing-whitespace
-             (looking-at "^[-+].*?\\([ \t]+\\)$"))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))
-    (if (or (and (eq magit-current-indentation 'tabs)
-                 (looking-at "^[-+]\\( *\t[ \t]*\\)"))
-            (and (integerp magit-current-indentation)
-                 (looking-at (format "^[-+]\\([ \t]* \\{%s,\\}[ \t]*\\)"
-                                     magit-current-indentation))))
-        (overlay-put (make-overlay (match-beginning 1) (match-end 1))
-                     'face 'magit-whitespace-warning-face))))
-
-(defun magit-put-line-property (prop val)
-  (put-text-property (line-beginning-position) (line-beginning-position 2)
-                     prop val))
-
-(defun magit-format-commit (commit format)
-  (magit-git-string "log" "--max-count=1"
-                    (concat "--pretty=format:" format)
-                    commit))
-
-(defun magit-current-line ()
-  (buffer-substring-no-properties (line-beginning-position)
-                                  (line-end-position)))
-
-(defun magit-insert-region (beg end buf)
-  (let ((text (buffer-substring-no-properties beg end)))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-insert-current-line (buf)
-  (let ((text (buffer-substring-no-properties
-               (line-beginning-position) (line-beginning-position 2))))
-    (with-current-buffer buf
-      (insert text))))
-
-(defun magit-file-uptodate-p (file)
-  (eq (magit-git-exit-code "diff" "--quiet" "--" file) 0))
-
-(defun magit-anything-staged-p ()
-  (not (eq (magit-git-exit-code "diff" "--quiet" "--cached") 0)))
-
-(defun magit-everything-clean-p ()
-  (and (not (magit-anything-staged-p))
-       (eq (magit-git-exit-code "diff" "--quiet") 0)))
-
-(defun magit-commit-parents (commit)
-  (cdr (split-string (magit-git-string "rev-list" "-1" "--parents" commit))))
-
-;; XXX - let the user choose the parent
-
-(defun magit-choose-parent-id (commit op)
-  (let* ((parents (magit-commit-parents commit)))
-    (if (> (length parents) 1)
-        (error "Can't %s merge commits" op)
-      nil)))
-
-;;; Revisions and ranges
-
-(defvar magit-current-range nil
-  "The range described by the current buffer.
-This is only non-nil in diff and log buffers.
-
-This has three possible (non-nil) forms.  If it's a string REF or
-a singleton list (REF), then the range is from REF to the current
-working directory state (or HEAD in a log buffer).  If it's a
-pair (START . END), then the range is START..END.")
-(make-variable-buffer-local 'magit-current-range)
-
-(defun magit-list-interesting-refs (&optional uninteresting)
-  "Return interesting references as given by `git show-ref'.
-Removes references matching UNINTERESTING from the
-results. UNINTERESTING can be either a function taking a single
-argument or a list of strings used as regexps."
-  (let ((refs ()))
-    (dolist (line (magit-git-lines "show-ref"))
-      (if (string-match "[^ ]+ +\\(.*\\)" line)
-          (let ((ref (match-string 1 line)))
-            (cond ((and (functionp uninteresting)
-                        (funcall uninteresting ref)))
-                  ((and (not (functionp uninteresting))
-                        (loop for i in uninteresting thereis (string-match i ref))))
-                  (t
-                   (let ((fmt-ref (magit-format-ref ref)))
-                     (when fmt-ref
-                       (push (cons fmt-ref
-                                   (replace-regexp-in-string "^refs/heads/"
-                                                             "" ref))
-                             refs))))))))
-    (nreverse refs)))
-
-(defun magit-format-ref (ref)
-  "Convert fully-specified ref REF into its displayable form
-according to `magit-remote-ref-format'"
-  (cond
-   ((null ref)
-    nil)
-   ((string-match "refs/heads/\\(.*\\)" ref)
-    (match-string 1 ref))
-   ((string-match "refs/tags/\\(.*\\)" ref)
-    (format (if (eq magit-remote-ref-format 'branch-then-remote)
-                "%s (tag)"
-              "%s")
-            (match-string 1 ref)))
-   ((string-match "refs/remotes/\\([^/]+\\)/\\(.+\\)" ref)
-    (if (eq magit-remote-ref-format 'branch-then-remote)
-        (format "%s (%s)"
-                (match-string 2 ref)
-                (match-string 1 ref))
-      (format "%s/%s"
-              (match-string 1 ref)
-              (match-string 2 ref))))))
-
-(defun magit-tree-contents (treeish)
-  "Returns a list of all files under TREEISH.  TREEISH can be a tree,
-a commit, or any reference to one of those."
-  (let ((return-value nil))
-    (with-temp-buffer
-      (magit-git-insert (list "ls-tree" "-r" treeish))
-      (if (eql 0 (buffer-size))
-          (error "%s is not a commit or tree." treeish))
-      (goto-char (point-min))
-      (while (search-forward-regexp "\t\\(.*\\)" nil 'noerror)
-        (push (match-string 1) return-value)))
-    return-value))
-
-(defvar magit-uninteresting-refs '("refs/remotes/\\([^/]+\\)/HEAD$" "refs/stash"))
-
-(defun magit-read-file-from-rev (revision)
-  (magit-completing-read (format "Retrieve file from %s: " revision)
-                         (magit-tree-contents revision)
-                         nil
-                         'require-match
-                         nil
-                         'magit-read-file-hist
-                         (if buffer-file-name
-                             (let ((topdir-length (length (magit-get-top-dir default-directory))))
-                               (substring (buffer-file-name) topdir-length)))))
-
-(defun magit-read-rev (prompt &optional default uninteresting)
-  (let* ((interesting-refs (magit-list-interesting-refs
-                            (or uninteresting magit-uninteresting-refs)))
-         (reply (magit-completing-read (concat prompt ": ") interesting-refs
-                                       nil nil nil 'magit-read-rev-history default))
-         (rev (or (cdr (assoc reply interesting-refs)) reply)))
-    (if (string= rev "")
-        nil
-      rev)))
-
-(defun magit-read-rev-range (op &optional def-beg def-end)
-  (let ((beg (magit-read-rev (format "%s start" op)
-                             def-beg)))
-    (if (not beg)
-        nil
-      (save-match-data
-        (if (string-match "^\\(.+\\)\\.\\.\\(.+\\)$" beg)
-            (cons (match-string 1 beg) (match-string 2 beg))
-          (let ((end (magit-read-rev (format "%s end" op) def-end)))
-            (cons beg end)))))))
-
-(defun magit-rev-to-git (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      (magit-marked-commit)
-    rev))
-
-(defun magit-rev-range-to-git (range)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      range
-    (if (cdr range)
-        (format "%s..%s"
-                (magit-rev-to-git (car range))
-                (magit-rev-to-git (cdr range)))
-      (format "%s" (magit-rev-to-git (car range))))))
-
-(defun magit-rev-describe (rev)
-  (or rev
-      (error "No revision specified"))
-  (if (string= rev ".")
-      "mark"
-    (magit-name-rev rev)))
-
-(defun magit-rev-range-describe (range things)
-  (or range
-      (error "No revision range specified"))
-  (if (stringp range)
-      (format "%s in %s" things range)
-    (if (cdr range)
-        (format "%s from %s to %s" things
-                (magit-rev-describe (car range))
-                (magit-rev-describe (cdr range)))
-      (format "%s at %s" things (magit-rev-describe (car range))))))
-
-(defun magit-default-rev (&optional no-trim)
-  (or (magit-name-rev (magit-commit-at-point t) no-trim)
-      (let ((branch (magit-guess-branch)))
-        (if branch
-            (if (string-match "^refs/\\(.*\\)" branch)
-                (match-string 1 branch)
-              branch)))))
-
-(defun magit-read-remote (&optional prompt def)
-  "Read the name of a remote.
-PROMPT is used as the prompt, and defaults to \"Remote\".
-DEF is the default value."
-  (let* ((prompt (or prompt "Remote"))
-         (def (or def (magit-guess-remote)))
-         (remotes (magit-git-lines "remote"))
-
-         (reply (magit-completing-read (concat prompt ": ") remotes
-                                       nil nil nil nil def)))
-    (if (string= reply "") nil reply)))
-
-(defun magit-read-remote-branch (remote &optional prompt default)
-  (let* ((prompt (or prompt (format "Remote branch (in %s)" remote)))
-         (branches (delete nil
-                           (mapcar
-                            (lambda (b)
-                              (and (not (string-match " -> " b))
-                                   (string-match (format "^ *%s/\\(.*\\)$"
-                                                         (regexp-quote remote)) b)
-                                   (match-string 1 b)))
-                            (magit-git-lines "branch" "-r"))))
-         (reply (magit-completing-read (concat prompt ": ") branches
-                                       nil nil nil nil default)))
-    (if (string= reply "") nil reply)))
-
-;;; Sections
-
-;; A buffer in magit-mode is organized into hierarchical sections.
-;; These sections are used for navigation and for hiding parts of the
-;; buffer.
-;;
-;; Most sections also represent the objects that Magit works with,
-;; such as files, diffs, hunks, commits, etc.  The 'type' of a section
-;; identifies what kind of object it represents (if any), and the
-;; parent and grand-parent, etc provide the context.
-
-(defstruct magit-section
-  parent title beginning end children hidden type info
-  needs-refresh-on-show)
-
-(defvar magit-top-section nil
-  "The top section of the current buffer.")
-(make-variable-buffer-local 'magit-top-section)
-(put 'magit-top-section 'permanent-local t)
-
-(defvar magit-old-top-section nil)
-
-(defvar magit-section-hidden-default nil)
-
-(defun magit-new-section (title type)
-  "Create a new section with title TITLE and type TYPE in current buffer.
-
-If not `magit-top-section' exist, the new section will be the new top-section
-otherwise, the new-section will be a child of the current top-section.
-
-If TYPE is nil, the section won't be highlighted."
-  (let* ((s (make-magit-section :parent magit-top-section
-                                :title title
-                                :type type
-                                :hidden magit-section-hidden-default))
-         (old (and magit-old-top-section
-                   (magit-find-section (magit-section-path s)
-                                       magit-old-top-section))))
-    (if magit-top-section
-        (push s (magit-section-children magit-top-section))
-      (setq magit-top-section s))
-    (if old
-        (setf (magit-section-hidden s) (magit-section-hidden old)))
-    s))
-
-(defun magit-cancel-section (section)
-  "Delete the section SECTION."
-  (delete-region (magit-section-beginning section)
-                 (magit-section-end section))
-  (let ((parent (magit-section-parent section)))
-    (if parent
-        (setf (magit-section-children parent)
-              (delq section (magit-section-children parent)))
-      (setq magit-top-section nil))))
-
-(defmacro magit-with-section (title type &rest body)
-  "Create a new section of title TITLE and type TYPE and evaluate BODY there.
-
-Sections created inside BODY will become children of the new
-section. BODY must leave point at the end of the created section.
-
-If TYPE is nil, the section won't be highlighted."
-  (declare (indent 2))
-  (let ((s (make-symbol "*section*")))
-    `(let* ((,s (magit-new-section ,title ,type))
-            (magit-top-section ,s))
-       (setf (magit-section-beginning ,s) (point))
-       ,@body
-       (setf (magit-section-end ,s) (point))
-       (setf (magit-section-children ,s)
-             (nreverse (magit-section-children ,s)))
-       ,s)))
-
-(defun magit-set-section (title type start end)
-  "Create a new section of title TITLE and type TYPE with specified start and
-end positions."
-  (let ((section (magit-new-section title type)))
-    (setf (magit-section-beginning section) start)
-    (setf (magit-section-end section) end)
-    section))
-
-(defun magit-set-section-info (info &optional section)
-  (setf (magit-section-info (or section magit-top-section)) info))
-
-(defun magit-set-section-needs-refresh-on-show (flag &optional section)
-  (setf (magit-section-needs-refresh-on-show
-         (or section magit-top-section))
-        flag))
-
-(defmacro magit-create-buffer-sections (&rest body)
-  "Empty current buffer of text and Magit's sections, and then evaluate BODY."
-  (declare (indent 0))
-  `(let ((inhibit-read-only t))
-     (erase-buffer)
-     (let ((magit-old-top-section magit-top-section))
-       (setq magit-top-section nil)
-       ,@body
-       (when (null magit-top-section)
-         (magit-with-section 'top nil
-           (insert "(empty)\n")))
-       (magit-propertize-section magit-top-section)
-       (magit-section-set-hidden magit-top-section
-                                 (magit-section-hidden magit-top-section)))))
-
-(defun magit-propertize-section (section)
-  "Add text-property needed for SECTION."
-  (put-text-property (magit-section-beginning section)
-                     (magit-section-end section)
-                     'magit-section section)
-  (dolist (s (magit-section-children section))
-    (magit-propertize-section s)))
-
-(defun magit-find-section (path top)
-  "Find the section at the path PATH in subsection of section TOP."
-  (if (null path)
-      top
-    (let ((secs (magit-section-children top)))
-      (while (and secs (not (equal (car path)
-                                   (magit-section-title (car secs)))))
-        (setq secs (cdr secs)))
-      (and (car secs)
-           (magit-find-section (cdr path) (car secs))))))
-
-(defun magit-section-path (section)
-  "Return the path of SECTION."
-  (if (not (magit-section-parent section))
-      '()
-    (append (magit-section-path (magit-section-parent section))
-            (list (magit-section-title section)))))
-
-(defun magit-find-section-after (pos)
-  "Find the first section that begins after POS."
-  (magit-find-section-after* pos (list magit-top-section)))
-
-(defun magit-find-section-after* (pos secs)
-  "Find the first section that begins after POS in the list SECS
-\(including children of sections in SECS)."
-  (while (and secs
-              (<= (magit-section-beginning (car secs)) pos))
-    (setq secs (if (magit-section-hidden (car secs))
-                   (cdr secs)
-                 (append (magit-section-children (car secs))
-                         (cdr secs)))))
-  (car secs))
-
-(defun magit-find-section-before (pos)
-  "Return the last section that begins before POS."
-  (let ((section (magit-find-section-at pos)))
-    (do* ((current (or (magit-section-parent section)
-                       section)
-                   next)
-          (next (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))
-                (if (not (magit-section-hidden current))
-                    (magit-find-section-before* pos (magit-section-children current)))))
-        ((null next) current))))
-
-(defun magit-find-section-before* (pos secs)
-  "Find the last section that begins before POS in the list SECS."
-  (let ((prev nil))
-    (while (and secs
-                (< (magit-section-beginning (car secs)) pos))
-      (setq prev (car secs))
-      (setq secs (cdr secs)))
-    prev))
-
-(defun magit-current-section ()
-  "Return the Magit section at point."
-  (magit-find-section-at (point)))
-
-(defun magit-find-section-at (pos)
-  "Return the Magit section at POS."
-  (or (get-text-property pos 'magit-section)
-      magit-top-section))
-
-(defun magit-insert-section (section-title-and-type
-                             buffer-title washer cmd &rest args)
-  "Run CMD and put its result in a new section.
-
-SECTION-TITLE-AND-TYPE is either a string that is the title of the section
-or (TITLE . TYPE) where TITLE is the title of the section and TYPE is its type.
-
-If there is no type, or if type is nil, the section won't be highlighted.
-
-BUFFER-TITLE is the inserted title of the section
-
-WASHER is a function that will be run after CMD.
-The buffer will be narrowed to the inserted text.
-It should add sectioning as needed for Magit interaction.
-
-CMD is an external command that will be run with ARGS as arguments."
-  (let* ((body-beg nil)
-         (section-title (if (consp section-title-and-type)
-                            (car section-title-and-type)
-                          section-title-and-type))
-         (section-type (if (consp section-title-and-type)
-                           (cdr section-title-and-type)
-                         nil))
-         (section
-          (magit-with-section section-title section-type
-            (if buffer-title
-                (insert (propertize buffer-title 'face 'magit-section-title)
-                        "\n"))
-            (setq body-beg (point))
-            (magit-cmd-insert cmd args)
-            (if (not (eq (char-before) ?\n))
-                (insert "\n"))
-            (if washer
-                (save-restriction
-                  (narrow-to-region body-beg (point))
-                  (goto-char (point-min))
-                  (funcall washer)
-                  (goto-char (point-max)))))))
-    (if (= body-beg (point))
-        (magit-cancel-section section)
-      (insert "\n"))
-    section))
-
-(defun magit-git-section (section-title-and-type
-                          buffer-title washer &rest args)
-  "Run git and put its result in a new section.
-
-see `magit-insert-section' for meaning of the arguments"
-  (apply #'magit-insert-section
-         section-title-and-type
-         buffer-title
-         washer
-         magit-git-executable
-         (append magit-git-standard-options args)))
-
-(defun magit-goto-next-section ()
-  "Go to the next section."
-  (interactive)
-  (let ((next (magit-find-section-after (point))))
-    (if next
-        (magit-goto-section next)
-      (message "No next section"))))
-
-(defun magit-goto-previous-section ()
-  "Go to the previous section."
-  (interactive)
-  (if (eq (point) 1)
-      (message "No previous section")
-    (magit-goto-section (magit-find-section-before (point)))))
-
-(defun magit-goto-parent-section ()
-  "Go to the parent section."
-  (interactive)
-  (let ((parent (magit-section-parent (magit-current-section))))
-    (when parent
-      (goto-char (magit-section-beginning parent)))))
-
-(defun magit-goto-next-sibling-section ()
-  "Go to the next sibling section."
-  (interactive)
-  (let* ((initial (point))
-         (section (magit-current-section))
-         (end (- (magit-section-end section) 1))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (next-sibling (magit-find-section-after* end siblings)))
-    (if next-sibling
-        (magit-goto-section next-sibling)
-      (magit-goto-next-section))))
-
-(defun magit-goto-previous-sibling-section ()
-  "Go to the previous sibling section."
-  (interactive)
-  (let* ((section (magit-current-section))
-         (beginning (magit-section-beginning section))
-         (parent (magit-section-parent section))
-         (siblings (magit-section-children parent))
-         (previous-sibling (magit-find-section-before* beginning siblings)))
-    (if previous-sibling
-        (magit-goto-section previous-sibling)
-      (magit-goto-parent-section))))
-
-(defun magit-goto-section (section)
-  (goto-char (magit-section-beginning section))
-  (cond
-   ((and magit-log-auto-more
-         (eq (magit-section-type section) 'longer))
-    (magit-log-show-more-entries)
-    (forward-line -1)
-    (magit-goto-next-section))
-   ((and (eq (magit-section-type section) 'commit)
-         (derived-mode-p 'magit-log-mode))
-    (magit-show-commit section))))
-
-(defun magit-goto-section-at-path (path)
-  "Go to the section described by PATH."
-  (let ((sec (magit-find-section path magit-top-section)))
-    (if sec
-        (goto-char (magit-section-beginning sec))
-      (message "No such section"))))
-
-(defun magit-for-all-sections (func &optional top)
-  "Run FUNC on TOP and recursively on all its children.
-
-Default value for TOP is `magit-top-section'"
-  (let ((section (or top magit-top-section)))
-    (when section
-      (funcall func section)
-      (dolist (c (magit-section-children section))
-        (magit-for-all-sections func c)))))
-
-(defun magit-section-set-hidden (section hidden)
-  "Hide SECTION if HIDDEN is not nil, show it otherwise."
-  (setf (magit-section-hidden section) hidden)
-  (if (and (not hidden)
-           (magit-section-needs-refresh-on-show section))
-      (magit-refresh)
-    (let ((inhibit-read-only t)
-          (beg (save-excursion
-                 (goto-char (magit-section-beginning section))
-                 (forward-line)
-                 (point)))
-          (end (magit-section-end section)))
-      (if (< beg end)
-          (put-text-property beg end 'invisible hidden)))
-    (if (not hidden)
-        (dolist (c (magit-section-children section))
-          (magit-section-set-hidden c (magit-section-hidden c))))))
-
-(defun magit-section-any-hidden (section)
-  "Return true if SECTION or any of its children is hidden."
-  (or (magit-section-hidden section)
-      (let ((kids (magit-section-children section)))
-        (while (and kids (not (magit-section-any-hidden (car kids))))
-          (setq kids (cdr kids)))
-        kids)))
-
-(defun magit-section-collapse (section)
-  "Show SECTION and hide all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) t))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand (section)
-  "Show SECTION and all its children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil))
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-expand-all-aux (section)
-  "Show recursively all SECTION's children."
-  (dolist (c (magit-section-children section))
-    (setf (magit-section-hidden c) nil)
-    (magit-section-expand-all-aux c)))
-
-(defun magit-section-expand-all (section)
-  "Show SECTION and all its children."
-  (magit-section-expand-all-aux section)
-  (magit-section-set-hidden section nil))
-
-(defun magit-section-hideshow (flag-or-func)
-  "Show or hide current section depending on FLAG-OR-FUNC.
-
-If FLAG-OR-FUNC is a function, it will be ran on current section
-IF FLAG-OR-FUNC is a Boolean value, the section will be hidden if its true, shown otherwise"
-  (let ((section (magit-current-section)))
-    (when (magit-section-parent section)
-      (goto-char (magit-section-beginning section))
-      (if (functionp flag-or-func)
-          (funcall flag-or-func section)
-        (magit-section-set-hidden section flag-or-func)))))
-
-(defun magit-show-section ()
-  "Show current section."
-  (interactive)
-  (magit-section-hideshow nil))
-
-(defun magit-hide-section ()
-  "Hide current section."
-  (interactive)
-  (magit-section-hideshow t))
-
-(defun magit-collapse-section ()
-  "Hide all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-collapse))
-
-(defun magit-expand-section ()
-  "Show all subsection of current section."
-  (interactive)
-  (magit-section-hideshow #'magit-section-expand))
-
-(defun magit-toggle-file-section ()
-  "Like `magit-toggle-section' but toggle at file granularity."
-  (interactive)
-  (when (eq 'hunk (first (magit-section-context-type (magit-current-section))))
-    (magit-goto-parent-section))
-  (magit-toggle-section))
-
-(defun magit-toggle-section ()
-  "Toggle hidden status of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (magit-section-set-hidden s (not (magit-section-hidden s))))))
-
-(defun magit-expand-collapse-section ()
-  "Toggle hidden status of subsections of current section."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-any-hidden s)
-            (magit-section-expand-all s))
-           (t
-            (magit-section-collapse s))))))
-
-(defun magit-cycle-section ()
-  "Cycle between expanded, hidden and collapsed state for current section.
-
-Hidden: only the first line of the section is shown
-Collapsed: only the first line of the subsection is shown
-Expanded: everything is shown."
-  (interactive)
-  (magit-section-hideshow
-   (lambda (s)
-     (cond ((magit-section-hidden s)
-            (magit-section-collapse s))
-           ((notany #'magit-section-hidden (magit-section-children s))
-            (magit-section-set-hidden s t))
-           (t
-            (magit-section-expand s))))))
-
-(defun magit-section-lineage (s)
-  "Return list of parent, grand-parents... for section S."
-  (when s
-    (cons s (magit-section-lineage (magit-section-parent s)))))
-
-(defun magit-section-show-level (section level threshold path)
-  (magit-section-set-hidden section (>= level threshold))
-  (when (and (< level threshold)
-             (not (magit-no-commit-p)))
-    (if path
-        (magit-section-show-level (car path) (1+ level) threshold (cdr path))
-      (dolist (c (magit-section-children section))
-        (magit-section-show-level c (1+ level) threshold nil)))))
-
-(defun magit-show-level (level all)
-  "Show section whose level is less than LEVEL, hide the others.
-If ALL is non nil, do this in all sections,
-otherwise do it only on ancestors and descendants of current section."
-  (magit-with-refresh
-    (if all
-        (magit-section-show-level magit-top-section 0 level nil)
-      (let ((path (reverse (magit-section-lineage (magit-current-section)))))
-        (magit-section-show-level (car path) 0 level (cdr path))))))
-
-(defun magit-show-only-files ()
-  "Show section that are files, but not there subsection.
-
-Do this in on ancestors and descendants of current section."
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2)
-    (call-interactively 'magit-show-level-1)))
-
-(defun magit-show-only-files-all ()
-  "Show section that are files, but not there subsection.
-
-Do this for all sections"
-  (interactive)
-  (if (derived-mode-p 'magit-status-mode)
-      (call-interactively 'magit-show-level-2-all)
-    (call-interactively 'magit-show-level-1-all)))
-
-(defmacro magit-define-level-shower-1 (level all)
-  "Define an interactive function to show function of level LEVEL.
-
-If ALL is non nil, this function will affect all section,
-otherwise it will affect only ancestors and descendants of current section."
-  (let ((fun (intern (format "magit-show-level-%s%s"
-                             level (if all "-all" ""))))
-        (doc (format "Show sections on level %s." level)))
-    `(defun ,fun ()
-       ,doc
-       (interactive)
-       (magit-show-level ,level ,all))))
-
-(defmacro magit-define-level-shower (level)
-  "Define two interactive function to show function of level LEVEL.
-one for all, one for current lineage."
-  `(progn
-     (magit-define-level-shower-1 ,level nil)
-     (magit-define-level-shower-1 ,level t)))
-
-(defmacro magit-define-section-jumper (sym title)
-  "Define an interactive function to go to section SYM.
-
-TITLE is the displayed title of the section."
-  (let ((fun (intern (format "magit-jump-to-%s" sym)))
-        (doc (format "Jump to section `%s'." title)))
-    `(progn
-       (defun ,fun ()
-         ,doc
-         (interactive)
-         (magit-goto-section-at-path '(,sym)))
-       (put ',fun 'definition-name ',sym))))
-
-(defmacro magit-define-inserter (sym arglist &rest body)
-  (declare (indent defun))
-  (let ((fun (intern (format "magit-insert-%s" sym)))
-        (before (intern (format "magit-before-insert-%s-hook" sym)))
-        (after (intern (format "magit-after-insert-%s-hook" sym)))
-        (doc (format "Insert items for `%s'." sym)))
-    `(progn
-       (defvar ,before nil)
-       (defvar ,after nil)
-       (defun ,fun ,arglist
-         ,doc
-         (run-hooks ',before)
-         ,@body
-         (run-hooks ',after))
-       (put ',before 'definition-name ',sym)
-       (put ',after 'definition-name ',sym)
-       (put ',fun 'definition-name ',sym))))
-
-(defvar magit-highlighted-section nil)
-
-(defun magit-refine-section (section)
-  "Apply temporary refinements to the display of SECTION.
-Refinements can be undone with `magit-unrefine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; Refine the current hunk to show fine details, using
-           ;; diff-mode machinery.
-           (save-excursion
-             (goto-char (magit-section-beginning magit-highlighted-section))
-             (diff-refine-hunk))))))
-
-(defun magit-unrefine-section (section)
-  "Remove refinements to the display of SECTION done by `magit-refine-section'."
-  (let ((type (and section (magit-section-type section))))
-    (cond ((and (eq type 'hunk)
-                magit-diff-refine-hunk
-                (not (eq magit-diff-refine-hunk 'all)))
-           ;; XXX this should be in some diff-mode function, like
-           ;; `diff-unrefine-hunk'
-           (remove-overlays (magit-section-beginning section)
-                            (magit-section-end section)
-                            'diff-mode 'fine)))))
-
-(defvar magit-highlight-overlay nil)
-
-(defun magit-highlight-section ()
-  "Highlight current section if it has a type."
-  (let ((section (magit-current-section)))
-    (when (not (eq section magit-highlighted-section))
-      (when magit-highlighted-section
-        ;; remove any refinement from previous hunk
-        (magit-unrefine-section magit-highlighted-section))
-      (setq magit-highlighted-section section)
-      (if (not magit-highlight-overlay)
-          (let ((ov (make-overlay 1 1)))
-            (overlay-put ov 'face 'magit-item-highlight)
-            (setq magit-highlight-overlay ov)))
-      (if (and section (magit-section-type section))
-          (progn
-            (magit-refine-section section)
-            (move-overlay magit-highlight-overlay
-                          (magit-section-beginning section)
-                          (magit-section-end section)
-                          (current-buffer)))
-        (delete-overlay magit-highlight-overlay)))))
-
-(defun magit-section-context-type (section)
-  (if (null section)
-      '()
-    (let ((c (or (magit-section-type section)
-                 (if (symbolp (magit-section-title section))
-                     (magit-section-title section)))))
-      (if c
-          (cons c (magit-section-context-type
-                   (magit-section-parent section)))
-        '()))))
-
-(defun magit-prefix-p (prefix list)
-  "Returns non-nil if PREFIX is a prefix of LIST.  PREFIX and LIST should both be
-lists.
-
-If the car of PREFIX is the symbol '*, then return non-nil if the cdr of PREFIX
-is a sublist of LIST (as if '* matched zero or more arbitrary elements of LIST)"
-  ;;; Very schemish...
-  (or (null prefix)
-      (if (eq (car prefix) '*)
-          (or (magit-prefix-p (cdr prefix) list)
-              (and (not (null list))
-                   (magit-prefix-p prefix (cdr list))))
-        (and (not (null list))
-             (equal (car prefix) (car list))
-             (magit-prefix-p (cdr prefix) (cdr list))))))
-
-(defmacro magit-section-case (head &rest clauses)
-  "Make different action depending of current section.
-
-HEAD is (SECTION INFO &optional OPNAME),
-  SECTION will be bind to the current section,
-  INFO will be bind to the info's of the current section,
-  OPNAME is a string that will be used to describe current action,
-
-CLAUSES is a list of CLAUSE, each clause is (SECTION-TYPE &BODY)
-where SECTION-TYPE describe section where BODY will be run.
-
-This returns non-nil if some section matches. If the
-corresponding body return a non-nil value, it is returned,
-otherwise it returns t.
-
-If no section matches, this returns nil if no OPNAME was given
-and throws an error otherwise."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (make-symbol "*type*"))
-        (context (make-symbol "*context*"))
-        (opname (caddr head)))
-    `(let* ((,section (magit-current-section))
-            (,info (and ,section (magit-section-info ,section)))
-            (,type (and ,section (magit-section-type ,section)))
-            (,context (magit-section-context-type ,section)))
-       (cond ,@(mapcar (lambda (clause)
-                         (if (eq (car clause) t)
-                             `(t (or (progn ,@(cdr clause))
-                                     t))
-                           (let ((prefix (reverse (car clause)))
-                                 (body (cdr clause)))
-                             `((magit-prefix-p ',prefix ,context)
-                               (or (progn ,@body)
-                                   t)))))
-                       clauses)
-             ,@(when opname
-                 `(((run-hook-with-args-until-success
-                     ',(intern (format "magit-%s-action-hook" opname))))
-                   ((not ,type)
-                    (error "Nothing to %s here" ,opname))
-                   (t
-                    (error "Can't %s a %s"
-                           ,opname
-                           (or (get ,type 'magit-description)
-                               ,type)))))))))
-
-(defmacro magit-section-action (head &rest clauses)
-  (declare (indent 1))
-  `(magit-with-refresh
-     (magit-section-case ,head ,@clauses)))
-
-(defmacro magit-add-action (head &rest clauses)
-  "Add additional actions to a pre-existing operator.
-The syntax is identical to `magit-section-case', except that
-OPNAME is mandatory and specifies the operation to which to add
-the actions."
-  (declare (indent 1))
-  (let ((section (car head))
-        (info (cadr head))
-        (type (caddr head)))
-    `(add-hook ',(intern (format "magit-%s-action-hook" type))
-               (lambda ()
-                 ,(macroexpand
-                   ;; Don't pass in the opname so we don't recursively
-                   ;; run the hook again, and so we don't throw an
-                   ;; error if no action matches.
-                   `(magit-section-case (,section ,info)
-                      ,@clauses))))))
-
-(defun magit-wash-sequence (func)
-  "Run FUNC until end of buffer is reached.
-
-FUNC should leave point at the end of the modified region"
-  (while (and (not (eobp))
-              (funcall func))))
-
-(defmacro magit-define-command (sym arglist &rest body)
-  "Macro to define a magit command.
-It will define the magit-SYM function having ARGLIST as argument.
-It will also define the magit-SYM-command-hook variable.
-
-The defined function will call the function in the hook in
-order until one return non nil. If they all return nil then body will be called.
-
-It is used to define hookable magit command: command defined by this
-function can be enriched by magit extension like magit-topgit and magit-svn"
-  (declare (indent defun)
-           (debug (&define name lambda-list
-                           [&optional stringp]        ; Match the doc string, if present.
-                           [&optional ("interactive" interactive)]
-                           def-body)))
-  (let ((fun (intern (format "magit-%s" sym)))
-        (hook (intern (format "magit-%s-command-hook" sym)))
-        (doc (format "Command for `%s'." sym))
-        (inter nil)
-        (instr body))
-    (when (stringp (car body))
-      (setq doc (car body)
-            instr (cdr body)))
-    (let ((form (car instr)))
-      (when (eq (car form) 'interactive)
-        (setq inter form
-              instr (cdr instr))))
-    `(progn
-       (defvar ,hook nil)
-       (defun ,fun ,arglist
-         ,doc
-         ,inter
-         (or (run-hook-with-args-until-success
-              ',hook ,@(remq '&optional (remq '&rest arglist)))
-             ,@instr))
-       (put ',fun 'definition-name ',sym)
-       (put ',hook 'definition-name ',sym))))
-
-;;; Running commands
-
-(defun magit-set-mode-line-process (str)
-  (let ((pr (if str (concat " " str) "")))
-    (save-excursion
-      (magit-for-all-buffers (lambda ()
-                               (setq mode-line-process pr))))))
-
-(defun magit-process-indicator-from-command (comps)
-  (if (magit-prefix-p (cons magit-git-executable magit-git-standard-options)
-                      comps)
-      (setq comps (nthcdr (+ (length magit-git-standard-options) 1) comps)))
-  (cond ((or (null (cdr comps))
-             (not (member (car comps) '("remote"))))
-         (car comps))
-        (t
-         (concat (car comps) " " (cadr comps)))))
-
-(defvar magit-process nil)
-(defvar magit-process-client-buffer nil)
-(defvar magit-process-buffer-name "*magit-process*"
-  "Buffer name for running git commands.")
-
-(defun magit-run* (cmd-and-args
-                   &optional logline noerase noerror nowait input)
-  (if (and magit-process
-           (get-buffer magit-process-buffer-name))
-      (error "Git is already running"))
-  (let ((cmd (car cmd-and-args))
-        (args (cdr cmd-and-args))
-        (dir default-directory)
-        (buf (get-buffer-create magit-process-buffer-name))
-        (successp nil))
-    (magit-set-mode-line-process
-     (magit-process-indicator-from-command cmd-and-args))
-    (setq magit-process-client-buffer (current-buffer))
-    (with-current-buffer buf
-      (view-mode 1)
-      (set (make-local-variable 'view-no-disable-on-exit) t)
-      (setq view-exit-action
-            (lambda (buffer)
-              (with-current-buffer buffer
-                (bury-buffer))))
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (setq default-directory dir)
-        (if noerase
-            (goto-char (point-max))
-          (erase-buffer))
-        (insert "$ " (or logline
-                         (mapconcat 'identity cmd-and-args " "))
-                "\n")
-        (cond (nowait
-               (setq magit-process
-                     (let ((process-connection-type magit-process-connection-type))
-                       (apply 'magit-start-process cmd buf cmd args)))
-               (set-process-sentinel magit-process 'magit-process-sentinel)
-               (set-process-filter magit-process 'magit-process-filter)
-               (when input
-                 (with-current-buffer input
-                   (process-send-region magit-process
-                                        (point-min) (point-max)))
-                 (process-send-eof magit-process)
-                 (sit-for 0.1 t))
-               (cond ((= magit-process-popup-time 0)
-                      (pop-to-buffer (process-buffer magit-process)))
-                     ((> magit-process-popup-time 0)
-                      (run-with-timer
-                       magit-process-popup-time nil
-                       (function
-                        (lambda (buf)
-                          (with-current-buffer buf
-                            (when magit-process
-                              (display-buffer (process-buffer magit-process))
-                              (goto-char (point-max))))))
-                       (current-buffer))))
-               (setq successp t))
-              (input
-               (with-current-buffer input
-                 (setq default-directory dir)
-                 (setq magit-process
-                       ;; Don't use a pty, because it would set icrnl
-                       ;; which would modify the input (issue #20).
-                       (let ((process-connection-type nil))
-                         (apply 'magit-start-process cmd buf cmd args)))
-                 (set-process-filter magit-process 'magit-process-filter)
-                 (process-send-region magit-process
-                                      (point-min) (point-max))
-                 (process-send-eof magit-process)
-                 (while (equal (process-status magit-process) 'run)
-                   (sit-for 0.1 t))
-                 (setq successp
-                       (equal (process-exit-status magit-process) 0))
-                 (setq magit-process nil))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))
-              (t
-               (setq successp
-                     (equal (apply 'process-file cmd nil buf nil args) 0))
-               (magit-set-mode-line-process nil)
-               (magit-need-refresh magit-process-client-buffer))))
-      (or successp
-          noerror
-          (error
-           "%s ... [Hit %s or see buffer %s for details]"
-           (or (with-current-buffer (get-buffer magit-process-buffer-name)
-                 (when (re-search-backward
-                        (concat "^error: \\(.*\\)" paragraph-separate) nil t)
-                   (match-string 1)))
-               "Git failed")
-           (with-current-buffer magit-process-client-buffer
-             (key-description (car (where-is-internal
-                                    'magit-display-process))))
-           magit-process-buffer-name))
-      successp)))
-
-(autoload 'dired-uncache "dired")
-(defun magit-process-sentinel (process event)
-  (let ((msg (format "%s %s." (process-name process) (substring event 0 -1)))
-        (successp (string-match "^finished" event))
-        (key (with-current-buffer magit-process-client-buffer
-               (key-description (car (where-is-internal
-                                      'magit-display-process))))))
-    (with-current-buffer (process-buffer process)
-      (let ((inhibit-read-only t))
-        (goto-char (point-max))
-        (insert msg "\n")
-        (message (if successp msg
-                   (format "%s Hit %s or see buffer %s for details."
-                           msg key (current-buffer)))))
-      (unless (memq (process-status process) '(run open))
-        (dired-uncache default-directory)))
-    (setq magit-process nil)
-    (magit-set-mode-line-process nil)
-    (magit-refresh-buffer magit-process-client-buffer)))
-
-(defun magit-password (proc string)
-  "Checks if git/ssh asks for a password and ask the user for it."
-  (let (ask)
-    (cond ((or (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
-               (string-match "^\\\(.*\\\)'s password:" string)
-               (string-match "^Password for '\\\(.*\\\)':" string))
-           (setq ask (format "Password for '%s': " (match-string 1 string))))
-          ((string-match "^[pP]assword:" string)
-           (setq ask "Password:")))
-    (when ask
-      (process-send-string proc (concat (read-passwd ask nil) "\n")))))
-
-(defun magit-username (proc string)
-  "Checks if git asks for a username and ask the user for it."
-  (when (string-match "^Username for '\\\(.*\\\)':" string)
-    (process-send-string proc
-                         (concat
-                          (read-string (format "Username for '%s': "
-                                               (match-string 1 string))
-                                       nil nil (user-login-name))
-                          "\n"))))
-
-(defun magit-process-filter (proc string)
-  (save-current-buffer
-    (set-buffer (process-buffer proc))
-    (let ((inhibit-read-only t))
-      (magit-username proc string)
-      (magit-password proc string)
-      (goto-char (process-mark proc))
-      ;; Find last ^M in string.  If one was found, ignore everything
-      ;; before it and delete the current line.
-      (let ((ret-pos (length string)))
-        (while (and (>= (setq ret-pos (1- ret-pos)) 0)
-                    (/= ?\r (aref string ret-pos))))
-        (cond ((>= ret-pos 0)
-               (goto-char (line-beginning-position))
-               (delete-region (point) (line-end-position))
-               (insert (substring string (+ ret-pos 1))))
-              (t
-               (insert string))))
-      (set-marker (process-mark proc) (point)))))
-
-(defun magit-run (cmd &rest args)
-  (magit-with-refresh
-    (magit-run* (cons cmd args))))
-
-(defun magit-run-git (&rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args))))
-
-(defun magit-run-git-with-input (input &rest args)
-  (magit-with-refresh
-    (magit-run* (append (cons magit-git-executable
-                              magit-git-standard-options)
-                        args)
-                nil nil nil nil input)))
-
-(defun magit-run-git-async (&rest args)
-  (message "Running %s %s" magit-git-executable (mapconcat 'identity args " "))
-  (magit-run* (append (cons magit-git-executable
-                            magit-git-standard-options)
-                      args)
-              nil nil nil t))
-
-(defun magit-run-async-with-input (input cmd &rest args)
-  (magit-run* (cons cmd args) nil nil nil t input))
-
-(defun magit-display-process ()
-  "Display output from most recent git command."
-  (interactive)
-  (unless (get-buffer magit-process-buffer-name)
-    (error "No Git commands have run"))
-  (display-buffer magit-process-buffer-name))
-
-;;; Mode
-
-;; We define individual functions (instead of using lambda etc) so
-;; that the online help can show something meaningful.
-
-(magit-define-section-jumper untracked "Untracked files")
-(magit-define-section-jumper unstaged  "Unstaged changes")
-(magit-define-section-jumper staged    "Staged changes")
-(magit-define-section-jumper unpushed  "Unpushed commits")
-
-(magit-define-level-shower 1)
-(magit-define-level-shower 2)
-(magit-define-level-shower 3)
-(magit-define-level-shower 4)
-
-(easy-menu-define magit-mode-menu magit-mode-map
-  "Magit menu"
-  '("Magit"
-    ["Refresh" magit-refresh t]
-    ["Refresh all" magit-refresh-all t]
-    "---"
-    ["Stage" magit-stage-item t]
-    ["Stage all" magit-stage-all t]
-    ["Unstage" magit-unstage-item t]
-    ["Unstage all" magit-unstage-all t]
-    ["Commit" magit-log-edit t]
-    ["Add log entry" magit-add-log t]
-    ["Tag" magit-tag t]
-    ["Annotated tag" magit-annotated-tag t]
-    "---"
-    ["Diff working tree" magit-diff-working-tree t]
-    ["Diff" magit-diff t]
-    ("Log"
-     ["Short Log" magit-log t]
-     ["Long Log" magit-log-long t]
-     ["Reflog" magit-reflog t]
-     ["Extended..." magit-key-mode-popup-logging t])
-    "---"
-    ["Cherry pick" magit-cherry-pick-item t]
-    ["Apply" magit-apply-item t]
-    ["Revert" magit-revert-item t]
-    "---"
-    ["Ignore" magit-ignore-item t]
-    ["Ignore locally" magit-ignore-item-locally t]
-    ["Discard" magit-discard-item t]
-    ["Reset head" magit-reset-head t]
-    ["Reset working tree" magit-reset-working-tree t]
-    ["Stash" magit-stash t]
-    ["Snapshot" magit-stash-snapshot t]
-    "---"
-    ["Branch..." magit-checkout t]
-    ["Merge" magit-manual-merge t]
-    ["Interactive resolve" magit-interactive-resolve-item t]
-    ["Rebase" magit-rebase-step t]
-    ("Rewrite"
-     ["Start" magit-rewrite-start t]
-     ["Stop" magit-rewrite-stop t]
-     ["Finish" magit-rewrite-finish t]
-     ["Abort" magit-rewrite-abort t]
-     ["Set used" magit-rewrite-set-used t]
-     ["Set unused" magit-rewrite-set-unused t])
-    "---"
-    ["Push" magit-push t]
-    ["Pull" magit-pull t]
-    ["Remote update" magit-remote-update t]
-    ("Submodule"
-     ["Submodule update" magit-submodule-update t]
-     ["Submodule update and init" magit-submodule-update-init t]
-     ["Submodule init" magit-submodule-init t]
-     ["Submodule sync" magit-submodule-sync t])
-    "---"
-    ("Extensions")
-    "---"
-    ["Display Git output" magit-display-process t]
-    ["Quit Magit" magit-quit-window t]))
-
-(defvar magit-mode-hook nil "Hook run by `magit-mode'.")
-
-(put 'magit-mode 'mode-class 'special)
-
-(defvar magit-refresh-function nil)
-(make-variable-buffer-local 'magit-refresh-function)
-(put 'magit-refresh-function 'permanent-local t)
-
-(defvar magit-refresh-args nil)
-(make-variable-buffer-local 'magit-refresh-args)
-(put 'magit-refresh-args 'permanent-local t)
-
-(defvar last-point)
-
-(defun magit-remember-point ()
-  (setq last-point (point)))
-
-(defun magit-invisible-region-end (pos)
-  (while (and (not (= pos (point-max))) (invisible-p pos))
-    (setq pos (next-char-property-change pos)))
-  pos)
-
-(defun magit-invisible-region-start (pos)
-  (while (and (not (= pos (point-min))) (invisible-p pos))
-    (setq pos (1- (previous-char-property-change pos))))
-  pos)
-
-(defun magit-correct-point-after-command ()
-  "Move point outside of invisible regions.
-
-Emacs often leaves point in invisible regions, it seems.  To fix
-this, we move point ourselves and never let Emacs do its own
-adjustments.
-
-When point has to be moved out of an invisible region, it can be
-moved to its end or its beginning.  We usually move it to its
-end, except when that would move point back to where it was
-before the last command."
-  (if (invisible-p (point))
-      (let ((end (magit-invisible-region-end (point))))
-        (goto-char (if (= end last-point)
-                       (magit-invisible-region-start (point))
-                     end))))
-  (setq disable-point-adjustment t))
-
-(defun magit-post-command-hook ()
-  (magit-correct-point-after-command)
-  (magit-highlight-section))
-
-(defun magit-mode ()
-  "Review the status of a git repository and act on it.
-
-Please see the manual for a complete description of Magit.
-
-\\{magit-mode-map}"
-  (kill-all-local-variables)
-  (buffer-disable-undo)
-  (setq buffer-read-only t
-        truncate-lines t
-        major-mode 'magit-mode
-        mode-name "Magit"
-        mode-line-process "")
-  (add-hook 'pre-command-hook #'magit-remember-point nil t)
-  (add-hook 'post-command-hook #'magit-post-command-hook t t)
-  (use-local-map magit-mode-map)
-  (setq magit-current-indentation (magit-indentation-for default-directory))
-  ;; Emacs' normal method of showing trailing whitespace gives weird
-  ;; results when `magit-whitespace-warning-face' is different from
-  ;; `trailing-whitespace'.
-  (if (and magit-highlight-whitespace magit-highlight-trailing-whitespace)
-      (setq show-trailing-whitespace nil))
-  (run-mode-hooks 'magit-mode-hook))
-
-(defun magit-mode-init (dir submode refresh-func &rest refresh-args)
-  (setq default-directory dir
-        magit-refresh-function refresh-func
-        magit-refresh-args refresh-args)
-  (funcall submode)
-  (magit-refresh-buffer))
-
-(defun magit-indentation-for (dir)
-  (let (result)
-    (dolist (pair magit-highlight-indentation)
-      (if (string-match-p (car pair) dir)
-          (setq result (cdr pair))))
-    result))
-
-(defun magit-find-buffer (submode &optional dir)
-  (let ((topdir (magit-get-top-dir (or dir default-directory))))
-    (dolist (buf (buffer-list))
-      (if (with-current-buffer buf
-            (and (eq major-mode submode)
-                 default-directory
-                 (equal (expand-file-name default-directory) topdir)))
-          (return buf)))))
-
-(defun magit-find-status-buffer (&optional dir)
-  (magit-find-buffer 'magit-status-mode dir))
-
-(defun magit-for-all-buffers (func &optional dir)
-  (dolist (buf (buffer-list))
-    (with-current-buffer buf
-      (if (and (derived-mode-p 'magit-mode)
-               (or (null dir)
-                   (equal default-directory dir)))
-          (funcall func)))))
-
-(defun magit-refresh-buffer (&optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (let* ((old-line (line-number-at-pos))
-           (old-point (point))
-           (old-section (magit-current-section))
-           (old-path (and old-section
-                          (magit-section-path (magit-current-section)))))
-      (beginning-of-line)
-      (let ((section-line (and old-section
-                               (count-lines
-                                (magit-section-beginning old-section)
-                                (point))))
-            (line-char (- old-point (point))))
-        (if magit-refresh-function
-            (apply magit-refresh-function
-                   magit-refresh-args))
-        (magit-refresh-marked-commits-in-buffer)
-        (let ((s (and old-path (magit-find-section old-path magit-top-section))))
-          (cond (s
-                 (goto-char (magit-section-beginning s))
-                 (forward-line section-line)
-                 (forward-char line-char))
-                (t
-                 (magit-goto-line old-line)))
-          (dolist (w (get-buffer-window-list (current-buffer)))
-            (set-window-point w (point)))
-          (magit-highlight-section))))))
-
-(defun magit-string-has-prefix-p (string prefix)
-  (eq (compare-strings string nil (length prefix) prefix nil nil) t))
-
-(defun magit-revert-buffers (dir &optional ignore-modtime)
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               ;; don't revert indirect buffers, as the parent will be reverted
-               (not (buffer-base-buffer buffer))
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir)
-               (file-readable-p (buffer-file-name buffer))
-               (or ignore-modtime (not (verify-visited-file-modtime buffer)))
-               (not (buffer-modified-p buffer)))
-      (with-current-buffer buffer
-        (condition-case var
-            (revert-buffer t t nil)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defun magit-update-vc-modeline (dir)
-  "Update the modeline for buffers representable by magit."
-  (dolist (buffer (buffer-list))
-    (when (and buffer
-               (buffer-file-name buffer)
-               (magit-string-has-prefix-p (buffer-file-name buffer) dir))
-      (with-current-buffer buffer
-        (condition-case var
-            (vc-find-file-hook)
-          (error (let ((signal-data (cadr var)))
-                   (cond (t (magit-bug-report signal-data))))))))))
-
-(defvar magit-refresh-needing-buffers nil)
-(defvar magit-refresh-pending nil)
-
-(defun magit-refresh-wrapper (func)
-  (if magit-refresh-pending
-      (funcall func)
-    (let* ((dir default-directory)
-           (status-buffer (magit-find-status-buffer dir))
-           (magit-refresh-needing-buffers nil)
-           (magit-refresh-pending t))
-      (unwind-protect
-          (funcall func)
-        (when magit-refresh-needing-buffers
-          (magit-revert-buffers dir)
-          (dolist (b (adjoin status-buffer
-                             magit-refresh-needing-buffers))
-            (magit-refresh-buffer b)))))))
-
-(defun magit-need-refresh (&optional buffer)
-  "Mark BUFFER as needing to be refreshed.  If BUFFER is nil, use the
-current buffer."
-  (pushnew (or buffer (current-buffer)) magit-refresh-needing-buffers :test 'eq))
-
-(defun magit-refresh ()
-  "Refresh current buffer to match repository state.
-Also revert every unmodified buffer visiting files
-in the corresponding directory."
-  (interactive)
-  (magit-with-refresh
-    (magit-need-refresh)))
-
-(defun magit-refresh-all ()
-  "Refresh all magit buffers to match respective repository states.
-Also revert every unmodified buffer visiting files
-in the corresponding directories."
-  (interactive)
-  (magit-for-all-buffers #'magit-refresh-buffer default-directory))
-
-;;; Untracked files
-
-(defun magit-wash-untracked-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\t" file "\n"))
-        t)
-    nil))
-
-(defun magit-wash-untracked-files ()
-  ;; Setting magit-old-top-section to nil speeds up washing: no time
-  ;; is wasted looking up the old visibility, which doesn't matter for
-  ;; untracked files.
-  ;;
-  ;; XXX - speed this up in a more general way.
-  ;;
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-untracked-file)))
-
-(defun magit-insert-untracked-files ()
-  (unless (string= (magit-get "status" "showUntrackedFiles") "no")
-    (apply 'magit-git-section
-           `(untracked
-             "Untracked files:"
-             magit-wash-untracked-files
-             "ls-files" "--others" "-t" "--exclude-standard"
-             ,@(when magit-omit-untracked-dir-contents
-                 '("--directory"))))))
-
-;;; Diffs and Hunks
-
-(defvar magit-diff-context-lines 3)
-
-(defun magit-diff-U-arg ()
-  (format "-U%d" magit-diff-context-lines))
-
-(defun magit-diff-smaller-hunks (&optional count)
-  "Decrease the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (max 0 (- magit-diff-context-lines count)))
-  (magit-refresh))
-
-(defun magit-diff-larger-hunks (&optional count)
-  "Increase the context for diff hunks by COUNT."
-  (interactive "p")
-  (setq magit-diff-context-lines (+ magit-diff-context-lines count))
-  (magit-refresh))
-
-(defun magit-diff-default-hunks ()
-  "Reset context for diff hunks to the default size."
-  (interactive "")
-  (setq magit-diff-context-lines 3)
-  (magit-refresh))
-
-(defun magit-toggle-diff-refine-hunk (&optional other)
-  (interactive "P")
-  "Turn diff-hunk refining on or off.
-
-If hunk refining is currently on, then hunk refining is turned off.
-If hunk refining is off, then hunk refining is turned on, in
-`selected' mode (only the currently selected hunk is refined).
-
-With a prefix argument, the \"third choice\" is used instead:
-If hunk refining is currently on, then refining is kept on, but
-the refining mode (`selected' or `all') is switched.
-If hunk refining is off, then hunk refining is turned on, in
-`all' mode (all hunks refined).
-
-Customize `magit-diff-refine-hunk' to change the default mode."
-  (let* ((old magit-diff-refine-hunk)
-         (new
-          (if other
-              (if (eq old 'all) t 'all)
-            (not old))))
-
-    ;; remove any old refining in currently highlighted section
-    (when (and magit-highlighted-section old (not (eq old 'all)))
-      (magit-unrefine-section magit-highlighted-section))
-
-    ;; set variable to new value locally
-    (set (make-local-variable 'magit-diff-refine-hunk) new)
-
-    ;; if now highlighting in "selected only" mode, turn refining back
-    ;; on in the current section
-    (when (and magit-highlighted-section new (not (eq new 'all)))
-      (magit-refine-section magit-highlighted-section))
-
-    ;; `all' mode being turned on or off needs a complete refresh
-    (when (or (eq old 'all) (eq new 'all))
-      (magit-refresh))))
-
-(defun magit-diff-line-file ()
-  (cond ((looking-at "^diff --git ./\\(.*\\) ./\\(.*\\)$")
-         (match-string-no-properties 2))
-        ((looking-at "^diff --cc +\\(.*\\)$")
-         (match-string-no-properties 1))
-        (t
-         nil)))
-
-(defun magit-wash-diffs ()
-  (magit-wash-sequence #'magit-wash-diff-or-other-file))
-
-(defun magit-wash-diff-or-other-file ()
-  (or (magit-wash-diff)
-      (magit-wash-other-file)))
-
-(defun magit-wash-other-file ()
-  (if (looking-at "^? \\(.*\\)$")
-      (let ((file (match-string-no-properties 1)))
-        (delete-region (point) (+ (line-end-position) 1))
-        (magit-with-section file 'file
-          (magit-set-section-info file)
-          (insert "\tNew      " file "\n"))
-        t)
-    nil))
-
-(defvar magit-hide-diffs nil)
-
-(defvar magit-indentation-level 1)
-
-(defun magit-insert-diff-title (status file file2)
-  (let ((status-text (case status
-                       ((unmerged)
-                        (format "Unmerged   %s" file))
-                       ((new)
-                        (format "New        %s" file))
-                       ((deleted)
-                        (format "Deleted    %s" file))
-                       ((renamed)
-                        (format "Renamed    %s   (from %s)"
-                                file file2))
-                       ((modified)
-                        (format "Modified   %s" file))
-                       ((typechange)
-                        (format "Typechange %s" file))
-                       (t
-                        (format "?          %s" file)))))
-    (insert (make-string magit-indentation-level ?\t) status-text "\n")))
-
-(defvar magit-current-diff-range nil
-  "Used internally when setting up magit diff sections.")
-
-(defun magit-wash-typechange-section (file)
-  (magit-set-section-info (list 'typechange file))
-  (let ((first-start (point-marker))
-        (second-start (progn (forward-line 1)
-                             (search-forward-regexp "^diff")
-                             (beginning-of-line)
-                             (point-marker))))
-    (let ((magit-indentation-level (+ magit-indentation-level 1)))
-      (save-restriction
-        (narrow-to-region first-start second-start)
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section)))
-      (save-restriction
-        (narrow-to-region second-start (point-max))
-        (goto-char (point-min))
-        (magit-with-section file 'diff
-          (magit-wash-diff-section))))))
-
-(defun magit-wash-diff-section ()
-  (cond ((looking-at "^\\* Unmerged path \\(.*\\)")
-         (let ((file (match-string-no-properties 1)))
-           (delete-region (point) (line-end-position))
-           (insert "\tUnmerged " file "\n")
-           (magit-set-section-info (list 'unmerged file nil))
-           t))
-        ((looking-at "^diff")
-         (let ((file (magit-diff-line-file))
-               (end (save-excursion
-                      (forward-line) ;; skip over "diff" line
-                      (if (search-forward-regexp "^diff\\|^@@" nil t)
-                          (goto-char (match-beginning 0))
-                        (goto-char (point-max)))
-                      (point-marker))))
-           (let* ((status (cond
-                           ((looking-at "^diff --cc")
-                            'unmerged)
-                           ((save-excursion
-                              (search-forward-regexp "^new file" end t))
-                            'new)
-                           ((save-excursion
-                              (search-forward-regexp "^deleted" end t))
-                            'deleted)
-                           ((save-excursion
-                              (search-forward-regexp "^rename" end t))
-                            'renamed)
-                           (t
-                            'modified)))
-                  (file2 (cond
-                          ((save-excursion
-                             (search-forward-regexp "^rename from \\(.*\\)"
-                                                    end t))
-                           (match-string-no-properties 1)))))
-             (magit-set-section-info (list status
-                                           file
-                                           (or file2 file)
-                                           magit-current-diff-range))
-             (magit-insert-diff-title status file file2)
-             (when (search-forward-regexp "\\(--- \\(.*\\)\n\\+\\+\\+ \\(.*\\)\n\\)" () t)
-               (when (match-string 1)
-                 (add-text-properties (match-beginning 1) (match-end 1)
-                                      '(face magit-diff-hunk-header))
-                 (add-text-properties (match-beginning 2) (match-end 2)
-                                      '(face magit-diff-file-header))
-                 (add-text-properties (match-beginning 3) (match-end 3)
-                                      '(face magit-diff-file-header))))
-             (goto-char end)
-             (let ((magit-section-hidden-default nil))
-               (magit-wash-sequence #'magit-wash-hunk))))
-         t)
-        (t
-         nil)))
-
-(defun magit-wash-diff ()
-  (let ((magit-section-hidden-default magit-hide-diffs))
-    (magit-with-section (magit-current-line) 'diff
-      (magit-wash-diff-section))))
-
-(defun magit-diff-item-kind (diff)
-  (car (magit-section-info diff)))
-
-(defun magit-diff-item-file (diff)
-  (cadr (magit-section-info diff)))
-
-(defun magit-diff-item-file2 (diff)
-  (caddr (magit-section-info diff)))
-
-(defun magit-diff-item-range (diff)
-  (nth 3 (magit-section-info diff)))
-
-(defun magit-wash-hunk ()
-  (cond ((looking-at "\\(^@+\\)[^@]*@+.*")
-         (let ((n-columns (1- (length (match-string 1))))
-               (head (match-string 0))
-               (hunk-start-pos (point)))
-           (magit-with-section head 'hunk
-             (add-text-properties (match-beginning 0) (match-end 0)
-                                  '(face magit-diff-hunk-header))
-             (forward-line)
-             (while (not (or (eobp)
-                             (looking-at "^diff\\|^@@")))
-               (magit-highlight-line-whitespace)
-               (let ((prefix (buffer-substring-no-properties
-                              (point) (min (+ (point) n-columns) (point-max)))))
-                 (cond ((string-match "\\+" prefix)
-                        (magit-put-line-property 'face 'magit-diff-add))
-                       ((string-match "-" prefix)
-                        (magit-put-line-property 'face 'magit-diff-del))
-                       (t
-                        (magit-put-line-property 'face 'magit-diff-none))))
-               (forward-line)))
-
-           (when (eq magit-diff-refine-hunk 'all)
-             (save-excursion
-               (goto-char hunk-start-pos)
-               (diff-refine-hunk))))
-         t)
-        (t
-         nil)))
-
-(defvar magit-diff-options nil)
-
-(defun magit-insert-diff (file status)
-  (let ((cmd magit-git-executable)
-        (args (append (list "diff")
-                      (list (magit-diff-U-arg))
-                      magit-diff-options
-                      (list "--" file))))
-    (let ((p (point)))
-      (magit-git-insert args)
-      (if (not (eq (char-before) ?\n))
-          (insert "\n"))
-      (save-restriction
-        (narrow-to-region p (point))
-        (goto-char p)
-        (cond
-         ((eq status 'typechange)
-          (magit-insert-diff-title status file file)
-          (magit-wash-typechange-section file))
-         (t
-          (magit-wash-diff-section)))
-        (goto-char (point-max))))))
-
-(defvar magit-last-raw-diff nil)
-(defvar magit-ignore-unmerged-raw-diffs nil)
-
-(defun magit-wash-raw-diffs ()
-  (let ((magit-last-raw-diff nil))
-    (magit-wash-sequence #'magit-wash-raw-diff)))
-
-(defun magit-wash-raw-diff ()
-  (if (looking-at
-       ":\\([0-7]+\\) \\([0-7]+\\) [0-9a-f]+ [0-9a-f]+ \\(.\\)[0-9]*\t\\([^\t\n]+\\)$")
-      (let ((old-perm (match-string-no-properties 1))
-            (new-perm (match-string-no-properties 2))
-            (status (case (string-to-char (match-string-no-properties 3))
-                      (?A 'new)
-                      (?D 'deleted)
-                      (?M 'modified)
-                      (?U 'unmerged)
-                      (?T 'typechange)
-                      (t     nil)))
-            (file (match-string-no-properties 4)))
-        ;; If this is for the same file as the last diff, ignore it.
-        ;; Unmerged files seem to get two entries.
-        ;; We also ignore unmerged files when told so.
-        (if (or (equal file magit-last-raw-diff)
-                (and magit-ignore-unmerged-raw-diffs (eq status 'unmerged)))
-            (delete-region (point) (+ (line-end-position) 1))
-          (setq magit-last-raw-diff file)
-          ;; The 'diff' section that is created here will not work with
-          ;; magit-insert-diff-item-patch etc when we leave it empty.
-          ;; Luckily, raw diffs are only produced for staged and
-          ;; unstaged changes, and we never call
-          ;; magit-insert-diff-item-patch on them.  This is a bit
-          ;; brittle, of course.
-          (let ((magit-section-hidden-default magit-hide-diffs))
-            (magit-with-section file 'diff
-              (delete-region (point) (+ (line-end-position) 1))
-              (if (not (magit-section-hidden magit-top-section))
-                  (magit-insert-diff file status)
-                (magit-set-section-info (list status file nil))
-                (magit-set-section-needs-refresh-on-show t)
-                (magit-insert-diff-title status file nil)))))
-        t)
-    nil))
-
-(defun magit-hunk-item-diff (hunk)
-  (let ((diff (magit-section-parent hunk)))
-    (or (eq (magit-section-type diff) 'diff)
-        (error "Huh?  Parent of hunk not a diff"))
-    diff))
-
-(defun magit-diff-item-insert-header (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (if (magit-section-children diff)
-                 (magit-section-beginning (car (magit-section-children diff)))
-               (magit-section-end diff))))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-diff-item-patch (diff buf)
-  (let ((beg (save-excursion
-               (goto-char (magit-section-beginning diff))
-               (forward-line)
-               (point)))
-        (end (magit-section-end diff)))
-    (magit-insert-region beg end buf)))
-
-(defun magit-insert-hunk-item-patch (hunk buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (magit-insert-region (magit-section-beginning hunk) (magit-section-end hunk)
-                       buf))
-
-(defun magit-insert-hunk-item-region-patch (hunk reverse beg end buf)
-  (magit-diff-item-insert-header (magit-hunk-item-diff hunk) buf)
-  (save-excursion
-    (goto-char (magit-section-beginning hunk))
-    (magit-insert-current-line buf)
-    (forward-line)
-    (let ((copy-op (if reverse "+" "-")))
-      (while (< (point) (magit-section-end hunk))
-        (if (and (<= beg (point)) (< (point) end))
-            (magit-insert-current-line buf)
-          (cond ((looking-at " ")
-                 (magit-insert-current-line buf))
-                ((looking-at copy-op)
-                 (let ((text (buffer-substring-no-properties
-                              (+ (point) 1) (line-beginning-position 2))))
-                   (with-current-buffer buf
-                     (insert " " text))))))
-        (forward-line))))
-  (with-current-buffer buf
-    (diff-fixup-modifs (point-min) (point-max))))
-
-(defun magit-hunk-item-is-conflict-p (hunk)
-  ;;; XXX - Using the title is a bit too clever...
-  (string-match "^diff --cc"
-                (magit-section-title (magit-hunk-item-diff hunk))))
-
-(defun magit-hunk-item-target-line (hunk)
-  (save-excursion
-    (beginning-of-line)
-    (let ((line (line-number-at-pos)))
-      (goto-char (magit-section-beginning hunk))
-      (if (not (looking-at "@@+ .* \\+\\([0-9]+\\)\\(,[0-9]+\\)? @@+"))
-          (error "Hunk header not found"))
-      (let ((target (string-to-number (match-string 1))))
-        (forward-line)
-        (while (< (line-number-at-pos) line)
-          ;; XXX - deal with combined diffs
-          (if (not (looking-at "-"))
-              (setq target (+ target 1)))
-          (forward-line))
-        target))))
-
-(defun magit-show (commit filename &optional select prefix)
-  "Returns a buffer containing the contents of the file FILENAME, as stored in
-COMMIT.  COMMIT may be one of the following:
-
-- A string with the name of a commit, such as \"head\" or \"dae86e\".  See 'git
-  help revisions' for syntax.
-- The symbol 'index, indicating that you want the version in Git's index or
-  staging area.
-- The symbol 'working, indicating that you want the version in the working
-  directory.  In this case you'll get a buffer visiting the file.  If there's
-  already a buffer visiting that file, you'll get that one.
-
-When called interactively or when SELECT is non-nil, make the buffer active,
-either in another window or (with a prefix argument) in the current window."
-  (interactive (let* ((revision (magit-read-rev "Retrieve file from revision"))
-                      (filename (magit-read-file-from-rev revision)))
-                 (list revision filename t current-prefix-arg)))
-  (if (eq commit 'working)
-      (find-file-noselect filename)
-    (let ((buffer (create-file-buffer (format "%s.%s" filename (replace-regexp-in-string ".*/" "" (prin1-to-string commit t))))))
-      (cond
-       ((eq commit 'index)
-        (let ((checkout-string (magit-git-string "checkout-index"
-                                                 "--temp"
-                                                 filename)))
-          (string-match "^\\(.*\\)\t" checkout-string)
-          (with-current-buffer buffer
-            (let ((tmpname (match-string 1 checkout-string)))
-              (magit-with-silent-modifications
-               (insert-file-contents tmpname nil nil nil t))
-              (delete-file tmpname)))))
-       (t
-        (with-current-buffer buffer
-          (magit-with-silent-modifications
-           (magit-git-insert (list "cat-file" "-p"
-                                   (concat commit ":" filename)))))))
-      (with-current-buffer buffer
-        (let ((buffer-file-name filename))
-          (normal-mode))
-        (goto-char (point-min)))
-      (if select
-          (if prefix
-              (switch-to-buffer buffer)
-            (switch-to-buffer-other-window buffer))
-        buffer))))
-
-(defmacro with-magit-tmp-buffer (var &rest body)
-  (declare (indent 1)
-           (debug (symbolp &rest form)))
-  `(let ((,var (generate-new-buffer magit-tmp-buffer-name)))
-     (unwind-protect
-         (progn ,@body)
-       (kill-buffer ,var))))
-
-(defun magit-apply-diff-item (diff &rest args)
-  (when (zerop magit-diff-context-lines)
-    (setq args (cons "--unidiff-zero" args)))
-  (with-magit-tmp-buffer tmp
-    (magit-insert-diff-item-patch diff tmp)
-    (apply #'magit-run-git-with-input tmp
-           "apply" (append args (list "-")))))
-
-(defun magit-apply-hunk-item* (hunk reverse &rest args)
-  "Apply single hunk or part of a hunk to the index or working file.
-
-This function is the core of magit's stage, unstage, apply, and
-revert operations.  HUNK (or the portion of it selected by the
-region) will be applied to either the index, if \"--cached\" is a
-member of ARGS, or to the working file otherwise."
-  (let ((zero-context (zerop magit-diff-context-lines))
-        (use-region (magit-use-region-p)))
-    (when zero-context
-      (setq args (cons "--unidiff-zero" args)))
-    (when reverse
-      (setq args (cons "--reverse" args)))
-    (when (and use-region zero-context)
-      (error (concat "Not enough context to partially apply hunk.  "
-                     "Use `+' to increase context.")))
-    (with-magit-tmp-buffer tmp
-      (if use-region
-          (magit-insert-hunk-item-region-patch
-           hunk reverse (region-beginning) (region-end) tmp)
-        (magit-insert-hunk-item-patch hunk tmp))
-      (apply #'magit-run-git-with-input tmp
-             "apply" (append args (list "-"))))))
-
-(defun magit-apply-hunk-item (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk nil args))
-
-(defun magit-apply-hunk-item-reverse (hunk &rest args)
-  (apply #'magit-apply-hunk-item* hunk t args))
-
-(magit-define-inserter unstaged-changes (title)
-  (let ((magit-hide-diffs t)
-        (magit-current-diff-range (cons 'index 'working)))
-    (let ((magit-diff-options (append '() magit-diff-options)))
-      (magit-git-section 'unstaged title 'magit-wash-raw-diffs
-                         "diff-files"))))
-
-(magit-define-inserter staged-changes (staged no-commit)
-  (let ((magit-current-diff-range (cons "HEAD" 'index)))
-    (when staged
-      (let ((magit-hide-diffs t)
-            (base (if no-commit
-                      (magit-git-string "mktree")
-                    "HEAD")))
-        (let ((magit-diff-options (append '("--cached") magit-diff-options))
-              (magit-ignore-unmerged-raw-diffs t))
-          (magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs
-                             "diff-index" "--cached"
-                             base))))))
-
-;;; Logs and Commits
-
-                                        ; Note: making this a plain defcustom would probably let users break
-                                        ; the parser too easily
-(defvar magit-git-log-options
-  (list
-   "--pretty=format:* %h %s"
-   (format "--abbrev=%s" magit-sha1-abbrev-length)))
-                                        ; --decorate=full otherwise some ref prefixes are stripped
-                                        ;  '("--pretty=format:* %H%d %s" "--decorate=full"))
-
-;;
-;; Regexps for parsing ref names
-;;
-;; see the `git-check-ref-format' manpage for details
-
-(defconst magit-ref-nonchars "\000-\037\177 ~^:?*[\\"
-  "Characters specifically disallowed from appearing in Git symbolic refs.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-ref-nonslash-re
-  (concat "\\(?:"
-          ;; "no slash-separated component can begin with a dot ." (rule 1)
-          "[^" magit-ref-nonchars "./]"
-          ;; "cannot have two consecutive dots ..  anywhere." (rule 3)
-          "\\.?"
-          "\\)*")
-  "Regexp that matches the non-slash parts of a ref name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-refname-re
-  (concat
-   "\\(?:HEAD\\|"
-
-   "\\(?:tag: \\)?"
-
-   ;; optional non-slash sequence at the beginning
-   magit-ref-nonslash-re
-
-   ;; any number of slash-prefixed sequences
-   "\\(?:"
-   "/"
-   magit-ref-nonslash-re
-   "\\)*"
-
-   "/" ;; "must contain at least one /." (rule 2)
-   magit-ref-nonslash-re
-
-   ;; "cannot end with a slash / nor a dot .." (rule 5)
-   "[^" magit-ref-nonchars "./]"
-
-   "\\)"
-   )
-  "Regexp that matches a git symbolic reference name.
-
-Evaluate (man \"git-check-ref-format\") for details")
-
-(defconst magit-log-oneline-re
-  (concat
-   "^\\([_\\*|/ -.]+\\)?"                          ; graph   (1)
-   "\\(?:"
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defconst magit-log-longline-re
-  (concat
-   ;; use \0 delimiter (from -z option) to identify commits. this prevents
-   ;; commit messages containing lines like "commit 00000" from polluting the
-   ;; display
-   "\\(?:\\(?:\\`\\|\0\\)"
-   "\\([_\\*|/ -.]+\\)?"                           ; graph   (1)
-   "commit "
-   "\\([0-9a-fA-F]+\\)"                            ; sha1    (2)
-   "\\(?:"                                         ; refs    (3)
-   " "
-   "\\("
-   "("
-   magit-refname-re "\\(?:, " magit-refname-re "\\)*"
-   ")"
-   "\\)"
-   "\\)?"
-   "$\\)?"
-   " ?\\(.*\\)$"                                   ; msg     (4)
-   ))
-
-(defvar magit-present-log-line-function 'magit-present-log-line
-  "The function to use when generating a log line.
-It takes four args: CHART, SHA1, REFS and MESSAGE.  The function
-must return a string which will represent the log line.")
-
-(defun magit-log-get-bisect-state-color (suffix)
-  (if (string= suffix "bad")
-      (list suffix 'magit-log-head-label-bisect-bad)
-    (list suffix 'magit-log-head-label-bisect-good)))
-
-(defun magit-log-get-patches-color (suffix)
-  (list (and (string-match ".+/\\(.+\\)" suffix)
-             (match-string 1 suffix))
-        'magit-log-head-label-patches))
-
-(defvar magit-log-remotes-color-hook nil)
-
-(defun magit-log-get-remotes-color (suffix)
-  (or
-   (run-hook-with-args-until-success
-    'magit-log-remotes-color-hook suffix)
-   (list suffix 'magit-log-head-label-remote)))
-
-(defvar magit-refs-namespaces
-  '(("tags" . magit-log-head-label-tags)
-    ("remotes" magit-log-get-remotes-color)
-    ("heads" . magit-log-head-label-local)
-    ("patches" magit-log-get-patches-color)
-    ("bisect" magit-log-get-bisect-state-color)))
-
-(defun magit-ref-get-label-color (r)
-  (let ((uninteresting (loop for re in magit-uninteresting-refs
-                             thereis (string-match re r))))
-    (if uninteresting (list nil nil)
-      (let* ((ref-re "\\(?:tag: \\)?refs/\\(?:\\([^/]+\\)/\\)?\\(.+\\)")
-             (label (and (string-match ref-re r)
-                         (match-string 2 r)))
-             (res (let ((colorizer
-                         (cdr (assoc (match-string 1 r)
-                                     magit-refs-namespaces))))
-                    (cond ((null colorizer)
-                           (list r 'magit-log-head-label-default))
-                          ((symbolp colorizer)
-                           (list label colorizer))
-                          ((listp colorizer)
-                           (funcall (car colorizer)
-                                    (match-string 2 r)))
-                          (t
-                           (list r 'magit-log-head-label-default))))))
-        res))))
-
-(defun magit-present-log-line (graph sha1 refs message)
-  "The default log line generator."
-  (let ((string-refs
-         (when refs
-           (let ((colored-labels
-                  (delete nil
-                          (mapcar (lambda (r)
-                                    (destructuring-bind (label face)
-                                        (magit-ref-get-label-color r)
-                                      (and label
-                                           (propertize label 'face face))))
-                                  refs))))
-             (concat
-              (mapconcat 'identity colored-labels " ")
-              " ")))))
-
-    (concat
-     (if sha1
-         (propertize sha1 'face 'magit-log-sha1)
-       (insert-char ? magit-sha1-abbrev-length))
-     " "
-     (when graph
-       (propertize graph 'face 'magit-log-graph))
-     string-refs
-     (when message
-       (propertize message 'face 'magit-log-message)))))
-
-(defvar magit-log-count ()
-  "Internal var used to count the number of logs actually added in a buffer.")
-
-(defmacro magit-create-log-buffer-sections (&rest body)
-  "Empty current buffer of text and magit's section, and then evaluate BODY.
-
-if the number of logs inserted in the buffer is `magit-log-cutoff-length'
-insert a line to tell how to insert more of them"
-  (declare (indent 0))
-  `(let ((magit-log-count 0) (inhibit-read-only t))
-     (magit-create-buffer-sections
-       (magit-with-section 'log nil
-         ,@body
-         (if (= magit-log-count magit-log-cutoff-length)
-             (magit-with-section "longer"  'longer
-               (insert "type \"e\" to show more logs\n")))))))
-
-(defun magit-wash-log-line (style)
-  (beginning-of-line)
-  (let ((line-re (cond ((eq style 'long) magit-log-longline-re)
-                       (t magit-log-oneline-re))))
-    (cond
-     ((looking-at line-re)
-      (let ((chart (match-string 1))
-            (sha1 (match-string 2))
-            (msg (match-string 4))
-            (refs (when (match-string 3)
-                    (delq nil
-                          (mapcar
-                           (lambda (s)
-                             (and (not
-                                   (or (string= s "tag:")
-                                       (string= s "HEAD"))) ; as of 1.6.6
-                                  s))
-                           (split-string (match-string 3) "[(), ]" t))))))
-        (delete-region (point-at-bol) (point-at-eol))
-        (insert (funcall magit-present-log-line-function chart sha1 refs msg))
-        (goto-char (point-at-bol))
-        (if sha1
-            (magit-with-section sha1 'commit
-              (when magit-log-count (setq magit-log-count (1+ magit-log-count)))
-              (magit-set-section-info sha1)
-              (forward-line))
-          (forward-line))))
-     (t
-      (forward-line)))
-    t))
-
-(defun magit-wash-log (&optional style)
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence (apply-partially 'magit-wash-log-line style))))
-
-(defvar magit-currently-shown-commit nil)
-
-(defun magit-wash-commit ()
-  (let ((magit-current-diff-range))
-    (when (looking-at "^commit \\([0-9a-fA-F]\\{40\\}\\)")
-      (setq magit-current-diff-range (match-string 1))
-      (add-text-properties (match-beginning 1) (match-end 1)
-                           '(face magit-log-sha1)))
-    (cond
-     ((search-forward-regexp "^Merge: \\([0-9a-fA-F]+\\) \\([0-9a-fA-F]+\\)$" nil t)
-      (setq magit-current-diff-range (cons (cons (match-string 1)
-                                                 (match-string 2))
-                                           magit-current-diff-range))
-      (let ((first (magit-set-section nil 'commit (match-beginning 1) (match-end 1)))
-            (second (magit-set-section nil 'commit (match-beginning 2) (match-end 2))))
-        (magit-set-section-info (match-string 1) first)
-        (magit-set-section-info (match-string 2) second))
-      (make-commit-button (match-beginning 1) (match-end 1))
-      (make-commit-button (match-beginning 2) (match-end 2)))
-     (t
-      (setq magit-current-diff-range (cons (concat magit-current-diff-range "^")
-                                           magit-current-diff-range))))
-    (search-forward-regexp "^$")
-    (while (and
-            (search-forward-regexp "\\(\\b[0-9a-fA-F]\\{4,40\\}\\b\\)\\|\\(^diff\\)" nil 'noerror)
-            (not (match-string 2)))
-      (let ((sha1 (match-string 1))
-            (start (match-beginning 1))
-            (end (match-end 1)))
-        (when (string-equal "commit" (magit-git-string "cat-file" "-t" sha1))
-          (make-commit-button start end)
-          (let ((section (magit-set-section sha1 'commit start end)))
-            (magit-set-section-info sha1 section)))))
-    (beginning-of-line)
-    (when (looking-at "^diff")
-      (magit-wash-diffs))
-    (goto-char (point-max))
-    (insert "\n")
-    (if magit-back-navigation-history
-        (magit-with-section "[back]" 'button
-          (insert-text-button "[back]"
-                              'help-echo "Previous commit"
-                              'action 'magit-show-commit-backward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))
-    (insert " ")
-    (if magit-forward-navigation-history
-        (magit-with-section "[forward]" 'button
-          (insert-text-button "[forward]"
-                              'help-echo "Next commit"
-                              'action 'magit-show-commit-forward
-                              'follow-link t
-                              'mouse-face 'magit-item-highlight)))))
-
-(defun make-commit-button (start end)
-  (make-text-button start end
-                    'help-echo "Visit commit"
-                    'action (lambda (button)
-                              (save-excursion
-                                (goto-char button)
-                                (magit-visit-item)))
-                    'follow-link t
-                    'mouse-face 'magit-item-highlight
-                    'face 'magit-log-sha1))
-
-(defun magit-refresh-commit-buffer (commit)
-  (magit-configure-have-abbrev)
-  (magit-configure-have-decorate)
-  (magit-create-buffer-sections
-    (apply #'magit-git-section nil nil
-           'magit-wash-commit
-           "log"
-           "--max-count=1"
-           "--pretty=medium"
-           `(,@(if magit-have-abbrev (list "--no-abbrev-commit"))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             "--cc"
-             "-p" ,commit))))
-
-(define-derived-mode magit-commit-mode magit-mode "Magit"
-  "Mode to view a git commit.
-
-\\{magit-commit-mode-map}"
-  :group 'magit)
-
-(defvar magit-commit-buffer-name "*magit-commit*"
-  "Buffer name for displaying commit log messages.")
-
-(defun magit-show-commit (commit &optional scroll inhibit-history select)
-  "Show information about a commit in the buffer named by
-`magit-commit-buffer-name'.  COMMIT can be any valid name for a commit
-in the current Git repository.
-
-When called interactively or when SELECT is non-nil, switch to
-the commit buffer using `pop-to-buffer'.
-
-Unless INHIBIT-HISTORY is non-nil, the commit currently shown
-will be pushed onto `magit-back-navigation-history' and
-`magit-forward-navigation-history' will be cleared.
-
-Noninteractively, if the commit is already displayed and SCROLL
-is provided, call SCROLL's function definition in the commit
-window.  (`scroll-up' and `scroll-down' are typically passed in
-for this argument.)"
-  (interactive (list (magit-read-rev "Show commit (hash or ref)")
-                     nil nil t))
-  (when (magit-section-p commit)
-    (setq commit (magit-section-info commit)))
-  (unless (eql 0 (magit-git-exit-code "cat-file" "commit" commit))
-    (error "%s is not a commit" commit))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-commit-buffer-name)))
-    (cond
-     ((and (equal magit-currently-shown-commit commit)
-           ;; if it's empty then the buffer was killed
-           (with-current-buffer buf
-             (> (length (buffer-string)) 1)))
-      (let ((win (get-buffer-window buf)))
-        (cond ((not win)
-               (display-buffer buf))
-              (scroll
-               (with-selected-window win
-                 (funcall scroll))))))
-     (commit
-      (display-buffer buf)
-      (with-current-buffer buf
-        (unless inhibit-history
-          (push (cons default-directory magit-currently-shown-commit)
-                magit-back-navigation-history)
-          (setq magit-forward-navigation-history nil))
-        (setq magit-currently-shown-commit commit)
-        (goto-char (point-min))
-        (magit-mode-init dir 'magit-commit-mode
-                         #'magit-refresh-commit-buffer commit))))
-    (if select
-        (pop-to-buffer buf))))
-
-(defun magit-show-commit-backward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-back-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-back-navigation-history
-      (error "No previous commit."))
-    (let ((histitem (pop magit-back-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-forward-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defun magit-show-commit-forward (&optional ignored)
-  ;; Ignore argument passed by push-button
-  "Show the commit at the head of `magit-forward-navigation-history in
-`magit-commit-buffer-name`."
-  (interactive)
-  (with-current-buffer magit-commit-buffer-name
-    (unless magit-forward-navigation-history
-      (error "No next commit."))
-    (let ((histitem (pop magit-forward-navigation-history)))
-      (push (cons default-directory magit-currently-shown-commit)
-            magit-back-navigation-history)
-      (setq default-directory (car histitem))
-      (magit-show-commit (cdr histitem) nil 'inhibit-history))))
-
-(defvar magit-marked-commit nil)
-
-(defvar magit-mark-overlay nil)
-(make-variable-buffer-local 'magit-mark-overlay)
-(put 'magit-mark-overlay 'permanent-local t)
-
-(defun magit-refresh-marked-commits ()
-  (magit-for-all-buffers #'magit-refresh-marked-commits-in-buffer))
-
-(defun magit-refresh-marked-commits-in-buffer ()
-  (if (not magit-mark-overlay)
-      (let ((ov (make-overlay 1 1)))
-        (overlay-put ov 'face 'magit-item-mark)
-        (setq magit-mark-overlay ov)))
-  (delete-overlay magit-mark-overlay)
-  (magit-for-all-sections
-   (lambda (section)
-     (when (and (eq (magit-section-type section) 'commit)
-                (equal (magit-section-info section)
-                       magit-marked-commit))
-       (move-overlay magit-mark-overlay
-                     (magit-section-beginning section)
-                     (magit-section-end section)
-                     (current-buffer))))))
-
-(defun magit-set-marked-commit (commit)
-  (setq magit-marked-commit commit)
-  (magit-refresh-marked-commits))
-
-(defun magit-marked-commit ()
-  (or magit-marked-commit
-      (error "No commit marked")))
-
-(defun magit-remote-branch-name (remote branch)
-  "Get the name of the branch BRANCH on remote REMOTE"
-  (if (string= remote ".")
-      branch
-    (concat remote "/" branch)))
-
-(magit-define-inserter unpulled-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpulled "Unpulled commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "HEAD..%s" (magit-remote-branch-name remote branch)))))))
-
-(magit-define-inserter unpushed-commits (remote branch)
-  (when remote
-    (apply #'magit-git-section
-           'unpushed "Unpushed commits:" 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    (format "%s..HEAD" (magit-remote-branch-name remote branch)))))))
-
-(defun magit-remote-branch-for (local-branch &optional fully-qualified-name)
-  "Guess the remote branch name that LOCAL-BRANCH is tracking.
-Gives a fully qualified name (e.g., refs/remotes/origin/master) if
-FULLY-QUALIFIED-NAME is non-nil."
-  (let ((merge (magit-get "branch" local-branch "merge")))
-    (save-match-data
-      (if (and merge (string-match "^refs/heads/\\(.+\\)" merge))
-          (concat (if fully-qualified-name
-                      (let ((remote-name (magit-get "branch" local-branch "remote")))
-                        (if (string= "." remote-name)
-                            "refs/heads/"
-                          (concat "refs/remotes/" remote-name "/"))))
-                  (match-string 1 merge))))))
-
-;;; Status
-
-(defvar magit-remote-string-hook nil)
-
-(defun magit-remote-string (remote remote-branch remote-rebase)
-  (cond
-   ((string= "." remote)
-    (concat
-     (when remote-rebase "onto ")
-     "branch "
-     (propertize remote-branch 'face 'magit-branch)))
-   (remote
-    (concat
-     (when remote-rebase "onto ")
-     (propertize remote-branch 'face 'magit-branch)
-     " @ "
-     remote
-     " ("
-     (magit-get "remote" remote "url")
-     ")"))
-   (t
-    (run-hook-with-args-until-success 'magit-remote-string-hook))))
-
-(declare-function magit--bisect-info-for-status "magit-bisect" (branch))
-
-(defun magit-refresh-status ()
-  (magit-create-buffer-sections
-    (magit-with-section 'status nil
-      (let* ((branch (magit-get-current-branch))
-             (remote (and branch (magit-get "branch" branch "remote")))
-             (remote-rebase (and branch (magit-get-boolean "branch" branch "rebase")))
-             (remote-branch (or (and branch (magit-remote-branch-for branch)) branch))
-             (remote-string (magit-remote-string remote remote-branch remote-rebase))
-             (head (magit-git-string
-                    "log"
-                    "--max-count=1"
-                    "--abbrev-commit"
-                    (format "--abbrev=%s" magit-sha1-abbrev-length)
-                    "--pretty=oneline"))
-             (no-commit (not head)))
-        (when remote-string
-          (insert "Remote:   " remote-string "\n"))
-        (insert (format "Local:    %s %s\n"
-                        (propertize (magit--bisect-info-for-status branch)
-                                    'face 'magit-branch)
-                        (abbreviate-file-name default-directory)))
-        (insert (format "Head:     %s\n"
-                        (if no-commit "nothing commited (yet)" head)))
-        (let ((merge-heads (magit-file-lines (concat (magit-git-dir)
-                                                     "MERGE_HEAD"))))
-          (if merge-heads
-              (insert (format "Merging:   %s\n"
-                              (mapconcat 'identity
-                                         (mapcar 'magit-name-rev merge-heads)
-                                         ", ")))))
-        (let ((rebase (magit-rebase-info)))
-          (if rebase
-              (insert (apply 'format "Rebasing: onto %s (%s of %s); Press \"R\" to Abort, Skip, or Continue\n" rebase))))
-        (insert "\n")
-        (magit-git-exit-code "update-index" "--refresh")
-        (magit-insert-stashes)
-        (magit-insert-untracked-files)
-        (magit-insert-pending-changes)
-        (magit-insert-pending-commits)
-        (magit-insert-unpulled-commits remote remote-branch)
-        (let ((staged (or no-commit (magit-anything-staged-p))))
-          (magit-insert-unstaged-changes
-           (if staged "Unstaged changes:" "Changes:"))
-          (magit-insert-staged-changes staged no-commit))
-        (magit-insert-unpushed-commits remote remote-branch)
-        (run-hooks 'magit-refresh-status-hook)))))
-
-(defun magit-init (dir)
-  "Initialize git repository in the DIR directory."
-  (interactive (list (read-directory-name "Directory for Git repository: ")))
-  (let* ((dir (file-name-as-directory (expand-file-name dir)))
-         (topdir (magit-get-top-dir dir)))
-    (when (or (not topdir)
-              (yes-or-no-p
-               (format
-                (if (string-equal topdir dir)
-                    "There is already a Git repository in %s. Reinitialize? "
-                  "There is a Git repository in %s. Create another in %s? ")
-                topdir dir)))
-      (unless (file-directory-p dir)
-        (and (y-or-n-p (format "Directory %s does not exists.  Create it? " dir))
-             (make-directory dir)))
-      (let ((default-directory dir))
-        (magit-run* (list magit-git-executable "init"))))))
-
-(define-derived-mode magit-status-mode magit-mode "Magit"
-  "Mode for looking at git status.
-
-\\{magit-status-mode-map}"
-  :group 'magit)
-
-(defvar magit-default-directory nil)
-
-(defun magit-save-some-buffers (&optional msg pred)
-  "Save some buffers if variable `magit-save-some-buffers' is non-nil.
-If variable `magit-save-some-buffers' is set to 'dontask then
-don't ask the user before saving the buffers, just go ahead and
-do it.
-
-Optional argument MSG is displayed in the minibuffer if variable
-`magit-save-some-buffers' is nil.
-
-Optional second argument PRED determines which buffers are considered:
-If PRED is nil, all the file-visiting buffers are considered.
-If PRED is t, then certain non-file buffers will also be considered.
-If PRED is a zero-argument function, it indicates for each buffer whether
-to consider it or not when called with that buffer current."
-  (interactive)
-  (let ((predicate-function (or pred magit-save-some-buffers-predicate))
-        (magit-default-directory default-directory))
-    (if magit-save-some-buffers
-        (save-some-buffers
-         (eq magit-save-some-buffers 'dontask)
-         predicate-function)
-      (when msg
-        (message msg)))))
-
-(defun magit-save-buffers-predicate-all ()
-  "Prompt to save all buffers with unsaved changes"
-  t)
-
-(defun magit-save-buffers-predicate-tree-only ()
-  "Only prompt to save buffers which are within the current git project (as
-  determined by the dir passed to `magit-status'."
-  (and buffer-file-name
-       (string= (magit-get-top-dir magit-default-directory)
-                (magit-get-top-dir (file-name-directory buffer-file-name)))))
-
-;;;###autoload
-(defun magit-status (dir)
-  "Open a Magit status buffer for the Git repository containing
-DIR.  If DIR is not within a Git repository, offer to create a
-Git repository in DIR.
-
-Interactively, a prefix argument means to ask the user which Git
-repository to use even if `default-directory' is under Git control.
-Two prefix arguments means to ignore `magit-repo-dirs' when asking for
-user input."
-  (interactive (list (if current-prefix-arg
-                         (magit-read-top-dir
-                          (> (prefix-numeric-value current-prefix-arg)
-                             4))
-                       (or (magit-get-top-dir default-directory)
-                           (magit-read-top-dir nil)))))
-  (magit-save-some-buffers)
-  (let ((topdir (magit-get-top-dir dir)))
-    (unless topdir
-      (when (y-or-n-p (format "There is no Git repository in %S.  Create one? "
-                              dir))
-        (magit-init dir)
-        (setq topdir (magit-get-top-dir dir))))
-    (when topdir
-      (let ((buf (or (magit-find-status-buffer topdir)
-                     (generate-new-buffer
-                      (concat "*magit: "
-                              (file-name-nondirectory
-                               (directory-file-name topdir)) "*")))))
-        (funcall magit-status-buffer-switch-function buf)
-        (magit-mode-init topdir 'magit-status-mode #'magit-refresh-status)))))
-
-(magit-define-command automatic-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (if revision
-      (magit-run-git "merge" (magit-rev-to-git revision))))
-
-(magit-define-command manual-merge (revision)
-  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
-\('git merge REVISION')."
-  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
-  (when revision
-    (apply 'magit-run-git
-           "merge" "--no-commit"
-           (magit-rev-to-git revision)
-           magit-custom-options)
-    (when (file-exists-p ".git/MERGE_MSG")
-        (magit-log-edit))))
-
-;;; Staging and Unstaging
-
-(defun magit-stage-item (&optional ask)
-  "Add the item at point to the staging area.
-If ASK is set, ask for the file name rather than picking the one
-at point."
-  (interactive "P")
-  (if ask
-      (magit-run-git "add" (read-file-name "File to stage: "))
-    (magit-section-action (item info "stage")
-      ((untracked file)
-       (magit-run-git "add" info))
-      ((untracked)
-       (apply #'magit-run-git "add" "--"
-              (magit-git-lines "ls-files" "--other" "--exclude-standard")))
-      ((unstaged diff hunk)
-       (if (magit-hunk-item-is-conflict-p item)
-           (error (concat "Can't stage individual resolution hunks.  "
-                          "Please stage the whole file.")))
-       (magit-apply-hunk-item item "--cached"))
-      ((unstaged diff)
-       (magit-run-git "add" "-u" (magit-diff-item-file item)))
-      ((staged *)
-       (error "Already staged"))
-      ((diff diff)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((diff diff hunk)
-       (save-excursion
-         (magit-goto-parent-section)
-         (magit-goto-parent-section)
-         (magit-stage-item)))
-      ((hunk)
-       (error "Can't stage this hunk"))
-      ((diff)
-       (error "Can't stage this diff")))))
-
-(defun magit-unstage-item ()
-  "Remove the item at point from the staging area."
-  (interactive)
-  (magit-section-action (item info "unstage")
-    ((staged diff hunk)
-     (magit-apply-hunk-item-reverse item "--cached"))
-    ((staged diff)
-     (if (eq (car info) 'unmerged)
-         (error "Can't unstage an unmerged file.  Resolve it first"))
-     (if (magit-no-commit-p)
-         (magit-run-git "rm" "--cached" "--" (magit-diff-item-file item))
-       (magit-run-git "reset" "-q" "HEAD" "--" (magit-diff-item-file item))))
-    ((unstaged *)
-     (error "Already unstaged"))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-unstage-item)))
-    ((hunk)
-     (error "Can't unstage this hunk"))
-    ((diff)
-     (error "Can't unstage this diff"))))
-
-(defun magit-stage-all (&optional also-untracked-p)
-  "Add all remaining changes in tracked files to staging area.
-With prefix argument, add remaining untracked files as well.
-\('git add -u .' or 'git add .', respectively)."
-  (interactive "P")
-  (if also-untracked-p
-      (magit-run-git "add" ".")
-    (magit-run-git "add" "-u" ".")))
-
-(defun magit-unstage-all ()
-  "Remove all changes from staging area.
-\('git reset --mixed HEAD')."
-  (interactive)
-  (magit-run-git "reset" "HEAD"))
-
-;;; Branches
-
-(defun escape-branch-name (branch)
-  "Escapes branch names to remove problematic characters."
-  (replace-regexp-in-string "[/]" "-" branch))
-
-(defun magit-default-tracking-name-remote-plus-branch
-  (remote branch)
-  "Use the remote name plus a hyphen plus the escaped branch name for tracking branches."
-  (concat remote "-" (escape-branch-name branch)))
-
-(defun magit-default-tracking-name-branch-only
-  (remote branch)
-  "Use just the escaped branch name for tracking branches."
-  (escape-branch-name branch))
-
-(defun magit-get-tracking-name (remote branch)
-  "Given a REMOTE and a BRANCH name, ask the user for a local
-tracking brach name suggesting a sensible default."
-  (when (yes-or-no-p
-         (format "Create local tracking branch for %s? " branch))
-    (let* ((default-name
-             (funcall magit-default-tracking-name-function remote branch))
-           (chosen-name (read-string (format "Call local branch (%s): " default-name)
-                                     nil
-                                     nil
-                                     default-name)))
-      (when (magit-ref-exists-p (concat "refs/heads/" chosen-name))
-        (error "'%s' already exists." chosen-name))
-      chosen-name)))
-
-(defun magit-maybe-create-local-tracking-branch (rev)
-  "Depending on the users wishes, create a tracking branch for
-rev... maybe."
-  (if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" rev)
-      (let* ((remote (match-string 1 rev))
-             (branch (match-string 2 rev))
-             (tracker-name (magit-get-tracking-name remote branch)))
-        (when tracker-name
-          (magit-run-git "checkout" "-b" tracker-name rev)
-          t))
-    nil))
-
-(magit-define-command checkout (revision)
-  "Switch 'HEAD' to REVISION and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-If REVISION is a remote branch, offer to create a local tracking branch.
-\('git checkout [-b] REVISION')."
-  (interactive
-   (list (let ((current-branch (magit-get-current-branch))
-               (default (magit-default-rev)))
-           (magit-read-rev "Switch to"
-                           (unless (string= current-branch default)
-                             default)
-                           (if current-branch
-                               (cons (concat "refs/heads/" current-branch "$")
-                                     magit-uninteresting-refs)
-                             magit-uninteresting-refs)))))
-  (if revision
-      (when (not (magit-maybe-create-local-tracking-branch revision))
-        (magit-save-some-buffers)
-        (magit-run-git "checkout" (magit-rev-to-git revision))
-        (magit-update-vc-modeline default-directory))))
-
-(defun magit-read-create-branch-args ()
-  (let* ((cur-branch (magit-get-current-branch))
-         (cur-point (magit-default-rev))
-         (branch (read-string "Create branch: "))
-         (parent (magit-read-rev "Parent"
-                                 (cond
-                                  ((eq magit-create-branch-behaviour 'at-point) cur-point)
-                                  ((eq magit-create-branch-behaviour 'at-head) cur-branch)
-                                  (t cur-branch)))))
-    (list branch parent)))
-
-(magit-define-command create-branch (branch parent)
-  "Switch 'HEAD' to new BRANCH at revision PARENT and update working tree.
-Fails if working tree or staging area contain uncommitted changes.
-\('git checkout -b BRANCH REVISION')."
-  (interactive (magit-read-create-branch-args))
-  (when (and branch (not (string= branch ""))
-             parent)
-    (magit-save-some-buffers)
-    (magit-run-git "checkout" "-b"
-                   branch
-                   (append
-                    magit-custom-options
-                    (magit-rev-to-git parent)))
-    (magit-update-vc-modeline default-directory)))
-
-(defun magit-delete-branch (branch &optional force)
-  "Deletes a branch.
-If the branch is the current one, offers to switch to `master' first.
-With prefix, forces the removal even if it hasn't been merged.
-Works with local or remote branches.
-\('git branch [-d|-D] BRANCH' or 'git push <remote-part-of-BRANCH> :refs/heads/BRANCH')."
-  (interactive (list (magit-read-rev "Branch to delete" (magit-default-rev 'notrim))
-                     current-prefix-arg))
-  (let* ((remote (magit-remote-part-of-branch branch))
-         (is-current (string= branch (magit-get-current-branch)))
-         (args (list "branch"
-                     (if force "-D" "-d")
-                     branch)))
-    (cond
-     (remote
-      (magit-run-git "push" remote (concat ":refs/heads/" (magit-branch-no-remote branch))))
-     (is-current
-      (when (y-or-n-p "Cannot delete current branch. Switch to master first? ")
-          (progn
-            (magit-checkout "master")
-            (apply 'magit-run-git args))
-          (message "The current branch was not deleted.")))
-     (t
-            (apply 'magit-run-git args)))))
-
-(defun magit-move-branch (old new &optional force)
-  "Renames or moves a branch.
-With prefix, forces the move even if NEW already exists.
-\('git branch [-m|-M] OLD NEW')."
-  (interactive (list (magit-read-rev "Old name" (magit-default-rev))
-                     (read-string "New name: ")
-                     current-prefix-arg))
-  (magit-run-git "branch" (if force
-                              "-M"
-                            "-m")
-                 (magit-rev-to-git old) new))
-
-(defun magit-guess-branch ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-current-section)))
-    ((wazzup commit)
-     (magit-section-info (magit-section-parent item)))
-    ((commit) (magit-name-rev (substring info 0 magit-sha1-abbrev-length)))
-    ((wazzup) info)))
-
-;;; Remotes
-
-(defun magit-add-remote (remote url)
-  "Adds a remote and fetches it.
-\('git remote add REMOTE URL')."
-  (interactive (list (read-string "Add remote: ")
-                     (read-string "URL: ")))
-  (magit-run-git "remote" "add" "-f" remote url))
-
-(defun magit-remove-remote (remote)
-  "Deletes a remote.
-\('git remote rm REMOTE')."
-  (interactive (list (magit-read-remote "Remote to delete")))
-  (magit-run-git "remote" "rm" remote))
-
-(defun magit-rename-remote (old new)
-  "Renames a remote.
-\('git remote rename OLD NEW')."
-  (interactive (list (magit-read-remote "Old name")
-                     (read-string "New name: ")))
-  (magit-run-git "remote" "rename" old new))
-
-(defun magit-guess-remote ()
-  (magit-section-case (item info)
-    ((branch)
-     (magit-section-info (magit-section-parent item)))
-    ((remote)
-     info)
-    (t
-     (if  (string= info ".")
-         info
-       (magit-get-current-remote)))))
-
-;;; Merging
-
-(defun magit-merge (revision)
-  "Merge REVISION into the current 'HEAD'; leave changes uncommitted.
-With a prefix-arg, the merge will be squashed.
-\('git merge --no-commit [--squash|--no-ff] REVISION')."
-  (interactive
-   (list (magit-read-rev "Merge" (magit-default-rev))))
-  (if revision
-      (apply 'magit-run-git
-             "merge"
-             (magit-rev-to-git revision)
-             magit-custom-options)))
-
-;;; Rebasing
-
-(defun magit-rebase-info ()
-  "Returns a list indicating the state of an in-progress rebase,
-if any."
-  (let ((git-dir (magit-git-dir)))
-    (cond ((file-exists-p (concat git-dir "rebase-merge"))
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-merge/onto"))))
-
-            ;; How many commits we've gone through
-            (length (magit-file-lines (concat git-dir "rebase-merge/done")))
-
-            ;; How many commits we have in total, without the comments
-            ;; at the end of git-rebase-todo.backup
-            (let ((todo-lines-with-comments (magit-file-lines (concat git-dir "rebase-merge/git-rebase-todo.backup"))))
-              (loop for i in todo-lines-with-comments
-                    until (string= "" i)
-                    count i))))
-          ((and (file-exists-p (concat git-dir "rebase-apply"))
-                (file-exists-p (concat git-dir "rebase-apply/onto")))
-           ;; we might be here because a non-interactive rebase failed: the
-           ;; patches didn't apply cleanly
-           (list
-            ;; The commit we're rebasing onto, i.e. git rebase -i <onto>
-            (magit-name-rev (car (magit-file-lines (concat git-dir "rebase-apply/onto"))))
-
-            ;; How many commits we've gone through
-            (- (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/next")))) 1)
-
-            ;; How many commits we have in total
-            (string-to-number (car (magit-file-lines (concat git-dir "rebase-apply/last"))))
-            ))
-          (t nil))))
-
-(defun magit-rebase-step ()
-  (interactive)
-  (let ((info (magit-rebase-info)))
-    (if (not info)
-        (let* ((current-branch (magit-get-current-branch))
-               (rev (magit-read-rev "Rebase to"
-                                    (magit-format-ref (magit-remote-branch-for current-branch t))
-                                    (if current-branch
-                                        (cons (concat "refs/heads/" current-branch)
-                                              magit-uninteresting-refs)
-                                      magit-uninteresting-refs))))
-          (if rev
-              (magit-run-git "rebase" (magit-rev-to-git rev))))
-      (let ((cursor-in-echo-area t)
-            (message-log-max nil))
-        (message "Rebase in progress. [A]bort, [S]kip, or [C]ontinue? ")
-        (let ((reply (read-event)))
-          (case reply
-            ((?A ?a)
-             (magit-run-git-async "rebase" "--abort"))
-            ((?S ?s)
-             (magit-run-git-async "rebase" "--skip"))
-            ((?C ?c)
-             (magit-run-git-async "rebase" "--continue"))))))))
-
-;;; Resetting
-
-(magit-define-command reset-head (revision &optional hard)
-  "Switch 'HEAD' to REVISION, keeping prior working tree and staging area.
-Any differences from REVISION become new changes to be committed.
-With prefix argument, all uncommitted changes in working tree
-and staging area are lost.
-\('git reset [--soft|--hard] REVISION')."
-  (interactive (list (magit-read-rev (format "%s head to"
-                                             (if current-prefix-arg
-                                                 "Hard reset"
-                                               "Reset"))
-                                     (or (magit-default-rev)
-                                         "HEAD^"))
-                     current-prefix-arg))
-  (when revision
-    (magit-run-git "reset" (if hard "--hard" "--soft")
-                   (magit-rev-to-git revision))
-    (magit-update-vc-modeline default-directory)))
-
-(magit-define-command reset-head-hard (revision)
-  "Switch 'HEAD' to REVISION, losing all changes.
-Uncomitted changes in both working tree and staging area are lost.
-\('git reset --hard REVISION')."
-  (interactive (list (magit-read-rev (format "Hard reset head to")
-                                     (or (magit-default-rev)
-                                         "HEAD"))))
-  (magit-reset-head revision t))
-
-(magit-define-command reset-working-tree (&optional arg)
-  "Revert working tree and clear changes from staging area.
-\('git reset --hard HEAD').
-
-With a prefix arg, also remove untracked files.  With two prefix args, remove ignored files as well."
-  (interactive "p")
-  (let ((include-untracked (>= arg 4))
-        (include-ignored (>= arg 16)))
-    (when (yes-or-no-p (format "Discard all uncommitted changes%s%s? "
-                               (if include-untracked
-                                   ", untracked files"
-                                 "")
-                               (if include-ignored
-                                   ", ignored files"
-                                 "")))
-      (magit-reset-head-hard "HEAD")
-      (if include-untracked
-          (magit-run-git "clean" "-fd" (if include-ignored
-                                           "-x"
-                                         ""))))))
-
-;;; Rewriting
-
-(defun magit-read-rewrite-info ()
-  (when (file-exists-p (concat (magit-git-dir) "magit-rewrite-info"))
-    (with-temp-buffer
-      (insert-file-contents (concat (magit-git-dir) "magit-rewrite-info"))
-      (goto-char (point-min))
-      (read (current-buffer)))))
-
-(defun magit-write-rewrite-info (info)
-  (with-temp-file (concat (magit-git-dir) "magit-rewrite-info")
-    (prin1 info (current-buffer))
-    (princ "\n" (current-buffer))))
-
-(magit-define-inserter pending-commits ()
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info))))
-    (when pending
-      (magit-with-section 'pending nil
-        (insert (propertize "Pending commits:\n"
-                            'face 'magit-section-title))
-        (dolist (p pending)
-          (let* ((commit (car p))
-                 (properties (cdr p))
-                 (used (plist-get properties 'used)))
-            (magit-with-section commit 'commit
-              (magit-set-section-info commit)
-              (insert (magit-git-string
-                       "log" "--max-count=1"
-                       (if used
-                           "--pretty=format:. %s"
-                         "--pretty=format:* %s")
-                       commit "--")
-                      "\n")))))
-      (insert "\n"))))
-
-(defun magit-rewrite-set-commit-property (commit prop value)
-  (let* ((info (magit-read-rewrite-info))
-         (pending (cdr (assq 'pending info)))
-         (p (assoc commit pending)))
-    (when p
-      (setf (cdr p) (plist-put (cdr p) prop value))
-      (magit-write-rewrite-info info)
-      (magit-need-refresh))))
-
-(defun magit-rewrite-set-used ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used t))))
-
-(defun magit-rewrite-set-unused ()
-  (interactive)
-  (magit-section-action (item info)
-    ((pending commit)
-     (magit-rewrite-set-commit-property info 'used nil))))
-
-(magit-define-inserter pending-changes ()
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (when orig
-      (let ((magit-hide-diffs t))
-        (magit-git-section 'pending-changes
-                           "Pending changes"
-                           'magit-wash-diffs
-                           "diff" (magit-diff-U-arg) "-R" orig)))))
-
-(defun magit-rewrite-start (from &optional onto)
-  (interactive (list (magit-read-rev "Rewrite from" (magit-default-rev))))
-  (or (magit-everything-clean-p)
-      (error "You have uncommitted changes"))
-  (or (not (magit-read-rewrite-info))
-      (error "Rewrite in progress"))
-  (let* ((orig (magit-rev-parse "HEAD"))
-         (base
-          (if
-              (or
-               (eq magit-rewrite-inclusive t)
-               (and
-                (eq magit-rewrite-inclusive 'ask)
-                (y-or-n-p "Include selected revision in rewrite? ")))
-              (or
-               (car (magit-commit-parents from))
-               (error "Can't rewrite a parentless commit."))
-            from))
-         (pending (magit-git-lines "rev-list" (concat base ".."))))
-    (magit-write-rewrite-info `((orig ,orig)
-                                (pending ,@(mapcar #'list pending))))
-    (magit-run-git "reset" "--hard" base)))
-
-(defun magit-rewrite-stop (&optional noconfirm)
-  (interactive)
-  (let* ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (when (or noconfirm
-              (yes-or-no-p "Stop rewrite? "))
-      (magit-write-rewrite-info nil)
-      (magit-refresh))))
-
-(defun magit-rewrite-abort ()
-  (interactive)
-  (let* ((info (magit-read-rewrite-info))
-         (orig (cadr (assq 'orig info))))
-    (or info
-        (error "No rewrite in progress"))
-    (or (magit-everything-clean-p)
-        (error "You have uncommitted changes"))
-    (when (yes-or-no-p "Abort rewrite? ")
-      (magit-write-rewrite-info nil)
-      (magit-run-git "reset" "--hard" orig))))
-
-(defun magit-rewrite-finish ()
-  (interactive)
-  (magit-with-refresh
-    (magit-rewrite-finish-step t)))
-
-(defun magit-rewrite-finish-step (first-p)
-  (let ((info (magit-read-rewrite-info)))
-    (or info
-        (error "No rewrite in progress"))
-    (let* ((pending (cdr (assq 'pending info)))
-           (first-unused
-            (let ((rpend (reverse pending)))
-              (while (and rpend (plist-get (cdr (car rpend)) 'used))
-                (setq rpend (cdr rpend)))
-              (car rpend)))
-           (commit (car first-unused)))
-      (cond ((not first-unused)
-             (magit-rewrite-stop t))
-            ((magit-apply-commit commit t (not first-p))
-             (magit-rewrite-set-commit-property commit 'used t)
-             (magit-rewrite-finish-step nil))))))
-
-;;; Updating, pull, and push
-
-(magit-define-command fetch (remote)
-  "Fetch from REMOTE."
-  (interactive (list (magit-read-remote)))
-  (apply 'magit-run-git-async "fetch" remote magit-custom-options))
-
-(magit-define-command fetch-current ()
-  "Run fetch for default remote.
-
-If there is no default remote, ask for one."
-  (interactive)
-  (magit-fetch (or (magit-get-current-remote)
-                   (magit-read-remote))))
-
-(magit-define-command remote-update ()
-  "Update all remotes."
-  (interactive)
-  (apply 'magit-run-git-async "remote" "update" magit-custom-options))
-
-(magit-define-command pull ()
-  "Run git pull against the current remote."
-  (interactive)
-  (let* ((branch (magit-get-current-branch))
-         (branch-remote (magit-get-remote branch))
-         (config-branch (and branch (magit-get "branch" branch "merge")))
-         (merge-branch (or (and config-branch (not current-prefix-arg))
-                           (magit-read-remote-branch
-                            branch-remote (format "Pull from: ")))))
-    (when (and branch (not config-branch))
-      (magit-set branch-remote "branch" branch "remote")
-      (magit-set (format "refs/heads/%s" merge-branch)
-                 "branch" branch "merge"))
-    (apply 'magit-run-git-async "pull" "-v" magit-custom-options)))
-
-(eval-when-compile (require 'eshell))
-
-(defun magit-parse-arguments (command)
-  (require 'eshell)
-  (with-temp-buffer
-    (insert command)
-    (mapcar 'eval (eshell-parse-arguments (point-min) (point-max)))))
-
-(defun magit-shell-command (command)
-  "Perform arbitrary shell COMMAND."
-  (interactive "sCommand: ")
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-run* args nil nil nil t)))
-
-(defvar magit-git-command-history nil)
-
-(defun magit-git-command (command)
-  "Perform arbitrary Git COMMAND.
-
-Similar to `magit-shell-command', but involves slightly less
-typing and automatically refreshes the status buffer."
-  (interactive
-   (list (read-string "Run git like this: " nil 'magit-git-command-history)))
-  (require 'pcomplete)
-  (let ((args (magit-parse-arguments command))
-        (magit-process-popup-time 0))
-    (magit-with-refresh
-      (magit-run* (append (cons magit-git-executable
-                                magit-git-standard-options)
-                          args)
-                  nil nil nil t))))
-
-(magit-define-command push-tags ()
-  "Push tags."
-  (interactive)
-  (magit-run-git-async "push" "--tags"))
-
-(magit-define-command push ()
-  "Push the current branch to a remote repository.
-
-With no prefix argument, ask `magit-get-remote' what remote to
-use for this branch.
-
-With a prefix arg \(e.g., \\[universal-argument] \\[magit-push]), \
-ask user instead.
-
-With \\[universal-argument] \\[universal-argument] as prefix, \
-also prompt user for the remote branch;
-otherwise, try to use the branch.<name>.merge git-config(1)
-option, falling back to something hairy if that is unset."
-  (interactive)
-  (let* ((branch (or (magit-get-current-branch)
-                     (error "Don't push a detached head.  That's gross")))
-         (branch-remote (magit-get-remote branch))
-         (push-remote (if (or current-prefix-arg
-                              (not branch-remote))
-                          (magit-read-remote (format "Push %s to remote"
-                                                     branch)
-                                             branch-remote)
-                        branch-remote))
-         (ref-branch (or (and (>= (prefix-numeric-value current-prefix-arg) 16)
-                              (magit-read-remote-branch
-                               push-remote (format "Push %s as branch" branch)))
-                         (magit-get "branch" branch "merge"))))
-    (if (and (not ref-branch)
-             (eq magit-set-upstream-on-push 'refuse))
-        (error "Not pushing since no upstream has been set.")
-      (let ((set-upstream-on-push (and (not ref-branch)
-                                       (or (eq magit-set-upstream-on-push 'dontask)
-                                           (and (eq magit-set-upstream-on-push t)
-                                                (yes-or-no-p "Set upstream while pushing? "))))))
-        (if (and (not branch-remote)
-                 (not current-prefix-arg))
-            (magit-set push-remote "branch" branch "remote"))
-        (apply 'magit-run-git-async "push" "-v" push-remote
-               (if ref-branch
-                   (format "%s:%s" branch ref-branch)
-                 branch)
-               (if set-upstream-on-push
-                   (cons "--set-upstream" magit-custom-options)
-                 magit-custom-options))
-        ;; Although git will automatically set up the remote,
-        ;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1),
-        ;; so we have to do that manually.
-        (unless ref-branch
-          (magit-set (concat "refs/heads/" branch) "branch" branch "merge"))))))
-
-;;; Log edit mode
-
-(defvar magit-log-edit-buffer-name "*magit-edit-log*"
-  "Buffer name for composing commit messages.")
-
-(defvar magit-log-edit-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-c") 'magit-log-edit-commit)
-    (define-key map (kbd "C-x #") 'magit-log-edit-commit)
-    (define-key map (kbd "C-c C-a") 'magit-log-edit-toggle-amending)
-    (define-key map (kbd "C-c C-s") 'magit-log-edit-toggle-signoff)
-    (define-key map (kbd "C-c C-t") 'magit-log-edit-toggle-author)
-    (define-key map (kbd "C-c C-e") 'magit-log-edit-toggle-allow-empty)
-    (define-key map (kbd "M-p") 'log-edit-previous-comment)
-    (define-key map (kbd "M-n") 'log-edit-next-comment)
-    (define-key map (kbd "C-c C-k") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-c C-]") 'magit-log-edit-cancel-log-message)
-    (define-key map (kbd "C-x C-s") (lambda ()
-                                      (interactive)
-                                      (message "Not saved. Use C-c C-c to finalize this commit message.")))
-    map))
-
-(defvar magit-pre-log-edit-window-configuration nil)
-
-(define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit"
-  ;; Recognize changelog-style paragraphs
-  (set (make-local-variable 'paragraph-start)
-       (concat paragraph-start "\\|*\\|(")))
-
-(defun magit-log-edit-cleanup ()
-  (save-excursion
-    (goto-char (point-min))
-    (goto-char (point-min))
-    (if (re-search-forward "[ \t\n]*\\'" nil t)
-        (replace-match "\n" nil nil))))
-
-(defun magit-log-edit-append (str)
-  (with-current-buffer (get-buffer-create magit-log-edit-buffer-name)
-    (goto-char (point-max))
-    (insert str "\n")))
-
-(defconst magit-log-header-end "-- End of Magit header --\n")
-
-(defun magit-log-edit-get-fields ()
-  (let ((buf (get-buffer magit-log-edit-buffer-name))
-        (result nil))
-    (if buf
-        (with-current-buffer buf
-          (goto-char (point-min))
-          (while (looking-at "^\\([A-Za-z0-9-_]+\\): *\\(.+\\)?$")
-            (setq result (acons (intern (downcase (match-string 1)))
-                                (read (or (match-string 2) "nil"))
-                                result))
-            (forward-line))
-          (if (not (looking-at (regexp-quote magit-log-header-end)))
-              (setq result nil))))
-    (nreverse result)))
-
-(defun magit-log-edit-set-fields (fields)
-  (let ((buf (get-buffer-create magit-log-edit-buffer-name)))
-    (with-current-buffer buf
-      (goto-char (point-min))
-      (if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)*%s"
-                                         (regexp-quote magit-log-header-end))
-                                 nil t)
-          (delete-region (match-beginning 0) (match-end 0)))
-      (goto-char (point-min))
-      (when fields
-        (while fields
-          (insert (capitalize (symbol-name (caar fields))) ": "
-                  (prin1-to-string (cdar fields)) "\n")
-          (setq fields (cdr fields)))
-        (insert magit-log-header-end)))))
-
-(defun magit-log-edit-set-field (name value)
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)))
-    (cond (cell
-           (if value
-               (rplacd cell value)
-             (setq fields (delq cell fields))))
-          (t
-           (if value
-               (setq fields (append fields (list (cons name value)))))))
-    (magit-log-edit-set-fields fields)))
-
-(defun magit-log-edit-get-field (name)
-  (cdr (assq name (magit-log-edit-get-fields))))
-
-(defun magit-log-edit-toggle-field (name default)
-  "Toggle the log-edit field named NAME.
-If it's currently unset, set it to DEFAULT (t or nil).
-
-Return nil if the field is toggled off, and non-nil if it's
-toggled on.  When it's toggled on for the first time, return
-'first."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields)) yesp)
-    (if cell
-        (progn
-          (setq yesp (equal (cdr cell) "yes"))
-          (rplacd cell (if yesp "no" "yes")))
-      (setq fields (acons name (if default "yes" "no") fields))
-      (setq yesp (if default 'first)))
-    (magit-log-edit-set-fields fields)
-    yesp))
-
-(defun magit-log-edit-toggle-input (name default)
-  "Toggle the log-edit input named NAME.
-If it's currently unset, set it to DEFAULT (a string). If it is
-set remove it.
-
-Return nil if the input is toggled off, and its valud if it's
-toggled on."
-  (let* ((fields (magit-log-edit-get-fields))
-         (cell (assq name fields))
-         result)
-    (if cell
-        (progn
-          (setq fields (assq-delete-all name fields)
-                result (cdr cell)))
-      (setq fields (acons name default fields)))
-    (magit-log-edit-set-fields fields)
-    result))
-
-(defun magit-log-edit-setup-author-env (author)
-  "Set GIT_AUTHOR_* variables from AUTHOR spec.
-If AUTHOR is nil, honor default values from
-environment (potentially empty)."
-  (when author
-    ;; XXX - this is a bit strict, probably.
-    (or (string-match "\\(.*\\) <\\(.*\\)>\\(?:,\\s-*\\(.+\\)\\)?" author)
-        (error "Can't parse author string"))
-    ;; Shucks, setenv destroys the match data.
-    (let ((name (match-string 1 author))
-          (email (match-string 2 author))
-          (date  (match-string 3 author)))
-      (make-local-variable 'process-environment)
-      (setenv "GIT_AUTHOR_NAME" name)
-      (setenv "GIT_AUTHOR_EMAIL" email)
-      (if date
-          (setenv "GIT_AUTHOR_DATE" date)))))
-
-(defun magit-log-edit-push-to-comment-ring (comment)
-  (when (or (ring-empty-p log-edit-comment-ring)
-            (not (equal comment (ring-ref log-edit-comment-ring 0))))
-    (ring-insert log-edit-comment-ring comment)))
-
-(defun magit-log-edit-commit ()
-  "Finish edits and create new commit object.
-\('git commit ...')"
-  (interactive)
-  (let* ((fields (magit-log-edit-get-fields))
-         (amend (equal (cdr (assq 'amend fields)) "yes"))
-         (allow-empty (equal (cdr (assq 'allow-empty fields)) "yes"))
-         (commit-all (equal (cdr (assq 'commit-all fields)) "yes"))
-         (sign-off-field (assq 'sign-off fields))
-         (sign-off (if sign-off-field
-                       (equal (cdr sign-off-field) "yes")
-                     magit-commit-signoff))
-         (tag-rev (cdr (assq 'tag-rev fields)))
-         (tag-name (cdr (assq 'tag-name fields)))
-         (author (cdr (assq 'author fields)))
-         (tag-options (cdr (assq 'tag-options fields))))
-
-    (unless (or (magit-anything-staged-p)
-                allow-empty
-                amend
-                tag-name
-                (file-exists-p (concat (magit-git-dir) "MERGE_HEAD"))
-                (and commit-all
-                     (not (magit-everything-clean-p))))
-      (error "Refusing to create empty commit. Maybe you want to amend (%s) or allow-empty (%s)?"
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-amending)))
-             (key-description (car (where-is-internal
-                                    'magit-log-edit-toggle-allow-empty)))))
-
-    (magit-log-edit-push-to-comment-ring (buffer-string))
-    (magit-log-edit-setup-author-env author)
-    (magit-log-edit-set-fields nil)
-    (magit-log-edit-cleanup)
-    (if (= (buffer-size) 0)
-        (insert "(Empty description)\n"))
-    (let ((env process-environment)
-          (commit-buf (current-buffer)))
-      (with-current-buffer (magit-find-status-buffer default-directory)
-        (let ((process-environment env))
-          (cond (tag-name
-                 (apply #'magit-run-git-with-input commit-buf
-                        "tag" (append tag-options (list tag-name "-a" "-F" "-" tag-rev))))
-                (t
-                 (apply #'magit-run-async-with-input commit-buf
-                        magit-git-executable
-                        (append magit-git-standard-options
-                                '("commit")
-                                magit-custom-options
-                                '("-F" "-")
-                                (if (and commit-all (not allow-empty)) '("--all") '())
-                                (if amend '("--amend") '())
-                                (if allow-empty '("--allow-empty"))
-                                (if sign-off '("--signoff") '()))))))))
-    ;; shouldn't we kill that buffer altogether?
-    (erase-buffer)
-    (let ((magit-buf magit-buffer-internal))
-      (bury-buffer)
-      (set-buffer magit-buf))
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (delete-file (concat (magit-git-dir) "MERGE_MSG")))
-    ;; potentially the local environment has been altered with settings that
-    ;; were specific to this commit. Let's revert it
-    (kill-local-variable 'process-environment)
-    (magit-update-vc-modeline default-directory)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-cancel-log-message ()
-  "Abort edits and erase commit message being composed."
-  (interactive)
-  (when (or (not magit-log-edit-confirm-cancellation)
-            (yes-or-no-p
-             "Really cancel editing the log (any changes will be lost)?"))
-    (erase-buffer)
-    (bury-buffer)
-    (when magit-pre-log-edit-window-configuration
-      (set-window-configuration magit-pre-log-edit-window-configuration)
-      (setq magit-pre-log-edit-window-configuration nil))))
-
-(defun magit-log-edit-toggle-amending ()
-  "Toggle whether this will be an amendment to the previous commit.
-\(i.e., whether eventual commit does 'git commit --amend')"
-  (interactive)
-  (when (eq (magit-log-edit-toggle-field 'amend t) 'first)
-    (magit-log-edit-append
-     (magit-trim-line (magit-format-commit "HEAD" "%s%n%n%b")))))
-
-(defun magit-log-edit-toggle-signoff ()
-  "Toggle whether this commit will include a signoff.
-\(i.e., whether eventual commit does 'git commit --signoff')"
-  (interactive)
-  (magit-log-edit-toggle-field 'sign-off (not magit-commit-signoff)))
-
-(defun magit-log-edit-toggle-author ()
-  "Toggle whether this commit will include an author.
-\(i.e., whether eventual commit is run with GIT_AUTHOR_NAME and
-GIT_AUTHOR_EMAIL set)"
-  (interactive)
-  (magit-log-edit-toggle-input 'author (format "%s <%s>"
-                                               (or (magit-get "user" "name") "Author Name")
-                                               (or (magit-get "user" "email") "author@email"))))
-
-(defun magit-log-edit-toggle-allow-empty ()
-  "Toggle whether this commit is allowed to be empty.
-This means that the eventual commit does 'git commit --allow-empty'."
-  (interactive)
-  (magit-log-edit-toggle-field 'allow-empty t))
-
-(defun magit-pop-to-log-edit (operation)
-  (let ((dir default-directory)
-        (magit-buf (current-buffer))
-        (buf (get-buffer-create magit-log-edit-buffer-name)))
-    (setq magit-pre-log-edit-window-configuration
-          (current-window-configuration))
-    (pop-to-buffer buf)
-    (setq default-directory dir)
-    (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
-      (insert-file-contents (concat (magit-git-dir) "MERGE_MSG")))
-    (magit-log-edit-mode)
-    (make-local-variable 'magit-buffer-internal)
-    (setq magit-buffer-internal magit-buf)
-    (message "Type C-c C-c to %s (C-c C-k to cancel)." operation)))
-
-(defun magit-log-edit (&optional arg)
-  "Brings up a buffer to allow editing of commit messages.
-
-Giving a simple prefix arg will amend a previous commit, while
-a double prefix arg will allow creating an empty one.
-
-If there is a rebase in progress, offer the user the option to
-continue it.
-
-\\{magit-log-edit-mode-map}"
-  (interactive "P")
-  ;; If repository is dirty there is no point in trying to
-  ;; suggest to continue the rebase. Git will rebuke you and exit with
-  ;; error code, so suggest it only if theres absolutely nothing else
-  ;; to do and rebase is ongoing.
-  (if (and (magit-everything-clean-p)
-           (magit-rebase-info)
-           (y-or-n-p "Rebase in progress.  Continue it? "))
-      (magit-run-git-async "rebase" "--continue")
-
-    ;; If there's nothing staged, set commit flag to `nil', thus
-    ;; avoiding unnescessary popping up of the log edit buffer in case
-    ;; when user chose to forgo commiting all unstaged changes
-    (let ((amend-p (= (prefix-numeric-value arg) 4))
-          (empty-p (= (prefix-numeric-value arg) 16)))
-      (when (and magit-commit-all-when-nothing-staged
-                 (not (magit-everything-clean-p))
-                 (not (magit-anything-staged-p)))
-        (cond ((eq magit-commit-all-when-nothing-staged 'ask-stage)
-               (when (y-or-n-p "Nothing staged.  Stage everything now? ")
-                 (magit-stage-all)))
-              ((not (magit-log-edit-get-field 'commit-all))
-               (when (or (eq magit-commit-all-when-nothing-staged t)
-                         (y-or-n-p
-                          "Nothing staged.  Commit all unstaged changes? "))
-                 (magit-log-edit-set-field 'commit-all "yes")))))
-      (when amend-p
-        (magit-log-edit-toggle-amending))
-      (when empty-p
-        (magit-log-edit-toggle-allow-empty))
-      (let ((author-email (or (getenv "GIT_AUTHOR_EMAIL") ""))
-            (author-name (or (getenv "GIT_AUTHOR_NAME") ""))
-            (author-date (or (getenv "GIT_AUTHOR_DATE") "")))
-        (if (not (string= author-email ""))
-            (magit-log-edit-set-field 'author (format "%s <%s>%s"
-                                                      (if (string= "" author-name) author-email author-name)
-                                                      author-email
-                                                      (if (string= "" author-date) "" (format ", %s" author-date))))))
-      (magit-pop-to-log-edit "commit"))))
-
-(defun magit-add-log ()
-  (interactive)
-  (cond ((magit-rebase-info)
-         (if (y-or-n-p "Rebase in progress.  Continue it? ")
-             (magit-run-git-async "rebase" "--continue")))
-        (t
-         (let ((section (magit-current-section)))
-           (let ((fun (if (eq (magit-section-type section) 'hunk)
-                          (save-window-excursion
-                            (save-excursion
-                              (magit-visit-item)
-                              (add-log-current-defun)))
-                        nil))
-                 (file (magit-diff-item-file
-                        (cond ((eq (magit-section-type section) 'hunk)
-                               (magit-hunk-item-diff section))
-                              ((eq (magit-section-type section) 'diff)
-                               section)
-                              (t
-                               (error "No change at point"))))))
-             (magit-log-edit nil)
-             (goto-char (point-min))
-             (cond ((not (search-forward-regexp
-                          (format "^\\* %s" (regexp-quote file)) nil t))
-                    ;; No entry for file, create it.
-                    (goto-char (point-max))
-                    (insert (format "\n* %s" file))
-                    (if fun
-                        (insert (format " (%s)" fun)))
-                    (insert ": "))
-                   (fun
-                    ;; found entry for file, look for fun
-                    (let ((limit (or (save-excursion
-                                       (and (search-forward-regexp "^\\* "
-                                                                   nil t)
-                                            (match-beginning 0)))
-                                     (point-max))))
-                      (cond ((search-forward-regexp (format "(.*\\<%s\\>.*):"
-                                                            (regexp-quote fun))
-                                                    limit t)
-                             ;; found it, goto end of current entry
-                             (if (search-forward-regexp "^(" limit t)
-                                 (backward-char 2)
-                               (goto-char limit)))
-                            (t
-                             ;; not found, insert new entry
-                             (goto-char limit)
-                             (if (bolp)
-                                 (open-line 1)
-                               (newline))
-                             (insert (format "(%s): " fun))))))
-                   (t
-                    ;; found entry for file, look for beginning  it
-                    (when (looking-at ":")
-                      (forward-char 2)))))))))
-
-;;; Tags
-
-(magit-define-command tag (name rev)
-  "Create a new lightweight tag with the given NAME at REV.
-\('git tag NAME')."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (apply #'magit-run-git "tag" (append magit-custom-options (list name rev))))
-
-(magit-define-command annotated-tag (name rev)
-  "Start composing an annotated tag with the given NAME.
-Tag will point to the current 'HEAD'."
-  (interactive
-   (list
-    (read-string "Tag name: ")
-    (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
-  (magit-log-edit-set-field 'tag-name name)
-  (magit-log-edit-set-field 'tag-rev rev)
-  (magit-log-edit-set-field 'tag-options magit-custom-options)
-  (magit-pop-to-log-edit "tag"))
-
-;;; Stashing
-
-(defun magit-wash-stash ()
-  (if (search-forward-regexp "stash@{\\(.*?\\)}" (line-end-position) t)
-      (let ((stash (match-string-no-properties 0))
-            (name (match-string-no-properties 1)))
-        (delete-region (match-beginning 0) (match-end 0))
-        (goto-char (match-beginning 0))
-        (fixup-whitespace)
-        (goto-char (line-beginning-position))
-        (insert name)
-        (goto-char (line-beginning-position))
-        (magit-with-section stash 'stash
-          (magit-set-section-info stash)
-          (forward-line)))
-    (forward-line))
-  t)
-
-(defun magit-wash-stashes ()
-  (let ((magit-old-top-section nil))
-    (magit-wash-sequence #'magit-wash-stash)))
-
-(magit-define-inserter stashes ()
-  (magit-git-section 'stashes
-                     "Stashes:" 'magit-wash-stashes
-                     "stash" "list"))
-
-(magit-define-command stash (description)
-  "Create new stash of working tree and staging area named DESCRIPTION.
-Working tree and staging area revert to the current 'HEAD'.
-With prefix argument, changes in staging area are kept.
-\('git stash save [--keep-index] DESCRIPTION')"
-  (interactive "sStash description: ")
-  (apply 'magit-run-git `("stash" "save" ,@magit-custom-options "--" ,description)))
-
-(magit-define-command stash-snapshot ()
-  "Create new stash of working tree and staging area; keep changes in place.
-\('git stash save \"Snapshot...\"; git stash apply stash@{0}')"
-  (interactive)
-  (magit-with-refresh
-    (apply 'magit-run-git `("stash" "save" ,@magit-custom-options
-                   ,(format-time-string "Snapshot taken at %Y-%m-%d %H:%M:%S"
-                                       (current-time))))
-    (magit-run-git "stash" "apply" "stash@{0}")))
-
-(defvar magit-currently-shown-stash nil)
-
-(define-derived-mode magit-stash-mode magit-mode "Magit Stash"
-  "Mode for looking at a git stash.
-
-\\{magit-stash-mode-map}"
-  :group 'magit)
-
-(defvar magit-stash-buffer-name "*magit-stash*"
-  "Buffer name for displaying a stash.")
-
-(defun magit-show-stash (stash &optional scroll)
-  (when (magit-section-p stash)
-    (setq stash (magit-section-info stash)))
-  (let ((dir default-directory)
-        (buf (get-buffer-create magit-stash-buffer-name))
-        (stash-id (magit-git-string "rev-list" "-1" stash)))
-    (cond ((and (equal magit-currently-shown-stash stash-id)
-                (with-current-buffer buf
-                  (> (length (buffer-string)) 1)))
-           (let ((win (get-buffer-window buf)))
-             (cond ((not win)
-                    (display-buffer buf))
-                   (scroll
-                    (with-selected-window win
-                      (funcall scroll))))))
-          (t
-           (setq magit-currently-shown-stash stash-id)
-           (display-buffer buf)
-           (with-current-buffer buf
-             (set-buffer buf)
-             (goto-char (point-min))
-             (let* ((range (cons (concat stash "^2^") stash))
-                    (magit-current-diff-range range)
-                    (args (magit-rev-range-to-git range)))
-               (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer
-                                range args)))))))
-;;; Commits
-
-(defun magit-commit-at-point (&optional nil-ok-p)
-  (let* ((section (magit-current-section))
-         (commit (if (and section
-                          (eq (magit-section-type section) 'commit))
-                     (magit-section-info section)
-                 (get-text-property (point) 'revision))))
-    (if nil-ok-p
-        commit
-      (or commit
-          (error "No commit at point")))))
-
-(defun magit-apply-commit (commit &optional docommit noerase revert)
-  (let* ((parent-id (magit-choose-parent-id commit "cherry-pick"))
-         (success (magit-run* `(,magit-git-executable
-                                ,@magit-git-standard-options
-                                ,(if revert "revert" "cherry-pick")
-                                ,@(if parent-id
-                                      (list "-m" (number-to-string parent-id)))
-                                ,@(if (not docommit) (list "--no-commit"))
-                                ,commit)
-                              nil noerase)))
-    (when (and (not docommit) success)
-      (cond (revert
-             (magit-log-edit-append
-              (magit-format-commit commit "Reverting \"%s\"")))
-            (t
-             (magit-log-edit-append
-              (magit-format-commit commit "%s%n%n%b"))
-             (magit-log-edit-set-field
-              'author
-              (magit-format-commit commit "%an <%ae>, %ai")))))
-    success))
-
-(defun magit-apply-item ()
-  (interactive)
-  (magit-section-action (item info "apply")
-    ((pending commit)
-     (magit-apply-commit info)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info))
-    ((unstaged *)
-     (error "Change is already in your working tree"))
-    ((staged *)
-     (error "Change is already in your working tree"))
-    ((hunk)
-     (magit-apply-hunk-item item))
-    ((diff)
-     (magit-apply-diff-item item))
-    ((stash)
-     (magit-run-git "stash" "apply" info))))
-
-(defun magit-cherry-pick-item ()
-  (interactive)
-  (magit-section-action (item info "cherry-pick")
-    ((pending commit)
-     (magit-apply-commit info t)
-     (magit-rewrite-set-commit-property info 'used t))
-    ((commit)
-     (magit-apply-commit info t))
-    ((stash)
-     (magit-run-git "stash" "pop" info))))
-
-(defmacro magit-with-revert-confirmation (&rest body)
-  `(when (or (not magit-revert-item-confirm)
-             (yes-or-no-p "Really revert this item? "))
-     ,@body))
-
-(defun magit-revert-item ()
-  (interactive)
-  (magit-section-action (item info "revert")
-    ((pending commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)
-      (magit-rewrite-set-commit-property info 'used nil)))
-    ((commit)
-     (magit-with-revert-confirmation
-      (magit-apply-commit info nil nil t)))
-    ;; Reverting unstaged changes cannot be undone
-    ((unstaged *)
-     (magit-discard-item))
-    ((hunk)
-     (magit-with-revert-confirmation
-      (magit-apply-hunk-item-reverse item)))
-    ((diff)
-     (magit-with-revert-confirmation
-      (magit-apply-diff-item item "--reverse")))))
-
-(defun magit-log-show-more-entries (&optional arg)
-  "Grow the number of log entries shown.
-
-With no prefix optional ARG, show twice as many log entries.
-With a numerical prefix ARG, add this number to the number of shown log entries.
-With a non numeric prefix ARG, show all entries"
-  (interactive "P")
-  (make-local-variable 'magit-log-cutoff-length)
-  (cond
-   ((numberp arg)
-    (setq magit-log-cutoff-length (+ magit-log-cutoff-length arg)))
-   (arg
-    (setq magit-log-cutoff-length magit-log-infinite-length))
-   (t (setq magit-log-cutoff-length (* magit-log-cutoff-length 2))))
-  (let ((old-point (point)))
-    (magit-refresh)
-    (goto-char old-point)))
-
-(defun magit-refresh-log-buffer (range style args)
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range "Commits")
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             ,@args
-             "--"))))
-
-(define-derived-mode magit-log-mode magit-mode "Magit Log"
-  "Mode for looking at git log.
-
-\\{magit-log-mode-map}"
-  :group 'magit)
-
-(defvar magit-log-buffer-name "*magit-log*"
-  "Buffer name for display of log entries.")
-
-(magit-define-command log-ranged ()
-  (interactive)
-  (magit-log t))
-(define-obsolete-function-alias 'magit-display-log-ranged 'magit-log-ranged)
-
-(magit-define-command log (&optional ask-for-range &rest extra-args)
-  (interactive)
-  (let* ((log-range (if ask-for-range
-                        (magit-read-rev-range "Log" "HEAD")
-                      "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (nconc (list (magit-rev-range-to-git log-range))
-                      magit-custom-options
-                      extra-args)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer log-range
-                     'oneline args)))
-
-(define-obsolete-function-alias 'magit-display-log 'magit-log)
-
-(magit-define-command log-long-ranged ()
-  (interactive)
-  (magit-log-long t))
-
-(magit-define-command log-long (&optional ranged)
-  (interactive)
-  (let* ((range (if ranged
-                    (magit-read-rev-range "Long log" "HEAD")
-                  "HEAD"))
-         (topdir (magit-get-top-dir default-directory))
-         (args (append (list (magit-rev-range-to-git range))
-                       magit-custom-options)))
-    (magit-buffer-switch magit-log-buffer-name)
-    (magit-mode-init topdir 'magit-log-mode #'magit-refresh-log-buffer range
-                     'long args)))
-
-;;; Reflog
-
-(defvar magit-reflog-head nil
-  "The HEAD of the reflog in the current buffer.
-This is only non-nil in reflog buffers.")
-(make-variable-buffer-local 'magit-reflog-head)
-
-(defun magit-refresh-reflog-buffer (head args)
-  (setq magit-reflog-head head)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section
-           'reflog (format "Local history of head %s" head) 'magit-wash-log "log"
-           (append magit-git-log-options
-                   (list
-                    "--walk-reflogs"
-                    (format "--max-count=%s" magit-log-cutoff-length)
-                    args)))))
-
-(define-derived-mode magit-reflog-mode magit-log-mode "Magit Reflog"
-  "Mode for looking at git reflog.
-
-\\{magit-reflog-mode-map}"
-  :group 'magit)
-
-(magit-define-command reflog (&optional ask-for-range)
-  (interactive)
-  (let ((at (or (if ask-for-range
-                    (magit-read-rev "Reflog of" (or (magit-guess-branch) "HEAD")))
-                "HEAD")))
-    (let* ((topdir (magit-get-top-dir default-directory))
-           (args (magit-rev-to-git at)))
-      (magit-buffer-switch "*magit-reflog*")
-      (magit-mode-init topdir 'magit-reflog-mode
-                       #'magit-refresh-reflog-buffer at args))))
-
-(magit-define-command reflog-ranged ()
-  (interactive)
-  (magit-reflog t))
-
-;;; Diffing
-
-(defvar magit-ediff-buffers nil
-  "List of buffers that may be killed by `magit-ediff-restore'.")
-
-(defvar magit-ediff-windows nil
-  "The window configuration that will be restored when Ediff is finished.")
-
-(defun magit-ediff()
-  "View the current DIFF section in ediff."
-  (interactive)
-  (let ((diff (magit-current-section)))
-    (when (magit-section-hidden diff)
-      ;; Range is not set until the first time the diff is visible.
-      ;; This somewhat hackish code makes sure it's been visible at least once.
-      (magit-toggle-section)
-      (magit-toggle-section)
-      (setq diff (magit-current-section)))
-    (if (eq 'hunk (magit-section-type diff))
-        (setq diff (magit-section-parent diff)))
-    (unless (eq 'diff (magit-section-type diff))
-      (error "No diff at this location"))
-    (let* ((type (magit-diff-item-kind diff))
-           (file1 (magit-diff-item-file diff))
-           (file2 (magit-diff-item-file2 diff))
-           (range (magit-diff-item-range diff)))
-      (cond
-       ((memq type '(new deleted typechange))
-        (message "Why ediff a %s file?" type))
-       ((and (eq type 'unmerged)
-             (eq (cdr range) 'working))
-        (magit-interactive-resolve file1))
-       ((consp (car range))
-        (magit-ediff* (magit-show (caar range) file2)
-                      (magit-show (cdar range) file2)
-                      (magit-show (cdr range) file1)))
-       (t
-        (magit-ediff* (magit-show (car range) file2)
-                      (magit-show (cdr range) file1)))))))
-
-(defun magit-ediff* (a b &optional c)
-  (setq magit-ediff-buffers (list a b c))
-  (setq magit-ediff-windows (current-window-configuration))
-  (add-hook 'ediff-quit-hook 'magit-ediff-restore 'append)
-  (if c
-      (ediff-buffers3 a b c)
-    (ediff-buffers a b)))
-
-(defun magit-ediff-restore()
-  "Kill any buffers in `magit-ediff-buffers' that are not visiting files and
-restore the window state that was saved before ediff was called."
-  (dolist (buffer magit-ediff-buffers)
-    (if (and (null (buffer-file-name buffer))
-             (buffer-live-p buffer))
-        (kill-buffer buffer)))
-  (setq magit-ediff-buffers nil)
-  (set-window-configuration magit-ediff-windows)
-  (remove-hook 'ediff-quit-hook 'magit-ediff-restore))
-
-(defun magit-refresh-diff-buffer (range args)
-  (let ((magit-current-diff-range (cond
-                                   ((stringp range)
-                                    (cons range 'working))
-                                   ((null (cdr range))
-                                    (cons (car range) 'working))
-                                   (t
-                                    range))))
-    (setq magit-current-range range)
-    (magit-create-buffer-sections
-      (magit-git-section 'diffbuf
-                         (magit-rev-range-describe range "Changes")
-                         'magit-wash-diffs
-                         "diff" (magit-diff-U-arg) args "--"))))
-
-(define-derived-mode magit-diff-mode magit-mode "Magit Diff"
-  "Mode for looking at a git diff.
-
-\\{magit-diff-mode-map}"
-  :group 'magit)
-
-(magit-define-command diff (range)
-  (interactive (list (magit-read-rev-range "Diff")))
-  (if range
-      (let* ((dir default-directory)
-             (args (magit-rev-range-to-git range))
-             (buf (get-buffer-create "*magit-diff*")))
-        (display-buffer buf)
-        (with-current-buffer buf
-          (magit-mode-init dir 'magit-diff-mode #'magit-refresh-diff-buffer range args)))))
-
-(magit-define-command diff-working-tree (rev)
-  (interactive (list (magit-read-rev "Diff with" (magit-default-rev))))
-  (magit-diff (or rev "HEAD")))
-
-(defun magit-diff-with-mark ()
-  (interactive)
-  (magit-diff (cons (magit-marked-commit)
-                    (magit-commit-at-point))))
-
-;;; Wazzup
-
-(defvar magit-wazzup-head nil
-  "The integration head for the current wazzup buffer.
-This is only non-nil in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-head)
-
-(defvar magit-wazzup-all-p nil
-  "Non-nil if the current wazzup buffer displays excluded branches.
-This is only meaningful in wazzup buffers.")
-(make-variable-buffer-local 'magit-wazzup-all-p)
-
-(defun magit-wazzup-toggle-ignore (branch edit)
-  (let ((ignore-file (concat (magit-git-dir) "info/wazzup-exclude")))
-    (if edit
-        (setq branch (read-string "Branch to ignore for wazzup: " branch)))
-    (let ((ignored (magit-file-lines ignore-file)))
-      (cond ((member branch ignored)
-             (when (or (not edit)
-                       (y-or-n-p "Branch %s is already ignored.  Unignore? "))
-               (setq ignored (delete branch ignored))))
-            (t
-             (setq ignored (append ignored (list branch)))))
-      (magit-write-file-lines ignore-file ignored)
-      (magit-need-refresh))))
-
-(defun magit-refresh-wazzup-buffer (head all)
-  (setq magit-wazzup-head head)
-  (setq magit-wazzup-all-p all)
-  (let ((branch-desc (or head "(detached) HEAD")))
-    (unless head (setq head "HEAD"))
-    (magit-create-buffer-sections
-      (magit-with-section 'wazzupbuf nil
-        (insert (format "Wazzup, %s\n\n" branch-desc))
-        (let* ((excluded (magit-file-lines (concat (magit-git-dir) "info/wazzup-exclude")))
-               (all-branches (magit-list-interesting-refs))
-               (branches (if all all-branches
-                           (delq nil (mapcar
-                                      (lambda (b)
-                                        (and (not
-                                              (member (cdr b) excluded))
-                                             b))
-                                      all-branches))))
-               (reported (make-hash-table :test #'equal)))
-          (dolist (branch branches)
-            (let* ((name (car branch))
-                   (ref (cdr branch))
-                   (hash (magit-rev-parse ref))
-                   (reported-branch (gethash hash reported)))
-              (unless (or (and reported-branch
-                               (string= (file-name-nondirectory ref)
-                                        reported-branch))
-                          (not (magit-git-string "merge-base" head ref)))
-                (puthash hash (file-name-nondirectory ref) reported)
-                (let* ((n (length (magit-git-lines "log" "--pretty=oneline"
-                                                   (concat head ".." ref))))
-                       (section
-                        (let ((magit-section-hidden-default t))
-                          (magit-git-section
-                           (cons ref 'wazzup)
-                           (format "%s unmerged commits in %s%s"
-                                   n name
-                                   (if (member ref excluded)
-                                       " (normally ignored)"
-                                     ""))
-                           'magit-wash-log
-                           "log"
-                           (format "--max-count=%s" magit-log-cutoff-length)
-                           "--abbrev-commit"
-                           (format "--abbrev=%s" magit-sha1-abbrev-length)
-                           "--graph"
-                           "--pretty=oneline"
-                           (format "%s..%s" head ref)
-                           "--"))))
-                  (magit-set-section-info ref section))))))))))
-
-(define-derived-mode magit-wazzup-mode magit-mode "Magit Wazzup"
-  "Mode for looking at commits that could be merged from other branches.
-
-\\{magit-wazzup-mode-map}"
-  :group 'magit)
-
-(defun magit-wazzup (&optional all)
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-branch (magit-get-current-branch)))
-    (magit-buffer-switch "*magit-wazzup*")
-    (magit-mode-init topdir 'magit-wazzup-mode
-                     #'magit-refresh-wazzup-buffer
-                     current-branch all)))
-
-(defun magit-filename (filename)
-  "Return the path of FILENAME relative to its git repository.
-
-If FILENAME is absolute, return a path relative to the git
-repository containing it. Otherwise, return a path relative to
-the current git repository."
-  (let ((topdir (expand-file-name
-                 (magit-get-top-dir (or (file-name-directory filename)
-                                        default-directory))))
-        (file (file-truename filename)))
-    (when (and (not (string= topdir ""))
-               ;; FILE must start with the git repository path
-               (zerop (string-match-p (concat "\\`" topdir) file)))
-      (substring file (length topdir)))))
-
-;; This variable is used to keep track of the current file in the
-;; *magit-log* buffer when this one is dedicated to showing the log of
-;; just 1 file.
-(defvar magit-file-log-file nil)
-(make-variable-buffer-local 'magit-file-log-file)
-
-(defun magit-refresh-file-log-buffer (file range style)
-  "Refresh the current file-log buffer by calling git.
-
-FILE is the path of the file whose log must be displayed.
-
-`magit-current-range' will be set to the value of RANGE.
-
-STYLE controls the display. It is either `'long',  `'oneline', or something else.
- "
-  (magit-configure-have-graph)
-  (magit-configure-have-decorate)
-  (magit-configure-have-abbrev)
-  (setq magit-current-range range)
-  (setq magit-file-log-file file)
-  (magit-create-log-buffer-sections
-    (apply #'magit-git-section nil
-           (magit-rev-range-describe range (format "Commits for file %s" file))
-           (apply-partially 'magit-wash-log style)
-           `("log"
-             ,(format "--max-count=%s" magit-log-cutoff-length)
-             ,"--abbrev-commit"
-             ,(format "--abbrev=%s" magit-sha1-abbrev-length)
-             ,@(cond ((eq style 'long) (list "--stat" "-z"))
-                     ((eq style 'oneline) (list "--pretty=oneline"))
-                     (t nil))
-             ,@(if magit-have-decorate (list "--decorate=full"))
-             ,@(if magit-have-graph (list "--graph"))
-             "--"
-             ,file))))
-
-(defun magit-file-log (&optional all)
-  "Display the log for the currently visited file or another one.
-
-With a prefix argument or if no file is currently visited, ask
-for the file whose log must be displayed."
-  (interactive "P")
-  (let ((topdir (magit-get-top-dir default-directory))
-        (current-file (magit-filename
-                       (if (or current-prefix-arg (not buffer-file-name))
-                           (magit-read-file-from-rev (magit-get-current-branch))
-                        buffer-file-name)))
-        (range "HEAD"))
-    (magit-buffer-switch "*magit-log*")
-    (magit-mode-init topdir 'magit-log-mode
-                     #'magit-refresh-file-log-buffer
-                     current-file range 'oneline)))
-
-(defun magit-show-file-revision ()
-  "Open a new buffer showing the current file in the revision at point."
-  (interactive)
-  (flet ((magit-show-file-from-diff (item)
-                                    (switch-to-buffer-other-window
-                                     (magit-show (cdr (magit-diff-item-range item))
-                                                 (magit-diff-item-file item)))))
-    (magit-section-action (item info "show")
-      ((commit)
-       (let ((current-file (or magit-file-log-file
-                               (magit-read-file-from-rev info))))
-         (switch-to-buffer-other-window
-          (magit-show info current-file))))
-      ((hunk) (magit-show-file-from-diff (magit-hunk-item-diff item)))
-      ((diff) (magit-show-file-from-diff item)))))
-
-;;; Miscellaneous
-
-(defun magit-ignore-modifiable-file (file edit)
-  "Prompt the user for the filename to be added to git ignore.
-\\<minibuffer-local-map>
-The minibuffer's future history (accessible with \\[next-history-element])
-contains predefined values (such as wildcards) that might
-be of interest.
-The history and default value are derived from the filename FILE.
-If EDIT argument is negative, the prompt proposes wildcard by default.
-"
-  (let* ((just-extension (concat "*." (file-name-extension file)))
-         (full-extension (concat (file-name-directory file) just-extension))
-         (just-file (file-name-nondirectory file))
-         ;; change the order in history depending on the negativity of
-         ;; EDIT.
-         (history (if (< (prefix-numeric-value edit) 0)
-                      (list full-extension just-extension file just-file)
-                    (list file full-extension just-extension just-file))))
-    (read-string
-     (format "File to ignore [%s]: " (car history))
-     nil nil history)))
-
-(defun magit-ignore-file (file edit local)
-  "Add FILE to the list of files to ignore.
-\\<minibuffer-local-map>
-If EDIT is non-`nil', prompt the user for the filename to
-be added to git ignore. In this case, the minibuffer's
-future history (accessible with \\[next-history-element]) contains predefined
-values (such as wildcards) that might be of interest.
-
-If LOCAL is nil, the `.gitignore' file is updated.
-Otherwise, it is `.git/info/exclude'."
-  (let* ((local-ignore-dir (concat (magit-git-dir) "info/"))
-         (ignore-file (if local
-                          (concat local-ignore-dir "exclude")
-                        ".gitignore")))
-    (if edit
-      (setq file (magit-ignore-modifiable-file file edit)))
-    (if (and local (not (file-exists-p local-ignore-dir)))
-        (make-directory local-ignore-dir t))
-    (with-temp-buffer
-      (when (file-exists-p ignore-file)
-        (insert-file-contents ignore-file))
-      (goto-char (point-max))
-      (unless (bolp)
-        (insert "\n"))
-      (insert file "\n")
-      (write-region nil nil ignore-file))
-    (magit-need-refresh)))
-
-(defun magit-ignore-item ()
-  "Add FILE to the `.gitignore' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-\(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg nil))
-    ((wazzup)
-     (magit-wazzup-toggle-ignore info current-prefix-arg))))
-
-(defun magit-ignore-item-locally ()
-  "Add FILE to the `.git/info/exclude' list of files to ignore.
-\\<minibuffer-local-map>
-With a prefix argument, prompt the user for the filename to
-be added. In this case, the minibuffer's future history
-(accessible with \\[next-history-element]) contains predefined values (such as
-wildcards) that might be of interest. If prefix argument is
-negative, the prompt proposes wildcard by default."
-  (interactive)
-  (magit-section-action (item info "ignore")
-    ((untracked file)
-     (magit-ignore-file (concat "/" info) current-prefix-arg t))))
-
-(defun magit-discard-diff (diff stagedp)
-  (let ((kind (magit-diff-item-kind diff))
-        (file (magit-diff-item-file diff)))
-    (cond ((eq kind 'deleted)
-           (when (yes-or-no-p (format "Resurrect %s? " file))
-             (magit-run-git "reset" "-q" "--" file)
-             (magit-run-git "checkout" "--" file)))
-          ((eq kind 'new)
-           (if (yes-or-no-p (format "Delete %s? " file))
-               (magit-run-git "rm" "-f" "--" file)))
-          (t
-           (if (yes-or-no-p (format "Discard changes to %s? " file))
-               (if stagedp
-                   (magit-run-git "checkout" "HEAD" "--" file)
-                 (magit-run-git "checkout" "--" file)))))))
-
-(defun magit-discard-item ()
-  (interactive)
-  (magit-section-action (item info "discard")
-    ((untracked file)
-     (when (yes-or-no-p (format "Delete %s? " info))
-       (if (and (file-directory-p info)
-                (not (file-symlink-p info)))
-           (magit-delete-directory info 'recursive)
-         (delete-file info))
-       (magit-refresh-buffer)))
-    ((untracked)
-     (if (yes-or-no-p "Delete all untracked files and directories? ")
-         (magit-run-git "clean" "-df")))
-    ((unstaged diff hunk)
-     (when (yes-or-no-p (if (magit-use-region-p)
-                            "Discard changes in region? "
-                          "Discard hunk? "))
-       (magit-apply-hunk-item-reverse item)))
-    ((staged diff hunk)
-     (if (magit-file-uptodate-p (magit-diff-item-file
-                                 (magit-hunk-item-diff item)))
-         (when (yes-or-no-p (if (magit-use-region-p)
-                                "Discard changes in region? "
-                              "Discard hunk? "))
-           (magit-apply-hunk-item-reverse item "--index"))
-       (error "Can't discard this hunk.  Please unstage it first")))
-    ((unstaged diff)
-     (magit-discard-diff item nil))
-    ((staged diff)
-     (if (magit-file-uptodate-p (magit-diff-item-file item))
-         (magit-discard-diff item t)
-       (error "Can't discard staged changes to this file.  Please unstage it first")))
-    ((diff diff)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((diff diff hunk)
-     (save-excursion
-       (magit-goto-parent-section)
-       (magit-goto-parent-section)
-       (magit-discard-item)))
-    ((hunk)
-     (error "Can't discard this hunk"))
-    ((diff)
-     (error "Can't discard this diff"))
-    ((stash)
-     (when (yes-or-no-p "Discard stash? ")
-       (magit-run-git "stash" "drop" info)))
-    ((branch)
-     (when (yes-or-no-p (if current-prefix-arg
-                            "Force delete branch?"
-                          "Delete branch? "))
-       (magit-delete-branch info current-prefix-arg)))
-    ((remote)
-     (when (yes-or-no-p "Remove remote? ")
-       (magit-remove-remote info)))))
-
-(defun magit-move-item ()
-  (interactive)
-  (magit-section-action (item info "move")
-    ((branch)
-     (call-interactively 'magit-move-branch))
-    ((remote)
-     (call-interactively 'magit-rename-remote))))
-
-(defmacro magit-visiting-file-item (&rest body)
-  `(let ((marker (save-window-excursion
-                   (magit-visit-file-item)
-                   (set-marker (make-marker) (point)))))
-     (save-excursion
-       (with-current-buffer (marker-buffer marker)
-         (goto-char marker)
-         ,@body))))
-
-(defun magit-add-change-log-entry-no-option (&optional other-window)
-  "Add a change log entry for current change.
-With a prefix argument, edit in other window.
-The name of the change log file is set by variable change-log-default-name."
-  (interactive "P")
-  (if other-window
-      (magit-visiting-file-item (add-change-log-entry-other-window))
-    (magit-visiting-file-item (add-change-log-entry))))
-
-(defun magit-add-change-log-entry-other-window ()
-  (interactive)
-  (magit-visiting-file-item (call-interactively 'add-change-log-entry-other-window)))
-
-(eval-after-load 'dired-x
-  '(defun magit-dired-jump (&optional other-window)
-    "Visit current item.
-With a prefix argument, visit in other window."
-    (interactive "P")
-    (require 'dired-x)
-    (magit-section-action (item info "dired-jump")
-      ((untracked file)
-       (dired-jump other-window (file-truename info)))
-      ((diff)
-       (dired-jump other-window (file-truename (magit-diff-item-file item))))
-      ((hunk)
-       (dired-jump other-window
-                   (file-truename (magit-diff-item-file
-                                   (magit-hunk-item-diff item))))))))
-
-(defun magit-visit-file-item (&optional other-window)
-  "Visit current file associated with item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit-file")
-    ((untracked file)
-     (funcall
-      (if other-window 'find-file-other-window 'find-file)
-      info))
-    ((diff)
-     (let ((file (magit-diff-item-file item)))
-       (cond ((not (file-exists-p file))
-              (error "Can't visit deleted file: %s" file))
-             ((file-directory-p file)
-              (magit-status file))
-             (t
-              (funcall
-               (if other-window 'find-file-other-window 'find-file)
-               file)))))
-    ((hunk)
-     (let ((file (magit-diff-item-file (magit-hunk-item-diff item)))
-           (line (magit-hunk-item-target-line item)))
-       (if (not (file-exists-p file))
-           (error "Can't visit deleted file: %s" file))
-       (funcall
-        (if other-window 'find-file-other-window 'find-file)
-        file)
-       (goto-char (point-min))
-       (forward-line (1- line))))))
-
-(defun magit-visit-item (&optional other-window)
-  "Visit current item.
-With a prefix argument, visit in other window."
-  (interactive "P")
-  (magit-section-action (item info "visit")
-    ((untracked file)
-     (call-interactively 'magit-visit-file-item))
-    ((diff)
-     (call-interactively 'magit-visit-file-item))
-    ((hunk)
-     (call-interactively 'magit-visit-file-item))
-    ((commit)
-     (magit-show-commit info nil nil 'select))
-    ((stash)
-     (magit-show-stash info)
-     (pop-to-buffer magit-stash-buffer-name))
-    ((branch)
-     (magit-checkout info))
-    ((longer)
-     (magit-log-show-more-entries ()))))
-
-(defun magit-show-item-or-scroll-up ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-up))
-    ((stash)
-     (magit-show-stash info #'scroll-up))
-    (t
-     (scroll-up))))
-
-(defun magit-show-item-or-scroll-down ()
-  (interactive)
-  (magit-section-action (item info)
-    ((commit)
-     (magit-show-commit info #'scroll-down))
-    ((stash)
-     (magit-show-stash info #'scroll-down))
-    (t
-     (scroll-down))))
-
-(defun magit-mark-item (&optional unmark)
-  (interactive "P")
-  (if unmark
-      (magit-set-marked-commit nil)
-    (magit-section-action (item info "mark")
-      ((commit)
-       (magit-set-marked-commit (if (eq magit-marked-commit info)
-                                    nil
-                                  info))))))
-
-(defun magit-describe-item ()
-  (interactive)
-  (let ((section (magit-current-section)))
-    (message "Section: %s %s-%s %S %S %S"
-             (magit-section-type section)
-             (magit-section-beginning section)
-             (magit-section-end section)
-             (magit-section-title section)
-             (magit-section-info section)
-             (magit-section-context-type section))))
-
-(defun magit-copy-item-as-kill ()
-  "Copy sha1 of commit at point into kill ring."
-  (interactive)
-  (magit-section-action (item info "copy")
-    ((commit)
-     (kill-new info)
-     (message "%s" info))))
-
-(eval-when-compile (require 'server))
-
-(defun magit-server-running-p ()
-  "Test whether server is running (works with < 23 as well).
-
-Return values:
-  nil              the server is definitely not running.
-  t                the server seems to be running.
-  something else   we cannot determine whether it's running without using
-                   commands which may have to wait for a long time."
-  (require 'server)
-  (if (functionp 'server-running-p)
-      (server-running-p)
-    (condition-case nil
-        (if server-use-tcp
-            (with-temp-buffer
-              (insert-file-contents-literally (expand-file-name server-name server-auth-dir))
-              (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
-                       (assq 'comm
-                             (process-attributes
-                              (string-to-number (match-string 1))))
-                       t)
-                  :other))
-          (delete-process
-           (make-network-process
-            :name "server-client-test" :family 'local :server nil :noquery t
-            :service (expand-file-name server-name server-socket-dir)))
-          t)
-      (file-error nil))))
-
-(defun magit-interactive-rebase ()
-  "Start a git rebase -i session, old school-style."
-  (interactive)
-  (unless (magit-server-running-p)
-    (server-start))
-  (let* ((section (get-text-property (point) 'magit-section))
-         (commit (and (member 'commit (magit-section-context-type section))
-                      (magit-section-info section)))
-         (old-editor (getenv "GIT_EDITOR")))
-    (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
-                                 " -s " server-name))
-    (unwind-protect
-        (magit-run-git-async "rebase" "-i"
-                             (or (and commit (concat commit "^"))
-                                 (magit-read-rev "Interactively rebase to" (magit-guess-branch))))
-      (if old-editor
-          (setenv "GIT_EDITOR" old-editor)))))
-
-(define-derived-mode magit-branch-manager-mode magit-mode "Magit Branch"
-  "Magit Branches")
-
-(defun magit-quit-window (&optional kill-buffer)
-  "Bury the buffer and delete its window.  With a prefix argument, kill the
-buffer instead."
-  (interactive "P")
-  (quit-window kill-buffer (selected-window)))
-
-(defun magit--branch-name-at-point ()
-  "Get the branch name in the line at point."
-  (let ((branch (magit-section-info (magit-current-section))))
-    (or branch (error "No branch at point"))))
-
-(defun magit--branches-for-remote-repo (remote)
-  "Return a list of remote branch names for REMOTE.
-These are the branch names with the remote name stripped."
-  (remq nil
-        (mapcar (lambda (line)
-                  (save-match-data
-                    (if (and (not (string-match-p " -> " line))
-                             (string-match (concat "^ +" remote "/\\([^ $]+\\)")
-                                           line))
-                        (match-string 1 line))))
-                (magit-git-lines "branch" "-r"))))
-
-(defvar magit-branches-buffer-name "*magit-branches*")
-
-(defun magit--is-branch-at-point-remote ()
-  "Return non-nil if the branch at point is a remote tracking branch"
-  (magit-remote-part-of-branch (magit--branch-name-at-point)))
-
-(defun magit-remote-part-of-branch (branch)
-  (when (string-match-p "^\\(?:refs/\\)?remotes\\/" branch)
-    (loop for remote in (magit-git-lines "remote")
-          when (string-match-p (format "^\\(?:refs/\\)?remotes\\/%s\\/" (regexp-quote remote)) branch) return remote)))
-
-(defun magit-branch-no-remote (branch)
-  (let ((remote (magit-remote-part-of-branch branch)))
-    (if remote
-        (progn
-          ;; This has to match if remote is non-nil
-          (assert (string-match (format "^\\(?:refs/\\)?remotes\\/%s\\/\\(.*\\)" (regexp-quote remote)) branch)
-                  'show-args "Unexpected string-match failure: %s %s")
-          (match-string 1 branch))
-      branch)))
-
-(defun magit-wash-branch-line (&optional remote-name)
-  (looking-at (concat
-               "^\\([ *] \\)"                 ; 1: current branch marker
-               "\\(.+?\\) +"                  ; 2: branch name
-
-               "\\(?:"
-
-               "\\([0-9a-fA-F]+\\)"           ; 3: sha1
-               " "
-               "\\(?:\\["
-               "\\([^:\n]+?\\)"               ; 4: tracking (non-greedy + to avoid matching \n)
-               "\\(?:: \\)?"
-               "\\(?:ahead \\([0-9]+\\)\\)?"  ; 5: ahead
-               "\\(?:, \\)?"
-               "\\(?:behind \\([0-9]+\\)\\)?" ; 6: behind
-               "\\] \\)?"
-               "\\(?:.*\\)"                   ; message
-
-               "\\|"                          ; or
-
-               "-> "                          ; the pointer to
-               "\\(.+\\)"                     ; 7: a ref
-
-               "\\)\n"))
-
-  (let* ((current-string (match-string 1))
-         (branch         (match-string 2))
-         (sha1           (match-string 3))
-         (tracking       (match-string 4))
-         (ahead          (match-string 5))
-         (behind         (match-string 6))
-         (other-ref      (match-string 7))
-         (current (string-match-p "^\\*" current-string)))
-
-    ; the current line is deleted before being reconstructed
-    (delete-region (point)
-                   (line-beginning-position 2))
-
-    (magit-with-section branch 'branch
-      (magit-set-section-info branch)
-      (insert-before-markers
-       ; sha1
-       (propertize (or sha1
-                       (make-string magit-sha1-abbrev-length ? ))
-                   'face 'magit-log-sha1)
-       " "
-       ; current marker
-       (if current
-           "# "
-         "  ")
-       ; branch name
-       (apply 'propertize (magit-branch-no-remote branch)
-              (if current
-                  '(face magit-branch)))
-       ; other ref that this branch is pointing to
-       (if other-ref
-           (concat " -> " (substring other-ref (+ 1 (length remote-name))))
-         "")
-       ; tracking information
-       (if (and tracking
-                (equal (magit-remote-branch-for branch t)
-                       (concat "refs/remotes/" tracking)))
-           (concat " ["
-                   ; getting rid of the tracking branch name if it is the same as the branch name
-                   (let* ((tracking-remote (magit-get "branch" branch "remote"))
-                          (tracking-branch (substring tracking (+ 1 (length tracking-remote)))))
-                     (propertize (if (string= branch tracking-branch)
-                                     (concat "@ " tracking-remote)
-                                   (concat tracking-branch " @ " tracking-remote))
-                                 'face 'magit-log-head-label-remote))
-                   ; ahead/behind information
-                   (if (or ahead
-                           behind)
-                       ": "
-                     "")
-                   (if ahead
-                       (concat "ahead "
-                               (propertize ahead
-                                           'face (if current
-                                                     'magit-branch))
-                               (if behind
-                                   ", "
-                                 ""))
-                     "")
-                   (if behind
-                       (concat "behind "
-                               (propertize behind
-                                           'face 'magit-log-head-label-remote))
-                     "")
-                   "]")
-         "")
-       "\n"))))
-
-(defun magit-wash-remote-branches-group (group)
-  (let* ((remote-name (first group))
-         (url (magit-get "remote" remote-name "url"))
-         (push-url (magit-get "remote" remote-name "pushurl"))
-         (urls (concat url (if push-url
-                               (concat ", "push-url)
-                             "")))
-         (marker (second group)))
-
-    (magit-with-section (concat "remote:" remote-name) 'remote
-      (magit-set-section-info remote-name)
-      (insert-before-markers (propertize (format "%s (%s):" remote-name urls) 'face 'magit-section-title) "\n")
-      (magit-wash-branches-between-point-and-marker marker remote-name))
-    (insert-before-markers "\n")))
-
-(defun magit-wash-branches-between-point-and-marker (marker &optional remote-name)
-  (save-restriction
-    (narrow-to-region (point) marker)
-    (magit-wash-sequence
-     (if remote-name
-         (apply-partially 'magit-wash-branch-line remote-name)
-       #'magit-wash-branch-line))))
-
-(defun magit-wash-branches ()
-         ; get the names of the remotes
-  (let* ((remotes (magit-git-lines "remote"))
-         ; get the location of remotes in the buffer
-         (markers
-          (append (mapcar (lambda (remote)
-                            (save-excursion
-                              (when (search-forward-regexp
-                                     (concat "^  remotes\\/" remote) nil t)
-                                (beginning-of-line)
-                                (point-marker))))
-                          remotes)
-                  (list (save-excursion
-                          (goto-char (point-max))
-                          (point-marker)))))
-         ; list of remote elements to display in the buffer
-         (remote-groups (loop for remote in remotes
-                              for end-markers on (cdr markers)
-                              for marker = (loop for x in end-markers thereis x)
-                              collect (list remote marker))))
-
-    ; actual displaying of information
-    (magit-with-section "local" nil
-      (insert-before-markers (propertize "Local:" 'face 'magit-section-title) "\n")
-      (magit-set-section-info ".")
-      (magit-wash-branches-between-point-and-marker
-       (loop for x in markers thereis x)))
-
-    (insert-before-markers "\n")
-
-    (mapc 'magit-wash-remote-branches-group remote-groups)
-
-    ; make sure markers point to nil so that they can be garbage collected
-    (mapc (lambda (marker)
-            (when marker
-             (set-marker marker nil)))
-          markers)))
-
-(defun magit-refresh-branch-manager ()
-  (magit-create-buffer-sections
-    (magit-git-section "branches" nil 'magit-wash-branches
-                       "branch"
-                       "-vva"
-                       (format "--abbrev=%s" magit-sha1-abbrev-length))))
-
-(magit-define-command branch-manager ()
-  (interactive)
-  (let ((topdir (magit-get-top-dir default-directory)))
-    (magit-buffer-switch magit-branches-buffer-name)
-    (magit-mode-init topdir 'magit-branch-manager-mode #'magit-refresh-branch-manager)))
-
-(defun magit-change-what-branch-tracks ()
-  "Change which remote branch the current branch tracks."
-  (interactive)
-  (if (magit--is-branch-at-point-remote)
-      (error "Cannot modify a remote branch"))
-  (let* ((local-branch (magit--branch-name-at-point))
-         (new-tracked (magit-read-rev  "Change tracked branch to"
-                                       nil
-                                       (lambda (ref)
-                                         (not (string-match-p "refs/remotes/"
-                                                              ref)))))
-         new-remote new-branch)
-    (unless (string= (or new-tracked "") "")
-      (cond (;; Match refs that are unknown in the local repository if
-             ;; `magit-remote-ref-format' is set to
-             ;; `name-then-remote'. Can be useful if you want to
-             ;; create a new branch in a remote repository.
-             (string-match "^\\([^ ]+\\) +(\\(.+\\))$" ; 1: branch name; 2: remote name
-                           new-tracked)
-             (setq new-remote (match-string 2 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 1 new-tracked))))
-            ((string-match "^\\(?:refs/remotes/\\)?\\([^/]+\\)/\\(.+\\)" ; 1: remote name; 2: branch name
-                           new-tracked)
-             (setq new-remote (match-string 1 new-tracked)
-                   new-branch (concat "refs/heads/" (match-string 2 new-tracked))))
-            (t (error "Cannot parse the remote and branch name"))))
-    (magit-set new-remote "branch" local-branch "remote")
-    (magit-set new-branch "branch" local-branch "merge")
-    (magit-branch-manager)
-    (if (string= (magit-get-current-branch) local-branch)
-        (magit-refresh-buffer (magit-find-status-buffer default-directory)))))
-
-(defvar magit-ediff-file)
-
-(defun magit-interactive-resolve (file)
-  (require 'ediff)
-  (let ((merge-status (magit-git-string "ls-files" "-u" "--" file))
-        (base-buffer (generate-new-buffer (concat file ".base")))
-        (our-buffer (generate-new-buffer (concat file ".current")))
-        (their-buffer (generate-new-buffer (concat file ".merged")))
-        (windows (current-window-configuration)))
-    (if (null merge-status)
-        (error "Cannot resolve %s" file))
-    (with-current-buffer base-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:" file))))))
-    (with-current-buffer our-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    (with-current-buffer their-buffer
-      (if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status)
-          (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:" file)))))
-      (let ((buffer-file-name file))
-        (normal-mode)))
-    ;; We have now created the 3 buffer with ours, theirs and the ancestor files
-    (with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer)
-      (make-local-variable 'magit-ediff-file)
-      (setq magit-ediff-file file)
-      (make-local-variable 'magit-ediff-windows)
-      (setq magit-ediff-windows windows)
-      (make-local-variable 'ediff-quit-hook)
-      (add-hook 'ediff-quit-hook
-                (lambda ()
-                  (let ((buffer-A ediff-buffer-A)
-                        (buffer-B ediff-buffer-B)
-                        (buffer-C ediff-buffer-C)
-                        (buffer-Ancestor ediff-ancestor-buffer)
-                        (file magit-ediff-file)
-                        (file-buffer)
-                        (windows magit-ediff-windows))
-                    (ediff-cleanup-mess)
-                    (find-file file)
-                    (setq file-buffer (current-buffer))
-                    (erase-buffer)
-                    (insert-buffer-substring buffer-C)
-                    (kill-buffer buffer-A)
-                    (kill-buffer buffer-B)
-                    (kill-buffer buffer-C)
-                    (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor))
-                    (set-window-configuration windows)
-                    (magit-save-some-buffers
-                     "Conflict resolution finished; you may save the buffer"
-                     (lambda () (eq (current-buffer) file-buffer)))))))))
-
-(defun magit-interactive-resolve-item ()
-  (interactive)
-  (magit-section-action (item info "resolv")
-    ((diff)
-     (magit-interactive-resolve (cadr info)))))
-
-(defun magit-submodule-update (&optional init)
-  "Update the submodule of the current git repository
-
-With a prefix arg, do a submodule update --init"
-  (interactive "P")
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (apply #'magit-run-git-async "submodule" "update" (if init '("--init") ()))))
-
-(defun magit-submodule-update-init ()
-  "Update and init the submodule of the current git repository."
-  (interactive)
-  (magit-submodule-update t))
-
-(defun magit-submodule-init ()
-  "Initialize the submodules"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "init")))
-
-(defun magit-submodule-sync ()
-  "Synchronizes submodules' remote URL configuration"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (magit-run-git-async "submodule" "sync")))
-
-(defun magit-run-git-gui ()
-  "Run `git gui' for the current git repository"
-  (interactive)
-  (let* ((default-directory (magit-get-top-dir default-directory)))
-    (magit-start-process "Git Gui" nil magit-git-executable "gui")))
-
-(defun magit-run-gitk ()
-  "Run `gitk --all' for the current git repository"
-  (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory)))
-    (cond
-     ((eq system-type 'windows-nt)
-      ;; Gitk is a shell script, and Windows doesn't know how to
-      ;; "execute" it.  The Windows version of Git comes with an
-      ;; implementation of "sh" and everything else it needs, but
-      ;; Windows users might not have added the directory where it's
-      ;; installed to their path
-      (let ((git-bin-dir (file-name-directory magit-gitk-executable))
-            (exec-path exec-path)
-            (process-environment process-environment))
-        (when git-bin-dir
-          ;; Adding it onto the end so that anything the user
-          ;; specified will get tried first.  Emacs looks in
-          ;; exec-path; PATH is the environment variable inherited by
-          ;; the process.  I need to change both.
-          (setq exec-path (append exec-path (list git-bin-dir)))
-          (push (format "PATH=%s;%s"
-                        (getenv "PATH")
-                        (replace-regexp-in-string "/" "\\\\" git-bin-dir))
-                process-environment))
-        (magit-start-process "Gitk" nil "sh" magit-gitk-executable "--all")))
-     (t
-      (magit-start-process "Gitk" nil magit-gitk-executable "--all")))))
-
-(defun magit-load-config-extensions ()
-  "Try to load magit extensions that are defined at git config
-layer. This can be added to `magit-mode-hook' for example"
-  (dolist (ext (magit-get-all "magit.extension"))
-    (let ((sym (intern (format "magit-%s-mode" ext))))
-      (when (and (fboundp sym)
-                 (not (eq sym 'magit-wip-save-mode)))
-        (funcall sym 1)))))
-
-(provide 'magit)
-
-;; rest of magit core
-(require 'magit-key-mode)
-(require 'magit-bisect)
-
-;;; magit.el ends here
diff --git a/elpa/magit-1.2.0/magit.elc b/elpa/magit-1.2.0/magit.elc
deleted file mode 100644
index 3e4958feb67547e92febe434f0e1431192e7d39d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263764
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%0ApInn-xo0`$LUu^|
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
Gj{Se}m2+JH

diff --git a/elpa/magit-1.2.0/rebase-mode.el b/elpa/magit-1.2.0/rebase-mode.el
deleted file mode 100644
index 1ccfb540e..000000000
--- a/elpa/magit-1.2.0/rebase-mode.el
+++ /dev/null
@@ -1,322 +0,0 @@
-;;; rebase-mode -- edit git rebase files.
-
-;; Copyright (C) 2010  Phil Jackson
-;; Copyright (C) 2011  Peter J Weisberg
-;;
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Allows the editing of a git rebase file (which you might get when
-;; using 'git rebase -i' or hitting 'E' in Magit). Assumes editing is
-;; happening in a server.
-
-;;; Code:
-
-(require 'server)
-
-(defgroup rebase-mode nil
-  "Customize Rebase Mode"
-  :group 'faces)
-
-(defface rebase-mode-killed-action-face
-  '((((class color))
-     :inherit font-lock-comment-face
-     :strike-through t))
-  "Action lines in the rebase TODO list that have been commented out."
-  :group 'rebase-mode)
-
-(defface rebase-mode-description-face
-  '((t :inherit font-lock-comment-face))
-  "Face for one-line commit descriptions"
-  :group 'rebase-mode)
-
-(defconst rebase-mode-action-line-re
-  (rx
-   line-start
-   (? "#")
-   (group
-    (|
-     (any "presf")
-     "pick"
-     "reword"
-     "edit"
-     "squash"
-     "fixup"))
-   (char space)
-   (group
-    (** 4 40 hex-digit)) ;sha1
-   (char space)
-   (group
-    (* not-newline)))
-  "Regexp that matches an action line in a rebase buffer.")
-
-(defconst rebase-mode-exec-line-re
-  (rx
-   line-start
-   (? "#")
-   (group
-    (| "x"
-       "exec"))
-   (char space)
-   (group
-    (* not-newline)))
-  "Regexp that matches an exec line in a rebase buffer.")
-
-(defconst rebase-mode-dead-line-re
-  (rx-to-string `(and line-start
-                      (char ?#)
-                      (or (regexp ,(substring rebase-mode-action-line-re 1))
-                          (regexp ,(substring rebase-mode-exec-line-re 1)))) t)
-  "Regexp that matches a commented-out exec or action line in a rebase buffer.")
-
-(defvar rebase-mode-font-lock-keywords
-  (list
-   (list rebase-mode-action-line-re
-         '(1 font-lock-keyword-face)
-         '(2 font-lock-builtin-face)
-         '(3 'rebase-mode-description-face))
-   (list rebase-mode-exec-line-re
-         '(1 font-lock-keyword-face))
-   (list (rx line-start (char "#") (* not-newline)) 0 font-lock-comment-face)
-   (list rebase-mode-dead-line-re 0 ''rebase-mode-killed-action-face t))
-  "Font lock keywords for `rebase-mode'.")
-
-(defvar key-to-action-map
-  '(("c" . "pick")
-    ("r" . "reword")
-    ("e" . "edit")
-    ("s" . "squash")
-    ("f" . "fixup"))
-  "Mapping from key to action.")
-
-(defvar rebase-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "q") 'server-edit)
-    (define-key map (kbd "C-c C-c") 'server-edit)
-
-    (define-key map (kbd "a") 'rebase-mode-abort)
-    (define-key map (kbd "C-c C-k") 'rebase-mode-abort)
-
-    (define-key map (kbd "M-p") 'rebase-mode-move-line-up)
-    (define-key map (kbd "M-n") 'rebase-mode-move-line-down)
-    (define-key map (kbd "k") 'rebase-mode-kill-line)
-    (define-key map (kbd "x") 'rebase-mode-exec)
-
-    (define-key map (kbd "n") 'forward-line)
-    (define-key map (kbd "p") '(lambda(n)
-                                 (interactive "p")
-                                 (forward-line (* n -1))))
-    (define-key map [remap undo] 'rebase-mode-undo)
-    map)
-  "Keymap for rebase-mode.  Note this will be added to by the
-top-level code which defines the edit functions.")
-
-(require 'easymenu)
-(easy-menu-define rebase-mode-menu rebase-mode-map
-  "Rebase-mode menu"
-  '("Rebase"
-    ["Pick" rebase-mode-pick t]
-    ["Reword" rebase-mode-reword t]
-    ["Edit" rebase-mode-edit t]
-    ["Squash" rebase-mode-squash t]
-    ["Fixup" rebase-mode-fixup t]
-    ["Kill" rebase-mode-kill-line t]
-    ["Move Down" rebase-mode-move-line-down t]
-    ["Move Up" rebase-mode-move-line-up t]
-    ["Execute" rebase-mode-exec t]
-    "---"
-    ["Abort" rebase-mode-abort t]
-    ["Done" server-edit t]))
-
-;; create the functions which edit the action lines themselves (based
-;; on `key-to-action-map' above)
-(mapc (lambda (key-action)
-        (let ((fun-name (intern (concat "rebase-mode-" (cdr key-action)))))
-          ;; define the function
-          (eval `(defun ,fun-name ()
-                   (interactive)
-                   (rebase-mode-edit-line ,(cdr key-action))))
-
-          ;; bind the function in `rebase-mode-map'
-          (define-key rebase-mode-map (car key-action) fun-name)))
-      key-to-action-map)
-
-(defun rebase-mode-edit-line (change-to)
-  "Change the keyword at the start of the current action line to
-that of CHANGE-TO."
-  (when (rebase-mode-looking-at-action)
-    (let ((buffer-read-only nil)
-          (start (point)))
-      (goto-char (point-at-bol))
-      (delete-region (point) (progn (forward-word 1) (point)))
-      (insert change-to)
-      (goto-char start))))
-
-(defun rebase-mode-looking-at-action ()
-  "Return non-nil if looking at an action line."
-  (save-excursion
-    (goto-char (point-at-bol))
-    (looking-at rebase-mode-action-line-re)))
-
-(defun rebase-mode-looking-at-action-or-exec ()
-  "Return non-nil if looking at an action line or exec line."
-  (save-excursion
-    (goto-char (point-at-bol))
-    (or (looking-at rebase-mode-action-line-re)
-        (looking-at rebase-mode-exec-line-re))))
-
-(defun rebase-mode-looking-at-exec ()
-  "Return non-nil if cursor is on an exec line."
-  (string-match rebase-mode-exec-line-re (thing-at-point 'line)))
-
-(defun rebase-mode-looking-at-killed-exec ()
-  "Return non-nil if looking at an exec line that has been commented out"
-  (let ((line (thing-at-point 'line)))
-    (and (eq (aref line 0) ?#)
-         (string-match rebase-mode-exec-line-re line))))
-
-(defun rebase-mode-move-line-up ()
-  "Move the current action line up."
-  (interactive)
-  (when (rebase-mode-looking-at-action-or-exec)
-    (let ((buffer-read-only nil)
-          (col (current-column)))
-      (transpose-lines 1)
-      (forward-line -2)
-      (move-to-column col))))
-
-(defun rebase-mode-move-line-down ()
-  "Assuming the next line is also an action line, move the current line down."
-  (interactive)
-  ;; if we're on an action and the next line is also an action
-  (when (and (rebase-mode-looking-at-action-or-exec)
-             (save-excursion
-               (forward-line)
-               (rebase-mode-looking-at-action-or-exec)))
-    (let ((buffer-read-only nil)
-          (col (current-column)))
-      (forward-line 1)
-      (transpose-lines 1)
-      (forward-line -1)
-      (move-to-column col))))
-
-(defun rebase-mode-abort ()
-  "Abort this rebase (by emptying the buffer, saving and closing
-server connection)."
-  (interactive)
-  (when (or (not (buffer-modified-p))
-            (y-or-n-p "Abort this rebase? "))
-    (let ((buffer-read-only nil))
-      (delete-region (point-min) (point-max))
-      (save-buffer)
-      (server-edit))))
-
-(defun rebase-mode-kill-line ()
-  "Kill the current action line."
-  (interactive)
-  (when (and (not (eq (char-after (point-at-bol)) ?#))
-             (rebase-mode-looking-at-action-or-exec))
-    (beginning-of-line)
-    (let ((buffer-read-only nil))
-      (insert "#"))
-    (forward-line)))
-
-(defun rebase-mode-exec (edit)
-  "Prompt the user for a shell command to be executed, and add it to
-the todo list.
-
-If the cursor is on a commented-out exec line, uncomment the
-current line instead of prompting.
-
-When the prefix argument EDIT is non-nil and the cursor is on an
-exec line, edit that line instead of inserting a new one.  If the
-exec line was commented out, also uncomment it."
-  (interactive "P")
-  (cond
-   ((and edit (rebase-mode-looking-at-exec))
-    (let ((new-line (rebase-mode-read-exec-line
-                     (match-string-no-properties 2 (thing-at-point 'line))))
-          (inhibit-read-only t))
-      (delete-region (point-at-bol) (point-at-eol))
-      (if (not (equal "" new-line))
-          (insert "exec " new-line)
-        (delete-char -1)
-        (forward-line))
-      (move-beginning-of-line nil)))
-   ((rebase-mode-looking-at-killed-exec)
-    (save-excursion
-      (beginning-of-line)
-      (let ((buffer-read-only nil))
-        (delete-char 1))))
-   (t
-    (let ((inhibit-read-only t)
-          (line (rebase-mode-read-exec-line)))
-      (unless (equal "" line)
-        (move-end-of-line nil)
-        (newline)
-        (insert (concat "exec " line))))
-    (move-beginning-of-line nil))))
-
-(defun rebase-mode-read-exec-line (&optional initial-line)
-  (read-shell-command "Execute: " initial-line))
-
-(defun rebase-mode-undo (&optional arg)
-  "A thin wrapper around `undo', which allows undoing in
-read-only buffers."
-  (interactive "P")
-  (let ((inhibit-read-only t))
-    (undo arg)))
-
-;;;###autoload
-(define-derived-mode rebase-mode special-mode "Rebase"
-  "Major mode for editing of a Git rebase file.
-
-Rebase files are generated when you run 'git rebase -i' or run
-`magit-interactive-rebase'.  They describe how Git should perform
-the rebase.  See the documentation for git-rebase (e.g., by
-running 'man git-rebase' at the command line) for details."
-  (setq font-lock-defaults '(rebase-mode-font-lock-keywords t t)))
-
-(defun rebase-mode-show-keybindings ()
-  "Modify the \"Commands:\" section of the comment Git generates
-at the bottom of the file so that in place of the one-letter
-abbreviation for the command, it shows the command's keybinding.
-By default, this is the same except for the \"pick\" command."
-  (save-excursion
-    (goto-char (point-min))
-    (while (search-forward-regexp "^#  \\(.\\), \\([[:alpha:]]+\\) = " nil t)
-      (let ((start (match-beginning 1))
-            (end (match-end 1))
-            (command (intern (concat "rebase-mode-" (match-string 2)))))
-        (when (fboundp command)
-          (let ((overlay (make-overlay start end)))
-            (overlay-put overlay
-                         'display
-                         (key-description (where-is-internal command nil t)))))))))
-
-(add-hook 'rebase-mode-hook 'rebase-mode-show-keybindings t)
-
-(defun rebase-mode-disable-before-save-hook ()
-  (set (make-local-variable 'before-save-hook) nil))
-
-(add-hook 'rebase-mode-hook 'rebase-mode-disable-before-save-hook)
-
-;;;###autoload
-(add-to-list 'auto-mode-alist
-             '("git-rebase-todo" . rebase-mode))
-
-(provide 'rebase-mode)
-
-;;; rebase-mode.el ends here
diff --git a/elpa/magit-1.2.0/rebase-mode.elc b/elpa/magit-1.2.0/rebase-mode.elc
deleted file mode 100644
index f138153187e095e9aaaa385ba6446efb8305f704..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11078
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

diff --git a/elpa/paredit-22/paredit-autoloads.el b/elpa/paredit-22/paredit-autoloads.el
index 2049d2270..a27ccb27a 100644
--- a/elpa/paredit-22/paredit-autoloads.el
+++ b/elpa/paredit-22/paredit-autoloads.el
@@ -3,8 +3,7 @@
 ;;; Code:
 
 
-;;;### (autoloads (paredit-mode) "paredit" "paredit.el" (21031 23282
-;;;;;;  0 0))
+;;;### (autoloads (paredit-mode) "paredit" "paredit.el" (20166 22150))
 ;;; Generated autoloads from paredit.el
 
 (autoload 'paredit-mode "paredit" "\
@@ -20,8 +19,7 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
 
 ;;;***
 
-;;;### (autoloads nil nil ("paredit-pkg.el") (21031 23282 262946
-;;;;;;  0))
+;;;### (autoloads nil nil ("paredit-pkg.el") (20166 22150 922167))
 
 ;;;***
 
diff --git a/elpa/paredit-22/paredit-pkg.elc b/elpa/paredit-22/paredit-pkg.elc
index da197695bd3a539128eed1cb96222c3c0146e86d..249a9588318e72560e8fd4c1026d0083dd0359a6 100644
GIT binary patch
delta 61
zcmcb^@|I<Sq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm5I56k%6J%
RMAKLn13gQ_jgwC@0sw##6CnTq

delta 44
zcmaFMa))Jtq>Ms-o<ewPib8N|fr5gGf}xR>frXW!g@TcRq47lLSVrTGOHMKZ03@Rf
A!T<mO

diff --git a/elpa/paredit-22/paredit.elc b/elpa/paredit-22/paredit.elc
index 12b272c364f430dea7148b3905a54a6e7a4c2781..721bcb87de5e6ac5a9783ea146f4ecc7a607b420 100644
GIT binary patch
delta 2048
zcmaJ>Yitx%6lV6$Zo9=UEs+)k%XC+pUFzuEJMSV*i%^VU0fB_amUi16U}L+x-A;>D
zOig@&30iW+O0bF;5PqPN8&X6d#Q=dHXoyJ@6{I#KVxqPQ7)Sv1%xtL*f<I>W%(>_F
zedoKgb1(nvKE8X}tavP$u$rsvOlo~Rl@U@&p(c|MYEvBoHUvqpP>l*j7l?%MHgy#*
zJ#ONI@2uy#8ar)EY)Zu~AsCe<oIAGw{s=sBX_R0I3?=JR!PLMf=|N#lQ+p<3C2g@e
z6^o0_i8fnE$1+wtVT&DBrY!-@!_Bdl#&}E!hwz+GMci7~luEYQqTP}fJ7SrL5YD>5
z_n*`d4n-mYA!7%PmK_t*<4ThMD><&>Xkv&s1?@V4(4W^%VRJoU&S#i7QWv3B`6XQr
zC^@=rf`b)IlJ8h*G&qW1gE!rYQOe=Kr9_8+3=b)tn#pa=#$g%$Ar>o5qYhxqb?ES}
zmygxMqa3=#*j5W2CVqMV&5{M6B-Y++i;b!FWIR0vzs-6fEn1mODkIvRX-jCcY;iP{
z-n^V*CwR<pste8U8{&BACeh)X*AdYrwlTMtM~W)3;(Uoix@yp80^MDvL?S{m(OehF
z3*T1(*aaPO*pT4?z>*?3TusRm1XPtemgYK3921~soeoVH3XGD7$(XQ!v}hxcSu<J}
zJ7UY$HNfT2D3N*p)~$A&?p_?{U3Foo`v{VLvwhmk=dI4WNgYR?Ko?GWiW6vTYZ2`#
z^p%B!^X4xKf;59q#;s<{wkm_d9kXdeEK?bb)Cme*UC;!Cs;s}@mj??rOo%3{V86I<
zHcX;4(8G_ee4-=(wp>3U5U483cX$X)f?pEIFAYo#IpPQes-2u7Cr+uMbIQmRR}G@r
z)GWqR&V>>|8ELwyY;AGKQTyE|qR754tM%MFjVY0~`y4?<gZ);1(tGbrdJIR9ZpgIM
zo=$mkyJ&oKJJDjbxpT1sd08%!HHod8ebR$e1v9boZI0K7s?*kGC+I6xYmlazbldV)
zy12R?nTpB|R{IdI6RgmSOMB_c`PYyst8R3`f+&*ZZ1muQ2BZ;<9;~jQgA07@)u&H+
zkYVantn8&%7G6af&L(~I>}oHOBy6}%QnmH)2G`b2Ox1eX<i%%TGF@XAmv(bJCZ^6>
zmpu$uK*Er5-ftR4L<lYk*3mSY&fZwDDF-Ps>Dd+FifQkb9Qtk2%ffXp`goJ*5%+R^
z)zrz|n>JQ$9rh#5Fxai6?eXXueQaO`9q!F#@3n6BAf1@3)cz28;S!l9JGt>w7)X)~
zmg?+4&{d`VLo?`(O*2{O<s*4W*9|uK=5CHxu`Ig-vED5=e7q)UK*PXvxA4*KM|?=r
zWY<xD+D`|!7t(Xx0an(tkcXL74Ne5MeP=iq84{@VlMC==AW*?sZTC(u>)+$!k*sL0
zW7WO~*vS3^Fb#~g>%d_yM>jR#CqwZ-G2QXSWVZS95B$6i472c;-vNz^!Tvf@!0`sb
z2Ah0zD~A+Qp}UWL2HSG=!;;6Z`jBd17C+U<A;XZ^+0$#CRmeIkKU2;j)x>Po*&5!>
z0ATFcxoe1rkEY2Eows>jkz|F51D!nR$7K6|ut8xmQCaDQ_mQ(lcJva5KrIUEANtV?
zpe4x#Gu-Q^4OjAL!w66Jjuf(?D?jlCs;u1k<b|qa(B{Xt1UB+}mj_{jsbJ5bz#{7z
zS?-0o4ED#LmpEQ_;GVy}2f7(1>%2J?a6`9uZ!Lo5I19XdyPX3LWfuLr9?r0N=s33m
zrj&H0uh_#a_8<kTJqez>&g&506Zdk*;SQ)~Uzv}4j`J$25^)6hP+w0DHw<J-irn*-
npZl6O0BGNmJPrd*MCyBOB6kBgBt~CXK34)gWwj5a`V#*S8KZnG

delta 1496
zcmb7EYiv|S6n1uIAAK#mEsxe#xGV{D(W^6a=RO9I0OcX3f)Q9jwk@Sy%!bmIWg(PA
zF){uCqf#eY5~)%X#0Vk430WjUsWJGDsU)Bx8VQ6bi9j>~6F}!KKGL85xcAPSIp^H(
zeBXEP&+n2q-XS|`>Wr>V<H=0Bu_V)N7{XwD8ug|z&)}3<y$vgnb!hj~NIe&*A)F^m
z)o`E&<<;=kF;If*QOJ=z*_2d=Qnd+-S`*WpTIn_Sr1e@ad4<0c>4aXp31g)?Po|bP
z86sI)-=0~ssWqo&hHGZlukOib%(kxfjFHgkOkaFrbuO|#%^AJhi8+3sw!Z_m-uMAm
z?_D)s)WG!MTPR>9i?FVRE+E3BCDob83z%9GnoIf#=1jt!3W~7JUByQ2sB~PGG&-{#
zP5+^}_Ifoj*JgSY9T@!(wZcAn=401SZuqlB{~65>34PiA$i>;di#0@>44(YAouRra
z>l7QPTJS$xb+_g+?b*D!IkT>{ZG+iu)F<Z7YfL27)z}y{CtiyT6(?21f0<epZ^L?6
zI2FG<I^KRyx^tE$g~g|9R3e>L$0sj0@AZMN^pD0?q%FpxQGMspiiy#(Nkv9GXZtmk
ze#tyFcM7jC&GxR2?1sFVZ_Re77pF7>s(&m{H6m=9##&>ude}77Ofv$#Q|ARn*1?qr
zZUsk%)GeOG!sTjUuvRr#w@3LM^VxNo4Q5AnT{aIXu_U4;6R>~AM*%IFt$G{#RczLE
zVoQsu!qOo%I4h_=pPj;%WvR2v)~na%v|xuxwQb=vU=3dch~s%4p!vNBJ5&}+7A**=
z^dl*(4P7jmyl@q^D1~hcgBaT`gWkp+2y^dl_N7Hn1)0>oF6JIt+@g2Vl~D6|7-Mcz
zh35CGlS_UhRO-^g()$p$Tw5m(W5?mJFV!C=j5_+8STR;*8_S`yc}s{ml==1?tG;a+
z1LHDnXe2Z6%9^7k*s=vY+MN$z!5tXN?F(Q_+CEvZedF^u$ff7lP}#E=5$d=Cj&Iq7
zF{4aHFV?Bc&rE>z&mJqqLI`+p+uJB8Tq%nv;L7%!A!56lv7y`~wY4&=(mSgm`D!qP
zEiQrWe3=kWa;}eS;fGyjM2o~Ay61c3drR#etb>xhWkeHLln(g5_c5j#!LJ97qKI&K
z(n#bIYWPq+oH@9wgg8Dkn~t4ESTF&NAH)!GJx{=@<1gus4prAq9Kg0MVPG&C#$32?
z_|$6sWeNwzebTI_lhlHqPw&^F*e>k-Y(DX`i|ER}`W+MQSvKI)d7_!8>SV4?9T*6~
zuCvRDwt@{e&gGFdjAYPtekaD3<3j0ANQ);aL@%BT63=rSpVq!u7)2oV%N_lD(0+(t
z-5(&-^B4?W-yFo;5isM%kBD%8oC$yI!C2Tfe0-}~E3R8zxZQ||@P*)iZbX<;dE`CR
zqR%|LP#!?bGzM4DLI$J70ZcvCR|ujT#L)$PhePOuW{KN{d>B2Ue^;C))xlJ4;Zg)$
z)nvI;_I*=|J|tQ~R(P`vG0mIj6uvG;H#MnJ6uyk2@tP>#RoZ8LMjS;8RWXzze*vR(
B%!U8}

diff --git a/elpa/pkg-info-0.4/pkg-info-pkg.el b/elpa/pkg-info-0.4/pkg-info-pkg.el
deleted file mode 100644
index c65be9232..000000000
--- a/elpa/pkg-info-0.4/pkg-info-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "pkg-info" "0.4" "Information about packages       -*- lexical-binding: t; -*-" (quote ((dash "1.6.0") (epl "0.4"))))
diff --git a/elpa/pkg-info-0.4/pkg-info-autoloads.el b/elpa/pkg-info-20131101.408/pkg-info-autoloads.el
similarity index 95%
rename from elpa/pkg-info-0.4/pkg-info-autoloads.el
rename to elpa/pkg-info-20131101.408/pkg-info-autoloads.el
index 74ec98576..1f55e6d34 100644
--- a/elpa/pkg-info-0.4/pkg-info-autoloads.el
+++ b/elpa/pkg-info-20131101.408/pkg-info-autoloads.el
@@ -5,7 +5,7 @@
 
 ;;;### (autoloads (pkg-info-version-info pkg-info-package-version
 ;;;;;;  pkg-info-defining-library-version pkg-info-library-version)
-;;;;;;  "pkg-info" "pkg-info.el" (21124 57415))
+;;;;;;  "pkg-info" "pkg-info.el" (21184 20186))
 ;;; Generated autoloads from pkg-info.el
 
 (autoload 'pkg-info-library-version "pkg-info" "\
@@ -73,7 +73,7 @@ version.
 
 ;;;***
 
-;;;### (autoloads nil nil ("pkg-info-pkg.el") (21124 57415 852515))
+;;;### (autoloads nil nil ("pkg-info-pkg.el") (21184 20186 468049))
 
 ;;;***
 
diff --git a/elpa/pkg-info-20131101.408/pkg-info-pkg.el b/elpa/pkg-info-20131101.408/pkg-info-pkg.el
new file mode 100644
index 000000000..ebafed5d6
--- /dev/null
+++ b/elpa/pkg-info-20131101.408/pkg-info-pkg.el
@@ -0,0 +1 @@
+(define-package "pkg-info" "20131101.408" "Information about packages" (quote ((dash "1.6.0") (epl "0.4"))))
diff --git a/elpa/pkg-info-0.4/pkg-info-pkg.elc b/elpa/pkg-info-20131101.408/pkg-info-pkg.elc
similarity index 60%
rename from elpa/pkg-info-0.4/pkg-info-pkg.elc
rename to elpa/pkg-info-20131101.408/pkg-info-pkg.elc
index 9c5b83e051f1641b2913320cbfac2da1b9421d58..137cea05e4676976a6cc858c96ea1e17510db95d 100644
GIT binary patch
delta 66
zcmeBV{mC*xTPV0RPr)TMS;5Fs!O+mk*x1T=qOBE=k%6JHp`n4Ho{53Q#;P@pC<2o;
LnPewtFew56N`??@

delta 83
zcmey#(#bkOTPP%>RKYL5Ou^7Z!NAhW*uu(SqOBFPfu706<~58Uda^Z>tdar*=xXUI
f<fK+)CMV|TCS~TOWagz?DU?_%0L3RqFew56wHX#g

diff --git a/elpa/pkg-info-0.4/pkg-info.el b/elpa/pkg-info-20131101.408/pkg-info.el
similarity index 99%
rename from elpa/pkg-info-0.4/pkg-info.el
rename to elpa/pkg-info-20131101.408/pkg-info.el
index fd3189f0f..d54c839a9 100644
--- a/elpa/pkg-info-0.4/pkg-info.el
+++ b/elpa/pkg-info-20131101.408/pkg-info.el
@@ -5,7 +5,8 @@
 ;; Author: Sebastian Wiesner <lunaryorn@gmail.com>
 ;; URL: https://github.com/lunaryorn/pkg-info.el
 ;; Keywords: convenience
-;; Version: 0.4
+;; Version: 20131101.408
+;; X-Original-Version: 0.5-cvs
 ;; Package-Requires: ((dash "1.6.0") (epl "0.4"))
 
 ;; This file is not part of GNU Emacs.
diff --git a/elpa/pkg-info-20131101.408/pkg-info.elc b/elpa/pkg-info-20131101.408/pkg-info.elc
new file mode 100644
index 0000000000000000000000000000000000000000..bdfe20463b5fcff08f52a307589fc36df510d2c5
GIT binary patch
literal 5549
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

literal 0
HcmV?d00001

diff --git a/elpa/popup-0.5/popup-autoloads.el b/elpa/popup-0.5/popup-autoloads.el
index 9859825f1..ea87ae39e 100644
--- a/elpa/popup-0.5/popup-autoloads.el
+++ b/elpa/popup-0.5/popup-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads nil nil ("popup-pkg.el" "popup.el") (21031 23303
-;;;;;;  628729 0))
+;;;### (autoloads nil nil ("popup-pkg.el" "popup.el") (20887 42932
+;;;;;;  288158))
 
 ;;;***
 
diff --git a/elpa/popup-0.5/popup-pkg.elc b/elpa/popup-0.5/popup-pkg.elc
index 2e2e75220d3d9448d1bbe003e9f29501c180fd47..7888ce4ee90328a38367bc0a219706ce6d081e83 100644
GIT binary patch
delta 53
zcmdnaa+GC)q-siHUS?{JLwRCaT25-QLVlh?aAJvqZ(^l_p@o8>k(Gg^m66FrgLp>6
JjT4qL0s!Nb5dHuF

delta 39
vcmX@gvYlmuq_{$Uo<ewPib8N|fr5gGf}xR>frXW^<wU!9M&ph1mNNnX<I@Xb

diff --git a/elpa/popup-0.5/popup.elc b/elpa/popup-0.5/popup.elc
index 58c4385fa712b23d040d31e56265bd6ab3fdf30a..05c226153099b821380d1a883aad0fac678b46c2 100644
GIT binary patch
delta 15304
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
F@IP65YT^I@

delta 5870
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
CMY4JT

diff --git a/elpa/projectile-0.9.2/projectile-autoloads.el b/elpa/projectile-0.9.2/projectile-autoloads.el
new file mode 100644
index 000000000..94f5d3286
--- /dev/null
+++ b/elpa/projectile-0.9.2/projectile-autoloads.el
@@ -0,0 +1,52 @@
+;;; projectile-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (projectile-global-mode projectile-mode) "projectile"
+;;;;;;  "projectile.el" (21077 32442 0 0))
+;;; Generated autoloads from projectile.el
+
+(autoload 'projectile-mode "projectile" "\
+Minor mode to assist project management and navigation.
+
+\\{projectile-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar projectile-global-mode nil "\
+Non-nil if Projectile-Global mode is enabled.
+See the command `projectile-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `projectile-global-mode'.")
+
+(custom-autoload 'projectile-global-mode "projectile" nil)
+
+(autoload 'projectile-global-mode "projectile" "\
+Toggle Projectile mode in all buffers.
+With prefix ARG, enable Projectile-Global mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Projectile mode is enabled in all buffers where
+`projectile-on' would do it.
+See `projectile-mode' for more information on Projectile mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("projectile-pkg.el") (21077 32442 851509
+;;;;;;  0))
+
+;;;***
+
+(provide 'projectile-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; projectile-autoloads.el ends here
diff --git a/elpa/projectile-0.9.2/projectile-pkg.el b/elpa/projectile-0.9.2/projectile-pkg.el
new file mode 100644
index 000000000..9d4df7e3b
--- /dev/null
+++ b/elpa/projectile-0.9.2/projectile-pkg.el
@@ -0,0 +1 @@
+(define-package "projectile" "0.9.2" "Manage and navigate projects in Emacs easily" (quote ((s "1.0.0") (dash "1.0.0"))))
diff --git a/elpa/projectile-0.9.2/projectile.el b/elpa/projectile-0.9.2/projectile.el
new file mode 100644
index 000000000..98da5149b
--- /dev/null
+++ b/elpa/projectile-0.9.2/projectile.el
@@ -0,0 +1,1015 @@
+;;; projectile.el --- Manage and navigate projects in Emacs easily
+
+;; Copyright © 2011-2013 Bozhidar Batsov
+
+;; Author: Bozhidar Batsov
+;; URL: https://github.com/bbatsov/projectile
+;; Keywords: project, convenience
+;; Version: 0.9.2
+;; Package-Requires: ((s "1.0.0") (dash "1.0.0"))
+
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library provides easy project management and navigation.  The
+;; concept of a project is pretty basic - just a folder containing
+;; special file.  Currently git, mercurial and bazaar repos are
+;; considered projects by default.  If you want to mark a folder
+;; manually as a project just create an empty .projectile file in
+;; it.  See the README for more details.
+;;
+;;; Code:
+
+;; requires
+(require 'cl)
+(require 'easymenu)
+(require 'thingatpt)
+(require 's)
+(require 'dash)
+(require 'grep)
+
+(defgroup projectile nil
+  "Manage and navigate projects easily."
+  :group 'tools
+  :group 'convenience)
+
+(defconst projectile-current-version "0.9.1"
+  "The current Projectile version.")
+
+(defcustom projectile-use-native-indexing (eq system-type 'windows-nt)
+  "Use native Emacs Lisp project indexing."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-enable-caching projectile-use-native-indexing
+  "Enable project files caching."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-require-project-root t
+  "Require the presence of a project root to operate when true.
+Otherwise consider the current directory the project root."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-completion-system 'ido
+  "The completion system to be used by Projectile."
+  :group 'projectile
+  :type 'symbol
+  :options '(ido grizzl default))
+
+(defcustom projectile-ack-function 'ack-and-a-half
+  "The ack function to use."
+  :group 'projectile
+  :type 'symbol
+  :options '(ack-and-a-half default))
+
+(defcustom projectile-keymap-prefix (kbd "C-c p")
+  "Projectile keymap prefix."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-cache-file
+  (expand-file-name "projectile.cache" user-emacs-directory)
+  "The name of Projectile's cache file."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-tags-command "ctags -Re %s %s"
+  "The command Projectile's going to use to generate a TAGS file."
+  :group 'projectile
+  :type 'string)
+
+;; variables
+(defvar projectile-project-root-files
+  '(".projectile" "project.clj" ".git" ".hg" ".fslckout" ".bzr" "_darcs"
+    "rebar.config" "pom.xml" "build.sbt" "Gemfile" "Makefile")
+  "A list of files considered to mark the root of a project.")
+
+(defvar projectile-globally-ignored-files
+  '("TAGS")
+  "A list of files globally ignored by projectile.")
+
+(defvar projectile-globally-ignored-directories
+  '(".idea" ".eunit" ".git" ".hg" ".fslckout" ".bzr" "_darcs")
+  "A list of directories globally ignored by projectile.")
+
+(defvar projectile-find-file-hook nil
+  "Hooks run when a file is opened with `projectile-find-file'.")
+
+(defvar projectile-find-dir-hook nil
+  "Hooks run when a directory is opened with `projectile-find-dir'.")
+
+(defun projectile-serialize (data filename)
+  "Serialize DATA to FILENAME.
+
+The saved data can be restored with `projectile-unserialize'."
+  (when (file-writable-p filename)
+    (with-temp-file filename
+      (insert (prin1-to-string data)))))
+
+(defun projectile-unserialize (filename)
+  "Read data serialized by `projectile-serialize' from FILENAME."
+  (when (file-exists-p filename)
+    (with-temp-buffer
+      (insert-file-contents filename)
+      (read (buffer-string)))))
+
+(defvar projectile-projects-cache
+  (or (projectile-unserialize projectile-cache-file)
+      (make-hash-table :test 'equal))
+  "A hashmap used to cache project file names to speed up related operations.")
+
+(defvar projectile-known-projects nil
+  "List of locations where we have previously seen projects.
+The list of projects is ordered by the time they have been accessed.")
+
+(defcustom projectile-known-projects-file
+  (expand-file-name "projectile-bookmarks.eld"
+                    user-emacs-directory)
+  "Name and location of the Projectile's known projects file."
+  :group 'projectile
+  :type 'string)
+
+(defun projectile-version ()
+  "Reports the version of Projectile in use."
+  (interactive)
+  (message "Projectile (version %s) 2011-2013 Bozhidar Batsov <bozhidar@batsov.com>"
+           projectile-current-version))
+
+(defun projectile-invalidate-cache (arg)
+  "Remove the current project's files from `projectile-projects-cache'.
+
+With a prefix argument ARG prompts for the name of the project whose cache
+to invalidate."
+  (interactive "P")
+  (let ((project-root
+         (if arg
+             (completing-read "Remove cache for: "
+                              (projectile-hash-keys projectile-projects-cache))
+             (projectile-project-root))))
+    (remhash project-root projectile-projects-cache)
+    (projectile-serialize-cache)
+    (message "Invalidated Projectile cache for %s."
+             (propertize project-root 'face 'font-lock-keyword-face))))
+
+(defun projectile-cache-project (project files)
+  "Cache PROJECTs FILES.
+The cache is created both in memory and on the hard drive."
+  (when projectile-enable-caching
+    (puthash project files projectile-projects-cache)
+    (projectile-serialize-cache)))
+
+(defun projectile-project-root ()
+  "Retrieves the root directory of a project if available.
+The current directory is assumed to be the project's root otherwise."
+  (let ((project-root
+         (or (->> projectile-project-root-files
+               (--map (locate-dominating-file default-directory it))
+               (-remove #'null)
+               (car)
+               (projectile-expand-file-name))
+             (if projectile-require-project-root
+                 (error "You're not into a project")
+               default-directory))))
+    project-root))
+
+(defun projectile-expand-file-name (file-name)
+  "A thin wrapper around `expand-file-name' that handles nil.
+Expand FILE-NAME using `default-directory'."
+  (when file-name
+    (expand-file-name file-name)))
+
+(defun projectile-project-p ()
+  "Check if we're in a project."
+  (condition-case nil
+      (projectile-project-root)
+    (error nil)))
+
+(defun projectile-project-name ()
+  "Return project name."
+  (let ((project-root
+         (condition-case nil
+             (projectile-project-root)
+           (error default-directory))))
+   (file-name-nondirectory (directory-file-name project-root))))
+
+(defun projectile-get-project-directories ()
+  "Get the list of project directories that are of interest to the user."
+  (-map (lambda (subdir) (concat (projectile-project-root) subdir))
+        (or (car (projectile-parse-dirconfig-file)) '(""))))
+
+(defun projectile-dir-files (directory)
+  "List the files in DIRECTORY and in its sub-directories.
+Files are returned as relative paths to the project root."
+  ;; check for a cache hit first if caching is enabled
+  (let ((files-list (and projectile-enable-caching
+                         (gethash directory projectile-projects-cache)))
+        (root (projectile-project-root)))
+    ;; cache disabled or cache miss
+    (or files-list
+        (if projectile-use-native-indexing
+            (projectile-dir-files-native root directory)
+          ;; use external tools to get the project files
+          (projectile-dir-files-external root directory)))))
+
+(defun projectile-dir-files-native (root directory)
+  "Get the files for ROOT under DIRECTORY using just Emacs Lisp."
+  (message "Projectile is indexing %s. This may take a while."
+           (propertize directory 'face 'font-lock-keyword-face))
+  ;; we need the files with paths relative to the project root
+  (-map (lambda (file) (s-chop-prefix root file))
+        (projectile-index-directory directory (projectile-patterns-to-ignore))))
+
+(defun projectile-dir-files-external (root directory)
+  "Get the files for ROOT under DIRECTORY using external tools."
+  (let ((default-directory directory)
+        (files-list nil))
+    (setq files-list (-map (lambda (f)
+                             (s-chop-prefix root (expand-file-name f directory)))
+                           (projectile-get-repo-files)))
+    files-list))
+
+(defun projectile-file-cached-p (file project)
+  "Check if FILE is already in PROJECT cache."
+  (member file (gethash project projectile-projects-cache)))
+
+(defun projectile-cache-current-file ()
+  "Add the currently visited file to the cache."
+  (interactive)
+  (let* ((current-project (projectile-project-root))
+        (current-file (file-relative-name (buffer-file-name (current-buffer)) current-project)))
+    (unless (projectile-file-cached-p current-file current-project)
+      (puthash current-project
+               (cons current-file (gethash current-project projectile-projects-cache))
+               projectile-projects-cache)
+      (projectile-serialize-cache)
+      (message "File %s added to project %s cache." current-file current-project))))
+
+;; cache opened files automatically to reduce the need for cache invalidation
+(defun projectile-cache-files-find-file-hook ()
+  "Function for caching files with `find-file-hook'."
+  (when (and (projectile-project-p) projectile-enable-caching)
+    (projectile-cache-current-file)))
+
+(defun projectile-cache-projects-find-file-hook ()
+  "Function for caching projects with `find-file-hook'."
+  (when (projectile-project-p)
+    (projectile-add-known-project (projectile-project-root))
+    (projectile-save-known-projects)))
+
+(defcustom projectile-git-command "git ls-files -zco --exclude-standard"
+  "Command used by projectile to get the files in a git project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-hg-command "hg locate -0 -I ."
+  "Command used by projectile to get the files in a hg project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-fossil-command "fossil ls"
+  "Command used by projectile to get the files in a fossil project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-bzr-command "bzr ls --versioned -0"
+  "Command used by projectile to get the files in a bazaar project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-darcs-command "darcs show files -0 . "
+  "Command used by projectile to get the files in a darcs project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-svn-command "find . -type f -print0"
+  "Command used by projectile to get the files in a svn project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-generic-command "find . -type f -print0"
+  "Command used by projectile to get the files in a generic project."
+  :group 'projectile
+  :type 'string)
+
+(defun projectile-get-ext-command ()
+  "Determine which external command to invoke based on the project's VCS."
+  (let ((vcs (projectile-project-vcs)))
+    (cond
+     ((eq vcs 'git) projectile-git-command)
+     ((eq vcs 'hg) projectile-hg-command)
+     ((eq vcs 'fossil) projectile-fossil-command)
+     ((eq vcs 'bzr) projectile-bzr-command)
+     ((eq vcs 'darcs) projectile-darcs-command)
+     ((eq vcs 'svn) projectile-svn-command)
+     (t projectile-generic-command))))
+
+(defun projectile-get-repo-files ()
+  "Get a list of the files in the project."
+  (projectile-files-via-ext-command (projectile-get-ext-command)))
+
+(defun projectile-files-via-ext-command (command)
+  "Get a list of relative file names in the project root by executing COMMAND."
+  (split-string (shell-command-to-string command) "\0" t))
+
+(defun projectile-index-directory (directory patterns)
+  "Index DIRECTORY taking into account PATTERNS.
+The function calls itself recursively until all sub-directories
+have been indexed."
+  (let (files-list)
+    (dolist (current-file (file-name-all-completions "" directory) files-list)
+      (let ((absolute-file (expand-file-name current-file directory)))
+        (cond
+         ;; check for directories that are not ignored
+         ((and (s-ends-with-p "/" current-file)
+               ;; avoid loops & ignore some well known directories
+               (not (-any? (lambda (file)
+                            (string= (s-chop-suffix "/" current-file) file))
+                          '("." ".." ".svn" ".cvs")))
+               (not (projectile-ignored-directory-p absolute-file))
+               (not (and patterns
+                         (projectile-ignored-rel-p directory
+                                                   absolute-file patterns))))
+          (setq files-list (append files-list
+                                   (projectile-index-directory
+                                    (expand-file-name current-file directory)
+                                    patterns))))
+         ;; check for regular files that are not ignored
+         ((and (not (s-ends-with-p "/" current-file))
+               (not (projectile-ignored-file-p absolute-file))
+               (not (and patterns
+                         (projectile-ignored-rel-p directory
+                                                   absolute-file patterns))))
+          (setq files-list (cons
+                            (expand-file-name current-file directory)
+                            files-list))))))))
+
+(defun projectile-project-buffers ()
+  "Get a list of project buffers."
+  (let ((project-root (projectile-project-root)))
+    (-filter (lambda (buffer)
+               (projectile-project-buffer-p buffer project-root))
+             (buffer-list))))
+
+(defun projectile-project-buffer-p (buffer project-root)
+  "Check if BUFFER is under PROJECT-ROOT."
+  (with-current-buffer buffer
+    (and (s-starts-with? project-root
+                         (expand-file-name default-directory))
+         ;; ignore hidden buffers
+         (not (s-starts-with? " " (buffer-name buffer))))))
+
+(defun projectile-project-buffer-names ()
+  "Get a list of project buffer names."
+  (-map 'buffer-name (projectile-project-buffers)))
+
+(defun projectile-prepend-project-name (string)
+  "Prepend the current project's name to STRING."
+  (format "[%s] %s" (projectile-project-name) string))
+
+(defun projectile-switch-to-buffer ()
+  "Switch to a project buffer."
+  (interactive)
+  (switch-to-buffer
+   (projectile-completing-read
+    "Switch to buffer: "
+    (projectile-project-buffer-names))))
+
+(defun projectile-multi-occur ()
+  "Do a `multi-occur' in the project's buffers."
+  (interactive)
+  (multi-occur (projectile-project-buffers)
+               (car (occur-read-primary-args))))
+
+(defun projectile-ignored-directory-p (directory)
+  "Check if DIRECTORY should be ignored."
+  (member directory (projectile-ignored-directories)))
+
+(defun projectile-ignored-file-p (file)
+  "Check if FILE should be ignored."
+  (member file (projectile-ignored-files)))
+
+(defun projectile-ignored-rel-p (directory file patterns)
+  "Check if FILE should be ignored relative to DIRECTORY according to PATTERNS."
+  (let ((default-directory directory))
+    (-any? (lambda (pattern)
+             (or (s-ends-with? (s-chop-suffix "/" pattern)
+                               (s-chop-suffix "/" file))
+                 (member file (file-expand-wildcards pattern t))))
+           patterns)))
+
+(defun projectile-ignored-files ()
+  "Return list of ignored files."
+  (-map
+   'projectile-expand-root
+   (append
+    projectile-globally-ignored-files
+    (projectile-project-ignored-files))))
+
+(defun projectile-ignored-directories ()
+  "Return list of ignored directories."
+  (-map
+   'file-name-as-directory
+   (-map
+    'projectile-expand-root
+    (append
+     projectile-globally-ignored-directories
+     (projectile-project-ignored-directories)))))
+
+(defun projectile-project-ignored-files ()
+  "Return list of project ignored files."
+  (-remove 'file-directory-p (projectile-project-ignored)))
+
+(defun projectile-project-ignored-directories ()
+  "Return list of project ignored directories."
+  (-filter 'file-directory-p (projectile-project-ignored)))
+
+(defun projectile-paths-to-ignore ()
+  "Return a list of ignored project paths."
+  (-map (lambda (pattern)
+          (s-chop-prefix "/" pattern))
+        (-filter (lambda (pattern)
+                   (s-starts-with? "/" pattern))
+                 (cdr (projectile-parse-dirconfig-file)))))
+
+(defun projectile-patterns-to-ignore ()
+  "Return a list of relative file patterns."
+  (-remove (lambda (pattern)
+             (s-starts-with? "/" pattern))
+           (cdr (projectile-parse-dirconfig-file))))
+
+(defun projectile-project-ignored ()
+  "Return list of project ignored files/directories."
+  (let ((paths (projectile-paths-to-ignore))
+        (default-directory (projectile-project-root)))
+    (apply 'append
+           (-map
+            (lambda (pattern)
+              (file-expand-wildcards pattern t))
+            paths))))
+
+(defun projectile-dirconfig-file ()
+  "Return the absolute path to the project's dirconfig file."
+  (expand-file-name ".projectile" (projectile-project-root)))
+
+(defun projectile-parse-dirconfig-file ()
+  "Parse project ignore file and return directories to ignore and keep.
+
+The return value will be a cons, the car being the list of
+directories to keep, and the cdr being the list of files or
+directories to ignore.
+
+Strings starting with + will be added to the list of directories
+to keep, and strings starting with - will be added to the list of
+directories to ignore.  For backward compatibility, without a
+prefix the string will be assumed to be an ignore string."
+  (let ((dirconfig-file (projectile-dirconfig-file)))
+    (when (file-exists-p dirconfig-file)
+      (with-temp-buffer
+        (insert-file-contents-literally dirconfig-file)
+        (let* ((split-string-default-separators "[\r\n]")
+               (strings (-map 's-trim (delete "" (split-string (buffer-string)))))
+               (separated-vals (--separate (s-starts-with? "+" it) strings)))
+          (flet ((strip-prefix (s) (s-chop-prefixes '("-" "+") s)))
+            (cons (-map 'strip-prefix (first separated-vals))
+                  (-map 'strip-prefix (second separated-vals)))))))))
+
+(defun projectile-expand-root (name)
+  "Expand NAME to project root.
+
+Never use on many files since it's going to recalculate the
+project-root for every file."
+  (expand-file-name name (projectile-project-root)))
+
+(defun projectile-completing-read (prompt choices)
+  "Present a project tailored PROMPT with CHOICES."
+  (let ((prompt (projectile-prepend-project-name prompt)))
+    (cond
+     ((eq projectile-completion-system 'ido)
+      (ido-completing-read prompt choices))
+     ((eq projectile-completion-system 'default)
+      (completing-read prompt choices))
+     ((eq projectile-completion-system 'grizzl)
+      (if (and (fboundp 'grizzl-completing-read)
+               (fboundp 'grizzl-make-index))
+          (grizzl-completing-read prompt (grizzl-make-index choices))
+        (user-error "Please install grizzl from \
+https://github.com/d11wtq/grizzl")))
+     (t (funcall projectile-completion-system prompt choices)))))
+
+(defun projectile-current-project-files ()
+  "Return a list of files for the current project."
+  (let ((files (and projectile-enable-caching
+                    (gethash (projectile-project-root) projectile-projects-cache))))
+    ;; nothing is cached
+    (unless files
+      (setq files (-mapcat 'projectile-dir-files
+                           (projectile-get-project-directories)))
+      ;; cache the resulting list of files
+      (when projectile-enable-caching
+        (projectile-cache-project (projectile-project-root) files)))
+    files))
+
+(defun projectile-current-project-dirs ()
+  "Return a list of dirs for the current project."
+  (-remove 'null (-distinct
+                  (-map 'file-name-directory
+                        (projectile-current-project-files)))))
+
+(defun projectile-hash-keys (hash)
+  "Return a list of all HASH keys."
+  (let (allkeys)
+    (maphash (lambda (k v) (setq allkeys (cons k allkeys))) hash)
+    allkeys))
+
+(defun projectile-find-file (arg)
+  "Jump to a project's file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((file (projectile-completing-read "Find file: "
+                                          (projectile-current-project-files))))
+    (find-file (expand-file-name file (projectile-project-root)))
+    (run-hooks 'projectile-find-file-hook)))
+
+(defun projectile-find-dir (arg)
+  "Jump to a project's file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((dir (projectile-completing-read "Find dir: "
+                                          (projectile-current-project-dirs))))
+    (dired (expand-file-name dir (projectile-project-root)))
+    (run-hooks 'projectile-find-dir-hook)))
+
+(defun projectile-find-test-file (arg)
+  "Jump to a project's test file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((file (projectile-completing-read "Find test file: "
+                                          (projectile-current-project-files))))
+    (find-file (expand-file-name file (projectile-project-root)))))
+
+(defvar projectile-test-files-suffices '("_test" "_spec" "Test" "-test")
+  "Some common suffices of test files.")
+
+(defun projectile-test-files (files)
+  "Return only the test FILES."
+  (-filter 'projectile-test-file-p files))
+
+(defun projectile-test-file-p (file)
+  "Check if FILE is a test file."
+  (-any? (lambda (suffix)
+           (s-ends-with? suffix (file-name-sans-extension file)))
+         projectile-test-files-suffices))
+
+(defvar projectile-rails-rspec '("Gemfile" "app" "lib" "db" "config" "spec"))
+(defvar projectile-rails-test '("Gemfile" "app" "lib" "db" "config" "test"))
+(defvar projectile-symfony '("composer.json" "app" "src" "vendor"))
+(defvar projectile-ruby-rspec '("Gemfile" "lib" "spec"))
+(defvar projectile-ruby-test '("Gemfile" "lib" "test"))
+(defvar projectile-maven '("pom.xml"))
+(defvar projectile-lein '("project.clj"))
+(defvar projectile-rebar '("rebar"))
+(defvar projectile-make '("Makefile"))
+
+(defun projectile-project-type ()
+  "Determine the project's type based on its structure."
+  (let ((project-root (projectile-project-root)))
+    (cond
+     ((projectile-verify-files projectile-rails-rspec) 'rails-rspec)
+     ((projectile-verify-files projectile-rails-test) 'rails-test)
+     ((projectile-verify-files projectile-ruby-rspec) 'ruby-rspec)
+     ((projectile-verify-files projectile-ruby-test) 'ruby-test)
+     ((projectile-verify-files projectile-symfony) 'symfony)
+     ((projectile-verify-files projectile-maven) 'maven)
+     ((projectile-verify-files projectile-lein) 'lein)
+     ((projectile-verify-files projectile-rebar) 'rebar)
+     ((projectile-verify-files projectile-make) 'make)
+     (t 'generic))))
+
+(defun projectile-verify-files (files)
+  "Check whether all FILES exist in the current project."
+  (-all? 'projectile-verify-file files))
+
+(defun projectile-verify-file (file)
+  "Check whether FILE exists in the current project."
+  (file-exists-p (projectile-expand-root file)))
+
+(defun projectile-project-vcs ()
+  "Determine the VCS used by the project if any."
+  (let ((project-root (projectile-project-root)))
+   (cond
+    ((file-exists-p (expand-file-name ".git" project-root)) 'git)
+    ((file-exists-p (expand-file-name ".hg" project-root)) 'hg)
+    ((file-exists-p (expand-file-name ".fossil" project-root)) 'fossil)
+    ((file-exists-p (expand-file-name ".bzr" project-root)) 'bzr)
+    ((file-exists-p (expand-file-name "_darcs" project-root)) 'darcs)
+    ((file-exists-p (expand-file-name ".svn" project-root)) 'svn)
+    ((locate-dominating-file project-root ".git") 'git)
+    ((locate-dominating-file project-root ".hg") 'hg)
+    ((locate-dominating-file project-root ".fossil") 'fossil)
+    ((locate-dominating-file project-root ".bzr") 'bzr)
+    ((locate-dominating-file project-root "_darcs") 'darcs)
+    ((locate-dominating-file project-root ".svn") 'svn)
+    (t 'none))))
+
+(defun projectile-toggle-between-implemenation-and-test ()
+  "Toggle between an implementation file and its test file."
+  (interactive)
+  (if (projectile-test-file-p (buffer-file-name))
+      ;; find the matching impl file
+      (let ((impl-file (projectile-find-matching-file (buffer-file-name))))
+        (if impl-file
+            (find-file (projectile-expand-root impl-file))
+          (error "No matching source file found")))
+    ;; find the matching test file
+    (let ((test-file (projectile-find-matching-test (buffer-file-name))))
+      (if test-file
+          (find-file (projectile-expand-root test-file))
+        (error "No matching test file found")))))
+
+(defun projectile-test-suffix (project-type)
+  "Find test files suffix based on PROJECT-TYPE."
+  (cond
+   ((member project-type '(rails-rspec ruby-rspec)) "_spec")
+   ((member project-type '(rails-test ruby-test lein)) "_test")
+   ((member project-type '(maven symfony)) "Test")
+   (t (error "Project type not supported!"))))
+
+(defun projectile-find-matching-test (file)
+  "Compute the name of the test matching FILE."
+  (let ((basename (file-name-nondirectory (file-name-sans-extension file)))
+        (extension (file-name-extension file))
+        (test-suffix (projectile-test-suffix (projectile-project-type))))
+      (-first (lambda (current-file)
+                (s-equals? (file-name-nondirectory (file-name-sans-extension current-file))
+                           (concat basename test-suffix)))
+              (projectile-current-project-files))))
+
+(defun projectile-find-matching-file (test-file)
+  "Compute the name of a file matching TEST-FILE."
+  (let ((basename (file-name-nondirectory (file-name-sans-extension test-file)))
+        (extension (file-name-extension test-file))
+        (test-suffix (projectile-test-suffix (projectile-project-type))))
+    (-first (lambda (current-file)
+              (s-equals? (concat (file-name-nondirectory (file-name-sans-extension current-file)) test-suffix)
+                         basename))
+            (projectile-current-project-files))))
+
+(defun projectile-grep ()
+  "Perform rgrep in the project."
+  (interactive)
+  (let ((roots (projectile-get-project-directories))
+        (search-regexp (if (and transient-mark-mode mark-active)
+                           (buffer-substring (region-beginning) (region-end))
+                         (read-string (projectile-prepend-project-name "Grep for: ")
+                                      (projectile-symbol-at-point)))))
+    (dolist (root-dir roots)
+      (require 'grep)
+      ;; paths for find-grep should relative and without trailing /
+      (let ((grep-find-ignored-directories (union (-map (lambda (dir) (s-chop-suffix "/" (s-chop-prefix root-dir dir)))
+                                                         (cdr (projectile-ignored-directories))) grep-find-ignored-directories))
+            (grep-find-ignored-files (union (-map (lambda (file) (s-chop-prefix root-dir file)) (projectile-ignored-files)) grep-find-ignored-files)))
+        (grep-compute-defaults)
+        (rgrep search-regexp "* .*" root-dir)))))
+
+(defun projectile-ack ()
+  "Run an `ack-and-a-half' search in the project."
+  (interactive)
+  (let ((ack-and-a-half-arguments
+         (-map
+          (lambda (path)
+            (concat "--ignore-dir=" (file-name-nondirectory (directory-file-name path))))
+          (projectile-ignored-directories))))
+    (call-interactively projectile-ack-function)))
+
+(defun projectile-tags-exclude-patterns ()
+  "Return a string with exclude patterns for ctags."
+  (mapconcat (lambda (pattern) (format "--exclude=%s" pattern))
+       (projectile-project-ignored-directories) " "))
+
+(defun projectile-regenerate-tags ()
+  "Regenerate the project's etags."
+  (interactive)
+  (let* ((project-root (projectile-project-root))
+         (tags-exclude (projectile-tags-exclude-patterns))
+         (default-directory project-root))
+    (shell-command (format projectile-tags-command tags-exclude project-root))
+    (visit-tags-table project-root)))
+
+(defun projectile-replace ()
+  "Replace a string in the project using `tags-query-replace'."
+  (interactive)
+  (let* ((old-text (read-string
+                    (projectile-prepend-project-name "Replace: ")
+                    (projectile-symbol-at-point)))
+        (new-text (read-string
+                   (projectile-prepend-project-name
+                    (format "Replace %s with: " old-text)))))
+    (tags-query-replace old-text new-text nil '(-map 'projectile-expand-root (projectile-current-project-files)))))
+
+(defun projectile-symbol-at-point ()
+  "Get the symbol at point and strip its properties."
+  (substring-no-properties (or (thing-at-point 'symbol) "")))
+
+(defun projectile-kill-buffers ()
+  "Kill all project buffers."
+  (interactive)
+  (let* ((buffers (projectile-project-buffer-names))
+         (question
+          (format
+           "Are you sure you want to kill %d buffer(s) for '%s'? "
+           (length buffers)
+           (projectile-project-name))))
+    (if (yes-or-no-p question)
+        (mapc 'kill-buffer buffers))))
+
+(defun projectile-dired ()
+  "Opens dired at the root of the project."
+  (interactive)
+  (dired (projectile-project-root)))
+
+(defun projectile-recentf ()
+  "Show a list of recently visited files in a project."
+  (interactive)
+  (if (boundp 'recentf-list)
+      (find-file (projectile-expand-root (projectile-completing-read "Recently visited files: " (projectile-recentf-files)))))
+    (message "recentf is not enabled"))
+
+(defun projectile-recentf-files ()
+  "Return a list of recently visited files in a project."
+  (if (boundp 'recentf-list)
+      (let ((project-root (projectile-project-root)))
+        (->> recentf-list
+          (-filter (lambda (file) (s-starts-with-p project-root file)))
+          (-map (lambda (file) (s-chop-prefix project-root file)))))
+    nil))
+
+(defun projectile-serialize-cache ()
+  "Serializes the memory cache to the hard drive."
+  (projectile-serialize projectile-projects-cache projectile-cache-file))
+
+(defvar projectile-rails-compile-cmd "bundle exec rails server")
+(defvar projectile-ruby-compile-cmd "bundle exec rake build")
+(defvar projectile-ruby-test-cmd "bundle exec rake test")
+(defvar projectile-ruby-rspec-cmd "bundle exec rspec")
+(defvar projectile-symfony-compile-cmd "app/console server:run")
+(defvar projectile-symfony-test-cmd "phpunit -c app ")
+(defvar projectile-maven-compile-cmd "mvn clean install")
+(defvar projectile-maven-test-cmd "mvn test")
+(defvar projectile-lein-compile-cmd "lein compile")
+(defvar projectile-lein-test-cmd "lein test")
+(defvar projectile-rebar-compile-cmd "rebar")
+(defvar projectile-rebar-test-cmd "rebar eunit")
+(defvar projectile-make-compile-cmd "make")
+(defvar projectile-make-test-cmd "make test")
+
+(defvar projectile-compilation-cmd-map
+  (make-hash-table :test 'equal)
+  "A mapping between projects and the last compilation command used on them.")
+(defvar projectile-test-cmd-map
+  (make-hash-table :test 'equal)
+  "A mapping between projects and the last test command used on them.")
+
+(defun projectile-default-compilation-command (project-type)
+  "Retrieve default compilation command for PROJECT-TYPE."
+  (cond
+   ((member project-type '(rails-rspec rails-test)) projectile-rails-compile-cmd)
+   ((member project-type '(ruby-rspec ruby-test)) projectile-ruby-compile-cmd)
+   ((eq project-type 'symfony) projectile-symfony-compile-cmd)
+   ((eq project-type 'lein) projectile-lein-compile-cmd)
+   ((eq project-type 'make) projectile-make-compile-cmd)
+   ((eq project-type 'rebar) projectile-rebar-compile-cmd)
+   ((eq project-type 'maven) projectile-maven-compile-cmd)
+   (t projectile-make-compile-cmd)))
+
+(defun projectile-default-test-command (project-type)
+  "Retrieve default test command for PROJECT-TYPE."
+  (cond
+   ((member project-type '(rails-rspec ruby-rspec)) projectile-ruby-rspec-cmd)
+   ((member project-type '(rails-test ruby-test)) projectile-ruby-test-cmd)
+   ((eq project-type 'symfony) projectile-symfony-test-cmd)
+   ((eq project-type 'lein) projectile-lein-test-cmd)
+   ((eq project-type 'make) projectile-make-test-cmd)
+   ((eq project-type 'rebar) projectile-rebar-test-cmd)
+   ((eq project-type 'maven) projectile-maven-test-cmd)
+   (t projectile-make-test-cmd)))
+
+(defun projectile-compilation-command (project)
+  "Retrieve the compilation command for PROJECT."
+  (or (gethash project projectile-compilation-cmd-map)
+      (projectile-default-compilation-command (projectile-project-type))))
+
+(defun projectile-test-command (project)
+  "Retrieve the compilation command for PROJECT."
+  (or (gethash project projectile-test-cmd-map)
+      (projectile-default-test-command (projectile-project-type))))
+
+(defun projectile-compile-project ()
+  "Run project compilation command."
+  (interactive)
+  (let* ((project-root (projectile-project-root))
+         (compilation-cmd (compilation-read-command (projectile-compilation-command project-root)))
+         (default-directory project-root))
+    (puthash project-root compilation-cmd projectile-compilation-cmd-map)
+    (compilation-start compilation-cmd)))
+
+;; TODO - factor this duplication out
+(defun projectile-test-project ()
+  "Run project test command."
+  (interactive)
+  (let* ((project-root (projectile-project-root))
+         (test-cmd (compilation-read-command (projectile-test-command project-root)))
+         (default-directory project-root))
+    (puthash project-root test-cmd projectile-test-cmd-map)
+    (compilation-start test-cmd)))
+
+(defun projectile-switch-project ()
+  "Switch to a project we have seen before."
+  (interactive)
+  (let* ((project-to-switch
+         (projectile-completing-read "Switch to which project: "
+                                     projectile-known-projects))
+         (default-directory project-to-switch))
+    (projectile-find-file nil)
+    (let ((project-switched project-to-switch))
+      (run-hooks 'projectile-switch-project-hook))))
+
+(defvar projectile-switch-project-hook nil
+  "Hooks run when project is switched.
+
+The path to the opened project is available as PROJECT-SWITCHED")
+
+(defun projectile-clear-known-projects ()
+  "Clear both `projectile-known-projects' and `projectile-known-projects-file'."
+  (interactive)
+  (setq projectile-known-projects nil)
+  (projectile-save-known-projects))
+
+(defun projectile-remove-known-project ()
+  "Remove a projected from the list of known projects."
+  (interactive)
+  (let ((project-to-remove
+          (projectile-completing-read "Switch to which project: "
+                                      projectile-known-projects)))
+    (setq projectile-known-projects
+          (--reject (string= project-to-remove it) projectile-known-projects))
+    (projectile-save-known-projects)
+    (message "Project %s removed from the list of known projects." project-to-remove)))
+
+(defun projectile-add-known-project (project-root)
+  "Add PROJECT-ROOT to the list of known projects."
+  (setq projectile-known-projects
+        (-distinct
+         (cons (abbreviate-file-name project-root) projectile-known-projects))))
+
+(defun projectile-load-known-projects ()
+  "Load saved projects from `projectile-known-projects-file'.
+Also set `projectile-known-projects'."
+  (setq projectile-known-projects
+        (projectile-unserialize projectile-known-projects-file)))
+
+;; load the known projects
+(projectile-load-known-projects)
+
+(defun projectile-save-known-projects ()
+  "Save PROJECTILE-KNOWN-PROJECTS to PROJECTILE-KNOWN-PROJECTS-FILE."
+  (projectile-serialize projectile-known-projects projectile-known-projects-file))
+
+(defvar projectile-mode-map
+  (let ((map (make-sparse-keymap)))
+    (let ((prefix-map (make-sparse-keymap)))
+      (define-key prefix-map (kbd "f") 'projectile-find-file)
+      (define-key prefix-map (kbd "T") 'projectile-find-test-file)
+      (define-key prefix-map (kbd "t") 'projectile-toggle-between-implemenation-and-test)
+      (define-key prefix-map (kbd "g") 'projectile-grep)
+      (define-key prefix-map (kbd "b") 'projectile-switch-to-buffer)
+      (define-key prefix-map (kbd "o") 'projectile-multi-occur)
+      (define-key prefix-map (kbd "r") 'projectile-replace)
+      (define-key prefix-map (kbd "i") 'projectile-invalidate-cache)
+      (define-key prefix-map (kbd "R") 'projectile-regenerate-tags)
+      (define-key prefix-map (kbd "k") 'projectile-kill-buffers)
+      (define-key prefix-map (kbd "d") 'projectile-find-dir)
+      (define-key prefix-map (kbd "D") 'projectile-dired)
+      (define-key prefix-map (kbd "e") 'projectile-recentf)
+      (define-key prefix-map (kbd "a") 'projectile-ack)
+      (define-key prefix-map (kbd "c") 'projectile-compile-project)
+      (define-key prefix-map (kbd "p") 'projectile-test-project)
+      (define-key prefix-map (kbd "z") 'projectile-cache-current-file)
+      (define-key prefix-map (kbd "s") 'projectile-switch-project)
+
+      (define-key map projectile-keymap-prefix prefix-map))
+    map)
+  "Keymap for Projectile mode.")
+
+(defun projectile-add-menu ()
+  "Add Projectile's menu under Tools."
+  (easy-menu-add-item nil '("Tools")
+                      '("Projectile"
+                        ["Find file" projectile-find-file]
+                        ["Switch to buffer" projectile-switch-to-buffer]
+                        ["Kill project buffers" projectile-kill-buffers]
+                        ["Recent files" projectile-recentf]
+                        "--"
+                        ["Open project in dired" projectile-dired]
+                        ["Find in project (grep)" projectile-grep]
+                        ["Find in project (ack)" projectile-ack]
+                        ["Replace in project" projectile-replace]
+                        ["Multi-occur in project" projectile-multi-occur]
+                        "--"
+                        ["Invalidate cache" projectile-invalidate-cache]
+                        ["Regenerate etags" projectile-regenerate-tags]
+                        "--"
+                        ["Compile project" projectile-compile-project]
+                        ["Test project" projectile-test-project]
+                        "--"
+                        ["About" projectile-version])
+                      "Search Files (Grep)...")
+
+  (easy-menu-add-item nil '("Tools") '("--") "Search Files (Grep)..."))
+
+(defun projectile-remove-menu ()
+  "Remove Projectile's menu."
+  (easy-menu-remove-item nil '("Tools") "Projectile")
+  (easy-menu-remove-item nil '("Tools") "--"))
+
+;;; define minor mode
+
+;;;###autoload
+(define-minor-mode projectile-mode
+  "Minor mode to assist project management and navigation.
+
+\\{projectile-mode-map}"
+  :lighter " Projectile"
+  :keymap projectile-mode-map
+  :group 'projectile
+  (if projectile-mode
+      ;; on start
+      (projectile-add-menu)
+    ;; on stop
+    (projectile-remove-menu)))
+
+;;;###autoload
+(define-globalized-minor-mode projectile-global-mode
+  projectile-mode
+  projectile-on)
+
+(defun projectile-on ()
+  "Enable Projectile minor mode."
+  (projectile-mode 1))
+
+(defun projectile-off ()
+  "Disable Projectile minor mode."
+  (projectile-mode -1))
+
+(defun projectile-global-on ()
+  "Enable Projectile global minor mode."
+  (add-hook 'find-file-hook 'projectile-cache-files-find-file-hook)
+  (add-hook 'find-file-hook 'projectile-cache-projects-find-file-hook)
+  (add-hook 'projectile-find-dir-hook 'projectile-cache-projects-find-file-hook))
+
+(defun projectile-global-off ()
+  "Disable Projectile global minor mode."
+  (remove-hook 'find-file-hook 'projectile-cache-files-find-file-hook)
+  (remove-hook 'find-file-hook 'projectile-cache-projects-find-file-hook))
+
+(defadvice projectile-global-mode (after projectile-setup-hooks activate)
+  "Add/remove `find-file-hook' functions within `projectile-global-mode'."
+  (if projectile-global-mode
+      (projectile-global-on)
+    (projectile-global-off)))
+
+(provide 'projectile)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+
+;;; projectile.el ends here
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el
new file mode 100644
index 000000000..2d0a90806
--- /dev/null
+++ b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el
@@ -0,0 +1,61 @@
+;;; rainbow-delimiters-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (global-rainbow-delimiters-mode rainbow-delimiters-mode-disable
+;;;;;;  rainbow-delimiters-mode-enable rainbow-delimiters-mode) "rainbow-delimiters"
+;;;;;;  "rainbow-delimiters.el" (20887 43078))
+;;; Generated autoloads from rainbow-delimiters.el
+
+(autoload 'rainbow-delimiters-mode "rainbow-delimiters" "\
+Highlight nested parentheses, brackets, and braces according to their depth.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'rainbow-delimiters-mode-enable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'rainbow-delimiters-mode-disable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(defvar global-rainbow-delimiters-mode nil "\
+Non-nil if Global-Rainbow-Delimiters mode is enabled.
+See the command `global-rainbow-delimiters-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-rainbow-delimiters-mode'.")
+
+(custom-autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" nil)
+
+(autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" "\
+Toggle Rainbow-Delimiters mode in all buffers.
+With prefix ARG, enable Global-Rainbow-Delimiters mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Rainbow-Delimiters mode is enabled in all buffers where
+`rainbow-delimiters-mode-enable' would do it.
+See `rainbow-delimiters-mode' for more information on Rainbow-Delimiters mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("rainbow-delimiters-pkg.el") (20887 43078
+;;;;;;  250887))
+
+;;;***
+
+(provide 'rainbow-delimiters-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; rainbow-delimiters-autoloads.el ends here
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el
new file mode 100644
index 000000000..46adb6133
--- /dev/null
+++ b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el
@@ -0,0 +1 @@
+(define-package "rainbow-delimiters" "1.3.4" "Highlight nested parens, brackets, braces a different color at each depth." (quote nil))
diff --git a/elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.elc b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc
similarity index 54%
rename from elpa/clojure-test-mode-2.1.0/clojure-test-mode-pkg.elc
rename to elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc
index 018b480ad8726b4d1d59a080a23e9de3e48242bf..25caafc4e4c1f459e64d93106a06f982cc093db8 100644
GIT binary patch
delta 211
zcmZXOy$ZrG6oql<;v2YK3J#*JjXxlr99^7zg4^cCUW`de0>$0M%|3y<n{Q|kw+@GM
z;N!q|PhQD$GL>kU^u9x-G<mQFP8i^bHxN4zt5S$^Tl7UScgUu)T_#EMl><4SiF}=J
zmP61#U?e{8Ze)fmh4goeec*GWV*(iRfh4r($oK_R4(khr|B6-!l9i%J1JqVq2howR
PZa`8Snmh%=dN%$7di+Pf

delta 184
zcmbQw+QK?PQd}WFPa!-tMIkt~KtaJo!O+Ocz{1Mde4?F!W^zt`R%ubHZb@o!iEeIw
zN~*4ro}r$BK8E<jnF@@?8+Vm6CSyn`DJX$80cqdNy!;{skU0uzK!!8KbOn&<#Yzh5
h8X7RoU?ob1dge-+3L1GusRcO-N(MlifqYF(E&vxEITru`

diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el
new file mode 100644
index 000000000..e3c6ce029
--- /dev/null
+++ b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el
@@ -0,0 +1,520 @@
+;;; rainbow-delimiters.el --- Highlight nested parens, brackets, braces a different color at each depth.
+
+;; Copyright (C) 2010-2012 Jeremy L. Rayman.
+;; Author: Jeremy L. Rayman <jeremy.rayman@gmail.com>
+;; Maintainer: Jeremy L. Rayman <jeremy.rayman@gmail.com>
+;; Created: 2010-09-02
+;; Version: 1.3.4
+;; Keywords: faces, convenience, lisp, matching, tools, rainbow, rainbow parentheses, rainbow parens
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+;; URL: http://github.com/jlr/rainbow-delimiters/raw/master/rainbow-delimiters.el
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+;; Rainbow-delimiters is a rainbow parentheses-like mode which highlights
+;; parentheses, brackets, and braces according to their depth. Each
+;; successive level is highlighted in a different color. This makes it easy
+;; to spot matching delimiters, orient yourself in the code, and tell which
+;; statements are at a given level.
+;;
+;; Great care has been taken to make this mode FAST. You shouldn't see
+;; any discernible change in scrolling or editing speed while using it,
+;; even in delimiter-rich languages like Clojure, Lisp, and Scheme.
+;;
+;; Default colors are subtle, with the philosophy that syntax highlighting
+;; shouldn't be visually intrusive. Color schemes are always a matter of
+;; taste.  If you take the time to design a new color scheme, please share
+;; (even a simple list of colors works) on the EmacsWiki page or via github.
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+
+
+;;; Installation:
+
+;; 1. Place rainbow-delimiters.el on your emacs load-path.
+;;
+;; 2. Compile the file (necessary for speed):
+;; M-x byte-compile-file <location of rainbow-delimiters.el>
+;;
+;; 3. Add the following to your dot-emacs/init file:
+;; (require 'rainbow-delimiters)
+;;
+;; 4. Activate the mode in your init file.
+;;    You can choose to enable it only in certain modes, or Emacs-wide:
+;;
+;; - To enable it only in certain modes, add lines like the following:
+;; (add-hook 'clojure-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To enable it in all programming-related emacs modes (Emacs 24+):
+;; (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To activate the mode globally, add to your init file:
+;; (global-rainbow-delimiters-mode)
+;;
+;; - To temporarily activate rainbow-delimiters mode in an open buffer:
+;; M-x rainbow-delimiters-mode
+;;
+;; - To toggle global-rainbow-delimiters-mode:
+;; M-x global-rainbow-delimiters-mode
+
+;;; Customization:
+
+;; To customize various options, including the color scheme:
+;; M-x customize-group rainbow-delimiters
+;;
+;; deftheme / color-theme.el users:
+;; You can specify custom colors by adding the appropriate faces to your theme.
+;; - Faces take the form of:
+;;   'rainbow-delimiters-depth-#-face' with # being the depth.
+;;   Depth begins at 1, the outermost color.
+;;   Faces exist for depths 1-9.
+;; - The unmatched delimiter face (normally colored red) is:
+;;   'rainbow-delimiters-unmatched-face'
+
+
+;;; Change Log:
+
+;; 1.0 - Initial release.
+;; 1.1 - Stop tracking each delimiter's depth independently.
+;;       This had lead to confusing results when viewing clojure
+;;       code. Instead, just color based on current nesting inside
+;;       all delimiters combined.
+;;     - Added 'all-delimiters' faces to apply a color scheme to
+;;       all delimiters at once. Other faces inherit from this group.
+;; 1.1.1 - Change color scheme to a lighter, more subtle style.
+;; 1.1.2: (2011-03-25)
+;;  - Add an unmatched-delimiter face and correct problem with
+;;    coloring of text following unmatched closing delims.
+;; 1.2: (2011-03-28)
+;;  - Unify delimiter faces: all delimiter types now use the same depth
+;;    faces, of form 'rainbow-delimiters-depth-#-face'.
+;; 1.2.1: (2011-03-29)
+;;  - Conform to ELPA conventions.
+;; 1.3: (2011-05-24)
+;;  - Add separate color schemes for light and dark background modes.
+;;  - Checkboxes to enable/disable highlighting for each delimiter type.
+;;  - Improvements to Customize interface.
+;;  - Infinite depth support by cycling through defined faces repeatedly.
+;;  - Documentation changes.
+;; 1.3.1 (2011-05-25)
+;;  - Light color theme appears entirely grey on SRGB monitors. Revert to
+;;    old color theme until a nicer light background theme can be added.
+;;  - Correct typo in the installation step for users of dark backgrounds.
+;; 1.3.2 (2011-10-14)
+;;  - Add 'global-rainbow-delimiters-mode'.
+;;  - Respect syntax of current buffer major-mode so delimiters
+;;    highlight correctly in non-lisp languages.
+;; 1.3.3 (2011-11-25)
+;;  - Backwards compatibility with Emacs versions prior to 23.2.
+;;    Defines "with-silent-modifications" if undefined.
+;; 1.3.4 (2012-04-27)
+;;  - Further optimize highlighting speed. Benchmarks show 2x improvement.
+;;  - Color scheme for light backgrounds.
+;;  - Eliminate bottleneck seen in certain large files.
+;;    A large file which revealed this bottleneck now highlights ~40x faster.
+;;  - Correct broken/incorrect highlighting reported in certain languages.
+
+;;; TODO:
+
+;; - Add support for independent depth tracking of each delimiter type
+;;   for users of C-like languages.
+;; - Python style - increase depth with each new indentation.
+;; - Add support for nested tags (XML, HTML)
+;; - Set up proper example defthemes for rainbow-delimiters faces.
+;; - Intelligent support for other languages: Ruby, LaTeX tags, et al.
+
+;;; Issues:
+
+;; - Rainbow-delimiters mode does not appear to change the color of
+;;   delimiters when Org-mode is also enabled.
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+
+;; Note: some of the functions in this file have been inlined for speed.
+;; Inlining functions can cause problems with debugging. To debug these
+;; functions more easily, change defsubst -> defun.
+;; http://www.gnu.org/s/emacs/manual/html_node/elisp/Compilation-Tips.html
+
+;;; Customize interface:
+
+(defgroup rainbow-delimiters nil
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  :prefix "rainbow-delimiters-"
+  :link '(url-link :tag "Website for rainbow-delimiters (EmacsWiki)"
+                   "http://www.emacswiki.org/emacs/RainbowDelimiters")
+  :group 'applications)
+
+(defgroup rainbow-delimiters-faces nil
+  "Faces for successively nested pairs of delimiters.
+
+When depth exceeds innermost defined face, colors cycle back through."
+  :tag "Color Scheme"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Toggle Delimiters" "rainbow-delimiters-toggle-delimiter-highlighting")
+  :prefix 'rainbow-delimiters-faces-)
+
+;; Choose which delimiters you want to highlight in your preferred language:
+
+(defgroup rainbow-delimiters-toggle-delimiter-highlighting nil
+  "Choose which delimiters to highlight."
+  :tag "Toggle Delimiters"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Color Scheme" "rainbow-delimiters-faces"))
+
+(defcustom rainbow-delimiters-highlight-parens-p t
+  "Enable highlighting of nested parentheses -- ().
+
+Non-nil (default) enables highlighting of parentheses.
+Nil disables parentheses highlighting."
+  :tag "Highlight Parentheses?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-brackets-p t
+  "Enable highlighting of nested brackets -- [].
+
+Non-nil (default) enables highlighting of brackets.
+Nil disables bracket highlighting."
+  :tag "Highlight Brackets?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-braces-p t
+  "Enable highlighting of nested braces -- {}.
+
+Non-nil (default) enables highlighting of braces.
+Nil disables brace highlighting."
+  :tag "Highlight Braces?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+
+;;; Faces:
+
+;; Unmatched delimiter face:
+(defface rainbow-delimiters-unmatched-face
+  '((((background light)) (:foreground "#88090B"))
+    (((background dark)) (:foreground "#88090B")))
+  "Face to highlight unmatched closing delimiters in."
+  :group 'rainbow-delimiters-faces)
+
+;; Faces for highlighting delimiters by nested level:
+(defface rainbow-delimiters-depth-1-face
+  '((((background light)) (:foreground "#707183"))
+    (((background dark)) (:foreground "grey55")))
+  "Nested delimiters face, depth 1 - outermost set."
+  :tag "Rainbow Delimiters Depth 1 Face -- OUTERMOST"
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-2-face
+  '((((background light)) (:foreground "#7388d6"))
+    (((background dark)) (:foreground "#93a8c6")))
+  "Nested delimiters face, depth 2."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-3-face
+  '((((background light)) (:foreground "#909183"))
+    (((background dark)) (:foreground "#b0b1a3")))
+  "Nested delimiters face, depth 3."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-4-face
+  '((((background light)) (:foreground "#709870"))
+    (((background dark)) (:foreground "#97b098")))
+  "Nested delimiters face, depth 4."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-5-face
+  '((((background light)) (:foreground "#907373"))
+    (((background dark)) (:foreground "#aebed8")))
+  "Nested delimiters face, depth 5."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-6-face
+  '((((background light)) (:foreground "#6276ba"))
+    (((background dark)) (:foreground "#b0b0b3")))
+  "Nested delimiters face, depth 6."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-7-face
+  '((((background light)) (:foreground "#858580"))
+    (((background dark)) (:foreground "#90a890")))
+  "Nested delimiters face, depth 7."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-8-face
+  '((((background light)) (:foreground "#80a880"))
+    (((background dark)) (:foreground "#a2b6da")))
+  "Nested delimiters face, depth 8."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-9-face
+  '((((background light)) (:foreground "#887070"))
+    (((background dark)) (:foreground "#9cb6ad")))
+  "Nested delimiters face, depth 9."
+  :group 'rainbow-delimiters-faces)
+
+;;; Faces 10+:
+;; NOTE: Currently unused. Additional faces for depths 9+ can be added on request.
+
+(defconst rainbow-delimiters-max-face-count 9
+  "Number of faces defined for highlighting delimiter levels.
+
+Determines depth at which to cycle through faces again.")
+
+;;; Face utility functions
+
+(defsubst rainbow-delimiters-depth-face (depth)
+  "Return face-name for DEPTH as a string 'rainbow-delimiters-depth-DEPTH-face'.
+
+For example: 'rainbow-delimiters-depth-1-face'."
+  (concat "rainbow-delimiters-depth-"
+          (number-to-string
+           (or
+            ;; Our nesting depth has a face defined for it.
+            (and (< depth rainbow-delimiters-max-face-count)
+                 depth)
+            ;; Deeper than # of defined faces; cycle back through to beginning.
+            ;; Depth 1 face is only applied to the outermost delimiter pair.
+            ;; Cycles infinitely through faces 2-9.
+            (let ((cycled-depth (mod depth rainbow-delimiters-max-face-count)))
+              (if (/= cycled-depth 0)
+                  ;; Return face # that corresponds to current nesting level.
+                  (mod depth rainbow-delimiters-max-face-count)
+                ;; Special case: depth divides evenly into max, correct face # is max.
+                rainbow-delimiters-max-face-count))))
+          "-face"))
+
+
+;;; Nesting level
+
+(defvar rainbow-delimiters-syntax-table nil
+  "Syntax table (inherited from buffer major-mode) which uses all delimiters.
+
+When rainbow-delimiters-minor-mode is first activated, it sets this variable and
+the other rainbow-delimiters specific syntax tables based on the current
+major-mode. The syntax table is constructed by the function
+'rainbow-delimiters-make-syntax-table'.")
+
+;; syntax-table: used with syntax-ppss for determining current depth.
+(defun rainbow-delimiters-make-syntax-table (syntax-table)
+  "Inherit SYNTAX-TABLE and add delimiters intended to be highlighted by mode."
+  (let ((table (copy-syntax-table syntax-table)))
+    (modify-syntax-entry ?\( "()  " table)
+    (modify-syntax-entry ?\) ")(  " table)
+    (modify-syntax-entry ?\[ "(]" table)
+    (modify-syntax-entry ?\] ")[" table)
+    (modify-syntax-entry ?\{ "(}" table)
+    (modify-syntax-entry ?\} "){" table)
+    table))
+
+(defsubst rainbow-delimiters-depth (loc)
+  "Return # of nested levels of parens, brackets, braces LOC is inside of."
+  (let ((depth
+         (with-syntax-table rainbow-delimiters-syntax-table
+           (car (syntax-ppss loc)))))
+    (if (>= depth 0)
+        depth
+      0))) ; ignore negative depths created by unmatched closing parens.
+
+
+;;; Text properties
+
+;; Backwards compatibility: Emacs < v23.2 lack macro 'with-silent-modifications'.
+(eval-and-compile
+  (unless (fboundp 'with-silent-modifications)
+    (defmacro with-silent-modifications (&rest body)
+      "Defined by rainbow-delimiters.el for backwards compatibility with Emacs < 23.2.
+ Execute BODY, pretending it does not modify the buffer.
+If BODY performs real modifications to the buffer's text, other
+than cosmetic ones, undo data may become corrupted.
+
+This macro will run BODY normally, but doesn't count its buffer
+modifications as being buffer modifications.  This affects things
+like buffer-modified-p, checking whether the file is locked by
+someone else, running buffer modification hooks, and other things
+of that nature.
+
+Typically used around modifications of text-properties which do
+not really affect the buffer's content."
+      (declare (debug t) (indent 0))
+      (let ((modified (make-symbol "modified")))
+        `(let* ((,modified (buffer-modified-p))
+                (buffer-undo-list t)
+                (inhibit-read-only t)
+                (inhibit-modification-hooks t)
+                deactivate-mark
+                ;; Avoid setting and removing file locks and checking
+                ;; buffer's uptodate-ness w.r.t the underlying file.
+                buffer-file-name
+                buffer-file-truename)
+           (unwind-protect
+               (progn
+                 ,@body)
+             (unless ,modified
+               (restore-buffer-modified-p nil))))))))
+
+(defsubst rainbow-delimiters-propertize-delimiter (loc depth)
+  "Highlight a single delimiter at LOC according to DEPTH.
+
+LOC is the location of the character to add text properties to.
+DEPTH is the nested depth at LOC, which determines the face to use.
+
+Sets text properties:
+`font-lock-face' to the appropriate delimiter face.
+`rear-nonsticky' to prevent color from bleeding into subsequent characters typed by the user."
+  (with-silent-modifications
+    (let ((delim-face (if (<= depth 0)
+                          "rainbow-delimiters-unmatched-face"
+                        (rainbow-delimiters-depth-face depth))))
+      ;; (when (eq depth -1) (message "Unmatched delimiter at char %s." loc))
+      (add-text-properties loc (1+ loc)
+                           `(font-lock-face ,delim-face
+                             rear-nonsticky t)))))
+
+
+(defsubst rainbow-delimiters-unpropertize-delimiter (loc)
+  "Remove text properties set by rainbow-delimiters mode from char at LOC."
+  (with-silent-modifications
+    (remove-text-properties loc (1+ loc)
+                            '(font-lock-face nil
+                              rear-nonsticky nil))))
+
+
+(defsubst rainbow-delimiters-char-ineligible-p (loc)
+  "Return t if char at LOC should be skipped, e.g. if inside a comment.
+
+Returns t if char at loc meets one of the following conditions:
+- Inside a string.
+- Inside a comment.
+- Is an escaped char, e.g. ?\)"
+  (let ((parse-state (syntax-ppss loc)))
+    (or
+     (nth 3 parse-state)                ; inside string?
+     (nth 4 parse-state)                ; inside comment?
+     (and (eq (char-before loc) ?\\)  ; escaped char, e.g. ?\) - not counted
+          (and (not (eq (char-before (1- loc)) ?\\)) ; special-case: ignore ?\\
+               (eq (char-before (1- loc)) ?\?))))))
+;; NOTE: standard char read syntax '?)' is not tested for because emacs manual
+;; states punctuation such as delimiters should _always_ use escaped '?\)' form.
+
+
+(defsubst rainbow-delimiters-apply-color (delim depth loc)
+  "Apply color for DEPTH to DELIM at LOC following user settings.
+
+DELIM is a string specifying delimiter type.
+DEPTH is the delimiter depth, or corresponding face # if colors are repeating.
+LOC is location of character (delimiter) to be colorized."
+  (and
+   ;; Ensure user has enabled highlighting of this delimiter type.
+   (symbol-value (intern-soft
+                  (concat "rainbow-delimiters-highlight-" delim "s-p")))
+   (rainbow-delimiters-propertize-delimiter loc
+                                            depth)))
+
+
+;;; JIT-Lock functionality
+
+;; Used to skip delimiter-by-delimiter `rainbow-delimiters-propertize-region'.
+(defconst rainbow-delimiters-delim-regex "\\(\(\\|\)\\|\\[\\|\\]\\|\{\\|\}\\)"
+  "Regex matching all opening and closing delimiters the mode highlights.")
+
+;; main function called by jit-lock:
+(defsubst rainbow-delimiters-propertize-region (start end)
+  "Highlight delimiters in region between START and END.
+
+Used by jit-lock for dynamic highlighting."
+  (save-excursion
+    (goto-char start)
+    ;; START can be anywhere in buffer; determine the nesting depth at START loc
+    (let ((depth (rainbow-delimiters-depth start)))
+      (while (and (< (point) end)
+                  (re-search-forward rainbow-delimiters-delim-regex end t))
+        (backward-char) ; re-search-forward places point after delim; go back.
+        (unless (rainbow-delimiters-char-ineligible-p (point))
+          (let ((delim (char-after (point))))
+            (cond ((eq ?\( delim)       ; (
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "paren" depth (point)))
+                  ((eq ?\) delim)       ; )
+                   (rainbow-delimiters-apply-color "paren" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched paren
+                                   (1- depth))))
+                  ((eq ?\[ delim)       ; [
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "bracket" depth (point)))
+                  ((eq ?\] delim)       ; ]
+                   (rainbow-delimiters-apply-color "bracket" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched bracket
+                                   (1- depth))))
+                  ((eq ?\{ delim)       ; {
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "brace" depth (point)))
+                  ((eq ?\} delim)       ; }
+                   (rainbow-delimiters-apply-color "brace" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched brace
+                                   (1- depth)))))))
+        ;; move past delimiter so re-search-forward doesn't pick it up again
+        (forward-char)))))
+
+(defun rainbow-delimiters-unpropertize-region (start end)
+  "Remove highlighting from delimiters between START and END."
+  (save-excursion
+    (goto-char start)
+    (while (and (< (point) end)
+                (re-search-forward rainbow-delimiters-delim-regex end t))
+      ;; re-search-forward places point 1 further than the delim matched:
+      (rainbow-delimiters-unpropertize-delimiter (1- (point))))))
+
+
+;;; Minor mode:
+
+;;;###autoload
+(define-minor-mode rainbow-delimiters-mode
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  nil "" nil ; No modeline lighter - it's already obvious when the mode is on.
+  (if (not rainbow-delimiters-mode)
+      (progn
+        (jit-lock-unregister 'rainbow-delimiters-propertize-region)
+        (rainbow-delimiters-unpropertize-region (point-min) (point-max)))
+    (jit-lock-register 'rainbow-delimiters-propertize-region t)
+    ;; Create necessary syntax tables inheriting from current major-mode.
+    (set (make-local-variable 'rainbow-delimiters-syntax-table)
+         (rainbow-delimiters-make-syntax-table (syntax-table)))))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-enable ()
+  (rainbow-delimiters-mode 1))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-disable ()
+  (rainbow-delimiters-mode 0))
+
+;;;###autoload
+(define-globalized-minor-mode global-rainbow-delimiters-mode
+  rainbow-delimiters-mode rainbow-delimiters-mode-enable)
+
+(provide 'rainbow-delimiters)
+
+;;; rainbow-delimiters.el ends here.
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.elc b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.elc
new file mode 100644
index 0000000000000000000000000000000000000000..1119a7df56c97716c1edc4519a6f2709dab4c1a5
GIT binary patch
literal 20154
zcmd^H3v=5>lBVsuI!h_*9!V~V6Kls*)*=&u#*>ufO|4%_;w{HXEajY(={<oYC?O&N
zE&y6qa@pU0U-t|^Km<wAc518cl9Ehf1~WZ9J>6eFMtAleKlq?hsjS|)b4NS~ha-RB
z^+e}P^xVMr26s>0et+P_A`Ha7n}~1RGhu8C!`wBDT}KzDZdm+kKMIGUkC(;mA7U?x
zZ_D>@H@u<SjT^n&-eBb3j$A+Jgr{218~8&%K|jrCSPi?Rq2Ud9U_TIhG=zAG-ag1M
z?S|1Xxb4(Wj)glIh;Wo(ykFb|9pc6+Hy#}Ov7~4mV*$Ohz#aNs(F?nA68XVVyoJ^%
zPK4X*VaeG%#!kcBnHr-PVvHb6L^li)tU`>FzP61gfp%~I!J|i_d+bJTmzK1})4M@W
z#G&ZAf#`T*5W0m))M8@cxzWJ)B9R=UqiM-`u@`Uj9})1T|E;dB);ed2r**@gC#r2r
z*YRWE$Hb3?9~(aoewz4cwJihfhH-19ZPF*|ZBS4A80c-Fw}IZ=Mx)>@gWjZn@ivWS
z>bI^<-Zs@-CXGO?G)hVX-ZE)^`q#PjPTSO5Rq?z#j+1Z*>FN&L$kUFZa6A&zGA9Cm
zAgW*cN5=#FBqH$Q1QIa9J3(^nL0Yy%2b+1~CHO=eN#C&lZnqmoJ;;toLhP95N22GA
zlH*2I?2aO@@4ph&>FG4I4*cLm)W*?3<4?PZdnBsQyiSZmAo^icMrDoV{+WN`*Q=s>
zoFt>&+qX|oPvwz1#q&lO9o^;wcKfM3Sr4;=RjrF%$pCjW8u(p#HcIBv`n<O4m;4XW
z5|6uBZS24F24@rI;H-$Sj|Hbkx6uyT!Lws8kW3KXtFGtuVw|MFi-sXiRu3!*z*(AM
z3nym~VvO!t7h0kN_JW1jp(AD=GvopF5c}O@Z|GG;O>HNyLh`MIyI5yQN6FxW@aPD0
z<(N{sKM8l6C?)MU6%A}P#xL1Y=9yO3GIuaheQ+Fxu_sQC{qAv&mn2ZxtPrPa3F#%v
zT#_F}{+7HfWuaPsAq=~|x^dUA9kCa<9WXJYj>I2wFnwr*rioe|8te&_A|0_B_TL>3
zlDhDCjCg90+>vXnKEW$JKc?B@{9!D-)%e3|%7^rrzjPy?N!%>isElll=ZdwF*i6J`
zZR1nX5QfvzaZFhDzE1aCd^gbpf5y>G&PJZt?1bUKgNjyXs%)ycJI~y-7ICwqv<|WI
z`HQ7knZA0CkLvMT;$b>Tk&8RJJ<Y}YYAJ7-h33uzfg}<kKVaamzb(x`58$C7hCJF^
zWS&<PK+`l^<*f7Kx5>DRSn@wkOmESo!|akFCv)rE`j<(syjhp6xgp55lU+B-V)LuH
zMl$VW*2$z#H<GOfQZO;XbR&keFr-D`;QX)_hO{uGMGaGp7}CO!mI52PlOxE+kT!<2
zvxTCu3{sHZFVp(tVCW{WTRqmGqK5y-!jb6$d|;SShoRbqdG*x8>c;lAzN6o-QbVD8
z&y7yz^sWoG)diCwG6F<*5XPjVCx#jpnGlLZ10_0=jak{M7~E*aGHYt-Eo0ld;F^vi
z@62(~8B2O1L0FDzi5i#&VF*oxW1wrs6|tAlf>>`W;FB}*_y|mfSH7gpf+G0#hl9PR
z-+a4&P@TO<bE!pI+uOb71sA!oW4YU1>b-E4CRSClKXMzaWhmUycP_pS8y&r4xU^{t
zDYWKMXfH!yOW)aU=@;f<tAqX*q0pX3p|cEyJ9^7%T~w4eT(9HxE<~X-kHY3M6gJIP
zv*TWrhuCGkbD>>s&ZDrk429bc{=fJx>+bdr^<F54t$7q~FGV5dyf}rf*=hEO;|nR=
zo=4%%QWWBxEOAo0ou=En2!%V1>I<>Wz|?4oC*xrUaR?xLX$~^q4IWtrq6>CK3_N&<
z6mEIwk!FUghcFB4UPOwdhXc1p`g_XNQ-ixla90V+V-^Hd;3}4=y`lSx*@OthI7q~f
zkf7ae8m&50ZElOFUNVjX9#unpNBYta_r5#$TDb7ng$(tGGPo|aD);4SHnET|u~_ew
zI~)zX-8nBwi@2#4;0}DuHG2x;r`ULowZbexZU9ag_gr0h29RO3`<1Ksw<#)UaIUVj
ztAJR>b$n_5famsl?zwLMp|VoHiMH1F3ZO`aFJ>QaLk~_a*~V%~f60%k2v`ubB-9l1
zhG9?WqRLEy#5B`=XzlFOU({D?qcI$+nFI3bH#w4|qI8fl`MoQ{jhY`IDB@|}s}W)?
zw6lPBV*d<rwpSuy&#vYN$6kb331SHpXzYypeGD^ne-0xJ^m%n9Zyf5Qh~NZAU|Tsz
zQ9>a^R=qDcR>;x7ZsNamG1Hdt69J?VBTRwT%*zCgtBC!G5Wh;}Hu1>o`hA2N<J=Nr
zL_A`Uj{qjU+#N?0Y+9YHpdk+MJpT&O#D^mqBd*9nS$efU4nSfUtd{Y7=$?3*97JQ*
zr9ukw%g$K7D~HA88FS2*#b>P55|1S7#r{uE4(|P^9o)PBc#nf(h@0lv43L?40R=g6
z<`MDCbcUpyHfiB`nWCPKO`b$~dd#agKS~b~otc#l<&@B|BCny9e<I_Og(pDyhE;e1
zZ^0;xBmEcIXQi&rTAmaoncZ-7R$#cmO8tKJ44WLC2^;69Ru`fwY(rG*HTtxJPqi2L
z*TR$MRm9Zsq4pbnaPZ_;95q`VHK*BZ(ox&E+p<!Xw~-6NNJUH!WRN2tzEuA3<8L33
zJo!QFBb*!d7w&~r6yX0L>`JyfV)P;Ly$NnJm)pTj$#_G5=jPqdNo{=sJ{muPUDn5y
zb|3$mpFn*XM#{kr<BN@5b$T~Ue3s|C<ZKpr4H}eXDLjVPG>K40SO2EOz+7Rv>Y&wB
zJGWtMhz)at&U0b6UI-JW{QOgO47JfHj)ne0SZW`dy4;8Sw3tK%s-;#>WsxJ}phLH>
zlL9BN6HJ3Jl6u!k<6GCE_~lbWKIO5b--(n*6skxzhi<j>+zZmTB@B}rc23bM{%~5S
zsAomLL%!)qP!dIpk+}&HQl+H1RIHf7cWm2gObr5N5Qke495vAiduQq}f@tgJhxl#N
zYMlG{)udlov7xWvlVPC2Fz?^r+e^hj&O@33<3NqG(i(O`gyqwwD&R%(89ZYtEs8Wa
z*duIM_7p1!5gG<Xh%%Cu@H>8@MV{N!!T{0h{L}p6G=yPKpxNsXD`ah0<7-3s-O99R
zl**EbLe0+)l4y)j<`Cv)9Gv<Ah>60)>m~yK9w8?bAaognI^q#LeQk<%(y?`fS6ia`
zPzA@4Yn$FpWWP8qKtY64H$qgMj3xG^;}87gj5kf?#r{NTBNM@RvG>aB!bcYOzkT@A
z7Dxgr3piT=Lzd;Qm<wPGEQzEJZ$9etJ7VNT2v7`T0R|4FBFlt9W<1n8n_!*yD%p}o
zu#Kz<LZjU<9(oDvUI-w#1!nX@WDye=`+Ek9fCa$rg;6vf!J2XMfKzl*woZK*?PwfG
zLSUAMu;OP>WDs_uJwVh};y@o3SyJ8(@>>eHhX#)zs%$PUpdnyjp#hQ4#D=j^M-H$J
z=y8&AA}3?WRvdfX6B_LF*aNdDLkHVS2~G?GeRRThtsTTz78WdkgpuRG3W6CF2o^b+
zPm<UHxPnQ5-Ub7ahjIaCJ;|A~5jYPH2q2oCaAh2+xLkS-n?N#%jZ1u>Z<SUE+X1C2
zX%{hqTybv4v3r!o#DRwgfMcTq>GYv9MsABwQV-2SCt2l8faUCnNr)W48l;048O#!(
zpKMGaMaJM7_)8fd;vhK3+J%f2eb3US1RDrZ(30plrAtb}#;OGL;5)sc5)V?{$yvA3
zg-`qt-Yo*&7#1u95&I0~ilgtY9`?ZrjrLPI0o0$~MbZp3AhCe+G+88p*~aQ27#nFw
z{l<{?le0~F2dC{Nag38(3ZxE@4kKXzG76DY>%`vQpgzziOBD-BE@a3KbVdv9a>|-t
zyh*}}^m1k*rCM$ZQpqi{$sds~(fXK;51Hs2^lANFQp{*>uDwUv`A0HHH^^37_+&n*
zti88R4GfId-dlU0eH9&#(cJtCb;O%%?@MoG{Xc08c2~YCH0kD}%G&$nu^6rI>+2sN
ztgEkmNK_r*qp?O0U>P<VNE>s!l>vg3b7BnRd~KrTr!{=~B!4!PcE6}<Pp3mx1BZ|j
zS9t?ZrrN$rHk|Fef;<IeF<0G7hyegNt>v+>eApOizmh(4{W9g1(aF)yD}$nB3mB!m
z)Y36m>@Ao!g|kWsIp>cT97;YSe1hnNlYNtpM5|@mbDhLeabD70WKcW|U*fPAk2e83
zs%4p84A};#bMhtWG%D@2@bHa;QhM_!dEvnWELJCv&deHBJkVh<tc?bV8r3oUUp)ko
zN4qp7sI_yFN=NXVuo7%47grWHM~NGvht^zio3VjQ3LF$d>V_r4@8?BG#K+-y0L=wo
z{=^?ayKf1vanzu0%K36(B!)w>zN@P;eg(spABI%<&?9q2z(N_yemEF}z??^9yL&!Y
zI_<7%aL?JJOG90a{G)6hbOZ7Ugco;RGB_mjimpG`Wf*RD6pK2;cR=08k&oOwv}9i1
zQ)hf-n+!vZ^rW4BzPb-t*PSoW;?ycv_tn=w7rr;YNWB7DHyqd)5sZZFuJZNR3$x%1
z@0g-#L7l42-f_(N0jO!hm)&Q(CGMem<}5Yq2oFju0)zf=@A0E=QrI)u9WvsicM`&O
z*kRd?fM*(vl<}c6+R6#CARurK=u8^f1ORMDpaXHEctjF_*JWgpMMu`wpmG5xXXF85
z1xJk(cY&`N<|3YOnHr%zRmoE)00V(#?Bf3daK1<+sHEr&aak(YfiUn$%5Y#Zg+K^(
zkmsj=fAcT2<42X1c5odL1j7)7M&O$(G-5J-0Prx3^$*qoTnuZS`q_BWM3oU@GmK9(
z#ugaM{IP<e@ElGiGR(o+b%rN@!c(+156}-eW;|B#gr;*Co_t?u(#`$K+I4~_rU`h0
z=!IzkiAZ!}uhDmh&`DZgCKpO_D&gmAC~8E?11%2wNvW~VqGl)>tD;t*nkv2jw;1Iu
z;JYHenFa%J{0o_e8OUZ5`ZjbOIf!|&@B9H-Qt7lz*p?&j72IZ26wooJcsBeYb}XqH
zu_VJ!E(=4NOn_o_h-ao(Se6kgp{c6vcCFTK|4$u1?e=s2{Q|###m{f;HtG*m!IXiL
zDGm(p<lVtclTd&W3h0RHbUR*h>Y+Gr|KQ%!0}dGPJ$VR)_yak#0A)WTP=k|n!f}qY
zIyWPq^w%OSl*3|bPUs?-jwnIFS&y`kX_!|#_^n^%z@->nhbCaJNXFv&X#mq$Q2|VH
zj!X_<-mCzc0p?dp>6oA0I9#ifl5yImX<xx3Ywfc&gcuDQ5x>b(XH3%_vX)!9x&Api
zG}k_7+vw3it?bJRSwmB2<LFgZ*f`=V8^`Rs@x^Bto%P_AL&Q^|Ah$?a(OZaiJ5J@=
z!TY4Ot{r}KgPY*6na&z@YAU^pZhB?q+6~ZTw#2$dH1kM}_1pA$o$6_HeqyXs35~vv
zp;2K2<$Dbsq;J?ZohBB58XIB?nk(19D_L%HZOvx=+csMu2pzy()1lrDnv@PkKvcPi
zXf*SUG@fZ!)@)M5RuhUC?^~@@5!?D2zS{;XVu~_@R&u`#=L)UUmdto{34_dIL;unn
z^I!{eNCrH+G`;#emw4&>)Twmc-{o6$^Xa9FuXwT#5e6aCshi2AYy0mPSz#%;Xc?DS
zE^K?QTr}-B=Lz=Q%-Dk6a7s7>ib0T+3){$Z0rH%e3#*xLB)PElCAd^%2IEeOX4sc8
z&OA;;m)}@4wlRkkjqc@X(fH~zul~QOQ>kdQ+xaHl{Oje{k&VA&5Gfm2wSIX@Jen*X
z|9nNtMr)32RIa=+N1$k%8B^L;(<tE!sR_v%(q(xToD&Sk%r}x?IQ9}ODhP(dI+xI<
z13hlfW5eIyoDB~#hZKzP%CunYUtz&Gp-!cOahz|_&7ZHlj$B}=CdNrc!?3SFG+?_d
zovjsd=hF%q8VWv014<b8HIsD`8vg?lbwD0kj38I{SVJ0v(kAe$H3R88<vVg7mQ$ov
z3d+7Q5??x2Xd&a7B6(0dCrKouhGp@<e{jqY32e$-Q(77KV>o@ynQMB0OB<BD2KXuo
zxyf*~0-Sj_UpiGA)<){<{LbOtx8@F{K~BQ}@|f!mOe57Lor0zgr+`D8d4wzjm^t)a
zj=2}%=t59z5t2USswJld00)>CtPq}N1l+0|?sJksz-^Y9ha2m_EqZHxjQ{|Ykg@)+
z>;Fcd*Z*B=Bd)Tr;9biQsLgo*iSPcYl7@vcM88O=GM$wjv8nt)nTAlE(w7k5TKZh0
zy5It*`3=LLsV9uksLF1qPbBFw$g^bbqi`4|6(@#mIy#9o?f@B%NN@BYi1}1rG}9iY
z(W6*8o``VCTRy!8xp*?Uhd3uWtcPVjHv;gSIYUG$IHLX-AuX~}uHTHJB`g<dK+4m|
zTRismb`wr1suWO1kPeaN-XRpoWtY}UVHmEd+0JD)Rd$h$1f1&ExC^-Gv@!K?RBur^
zTo`~jH#(9bGh2K}=Sc$BH3YNB88qMJqlTIm9HsxFqw*hkYJZBSva~7nVNI{6%1H1M
zIao;L(YYgckBd(5iK<ep^ab*PTjC}%fpklQ0%jQ4LJ$r98BP2JeX`Pb>At1u;9cGN
zD;f|2r;p!r4GVo{ki$)MbHi-O(Vn9#IhTNJZThGxT?l-bcnK?@NwcKKz>QIbf+7kR
zA_2aX9eHM8i9{6;hbpkk#*&w_C{2r7ni^^xQBK%}unfi?iW}2d1QK$j|8O0&v|4Uj
zjhB#7rcJZ)v(Xb-^}^Db$!zIr&sX%NVR2PCH4fB?FCm3E#jT|SQzLHbQCY(5_I_V>
zpkf3R-!N+8f*ITmg{E`^l<%nRsy>~e8ve+4`g(|HdI5gnj$f66K3$JXH|b`lr;SG_
z74dQk$T1Au&8u;3PmLnqvSJd|4!naT8=G=dQKNvvpQ{9ea286k@Lealb=m<-D?&Ji
zkzVkb#kQe~)gh~zs}Y^iRa6nBm9<n*N{AAInyhqcmg3Q*vPATp6j_x>B(jN2It;U>
zGJp$dwTs7BHz}8$0M%~k1aq`6BBp8OEmt(XmhR0B!bQJG3*_v~SA($Q4zyV^l{Yv0
z-Z^t~B;TFE#7&Mkx(MON-N<JpER$>)lXsg9T7wEkD2-CIOt_&Mp?(M{p{$}R!3h-}
zmlfSv^-xU*<sq*wBbP!&#I;xv=m-4}e=-2p>u}GF&%^`1ude=X!DfAx#GHb?6wS@b
z{SFtbhHT}zi|?ro6r1zk6`Le{>1EiaV>WRak#gpnYCwF>AAnsyK;jXZLaZz8GI<1m
z&)0p^n`R}Vf9^IdZ#%Mj>az39y$(18E^!)iYR~A;K1e+v?mhhqiA;G#d6CHUsW+8x
zjc`K_HGkfnRW8Ij^{I3#JurTPQZZD-NsT8V_G3RDWz%G_cE7)>1`P4XET}{q8wie4
zUU!BnoQN$&%4x6Fs;JB?@=#i&UYvk>sU+nRH^nJumr+><G9jUmq#18WDIcN=5i?O$
zpGpA+vk+V{+`d3?%JB<oAJ`w@FjE1)pb`}L#V|7bV%-KBKtMu*lnFqgClnDZK4GMi
z0ug#k0Tu~s04^S2H2y;o1bMP|`AK0keo`2Xo)ks{<Pmsee@s^56X;`Wh*IXe??&&)
z`eFu2FK9kT0vJs1an#$Q2tWNv4714)tKRP4qd}--%6^Oh3!x%HLp;PQbfzG?Zl2L6
zBpMhFsgODu0)(h6j=2+RGkHjSXfp0X7Q&F_!x{8Sdt-UH<jQm4k%hr=y_Eo%Y1#B;
z0>SJHL9hj)00Bm6H3A!&)*WcQkSsPzJcc9OyqqDMnK4hH!+dl`W|&cm+Xpbyq{EQ2
z9<p&hnabV*z$nK6HIVFh<j0ZYQ%$lQ5`Vn{7ka4@n5SPb16PdB8T~?I43CfDN^+SD
z_gBs-!yr=DGdP;U2}HY4g39E^VgbDup(n+M3x*0W024El2#!Z5nj0fl2Naxw$FJtw
z``5ydEgcmizYm7wVuch#F5pfHl$`$tJGT;2W^j_w*!;IL(Sw{6AmW18q-n{Y3<XO0
zcEU%b!LCDpI6H7i?;>!6>ou&Mj7qe^D)F6mpESO$OD*_0lniM>gFv@*QKh2nze{RJ
zM>C)vH}&7Gw}X2$1N*dGW!X#v(F@2<4JYd#x>j;={gXTMaKkbrJL7E0-H?^21E2=D
zJ#@_G8fx4b$;ty3tYez}n*dS_tLX2j(51!&Fm9R6E-I;s_n|ffb_M}Dd6R{A5k`p}
zk_C%MH)BD!>9w*>%jr8nvjl}jLy8+MuXUGTdyx^pE6YizPdLqf-YB*9Fv}^sQ&w{=
zue#N;fS)PbGYk1v*jIF=nO+ddgr>Kf5DU^d7DUb}T}WC$XqR|!UaaT8Lze(v(q*;j
Jlg4)v{ue_R40-?n

literal 0
HcmV?d00001

diff --git a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el
new file mode 100644
index 000000000..4f25d3c12
--- /dev/null
+++ b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el
@@ -0,0 +1,61 @@
+;;; rainbow-delimiters-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (global-rainbow-delimiters-mode rainbow-delimiters-mode-disable
+;;;;;;  rainbow-delimiters-mode-enable rainbow-delimiters-mode) "rainbow-delimiters"
+;;;;;;  "rainbow-delimiters.el" (21130 14442 0 0))
+;;; Generated autoloads from rainbow-delimiters.el
+
+(autoload 'rainbow-delimiters-mode "rainbow-delimiters" "\
+Highlight nested parentheses, brackets, and braces according to their depth.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'rainbow-delimiters-mode-enable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'rainbow-delimiters-mode-disable "rainbow-delimiters" "\
+
+
+\(fn)" nil nil)
+
+(defvar global-rainbow-delimiters-mode nil "\
+Non-nil if Global-Rainbow-Delimiters mode is enabled.
+See the command `global-rainbow-delimiters-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `global-rainbow-delimiters-mode'.")
+
+(custom-autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" nil)
+
+(autoload 'global-rainbow-delimiters-mode "rainbow-delimiters" "\
+Toggle Rainbow-Delimiters mode in all buffers.
+With prefix ARG, enable Global-Rainbow-Delimiters mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Rainbow-Delimiters mode is enabled in all buffers where
+`rainbow-delimiters-mode-enable' would do it.
+See `rainbow-delimiters-mode' for more information on Rainbow-Delimiters mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("rainbow-delimiters-pkg.el") (21130 14442
+;;;;;;  625138 0))
+
+;;;***
+
+(provide 'rainbow-delimiters-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; rainbow-delimiters-autoloads.el ends here
diff --git a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el
new file mode 100644
index 000000000..ceaf273b3
--- /dev/null
+++ b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el
@@ -0,0 +1 @@
+(define-package "rainbow-delimiters" "20131015.1304" "Highlight nested parens, brackets, braces a different color at each depth. [github]" (quote nil))
diff --git a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el
new file mode 100644
index 000000000..4a8b46249
--- /dev/null
+++ b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el
@@ -0,0 +1,544 @@
+;;; rainbow-delimiters.el --- Highlight nested parens, brackets, braces a different color at each depth.
+
+;; Copyright (C) 2010-2013 Jeremy Rayman.
+;; Author: Jeremy Rayman <opensource@jeremyrayman.com>
+;; Maintainer: Jeremy Rayman <opensource@jeremyrayman.com>
+;; Created: 2010-09-02
+;; Version: 20131015.1304
+;; X-Original-Version: 1.3.4
+;; Keywords: faces, convenience, lisp, matching, tools, rainbow, rainbow parentheses, rainbow parens
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+;; URL: http://github.com/jlr/rainbow-delimiters/raw/master/rainbow-delimiters.el
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+;; Rainbow-delimiters is a “rainbow parentheses�-like mode which highlights
+;; parentheses, brackets, and braces according to their depth. Each
+;; successive level is highlighted in a different color. This makes it easy
+;; to spot matching delimiters, orient yourself in the code, and tell which
+;; statements are at a given level.
+;;
+;; Great care has been taken to make this mode FAST. You shouldn't see
+;; any discernible change in scrolling or editing speed while using it,
+;; even in delimiter-rich languages like Clojure, Lisp, and Scheme.
+;;
+;; Default colors are subtle, with the philosophy that syntax highlighting
+;; shouldn't be visually intrusive. Color schemes are always a matter of
+;; taste.  If you take the time to design a new color scheme, please share
+;; (even a simple list of colors works) on the EmacsWiki page or via github.
+;; EmacsWiki: http://www.emacswiki.org/emacs/RainbowDelimiters
+;; Github: http://github.com/jlr/rainbow-delimiters
+
+
+;;; Installation:
+
+;; 1. Place rainbow-delimiters.el on your emacs load-path.
+;;
+;; 2. Compile the file (necessary for speed):
+;; M-x byte-compile-file <location of rainbow-delimiters.el>
+;;
+;; 3. Add the following to your dot-emacs/init file:
+;; (require 'rainbow-delimiters)
+;;
+;; 4. Activate the mode in your init file.
+;;    You can choose to enable it only in certain modes, or Emacs-wide:
+;;
+;; - To enable it only in certain modes, add lines like the following:
+;; (add-hook 'clojure-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To enable it in all programming-related emacs modes (Emacs 24+):
+;; (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+;;
+;; - To activate the mode globally, add to your init file:
+;; (global-rainbow-delimiters-mode)
+;;
+;; - To temporarily activate rainbow-delimiters mode in an open buffer:
+;; M-x rainbow-delimiters-mode
+;;
+;; - To toggle global-rainbow-delimiters-mode:
+;; M-x global-rainbow-delimiters-mode
+
+;;; Customization:
+
+;; To customize various options, including the color scheme:
+;; M-x customize-group rainbow-delimiters
+;;
+;; deftheme / color-theme.el users:
+;; You can specify custom colors by adding the appropriate faces to your theme.
+;; - Faces take the form of:
+;;   'rainbow-delimiters-depth-#-face' with # being the depth.
+;;   Depth begins at 1, the outermost color.
+;;   Faces exist for depths 1-9.
+;; - The unmatched delimiter face (normally colored red) is:
+;;   'rainbow-delimiters-unmatched-face'
+
+
+;;; Change Log:
+
+;; 1.0 - Initial release.
+;; 1.1 - Stop tracking each delimiter's depth independently.
+;;       This had lead to confusing results when viewing clojure
+;;       code. Instead, just color based on current nesting inside
+;;       all delimiters combined.
+;;     - Added 'all-delimiters' faces to apply a color scheme to
+;;       all delimiters at once. Other faces inherit from this group.
+;; 1.1.1 - Change color scheme to a lighter, more subtle style.
+;; 1.1.2: (2011-03-25)
+;;  - Add an unmatched-delimiter face and correct problem with
+;;    coloring of text following unmatched closing delims.
+;; 1.2: (2011-03-28)
+;;  - Unify delimiter faces: all delimiter types now use the same depth
+;;    faces, of form 'rainbow-delimiters-depth-#-face'.
+;; 1.2.1: (2011-03-29)
+;;  - Conform to ELPA conventions.
+;; 1.3: (2011-05-24)
+;;  - Add separate color schemes for light and dark background modes.
+;;  - Checkboxes to enable/disable highlighting for each delimiter type.
+;;  - Improvements to Customize interface.
+;;  - Infinite depth support by cycling through defined faces repeatedly.
+;;  - Documentation changes.
+;; 1.3.1 (2011-05-25)
+;;  - Light color theme appears entirely grey on SRGB monitors. Revert to
+;;    old color theme until a nicer light background theme can be added.
+;;  - Correct typo in the installation step for users of dark backgrounds.
+;; 1.3.2 (2011-10-14)
+;;  - Add 'global-rainbow-delimiters-mode'.
+;;  - Respect syntax of current buffer major-mode so delimiters
+;;    highlight correctly in non-lisp languages.
+;; 1.3.3 (2011-11-25)
+;;  - Backwards compatibility with Emacs versions prior to 23.2.
+;;    Defines "with-silent-modifications" if undefined.
+;; 1.3.4 (2012-04-27)
+;;  - Further optimize highlighting speed. Benchmarks show 2x improvement.
+;;  - Color scheme for light backgrounds.
+;;  - Eliminate bottleneck seen in certain large files.
+;;    A large file which revealed this bottleneck now highlights ~40x faster.
+;;  - Correct broken/incorrect highlighting reported in certain languages.
+
+;;; TODO:
+
+;; - Add support for independent depth tracking of each delimiter type
+;;   for users of C-like languages.
+;; - Python style - increase depth with each new indentation.
+;; - Add support for nested tags (XML, HTML)
+;; - Set up proper example defthemes for rainbow-delimiters faces.
+;; - Intelligent support for other languages: Ruby, LaTeX tags, et al.
+
+;;; Issues:
+
+;; - Rainbow-delimiters mode does not appear to change the color of
+;;   delimiters when Org-mode is also enabled.
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+
+;; Note: some of the functions in this file have been inlined for speed.
+;; Inlining functions can cause problems with debugging. To debug these
+;; functions more easily, change defsubst -> defun.
+;; http://www.gnu.org/s/emacs/manual/html_node/elisp/Compilation-Tips.html
+
+;;; Customize interface:
+
+(defgroup rainbow-delimiters nil
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  :prefix "rainbow-delimiters-"
+  :link '(url-link :tag "Website for rainbow-delimiters (EmacsWiki)"
+                   "http://www.emacswiki.org/emacs/RainbowDelimiters")
+  :group 'applications)
+
+(defgroup rainbow-delimiters-faces nil
+  "Faces for successively nested pairs of delimiters.
+
+When depth exceeds innermost defined face, colors cycle back through."
+  :tag "Color Scheme"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Toggle Delimiters" "rainbow-delimiters-toggle-delimiter-highlighting")
+  :prefix 'rainbow-delimiters-faces-)
+
+;; Choose which delimiters you want to highlight in your preferred language:
+
+(defgroup rainbow-delimiters-toggle-delimiter-highlighting nil
+  "Choose which delimiters to highlight."
+  :tag "Toggle Delimiters"
+  :group 'rainbow-delimiters
+  :link '(custom-group-link "rainbow-delimiters")
+  :link '(custom-group-link :tag "Color Scheme" "rainbow-delimiters-faces"))
+
+(defcustom rainbow-delimiters-highlight-parens-p t
+  "Enable highlighting of nested parentheses -- ().
+
+Non-nil (default) enables highlighting of parentheses.
+Nil disables parentheses highlighting."
+  :tag "Highlight Parentheses?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-brackets-p t
+  "Enable highlighting of nested brackets -- [].
+
+Non-nil (default) enables highlighting of brackets.
+Nil disables bracket highlighting."
+  :tag "Highlight Brackets?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+(defcustom rainbow-delimiters-highlight-braces-p t
+  "Enable highlighting of nested braces -- {}.
+
+Non-nil (default) enables highlighting of braces.
+Nil disables brace highlighting."
+  :tag "Highlight Braces?"
+  :type 'boolean
+  :group 'rainbow-delimiters-toggle-delimiter-highlighting)
+
+
+;;; Faces:
+
+;; Unmatched delimiter face:
+(defface rainbow-delimiters-unmatched-face
+  '((((background light)) (:foreground "#88090B"))
+    (((background dark)) (:foreground "#88090B")))
+  "Face to highlight unmatched closing delimiters in."
+  :group 'rainbow-delimiters-faces)
+
+;; Faces for highlighting delimiters by nested level:
+(defface rainbow-delimiters-depth-1-face
+  '((((background light)) (:foreground "#707183"))
+    (((background dark)) (:foreground "grey55")))
+  "Nested delimiters face, depth 1 - outermost set."
+  :tag "Rainbow Delimiters Depth 1 Face -- OUTERMOST"
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-2-face
+  '((((background light)) (:foreground "#7388d6"))
+    (((background dark)) (:foreground "#93a8c6")))
+  "Nested delimiters face, depth 2."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-3-face
+  '((((background light)) (:foreground "#909183"))
+    (((background dark)) (:foreground "#b0b1a3")))
+  "Nested delimiters face, depth 3."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-4-face
+  '((((background light)) (:foreground "#709870"))
+    (((background dark)) (:foreground "#97b098")))
+  "Nested delimiters face, depth 4."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-5-face
+  '((((background light)) (:foreground "#907373"))
+    (((background dark)) (:foreground "#aebed8")))
+  "Nested delimiters face, depth 5."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-6-face
+  '((((background light)) (:foreground "#6276ba"))
+    (((background dark)) (:foreground "#b0b0b3")))
+  "Nested delimiters face, depth 6."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-7-face
+  '((((background light)) (:foreground "#858580"))
+    (((background dark)) (:foreground "#90a890")))
+  "Nested delimiters face, depth 7."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-8-face
+  '((((background light)) (:foreground "#80a880"))
+    (((background dark)) (:foreground "#a2b6da")))
+  "Nested delimiters face, depth 8."
+  :group 'rainbow-delimiters-faces)
+
+(defface rainbow-delimiters-depth-9-face
+  '((((background light)) (:foreground "#887070"))
+    (((background dark)) (:foreground "#9cb6ad")))
+  "Nested delimiters face, depth 9."
+  :group 'rainbow-delimiters-faces)
+
+;;; Faces 10+:
+;; NOTE: Currently unused. Additional faces for depths 9+ can be added on request.
+
+(defconst rainbow-delimiters-max-face-count 9
+  "Number of faces defined for highlighting delimiter levels.
+
+Determines depth at which to cycle through faces again.")
+
+(defvar rainbow-delimiters-outermost-only-face-count 0
+  "Number of faces to be used only for N outermost delimiter levels.
+
+This should be smaller than `rainbow-delimiters-max-face-count'.")
+
+;;; Face utility functions
+
+(defsubst rainbow-delimiters-depth-face (depth)
+  "Return face-name for DEPTH as a string 'rainbow-delimiters-depth-DEPTH-face'.
+
+For example: 'rainbow-delimiters-depth-1-face'."
+  (intern-soft
+   (concat "rainbow-delimiters-depth-"
+           (number-to-string
+            (or
+             ;; Our nesting depth has a face defined for it.
+             (and (<= depth rainbow-delimiters-max-face-count)
+                  depth)
+             ;; Deeper than # of defined faces; cycle back through to
+             ;; `rainbow-delimiters-outermost-only-face-count' + 1.
+             ;; Return face # that corresponds to current nesting level.
+             (+ 1 rainbow-delimiters-outermost-only-face-count
+                (mod (- depth rainbow-delimiters-max-face-count 1)
+                     (- rainbow-delimiters-max-face-count
+                        rainbow-delimiters-outermost-only-face-count)))))
+           "-face")))
+
+;;; Nesting level
+
+(defvar rainbow-delimiters-syntax-table nil
+  "Syntax table (inherited from buffer major-mode) which uses all delimiters.
+
+When rainbow-delimiters-minor-mode is first activated, it sets this variable and
+the other rainbow-delimiters specific syntax tables based on the current
+major-mode. The syntax table is constructed by the function
+'rainbow-delimiters-make-syntax-table'.")
+
+;; syntax-table: used with syntax-ppss for determining current depth.
+(defun rainbow-delimiters-make-syntax-table (syntax-table)
+  "Inherit SYNTAX-TABLE and add delimiters intended to be highlighted by mode."
+  (let ((table (copy-syntax-table syntax-table)))
+    (modify-syntax-entry ?\( "()  " table)
+    (modify-syntax-entry ?\) ")(  " table)
+    (modify-syntax-entry ?\[ "(]" table)
+    (modify-syntax-entry ?\] ")[" table)
+    (modify-syntax-entry ?\{ "(}" table)
+    (modify-syntax-entry ?\} "){" table)
+    table))
+
+(defsubst rainbow-delimiters-depth (loc)
+  "Return # of nested levels of parens, brackets, braces LOC is inside of."
+  (let ((depth
+         (with-syntax-table rainbow-delimiters-syntax-table
+           (car (syntax-ppss loc)))))
+    (if (>= depth 0)
+        depth
+      0))) ; ignore negative depths created by unmatched closing parens.
+
+
+;;; Text properties
+
+;; Backwards compatibility: Emacs < v23.2 lack macro 'with-silent-modifications'.
+(eval-and-compile
+  (unless (fboundp 'with-silent-modifications)
+    (defmacro with-silent-modifications (&rest body)
+      "Defined by rainbow-delimiters.el for backwards compatibility with Emacs < 23.2.
+ Execute BODY, pretending it does not modify the buffer.
+If BODY performs real modifications to the buffer's text, other
+than cosmetic ones, undo data may become corrupted.
+
+This macro will run BODY normally, but doesn't count its buffer
+modifications as being buffer modifications.  This affects things
+like buffer-modified-p, checking whether the file is locked by
+someone else, running buffer modification hooks, and other things
+of that nature.
+
+Typically used around modifications of text-properties which do
+not really affect the buffer's content."
+      (declare (debug t) (indent 0))
+      (let ((modified (make-symbol "modified")))
+        `(let* ((,modified (buffer-modified-p))
+                (buffer-undo-list t)
+                (inhibit-read-only t)
+                (inhibit-modification-hooks t)
+                deactivate-mark
+                ;; Avoid setting and removing file locks and checking
+                ;; buffer's uptodate-ness w.r.t the underlying file.
+                buffer-file-name
+                buffer-file-truename)
+           (unwind-protect
+               (progn
+                 ,@body)
+             (unless ,modified
+               (restore-buffer-modified-p nil))))))))
+
+(defsubst rainbow-delimiters-propertize-delimiter (loc depth)
+  "Highlight a single delimiter at LOC according to DEPTH.
+
+LOC is the location of the character to add text properties to.
+DEPTH is the nested depth at LOC, which determines the face to use.
+
+Sets text properties:
+`font-lock-face' to the appropriate delimiter face.
+`rear-nonsticky' to prevent color from bleeding into subsequent characters typed by the user."
+  (with-silent-modifications
+    (let ((delim-face (if (<= depth 0)
+                          'rainbow-delimiters-unmatched-face
+                        (rainbow-delimiters-depth-face depth))))
+      ;; (when (eq depth -1) (message "Unmatched delimiter at char %s." loc))
+      (add-text-properties loc (1+ loc)
+                           `(font-lock-face ,delim-face
+                             rear-nonsticky t)))))
+
+
+(defsubst rainbow-delimiters-unpropertize-delimiter (loc)
+  "Remove text properties set by rainbow-delimiters mode from char at LOC."
+  (with-silent-modifications
+    (remove-text-properties loc (1+ loc)
+                            '(font-lock-face nil
+                              rear-nonsticky nil))))
+
+(defvar rainbow-delimiters-escaped-char-predicate nil)
+(make-variable-buffer-local 'rainbow-delimiters-escaped-char-predicate)
+
+(defvar rainbow-delimiters-escaped-char-predicate-list
+  '((emacs-lisp-mode . rainbow-delimiters-escaped-char-predicate-emacs-lisp)
+    (inferior-emacs-lisp-mode . rainbow-delimiters-escaped-char-predicate-emacs-lisp)
+    (lisp-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    (scheme-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    (clojure-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    (inferior-scheme-mode . rainbow-delimiters-escaped-char-predicate-lisp)
+    ))
+
+(defun rainbow-delimiters-escaped-char-predicate-emacs-lisp (loc)
+  (or (and (eq (char-before loc) ?\?) ; e.g. ?) - deprecated, but people use it
+           (not (and (eq (char-before (1- loc)) ?\\) ; special case: ignore ?\?
+                     (eq (char-before (- loc 2)) ?\?))))
+      (and (eq (char-before loc) ?\\) ; escaped char, e.g. ?\) - not counted
+           (eq (char-before (1- loc)) ?\?))))
+
+(defun rainbow-delimiters-escaped-char-predicate-lisp (loc)
+  (eq (char-before loc) ?\\))
+
+(defsubst rainbow-delimiters-char-ineligible-p (loc)
+  "Return t if char at LOC should be skipped, e.g. if inside a comment.
+
+Returns t if char at loc meets one of the following conditions:
+- Inside a string.
+- Inside a comment.
+- Is an escaped char, e.g. ?\)"
+  (let ((parse-state (syntax-ppss loc)))
+    (or
+     (nth 3 parse-state)                ; inside string?
+     (nth 4 parse-state)                ; inside comment?
+     (and rainbow-delimiters-escaped-char-predicate
+          (funcall rainbow-delimiters-escaped-char-predicate loc)))))
+
+
+(defsubst rainbow-delimiters-apply-color (delim depth loc)
+  "Apply color for DEPTH to DELIM at LOC following user settings.
+
+DELIM is a string specifying delimiter type.
+DEPTH is the delimiter depth, or corresponding face # if colors are repeating.
+LOC is location of character (delimiter) to be colorized."
+  (and
+   ;; Ensure user has enabled highlighting of this delimiter type.
+   (symbol-value (intern-soft
+                  (concat "rainbow-delimiters-highlight-" delim "s-p")))
+   (rainbow-delimiters-propertize-delimiter loc
+                                            depth)))
+
+
+;;; JIT-Lock functionality
+
+;; Used to skip delimiter-by-delimiter `rainbow-delimiters-propertize-region'.
+(defconst rainbow-delimiters-delim-regex "\\(\(\\|\)\\|\\[\\|\\]\\|\{\\|\}\\)"
+  "Regex matching all opening and closing delimiters the mode highlights.")
+
+;; main function called by jit-lock:
+(defsubst rainbow-delimiters-propertize-region (start end)
+  "Highlight delimiters in region between START and END.
+
+Used by jit-lock for dynamic highlighting."
+  (setq rainbow-delimiters-escaped-char-predicate
+        (cdr (assoc major-mode rainbow-delimiters-escaped-char-predicate-list)))
+  (save-excursion
+    (goto-char start)
+    ;; START can be anywhere in buffer; determine the nesting depth at START loc
+    (let ((depth (rainbow-delimiters-depth start)))
+      (while (and (< (point) end)
+                  (re-search-forward rainbow-delimiters-delim-regex end t))
+        (backward-char) ; re-search-forward places point after delim; go back.
+        (unless (rainbow-delimiters-char-ineligible-p (point))
+          (let ((delim (char-after (point))))
+            (cond ((eq ?\( delim)       ; (
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "paren" depth (point)))
+                  ((eq ?\) delim)       ; )
+                   (rainbow-delimiters-apply-color "paren" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched paren
+                                   (1- depth))))
+                  ((eq ?\[ delim)       ; [
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "bracket" depth (point)))
+                  ((eq ?\] delim)       ; ]
+                   (rainbow-delimiters-apply-color "bracket" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched bracket
+                                   (1- depth))))
+                  ((eq ?\{ delim)       ; {
+                   (setq depth (1+ depth))
+                   (rainbow-delimiters-apply-color "brace" depth (point)))
+                  ((eq ?\} delim)       ; }
+                   (rainbow-delimiters-apply-color "brace" depth (point))
+                   (setq depth (or (and (<= depth 0) 0) ; unmatched brace
+                                   (1- depth)))))))
+        ;; move past delimiter so re-search-forward doesn't pick it up again
+        (forward-char)))))
+
+(defun rainbow-delimiters-unpropertize-region (start end)
+  "Remove highlighting from delimiters between START and END."
+  (save-excursion
+    (goto-char start)
+    (while (and (< (point) end)
+                (re-search-forward rainbow-delimiters-delim-regex end t))
+      ;; re-search-forward places point 1 further than the delim matched:
+      (rainbow-delimiters-unpropertize-delimiter (1- (point))))))
+
+
+;;; Minor mode:
+
+;;;###autoload
+(define-minor-mode rainbow-delimiters-mode
+  "Highlight nested parentheses, brackets, and braces according to their depth."
+  nil "" nil ; No modeline lighter - it's already obvious when the mode is on.
+  (if (not rainbow-delimiters-mode)
+      (progn
+        (jit-lock-unregister 'rainbow-delimiters-propertize-region)
+        (rainbow-delimiters-unpropertize-region (point-min) (point-max)))
+    (jit-lock-register 'rainbow-delimiters-propertize-region t)
+    ;; Create necessary syntax tables inheriting from current major-mode.
+    (set (make-local-variable 'rainbow-delimiters-syntax-table)
+         (rainbow-delimiters-make-syntax-table (syntax-table)))))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-enable ()
+  (rainbow-delimiters-mode 1))
+
+;;;###autoload
+(defun rainbow-delimiters-mode-disable ()
+  (rainbow-delimiters-mode 0))
+
+;;;###autoload
+(define-globalized-minor-mode global-rainbow-delimiters-mode
+  rainbow-delimiters-mode rainbow-delimiters-mode-enable)
+
+(provide 'rainbow-delimiters)
+
+;;; rainbow-delimiters.el ends here.
diff --git a/elpa/s-1.7.0/s-autoloads.el b/elpa/s-1.7.0/s-autoloads.el
new file mode 100644
index 000000000..b832d58a6
--- /dev/null
+++ b/elpa/s-1.7.0/s-autoloads.el
@@ -0,0 +1,18 @@
+;;; s-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil nil ("s-pkg.el" "s.el") (21077 32440 527954
+;;;;;;  0))
+
+;;;***
+
+(provide 's-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; s-autoloads.el ends here
diff --git a/elpa/s-1.7.0/s-pkg.el b/elpa/s-1.7.0/s-pkg.el
new file mode 100644
index 000000000..94c1d0179
--- /dev/null
+++ b/elpa/s-1.7.0/s-pkg.el
@@ -0,0 +1 @@
+(define-package "s" "1.7.0" "The long lost Emacs string manipulation library." (quote nil))
diff --git a/elpa/s-1.7.0/s.el b/elpa/s-1.7.0/s.el
new file mode 100644
index 000000000..995f620b0
--- /dev/null
+++ b/elpa/s-1.7.0/s.el
@@ -0,0 +1,538 @@
+;;; s.el --- The long lost Emacs string manipulation library.
+
+;; Copyright (C) 2012 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 1.7.0
+;; Keywords: strings
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; The long lost Emacs string manipulation library.
+;;
+;; See documentation on https://github.com/magnars/s.el#functions
+
+;;; Code:
+
+(defun s-trim-left (s)
+  "Remove whitespace at the beginning of S."
+  (if (string-match "\\`[ \t\n\r]+" s)
+      (replace-match "" t t s)
+    s))
+
+(defun s-trim-right (s)
+  "Remove whitespace at the end of S."
+  (if (string-match "[ \t\n\r]+\\'" s)
+      (replace-match "" t t s)
+    s))
+
+(defun s-trim (s)
+  "Remove whitespace at the beginning and end of S."
+  (s-trim-left (s-trim-right s)))
+
+(defun s-collapse-whitespace (s)
+  "Convert all adjacent whitespace characters to a single space."
+  (replace-regexp-in-string "[ \t\n\r]+" " " s))
+
+(defun s-split (separator s &optional omit-nulls)
+  "Split S into substrings bounded by matches for regexp SEPARATOR.
+If OMIT-NULLS is t, zero-length substrings are omitted.
+
+This is a simple wrapper around the built-in `split-string'."
+  (split-string s separator omit-nulls))
+
+(defun s-lines (s)
+  "Splits S into a list of strings on newline characters."
+  (s-split "\\(\r\n\\|[\n\r]\\)" s))
+
+(defun s-join (separator strings)
+  "Join all the strings in STRINGS with SEPARATOR in between."
+  (mapconcat 'identity strings separator))
+
+(defun s-concat (&rest strings)
+  "Join all the string arguments into one string."
+  (apply 'concat strings))
+
+(defun s-prepend (prefix s)
+  "Concatenate PREFIX and S."
+  (concat prefix s))
+
+(defun s-append (suffix s)
+  "Concatenate S and SUFFIX."
+  (concat s suffix))
+
+(defun s-repeat (num s)
+  "Make a string of S repeated NUM times."
+  (let (ss)
+    (while (> num 0)
+      (setq ss (cons s ss))
+      (setq num (1- num)))
+    (apply 'concat ss)))
+
+(defun s-chop-suffix (suffix s)
+  "Remove SUFFIX if it is at end of S."
+  (let ((pos (- (length suffix))))
+    (if (and (>= (length s) (length suffix))
+             (string= suffix (substring s pos)))
+        (substring s 0 pos)
+      s)))
+
+(defun s-chop-suffixes (suffixes s)
+  "Remove SUFFIXES one by one in order, if they are at the end of S."
+  (while suffixes
+    (setq s (s-chop-suffix (car suffixes) s))
+    (setq suffixes (cdr suffixes)))
+  s)
+
+(defun s-chop-prefix (prefix s)
+  "Remove PREFIX if it is at the start of S."
+  (let ((pos (length prefix)))
+    (if (and (>= (length s) (length prefix))
+             (string= prefix (substring s 0 pos)))
+        (substring s pos)
+      s)))
+
+(defun s-chop-prefixes (prefixes s)
+  "Remove PREFIXES one by one in order, if they are at the start of S."
+  (while prefixes
+    (setq s (s-chop-prefix (car prefixes) s))
+    (setq prefixes (cdr prefixes)))
+  s)
+
+(defun s-shared-start (s1 s2)
+  "Returns the longest prefix S1 and S2 have in common."
+  (let ((search-length (min (length s1) (length s2)))
+        (i 0))
+    (while (and (< i search-length)
+                (= (aref s1 i) (aref s2 i)))
+      (setq i (1+ i)))
+    (substring s1 0 i)))
+
+(defun s-shared-end (s1 s2)
+  "Returns the longest suffix S1 and S2 have in common."
+  (let* ((l1 (length s1))
+         (l2 (length s2))
+         (search-length (min l1 l2))
+         (i 0))
+    (while (and (< i search-length)
+                (= (aref s1 (- l1 i 1)) (aref s2 (- l2 i 1))))
+      (setq i (1+ i)))
+    ;; If I is 0, then it means that there's no common suffix between
+    ;; S1 and S2.
+    ;;
+    ;; However, since (substring s (- 0)) will return the whole
+    ;; string, `s-shared-end' should simply return the empty string
+    ;; when I is 0.
+    (if (zerop i)
+        ""
+      (substring s1 (- i)))))
+
+(defun s-chomp (s)
+  "Remove one trailing `\\n`, `\\r` or `\\r\\n` from S."
+  (s-chop-suffixes '("\n" "\r") s))
+
+(defun s-truncate (len s)
+  "If S is longer than LEN, cut it down to LEN - 3 and add ... at the end."
+  (if (> (length s) len)
+      (format "%s..." (substring s 0 (- len 3)))
+    s))
+
+(defun s-word-wrap (len s)
+  "If S is longer than LEN, wrap the words with newlines."
+  (with-temp-buffer
+    (insert s)
+    (let ((fill-column len))
+      (fill-region (point-min) (point-max)))
+    (buffer-substring-no-properties (point-min) (point-max))))
+
+(defun s-center (len s)
+  "If S is shorter than LEN, pad it with spaces so it is centered."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat
+     (make-string (ceiling extra 2) ? )
+     s
+     (make-string (floor extra 2) ? ))))
+
+(defun s-pad-left (len padding s)
+  "If S is shorter than LEN, pad it with PADDING on the left."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat (make-string extra (string-to-char padding))
+            s)))
+
+(defun s-pad-right (len padding s)
+  "If S is shorter than LEN, pad it with PADDING on the right."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat s
+            (make-string extra (string-to-char padding)))))
+
+(defun s-left (len s)
+  "Returns up to the LEN first chars of S."
+  (if (> (length s) len)
+      (substring s 0 len)
+    s))
+
+(defun s-right (len s)
+  "Returns up to the LEN last chars of S."
+  (let ((l (length s)))
+    (if (> l len)
+        (substring s (- l len) l)
+      s)))
+
+(defun s-ends-with? (suffix s &optional ignore-case)
+  "Does S end with SUFFIX?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences.
+
+Alias: `s-suffix?'"
+  (let ((start-pos (- (length s) (length suffix))))
+    (and (>= start-pos 0)
+         (eq t (compare-strings suffix nil nil
+                                s start-pos nil ignore-case)))))
+
+(defalias 's-ends-with-p 's-ends-with?)
+
+(defun s-starts-with? (prefix s &optional ignore-case)
+  "Does S start with PREFIX?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences.
+
+Alias: `s-prefix?'. This is a simple wrapper around the built-in
+`string-prefix-p'."
+  (string-prefix-p prefix s ignore-case))
+
+(defalias 's-starts-with-p 's-starts-with?)
+
+(defalias 's-suffix? 's-ends-with?)
+(defalias 's-prefix? 's-starts-with?)
+(defalias 's-suffix-p 's-ends-with?)
+(defalias 's-prefix-p 's-starts-with?)
+
+(defun s--truthy? (val)
+  (not (null val)))
+
+(defun s-contains? (needle s &optional ignore-case)
+  "Does S contain NEEDLE?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+  (let ((case-fold-search ignore-case))
+    (s--truthy? (string-match-p (regexp-quote needle) s))))
+
+(defalias 's-contains-p 's-contains?)
+
+(defun s-equals? (s1 s2)
+  "Is S1 equal to S2?
+
+This is a simple wrapper around the built-in `string-equal'."
+  (string-equal s1 s2))
+
+(defalias 's-equals-p 's-equals?)
+
+(defun s-less? (s1 s2)
+  "Is S1 less than S2?
+
+This is a simple wrapper around the built-in `string-lessp'."
+  (string-lessp s1 s2))
+
+(defalias 's-less-p 's-less?)
+
+(defun s-matches? (regexp s &optional start)
+  "Does REGEXP match S?
+If START is non-nil the search starts at that index.
+
+This is a simple wrapper around the built-in `string-match-p'."
+  (s--truthy? (string-match-p regexp s start)))
+
+(defalias 's-matches-p 's-matches?)
+
+(defun s-blank? (s)
+  "Is S nil or the empty string?"
+  (or (null s) (string= "" s)))
+
+(defun s-lowercase? (s)
+  "Are all the letters in S in lower case?"
+  (let ((case-fold-search nil))
+    (not (string-match-p "[[:upper:]]" s))))
+
+(defun s-uppercase? (s)
+  "Are all the letters in S in upper case?"
+  (let ((case-fold-search nil))
+    (not (string-match-p "[[:lower:]]" s))))
+
+(defun s-mixedcase? (s)
+  "Are there both lower case and upper case letters in S?"
+  (let ((case-fold-search nil))
+    (s--truthy?
+     (and (string-match-p "[[:lower:]]" s)
+          (string-match-p "[[:upper:]]" s)))))
+
+(defun s-capitalized? (s)
+  "In S, is the first letter upper case, and all other letters lower case?"
+  (let ((case-fold-search nil))
+    (s--truthy?
+     (string-match-p "^[[:upper:]][^[:upper:]]*$" s))))
+
+(defun s-numeric? (s)
+  "Is S a number?"
+  (s--truthy?
+   (string-match-p "^[0-9]+$" s)))
+
+(defun s-replace (old new s)
+  "Replaces OLD with NEW in S."
+  (replace-regexp-in-string (regexp-quote old) new s t t))
+
+(defun s--aget (alist key)
+  (cdr (assoc key alist)))
+
+(defun s-replace-all (replacements s)
+  "REPLACEMENTS is a list of cons-cells. Each `car` is replaced with `cdr` in S."
+  (replace-regexp-in-string (regexp-opt (mapcar 'car replacements))
+                            (lambda (it) (s--aget replacements it))
+                            s))
+
+(defun s-downcase (s)
+  "Convert S to lower case.
+
+This is a simple wrapper around the built-in `downcase'."
+  (downcase s))
+
+(defun s-upcase (s)
+  "Convert S to upper case.
+
+This is a simple wrapper around the built-in `upcase'."
+  (upcase s))
+
+(defun s-capitalize (s)
+  "Convert the first word's first character to upper case and the rest to lower case in S."
+  (concat (upcase (substring s 0 1)) (downcase (substring s 1))))
+
+(defun s-titleize (s)
+  "Convert each word's first character to upper case and the rest to lower case in S.
+
+This is a simple wrapper around the built-in `capitalize'."
+  (capitalize s))
+
+(defmacro s-with (s form &rest more)
+  "Threads S through the forms. Inserts S as the last item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, inserts the first form as the
+last item in second form, etc."
+  (if (null more)
+      (if (listp form)
+          `(,(car form) ,@(cdr form) ,s)
+        (list form s))
+    `(s-with (s-with ,s ,form) ,@more)))
+
+(put 's-with 'lisp-indent-function 1)
+
+(defun s-index-of (needle s &optional ignore-case)
+  "Returns first index of NEEDLE in S, or nil.
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+  (let ((case-fold-search ignore-case))
+    (string-match-p (regexp-quote needle) s)))
+
+(defun s-reverse (s) ;; from org-babel-reverse-string
+  "Return the reverse of S."
+  (apply 'string (nreverse (string-to-list s))))
+
+(defun s-match-strings-all (regex string)
+  "Return a list of matches for REGEX in STRING.
+
+Each element itself is a list of matches, as per
+`match-string'. Multiple matches at the same position will be
+ignored after the first."
+  (let ((all-strings ())
+  (i 0))
+    (while (and (< i (length string))
+                (string-match regex string i))
+      (setq i (1+ (match-beginning 0)))
+      (let (strings
+            (num-matches (/ (length (match-data)) 2))
+            (match 0))
+        (while (/= match num-matches)
+          (push (match-string match string) strings)
+          (setq match (1+ match)))
+        (push (nreverse strings) all-strings)))
+    (nreverse all-strings)))
+
+(defun s-match (regexp s &optional start)
+  "When the given expression matches the string, this function returns a list
+of the whole matching string and a string for each matched subexpressions.
+If it did not match the returned value is an empty list (nil).
+
+When START is non-nil the search will start at that index."
+  (save-match-data
+    (if (string-match regexp s start)
+        (let ((match-data-list (match-data))
+              result)
+          (while match-data-list
+            (let* ((beg (car match-data-list))
+                   (end (cadr match-data-list))
+                   (subs (if (and beg end) (substring s beg end) nil)))
+              (setq result (cons subs result))
+              (setq match-data-list
+                    (cddr match-data-list))))
+          (nreverse result)))))
+
+(defun s-slice-at (regexp s)
+  "Slices S up at every index matching REGEXP."
+  (save-match-data
+    (let (i)
+      (setq i (string-match regexp s 1))
+      (if i
+          (cons (substring s 0 i)
+                (s-slice-at regexp (substring s i)))
+        (list s)))))
+
+(defun s-split-words (s)
+  "Split S into list of words."
+  (s-split
+   "[^[:lower:][:upper:]0-9]+"
+   (let ((case-fold-search nil))
+     (replace-regexp-in-string
+      "\\([[:lower:]]\\)\\([[:upper:]]\\)" "\\1 \\2"
+      (replace-regexp-in-string "\\([[:upper:]]\\)\\([[:upper:]][0-9[:lower:]]\\)" "\\1 \\2" s)))
+   t))
+
+(defun s--mapcar-head (fn-head fn-rest list)
+  "Like MAPCAR, but applies a different function to the first element."
+  (if list
+      (cons (funcall fn-head (car list)) (mapcar fn-rest (cdr list)))))
+
+(defun s-lower-camel-case (s)
+  "Convert S to lowerCamelCase."
+  (s-join "" (s--mapcar-head 'downcase 'capitalize (s-split-words s))))
+
+(defun s-upper-camel-case (s)
+  "Convert S to UpperCamelCase."
+  (s-join "" (mapcar 'capitalize (s-split-words s))))
+
+(defun s-snake-case (s)
+  "Convert S to snake_case."
+  (s-join "_" (mapcar 'downcase (s-split-words s))))
+
+(defun s-dashed-words (s)
+  "Convert S to dashed-words."
+  (s-join "-" (mapcar 'downcase (s-split-words s))))
+
+(defun s-capitalized-words (s)
+  "Convert S to Capitalized words."
+  (let ((words (s-split-words s)))
+    (s-join " " (cons (capitalize (car words)) (mapcar 'downcase (cdr words))))))
+
+(defun s-titleized-words (s)
+  "Convert S to Titleized Words."
+  (s-join " " (mapcar 's-titleize (s-split-words s))))
+
+(defun s-word-initials (s)
+  "Convert S to its initials."
+  (s-join "" (mapcar (lambda (ss) (substring ss 0 1))
+                     (s-split-words s))))
+
+;; Errors for s-format
+(progn
+  (put 's-format-resolve
+       'error-conditions
+       '(error s-format s-format-resolve))
+  (put 's-format-resolve
+       'error-message
+       "Cannot resolve a template to values"))
+
+(defun s-format (template replacer &optional extra)
+  "Format TEMPLATE with the function REPLACER.
+
+REPLACER takes an argument of the format variable and optionally
+an extra argument which is the EXTRA value from the call to
+`s-format'.
+
+Several standard `s-format' helper functions are recognized and
+adapted for this:
+
+    (s-format \"${name}\" 'gethash hash-table)
+    (s-format \"${name}\" 'aget alist)
+    (s-format \"$0\" 'elt sequence)
+
+The REPLACER function may be used to do any other kind of
+transformation."
+  (let ((saved-match-data (match-data)))
+    (unwind-protect
+        (replace-regexp-in-string
+         "\\$\\({\\([^}]+\\)}\\|[0-9]+\\)"
+         (lambda (md)
+           (let ((var
+                  (let ((m (match-string 2 md)))
+                    (if m m
+                      (string-to-number (match-string 1 md)))))
+                 (replacer-match-data (match-data)))
+             (unwind-protect
+                 (let ((v
+                        (cond
+                         ((eq replacer 'gethash)
+                          (funcall replacer var extra))
+                         ((eq replacer 'aget)
+                          (funcall 's--aget extra var))
+                         ((eq replacer 'elt)
+                          (funcall replacer extra var))
+                         (t
+                          (set-match-data saved-match-data)
+                          (if extra
+                              (funcall replacer var extra)
+                            (funcall replacer var))))))
+                   (if v v (signal 's-format-resolve md)))
+               (set-match-data replacer-match-data)))) template
+               ;; Need literal to make sure it works
+               t t)
+      (set-match-data saved-match-data))))
+
+(defvar s-lex-value-as-lisp nil
+  "If `t' interpolate lisp values as lisp.
+
+`s-lex-format' inserts values with (format \"%S\").")
+
+(defun s-lex-fmt|expand (fmt)
+  "Expand FMT into lisp."
+  (list 's-format fmt (quote 'aget)
+        (append '(list)
+                (mapcar
+                 (lambda (matches)
+                   (list
+                    'cons
+                    (cadr matches)
+                    `(format
+                      (if s-lex-value-as-lisp "%S" "%s")
+                      ,(intern (cadr matches)))))
+                 (s-match-strings-all "${\\([^}]+\\)}" fmt)))))
+
+(defmacro s-lex-format (format-str)
+  "`s-format` with the current environment.
+
+FORMAT-STR may use the `s-format' variable reference to refer to
+any variable:
+
+ (let ((x 1))
+   (s-lex-format \"x is: ${x}\"))
+
+The values of the variables are interpolated with \"%s\" unless
+the variable `s-lex-value-as-lisp' is `t' and then they are
+interpolated with \"%S\"."
+  (s-lex-fmt|expand format-str))
+
+(provide 's)
+;;; s.el ends here
diff --git a/elpa/smex-2.1/smex-autoloads.el b/elpa/smex-1.1.1/smex-autoloads.el
similarity index 65%
rename from elpa/smex-2.1/smex-autoloads.el
rename to elpa/smex-1.1.1/smex-autoloads.el
index bed11cf11..b466f5214 100644
--- a/elpa/smex-2.1/smex-autoloads.el
+++ b/elpa/smex-1.1.1/smex-autoloads.el
@@ -3,15 +3,9 @@
 ;;; Code:
 
 
-;;;### (autoloads (smex-initialize smex) "smex" "smex.el" (21031
-;;;;;;  23277 0 0))
+;;;### (autoloads (smex-initialize) "smex" "smex.el" (20166 22147))
 ;;; Generated autoloads from smex.el
 
-(autoload 'smex "smex" "\
-
-
-\(fn)" t nil)
-
 (autoload 'smex-initialize "smex" "\
 
 
@@ -19,7 +13,7 @@
 
 ;;;***
 
-;;;### (autoloads nil nil ("smex-pkg.el") (21031 23277 451780 0))
+;;;### (autoloads nil nil ("smex-pkg.el") (20166 22147 529156))
 
 ;;;***
 
diff --git a/elpa/smex-1.1.1/smex-pkg.el b/elpa/smex-1.1.1/smex-pkg.el
new file mode 100644
index 000000000..7456ac0e5
--- /dev/null
+++ b/elpa/smex-1.1.1/smex-pkg.el
@@ -0,0 +1 @@
+(define-package "smex" "1.1.1" "M-x interface with Ido-style fuzzy matching." (quote nil))
diff --git a/elpa/clojure-mode-2.1.0/clojure-mode-pkg.elc b/elpa/smex-1.1.1/smex-pkg.elc
similarity index 60%
rename from elpa/clojure-mode-2.1.0/clojure-mode-pkg.elc
rename to elpa/smex-1.1.1/smex-pkg.elc
index 00e50c23cc9b1b3290c6c00929f58da4a83fc875..bec545ebb7ee7ce95b2ca27778a728426b07f279 100644
GIT binary patch
delta 147
zcmcb>a*Jhxq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm5H%}k%6J%
zL{n}4;@s2<T|+$})CVyq)+?|W=vf+WTu{#F1QJkEPy)*WX<yw6h0MH?)S|S+<Wz<7
o%#sWR&y;-K;*!doRE4zCs;Wwb+{BXPjLf`rJtc*_%p6TF07CyRGXMYp

delta 137
zcmcb`a)D)nq>Ms-o<ewPib8N|fr5gGf}xR>frXWkrGk-xq47j#ZTaM!{H)TVRNdVC
zlvG_KJwrVMePp4DwF->J8yA){S|W=oDJX%J0%_mGto$MckZy%EAj27AoI)~CKuIAl
IGe?sP06JhQga7~l

diff --git a/elpa/smex-2.1/smex.el b/elpa/smex-1.1.1/smex.el
similarity index 78%
rename from elpa/smex-2.1/smex.el
rename to elpa/smex-1.1.1/smex.el
index 35b1a0c6c..db2105fdd 100644
--- a/elpa/smex-2.1/smex.el
+++ b/elpa/smex-1.1.1/smex.el
@@ -1,10 +1,10 @@
 ;;; smex.el --- M-x interface with Ido-style fuzzy matching.
 
-;; Copyright (C) 2009-2013 Cornelius Mika and contributors
+;; Copyright (C) 2009, 2010 Cornelius Mika
 ;;
-;; Author: Cornelius Mika <cornelius.mika@gmail.com> and contributors
+;; Author: Cornelius Mika <cornelius.mika@gmail.com>
 ;; URL: http://github.com/nonsequitur/smex/
-;; Version: 2.1
+;; Version: 1.1.1
 ;; Keywords: convenience, usability
 
 ;; This file is not part of GNU Emacs.
@@ -24,14 +24,15 @@
 ;; For a detailed introduction see:
 ;; http://github.com/nonsequitur/smex/blob/master/README.markdown
 
-;;; Code:
-
 (require 'ido)
+;; Provides `union' and `dolist'.
+(require 'cl)
 
 (defgroup smex nil
   "M-x interface with Ido-style fuzzy matching and ranking heuristics."
   :group 'extensions
   :group 'convenience
+  :version "1.1"
   :link '(emacs-library-link :tag "Lisp File" "smex.el"))
 
 (defcustom smex-auto-update t
@@ -59,18 +60,6 @@ Must be set before initializing Smex."
   :type 'string
   :group 'smex)
 
-(defcustom smex-key-advice-ignore-menu-bar nil
-  "If non-nil, `smex-key-advice' ignores `menu-bar' bindings"
-  :type 'boolean
-  :group 'smex)
-
-(defcustom smex-flex-matching t
-  "Enables Ido flex matching. On by default.
-Set this to nil to disable fuzzy matching."
-  :type 'boolean
-  :group 'smex)
-
-(defvar smex-initialized-p nil)
 (defvar smex-cache)
 (defvar smex-ido-cache)
 (defvar smex-data)
@@ -81,25 +70,17 @@ Set this to nil to disable fuzzy matching."
 ;;--------------------------------------------------------------------------------
 ;; Smex Interface
 
-;;;###autoload
 (defun smex ()
   (interactive)
-  (unless smex-initialized-p
-    (smex-initialize))
   (if (smex-already-running)
-      (smex-update-and-rerun)
-    (and smex-auto-update
-         (smex-detect-new-commands)
-         (smex-update))
+      (smex-do-with-selected-item
+       (lambda (ignore) (smex-update) (smex-read-and-run smex-ido-cache ido-text)))
+    (and smex-auto-update (smex-detect-new-commands) (smex-update))
     (smex-read-and-run smex-ido-cache)))
 
 (defsubst smex-already-running ()
   (and (boundp 'ido-choice-list) (eql ido-choice-list smex-ido-cache)))
 
-(defsubst smex-update-and-rerun ()
-  (smex-do-with-selected-item
-   (lambda (ignore) (smex-update) (smex-read-and-run smex-ido-cache ido-text))))
-
 (defun smex-read-and-run (commands &optional initial-input)
   (let ((chosen-item (intern (smex-completing-read commands initial-input))))
     (if smex-custom-action
@@ -108,55 +89,33 @@ Set this to nil to disable fuzzy matching."
           (funcall action chosen-item))
       (unwind-protect
           (progn (setq prefix-arg current-prefix-arg)
-                 ;; Set the chosen command as the current command, like in
-                 ;; `execute-extended-command'
-                 (setq this-command chosen-item)
-                 (setq real-this-command chosen-item)
                  (command-execute chosen-item 'record))
         (smex-rank chosen-item)
         (smex-show-key-advice chosen-item)
         ;; Todo: Is there a better way to manipulate 'last-repeatable-command'
         ;; from the inside of an interactively called function?
-        ;; (This is unneeded in Emacs >=24.3 when `real-this-command' has been set.)
         (run-at-time 0.01 nil (lambda (cmd) (setq last-repeatable-command cmd))
                      chosen-item)))))
 
 (defun smex-major-mode-commands ()
   "Like `smex', but limited to commands that are relevant to the active major mode."
   (interactive)
-  (let ((commands (delete-dups (append (smex-extract-commands-from-keymap (current-local-map))
-                                       (smex-extract-commands-from-features major-mode)))))
+  (let ((commands (union (extract-commands-from-keymap (current-local-map))
+                         (extract-commands-from-features major-mode))))
     (setq commands (smex-sort-according-to-cache commands))
-    (setq commands (mapcar #'symbol-name commands))
+    (setq commands (mapcar (lambda (command) (symbol-name command)) commands))
     (smex-read-and-run commands)))
 
 (defun smex-completing-read (choices initial-input)
   (let ((ido-completion-map ido-completion-map)
         (ido-setup-hook (cons 'smex-prepare-ido-bindings ido-setup-hook))
         (ido-enable-prefix nil)
-        (ido-enable-flex-matching smex-flex-matching)
-        (ido-max-prospects 10)
-        (minibuffer-completion-table choices))
-    (ido-completing-read (smex-prompt-with-prefix-arg) choices nil nil
-                         initial-input nil (car choices))))
-
-(defun smex-prompt-with-prefix-arg ()
-  (if (not current-prefix-arg)
-      smex-prompt-string
-    (concat
-     (if (eq current-prefix-arg '-)
-         "- "
-       (if (integerp current-prefix-arg)
-           (format "%d " current-prefix-arg)
-         (if (= (car current-prefix-arg) 4)
-             "C-u "
-           (format "%d " (car current-prefix-arg)))))
-     smex-prompt-string)))
+        (ido-enable-flex-matching t)
+        (ido-max-prospects 10))
+    (ido-completing-read smex-prompt-string choices nil nil initial-input)))
 
 (defun smex-prepare-ido-bindings ()
-  (define-key ido-completion-map (kbd "TAB") 'minibuffer-complete)
   (define-key ido-completion-map (kbd "C-h f") 'smex-describe-function)
-  (define-key ido-completion-map (kbd "C-h w") 'smex-where-is)
   (define-key ido-completion-map (kbd "M-.") 'smex-find-function)
   (define-key ido-completion-map (kbd "C-a") 'move-beginning-of-line))
 
@@ -201,16 +160,6 @@ Set this to nil to disable fuzzy matching."
                   (setq smex-cache command-cell))))))
         (reverse smex-history)))
 
-(defun smex-sort-according-to-cache (list)
-  "Sorts a list of commands by their order in `smex-cache'"
-  (let (sorted)
-    (dolist (command-item smex-cache)
-      (let ((command (car command-item)))
-        (when (memq command list)
-          (setq sorted (cons command sorted))
-          (setq list (delq command list)))))
-    (nreverse (append list sorted))))
-
 (defun smex-update ()
   (interactive)
   (smex-save-history)
@@ -228,40 +177,37 @@ Set this to nil to disable fuzzy matching."
   (run-with-idle-timer idle-time t
                        '(lambda () (if (smex-detect-new-commands) (smex-update)))))
 
+(defun smex-detect-legacy-save-file ()
+  "The default value of `smex-save-file' was changed in between releases.
+This function provides temporary means to aid the transition."
+  (unless (file-readable-p smex-save-file)
+    (let ((legacy-save-file "~/smex.save"))
+      (when (file-readable-p legacy-save-file)
+        (message (format "%s not found. Falling back to %s"
+                         smex-save-file legacy-save-file))
+        (setq smex-save-file legacy-save-file)))))
+
 ;;;###autoload
 (defun smex-initialize ()
   (interactive)
   (unless ido-mode (smex-initialize-ido))
-  (smex-load-save-file)
-  (smex-detect-new-commands)
-  (smex-rebuild-cache)
-  (add-hook 'kill-emacs-hook 'smex-save-to-file)
-  (setq smex-initialized-p t))
+  (smex-detect-legacy-save-file)
+  (let ((save-file (expand-file-name smex-save-file)))
+    (if (file-readable-p save-file)
+        (with-temp-buffer
+          (insert-file-contents save-file)
+          (setq smex-history (read (current-buffer))
+                smex-data (read (current-buffer))))
+      (setq smex-history nil smex-data nil))
+    (smex-detect-new-commands)
+    (smex-rebuild-cache)
+    (add-hook 'kill-emacs-hook 'smex-save-to-file)))
 
 (defun smex-initialize-ido ()
   "Sets up a minimal Ido environment for `ido-completing-read'."
   (ido-init-completion-maps)
   (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup))
 
-(defun smex-load-save-file ()
-  "Loads `smex-history' and `smex-data' from `smex-save-file'"
-  (let ((save-file (expand-file-name smex-save-file)))
-    (if (file-readable-p save-file)
-        (with-temp-buffer
-          (insert-file-contents save-file)
-          (condition-case nil
-              (setq smex-history (read (current-buffer))
-                    smex-data    (read (current-buffer)))
-            (error (if (smex-save-file-not-empty-p)
-                       (error "Invalid data in smex-save-file (%s). Can't restore history."
-                              smex-save-file)
-                     (if (not (boundp 'smex-history)) (setq smex-history))
-                     (if (not (boundp 'smex-data))    (setq smex-data))))))
-      (setq smex-history nil smex-data nil))))
-
-(defsubst save-file-not-empty-p ()
-  (string-match-p "\[^[:space:]\]" (buffer-string)))
-
 (defun smex-save-history ()
   "Updates `smex-history'"
   (setq smex-history nil)
@@ -394,10 +340,6 @@ Returns nil when reaching the end of the list."
                            (describe-function chosen)
                            (pop-to-buffer "*Help*"))))
 
-(defun smex-where-is ()
-  (interactive)
-  (smex-do-with-selected-item 'where-is))
-
 (defun smex-find-function ()
   (interactive)
   (smex-do-with-selected-item 'find-function))
@@ -422,49 +364,41 @@ Returns nil when reaching the end of the list."
 
 (defun smex-key-advice (command)
   (let ((keys (where-is-internal command)))
-    (if smex-key-advice-ignore-menu-bar
-        (setq keys (smex-filter-out-menu-bar-bindings keys)))
     (if keys
         (format "You can run the command `%s' with %s"
                 command
                 (mapconcat 'key-description keys ", ")))))
 
-(defsubst smex-filter-out-menu-bar-bindings (keys)
-  (delq nil (mapcar (lambda (key-vec)
-                      (unless (equal (aref key-vec 0) 'menu-bar)
-                        key-vec))
-                    keys)))
-
 (defun smex-unlogged-message (string)
   "Bypasses logging in *Messages*"
   (let (message-log-max)
     (message "%s" string)))
 
-(defun smex-extract-commands-from-keymap (map)
+(defun extract-commands-from-keymap (map)
   (let (commands)
-    (smex-parse-keymap map commands)
+    (parse-keymap map)
     commands))
 
-(defun smex-parse-keymap (map commands)
+(defun parse-keymap (map)
   (map-keymap (lambda (binding element)
                 (if (and (listp element) (eq 'keymap (car element)))
-                    (smex-parse-keymap element commands)
+                    (parse-keymap element)
                           ; Strings are commands, too. Reject them.
                   (if (and (symbolp element) (commandp element))
-                      (push element commands))))
+                      (setq commands (cons element commands)))))
               map))
 
-(defun smex-extract-commands-from-features (mode)
+(defun extract-commands-from-features (mode)
   (let ((library-path (symbol-file mode))
         (mode-name (symbol-name mode))
         commands)
-
+    
     (string-match "\\(.+?\\)\\(-mode\\)?$" mode-name)
     ;; 'lisp-mode' -> 'lisp'
     (setq mode-name (match-string 1 mode-name))
     (if (string= mode-name "c") (setq mode-name "cc"))
     (setq mode-name (regexp-quote mode-name))
-
+    
     (dolist (feature load-history)
       (let ((feature-path (car feature)))
         (when (and feature-path (or (equal feature-path library-path)
@@ -477,6 +411,15 @@ Returns nil when reaching the end of the list."
                     (setq commands (append commands (list function))))))))))
     commands))
 
+(defun smex-sort-according-to-cache (list)
+  (let (sorted)
+    (dolist (command-item smex-cache)
+      (let ((command (car command-item)))
+        (when (memq command list)
+          (setq sorted (cons command sorted))
+          (setq list (delq command list)))))
+    (nreverse (append list sorted))))
+
 (defun smex-show-unbound-commands ()
   "Shows unbound commands in a new buffer,
 sorted by frequency of use."
@@ -488,12 +431,10 @@ sorted by frequency of use."
                                             command-item))
                                         smex-data))))
     (view-buffer-other-window "*Smex: Unbound Commands*")
-    (setq buffer-read-only t)
-    (let ((inhibit-read-only t))
-      (erase-buffer)
-      (ido-pp 'unbound-commands))
-    (set-buffer-modified-p nil)
-    (goto-char (point-min))))
+    (toggle-read-only nil)
+    (erase-buffer)
+    (ido-pp 'unbound-commands)
+    (beginning-of-buffer)))
 
 (provide 'smex)
 ;;; smex.el ends here
diff --git a/elpa/smex-1.1.1/smex.elc b/elpa/smex-1.1.1/smex.elc
new file mode 100644
index 0000000000000000000000000000000000000000..ca574008baa165911742574e24404f321ed598c4
GIT binary patch
literal 12429
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

literal 0
HcmV?d00001

diff --git a/elpa/smex-2.1/smex-autoloads.el~ b/elpa/smex-2.1/smex-autoloads.el~
deleted file mode 100644
index 305567a57..000000000
--- a/elpa/smex-2.1/smex-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; smex-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'smex-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; smex-autoloads.el ends here
diff --git a/elpa/smex-2.1/smex-pkg.el b/elpa/smex-2.1/smex-pkg.el
deleted file mode 100644
index 9524fbe6f..000000000
--- a/elpa/smex-2.1/smex-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "smex" "2.1" "M-x interface with Ido-style fuzzy matching." (quote nil))
diff --git a/elpa/smex-2.1/smex.elc b/elpa/smex-2.1/smex.elc
deleted file mode 100644
index 9e8ac274cda09bf1d637f53df250a825c18b23ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13931
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
P`R5)Hs;hGSy|MCtO_=VU

diff --git a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el b/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
index d5c4b15fb..5e9d36e5e 100644
--- a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
+++ b/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
@@ -3,8 +3,7 @@
 ;;; Code:
 
 
-;;;### (autoloads nil "starter-kit" "starter-kit.el" (21031 23285
-;;;;;;  0 0))
+;;;### (autoloads nil "starter-kit" "starter-kit.el" (20166 22154))
 ;;; Generated autoloads from starter-kit.el
 
 (dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode)) (when (fboundp mode) (funcall mode -1)))
@@ -30,7 +29,7 @@
 ;;;***
 
 ;;;### (autoloads nil nil ("starter-kit-defuns.el" "starter-kit-misc.el"
-;;;;;;  "starter-kit-pkg.el") (21031 23285 877636 0))
+;;;;;;  "starter-kit-pkg.el") (20166 22154 260459))
 
 ;;;***
 
diff --git a/elpa/starter-kit-2.0.3/starter-kit-defuns.elc b/elpa/starter-kit-2.0.3/starter-kit-defuns.elc
index 734892f40cedc706f460874a384dd0009d914b99..db515b49ed4698e51a9d7c36e90d5f3623963599 100644
GIT binary patch
delta 140
zcmV;70CWGQCcY++87gF9ZfRv~Ky-3%XJl`3Aa8CUMsjH&PH%P~F*qPFH##*qIyEpL
zGB7bQku_@sFfKVUv7vJb0ys3Y77A4X12!=-vu+C<0|GZOlZ+1O79%k|BRVZDV{9#C
uZ**yGWpgcbWo>Yigby(SH8hjA56J>IIFo`9-vTx>lVcI@0ysF6R1(su#wzas

delta 116
zcmdm|woGk;q>Ms-o<ewPib8N|fr5gGf}xR>frXWkk%Ezdq47lLY)0dan~FJ^%*;2d
zbA>W8n_8M~uIH9vW->LIJeTh!zpiddeo1C-YO!ukW^QK5<T?C?OvdJu&-0%IshA~j
TpUK#Aa<$-lCNq=CIYO5JpvEJ(

diff --git a/elpa/starter-kit-2.0.3/starter-kit-misc.elc b/elpa/starter-kit-2.0.3/starter-kit-misc.elc
index 83f98daa5a7c98e9fe73d20a2edeadd73c6ab9d2..0b08c039beab1e1a1d685bec985db1c0bd9495b7 100644
GIT binary patch
delta 84
zcmew>Hd%avq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm8qeEk%6J%
oMAJ+b13gQ_jq`oEgp{pxb(3>+Q}S~%i%WD%QgaI?|Kw@`0DLzZ{r~^~

delta 62
zcmbO%{#R^*q>Ms-o<ewPib8N|fr5gGf}xR>frXWkk%Ezdq47lLOh)648+^HVb#+tn
Sb25udbW0L5b0+h1w*UY$c@j(j

diff --git a/elpa/starter-kit-2.0.3/starter-kit-pkg.elc b/elpa/starter-kit-2.0.3/starter-kit-pkg.elc
index 0fd2ea910c0815e7a0a3c0ed6e1c397a6db5a18d..5a22d2301d6059d5f5d13948e6c7a82456be9be8 100644
GIT binary patch
delta 61
zcmX@ZdY5&Aq*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm8qeEk%6J%
QMAHlw13gQ_jq~)F0C))!dH?_b

delta 44
zcmcc1dWLm^q>Ms-o<ewPib8N|fr5gGf}xR>frXWkk%Ezdq47lL3`XOP>-Crb9)=7X

diff --git a/elpa/starter-kit-2.0.3/starter-kit.elc b/elpa/starter-kit-2.0.3/starter-kit.elc
index 6243ee89eaf50df24bafdd385178d592c42de67b..3ff2af4faef1f80b9ee6c16715ea75962db9eaef 100644
GIT binary patch
delta 85
zcmZ3_d6aX4q*h8|US?{JLrGD7dP;tgLVlitTT!NhUw)Z_p@o8hxs|Dfm8qeEk%6J%
pMAH-&13gQ_jkBtmgp{pxb(3>+Q}S~%i%WD%QgaJ7D>3&n0sw@%8ZQ6<

delta 63
zcmX@gxt?=^q>Ms-o<ewPib8N|fr5gGf}xR>frXWkv4W9-q47lL6h`BXtE-uKb#+tn
Tb25udbW0L5b2eKr_c8(iJfsqR

diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
index 2a20af0a5..5d5d0104c 100644
--- a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
+++ b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
@@ -4,7 +4,7 @@
 
 
 ;;;### (autoloads nil "starter-kit-bindings" "starter-kit-bindings.el"
-;;;;;;  (21031 23289 0 0))
+;;;;;;  (20184 56041))
 ;;; Generated autoloads from starter-kit-bindings.el
 
 (global-set-key (kbd "C-c f") 'find-file-in-project)
@@ -65,8 +65,8 @@
 
 ;;;***
 
-;;;### (autoloads nil nil ("starter-kit-bindings-pkg.el") (21031
-;;;;;;  23289 123404 0))
+;;;### (autoloads nil nil ("starter-kit-bindings-pkg.el") (20184
+;;;;;;  56041 900829))
 
 ;;;***
 
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.elc b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.elc
index 09781b65eec584a09d298196348b9fcc70f57d6a..56121e496624e9ef83b66418cb5f2f6447ac8ea5 100644
GIT binary patch
delta 43
ycmZo;?PQ%GE8$j@so;{Dte{||U|?xwU}9xtreI`XXgJZdip4<B(s1L3Ym5N#*$a;V

delta 40
vcmeBVZDXAvD-oWWq7a-~prBx)U}$7zU}0rss$gVbXgtxhiqUxE=4*@q*CPuS

diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc
index 11b5f84736ac14b7897ab0d7a9eb9a1b2021864a..f8e41f68dbc187b555997337bab15c5e1f14fe7d 100644
GIT binary patch
delta 43
zcmZ22xK40_tb|)prh-dqvVww<f`O%#fr*uonSzmlq2WZ+G8O|pOT&$8{<8xB0tgHk

delta 40
wcmZ1{xLR<6tVDQfib8N|fr5gGf}xR>frXWkse+M#q47l1GDhQ#>;JO@0OlzRp8x;=

diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
index 4b011183e..5db145386 100644
--- a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
+++ b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
@@ -3,8 +3,8 @@
 ;;; Code:
 
 
-;;;### (autoloads nil "starter-kit-lisp" "starter-kit-lisp.el" (21031
-;;;;;;  23288 0 0))
+;;;### (autoloads nil "starter-kit-lisp" "starter-kit-lisp.el" (20184
+;;;;;;  56040))
 ;;; Generated autoloads from starter-kit-lisp.el
 
 (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
@@ -37,8 +37,8 @@ Face used to dim parentheses." :group (quote starter-kit-faces))
 
 ;;;***
 
-;;;### (autoloads nil nil ("starter-kit-lisp-pkg.el") (21031 23288
-;;;;;;  270704 0))
+;;;### (autoloads nil nil ("starter-kit-lisp-pkg.el") (20184 56040
+;;;;;;  964735))
 
 ;;;***
 
diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.elc b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.elc
index 51299714e487ac24003062bc80a597e89738b249..01164c403bf859ff1ff4f1b2ddc2a1a66c8b31ae 100644
GIT binary patch
delta 43
zcmbQuI*)aNtb|)prh-dqvVww<f`O%#fr*uose+M#q2WZ+A{GNZOT&#TJ~ILU_<ak-

delta 40
wcmbQoI-7NZtVDQfib8N|fr5gGf}xR>frXWkiGq=Vq47l1B1Yqlt3NXW0NrE@OaK4?

diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.elc b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.elc
index 12ac2d13fb74c72c37ed5ba0bf5d4fe4d942efd5..fef3ddd81601e7c69fcd9332b57aa05a111f8c42 100644
GIT binary patch
delta 107
zcmca8cvEnKtb|)prh-dqvVww<f`O%#fr*uose+M#q2WZ+JQf2zOT&#zBp8K@OA?Dp
zQj2u6GfQ-HGK&lJQgbHnV^n3))a2sY{DYC5iP3lyO9-QovX!oGa*l3FK2TAKZb@ox
K!RAEP0%ib$${%z9

delta 100
zcmca9cu{bItVDQfib8N|fr5gGf}xR>frXWkiGq=Vq47l1JVxV<%Ox0@REsBHVpJ7X
tP*%~@<l?eM0h@m_vNJInY-VN&VdT}-P07#6EH2S4NzBaIoXJ|i3;;5F8jJt{

diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el
deleted file mode 100644
index af4ad9ffc..000000000
--- a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "starter-kit-ruby" "2.0.3" "Saner defaults and goodies for Ruby" (quote ((inf-ruby "2.2.3") (starter-kit "2.0.1"))))
diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.elc b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.elc
deleted file mode 100644
index 0f9620d7fcac1219f56f919e4ae2e3a182fa25cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmbtR!ES>v4DFd8*wx}PkV+^}X>B=8RS%VRS~u<Nk^oUdf|9VQ`}!F=P1|~`FNy5u
z_x$W~_q4s6&1OMamasKlFO}eMJOdaFZ}dHg9$*PszFDj``2*yOteC*HH67FhhxFA6
z>r#$d3Y9X^VdWT4h3YYN9<3KPIZ2<`;doARwqV6|x<55csEJr=*o_qMPOOr~$d{~O
z*;M<Gz6DeYOz&kUKhYDwv0y5`w9;KB8k}&z&l)>f0XLQNR_eyhscM}E<eZ%S=wxe_
zudg_`Ar5UkR7QIw@ZjrYMH!tu9=7{ER4rPp$ef!`@~AmD0~KmG3Qz|Bh<uxIAkZo)
zEcljyd2!LD?cWsR0JlaE1Q8dt)FSDzI$<Lq{C~a>!s&qY9#E4DYQRBx2c!GO7%pjR
hwXyI_#}45>ilnZm%a5HoE5aC}U#u6tER5qg_yU1B!O;K!

diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc
deleted file mode 100644
index cc8fb96853864cfc1115d5fb970e7e6fd3e2669c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2748
zcmbtW&u`l{6wYZVJZ#u)$Gxg8DtD!9Np_qjmkmKt6xe_vO}9hrVYEcsj3rVf>A2Zn
zzmJriII*`KYD9>{_xOJCd*9>P+h5MVKRP<<oSmJ~xvm>oiIS$bL|V}wc>N$6q5-AZ
zY5(Lj8&TFz^PoI4x~3V_srS(eV|yi6QdGS})V#1s*%MX6d)9H|gkekRm|0D4S(fyZ
zd~Z1sRWK?Qz4hDa1{Nhk$OcKCq(QcpZb7`NNH<Q_@^9{-V3SS|UM{3<qgh#Dsk~LZ
zmIal%u+B&|x33{J))6mDWOe5!eUoHw_H2|IHk5W$XyrJRS8m2mu%g({AI{&ur((ek
zFOZmh9o%zOlGRjjMN>hQ<`0}~lCdPXsiZLE7EsLc)-NjmML!?Fm;O4PPCUJJf)%<H
z6pizKA5V%W8%N_T^<O!j0iNOA$}zr1;~dhh&UPi;Te-Kh)yemC274>}zK-{FMvqsr
z2k~UcB75LHtOW1<QAAhbhF6TwJWBn+QGjXf>kv0a&lSaTuCx(M7^97)*oaRnX#~9t
znnh@u0LE^YVk_LI)&zjaghD|9KUVXGl&qit0J4SF%guK0X!9-AtnHDdxV6wM#Y`%}
z@O2+kFcdGRB}Er+FQYE32&qb;9CHhym=f#CZvr4$yZ--%&e^YQ;Z03>v0QUgqFbwq
zt+gqU(Y(@A6bN~RNUlyO&xgaoaBw^!BYi(Hr&%R^Z>{ha65`=Ij>hA}@TGVjQF5OH
zBJu*a(B`0EE^6C|;-Ji|_Lnc<!4uKG<Pt6pOWuk4u;83GhXud$x#7wk5_$+!!qX9J
zp;9vO*$L$t%u<w?X%U5gI+{@4?L7NwkOs1CH=!~W_-3X(F$nt0+QmySPhH~>lOH-B
z2dF2v^s?D_5<Op4dUgd!-FGWJ9cKa2cWP`QfYYWxc+Br$j@zZ3P)6~y=Qxsd(9gOP
zA5c2V=|Z@bQN$@6o}LA=^$`VUVJo$m3<T;W#mX39uY*Rp7KO73(R*4dy+$S=Wc+bj
z09E8PH7g(l^zHXmdJc95vErj6K8wO*sAcMH=C5gr4bl;CxP%?gumZ@S8Mp3HRUYQ|
zxGrF+49`7(<^AKQfx0442dFC)trXQK-=c(8Ex3V^*mqJl)Hg8Ulb}2N`e<vcUGN;@
zHK~ms9qNh&MWJZpaeVbBO@17YyAcdSu+1_B5+-Du3WITzxLpXe-R9tT3euWlm%z}~
zSWSST(f0g?gA;##I}q6bBlgF&8~ZyS^he~Hf8*mH;4S<1=*e$e%y@nJ?+7C5Q{=(8
zsvLqCgleHk==^xw0-!o0K%&uw2WW^3+NT~jep~mHBGBq1Kz6$!iH8HI9X|fpw!@_z
zJ~+H^c7E*SX*$k^qp!Zh8;&^5x7lFib0cvS*V+U|!t6an^FC}@1@gXQdmn0fBMac(
zUsy^FQdVr;d!RcNXjegjD5tC03`0G}l>;47m%bu?6rj5)4wYf83JV%Bb^;0%y?S9^
zMda5|0E*Y(Z;I#O*^NQ(aCfKI!5xTgn(p7!eAVGv;2`Gy3Kch6Vm#DR!NBI7e}>E8
zm6r?`8F|CqcAy<f81dDsn%8<WC~^N$bFow3c7&A}i)A|j!iWn6yq|D|wL8LFUROJx
c*ZhXt!pH`p-pxet%8kS%eteCb&~dl(53(g$R{#J2

diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
similarity index 80%
rename from elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el
rename to elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
index 6eeadd102..939affa50 100644
--- a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el
+++ b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
@@ -3,26 +3,22 @@
 ;;; Code:
 
 
-;;;### (autoloads nil "starter-kit-ruby" "starter-kit-ruby.el" (21031
-;;;;;;  23291 0 0))
+;;;### (autoloads nil "starter-kit-ruby" "starter-kit-ruby.el" (20184
+;;;;;;  56042))
 ;;; Generated autoloads from starter-kit-ruby.el
 
-(eval-after-load 'ruby-mode '(progn (ignore-errors (require 'ruby-compilation)) (setq ruby-use-encoding-map nil) (add-hook 'ruby-mode-hook 'inf-ruby-keys) (define-key ruby-mode-map (kbd "RET") 'reindent-then-newline-and-indent) (define-key ruby-mode-map (kbd "C-M-h") 'backward-kill-word)))
+(eval-after-load 'ruby-mode '(progn (ignore-errors (require 'ruby-compilation)) (setq ruby-use-encoding-map nil) (define-key ruby-mode-map (kbd "RET") 'reindent-then-newline-and-indent) (define-key ruby-mode-map (kbd "C-M-h") 'backward-kill-word)))
 
 (global-set-key (kbd "C-h S-r") 'ri)
 
 (add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
 
-(add-to-list 'auto-mode-alist '("\\.thor$" . ruby-mode))
-
 (add-to-list 'auto-mode-alist '("\\.gemspec$" . ruby-mode))
 
 (add-to-list 'auto-mode-alist '("\\.ru$" . ruby-mode))
 
 (add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
 
-(add-to-list 'auto-mode-alist '("Thorfile$" . ruby-mode))
-
 (add-to-list 'auto-mode-alist '("Gemfile$" . ruby-mode))
 
 (add-to-list 'auto-mode-alist '("Capfile$" . ruby-mode))
@@ -31,8 +27,6 @@
 
 (add-to-list 'completion-ignored-extensions ".rbc")
 
-(add-to-list 'completion-ignored-extensions ".rbo")
-
 (defun pcomplete/rake nil "\
 Completion rules for the `ssh' command." (pcomplete-here (pcmpl-rake-tasks)))
 
@@ -46,12 +40,16 @@ exec-to-string command, but it works and seems fast" (delq nil (mapcar (quote (l
 
 (eval-after-load 'ruby-compilation '(progn (defadvice ruby-do-run-w/compilation (before kill-buffer (name cmdlist)) (let ((comp-buffer-name (format "*%s*" name))) (when (get-buffer comp-buffer-name) (with-current-buffer comp-buffer-name (delete-region (point-min) (point-max)))))) (ad-activate 'ruby-do-run-w/compilation)))
 
+(add-hook 'ruby-mode-hook 'esk-run-coding-hook)
+
+(add-hook 'ruby-mode-hook 'esk-paredit-nonlisp)
+
 (setq rinari-major-modes (list 'mumamo-after-change-major-mode-hook 'dired-mode-hook 'ruby-mode-hook 'css-mode-hook 'yaml-mode-hook 'javascript-mode-hook))
 
 ;;;***
 
-;;;### (autoloads nil nil ("starter-kit-ruby-pkg.el") (21031 23291
-;;;;;;  328751 0))
+;;;### (autoloads nil nil ("starter-kit-ruby-pkg.el") (20184 56042
+;;;;;;  635313))
 
 ;;;***
 
diff --git a/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el
new file mode 100644
index 000000000..8f99a5a5b
--- /dev/null
+++ b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el
@@ -0,0 +1 @@
+(define-package "starter-kit-ruby" "2.0" "Saner defaults and goodies for Ruby" (quote nil))
diff --git a/elpa/inf-ruby-2.3.0/inf-ruby-pkg.elc b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc
similarity index 59%
rename from elpa/inf-ruby-2.3.0/inf-ruby-pkg.elc
rename to elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc
index 210a1cb85b3b827a8bf6429386a95ed0e4c6fea0..3ee9d931400b61405cec73f607e02066873bc4a7 100644
GIT binary patch
delta 147
zcmX@k@|b0Utb|)prh-dqvVww<f`O%#fr*uonSzmlq2WYRZH3~J#G;baBHirF65XQG
zq)J^QJp+9t!HGqxECza(h8t&;Gdd%QgB2?&C;^oN$>7Ai)FOqH)U?FXoRVUN#Jm)R
a^!)sk%+z9qwEQB4AfUlY3VE41np^-zIWH^#

delta 119
zcmaFNa-3y?tVDQfib8N|fr5gGf}xR>frXWknSzmlq47jhZK2G(G~J@oq)J^QJ!3rs
zeIR#YgDRu(#+Bua7BD#_1tqX7kPa%%Q%F<*X;3IA%1=%$E>_3{i6oV#rKJ`rDdc75
HXmSAn9pNLC

diff --git a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el b/elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
similarity index 90%
rename from elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el
rename to elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
index 63c71d4bc..ef5e11aa4 100644
--- a/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el
+++ b/elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
@@ -4,9 +4,9 @@
 ;;
 ;; Author: Phil Hagelberg <technomancy@gmail.com>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/StarterKit
-;; Version: 2.0.3
+;; Version: 2.0
 ;; Keywords: convenience
-;; Package-Requires: ((inf-ruby "2.2.3") (starter-kit "2.0.1"))
+
 ;; This file is not part of GNU Emacs.
 
 ;;; Commentary:
@@ -18,8 +18,6 @@
 
 ;; This file contains tweaks specific to Ruby.
 
-;; This file is in need of a maintainer.
-
 ;;; License:
 
 ;; This program is free software; you can redistribute it and/or
@@ -46,7 +44,7 @@
        ;; work around possible elpa bug
        (ignore-errors (require 'ruby-compilation))
        (setq ruby-use-encoding-map nil)
-       (add-hook 'ruby-mode-hook 'inf-ruby-keys)
+       ;; (add-hook 'ruby-mode-hook 'inf-ruby-keys)
        (define-key ruby-mode-map (kbd "RET") 'reindent-then-newline-and-indent)
        (define-key ruby-mode-map (kbd "C-M-h") 'backward-kill-word)))
 
@@ -54,18 +52,15 @@
 
   ;; Rake files are ruby, too, as are gemspecs, rackup files, etc.
   (add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
-  (add-to-list 'auto-mode-alist '("\\.thor$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("\\.gemspec$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("\\.ru$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
-  (add-to-list 'auto-mode-alist '("Thorfile$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Gemfile$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Capfile$" . ruby-mode))
   (add-to-list 'auto-mode-alist '("Vagrantfile$" . ruby-mode))
 
-  ;; We never want to edit Rubinius bytecode or MacRuby binaries
+  ;; We never want to edit Rubinius bytecode
   (add-to-list 'completion-ignored-extensions ".rbc")
-  (add-to-list 'completion-ignored-extensions ".rbo")
 
 ;;; Rake
 
@@ -97,6 +92,9 @@ exec-to-string command, but it works and seems fast"
                (delete-region (point-min) (point-max))))))
        (ad-activate 'ruby-do-run-w/compilation)))
 
+  (add-hook 'ruby-mode-hook 'esk-run-coding-hook)
+  (add-hook 'ruby-mode-hook 'esk-paredit-nonlisp)
+
   ;; Rinari (Minor Mode for Ruby On Rails)
   (setq rinari-major-modes
         (list 'mumamo-after-change-major-mode-hook 'dired-mode-hook 'ruby-mode-hook
diff --git a/init.el b/init.el
index 36e0b335a..87937bb72 100644
--- a/init.el
+++ b/init.el
@@ -8,19 +8,4 @@
 (when (not package-archive-contents)
   (package-refresh-contents))
 
-;; Add in your own as you wish:
-(defvar my-packages '(starter-kit
-                      starter-kit-lisp
-                      starter-kit-bindings
-                      starter-kit-ruby
-                      clojure-mode
-                      clojure-test-mode
-                      nrepl
-                      )
-  "A list of packages to ensure are installed at launch.")
-
-(dolist (p my-packages)
-  (when (not (package-installed-p p))
-    (package-install p)))
-
 (load "~/.emacs.d/user.el")
diff --git a/nrepl-history b/nrepl-history
deleted file mode 100644
index c661085f2..000000000
--- a/nrepl-history
+++ /dev/null
@@ -1,5 +0,0 @@
-;; -*- coding: utf-8-unix -*-
-;; Automatically written history of nREPL session
-;; Edit at your own risk
-
-nil
\ No newline at end of file
diff --git a/user.el b/user.el
index e3748154d..3e7cd97c8 100644
--- a/user.el
+++ b/user.el
@@ -40,20 +40,7 @@
 ;; Flyspell often slows down editing so it's turned off
 (remove-hook 'text-mode-hook 'turn-on-flyspell)
 
-;; Clojure
-(add-to-list 'auto-mode-alist '("\\.edn$" . clojure-mode))
-(setq nrepl-history-file "~/.emacs.d/nrepl-history")
-(setq nrepl-popup-stacktraces t)
-(setq nrepl-popup-stacktraces-in-repl t)
-(add-hook 'nrepl-connected-hook
-          (defun pnh-clojure-mode-eldoc-hook ()
-            (add-hook 'clojure-mode-hook 'turn-on-eldoc-mode)
-            (add-hook 'nrepl-interaction-mode-hook 'nrepl-turn-on-eldoc-mode)
-            (nrepl-enable-on-existing-clojure-buffers)))
-(add-hook 'nrepl-mode-hook 'subword-mode)
-(eval-after-load "auto-complete"
-  '(add-to-list 'ac-modes 'nrepl-mode))
-(add-hook 'nrepl-mode-hook 'ac-nrepl-setup)
+(load "~/.emacs.d/vendor/clojure")
 
 ;; hippie expand - don't try to complete with file names
 (setq hippie-expand-try-functions-list (delete 'try-complete-file-name hippie-expand-try-functions-list))
diff --git a/vendor/clojure.el b/vendor/clojure.el
new file mode 100644
index 000000000..d9cfbd3cd
--- /dev/null
+++ b/vendor/clojure.el
@@ -0,0 +1,15 @@
+;; clojure
+(add-to-list 'auto-mode-alist '("\\.edn$" . clojure-mode))
+
+;; cider
+(add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)
+(setq cider-repl-pop-to-buffer-on-connect t)
+(setq cider-popup-stacktraces t)
+(setq cider-repl-popup-stacktraces t)
+(setq cider-auto-select-error-buffer t)
+(setq cider-repl-history-file "~/.emacs.d/cider-history")
+(setq cider-repl-wrap-history t)
+
+(add-hook 'cider-repl-mode-hook 'subword-mode)
+(add-hook 'cider-repl-mode-hook 'paredit-mode)
+(add-hook 'cider-repl-mode-hook 'rainbow-delimiters-mode)