diff --git a/.gitignore b/.gitignore
index 604bc7aff..229fe831b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 *#*
 *-history
 .smex-items
-places
\ No newline at end of file
+places
+*.bat
diff --git a/elpa/Save-visited-files-readme.txt b/elpa/Save-visited-files-readme.txt
deleted file mode 100644
index 44ff71312..000000000
--- a/elpa/Save-visited-files-readme.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-;;; 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/ac-cider-0.2.1/ac-cider-autoloads.el b/elpa/ac-cider-0.2.1/ac-cider-autoloads.el
new file mode 100644
index 000000000..b7433633a
--- /dev/null
+++ b/elpa/ac-cider-0.2.1/ac-cider-autoloads.el
@@ -0,0 +1,39 @@
+;;; ac-cider-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "ac-cider" "ac-cider.el" (21721 36942 0 0))
+;;; Generated autoloads from ac-cider.el
+
+(defface ac-cider-candidate-face '((t (:inherit ac-candidate-face))) "\
+Face for nrepl candidates." :group (quote auto-complete))
+
+(defface ac-cider-selection-face '((t (:inherit ac-selection-face))) "\
+Face for the nrepl selected candidate." :group (quote auto-complete))
+
+(defconst ac-cider-source-defaults '((available . ac-cider-available-p) (candidate-face . ac-cider-candidate-face) (selection-face . ac-cider-selection-face) (prefix . cider-completion-symbol-start-pos) (match . ac-cider-match-fuzzy) (document . ac-cider-documentation) (cache)) "\
+Defaults common to the various completion sources.")
+
+(defvar ac-source-cider-everything (append '((candidates . ac-cider-candidates-everything) (symbol . "v")) ac-cider-source-defaults) "\
+Auto-complete source for CIDER buffers.")
+
+(autoload 'ac-cider-setup "ac-cider" "\
+Add the CIDER completion source to the front of `ac-sources'.
+This affects only the current buffer.
+
+\(fn)" t nil)
+
+(autoload 'ac-cider-popup-doc "ac-cider" "\
+A popup alternative to `cider-doc'.
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; ac-cider-autoloads.el ends here
diff --git a/elpa/ac-cider-0.2.1/ac-cider-pkg.el b/elpa/ac-cider-0.2.1/ac-cider-pkg.el
new file mode 100644
index 000000000..40d398493
--- /dev/null
+++ b/elpa/ac-cider-0.2.1/ac-cider-pkg.el
@@ -0,0 +1 @@
+(define-package "ac-cider" "0.2.1" "Clojure auto-complete sources using CIDER" '((cider "0.8.0") (auto-complete "1.4") (cl-lib "0.3")) :url "https://github.com/clojure-emacs/ac-cider" :keywords '("languages" "clojure" "nrepl" "cider" "compliment"))
diff --git a/elpa/auto-complete-1.4/auto-complete-pkg.elc b/elpa/ac-cider-0.2.1/ac-cider-pkg.elc
similarity index 55%
rename from elpa/auto-complete-1.4/auto-complete-pkg.elc
rename to elpa/ac-cider-0.2.1/ac-cider-pkg.elc
index 0da54964d..929137de1 100644
Binary files a/elpa/auto-complete-1.4/auto-complete-pkg.elc and b/elpa/ac-cider-0.2.1/ac-cider-pkg.elc differ
diff --git a/elpa/ac-cider-0.2.1/ac-cider.el b/elpa/ac-cider-0.2.1/ac-cider.el
new file mode 100644
index 000000000..8e419a7d5
--- /dev/null
+++ b/elpa/ac-cider-0.2.1/ac-cider.el
@@ -0,0 +1,206 @@
+;;; ac-cider.el --- Clojure auto-complete sources using CIDER
+
+;; Copyright (C) 2012-2014 Alex Yakushev <alex@bytopia.org>
+
+;; Author: Alex Yakushev <alex@bytopia.org>
+;;         Steve Purcell <steve@sanityinc.com>
+;;         Sam Aaron <samaaron@gmail.com>
+;;
+;; URL: https://github.com/clojure-emacs/ac-cider
+;; Keywords: languages, clojure, nrepl, cider, compliment
+;; Version: 0.2.1
+;; X-Original-Version: 0.2.1
+;; Package-Requires: ((cider "0.8.0") (auto-complete "1.4") (cl-lib "0.3"))
+
+;; 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:
+
+;; Provides a number of auto-complete sources for Clojure projects using CIDER
+;; and compliment. This is a replacement for now deprecated ac-nrepl project by
+;; Steve Purcell.
+
+;;; Installation:
+
+;; Available as a package in melpa.org.
+;; M-x package-install ac-cider
+
+;;; Usage:
+
+;;     (require 'ac-cider)
+;;     (add-hook 'cider-mode-hook 'ac-flyspell-workaround)
+;;     (add-hook 'cider-mode-hook 'ac-cider-setup)
+;;     (add-hook 'cider-repl-mode-hook 'ac-cider-setup)
+;;     (eval-after-load "auto-complete"
+;;       '(progn
+;;          (add-to-list 'ac-modes 'cider-mode)
+;;          (add-to-list 'ac-modes 'cider-repl-mode)))
+
+;; If you want to trigger auto-complete using TAB in CIDER buffers, add this to
+;; your configuration file, but note that it is incompatible with (setq
+;; tab-always-indent 'complete):
+
+;;     (defun set-auto-complete-as-completion-at-point-function ()
+;;       (setq completion-at-point-functions '(auto-complete)))
+;;     (add-hook 'auto-complete-mode-hook 'set-auto-complete-as-completion-at-point-function)
+;;
+;;     (add-hook 'cider-mode-hook 'set-auto-complete-as-completion-at-point-function)
+
+;;; Code:
+
+(require 'cider)
+(require 'auto-complete)
+(require 'cl-lib)
+
+(defun ac-cider-available-p ()
+  "Return t if CIDER supports completion, otherwise nil."
+  (functionp 'cider-complete))
+
+(defvar ac-cider-documentation-cache '())
+
+(defun ac-cider-candidates-everything ()
+  "Return all candidates for a symbol at point."
+  (setq ac-cider-documentation-cache nil)
+  (cider-complete ac-prefix))
+
+(defun ac-cider-documentation (symbol)
+  "Return documentation for the given SYMBOL, if available.
+Caches fetched documentation for the current completion call."
+  (when symbol
+    (let ((cached-doc (assoc (substring-no-properties symbol)
+                             ac-cider-documentation-cache)))
+      (if cached-doc
+          (cdr cached-doc)
+        (let* ((doc
+                (substring-no-properties
+                 (replace-regexp-in-string
+                  "\r" ""
+                  (nrepl-dict-get (nrepl-send-sync-request
+                                   (list "op" "complete-doc"
+                                         "session" (nrepl-current-session)
+                                         "ns" (cider-current-ns)
+                                         "symbol" symbol))
+                                  "completion-doc"))))
+               (doc (if (string= "\"\"" doc)
+                        "No documentation available."
+                      doc)))
+          (add-to-list 'ac-cider-documentation-cache
+                       (cons (substring-no-properties symbol) doc))
+          doc)))))
+
+(defun ac-cider--is-separator (c)
+  (or (= c 45) (= c 46)))
+
+(defun ac-cider--is-capital (c)
+  (and (<= 65 c) (<= c 90)))
+
+(defun ac-cider-fuzzy-matches-p (prefix candidate)
+  "Return t if PREFIX and CANDIDATE are matched."
+  (let ((pre (string-to-list prefix))
+        (cand (string-to-list candidate))
+        (camelcase nil))
+    (when (= (car pre) 46)
+      (setq camelcase t)
+      (setq pre (cdr pre))
+      (setq cand (cdr cand)))
+    (if (string-prefix-p prefix candidate)
+        t
+      (let ((result :not-yet) (skipping nil))
+        (when (= (car pre) (car cand))
+          (while (eq result :not-yet)
+            (cond ((not pre) (setq result t))
+                  ((not cand) (setq result nil))
+                  (skipping (if camelcase
+                                (if (ac-cider--is-capital (car cand))
+                                    (setq skipping nil)
+                                  (setq cand (cdr cand)))
+                              (if (ac-cider--is-separator (car cand))
+                                  (progn
+                                    (when (ac-cider--is-separator (car pre))
+                                      (setq pre (cdr pre)))
+                                    (setq cand (cdr cand))
+                                    (setq skipping nil))
+                                (setq cand (cdr cand)))))
+                  ((= (car pre) (car cand)) (progn (setq pre (cdr pre))
+                                                   (setq cand (cdr cand))))
+                  (t (progn (setq skipping
+                                  (or camelcase
+                                      (not (ac-cider--is-separator (car cand)))))
+                            (setq cand (cdr cand))))))
+          result)))))
+
+(defun ac-cider-match-fuzzy (prefix candidates)
+  "Returns candidates that match fuzzily with the prefix."
+  (cl-remove-if-not (lambda (cand)
+                      (ac-cider-fuzzy-matches-p prefix cand))
+                    candidates))
+
+;;;###autoload
+(defface ac-cider-candidate-face
+  '((t (:inherit ac-candidate-face)))
+  "Face for nrepl candidates."
+  :group 'auto-complete)
+
+;;;###autoload
+(defface ac-cider-selection-face
+  '((t (:inherit ac-selection-face)))
+  "Face for the nrepl selected candidate."
+  :group 'auto-complete)
+
+;;;###autoload
+(defconst ac-cider-source-defaults
+  '((available . ac-cider-available-p)
+    (candidate-face . ac-cider-candidate-face)
+    (selection-face . ac-cider-selection-face)
+    (prefix . cider-completion-symbol-start-pos)
+    (match . ac-cider-match-fuzzy)
+    (document . ac-cider-documentation)
+    (cache))
+  "Defaults common to the various completion sources.")
+
+;;;###autoload
+(defvar ac-source-cider-everything
+  (append
+   '((candidates . ac-cider-candidates-everything)
+     (symbol . "v"))
+   ac-cider-source-defaults)
+  "Auto-complete source for CIDER buffers.")
+
+;;;###autoload
+(defun ac-cider-setup ()
+  "Add the CIDER completion source to the front of `ac-sources'.
+This affects only the current buffer."
+  (interactive)
+  (setq-default ac-use-fuzzy nil)
+  (add-to-list 'ac-sources 'ac-source-cider-everything))
+
+;;;###autoload
+(defun ac-cider-popup-doc ()
+  "A popup alternative to `cider-doc'."
+  (interactive)
+  (popup-tip (ac-cider-documentation (symbol-name (symbol-at-point)))
+             :point (cider-completion-symbol-start-pos)
+             :around t
+             :scroll-bar t
+             :margin t))
+
+(provide 'ac-cider)
+
+;; Local Variables:
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; eval: (checkdoc-minor-mode 1)
+;; End:
+
+;;; ac-cider.el ends here
diff --git a/elpa/ac-cider-0.2.1/ac-cider.elc b/elpa/ac-cider-0.2.1/ac-cider.elc
new file mode 100644
index 000000000..7648b9c2c
Binary files /dev/null and b/elpa/ac-cider-0.2.1/ac-cider.elc differ
diff --git a/elpa/ac-nrepl-0.21/ac-nrepl-autoloads.el b/elpa/ac-nrepl-0.21/ac-nrepl-autoloads.el
new file mode 100644
index 000000000..58a1df783
--- /dev/null
+++ b/elpa/ac-nrepl-0.21/ac-nrepl-autoloads.el
@@ -0,0 +1,54 @@
+;;; ac-nrepl-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "ac-nrepl" "ac-nrepl.el" (21706 21578 0 0))
+;;; Generated autoloads from ac-nrepl.el
+
+(defface ac-nrepl-candidate-face '((t (:inherit ac-candidate-face))) "\
+Face for nrepl candidates." :group (quote auto-complete))
+
+(defface ac-nrepl-selection-face '((t (:inherit ac-selection-face))) "\
+Face for the nrepl selected candidate." :group (quote auto-complete))
+
+(defconst ac-nrepl-source-defaults '((available . ac-nrepl-available-p) (candidate-face . ac-nrepl-candidate-face) (selection-face . ac-nrepl-selection-face) (prefix . ac-nrepl-symbol-start-pos) (document . ac-nrepl-documentation)) "\
+Defaults common to the various completion sources.")
+
+(defvar ac-source-nrepl-ns (append '((candidates . ac-nrepl-candidates-ns) (symbol . "n")) ac-nrepl-source-defaults) "\
+Auto-complete source for nrepl ns completion.")
+
+(defvar ac-source-nrepl-vars (append '((candidates . ac-nrepl-candidates-vars) (symbol . "v")) ac-nrepl-source-defaults) "\
+Auto-complete source for nrepl var completion.")
+
+(defvar ac-source-nrepl-ns-classes (append '((candidates . ac-nrepl-candidates-ns-classes) (symbol . "c")) ac-nrepl-source-defaults) "\
+Auto-complete source for nrepl ns-specific class completion.")
+
+(defvar ac-source-nrepl-all-classes (append '((candidates . ac-nrepl-candidates-all-classes) (symbol . "c")) ac-nrepl-source-defaults) "\
+Auto-complete source for nrepl all class completion.")
+
+(defvar ac-source-nrepl-java-methods (append '((candidates . ac-nrepl-candidates-java-methods) (symbol . "m")) ac-nrepl-source-defaults) "\
+Auto-complete source for nrepl java method completion.")
+
+(defvar ac-source-nrepl-static-methods (append '((candidates . ac-nrepl-candidates-static-methods) (symbol . "s")) ac-nrepl-source-defaults) "\
+Auto-complete source for nrepl java static method completion.")
+
+(autoload 'ac-nrepl-setup "ac-nrepl" "\
+Add the nrepl completion source to the front of `ac-sources'.
+This affects only the current buffer.
+
+\(fn)" t nil)
+
+(autoload 'ac-nrepl-popup-doc "ac-nrepl" "\
+A popup alternative to `nrepl-doc'.
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; ac-nrepl-autoloads.el ends here
diff --git a/elpa/ac-nrepl-0.21/ac-nrepl-pkg.el b/elpa/ac-nrepl-0.21/ac-nrepl-pkg.el
new file mode 100644
index 000000000..093b484b3
--- /dev/null
+++ b/elpa/ac-nrepl-0.21/ac-nrepl-pkg.el
@@ -0,0 +1 @@
+(define-package "ac-nrepl" "0.21" "auto-complete sources for Clojure using nrepl completions" '((cider "0.1") (auto-complete "1.4")))
diff --git a/elpa/magit-1.0.0/50magit.elc b/elpa/ac-nrepl-0.21/ac-nrepl-pkg.elc
similarity index 65%
rename from elpa/magit-1.0.0/50magit.elc
rename to elpa/ac-nrepl-0.21/ac-nrepl-pkg.elc
index 8a38ba6ac..d0b9e4108 100644
Binary files a/elpa/magit-1.0.0/50magit.elc and b/elpa/ac-nrepl-0.21/ac-nrepl-pkg.elc differ
diff --git a/elpa/ac-nrepl-0.21/ac-nrepl.el b/elpa/ac-nrepl-0.21/ac-nrepl.el
new file mode 100644
index 000000000..25ea582b9
--- /dev/null
+++ b/elpa/ac-nrepl-0.21/ac-nrepl.el
@@ -0,0 +1,298 @@
+
+;;; ac-nrepl.el --- auto-complete sources for Clojure using nrepl completions
+
+;; Copyright (C) 2012  Steve Purcell <steve@sanityinc.com>
+
+;; Author: Steve Purcell <steve@sanityinc.com>
+;;         Sam Aaron <samaaron@gmail.com>
+;; URL: https://github.com/purcell/ac-nrepl
+;; Keywords: languages, clojure, nrepl
+;; Version: 0.21
+;; Package-Requires: ((cider "0.1") (auto-complete "1.4"))
+
+;; 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:
+
+;; Provides a number of auto-complete sources for Clojure projects
+;; using nrepl.
+
+;;; Installation:
+
+;; Available as a package in both Melpa (recommended) at
+;; http://melpa.milkbox.net/ and Marmalade at http://marmalade-repo.org/
+;; M-x package-install ac-nrepl
+
+;;; Usage:
+
+;;     (require 'ac-nrepl)
+;;     (add-hook 'cider-repl-mode-hook 'ac-nrepl-setup)
+;;     (add-hook 'cider-mode-hook 'ac-nrepl-setup)
+;;     (eval-after-load "auto-complete"
+;;       '(add-to-list 'ac-modes 'cider-repl-mode))
+
+;; If you want to trigger auto-complete using TAB in nrepl buffers, you may
+;; want to use auto-complete in your `completion-at-point-functions':
+
+;;     (defun set-auto-complete-as-completion-at-point-function ()
+;;       (setq completion-at-point-functions '(auto-complete)))
+;;     (add-hook 'auto-complete-mode-hook 'set-auto-complete-as-completion-at-point-function)
+;;
+;;     (add-hook 'cider-repl-mode-hook 'set-auto-complete-as-completion-at-point-function)
+;;     (add-hook 'cider-mode-hook 'set-auto-complete-as-completion-at-point-function)
+;;
+;; You might consider using ac-nrepl's popup documentation in place of `nrepl-doc':
+;;
+;;     (eval-after-load 'cider
+;;       '(define-key cider-mode-map (kbd "C-c C-d") 'ac-nrepl-popup-doc))
+
+;;; Code:
+
+(require 'nrepl-client)
+(require 'cider-interaction)
+(require 'auto-complete)
+
+(defun ac-nrepl-available-p ()
+  "Return t if nrepl is available for completion, otherwise nil."
+  (condition-case nil
+      (not (null (nrepl-current-tooling-session)))
+    (error nil)))
+
+(defun ac-nrepl-sync-eval (clj)
+  "Synchronously evaluate CLJ.
+Result is a plist, as returned from `nrepl-send-string-sync'."
+  (nrepl-send-string-sync clj (cider-current-ns) (nrepl-current-tooling-session)))
+
+(defun ac-nrepl-candidates* (clj)
+  "Return completion candidates produced by evaluating CLJ."
+  (let ((response (plist-get (ac-nrepl-sync-eval (concat "(require 'complete.core) " clj))
+                             :value)))
+    (when response
+      (car (read-from-string response)))))
+
+(defun ac-nrepl-unfiltered-clj (clj)
+  "Return a version of CLJ with the completion prefix inserted."
+  (format clj ac-prefix))
+
+(defun ac-nrepl-filtered-clj (clj)
+  "Build an expression which extracts the prefixed values from CLJ."
+  (concat "(filter #(.startsWith % \"" ac-prefix "\")"
+          (ac-nrepl-unfiltered-clj clj) ")"))
+
+(defun ac-nrepl-candidates-ns ()
+  "Return namespace candidates."
+  (ac-nrepl-candidates*
+   (ac-nrepl-filtered-clj "(complete.core/namespaces *ns*)")))
+
+(defun ac-nrepl-candidates-vars ()
+  "Return var candidates."
+  (ac-nrepl-candidates*
+   (ac-nrepl-filtered-clj "(let [prefix \"%s\"]
+    (if-not (.contains prefix \"/\")
+      (complete.core/ns-vars *ns*)
+      (let [ns-alias (symbol (first (.split prefix \"/\")))
+            core     (find-ns 'clojure.core)]
+        (if-let [ns (or (get (ns-aliases *ns*) ns-alias)
+                        (find-ns ns-alias))]
+          (let [vars (complete.core/ns-vars ns)
+                vars (if (= core ns)
+                       vars
+                       (remove (into #{} (complete.core/ns-vars core)) vars))]
+            (map (fn [x] (str ns-alias \"/\" x)) vars))
+           '()))))")))
+
+(defun ac-nrepl-candidates-ns-classes ()
+  "Return namespaced class candidates."
+  (ac-nrepl-candidates*
+   (ac-nrepl-filtered-clj "(complete.core/ns-classes *ns*)")))
+
+(defvar ac-nrepl-all-classes-cache nil
+  "Cached list of all classes loaded in the JVM backend.")
+
+(defun ac-nrepl-refresh-class-cache ()
+  "Clear `ac-nrepl-all-classes-cache' and then refill it asynchronously."
+  (setq ac-nrepl-all-classes-cache nil)
+  (nrepl-send-string
+   (concat "(require 'complete.core)"
+           (ac-nrepl-unfiltered-clj "(concat @complete.core/nested-classes
+                                       @complete.core/top-level-classes)"))
+   (nrepl-make-response-handler
+    (nrepl-current-connection-buffer)
+    (lambda (buffer value)
+      (setq ac-nrepl-all-classes-cache (car (read-from-string value))))
+    nil nil nil)
+   (cider-current-ns)
+   (nrepl-current-tooling-session)))
+
+
+(add-hook 'nrepl-connected-hook 'ac-nrepl-refresh-class-cache t)
+
+(defun ac-nrepl-candidates-all-classes ()
+  "Return java method candidates."
+  (when (string-match-p "^[a-zA-Z]+[a-zA-Z0-9$_]*\\.[a-zA-Z0-9$_.]*$" ac-prefix)
+    ac-nrepl-all-classes-cache))
+
+(defun ac-nrepl-candidates-java-methods ()
+  "Return java method candidates."
+  (mapcar (lambda (hit)
+            (let* ((parts (split-string hit "#"))
+                   (meth (nth 0 parts))
+                   (classname (nth 1 parts)))
+              (propertize meth 'summary classname)))
+          (ac-nrepl-candidates*
+           (ac-nrepl-filtered-clj
+            "(for [class (vals (ns-imports *ns*))
+                   method (.getMethods class)
+                   :when (not (java.lang.reflect.Modifier/isStatic (.getModifiers method)))]
+               (str \".\" (.getName method) \"#\" (.getName class)))"))))
+
+(defun ac-nrepl-candidates-static-methods ()
+  "Return static method candidates."
+  (ac-nrepl-candidates*
+   (ac-nrepl-filtered-clj
+    "(let [prefix \"%s\"]
+       (if (or (not (.contains prefix \"/\"))
+               (.startsWith prefix \"/\"))
+         '()
+          (let [scope (symbol (first (.split prefix \"/\")))]
+            (map (fn [memb] (str scope \"/\" memb))
+                 (when-let [class (try (complete.core/resolve-class scope)
+                                   (catch java.lang.ClassNotFoundException e nil))]
+                   (complete.core/static-members class))))))  ")))
+
+(defun ac-nrepl-documentation (symbol)
+  "Return documentation for the given SYMBOL, if available."
+  (let ((raw-doc (plist-get (ac-nrepl-sync-eval
+                             (format "(try (eval '(clojure.repl/doc %s))
+                                        (catch Exception e nil))"
+                                     symbol))
+                            :stdout)))
+    (when raw-doc
+      (let ((doc
+             (substring-no-properties
+              (replace-regexp-in-string
+               "\r" ""
+               (replace-regexp-in-string
+                "^\\(  \\|-------------------------\r?\n\\)" ""
+                raw-doc)))))
+        (unless (string-match "\\`[ \t\n]*\\'" doc)
+          doc)))))
+
+(defun ac-nrepl-symbol-start-pos ()
+  "Find the starting position of the symbol at point, unless inside a string."
+  (let ((sap (symbol-at-point)))
+    (when (and sap (not (in-string-p)))
+      (car (bounds-of-thing-at-point 'symbol)))))
+
+;;;###autoload
+(defface ac-nrepl-candidate-face
+  '((t (:inherit ac-candidate-face)))
+  "Face for nrepl candidates."
+  :group 'auto-complete)
+
+;;;###autoload
+(defface ac-nrepl-selection-face
+  '((t (:inherit ac-selection-face)))
+  "Face for the nrepl selected candidate."
+  :group 'auto-complete)
+
+;;;###autoload
+(defconst ac-nrepl-source-defaults
+  '((available . ac-nrepl-available-p)
+    (candidate-face . ac-nrepl-candidate-face)
+    (selection-face . ac-nrepl-selection-face)
+    (prefix . ac-nrepl-symbol-start-pos)
+    (document . ac-nrepl-documentation))
+  "Defaults common to the various completion sources.")
+
+;;;###autoload
+(defvar ac-source-nrepl-ns
+  (append
+   '((candidates . ac-nrepl-candidates-ns)
+     (symbol . "n"))
+   ac-nrepl-source-defaults)
+  "Auto-complete source for nrepl ns completion.")
+
+;;;###autoload
+(defvar ac-source-nrepl-vars
+  (append
+   '((candidates . ac-nrepl-candidates-vars)
+     (symbol . "v"))
+   ac-nrepl-source-defaults)
+  "Auto-complete source for nrepl var completion.")
+
+;;;###autoload
+(defvar ac-source-nrepl-ns-classes
+  (append
+   '((candidates . ac-nrepl-candidates-ns-classes)
+     (symbol . "c"))
+   ac-nrepl-source-defaults)
+  "Auto-complete source for nrepl ns-specific class completion.")
+
+;;;###autoload
+(defvar ac-source-nrepl-all-classes
+  (append
+   '((candidates . ac-nrepl-candidates-all-classes)
+     (symbol . "c"))
+   ac-nrepl-source-defaults)
+  "Auto-complete source for nrepl all class completion.")
+
+;;;###autoload
+(defvar ac-source-nrepl-java-methods
+  (append
+   '((candidates . ac-nrepl-candidates-java-methods)
+     (symbol . "m"))
+   ac-nrepl-source-defaults)
+  "Auto-complete source for nrepl java method completion.")
+
+;;;###autoload
+(defvar ac-source-nrepl-static-methods
+  (append
+   '((candidates . ac-nrepl-candidates-static-methods)
+     (symbol . "s"))
+   ac-nrepl-source-defaults)
+  "Auto-complete source for nrepl java static method completion.")
+
+;;;###autoload
+(defun ac-nrepl-setup ()
+  "Add the nrepl completion source to the front of `ac-sources'.
+This affects only the current buffer."
+  (interactive)
+  (add-to-list 'ac-sources 'ac-source-nrepl-ns)
+  (add-to-list 'ac-sources 'ac-source-nrepl-vars)
+  (add-to-list 'ac-sources 'ac-source-nrepl-ns-classes)
+  (add-to-list 'ac-sources 'ac-source-nrepl-all-classes)
+  (add-to-list 'ac-sources 'ac-source-nrepl-java-methods)
+  (add-to-list 'ac-sources 'ac-source-nrepl-static-methods))
+
+;;;###autoload
+(defun ac-nrepl-popup-doc ()
+  "A popup alternative to `nrepl-doc'."
+  (interactive)
+  (let ((doc (ac-nrepl-documentation (symbol-at-point))))
+    (when doc
+     (popup-tip doc
+                :point (ac-nrepl-symbol-start-pos)
+                :around t
+                :scroll-bar t
+                :margin t))))
+
+(provide 'ac-nrepl)
+
+;; Local Variables:
+;; coding: utf-8
+;; eval: (checkdoc-minor-mode 1)
+;; End:
+
+;;; ac-nrepl.el ends here
diff --git a/elpa/ac-nrepl-0.21/ac-nrepl.elc b/elpa/ac-nrepl-0.21/ac-nrepl.elc
new file mode 100644
index 000000000..9505699d0
Binary files /dev/null and b/elpa/ac-nrepl-0.21/ac-nrepl.elc differ
diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents
deleted file mode 100644
index 78f93ebe5..000000000
--- a/elpa/archives/gnu/archive-contents
+++ /dev/null
@@ -1,332 +0,0 @@
-(1
- (ack .
-      [(1 3)
-       nil "Interface to ack-like source code search tools" tar
-       ((:keywords "tools" "processes" "convenience")
-	(:url . "https://github.com/leoliu/ack-el"))])
- (ada-mode .
-	   [(5 0)
-	    ((wisi
-	      (1 0)))
-	    "major-mode for editing Ada sources" tar
-	    ((:url . "http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html"))])
- (adaptive-wrap .
-		[(0 5)
-		 nil "Smart line-wrapping with wrap-prefix" single
-		 ((:url . "http://elpa.gnu.org/packages/adaptive-wrap.html")
-		  (:keywords))])
- (adjust-parens .
-		[(3 0)
-		 nil "Indent and dedent Lisp code, automatically adjust close parens" tar
-		 ((:url . "http://elpa.gnu.org/packages/adjust-parens.html"))])
- (all .
-      [(1 0)
-       nil "Edit all lines matching a given regexp" single
-       ((:url . "http://elpa.gnu.org/packages/all.html")
-	(:keywords "matching"))])
- (auctex .
-	 [(11 87 2)
-	  nil "Integrated environment for *TeX*" tar
-	  ((:url . "http://www.gnu.org/software/auctex/"))])
- (cl-lib .
-	 [(0 3)
-	  nil "Properly prefixed CL functions and macros" single
-	  ((:url . "http://elpa.gnu.org/packages/cl-lib.html")
-	   (:keywords))])
- (coffee-mode .
-	      [(0 4 1 1)
-	       nil "Major mode for CoffeeScript files" single
-	       ((:url . "http://github.com/defunkt/coffee-mode")
-		(:keywords "CoffeeScript major mode"))])
- (company .
-	  [(0 6 12)
-	   nil "Modular in-buffer completion framework" tar
-	   ((:keywords "abbrev" "convenience" "matching")
-	    (:url . "http://company-mode.github.io/"))])
- (csv-mode .
-	   [(1 2)
-	    nil "Major mode for editing comma/char separated values" single
-	    ((:url . "http://centaur.maths.qmul.ac.uk/Emacs/")
-	     (:keywords "convenience"))])
- (debbugs .
-	  [(0 5)
-	   nil "SOAP library to access debbugs servers" tar
-	   ((:keywords "comm" "hypermedia")
-	    (:url . "http://elpa.gnu.org/packages/debbugs.html"))])
- (dict-tree .
-	    [(0 12 8)
-	     ((trie
-	       (0 2 5))
-	      (tNFA
-	       (0 1 1))
-	      (heap
-	       (0 3)))
-	     "Dictionary data structure" single
-	     ((:url . "http://www.dr-qubit.org/emacs.php")
-	      (:keywords "extensions" "matching" "data structures"))])
- (diff-hl .
-	  [(1 5 1)
-	   ((cl-lib
-	     (0 2)))
-	   "Highlight uncommitted changes" tar
-	   ((:keywords "vc" "diff")
-	    (:url . "https://github.com/dgutov/diff-hl"))])
- (dismal .
-	 [(1 5)
-	  ((cl-lib
-	    (0)))
-	  "Dis Mode Ain't Lotus: Spreadsheet program Emacs" tar
-	  ((:url . "http://elpa.gnu.org/packages/dismal.html"))])
- (djvu .
-       [(0 5)
-	nil "Edit and view Djvu files via djvused" single
-	((:url . "http://elpa.gnu.org/packages/djvu.html")
-	 (:keywords "files" "wp"))])
- (docbook .
-	  [(0 1)
-	   nil "Info-like viewer for DocBook" single
-	   ((:url . "http://elpa.gnu.org/packages/docbook.html")
-	    (:keywords "docs" "help"))])
- (ediprolog .
-	    [(1 0)
-	     nil "Emacs Does Interactive Prolog" single
-	     ((:url . "http://elpa.gnu.org/packages/ediprolog.html")
-	      (:keywords "languages" "processes"))])
- (eldoc-eval .
-	     [(0 1)
-	      nil "Enable eldoc support when minibuffer is in use." single
-	      ((:url . "http://elpa.gnu.org/packages/eldoc-eval.html")
-	       (:keywords))])
- (enwc .
-       [(1 0)
-	nil "The Emacs Network Client" tar
-	((:keywords "enwc" "network" "wicd" "manager" "nm")
-	 (:url . "http://elpa.gnu.org/packages/enwc.html"))])
- (epoch-view .
-	     [(0 0 1)
-	      nil "Minor mode to visualize epoch timestamps" single
-	      ((:url . "http://elpa.gnu.org/packages/epoch-view.html")
-	       (:keywords "data" "timestamp" "epoch" "unix"))])
- (f90-interface-browser .
-			[(1 1)
-			 nil "Parse and browse f90 interfaces" single
-			 ((:url . "http://github.com/wence-/f90-iface/")
-			  (:keywords))])
- (flylisp .
-	  [(0 2)
-	   nil "Color unbalanced parentheses and parentheses inconsistent with indentation" single
-	   ((:url . "http://elpa.gnu.org/packages/flylisp.html")
-	    (:keywords))])
- (ggtags .
-	 [(0 7 8)
-	  ((emacs
-	    (24)))
-	  "emacs frontend to GNU Global source code tagging system" single
-	  ((:url . "https://github.com/leoliu/ggtags")
-	   (:keywords "tools" "convenience"))])
- (heap .
-       [(0 3)
-	nil "Heap (a.k.a. priority queue) data structure" single
-	((:url . "http://www.dr-qubit.org/emacs.php")
-	 (:keywords "extensions" "data structures" "heap" "priority queue"))])
- (ioccur .
-	 [(2 4)
-	  nil "Incremental occur" single
-	  ((:url . "http://elpa.gnu.org/packages/ioccur.html")
-	   (:keywords))])
- (jgraph-mode .
-	      [(1 0)
-	       nil "Major mode for Jgraph files" single
-	       ((:url . "http://elpa.gnu.org/packages/jgraph-mode.html")
-		(:keywords "tex" "wp"))])
- (js2-mode .
-	   [(20131106)
-	    ((emacs
-	      (24 1)))
-	    "Improved JavaScript editing mode" tar
-	    ((:keywords "languages" "javascript")
-	     (:url . "https://github.com/mooz/js2-mode/"))])
- (jumpc .
-	[(3 0)
-	 nil "jump to previous insertion points" single
-	 ((:url . "http://elpa.gnu.org/packages/jumpc.html")
-	  (:keywords))])
- (lex .
-      [(1 1)
-       nil "Lexical analyser construction" tar
-       ((:url . "http://elpa.gnu.org/packages/lex.html"))])
- (lmc .
-      [(1 2)
-       nil "Little Man Computer in Elisp" single
-       ((:url . "http://elpa.gnu.org/packages/lmc.html")
-	(:keywords))])
- (load-dir .
-	   [(0 0 3)
-	    nil "Load all Emacs Lisp files in a given directory" single
-	    ((:url . "http://elpa.gnu.org/packages/load-dir.html")
-	     (:keywords "lisp" "files" "convenience"))])
- (markchars .
-	    [(0 2 0)
-	     nil "Mark chars fitting certain characteristics" single
-	     ((:url . "http://elpa.gnu.org/packages/markchars.html")
-	      (:keywords))])
- (memory-usage .
-	       [(0 2)
-		nil "Analyze the memory usage of Emacs in various ways" single
-		((:url . "http://elpa.gnu.org/packages/memory-usage.html")
-		 (:keywords "maint"))])
- (minimap .
-	  [(1 0)
-	   nil "Sidebar showing a \"mini-map\" of a buffer" single
-	   ((:url . "http://elpa.gnu.org/packages/minimap.html")
-	    (:keywords))])
- (muse .
-       [(3 20)
-	nil "Authoring and publishing tool for Emacs" tar
-	((:keywords "hypermedia")
-	 (:url . "http://mwolson.org/projects/EmacsMuse.html"))])
- (nhexl-mode .
-	     [(0 1)
-	      nil "Minor mode to edit files via hex-dump format" single
-	      ((:url . "http://elpa.gnu.org/packages/nhexl-mode.html")
-	       (:keywords "data"))])
- (nlinum .
-	 [(1 1)
-	  nil "Show line numbers in the margin" single
-	  ((:url . "http://elpa.gnu.org/packages/nlinum.html")
-	   (:keywords "convenience"))])
- (notes-mode .
-	     [(1 30)
-	      nil "Indexing system for on-line note-taking" tar
-	      ((:url . "http://elpa.gnu.org/packages/notes-mode.html"))])
- (num3-mode .
-	    [(1 1)
-	     nil "highlight groups of digits in long numbers" single
-	     ((:url . "http://elpa.gnu.org/packages/num3-mode.html")
-	      (:keywords))])
- (oauth2 .
-	 [(0 9)
-	  nil "OAuth 2.0 Authorization Protocol" single
-	  ((:url . "http://elpa.gnu.org/packages/oauth2.html")
-	   (:keywords "comm"))])
- (omn-mode .
-	   [(1 0)
-	    nil "Support for OWL Manchester Notation" single
-	    ((:url . "http://elpa.gnu.org/packages/omn-mode.html")
-	     (:keywords))])
- (org .
-      [(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")
-		  (:keywords "convenience wp"))])
- (queue .
-	[(0 1)
-	 nil "Queue data structure" single
-	 ((:url . "http://www.dr-qubit.org/emacs.php")
-	  (:keywords "extensions" "data structures" "queue"))])
- (rainbow-mode .
-	       [(0 9)
-		nil "Colorize color names in buffers" single
-		((:url . "http://elpa.gnu.org/packages/rainbow-mode.html")
-		 (:keywords "faces"))])
- (register-list .
-		[(0 1)
-		 nil "Interactively list/edit registers" single
-		 ((:url . "http://elpa.gnu.org/packages/register-list.html")
-		  (:keywords "register"))])
- (shen-mode .
-	    [(0 1)
-	     nil "A major mode for editing shen source code" tar
-	     ((:keywords "languages" "shen")
-	      (:url . "http://elpa.gnu.org/packages/shen-mode.html"))])
- (sisu-mode .
-	    [(3 0 3)
-	     nil "Major mode for SiSU markup text" single
-	     ((:url . "http://elpa.gnu.org/packages/sisu-mode.html")
-	      (:keywords "text" "processes" "tools"))])
- (smart-operator .
-		 [(4 0)
-		  nil "Insert operators with surrounding spaces smartly" single
-		  ((:url . "http://xwl.appspot.com/ref/smart-operator.el")
-		   (:keywords))])
- (sml-mode .
-	   [(6 4)
-	    nil "Major mode for editing (Standard) ML" single
-	    ((:url . "http://elpa.gnu.org/packages/sml-mode.html")
-	     (:keywords "SML"))])
- (sokoban .
-	  [(1 0 4)
-	   nil "Sokoban game for emacs" tar nil])
- (svg-clock .
-	    [(0 5)
-	     nil "Analog clock using Scalable Vector Graphics" single
-	     ((:url . "http://elpa.gnu.org/packages/svg-clock.html")
-	      (:keywords "demo" "svg" "clock"))])
- (tNFA .
-       [(0 1 1)
-	((queue
-	  (0 1)))
-	"Tagged non-deterministic finite-state automata" single
-	((:url . "http://www.dr-qubit.org/emacs.php")
-	 (:keywords "extensions" "matching" "data structures"))])
- (temp-buffer-browse .
-		     [(1 1)
-		      nil "temp buffer browse mode" single
-		      ((:url . "http://elpa.gnu.org/packages/temp-buffer-browse.html")
-		       (:keywords "convenience"))])
- (trie .
-       [(0 2 6)
-	((tNFA
-	  (0 1 1))
-	 (heap
-	  (0 3)))
-	"Trie data structure" single
-	((:url . "http://www.dr-qubit.org/emacs.php")
-	 (:keywords "extensions" "matching" "data structures"))])
- (undo-tree .
-	    [(0 6 5)
-	     nil "Treat undo history as a tree" single
-	     ((:url . "http://www.dr-qubit.org/emacs.php")
-	      (:keywords "convenience" "files" "undo" "redo" "history" "tree"))])
- (uni-confusables .
-		  [(0 1)
-		   nil "Unicode confusables table" tar nil])
- (vlf .
-      [(1 2)
-       nil "View Large Files" single
-       ((:url . "https://github.com/m00natic/vlfi")
-	(:keywords "large files" "utilities"))])
- (w3 .
-     [(4 0 49)
-      nil "Fully customizable, largely undocumented web browser for Emacs" tar
-      ((:keywords "faces" "help" "comm" "news" "mail" "processes" "mouse" "hypermedia")
-       (:url . "http://elpa.gnu.org/packages/w3.html"))])
- (websocket .
-	    [(1 1)
-	     nil "Emacs WebSocket client and server" tar
-	     ((:keywords "Communication" "Websocket" "Server")
-	      (:url . "http://elpa.gnu.org/packages/websocket.html"))])
- (windresize .
-	     [(0 1)
-	      nil "Resize windows interactively" single
-	      ((:url . "http://elpa.gnu.org/packages/windresize.html")
-	       (:keywords "window"))])
- (wisi .
-       [(1 0)
-	((cl-lib
-	  (0)))
-	"Utilities for implementing an indentation/navigation engine using a generalized LALR parser" tar
-	((:url . "http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html"))])
- (xclip .
-	[(1 3)
-	 nil "use xclip to copy&paste" single
-	 ((:url . "http://elpa.gnu.org/packages/xclip.html")
-	  (:keywords "convenience" "tools"))])
- (yasnippet .
-	    [(0 8 0)
-	     nil "Yet another snippet extension for Emacs." tar
-	     ((:keywords "convenience" "emulation")
-	      (:url . "http://github.com/capitaomorte/yasnippet"))]))
diff --git a/elpa/archives/marmalade/archive-contents b/elpa/archives/marmalade/archive-contents
deleted file mode 100644
index f381f7159..000000000
--- a/elpa/archives/marmalade/archive-contents
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index 9f21aa941..000000000
--- a/elpa/archives/melpa/archive-contents
+++ /dev/null
@@ -1,2 +0,0 @@
-
-(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/archives/tromey/archive-contents b/elpa/archives/tromey/archive-contents
deleted file mode 100644
index 0a7883543..000000000
--- a/elpa/archives/tromey/archive-contents
+++ /dev/null
@@ -1,447 +0,0 @@
-(1
- (load-relative .
-		[(0 1)
-		 nil "relative file load (within a multi-file Emacs package)" single])
- (test-unit .
-	    [(0 1)
-	     nil "Unit Test Framework for Emacs Lisp " single])
- (zenburn .
-	  [(1 8)
-	   nil "just some alien fruit salad to keep you in the zone" single])
- (multi-project .
-		[(0 0 1)
-		 nil "Work with multiple projects" single])
- (hungry-delete .
-		[(1 0)
-		 nil "hungry delete minor mode" single])
- (Save-visited-files .
-		     [(1 2)
-		      nil "save opened files across sessions" single])
- (c-eldoc .
-	  [(0 6)
-	   nil "helpful description of the arguments to C functions" single])
- (mv-shell .
-	   [(1 0)
-	    nil "keep buffers in sync with filename throughout 'mv'commands in shell-mode." single])
- (diff-git .
-	   [(0 1 1)
-	    nil "Git integration with diff-mode" single])
- (html-script-src .
-		  [(0 0 2)
-		   nil "Insert <script src=\"..\"> for popular JavaScript libraries" single])
- (rvm .
-      [(1 1)
-       nil "Emacs integration for rvm" single])
- (elisp-depend .
-	       [(0 4 1)
-		nil "Parse depend libraries of elisp file." single])
- (perspective .
-	      [(1 3)
-	       nil "switch between named \"perspectives\" of the editor" single])
- (ruby-electric .
-		[(1 1)
-		 nil "electric editing commands for ruby files" single])
- (yari .
-       [(0 3)
-	nil "Yet Another RI interface for Emacs" single])
- (smex .
-       [(1 1 1)
-	nil "M-x interface with Ido-style fuzzy matching." single])
- (drag-stuff .
-	     [(0 0 3)
-	      nil "Drag stuff (lines, words, region, etc...) around" single])
- (ruby-test-mode .
-		 [(1 0)
-		  nil "Minor mode for Behaviour and Test Driven" single])
- (applescript-mode .
-		   [(20090321)
-		    nil "major mode for editing AppleScript source" single])
- (mediawiki .
-	    [(1 1)
-	     nil "mediawiki frontend" single])
- (wrap-region .
-	      [(0 1 3)
-	       nil "Wrap text with punctation or tag" single])
- (twitter .
-	  [(20090422)
-	   nil "Simple Emacs-based client for Twitter" single])
- (pastie .
-	 [(20091230)
-	  nil "Emacs integration for pastie.org" single])
- (textmate .
-	   [(1)
-	    nil "TextMate minor mode for Emacs" single])
- (yaml-mode .
-	    [(0 0 5)
-	     nil "Major mode for editing YAML files" single])
- (rspec-mode .
-	     [(0 2)
-	      ((ruby-mode
-		(1 1)))
-	      "Enhance ruby-mode for RSpec" single])
- (htmlize .
-	  [(1 37)
-	   nil "Convert buffer text and decorations to HTML." single])
- (swank-clojure .
-		[(1 1 0)
-		 ((slime-repl
-		   (20091016))
-		  (clojure-mode
-		   (1 6)))
-		 "slime adapter for clojure" single])
- (slime-repl .
-	     [(20100404)
-	      ((slime
-		(20100404)))
-	      "Read-Eval-Print Loop written in Emacs Lisp" single])
- (slime .
-	[(20100404)
-	 nil "Superior Lisp Interaction Mode for Emacs" single])
- (nterm .
-	[(0 1)
-	 nil "New TERMinal emulator" single])
- (sass-mode .
-	    [(3 0 14)
-	     ((haml-mode
-	       (3 0 14)))
-	     "Major mode for editing Sass files" single])
- (haml-mode .
-	    [(3 0 14)
-	     nil "Major mode for editing Haml files" single])
- (smart-tab .
-	    [(0 3)
-	     nil "Intelligent tab completion and indentation." single])
- (cssh .
-       [(0 7)
-	nil "clusterssh implementation for emacs" single])
- (relax .
-	[(0 2)
-	 ((json
-	   (1 2))
-	  (javascript
-	   (1 99 8)))
-	 "For browsing and interacting with CouchDB" single])
- (shellfm .
-	  [(0 1)
-	   nil "Emacs Shell.FM interface" single])
- (texdrive .
-	   [(0 3 1)
-	    nil "minor mode for creating png images from TeX formulae " single])
- (paredit .
-	  [(20)
-	   nil "Parenthesis-Editing Minor Mode" single])
- (rotate-text .
-	      [(0 1)
-	       nil "cycle through words, symbols and patterns" single])
- (full-ack .
-	   [(0 2 1)
-	    nil "a front-end for ack" single])
- (recent-addresses .
-		   [(0 1)
-		    nil "store and recall recently used email addresses" single])
- (test-case-mode .
-		 [(0 1)
-		  ((fringe-helper
-		    (0 1 1)))
-		  "unit test front-end" single])
- (nav .
-      [(35)
-       nil "Emacs mode for IDE-like navigation of directories" single])
- (company .
-	  [(0 5)
-	   nil "extensible inline text completion mechanism" tar])
- (guess-style .
-	      [(0 1)
-	       nil "automatic setting of code style variables" single])
- (clojure-test-mode .
-		    [(1 4)
-		     ((slime
-		       (20091016))
-		      (clojure-mode
-		       (1 7)))
-		     "Minor mode for Clojure tests" single])
- (clojure-mode .
-	       [(1 7 1)
-		nil "Major mode for Clojure code" single])
- (magit .
-	[(0 8 1)
-	 nil "control Git from Emacs." single])
- (w3 .
-     [(4 0 46)
-      nil "A web browser written entirely in Emacs Lisp" tar])
- (yasnippet-bundle .
-		   [(0 6 1)
-		    nil "Yet another snippet extension (Auto compiled bundle)" single])
- (rinari .
-	 [(2 1)
-	  ((ruby-mode
-	    (1 1))
-	   (inf-ruby
-	    (2 1))
-	   (ruby-compilation
-	    (0 7))
-	   (jump
-	    (2 0)))
-	  "Rinari Is Not A Rails IDE" single])
- (jump .
-       [(2 0)
-	((findr
-	  (0 7))
-	 (inflections
-	  (1 0)))
-	"build functions which contextually jump between files" single])
- (inflections .
-	      [(1 0)
-	       nil "convert english words between singular and plural" single])
- (tumble .
-	 [(1 1)
-	  ((http-post-simple
-	    (1 0)))
-	  "an Emacs mode for Tumblr" single])
- (http-post-simple .
-		   [(1 0)
-		    nil "HTTP POST requests using the url library" single])
- (findr .
-	[(0 7)
-	 nil "Breadth-first file-finding facility for (X)Emacs" single])
- (ruby-compilation .
-		   [(0 7)
-		    ((ruby-mode
-		      (1 1))
-		     (inf-ruby
-		      (2 1)))
-		    "run a ruby process in a compilation buffer" single])
- (gist .
-       [(0 5)
-	nil "Emacs integration for gist.github.com" single])
- (confluence .
-	     [(1 4)
-	      ((xml-rpc
-		(1 6 4)))
-	      "Emacs mode for interacting with confluence wikis" single])
- (epresent .
-	   [(0 1)
-	    nil "Simple presentation mode for Emacs" single])
- (inf-ruby .
-	   [(2 1)
-	    ((ruby-mode
-	      (1 1)))
-	    "Run a ruby process in a buffer" single])
- (ruby-mode .
-	    [(1 1)
-	     nil "Major mode for editing Ruby files" single])
- (idle-highlight .
-		 [(1 0)
-		  nil "highlight the word the point is on" single])
- (find-file-in-project .
-		       [(2 0)
-			((project-local-variables
-			  (0 2)))
-			"Find files in a project quickly." single])
- (project-local-variables .
-			  [(0 2)
-			   nil "set project-local variables from a file" single])
- (lusty-explorer .
-		 [(2 4)
-		  nil "Dynamic filesystem explorer and buffer switcher" single])
- (tempo-snippets .
-		 [(0 1 5)
-		  nil "visual insertion of tempo templates" single])
- (highlight-80+ .
-		[(1 0)
-		 nil "highlight characters beyond column 80" single])
- (echo-pick .
-	    [(0 1)
-	     nil "filter for echo area status messages" single])
- (fringe-helper .
-		[(0 1 1)
-		 nil "helper functions for fringe bitmaps" single])
- (elk-test .
-	   [(0 3 2)
-	    ((fringe-helper
-	      (0 1 1)))
-	    "Emacs Lisp testing framework" single])
- (compile-bookmarks .
-		    [(0 2)
-		     nil "bookmarks for compilation commands" single])
- (pov-mode .
-	   [(3 2)
-	    nil "Major mode for editing POV-Ray scene files." tar])
- (js2-mode .
-	   [(20090723)
-	    nil "an improved JavaScript editing mode" single])
- (ert .
-      [(0 1)
-       nil "Emacs Lisp Regression Testing" single])
- (jtags .
-	[(0 96)
-	 nil "enhanced tags functionality for Java development" single])
- (eproject .
-	   [(0 4)
-	    nil "project workspaces for emacs" tar])
- (log4j-mode .
-	     [(1 3)
-	      nil "major mode for viewing log files" single])
- (nxml-mode .
-	    [(20041004)
-	     nil "Major mode for editing XML documents." tar])
- (columnify .
-	    [(1 0)
-	     nil "arrange lines into columns" single])
- (gdb-mi .
-	 [(0 6 1 0)
-	  nil "User Interface for running GDB" single])
- (asciidoc .
-	   [(0 1)
-	    nil "asciidoc text file development support" single])
- (shell-current-directory .
-			  [(0 1)
-			   nil "create new shell based on buffer directory" single])
- (facebook .
-	   [(0 0 1)
-	    ((json
-	      (0)))
-	    "Access the Facebook API from emacs" single])
- (json .
-       [(1 2)
-	nil "JavaScript Object Notation parser / generator" single])
- (pick-backup .
-	      [(0 8)
-	       nil "easy access to versioned backup files" single])
- (idle-require .
-	       [(1 0)
-		nil "load elisp libraries while Emacs is idle" single])
- (highlight-symbol .
-		   [(1 1)
-		    nil "automatic and manual symbol highlighting" single])
- (auto-dictionary .
-		  [(1 0 1)
-		   nil "automatic dictionary switcher for flyspell" single])
- (dictionary .
-	     [(1 8 7)
-	      nil "an interface to an RFC 2229 dictionary server" tar])
- (muse .
-       [(3 20)
-	nil "Authoring and publishing tool" tar])
- (jimb-patch .
-	     [(1 5)
-	      nil "clean a patch for submission via email" single])
- (lisppaste .
-	    [(1 8)
-	     ((xml-rpc
-	       (1 6 7)))
-	     "Interact with the lisppaste pastebot via XML-RPC." single])
- (weblogger .
-	    [(1 4 3)
-	     ((xml-rpc
-	       (1 6 5)))
-	     "Weblog maintenance via XML-RPC APIs" single])
- (xml-rpc .
-	  [(1 6 7)
-	   nil "An elisp implementation of clientside XML-RPC" single])
- (iresize .
-	  [(0 2)
-	   nil "Interactively resize a window" single])
- (sgftree .
-	  [(0 1)
-	   nil "Read an sgf file and represent it as a tree" single])
- (chess .
-	[(1 96)
-	 nil "Play chess in Emacs" tar])
- (etags-select .
-	       [(1 11)
-		nil "Select from multiple tags" single])
- (less .
-       [(0 2)
-	nil "less style view mode" single])
- (smart-operator .
-		 [(0 9)
-		  nil "Insert operators packed with whitespaces smartly" single])
- (dired-isearch .
-		[(0 3)
-		 nil "isearch in Dired" single])
- (cal-china-x .
-	      [(0 6)
-	       nil "Chinese calendar extras" single])
- (wajig .
-	[(0 53)
-	 nil "an interface for wajig" single])
- (erc .
-      [(5 3)
-       nil "An Emacs Internet Relay Chat client" tar])
- (emms .
-       [(3 0)
-	nil "The Emacs Multimedia System" tar])
- (archive-downloader .
-		     [(1 1)
-		      nil "Download files from archive.org" single])
- (package .
-	  [(0 9)
-	   nil "Simple package system for Emacs" single])
- (highlight-parentheses .
-			[(1 0 1)
-			 nil "highlight surrounding parentheses" single])
- (kill-ring-search .
-		   [(1 1)
-		    nil "incremental search for the kill ring" single])
- (tex-math-preview .
-		   [(8)
-		    nil "preview TeX math expressions." single])
- (gtk-look .
-	   [(19)
-	    nil "lookup Gtk and Gnome documentation." single])
- (xtide .
-	[(16)
-	 nil "XTide display in Emacs" single])
- (compilation-recenter-end .
-			   [(4)
-			    nil "compilation-mode window recentre" single])
- (gdb-shell .
-	    [(0 4)
-	     nil "minor mode to add gdb features to shell" single])
- (highline .
-	   [(4 2)
-	    nil "minor mode to highlight current line in buffer" single])
- (lua-mode .
-	   [(20100617)
-	    nil "a major-mode for editing Lua scripts" single])
- (css-mode .
-	   [(1 0)
-	    nil "Major mode for editing Cascading Style Sheets" single])
- (javascript .
-	     [(2 2 1)
-	      nil "Major mode for editing JavaScript source text" single])
- (light-symbol .
-	       [(0 1)
-		nil "Minor mode to highlight symbol under point" single])
- (worklog .
-	  [(2 4 2)
-	   nil "time tracking mode" single])
- (abacus .
-	 [(1 0 2)
-	  nil "Abacus Calculator" single])
- (sudoku .
-	 [(0 3)
-	  nil "Simple sudoku game, can download puzzles from the web." single])
- (caps-mode .
-	    [(1 0)
-	     nil "(minor mode) letters are inserted capitalized" single])
- (lambdacalc .
-	     [(1 0)
-	      nil "Interpret lambda calculus expressions" single])
- (wtf .
-      [(2 0)
-       nil "Look up conversational and computing acronyms" single])
- (blank-mode .
-	     [(6 6)
-	      nil "Minor mode to visualize blanks" single])
- (bubbles .
-	  [(0 5)
-	   nil "Puzzle game for Emacs." single])
- (newsticker .
-	     [(1 10)
-	      nil "Headline news ticker" tar])
- (changelog-url .
-		[(0 1)
-		 nil "ChangeLog bugzilla buttonizer" tar]))
-
diff --git a/elpa/auto-complete-1.4/COPYING.FDL b/elpa/auto-complete-1.4/COPYING.FDL
deleted file mode 100644
index 2f7e03ca5..000000000
--- a/elpa/auto-complete-1.4/COPYING.FDL
+++ /dev/null
@@ -1,451 +0,0 @@
-
-                GNU Free Documentation License
-                 Version 1.3, 3 November 2008
-
-
- Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-     <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The "Document", below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as "you".  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject.  (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-The "publisher" means any person or entity that distributes copies of
-the Document to the public.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no
-other conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to
-give them a chance to provide you with an updated version of the
-Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
-   or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications".  You must delete all sections
-Entitled "Endorsements".
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other
-documents released under this License, and replace the individual
-copies of this License in the various documents with a single copy
-that is included in the collection, provided that you follow the rules
-of this License for verbatim copying of each of the documents in all
-other respects.
-
-You may extract a single document from such a collection, and
-distribute it individually under this License, provided you insert a
-copy of this License into the extracted document, and follow this
-License in all other respects regarding verbatim copying of that
-document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense, or distribute it is void, and
-will automatically terminate your rights under this License.
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, receipt of a copy of some or all of the same material does
-not give you any rights to use it.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions of the
-GNU Free Documentation License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in
-detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.  If the Document
-specifies that a proxy can decide which future versions of this
-License can be used, that proxy's public statement of acceptance of a
-version permanently authorizes you to choose that version for the
-Document.
-
-11. RELICENSING
-
-"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
-World Wide Web server that publishes copyrightable works and also
-provides prominent facilities for anybody to edit those works.  A
-public wiki that anybody can edit is an example of such a server.  A
-"Massive Multiauthor Collaboration" (or "MMC") contained in the site
-means any set of copyrightable works thus published on the MMC site.
-
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 
-license published by Creative Commons Corporation, a not-for-profit 
-corporation with a principal place of business in San Francisco, 
-California, as well as future copyleft versions of that license 
-published by that same organization.
-
-"Incorporate" means to publish or republish a Document, in whole or in 
-part, as part of another Document.
-
-An MMC is "eligible for relicensing" if it is licensed under this 
-License, and if all works that were first published under this License 
-somewhere other than this MMC, and subsequently incorporated in whole or 
-in part into the MMC, (1) had no cover texts or invariant sections, and 
-(2) were thus incorporated prior to November 1, 2008.
-
-The operator of an MMC Site may republish an MMC contained in the site
-under CC-BY-SA on the same site at any time before August 1, 2009,
-provided the MMC is eligible for relicensing.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c)  YEAR  YOUR NAME.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
-    with the Invariant Sections being LIST THEIR TITLES, with the
-    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/elpa/auto-complete-1.4/COPYING.GPLv3 b/elpa/auto-complete-1.4/COPYING.GPLv3
deleted file mode 100644
index 94a9ed024..000000000
--- a/elpa/auto-complete-1.4/COPYING.GPLv3
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/elpa/auto-complete-1.4/Makefile b/elpa/auto-complete-1.4/Makefile
deleted file mode 100644
index e65514ca6..000000000
--- a/elpa/auto-complete-1.4/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-VERSION=`perl -ne 'print $$1 if /;; Version: (.*)/' auto-complete.el`
-PACKAGE=auto-complete-${VERSION}
-
-byte-compile:
-	emacs -Q -L . -batch -f batch-byte-compile auto-complete.el auto-complete-config.el
-
-install:
-	emacs -Q -L . -batch -l etc/install ${DIR}
-
-clean:
-	rm -f *.elc
-	rm -f doc/*.html
-	rm -rf ${PACKAGE}
-	rm -f ${PACKAGE}.zip ${PACKAGE}.tar ${PACKAGE}.tar.bz2
-
-package: clean
-	mkdir ${PACKAGE}
-	cp -r *.el Makefile *.md COPYING.* doc dict ${PACKAGE}
-
-package.tar: package
-	tar cf ${PACKAGE}.tar ${PACKAGE}
-
-package.tar.bz2: tar
-	bzip2 ${PACKAGE}.tar
-
-package.zip: package
-	zip -r ${PACKAGE}.zip ${PACKAGE}
diff --git a/elpa/auto-complete-1.4/README.md b/elpa/auto-complete-1.4/README.md
deleted file mode 100644
index c6ff110af..000000000
--- a/elpa/auto-complete-1.4/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Auto Complete Mode
-==================
-
-Documentation
--------------
-
-* http://cx4a.org/software/auto-complete/
-* doc/index.txt
-
-License
--------
-
-Auto Complete Mode is distributed under the term of GPLv3. And its documentations under doc directory is distributed under the term of GFDL.
diff --git a/elpa/auto-complete-1.4/TODO.md b/elpa/auto-complete-1.4/TODO.md
deleted file mode 100644
index 3dd2c896e..000000000
--- a/elpa/auto-complete-1.4/TODO.md
+++ /dev/null
@@ -1,11 +0,0 @@
-- etags, ctags
-- emacswiki
-- test facility
-- support composed chars
-- minibuffer completion
-- performance issue (cache issue)
-- asynchronous processing
-- kanji henkan support
-- create menu if needed
-- quick help positioning on tabs (bug)
-- skip short completion
diff --git a/elpa/auto-complete-1.4/auto-complete-autoloads.el b/elpa/auto-complete-1.4/auto-complete-autoloads.el
deleted file mode 100644
index ce322acf1..000000000
--- a/elpa/auto-complete-1.4/auto-complete-autoloads.el
+++ /dev/null
@@ -1,21 +0,0 @@
-;;; auto-complete-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (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))
-
-;;;***
-
-(provide 'auto-complete-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; auto-complete-autoloads.el ends here
diff --git a/elpa/auto-complete-1.4/auto-complete-config.el b/elpa/auto-complete-1.4/auto-complete-config.el
deleted file mode 100644
index 13f3057f1..000000000
--- a/elpa/auto-complete-1.4/auto-complete-config.el
+++ /dev/null
@@ -1,497 +0,0 @@
-;;; auto-complete-config.el --- auto-complete additional configuations
-
-;; Copyright (C) 2009, 2010  Tomohiro Matsuyama
-
-;; Author: Tomohiro Matsuyama <m2ym.pub@gmail.com>
-;; Keywords: convenience
-;; Version: 1.4
-
-;; 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:
-
-;; 
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'auto-complete)
-
-
-
-;;;; Additional sources
-
-;; imenu
-
-(defvar ac-imenu-index nil)
-
-(ac-clear-variable-every-10-minutes 'ac-imenu-index)
-
-(defun ac-imenu-candidates ()
-  (loop with i = 0
-        with stack = (progn
-                       (unless (local-variable-p 'ac-imenu-index)
-                         (make-local-variable 'ac-imenu-index))
-                       (or ac-imenu-index
-                           (setq ac-imenu-index
-                                 (ignore-errors
-                                   (with-no-warnings
-                                     (imenu--make-index-alist))))))
-        with result
-        while (and stack (or (not (integerp ac-limit))
-                             (< i ac-limit)))
-        for node = (pop stack)
-        if (consp node)
-        do
-        (let ((car (car node))
-              (cdr (cdr node)))
-          (if (consp cdr)
-              (mapc (lambda (child)
-                      (push child stack))
-                    cdr)
-            (when (and (stringp car)
-                       (string-match (concat "^" (regexp-quote ac-prefix)) car))
-              ;; Remove extra characters
-              (if (string-match "^.*\\(()\\|=\\|<>\\)$" car)
-                  (setq car (substring car 0 (match-beginning 1))))
-              (push car result)
-              (incf i))))
-        finally return (nreverse result)))
-
-(ac-define-source imenu
-  '((depends imenu)
-    (candidates . ac-imenu-candidates)
-    (symbol . "s")))
-
-;; gtags
-
-(defface ac-gtags-candidate-face
-  '((t (:background "lightgray" :foreground "navy")))
-  "Face for gtags candidate"
-  :group 'auto-complete)
-
-(defface ac-gtags-selection-face
-  '((t (:background "navy" :foreground "white")))
-  "Face for the gtags selected candidate."
-  :group 'auto-complete)
-
-(defun ac-gtags-candidate ()
-  (ignore-errors
-    (split-string (shell-command-to-string (format "global -ciq %s" ac-prefix)) "\n")))
-
-(ac-define-source gtags
-  '((candidates . ac-gtags-candidate)
-    (candidate-face . ac-gtags-candidate-face)
-    (selection-face . ac-gtags-selection-face)
-    (requires . 3)
-    (symbol . "s")))
-
-;; yasnippet
-
-(defface ac-yasnippet-candidate-face
-  '((t (:background "sandybrown" :foreground "black")))
-  "Face for yasnippet candidate."
-  :group 'auto-complete)
-
-(defface ac-yasnippet-selection-face
-  '((t (:background "coral3" :foreground "white")))
-  "Face for the yasnippet selected candidate."
-  :group 'auto-complete)
-
-(defun ac-yasnippet-table-hash (table)
-  (cond
-   ((fboundp 'yas/snippet-table-hash)
-    (yas/snippet-table-hash table))
-   ((fboundp 'yas/table-hash)
-    (yas/table-hash table))))
-
-(defun ac-yasnippet-table-parent (table)
-  (cond
-   ((fboundp 'yas/snippet-table-parent)
-    (yas/snippet-table-parent table))
-   ((fboundp 'yas/table-parent)
-    (yas/table-parent table))))
-
-(defun ac-yasnippet-candidate-1 (table)
-  (with-no-warnings
-    (let ((hashtab (ac-yasnippet-table-hash table))
-          (parent (ac-yasnippet-table-parent table))
-          candidates)
-      (maphash (lambda (key value)
-                 (push key candidates))
-               hashtab)
-      (setq candidates (all-completions ac-prefix (nreverse candidates)))
-      (if parent
-          (setq candidates
-                (append candidates (ac-yasnippet-candidate-1 parent))))
-      candidates)))
-
-(defun ac-yasnippet-candidates ()
-  (with-no-warnings
-    (if (fboundp 'yas/get-snippet-tables)
-        ;; >0.6.0
-        (apply 'append (mapcar 'ac-yasnippet-candidate-1 (yas/get-snippet-tables major-mode)))
-      (let ((table
-             (if (fboundp 'yas/snippet-table)
-                 ;; <0.6.0
-                 (yas/snippet-table major-mode)
-               ;; 0.6.0
-               (yas/current-snippet-table))))
-        (if table
-            (ac-yasnippet-candidate-1 table))))))
-
-(ac-define-source yasnippet
-  '((depends yasnippet)
-    (candidates . ac-yasnippet-candidates)
-    (action . yas/expand)
-    (candidate-face . ac-yasnippet-candidate-face)
-    (selection-face . ac-yasnippet-selection-face)
-    (symbol . "a")))
-
-;; semantic
-
-(defun ac-semantic-candidates (prefix)
-  (with-no-warnings
-    (delete ""            ; semantic sometimes returns an empty string
-            (mapcar 'semantic-tag-name
-                    (ignore-errors
-                      (or (semantic-analyze-possible-completions
-                           (semantic-analyze-current-context))
-                          (senator-find-tag-for-completion prefix)))))))
-
-(ac-define-source semantic
-  '((available . (or (require 'semantic-ia nil t)
-                     (require 'semantic/ia nil t)))
-    (candidates . (ac-semantic-candidates ac-prefix))
-    (prefix . c-dot-ref)
-    (requires . 0)
-    (symbol . "m")))
-
-(ac-define-source semantic-raw
-  '((available . (or (require 'semantic-ia nil t)
-                     (require 'semantic/ia nil t)))
-    (candidates . (ac-semantic-candidates ac-prefix))
-    (symbol . "s")))
-
-;; eclim
-
-(defun ac-eclim-candidates ()
-  (with-no-warnings
-    (loop for c in (eclim/java-complete)
-          collect (nth 1 c))))
-
-(ac-define-source eclim
-  '((candidates . ac-eclim-candidates)
-    (prefix . c-dot)
-    (requires . 0)
-    (symbol . "f")))
-
-;; css
-
-;; Copied from company-css.el
-(defconst ac-css-property-alist
-  ;; see http://www.w3.org/TR/CSS21/propidx.html
-  '(("azimuth" angle "left-side" "far-left" "left" "center-left" "center"
-     "center-right" "right" "far-right" "right-side" "behind" "leftwards"
-     "rightwards")
-    ("background" background-color background-image background-repeat
-     background-attachment background-position)
-    ("background-attachment" "scroll" "fixed")
-    ("background-color" color "transparent")
-    ("background-image" uri "none")
-    ("background-position" percentage length "left" "center" "right" percentage
-     length "top" "center" "bottom" "left" "center" "right" "top" "center"
-     "bottom")
-    ("background-repeat" "repeat" "repeat-x" "repeat-y" "no-repeat")
-    ("border" border-width border-style border-color)
-    ("border-bottom" border)
-    ("border-bottom-color" border-color)
-    ("border-bottom-style" border-style)
-    ("border-bottom-width" border-width)
-    ("border-collapse" "collapse" "separate")
-    ("border-color" color "transparent")
-    ("border-left" border)
-    ("border-left-color" border-color)
-    ("border-left-style" border-style)
-    ("border-left-width" border-width)
-    ("border-right" border)
-    ("border-right-color" border-color)
-    ("border-right-style" border-style)
-    ("border-right-width" border-width)
-    ("border-spacing" length length)
-    ("border-style" border-style)
-    ("border-top" border)
-    ("border-top-color" border-color)
-    ("border-top-style" border-style)
-    ("border-top-width" border-width)
-    ("border-width" border-width)
-    ("bottom" length percentage "auto")
-    ("caption-side" "top" "bottom")
-    ("clear" "none" "left" "right" "both")
-    ("clip" shape "auto")
-    ("color" color)
-    ("content" "normal" "none" string uri counter "attr()" "open-quote"
-     "close-quote" "no-open-quote" "no-close-quote")
-    ("counter-increment" identifier integer "none")
-    ("counter-reset" identifier integer "none")
-    ("cue" cue-before cue-after)
-    ("cue-after" uri "none")
-    ("cue-before" uri "none")
-    ("cursor" uri "*" "auto" "crosshair" "default" "pointer" "move" "e-resize"
-     "ne-resize" "nw-resize" "n-resize" "se-resize" "sw-resize" "s-resize"
-     "w-resize" "text" "wait" "help" "progress")
-    ("direction" "ltr" "rtl")
-    ("display" "inline" "block" "list-item" "run-in" "inline-block" "table"
-     "inline-table" "table-row-group" "table-header-group" "table-footer-group"
-     "table-row" "table-column-group" "table-column" "table-cell"
-     "table-caption" "none")
-    ("elevation" angle "below" "level" "above" "higher" "lower")
-    ("empty-cells" "show" "hide")
-    ("float" "left" "right" "none")
-    ("font" font-style font-variant font-weight font-size "/" line-height
-     font-family "caption" "icon" "menu" "message-box" "small-caption"
-     "status-bar")
-    ("font-family" family-name generic-family)
-    ("font-size" absolute-size relative-size length percentage)
-    ("font-style" "normal" "italic" "oblique")
-    ("font-variant" "normal" "small-caps")
-    ("font-weight" "normal" "bold" "bolder" "lighter" "100" "200" "300" "400"
-     "500" "600" "700" "800" "900")
-    ("height" length percentage "auto")
-    ("left" length percentage "auto")
-    ("letter-spacing" "normal" length)
-    ("line-height" "normal" number length percentage)
-    ("list-style" list-style-type list-style-position list-style-image)
-    ("list-style-image" uri "none")
-    ("list-style-position" "inside" "outside")
-    ("list-style-type" "disc" "circle" "square" "decimal" "decimal-leading-zero"
-     "lower-roman" "upper-roman" "lower-greek" "lower-latin" "upper-latin"
-     "armenian" "georgian" "lower-alpha" "upper-alpha" "none")
-    ("margin" margin-width)
-    ("margin-bottom" margin-width)
-    ("margin-left" margin-width)
-    ("margin-right" margin-width)
-    ("margin-top" margin-width)
-    ("max-height" length percentage "none")
-    ("max-width" length percentage "none")
-    ("min-height" length percentage)
-    ("min-width" length percentage)
-    ("orphans" integer)
-    ("outline" outline-color outline-style outline-width)
-    ("outline-color" color "invert")
-    ("outline-style" border-style)
-    ("outline-width" border-width)
-    ("overflow" "visible" "hidden" "scroll" "auto")
-    ("padding" padding-width)
-    ("padding-bottom" padding-width)
-    ("padding-left" padding-width)
-    ("padding-right" padding-width)
-    ("padding-top" padding-width)
-    ("page-break-after" "auto" "always" "avoid" "left" "right")
-    ("page-break-before" "auto" "always" "avoid" "left" "right")
-    ("page-break-inside" "avoid" "auto")
-    ("pause" time percentage)
-    ("pause-after" time percentage)
-    ("pause-before" time percentage)
-    ("pitch" frequency "x-low" "low" "medium" "high" "x-high")
-    ("pitch-range" number)
-    ("play-during" uri "mix" "repeat" "auto" "none")
-    ("position" "static" "relative" "absolute" "fixed")
-    ("quotes" string string "none")
-    ("richness" number)
-    ("right" length percentage "auto")
-    ("speak" "normal" "none" "spell-out")
-    ("speak-header" "once" "always")
-    ("speak-numeral" "digits" "continuous")
-    ("speak-punctuation" "code" "none")
-    ("speech-rate" number "x-slow" "slow" "medium" "fast" "x-fast" "faster"
-     "slower")
-    ("stress" number)
-    ("table-layout" "auto" "fixed")
-    ("text-align" "left" "right" "center" "justify")
-    ("text-decoration" "none" "underline" "overline" "line-through" "blink")
-    ("text-indent" length percentage)
-    ("text-transform" "capitalize" "uppercase" "lowercase" "none")
-    ("top" length percentage "auto")
-    ("unicode-bidi" "normal" "embed" "bidi-override")
-    ("vertical-align" "baseline" "sub" "super" "top" "text-top" "middle"
-     "bottom" "text-bottom" percentage length)
-    ("visibility" "visible" "hidden" "collapse")
-    ("voice-family" specific-voice generic-voice "*" specific-voice
-     generic-voice)
-    ("volume" number percentage "silent" "x-soft" "soft" "medium" "loud"
-     "x-loud")
-    ("white-space" "normal" "pre" "nowrap" "pre-wrap" "pre-line")
-    ("widows" integer)
-    ("width" length percentage "auto")
-    ("word-spacing" "normal" length)
-    ("z-index" "auto" integer))
-  "A list of CSS properties and their possible values.")
-
-(defconst ac-css-value-classes
-  '((absolute-size "xx-small" "x-small" "small" "medium" "large" "x-large"
-                   "xx-large")
-    (border-style "none" "hidden" "dotted" "dashed" "solid" "double" "groove"
-                  "ridge" "inset" "outset")
-    (color "aqua" "black" "blue" "fuchsia" "gray" "green" "lime" "maroon" "navy"
-           "olive" "orange" "purple" "red" "silver" "teal" "white" "yellow"
-           "rgb")
-    (counter "counter")
-    (family-name "Courier" "Helvetica" "Times")
-    (generic-family "serif" "sans-serif" "cursive" "fantasy" "monospace")
-    (generic-voice "male" "female" "child")
-    (margin-width "auto") ;; length percentage
-    (relative-size "larger" "smaller")
-    (shape "rect")
-    (uri "url"))
-  "A list of CSS property value classes and their contents.")
-
-(defconst ac-css-pseudo-classes
-  '("active" "after" "before" "first" "first-child" "first-letter" "first-line"
-    "focus" "hover" "lang" "left" "link" "right" "visited")
-  "Identifiers for CSS pseudo-elements and pseudo-classes.")
-
-(defvar ac-css-property nil
-  "Current editing property.")
-
-(defun ac-css-prefix ()
-  (when (save-excursion (re-search-backward "\\_<\\(.+?\\)\\_>\\s *:[^;]*\\=" nil t))
-    (setq ac-css-property (match-string 1))
-    (or (ac-prefix-symbol) (point))))
-
-(defun ac-css-property-candidates ()
-  (let ((list (assoc-default ac-css-property ac-css-property-alist)))
-    (if list
-        (loop with seen
-              with value
-              while (setq value (pop list))
-              if (symbolp value)
-              do (unless (memq value seen)
-                   (push value seen)
-                   (setq list
-                         (append list
-                                 (or (assoc-default value ac-css-value-classes)
-                                     (assoc-default (symbol-name value) ac-css-property-alist)))))
-              else collect value)
-      ac-css-pseudo-classes)))
-
-(ac-define-source css-property
-  '((candidates . ac-css-property-candidates)
-    (prefix . ac-css-prefix)
-    (requires . 0)))
-
-;; slime
-(ac-define-source slime
-  '((depends slime)
-    (candidates . (car (slime-simple-completions ac-prefix)))
-    (symbol . "s")
-    (cache)))
-
-;; ghc-mod
-(ac-define-source ghc-mod
-  '((depends ghc)
-    (candidates . (ghc-select-completion-symbol))
-    (symbol . "s")
-    (cache)))
-
-
-
-;;;; Not maintained sources
-
-;; ropemacs
-
-(defvar ac-ropemacs-loaded nil)
-(defun ac-ropemacs-require ()
-  (with-no-warnings
-    (unless ac-ropemacs-loaded
-      (pymacs-load "ropemacs" "rope-")
-      (if (boundp 'ropemacs-enable-autoimport)
-          (setq ropemacs-enable-autoimport t))
-      (setq ac-ropemacs-loaded t))))
-
-(defun ac-ropemacs-setup ()
-  (ac-ropemacs-require)
-  ;(setq ac-sources (append (list 'ac-source-ropemacs) ac-sources))
-  (setq ac-omni-completion-sources '(("\\." ac-source-ropemacs))))
-
-(defun ac-ropemacs-initialize ()
-  (autoload 'pymacs-apply "pymacs")
-  (autoload 'pymacs-call "pymacs")
-  (autoload 'pymacs-eval "pymacs" nil t)
-  (autoload 'pymacs-exec "pymacs" nil t)
-  (autoload 'pymacs-load "pymacs" nil t)
-  (add-hook 'python-mode-hook 'ac-ropemacs-setup)
-  t)
-
-(defvar ac-ropemacs-completions-cache nil)
-(defvar ac-source-ropemacs
-  '((init
-     . (lambda ()
-         (setq ac-ropemacs-completions-cache
-               (mapcar
-                (lambda (completion)
-                  (concat ac-prefix completion))
-                (ignore-errors
-                  (rope-completions))))))
-    (candidates . ac-ropemacs-completions-cache)))
-
-;; rcodetools
-
-(defvar ac-source-rcodetools
-  '((init . (lambda ()
-              (require 'rcodetools)
-              (condition-case x
-                  (save-excursion
-                    (rct-exec-and-eval rct-complete-command-name "--completion-emacs-icicles"))
-                (error) (setq rct-method-completion-table nil))))
-    (candidates . (lambda ()
-                    (all-completions
-                     ac-prefix
-                     (mapcar
-                      (lambda (completion)
-                        (replace-regexp-in-string "\t.*$" "" (car completion)))
-                      rct-method-completion-table))))))
-
-
-
-;;;; Default settings
-
-(defun ac-common-setup ()
-  ;(add-to-list 'ac-sources 'ac-source-filename)
-  )
-
-(defun ac-emacs-lisp-mode-setup ()
-  (setq ac-sources (append '(ac-source-features ac-source-functions ac-source-yasnippet ac-source-variables ac-source-symbols) ac-sources)))
-
-(defun ac-cc-mode-setup ()
-  (setq ac-sources (append '(ac-source-yasnippet ac-source-gtags) ac-sources)))
-
-(defun ac-ruby-mode-setup ())
-
-(defun ac-css-mode-setup ()
-  (setq ac-sources (append '(ac-source-css-property) ac-sources)))
-
-(defun ac-config-default ()
-  (setq-default ac-sources '(ac-source-abbrev ac-source-dictionary ac-source-words-in-same-mode-buffers))
-  (add-hook 'emacs-lisp-mode-hook 'ac-emacs-lisp-mode-setup)
-  (add-hook 'c-mode-common-hook 'ac-cc-mode-setup)
-  (add-hook 'ruby-mode-hook 'ac-ruby-mode-setup)
-  (add-hook 'css-mode-hook 'ac-css-mode-setup)
-  (add-hook 'auto-complete-mode-hook 'ac-common-setup)
-  (global-auto-complete-mode t))
-
-(provide 'auto-complete-config)
-;;; auto-complete-config.el ends here
diff --git a/elpa/auto-complete-1.4/auto-complete-config.elc b/elpa/auto-complete-1.4/auto-complete-config.elc
deleted file mode 100644
index eb2ba599d..000000000
Binary files a/elpa/auto-complete-1.4/auto-complete-config.elc and /dev/null differ
diff --git a/elpa/auto-complete-1.4/auto-complete-pkg.el b/elpa/auto-complete-1.4/auto-complete-pkg.el
deleted file mode 100644
index d7ee90346..000000000
--- a/elpa/auto-complete-1.4/auto-complete-pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(define-package "auto-complete"
-  "1.4"
-  "Auto Completion for GNU Emacs"
-  '((popup "0.5")))
diff --git a/elpa/auto-complete-1.4/auto-complete.el b/elpa/auto-complete-1.4/auto-complete.el
deleted file mode 100644
index 3a2e6520e..000000000
--- a/elpa/auto-complete-1.4/auto-complete.el
+++ /dev/null
@@ -1,1985 +0,0 @@
-;;; auto-complete.el --- Auto Completion for GNU Emacs
-
-;; Copyright (C) 2008, 2009, 2010, 2011, 2012  Tomohiro Matsuyama
-
-;; Author: Tomohiro Matsuyama <m2ym.pub@gmail.com>
-;; URL: http://cx4a.org/software/auto-complete
-;; Keywords: completion, convenience
-;; Version: 1.4
-
-;; 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:
-;;
-;; This extension provides a way to complete with popup menu like:
-;;
-;;     def-!-
-;;     +-----------------+
-;;     |defun::::::::::::|
-;;     |defvar           |
-;;     |defmacro         |
-;;     |       ...       |
-;;     +-----------------+
-;;
-;; You can complete by typing and selecting menu.
-;;
-;; Entire documents are located in doc/ directory.
-;; Take a look for information.
-;;
-;; Enjoy!
-
-;;; Code:
-
-
-
-(eval-when-compile
-  (require 'cl))
-
-(require 'popup)
-
-;;;; Global stuff
-
-(defun ac-error (&optional var)
-  "Report an error and disable `auto-complete-mode'."
-  (ignore-errors
-    (message "auto-complete error: %s" var)
-    (auto-complete-mode -1)
-    var))
-
-
-
-;;;; Customization
-
-(defgroup auto-complete nil
-  "Auto completion."
-  :group 'completion
-  :prefix "ac-")
-
-(defcustom ac-delay 0.1
-  "Delay to completions will be available."
-  :type 'float
-  :group 'auto-complete)
-
-(defcustom ac-auto-show-menu 0.8
-  "Non-nil means completion menu will be automatically shown."
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "Never" nil)
-                 (float :tag "Timer"))
-  :group 'auto-complete)
-
-(defcustom ac-show-menu-immediately-on-auto-complete t
-  "Non-nil means menu will be showed immediately on `auto-complete'."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-expand-on-auto-complete t
-  "Non-nil means expand whole common part on first time `auto-complete'."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-disable-faces '(font-lock-comment-face font-lock-string-face font-lock-doc-face)
-  "Non-nil means disable automatic completion on specified faces."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-stop-flymake-on-completing t
-  "Non-nil means disble flymake temporarily on completing."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-use-fuzzy t
-  "Non-nil means use fuzzy matching."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-fuzzy-cursor-color "red"
-  "Cursor color in fuzzy mode."
-  :type 'string
-  :group 'auto-complete)
-
-(defcustom ac-use-comphist t
-  "Non-nil means use intelligent completion history."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-comphist-threshold 0.7
-  "Percentage of ignoring low scored candidates."
-  :type 'float
-  :group 'auto-complete)
-
-(defcustom ac-comphist-file
-  (expand-file-name (concat (if (boundp 'user-emacs-directory)
-                                user-emacs-directory
-                              "~/.emacs.d/")
-                            "/ac-comphist.dat"))
-  "Completion history file name."
-  :type 'string
-  :group 'auto-complete)
-
-(defcustom ac-user-dictionary nil
-  "User defined dictionary"
-  :type '(repeat string)
-  :group 'auto-complete)
-
-(defcustom ac-dictionary-files '("~/.dict")
-  "Dictionary files."
-  :type '(repeat string)
-  :group 'auto-complete)
-(defvaralias 'ac-user-dictionary-files 'ac-dictionary-files)
-
-(defcustom ac-dictionary-directories
-  (ignore-errors
-    (when load-file-name
-      (let ((installed-dir (file-name-directory load-file-name)))
-        (loop for name in '("ac-dict" "dict")
-              for dir = (concat installed-dir name)
-              if (file-directory-p dir)
-              collect dir))))
-  "Dictionary directories."
-  :type '(repeat string)
-  :group 'auto-complete)
-
-(defcustom ac-use-quick-help t
-  "Non-nil means use quick help."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-quick-help-delay 1.5
-  "Delay to show quick help."
-  :type 'float
-  :group 'auto-complete)
-
-(defcustom ac-menu-height 10
-  "Max height of candidate menu."
-  :type 'integer
-  :group 'auto-complete)
-(defvaralias 'ac-candidate-menu-height 'ac-menu-height)
-
-(defcustom ac-quick-help-height 20
-  "Max height of quick help."
-  :type 'integer
-  :group 'auto-complete)
-
-(defcustom ac-quick-help-prefer-pos-tip t
-  "Prefer native tooltip with pos-tip than overlay popup for displaying quick help."
-  :type 'boolean
-  :group 'auto-complete)
-(defvaralias 'ac-quick-help-prefer-x 'ac-quick-help-prefer-pos-tip)
-
-(defcustom ac-candidate-limit nil
-  "Limit number of candidates. Non-integer means no limit."
-  :type 'integer
-  :group 'auto-complete)
-(defvaralias 'ac-candidate-max 'ac-candidate-limit)
-
-(defcustom ac-modes
-  '(emacs-lisp-mode lisp-mode lisp-interaction-mode
-    slime-repl-mode
-    c-mode cc-mode c++-mode
-    java-mode malabar-mode clojure-mode clojurescript-mode  scala-mode
-    scheme-mode
-    ocaml-mode tuareg-mode coq-mode haskell-mode agda-mode agda2-mode
-    perl-mode cperl-mode python-mode ruby-mode lua-mode
-    ecmascript-mode javascript-mode js-mode js2-mode php-mode css-mode
-    makefile-mode sh-mode fortran-mode f90-mode ada-mode
-    xml-mode sgml-mode
-    ts-mode)
-  "Major modes `auto-complete-mode' can run on."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-compatible-packages-regexp
-  "^ac-"
-  "Regexp to indicate what packages can work with auto-complete."
-  :type 'string
-  :group 'auto-complete)
-
-(defcustom ac-non-trigger-commands
-  '(*table--cell-self-insert-command)
-  "Commands that can't be used as triggers of `auto-complete'."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-trigger-commands
-  '(self-insert-command)
-  "Trigger commands that specify whether `auto-complete' should start or not."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-trigger-commands-on-completing
-  '(delete-backward-char
-    backward-delete-char
-    backward-delete-char-untabify)
-  "Trigger commands that specify whether `auto-complete' should continue or not."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-trigger-key nil
-  "Non-nil means `auto-complete' will start by typing this key.
-If you specify this TAB, for example, `auto-complete' will start by typing TAB,
-and if there is no completions, an original command will be fallbacked."
-  :type 'string
-  :group 'auto-complete
-  :set (lambda (symbol value)
-         (set-default symbol value)
-         (when (and value
-                    (fboundp 'ac-set-trigger-key))
-           (ac-set-trigger-key value))))
-
-(defcustom ac-auto-start 2
-  "Non-nil means completion will be started automatically.
-Positive integer means if a length of a word you entered is larger than the value,
-completion will be started automatically.
-If you specify `nil', never be started automatically."
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "Never" nil)
-                 (integer :tag "Require"))
-  :group 'auto-complete)
-
-(defcustom ac-stop-words nil
-  "List of string to stop completion."
-  :type '(repeat string)
-  :group 'auto-complete)
-(defvaralias 'ac-ignores 'ac-stop-words)
-
-(defcustom ac-use-dictionary-as-stop-words t
-  "Non-nil means a buffer related dictionary will be thought of as stop words."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-ignore-case 'smart
-  "Non-nil means auto-complete ignores case.
-If this value is `smart', auto-complete ignores case only when
-a prefix doen't contain any upper case letters."
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "Smart" smart)
-                 (const :tag "No" nil))
-  :group 'auto-complete)
-
-(defcustom ac-dwim t
-  "Non-nil means `auto-complete' works based on Do What I Mean."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-use-menu-map nil
-  "Non-nil means a special keymap `ac-menu-map' on completing menu will be used."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-use-overriding-local-map nil
-  "Non-nil means `overriding-local-map' will be used to hack for overriding key events on auto-copletion."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defface ac-completion-face
-  '((t (:foreground "darkgray" :underline t)))
-  "Face for inline completion"
-  :group 'auto-complete)
-
-(defface ac-candidate-face
-  '((t (:background "lightgray" :foreground "black")))
-  "Face for candidate."
-  :group 'auto-complete)
-
-(defface ac-candidate-mouse-face
-  '((t (:background "blue" :foreground "white")))
-  "Mouse face for candidate."
-  :group 'auto-complete)
-
-(defface ac-selection-face
-  '((t (:background "steelblue" :foreground "white")))
-  "Face for selected candidate."
-  :group 'auto-complete)
-
-(defvar auto-complete-mode-hook nil
-  "Hook for `auto-complete-mode'.")
-
-
-
-;;;; Internal variables
-
-(defvar auto-complete-mode nil
-  "Dummy variable to suppress compiler warnings.")
-
-(defvar ac-cursor-color nil
-  "Old cursor color.")
-
-(defvar ac-inline nil
-  "Inline completion instance.")
-
-(defvar ac-menu nil
-  "Menu instance.")
-
-(defvar ac-show-menu nil
-  "Flag to show menu on timer tick.")
-
-(defvar ac-last-completion nil
-  "Cons of prefix marker and selected item of last completion.")
-
-(defvar ac-quick-help nil
-  "Quick help instance")
-
-(defvar ac-completing nil
-  "Non-nil means `auto-complete-mode' is now working on completion.")
-
-(defvar ac-buffer nil
-  "Buffer where auto-complete is started.")
-
-(defvar ac-point nil
-  "Start point of prefix.")
-
-(defvar ac-last-point nil
-  "Last point of updating pattern.")
-
-(defvar ac-prefix nil
-  "Prefix string.")
-(defvaralias 'ac-target 'ac-prefix)
-
-(defvar ac-selected-candidate nil
-  "Last selected candidate.")
-
-(defvar ac-common-part nil
-  "Common part string of meaningful candidates.
-If there is no common part, this will be nil.")
-
-(defvar ac-whole-common-part nil
-  "Common part string of whole candidates.
-If there is no common part, this will be nil.")
-
-(defvar ac-prefix-overlay nil
-  "Overlay for prefix string.")
-
-(defvar ac-timer nil
-  "Completion idle timer.")
-
-(defvar ac-show-menu-timer nil
-  "Show menu idle timer.")
-
-(defvar ac-quick-help-timer nil
-  "Quick help idle timer.")
-
-(defvar ac-triggered nil
-  "Flag to update.")
-
-(defvar ac-limit nil
-  "Limit number of candidates for each sources.")
-
-(defvar ac-candidates nil
-  "Current candidates.")
-
-(defvar ac-candidates-cache nil
-  "Candidates cache for individual sources.")
-
-(defvar ac-fuzzy-enable nil
-  "Non-nil means fuzzy matching is enabled.")
-
-(defvar ac-dwim-enable nil
-  "Non-nil means DWIM completion will be allowed.")
-
-(defvar ac-mode-map (make-sparse-keymap)
-  "Auto-complete mode map. It is also used for trigger key command. See also `ac-trigger-key'.")
-
-(defvar ac-completing-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\t" 'ac-expand)
-    (define-key map [tab] 'ac-expand)
-    (define-key map "\r" 'ac-complete)
-    (define-key map [return] 'ac-complete)
-    (define-key map (kbd "M-TAB") 'auto-complete)
-    (define-key map "\C-s" 'ac-isearch)
-
-    (define-key map "\M-n" 'ac-next)
-    (define-key map "\M-p" 'ac-previous)
-    (define-key map [down] 'ac-next)
-    (define-key map [up] 'ac-previous)
-
-    (define-key map [f1] 'ac-help)
-    (define-key map [M-f1] 'ac-persist-help)
-    (define-key map (kbd "C-?") 'ac-help)
-    (define-key map (kbd "C-M-?") 'ac-persist-help)
-
-    (define-key map [C-down] 'ac-quick-help-scroll-down)
-    (define-key map [C-up] 'ac-quick-help-scroll-up)
-    (define-key map "\C-\M-n" 'ac-quick-help-scroll-down)
-    (define-key map "\C-\M-p" 'ac-quick-help-scroll-up)
-
-    (dotimes (i 9)
-      (let ((symbol (intern (format "ac-complete-%d" (1+ i)))))
-        (fset symbol
-              `(lambda ()
-                 (interactive)
-                 (when (and (ac-menu-live-p) (popup-select ac-menu ,i))
-                   (ac-complete))))
-        (define-key map (read-kbd-macro (format "M-%s" (1+ i))) symbol)))
-
-    map)
-  "Keymap for completion.")
-(defvaralias 'ac-complete-mode-map 'ac-completing-map)
-
-(defvar ac-menu-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map ac-completing-map)
-    (define-key map "\C-n" 'ac-next)
-    (define-key map "\C-p" 'ac-previous)
-    (define-key map [mouse-1] 'ac-mouse-1)
-    (define-key map [down-mouse-1] 'ac-ignore)
-    (define-key map [mouse-4] 'ac-mouse-4)
-    (define-key map [mouse-5] 'ac-mouse-5)
-    map)
-  "Keymap for completion on completing menu.")
-
-(defvar ac-current-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map ac-completing-map)
-    map))
-
-(defvar ac-match-function 'all-completions
-  "Default match function.")
-
-(defvar ac-prefix-definitions
-  '((symbol . ac-prefix-symbol)
-    (file . ac-prefix-file)
-    (valid-file . ac-prefix-valid-file)
-    (c-dot . ac-prefix-c-dot)
-    (c-dot-ref . ac-prefix-c-dot-ref))
-  "Prefix definitions for common use.")
-
-(defvar ac-sources '(ac-source-words-in-same-mode-buffers)
-  "Sources for completion.")
-(make-variable-buffer-local 'ac-sources)
-
-(defvar ac-compiled-sources nil
-  "Compiled source of `ac-sources'.")
-
-(defvar ac-current-sources nil
-  "Current working sources. This is sublist of `ac-compiled-sources'.")
-
-(defvar ac-omni-completion-sources nil
-  "Do not use this anymore.")
-
-(defvar ac-current-prefix-def nil)
-
-(defvar ac-ignoring-prefix-def nil)
-
-
-
-;;;; Intelligent completion history
-
-(defvar ac-comphist nil
-  "Database of completion history.")
-
-(defsubst ac-comphist-make-tab ()
-  (make-hash-table :test 'equal))
-
-(defsubst ac-comphist-tab (db)
-  (nth 0 db))
-
-(defsubst ac-comphist-cache (db)
-  (nth 1 db))
-
-(defun ac-comphist-make (&optional tab)
-  (list (or tab (ac-comphist-make-tab)) (make-hash-table :test 'equal :weakness t)))
-
-(defun ac-comphist-get (db string &optional create)
-  (let* ((tab (ac-comphist-tab db))
-         (index (gethash string tab)))
-    (when (and create (null index))
-      (setq index (make-vector (length string) 0))
-      (puthash string index tab))
-    index))
-
-(defun ac-comphist-add (db string prefix)
-  (setq prefix (min prefix (1- (length string))))
-  (when (<= 0 prefix)
-    (setq string (substring-no-properties string))
-    (let ((stat (ac-comphist-get db string t)))
-      (incf (aref stat prefix))
-      (remhash string (ac-comphist-cache db)))))
-
-(defun ac-comphist-score (db string prefix)
-  (setq prefix (min prefix (1- (length string))))
-  (if (<= 0 prefix)
-      (let ((cache (gethash string (ac-comphist-cache db))))
-        (or (and cache (aref cache prefix))
-            (let ((stat (ac-comphist-get db string))
-                  (score 0.0))
-              (when stat
-                (loop for p from 0 below (length string)
-                      ;; sigmoid function
-                      with a = 5
-                      with b = (/ 700.0 a) ; bounds for avoiding range error in `exp'
-                      with d = (/ 6.0 a)
-                      for x = (max (- b) (min b (- d (abs (- prefix p)))))
-                      for r = (/ 1.0 (1+ (exp (* (- a) x))))
-                      do
-                      (incf score (* (aref stat p) r))))
-              ;; Weight by distance
-              (incf score (max 0.0 (- 0.3 (/ (- (length string) prefix) 100.0))))
-              (unless cache
-                (setq cache (make-vector (length string) nil))
-                (puthash string cache (ac-comphist-cache db)))
-              (aset cache prefix score)
-              score)))
-    0.0))
-
-(defun ac-comphist-sort (db collection prefix &optional threshold)
-  (let (result
-        (n 0)
-        (total 0)
-        (cur 0))
-    (setq result (mapcar (lambda (a)
-                           (when (and cur threshold)
-                             (if (>= cur (* total threshold))
-                                 (setq cur nil)
-                               (incf n)
-                               (incf cur (cdr a))))
-                           (car a))
-                         (sort (mapcar (lambda (string)
-                                         (let ((score (ac-comphist-score db string prefix)))
-                                           (incf total score)
-                                           (cons string score)))
-                                       collection)
-                               (lambda (a b) (< (cdr b) (cdr a))))))
-    (if threshold
-        (cons n result)
-      result)))
-
-(defun ac-comphist-serialize (db)
-  (let (alist)
-    (maphash (lambda (k v)
-               (push (cons k v) alist))
-             (ac-comphist-tab db))
-    (list alist)))
-
-(defun ac-comphist-deserialize (sexp)
-  (condition-case nil
-      (ac-comphist-make (let ((tab (ac-comphist-make-tab)))
-                          (mapc (lambda (cons)
-                                  (puthash (car cons) (cdr cons) tab))
-                                (nth 0 sexp))
-                          tab))
-    (error (message "Invalid comphist db.") nil)))
-
-(defun ac-comphist-init ()
-  (ac-comphist-load)
-  (add-hook 'kill-emacs-hook 'ac-comphist-save))
-
-(defun ac-comphist-load ()
-  (interactive)
-  (let ((db (if (file-exists-p ac-comphist-file)
-                (ignore-errors
-                  (with-temp-buffer
-                    (insert-file-contents ac-comphist-file)
-                    (goto-char (point-min))
-                    (ac-comphist-deserialize (read (current-buffer))))))))
-    (setq ac-comphist (or db (ac-comphist-make)))))
-
-(defun ac-comphist-save ()
-  (interactive)
-  (require 'pp)
-  (ignore-errors
-    (with-temp-buffer
-      (pp (ac-comphist-serialize ac-comphist) (current-buffer))
-      (write-region (point-min) (point-max) ac-comphist-file))))
-
-
-
-;;;; Dictionary
-(defvar ac-buffer-dictionary nil)
-(defvar ac-file-dictionary (make-hash-table :test 'equal))
-
-(defun ac-clear-dictionary-cache ()
-  (interactive)
-  (dolist (buffer (buffer-list))
-    (with-current-buffer buffer
-      (if (local-variable-p 'ac-buffer-dictionary)
-          (kill-local-variable 'ac-buffer-dictionary))))
-  (clrhash ac-file-dictionary))
-
-(defun ac-file-dictionary (filename)
-  (let ((cache (gethash filename ac-file-dictionary 'none)))
-    (if (and cache (not (eq cache 'none)))
-        cache
-      (let (result)
-        (ignore-errors
-          (with-temp-buffer
-            (insert-file-contents filename)
-            (setq result (split-string (buffer-string) "\n" t))))
-        (puthash filename result ac-file-dictionary)
-        result))))
-
-(defun ac-mode-dictionary (mode)
-  (loop for name in (cons (symbol-name mode)
-                          (ignore-errors (list (file-name-extension (buffer-file-name)))))
-        for dir in ac-dictionary-directories
-        for file = (concat dir "/" name)
-        if (file-exists-p file)
-        append (ac-file-dictionary file)))
-
-(defun ac-buffer-dictionary (&optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (if (local-variable-p 'ac-buffer-dictionary)
-        ac-buffer-dictionary
-      (make-local-variable 'ac-buffer-dictionary)
-      (setq ac-buffer-dictionary
-            (apply 'append
-                   ac-user-dictionary
-                   (ac-mode-dictionary major-mode)
-                   (mapcar 'ac-file-dictionary ac-dictionary-files))))))
-
-
-
-;;;; Auto completion internals
-
-(defun ac-menu-at-wrapper-line-p ()
-  "Return non-nil if current line is long and wrapped to next visual line."
-  (and (not truncate-lines)
-       (eq (line-beginning-position)
-           (save-excursion
-             (vertical-motion 1)
-             (line-beginning-position)))))
-
-(defun ac-stop-word-p (word)
-  (or (member word ac-stop-words)
-      (if ac-use-dictionary-as-stop-words
-          (member word (ac-buffer-dictionary)))))
-
-(defun ac-prefix-symbol ()
-  "Default prefix definition function."
-  (require 'thingatpt)
-  (car-safe (bounds-of-thing-at-point 'symbol)))
-(defalias 'ac-prefix-default 'ac-prefix-symbol)
-
-(defun ac-prefix-file ()
-  "File prefix."
-  (let ((point (re-search-backward "[\"<>' \t\r\n]" nil t)))
-    (if point (1+ point))))
-
-(defun ac-prefix-valid-file ()
-  "Existed (or to be existed) file prefix."
-  (let* ((line-beg (line-beginning-position))
-         (end (point))
-         (start (or (let ((point (re-search-backward "[\"<>'= \t\r\n]" line-beg t)))
-                      (if point (1+ point)))
-                    line-beg))
-         (file (buffer-substring start end)))
-    (if (and file (or (string-match "^/" file)
-                      (and (setq file (and (string-match "^[^/]*/" file)
-                                           (match-string 0 file)))
-                           (file-directory-p file))))
-        start)))
-
-(defun ac-prefix-c-dot ()
-  "C-like languages dot(.) prefix."
-  (if (re-search-backward "\\.\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
-      (match-beginning 1)))
-
-(defun ac-prefix-c-dot-ref ()
-  "C-like languages dot(.) and reference(->) prefix."
-  (if (re-search-backward "\\(?:\\.\\|->\\)\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
-      (match-beginning 1)))
-
-(defun ac-define-prefix (name prefix)
-  "Define new prefix definition.
-You can not use it in source definition like (prefix . `NAME')."
-  (push (cons name prefix) ac-prefix-definitions))
-
-(defun ac-match-substring (prefix candidates)
-  (loop with regexp = (regexp-quote prefix)
-        for candidate in candidates
-        if (string-match regexp candidate)
-        collect candidate))
-
-(defsubst ac-source-entity (source)
-  (if (symbolp source)
-      (symbol-value source)
-    source))
-
-(defun ac-source-available-p (source)
-  (if (and (symbolp source)
-           (get source 'available))
-      (eq (get source 'available) t)
-    (let* ((src (ac-source-entity source))
-           (avail-pair (assq 'available src))
-           (avail-cond (cdr avail-pair))
-           (available (and (if avail-pair
-                               (cond
-                                ((symbolp avail-cond)
-                                 (funcall avail-cond))
-                                ((listp avail-cond)
-                                 (eval avail-cond)))
-                             t)
-                           (loop for feature in (assoc-default 'depends src)
-                                 unless (require feature nil t) return nil
-                                 finally return t))))
-      (if (symbolp source)
-          (put source 'available (if available t 'no)))
-      available)))
-
-(defun ac-compile-sources (sources)
-  "Compiled `SOURCES' into expanded sources style."
-  (loop for source in sources
-        if (ac-source-available-p source)
-        do
-        (setq source (ac-source-entity source))
-        (flet ((add-attribute (name value &optional append) (add-to-list 'source (cons name value) append)))
-          ;; prefix
-          (let* ((prefix (assoc 'prefix source))
-                 (real (assoc-default (cdr prefix) ac-prefix-definitions)))
-            (cond
-             (real
-              (add-attribute 'prefix real))
-             ((null prefix)
-              (add-attribute 'prefix 'ac-prefix-default))))
-          ;; match
-          (let ((match (assq 'match source)))
-            (cond
-             ((eq (cdr match) 'substring)
-              (setcdr match 'ac-match-substring)))))
-        and collect source))
-
-(defun ac-compiled-sources ()
-  (or ac-compiled-sources
-      (setq ac-compiled-sources
-            (ac-compile-sources ac-sources))))
-
-(defsubst ac-menu-live-p ()
-  (popup-live-p ac-menu))
-
-(defun ac-menu-create (point width height)
-  (setq ac-menu
-        (popup-create point width height
-                      :around t
-                      :face 'ac-candidate-face
-                      :mouse-face 'ac-candidate-mouse-face
-                      :selection-face 'ac-selection-face
-                      :symbol t
-                      :scroll-bar t
-                      :margin-left 1
-                      :keymap ac-menu-map ; for mouse bindings
-                      )))
-
-(defun ac-menu-delete ()
-  (when ac-menu
-    (popup-delete ac-menu)
-    (setq ac-menu)))
-
-(defsubst ac-inline-overlay ()
-  (nth 0 ac-inline))
-
-(defsubst ac-inline-live-p ()
-  (and ac-inline (ac-inline-overlay) t))
-
-(defun ac-inline-show (point string)
-  (unless ac-inline
-    (setq ac-inline (list nil)))
-  (save-excursion
-    (let ((overlay (ac-inline-overlay))
-          (width 0)
-          (string-width (string-width string))
-          (length 0)
-          (original-string string))
-      ;; Calculate string space to show completion
-      (goto-char point)
-      (let (c)
-        (while (and (not (eolp))
-                    (< width string-width)
-                    (setq c (char-after))
-                    (not (eq c ?\t)))   ; special case for tab
-        (incf width (char-width c))
-        (incf length)
-        (forward-char)))
-
-      ;; Show completion
-      (goto-char point)
-      (cond
-       ((= width 0)
-        ;; End-of-line
-        ;; Do nothing
-        )
-       ((<= width string-width)
-        ;; No space to show
-        ;; Do nothing
-        )
-       ((> width string-width)
-        ;; Need to fill space
-        (setq string (concat string (make-string (- width string-width) ? )))))
-      (setq string (propertize string 'face 'ac-completion-face))
-      (if overlay
-          (progn
-            (move-overlay overlay point (+ point length))
-            (overlay-put overlay 'invisible nil))
-        (setq overlay (make-overlay point (+ point length)))
-        (setf (nth 0 ac-inline)  overlay)
-        (overlay-put overlay 'priority 9999)
-        ;; Help prefix-overlay in some cases
-        (overlay-put overlay 'keymap ac-current-map))
-      ;; TODO no width but char
-      (if (eq length 0)
-          ;; Case: End-of-line
-          (progn
-            (put-text-property 0 1 'cursor t string)
-            (overlay-put overlay 'after-string string))
-        (let ((display (substring string 0 1))
-              (after-string (substring string 1)))
-          (overlay-put overlay 'display display)
-          (overlay-put overlay 'after-string after-string)))
-      (overlay-put overlay 'string original-string))))
-
-(defun ac-inline-delete ()
-  (when (ac-inline-live-p)
-    (ac-inline-hide)
-    (delete-overlay (ac-inline-overlay))
-    (setq ac-inline nil)))
-
-(defun ac-inline-hide ()
-  (when (ac-inline-live-p)
-    (let ((overlay (ac-inline-overlay))
-          (buffer-undo-list t))
-      (when overlay
-        (move-overlay overlay (point-min) (point-min))
-        (overlay-put overlay 'invisible t)
-        (overlay-put overlay 'display nil)
-        (overlay-put overlay 'after-string nil)))))
-
-(defun ac-inline-update ()
-  (if (and ac-completing ac-prefix (stringp ac-common-part))
-      (let ((common-part-length (length ac-common-part))
-            (prefix-length (length ac-prefix)))
-        (if (> common-part-length prefix-length)
-            (progn
-              (ac-inline-hide)
-              (ac-inline-show (point) (substring ac-common-part prefix-length)))
-          (ac-inline-delete)))
-    (ac-inline-delete)))
-
-(defun ac-put-prefix-overlay ()
-  (unless ac-prefix-overlay
-    (let (newline)
-      ;; Insert newline to make sure that cursor always on the overlay
-      (when (and (eq ac-point (point-max))
-                 (eq ac-point (point)))
-        (popup-save-buffer-state
-          (insert "\n"))
-        (setq newline t))
-      (setq ac-prefix-overlay (make-overlay ac-point (1+ (point)) nil t t))
-      (overlay-put ac-prefix-overlay 'priority 9999)
-      (overlay-put ac-prefix-overlay 'keymap (make-sparse-keymap))
-      (overlay-put ac-prefix-overlay 'newline newline))))
-
-(defun ac-remove-prefix-overlay ()
-  (when ac-prefix-overlay
-    (when (overlay-get ac-prefix-overlay 'newline)
-      ;; Remove inserted newline
-      (popup-save-buffer-state
-        (goto-char (point-max))
-        (if (eq (char-before) ?\n)
-            (delete-char -1))))
-    (delete-overlay ac-prefix-overlay)))
-
-(defun ac-activate-completing-map ()
-  (if (and ac-show-menu ac-use-menu-map)
-      (set-keymap-parent ac-current-map ac-menu-map))
-  (when (and ac-use-overriding-local-map
-             (null overriding-terminal-local-map))
-    (setq overriding-terminal-local-map ac-current-map))
-  (when ac-prefix-overlay
-    (set-keymap-parent (overlay-get ac-prefix-overlay 'keymap) ac-current-map)))
-
-(defun ac-deactivate-completing-map ()
-  (set-keymap-parent ac-current-map ac-completing-map)
-  (when (and ac-use-overriding-local-map
-             (eq overriding-terminal-local-map ac-current-map))
-    (setq overriding-terminal-local-map nil))
-  (when ac-prefix-overlay
-    (set-keymap-parent (overlay-get ac-prefix-overlay 'keymap) nil)))
-
-(defsubst ac-selected-candidate ()
-  (if ac-menu
-      (popup-selected-item ac-menu)))
-
-(defun ac-prefix (requires ignore-list)
-  (loop with current = (point)
-        with point
-        with prefix-def
-        with sources
-        for source in (ac-compiled-sources)
-        for prefix = (assoc-default 'prefix source)
-        for req = (or (assoc-default 'requires source) requires 1)
-
-        if (null prefix-def)
-        do
-        (unless (member prefix ignore-list)
-          (save-excursion
-            (setq point (cond
-                         ((symbolp prefix)
-                          (funcall prefix))
-                         ((stringp prefix)
-                          (and (re-search-backward (concat prefix "\\=") nil t)
-                               (or (match-beginning 1) (match-beginning 0))))
-                         ((stringp (car-safe prefix))
-                          (let ((regexp (nth 0 prefix))
-                                (end (nth 1 prefix))
-                                (group (nth 2 prefix)))
-                            (and (re-search-backward (concat regexp "\\=") nil t)
-                                 (funcall (if end 'match-end 'match-beginning)
-                                          (or group 0)))))
-                         (t
-                          (eval prefix))))
-            (if (and point
-                     (integerp req)
-                     (< (- current point) req))
-                (setq point nil))
-            (if point
-                (setq prefix-def prefix))))
-        
-        if (equal prefix prefix-def) do (push source sources)
-
-        finally return
-        (and point (list prefix-def point (nreverse sources)))))
-
-(defun ac-init ()
-  "Initialize current sources to start completion."
-  (setq ac-candidates-cache nil)
-  (loop for source in ac-current-sources
-        for function = (assoc-default 'init source)
-        if function do
-        (save-excursion
-          (cond
-           ((functionp function)
-            (funcall function))
-           (t
-            (eval function))))))
-
-(defun ac-candidates-1 (source)
-  (let* ((do-cache (assq 'cache source))
-         (function (assoc-default 'candidates source))
-         (action (assoc-default 'action source))
-         (document (assoc-default 'document source))
-         (symbol (assoc-default 'symbol source))
-         (ac-limit (or (assoc-default 'limit source) ac-limit))
-         (face (or (assoc-default 'face source) (assoc-default 'candidate-face source)))
-         (selection-face (assoc-default 'selection-face source))
-         (cache (and do-cache (assq source ac-candidates-cache)))
-         (candidates (cdr cache)))
-    (unless cache
-      (setq candidates (save-excursion
-                         (cond
-                          ((functionp function)
-                           (funcall function))
-                          (t
-                           (eval function)))))
-      ;; Convert (name value) format candidates into name with text properties.
-      (setq candidates (mapcar (lambda (candidate)
-                                 (if (consp candidate)
-                                     (propertize (car candidate) 'value (cdr candidate))
-                                   candidate))
-                               candidates))
-      (when do-cache
-        (push (cons source candidates) ac-candidates-cache)))
-    (setq candidates (funcall (or (assoc-default 'match source)
-                                  ac-match-function)
-                              ac-prefix candidates))
-    ;; Remove extra items regarding to ac-limit
-    (if (and (integerp ac-limit) (> ac-limit 1) (> (length candidates) ac-limit))
-        (setcdr (nthcdr (1- ac-limit) candidates) nil))
-    ;; Put candidate properties
-    (setq candidates (mapcar (lambda (candidate)
-                               (popup-item-propertize candidate
-                                                      'action action
-                                                      'symbol symbol
-                                                      'document document
-                                                      'popup-face face
-                                                      'selection-face selection-face))
-                             candidates))
-    candidates))
-
-(defun ac-candidates ()
-  "Produce candidates for current sources."
-  (loop with completion-ignore-case = (or (eq ac-ignore-case t)
-                                          (and (eq ac-ignore-case 'smart)
-                                               (let ((case-fold-search nil)) (not (string-match "[[:upper:]]" ac-prefix)))))
-        with case-fold-search = completion-ignore-case
-        with prefix-len = (length ac-prefix)
-        for source in ac-current-sources
-        append (ac-candidates-1 source) into candidates
-        finally return
-        (progn
-          (delete-dups candidates)
-          (if (and ac-use-comphist ac-comphist)
-              (if ac-show-menu
-                  (let* ((pair (ac-comphist-sort ac-comphist candidates prefix-len ac-comphist-threshold))
-                         (n (car pair))
-                         (result (cdr pair))
-                         (cons (if (> n 0) (nthcdr (1- n) result)))
-                         (cdr (cdr cons)))
-                    (if cons (setcdr cons nil))
-                    (setq ac-common-part (try-completion ac-prefix result))
-                    (setq ac-whole-common-part (try-completion ac-prefix candidates))
-                    (if cons (setcdr cons cdr))
-                    result)
-                (setq candidates (ac-comphist-sort ac-comphist candidates prefix-len))
-                (setq ac-common-part (if candidates (popup-x-to-string (car candidates))))
-                (setq ac-whole-common-part (try-completion ac-prefix candidates))
-                candidates)
-            (setq ac-common-part (try-completion ac-prefix candidates))
-            (setq ac-whole-common-part ac-common-part)
-            candidates))))
-
-(defun ac-update-candidates (cursor scroll-top)
-  "Update candidates of menu to `ac-candidates' and redraw it."
-  (setf (popup-cursor ac-menu) cursor
-        (popup-scroll-top ac-menu) scroll-top)
-  (setq ac-dwim-enable (= (length ac-candidates) 1))
-  (if ac-candidates
-      (progn
-        (setq ac-completing t)
-        (ac-activate-completing-map))
-    (setq ac-completing nil)
-    (ac-deactivate-completing-map))
-  (ac-inline-update)
-  (popup-set-list ac-menu ac-candidates)
-  (if (and (not ac-fuzzy-enable)
-           (<= (length ac-candidates) 1))
-      (popup-hide ac-menu)
-    (if ac-show-menu
-        (popup-draw ac-menu))))
-
-(defun ac-reposition ()
-  "Force to redraw candidate menu with current `ac-candidates'."
-  (let ((cursor (popup-cursor ac-menu))
-        (scroll-top (popup-scroll-top ac-menu))
-        (height (popup-height ac-menu)))
-    (ac-menu-delete)
-    (ac-menu-create ac-point (popup-preferred-width ac-candidates) height)
-    (ac-update-candidates cursor scroll-top)))
-
-(defun ac-cleanup ()
-  "Cleanup auto completion."
-  (if ac-cursor-color
-      (set-cursor-color ac-cursor-color))
-  (when (and ac-use-comphist ac-comphist)
-    (when (and (null ac-selected-candidate)
-               (member ac-prefix ac-candidates))
-      ;; Assume candidate is selected by just typing
-      (setq ac-selected-candidate ac-prefix)
-      (setq ac-last-point ac-point))
-    (when ac-selected-candidate
-      (ac-comphist-add ac-comphist
-                       ac-selected-candidate
-                       (if ac-last-point
-                           (- ac-last-point ac-point)
-                         (length ac-prefix)))))
-  (ac-deactivate-completing-map)
-  (ac-remove-prefix-overlay)
-  (ac-remove-quick-help)
-  (ac-inline-delete)
-  (ac-menu-delete)
-  (ac-cancel-timer)
-  (ac-cancel-show-menu-timer)
-  (ac-cancel-quick-help-timer)
-  (setq ac-cursor-color nil
-        ac-inline nil
-        ac-show-menu nil
-        ac-menu nil
-        ac-completing nil
-        ac-point nil
-        ac-last-point nil
-        ac-prefix nil
-        ac-prefix-overlay nil
-        ac-selected-candidate nil
-        ac-common-part nil
-        ac-whole-common-part nil
-        ac-triggered nil
-        ac-limit nil
-        ac-candidates nil
-        ac-candidates-cache nil
-        ac-fuzzy-enable nil
-        ac-dwim-enable nil
-        ac-compiled-sources nil
-        ac-current-sources nil
-        ac-current-prefix-def nil
-        ac-ignoring-prefix-def nil))
-
-(defsubst ac-abort ()
-  "Abort completion."
-  (ac-cleanup))
-
-(defun ac-expand-string (string &optional remove-undo-boundary)
-  "Expand `STRING' into the buffer and update `ac-prefix' to `STRING'.
-This function records deletion and insertion sequences by `undo-boundary'.
-If `remove-undo-boundary' is non-nil, this function also removes `undo-boundary'
-that have been made before in this function."
-  (when (not (equal string (buffer-substring ac-point (point))))
-    (undo-boundary)
-    ;; We can't use primitive-undo since it undoes by
-    ;; groups, divided by boundaries.
-    ;; We don't want boundary between deletion and insertion.
-    ;; So do it manually.
-    ;; Delete region silently for undo:
-    (if remove-undo-boundary
-        (progn
-          (let (buffer-undo-list)
-            (save-excursion
-              (delete-region ac-point (point))))
-          (setq buffer-undo-list
-                (nthcdr 2 buffer-undo-list)))
-      (delete-region ac-point (point)))
-    (insert string)
-    ;; Sometimes, possible when omni-completion used, (insert) added
-    ;; to buffer-undo-list strange record about position changes.
-    ;; Delete it here:
-    (when (and remove-undo-boundary
-               (integerp (cadr buffer-undo-list)))
-      (setcdr buffer-undo-list (nthcdr 2 buffer-undo-list)))
-    (undo-boundary)
-    (setq ac-selected-candidate string)
-    (setq ac-prefix string)))
-
-(defun ac-set-trigger-key (key)
-  "Set `ac-trigger-key' to `KEY'. It is recommemded to use this function instead of calling `setq'."
-  ;; Remove old mapping
-  (when ac-trigger-key
-    (define-key ac-mode-map (read-kbd-macro ac-trigger-key) nil))
-
-  ;; Make new mapping
-  (setq ac-trigger-key key)
-  (when key
-    (define-key ac-mode-map (read-kbd-macro key) 'ac-trigger-key-command)))
-
-(defun ac-set-timer ()
-  (unless ac-timer
-    (setq ac-timer (run-with-idle-timer ac-delay ac-delay 'ac-update-greedy))))
-
-(defun ac-cancel-timer ()
-  (when (timerp ac-timer)
-    (cancel-timer ac-timer)
-    (setq ac-timer nil)))
-
-(defun ac-update (&optional force)
-  (when (and auto-complete-mode
-             ac-prefix
-             (or ac-triggered
-                 force)
-             (not isearch-mode))
-    (ac-put-prefix-overlay)
-    (setq ac-candidates (ac-candidates))
-    (let ((preferred-width (popup-preferred-width ac-candidates)))
-      ;; Reposition if needed
-      (when (or (null ac-menu)
-                (>= (popup-width ac-menu) preferred-width)
-                (<= (popup-width ac-menu) (- preferred-width 10))
-                (and (> (popup-direction ac-menu) 0)
-                     (ac-menu-at-wrapper-line-p)))
-        (ac-inline-hide) ; Hide overlay to calculate correct column
-        (ac-menu-delete)
-        (ac-menu-create ac-point preferred-width ac-menu-height)))
-    (ac-update-candidates 0 0)
-    t))
-
-(defun ac-update-greedy (&optional force)
-  (let (result)
-    (while (when (and (setq result (ac-update force))
-                      (null ac-candidates))
-             (add-to-list 'ac-ignoring-prefix-def ac-current-prefix-def)
-             (ac-start :force-init t)
-             ac-current-prefix-def))
-    result))
-
-(defun ac-set-show-menu-timer ()
-  (when (and (or (integerp ac-auto-show-menu) (floatp ac-auto-show-menu))
-             (null ac-show-menu-timer))
-    (setq ac-show-menu-timer (run-with-idle-timer ac-auto-show-menu ac-auto-show-menu 'ac-show-menu))))
-
-(defun ac-cancel-show-menu-timer ()
-  (when (timerp ac-show-menu-timer)
-    (cancel-timer ac-show-menu-timer)
-    (setq ac-show-menu-timer nil)))
-
-(defun ac-show-menu ()
-  (when (not (eq ac-show-menu t))
-    (setq ac-show-menu t)
-    (ac-inline-hide)
-    (ac-remove-quick-help)
-    (ac-update t)))
-
-(defun ac-help (&optional persist)
-  (interactive "P")
-  (when ac-menu
-    (popup-menu-show-help ac-menu persist)))
-
-(defun ac-persist-help ()
-  (interactive)
-  (ac-help t))
-
-(defun ac-last-help (&optional persist)
-  (interactive "P")
-  (when ac-last-completion
-    (popup-item-show-help (cdr ac-last-completion) persist)))
-
-(defun ac-last-persist-help ()
-  (interactive)
-  (ac-last-help t))
-
-(defun ac-set-quick-help-timer ()
-  (when (and ac-use-quick-help
-             (null ac-quick-help-timer))
-    (setq ac-quick-help-timer (run-with-idle-timer ac-quick-help-delay ac-quick-help-delay 'ac-quick-help))))
-
-(defun ac-cancel-quick-help-timer ()
-  (when (timerp ac-quick-help-timer)
-    (cancel-timer ac-quick-help-timer)
-    (setq ac-quick-help-timer nil)))
-
-(defun ac-pos-tip-show-quick-help (menu &optional item &rest args)
-  (let* ((point (plist-get args :point))
-         (around nil)
-         (parent-offset (popup-offset menu))
-         (doc (popup-menu-documentation menu item)))
-    (when (stringp doc)
-      (if (popup-hidden-p menu)
-          (setq around t)
-        (setq point nil))
-      (with-no-warnings
-        (pos-tip-show doc
-                      'popup-tip-face
-                      (or point
-                          (and menu
-                               (popup-child-point menu parent-offset))
-                          (point))
-                      nil 0
-                      popup-tip-max-width
-                      nil nil
-                      (and (not around) 0))
-        (unless (plist-get args :nowait)
-          (clear-this-command-keys)
-          (unwind-protect
-              (push (read-event (plist-get args :prompt)) unread-command-events)
-            (pos-tip-hide))
-          t)))))
-
-(defun ac-quick-help-use-pos-tip-p ()
-  (and ac-quick-help-prefer-pos-tip
-       window-system
-       (featurep 'pos-tip)))
-
-(defun ac-quick-help (&optional force)
-  (interactive)
-  ;; TODO don't use FORCE
-  (when (and (or force
-                 (called-interactively-p)
-                 ;; ac-isearch'ing
-                 (null this-command))
-             (ac-menu-live-p)
-             (null ac-quick-help))
-      (setq ac-quick-help
-            (funcall (if (ac-quick-help-use-pos-tip-p)
-                         'ac-pos-tip-show-quick-help
-                       'popup-menu-show-quick-help)
-                     ac-menu nil
-                     :point ac-point
-                     :height ac-quick-help-height
-                     :nowait t))))
-
-(defun ac-remove-quick-help ()
-  (when (ac-quick-help-use-pos-tip-p)
-    (with-no-warnings
-      (pos-tip-hide)))
-  (when ac-quick-help
-    (popup-delete ac-quick-help)
-    (setq ac-quick-help nil)))
-
-(defun ac-last-quick-help ()
-  (interactive)
-  (when (and ac-last-completion
-             (eq (marker-buffer (car ac-last-completion))
-                 (current-buffer)))
-    (let ((doc (popup-item-documentation (cdr ac-last-completion)))
-          (point (marker-position (car ac-last-completion))))
-      (when (stringp doc)
-        (if (ac-quick-help-use-pos-tip-p)
-            (with-no-warnings (pos-tip-show doc nil point nil 0))
-          (popup-tip doc
-                     :point point
-                     :around t
-                     :scroll-bar t
-                     :margin t))))))
-
-(defmacro ac-define-quick-help-command (name arglist &rest body)
-  (declare (indent 2))
-  `(progn
-     (defun ,name ,arglist ,@body)
-     (put ',name 'ac-quick-help-command t)))
-
-(ac-define-quick-help-command ac-quick-help-scroll-down ()
-  (interactive)
-  (when ac-quick-help
-    (popup-scroll-down ac-quick-help)))
-
-(ac-define-quick-help-command ac-quick-help-scroll-up ()
-  (interactive)
-  (when ac-quick-help
-    (popup-scroll-up ac-quick-help)))
-
-
-
-;;;; Auto completion isearch
-
-(defun ac-isearch-callback (list)
-  (setq ac-dwim-enable (eq (length list) 1)))
-
-(defun ac-isearch ()
-  (interactive)
-  (when (ac-menu-live-p)
-    (ac-cancel-show-menu-timer)
-    (ac-cancel-quick-help-timer)
-    (ac-show-menu)
-    (popup-isearch ac-menu :callback 'ac-isearch-callback)))
-
-
-
-;;;; Auto completion commands
-
-(defun auto-complete (&optional sources)
-  "Start auto-completion at current point."
-  (interactive)
-  (let ((menu-live (ac-menu-live-p))
-        (inline-live (ac-inline-live-p)))
-    (ac-abort)
-    (let ((ac-sources (or sources ac-sources)))
-      (if (or ac-show-menu-immediately-on-auto-complete
-              inline-live)
-          (setq ac-show-menu t))
-      (ac-start))
-    (when (ac-update-greedy t)
-      ;; TODO Not to cause inline completion to be disrupted.
-      (if (ac-inline-live-p)
-          (ac-inline-hide))
-      ;; Not to expand when it is first time to complete
-      (when (and (or (and (not ac-expand-on-auto-complete)
-                          (> (length ac-candidates) 1)
-                          (not menu-live))
-                     (not (let ((ac-common-part ac-whole-common-part))
-                            (ac-expand-common))))
-                 ac-use-fuzzy
-                 (null ac-candidates))
-        (ac-fuzzy-complete)))))
-
-(defun ac-fuzzy-complete ()
-  "Start fuzzy completion at current point."
-  (interactive)
-  (when (require 'fuzzy nil)
-    (unless (ac-menu-live-p)
-      (ac-start))
-    (let ((ac-match-function 'fuzzy-all-completions))
-      (unless ac-cursor-color
-        (setq ac-cursor-color (frame-parameter (selected-frame) 'cursor-color)))
-      (if ac-fuzzy-cursor-color
-          (set-cursor-color ac-fuzzy-cursor-color))
-      (setq ac-show-menu t)
-      (setq ac-fuzzy-enable t)
-      (setq ac-triggered nil)
-      (ac-update t)))
-  t)
-
-(defun ac-next ()
-  "Select next candidate."
-  (interactive)
-  (when (ac-menu-live-p)
-    (popup-next ac-menu)
-    (setq ac-show-menu t)
-    (if (eq this-command 'ac-next)
-        (setq ac-dwim-enable t))))
-
-(defun ac-previous ()
-  "Select previous candidate."
-  (interactive)
-  (when (ac-menu-live-p)
-    (popup-previous ac-menu)
-    (setq ac-show-menu t)
-    (if (eq this-command 'ac-previous)
-        (setq ac-dwim-enable t))))
-
-(defun ac-expand ()
-  "Try expand, and if expanded twice, select next candidate."
-  (interactive)
-  (unless (ac-expand-common)
-    (let ((string (ac-selected-candidate)))
-      (when string
-        (when (equal ac-prefix string)
-          (ac-next)
-          (setq string (ac-selected-candidate)))
-        (ac-expand-string string (eq last-command this-command))
-        ;; Do reposition if menu at long line
-        (if (and (> (popup-direction ac-menu) 0)
-                 (ac-menu-at-wrapper-line-p))
-            (ac-reposition))
-        (setq ac-show-menu t)
-        string))))
-
-(defun ac-expand-common ()
-  "Try to expand meaningful common part."
-  (interactive)
-  (if (and ac-dwim ac-dwim-enable)
-      (ac-complete)
-    (when (and (ac-inline-live-p)
-               ac-common-part)
-      (ac-inline-hide) 
-      (ac-expand-string ac-common-part (eq last-command this-command))
-      (setq ac-common-part nil)
-      t)))
-
-(defun ac-complete-1 (candidate)
-  (let ((action (popup-item-property candidate 'action))
-        (fallback nil))
-    (when candidate
-      (unless (ac-expand-string candidate)
-        (setq fallback t))
-      ;; Remember to show help later
-      (when (and ac-point candidate)
-        (unless ac-last-completion
-          (setq ac-last-completion (cons (make-marker) nil)))
-        (set-marker (car ac-last-completion) ac-point ac-buffer)
-        (setcdr ac-last-completion candidate)))
-    (ac-abort)
-    (cond
-     (action
-      (funcall action))
-     (fallback
-      (ac-fallback-command)))
-    candidate))
-
-(defun ac-complete ()
-  "Try complete."
-  (interactive)
-  (ac-complete-1 (ac-selected-candidate)))
-
-(defun* ac-start (&key
-                  requires
-                  force-init)
-  "Start completion."
-  (interactive)
-  (if (not auto-complete-mode)
-      (message "auto-complete-mode is not enabled")
-    (let* ((info (ac-prefix requires ac-ignoring-prefix-def))
-           (prefix-def (nth 0 info))
-           (point (nth 1 info))
-           (sources (nth 2 info))
-           prefix
-           (init (or force-init (not (eq ac-point point)))))
-      (if (or (null point)
-              (progn
-                (setq prefix (buffer-substring-no-properties point (point)))
-                (ac-stop-word-p prefix)))
-          (prog1 nil
-            (ac-abort))
-        (unless ac-cursor-color
-          (setq ac-cursor-color (frame-parameter (selected-frame) 'cursor-color)))
-        (setq ac-show-menu (or ac-show-menu (if (eq ac-auto-show-menu t) t))
-              ac-current-sources sources
-              ac-buffer (current-buffer)
-              ac-point point
-              ac-prefix prefix
-              ac-limit ac-candidate-limit
-              ac-triggered t
-              ac-current-prefix-def prefix-def)
-        (when (or init (null ac-prefix-overlay))
-          (ac-init))
-        (ac-set-timer)
-        (ac-set-show-menu-timer)
-        (ac-set-quick-help-timer)
-        (ac-put-prefix-overlay)))))
-
-(defun ac-stop ()
-  "Stop completiong."
-  (interactive)
-  (setq ac-selected-candidate nil)
-  (ac-abort))
-
-(defun ac-ignore (&rest ignore)
-  "Same as `ignore'."
-  (interactive))
-
-(defun ac-mouse-1 (event)
-  (interactive "e")
-  (popup-awhen (popup-menu-item-of-mouse-event event)
-    (ac-complete-1 it)))
-
-(defun ac-mouse-4 (event)
-  (interactive "e")
-  (ac-previous))
-
-(defun ac-mouse-5 (event)
-  (interactive "e")
-  (ac-next))
-
-(defun ac-trigger-key-command (&optional force)
-  (interactive "P")
-  (if (or force (ac-trigger-command-p last-command))
-      (auto-complete)
-    (ac-fallback-command 'ac-trigger-key-command)))
-
-
-
-;;;; Basic cache facility
-
-(defvar ac-clear-variables-every-minute-timer nil)
-(defvar ac-clear-variables-after-save nil)
-(defvar ac-clear-variables-every-minute nil)
-(defvar ac-minutes-counter 0)
-
-(defun ac-clear-variable-after-save (variable &optional pred)
-  (add-to-list 'ac-clear-variables-after-save (cons variable pred)))
-
-(defun ac-clear-variables-after-save ()
-  (dolist (pair ac-clear-variables-after-save)
-    (if (or (null (cdr pair))
-            (funcall (cdr pair)))
-        (set (car pair) nil))))
-
-(defun ac-clear-variable-every-minutes (variable minutes)
-  (add-to-list 'ac-clear-variables-every-minute (cons variable minutes)))
-
-(defun ac-clear-variable-every-minute (variable)
-  (ac-clear-variable-every-minutes variable 1))
-
-(defun ac-clear-variable-every-10-minutes (variable)
-  (ac-clear-variable-every-minutes variable 10))
-
-(defun ac-clear-variables-every-minute ()
-  (incf ac-minutes-counter)
-  (dolist (pair ac-clear-variables-every-minute)
-    (if (eq (% ac-minutes-counter (cdr pair)) 0)
-        (set (car pair) nil))))
-
-
-
-;;;; Auto complete mode
-
-(defun ac-cursor-on-diable-face-p (&optional point)
-  (memq (get-text-property (or point (point)) 'face) ac-disable-faces))
-
-(defun ac-trigger-command-p (command)
-  "Return non-nil if `COMMAND' is a trigger command."
-  (and (symbolp command)
-       (not (memq command ac-non-trigger-commands))
-       (or (memq command ac-trigger-commands)
-           (string-match "self-insert-command" (symbol-name command))
-           (string-match "electric" (symbol-name command)))))
-
-(defun ac-fallback-command (&optional except-command)
-  (let* ((auto-complete-mode nil)
-         (keys (this-command-keys-vector))
-         (command (if keys (key-binding keys))))
-    (when (and (commandp command)
-               (not (eq command except-command)))
-      (setq this-command command)
-      (call-interactively command))))
-
-(defun ac-compatible-package-command-p (command)
-  "Return non-nil if `COMMAND' is compatible with auto-complete."
-  (and (symbolp command)
-       (string-match ac-compatible-packages-regexp (symbol-name command))))
-
-(defun ac-handle-pre-command ()
-  (condition-case var
-      (if (or (setq ac-triggered (and (not ac-fuzzy-enable) ; ignore key storkes in fuzzy mode
-                                      (or (eq this-command 'auto-complete) ; special case
-                                          (ac-trigger-command-p this-command)
-                                          (and ac-completing
-                                               (memq this-command ac-trigger-commands-on-completing)))
-                                      (not (ac-cursor-on-diable-face-p))))
-              (ac-compatible-package-command-p this-command))
-          (progn
-            (if (or (not (symbolp this-command))
-                    (not (get this-command 'ac-quick-help-command)))
-                (ac-remove-quick-help))
-            ;; Not to cause inline completion to be disrupted.
-            (ac-inline-hide))
-        (ac-abort))
-    (error (ac-error var))))
-
-(defun ac-handle-post-command ()
-  (condition-case var
-      (when (and ac-triggered
-                 (or ac-auto-start
-                     ac-completing)
-                 (not isearch-mode))
-        (setq ac-last-point (point))
-        (ac-start :requires (unless ac-completing ac-auto-start))
-        (ac-inline-update))
-    (error (ac-error var))))
-
-(defun ac-setup ()
-  (if ac-trigger-key
-      (ac-set-trigger-key ac-trigger-key))
-  (if ac-use-comphist
-      (ac-comphist-init))
-  (unless ac-clear-variables-every-minute-timer
-    (setq ac-clear-variables-every-minute-timer (run-with-timer 60 60 'ac-clear-variables-every-minute)))
-  (if ac-stop-flymake-on-completing
-      (defadvice flymake-on-timer-event (around ac-flymake-stop-advice activate)
-        (unless ac-completing
-          ad-do-it))
-    (ad-disable-advice 'flymake-on-timer-event 'around 'ac-flymake-stop-advice)))
-
-(define-minor-mode auto-complete-mode
-  "AutoComplete mode"
-  :lighter " AC"
-  :keymap ac-mode-map
-  :group 'auto-complete
-  (if auto-complete-mode
-      (progn
-        (ac-setup)
-        (add-hook 'pre-command-hook 'ac-handle-pre-command nil t)
-        (add-hook 'post-command-hook 'ac-handle-post-command nil t)
-        (add-hook 'after-save-hook 'ac-clear-variables-after-save nil t)
-        (run-hooks 'auto-complete-mode-hook))
-    (remove-hook 'pre-command-hook 'ac-handle-pre-command t)
-    (remove-hook 'post-command-hook 'ac-handle-post-command t)
-    (remove-hook 'after-save-hook 'ac-clear-variables-after-save t)
-    (ac-abort)))
-
-(defun auto-complete-mode-maybe ()
-  "What buffer `auto-complete-mode' prefers."
-  (if (and (not (minibufferp (current-buffer)))
-           (memq major-mode ac-modes))
-      (auto-complete-mode 1)))
-
-(define-global-minor-mode global-auto-complete-mode
-  auto-complete-mode auto-complete-mode-maybe
-  :group 'auto-complete)
-
-
-
-;;;; Compatibilities with other extensions
-
-(defun ac-flyspell-workaround ()
-  "Flyspell uses `sit-for' for delaying its process. Unfortunatelly,
-it stops auto completion which is trigger with `run-with-idle-timer'.
-This workaround avoid flyspell processes when auto completion is being started."
-  (interactive)
-  (defadvice flyspell-post-command-hook (around ac-flyspell-workaround activate)
-    (unless ac-triggered
-      ad-do-it)))
-
-(defun ac-linum-workaround ()
-  "linum-mode tries to display the line numbers even for the
-completion menu. This workaround stops that annoying behavior."
-  (interactive)
-  (defadvice linum-update (around ac-linum-update-workaround activate)
-    (unless ac-completing
-      ad-do-it)))
-
-
-
-;;;; Standard sources
-
-(defmacro ac-define-source (name source)
-  "Source definition macro. It defines a complete command also."
-  (declare (indent 1))
-  `(progn
-     (defvar ,(intern (format "ac-source-%s" name))
-       ,source)
-     (defun ,(intern (format "ac-complete-%s" name)) ()
-       (interactive)
-       (auto-complete '(,(intern (format "ac-source-%s" name)))))))
-
-;; Words in buffer source
-(defvar ac-word-index nil)
-
-(defun ac-candidate-words-in-buffer (point prefix limit)
-  (let ((i 0)
-        candidate
-        candidates
-        (regexp (concat "\\_<" (regexp-quote prefix) "\\(\\sw\\|\\s_\\)+\\_>")))
-    (save-excursion
-      ;; Search backward
-      (goto-char point)
-      (while (and (or (not (integerp limit)) (< i limit))
-                  (re-search-backward regexp nil t))
-        (setq candidate (match-string-no-properties 0))
-        (unless (member candidate candidates)
-          (push candidate candidates)
-          (incf i)))
-      ;; Search backward
-      (goto-char (+ point (length prefix)))
-      (while (and (or (not (integerp limit)) (< i limit))
-                  (re-search-forward regexp nil t))
-        (setq candidate (match-string-no-properties 0))
-        (unless (member candidate candidates)
-          (push candidate candidates)
-          (incf i)))
-      (nreverse candidates))))
-
-(defun ac-incremental-update-word-index ()
-  (unless (local-variable-p 'ac-word-index)
-    (make-local-variable 'ac-word-index))
-  (if (null ac-word-index)
-      (setq ac-word-index (cons nil nil)))
-  ;; Mark incomplete
-  (if (car ac-word-index)
-      (setcar ac-word-index nil))
-  (let ((index (cdr ac-word-index))
-        (words (ac-candidate-words-in-buffer ac-point ac-prefix (or (and (integerp ac-limit) ac-limit) 10))))
-    (dolist (word words)
-      (unless (member word index)
-        (push word index)
-        (setcdr ac-word-index index)))))
-
-(defun ac-update-word-index-1 ()
-  (unless (local-variable-p 'ac-word-index)
-    (make-local-variable 'ac-word-index))
-  (when (and (not (car ac-word-index))
-             (< (buffer-size) 1048576))
-    ;; Complete index
-    (setq ac-word-index
-          (cons t
-                (split-string (buffer-substring-no-properties (point-min) (point-max))
-                              "\\(?:^\\|\\_>\\).*?\\(?:\\_<\\|$\\)")))))
-
-(defun ac-update-word-index ()
-  (dolist (buffer (buffer-list))
-    (when (or ac-fuzzy-enable
-              (not (eq buffer (current-buffer))))
-      (with-current-buffer buffer
-        (ac-update-word-index-1)))))
-
-(defun ac-word-candidates (&optional buffer-pred)
-  (loop initially (unless ac-fuzzy-enable (ac-incremental-update-word-index))
-        for buffer in (buffer-list)
-        if (and (or (not (integerp ac-limit)) (< (length candidates) ac-limit))
-                (if buffer-pred (funcall buffer-pred buffer) t))
-        append (funcall ac-match-function
-                        ac-prefix
-                        (and (local-variable-p 'ac-word-index buffer)
-                             (cdr (buffer-local-value 'ac-word-index buffer))))
-        into candidates
-        finally return candidates))
-
-(ac-define-source words-in-buffer
-  '((candidates . ac-word-candidates)))
-
-(ac-define-source words-in-all-buffer
-  '((init . ac-update-word-index)
-    (candidates . ac-word-candidates)))
-
-(ac-define-source words-in-same-mode-buffers
-  '((init . ac-update-word-index)
-    (candidates . (ac-word-candidates
-                   (lambda (buffer)
-                     (derived-mode-p (buffer-local-value 'major-mode buffer)))))))
-
-;; Lisp symbols source
-(defvar ac-symbols-cache nil)
-(ac-clear-variable-every-10-minutes 'ac-symbols-cache)
-
-(defun ac-symbol-file (symbol type)
-  (if (fboundp 'find-lisp-object-file-name)
-      (find-lisp-object-file-name symbol type)
-    (let ((file-name (with-no-warnings
-                       (describe-simplify-lib-file-name
-                        (symbol-file symbol type)))))
-      (when (equal file-name "loaddefs.el")
-        ;; Find the real def site of the preloaded object.
-        (let ((location (condition-case nil
-                            (if (eq type 'defun)
-                                (find-function-search-for-symbol symbol nil
-                                                                 "loaddefs.el")
-                              (find-variable-noselect symbol file-name))
-                          (error nil))))
-          (when location
-            (with-current-buffer (car location)
-              (when (cdr location)
-                (goto-char (cdr location)))
-              (when (re-search-backward
-                     "^;;; Generated autoloads from \\(.*\\)" nil t)
-                (setq file-name (match-string 1)))))))
-      (if (and (null file-name)
-               (or (eq type 'defun)
-                   (integerp (get symbol 'variable-documentation))))
-          ;; It's a object not defined in Elisp but in C.
-          (if (get-buffer " *DOC*")
-              (if (eq type 'defun)
-                  (help-C-file-name (symbol-function symbol) 'subr)
-                (help-C-file-name symbol 'var))
-            'C-source)
-        file-name))))
-
-(defun ac-symbol-documentation (symbol)
-  (if (stringp symbol)
-      (setq symbol (intern-soft symbol)))
-  (ignore-errors
-    (with-temp-buffer
-      (let ((standard-output (current-buffer)))
-        (prin1 symbol)
-        (princ " is ")
-        (cond
-         ((fboundp symbol)
-          ;; import help-xref-following
-          (require 'help-mode)
-          (let ((help-xref-following t)
-                (major-mode 'help-mode)) ; avoid error in Emacs 24
-            (describe-function-1 symbol))
-          (buffer-string))
-         ((boundp symbol)
-          (let ((file-name  (ac-symbol-file symbol 'defvar)))
-            (princ "a variable")
-            (when file-name
-              (princ " defined in `")
-              (princ (if (eq file-name 'C-source)
-                         "C source code"
-                       (file-name-nondirectory file-name))))
-            (princ "'.\n\n")
-            (princ (or (documentation-property symbol 'variable-documentation t)
-                       "Not documented."))
-            (buffer-string)))
-         ((facep symbol)
-          (let ((file-name  (ac-symbol-file symbol 'defface)))
-            (princ "a face")
-            (when file-name
-              (princ " defined in `")
-              (princ (if (eq file-name 'C-source)
-                         "C source code"
-                       (file-name-nondirectory file-name))))
-            (princ "'.\n\n")
-            (princ (or (documentation-property symbol 'face-documentation t)
-                       "Not documented."))
-            (buffer-string)))
-         (t
-          (let ((doc (documentation-property symbol 'group-documentation t)))
-            (when doc
-              (princ "a group.\n\n")
-              (princ doc)
-              (buffer-string)))))))))
-
-(defun ac-symbol-candidates ()
-  (or ac-symbols-cache
-      (setq ac-symbols-cache
-            (loop for x being the symbols
-                  if (or (fboundp x)
-                         (boundp x)
-                         (symbol-plist x))
-                  collect (symbol-name x)))))
-
-(ac-define-source symbols
-  '((candidates . ac-symbol-candidates)
-    (document . ac-symbol-documentation)
-    (symbol . "s")
-    (cache)))
-
-;; Lisp functions source
-(defvar ac-functions-cache nil)
-(ac-clear-variable-every-10-minutes 'ac-functions-cache)
-
-(defun ac-function-candidates ()
-  (or ac-functions-cache
-      (setq ac-functions-cache
-            (loop for x being the symbols
-                  if (fboundp x)
-                  collect (symbol-name x)))))
-
-(ac-define-source functions
-  '((candidates . ac-function-candidates)
-    (document . ac-symbol-documentation)
-    (symbol . "f")
-    (prefix . "(\\(\\(?:\\sw\\|\\s_\\)+\\)")
-    (cache)))
-
-;; Lisp variables source
-(defvar ac-variables-cache nil)
-(ac-clear-variable-every-10-minutes 'ac-variables-cache)
-
-(defun ac-variable-candidates ()
-  (or ac-variables-cache
-      (setq ac-variables-cache
-            (loop for x being the symbols
-                  if (boundp x)
-                  collect (symbol-name x)))))
-
-(ac-define-source variables
-  '((candidates . ac-variable-candidates)
-    (document . ac-symbol-documentation)
-    (symbol . "v")
-    (cache)))
-
-;; Lisp features source
-(defvar ac-emacs-lisp-features nil)
-(ac-clear-variable-every-10-minutes 'ac-emacs-lisp-features)
-
-(defun ac-emacs-lisp-feature-candidates ()
-  (or ac-emacs-lisp-features
-      (if (fboundp 'find-library-suffixes)
-          (let ((suffix (concat (regexp-opt (find-library-suffixes) t) "\\'")))
-            (setq ac-emacs-lisp-features
-                  (append (mapcar 'prin1-to-string features)
-                          (loop for dir in load-path
-                                if (file-directory-p dir)
-                                append (loop for file in (directory-files dir)
-                                             if (string-match suffix file)
-                                             collect (substring file 0 (match-beginning 0))))))))))
-
-(ac-define-source features
-  '((depends find-func)
-    (candidates . ac-emacs-lisp-feature-candidates)
-    (prefix . "require +'\\(\\(?:\\sw\\|\\s_\\)*\\)")
-    (requires . 0)))
-
-(defvaralias 'ac-source-emacs-lisp-features 'ac-source-features)
-
-;; Abbrev source
-(ac-define-source abbrev
-  '((candidates . (mapcar 'popup-x-to-string (append (vconcat local-abbrev-table global-abbrev-table) nil)))
-    (action . expand-abbrev)
-    (symbol . "a")
-    (cache)))
-
-;; Files in current directory source
-(ac-define-source files-in-current-dir
-  '((candidates . (directory-files default-directory))
-    (cache)))
-
-;; Filename source
-(defvar ac-filename-cache nil)
-
-(defun ac-filename-candidate ()
-  (let (file-name-handler-alist)
-    (unless (file-regular-p ac-prefix)
-      (ignore-errors
-        (loop with dir = (file-name-directory ac-prefix)
-              with files = (or (assoc-default dir ac-filename-cache)
-                               (let ((files (directory-files dir nil "^[^.]")))
-                                 (push (cons dir files) ac-filename-cache)
-                                 files))
-              for file in files
-              for path = (concat dir file)
-              collect (if (file-directory-p path)
-                          (concat path "/")
-                        path))))))
-
-(ac-define-source filename
-  '((init . (setq ac-filename-cache nil))
-    (candidates . ac-filename-candidate)
-    (prefix . valid-file)
-    (requires . 0)
-    (action . ac-start)
-    (limit . nil)))
-
-;; Dictionary source
-(ac-define-source dictionary
-  '((candidates . ac-buffer-dictionary)
-    (symbol . "d")))
-
-(provide 'auto-complete)
-;;; auto-complete.el ends here
diff --git a/elpa/auto-complete-1.4/auto-complete.elc b/elpa/auto-complete-1.4/auto-complete.elc
deleted file mode 100644
index 05eef8c74..000000000
Binary files a/elpa/auto-complete-1.4/auto-complete.elc and /dev/null differ
diff --git a/elpa/auto-complete-1.4/dict/ada-mode b/elpa/auto-complete-1.4/dict/ada-mode
deleted file mode 100644
index bea538fb4..000000000
--- a/elpa/auto-complete-1.4/dict/ada-mode
+++ /dev/null
@@ -1,72 +0,0 @@
-abort
-abs
-abstract
-accept
-access
-aliased
-all
-and
-array
-at
-begin
-body
-case
-constant
-declare
-delay
-delta
-digits
-do
-else
-elsif
-end
-entry
-exception
-exit
-for
-function
-generic
-goto
-if
-in
-interface
-is
-limited
-loop
-mod
-new
-not
-null
-of
-or
-others
-out
-overriding
-package
-pragma
-private
-procedure
-protected
-raise
-range
-record
-rem
-renames
-requeue
-return
-reverse
-select
-separate
-subtype
-synchronized
-tagged
-task
-terminate
-then
-type
-until
-use
-when
-while
-with
-xor
diff --git a/elpa/auto-complete-1.4/dict/c++-mode b/elpa/auto-complete-1.4/dict/c++-mode
deleted file mode 100644
index e3cd8ae08..000000000
--- a/elpa/auto-complete-1.4/dict/c++-mode
+++ /dev/null
@@ -1,74 +0,0 @@
-and
-and_eq
-asm
-auto
-bitand
-bitor
-bool
-break
-case
-catch
-char
-class
-compl
-const
-const_cast
-continue
-default
-delete
-do
-double
-dynamic_cast
-else
-enum
-explicit
-export
-extern
-false
-float
-for
-friend
-goto
-if
-inline
-int
-long
-mutable
-namespace
-new
-not
-not_eq
-operator
-or
-or_eq
-private
-protected
-public
-register
-reinterpret_cast
-return
-short
-signed
-sizeof
-static
-static_cast
-struct
-switch
-template
-this
-throw
-true
-try
-typedef
-typeid
-typename
-union
-unsigned
-using
-virtual
-void
-volatile
-wchar_t
-while
-xor
-xor_eq
diff --git a/elpa/auto-complete-1.4/dict/c-mode b/elpa/auto-complete-1.4/dict/c-mode
deleted file mode 100644
index 496f904cb..000000000
--- a/elpa/auto-complete-1.4/dict/c-mode
+++ /dev/null
@@ -1,37 +0,0 @@
-auto
-_Bool
-break
-case
-char
-_Complex
-const
-continue
-default
-do
-double
-else
-enum
-extern
-float
-for
-goto
-if
-_Imaginary
-inline
-int
-long
-register
-restrict
-return
-short
-signed
-sizeof
-static
-struct
-switch
-typedef
-union
-unsigned
-void
-volatile
-while
diff --git a/elpa/auto-complete-1.4/dict/caml-mode b/elpa/auto-complete-1.4/dict/caml-mode
deleted file mode 100644
index e709f9f62..000000000
--- a/elpa/auto-complete-1.4/dict/caml-mode
+++ /dev/null
@@ -1,231 +0,0 @@
-# OCaml 3.12.1
-
-# Keywords
-and
-as
-assert
-begin
-class
-constraint
-do
-done
-downto
-else
-end
-exception
-external
-false
-for
-fun
-function
-functor
-if
-in
-include
-inherit
-initializer
-lazy
-let
-match
-method
-module
-mutable
-new
-object
-of
-open
-or
-private
-rec
-sig
-struct
-then
-to
-true
-try
-type
-val
-virtual
-when
-while
-with
-
-# Pervasives
-!
-!=
-&
-&&
-*
-**
-*.
-+
-+.
--
--.
-/
-/.
-:=
-<
-<=
-<>
-=
-==
->
->=
-@
-FP_infinite
-FP_nan
-FP_normal
-FP_subnormal
-FP_zero
-LargeFile
-Open_append
-Open_binary
-Open_creat
-Open_nonblock
-Open_rdonly
-Open_text
-Open_trunc
-Open_wronly
-Oupen_excl
-^
-^^
-abs
-abs_float
-acos
-asin
-asr
-at_exit
-atan
-atan2
-bool_of_string
-ceil
-char_of_int
-classify_float
-close_in
-close_in_noerr
-close_out
-close_out_noerr
-compare
-cos
-cosh
-decr
-do_at_exit
-epsilon_float
-exit
-exp
-expm1
-failwith
-float
-float_of_int
-float_of_string
-floor
-flush
-flush_all
-format
-format4
-format_of_string
-fpclass
-frexp
-fst
-ignore
-in_channel
-in_channel_length
-incr
-infinity
-input
-input_binary_int
-input_byte
-input_char
-input_line
-input_value
-int_of_char
-int_of_float
-int_of_string
-invalid_arg
-land
-ldexp
-lnot
-log
-log10
-log1p
-lor
-lsl
-lsr
-lxor
-max
-max_float
-max_int
-min
-min_float
-min_int
-mod
-mod_float
-modf
-nan
-neg_infinity
-not
-open_flag
-open_in
-open_in_bin
-open_in_gen
-open_out
-open_out_bin
-open_out_gen
-or
-out_channel
-out_channel_length
-output
-output_binary_int
-output_byte
-output_char
-output_string
-output_value
-pos_in
-pos_out
-pred
-prerr_char
-prerr_endline
-prerr_float
-prerr_int
-prerr_newline
-prerr_string
-print_char
-print_endline
-print_float
-print_int
-print_newline
-print_string
-raise
-read_float
-read_int
-read_line
-really_input
-ref
-seek_in
-seek_out
-set_binary_mode_in
-set_binary_mode_out
-sin
-sinh
-snd
-sqrt
-stderr
-stdin
-stdout
-string_of_bool
-string_of_float
-string_of_format
-string_of_int
-succ
-tan
-tanh
-truncate
-unsafe_really_input
-valid_float_lexem
-||
-~
-~+
-~+.
-~-
-~-.
diff --git a/elpa/auto-complete-1.4/dict/clojure-mode b/elpa/auto-complete-1.4/dict/clojure-mode
deleted file mode 100644
index 16348edb6..000000000
--- a/elpa/auto-complete-1.4/dict/clojure-mode
+++ /dev/null
@@ -1,475 +0,0 @@
-*agent*
-*clojure-version*
-*command-line-args*
-*compile-files*
-*compile-path*
-*err*
-*file*
-*flush-on-newline*
-*in*
-*ns*
-*out*
-*print-dup*
-*print-length*
-*print-level*
-*print-meta*
-*print-readably*
-*read-eval*
-*warn-on-reflection*
-accessor
-aclone
-add-classpath
-add-watch
-agent
-agent-error
-agent-errors
-aget
-alength
-alias
-all-ns
-alter
-alter-meta!
-alter-var-root
-amap
-ancestors
-and
-apply
-areduce
-array-map
-aset
-aset-boolean
-aset-byte
-aset-char
-aset-double
-aset-float
-aset-int
-aset-long
-aset-short
-assert
-assoc
-assoc!
-assoc-in
-associative?
-atom
-await
-await-for
-bases
-bean
-bigdec
-bigint
-binding
-bit-and
-bit-and-not
-bit-clear
-bit-flip
-bit-not
-bit-or
-bit-set
-bit-shift-left
-bit-shift-right
-bit-test
-bit-xor
-boolean
-boolean-array
-booleans
-bound-fn
-bound-fn*
-butlast
-byte
-byte-array
-bytes
-case
-cast
-char
-char-array
-char-escape-string
-char-name-string
-char?
-chars
-class
-class?
-clear-agent-errors
-clojure-version
-coll?
-comment
-commute
-comp
-comparator
-compare
-compare-and-set!
-compile
-complement
-concat
-cond
-condp
-conj
-conj!
-cons
-constantly
-construct-proxy
-contains?
-count
-counted?
-create-ns
-create-struct
-cycle
-dec
-decimal?
-declare
-definline
-defmacro
-defmethod
-defmulti
-defn
-defn-
-defonce
-defprotocol
-defstruct
-deftype
-delay
-delay?
-deliver
-deref
-derive
-descendants
-disj
-disj!
-dissoc
-dissoc!
-distinct
-distinct?
-doall
-doc
-dorun
-doseq
-dosync
-dotimes
-doto
-double
-double-array
-doubles
-drop
-drop-last
-drop-while
-dtype
-empty
-empty?
-ensure
-enumeration-seq
-error-handler
-error-mode
-eval
-even?
-every?
-extend
-extend-class
-extend-protocol
-extend-type
-extenders
-extends?
-false?
-ffirst
-file-seq
-filter
-find
-find-doc
-find-ns
-find-var
-first
-float
-float-array
-float?
-floats
-flush
-fn
-fn?
-fnext
-for
-force
-format
-future
-future-call
-future-cancel
-future-cancelled?
-future-done?
-future?
-gen-class
-gen-interface
-gensym
-get
-get-in
-get-method
-get-proxy-class
-get-thread-bindings
-get-validator
-hash
-hash-map
-hash-set
-identical?
-identity
-if-let
-if-not
-ifn?
-import
-in-ns
-inc
-init-proxy
-instance?
-int
-int-array
-integer?
-interleave
-intern
-interpose
-into
-into-array
-ints
-io!
-isa?
-iterate
-iterator-seq
-juxt
-key
-keys
-keyword
-keyword?
-last
-lazy-cat
-lazy-seq
-let
-letfn
-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?
-mapcat
-max
-max-key
-memfn
-memoize
-merge
-merge-with
-meta
-methods
-min
-min-key
-mod
-name
-namespace
-neg?
-newline
-next
-nfirst
-nil?
-nnext
-not
-not-any?
-not-empty
-not-every?
-not=
-ns
-ns-aliases
-ns-imports
-ns-interns
-ns-map
-ns-name
-ns-publics
-ns-refers
-ns-resolve
-ns-unalias
-ns-unmap
-nth
-nthnext
-num
-number?
-object-array
-odd?
-or
-parents
-partial
-partition
-pcalls
-peek
-persistent!
-pmap
-pop
-pop!
-pop-thread-bindings
-pos?
-pr
-pr-str
-prefer-method
-prefers
-print
-print-namespace-doc
-print-str
-printf
-println
-println-str
-prn
-prn-str
-promise
-proxy
-proxy-mappings
-proxy-super
-push-thread-bindings
-pvalues
-quot
-rand
-rand-int
-range
-ratio?
-rationalize
-re-find
-re-groups
-re-matcher
-re-matches
-re-pattern
-re-seq
-read
-read-line
-read-string
-reduce
-ref
-ref-history-count
-ref-max-history
-ref-min-history
-ref-set
-refer
-refer-clojure
-reify
-release-pending-sends
-rem
-remove
-remove-method
-remove-ns
-remove-watch
-repeat
-repeatedly
-replace
-replicate
-require
-reset!
-reset-meta!
-resolve
-rest
-restart-agent
-resultset-seq
-reverse
-reversible?
-rseq
-rsubseq
-satisfies?
-second
-select-keys
-send
-send-off
-seq
-seq?
-seque
-sequence
-sequential?
-set
-set-error-handler!
-set-error-mode!
-set-validator!
-set?
-short
-short-array
-shorts
-shutdown-agents
-slurp
-some
-sort
-sort-by
-sorted-map
-sorted-map-by
-sorted-set
-sorted-set-by
-sorted?
-special-form-anchor
-special-symbol?
-split-at
-split-with
-str
-stream?
-string?
-struct
-struct-map
-subs
-subseq
-subvec
-supers
-swap!
-symbol
-symbol?
-sync
-syntax-symbol-anchor
-take
-take-last
-take-nth
-take-while
-test
-the-ns
-time
-to-array
-to-array-2d
-trampoline
-transient
-tree-seq
-true?
-type
-unchecked-add
-unchecked-dec
-unchecked-divide
-unchecked-inc
-unchecked-multiply
-unchecked-negate
-unchecked-remainder
-unchecked-subtract
-underive
-update-in
-update-proxy
-use
-val
-vals
-var-get
-var-set
-var?
-vary-meta
-vec
-vector
-vector-of
-vector?
-when
-when-first
-when-let
-when-not
-while
-with-bindings
-with-bindings*
-with-in-str
-with-local-vars
-with-meta
-with-open
-with-out-str
-with-precision
-xml-seq
-zero?
-zipmap
\ No newline at end of file
diff --git a/elpa/auto-complete-1.4/dict/clojurescript-mode b/elpa/auto-complete-1.4/dict/clojurescript-mode
deleted file mode 100644
index 16348edb6..000000000
--- a/elpa/auto-complete-1.4/dict/clojurescript-mode
+++ /dev/null
@@ -1,475 +0,0 @@
-*agent*
-*clojure-version*
-*command-line-args*
-*compile-files*
-*compile-path*
-*err*
-*file*
-*flush-on-newline*
-*in*
-*ns*
-*out*
-*print-dup*
-*print-length*
-*print-level*
-*print-meta*
-*print-readably*
-*read-eval*
-*warn-on-reflection*
-accessor
-aclone
-add-classpath
-add-watch
-agent
-agent-error
-agent-errors
-aget
-alength
-alias
-all-ns
-alter
-alter-meta!
-alter-var-root
-amap
-ancestors
-and
-apply
-areduce
-array-map
-aset
-aset-boolean
-aset-byte
-aset-char
-aset-double
-aset-float
-aset-int
-aset-long
-aset-short
-assert
-assoc
-assoc!
-assoc-in
-associative?
-atom
-await
-await-for
-bases
-bean
-bigdec
-bigint
-binding
-bit-and
-bit-and-not
-bit-clear
-bit-flip
-bit-not
-bit-or
-bit-set
-bit-shift-left
-bit-shift-right
-bit-test
-bit-xor
-boolean
-boolean-array
-booleans
-bound-fn
-bound-fn*
-butlast
-byte
-byte-array
-bytes
-case
-cast
-char
-char-array
-char-escape-string
-char-name-string
-char?
-chars
-class
-class?
-clear-agent-errors
-clojure-version
-coll?
-comment
-commute
-comp
-comparator
-compare
-compare-and-set!
-compile
-complement
-concat
-cond
-condp
-conj
-conj!
-cons
-constantly
-construct-proxy
-contains?
-count
-counted?
-create-ns
-create-struct
-cycle
-dec
-decimal?
-declare
-definline
-defmacro
-defmethod
-defmulti
-defn
-defn-
-defonce
-defprotocol
-defstruct
-deftype
-delay
-delay?
-deliver
-deref
-derive
-descendants
-disj
-disj!
-dissoc
-dissoc!
-distinct
-distinct?
-doall
-doc
-dorun
-doseq
-dosync
-dotimes
-doto
-double
-double-array
-doubles
-drop
-drop-last
-drop-while
-dtype
-empty
-empty?
-ensure
-enumeration-seq
-error-handler
-error-mode
-eval
-even?
-every?
-extend
-extend-class
-extend-protocol
-extend-type
-extenders
-extends?
-false?
-ffirst
-file-seq
-filter
-find
-find-doc
-find-ns
-find-var
-first
-float
-float-array
-float?
-floats
-flush
-fn
-fn?
-fnext
-for
-force
-format
-future
-future-call
-future-cancel
-future-cancelled?
-future-done?
-future?
-gen-class
-gen-interface
-gensym
-get
-get-in
-get-method
-get-proxy-class
-get-thread-bindings
-get-validator
-hash
-hash-map
-hash-set
-identical?
-identity
-if-let
-if-not
-ifn?
-import
-in-ns
-inc
-init-proxy
-instance?
-int
-int-array
-integer?
-interleave
-intern
-interpose
-into
-into-array
-ints
-io!
-isa?
-iterate
-iterator-seq
-juxt
-key
-keys
-keyword
-keyword?
-last
-lazy-cat
-lazy-seq
-let
-letfn
-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?
-mapcat
-max
-max-key
-memfn
-memoize
-merge
-merge-with
-meta
-methods
-min
-min-key
-mod
-name
-namespace
-neg?
-newline
-next
-nfirst
-nil?
-nnext
-not
-not-any?
-not-empty
-not-every?
-not=
-ns
-ns-aliases
-ns-imports
-ns-interns
-ns-map
-ns-name
-ns-publics
-ns-refers
-ns-resolve
-ns-unalias
-ns-unmap
-nth
-nthnext
-num
-number?
-object-array
-odd?
-or
-parents
-partial
-partition
-pcalls
-peek
-persistent!
-pmap
-pop
-pop!
-pop-thread-bindings
-pos?
-pr
-pr-str
-prefer-method
-prefers
-print
-print-namespace-doc
-print-str
-printf
-println
-println-str
-prn
-prn-str
-promise
-proxy
-proxy-mappings
-proxy-super
-push-thread-bindings
-pvalues
-quot
-rand
-rand-int
-range
-ratio?
-rationalize
-re-find
-re-groups
-re-matcher
-re-matches
-re-pattern
-re-seq
-read
-read-line
-read-string
-reduce
-ref
-ref-history-count
-ref-max-history
-ref-min-history
-ref-set
-refer
-refer-clojure
-reify
-release-pending-sends
-rem
-remove
-remove-method
-remove-ns
-remove-watch
-repeat
-repeatedly
-replace
-replicate
-require
-reset!
-reset-meta!
-resolve
-rest
-restart-agent
-resultset-seq
-reverse
-reversible?
-rseq
-rsubseq
-satisfies?
-second
-select-keys
-send
-send-off
-seq
-seq?
-seque
-sequence
-sequential?
-set
-set-error-handler!
-set-error-mode!
-set-validator!
-set?
-short
-short-array
-shorts
-shutdown-agents
-slurp
-some
-sort
-sort-by
-sorted-map
-sorted-map-by
-sorted-set
-sorted-set-by
-sorted?
-special-form-anchor
-special-symbol?
-split-at
-split-with
-str
-stream?
-string?
-struct
-struct-map
-subs
-subseq
-subvec
-supers
-swap!
-symbol
-symbol?
-sync
-syntax-symbol-anchor
-take
-take-last
-take-nth
-take-while
-test
-the-ns
-time
-to-array
-to-array-2d
-trampoline
-transient
-tree-seq
-true?
-type
-unchecked-add
-unchecked-dec
-unchecked-divide
-unchecked-inc
-unchecked-multiply
-unchecked-negate
-unchecked-remainder
-unchecked-subtract
-underive
-update-in
-update-proxy
-use
-val
-vals
-var-get
-var-set
-var?
-vary-meta
-vec
-vector
-vector-of
-vector?
-when
-when-first
-when-let
-when-not
-while
-with-bindings
-with-bindings*
-with-in-str
-with-local-vars
-with-meta
-with-open
-with-out-str
-with-precision
-xml-seq
-zero?
-zipmap
\ No newline at end of file
diff --git a/elpa/auto-complete-1.4/dict/coq-mode b/elpa/auto-complete-1.4/dict/coq-mode
deleted file mode 100644
index 219448faa..000000000
--- a/elpa/auto-complete-1.4/dict/coq-mode
+++ /dev/null
@@ -1,278 +0,0 @@
-# Generated by the following form.
-# (loop for regexp in (append
-#                      coq-solve-tactics
-#                      coq-keywords
-#                      coq-reserved
-#                      coq-tactics
-#                      coq-tacticals
-#                      (list "Set" "Type" "Prop"))
-#       append (split-string regexp (regexp-quote "\\s-+")) into words
-#       finally (loop initially (goto-char (point-max))
-#                     for word in (delete-dups (sort words 'string<))
-#                     do (insert word) (newline)))
-
-Abort
-About
-Abstract
-Add
-Admit
-Admitted
-All
-Arguments
-AutoInline
-Axiom
-Bind
-Canonical
-Cd
-Chapter
-Check
-Close
-CoFixpoint
-CoInductive
-Coercion
-Coercions
-Comments
-Conjecture
-Constant
-Constructors
-Corollary
-Declare
-Defined
-Definition
-Delimit
-Dependent
-Depth
-Derive
-End
-Eval
-Export
-Extern
-Extract
-Extraction
-Fact
-False
-Field
-File
-Fixpoint
-Focus
-Function
-Functional
-Goal
-Hint
-Hypotheses
-Hypothesis
-Hyps
-Identity
-If
-Immediate
-Implicit
-Import
-Inductive
-Infix
-Inline
-Inlined
-Inspect
-Inversion
-Language
-Lemma
-Let
-Library
-Limit
-LoadPath
-Local
-Locate
-Ltac
-ML
-Module
-Morphism
-Next Obligation
-NoInline
-Notation
-Notations
-Obligation
-Obligations
-Off
-On
-Opaque
-Open
-Optimize
-Parameter
-Parameters
-Path
-Print
-Printing
-Program
-Proof
-Prop
-Pwd
-Qed
-Rec
-Record
-Recursive
-Remark
-Remove
-Require
-Reserved
-Reset
-Resolve
-Rewrite
-Ring
-Save
-Scheme
-Scope
-Search
-SearchAbout
-SearchPattern
-SearchRewrite
-Section
-Semi
-Set
-Setoid
-Show
-Solve
-Sort
-Strict
-Structure
-Synth
-Tactic
-Test
-Theorem
-Time
-Transparent
-True
-Type
-Undo
-Unfocus
-Unfold
-Unset
-Variable
-Variables
-Width
-Wildcard
-abstract
-absurd
-after
-apply
-as
-assert
-assumption
-at
-auto
-autorewrite
-beta
-by
-case
-cbv
-change
-clear
-clearbody
-cofix
-coinduction
-compare
-compute
-congruence
-constructor
-contradiction
-cut
-cutrewrite
-decide
-decompose
-delta
-dependent
-dest
-destruct
-discrR
-discriminate
-do
-double
-eapply
-eauto
-econstructor
-eexists
-eleft
-elim
-else
-end
-equality
-esplit
-exact
-exists
-fail
-field
-first
-firstorder
-fix
-fold
-forall
-fourier
-fun
-functional
-generalize
-hnf
-idtac
-if
-in
-induction
-info
-injection
-instantiate
-into
-intro
-intros
-intuition
-inversion
-inversion_clear
-iota
-lapply
-lazy
-left
-let
-linear
-load
-match
-move
-omega
-pattern
-pose
-progress
-prolog
-quote
-record
-red
-refine
-reflexivity
-rename
-repeat
-replace
-return
-rewrite
-right
-ring
-set
-setoid
-setoid_replace
-setoid_rewrite
-simpl
-simple
-simplify_eq
-solve
-specialize
-split
-split_Rabs
-split_Rmult
-stepl
-stepr
-struct
-subst
-sum
-symmetry
-tauto
-then
-transitivity
-trivial
-try
-unfold
-until
-using
-with
-zeta
diff --git a/elpa/auto-complete-1.4/dict/css-mode b/elpa/auto-complete-1.4/dict/css-mode
deleted file mode 100644
index 4ec8f7dc4..000000000
--- a/elpa/auto-complete-1.4/dict/css-mode
+++ /dev/null
@@ -1,747 +0,0 @@
-!important
-ActiveBorder
-ActiveCaption
-Alpha
-AppWorkspace
-Background
-Barn
-BasicImage
-Blinds
-Blur
-ButtonFace
-ButtonHighlight
-ButtonShadow
-ButtonText
-CaptionText
-CheckerBoard
-Chroma
-Compositor
-CradientWipe
-DXImageTransform
-DropShadow
-Emboss
-Engrave
-Fade
-FlipH
-FlipV
-Glow
-Gray
-GrayText
-Highlight
-HighlightText
-Hz
-ICMFilter
-InactiveBorder
-InactiveCaption
-InactiveCaptionText
-InfoBackground
-InfoText
-Inset
-Invert
-Iris
-Light
-MaskFilter
-Matrix
-Menu
-MenuText
-Microsoft
-MotionBlur
-Pixelate
-RadialWipe
-RandomBars
-RandomDissolve
-RevealTrans
-Scrollbar
-Shadow
-Slide
-Spiral
-Stretch
-Strips
-ThreeDDarkShadow
-ThreeDFace
-ThreeDHighlight
-ThreeDLightShadow
-ThreeDShadow
-Wave
-Wheel
-Window
-WindowFrame
-WindowText
-Xray
-Zigzag
-_azimuth
-_background
-_background-position-x
-_background-position-y
-_border
-_bottom
-_caption
-_clear
-_clip
-_color
-_content
-_counter
-_cue
-_cursor
-_direction
-_display
-_elevation
-_empty
-_filter
-_filter:progid:DXImageTransform.Microsoft
-_float
-_font
-_height
-_ime
-_ime-mode
-_layout
-_layout-flow
-_layout-grid
-_layout-grid-char
-_layout-grid-line
-_layout-grid-mode
-_layout-grid-type
-_left
-_letter
-_line
-_line-break
-_list
-_margin
-_orphans
-_outline
-_overflow
-_overflow-x
-_overflow-y
-_padding
-_page
-_pause
-_pitch
-_play
-_position
-_quotes
-_richness
-_right
-_ruby
-_ruby-align
-_ruby-overhang
-_ruby-position
-_scrollbar
-_scrollbar-3dlight-color
-_scrollbar-arrow-color
-_scrollbar-base-color
-_scrollbar-darkshadow-color
-_scrollbar-face-color
-_scrollbar-highlight-color
-_scrollbar-track-color
-_speak
-_speech
-_stress
-_table
-_text
-_text-align-last
-_text-autospace
-_text-justify
-_text-kashida-space
-_text-overflow
-_text-underline-position
-_top
-_unicode
-_vertical
-_visibility
-_voice
-_volume
-_white
-_widows
-_width
-_word
-_word-break
-_word-wrap
-_writing
-_writing-mode
-_z
-_zoom
-above
-active
-adjust
-after
-aliceblue
-align
-always
-antiquewhite
-aqua
-aquamarine
-armenian
-arrow
-attachment
-auto
-autospace
-avoid
-azimuth
-azure
-background
-background-attachment
-background-color
-background-image
-background-position
-background-repeat
-bar
-base
-baseline
-before
-behind
-beige
-below
-bidi
-bidi-override
-bisque
-black
-blanchedalmond
-blink
-block
-blue
-blueviolet
-bold
-bolder
-border
-border-bottom
-border-bottom-color
-border-bottom-style
-border-bottom-width
-border-collapse
-border-color
-border-left
-border-left-color
-border-left-style
-border-left-width
-border-right
-border-right-color
-border-right-style
-border-right-width
-border-spacing
-border-style
-border-top
-border-top-color
-border-top-style
-border-top-width
-border-width
-both
-bottom
-box
-break
-brown
-burlwood
-cadetblue
-capitalize
-caps
-caption
-caption-side
-cell
-cells
-center
-center-left
-center-right
-char
-chartreuse
-chocolate
-circle
-cjk
-cjk-ideographic
-clear
-clip
-close
-close-quote
-cm
-code
-collapse
-color
-column
-compact
-condensed
-content
-continuous
-coral
-cornflowerblue
-cornsilk
-counter
-counter-increment
-counter-reset
-crimson
-crop
-cross
-crosshair
-cue
-cue-after
-cue-before
-cursive
-cursor
-cyan
-darkblue
-darkcyan
-darkgoldenrod
-darkgray
-darkgreen
-darkkhaki
-darkmagenta
-darkolivegreen
-darkorange
-darkorchid
-darkred
-darksalmon
-darkseagreen
-darkshadow
-darkslateblue
-darkslategray
-darkturquoise
-darkviolet
-dashed
-decimal
-decimal-leading-zero
-decoration
-deeppink
-deepskyblue
-default
-deg
-digits
-dimgray
-direction
-disc
-display
-dodgerblue
-dotted
-double
-during
-e
-e-resize
-elevation
-em
-embed
-empty
-empty-cells
-ex
-expanded
-extra
-extra-condensed
-extra-expanded
-face
-family
-fantasy
-far
-far-left
-far-right
-fast
-faster
-firebrick
-first
-first-child
-first-letter
-first-line
-fixed
-float
-floralwhite
-flow
-focus
-font
-font-family
-font-size
-font-size-adjust
-font-stretch
-font-style
-font-variant
-font-weight
-footer
-forestgreen
-fuchsia
-gainsboro
-georgian
-ghostwhite
-gold
-goldenrod
-gray
-greek
-green
-greenyellow
-grid
-groove
-group
-header
-hebrew
-height
-help
-hidden
-hide
-high
-higher
-hiragana
-hiragana-iroha
-honeydew
-hotpink
-hover
-icon
-ideographic
-image
-in
-increment
-indent
-index
-indianred
-indigo
-inherit
-inline
-inline-block
-inline-table
-inset
-inside
-iroha
-italic
-item
-ivory
-justify
-kHz
-kashida
-katakana
-katakana-iroha
-khaki
-landscape
-lang()
-large
-larger
-last
-latin
-lavender
-lavenderblush
-lawngreen
-layout
-leading
-left
-left-side
-leftwards
-lenonchiffon
-letter
-letter-spacing
-level
-lightblue
-lightcoral
-lightcyan
-lighter
-lightgoldenrodyellow
-lightgray
-lightgreen
-lightgrey
-lightpink
-lightsalmon
-lightseagreen
-lightskyblue
-lightslategray
-lightsteelblue
-lightyellow
-lime
-limegreen
-line
-line-height
-line-through
-linen
-link
-list
-list-item
-list-style
-list-style-image
-list-style-position
-list-style-type
-loud
-low
-lower
-lower-alpha
-lower-greek
-lower-latin
-lower-roman
-lowercase
-ltr
-magenta
-margin
-margin-bottom
-margin-left
-margin-right
-margin-top
-marker
-marker-offset
-marks
-maroon
-max
-max-height
-max-width
-medium
-mediumaquamarine
-mediumblue
-mediumorchid
-mediumpurple
-mediumseagreen
-mediumslateblue
-mediumspringgreen
-mediumturquoise
-mediumvioletred
-menu
-message
-message-box
-middle
-midnightblue
-min
-min-height
-min-width
-mintcream
-mistyrose
-mix
-mm
-moccasin
-mode
-monospace
-move
-ms
-n
-n-resize
-naby
-narrower
-navajowhite
-ne
-ne-resize
-no
-no-close-quote
-no-open-quote
-no-repeat
-none
-normal
-nowrap
-number
-numeral
-nw
-nw-resize
-oblique
-offset
-oldlace
-olive
-olivedrab
-once
-open
-open-quote
-orange
-orangered
-orchid
-orphans
-out
-outline
-outline-color
-outline-style
-outline-width
-outset
-outside
-overflow
-overhang
-overline
-override
-padding
-padding-bottom
-padding-left
-padding-right
-padding-top
-page
-page-break-after
-page-break-before
-page-break-inside
-palegoldenrod
-palegreen
-paleturquoise
-palevioletred
-papayawhip
-pause
-pause-after
-pause-before
-pc
-peachpuff
-peru
-pink
-pitch
-pitch-range
-play
-play-during
-plum
-pointer
-portarait
-position
-powderblue
-pre
-pre-line
-pre-wrap
-progid
-progress
-pt
-punctuation
-purple
-px
-quote
-quotes
-rad
-range
-rate
-red
-relative
-repeat
-repeat-x
-repeat-y
-reset
-resize
-richness
-ridge
-right
-right-side
-rightwards
-roman
-rosybrown
-row
-royalblue
-rtl
-run
-run-in
-s
-s-resize
-saddlebrown
-salmon
-sandybrown
-sans-serif
-scroll
-se
-se-resize
-seagreen
-seashell
-semi
-semi-condensed
-semi-expanded
-separate
-serif
-shadow
-show
-side
-sienna
-silent
-silever
-silver
-size
-skyblue
-slateblue
-slategray
-slow
-slower
-small
-small-caps
-small-caption
-smaller
-snow
-soft
-solid
-space
-spacing
-speak
-speak-header
-speak-numeral
-speak-punctuation
-specific
-specific-voice
-speech
-speech-rate
-spell
-spell-out
-springgreen
-square
-static
-status
-status-bar
-steelblue
-stress
-stretch
-style
-sub
-super
-sw
-sw-resize
-table
-table-caption
-table-cell
-table-column
-table-column-group
-table-footer-group
-table-header-group
-table-layout
-table-row
-table-row-group
-tan
-teal
-text
-text-align
-text-bottom
-text-decoration
-text-indent
-text-shadow
-text-top
-text-transform
-thick
-thin
-thistle
-through
-tomato
-top
-track
-transform
-transparent
-turquoise
-type
-ultra
-ultra-condensed
-ultra-expanded
-underline
-unicode
-unicode-bidi
-upper
-upper-alpha
-upper-latin
-upper-roman
-uppercase
-variant
-vertical
-vertical-align
-violet
-visibility
-visible
-visited
-voice
-voice-family
-volume
-w
-w-resize
-wait
-weight
-wheat
-white
-white-space
-whitesmoke
-wider
-widows
-width
-word
-word-spacing
-wrap
-x
-x-fast
-x-high
-x-large
-x-loud
-x-low
-x-slow
-x-small
-x-soft
-xx
-xx-large
-xx-small
-y
-yellow
-yellowgreen
-z
-z-index
-zero
diff --git a/elpa/auto-complete-1.4/dict/erlang-mode b/elpa/auto-complete-1.4/dict/erlang-mode
deleted file mode 100644
index 960f2b837..000000000
--- a/elpa/auto-complete-1.4/dict/erlang-mode
+++ /dev/null
@@ -1,216 +0,0 @@
-after
-begin
-catch
-case
-cond
-end
-fun
-if
-let
-of
-query
-receive
-try
-when
-and
-andalso
-band
-bnot
-bor
-bsl
-bsr
-bxor
-div
-not
-or
-orelse
-rem
-xor
-is_atom
-is_binary
-is_bitstring
-is_boolean
-is_float
-is_function
-is_integer
-is_list
-is_number
-is_pid
-is_port
-is_record
-is_reference
-is_tuple
-atom
-binary
-bitstring
-boolean
-function
-integer
-list
-number
-pid
-port
-record
-reference
-tuple
-abs
-adler32
-adler32_combine
-alive
-apply
-atom_to_binary
-atom_to_list
-binary_to_atom
-binary_to_existing_atom
-binary_to_list
-binary_to_term
-bit_size
-bitstring_to_list
-byte_size
-check_process_code
-contact_binary
-crc32
-crc32_combine
-date
-decode_packet
-delete_module
-disconnect_node
-element
-erase
-exit
-float
-float_to_list
-garbage_collect
-get
-get_keys
-group_leader
-halt
-hd
-integer_to_list
-internal_bif
-iolist_size
-iolist_to_binary
-is_alive
-is_atom
-is_binary
-is_bitstring
-is_boolean
-is_float
-is_function
-is_integer
-is_list
-is_number
-is_pid
-is_port
-is_process_alive
-is_record
-is_reference
-is_tuple
-length
-link
-list_to_atom
-list_to_binary
-list_to_bitstring
-list_to_existing_atom
-list_to_float
-list_to_integer
-list_to_pid
-list_to_tuple
-load_module
-make_ref
-module_loaded
-monitor_node
-node
-node_link
-node_unlink
-nodes
-notalive
-now
-open_port
-pid_to_list
-port_close
-port_command
-port_connect
-port_control
-pre_loaded
-process_flag
-process_info
-processes
-purge_module
-put
-register
-registered
-round
-self
-setelement
-size
-spawn
-spawn_link
-spawn_monitor
-spawn_opt
-split_binary
-statistics
-term_to_binary
-time
-throw
-tl
-trunc
-tuple_size
-tuple_to_list
-unlink
-unregister
-whereis
-append_element
-bump_reductions
-cancel_timer
-demonitor
-display
-fun_info
-fun_to_list
-function_exported
-get_cookie
-get_stacktrace
-hash
-integer_to_list
-is_builtin
-list_to_integer
-loaded
-localtime
-localtime_to_universaltime
-make_tuple
-max
-md5
-md5_final
-md5_init
-md5_update
-memory
-min
-monitor
-monitor_node
-phash
-phash2
-port_call
-port_info
-port_to_list
-ports
-process_display
-read_timer
-ref_to_list
-resume_process
-send
-send_after
-send_nosuspend
-set_cookie
-start_timer
-suspend_process
-system_flag
-system_info
-system_monitor
-system_profile
-trace
-trace_delivered
-trace_info
-trace_pattern
-universaltime
-universaltime_to_localtime
-yield
diff --git a/elpa/auto-complete-1.4/dict/java-mode b/elpa/auto-complete-1.4/dict/java-mode
deleted file mode 100644
index 8ed3d04df..000000000
--- a/elpa/auto-complete-1.4/dict/java-mode
+++ /dev/null
@@ -1,50 +0,0 @@
-abstract
-assert
-boolean
-break
-byte
-case
-catch
-char
-class
-const
-continue
-default
-do
-double
-else
-enum
-extends
-final
-finally
-float
-for
-goto
-if
-implements
-import
-instanceof
-int
-interface
-long
-native
-new
-package
-private
-protected
-public
-return
-short
-static
-strictfp
-super
-switch
-synchronized
-this
-throw
-throws
-transient
-try
-void
-volatile
-while
diff --git a/elpa/auto-complete-1.4/dict/javascript-mode b/elpa/auto-complete-1.4/dict/javascript-mode
deleted file mode 100644
index 3d83f8439..000000000
--- a/elpa/auto-complete-1.4/dict/javascript-mode
+++ /dev/null
@@ -1,148 +0,0 @@
-Anchor
-Area
-Array
-Boolean
-Button
-Checkbox
-Date
-Document
-Element
-FileUpload
-Form
-Frame
-Function
-Hidden
-History
-Image
-Infinity
-JavaArray
-JavaClass
-JavaObject
-JavaPackage
-Link
-Location
-Math
-MimeType
-NaN
-Navigator
-Number
-Object
-Option
-Packages
-Password
-Plugin
-Radio
-RegExp
-Reset
-Select
-String
-Submit
-Text
-Textarea
-Window
-alert
-arguments
-assign
-blur
-break
-callee
-caller
-captureEvents
-case
-clearInterval
-clearTimeout
-close
-closed
-comment
-confirm
-constructor
-continue
-default
-defaultStatus
-delete
-do
-document
-else
-escape
-eval
-export
-find
-focus
-for
-frames
-function
-getClass
-history
-home
-if
-import
-in
-innerHeight
-innerWidth
-isFinite
-isNan
-java
-label
-length
-location
-locationbar
-menubar
-moveBy
-moveTo
-name
-navigate
-navigator
-netscape
-new
-onBlur
-onError
-onFocus
-onLoad
-onUnload
-open
-opener
-outerHeight
-outerWidth
-pageXoffset
-pageYoffset
-parent
-parseFloat
-parseInt
-personalbar
-print
-prompt
-prototype
-ref
-releaseEvents
-resizeBy
-resizeTo
-return
-routeEvent
-scroll
-scrollBy
-scrollTo
-scrollbars
-self
-setInterval
-setTimeout
-status
-statusbar
-stop
-sun
-switch
-taint
-this
-toString
-toolbar
-top
-typeof
-unescape
-untaint
-unwatch
-valueOf
-var
-void
-watch
-while
-window
-with
diff --git a/elpa/auto-complete-1.4/dict/lua-mode b/elpa/auto-complete-1.4/dict/lua-mode
deleted file mode 100644
index d0de6a4d7..000000000
--- a/elpa/auto-complete-1.4/dict/lua-mode
+++ /dev/null
@@ -1,21 +0,0 @@
-and
-break
-do
-else
-elseif
-end
-false
-for
-function
-if
-in
-local
-nil
-not
-or
-repeat
-return
-then
-true
-until
-while
diff --git a/elpa/auto-complete-1.4/dict/php-mode b/elpa/auto-complete-1.4/dict/php-mode
deleted file mode 100644
index 5a27b7118..000000000
--- a/elpa/auto-complete-1.4/dict/php-mode
+++ /dev/null
@@ -1,5983 +0,0 @@
-abs
-acos
-acosh
-addcslashes
-addslashes
-aggregate
-aggregate_info
-aggregate_methods
-aggregate_methods_by_list
-aggregate_methods_by_regexp
-aggregate_properties
-aggregate_properties_by_list
-aggregate_properties_by_regexp
-aggregation_info
-amqpconnection
-amqpexchange
-amqpqueue
-and
-apache_child_terminate
-apache_getenv
-apache_get_modules
-apache_get_version
-apache_lookup_uri
-apache_note
-apache_request_headers
-apache_reset_timeout
-apache_response_headers
-apache_setenv
-apc_add
-apc_bin_dump
-apc_bin_dumpfile
-apc_bin_load
-apc_bin_loadfile
-apc_cache_info
-apc_cas
-apc_clear_cache
-apc_compile_file
-apc_dec
-apc_define_constants
-apc_delete
-apc_delete_file
-apc_exists
-apc_fetch
-apc_inc
-apciterator
-apc_load_constants
-apc_sma_info
-apc_store
-apd_breakpoint
-apd_callstack
-apd_clunk
-apd_continue
-apd_croak
-apd_dump_function_table
-apd_dump_persistent_resources
-apd_dump_regular_resources
-apd_echo
-apd_get_active_symbols
-apd_set_pprof_trace
-apd_set_session
-apd_set_session_trace
-apd_set_session_trace_socket
-appenditerator
-array
-arrayaccess
-array_change_key_case
-array_chunk
-array_combine
-array_count_values
-array_diff
-array_diff_assoc
-array_diff_key
-array_diff_uassoc
-array_diff_ukey
-array_fill
-array_fill_keys
-array_filter
-array_flip
-array_intersect
-array_intersect_assoc
-array_intersect_key
-array_intersect_uassoc
-array_intersect_ukey
-arrayiterator
-array_key_exists
-array_keys
-array_map
-array_merge
-array_merge_recursive
-array_multisort
-arrayobject
-array_pad
-array_pop
-array_product
-array_push
-array_rand
-array_reduce
-array_replace
-array_replace_recursive
-array_reverse
-array_search
-array_shift
-array_slice
-array_splice
-array_sum
-array_udiff
-array_udiff_assoc
-array_udiff_uassoc
-array_uintersect
-array_uintersect_assoc
-array_uintersect_uassoc
-array_unique
-array_unshift
-array_values
-array_walk
-array_walk_recursive
-arsort
-as
-asin
-asinh
-asort
-assert
-assert_options
-atan
-atan2
-atanh
-badfunctioncallexception
-badmethodcallexception
-base64_decode
-base64_encode
-base_convert
-basename
-bbcode_add_element
-bbcode_add_smiley
-bbcode_create
-bbcode_destroy
-bbcode_parse
-bbcode_set_arg_parser
-bbcode_set_flags
-bcadd
-bccomp
-bcdiv
-bcmod
-bcmul
-bcompiler_load
-bcompiler_load_exe
-bcompiler_parse_class
-bcompiler_read
-bcompiler_write_class
-bcompiler_write_constant
-bcompiler_write_exe_footer
-bcompiler_write_file
-bcompiler_write_footer
-bcompiler_write_function
-bcompiler_write_functions_from_file
-bcompiler_write_header
-bcompiler_write_included_filename
-bcpow
-bcpowmod
-bcscale
-bcsqrt
-bcsub
-bin2hex
-bindec
-bindtextdomain
-bind_textdomain_codeset
-break
-bson_decode
-bson_encode
-bumpValue
-bzclose
-bzcompress
-bzdecompress
-bzerrno
-bzerror
-bzerrstr
-bzflush
-bzopen
-bzread
-bzwrite
-cachingiterator
-cairo
-cairoantialias
-cairocontent
-cairocontext
-cairo_create
-cairoexception
-cairoextend
-cairofillrule
-cairofilter
-cairofontface
-cairo_font_face_get_type
-cairo_font_face_status
-cairofontoptions
-cairo_font_options_create
-cairo_font_options_equal
-cairo_font_options_get_antialias
-cairo_font_options_get_hint_metrics
-cairo_font_options_get_hint_style
-cairo_font_options_get_subpixel_order
-cairo_font_options_hash
-cairo_font_options_merge
-cairo_font_options_set_antialias
-cairo_font_options_set_hint_metrics
-cairo_font_options_set_hint_style
-cairo_font_options_set_subpixel_order
-cairo_font_options_status
-cairofontslant
-cairofonttype
-cairofontweight
-cairoformat
-cairo_format_stride_for_width
-cairogradientpattern
-cairohintmetrics
-cairohintstyle
-cairoimagesurface
-cairo_image_surface_create
-cairo_image_surface_create_for_data
-cairo_image_surface_create_from_png
-cairo_image_surface_get_data
-cairo_image_surface_get_format
-cairo_image_surface_get_height
-cairo_image_surface_get_stride
-cairo_image_surface_get_width
-cairolineargradient
-cairolinecap
-cairolinejoin
-cairomatrix
-cairo_matrix_create_scale
-cairo_matrix_create_translate
-cairo_matrix_invert
-cairo_matrix_multiply
-cairo_matrix_rotate
-cairo_matrix_transform_distance
-cairo_matrix_transform_point
-cairo_matrix_translate
-cairooperator
-cairopath
-cairopattern
-cairo_pattern_add_color_stop_rgb
-cairo_pattern_add_color_stop_rgba
-cairo_pattern_create_for_surface
-cairo_pattern_create_linear
-cairo_pattern_create_radial
-cairo_pattern_create_rgb
-cairo_pattern_create_rgba
-cairo_pattern_get_color_stop_count
-cairo_pattern_get_color_stop_rgba
-cairo_pattern_get_extend
-cairo_pattern_get_filter
-cairo_pattern_get_linear_points
-cairo_pattern_get_matrix
-cairo_pattern_get_radial_circles
-cairo_pattern_get_rgba
-cairo_pattern_get_surface
-cairo_pattern_get_type
-cairo_pattern_set_extend
-cairo_pattern_set_filter
-cairo_pattern_set_matrix
-cairo_pattern_status
-cairopatterntype
-cairopdfsurface
-cairo_pdf_surface_create
-cairo_pdf_surface_set_size
-cairo_ps_get_levels
-cairopslevel
-cairo_ps_level_to_string
-cairopssurface
-cairo_ps_surface_create
-cairo_ps_surface_dsc_begin_page_setup
-cairo_ps_surface_dsc_begin_setup
-cairo_ps_surface_dsc_comment
-cairo_ps_surface_get_eps
-cairo_ps_surface_restrict_to_level
-cairo_ps_surface_set_eps
-cairo_ps_surface_set_size
-cairoradialgradient
-cairoscaledfont
-cairo_scaled_font_create
-cairo_scaled_font_extents
-cairo_scaled_font_get_ctm
-cairo_scaled_font_get_font_face
-cairo_scaled_font_get_font_matrix
-cairo_scaled_font_get_font_options
-cairo_scaled_font_get_scale_matrix
-cairo_scaled_font_get_type
-cairo_scaled_font_glyph_extents
-cairo_scaled_font_status
-cairo_scaled_font_text_extents
-cairosolidpattern
-cairostatus
-cairosubpixelorder
-cairosurface
-cairo_surface_copy_page
-cairo_surface_create_similar
-cairo_surface_finish
-cairo_surface_flush
-cairo_surface_get_content
-cairo_surface_get_device_offset
-cairo_surface_get_font_options
-cairo_surface_get_type
-cairo_surface_mark_dirty
-cairo_surface_mark_dirty_rectangle
-cairosurfacepattern
-cairo_surface_set_device_offset
-cairo_surface_set_fallback_resolution
-cairo_surface_show_page
-cairo_surface_status
-cairosurfacetype
-cairo_surface_write_to_png
-cairosvgsurface
-cairo_svg_surface_create
-cairo_svg_surface_restrict_to_version
-cairosvgversion
-cairo_svg_version_to_string
-cairotoyfontface
-calculhmac
-calcul_hmac
-cal_days_in_month
-cal_from_jd
-cal_info
-__call()
-callbackfilteriterator
-__callStatic()
-call_user_func
-call_user_func_array
-call_user_method
-call_user_method_array
-cal_to_jd
-case
-catch
-ceil
-cfunction
-chdb
-chdb_create
-chdir
-checkdate
-checkdnsrr
-chgrp
-chmod
-chop
-chown
-chr
-chroot
-chunk_split
-class
-__CLASS__
-class_alias
-class_exists
-class_implements
-classkit_import
-classkit_method_add
-classkit_method_copy
-classkit_method_redefine
-classkit_method_remove
-classkit_method_rename
-class_parents
-clearstatcache
-clone
-__clone()
-closedir
-closelog
-collator
-com
-com_addref
-com_create_guid
-com_event_sink
-com_get
-com_get_active_object
-com_invoke
-com_isenum
-com_load
-com_load_typelib
-com_message_pump
-compact
-com_print_typeinfo
-com_propget
-com_propput
-com_propset
-com_release
-com_set
-connection_aborted
-connection_status
-connection_timeout
-const
-constant
-construct
-__construct()
-continue
-convert_cyr_string
-convert_uudecode
-convert_uuencode
-copy
-cos
-cosh
-count
-countable
-count_chars
-counter_bump
-counter_bump_value
-counter_create
-counter_get
-counter_get_meta
-counter_get_named
-counter_get_value
-counter_reset
-counter_reset_value
-crack_check
-crack_closedict
-crack_getlastmessage
-crack_opendict
-crc32
-create_function
-crypt
-ctype_alnum
-ctype_alpha
-ctype_cntrl
-ctype_digit
-ctype_graph
-ctype_lower
-ctype_print
-ctype_punct
-ctype_space
-ctype_upper
-ctype_xdigit
-cubrid_affected_rows
-cubrid_bind
-cubrid_client_encoding
-cubrid_close
-cubrid_close_prepare
-cubrid_close_request
-cubrid_col_get
-cubrid_col_size
-cubrid_column_names
-cubrid_column_types
-cubrid_commit
-cubrid_connect
-cubrid_connect_with_url
-cubrid_current_oid
-cubrid_data_seek
-cubrid_db_name
-cubrid_disconnect
-cubrid_drop
-cubrid_errno
-cubrid_error
-cubrid_error_code
-cubrid_error_code_facility
-cubrid_error_msg
-cubrid_execute
-cubrid_fetch
-cubrid_fetch_array
-cubrid_fetch_assoc
-cubrid_fetch_field
-cubrid_fetch_lengths
-cubrid_fetch_object
-cubrid_fetch_row
-cubrid_field_flags
-cubrid_field_len
-cubrid_field_name
-cubrid_field_seek
-cubrid_field_table
-cubrid_field_type
-cubrid_free_result
-cubrid_get
-cubrid_get_autocommit
-cubrid_get_charset
-cubrid_get_class_name
-cubrid_get_client_info
-cubrid_get_db_parameter
-cubrid_get_server_info
-cubrid_insert_id
-cubrid_is_instance
-cubrid_list_dbs
-cubrid_load_from_glo
-cubrid_lob_close
-cubrid_lob_export
-cubrid_lob_get
-cubrid_lob_send
-cubrid_lob_size
-cubrid_lock_read
-cubrid_lock_write
-cubrid_move_cursor
-cubrid_new_glo
-cubrid_next_result
-cubrid_num_cols
-cubrid_num_fields
-cubrid_num_rows
-cubrid_ping
-cubrid_prepare
-cubrid_put
-cubrid_query
-cubrid_real_escape_string
-cubrid_result
-cubrid_rollback
-cubrid_save_to_glo
-cubrid_schema
-cubrid_send_glo
-cubrid_seq_drop
-cubrid_seq_insert
-cubrid_seq_put
-cubrid_set_add
-cubrid_set_autocommit
-cubrid_set_db_parameter
-cubrid_set_drop
-cubrid_unbuffered_query
-cubrid_version
-curl_close
-curl_copy_handle
-curl_errno
-curl_error
-curl_exec
-curl_getinfo
-curl_init
-curl_multi_add_handle
-curl_multi_close
-curl_multi_exec
-curl_multi_getcontent
-curl_multi_info_read
-curl_multi_init
-curl_multi_remove_handle
-curl_multi_select
-curl_setopt
-curl_setopt_array
-curl_version
-current
-cyrus_authenticate
-cyrus_bind
-cyrus_close
-cyrus_connect
-cyrus_query
-cyrus_unbind
-date
-date_add
-date_create
-date_create_from_format
-date_date_set
-date_default_timezone_get
-date_default_timezone_set
-date_diff
-date_format
-date_get_last_errors
-dateinterval
-date_interval_create_from_date_string
-date_interval_format
-date_isodate_set
-date_modify
-date_offset_get
-date_parse
-date_parse_from_format
-dateperiod
-date_sub
-date_sun_info
-date_sunrise
-date_sunset
-datetime
-date_time_set
-date_timestamp_get
-date_timestamp_set
-datetimezone
-date_timezone_get
-date_timezone_set
-db2_autocommit
-db2_bind_param
-db2_client_info
-db2_close
-db2_column_privileges
-db2_columns
-db2_commit
-db2_connect
-db2_conn_error
-db2_conn_errormsg
-db2_cursor_type
-db2_escape_string
-db2_exec
-db2_execute
-db2_fetch_array
-db2_fetch_assoc
-db2_fetch_both
-db2_fetch_object
-db2_fetch_row
-db2_field_display_size
-db2_field_name
-db2_field_num
-db2_field_precision
-db2_field_scale
-db2_field_type
-db2_field_width
-db2_foreign_keys
-db2_free_result
-db2_free_stmt
-db2_get_option
-db2_last_insert_id
-db2_lob_read
-db2_next_result
-db2_num_fields
-db2_num_rows
-db2_pclose
-db2_pconnect
-db2_prepare
-db2_primary_keys
-db2_procedure_columns
-db2_procedures
-db2_result
-db2_rollback
-db2_server_info
-db2_set_option
-db2_special_columns
-db2_statistics
-db2_stmt_error
-db2_stmt_errormsg
-db2_table_privileges
-db2_tables
-dba_close
-dba_delete
-dba_exists
-dba_fetch
-dba_firstkey
-dba_handlers
-dba_insert
-dba_key_split
-dba_list
-dba_nextkey
-dba_open
-dba_optimize
-dba_popen
-dba_replace
-dbase_add_record
-dbase_close
-dbase_create
-dbase_delete_record
-dbase_get_header_info
-dbase_get_record
-dbase_get_record_with_names
-dbase_numfields
-dbase_numrecords
-dbase_open
-dbase_pack
-dbase_replace_record
-dba_sync
-dbplus_add
-dbplus_aql
-dbplus_chdir
-dbplus_close
-dbplus_curr
-dbplus_errcode
-dbplus_errno
-dbplus_find
-dbplus_first
-dbplus_flush
-dbplus_freealllocks
-dbplus_freelock
-dbplus_freerlocks
-dbplus_getlock
-dbplus_getunique
-dbplus_info
-dbplus_last
-dbplus_lockrel
-dbplus_next
-dbplus_open
-dbplus_prev
-dbplus_rchperm
-dbplus_rcreate
-dbplus_rcrtexact
-dbplus_rcrtlike
-dbplus_resolve
-dbplus_restorepos
-dbplus_rkeys
-dbplus_ropen
-dbplus_rquery
-dbplus_rrename
-dbplus_rsecindex
-dbplus_runlink
-dbplus_rzap
-dbplus_savepos
-dbplus_setindex
-dbplus_setindexbynumber
-dbplus_sql
-dbplus_tcl
-dbplus_tremove
-dbplus_undo
-dbplus_undoprepare
-dbplus_unlockrel
-dbplus_unselect
-dbplus_update
-dbplus_xlockrel
-dbplus_xunlockrel
-dbx_close
-dbx_compare
-dbx_connect
-dbx_error
-dbx_escape_string
-dbx_fetch_row
-dbx_query
-dbx_sort
-dcgettext
-dcngettext
-deaggregate
-debug_backtrace
-debug_print_backtrace
-debug_zval_dump
-decbin
-dechex
-declare
-decoct
-default
-define
-defined
-define_syslog_variables
-deg2rad
-delete
-__destruct()
-dgettext
-die
-dio_close
-dio_fcntl
-dio_open
-dio_read
-dio_seek
-dio_stat
-dio_tcsetattr
-dio_truncate
-dio_write
-dir
-__DIR__
-directoryiterator
-dirname
-diskfreespace
-disk_free_space
-disk_total_space
-dl
-dngettext
-dns_check_record
-dns_get_mx
-dns_get_record
-do
-domainexception
-domattr
-domattribute_name
-domattribute_set_value
-domattribute_specified
-domattribute_value
-domcharacterdata
-domcomment
-domdocument
-domdocument_add_root
-domdocument_create_attribute
-domdocument_create_cdata_section
-domdocument_create_comment
-domdocument_create_element
-domdocument_create_element_ns
-domdocument_create_entity_reference
-domdocument_create_processing_instruction
-domdocument_create_text_node
-domdocument_doctype
-domdocument_document_element
-domdocument_dump_file
-domdocument_dump_mem
-domdocumentfragment
-domdocument_get_element_by_id
-domdocument_get_elements_by_tagname
-domdocument_html_dump_mem
-domdocumenttype
-domdocumenttype_entities
-domdocumenttype_internal_subset
-domdocumenttype_name
-domdocumenttype_notations
-domdocumenttype_public_id
-domdocumenttype_system_id
-domdocument_xinclude
-domelement
-domelement_get_attribute
-domelement_get_attribute_node
-domelement_get_elements_by_tagname
-domelement_has_attribute
-domelement_remove_attribute
-domelement_set_attribute
-domelement_set_attribute_node
-domelement_tagname
-domentity
-domentityreference
-domexception
-domimplementation
-dom_import_simplexml
-domnamednodemap
-domnode
-domnode_add_namespace
-domnode_append_child
-domnode_append_sibling
-domnode_attributes
-domnode_child_nodes
-domnode_clone_node
-domnode_dump_node
-domnode_first_child
-domnode_get_content
-domnode_has_attributes
-domnode_has_child_nodes
-domnode_insert_before
-domnode_is_blank_node
-domnode_last_child
-domnodelist
-domnode_next_sibling
-domnode_node_name
-domnode_node_type
-domnode_node_value
-domnode_owner_document
-domnode_parent_node
-domnode_prefix
-domnode_previous_sibling
-domnode_remove_child
-domnode_replace_child
-domnode_replace_node
-domnode_set_content
-domnode_set_name
-domnode_set_namespace
-domnode_unlink_node
-domnotation
-domprocessinginstruction
-domprocessinginstruction_data
-domprocessinginstruction_target
-domtext
-domxml_new_doc
-domxml_open_file
-domxml_open_mem
-domxml_version
-domxml_xmltree
-domxml_xslt_stylesheet
-domxml_xslt_stylesheet_doc
-domxml_xslt_stylesheet_file
-domxml_xslt_version
-domxpath
-domxsltstylesheet_process
-domxsltstylesheet_result_dump_file
-domxsltstylesheet_result_dump_mem
-dotnet
-dotnet_load
-doubleval
-each
-easter_date
-easter_days
-echo
-else
-elseif
-empty
-emptyiterator
-enchant_broker_describe
-enchant_broker_dict_exists
-enchant_broker_free
-enchant_broker_free_dict
-enchant_broker_get_error
-enchant_broker_init
-enchant_broker_list_dicts
-enchant_broker_request_dict
-enchant_broker_request_pwl_dict
-enchant_broker_set_ordering
-enchant_dict_add_to_personal
-enchant_dict_add_to_session
-enchant_dict_check
-enchant_dict_describe
-enchant_dict_get_error
-enchant_dict_is_in_session
-enchant_dict_quick_check
-enchant_dict_store_replacement
-enchant_dict_suggest
-end
-enddeclare
-endfor
-endforeach
-endif
-endswitch
-endwhile
-ereg
-eregi
-eregi_replace
-ereg_replace
-errorexception
-error_get_last
-error_log
-error_reporting
-escapeshellarg
-escapeshellcmd
-eval
-event_add
-event_base_free
-event_base_loop
-event_base_loopbreak
-event_base_loopexit
-event_base_new
-event_base_priority_init
-event_base_set
-event_buffer_base_set
-event_buffer_disable
-event_buffer_enable
-event_buffer_fd_set
-event_buffer_free
-event_buffer_new
-event_buffer_priority_set
-event_buffer_read
-event_buffer_set_callback
-event_buffer_timeout_set
-event_buffer_watermark_set
-event_buffer_write
-event_del
-event_free
-event_new
-event_set
-exception
-exec
-exif_imagetype
-exif_read_data
-exif_tagname
-exif_thumbnail
-exit
-exp
-expect_expectl
-expect_popen
-explode
-expm1
-export
-extends
-extension_loaded
-extract
-ezmlm_hash
-fam_cancel_monitor
-fam_close
-fam_monitor_collection
-fam_monitor_directory
-fam_monitor_file
-fam_next_event
-fam_open
-fam_pending
-fam_resume_monitor
-fam_suspend_monitor
-fbsql_affected_rows
-fbsql_autocommit
-fbsql_blob_size
-fbsql_change_user
-fbsql_clob_size
-fbsql_close
-fbsql_commit
-fbsql_connect
-fbsql_create_blob
-fbsql_create_clob
-fbsql_create_db
-fbsql_database
-fbsql_database_password
-fbsql_data_seek
-fbsql_db_query
-fbsql_db_status
-fbsql_drop_db
-fbsql_errno
-fbsql_error
-fbsql_fetch_array
-fbsql_fetch_assoc
-fbsql_fetch_field
-fbsql_fetch_lengths
-fbsql_fetch_object
-fbsql_fetch_row
-fbsql_field_flags
-fbsql_field_len
-fbsql_field_name
-fbsql_field_seek
-fbsql_field_table
-fbsql_field_type
-fbsql_free_result
-fbsql_get_autostart_info
-fbsql_hostname
-fbsql_insert_id
-fbsql_list_dbs
-fbsql_list_fields
-fbsql_list_tables
-fbsql_next_result
-fbsql_num_fields
-fbsql_num_rows
-fbsql_password
-fbsql_pconnect
-fbsql_query
-fbsql_read_blob
-fbsql_read_clob
-fbsql_result
-fbsql_rollback
-fbsql_rows_fetched
-fbsql_select_db
-fbsql_set_characterset
-fbsql_set_lob_mode
-fbsql_set_password
-fbsql_set_transaction
-fbsql_start_db
-fbsql_stop_db
-fbsql_tablename
-fbsql_table_name
-fbsql_username
-fbsql_warnings
-fclose
-fdf_add_doc_javascript
-fdf_add_template
-fdf_close
-fdf_create
-fdf_enum_values
-fdf_errno
-fdf_error
-fdf_get_ap
-fdf_get_attachment
-fdf_get_encoding
-fdf_get_file
-fdf_get_flags
-fdf_get_opt
-fdf_get_status
-fdf_get_value
-fdf_get_version
-fdf_header
-fdf_next_field_name
-fdf_open
-fdf_open_string
-fdf_remove_item
-fdf_save
-fdf_save_string
-fdf_set_ap
-fdf_set_encoding
-fdf_set_file
-fdf_set_flags
-fdf_set_javascript_action
-fdf_set_on_import_javascript
-fdf_set_opt
-fdf_set_status
-fdf_set_submit_form_action
-fdf_set_target_frame
-fdf_set_value
-fdf_set_version
-feof
-fflush
-fgetc
-fgetcsv
-fgets
-fgetss
-file
-__FILE__
-fileatime
-filectime
-file_exists
-file_get_contents
-filegroup
-fileinode
-filemtime
-fileowner
-fileperms
-filepro
-filepro_fieldcount
-filepro_fieldname
-filepro_fieldtype
-filepro_fieldwidth
-filepro_retrieve
-filepro_rowcount
-file_put_contents
-filesize
-filesystemiterator
-filetype
-filter_has_var
-filter_id
-filter_input
-filter_input_array
-filteriterator
-filter_list
-filter_var
-filter_var_array
-final
-finfo_buffer
-finfo_close
-finfo_file
-finfo_open
-finfo_set_flags
-floatval
-flock
-floor
-flush
-fmod
-fnmatch
-fopen
-for
-foreach
-forward_static_call
-forward_static_call_array
-fpassthru
-fprintf
-fputcsv
-fputs
-fread
-frenchtojd
-fribidi_log2vis
-fscanf
-fseek
-fsockopen
-fstat
-ftell
-ftok
-ftp_alloc
-ftp_cdup
-ftp_chdir
-ftp_chmod
-ftp_close
-ftp_connect
-ftp_delete
-ftp_exec
-ftp_fget
-ftp_fput
-ftp_get
-ftp_get_option
-ftp_login
-ftp_mdtm
-ftp_mkdir
-ftp_nb_continue
-ftp_nb_fget
-ftp_nb_fput
-ftp_nb_get
-ftp_nb_put
-ftp_nlist
-ftp_pasv
-ftp_put
-ftp_pwd
-ftp_quit
-ftp_raw
-ftp_rawlist
-ftp_rename
-ftp_rmdir
-ftp_set_option
-ftp_site
-ftp_size
-ftp_ssl_connect
-ftp_systype
-ftruncate
-func_get_arg
-func_get_args
-func_num_args
-function
-__FUNCTION__
-function_exists
-fwrite
-gc_collect_cycles
-gc_disable
-gc_enable
-gc_enabled
-gd_info
-gearmanclient
-gearmanjob
-gearmantask
-gearmanworker
-geoip_continent_code_by_name
-geoip_country_code3_by_name
-geoip_country_code_by_name
-geoip_country_name_by_name
-geoip_database_info
-geoip_db_avail
-geoip_db_filename
-geoip_db_get_all_info
-geoip_id_by_name
-geoip_isp_by_name
-geoip_org_by_name
-geoip_record_by_name
-geoip_region_by_name
-geoip_region_name_by_code
-geoip_time_zone_by_country_and_region
-__get()
-getallheaders
-get_browser
-get_called_class
-get_cfg_var
-get_class
-get_class_methods
-get_class_vars
-getclosure
-getconstant
-getconstants
-getconstructor
-get_current_user
-getcwd
-getdate
-get_declared_classes
-get_declared_interfaces
-getdefaultproperties
-get_defined_constants
-get_defined_functions
-get_defined_vars
-getdoccomment
-getendline
-getenv
-getextension
-get_extension_funcs
-getextensionname
-getfilename
-get_headers
-gethostbyaddr
-gethostbyname
-gethostbynamel
-gethostname
-get_html_translation_table
-getimagesize
-get_included_files
-get_include_path
-getinterfacenames
-getinterfaces
-getlastmod
-get_loaded_extensions
-get_magic_quotes_gpc
-get_magic_quotes_runtime
-getMeta
-get_meta_tags
-getmethod
-getmethods
-getmodifiers
-getmxrr
-getmygid
-getmyinode
-getmypid
-getmyuid
-getname
-getNamed
-getnamespacename
-get_object_vars
-getopt
-getparentclass
-get_parent_class
-getproperties
-getproperty
-getprotobyname
-getprotobynumber
-getrandmax
-get_required_files
-get_resource_type
-getrusage
-getservbyname
-getservbyport
-getshortname
-getstartline
-getstaticproperties
-getstaticpropertyvalue
-gettext
-gettimeofday
-gettraitaliases
-gettraitnames
-gettraits
-gettype
-getValue
-glob
-global
-globiterator
-gmagick
-gmagickdraw
-gmagickpixel
-gmdate
-gmmktime
-gmp_abs
-gmp_add
-gmp_and
-gmp_clrbit
-gmp_cmp
-gmp_com
-gmp_div
-gmp_divexact
-gmp_div_q
-gmp_div_qr
-gmp_div_r
-gmp_fact
-gmp_gcd
-gmp_gcdext
-gmp_hamdist
-gmp_init
-gmp_intval
-gmp_invert
-gmp_jacobi
-gmp_legendre
-gmp_mod
-gmp_mul
-gmp_neg
-gmp_nextprime
-gmp_or
-gmp_perfect_square
-gmp_popcount
-gmp_pow
-gmp_powm
-gmp_prob_prime
-gmp_random
-gmp_scan0
-gmp_scan1
-gmp_setbit
-gmp_sign
-gmp_sqrt
-gmp_sqrtrem
-gmp_strval
-gmp_sub
-gmp_testbit
-gmp_xor
-gmstrftime
-gnupg_adddecryptkey
-gnupg_addencryptkey
-gnupg_addsignkey
-gnupg_cleardecryptkeys
-gnupg_clearencryptkeys
-gnupg_clearsignkeys
-gnupg_decrypt
-gnupg_decryptverify
-gnupg_encrypt
-gnupg_encryptsign
-gnupg_export
-gnupg_geterror
-gnupg_getprotocol
-gnupg_import
-gnupg_init
-gnupg_keyinfo
-gnupg_setarmor
-gnupg_seterrormode
-gnupg_setsignmode
-gnupg_sign
-gnupg_verify
-gopher_parsedir
-goto
-grapheme_extract
-grapheme_stripos
-grapheme_stristr
-grapheme_strlen
-grapheme_strpos
-grapheme_strripos
-grapheme_strrpos
-grapheme_strstr
-grapheme_substr
-gregoriantojd
-gupnp_context_get_host_ip
-gupnp_context_get_port
-gupnp_context_get_subscription_timeout
-gupnp_context_host_path
-gupnp_context_new
-gupnp_context_set_subscription_timeout
-gupnp_context_timeout_add
-gupnp_context_unhost_path
-gupnp_control_point_browse_start
-gupnp_control_point_browse_stop
-gupnp_control_point_callback_set
-gupnp_control_point_new
-gupnp_device_action_callback_set
-gupnp_device_info_get
-gupnp_device_info_get_service
-gupnp_root_device_get_available
-gupnp_root_device_get_relative_location
-gupnp_root_device_new
-gupnp_root_device_set_available
-gupnp_root_device_start
-gupnp_root_device_stop
-gupnp_service_action_get
-gupnp_service_action_return
-gupnp_service_action_return_error
-gupnp_service_action_set
-gupnp_service_freeze_notify
-gupnp_service_info_get
-gupnp_service_info_get_introspection
-gupnp_service_introspection_get_state_variable
-gupnp_service_notify
-gupnp_service_proxy_action_get
-gupnp_service_proxy_action_set
-gupnp_service_proxy_add_notify
-gupnp_service_proxy_callback_set
-gupnp_service_proxy_get_subscribed
-gupnp_service_proxy_remove_notify
-gupnp_service_proxy_set_subscribed
-gupnp_service_thaw_notify
-gzclose
-gzcompress
-gzdecode
-gzdeflate
-gzencode
-gzeof
-gzfile
-gzgetc
-gzgets
-gzgetss
-gzinflate
-gzopen
-gzpassthru
-gzputs
-gzread
-gzrewind
-gzseek
-gztell
-gzuncompress
-gzwrite
-halt_compiler
-haruannotation
-haruannotation_setborderstyle
-haruannotation_sethighlightmode
-haruannotation_seticon
-haruannotation_setopened
-harudestination
-harudestination_setfit
-harudestination_setfitb
-harudestination_setfitbh
-harudestination_setfitbv
-harudestination_setfith
-harudestination_setfitr
-harudestination_setfitv
-harudestination_setxyz
-harudoc
-harudoc_addpage
-harudoc_addpagelabel
-harudoc_construct
-harudoc_createoutline
-harudoc_getcurrentencoder
-harudoc_getcurrentpage
-harudoc_getencoder
-harudoc_getfont
-harudoc_getinfoattr
-harudoc_getpagelayout
-harudoc_getpagemode
-harudoc_getstreamsize
-harudoc_insertpage
-harudoc_loadjpeg
-harudoc_loadpng
-harudoc_loadraw
-harudoc_loadttc
-harudoc_loadttf
-harudoc_loadtype1
-harudoc_output
-harudoc_readfromstream
-harudoc_reseterror
-harudoc_resetstream
-harudoc_save
-harudoc_savetostream
-harudoc_setcompressionmode
-harudoc_setcurrentencoder
-harudoc_setencryptionmode
-harudoc_setinfoattr
-harudoc_setinfodateattr
-harudoc_setopenaction
-harudoc_setpagelayout
-harudoc_setpagemode
-harudoc_setpagesconfiguration
-harudoc_setpassword
-harudoc_setpermission
-harudoc_usecnsencodings
-harudoc_usecnsfonts
-harudoc_usecntencodings
-harudoc_usecntfonts
-harudoc_usejpencodings
-harudoc_usejpfonts
-harudoc_usekrencodings
-harudoc_usekrfonts
-haruencoder
-haruencoder_getbytetype
-haruencoder_gettype
-haruencoder_getunicode
-haruencoder_getwritingmode
-haruexception
-harufont
-harufont_getascent
-harufont_getcapheight
-harufont_getdescent
-harufont_getencodingname
-harufont_getfontname
-harufont_gettextwidth
-harufont_getunicodewidth
-harufont_getxheight
-harufont_measuretext
-haruimage
-haruimage_getbitspercomponent
-haruimage_getcolorspace
-haruimage_getheight
-haruimage_getsize
-haruimage_getwidth
-haruimage_setcolormask
-haruimage_setmaskimage
-haruoutline
-haruoutline_setdestination
-haruoutline_setopened
-harupage
-harupage_arc
-harupage_begintext
-harupage_circle
-harupage_closepath
-harupage_concat
-harupage_createdestination
-harupage_createlinkannotation
-harupage_createtextannotation
-harupage_createurlannotation
-harupage_curveto
-harupage_curveto2
-harupage_curveto3
-harupage_drawimage
-harupage_ellipse
-harupage_endpath
-harupage_endtext
-harupage_eofill
-harupage_eofillstroke
-harupage_fill
-harupage_fillstroke
-harupage_getcharspace
-harupage_getcmykfill
-harupage_getcmykstroke
-harupage_getcurrentfont
-harupage_getcurrentfontsize
-harupage_getcurrentpos
-harupage_getcurrenttextpos
-harupage_getdash
-harupage_getfillingcolorspace
-harupage_getflatness
-harupage_getgmode
-harupage_getgrayfill
-harupage_getgraystroke
-harupage_getheight
-harupage_gethorizontalscaling
-harupage_getlinecap
-harupage_getlinejoin
-harupage_getlinewidth
-harupage_getmiterlimit
-harupage_getrgbfill
-harupage_getrgbstroke
-harupage_getstrokingcolorspace
-harupage_gettextleading
-harupage_gettextmatrix
-harupage_gettextrenderingmode
-harupage_gettextrise
-harupage_gettextwidth
-harupage_gettransmatrix
-harupage_getwidth
-harupage_getwordspace
-harupage_lineto
-harupage_measuretext
-harupage_movetextpos
-harupage_moveto
-harupage_movetonextline
-harupage_rectangle
-harupage_setcharspace
-harupage_setcmykfill
-harupage_setcmykstroke
-harupage_setdash
-harupage_setflatness
-harupage_setfontandsize
-harupage_setgrayfill
-harupage_setgraystroke
-harupage_setheight
-harupage_sethorizontalscaling
-harupage_setlinecap
-harupage_setlinejoin
-harupage_setlinewidth
-harupage_setmiterlimit
-harupage_setrgbfill
-harupage_setrgbstroke
-harupage_setrotate
-harupage_setsize
-harupage_setslideshow
-harupage_settextleading
-harupage_settextmatrix
-harupage_settextrenderingmode
-harupage_settextrise
-harupage_setwidth
-harupage_setwordspace
-harupage_showtext
-harupage_showtextnextline
-harupage_stroke
-harupage_textout
-harupage_textrect
-hasconstant
-hash
-hash_algos
-hash_copy
-hash_file
-hash_final
-hash_hmac
-hash_hmac_file
-hash_init
-hash_update
-hash_update_file
-hash_update_stream
-hasmethod
-hasproperty
-header
-header_register_callback
-header_remove
-headers_list
-headers_sent
-hebrev
-hebrevc
-hex2bin
-hexdec
-highlight_file
-highlight_string
-htmlentities
-html_entity_decode
-htmlspecialchars
-htmlspecialchars_decode
-http_build_cookie
-http_build_query
-http_build_str
-http_build_url
-http_cache_etag
-http_cache_last_modified
-http_chunked_decode
-http_date
-http_deflate
-httpdeflatestream
-httpdeflatestream_construct
-httpdeflatestream_factory
-httpdeflatestream_finish
-httpdeflatestream_flush
-httpdeflatestream_update
-http_get
-http_get_request_body
-http_get_request_body_stream
-http_get_request_headers
-http_head
-http_inflate
-httpinflatestream
-httpinflatestream_construct
-httpinflatestream_factory
-httpinflatestream_finish
-httpinflatestream_flush
-httpinflatestream_update
-http_match_etag
-http_match_modified
-http_match_request_header
-httpmessage
-httpmessage_addheaders
-httpmessage_construct
-httpmessage_detach
-httpmessage_factory
-httpmessage_fromenv
-httpmessage_fromstring
-httpmessage_getbody
-httpmessage_getheader
-httpmessage_getheaders
-httpmessage_gethttpversion
-httpmessage_getparentmessage
-httpmessage_getrequestmethod
-httpmessage_getrequesturl
-httpmessage_getresponsecode
-httpmessage_getresponsestatus
-httpmessage_gettype
-httpmessage_guesscontenttype
-httpmessage_prepend
-httpmessage_reverse
-httpmessage_send
-httpmessage_setbody
-httpmessage_setheaders
-httpmessage_sethttpversion
-httpmessage_setrequestmethod
-httpmessage_setrequesturl
-httpmessage_setresponsecode
-httpmessage_setresponsestatus
-httpmessage_settype
-httpmessage_tomessagetypeobject
-httpmessage_tostring
-http_negotiate_charset
-http_negotiate_content_type
-http_negotiate_language
-http_parse_cookie
-http_parse_headers
-http_parse_message
-http_parse_params
-http_persistent_handles_clean
-http_persistent_handles_count
-http_persistent_handles_ident
-http_post_data
-http_post_fields
-http_put_data
-http_put_file
-http_put_stream
-httpquerystring
-httpquerystring_construct
-httpquerystring_get
-httpquerystring_mod
-httpquerystring_set
-httpquerystring_singleton
-httpquerystring_toarray
-httpquerystring_tostring
-httpquerystring_xlate
-http_redirect
-httprequest
-http_request
-httprequest_addcookies
-httprequest_addheaders
-httprequest_addpostfields
-httprequest_addpostfile
-httprequest_addputdata
-httprequest_addquerydata
-httprequest_addrawpostdata
-httprequest_addssloptions
-http_request_body_encode
-httprequest_clearhistory
-httprequest_construct
-httprequest_enablecookies
-httprequest_getcontenttype
-httprequest_getcookies
-httprequest_getheaders
-httprequest_gethistory
-httprequest_getmethod
-httprequest_getoptions
-httprequest_getpostfields
-httprequest_getpostfiles
-httprequest_getputdata
-httprequest_getputfile
-httprequest_getquerydata
-httprequest_getrawpostdata
-httprequest_getrawrequestmessage
-httprequest_getrawresponsemessage
-httprequest_getrequestmessage
-httprequest_getresponsebody
-httprequest_getresponsecode
-httprequest_getresponsecookies
-httprequest_getresponsedata
-httprequest_getresponseheader
-httprequest_getresponseinfo
-httprequest_getresponsemessage
-httprequest_getresponsestatus
-httprequest_getssloptions
-httprequest_geturl
-http_request_method_exists
-http_request_method_name
-http_request_method_register
-http_request_method_unregister
-httprequestpool
-httprequestpool_attach
-httprequestpool_construct
-httprequestpool_destruct
-httprequestpool_detach
-httprequestpool_getattachedrequests
-httprequestpool_getfinishedrequests
-httprequestpool_reset
-httprequestpool_send
-httprequestpool_socketperform
-httprequestpool_socketselect
-httprequest_resetcookies
-httprequest_send
-httprequest_setcontenttype
-httprequest_setcookies
-httprequest_setheaders
-httprequest_setmethod
-httprequest_setoptions
-httprequest_setpostfields
-httprequest_setpostfiles
-httprequest_setputdata
-httprequest_setputfile
-httprequest_setquerydata
-httprequest_setrawpostdata
-httprequest_setssloptions
-httprequest_seturl
-httpresponse
-httpresponse_capture
-http_response_code
-httpresponse_getbuffersize
-httpresponse_getcache
-httpresponse_getcachecontrol
-httpresponse_getcontentdisposition
-httpresponse_getcontenttype
-httpresponse_getdata
-httpresponse_getetag
-httpresponse_getfile
-httpresponse_getgzip
-httpresponse_getheader
-httpresponse_getlastmodified
-httpresponse_getrequestbody
-httpresponse_getrequestbodystream
-httpresponse_getrequestheaders
-httpresponse_getstream
-httpresponse_getthrottledelay
-httpresponse_guesscontenttype
-httpresponse_redirect
-httpresponse_send
-httpresponse_setbuffersize
-httpresponse_setcache
-httpresponse_setcachecontrol
-httpresponse_setcontentdisposition
-httpresponse_setcontenttype
-httpresponse_setdata
-httpresponse_setetag
-httpresponse_setfile
-httpresponse_setgzip
-httpresponse_setheader
-httpresponse_setlastmodified
-httpresponse_setstream
-httpresponse_setthrottledelay
-httpresponse_status
-http_send_content_disposition
-http_send_content_type
-http_send_data
-http_send_file
-http_send_last_modified
-http_send_status
-http_send_stream
-http_support
-http_throttle
-hwapi_attribute
-hwapi_attribute_key
-hwapi_attribute_langdepvalue
-hwapi_attribute_value
-hwapi_attribute_values
-hwapi_checkin
-hwapi_checkout
-hwapi_children
-hwapi_content
-hwapi_content_mimetype
-hwapi_content_read
-hwapi_copy
-hwapi_dbstat
-hwapi_dcstat
-hwapi_dstanchors
-hwapi_dstofsrcanchor
-hwapi_error_count
-hwapi_error_reason
-hwapi_find
-hwapi_ftstat
-hwapi_hgcsp
-hwapi_hwstat
-hwapi_identify
-hwapi_info
-hwapi_insert
-hwapi_insertanchor
-hwapi_insertcollection
-hwapi_insertdocument
-hwapi_link
-hwapi_lock
-hwapi_move
-hwapi_new_content
-hwapi_object
-hwapi_object_assign
-hwapi_object_attreditable
-hwapi_objectbyanchor
-hwapi_object_count
-hwapi_object_insert
-hwapi_object_new
-hwapi_object_remove
-hwapi_object_title
-hwapi_object_value
-hwapi_parents
-hwapi_reason_description
-hwapi_reason_type
-hwapi_remove
-hwapi_replace
-hwapi_setcommittedversion
-hwapi_srcanchors
-hwapi_srcsofdst
-hwapi_unlock
-hwapi_user
-hwapi_userlist
-hw_array2objrec
-hw_changeobject
-hw_children
-hw_childrenobj
-hw_close
-hw_connect
-hw_connection_info
-hw_cp
-hw_deleteobject
-hw_docbyanchor
-hw_docbyanchorobj
-hw_document_attributes
-hw_document_bodytag
-hw_document_content
-hw_document_setcontent
-hw_document_size
-hw_dummy
-hw_edittext
-hw_error
-hw_errormsg
-hw_free_document
-hw_getanchors
-hw_getanchorsobj
-hw_getandlock
-hw_getchildcoll
-hw_getchildcollobj
-hw_getchilddoccoll
-hw_getchilddoccollobj
-hw_getobject
-hw_getobjectbyquery
-hw_getobjectbyquerycoll
-hw_getobjectbyquerycollobj
-hw_getobjectbyqueryobj
-hw_getparents
-hw_getparentsobj
-hw_getrellink
-hw_getremote
-hw_getremotechildren
-hw_getsrcbydestobj
-hw_gettext
-hw_getusername
-hw_identify
-hw_incollections
-hw_info
-hw_inscoll
-hw_insdoc
-hw_insertanchors
-hw_insertdocument
-hw_insertobject
-hw_mapid
-hw_modifyobject
-hw_mv
-hw_new_document
-hw_objrec2array
-hw_output_document
-hw_pconnect
-hw_pipedocument
-hw_root
-hw_setlinkroot
-hw_stat
-hw_unlock
-hw_who
-hypot
-ibase_add_user
-ibase_affected_rows
-ibase_backup
-ibase_blob_add
-ibase_blob_cancel
-ibase_blob_close
-ibase_blob_create
-ibase_blob_echo
-ibase_blob_get
-ibase_blob_import
-ibase_blob_info
-ibase_blob_open
-ibase_close
-ibase_commit
-ibase_commit_ret
-ibase_connect
-ibase_db_info
-ibase_delete_user
-ibase_drop_db
-ibase_errcode
-ibase_errmsg
-ibase_execute
-ibase_fetch_assoc
-ibase_fetch_object
-ibase_fetch_row
-ibase_field_info
-ibase_free_event_handler
-ibase_free_query
-ibase_free_result
-ibase_gen_id
-ibase_maintain_db
-ibase_modify_user
-ibase_name_result
-ibase_num_fields
-ibase_num_params
-ibase_param_info
-ibase_pconnect
-ibase_prepare
-ibase_query
-ibase_restore
-ibase_rollback
-ibase_rollback_ret
-ibase_server_info
-ibase_service_attach
-ibase_service_detach
-ibase_set_event_handler
-ibase_timefmt
-ibase_trans
-ibase_wait_event
-iconv
-iconv_get_encoding
-iconv_mime_decode
-iconv_mime_decode_headers
-iconv_mime_encode
-iconv_set_encoding
-iconv_strlen
-iconv_strpos
-iconv_strrpos
-iconv_substr
-id3_get_frame_long_name
-id3_get_frame_short_name
-id3_get_genre_id
-id3_get_genre_list
-id3_get_genre_name
-id3_get_tag
-id3_get_version
-id3_remove_tag
-id3_set_tag
-idate
-idn_to_ascii
-idn_to_unicode
-idn_to_utf8
-if
-ifx_affected_rows
-ifx_blobinfile_mode
-ifx_byteasvarchar
-ifx_close
-ifx_connect
-ifx_copy_blob
-ifx_create_blob
-ifx_create_char
-ifx_do
-ifx_error
-ifx_errormsg
-ifx_fetch_row
-ifx_fieldproperties
-ifx_fieldtypes
-ifx_free_blob
-ifx_free_char
-ifx_free_result
-ifx_get_blob
-ifx_get_char
-ifx_getsqlca
-ifx_htmltbl_result
-ifx_nullformat
-ifx_num_fields
-ifx_num_rows
-ifx_pconnect
-ifx_prepare
-ifx_query
-ifx_textasvarchar
-ifx_update_blob
-ifx_update_char
-ifxus_close_slob
-ifxus_create_slob
-ifxus_free_slob
-ifxus_open_slob
-ifxus_read_slob
-ifxus_seek_slob
-ifxus_tell_slob
-ifxus_write_slob
-ignore_user_abort
-iis_add_server
-iis_get_dir_security
-iis_get_script_map
-iis_get_server_by_comment
-iis_get_server_by_path
-iis_get_server_rights
-iis_get_service_state
-iis_remove_server
-iis_set_app_settings
-iis_set_dir_security
-iis_set_script_map
-iis_set_server_rights
-iis_start_server
-iis_start_service
-iis_stop_server
-iis_stop_service
-image2wbmp
-imagealphablending
-imageantialias
-imagearc
-imagechar
-imagecharup
-imagecolorallocate
-imagecolorallocatealpha
-imagecolorat
-imagecolorclosest
-imagecolorclosestalpha
-imagecolorclosesthwb
-imagecolordeallocate
-imagecolorexact
-imagecolorexactalpha
-imagecolormatch
-imagecolorresolve
-imagecolorresolvealpha
-imagecolorset
-imagecolorsforindex
-imagecolorstotal
-imagecolortransparent
-imageconvolution
-imagecopy
-imagecopymerge
-imagecopymergegray
-imagecopyresampled
-imagecopyresized
-imagecreate
-imagecreatefromgd
-imagecreatefromgd2
-imagecreatefromgd2part
-imagecreatefromgif
-imagecreatefromjpeg
-imagecreatefrompng
-imagecreatefromstring
-imagecreatefromwbmp
-imagecreatefromxbm
-imagecreatefromxpm
-imagecreatetruecolor
-imagedashedline
-imagedestroy
-imageellipse
-imagefill
-imagefilledarc
-imagefilledellipse
-imagefilledpolygon
-imagefilledrectangle
-imagefilltoborder
-imagefilter
-imagefontheight
-imagefontwidth
-imageftbbox
-imagefttext
-imagegammacorrect
-imagegd
-imagegd2
-imagegif
-imagegrabscreen
-imagegrabwindow
-imageinterlace
-imageistruecolor
-imagejpeg
-imagelayereffect
-imageline
-imageloadfont
-imagepalettecopy
-imagepng
-imagepolygon
-imagepsbbox
-imagepsencodefont
-imagepsextendfont
-imagepsfreefont
-imagepsloadfont
-imagepsslantfont
-imagepstext
-imagerectangle
-imagerotate
-imagesavealpha
-imagesetbrush
-imagesetpixel
-imagesetstyle
-imagesetthickness
-imagesettile
-imagestring
-imagestringup
-imagesx
-imagesy
-imagetruecolortopalette
-imagettfbbox
-imagettftext
-imagetypes
-image_type_to_extension
-image_type_to_mime_type
-imagewbmp
-imagexbm
-imagick
-imagick_adaptiveblurimage
-imagick_adaptiveresizeimage
-imagick_adaptivesharpenimage
-imagick_adaptivethresholdimage
-imagick_addimage
-imagick_addnoiseimage
-imagick_affinetransformimage
-imagick_animateimages
-imagick_annotateimage
-imagick_appendimages
-imagick_averageimages
-imagick_blackthresholdimage
-imagick_blurimage
-imagick_borderimage
-imagick_charcoalimage
-imagick_chopimage
-imagick_clear
-imagick_clipimage
-imagick_clippathimage
-imagick_clone
-imagick_clutimage
-imagick_coalesceimages
-imagick_colorfloodfillimage
-imagick_colorizeimage
-imagick_combineimages
-imagick_commentimage
-imagick_compareimagechannels
-imagick_compareimagelayers
-imagick_compareimages
-imagick_compositeimage
-imagick_construct
-imagick_contrastimage
-imagick_contraststretchimage
-imagick_convolveimage
-imagick_cropimage
-imagick_cropthumbnailimage
-imagick_current
-imagick_cyclecolormapimage
-imagick_decipherimage
-imagick_deconstructimages
-imagick_deleteimageartifact
-imagick_despeckleimage
-imagick_destroy
-imagick_displayimage
-imagick_displayimages
-imagick_distortimage
-imagickdraw
-imagickdraw_affine
-imagickdraw_annotation
-imagickdraw_arc
-imagickdraw_bezier
-imagickdraw_circle
-imagickdraw_clear
-imagickdraw_clone
-imagickdraw_color
-imagickdraw_comment
-imagickdraw_composite
-imagickdraw_construct
-imagickdraw_destroy
-imagickdraw_ellipse
-imagickdraw_getclippath
-imagickdraw_getcliprule
-imagickdraw_getclipunits
-imagickdraw_getfillcolor
-imagickdraw_getfillopacity
-imagickdraw_getfillrule
-imagickdraw_getfont
-imagickdraw_getfontfamily
-imagickdraw_getfontsize
-imagickdraw_getfontstyle
-imagickdraw_getfontweight
-imagickdraw_getgravity
-imagickdraw_getstrokeantialias
-imagickdraw_getstrokecolor
-imagickdraw_getstrokedasharray
-imagickdraw_getstrokedashoffset
-imagickdraw_getstrokelinecap
-imagickdraw_getstrokelinejoin
-imagickdraw_getstrokemiterlimit
-imagickdraw_getstrokeopacity
-imagickdraw_getstrokewidth
-imagickdraw_gettextalignment
-imagickdraw_gettextantialias
-imagickdraw_gettextdecoration
-imagickdraw_gettextencoding
-imagickdraw_gettextundercolor
-imagickdraw_getvectorgraphics
-imagick_drawimage
-imagickdraw_line
-imagickdraw_matte
-imagickdraw_pathclose
-imagickdraw_pathcurvetoabsolute
-imagickdraw_pathcurvetoquadraticbezierabsolute
-imagickdraw_pathcurvetoquadraticbezierrelative
-imagickdraw_pathcurvetoquadraticbeziersmoothabsolute
-imagickdraw_pathcurvetoquadraticbeziersmoothrelative
-imagickdraw_pathcurvetorelative
-imagickdraw_pathcurvetosmoothabsolute
-imagickdraw_pathcurvetosmoothrelative
-imagickdraw_pathellipticarcabsolute
-imagickdraw_pathellipticarcrelative
-imagickdraw_pathfinish
-imagickdraw_pathlinetoabsolute
-imagickdraw_pathlinetohorizontalabsolute
-imagickdraw_pathlinetohorizontalrelative
-imagickdraw_pathlinetorelative
-imagickdraw_pathlinetoverticalabsolute
-imagickdraw_pathlinetoverticalrelative
-imagickdraw_pathmovetoabsolute
-imagickdraw_pathmovetorelative
-imagickdraw_pathstart
-imagickdraw_point
-imagickdraw_polygon
-imagickdraw_polyline
-imagickdraw_pop
-imagickdraw_popclippath
-imagickdraw_popdefs
-imagickdraw_poppattern
-imagickdraw_push
-imagickdraw_pushclippath
-imagickdraw_pushdefs
-imagickdraw_pushpattern
-imagickdraw_rectangle
-imagickdraw_render
-imagickdraw_rotate
-imagickdraw_roundrectangle
-imagickdraw_scale
-imagickdraw_setclippath
-imagickdraw_setcliprule
-imagickdraw_setclipunits
-imagickdraw_setfillalpha
-imagickdraw_setfillcolor
-imagickdraw_setfillopacity
-imagickdraw_setfillpatternurl
-imagickdraw_setfillrule
-imagickdraw_setfont
-imagickdraw_setfontfamily
-imagickdraw_setfontsize
-imagickdraw_setfontstretch
-imagickdraw_setfontstyle
-imagickdraw_setfontweight
-imagickdraw_setgravity
-imagickdraw_setstrokealpha
-imagickdraw_setstrokeantialias
-imagickdraw_setstrokecolor
-imagickdraw_setstrokedasharray
-imagickdraw_setstrokedashoffset
-imagickdraw_setstrokelinecap
-imagickdraw_setstrokelinejoin
-imagickdraw_setstrokemiterlimit
-imagickdraw_setstrokeopacity
-imagickdraw_setstrokepatternurl
-imagickdraw_setstrokewidth
-imagickdraw_settextalignment
-imagickdraw_settextantialias
-imagickdraw_settextdecoration
-imagickdraw_settextencoding
-imagickdraw_settextundercolor
-imagickdraw_setvectorgraphics
-imagickdraw_setviewbox
-imagickdraw_skewx
-imagickdraw_skewy
-imagickdraw_translate
-imagick_edgeimage
-imagick_embossimage
-imagick_encipherimage
-imagick_enhanceimage
-imagick_equalizeimage
-imagick_evaluateimage
-imagick_extentimage
-imagick_flattenimages
-imagick_flipimage
-imagick_floodfillpaintimage
-imagick_flopimage
-imagick_frameimage
-imagick_fximage
-imagick_gammaimage
-imagick_gaussianblurimage
-imagick_getcolorspace
-imagick_getcompression
-imagick_getcompressionquality
-imagick_getcopyright
-imagick_getfilename
-imagick_getfont
-imagick_getformat
-imagick_getgravity
-imagick_gethomeurl
-imagick_getimage
-imagick_getimagealphachannel
-imagick_getimageartifact
-imagick_getimagebackgroundcolor
-imagick_getimageblob
-imagick_getimageblueprimary
-imagick_getimagebordercolor
-imagick_getimagechanneldepth
-imagick_getimagechanneldistortion
-imagick_getimagechanneldistortions
-imagick_getimagechannelextrema
-imagick_getimagechannelmean
-imagick_getimagechannelrange
-imagick_getimagechannelstatistics
-imagick_getimageclipmask
-imagick_getimagecolormapcolor
-imagick_getimagecolors
-imagick_getimagecolorspace
-imagick_getimagecompose
-imagick_getimagecompression
-imagick_getimagecompressionquality
-imagick_getimagedelay
-imagick_getimagedepth
-imagick_getimagedispose
-imagick_getimagedistortion
-imagick_getimageextrema
-imagick_getimagefilename
-imagick_getimageformat
-imagick_getimagegamma
-imagick_getimagegeometry
-imagick_getimagegravity
-imagick_getimagegreenprimary
-imagick_getimageheight
-imagick_getimagehistogram
-imagick_getimageindex
-imagick_getimageinterlacescheme
-imagick_getimageinterpolatemethod
-imagick_getimageiterations
-imagick_getimagelength
-imagick_getimagemagicklicense
-imagick_getimagematte
-imagick_getimagemattecolor
-imagick_getimageorientation
-imagick_getimagepage
-imagick_getimagepixelcolor
-imagick_getimageprofile
-imagick_getimageprofiles
-imagick_getimageproperties
-imagick_getimageproperty
-imagick_getimageredprimary
-imagick_getimageregion
-imagick_getimagerenderingintent
-imagick_getimageresolution
-imagick_getimagesblob
-imagick_getimagescene
-imagick_getimagesignature
-imagick_getimagesize
-imagick_getimagetickspersecond
-imagick_getimagetotalinkdensity
-imagick_getimagetype
-imagick_getimageunits
-imagick_getimagevirtualpixelmethod
-imagick_getimagewhitepoint
-imagick_getimagewidth
-imagick_getinterlacescheme
-imagick_getiteratorindex
-imagick_getnumberimages
-imagick_getoption
-imagick_getpackagename
-imagick_getpage
-imagick_getpixeliterator
-imagick_getpixelregioniterator
-imagick_getpointsize
-imagick_getquantumdepth
-imagick_getquantumrange
-imagick_getreleasedate
-imagick_getresource
-imagick_getresourcelimit
-imagick_getsamplingfactors
-imagick_getsize
-imagick_getsizeoffset
-imagick_getversion
-imagick_hasnextimage
-imagick_haspreviousimage
-imagick_identifyimage
-imagick_implodeimage
-imagick_labelimage
-imagick_levelimage
-imagick_linearstretchimage
-imagick_liquidrescaleimage
-imagick_magnifyimage
-imagick_mapimage
-imagick_mattefloodfillimage
-imagick_medianfilterimage
-imagick_mergeimagelayers
-imagick_minifyimage
-imagick_modulateimage
-imagick_montageimage
-imagick_morphimages
-imagick_mosaicimages
-imagick_motionblurimage
-imagick_negateimage
-imagick_newimage
-imagick_newpseudoimage
-imagick_nextimage
-imagick_normalizeimage
-imagick_oilpaintimage
-imagick_opaquepaintimage
-imagick_optimizeimagelayers
-imagick_orderedposterizeimage
-imagick_paintfloodfillimage
-imagick_paintopaqueimage
-imagick_painttransparentimage
-imagick_pingimage
-imagick_pingimageblob
-imagick_pingimagefile
-imagickpixel
-imagickpixel_clear
-imagickpixel_construct
-imagickpixel_destroy
-imagickpixel_getcolor
-imagickpixel_getcolorasstring
-imagickpixel_getcolorcount
-imagickpixel_getcolorvalue
-imagickpixel_gethsl
-imagickpixel_issimilar
-imagickpixeliterator
-imagickpixeliterator_clear
-imagickpixeliterator_construct
-imagickpixeliterator_destroy
-imagickpixeliterator_getcurrentiteratorrow
-imagickpixeliterator_getiteratorrow
-imagickpixeliterator_getnextiteratorrow
-imagickpixeliterator_getpreviousiteratorrow
-imagickpixeliterator_newpixeliterator
-imagickpixeliterator_newpixelregioniterator
-imagickpixeliterator_resetiterator
-imagickpixeliterator_setiteratorfirstrow
-imagickpixeliterator_setiteratorlastrow
-imagickpixeliterator_setiteratorrow
-imagickpixeliterator_synciterator
-imagickpixel_setcolor
-imagickpixel_setcolorvalue
-imagickpixel_sethsl
-imagick_polaroidimage
-imagick_posterizeimage
-imagick_previewimages
-imagick_previousimage
-imagick_profileimage
-imagick_quantizeimage
-imagick_quantizeimages
-imagick_queryfontmetrics
-imagick_queryfonts
-imagick_queryformats
-imagick_radialblurimage
-imagick_raiseimage
-imagick_randomthresholdimage
-imagick_readimage
-imagick_readimageblob
-imagick_readimagefile
-imagick_recolorimage
-imagick_reducenoiseimage
-imagick_removeimage
-imagick_removeimageprofile
-imagick_render
-imagick_resampleimage
-imagick_resetimagepage
-imagick_resizeimage
-imagick_rollimage
-imagick_rotateimage
-imagick_roundcorners
-imagick_sampleimage
-imagick_scaleimage
-imagick_separateimagechannel
-imagick_sepiatoneimage
-imagick_setbackgroundcolor
-imagick_setcolorspace
-imagick_setcompression
-imagick_setcompressionquality
-imagick_setfilename
-imagick_setfirstiterator
-imagick_setfont
-imagick_setformat
-imagick_setgravity
-imagick_setimage
-imagick_setimagealphachannel
-imagick_setimageartifact
-imagick_setimagebackgroundcolor
-imagick_setimagebias
-imagick_setimageblueprimary
-imagick_setimagebordercolor
-imagick_setimagechanneldepth
-imagick_setimageclipmask
-imagick_setimagecolormapcolor
-imagick_setimagecolorspace
-imagick_setimagecompose
-imagick_setimagecompression
-imagick_setimagecompressionquality
-imagick_setimagedelay
-imagick_setimagedepth
-imagick_setimagedispose
-imagick_setimageextent
-imagick_setimagefilename
-imagick_setimageformat
-imagick_setimagegamma
-imagick_setimagegravity
-imagick_setimagegreenprimary
-imagick_setimageindex
-imagick_setimageinterlacescheme
-imagick_setimageinterpolatemethod
-imagick_setimageiterations
-imagick_setimagematte
-imagick_setimagemattecolor
-imagick_setimageopacity
-imagick_setimageorientation
-imagick_setimagepage
-imagick_setimageprofile
-imagick_setimageproperty
-imagick_setimageredprimary
-imagick_setimagerenderingintent
-imagick_setimageresolution
-imagick_setimagescene
-imagick_setimagetickspersecond
-imagick_setimagetype
-imagick_setimageunits
-imagick_setimagevirtualpixelmethod
-imagick_setimagewhitepoint
-imagick_setinterlacescheme
-imagick_setiteratorindex
-imagick_setlastiterator
-imagick_setoption
-imagick_setpage
-imagick_setpointsize
-imagick_setresolution
-imagick_setresourcelimit
-imagick_setsamplingfactors
-imagick_setsize
-imagick_setsizeoffset
-imagick_settype
-imagick_shadeimage
-imagick_shadowimage
-imagick_sharpenimage
-imagick_shaveimage
-imagick_shearimage
-imagick_sigmoidalcontrastimage
-imagick_sketchimage
-imagick_solarizeimage
-imagick_spliceimage
-imagick_spreadimage
-imagick_steganoimage
-imagick_stereoimage
-imagick_stripimage
-imagick_swirlimage
-imagick_textureimage
-imagick_thresholdimage
-imagick_thumbnailimage
-imagick_tintimage
-imagick_transformimage
-imagick_transparentpaintimage
-imagick_transposeimage
-imagick_transverseimage
-imagick_trimimage
-imagick_uniqueimagecolors
-imagick_unsharpmaskimage
-imagick_valid
-imagick_vignetteimage
-imagick_waveimage
-imagick_whitethresholdimage
-imagick_writeimage
-imagick_writeimagefile
-imagick_writeimages
-imagick_writeimagesfile
-imap_8bit
-imap_alerts
-imap_append
-imap_base64
-imap_binary
-imap_body
-imap_bodystruct
-imap_check
-imap_clearflag_full
-imap_close
-imap_create
-imap_createmailbox
-imap_delete
-imap_deletemailbox
-imap_errors
-imap_expunge
-imap_fetchbody
-imap_fetchheader
-imap_fetchmime
-imap_fetch_overview
-imap_fetchstructure
-imap_fetchtext
-imap_gc
-imap_getacl
-imap_getmailboxes
-imap_get_quota
-imap_get_quotaroot
-imap_getsubscribed
-imap_header
-imap_headerinfo
-imap_headers
-imap_last_error
-imap_list
-imap_listmailbox
-imap_listscan
-imap_listsubscribed
-imap_lsub
-imap_mail
-imap_mailboxmsginfo
-imap_mail_compose
-imap_mail_copy
-imap_mail_move
-imap_mime_header_decode
-imap_msgno
-imap_num_msg
-imap_num_recent
-imap_open
-imap_ping
-imap_qprint
-imap_rename
-imap_renamemailbox
-imap_reopen
-imap_rfc822_parse_adrlist
-imap_rfc822_parse_headers
-imap_rfc822_write_address
-imap_savebody
-imap_scan
-imap_scanmailbox
-imap_search
-imap_setacl
-imap_setflag_full
-imap_set_quota
-imap_sort
-imap_status
-imap_subscribe
-imap_thread
-imap_timeout
-imap_uid
-imap_undelete
-imap_unsubscribe
-imap_utf7_decode
-imap_utf7_encode
-imap_utf8
-implements
-implementsinterface
-implode
-import_request_variables
-in_array
-include
-include_once
-inclued_get_data
-inet_ntop
-inet_pton
-infiniteiterator
-ingres_autocommit
-ingres_autocommit_state
-ingres_charset
-ingres_close
-ingres_commit
-ingres_connect
-ingres_cursor
-ingres_errno
-ingres_error
-ingres_errsqlstate
-ingres_escape_string
-ingres_execute
-ingres_fetch_array
-ingres_fetch_assoc
-ingres_fetch_object
-ingres_fetch_proc_return
-ingres_fetch_row
-ingres_field_length
-ingres_field_name
-ingres_field_nullable
-ingres_field_precision
-ingres_field_scale
-ingres_field_type
-ingres_free_result
-ingres_next_error
-ingres_num_fields
-ingres_num_rows
-ingres_pconnect
-ingres_prepare
-ingres_query
-ingres_result_seek
-ingres_rollback
-ingres_set_environment
-ingres_unbuffered_query
-ini_alter
-ini_get
-ini_get_all
-ini_restore
-ini_set
-innamespace
-inotify_add_watch
-inotify_init
-inotify_queue_len
-inotify_read
-inotify_rm_watch
-instanceof
-interface
-interface_exists
-intldateformatter
-intl_error_name
-intl_get_error_code
-intl_get_error_message
-intl_is_failure
-intval
-invalidargumentexception
-invoke
-__invoke()
-invokeargs
-ip2long
-iptcembed
-iptcparse
-is_a
-isabstract
-is_array
-is_bool
-is_callable
-iscloneable
-is_dir
-isdisabled
-is_double
-is_executable
-is_file
-isfinal
-is_finite
-is_float
-is_infinite
-isinstance
-isinstantiable
-is_int
-is_integer
-isinterface
-isinternal
-isiterateable
-is_link
-is_long
-is_nan
-is_null
-is_numeric
-is_object
-is_readable
-is_real
-is_resource
-is_scalar
-isset
-__isset()
-is_soap_fault
-is_string
-issubclassof
-is_subclass_of
-istrait
-is_uploaded_file
-isuserdefined
-is_writable
-is_writeable
-iterator
-iteratoraggregate
-iterator_apply
-iterator_count
-iteratoriterator
-iterator_to_array
-java_last_exception_clear
-java_last_exception_get
-jddayofweek
-jdmonthname
-jdtofrench
-jdtogregorian
-jdtojewish
-jdtojulian
-jdtounix
-jewishtojd
-join
-jpeg2wbmp
-json_decode
-json_encode
-json_last_error
-jsonserializable
-judy
-judy_type
-judy_version
-juliantojd
-kadm5_chpass_principal
-kadm5_create_principal
-kadm5_delete_principal
-kadm5_destroy
-kadm5_flush
-kadm5_get_policies
-kadm5_get_principal
-kadm5_get_principals
-kadm5_init_with_password
-kadm5_modify_principal
-key
-krsort
-ksort
-ktaglib_id3v2_attachedpictureframe
-ktaglib_id3v2_frame
-ktaglib_id3v2_tag
-ktaglib_mpeg_audioproperties
-ktaglib_mpeg_file
-ktaglib_tag
-lcfirst
-lcg_value
-lchgrp
-lchown
-ldap_8859_to_t61
-ldap_add
-ldap_bind
-ldap_close
-ldap_compare
-ldap_connect
-ldap_count_entries
-ldap_delete
-ldap_dn2ufn
-ldap_err2str
-ldap_errno
-ldap_error
-ldap_explode_dn
-ldap_first_attribute
-ldap_first_entry
-ldap_first_reference
-ldap_free_result
-ldap_get_attributes
-ldap_get_dn
-ldap_get_entries
-ldap_get_option
-ldap_get_values
-ldap_get_values_len
-ldap_list
-ldap_mod_add
-ldap_mod_del
-ldap_modify
-ldap_mod_replace
-ldap_next_attribute
-ldap_next_entry
-ldap_next_reference
-ldap_parse_reference
-ldap_parse_result
-ldap_read
-ldap_rename
-ldap_sasl_bind
-ldap_search
-ldap_set_option
-ldap_set_rebind_proc
-ldap_sort
-ldap_start_tls
-ldap_t61_to_8859
-ldap_unbind
-lengthexception
-levenshtein
-libxml_clear_errors
-libxml_disable_entity_loader
-libxmlerror
-libxml_get_errors
-libxml_get_last_error
-libxml_set_streams_context
-libxml_use_internal_errors
-limititerator
-__LINE__
-link
-linkinfo
-list
-locale
-localeconv
-localtime
-log
-log10
-log1p
-logicexception
-long2ip
-lstat
-ltrim
-lua
-luaclosure
-lzf_compress
-lzf_decompress
-lzf_optimized_for
-magic_quotes_runtime
-mail
-mailparse_determine_best_xfer_encoding
-mailparse_msg_create
-mailparse_msg_extract_part
-mailparse_msg_extract_part_file
-mailparse_msg_extract_whole_part_file
-mailparse_msg_free
-mailparse_msg_get_part
-mailparse_msg_get_part_data
-mailparse_msg_get_structure
-mailparse_msg_parse
-mailparse_msg_parse_file
-mailparse_rfc822_parse_addresses
-mailparse_stream_encode
-mailparse_uudecode_all
-main
-max
-maxdb_affected_rows
-maxdb_autocommit
-maxdb_bind_param
-maxdb_bind_result
-maxdb_change_user
-maxdb_character_set_name
-maxdb_client_encoding
-maxdb_close
-maxdb_close_long_data
-maxdb_commit
-maxdb_connect
-maxdb_connect_errno
-maxdb_connect_error
-maxdb_data_seek
-maxdb_debug
-maxdb_disable_reads_from_master
-maxdb_disable_rpl_parse
-maxdb_dump_debug_info
-maxdb_embedded_connect
-maxdb_enable_reads_from_master
-maxdb_enable_rpl_parse
-maxdb_errno
-maxdb_error
-maxdb_escape_string
-maxdb_execute
-maxdb_fetch
-maxdb_fetch_array
-maxdb_fetch_assoc
-maxdb_fetch_field
-maxdb_fetch_field_direct
-maxdb_fetch_fields
-maxdb_fetch_lengths
-maxdb_fetch_object
-maxdb_fetch_row
-maxdb_field_count
-maxdb_field_seek
-maxdb_field_tell
-maxdb_free_result
-maxdb_get_client_info
-maxdb_get_client_version
-maxdb_get_host_info
-maxdb_get_metadata
-maxdb_get_proto_info
-maxdb_get_server_info
-maxdb_get_server_version
-maxdb_info
-maxdb_init
-maxdb_insert_id
-maxdb_kill
-maxdb_master_query
-maxdb_more_results
-maxdb_multi_query
-maxdb_next_result
-maxdb_num_fields
-maxdb_num_rows
-maxdb_options
-maxdb_param_count
-maxdb_ping
-maxdb_prepare
-maxdb_query
-maxdb_real_connect
-maxdb_real_escape_string
-maxdb_real_query
-maxdb_report
-maxdb_rollback
-maxdb_rpl_parse_enabled
-maxdb_rpl_probe
-maxdb_rpl_query_type
-maxdb_select_db
-maxdb_send_long_data
-maxdb_send_query
-maxdb_server_end
-maxdb_server_init
-maxdb_set_opt
-maxdb_sqlstate
-maxdb_ssl_set
-maxdb_stat
-maxdb_stmt_affected_rows
-maxdb_stmt_bind_param
-maxdb_stmt_bind_result
-maxdb_stmt_close
-maxdb_stmt_close_long_data
-maxdb_stmt_data_seek
-maxdb_stmt_errno
-maxdb_stmt_error
-maxdb_stmt_execute
-maxdb_stmt_fetch
-maxdb_stmt_free_result
-maxdb_stmt_init
-maxdb_stmt_num_rows
-maxdb_stmt_param_count
-maxdb_stmt_prepare
-maxdb_stmt_reset
-maxdb_stmt_result_metadata
-maxdb_stmt_send_long_data
-maxdb_stmt_sqlstate
-maxdb_stmt_store_result
-maxdb_store_result
-maxdb_thread_id
-maxdb_thread_safe
-maxdb_use_result
-maxdb_warning_count
-mb_check_encoding
-mb_convert_case
-mb_convert_encoding
-mb_convert_kana
-mb_convert_variables
-mb_decode_mimeheader
-mb_decode_numericentity
-mb_detect_encoding
-mb_detect_order
-mb_encode_mimeheader
-mb_encode_numericentity
-mb_encoding_aliases
-mb_ereg
-mb_eregi
-mb_eregi_replace
-mb_ereg_match
-mb_ereg_replace
-mb_ereg_search
-mb_ereg_search_getpos
-mb_ereg_search_getregs
-mb_ereg_search_init
-mb_ereg_search_pos
-mb_ereg_search_regs
-mb_ereg_search_setpos
-mb_get_info
-mb_http_input
-mb_http_output
-mb_internal_encoding
-mb_language
-mb_list_encodings
-mb_output_handler
-mb_parse_str
-mb_preferred_mime_name
-mb_regex_encoding
-mb_regex_set_options
-mb_send_mail
-mb_split
-mb_strcut
-mb_strimwidth
-mb_stripos
-mb_stristr
-mb_strlen
-mb_strpos
-mb_strrchr
-mb_strrichr
-mb_strripos
-mb_strrpos
-mb_strstr
-mb_strtolower
-mb_strtoupper
-mb_strwidth
-mb_substitute_character
-mb_substr
-mb_substr_count
-m_checkstatus
-m_completeauthorizations
-m_connect
-m_connectionerror
-mcrypt_cbc
-mcrypt_cfb
-mcrypt_create_iv
-mcrypt_decrypt
-mcrypt_ecb
-mcrypt_enc_get_algorithms_name
-mcrypt_enc_get_block_size
-mcrypt_enc_get_iv_size
-mcrypt_enc_get_key_size
-mcrypt_enc_get_modes_name
-mcrypt_enc_get_supported_key_sizes
-mcrypt_enc_is_block_algorithm
-mcrypt_enc_is_block_algorithm_mode
-mcrypt_enc_is_block_mode
-mcrypt_encrypt
-mcrypt_enc_self_test
-mcrypt_generic
-mcrypt_generic_deinit
-mcrypt_generic_end
-mcrypt_generic_init
-mcrypt_get_block_size
-mcrypt_get_cipher_name
-mcrypt_get_iv_size
-mcrypt_get_key_size
-mcrypt_list_algorithms
-mcrypt_list_modes
-mcrypt_module_close
-mcrypt_module_get_algo_block_size
-mcrypt_module_get_algo_key_size
-mcrypt_module_get_supported_key_sizes
-mcrypt_module_is_block_algorithm
-mcrypt_module_is_block_algorithm_mode
-mcrypt_module_is_block_mode
-mcrypt_module_open
-mcrypt_module_self_test
-mcrypt_ofb
-md5
-md5_file
-mdecrypt_generic
-m_deletetrans
-m_destroyconn
-m_destroyengine
-memcache
-memcached
-memcache_debug
-memory_get_peak_usage
-memory_get_usage
-messageformatter
-metaphone
-__METHOD__
-method_exists
-m_getcell
-m_getcellbynum
-m_getcommadelimited
-m_getheader
-mhash
-mhash_count
-mhash_get_block_size
-mhash_get_hash_name
-mhash_keygen_s2k
-microtime
-mime_content_type
-min
-ming_keypress
-ming_setcubicthreshold
-ming_setscale
-ming_setswfcompression
-ming_useconstants
-ming_useswfversion
-m_initconn
-m_initengine
-m_iscommadelimited
-mkdir
-mktime
-m_maxconntimeout
-m_monitor
-m_numcolumns
-m_numrows
-money_format
-mongo
-mongobindata
-mongocode
-mongocollection
-mongoconnectionexception
-mongocursor
-mongocursorexception
-mongocursortimeoutexception
-mongodate
-mongodb
-mongodbref
-mongoexception
-mongogridfs
-mongogridfscursor
-mongogridfsexception
-mongogridfsfile
-mongoid
-mongoint32
-mongoint64
-mongolog
-mongomaxkey
-mongominkey
-mongopool
-mongoregex
-mongotimestamp
-move_uploaded_file
-m_parsecommadelimited
-mqseries_back
-mqseries_begin
-mqseries_close
-mqseries_cmit
-mqseries_conn
-mqseries_connx
-mqseries_disc
-mqseries_get
-mqseries_inq
-mqseries_open
-mqseries_put
-mqseries_put1
-mqseries_set
-mqseries_strerror
-m_responsekeys
-m_responseparam
-m_returnstatus
-msession_connect
-msession_count
-msession_create
-msession_destroy
-msession_disconnect
-msession_find
-msession_get
-msession_get_array
-msession_get_data
-msession_inc
-msession_list
-msession_listvar
-msession_lock
-msession_plugin
-msession_randstr
-msession_set
-msession_set_array
-msession_set_data
-msession_timeout
-msession_uniq
-msession_unlock
-m_setblocking
-m_setdropfile
-m_setip
-m_setssl
-m_setssl_cafile
-m_setssl_files
-m_settimeout
-msg_get_queue
-msg_queue_exists
-msg_receive
-msg_remove_queue
-msg_send
-msg_set_queue
-msg_stat_queue
-msql
-msql_affected_rows
-msql_close
-msql_connect
-msql_createdb
-msql_create_db
-msql_data_seek
-msql_dbname
-msql_db_query
-msql_drop_db
-msql_error
-msql_fetch_array
-msql_fetch_field
-msql_fetch_object
-msql_fetch_row
-msql_fieldflags
-msql_field_flags
-msql_fieldlen
-msql_field_len
-msql_fieldname
-msql_field_name
-msql_field_seek
-msql_fieldtable
-msql_field_table
-msql_fieldtype
-msql_field_type
-msql_free_result
-msql_list_dbs
-msql_list_fields
-msql_list_tables
-msql_numfields
-msql_num_fields
-msql_numrows
-msql_num_rows
-msql_pconnect
-msql_query
-msql_regcase
-msql_result
-msql_select_db
-msql_tablename
-m_sslcert_gen_hash
-mssql_bind
-mssql_close
-mssql_connect
-mssql_data_seek
-mssql_execute
-mssql_fetch_array
-mssql_fetch_assoc
-mssql_fetch_batch
-mssql_fetch_field
-mssql_fetch_object
-mssql_fetch_row
-mssql_field_length
-mssql_field_name
-mssql_field_seek
-mssql_field_type
-mssql_free_result
-mssql_free_statement
-mssql_get_last_message
-mssql_guid_string
-mssql_init
-mssql_min_error_severity
-mssql_min_message_severity
-mssql_next_result
-mssql_num_fields
-mssql_num_rows
-mssql_pconnect
-mssql_query
-mssql_result
-mssql_rows_affected
-mssql_select_db
-mt_getrandmax
-mt_rand
-m_transactionssent
-m_transinqueue
-m_transkeyval
-m_transnew
-m_transsend
-mt_srand
-multipleiterator
-m_uwait
-m_validateidentifier
-m_verifyconnection
-m_verifysslcert
-mysql_affected_rows
-mysql_client_encoding
-mysql_close
-mysql_connect
-mysql_create_db
-mysql_data_seek
-mysql_db_name
-mysql_db_query
-mysql_drop_db
-mysql_errno
-mysql_error
-mysql_escape_string
-mysql_fetch_array
-mysql_fetch_assoc
-mysql_fetch_field
-mysql_fetch_lengths
-mysql_fetch_object
-mysql_fetch_row
-mysql_field_flags
-mysql_field_len
-mysql_field_name
-mysql_field_seek
-mysql_field_table
-mysql_field_type
-mysql_free_result
-mysql_get_client_info
-mysql_get_host_info
-mysql_get_proto_info
-mysql_get_server_info
-mysqli
-mysqli_bind_param
-mysqli_bind_result
-mysqli_client_encoding
-mysqli_connect
-mysqli_disable_reads_from_master
-mysqli_disable_rpl_parse
-mysqli_driver
-mysqli_enable_reads_from_master
-mysqli_enable_rpl_parse
-mysqli_escape_string
-mysqli_execute
-mysqli_fetch
-mysqli_get_metadata
-mysqli_master_query
-mysql_info
-mysql_insert_id
-mysqli_param_count
-mysqli_report
-mysqli_result
-mysqli_rpl_parse_enabled
-mysqli_rpl_probe
-mysqli_rpl_query_type
-mysqli_send_long_data
-mysqli_send_query
-mysqli_set_opt
-mysqli_slave_query
-mysqli_stmt
-mysqli_warning
-mysql_list_dbs
-mysql_list_fields
-mysql_list_processes
-mysql_list_tables
-mysqlnd_ms_get_stats
-mysqlnd_ms_query_is_select
-mysqlnd_ms_set_user_pick_server
-mysqlnd_qc_change_handler
-mysqlnd_qc_clear_cache
-mysqlnd_qc_get_cache_info
-mysqlnd_qc_get_core_stats
-mysqlnd_qc_get_handler
-mysqlnd_qc_get_query_trace_log
-mysqlnd_qc_set_user_handlers
-mysql_num_fields
-mysql_num_rows
-mysql_pconnect
-mysql_ping
-mysql_query
-mysql_real_escape_string
-mysql_result
-mysql_select_db
-mysql_set_charset
-mysql_stat
-mysql_tablename
-mysql_thread_id
-mysql_unbuffered_query
-namespace
-__NAMESPACE__
-natcasesort
-natsort
-ncurses_addch
-ncurses_addchnstr
-ncurses_addchstr
-ncurses_addnstr
-ncurses_addstr
-ncurses_assume_default_colors
-ncurses_attroff
-ncurses_attron
-ncurses_attrset
-ncurses_baudrate
-ncurses_beep
-ncurses_bkgd
-ncurses_bkgdset
-ncurses_border
-ncurses_bottom_panel
-ncurses_can_change_color
-ncurses_cbreak
-ncurses_clear
-ncurses_clrtobot
-ncurses_clrtoeol
-ncurses_color_content
-ncurses_color_set
-ncurses_curs_set
-ncurses_define_key
-ncurses_def_prog_mode
-ncurses_def_shell_mode
-ncurses_delay_output
-ncurses_delch
-ncurses_deleteln
-ncurses_del_panel
-ncurses_delwin
-ncurses_doupdate
-ncurses_echo
-ncurses_echochar
-ncurses_end
-ncurses_erase
-ncurses_erasechar
-ncurses_filter
-ncurses_flash
-ncurses_flushinp
-ncurses_getch
-ncurses_getmaxyx
-ncurses_getmouse
-ncurses_getyx
-ncurses_halfdelay
-ncurses_has_colors
-ncurses_has_ic
-ncurses_has_il
-ncurses_has_key
-ncurses_hide_panel
-ncurses_hline
-ncurses_inch
-ncurses_init
-ncurses_init_color
-ncurses_init_pair
-ncurses_insch
-ncurses_insdelln
-ncurses_insertln
-ncurses_insstr
-ncurses_instr
-ncurses_isendwin
-ncurses_keyok
-ncurses_keypad
-ncurses_killchar
-ncurses_longname
-ncurses_meta
-ncurses_mouseinterval
-ncurses_mousemask
-ncurses_mouse_trafo
-ncurses_move
-ncurses_move_panel
-ncurses_mvaddch
-ncurses_mvaddchnstr
-ncurses_mvaddchstr
-ncurses_mvaddnstr
-ncurses_mvaddstr
-ncurses_mvcur
-ncurses_mvdelch
-ncurses_mvgetch
-ncurses_mvhline
-ncurses_mvinch
-ncurses_mvvline
-ncurses_mvwaddstr
-ncurses_napms
-ncurses_newpad
-ncurses_new_panel
-ncurses_newwin
-ncurses_nl
-ncurses_nocbreak
-ncurses_noecho
-ncurses_nonl
-ncurses_noqiflush
-ncurses_noraw
-ncurses_pair_content
-ncurses_panel_above
-ncurses_panel_below
-ncurses_panel_window
-ncurses_pnoutrefresh
-ncurses_prefresh
-ncurses_putp
-ncurses_qiflush
-ncurses_raw
-ncurses_refresh
-ncurses_replace_panel
-ncurses_reset_prog_mode
-ncurses_reset_shell_mode
-ncurses_resetty
-ncurses_savetty
-ncurses_scr_dump
-ncurses_scr_init
-ncurses_scrl
-ncurses_scr_restore
-ncurses_scr_set
-ncurses_show_panel
-ncurses_slk_attr
-ncurses_slk_attroff
-ncurses_slk_attron
-ncurses_slk_attrset
-ncurses_slk_clear
-ncurses_slk_color
-ncurses_slk_init
-ncurses_slk_noutrefresh
-ncurses_slk_refresh
-ncurses_slk_restore
-ncurses_slk_set
-ncurses_slk_touch
-ncurses_standend
-ncurses_standout
-ncurses_start_color
-ncurses_termattrs
-ncurses_termname
-ncurses_timeout
-ncurses_top_panel
-ncurses_typeahead
-ncurses_ungetch
-ncurses_ungetmouse
-ncurses_update_panels
-ncurses_use_default_colors
-ncurses_use_env
-ncurses_use_extended_names
-ncurses_vidattr
-ncurses_vline
-ncurses_waddch
-ncurses_waddstr
-ncurses_wattroff
-ncurses_wattron
-ncurses_wattrset
-ncurses_wborder
-ncurses_wclear
-ncurses_wcolor_set
-ncurses_werase
-ncurses_wgetch
-ncurses_whline
-ncurses_wmouse_trafo
-ncurses_wmove
-ncurses_wnoutrefresh
-ncurses_wrefresh
-ncurses_wstandend
-ncurses_wstandout
-ncurses_wvline
-new
-newinstance
-newinstanceargs
-newinstancewithoutconstructor
-newt_bell
-newt_button
-newt_button_bar
-newt_centered_window
-newt_checkbox
-newt_checkbox_get_value
-newt_checkbox_set_flags
-newt_checkbox_set_value
-newt_checkbox_tree
-newt_checkbox_tree_add_item
-newt_checkbox_tree_find_item
-newt_checkbox_tree_get_current
-newt_checkbox_tree_get_entry_value
-newt_checkbox_tree_get_multi_selection
-newt_checkbox_tree_get_selection
-newt_checkbox_tree_multi
-newt_checkbox_tree_set_current
-newt_checkbox_tree_set_entry
-newt_checkbox_tree_set_entry_value
-newt_checkbox_tree_set_width
-newt_clear_key_buffer
-newt_cls
-newt_compact_button
-newt_component_add_callback
-newt_component_takes_focus
-newt_create_grid
-newt_cursor_off
-newt_cursor_on
-newt_delay
-newt_draw_form
-newt_draw_root_text
-newt_entry
-newt_entry_get_value
-newt_entry_set
-newt_entry_set_filter
-newt_entry_set_flags
-newt_finished
-newt_form
-newt_form_add_component
-newt_form_add_components
-newt_form_add_hot_key
-newt_form_destroy
-newt_form_get_current
-newt_form_run
-newt_form_set_background
-newt_form_set_height
-newt_form_set_size
-newt_form_set_timer
-newt_form_set_width
-newt_form_watch_fd
-newt_get_screen_size
-newt_grid_add_components_to_form
-newt_grid_basic_window
-newt_grid_free
-newt_grid_get_size
-newt_grid_h_close_stacked
-newt_grid_h_stacked
-newt_grid_place
-newt_grid_set_field
-newt_grid_simple_window
-newt_grid_v_close_stacked
-newt_grid_v_stacked
-newt_grid_wrapped_window
-newt_grid_wrapped_window_at
-newt_init
-newt_label
-newt_label_set_text
-newt_listbox
-newt_listbox_append_entry
-newt_listbox_clear
-newt_listbox_clear_selection
-newt_listbox_delete_entry
-newt_listbox_get_current
-newt_listbox_get_selection
-newt_listbox_insert_entry
-newt_listbox_item_count
-newt_listbox_select_item
-newt_listbox_set_current
-newt_listbox_set_current_by_key
-newt_listbox_set_data
-newt_listbox_set_entry
-newt_listbox_set_width
-newt_listitem
-newt_listitem_get_data
-newt_listitem_set
-newt_open_window
-newt_pop_help_line
-newt_pop_window
-newt_push_help_line
-newt_radiobutton
-newt_radio_get_current
-newt_redraw_help_line
-newt_reflow_text
-newt_refresh
-newt_resize_screen
-newt_resume
-newt_run_form
-newt_scale
-newt_scale_set
-newt_scrollbar_set
-newt_set_help_callback
-newt_set_suspend_callback
-newt_suspend
-newt_textbox
-newt_textbox_get_num_lines
-newt_textbox_reflowed
-newt_textbox_set_height
-newt_textbox_set_text
-newt_vertical_scrollbar
-newt_wait_for_key
-newt_win_choice
-newt_win_entries
-newt_win_menu
-newt_win_message
-newt_win_messagev
-newt_win_ternary
-next
-ngettext
-nl2br
-nl_langinfo
-norewinditerator
-normalizer
-notes_body
-notes_copy_db
-notes_create_db
-notes_create_note
-notes_drop_db
-notes_find_note
-notes_header_info
-notes_list_msgs
-notes_mark_read
-notes_mark_unread
-notes_nav_create
-notes_search
-notes_unread
-notes_version
-nsapi_request_headers
-nsapi_response_headers
-nsapi_virtual
-nthmac
-number_format
-numberformatter
-oauth
-oauthexception
-oauth_get_sbs
-oauthprovider
-oauth_urlencode
-ob_clean
-ob_deflatehandler
-ob_end_clean
-ob_end_flush
-ob_etaghandler
-ob_flush
-ob_get_clean
-ob_get_contents
-ob_get_flush
-ob_get_length
-ob_get_level
-ob_get_status
-ob_gzhandler
-ob_iconv_handler
-ob_implicit_flush
-ob_inflatehandler
-ob_list_handlers
-ob_start
-ob_tidyhandler
-oci_bind_array_by_name
-ocibindbyname
-oci_bind_by_name
-ocicancel
-oci_cancel
-oci_client_version
-oci_close
-ocicloselob
-ocicollappend
-ocicollassign
-ocicollassignelem
-oci_collection_append
-oci_collection_assign
-oci_collection_element_assign
-oci_collection_element_get
-oci_collection_free
-oci_collection_max
-oci_collection_size
-oci_collection_trim
-ocicollgetelem
-ocicollmax
-ocicollsize
-ocicolltrim
-ocicolumnisnull
-ocicolumnname
-ocicolumnprecision
-ocicolumnscale
-ocicolumnsize
-ocicolumntype
-ocicolumntyperaw
-ocicommit
-oci_commit
-oci_connect
-ocidefinebyname
-oci_define_by_name
-ocierror
-oci_error
-ociexecute
-oci_execute
-ocifetch
-oci_fetch
-oci_fetch_all
-oci_fetch_array
-oci_fetch_assoc
-ocifetchinto
-oci_fetch_object
-oci_fetch_row
-ocifetchstatement
-oci_field_is_null
-oci_field_name
-oci_field_precision
-oci_field_scale
-oci_field_size
-oci_field_type
-oci_field_type_raw
-ocifreecollection
-ocifreecursor
-ocifreedesc
-ocifreestatement
-oci_free_statement
-ociinternaldebug
-oci_internal_debug
-ociloadlob
-oci_lob_append
-oci_lob_close
-oci_lob_copy
-oci_lob_eof
-oci_lob_erase
-oci_lob_export
-oci_lob_flush
-oci_lob_free
-oci_lob_getbuffering
-oci_lob_import
-oci_lob_is_equal
-oci_lob_load
-oci_lob_read
-oci_lob_rewind
-oci_lob_save
-oci_lob_savefile
-oci_lob_seek
-oci_lob_setbuffering
-oci_lob_size
-oci_lob_tell
-oci_lob_truncate
-oci_lob_write
-oci_lob_writetemporary
-oci_lob_writetofile
-ocilogoff
-ocilogon
-ocinewcollection
-oci_new_collection
-oci_new_connect
-ocinewcursor
-oci_new_cursor
-ocinewdescriptor
-oci_new_descriptor
-ocinlogon
-ocinumcols
-oci_num_fields
-oci_num_rows
-ociparse
-oci_parse
-oci_password_change
-oci_pconnect
-ociplogon
-ociresult
-oci_result
-ocirollback
-oci_rollback
-ocirowcount
-ocisavelob
-ocisavelobfile
-ociserverversion
-oci_server_version
-oci_set_action
-oci_set_client_identifier
-oci_set_client_info
-oci_set_edition
-oci_set_module_name
-ocisetprefetch
-oci_set_prefetch
-ocistatementtype
-oci_statement_type
-ociwritelobtofile
-ociwritetemporarylob
-octdec
-odbc_autocommit
-odbc_binmode
-odbc_close
-odbc_close_all
-odbc_columnprivileges
-odbc_columns
-odbc_commit
-odbc_connect
-odbc_cursor
-odbc_data_source
-odbc_do
-odbc_error
-odbc_errormsg
-odbc_exec
-odbc_execute
-odbc_fetch_array
-odbc_fetch_into
-odbc_fetch_object
-odbc_fetch_row
-odbc_field_len
-odbc_field_name
-odbc_field_num
-odbc_field_precision
-odbc_field_scale
-odbc_field_type
-odbc_foreignkeys
-odbc_free_result
-odbc_gettypeinfo
-odbc_longreadlen
-odbc_next_result
-odbc_num_fields
-odbc_num_rows
-odbc_pconnect
-odbc_prepare
-odbc_primarykeys
-odbc_procedurecolumns
-odbc_procedures
-odbc_result
-odbc_result_all
-odbc_rollback
-odbc_setoption
-odbc_specialcolumns
-odbc_statistics
-odbc_tableprivileges
-odbc_tables
-old_function
-openal_buffer_create
-openal_buffer_data
-openal_buffer_destroy
-openal_buffer_get
-openal_buffer_loadwav
-openal_context_create
-openal_context_current
-openal_context_destroy
-openal_context_process
-openal_context_suspend
-openal_device_close
-openal_device_open
-openal_listener_get
-openal_listener_set
-openal_source_create
-openal_source_destroy
-openal_source_get
-openal_source_pause
-openal_source_play
-openal_source_rewind
-openal_source_set
-openal_source_stop
-openal_stream
-opendir
-openlog
-openssl_cipher_iv_length
-openssl_csr_export
-openssl_csr_export_to_file
-openssl_csr_get_public_key
-openssl_csr_get_subject
-openssl_csr_new
-openssl_csr_sign
-openssl_decrypt
-openssl_dh_compute_key
-openssl_digest
-openssl_encrypt
-openssl_error_string
-openssl_free_key
-openssl_get_cipher_methods
-openssl_get_md_methods
-openssl_get_privatekey
-openssl_get_publickey
-openssl_open
-openssl_pkcs12_export
-openssl_pkcs12_export_to_file
-openssl_pkcs12_read
-openssl_pkcs7_decrypt
-openssl_pkcs7_encrypt
-openssl_pkcs7_sign
-openssl_pkcs7_verify
-openssl_pkey_export
-openssl_pkey_export_to_file
-openssl_pkey_free
-openssl_pkey_get_details
-openssl_pkey_get_private
-openssl_pkey_get_public
-openssl_pkey_new
-openssl_private_decrypt
-openssl_private_encrypt
-openssl_public_decrypt
-openssl_public_encrypt
-openssl_random_pseudo_bytes
-openssl_seal
-openssl_sign
-openssl_verify
-openssl_x509_check_private_key
-openssl_x509_checkpurpose
-openssl_x509_export
-openssl_x509_export_to_file
-openssl_x509_free
-openssl_x509_parse
-openssl_x509_read
-or
-ord
-outeriterator
-outofboundsexception
-outofrangeexception
-output_add_rewrite_var
-output_reset_rewrite_vars
-overflowexception
-overload
-override_function
-ovrimos_close
-ovrimos_commit
-ovrimos_connect
-ovrimos_cursor
-ovrimos_exec
-ovrimos_execute
-ovrimos_fetch_into
-ovrimos_fetch_row
-ovrimos_field_len
-ovrimos_field_name
-ovrimos_field_num
-ovrimos_field_type
-ovrimos_free_result
-ovrimos_longreadlen
-ovrimos_num_fields
-ovrimos_num_rows
-ovrimos_prepare
-ovrimos_result
-ovrimos_result_all
-ovrimos_rollback
-pack
-parentiterator
-parse_ini_file
-parse_ini_string
-parsekit_compile_file
-parsekit_compile_string
-parsekit_func_arginfo
-parse_str
-parse_url
-passthru
-pathinfo
-pclose
-pcntl_alarm
-pcntl_exec
-pcntl_fork
-pcntl_getpriority
-pcntl_setpriority
-pcntl_signal
-pcntl_signal_dispatch
-pcntl_sigprocmask
-pcntl_sigtimedwait
-pcntl_sigwaitinfo
-pcntl_wait
-pcntl_waitpid
-pcntl_wexitstatus
-pcntl_wifexited
-pcntl_wifsignaled
-pcntl_wifstopped
-pcntl_wstopsig
-pcntl_wtermsig
-pdf_activate_item
-pdf_add_annotation
-pdf_add_bookmark
-pdf_add_launchlink
-pdf_add_locallink
-pdf_add_nameddest
-pdf_add_note
-pdf_add_outline
-pdf_add_pdflink
-pdf_add_table_cell
-pdf_add_textflow
-pdf_add_thumbnail
-pdf_add_weblink
-pdf_arc
-pdf_arcn
-pdf_attach_file
-pdf_begin_document
-pdf_begin_font
-pdf_begin_glyph
-pdf_begin_item
-pdf_begin_layer
-pdf_begin_page
-pdf_begin_page_ext
-pdf_begin_pattern
-pdf_begin_template
-pdf_begin_template_ext
-pdf_circle
-pdf_clip
-pdf_close
-pdf_close_image
-pdf_closepath
-pdf_closepath_fill_stroke
-pdf_closepath_stroke
-pdf_close_pdi
-pdf_close_pdi_page
-pdf_concat
-pdf_continue_text
-pdf_create_3dview
-pdf_create_action
-pdf_create_annotation
-pdf_create_bookmark
-pdf_create_field
-pdf_create_fieldgroup
-pdf_create_gstate
-pdf_create_pvf
-pdf_create_textflow
-pdf_curveto
-pdf_define_layer
-pdf_delete
-pdf_delete_pvf
-pdf_delete_table
-pdf_delete_textflow
-pdf_encoding_set_char
-pdf_end_document
-pdf_end_font
-pdf_end_glyph
-pdf_end_item
-pdf_end_layer
-pdf_end_page
-pdf_end_page_ext
-pdf_endpath
-pdf_end_pattern
-pdf_end_template
-pdf_fill
-pdf_fill_imageblock
-pdf_fill_pdfblock
-pdf_fill_stroke
-pdf_fill_textblock
-pdf_findfont
-pdf_fit_image
-pdf_fit_pdi_page
-pdf_fit_table
-pdf_fit_textflow
-pdf_fit_textline
-pdf_get_apiname
-pdf_get_buffer
-pdf_get_errmsg
-pdf_get_errnum
-pdf_get_font
-pdf_get_fontname
-pdf_get_fontsize
-pdf_get_image_height
-pdf_get_image_width
-pdf_get_majorversion
-pdf_get_minorversion
-pdf_get_parameter
-pdf_get_pdi_parameter
-pdf_get_pdi_value
-pdf_get_value
-pdf_info_font
-pdf_info_matchbox
-pdf_info_table
-pdf_info_textflow
-pdf_info_textline
-pdf_initgraphics
-pdf_lineto
-pdf_load_3ddata
-pdf_load_font
-pdf_load_iccprofile
-pdf_load_image
-pdf_makespotcolor
-pdf_moveto
-pdf_new
-pdf_open_ccitt
-pdf_open_file
-pdf_open_gif
-pdf_open_image
-pdf_open_image_file
-pdf_open_jpeg
-pdf_open_memory_image
-pdf_open_pdi
-pdf_open_pdi_document
-pdf_open_pdi_page
-pdf_open_tiff
-pdf_pcos_get_number
-pdf_pcos_get_stream
-pdf_pcos_get_string
-pdf_place_image
-pdf_place_pdi_page
-pdf_process_pdi
-pdf_rect
-pdf_restore
-pdf_resume_page
-pdf_rotate
-pdf_save
-pdf_scale
-pdf_set_border_color
-pdf_set_border_dash
-pdf_set_border_style
-pdf_set_char_spacing
-pdf_setcolor
-pdf_setdash
-pdf_setdashpattern
-pdf_set_duration
-pdf_setflat
-pdf_setfont
-pdf_setgray
-pdf_setgray_fill
-pdf_setgray_stroke
-pdf_set_gstate
-pdf_set_horiz_scaling
-pdf_set_info
-pdf_set_info_author
-pdf_set_info_creator
-pdf_set_info_keywords
-pdf_set_info_subject
-pdf_set_info_title
-pdf_set_layer_dependency
-pdf_set_leading
-pdf_setlinecap
-pdf_setlinejoin
-pdf_setlinewidth
-pdf_setmatrix
-pdf_setmiterlimit
-pdf_set_parameter
-pdf_setpolydash
-pdf_setrgbcolor
-pdf_setrgbcolor_fill
-pdf_setrgbcolor_stroke
-pdf_set_text_matrix
-pdf_set_text_pos
-pdf_set_text_rendering
-pdf_set_text_rise
-pdf_set_value
-pdf_set_word_spacing
-pdf_shading
-pdf_shading_pattern
-pdf_shfill
-pdf_show
-pdf_show_boxed
-pdf_show_xy
-pdf_skew
-pdf_stringwidth
-pdf_stroke
-pdf_suspend_page
-pdf_translate
-pdf_utf16_to_utf8
-pdf_utf32_to_utf16
-pdf_utf8_to_utf16
-pdo
-pdo_cubrid_schema
-pdoexception
-pdo_pgsqllobcreate
-pdo_pgsqllobopen
-pdo_pgsqllobunlink
-pdo_sqlitecreateaggregate
-pdo_sqlitecreatefunction
-pdostatement
-pfsockopen
-pg_affected_rows
-pg_cancel_query
-pg_client_encoding
-pg_close
-pg_connect
-pg_connection_busy
-pg_connection_reset
-pg_connection_status
-pg_convert
-pg_copy_from
-pg_copy_to
-pg_dbname
-pg_delete
-pg_end_copy
-pg_escape_bytea
-pg_escape_string
-pg_execute
-pg_fetch_all
-pg_fetch_all_columns
-pg_fetch_array
-pg_fetch_assoc
-pg_fetch_object
-pg_fetch_result
-pg_fetch_row
-pg_field_is_null
-pg_field_name
-pg_field_num
-pg_field_prtlen
-pg_field_size
-pg_field_table
-pg_field_type
-pg_field_type_oid
-pg_free_result
-pg_get_notify
-pg_get_pid
-pg_get_result
-pg_host
-pg_insert
-pg_last_error
-pg_last_notice
-pg_last_oid
-pg_lo_close
-pg_lo_create
-pg_lo_export
-pg_lo_import
-pg_lo_open
-pg_lo_read
-pg_lo_read_all
-pg_lo_seek
-pg_lo_tell
-pg_lo_unlink
-pg_lo_write
-pg_meta_data
-pg_num_fields
-pg_num_rows
-pg_options
-pg_parameter_status
-pg_pconnect
-pg_ping
-pg_port
-pg_prepare
-pg_put_line
-pg_query
-pg_query_params
-pg_result_error
-pg_result_error_field
-pg_result_seek
-pg_result_status
-pg_select
-pg_send_execute
-pg_send_prepare
-pg_send_query
-pg_send_query_params
-pg_set_client_encoding
-pg_set_error_verbosity
-pg_trace
-pg_transaction_status
-pg_tty
-pg_unescape_bytea
-pg_untrace
-pg_update
-pg_version
-Phar
-PharData
-PharException
-PharFileInfo
-php_check_syntax
-phpcredits
-phpinfo
-php_ini_loaded_file
-php_ini_scanned_files
-php_logo_guid
-php_sapi_name
-php_strip_whitespace
-php_uname
-phpversion
-pi
-png2wbmp
-popen
-pos
-posix_access
-posix_ctermid
-posix_errno
-posix_getcwd
-posix_getegid
-posix_geteuid
-posix_getgid
-posix_getgrgid
-posix_getgrnam
-posix_getgroups
-posix_get_last_error
-posix_getlogin
-posix_getpgid
-posix_getpgrp
-posix_getpid
-posix_getppid
-posix_getpwnam
-posix_getpwuid
-posix_getrlimit
-posix_getsid
-posix_getuid
-posix_initgroups
-posix_isatty
-posix_kill
-posix_mkfifo
-posix_mknod
-posix_setegid
-posix_seteuid
-posix_setgid
-posix_setpgid
-posix_setsid
-posix_setuid
-posix_strerror
-posix_times
-posix_ttyname
-posix_uname
-pow
-preg_filter
-preg_grep
-preg_last_error
-preg_match
-preg_match_all
-preg_quote
-preg_replace
-preg_replace_callback
-preg_split
-prev
-print
-printer_abort
-printer_close
-printer_create_brush
-printer_create_dc
-printer_create_font
-printer_create_pen
-printer_delete_brush
-printer_delete_dc
-printer_delete_font
-printer_delete_pen
-printer_draw_bmp
-printer_draw_chord
-printer_draw_elipse
-printer_draw_line
-printer_draw_pie
-printer_draw_rectangle
-printer_draw_roundrect
-printer_draw_text
-printer_end_doc
-printer_end_page
-printer_get_option
-printer_list
-printer_logical_fontheight
-printer_open
-printer_select_brush
-printer_select_font
-printer_select_pen
-printer_set_option
-printer_start_doc
-printer_start_page
-printer_write
-printf
-print_r
-private
-proc_close
-proc_get_status
-proc_nice
-proc_open
-proc_terminate
-property_exists
-protected
-ps_add_bookmark
-ps_add_launchlink
-ps_add_locallink
-ps_add_note
-ps_add_pdflink
-ps_add_weblink
-ps_arc
-ps_arcn
-ps_begin_page
-ps_begin_pattern
-ps_begin_template
-ps_circle
-ps_clip
-ps_close
-ps_close_image
-ps_closepath
-ps_closepath_stroke
-ps_continue_text
-ps_curveto
-ps_delete
-ps_end_page
-ps_end_pattern
-ps_end_template
-ps_fill
-ps_fill_stroke
-ps_findfont
-ps_get_buffer
-ps_get_parameter
-ps_get_value
-ps_hyphenate
-ps_include_file
-ps_lineto
-ps_makespotcolor
-ps_moveto
-ps_new
-ps_open_file
-ps_open_image
-ps_open_image_file
-ps_open_memory_image
-pspell_add_to_personal
-pspell_add_to_session
-pspell_check
-pspell_clear_session
-pspell_config_create
-pspell_config_data_dir
-pspell_config_dict_dir
-pspell_config_ignore
-pspell_config_mode
-pspell_config_personal
-pspell_config_repl
-pspell_config_runtogether
-pspell_config_save_repl
-pspell_new
-pspell_new_config
-pspell_new_personal
-pspell_save_wordlist
-pspell_store_replacement
-pspell_suggest
-ps_place_image
-ps_rect
-ps_restore
-ps_rotate
-ps_save
-ps_scale
-ps_set_border_color
-ps_set_border_dash
-ps_set_border_style
-ps_setcolor
-ps_setdash
-ps_setflat
-ps_setfont
-ps_setgray
-ps_set_info
-ps_setlinecap
-ps_setlinejoin
-ps_setlinewidth
-ps_setmiterlimit
-ps_setoverprintmode
-ps_set_parameter
-ps_setpolydash
-ps_set_text_pos
-ps_set_value
-ps_shading
-ps_shading_pattern
-ps_shfill
-ps_show
-ps_show2
-ps_show_boxed
-ps_show_xy
-ps_show_xy2
-ps_string_geometry
-ps_stringwidth
-ps_stroke
-ps_symbol
-ps_symbol_name
-ps_symbol_width
-ps_translate
-public
-putenv
-px_close
-px_create_fp
-px_date2string
-px_delete
-px_delete_record
-px_get_field
-px_get_info
-px_get_parameter
-px_get_record
-px_get_schema
-px_get_value
-px_insert_record
-px_new
-px_numfields
-px_numrecords
-px_open_fp
-px_put_record
-px_retrieve_record
-px_set_blob_file
-px_set_parameter
-px_set_tablename
-px_set_targetencoding
-px_set_value
-px_timestamp2string
-px_update_record
-qdom_error
-qdom_tree
-quickhashinthash
-quickhashintset
-quickhashintstringhash
-quickhashstringinthash
-quoted_printable_decode
-quoted_printable_encode
-quotemeta
-rad2deg
-radius_acct_open
-radius_add_server
-radius_auth_open
-radius_close
-radius_config
-radius_create_request
-radius_cvt_addr
-radius_cvt_int
-radius_cvt_string
-radius_demangle
-radius_demangle_mppe_key
-radius_get_attr
-radius_get_vendor_attr
-radius_put_addr
-radius_put_attr
-radius_put_int
-radius_put_string
-radius_put_vendor_addr
-radius_put_vendor_attr
-radius_put_vendor_int
-radius_put_vendor_string
-radius_request_authenticator
-radius_send_request
-radius_server_secret
-radius_strerror
-rand
-range
-rangeexception
-rararchive
-rarentry
-rarexception
-rar_wrapper_cache_stats
-rawurldecode
-rawurlencode
-readdir
-read_exif_data
-readfile
-readgzfile
-readline
-readline_add_history
-readline_callback_handler_install
-readline_callback_handler_remove
-readline_callback_read_char
-readline_clear_history
-readline_completion_function
-readline_info
-readline_list_history
-readline_on_new_line
-readline_read_history
-readline_redisplay
-readline_write_history
-readlink
-realpath
-realpath_cache_get
-realpath_cache_size
-recode
-recode_file
-recode_string
-recursivearrayiterator
-recursivecachingiterator
-recursivecallbackfilteriterator
-recursivedirectoryiterator
-recursivefilteriterator
-recursiveiterator
-recursiveiteratoriterator
-recursiveregexiterator
-recursivetreeiterator
-reflection
-reflectionclass
-reflectionexception
-reflectionextension
-reflectionfunction
-reflectionfunctionabstract
-reflectionmethod
-reflectionobject
-reflectionparameter
-reflectionproperty
-reflector
-regexiterator
-register_shutdown_function
-register_tick_function
-rename
-rename_function
-require
-require_once
-reset
-resetValue
-resourcebundle
-restore_error_handler
-restore_exception_handler
-restore_include_path
-return
-rewind
-rewinddir
-rmdir
-round
-rpm_close
-rpm_get_tag
-rpm_is_valid
-rpm_open
-rpm_version
-rrd_create
-rrdcreator
-rrd_error
-rrd_fetch
-rrd_first
-rrdgraph
-rrd_graph
-rrd_info
-rrd_last
-rrd_lastupdate
-rrd_restore
-rrd_tune
-rrd_update
-rrdupdater
-rrd_version
-rrd_xport
-rsort
-rtrim
-runkit_class_adopt
-runkit_class_emancipate
-runkit_constant_add
-runkit_constant_redefine
-runkit_constant_remove
-runkit_function_add
-runkit_function_copy
-runkit_function_redefine
-runkit_function_remove
-runkit_function_rename
-runkit_import
-runkit_lint
-runkit_lint_file
-runkit_method_add
-runkit_method_copy
-runkit_method_redefine
-runkit_method_remove
-runkit_method_rename
-runkit_return_value_used
-runkit_sandbox_output_handler
-runkit_superglobals
-runtimeexception
-samconnection_commit
-samconnection_connect
-samconnection_constructor
-samconnection_disconnect
-samconnection_errno
-samconnection_error
-samconnection_isconnected
-samconnection_peek
-samconnection_peekall
-samconnection_receive
-samconnection_remove
-samconnection_rollback
-samconnection_send
-samconnection_setDebug
-samconnection_subscribe
-samconnection_unsubscribe
-sammessage_body
-sammessage_constructor
-sammessage_header
-sca_createdataobject
-sca_getservice
-sca_localproxy_createdataobject
-scandir
-sca_soapproxy_createdataobject
-sdo_das_changesummary_beginlogging
-sdo_das_changesummary_endlogging
-sdo_das_changesummary_getchangeddataobjects
-sdo_das_changesummary_getchangetype
-sdo_das_changesummary_getoldcontainer
-sdo_das_changesummary_getoldvalues
-sdo_das_changesummary_islogging
-sdo_das_datafactory_addpropertytotype
-sdo_das_datafactory_addtype
-sdo_das_datafactory_getdatafactory
-sdo_das_dataobject_getchangesummary
-sdo_das_relational_applychanges
-sdo_das_relational_construct
-sdo_das_relational_createrootdataobject
-sdo_das_relational_executepreparedquery
-sdo_das_relational_executequery
-sdo_das_setting_getlistindex
-sdo_das_setting_getpropertyindex
-sdo_das_setting_getpropertyname
-sdo_das_setting_getvalue
-sdo_das_setting_isset
-sdo_das_xml_addtypes
-sdo_das_xml_create
-sdo_das_xml_createdataobject
-sdo_das_xml_createdocument
-sdo_das_xml_document_getrootdataobject
-sdo_das_xml_document_getrootelementname
-sdo_das_xml_document_getrootelementuri
-sdo_das_xml_document_setencoding
-sdo_das_xml_document_setxmldeclaration
-sdo_das_xml_document_setxmlversion
-sdo_das_xml_loadfile
-sdo_das_xml_loadstring
-sdo_das_xml_savefile
-sdo_das_xml_savestring
-sdo_datafactory_create
-sdo_dataobject_clear
-sdo_dataobject_createdataobject
-sdo_dataobject_getcontainer
-sdo_dataobject_getsequence
-sdo_dataobject_gettypename
-sdo_dataobject_gettypenamespaceuri
-sdo_exception_getcause
-sdo_list_insert
-sdo_model_property_getcontainingtype
-sdo_model_property_getdefault
-sdo_model_property_getname
-sdo_model_property_gettype
-sdo_model_property_iscontainment
-sdo_model_property_ismany
-sdo_model_reflectiondataobject_construct
-sdo_model_reflectiondataobject_export
-sdo_model_reflectiondataobject_getcontainmentproperty
-sdo_model_reflectiondataobject_getinstanceproperties
-sdo_model_reflectiondataobject_gettype
-sdo_model_type_getbasetype
-sdo_model_type_getname
-sdo_model_type_getnamespaceuri
-sdo_model_type_getproperties
-sdo_model_type_getproperty
-sdo_model_type_isabstracttype
-sdo_model_type_isdatatype
-sdo_model_type_isinstance
-sdo_model_type_isopentype
-sdo_model_type_issequencedtype
-sdo_sequence_getproperty
-sdo_sequence_insert
-sdo_sequence_move
-seekableiterator
-sem_acquire
-sem_get
-sem_release
-sem_remove
-serializable
-serialize
-session_cache_expire
-session_cache_limiter
-session_commit
-session_decode
-session_destroy
-session_encode
-session_get_cookie_params
-session_id
-session_is_registered
-session_module_name
-session_name
-session_pgsql_add_error
-session_pgsql_get_error
-session_pgsql_get_field
-session_pgsql_reset
-session_pgsql_set_field
-session_pgsql_status
-session_regenerate_id
-session_register
-session_save_path
-session_set_cookie_params
-session_set_save_handler
-session_start
-session_unregister
-session_unset
-session_write_close
-__set()
-setcookie
-setCounterClass
-set_error_handler
-set_exception_handler
-set_file_buffer
-set_include_path
-setlocale
-set_magic_quotes_runtime
-setproctitle
-setrawcookie
-set_socket_blocking
-__set_state()
-setstaticpropertyvalue
-setthreadtitle
-set_time_limit
-settype
-sha1
-sha1_file
-shell_exec
-shm_attach
-shm_detach
-shm_get_var
-shm_has_var
-shmop_close
-shmop_delete
-shmop_open
-shmop_read
-shmop_size
-shmop_write
-shm_put_var
-shm_remove
-shm_remove_var
-show_source
-shuffle
-signeurlpaiement
-similar_text
-simplexmlelement
-simplexml_import_dom
-simplexmliterator
-simplexml_load_file
-simplexml_load_string
-sin
-sinh
-sizeof
-sleep
-__sleep()
-snmp
-snmp2_get
-snmp2_getnext
-snmp2_real_walk
-snmp2_set
-snmp2_walk
-snmp3_get
-snmp3_getnext
-snmp3_real_walk
-snmp3_set
-snmp3_walk
-snmpexception
-snmpget
-snmpgetnext
-snmp_get_quick_print
-snmp_get_valueretrieval
-snmp_read_mib
-snmprealwalk
-snmpset
-snmp_set_enum_print
-snmp_set_oid_numeric_print
-snmp_set_oid_output_format
-snmp_set_quick_print
-snmp_set_valueretrieval
-snmpwalk
-snmpwalkoid
-soapclient
-soapfault
-soapheader
-soapparam
-soapserver
-soapvar
-socket_accept
-socket_bind
-socket_clear_error
-socket_close
-socket_connect
-socket_create
-socket_create_listen
-socket_create_pair
-socket_get_option
-socket_getpeername
-socket_getsockname
-socket_get_status
-socket_last_error
-socket_listen
-socket_read
-socket_recv
-socket_recvfrom
-socket_select
-socket_send
-socket_sendto
-socket_set_block
-socket_set_blocking
-socket_set_nonblock
-socket_set_option
-socket_set_timeout
-socket_shutdown
-socket_strerror
-socket_write
-solrclient
-solrclientexception
-solrdocument
-solrdocumentfield
-solrexception
-solrgenericresponse
-solr_get_version
-solrillegalargumentexception
-solrillegaloperationexception
-solrinputdocument
-solrmodifiableparams
-solrobject
-solrparams
-solrpingresponse
-solrquery
-solrqueryresponse
-solrresponse
-solrupdateresponse
-solrutils
-sort
-soundex
-sphinxclient
-spl_autoload
-spl_autoload_call
-spl_autoload_extensions
-spl_autoload_functions
-spl_autoload_register
-spl_autoload_unregister
-splbool
-spl_classes
-spldoublylinkedlist
-splenum
-splfileinfo
-splfileobject
-splfixedarray
-splfloat
-splheap
-splint
-split
-spliti
-splmaxheap
-splminheap
-spl_object_hash
-splobjectstorage
-splobserver
-splpriorityqueue
-splqueue
-splstack
-splstring
-splsubject
-spltempfileobject
-spltype
-spoofchecker
-sprintf
-sqlite3
-sqlite3result
-sqlite3stmt
-sqlite_array_query
-sqlite_busy_timeout
-sqlite_changes
-sqlite_close
-sqlite_column
-sqlite_create_aggregate
-sqlite_create_function
-sqlite_current
-sqlite_error_string
-sqlite_escape_string
-sqlite_exec
-sqlite_factory
-sqlite_fetch_all
-sqlite_fetch_array
-sqlite_fetch_column_types
-sqlite_fetch_object
-sqlite_fetch_single
-sqlite_fetch_string
-sqlite_field_name
-sqlite_has_more
-sqlite_has_prev
-sqlite_key
-sqlite_last_error
-sqlite_last_insert_rowid
-sqlite_libencoding
-sqlite_libversion
-sqlite_next
-sqlite_num_fields
-sqlite_num_rows
-sqlite_open
-sqlite_popen
-sqlite_prev
-sqlite_query
-sqlite_rewind
-sqlite_seek
-sqlite_single_query
-sqlite_udf_decode_binary
-sqlite_udf_encode_binary
-sqlite_unbuffered_query
-sqlite_valid
-sql_regcase
-sqlsrv_begin_transaction
-sqlsrv_cancel
-sqlsrv_client_info
-sqlsrv_close
-sqlsrv_commit
-sqlsrv_configure
-sqlsrv_connect
-sqlsrv_errors
-sqlsrv_execute
-sqlsrv_fetch
-sqlsrv_fetch_array
-sqlsrv_fetch_object
-sqlsrv_field_metadata
-sqlsrv_free_stmt
-sqlsrv_get_config
-sqlsrv_get_field
-sqlsrv_has_rows
-sqlsrv_next_result
-sqlsrv_num_fields
-sqlsrv_num_rows
-sqlsrv_prepare
-sqlsrv_query
-sqlsrv_rollback
-sqlsrv_rows_affected
-sqlsrv_send_stream_data
-sqlsrv_server_info
-sqrt
-srand
-sscanf
-ssdeep_fuzzy_compare
-ssdeep_fuzzy_hash
-ssdeep_fuzzy_hash_filename
-ssh2_auth_hostbased_file
-ssh2_auth_none
-ssh2_auth_password
-ssh2_auth_pubkey_file
-ssh2_connect
-ssh2_exec
-ssh2_fetch_stream
-ssh2_fingerprint
-ssh2_methods_negotiated
-ssh2_publickey_add
-ssh2_publickey_init
-ssh2_publickey_list
-ssh2_publickey_remove
-ssh2_scp_recv
-ssh2_scp_send
-ssh2_sftp
-ssh2_sftp_lstat
-ssh2_sftp_mkdir
-ssh2_sftp_readlink
-ssh2_sftp_realpath
-ssh2_sftp_rename
-ssh2_sftp_rmdir
-ssh2_sftp_stat
-ssh2_sftp_symlink
-ssh2_sftp_unlink
-ssh2_shell
-ssh2_tunnel
-stat
-static
-stats_absolute_deviation
-stats_cdf_beta
-stats_cdf_binomial
-stats_cdf_cauchy
-stats_cdf_chisquare
-stats_cdf_exponential
-stats_cdf_f
-stats_cdf_gamma
-stats_cdf_laplace
-stats_cdf_logistic
-stats_cdf_negative_binomial
-stats_cdf_noncentral_chisquare
-stats_cdf_noncentral_f
-stats_cdf_poisson
-stats_cdf_t
-stats_cdf_uniform
-stats_cdf_weibull
-stats_covariance
-stats_dens_beta
-stats_dens_cauchy
-stats_dens_chisquare
-stats_dens_exponential
-stats_dens_f
-stats_dens_gamma
-stats_dens_laplace
-stats_dens_logistic
-stats_dens_negative_binomial
-stats_dens_normal
-stats_dens_pmf_binomial
-stats_dens_pmf_hypergeometric
-stats_dens_pmf_poisson
-stats_dens_t
-stats_dens_weibull
-stats_den_uniform
-stats_harmonic_mean
-stats_kurtosis
-stats_rand_gen_beta
-stats_rand_gen_chisquare
-stats_rand_gen_exponential
-stats_rand_gen_f
-stats_rand_gen_funiform
-stats_rand_gen_gamma
-stats_rand_gen_ibinomial
-stats_rand_gen_ibinomial_negative
-stats_rand_gen_int
-stats_rand_gen_ipoisson
-stats_rand_gen_iuniform
-stats_rand_gen_noncenral_chisquare
-stats_rand_gen_noncentral_f
-stats_rand_gen_noncentral_t
-stats_rand_gen_normal
-stats_rand_gen_t
-stats_rand_get_seeds
-stats_rand_phrase_to_seeds
-stats_rand_ranf
-stats_rand_setall
-stats_skew
-stats_standard_deviation
-stats_stat_binomial_coef
-stats_stat_correlation
-stats_stat_gennch
-stats_stat_independent_t
-stats_stat_innerproduct
-stats_stat_noncentral_t
-stats_stat_paired_t
-stats_stat_percentile
-stats_stat_powersum
-stats_variance
-stomp
-stomp_connect_error
-stompexception
-stompframe
-stomp_version
-strcasecmp
-strchr
-strcmp
-strcoll
-strcspn
-stream_bucket_append
-stream_bucket_make_writeable
-stream_bucket_new
-stream_bucket_prepend
-stream_context_create
-stream_context_get_default
-stream_context_get_options
-stream_context_get_params
-stream_context_set_default
-stream_context_set_option
-stream_context_set_params
-stream_copy_to_stream
-stream_encoding
-stream_filter_append
-stream_filter_prepend
-stream_filter_register
-stream_filter_remove
-stream_get_contents
-stream_get_filters
-stream_get_line
-stream_get_meta_data
-stream_get_transports
-stream_get_wrappers
-stream_is_local
-stream_notification_callback
-stream_register_wrapper
-stream_resolve_include_path
-stream_select
-stream_set_blocking
-stream_set_read_buffer
-stream_set_timeout
-stream_set_write_buffer
-stream_socket_accept
-stream_socket_client
-stream_socket_enable_crypto
-stream_socket_get_name
-stream_socket_pair
-stream_socket_recvfrom
-stream_socket_sendto
-stream_socket_server
-stream_socket_shutdown
-stream_supports_lock
-streamwrapper
-stream_wrapper_register
-stream_wrapper_restore
-stream_wrapper_unregister
-strftime
-str_getcsv
-stripcslashes
-stripos
-stripslashes
-strip_tags
-str_ireplace
-stristr
-strlen
-strnatcasecmp
-strnatcmp
-strncasecmp
-strncmp
-str_pad
-strpbrk
-strpos
-strptime
-strrchr
-str_repeat
-str_replace
-strrev
-strripos
-str_rot13
-strrpos
-str_shuffle
-str_split
-strspn
-strstr
-strtok
-strtolower
-strtotime
-strtoupper
-strtr
-strval
-str_word_count
-substr
-substr_compare
-substr_count
-substr_replace
-svm
-svmmodel
-svn_add
-svn_auth_get_parameter
-svn_auth_set_parameter
-svn_blame
-svn_cat
-svn_checkout
-svn_cleanup
-svn_client_version
-svn_commit
-svn_delete
-svn_diff
-svn_export
-svn_fs_abort_txn
-svn_fs_apply_text
-svn_fs_begin_txn2
-svn_fs_change_node_prop
-svn_fs_check_path
-svn_fs_contents_changed
-svn_fs_copy
-svn_fs_delete
-svn_fs_dir_entries
-svn_fs_file_contents
-svn_fs_file_length
-svn_fs_is_dir
-svn_fs_is_file
-svn_fs_make_dir
-svn_fs_make_file
-svn_fs_node_created_rev
-svn_fs_node_prop
-svn_fs_props_changed
-svn_fs_revision_prop
-svn_fs_revision_root
-svn_fs_txn_root
-svn_fs_youngest_rev
-svn_import
-svn_log
-svn_ls
-svn_mkdir
-svn_repos_create
-svn_repos_fs
-svn_repos_fs_begin_txn_for_commit
-svn_repos_fs_commit_txn
-svn_repos_hotcopy
-svn_repos_open
-svn_repos_recover
-svn_revert
-svn_status
-svn_update
-swfaction
-swfaction.construct
-swf_actiongeturl
-swf_actiongotoframe
-swf_actiongotolabel
-swf_actionnextframe
-swf_actionplay
-swf_actionprevframe
-swf_actionsettarget
-swf_actionstop
-swf_actiontogglequality
-swf_actionwaitforframe
-swf_addbuttonrecord
-swf_addcolor
-swfbitmap
-swfbitmap.construct
-swfbitmap.getheight
-swfbitmap.getwidth
-swfbutton
-swfbutton.addaction
-swfbutton.addasound
-swfbutton.addshape
-swfbutton.construct
-swfbutton.setaction
-swfbutton.setdown
-swfbutton.sethit
-swfbutton.setmenu
-swfbutton.setover
-swfbutton.setup
-swf_closefile
-swf_definebitmap
-swf_definefont
-swf_defineline
-swf_definepoly
-swf_definerect
-swf_definetext
-swfdisplayitem
-swfdisplayitem.addaction
-swfdisplayitem.addcolor
-swfdisplayitem.endmask
-swfdisplayitem.getrot
-swfdisplayitem.getx
-swfdisplayitem.getxscale
-swfdisplayitem.getxskew
-swfdisplayitem.gety
-swfdisplayitem.getyscale
-swfdisplayitem.getyskew
-swfdisplayitem.move
-swfdisplayitem.moveto
-swfdisplayitem.multcolor
-swfdisplayitem.remove
-swfdisplayitem.rotate
-swfdisplayitem.rotateto
-swfdisplayitem.scale
-swfdisplayitem.scaleto
-swfdisplayitem.setdepth
-swfdisplayitem.setmasklevel
-swfdisplayitem.setmatrix
-swfdisplayitem.setname
-swfdisplayitem.setratio
-swfdisplayitem.skewx
-swfdisplayitem.skewxto
-swfdisplayitem.skewy
-swfdisplayitem.skewyto
-swf_endbutton
-swf_enddoaction
-swf_endshape
-swf_endsymbol
-swffill
-swffill.moveto
-swffill.rotateto
-swffill.scaleto
-swffill.skewxto
-swffill.skewyto
-swffont
-swffontchar
-swffontchar.addchars
-swffontchar.addutf8chars
-swffont.construct
-swffont.getascent
-swffont.getdescent
-swffont.getleading
-swffont.getshape
-swffont.getutf8width
-swffont.getwidth
-swf_fontsize
-swf_fontslant
-swf_fonttracking
-swf_getbitmapinfo
-swf_getfontinfo
-swf_getframe
-swfgradient
-swfgradient.addentry
-swfgradient.construct
-swf_labelframe
-swf_lookat
-swf_modifyobject
-swfmorph
-swfmorph.construct
-swfmorph.getshape1
-swfmorph.getshape2
-swfmovie
-swfmovie.add
-swfmovie.addexport
-swfmovie.addfont
-swfmovie.construct
-swfmovie.importchar
-swfmovie.importfont
-swfmovie.labelframe
-swfmovie.nextframe
-swfmovie.output
-swfmovie.remove
-swfmovie.save
-swfmovie.savetofile
-swfmovie.setbackground
-swfmovie.setdimension
-swfmovie.setframes
-swfmovie.setrate
-swfmovie.startsound
-swfmovie.stopsound
-swfmovie.streammp3
-swfmovie.writeexports
-swf_mulcolor
-swf_nextid
-swf_oncondition
-swf_openfile
-swf_ortho
-swf_ortho2
-swf_perspective
-swf_placeobject
-swf_polarview
-swf_popmatrix
-swf_posround
-swfprebuiltclip
-swfprebuiltclip.construct
-swf_pushmatrix
-swf_removeobject
-swf_rotate
-swf_scale
-swf_setfont
-swf_setframe
-swfshape
-swfshape.addfill
-swf_shapearc
-swfshape.construct
-swf_shapecurveto
-swf_shapecurveto3
-swfshape.drawarc
-swfshape.drawcircle
-swfshape.drawcubic
-swfshape.drawcubicto
-swfshape.drawcurve
-swfshape.drawcurveto
-swfshape.drawglyph
-swfshape.drawline
-swfshape.drawlineto
-swf_shapefillbitmapclip
-swf_shapefillbitmaptile
-swf_shapefilloff
-swf_shapefillsolid
-swf_shapelinesolid
-swf_shapelineto
-swfshape.movepen
-swfshape.movepento
-swf_shapemoveto
-swfshape.setleftfill
-swfshape.setline
-swfshape.setrightfill
-swf_showframe
-swfsound
-swfsound.construct
-swfsoundinstance
-swfsoundinstance.loopcount
-swfsoundinstance.loopinpoint
-swfsoundinstance.loopoutpoint
-swfsoundinstance.nomultiple
-swfsprite
-swfsprite.add
-swfsprite.construct
-swfsprite.labelframe
-swfsprite.nextframe
-swfsprite.remove
-swfsprite.setframes
-swfsprite.startsound
-swfsprite.stopsound
-swf_startbutton
-swf_startdoaction
-swf_startshape
-swf_startsymbol
-swftext
-swftext.addstring
-swftext.addutf8string
-swftext.construct
-swftextfield
-swftextfield.addchars
-swftextfield.addstring
-swftextfield.align
-swftextfield.construct
-swftextfield.setbounds
-swftextfield.setcolor
-swftextfield.setfont
-swftextfield.setheight
-swftextfield.setindentation
-swftextfield.setleftmargin
-swftextfield.setlinespacing
-swftextfield.setmargins
-swftextfield.setname
-swftextfield.setpadding
-swftextfield.setrightmargin
-swftext.getascent
-swftext.getdescent
-swftext.getleading
-swftext.getutf8width
-swftext.getwidth
-swftext.moveto
-swftext.setcolor
-swftext.setfont
-swftext.setheight
-swftext.setspacing
-swf_textwidth
-swf_translate
-swfvideostream
-swfvideostream.construct
-swfvideostream.getnumframes
-swfvideostream.setdimension
-swf_viewport
-swish_construct
-swish_getmetalist
-swish_getpropertylist
-swish_prepare
-swish_query
-swishresult_getmetalist
-swishresults_getparsedwords
-swishresults_getremovedstopwords
-swishresults_nextresult
-swishresults_seekresult
-swishresult_stem
-swishsearch_execute
-swishsearch_resetlimit
-swishsearch_setlimit
-swishsearch_setphrasedelimiter
-swishsearch_setsort
-swishsearch_setstructure
-switch
-sybase_affected_rows
-sybase_close
-sybase_connect
-sybase_data_seek
-sybase_deadlock_retry_count
-sybase_fetch_array
-sybase_fetch_assoc
-sybase_fetch_field
-sybase_fetch_object
-sybase_fetch_row
-sybase_field_seek
-sybase_free_result
-sybase_get_last_message
-sybase_min_client_severity
-sybase_min_error_severity
-sybase_min_message_severity
-sybase_min_server_severity
-sybase_num_fields
-sybase_num_rows
-sybase_pconnect
-sybase_query
-sybase_result
-sybase_select_db
-sybase_set_message_handler
-sybase_unbuffered_query
-symlink
-sys_getloadavg
-sys_get_temp_dir
-syslog
-system
-tan
-tanh
-tcpwrap_check
-tempnam
-textdomain
-throw
-tidy
-tidy_access_count
-tidy_config_count
-tidy_diagnose
-tidy_error_count
-tidy_get_error_buffer
-tidy_get_output
-tidy_load_config
-tidynode
-tidy_reset_config
-tidy_save_config
-tidy_set_encoding
-tidy_setopt
-tidy_warning_count
-time
-time_nanosleep
-time_sleep_until
-timezone_abbreviations_list
-timezone_identifiers_list
-timezone_location_get
-timezone_name_from_abbr
-timezone_name_get
-timezone_offset_get
-timezone_open
-timezone_transitions_get
-timezone_version_get
-tmpfile
-token_get_all
-token_name
-tokyotyrant
-tokyotyrantquery
-tokyotyranttable
-tostring
-__toString()
-touch
-transliterator
-traversable
-trigger_error
-trim
-try
-uasort
-ucfirst
-ucwords
-udm_add_search_limit
-udm_alloc_agent
-udm_alloc_agent_array
-udm_api_version
-udm_cat_list
-udm_cat_path
-udm_check_charset
-udm_check_stored
-udm_clear_search_limits
-udm_close_stored
-udm_crc32
-udm_errno
-udm_error
-udm_find
-udm_free_agent
-udm_free_ispell_data
-udm_free_res
-udm_get_doc_count
-udm_get_res_field
-udm_get_res_param
-udm_hash32
-udm_load_ispell_data
-udm_open_stored
-udm_set_agent_param
-uksort
-umask
-underflowexception
-unexpectedvalueexception
-uniqid
-unixtojd
-unlink
-unpack
-unregister_tick_function
-unserialize
-unset
-__unset()
-urldecode
-urlencode
-use
-user_error
-use_soap_error_handler
-usleep
-usort
-utf8_decode
-utf8_encode
-v8js
-v8jsexception
-var
-var_dump
-var_export
-variant
-variant_abs
-variant_add
-variant_and
-variant_cast
-variant_cat
-variant_cmp
-variant_date_from_timestamp
-variant_date_to_timestamp
-variant_div
-variant_eqv
-variant_fix
-variant_get_type
-variant_idiv
-variant_imp
-variant_int
-variant_mod
-variant_mul
-variant_neg
-variant_not
-variant_or
-variant_pow
-variant_round
-variant_set
-variant_set_type
-variant_sub
-variant_xor
-version_compare
-vfprintf
-virtual
-vpopmail_add_alias_domain
-vpopmail_add_alias_domain_ex
-vpopmail_add_domain
-vpopmail_add_domain_ex
-vpopmail_add_user
-vpopmail_alias_add
-vpopmail_alias_del
-vpopmail_alias_del_domain
-vpopmail_alias_get
-vpopmail_alias_get_all
-vpopmail_auth_user
-vpopmail_del_domain
-vpopmail_del_domain_ex
-vpopmail_del_user
-vpopmail_error
-vpopmail_passwd
-vpopmail_set_user_quota
-vprintf
-vsprintf
-w32api_deftype
-w32api_init_dtype
-w32api_invoke_function
-w32api_register_function
-w32api_set_call_method
-__wakeup()
-wddx_add_vars
-wddx_deserialize
-wddx_packet_end
-wddx_packet_start
-wddx_serialize_value
-wddx_serialize_vars
-weakref
-while
-win32_continue_service
-win32_create_service
-win32_delete_service
-win32_get_last_control_message
-win32_pause_service
-win32_ps_list_procs
-win32_ps_stat_mem
-win32_ps_stat_proc
-win32_query_service_status
-win32_set_service_status
-win32_start_service
-win32_start_service_ctrl_dispatcher
-win32_stop_service
-wincache_fcache_fileinfo
-wincache_fcache_meminfo
-wincache_lock
-wincache_ocache_fileinfo
-wincache_ocache_meminfo
-wincache_refresh_if_changed
-wincache_rplist_fileinfo
-wincache_rplist_meminfo
-wincache_scache_info
-wincache_scache_meminfo
-wincache_ucache_add
-wincache_ucache_cas
-wincache_ucache_clear
-wincache_ucache_dec
-wincache_ucache_delete
-wincache_ucache_exists
-wincache_ucache_get
-wincache_ucache_inc
-wincache_ucache_info
-wincache_ucache_meminfo
-wincache_ucache_set
-wincache_unlock
-wordwrap
-xattr_get
-xattr_list
-xattr_remove
-xattr_set
-xattr_supported
-xdiff_file_bdiff
-xdiff_file_bdiff_size
-xdiff_file_bpatch
-xdiff_file_diff
-xdiff_file_diff_binary
-xdiff_file_merge3
-xdiff_file_patch
-xdiff_file_patch_binary
-xdiff_file_rabdiff
-xdiff_string_bdiff
-xdiff_string_bdiff_size
-xdiff_string_bpatch
-xdiff_string_diff
-xdiff_string_diff_binary
-xdiff_string_merge3
-xdiff_string_patch
-xdiff_string_patch_binary
-xdiff_string_rabdiff
-xhprof_disable
-xhprof_enable
-xhprof_sample_disable
-xhprof_sample_enable
-xml_error_string
-xml_get_current_byte_index
-xml_get_current_column_number
-xml_get_current_line_number
-xml_get_error_code
-xml_parse
-xml_parse_into_struct
-xml_parser_create
-xml_parser_create_ns
-xml_parser_free
-xml_parser_get_option
-xml_parser_set_option
-xmlreader
-xmlrpc_decode
-xmlrpc_decode_request
-xmlrpc_encode
-xmlrpc_encode_request
-xmlrpc_get_type
-xmlrpc_is_fault
-xmlrpc_parse_method_descriptions
-xmlrpc_server_add_introspection_data
-xmlrpc_server_call_method
-xmlrpc_server_create
-xmlrpc_server_destroy
-xmlrpc_server_register_introspection_callback
-xmlrpc_server_register_method
-xmlrpc_set_type
-xml_set_character_data_handler
-xml_set_default_handler
-xml_set_element_handler
-xml_set_end_namespace_decl_handler
-xml_set_external_entity_ref_handler
-xml_set_notation_decl_handler
-xml_set_object
-xml_set_processing_instruction_handler
-xml_set_start_namespace_decl_handler
-xml_set_unparsed_entity_decl_handler
-xmlwriter_end_attribute
-xmlwriter_end_cdata
-xmlwriter_end_comment
-xmlwriter_end_document
-xmlwriter_end_dtd
-xmlwriter_end_dtd_attlist
-xmlwriter_end_dtd_element
-xmlwriter_end_dtd_entity
-xmlwriter_end_element
-xmlwriter_end_pi
-xmlwriter_flush
-xmlwriter_full_end_element
-xmlwriter_open_memory
-xmlwriter_open_uri
-xmlwriter_output_memory
-xmlwriter_set_indent
-xmlwriter_set_indent_string
-xmlwriter_start_attribute
-xmlwriter_start_attribute_ns
-xmlwriter_start_cdata
-xmlwriter_start_comment
-xmlwriter_start_document
-xmlwriter_start_dtd
-xmlwriter_start_dtd_attlist
-xmlwriter_start_dtd_element
-xmlwriter_start_dtd_entity
-xmlwriter_start_element
-xmlwriter_start_element_ns
-xmlwriter_start_pi
-xmlwriter_text
-xmlwriter_write_attribute
-xmlwriter_write_attribute_ns
-xmlwriter_write_cdata
-xmlwriter_write_comment
-xmlwriter_write_dtd
-xmlwriter_write_dtd_attlist
-xmlwriter_write_dtd_element
-xmlwriter_write_dtd_entity
-xmlwriter_write_element
-xmlwriter_write_element_ns
-xmlwriter_write_pi
-xmlwriter_write_raw
-xor
-xpath_eval
-xpath_eval_expression
-xpath_new_context
-xpath_register_ns
-xpath_register_ns_auto
-xptr_eval
-xptr_new_context
-xslt_backend_info
-xslt_backend_name
-xslt_backend_version
-xslt_create
-xslt_errno
-xslt_error
-xslt_free
-xslt_getopt
-xslt_process
-xsltprocessor
-xslt_set_base
-xslt_set_encoding
-xslt_set_error_handler
-xslt_set_log
-xslt_set_object
-xslt_setopt
-xslt_set_sax_handler
-xslt_set_sax_handlers
-xslt_set_scheme_handler
-xslt_set_scheme_handlers
-yaml_emit
-yaml_emit_file
-yaml_parse
-yaml_parse_file
-yaml_parse_url
-yaz_addinfo
-yaz_ccl_conf
-yaz_ccl_parse
-yaz_close
-yaz_connect
-yaz_database
-yaz_element
-yaz_errno
-yaz_error
-yaz_es
-yaz_es_result
-yaz_get_option
-yaz_hits
-yaz_itemorder
-yaz_present
-yaz_range
-yaz_record
-yaz_scan
-yaz_scan_result
-yaz_schema
-yaz_search
-yaz_set_option
-yaz_sort
-yaz_syntax
-yaz_wait
-yp_all
-yp_cat
-yp_errno
-yp_err_string
-yp_first
-yp_get_default_domain
-yp_master
-yp_match
-yp_next
-yp_order
-zend_logo_guid
-zend_thread_id
-zend_version
-ziparchive
-ziparchive_addemptydir
-ziparchive_addfile
-ziparchive_addfromstring
-ziparchive_close
-ziparchive_deleteindex
-ziparchive_deletename
-ziparchive_extractto
-ziparchive_getarchivecomment
-ziparchive_getcommentindex
-ziparchive_getcommentname
-ziparchive_getfromindex
-ziparchive_getfromname
-ziparchive_getnameindex
-ziparchive_getstatusstring
-ziparchive_getstream
-ziparchive_locatename
-ziparchive_open
-ziparchive_renameindex
-ziparchive_renamename
-ziparchive_setarchivecomment
-ziparchive_setcommentindex
-ziparchive_setCommentName
-ziparchive_statindex
-ziparchive_statname
-ziparchive_unchangeall
-ziparchive_unchangearchive
-ziparchive_unchangeindex
-ziparchive_unchangename
-zip_close
-zip_entry_close
-zip_entry_compressedsize
-zip_entry_compressionmethod
-zip_entry_filesize
-zip_entry_name
-zip_entry_open
-zip_entry_read
-zip_open
-zip_read
-zlib_get_coding_type
diff --git a/elpa/auto-complete-1.4/dict/python-mode b/elpa/auto-complete-1.4/dict/python-mode
deleted file mode 100644
index 0ef64894a..000000000
--- a/elpa/auto-complete-1.4/dict/python-mode
+++ /dev/null
@@ -1,175 +0,0 @@
-ArithmeticError
-AssertionError
-AttributeError
-BaseException
-BufferError
-BytesWarning
-DeprecationWarning
-EOFError
-Ellipsis
-EnvironmentError
-Exception
-False
-FloatingPointError
-FutureWarning
-GeneratorExit
-IOError
-ImportError
-ImportWarning
-IndentationError
-IndexError
-KeyError
-KeyboardInterrupt
-LookupError
-MemoryError
-NameError
-None
-NotImplemented
-NotImplementedError
-OSError
-OverflowError
-PendingDeprecationWarning
-ReferenceError
-RuntimeError
-RuntimeWarning
-StandardError
-StopIteration
-SyntaxError
-SyntaxWarning
-SystemError
-SystemExit
-TabError
-True
-TypeError
-UnboundLocalError
-UnicodeDecodeError
-UnicodeEncodeError
-UnicodeError
-UnicodeTranslateError
-UnicodeWarning
-UserWarning
-ValueError
-Warning
-ZeroDivisionError
-__builtins__
-__debug__
-__doc__
-__file__
-__import__
-__name__
-__package__
-abs
-all
-and
-any
-apply
-as
-assert
-basestring
-bin
-bool
-break
-buffer
-bytearray
-bytes
-callable
-chr
-class
-classmethod
-cmp
-coerce
-compile
-complex
-continue
-copyright
-credits
-def
-del
-delattr
-dict
-dir
-divmod
-elif
-else
-enumerate
-eval
-except
-exec
-execfile
-exit
-file
-filter
-finally
-float
-for
-format
-from
-frozenset
-getattr
-global
-globals
-hasattr
-hash
-help
-hex
-id
-if
-import
-in
-input
-int
-intern
-is
-isinstance
-issubclass
-iter
-lambda
-len
-license
-list
-locals
-long
-map
-max
-memoryview
-min
-next
-not
-object
-oct
-open
-or
-ord
-pass
-pow
-print
-property
-quit
-raise
-range
-raw_input
-reduce
-reload
-repr
-return
-reversed
-round
-set
-setattr
-slice
-sorted
-staticmethod
-str
-sum
-super
-try
-tuple
-type
-unichr
-unicode
-vars
-while
-with
-xrange
-yield
-zip
diff --git a/elpa/auto-complete-1.4/dict/ruby-mode b/elpa/auto-complete-1.4/dict/ruby-mode
deleted file mode 100644
index 90b4fc9d8..000000000
--- a/elpa/auto-complete-1.4/dict/ruby-mode
+++ /dev/null
@@ -1,181 +0,0 @@
-$!
-$"
-$$
-$&
-$'
-$*
-$+
-$,
-$-0
-$-F
-$-I
-$-K
-$-a
-$-d
-$-i
-$-l
-$-p
-$-v
-$-w
-$.
-$/
-$0
-$1
-$10
-$11
-$2
-$3
-$4
-$5
-$6
-$7
-$8
-$9
-$:
-$;
-$<
-$=
-$>
-$?
-$@
-$DEBUG
-$FILENAME
-$KCODE
-$LOADED_FEATURES
-$LOAD_PATH
-$PROGRAM_NAME
-$SAFE
-$VERBOSE
-$\
-$_
-$`
-$deferr
-$defout
-$stderr
-$stdin
-$stdout
-$~
-ARGF
-ARGV
-Array
-BEGIN
-DATA
-END
-ENV
-FALSE
-Float
-Integer
-NIL
-PLATFORM
-RELEASE_DATE
-RUBY_COPYRIGHT
-RUBY_DESCRIPTION
-RUBY_PATCHLEVEL
-RUBY_PLATFORM
-RUBY_RELEASE_DATE
-RUBY_VERSION
-SCRIPT_LINES__
-STDERR
-STDIN
-STDOUT
-String
-TOPLEVEL_BINDING
-TRUE
-VERSION
-__method__
-`
-abort
-alias
-and
-at_exit
-autoload
-autoload?
-begin
-binding
-block_given
-break
-callcc
-caller
-case
-catch
-chomp
-chomp!
-chop
-chop
-class
-def
-defined?
-do
-else
-elsif
-end
-ensure
-eval
-exec
-exit
-exit!
-fail
-false
-for
-fork
-format
-getc
-gets
-global_variables
-gsub
-gsub!
-if
-in
-iterator?
-lambda
-load
-local_varaibles
-loop
-module
-next
-nil
-not
-open
-or
-p
-printf
-proc
-putc
-puts
-raise
-rand
-readline
-readlines
-redo
-require
-require_relative
-rescue
-retry
-return
-scan
-select
-self
-set_trace_func
-sleep
-split
-sprintf
-srand
-sub
-sub!
-super
-syscall
-system
-test
-then
-throw
-trace_var
-trap
-true
-undef
-unless
-until
-untrace_var
-warn
-when
-while
-yield
diff --git a/elpa/auto-complete-1.4/dict/scheme-mode b/elpa/auto-complete-1.4/dict/scheme-mode
deleted file mode 100644
index e5cca6151..000000000
--- a/elpa/auto-complete-1.4/dict/scheme-mode
+++ /dev/null
@@ -1,216 +0,0 @@
-case-lambda
-call/cc
-class
-define-class
-exit-handler
-field
-import
-inherit
-init-field
-interface
-let*-values
-let-values
-let/ec
-mixin
-opt-lambda
-override
-protect
-provide
-public
-rename
-require
-require-for-syntax
-syntax
-syntax-case
-syntax-error
-unit/sig
-unless
-when
-with-syntax
-and
-begin
-call-with-current-continuation
-call-with-input-file
-call-with-output-file
-case
-cond
-define
-define-syntax
-delay
-do
-dynamic-wind
-else
-for-each
-if
-lambda
-let
-let*
-let-syntax
-letrec
-letrec-syntax
-map
-or
-syntax-rules
-abs
-acos
-angle
-append
-apply
-asin
-assoc
-assq
-assv
-atan
-boolean?
-caar
-cadr
-call-with-input-file
-call-with-output-file
-call-with-values
-car
-cdddar
-cddddr
-cdr
-ceiling
-char->integer
-char-alphabetic?
-char-ci<=?
-char-ci<?
-char-ci=?
-char-ci>=?
-char-ci>?
-char-downcase
-char-lower-case?
-char-numeric?
-char-ready?
-char-upcase
-char-upper-case?
-char-whitespace?
-char<=?
-char<?
-char=?
-char>=?
-char>?
-char?
-close-input-port
-close-output-port
-complex?
-cons
-cos
-current-input-port
-current-output-port
-denominator
-display
-eof-object?
-eq?
-equal?
-eqv?
-eval
-even?
-exact->inexact
-exact?
-exp
-expt
-#f
-floor
-force
-gcd
-imag-part
-inexact->exact
-inexact?
-input-port?
-integer->char
-integer?
-interaction-environment
-lcm
-length
-list
-list->string
-list->vector
-list-ref
-list-tail
-list?
-load
-log
-magnitude
-make-polar
-make-rectangular
-make-string
-make-vector
-max
-member
-memq
-memv
-min
-modulo
-negative?
-newline
-not
-null-environment
-null?
-number->string
-number?
-numerator
-odd?
-open-input-file
-open-output-file
-output-port?
-pair?
-peek-char
-port?
-positive?
-procedure?
-quasiquote
-quote
-quotient
-rational?
-rationalize
-read
-read-char
-real-part
-real?
-remainder
-reverse
-round
-scheme-report-environment
-set!
-set-car!
-set-cdr!
-sin
-sqrt
-string
-string->list
-string->number
-string->symbol
-string-append
-string-ci<=?
-string-ci<?
-string-ci=?
-string-ci>=?
-string-ci>?
-string-copy
-string-fill!
-string-length
-string-ref
-string-set!
-string<=?
-string<?
-string=?
-string>=?
-string>?
-string?
-substring
-symbol->string
-symbol?
-#t
-tan
-transcript-off
-transcript-on
-truncate
-values
-vector
-vector->list
-vector-fill!
-vector-length
-vector-ref
-vector-set!
diff --git a/elpa/auto-complete-1.4/dict/sh-mode b/elpa/auto-complete-1.4/dict/sh-mode
deleted file mode 100644
index df66ae35c..000000000
--- a/elpa/auto-complete-1.4/dict/sh-mode
+++ /dev/null
@@ -1,182 +0,0 @@
-# Bash Family Shell Dictionary
-# http://www.gnu.org/software/bash/manual/bash.html
-
-.
-:
-[
-alias
-bg
-bind
-break
-builtin
-caller
-cd
-command
-compgen
-complete
-compopt
-continue
-declare
-dirs
-disown
-echo
-enable
-eval
-exec
-exit
-export
-fc
-fg
-getopts
-hash
-help
-history
-jobs
-kill
-let
-local
-logout
-mapfile
-popd
-printf
-pushd
-pwd
-read
-readarray
-readonly
-return
-set
-shift
-shopt
-source
-suspend
-test
-times
-trap
-type
-typeset
-ulimit
-umask
-unalias
-unset
-wait
-!
-[[
-]]
-case
-do
-done
-elif
-else
-esac
-fi
-for
-function
-if
-in
-select
-then
-time
-until
-while
-{
-}
-!
-#
-$
-*
--
-0
-?
-@
-_
-BASH
-BASH_ALIASES
-BASH_ARGC
-BASH_ARGV
-BASH_CMDS
-BASH_COMMAND
-BASH_ENV
-BASH_EXECUTION_STRING
-BASH_LINENO
-BASH_REMATCH
-BASH_SOURCE
-BASH_SUBSHELL
-BASH_VERSINFO
-BASH_VERSION
-BASH_XTRACEFD
-BASHOPTS
-BASHPID
-CDPATH
-COLUMNS
-COMP_CWORD
-COMP_KEY
-COMP_LINE
-COMP_POINT
-COMP_TYPE
-COMP_WORDBREAKS
-COMP_WORDS
-COMPREPLY
-DIRSTACK
-EMACS
-EUID
-FCEDIT
-FIGNORE
-FUNCNAME
-GLOBIGNORE
-GROUPS
-HISTCMD
-HISTCONTROL
-HISTFILE
-HISTFILESIZE
-HISTIGNORE
-HISTSIZE
-HISTTIMEFORMAT
-HOME
-HOSTFILE
-HOSTNAME
-HOSTTYPE
-IFS
-IGNOREEOF
-INPUTRC
-LANG
-LC_ALL
-LC_COLLATE
-LC_CTYPE
-LC_MESSAGES
-LC_MESSAGES
-LC_NUMERIC
-LINENO
-LINES
-MACHTYPE
-MAIL
-MAILCHECK
-MAILPATH
-OLDPWD
-OPTARG
-OPTERR
-OPTIND
-OSTYPE
-PATH
-PIPESTATUS
-POSIXLY_CORRECT
-PPID
-PROMPT_COMMAND
-PROMPT_DIRTRIM
-PS1
-PS2
-PS3
-PS4
-PWD
-RANDOM
-REPLY
-SECONDS
-SHELL
-SHELLOPTS
-SHLVL
-TEXTDOMAIN
-TEXTDOMAINDIR
-TIMEFORMAT
-TMOUT
-TMPDIR
-UID
diff --git a/elpa/auto-complete-1.4/dict/tcl-mode b/elpa/auto-complete-1.4/dict/tcl-mode
deleted file mode 100644
index 07a128151..000000000
--- a/elpa/auto-complete-1.4/dict/tcl-mode
+++ /dev/null
@@ -1,172 +0,0 @@
-after
-append
-apply
-array
-auto_execok
-auto_import
-auto_load
-auto_load_index
-auto_mkindex
-auto_mkindex_old
-auto_qualify
-auto_reset
-bell
-binary
-bind
-bindtags
-break
-button
-canvas
-case
-catch
-cd
-chan
-checkbutton
-clipboard
-clock
-close
-concat
-continue
-destroy
-dict
-encoding
-entry
-eof
-error
-eval
-event
-exec
-exit
-expr
-fblocked
-fconfigure
-fcopy
-file
-fileevent
-flush
-focus
-font
-for
-foreach
-format
-frame
-gets
-glob
-global
-grab
-grid
-if
-image
-incr
-info
-interp
-join
-label
-labelframe
-lappend
-lassign
-lindex
-linsert
-list
-listbox
-llength
-load
-lower
-lrange
-lrepeat
-lreplace
-lreverse
-lsearch
-lset
-lsort
-menu
-menubutton
-message
-namespace
-open
-option
-pack
-package
-panedwindow
-pid
-pkg_mkIndex
-place
-proc
-puts
-pwd
-radiobutton
-raise
-read
-regexp
-registry
-regsub
-rename
-return
-scale
-scan
-scrollbar
-seek
-selection
-set
-socket
-source
-spinbox
-split
-string
-subst
-switch
-tclLog
-tclPkgSetup
-tclPkgUnknown
-tcl_findLibrary
-tell
-text
-time
-tk
-tk_chooseColor
-tk_chooseDirectory
-tk_getOpenFile
-tk_getSaveFile
-tk_menuSetFocus
-tk_messageBox
-tk_popup
-tk_textCopy
-tk_textCut
-tk_textPaste
-tkwait
-toplevel
-ttk::button
-ttk::checkbutton
-ttk::combobox
-ttk::entry
-ttk::focusFirst
-ttk::frame
-ttk::label
-ttk::labelframe
-ttk::menubutton
-ttk::notebook
-ttk::paned
-ttk::panedwindow
-ttk::progressbar
-ttk::radiobutton
-ttk::scale
-ttk::scrollbar
-ttk::separator
-ttk::setTheme
-ttk::sizegrip
-ttk::style
-ttk::takefocus
-ttk::themes
-ttk::treeview
-trace
-unknown
-unload
-unset
-update
-uplevel
-upvar
-variable
-vwait
-while
-winfo
-wm
diff --git a/elpa/auto-complete-1.4/dict/ts-mode b/elpa/auto-complete-1.4/dict/ts-mode
deleted file mode 100644
index ffe377f98..000000000
--- a/elpa/auto-complete-1.4/dict/ts-mode
+++ /dev/null
@@ -1,797 +0,0 @@
-absRefPrefix
-accessibility
-accessibilityWrap
-accessKey
-ACT
-ACTIFSUB
-ACTIVSUBRO
-ACTRO
-addAttributes
-addExtUrlsAndShortCuts
-additionalHeaders
-additionalParams
-addParams
-addQueryString
-addQueryString
-adjustItemsH
-adjustSubItemsH
-adminPanelStyles
-after
-age
-align
-align.field
-all
-allowedAttribs
-allowedGroups
-allowEdit
-allowNew
-allowTags
-allStdWrap
-allWrap
-alternativeSortingField
-alternativeTempPath
-altImgResource
-altTarget
-altText
-alwaysActivePIDlist
-alwaysLink
-andWhere
-angle
-antiAlias
-append
-applyTotalH
-applyTotalW
-arrayReturnMode
-arrowACT
-arrowImgParams
-arrowNO
-ATagBeforeWrap
-ATagParams
-ATagTitle
-atLeast
-atMost
-authcodeFields
-autoInsertPID
-autostart
-backColor
-badMess
-base64
-baseURL
-beforeImg
-beforeImgLink
-beforeImgTagParams
-beforeROImg
-beforeWrap
-begin
-begin
-beginAtLevel
-beLoginLinkIPList
-beLoginLinkIPList_login
-beLoginLinkIPList_logout
-beUserLogin
-bgImg
-blankStrEqFalse
-blur
-bm
-bodyTag
-bodyTag
-bodyTagAdd
-bodyTagCObject
-bodyTagMargins
-border
-border
-borderCol
-bordersWithin
-borderThick
-bottomContent
-bottomHeight
-br
-breakSpace
-breakWidth
-brTag
-bytes
-c
-cache_clearAtMidnight
-cached
-cache_period
-caption
-captionAlign
-captionSplit
-case
-case
-CASE
-casesensitiveComp
-cellpadding
-cellspacing
-char
-charcoal
-clearCacheOfPages
-cMargins
-COA
-COA_INT
-cObject
-cObjNum
-code
-collapse
-color
-color1
-color2
-color3
-color.default
-color.field
-colRelations
-cols
-cols
-colSpace
-COLUMNS
-COMMENT
-commentWrap
-compensateFieldWidth
-compX
-compY
-concatenateJsAndCss
-conf
-config
-config
-CONFIG
-constants
-CONTENT
-content_fallback
-content_from_pid_allowOutsideDomain
-controllerActionName
-controllerExtensionName
-controllerName
-crop
-cropHTML
-csConv
-cssInline
-CSS_inlineStyle
-CTABLE
-CUR
-CURIFSUB
-CURIFSUBRO
-current
-CURRO
-cWidth
-data
-dataArray
-dataWrap
-date
-debug
-debugData
-debugFunc
-debugItemConf
-debugRenumberedObject
-decimals
-dec_point
-default
-defaultAlign
-defaultCmd
-defaultCode
-defaultGetVars
-delete
-denyTags
-depth
-dimensions
-directImageLink
-directionLeft
-directionUp
-directReturn
-disableAllHeaderCode
-disableAltText
-disableCharsetHeader
-disableImgBorderAttr
-disablePageExternalUrl
-disablePrefixComment
-disablePreviewNotification
-displayActiveOnLoad
-displayActiveOnLoad
-displayrecord
-distributeX
-distributeY
-doctype
-doctypeSwitch
-doNotLinkIt
-doNotShowLink
-doNotStripHTML
-dontCheckPid
-dontFollowMouse
-dontHideOnMouseUp
-dontLinkIfSubmenu
-dontMd5FieldNames
-dontWrapInTable
-doubleBrTag
-doublePostCheck
-dWorkArea
-edge
-edit
-editIcons
-editIcons
-editPanel
-EDITPANEL
-EDITPANEL
-effects
-email
-emailMess
-emboss
-emptyTitleHandling
-emptyTitleHandling
-emptyTitleHandling
-enable
-enableContentLengthHeader
-encapsLines
-encapsLinesStdWrap
-encapsTagList
-entryLevel
-equalH
-equals
-evalErrors
-evalFunc
-excludeDoktypes
-excludeNoSearchPages
-excludeUidList
-expAll
-explode
-ext
-extbase
-externalBlocks
-extOnReady
-extTarget
-face.default
-face.field
-FEData
-fe_userEditSelf
-fe_userOwnSelf
-field
-fieldPrefix
-fieldRequired
-fieldWrap
-file
-FILE
-filelink
-fileList
-fileTarget
-firstLabel
-firstLabelGeneral
-flip
-flop
-foldSpeed
-foldTimer
-fontFile
-fontSize
-fontSizeMultiplicator
-fontTag
-footerData
-forceAbsoluteUrl
-forceTypeValue
-FORM
-format
-formName
-formurl
-frame
-frameReloadIfNotInFrameset
-frameSet
-freezeMouseover
-ftu
-gamma
-gapBgCol
-gapLineCol
-gapLineThickness
-gapWidth
-gif
-GIFBUILDER
-globalNesting
-GMENU
-goodMess
-gray
-gr_list
-groupBy
-headerComment
-headerData
-headTag
-height
-hiddenFields
-hide
-hideButCreateMap
-hideMenuTimer
-hideMenuWhenNotOver
-hideNonTranslated
-highColor
-HMENU
-hover
-hoverStyle
-HRULER
-HTML
-html5
-htmlmail
-HTMLparser
-htmlSpecialChars
-htmlTag_dir
-htmlTag_langKey
-htmlTag_setParams
-http
-icon
-iconCObject
-icon_image_ext_list
-icon_link
-icon_thumbSize
-if
-ifBlank
-ifEmpty
-IFSUB
-IFSUBRO
-ignore
-IMAGE
-image_compression
-image_effects
-image_frames
-imgList
-imgMap
-imgMapExtras
-imgMax
-imgNameNotRandom
-imgNamePrefix
-imgObjNum
-imgParams
-imgPath
-imgStart
-IMGTEXT
-import
-inBranch
-includeCSS
-includeJS
-includeJSFooter
-includeJSFooterlibs
-includeJSlibs
-includeLibrary
-includeLibs
-includeNotInMenu
-incT3Lib_htmlmail
-index_descrLgd
-index_enable
-index_externals
-index_metatags
-infomail
-inlineJS
-inlineLanguageLabel
-inlineSettings
-inlineStyle2TempFile
-innerStdWrap_all
-innerWrap
-innerWrap2
-inputLevels
-insertClassesFromRTE
-insertData
-intensity
-intTarget
-intval
-invert
-IProcFunc
-isFalse
-isGreaterThan
-isInList
-isLessThan
-isPositive
-isTrue
-itemArrayProcFunc
-items
-iterations
-javascriptLibs
-join
-jpg
-jsFooterInline
-jsInline
-JSMENU
-JSwindow
-JSwindow.altUrl
-JSwindow.altUrl_noDefaultParams
-JSwindow.expand
-JSwindow.newWindow
-JSwindow_params
-jumpurl
-jumpurl_enable
-jumpurl_mailto_disable
-keep
-keepNonMatchedTags
-keywords
-keywordsField
-labelStdWrap
-labelWrap
-lang
-language
-language_alt
-languageField
-layer_menu_id
-layerStyle
-layout
-layoutRootPath
-leftjoin
-leftOffset
-levels
-limit
-lineColor
-lineThickness
-linkAccessRestrictedPages
-linkParams
-linkVars
-linkWrap
-list
-listNum
-lm
-LOAD_REGISTER
-locale_all
-localNesting
-locationData
-lockFilePath
-lockPosition
-lockPosition_addSelf
-lockPosition_adjust
-loginUser
-longdescURL
-loop
-lowColor
-lower
-mailto
-main
-mainScript
-makelinks
-markers
-markerWrap
-mask
-max
-maxAge
-maxH
-maxHeight
-maxItems
-maxW
-maxWidth
-maxWInText
-m.bgImg
-m.bottomImg
-m.bottomImg_mask
-md5
-meaningfulTempFilePrefix
-menuBackColor
-menuHeight
-menuOffset
-menuWidth
-message_page_is_being_generated
-message_preview
-message_preview_workspace
-meta
-metaCharset
-method
-minH
-minifyCSS
-minifyJS
-minItems
-minItems
-minW
-m.mask
-moveJsFromHeaderToFooter
-MP_defaults
-MP_disableTypolinkClosestMPvalue
-MP_mapRootPoints
-MULTIMEDIA
-name
-namespaces
-negate
-newRecordFromTable
-newRecordInPid
-next
-niceText
-NO
-noAttrib
-noBlur
-no_cache
-noCols
-noLink
-noLinkUnderline
-nonCachedSubst
-none
-nonTypoTagStdWrap
-nonTypoTagUserFunc
-nonWrappedTag
-noOrderBy
-noPageTitle
-noResultObj
-normalWhenNoLanguage
-noRows
-noScale
-noScaleUp
-noscript
-noStretchAndMarginCells
-notification_email_charset
-notification_email_encoding
-notification_email_urlmode
-noTrimWrap
-noValueInsert
-noWrapAttr
-numberFormat
-numRows
-obj
-offset
-offset
-_offset
-offsetWrap
-onlyCurrentPid
-opacity
-options
-orderBy
-OTABLE
-outerWrap
-outline
-output
-outputLevels
-override
-overrideAttribs
-overrideEdit
-overrideId
-PAGE
-pageGenScript
-pageRendererTemplateFile
-pageTitleFirst
-parameter
-params
-parseFunc
-parseFunc
-parseValues
-partialRootPath
-path
-pidInList
-pixelSpaceFontSizeRef
-plainTextStdWrap
-pluginNames
-png
-postCObject
-postUserFunc
-postUserFunkInt
-preCObject
-prefixComment
-prefixLocalAnchors
-prefixLocalAnchors
-prefixRelPathWith
-preIfEmptyListNum
-prepend
-preUserFunc
-prev
-previewBorder
-printBeforeContent
-prioriCalc
-processScript
-properties
-protect
-protectLvar
-quality
-quality
-radioInputWrap
-radioWrap
-range
-range
-rawUrlEncode
-recipient
-RECORDS
-recursive
-redirect
-reduceColors
-relativeToParentLayer
-relativeToTriggerItem
-relPathPrefix
-remap
-remapTag
-removeBadHTML
-removeDefaultJS
-removeIfEquals
-removeIfFalse
-removeObjectsOfDummy
-removePrependedNumbers
-removeTags
-removeWrapping
-renderCharset
-renderObj
-renderWrap
-REQ
-required
-required
-resources
-resultObj
-returnKey
-returnLast
-reverseOrder
-rightjoin
-rm
-rmTagIfNoAttrib
-RO_chBgColor
-rootline
-rotate
-rows
-rowSpace
-sample
-sample
-section
-sectionIndex
-select
-sendCacheHeaders
-sendCacheHeaders_onlyWhenLoginDeniedInBranch
-separator
-setContentToCurrent
-setCurrent
-setfixed
-setFixedHeight
-setFixedWidth
-setJS_mouseOver
-setJS_openPic
-setKeywords
-shadow
-sharpen
-shear
-short
-shortcutIcon
-showAccessRestrictedPages
-showActive
-showFirst
-simulateStaticDocuments
-simulateStaticDocuments_addTitle
-simulateStaticDocuments_dontRedirectPathInfoError
-simulateStaticDocuments_noTypeIfNoTitle
-simulateStaticDocuments_pEnc
-simulateStaticDocuments_pEnc_onlyP
-simulateStaticDocuments_replacementChar
-sitetitle
-size
-size.default
-size.field
-slide
-smallFormFields
-solarize
-source
-space
-spaceAfter
-spaceBefore
-spaceBelowAbove
-spaceLeft
-spaceRight
-spacing
-spamProtectEmailAddresses
-spamProtectEmailAddresses_atSubst
-spamProtectEmailAddresses_lastDotSubst
-SPC
-special
-split
-splitRendering
-src
-stat
-stat_apache
-stat_apache_logfile
-stat_apache_niceTitle
-stat_apache_noHost
-stat_apache_noRoot
-stat_apache_notExtended
-stat_apache_pagenames
-stat_excludeBEuserHits
-stat_excludeIPList
-stat_mysql
-stat_pageLen
-stat_titleLen
-stat_typeNumList
-stayFolded
-stdWrap
-stdWrap2
-strftime
-stripHtml
-stripProfile
-stylesheet
-submenuObjSuffixes
-subMenuOffset
-subparts
-subst_elementUid
-subst_elementUid
-substMarksSeparately
-substring
-swirl
-sword
-sword_noMixedCase
-sword_standAlone
-sys_language_mode
-sys_language_overlay
-sys_language_softExclude
-sys_language_softMergeIfNotBlank
-sys_language_uid
-sys_page
-table
-tableParams
-tables
-tableStdWrap
-tableStyle
-tags
-target
-TCAselectItem
-TDparams
-template
-TEMPLATE
-templateFile
-text
-TEXT
-textMargin
-textMargin_outOfText
-textMaxLength
-textObjNum
-textPos
-textStyle
-thickness
-thousands_sep
-title
-titleTagFunction
-titleText
-titleText
-tm
-TMENU
-token
-topOffset
-totalWidth
-transparentBackground
-transparentColor
-trim
-twice
-typeNum
-types
-typolink
-typolinkCheckRootline
-typolinkEnableLinksAcrossDomains
-typolinkLinkAccessRestrictedPages
-typolinkLinkAccessRestrictedPages_addParams
-uid
-uidInList
-uniqueGlobal
-uniqueLinkVars
-uniqueLocal
-unset
-unsetEmpty
-upper
-url
-useCacheHash
-useLargestItemX
-useLargestItemY
-USER
-USERDEF1
-USERDEF1RO
-USERDEF2RO
-USERFEF2
-userFunc
-userFunc_updateArray
-userIdColumn
-USER_INT
-USERNAME_substToken
-USERUID_substToken
-USR
-USRRO
-value
-variables
-wave
-where
-width
-wordSpacing
-workArea
-workOnSubpart
-wrap
-wrap2
-wrap3
-wrapAlign
-wrapFieldName
-wrapItemAndSub
-wrapNoWrappedLines
-wraps
-xhtml_11
-xhtml_2
-xhtml_basic
-xhtml_cleaning
-xhtmlDoctype
-xhtml_frames
-xhtml+rdfa_10
-xhtml_strict
-xhtml_trans
-xml_10
-xml_11
-xmlprologue
-xPosOffset
-yPosOffset
diff --git a/elpa/auto-complete-1.4/dict/tuareg-mode b/elpa/auto-complete-1.4/dict/tuareg-mode
deleted file mode 100644
index e709f9f62..000000000
--- a/elpa/auto-complete-1.4/dict/tuareg-mode
+++ /dev/null
@@ -1,231 +0,0 @@
-# OCaml 3.12.1
-
-# Keywords
-and
-as
-assert
-begin
-class
-constraint
-do
-done
-downto
-else
-end
-exception
-external
-false
-for
-fun
-function
-functor
-if
-in
-include
-inherit
-initializer
-lazy
-let
-match
-method
-module
-mutable
-new
-object
-of
-open
-or
-private
-rec
-sig
-struct
-then
-to
-true
-try
-type
-val
-virtual
-when
-while
-with
-
-# Pervasives
-!
-!=
-&
-&&
-*
-**
-*.
-+
-+.
--
--.
-/
-/.
-:=
-<
-<=
-<>
-=
-==
->
->=
-@
-FP_infinite
-FP_nan
-FP_normal
-FP_subnormal
-FP_zero
-LargeFile
-Open_append
-Open_binary
-Open_creat
-Open_nonblock
-Open_rdonly
-Open_text
-Open_trunc
-Open_wronly
-Oupen_excl
-^
-^^
-abs
-abs_float
-acos
-asin
-asr
-at_exit
-atan
-atan2
-bool_of_string
-ceil
-char_of_int
-classify_float
-close_in
-close_in_noerr
-close_out
-close_out_noerr
-compare
-cos
-cosh
-decr
-do_at_exit
-epsilon_float
-exit
-exp
-expm1
-failwith
-float
-float_of_int
-float_of_string
-floor
-flush
-flush_all
-format
-format4
-format_of_string
-fpclass
-frexp
-fst
-ignore
-in_channel
-in_channel_length
-incr
-infinity
-input
-input_binary_int
-input_byte
-input_char
-input_line
-input_value
-int_of_char
-int_of_float
-int_of_string
-invalid_arg
-land
-ldexp
-lnot
-log
-log10
-log1p
-lor
-lsl
-lsr
-lxor
-max
-max_float
-max_int
-min
-min_float
-min_int
-mod
-mod_float
-modf
-nan
-neg_infinity
-not
-open_flag
-open_in
-open_in_bin
-open_in_gen
-open_out
-open_out_bin
-open_out_gen
-or
-out_channel
-out_channel_length
-output
-output_binary_int
-output_byte
-output_char
-output_string
-output_value
-pos_in
-pos_out
-pred
-prerr_char
-prerr_endline
-prerr_float
-prerr_int
-prerr_newline
-prerr_string
-print_char
-print_endline
-print_float
-print_int
-print_newline
-print_string
-raise
-read_float
-read_int
-read_line
-really_input
-ref
-seek_in
-seek_out
-set_binary_mode_in
-set_binary_mode_out
-sin
-sinh
-snd
-sqrt
-stderr
-stdin
-stdout
-string_of_bool
-string_of_float
-string_of_format
-string_of_int
-succ
-tan
-tanh
-truncate
-unsafe_really_input
-valid_float_lexem
-||
-~
-~+
-~+.
-~-
-~-.
diff --git a/elpa/auto-complete-1.4/doc/ac-fuzzy.png b/elpa/auto-complete-1.4/doc/ac-fuzzy.png
deleted file mode 100644
index 9940fa750..000000000
Binary files a/elpa/auto-complete-1.4/doc/ac-fuzzy.png and /dev/null differ
diff --git a/elpa/auto-complete-1.4/doc/ac-isearch.png b/elpa/auto-complete-1.4/doc/ac-isearch.png
deleted file mode 100644
index e2ce709c2..000000000
Binary files a/elpa/auto-complete-1.4/doc/ac-isearch.png and /dev/null differ
diff --git a/elpa/auto-complete-1.4/doc/ac.png b/elpa/auto-complete-1.4/doc/ac.png
deleted file mode 100644
index f304e0934..000000000
Binary files a/elpa/auto-complete-1.4/doc/ac.png and /dev/null differ
diff --git a/elpa/auto-complete-1.4/doc/changes.ja.txt b/elpa/auto-complete-1.4/doc/changes.ja.txt
deleted file mode 100644
index 854d3ff69..000000000
--- a/elpa/auto-complete-1.4/doc/changes.ja.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-Title: Auto Complete Mode - 変更点
-CSS: style.css
-
-Auto Complete Mode 変更点
-=========================
-
-[Index](index.ja.txt)
-
-\[[English](changes.txt)]
-
-[ユーザーマニュアル](manual.ja.txt)も参照してください。
-
-v1.4の変更点 {#Changes_v1.4}
-------------
-
-### 新しいオプション ### {#New_Options_v1.4}
-
-* [`ac-use-dictionary-as-stop-words`](manual.ja.txt#ac-use-dictionary-as-stop-words)
-* [`ac-non-trigger-commands`](manual.ja.txt#ac-non-trigger-commands)
-
-### 新しい情報源 ### {#New_Sources_v1.4}
-
-* [`ac-source-ghc-mod`](manual.ja.txt#ac-source-ghc-mod)
-* [`ac-source-slime`](manual.ja.txt#ac-source-slime)
-
-### 新しい辞書 ### {#New_Dictionaries_v1.4}
-
-* erlang-mode
-* ada-mode
-
-### 修正されたバグ ### {#Fixed_Bugs_v1.4}
-
-* 頻度計算で稀に起こるエラー
-* 辞書のキャッシュ戦略の改善
-* help-modeがおかしくなる問題を修正 ("help-setup-xref: Symbol's value as variable is void: help-xref-following")
-* auto-completeがWindows上でpos-tipを使えなかった問題を修正
-* [linum-modeの表示に関するバグの回避策を追加](manual.ja.txt#linum-mode-bug)
-
-v1.3.1の変更点 {#Changes_v1.3.1}
-------------
-
-### 修正されたバグ ### {#Fixed_Bugs_v1.3.1}
-
-* css-modeでborder:と入力するとEmacsが固まる問題
-
-### その他 ### {#Others_v1.3.1}
-
-* COPYINGファイルの追加
-
-v1.3の変更点 {#Changes_v1.3}
-------------
-
-v1.3の主な変更点は次のようになります。
-
-### 新しいオプション ### {#New_Options_v1.3}
-
-* [`ac-disable-faces`](manual.ja.txt#ac-disable-faces)
-* [`ac-show-menu-immediately-on-auto-complete`](manual.ja.txt#ac-show-menu-immediately-on-auto-complete)
-* [`ac-expand-on-auto-complete`](manual.ja.txt#ac-expand-on-auto-complete)
-* [`ac-use-menu-map`](manual.ja.txt#ac-use-menu-map)
-
-### 新しい情報源 ### {#New_Sources_v1.3}
-
-* [`ac-source-semantic-raw`](manual.ja.txt#ac-source-semantic-raw)
-* [`ac-source-css-property`](manual.ja.txt#ac-source-css-property)
-
-### 新しい情報源のプロパティ ### {#New_Source_Properties_v1.3}
-
-* [`summary`](manual.ja.txt#summary)
-* [`available`](manual.ja.txt#available)
-
-### 新しい辞書 ### {#New_Dictionaries_v1.3}
-
-* tcl-mode
-* scheme-mode
-
-### 変更された挙動 ### {#Changed_Behaviors_v1.3}
-
-* 補完候補の長さを考慮したスコアリング（文字列長でソート）
-
-### 修正されたバグ ### {#Fixed_Bugs_v1.3}
-
-* Emacs 22.1でのエラー
-* `flyspell-mode`との衝突（`M-x flyspell-workaround`で解決）
-
-### その他 ### {#Others_v1.3}
-
-* 単語収集の速度を改善 (#18)
-* [pos-tip.el](manual.ja.txt#.E3.83.98.E3.83.AB.E3.83.97.E3.82.92.E7.B6.BA.E9.BA.97.E3.81.AB.E8.A1.A8.E7.A4.BA.E3.81.99.E3.82.8B)との協調
-* Yasnippet 0.61のサポート
-* 多くのバグ修正
-
-v1.2の変更点 {#Changes_v1.2}
-------------
-
-v1.0からv1.2の主な変更点は次のようになります。
-
-### 新機能 ### {#New_Features_v1.2}
-
-* [曖昧マッチによる補完](manual.ja.txt#.E6.9B.96.E6.98.A7.E3.83.9E.E3.83.83.E3.83.81.E3.81.AB.E3.82.88.E3.82.8B.E8.A3.9C.E5.AE.8C)
-* [辞書による補完](manual.ja.txt#.E8.BE.9E.E6.9B.B8.E3.81.AB.E3.82.88.E3.82.8B.E8.A3.9C.E5.AE.8C)
-* [補完候補の絞り込み](manual.ja.txt#.E8.A3.9C.E5.AE.8C.E5.80.99.E8.A3.9C.E3.81.AE.E7.B5.9E.E3.82.8A.E8.BE.BC.E3.81.BF)
-* [補完推測機能](manual.ja.txt#.E8.A3.9C.E5.AE.8C.E6.8E.A8.E6.B8.AC.E6.A9.9F.E8.83.BD)
-* [トリガーキー](manual.ja.txt#.E3.83.88.E3.83.AA.E3.82.AC.E3.83.BC.E3.82.AD.E3.83.BC)
-* [ヘルプ](manual.ja.txt#.E3.83.98.E3.83.AB.E3.83.97)
-
-### 新しいコマンド ### {#New_Commands_v1.2}
-
-* [`auto-complete`](manual.ja.txt#auto-complete.E3.82.B3.E3.83.9E.E3.83.B3.E3.83.89)
-
-### 新しいオプション ### {#New_Options_v1.2}
-
-* [`ac-delay`](manual.ja.txt#ac-delay)
-* [`ac-auto-show-menu`](manual.ja.txt#ac-auto-show-menu)
-* [`ac-use-fuzzy`](manual.ja.txt#ac-use-fuzzy)
-* [`ac-use-comphist`](manual.ja.txt#ac-use-comphist)
-* [`ac-ignores`](manual.ja.txt#ac-ignores)
-* [`ac-ignore-case`](manual.ja.txt#ac-ignore-case)
-* [`ac-mode-map`](manual.ja.txt#ac-mode-map)
-
-### 新しい情報源 ### {#New_Sources_v1.2}
-
-* [`ac-source-dictionary`](manual.ja.txt#ac-source-dictionary)
-
-### 変更された挙動 ### {#Changed_Behaviors_v1.2}
-
-* 補完の開始が遅延されるようになりました ([`ac-delay`](manual.ja.txt#ac-delay))
-* 補完メニューの表示が遅延されるようになりました ([`ac-auto-show-menu`](manual.ja.txt#ac-auto-show-menu))
-
-### その他 ### {#Others_v1.2}
-
-* 多くのバグ修正
-* パフォーマンスの改善
diff --git a/elpa/auto-complete-1.4/doc/changes.txt b/elpa/auto-complete-1.4/doc/changes.txt
deleted file mode 100644
index 489b2c16e..000000000
--- a/elpa/auto-complete-1.4/doc/changes.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-Title: Auto Complete Mode - Changes
-CSS: style.css
-
-Auto Complete Mode Changes
-==========================
-
-[Index](index.txt)
-
-\[[Japanese](changes.ja.txt)]
-
-See also [documentation](manual.txt).
-
-v1.4 Changes {#Changes_v1.4}
-------------
-
-### New Options ### {#New_Options_v1.4}
-
-* [`ac-use-dictionary-as-stop-words`](manual.txt#ac-use-dictionary-as-stop-words)
-* [`ac-non-trigger-commands`](manual.txt#ac-non-trigger-commands)
-
-### New Sources ### {#New_Sources_v1.4}
-
-* [`ac-source-ghc-mod`](manual.txt#ac-source-ghc-mod)
-* [`ac-source-slime`](manual.txt#ac-source-slime)
-
-### New Dictionaries ### {#New_Dictionaries_v1.4}
-
-* erlang-mode
-* ada-mode
-
-### Fixed Bugs ### {#Fixed_Bugs_v1.4}
-
-* Rare completion frequency computation error
-* Improve dictionary caching sterategy
-* Fixed help-mode error ("help-setup-xref: Symbol's value as variable is void: help-xref-following")
-* Fixed auto-complete couldn't use pos-tip on Windows
-* [Added workaround for linum-mode displaying bug](manual.txt#linum-mode-bug)
-
-v1.3.1 Changes {#Changes_v1.3.1}
-------------
-
-### Fixed Bugs ### {#Fixed_Bugs_v1.3.1}
-
-* Significant bug on css-mode
-
-### Others ### {#Others_v1.3.1}
-
-* Added COPYING files
-
-v1.3 Changes {#Changes_v1.3}
-------------
-
-Major changes in v1.3.
-
-### New Options ### {#New_Options_v1.3}
-
-* [`ac-disable-faces`](manual.txt#ac-disable-faces)
-* [`ac-show-menu-immediately-on-auto-complete`](manual.txt#ac-show-menu-immediately-on-auto-complete)
-* [`ac-expand-on-auto-complete`](manual.txt#ac-expand-on-auto-complete)
-* [`ac-use-menu-map`](manual.txt#ac-use-menu-map)
-
-### New Sources ### {#New_Sources_v1.3}
-
-* [`ac-source-semantic-raw`](manual.txt#ac-source-semantic-raw)
-* [`ac-source-css-property`](manual.txt#ac-source-css-property)
-
-### New Source Properties ### {#New_Source_Properties_v1.3}
-
-* [`summary`](manual.txt#summary)
-* [`available`](manual.txt#available)
-
-### New Dictionaries ### {#New_Dictionaries_v1.3}
-
-* tcl-mode
-* scheme-mode
-
-### Changed Behaviors ### {#Changed_Behaviors_v1.3}
-
-* Scoring regarding to candidate length (sort by length)
-
-### Fixed Bugs ### {#Fixed_Bugs_v1.3}
-
-* Error on Emacs 22.1
-* `flyspell-mode` confliction (`M-x flyspell-workaround`)
-
-### Others ### {#Others_v1.3}
-
-* Improved word completion performance (#18)
-* Cooperate with [pos-tip.el](manual.txt#Show_help_beautifully)
-* Yasnippet 0.61 support
-* Fix many bugs
-
-v1.2 Changes {#Changes_v1.2}
-------------
-
-Major changes in v1.2 since v1.0.
-
-### New Features ### {#New_Features_v1.2}
-
-* [Completion by Fuzzy Matching](manual.txt#Completion_by_Fuzzy_Matching)
-* [Completion by Dictionary](manual.txt#Completion_by_Dictionary)
-* [Incremental Filtering](manual.txt#Filtering_Completion_Candidates)
-* [Intelligent Candidate Suggestion](manual.txt#Candidate_Suggestion)
-* [Trigger Key](manual.txt#Trigger_Key)
-* [Help](manual.txt#Help)
-
-### New Commands ### {#New_Commands_v1.2}
-
-* [`auto-complete`](manual.txt#auto-complete_command)
-
-### New Options ### {#New_Options_v1.2}
-
-* [`ac-delay`](manual.txt#ac-delay)
-* [`ac-auto-show-menu`](manual.txt#ac-auto-show-menu)
-* [`ac-use-fuzzy`](manual.txt#ac-use-fuzzy)
-* [`ac-use-comphist`](manual.txt#ac-use-comphist)
-* [`ac-ignores`](manual.txt#ac-ignores)
-* [`ac-ignore-case`](manual.txt#ac-ignore-case)
-* [`ac-mode-map`](manual.txt#ac-mode-map)
-
-### New Sources ### {#New_Sources_v1.2}
-
-* [`ac-source-dictionary`](manual.txt#ac-source-dictionary)
-
-### Changed Behaviors ### {#Changed_Behaviors_v1.2}
-
-* Completion is now delayed to start ([`ac-delay`](manual.txt#ac-delay))
-* Completion menu is now delayed to show ([`ac-auto-show-menu`](manual.txt#ac-auto-show-menu))
-
-### Others ### {#Others_v1.2}
-
-* Fix many bugs
-* Improve performance
diff --git a/elpa/auto-complete-1.4/doc/demo.txt b/elpa/auto-complete-1.4/doc/demo.txt
deleted file mode 100644
index aa04d7d4a..000000000
--- a/elpa/auto-complete-1.4/doc/demo.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: Auto Complete Mode - Demo
-CSS: style.css
-
-Auto Complete Mode Demo
-=======================
-
-[Index](index.txt)
-
-[YouTube mirror](http://www.youtube.com/watch?v=rGVVnDxwJYE)
-
-<video src="ac-demo.ogv" controls="true" width="720" height="672" />
diff --git a/elpa/auto-complete-1.4/doc/index.ja.txt b/elpa/auto-complete-1.4/doc/index.ja.txt
deleted file mode 100644
index 28abfb4e2..000000000
--- a/elpa/auto-complete-1.4/doc/index.ja.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-Title: Auto Complete Mode - GNU Emacsのための最も賢い自動補完機能
-CSS: style.css
-
-Auto Complete Mode
-==================
-
-*[GNU Emacs][]のための最も賢い自動補完機能*
-
-\[[English](index.txt)]
-
-* * * *
-
-{toc}
-
-* * * *
-
-Auto Complete Modeとは
-----------------------
-
-Auto Complete Modeは[GNU Emacs][]のための最も賢い自動補完機能です。従来の使いづらい補完インターフェースを一新し、ユーザーがより本質的な作業に集中できる環境を提供します。
-
-特徴
-----
-
-* 視覚的な操作感
-* 統計的手法による補完オーバーヘッドの削減
-* 拡張性
-
-スクリーンショット
-------------------
-
-![](ac.png "自動補完") ![](ac-fuzzy.png "曖昧補完") ![](ac-isearch.png "インクリメンタル検索")
-
-デモ
-----
-
-* [YouTube](http://www.youtube.com/watch?v=rGVVnDxwJYE)
-* [Ogg Theora with video tag](demo.txt)
-
-ダウンロード
-------------
-
-### 最新安定板 (v1.3.1) ### {#Latest_Stable}
-
-[v1.3.1の変更点](changes.ja.txt#Changes_v1.3.1)
-
-* [auto-complete-1.3.1.tar.bz2](http://cx4a.org/pub/auto-complete/auto-complete-1.3.1.tar.bz2)
-* [auto-complete-1.3.1.tar.zip](http://cx4a.org/pub/auto-complete/auto-complete-1.3.1.zip)
-
-ユーザーマニュアル
-------------------
-
-[Auto Complete Modeユーザーマニュアル](manual.ja.txt)
-
-利用者の声
-----------
-
-利用者の声をぜひお聞かせください。あなたの名前（匿名希望可）とコメントをそえて[tomo@cx4a.org](mailto: tomo@cx4a.org)までメールでお願いします。どんなコメントでも歓迎です。
-
-ソースコード
-------------
-
-ソースコードは以下のGitリポジトリから取得できます。
-
-* <http://cx4a.org/repo/auto-complete.git>
-* <http://github.com/m2ym/auto-complete> (GitHubミラー)
-
-バグレポート
-------------
-
-[Auto Complete Modeのバグトラッキングシステム](http://cx4a.org/redmine/projects/auto-complete-mode)に新しいチケットを登録してください。
-
-ライセンス
-----------
-
-このソフトウェアは[GPLv3][]のもとで配布されます。
-
-[GNU Emacs]: http://www.gnu.org/software/emacs/
-[GPLv3]: http://gplv3.fsf.org/
diff --git a/elpa/auto-complete-1.4/doc/index.txt b/elpa/auto-complete-1.4/doc/index.txt
deleted file mode 100644
index 5447df21c..000000000
--- a/elpa/auto-complete-1.4/doc/index.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-Title: Auto Complete Mode - The most intelligent auto-completion extension for GNU Emacs
-CSS: style.css
-
-Auto Complete Mode
-==================
-
-*The most intelligent auto-completion extension for [GNU Emacs][]*
-
-\[[Japanese](index.ja.txt)]
-
-* * * *
-
-{toc}
-
-* * * *
-
-What is Auto Complete Mode?
----------------------------
-
-Auto Complete Mode is the most intelligent auto-completion extension for [GNU Emacs][]. It extends the standard Emacs completion interface and provides an environment that allows users to concentrate more on their own work.
-
-Features
---------
-
-* Visual interface
-* Reduce overhead of completion by using statistic method
-* Extensibility
-
-Screenshots
------------
-
-![](ac.png "Auto Completion") ![](ac-fuzzy.png "Fuzzy Completion") ![](ac-isearch.png "Increamental Search")
-
-Demo
-----
-
-* [YouTube](http://www.youtube.com/watch?v=rGVVnDxwJYE)
-* [Ogg Theora with video tag](demo.txt)
-
-Downloads
----------
-
-### Latest Stable (v1.3.1) ### {#Latest_Stable}
-
-[Changes v1.3.1](changes.txt#Changes_v1.3.1)
-
-* [auto-complete-1.3.1.tar.bz2](/pub/auto-complete/auto-complete-1.3.1.tar.bz2)
-* [auto-complete-1.3.1.zip](/pub/auto-complete/auto-complete-1.3.1.zip)
-
-User Manual
------------
-
-[Auto Complete Mode User Manual](manual.txt)
-
-User's Voice
-------------
-
-Please send me a comment with your name (or anonymous) to [tomo@cx4a.org](mailto: tomo@cx4a.org) if you like it. Any comments are welcome.
-
-Source Code
------------
-
-Git repositories are available:
-
-* <http://cx4a.org/repo/auto-complete.git>
-* <http://github.com/m2ym/auto-complete> (GitHub mirror)
-
-Reporting Bugs
---------------
-
-Visit [Auto Complete Mode Bug Tracking System](http://cx4a.org/redmine/projects/auto-complete-mode) and create a new ticket.
-
-License
--------
-
-This software is distributed under the term of [GPLv3][]+.
-
-[GNU Emacs]: http://www.gnu.org/software/emacs/
-[GPLv3]: http://gplv3.fsf.org/
diff --git a/elpa/auto-complete-1.4/doc/manual.ja.txt b/elpa/auto-complete-1.4/doc/manual.ja.txt
deleted file mode 100644
index 27b6d8e01..000000000
--- a/elpa/auto-complete-1.4/doc/manual.ja.txt
+++ /dev/null
@@ -1,1108 +0,0 @@
-Title: Auto Complete Modeユーザーマニュアル
-Numbering: yes
-CSS: style.css
-
-Auto Complete Modeユーザーマニュアル
-====================================
-
-[Index](index.ja.txt)
-
-\[[English](manual.txt)]
-
-* * * *
-
-{toc}
-
-* * * *
-
-はじめに
---------
-
-Auto Complete Mode（通称、`auto-complete.el`, `auto-complete-mode`）は[GNU Emacs][]（以下Emacs）の補完システムを自動化・高度化する拡張です。従来の補完システムと比べて以下の点で優れています。
-
-* 視覚的な操作感
-* 統計的手法による補完オーバーヘッドの削減
-* 拡張性
-
-本マニュアルはインストール方法から基本的な使い方・設定方法、また拡張方法までを網羅しています。不明な点があれば開発者まで連絡をください。
-
-なお、Auto Complete Modeは[GPLv3][]のもとでライセンスされています。また、このドキュメントは[GFDL][]のもとでライセンスされています。
-
-ダウンロード
-------------
-
-[Auto Complete Modeのトップページ](index.ja.txt)からダウンロードできます。
-
-インストール
-------------
-
-### 必要条件 ###
-
-* 800MHz以上のCPU
-* 256MB以上のメモリ
-* GNU Emacs 22以上
-
-### インストールスクリプト ###
-
-パッケージディレクトリ内の`etc/install.el`というインストールスクリプトを利用すれば簡単にインストールを行うことができます。
-
-起動中のEmacsあるいは新しく起動したEmacsで`M-x load-file RET`と入力してください。なお`auto-complete-mode`をアップグレードする場合は**`-q`オプションで新しく起動したEmacs**でインストールを行ってください。`auto-complete-mode`ロードするファイル名を尋ねられるのでアーカイブを展開したディレクトリに`/etc/install.el`を追加したフルパスを入力します。例えば展開したディレクトリのパスが`~/tmp/auto-complete-1.2`である場合、`~/tmp/auto-complete-1.2/etc/install.el`と入力します。
-
-次にインストール先のディレクトリを尋ねられますので、お好みディレクトリを入力してください。このディレクトリが`load-path`に設定されていない場合は後で設定する必要があります。デフォルトでは`~/.emacs.d`です。
-
-最後に`RET`を押してインストールを開始してください。インストールが完了すると次のようなバッファが表示されるので、指示に従って`.emacs`を編集してください。
-
-あるいは、次のようにターミナルからインストールすることもできます。
-
-    $ make install
-    $ # あるいはディレクトリをあらかじめ指定して
-    $ make install DIR=$HOME/.emacs.d/
-
-GNU Makeがない場合は次のようにします。
-
-    $ emacs -batch -l etc/install.el
-
-**インストール後のメッセージ例（\*Installation Result*バッファ）**
-
-    Successfully installed!
-    
-    Add the following code to your .emacs:
-    
-    (add-to-list 'load-path "~/.emacs.d")    ; load-pathにすでに設定されている場合は表れません
-    (require 'auto-complete-config)
-    (add-to-list 'ac-dictionary-directories "~/.emacs.d/ac-dict")
-    (ac-config-default)
-
-### 手動によるインストール ###
-
-ディレクトリ構成と設定が正しければ手動によるインストールも可能です。まず展開したディレクトリにおいて全ての`.el`ファイルに対してバイトコンパイルを実行してください。UNIX系OSであれば同封の`Makefile`を利用できると思います。
-
-    $ make byte-compile
-
-`Makefile`を利用できない場合は、Emacsから`C-x d`で展開したディレクトリを開き`* . el RET B RET`で`.el`ファイルをバイトコンパイルしてください。
-
-次に全て`.el`ファイルと`.elc`ファイルを`load-path`が通ったディレクトリにコピーします。例えばそのディレクトリが`~/.emacs.d`であれば次のようなコマンドを実行します。
-
-    $ cp *.el *.elc ~/.emacs.d
-
-次に辞書ファイルをインストールします。このファイルがなくても動作しますが、特に理由がなければインストールしたほうがよいでしょう。辞書ファイルは`dict`ディレクトリに格納されており、`auto-complete.el`がインストールされたディレクトリと同じディレクトリにインストールされる必要があります。例えば`auto-complete.el`を`~/.emacs.d`にインストールしたのであれば、`~/.emacs.d`に`dict`ディレクトリをコピーします。この際、既存のファイルを上書きしないようにしてください。おそらくそのようなケースは起こらないと思いますが、上記のインストールスクリプトでは`ac-dict`という名前のディレクトリに辞書ファイルを格納することにより、他のファイルを上書きしたり干渉する可能性を最小限にしています。
-
-    $ cp -r dict ~/.emacs.d
-
-最後に`.emacs`に次のような設定を記述します。
-
-    (require 'auto-complete-config)
-    (add-to-list 'ac-dictionary-directories "~/.emacs.d/dict")
-    (ac-config-default)
-
-`load-path`の設定が行われていない場合は次のコードも記述する必要があります。
-
-    (add-to-list 'load-path "~/.emacs.d")
-
-### 動作確認 ###
-
-Emacsを再起動するか新規に起動して\*scratch\*バッファで適当な文字を入力してください。補完メニューが表われて補完が開始されればインストール成功です。エラーが出たり補完が開始されない場合は以下のことを確認した後、開発者に連絡してください。
-
-* `load-path`は正しいか
-
-  `auto-complete.el`をインストールしたディレクトリが`load-path`に設定されているかどうか。
-
-* モードラインに`AC`という文字があるか
-
-  モードライン（バッファ下部の灰色の行）に`AC`という文字がない場合は`auto-complete-mode`が有効になっていない可能性があります。`M-x auto-complete-mode`で有効にして再度試してください。
-
-* エラーが発生
-
-  \*Backtrace*バッファにエラーが表示されたり、ミニバッファ（フレーム下部の入力欄）にエラーメッセージが表示された場合は、その内容を添付のうえ開発者に連絡してください。
-
-基本的な使い方
---------------
-
-出鼻をくじくようですが、ある意味では`auto-complete-mode`には「使い方」が存在しません。というのも、Emacsの編集システムに自然に溶け込むように`auto-complete-mode`が設計されているからです。ユーザーは快適な編集操作を邪魔されることなく、高度な補完機能を自動的に享受することができるのです。究極的には、ユーザーのいかなる指示もなしにユーザーが望むように自動的に補完することが目標となりますが、100%の補完推測は現実的に不可能です。その点をカバーするために若干の「使い方」が存在します。この節ではその「使い方」を説明します。
-
-### 文字入力 ###
-
-まず基本となるのが文字入力です。文字が入力されなければ補完もできません。ではどの文字が入力されたときに補完が開始されるのかという疑問がわくと思いますが、それを説明するのは難しいのでここでは割愛します。簡単に言えば、キーの押し込みによる単純な文字追加時に補完が開始されます。詳しくは[`ac-trigger-commands`](#)を参照してください。
-
-![文字入力](ac.png)
-
-### TABによる補完 ####
-
-補完が開始されるとTABによる補完が一時的に有効になります。TABによる補完は`auto-complete-mode`において最も重要で最もよく使う操作です。TABは状況によって様々な意味を持ちます。
-
-* 補完候補が一つしかない場合
-
-  補完候補が一つの場合は、その補完候補で補完を実行します。
-
-* 補完候補に共通部分がある場合
-
-  例えばsという単語の補完候補が全てsetではじまる場合、その共通部分はsetであると解釈され、TABによってsetまで展開されます。
-
-* その他の場合
-
-  その他の場合、TABを押すごとに補完候補を先頭から順繰りで選択していきます。補完候補の末尾にきたら再び補完候補の先頭から選択していきます。
-
-設定によって若干挙動が異なりますが、基本的にはこのような挙動になります。このようにTABに様々な意味を持たせるのは、TABのみで全て完結させようという狙いがあります。
-
-### RETによる補完 ###
-
-TABによる補完と似ていますが、RETによる補完は以下の点で異なります。
-
-* 選択中の補完候補で即時補完する
-* 補完候補にアクションが設定されている場合に、そのアクションが実行される
-
-TABによる補完では共通部分の展開などで何度かTABを押す必要があります。RETによる補完では選択中の補完候補で即時に補完されるので、目的の補完候補であると視認したならRETを押すとよいでしょう。その際、アクションというのものが実行される可能性がありますが、ここでは詳しくは触れません。アクションの例としては、標準添付の略語補完が分かりやすいでしょう。wwwをWorld Wide Webと展開する略語が登録されている時、wという単語でwwwを補完することができますが、RETによる補完の場合は、さらに略語展開を行いWorld Wide Webと補完します。つまりTABによる補完ではwwwが最終的な補完結果になり、RETによる補完ではWorld Wide Webが最終的な補完結果になります。
-
-### 補完候補の選択 ###
-
-`auto-complete-mode`の考え方に従えば、補完候補の選択は推奨されるものではありません。なぜなら、その時点でユーザーの補完推測に失敗しており、さらにユーザーに補完候補を選択させるというオーバーヘッドの高い操作を要求しているからです。補完候補の選択はTABによる補完でもある程度補うことができ、さらに最近のバージョンでは統計的手法によって補完推測の精度があがっているので、補完候補の選択が必要になるケースはそれほど多くないと考えられます。しかし、実際にそのようなケースは存在するので、補完候補の選択方法を覚えておくのも悪いことではないかもしれません。
-
-前置きが長いですが、補完候補の選択自体は難しい操作ではありません。補完中にカーソルキーあるいは`M-p`, `M-n`で前後に選択することができます。設定によりますが、補完候補の選択が行われた後はTABによる補完がRETによる補完に近い挙動に変化します。詳しくは[`ac-dwim`](#)を参照してください。
-
-その他の方法としてMetaキーと数字の組合せで選択することもできます。例えば`M-1`を押せば1番目の候補を選択して補完します。これもオーバーヘッドが大きいので極力使わないでください。
-
-### ヘルプ ###
-
-`auto-complete-mode`には*クイックヘルプ*と*バッファヘルプ*の二つのヘルプ機能が備え付けられています。両者の違いは見せ方だけです。クイックヘルプは補完メニューのすぐ隣に表示するので、視線の移動が最小限で済むというメリットがありますが、表示領域が狭すぎると可読性が低くなるというデメリットがあります。またクイックヘルプは補完メニューを表示してからしばらく待つと自動的に表示されます。クイックヘルプを利用するには[`ac-use-quick-help`](#)を`t`にしておく必要があります。表示までの時間は[`ac-quick-help-delay`](#)で制御できます。
-
-一方、ユーザーが明示的に命令することで表示されるのがバッファヘルプです。バッファヘルプはその名の通り、別ウィンドウにヘルプ用バッファを表示します。クイックヘルプに比べて視線の移動が大きい分、、可読性に優れています。バッファヘルプを表示するには補完中に`C-?`あるいは`f1`を押します。バッファヘルプ表示後はさらに`C-M-v`あるいは`C-M-S-v`でバッファヘルプの上下スクロールが可能です。それ以外の命令の場合はバッファヘルプを閉じてフォールバックします。
-
-### まとめ ###
-
-補完は文字の入力によって開始されます。補完が開始されると次の表に示す操作が時的に有効になります。補完が完了したら、これらの操作は無効になります。
-
-| キー      | コマンド    | 説明                     |
-|-----------|-------------|--------------------------|
-| TAB, C-i  | ac-expand   | TABによる補完を実行する  |
-| RET, C-m  | ac-complete | RETによる補完を実行する  |
-| down, M-n | ac-next     | 次の候補を選択する       |
-| up, M-p   | ac-previous | 前の候補を選択する       |
-| C-?, f1   | ac-help     | バッファヘルプを表示する |
-
-補完を途中で中断するには`C-g`を使うとよいでしょう。
-
-高度な使い方
-------------
-
-前節に引き続いて、もう少し高度な使い方を説明します。とはいってもあくまでユーザーの視点での話なので、`auto-complete-mode`を意のままに操りたいという方は、次節以降を読み進めるとよいでしょう。
-
-### `auto-complete`コマンド ###
-
-基本的に`auto-complete-mode`は自動的に補完を開始するという前提がありますが、その限りではない場合もあります。例えば、文字は入力しないけど補完はしたいという場合や、設定によって自動的に補完が開始されないようにしている場合などです。そのような時に利用するのが`auto-complete`というコマンドで、普通は何らかのキーに割り当てて利用します。例えば従来の`M-TAB`による補完を、`auto-complete-mode`が提供するより高度な補完に切り替えるには次のコードを評価します。
-
-    (define-key ac-mode-map (kbd "M-TAB") 'auto-complete)
-
-さて、`auto-complete`コマンドに関してですが、これは通常の自動的な補完とは若干異なる挙動になっています。
-
-* 補完候補が一つしかない場合
-
-  補完メニューを表示しないで、そのまま補完を実行します。
-
-* 補完候補が一つもない場合
-
-  曖昧マッチによる補完を試みます。詳しくは[曖昧マッチによる補完](#)を参照してください。
-
-* その他の場合
-
-  その他の場合、全体共通部分を展開しつつ補完メニューを表示して補完を開始します。その後の操作は自動的に補完が開始された場合と同じになります。[`ac-show-menu-immediately-on-auto-complete`](#)と[`ac-expand-on-auto-complete`](#)も参照してください。
-
-### 曖昧マッチによる補完 ###
-
-`auto-complete`コマンドで補完候補が一つもない場合や`ac-fuzzy-complete`コマンドが実行された場合、通常の確実なマッチではなく曖昧なマッチによって補完を試みます。曖昧マッチのパラメータはあらかじめ最適化されているのでユーザーが変更する必要はありませんが、内部を知りたい場合は`fuzzy.el`を参照してください。曖昧マッチによる補完を利用すれば、タイポも補完の一環として修正することができます。例えば適当なバッファでmessaegと入力して`M-x auto-complete`あるいは`M-x ac-fuzzy-complete`してください。曖昧マッチに成功したらカーソルの色が赤色に変化し、messaegではなくmessageであると解釈して補完を継続することができます。このようなケースにすぐさま対処するという意味でも`auto-complete`コマンドを何らかのキーに割り当てておくのは決して悪いことではありません。
-
-![曖昧マッチ](ac-fuzzy.png)
-
-### 補完候補の絞り込み ###
-
-補完中に`C-s`を押すことで絞り込みを開始できます。絞り込みが開始されるとカーソルの色が青色に変化します。その後に続いて絞り込む文字列を入力していきます。絞り込みはインクリメンタルに更新されるので直感的に理解できると思います。絞り込みの最中でもTABによる補完や候補選択を行うことができます。その際、カーソルの色が元に戻りますが、これは絞り込みが終了したことを意味しています。再度`C-s`を押したときは、前回の絞り込み文字列が復元されます。絞り込み文字列を削除するには`DEL`または`C-h`を押してください。それ以外の一般的な編集操作はここでは利用できません。
-
-![絞り込み](ac-isearch.png)
-
-### トリガーキー ###
-
-`auto-complete`コマンドをどのキーに割り当てるかは結構難しい問題です。補完という操作は頻繁に行うため、できるだけ押しやすいキーに割り当てるべきです。しかし押しやすいキーはすでに他のコマンドに割り当てられているというのはEmacsでは非常によくあることなのです。そういうケースに対処するため`auto-complete-mode`はトリガーキーと呼ばれる機能を提供しています。トリガーキーを利用すれば、任意のキーを必要なときに一時的にのっとって`auto-complete`コマンドに割り当てることができます。例えばTABをトリガーキーに設定するには次のようになります。
-
-    (ac-set-trigger-key "TAB")
-
-トリガーキーは文字入力の直後に有効になります。それ以外の場合は通常のコマンドが実行されます（TABならインデント）。通常、トリガーキーは`ac-auto-start`を`nil`にして利用します。
-
-    (setq ac-auto-start nil)
-
-`ac-auto-start`に関しては[自動的に補完しない](#)あるいは[`ac-auto-start`](#)を参照してください。
-
-### 補完推測機能 ###
-
-`auto-complete-mode`はユーザーの補完行動を逐一解析して、可能な限り補完のオーバーヘッドを削減しようとします。具体的には、例えば何度か`foobar`が補完されれば、次回以降は`foobar`が補完候補の上位に配置され、一回あるいは数回以内のTABで補完できる環境を作ります。内部的には`comphist`と呼ばれる機構を使っており、`ac-use-comphist`が`t`の場合にこの機能が有効になります。デフォルトでは有効になっています。収集された行動データは`user-emacs-directory`あるいは`~/.emacs.d`に`ac-comphist.dat`というファイル名で永続化され、次回以降も再利用されます。
-
-優れた補完推測を実現するため、次の二つのデータを収集します。
-
-* その補完候補が補完された回数
-* その補完候補が補完された位置
-
-簡単に言えば、単純に補完回数を数えるのではなく、補完位置ごとに補完回数を数えていき、その補完候補のスコアは補完されている位置との比較でうまく重み付けされます。例えばfと入力して`find-file`を補完するという行動を何度か繰り返せば、fを入力した段階で`find-file`が上位に配置されます。ただ、続けてfind-と入力したときに`find-file`が先ほどと同じスコアになるかといえば、そういうわけではなく、先ほどと位置として4離れているわけですから、それだけ重み付けが軽くなります。逆にfind-の後に`find-library`が補完されやすい場合は、そちらの補完候補のスコアのほうが上位に来る可能性が高くなるので、結果的にfの時点では`find-file`が上位に、find-の時点では`find-library`が上位に来るといった、ユーザーの行動を学習したかのような推測が可能になるわけです。
-
-ユーザーはこの機能をできるだけ活用するために、よく入力する単語はできるだけ前の位置で補完するように心がけてください。また、できるだけ行動は一貫してください。補完位置が毎回変わるようではうまく学習できないからです。おそらくあまり気にせず使っていれば、自動的にそのような行動になるでしょう。
-
-### 辞書による補完 ###
-
-辞書とは単純な文字列のリストのことであり、それぞれユーザー定義辞書、メジャーモード辞書、拡張子辞書の3つがあります。なお、辞書による補完を利用するには情報源に`ac-source-dictionary`を設定しておく必要があります（デフォルトでは設定済み）。詳しくは[情報源](#)を参照してください。
-
-#### ユーザー定義辞書 ####
-
-ユーザー定義辞書は`ac-user-dictionary`に設定された文字列リストおよび`ac-user-dictionary-files`で指定された辞書ファイルで構築されます。辞書ファイルは改行で区切られた単語の一覧です。ユーザー定義辞書は全てのバッファで共通です。例えば自分のメールアドレスを辞書に登録する場合、次のように`ac-user-dictionary`に単語を追加します。
-
-    (add-to-list 'ac-user-dictionary "foobar@example.com")
-
-設定は直ちに反映されます。試しに適当なバッファで`foo`と入力してください。`foobar@example.com`が補完候補になると思います。この設定はEmacsを終了したら消去されます。永続化させるためには`.emacs`に記述しておく必要があります。
-
-    (setq ac-user-dictionary '("foobar@example.com" "hogehoge@example.com"))
-
-もっと分かりやすいのは辞書ファイルを利用する方法です。`ac-user-dictionary-files`に指定されているファイルは辞書ファイルとして扱われます。デフォルトで`~/.dict`が辞書ファイルになるので、`~/.dict`を開いて次のように記述してください。
-
-    foobar@example.com
-    hogehoge@example.com
-
-前述したように改行が単語の区切りになります。保存してもすぐには反映されません。コストの高い辞書ファイルの読み込みを抑えるためにキャッシュを使っているからです。キャッシュを消去するには`M-x ac-clear-dictionary-cache`を実行します。後は先ほどと同じように適当なバッファで文字を入力すれば定義した単語を補完できるようになると思います。
-
-言うまでもないかもしれませんが、`ac-user-dictionary-files`に任意の辞書ファイルを追加することで、違う辞書ファイルを読み込むことも可能です。
-
-#### メジャーモード辞書・拡張子辞書 ####
-
-メジャーモードや拡張子ごとに違う辞書を利用することもできます。辞書は`ac-dictionary-directories`に設定されたディレクトリから読み込まれます。`ac-dictionary-directories`は[インストール](#)時に次のように設定しているはずです。
-
-    (add-to-list 'ac-dictionary-directories "~/.emacs.d/ac-dict")
-
-このディレクトリにはc++-modeのようなメジャーモードのための辞書ファイルやtxtのような拡張子のための辞書ファイルが格納されています。例えば`a.cpp`というバッファで辞書による補完を利用する場合、上記の設定を前提にすれば、`~/.emacs.d/ac-dict/c++-mode`と`~/.emacs.d/ac-dict/cpp`から辞書が読み込まれます。ユーザーはこれらの辞書ファイルを変更することができますし、また新しく追加することもできます。さらに、同様の構成のディレクトリを作成して`ac-dictionary-directories`に追加することで、辞書ファイルを追加することも可能です。この際、`ac-dictionary-directories`の先頭にあるディレクトリが優先されることに気をつけてください。
-
-ユーザー定義辞書と同様、辞書の追加・編集後は`M-x ac-clear-dictionary-cache`でキャッシュを消去してください。
-
-情報源
-------
-
-`auto-complete-mode`の拡張性を保証しているのがこの情報源という概念です。*情報源*とは簡単に言えば、下記する事柄をひとまとめに記述したものと言えます。
-
-* どのような補完候補を生成するか
-* どのように補完するか
-* どのように表示するか
-
-Emacs Lispについて若干の知識があれば誰でも簡単に情報源を定義することができます。情報源の定義に関しては[拡張方法](#)を参照してください。ここでは情報源の利用方法と標準添付されている情報源について説明します。
-
-情報源の名前は`ac-source-`で始まる慣習となっています。そのため`apropos`を使ってどのような情報源が定義されているか調べることができます（`M-x apropos RET ^ac-source-`)。`ac-source-filename`や`ac-source-dictionary`などが見付かると思いますが、これらが情報源と呼ばれる実体になっています。
-
-### 情報源を利用する ###
-
-`.emacs`に`(ac-config-default)`を記述している場合、デフォルトで最適な設定が使われるので、おそらく情報源の設定を変更するケースはまれだと思いますが、一応簡単に触れておきます。情報源は`ac-sources`という変数にリストとして設定されます。インストール直後に\*scracth*で`ac-sources`を評価すると次のような結果になると思います。
-
-    ;; 整形済み
-    (ac-source-filename
-     ac-source-functions
-     ac-source-yasnippet
-     ac-source-variables
-     ac-source-symbols
-     ac-source-features
-     ac-source-abbrev
-     ac-source-words-in-same-mode-buffers
-     ac-source-dictionary)
-
-見てのとおり、\*scratch\*バッファの`ac-sources`には6つの情報源が設定されていることがわかります。それぞれの説明は後述しますが、大体の意味は推測できるでしょう。大事なことなので記憶しておいてほしいのですが、`ac-sources`はバッファーローカル変数になっており、バッファごとに独立した設定を許可しています。つまりあるバッファで`ac-sources`を変更しても、他のバッファには影響がないことになります。
-
-例を示します。今、\*scratch\*バッファにいると考えてください。上記のように、このバッファには多くの情報源が設定されています。多機能すぎると感じるユーザーもいるでしょう。そこで、もう少し機能を制限するために`ac-sources`の変更を考えます。変更方法は簡単で、次のようなコードを\*scratch\*バッファあるいは`M-:`で評価するだけです。
-
-    (setq ac-sources '(ac-source-symbols ac-source-words-in-same-mode-buffers))
-
-この例では、`ac-sources`を減らして、シンボル補完と同一メジャーモード間での単語補完のみを有効にしました。さて、これを次のEmacsの起動時にも有効にするにはどうしたらよいのでしょうか。\*scratch\*バッファ作成時に`emacs-lisp-mode-hook`というフックが実行されるので、このフックに適当な関数を追加するのがよいでしょう。
-
-    (defun my-ac-emacs-lisp-mode ()
-      (setq ac-sources '(ac-source-symbols ac-source-words-in-same-mode-buffers)))
-    
-    (add-hook 'emacs-lisp-mode-hook 'my-ac-emacs-lisp-mode)
-
-`.emacs`に`(ac-config-default)`が記述されている場合は、上記の方法では正しく動作しないかもしれません。というのも`(ac-config-default)`内部で同様のことを行っているので、どちらかが設定を上書きしてしまうからです。その場合は`(ac-config-default)`で利用する関数を再定義してしまうのがよいでしょう。`emacs-lisp-mode`の場合は、その関数名は`ac-emacs-lisp-mode-setup`です。詳しくは`auto-complete-config.el`を参照してください。
-
-    (defun ac-emacs-lisp-mode-setup ()
-      (setq ac-sources '(ac-source-symbols ac-source-words-in-same-mode-buffers)))
-
-さて、これで特定のメジャーモードで情報源を変更する方法が分かったと思います。まとめると次のようになるでしょう。
-
-1. `ac-sources`を変更する関数を定義する
-2. `add-hook`で適当なモードフックにその関数を登録する（`c++-mode-hook`, `ruby-mode-hook`, `python-mode-hook`など）
-
-では、全てのバッファに対して`ac-sources`を設定するにはどうしたらよいのでしょうか。その場合は`setq`ではなく`setq-default`で`ac-sources`を設定します。そうするとバッファローカル変数である`ac-sources`のデフォルト値が設定した値になります。
-
-    (setq-default ac-sources '(ac-source-words-in-all-buffer))
-
-他にも方法があります。`(ac-config-default)`は`auto-complete-mode`のフックである`auto-complete-mode-hook`に関数を追加することにより、`setq-default`によるデフォルト値の変更に近いことをやっています。その関数は`ac-common-setup`であり、`ac-sources`の先頭に`ac-source-filename`という情報源を追加しています。これにより`auto-complete-mode`が有効な全てのバッファで`ac-source-filename`が情報源の先頭に追加されます。なぜ先頭なのかというと、これにはオムニ補完の仕様が関係しているのですが、とりあえずここでは気にしなくてもいいです。つまるところ、`(ac-config-default)`を使っていて共通して`ac-sources`を変更したい場合は、この`ac-common-setup`関数を再定義することも一つの手段となります。
-
-    ;; 全てのバッファの`ac-sources`の末尾に辞書情報源を追加
-    (defun ac-common-setup ()
-      (setq ac-sources (append ac-sources '(ac-source-dictionary))))
-
-### 標準情報源 ###
-
-`auto-complete.el`および`auto-complete-config.el`に定義されている情報源の一覧です。
-
-#### `ac-source-abbrev` ####
-
-Emacsの略語機能のための情報源です。略語機能に関しては`info emacs Abbrevs`を参照してください。
-
-#### `ac-source-css-property` ####
-
-CSSプロパティのための情報源です。
-
-#### `ac-source-dictionary` ####
-
-辞書のための情報源です。辞書に関しては[辞書による補完](#)を参照してください。
-
-#### `ac-source-eclim` ####
-
-[Emacs-eclim](http://github.com/senny/emacs-eclim)のための情報源です。
-
-#### `ac-source-features` ####
-
-`(require '`で有効なfeatureを補完するための情報源です。
-
-#### `ac-source-filename` ####
-
-ファイル名を補完するための情報源です。`/`を入力した時点で補完が開始されます。
-
-#### `ac-source-files-in-current-dir` ####
-
-カレントディレクトリのファイルを補完するための情報源です。`eshell`などで便利かもしれません。
-
-#### `ac-source-functions` ####
-
-Emacs Lispの関数を補完するための情報源です。`(`の直後で有効です。
-
-#### `ac-source-ghc-mod` ####
-
-[ghc-mod](http://www.mew.org/~kazu/proj/ghc-mod/en/)のための情報源です。
-
-#### `ac-source-gtags` ####
-
-[Global](http://www.tamacom.com/global.html)のタグを補完するための情報源です。
-
-#### `ac-source-imenu` ####
-
-`imenu`ノードを補完するための情報源です。詳しくは`info emacs imenu`を参照してください。
-
-#### `ac-source-semantic` ####
-
-[Semantic](http://cedet.sourceforge.net/semantic.shtml)のための情報源です。C/C++でメンバー名補完として利用できます。
-
-#### `ac-source-semantic-raw` ####
-
-`ac-source-semantic`と違って、この情報源は生の名前空間でシンボルを補完するのに使います。
-
-#### `ac-source-slime` ####
-
-[SLIME](http://common-lisp.net/project/slime/)のための情報源です。
-
-#### `ac-source-symbols` ####
-
-Emacs Lispのシンボルを補完するための情報源です。
-
-#### `ac-source-variables` ####
-
-Emacs Lispの変数を補完するための情報源です。
-
-#### `ac-source-words-in-all-buffer` ####
-
-全てのバッファの単語を補完するための情報源です。[`ac-source-words-in-same-mode-buffers`](#)と違って、メジャーモードを考慮しません。
-
-#### `ac-source-words-in-buffer` ####
-
-現在のバッファの単語を補完するための情報源です。
-
-#### `ac-source-words-in-same-mode-buffers` ####
-
-現在のバッファと同じメジャーモードの全てのバッファの単語を補完するための情報源です。例えば`a.cpp`と`b.cpp`では単語が共有されますが、`a.pl`と`b.cpp`ではメジャーモードが異なるので単語が共有されません。通常は[`ac-source-words-in-all-buffer`](#)よりこちらのほうが使い勝手がよいでしょう。
-
-#### `ac-source-yasnippet` ####
-
-[Yasnippet](http://code.google.com/p/yasnippet/)のスニペットを補完・展開するための情報源です。
-
-Tips
-----
-
-### 自動的に補完しない ###
-
-補完メニューが現われたり消えたりすると、編集操作に集中できないというユーザーがいます。私の経験では得てしてEmacsの上級ユーザーなのですが、とにかく`auto-complete-mode`はそのような用途も想定しています。次のように`ac-auto-start`をnilにすることにより自動的に補完されなくなります。
-
-    (setq ac-auto-start nil)
-
-この際、`auto-complete`コマンドを何らかのキーに割り当ておくべきです（じゃないと補完できないので）。例えば次のように`ac-mode-map`（`auto-complete-mode`が有効なバッファで利用できるキーマップ）に割り当てたり、
-
-    (define-key ac-mode-map (kbd "M-TAB") 'auto-complete)
-
-あるいはグローバルキーマップに割り当てるのもよいでしょう。
-
-    (global-set-key "\M-/" 'auto-complete)
-
-また、自動的に補完してもいいけど、もう少し長い単語のときだけ補完を開始するということも可能です。例えば4文字以上の単語のときに補完を開始するには`ac-auto-start`に4を設定します。
-
-    (setq ac-auto-start 4)
-
-`ac-auto-start`を大きめの数値に設定するのはパフォーマンスに良い影響をもたらします。`ac-auto-start`が小さい数値だと、必然的に補完候補数が増えるので、それだけ補完候補の生成にかかるコストが大きくなります。もし`auto-complete-mode`が重いと感じるなら`ac-auto-start`に大きめの数値を設定するか`nil`を設定するとよいでしょう。
-
-`ac-auto-start`に関しては[`ac-auto-start`](#)を参照してください。
-
-また[トリガーキー](#)を利用も考慮してみてください。
-
-### 補完メニューを自動で表示しない ###
-
-補完メニューによって集中力が削がれる問題のもう一つの対処としては、補完メニューを表示しないという方法が考えられます。補完メニューを非表示にするには[`ac-auto-show-menu`](#)を`nil`にします。
-
-    (setq ac-auto-show-menu nil)
-
-これで補完メニューは自動で表示されなくなりますが、補完候補の選択や絞り込みを行うと補完メニューは表示されます。
-
-あるいは補完メニューの表示を遅延させることにより、補完メニューが必要な時だけ自動で表示させるようにすることも可能です。そのためには`ac-auto-show-menu`に実数で遅延する時間を秒単位で設定します。
-
-    ;; 0.8秒後に自動で表示
-    (setq ac-auto-show-menu 0.8)
-
-このインターフェースはデフォルトの完全自動補完と上記した非自動補完のよいところだけを組合せたものと言えます。将来はこれがデフォルトになるかもしれません。
-
-### 補完を中止する ###
-
-補完の中止は`C-g`で行うことができますが、マクロ定義中などは`C-g`したくないでしょう。そのような場合は`ac-completing-map`に補完を中止するキーを割り当てるとよいでしょう。
-
-    (define-key ac-completing-map "\M-/" 'ac-stop)
-
-これで補完中でも`M-/`で中止することができます。
-
-### TABで補完を完了する ###
-
-上記したようにTABには様々な挙動が定義されています。`auto-complete-mode`を正しく使いこなすにはTABとRETによる補完を使いわけなければなりませんが、RETはそのまま改行でTABで補完完了するといった単純な操作方法も十分考えられます。。そのような場合は次のように設定します。
-
-    (define-key ac-completing-map "\t" 'ac-complete)
-    (define-key ac-completing-map "\r" nil)
-
-### 補完メニュー表示時のみC-n/C-pで補完候補を選択する ###
-
-次のコードを評価することでC-n/C-pで補完候補を選択できますが、これでは邪魔だと感じることがあります。
-
-    ;; 良くない設定
-    (define-key ac-completing-map "\C-n" 'ac-next)
-    (define-key ac-completing-map "\C-p" 'ac-previous)
-
-そこで補完メニュー表示時のみにC-n/C-pで補完候補を選択できるようにして、キー入力を極力奪わないようにしてみます。`ac-menu-map`は補完メニューが表示されているときに利用されるキーマップで、`ac-use-menu-map`が`t`のときに有効になります。
-
-    (setq ac-use-menu-map t)
-    ;; デフォルトで設定済み
-    (define-key ac-menu-map "\C-n" 'ac-next)
-    (define-key ac-menu-map "\C-p" 'ac-previous)
-
-詳しくは[`ac-use-menu-map`](#)および[`ac-menu-map`](#)を参照してください。
-
-### クイックヘルプを利用しない ###
-
-補完中に1秒ほど待ったときに出てくるツールチップヘルプをクイックヘルプと呼んでいますが、これを利用したくない場合は次のように設定します。
-
-    (setq ac-use-quick-help nil)
-
-### 補完メニューの高さを変更する ###
-
-`ac-menu-height`に行数を設定します。
-
-    ;; 20行分表示
-    (setq ac-menu-height 20)
-
-### 特定のモードで自動で`auto-complete-mode`を有効にする ###
-
-`ac-modes`に設定されていないモードでは自動で`auto-complete-mode`が有効になりません。適宜設定してください。
-
-    (add-to-list 'ac-modes 'brandnew-mode)
-
-### 大文字・小文字を区別したい/したくない ###
-
-大文字・小文字の区別方法を設定するには`ac-ignore-case`に次のように設定します。
-
-    ;; 大文字・小文字を区別しない
-    (setq ac-ignore-case t)
-    ;; 補完対象に大文字が含まれる場合のみ区別する
-    (setq ac-ignore-case 'smart)
-    ;; 大文字・小文字を区別する
-    (setq ac-ignore-case nil)
-
-デフォルトは`smart`です。
-
-### 特定の単語を入力したら補完を自動的に中止する ###
-
-`ac-stop-words`に自動的に補完を中止する単語を設定します。例えばRubyでendと入力した後に自動的に補完を中止するには以下のようにします。
-
-    (add-hook 'ruby-mode-hook
-              (lambda ()
-                (make-local-variable 'ac-stop-words)
-                (add-to-list 'ac-stop-words "end")))
-
-`ac-stop-words`はバッファローカル変数ではないので、バッファ特有の設定にする場合は`make-local-variable`で適宜バッファローカルにする必要があります。
-
-### 色を変更する ###
-
-色の設定はそれぞれ次のようになっています。
-
-| フェイス名           | 説明                   |
-|----------------------|------------------------|
-| `ac-completion-face` | インライン補完の文字色 |
-| `ac-candidate-face`  | 補完メニューの背景色   |
-| `ac-selection-face`  | 補完メニューの選択色   |
-
-フェイスの背景色を変更するには`set-face-background`、前景色を変更するには`set-face-foreground`、下線の設定には`set-face-underline`を使います。
-
-    ;; 設定例
-    (set-face-background 'ac-candidate-face "lightgray")
-    (set-face-underline 'ac-candidate-face "darkgray")
-    (set-face-background 'ac-selection-face "steelblue")
-
-### デフォルトの情報源を変更する ###
-
-情報源について分からない場合は最初に[情報源](#)を参照してください。デフォルトの情報源（全てのバッファに共通）を変更するには`setq-default`を使います。
-
-    (setq-default ac-sources '(ac-source-words-in-all-buffer))
-
-### 特定のメジャーモードで情報源を変更する ###
-
-例えばC++のバッファでは特定の情報源を利用したいということがあるでしょう。その場合は`add-hook`でフックを登録して、適宜`ac-sources`を変更するにようします。
-
-    (add-hook 'c++-mode (lambda () (add-to-list 'ac-sources 'ac-source-semantic)))
-
-### 特定の情報源で補完する ###
-
-特定の情報源で補完することも可能です。例えばファイル名補完を行いたい場合は`M-x ac-complete-filename`とします。あるいはC/C++のメンバー名補完を行いたい場合は`M-x ac-complete-semantic`とします。普通は次のようにこれらのコマンドをキーバインドします。
-
-    ;; C++モードにもC-c .でメンバー名補完
-    (add-hook 'c++-mode-hook
-              (lambda ()
-                (local-set-key (kbd "C-c .") 'ac-complete-semantic)))
-    ;; C-c /でファイル名補完
-    (global-set-key (kbd "C-c /") 'ac-complete-filename)
-
-一般的に、このようなコマンドは自動的に定義されます。例えば`ac-source-foobar`という情報源を定義しているとすれば、`ac-complete-foobar`というコマンドも同時に自動的に定義されるのです。利用可能なコマンドは[標準情報源](#)を参照してください。
-
-一つの補完コマンドで複数の情報源を使うには次のように別途定義する必要があります。
-
-    (defun semantic-and-gtags-complete ()
-      (interactive)
-      (auto-complete '(ac-source-semantic ac-source-gtags)))
-
-`auto-complete`関数は`ac-sources`の代替を引数として取ることができます。
-
-### 永続的にヘルプを表示する ###
-
-`ac-help`の代わりに`ac-persist-help`を使ってください。デフォルトで`M-<f1>`と`C-M-?`に割り当てられています。
-
-### 最後に補完したヘルプを表示する ###
-
-`ac-last-help`コマンドは最後に補完した候補のヘルプを`ac-help`（バッファヘルプ）と同じ形式で表示してくれます。`C-u`で引数をあたえるか`ac-last-persist-help`を呼び出すことで、そのヘルプバッファを永続的に表示することも可能です。
-
-`ac-last-quick-help`コマンドは最後に補完した候補のヘルプを`ac-quick-help`（クイックヘルプ）と同じ形式で表示してくれます。例えば、後から関数のドキュメントを見るときなどに便利です。
-
-これらのコマンドは次のようにキーバインドするとよいでしょう。
-
-    (define-key ac-mode-map (kbd "C-c h") 'ac-last-quick-help)
-    (define-key ac-mode-map (kbd "C-c H") 'ac-last-help)
-
-### ヘルプを綺麗に表示する ###
-
-[pos-tip.el](http://www.emacswiki.org/emacs-en/PosTip)がインストールされている場合、`auto-complete-mode`は従来のレンダリングエンジンの代わりに、`pos-tip.el`が提供するネイティブレンダリングエンジンを利用してヘルプを表示します。
-
-サードパーティ拡張
-------------------
-
-### SLIME ###
-
-[ac-slime](https://github.com/purcell/ac-slime)のページを参照してください。
-
-### Scala ###
-
-[ENSIME](https://github.com/aemoncannon/ensime)のページを参照してください。
-
-設定項目
---------
-
-それぞれの設定項目は`.emacs`で変更するか`M-x customize-group RET auto-complete RET`で変更可能です。
-
-### `ac-delay` ###
-
-補完可能になるまでの遅延時間（秒）を実数で指定します。小さいほど瞬時に反応しますが、パフォーマンスの低下につながります。
-
-### `ac-auto-show-menu` ###
-
-補完時に自動的に補完メニューを表示するかどうかです。`t`の場合は常に自動的に表示します。`nil`の場合は絶対に表示されません。実数を指定すると表示までの遅延時間を秒数で指定できます。
-
-### `ac-show-menu-immediately-on-auto-complete` ###
-
-`auto-complete`時にただちに補完メニューを表示するかどうかです。すでにインライン補完が表示されている場合は、この設定は無視されます。
-
-### `ac-expand-on-auto-complete` ###
-
-`auto-complete`時に補完候補全体の共通部分を展開するかどうかです。
-
-### `ac-disable-faces` ###
-
-自動補完を無効にするフェイス名をシンボルのリストで指定します。カーソル位置のフェイステキストプロパティがそのリストに含まれる場合に自動補完が無効になる仕組みです。
-
-### `ac-stop-flymake-on-completing` ###
-
-補完時にFlymakeを中止するかどうかです。
-
-### `ac-use-fuzzy` ###
-
-[曖昧マッチによる補完](#)を利用するかどうかです。
-
-### `ac-fuzzy-cursor-color` ###
-
-[曖昧マッチによる補完](#)時にカーソルの指定した色に変更します。`nil`の場合は変更しません。利用できる色は`M-x list-colors-display`で確認できます。
-
-### `ac-use-comphist` ###
-
-[補完推測機能](#)を利用するかどうかです。`nil`にすると利用しませんが、パフォーマンスが向上する可能性があります。
-
-### `ac-comphist-threshold` ###
-
-低いスコアの補完候補を排除する閾値をパーセンテージで指定します。スコアの全体を100%とします。
-
-### `ac-comphist-file` ###
-
-[補完推測機能](#)のデータを永続化するファイルを指定します。
-
-### `ac-use-quick-help` ###
-
-クイックヘルプを利用するかどうかです。
-
-### `ac-quick-help-delay` ###
-
-クイックヘルプを表示するまでの時間（秒）を実数で指定します。
-
-### `ac-menu-height` ###
-
-補完メニューの行数を整数で指定します。
-
-### `ac-quick-help-height` ###
-
-クイックヘルプの行数を整数で指定します。
-
-### `ac-quick-help-prefer-pos-tip` ###
-
-auto-completeがクイックヘルプの表示にpos-tipによるネイティブのツールチップを使うかどうかです。non-nilなら追加で[pos-tip.el](http://www.emacswiki.org/emacs/PosTip)をインストールする必要があります。
-
-### `ac-candidate-limit` ###
-
-補完候補数を制限します。整数が指定されている場合は、その値を表示する補完候補数の上限にします。`nil`の場合は無制限です。
-
-### `ac-modes` ###
-
-`global-auto-complete-mode`が有効な時に`auto-complete-mode`が自動的に有効になるモードをシンボルのリストで指定します。
-
-### `ac-compatible-packages-regexp` ###
-
-自動補完を開始するコマンドのパッケージを正規表現で指定します。
-
-### `ac-non-trigger-commands` ###
-
-自動補完を開始しないコマンドをシンボルのリストで指定します。
-
-### `ac-trigger-commands` ###
-
-自動補完を開始するコマンドをシンボルのリストで指定します。`self-insert-command`がデフォルトですが、まれに文字の挿入を独自のコマンドに設定しているモードがあるので、その対応のための設定項目です。
-
-### `ac-trigger-commands-on-completing` ###
-
-[`ac-trigger-commands`](#)と同様ですが、補完中に使用される点が異なります。
-
-### `ac-trigger-key` ###
-
-[トリガーキー](#)を指定します。
-
-### `ac-auto-start` ###
-
-補完が自動的に開始されるかどうかを指定します。`t`の場合は常に自動的に開始されます。`nil`の場合は絶対に自動的に開始されません。整数の場合は、補完対象文字列の長さがその値以上になるまで自動的に開始されません。
-
-### `ac-stop-words` ###
-
-補完しない文字列を文字列のリストで指定します。
-
-### `ac-use-dictionary-as-stop-words` ###
-
-auto-completeが辞書をストップワードとして利用するかどうかを指定します。
-
-### `ac-ignore-case` ###
-
-補完時に大文字・小文字を区別するかどうかです。`t`の場合は常に無視します。`nil`の場合は無視しません。シンボルで`smart`が指定された場合は、補完対象文字列に大文字が含まれる場合のみ区別します。
-
-### `ac-dwim` ###
-
-"Do What I Mean"機能です。`t`の場合は次の挙動になります。
-
-* 補完選択時にTABがRETの挙動に変化する
-* 補完候補が一つしかないときにTABをするとRETの挙動になる
-
-### `ac-use-menu-map` ###
-
-補完メニュー表示時に特別なキーマップ（`ac-menu-map`）を有効にするかどうかです。`t`かつ次の条件を満たしたときに`ac-menu-map`が有効になります。
-
-* `ac-auto-start`および`ac-auto-show-menu`が`nil`でなく、補完を開始してから一定時間後にメニューが表示されたとき
-* `auto-complete`コマンドでメニューが表示されたとき
-* `ac-isearch`コマンドでメニューが表示されたとき
-
-### `ac-use-overriding-local-map` ###
-
-補完の選択などの補完中のキー入力が効かない場合に利用します。内部的には`overriding-local-map`を使いますが、効果が強力すぎて他の拡張と干渉することがあるので、極力利用しないでください。
-
-### `ac-completion-face` ###
-
-インライン補完のためのフェイスです。
-
-### `ac-candidate-face` ###
-
-補完候補の背景のためのフェイスです。
-
-### `ac-selection-face` ###
-
-選択された補完候補のフェイスです。
-
-### `global-auto-complete-mode` ###
-
-グローバルに`auto-complete-mode`を利用するかどうかです。
-
-### `ac-user-dictionary` ###
-
-[辞書による補完](#)のための辞書を文字列のリストで指定します。
-
-### `ac-user-dictionary-files` ###
-
-[辞書による補完](#)のための辞書ファイルを文字列のリストで指定します。
-
-### `ac-dictionary-directories` ###
-
-[辞書による補完](#)のための辞書ファイルディレクトリを文字列のリストで指定します。
-
-### `ac-sources` ###
-
-使用する[情報源](#)をリストで指定します。これはバッファローカル変数です。
-
-### `ac-completing-map` ###
-
-補完中に使用するキーマップです。
-
-### `ac-menu-map` ###
-
-メニュー表示時に使用するキーマップです。[`ac-use-menu-map`](#)も参照してください。
-
-### `ac-mode-map` ###
-
-`auto-complete-mode`が有効なバッファで使用するキーマップです。
-
-拡張方法
---------
-
-`auto-complete-mode`を拡張するとはつまり[情報源](#)を定義することです。この節では情報源の定義の仕方を説明します。
-
-### 雛形 ###
-
-情報源はおおまかに言って次のような形をとります。
-
-    (defvar ac-source-mysource1
-      '((prop . value)
-        ...))
-
-見てわかる通り情報源とは単なる連想リストでしかないのです。あらかじめ定義されたプロパティ名と正しい値のペアを連想リストとして組合せるだけで情報源が定義できてしまうのです。
-
-### 簡単な例 ###
-
-情報源で一番重要なプロパティは[`candidates`](#)プロパティです。このプロパティに関数あるいは式、変数を与えることで補完候補の生成を行います。プロパティの評価結果は文字列のリストであるべきです。例として補完候補としてFoo, Bar, Bazを生成する情報源を定義してみましょう。
-
-    (defvar ac-source-mysource1
-      '((candidates . (list "Foo" "Bar" "Baz"))))
-
-次にこの情報源を`ac-sources`に設定して実際に補完してみましょう。
-
-    (setq ac-sources '(ac-source-mysource1))
-
-Bと入力してBar, Bazが補完候補として現われれば成功です。上記の例では`candidates`プロパティに`(list ...)`という式を指定しました。ここで指定した式はバイトコンパイルされないので、よほど簡単なものでないかぎり式で指定するのはパフォーマンスの悪化をもたらします。代替策・正攻法としては関数を利用するのがよいでしょう。
-
-    (defun mysource1-candidates ()
-      '("Foo" "Bar" "Baz"))
-    
-    (defvar ac-source-mysource1
-      '((candidates . mysource1-candidates)))
-
-`candidates`プロパティに指定した関数は引数なしで補完が更新される度に呼び出されます。その他の方法として変数を直接指定することもできます。
-
-### 初期化 ###
-
-補完が開始されたときに一度だけ初期化処理を行いたいということがあります。そのためには`init`プロパティを利用します。`candidates`プロパティ同様、引数なしの関数あるいは式を指定します。次に簡単な例を示します。
-
-    (defvar mysource2-cache nil)
-    
-    (defun mysource2-init ()
-      (setq mysource2-cache '("Huge" "Processing" "Is" "Done" "Here")))
-    
-    (defvar ac-source-mysource2
-      '((init . mysource2-init)
-        (candidates . mysource2-cache)))
-
-この例では`mysource2-init`関数で大規模な処理を行い、`mysource2-cache`変数にその結果を保存しています。そして`candidates`プロパティにその変数を指定することで、補完が更新される度に大規模な処理が行われるのを防いでいます。この例の他にも次のような用途が考えられます。
-
-* `require`する
-* バッファを開いておく
-
-### キャッシュ ###
-
-`auto-complete-mode`ではキャッシュの戦略が重要になります。その方法として、前節で触れた`init`プロパティによるものと、この節で説明する`cache`プロパティによるものが基本となります。情報源の定義に`cache`プロパティを設定しておくと、初回の`candidates`プロパティの結果が内部的にキャッシュされ、それ以降は`candidates`プロパティを評価する代わりに、そのキャッシュを利用するにようになります。
-
-前節の例を`cache`プロパティを利用して書き直してみます。
-
-    (defun mysource2-candidates ()
-      '("Huge" "Processing" "Is" "Done" "Here"))
-    
-    (defvar ac-source-mysource2
-      '((candidates . mysource2-candidates)
-        (cache)))
-
-`candidates`プロパティに大規模な処理が必要な関数が指定されていますが、初回のみ実行されるのでパフォーマンスの問題は軽減されます。
-
-#### キャッシュの寿命 ####
-
-`init`プロパティや`cache`プロパティより大きいスコープでキャッシュを保持することがあります。例えば滅多に変更のない関数名のリストなどがそうです。その場合にパフォーマンスを犠牲にすることなく、適度にキャッシュをクリアするにはどうすればよいのでしょうか。`auto-complete-mode`はキャッシュの寿命を管理する機構を持っており、ユーザーはそこにキャッシュ用の変数を登録しておくことにより、適当なイベントごとにキャッシュがクリアされます。
-
-バッファが保存されるたびにキャッシュをクリアするには`ac-clear-variable-after-save`で変数を登録します。簡単な例を示します。
-
-    (defvar mysource3-cache nil)
-    
-    (ac-clear-variable-after-save 'mysource3-cache)
-    
-    (defun mysource3-candidates ()
-      (or mysource3-cache
-          (setq mysource3-cache (list (format "Time %s" (current-time-string))))))
-    
-    (defvar ac-source-mysource3
-      '((candidates . mysource3-candidates)))
-
-これを`ac-sources`に設定してTimeで補完を行ってください。すると補完候補に補完時の時間が表示されると思います。二度目以降も同じ時間が表示されるのは`mysource3-candidates`は可能な限りキャッシュを返すようになっているからです。それでは一度そのバッファを保存して、再びTimeで補完を行ってください。今度は新しい時間に更新されたと思います。この情報源のキモは`ac-clear-variable-after-save`でキャッシュ用変数を登録しているところにあります。
-
-さらに定期的にキャッシュをクリアすることも可能です。そのためには`ac-clear-variable-every-minute`で変数を登録します。使い方は`ac-clear-variable-after-save`と同じですが、一分ごとに定期的にキャッシュがクリアされる点が異なります。標準の情報源である`ac-source-functions`などがこの機能を利用しています。
-
-### アクション ###
-
-[RETによる補完](#)の場合、`action`プロパティで指定された関数あるいは式が評価されます。標準情報源では`ac-source-abbrev`や`ac-source-yasnippet`が利用しています。
-
-### オムニ補完 ###
-
-*オムニ補完*とは現在編集中のコンテキストを考慮して行う補完のことです。スラッシュを検出して行うファイル名補完や、ドットを検出して行うC/C++のメンバー補完は、このオムニ補完であると言えます。情報源をオムニ補完に対応させるには`prefix`プロパティを使います。`prefix`プロパティは補完対象文字列の開始位置をポイントで返さなければなりません。`nil`を返した場合は、その情報源が現在のコンテキストでは無効であると解釈します。
-
-例として`To: `の後にメールアドレスを補完する情報源を考えてみましょう。まず、これまでの知識からメールアドレスを補完する情報源を定義します。
-
-    (defvar ac-source-to-mailaddr
-      '((candidates . (list "foo1@example.com"
-                            "foo2@example.com"
-                            "foo3@example.com"))))
-    
-    (setq ac-sources '(ac-source-to-mailaddr))
-
-ここまでは簡単です。次に`prefix`プロパティを使って`To: `の後にのみ補完が開始されるようにします。`prefix`プロパティには次の三つが指定できます。
-
-* 正規表現
-* 関数
-* 式
-
-正規表現を指定した場合、その正規表現を使って`re-search-backward`を行い[^1]、マッチしたグループ1あるいはグループ0の先頭位置を補完対象文字列の開始位置とします。もう少し複雑な制御が必要な場合は関数あるいは式を指定します。ここで評価された開始位置は[`ac-point`](#)に格納されます。先の例では次の正規表現で事足ります。
-
-    ^To: \(.*\)
-
-グループ1をキャプチャしているのは`To: `を補完対象文字列に含めないためです。これを`prefix`プロパティに設定した最終的な情報源は次のようになります。
-
-    (defvar ac-source-to-mailaddr
-      '((candidates . (list "foo1@example.com"
-                            "foo2@example.com"
-                            "foo3@example.com"))
-        (prefix . "^To: \\(.*\\)")))
-
-試しに`To: `と入力してみましょう。メールアドレスが補完できるようになったら成功です。
-
-
-[^1]: 厳密にはその正規表現の末尾にカーソルを意味する\=を付与したもので`re-search-backward`されます
-
-### `ac-define-source` ###
-
-これまでは`defvar`で情報源を定義してきましたが、`ac-define-source`というユーティリティマクロを使って定義することも可能です。
-
-    (ac-define-source mysource3
-      '((candidates . (list "Foo" "Bar" "Baz"))))
-
-このマクロは次のように展開されます。
-
-    (defvar ac-source-mysource3
-      '((candidates . (list "Foo" "Bar" "Baz"))))
-    
-    (defun ac-complete-mysource3 ()
-      (interactive)
-      (auto-complete '(ac-source-mysource3)))
-
-`defvar`は従来通り定義され、続いてその情報源のみで補完を行うコマンドが定義されます。`auto-complete`は引数なしで呼び出された場合は`ac-sources`を情報源として使い、引数ありで呼び出された場合はその値を情報源として使います。`defvar`か`ac-define-source`かどちらを使うかは微妙ですが、後方互換性を保持するなら`defvar`のほうが無難でしょう。ちなみに標準情報源は全て`ac-define-source`で定義されています。つまり`ac-complete-filename`などを他のキーに割り当てて個別に利用することができます。
-
-### 情報源プロパティ一覧 ###
-
-#### `init` ####
-
-補完開始時に一度だけ指定された関数あるいは式を評価します。
-
-#### `candidates` ####
-
-補完更新時に指定された関数あるいは式、変数を評価します。評価結果は文字列のリストであるべきです。[`cache`](#)プロパティが有効な場合は、その補完では二度目以降評価されません。
-
-#### `prefix` ####
-
-指定された正規表現、関数あるいは式を評価して、[オムニ補完](#)のための補完対象文字列の開始位置を取得します。`nil`を返した場合はその情報源は無視されます。正規表現が指定された場合、グループ1の開始位置あるいはグループ0の開始位置が評価値として使われます。
-
-#### `requires` ####
-
-情報源が有効になる補完対象文字列の文字数を指定します。指定のない場合は[`ac-auto-start`](#)の値が利用されます。
-
-#### `action` ####
-
-[RETによる補完](#)時に実行する[アクション](#)を関数あるいは式で指定します。
-
-#### `limit` ####
-
-補完候補の上限数を設定します。`ac-candidate-limit`を部分的に上書きします。
-
-#### `symbol` ####
-
-補完候補の意味を現わす記号を一文字の文字列で指定します。指定する記号は任意ですが、基本的に以下の慣習に従うべきです。
-
-| 記号 | 意味           |
-|------|----------------|
-| s    | シンボル       |
-| f    | 関数・メソッド |
-| v    | 変数           |
-| c    | 定数           |
-| a    | 略語           |
-| d    | 辞書           |
-
-#### `summary` ####
-
-補完候補のサマリを文字列で指定します。これは補完候補を簡潔に説明するために使うべきです。
-
-#### `cache` ####
-
-[キャッシュ](#)を利用します。
-
-#### `require` ####
-
-整数あるいは`nil`を指定します。整数が指定された場合、その値が補完対象文字列の長さより大きい場合は、その情報源は無視されます。`nil`の場合は常に有効になります。
-
-#### `candidate-face` ####
-
-補完候補のフェイスを指定します。[`ac-candidate-face`](#)を部分的に上書きします。
-
-#### `selection-face` ####
-
-選択された補完候補のフェイスを指定します。[`ac-selection-face`](#)を部分的に上書きします。
-
-#### `depends` ####
-
-依存するfeature（`require`される）をリストで指定します。
-
-#### `available` ####
-
-この情報源が利用できるかを示す関数あるいは式を指定します。
-
-#### `document` ####
-
-補完候補のドキュメントを示す関数あるいは式を指定します。
-
-### 変数一覧 ###
-
-情報源でよく利用する変数を一覧します。
-
-#### `ac-buffer` ####
-
-補完が開始されたバッファです。
-
-#### `ac-point` ####
-
-補完対象文字列の開始位置です。
-
-#### `ac-prefix` ####
-
-補完対象文字列です。
-
-#### `ac-limit` ####
-
-現在の情報源の候補上限数です。[`ac-candidate-limit`](#)や[`limit`](#)プロパティで制御されます。
-
-#### `ac-candidates` ####
-
-補完候補のリストです。
-
-トラブルシューティング
-----------------------
-
-### レスポンスが遅い ###
-
-十分なレスポンス性能を確保するのは`auto-complete-mode`にとって大変重要なことですが、よく知られているように、それは機能性とのトレードオフでもあります。以下にレスポンス性能に関連する設定項目を挙げるので、もし問題があれば参照してください。
-
-#### `ac-auto-start` #### {#trouble_ac-auto-start}
-
-[`ac-auto-start`](#)に大きめの数値を設定することで、補完候補の生成コストを軽減するができます。あるいは`nil`に設定することで、本当に必要な時だけ補完を実行することもできます。詳しくは[自動的に補完しない](#)を参照してください。
-
-#### `ac-delay` #### {#trouble_ac-delay}
-
-[`ac-delay`](#)に大きめの数値を設定することで、補完開始コストを軽減することができます。
-
-#### `ac-auto-show-menu` #### {#trouble_ac-auto-show-menu}
-
-[`ac-auto-show-menu`](#)に大きめの数値を設定することで、補完メニューの表示コストを軽減することができます。
-
-#### `ac-use-comphist` #### {#trouble_ac-use-comphist}
-
-[`ac-use-comphist`](#)に`nil`を設定して[補完推測機能](#)を無効にすることで、推測のための計算コストを軽減することができます。
-
-#### `ac-candidate-limit` #### {#trouble_ac-candidate-limit}
-
-[`ac-candidate-limit`](#)に適切な数値を設定することで、多量の計算を行わないようにすることができます。
-
-### 補完メニューの表示が崩れる ###
-
-補完メニューの表示が崩れる問題には大きく分けて二つあります。
-
-#### カラム計算の問題 ####
-
-`auto-complete-mode`は補完メニューを正しく表示するのに必須な処理であるカラム計算のコストを軽減するために、正確さをある程度犠牲にした最適化バージョンのカラム計算関数を利用していますが、これが原因で補完メニューの表示が崩れる可能性があります。最適化バージョンを使わないためには次のコードを評価します。
-
-    (setq popup-use-optimized-column-computation nil)
-
-#### フォントの問題 ####
-
-Ubuntu 9.10にて[IPAフォント](http://ossipedia.ipa.go.jp/ipafont/)をXftでレンダリングすると、補完メニューの表示が崩れる問題を確認しています。[VLゴシック](http://dicey.org/vlgothic/)などではXftでレンダリングしても正しく表示されるようなので、そちらをお使いください。また、Xftを使わなければIPAフォントも正しくレンダリングできます。
-
-現在のところ完全な対応策は見つかっていませんが、`set-face-font`で補完メニューのフォントサイズを適切なサイズに変更することで対応できる可能性があります。例えばNTEmacsでは日本語を含む補完メニューを表示すると補完メニューの表示が崩れることがあります。これは以下のようにフォントサイズを調整することで対応することができます。
-
-    (set-face-font 'ac-candidate-face "MS Gothic 11")
-    (set-face-font 'ac-selection-face "MS Gothic 11")
-
-既知の問題
-----------
-
-### `flyspell-mode`が有効なバッファで自動補完できない ### {#flyspell-mode-bug}
-
-`flyspell-mode`の遅延手法が原因で自動補完ができません。これを回避するには`M-x ac-flyspell-workaround`とするか`~/.emacs`に次のように書いてください。
-
-    (ac-flyspell-workaround)
-
-### `linum-mode`が補完メニューの行番号を表示してしまう ### {#linum-mode-bug}
-
-`linum-mode`が補完メニューの行番号を表示してしまいます。これを回避するには`M-x ac-linum-workaround`とするか`~/.emacs`に次のように書いてください。
-
-    (ac-linum-workaround)
-
-バグレポート
-------------
-
-[Auto Complete Modeのバグトラッキングシステム](http://cx4a.org/redmine/projects/auto-complete-mode)に新しいチケットを登録してください。
-
-[GNU Emacs]: http://www.gnu.org/software/emacs/
-[GPLv3]: http://gplv3.fsf.org/
-[GFDL]: http://www.gnu.org/copyleft/fdl.html
diff --git a/elpa/auto-complete-1.4/doc/manual.txt b/elpa/auto-complete-1.4/doc/manual.txt
deleted file mode 100644
index c20769d8b..000000000
--- a/elpa/auto-complete-1.4/doc/manual.txt
+++ /dev/null
@@ -1,1103 +0,0 @@
-Title: Auto Complete Mode - User Manual
-Numbering: yes
-CSS: style.css
-
-Auto Complete Mode User Manual
-==============================
-
-[Index](index.txt)
-
-\[[Japanese](manual.ja.txt)]
-
-* * * *
-
-{toc}
-
-* * * *
-
-Introduction
-------------
-
-Auto Complete Mode (aka `auto-complete.el`, `auto-complete-mode`) is an extension that automates and advances the completion-system of [GNU Emacs][]. This is superior to the old system:
-
-* Visual interface
-* Reduce overhead of completion by using statistic method
-* Extensibility
-
-This user manual covers from how to install and how to use to how to extend. Please contact me if you have any questions.
-
-Auto Complete Mode is licensed under the terms of [GPLv3][]. And this document is licensed under the term of [GFDL][].
-
-Downloads
----------
-
-You can download from [Auto Complete Mode top page](index.txt).
-
-Installation
-------------
-
-### Requirements ###
-
-* 800MHz or higher CPU
-* 256MB or higher RAM
-* GNU Emacs 22 or later
-
-### Installation Script ###
-
-It is easy to install by using an installation script called `etc/install.el` that is located in the package directory.
-
-Type `M-x load-file RET` in the running Emacs or newly launched Emacs. Note that if you want to upgrade `auto-complete-mode`, you have to install in **a newly launched Emacs with `-q` option**. Then input a file name to load which is a path string with adding `/etc/install.el` to the package directory. For example, if the package directory is `~/tmp/auto-complete-1.2`, the file name will be `~/tmp/auto-complete-1.2/etc/install.el`.
-
-Then input a directory where Auto Complete will be installed. You need to add a directory to `load-path` later if `load-path` doesn't include the directory. The directory is to be `~/.emacs.d` by default.
-
-Finally type `RET` to start installation. After installation, you may see the following buffer and follow instructions to edit `.emacs`.
-
-You can also install from terminal like:
-
-    $ make install
-    $ # or with directory specified
-    $ make install DIR=$HOME/.emacs.d/
-
-If you don't have GNU Make, run emacs like:
-
-    $ emacs -batch -l etc/install.el
-
-**Example message after installation (\*Installation Result* Buffer)**
-
-    Successfully installed!
-    
-    Add the following code to your .emacs:
-    
-    (add-to-list 'load-path "~/.emacs.d")    ; This may not be appeared if you have already added.
-    (require 'auto-complete-config)
-    (add-to-list 'ac-dictionary-directories "~/.emacs.d/ac-dict")
-    (ac-config-default)
-
-### Manual Installation ###
-
-It is also possible to install manually if you follow a directory configuration. First, byte-compile all `.el` files in the package directory. You may use `Makefile` in UNIX OS.
-
-    $ make byte-compile
-
-If you can't use `Makefile`, open the directory from Emacs by `C-x d` and type `* . el RET B RET` to do byte-compile.
-
-Then copy all `.el` files and `.elc` files to a directory which is added to `load-path`. You may do such the following command if the directory is `~/.emacs.d`
-
-    $ cp *.el *.elc ~/.emacs.d
-
-And then install dictionary files. They are optional to run Auto Complete Mode, but you should install if you don't have any reason. Dictionary files are located in called `dict` directory, it is needed that they are installed to a directory which is `auto-complete.el` has been installed. If you installed `auto-complete.el` to a directory called `~/.emacs.d`, you also have to install dictionary files to `~/.emacs.d`. Please be careful not to overwrite existed files. It may be rare case, but the installation script above avoids overwrite by renaming `dict` directory to `ac-dict` directory.
-
-    $ cp -r dict ~/.emacs.d
-
-Finally add the following code to `.emacs`.
-
-    (add-to-list 'ac-dictionary-directories "~/.emacs.d/dict")
-    (require 'auto-complete-config)
-    (ac-config-default)
-
-If you haven't added the directory to `load-path`, you need to add the following code too.
-
-    (add-to-list 'load-path "~/.emacs.d")
-
-### Check ###
-
-Type some characters in \*scratch\* buffer in a restarted Emacs or newly launched Emacs. Installation has been successful if you see a completion menu. If you have error or no completion is started, it is failure maybe. Please contact me in such case with confirmation following:
-
-* Using correct `load-path`?
-
-  A directory which `auto-complete.el` is installed to is in `load-path`.
-
-* Characters `AC` in mode-line?
-
-  If you don't see characters `AC` in mode-line (a gray line of bottom of buffer), `auto-complete-mode` is not enabled. Type `M-x auto-complete-mode` to enable and try again.
-
-* Error occurred
-
-  If you have \*Backtrace* with errors or errors in minibuffer (bottom of frame), please contact me with the errors.
-
-Basic Usage
------------
-
-First, in a meaning, `auto-complete-mode` has no "usage". Because `auto-complete-mode` is designed to fade into Emacs editing system. Users will be received a highly-developed completion-system automatically without any difficulty. Ultimately, a goal of `auto-complete-mode` is to provide a system that does what users want without any command, but it is impossible to accomplish 100% accuracy actually. So there is "usage" to cover that points.
-
-### Input Characters ###
-
-Inputting characters is basic. Any completion will never be shown without any character. So when completion will be started, in other others, what character causes completion to be started? It is good question but it is difficult to answer here. In simple words, completion will be started when just character is inserted. See [`ac-trigger-commands`](#) for more details.
-
-![Inputting Characters](ac.png)
-
-### Completion by TAB ####
-
-After completion is started, completion by TAB will be enabled temporarily. Completion by TAB is the most important and most frequent used command. TAB has several meanings.
-
-* Case that only one candidate remains
-
-  If only on candidate remains, the candidate will be used to complete.
-
-* Case that there is common part among candidates
-
-  For example, if all candidates start with "set", it means they have common part "set". So TAB completes "set" at first.
-
-* Otherwise
-
-  Otherwise, select candidates in cycle by typing TAB.
-
-It may be different a little according to settings, but basically completion by TAB works as we wrote above. A reason why TAB has several meanings is that we want users to do anything with TAB.
-
-### Completion by RET ###
-
-Like completion by TAB but some points are different:
-
-* Complete a selected candidate immediately
-* Execute an action if a selected candidate has the action
-
-It is necessary to type TAB a few times for completion by TAB. Completion by RET instead complete a selected candidate immediately, so when you see a candidate you want, just type RET. If the candidate has an action, the action will be executed. Take a example of builtin abbrev completion. In completion by TAB, an abbrev which expands "www" to "World Wide Web" will be completed to "www", but in completion by RET, the abbrev will be expanded to "World Wide Web" as completion.
-
-### Candidate Selection ###
-
-Following `auto-complete-mode` philosophy, it is not recommended to select candidates. Because, it means it has been failed to guess completion, and also it requires for users to do candidate selection which is a high cost operation. We think there is so many cases that requires to do candidate selection, because completion by TAB will help candidate selection somehow and in recent version, a statistic method contributes to make a candidate suggestion more accurate. However, actually, this is such cases. So we also think it is not bad idea to remember how to select candidates.
-
-Selecting candidates is not a complex operation. You can select candidates forward or backward by cursor key or `M-p` and `M-n`. According to setting, a behavior of completion by TAB will be changed as a behavior of completion by RET. See [`ac-dwim`](#) for more details.
-
-There is other ways to select candidates. `M-1` to select candidate 1, `M-2` to select candidate 2, and so on.
-
-### Help ###
-
-`auto-complete-mode` has two type of help functionalities called *Quick Help* and *Buffer Help*. They are different in a point of displaying. Quick help will appear at the side of completion menu, so you can easily see that, but there is a problem if there is no space to displaying the help. Quick help will be shown automatically. To use quick help, you need to set [`ac-use-quick-help`](#) to `t`. Delay time show quick help is given by [`ac-quick-help-delay`](#).
-
-On other side, buffer help will not be shown without any instructions from users. Buffer help literally display a help in a buffer of other window. It costs much to see than quick help, but it has more readability. To show buffer help, press `C-?` or `f1`. By pressing `C-M-v` or `C-M-S-v` after showing buffer help, you can scroll forward or backward for help buffer. Other commands will be fallbacked and buffer help will be closed.
-
-### Summary ###
-
-Completion will be started by inserting characters. After completion is started, operations in the following table will be enabled temporarily. After completion is finished, these operations will be disable.
-
-| Key       | Command     | Description               |
-|-----------|-------------|---------------------------|
-| TAB, C-i  | ac-expand   | Completion by TAB         |
-| RET, C-m  | ac-complete | Completion by RET         |
-| down, M-n | ac-next     | Select next candidate     |
-| up, M-p   | ac-previous | Select previous candidate |
-| C-?, f1   | ac-help     | Show buffer help          |
-
-To stop completion, use `C-g` simply.
-
-Advanced Usage
---------------
-
-### `auto-complete` command ###
-
-Basically there is assumption that `auto-complete-mode` will be started automatically, but there is also exception. For example, that is a case that an user wants to complete without inserting any character or a case not to start `auto-complete-mode` automatically by settings. A command called `auto-complete` is useful in such cases, which is used with key binding in general. The following code changes a default completion command to more advanced feature that `auto-complete-mode` provides.
-
-    (define-key ac-mode-map (kbd "M-TAB") 'auto-complete)
-
-So, as of `auto-complete` command, it is a little different from an original automatic completion.
-
-* Case that only one candidate remains
-
-  Complete immediately without showing completion menu.
-
-* Case that no candidates remains
-
-  Attempt to complete with fuzzy matching. See [Completion by Fuzzy Matching](#) for more details.
-
-* Otherwise
-
-  Otherwise start completion with/without expanding a whole common part and showing completion menu. See also [`ac-show-menu-immediately-on-auto-complete`](#) and [`ac-expand-on-auto-complete`](#).
-
-### Completion by Fuzzy Matching ###
-
-In a case that there is no candidates by `auto-complete` command or a case that `ac-fuzzy-complete` command is executed, `auto-complete-mode` attempts to complete with fuzzy matching instead of usual exact matching. Parameters of fuzzy matching has already been optimized for use, so users don't need to change them. However if you want to know the internals, see `fuzzy.el`. Using completion by fuzzy matching, typo will be fixed as a series of completion. For instance, input "messaeg" in a buffer, and then do `M-x auto-complete` or `M-x ac-fuzzy-complete`. The cursor color will be changed to red if completion has been successful, and then you can continue to complete with regarding of "messaeg" as "message". It is not bad idea to bind `auto-complete` command to some key in a meaning of handling such cases.
-
-![Fuzzy matching](ac-fuzzy.png)
-
-### Filtering Completion Candidates ###
-
-You can start filtering by `C-s`. The cursor color will be changed to blue. Then input characters to filter. It is possible to do completion by TAB or select candidates, which changes the cursor color to original so that telling filtering completion candidates has done. The filtering string will be restored when `C-s` again. To delete the filter string, press `DEL` or `C-h`. Other general operations is not allowed there.
-
-![Filtering](ac-isearch.png)
-
-### Trigger Key ###
-
-It is difficult what key `auto-complete` command is bound to. It should be bound to a key which is easy to press as much as possible because completion operation is often happened. However, it is a major problem that there is no empty key to press easily. `auto-complete-mode` provides a feature called *Trigger Key* that handles such the problem. Using trigger key, you can use an arbitrary key temporarily if necessary. The following code uses `TAB` as trigger key.
-
-    (ac-set-trigger-key "TAB")
-
-Trigger key will be enabled after inserting characters. Otherwise it is dealt as an usual command (TAB will be indent). Generally, trigger key is used with `ac-auto-start` being `nil`.
-
-    (setq ac-auto-start nil)
-
-As of `ac-auto-start`, see [Not to complete automatically](#) or [`ac-auto-start`](#) for more details.
-
-### Candidate Suggestion ###
-
-`auto-complete-mode` analyzes completion operations one by one and reduces overheads of completion as much as possible. For example, having a candidate "foobar" been completed few times, `auto-complete-mode` arranges it to top of the candidates next time and make a situation that allows users to complete the word with one time TAB or few times TAB. It is called `comphist` internally, and you can use it by setting `ac-use-comphist` to `t`. It is enabled by default. Collection operations data will be stored in `user-emacs-directory` or `~/.emacs.d/` with a name `ac-comphist.dat`.
-
-`auto-complete-mode` collects two types of data to accomplish accurate candidate suggestion.
-
-* Count of completion
-* Position of completion
-
-Simply saying, it collects not only a completion count but also a position of completion. A completion candidate will be scored with the count and the point. If you complete `find-file` with a word f few times, in next time `find-file` will be arranged to top of candidates. However it is too simple. Actually `find-file` with `find-` will not have the same score, because a distance between `f` and `find-` will reduce a weight of scoring. It means that if you often complete `find-library` after `find-`, `find-library` will get high score than `find-file` at that position. So `auto-complete-mode` can guess `find-file` will be top after `f` and `find-library` will be top after `find-` as it seems to learn from users' operations.
-
-### Completion by Dictionary ###
-
-Dictionary is a simple list of string. There is three types of dictionary: user defined dictionary, major mode dictionary, and extension dictionary. You need to add `ac-source-dictionary` to `ac-sources` (default). See [source](#Source) for more details.
-
-#### User Defined Dictionary ####
-
-User defined dictionary is composed of a list of string specified `ac-user-dictionary` and dictionary files specified by `ac-user-dictionary-files`. Dictionary file is a word list separated with newline. User defined dictionary is shared with all buffers. Here is example adding your mail address to dictionary.
-
-    (add-to-list 'ac-user-dictionary "foobar@example.com")
-
-Setting will be applied immediately. Try to input "foo" in a buffer. You may see `foobar@example.com` as a completion candidate. This setting will be cleared if Emacs will quit. You need to write the following code to keep setting in next Emacs launching.
-
-    (setq ac-user-dictionary '("foobar@example.com" "hogehoge@example.com"))
-
-There is more easy way to add word to dictionary. Files specified by `ac-user-dictionary-files` will be treated as dictionary files. By default, `~/.dict` will be a dictionary file, so edit `~/.dict` like:
-
-    foobar@example.com
-    hogehoge@example.com
-
-As we said, words are separated with newline. They are not applied immediately, because `auto-complete-mode` uses cache not to load every time from a dictionary file. It may be high cost. To clear cache, do `M-x ac-clear-dictionary-cache`. After that, dictionary files will be load absolutely.
-
-No need to say perhaps, you can use other files as dictionary file by adding to `ac-user-dictionary-files`.
-
-#### Major Mode Dictionary and Extension Dictionary ####
-
-You can use other dictionaries for every major-modes and extensions. A dictionary will loaded from a directory specified with `ac-dictionary-directories`. `ac-dictionary-directories` may be the following setting if you followed [installation](#Installation) instructions.
-
-    (add-to-list 'ac-dictionary-directories "~/.emacs.d/ac-dict")
-
-A dictionary named `c++-mode` for specific major-mode and a dictionary named `txt` for specific extension will be stored in the directory. For instance, you complete in a buffer named `a.cpp` with dictionary completion, following the setting above, `~/.emacs.d/ac-dict/c++-mode` and `~/.emacs.d/ac-dict/cpp` will be loaded as dictionary file. You can edit the dictionary files and make a new one. In addition, you can add a new dictionary file to a directory that has same configuration.
-
-As same as user defined dictionary, after editing and adding dictionary, you should do `M-x ac-clear-dictionary-cache` to apply changes.
-
-Source
-------
-
-*Source* is a concept that insures a extensibility of `auto-complete-mode`. Simply saying, source is a description about:
-
-* How to generate completion candidates
-* How to complete
-* How to show
-
-Anybody who know about Emacs Lisp a little can define a source easily. See [extend](#Extend) for how to define a source. Here we can explain how to use builtin sources.
-
-Usually a name of source starts with `ac-source-`. So you can list up sources with `apropos` (`M-x apropos RET ^ac-source-`). You may see `ac-source-filename` and `ac-source-dictionary` which are entities of sources.
-
-### Using Source ###
-
-If you wrote `(ac-config-default)` in your `.emacs`, it is rare to change a source setting because it is already optimized to use. Here is a short explanation about source however. Sources will be used by setting `ac-sources` to a list of sources. You can see the setting by evaluating `ac-sources` in \*scratch\* buffer:
-
-    ;; Formatted
-    (ac-source-filename
-     ac-source-functions
-     ac-source-yasnippet
-     ac-source-variables
-     ac-source-symbols
-     ac-source-features
-     ac-source-abbrev
-     ac-source-words-in-same-mode-buffers
-     ac-source-dictionary)
-
-As you see, `ac-sources` in \*scratch\* buffer has six sources. We explain each source for detail, you can guess meanings of sources. It is worth to remember that `ac-sources` is a buffer local variable, which means each `ac-sources` for buffers will be different.
-
-Here is an example. Think you are at \*scratch\* buffer. As we said, this buffer has many sources. Some people think it is too many. So try to change `ac-sources` to reduce functionalities. It is easy to change. Just evaluate the following code in \*scratch\* buffer or with `M-:`:
-
-    (setq ac-sources '(ac-source-symbols ac-source-words-in-same-mode-buffers))
-
-This example changes `ac-source` setting and enable only symbol completion and word completion among same major modes. Then, how can we enable this setting in next Emacs launching? We can change settings by adding a hook which is called when \*scratch\* buffer is created.
-
-    (defun my-ac-emacs-lisp-mode ()
-      (setq ac-sources '(ac-source-symbols ac-source-words-in-same-mode-buffers)))
-    
-    (add-hook 'emacs-lisp-mode-hook 'my-ac-emacs-lisp-mode)
-
-If a code `(ac-config-default)` is written in `.emacs`, the code above may not be worked correctly. It is because of `(ac-config-default)` will overwrite the setting. In such case, you can redefine a function which is used in `(ac-config-default)`. The function name is `ac-emacs-lisp-mode-setup` in `emacs-lisp-mode`. See `auto-complete-config.el` for more details.
-
-    (defun ac-emacs-lisp-mode-setup ()
-      (setq ac-sources '(ac-source-symbols ac-source-words-in-same-mode-buffers)))
-
-So, now you know how to change sources in a specific major mode. Summary is:
-
-1. Define a function changing `ac-sources`
-2. Register the function to proper mode hooks (`c++-mode-hook`, `ruby-mode-hook`, and `python-mode-hook`, etc)
-
-By the way, how can we change a setting for all buffers? We use `setq-default` to change `ac-sources` instead of `setq` in such case. Then the default value of `ac-sources` will be changed to the value you specified.
-
-    (setq-default ac-sources '(ac-source-words-in-all-buffer))
-
-There is other ways to do that. `(ac-config-default)` changes the default value of `ac-sources` by registering a hook for `auto-complete-mode`. The registered function is `ac-common-setup` that adds `ac-source-filename` to the first of `ac-sources` by default. So all `auto-complete-mode` enabled buffer will have `ac-source-filename` at the first of `ac-sources`. A reason why adding to the first is relating to [omni completion](#Omni_Completion). Anyway you don't care about it here. So if you want to change `ac-sources` of all buffer, you can redefine `ac-common-setup` function to do that.
-
-    ;; Add ac-source-dictionary to ac-sources of all buffer
-    (defun ac-common-setup ()
-      (setq ac-sources (append ac-sources '(ac-source-dictionary))))
-
-### Builtin Sources ###
-
-Here are defined sources in `auto-complete.el` and `auto-complete-config.el`.
-
-#### `ac-source-abbrev` ####
-
-A source for Emacs abbreviation function. See `info emacs Abbrevs` about abbreviation function.
-
-#### `ac-source-css-property` ####
-
-A source for CSS property.
-
-#### `ac-source-dictionary` ####
-
-A source for dictionary. See [completion by dictionary](#Completion_by_Dictionary) about dictionary.
-
-#### `ac-source-eclim` ####
-
-A source for [Emacs-eclim](http://github.com/senny/emacs-eclim).
-
-#### `ac-source-features` ####
-
-A source for completing features which are available with `(require '`.
-
-#### `ac-source-filename` ####
-
-A source for completing file name. Completion will be started after inserting `/`.
-
-#### `ac-source-files-in-current-dir` ####
-
-A source for completing files in a current directory. It may be useful with `eshell`.
-
-#### `ac-source-functions` ####
-
-A source for completing Emacs Lisp functions. It is available only after `(`.
-
-#### `ac-source-ghc-mod` ####
-
-A source for [ghc-mod](http://www.mew.org/~kazu/proj/ghc-mod/en/).
-
-#### `ac-source-gtags` ####
-
-A source for completing tags of [Global](http://www.tamacom.com/global.html).
-
-#### `ac-source-imenu` ####
-
-A source for completing `imenu` nodes. See `info emacs imenu` for details.
-
-#### `ac-source-semantic` ####
-
-A source for [Semantic](http://cedet.sourceforge.net/semantic.shtml). It can be used for completing member name for C/C++.
-
-#### `ac-source-slime` ####
-
-A source for [SLIME](http://common-lisp.net/project/slime/).
-
-#### `ac-source-semantic-raw` ####
-
-Unlike `ac-source-semantic`, this source is for completing symbols in a raw namespace.
-
-#### `ac-source-symbols` ####
-
-A source for completing Emacs Lisp symbols.
-
-#### `ac-source-variables` ####
-
-A source for completing Emacs Lisp symbols.
-
-#### `ac-source-words-in-all-buffer` ####
-
-A source for completing words in all buffer. Unlikely [`ac-source-words-in-same-mode-buffers`](#), it doesn't regard major-mode.
-
-#### `ac-source-words-in-buffer` ####
-
-A source for completing words in a current buffer.
-
-#### `ac-source-words-in-same-mode-buffers` ####
-
-A source for completing words which are collected over buffers whom major-mode is same to of a current buffer. For example, words will shared among `a.cpp` and `b.cpp`, but not shared among `a.pl` and `b.cpp` because they are different major-mode buffers. Usually this source is more useful than [`ac-source-words-in-all-buffer`](#).
-
-#### `ac-source-yasnippet` ####
-
-A source for [Yasnippet](http://code.google.com/p/yasnippet/) to complete and expand snippets.
-
-Tips
-----
-
-### Not to complete automatically ###
-
-If you are being annoyed with displaying completion menu, you can disable automatic starting completion by setting `ac-auto-start` to `nil`.
-
-    (setq ac-auto-start nil)
-
-You need to bind some key to `auto-complete` command (because you need to complete anyway). For example, bind to `ac-mode-map`, which is a key map for `auto-complete-mode` enabled buffer:
-
-    (define-key ac-mode-map (kbd "M-TAB") 'auto-complete)
-
-Or bind to global key map.
-
-    (global-set-key "\M-/" 'auto-complete)
-
-In addition, if you allow to start completion automatically but also want to be silent as much as possible, you can do it by setting `ac-auto-start` to an prefix length integer. For example, if you want to start completion automatically when you has inserted 4 or more characters, just set `ac-auto-start` to 4:
-
-    (setq ac-auto-start 4)
-
-Setting `ac-auto-start` to large number will result in good for performance. Lesser `ac-auto-start`, more high cost to produce completion candidates, because there will be so many candidates necessarily. If you feel `auto-complete-mode` is stalling, change `ac-auto-start` to a larger number or `nil`.
-
-See [`ac-auto-start`](#) for more details.
-
-And consider to use [trigger key](#Trigger_Key).
-
-### Not to show completion menu automatically ###
-
-There is another approach to solve the annoying problem is that not to show completion menu automatically. Not to show completion menu automatically, set [`ac-auto-show-menu`](#) to `nil`.
-
-    (setq ac-auto-show-menu nil)
-
-When you select or filter candidates, completion menu will be shown.
-
-In other way, you can delay showing completion menu by setting `ac-auto-show-menu` to seconds in real number.
-
-    ;; Show 0.8 second later
-    (setq ac-auto-show-menu 0.8)
-
-This interface has both good points of completely automatic completion and completely non-automatic completion. This may be default in the future.
-
-### Stop completion ###
-
-You can stop completion by pressing `C-g`. However you won't press `C-g` while defining a macro. In such case, it is a good idea to bind some key to `ac-completing-map`.
-
-    (define-key ac-completing-map "\M-/" 'ac-stop)
-
-Now you can stop completion by pressing `M-/`.
-
-### Finish completion by TAB ###
-
-As we described above, there is many behaviors in TAB. You need to use TAB and RET properly, but there is a simple interface that bind RET to original and TAB to finish completion:
-
-    (define-key ac-completing-map "\t" 'ac-complete)
-    (define-key ac-completing-map "\r" nil)
-
-### Select candidates with C-n/C-p only when completion menu is displayed ###
-
-By evaluating the following code, you can select candidates with C-n/C-p, but it might be annoying sometimes.
-
-    ;; Bad config
-    (define-key ac-completing-map "\C-n" 'ac-next)
-    (define-key ac-completing-map "\C-p" 'ac-previous)
-
-In this case, it is better that selecting candidates is enabled only when completion menu is displayed so that the key input will not be taken as much as possible. `ac-menu-map` is a keymap for completion on completion menu which is enabled when `ac-use-menu-map` is `t`.
-
-    (setq ac-use-menu-map t)
-    ;; Default settings
-    (define-key ac-menu-map "\C-n" 'ac-next)
-    (define-key ac-menu-map "\C-p" 'ac-previous)
-
-See [`ac-use-menu-map`](#) and [`ac-menu-map`](#) for more details.
-
-### Not to use quick help ###
-
-A tooltip help that is shown when completing is called quick help. You can disable it if you don't want to use it:
-
-    (setq ac-use-quick-help nil)
-
-### Change a height of completion menu ###
-
-Set `ac-menu-height` to number of lines.
-
-    ;; 20 lines
-    (setq ac-menu-height 20)
-
-### Enable `auto-complete-mode` automatically for specific modes ###
-
-`auto-complete-mode` won't be enabled automatically for modes that are not in `ac-modes`. So you need to set if necessary:
-
-    (add-to-list 'ac-modes 'brandnew-mode)
-
-### Ignore case ###
-
-There is three ways to distinguish upper case and lower case.
-
-    ;; Just ignore case
-    (setq ac-ignore-case t)
-    ;; Ignore case if completion target string doesn't include upper characters
-    (setq ac-ignore-case 'smart)
-    ;; Distinguish case
-    (setq ac-ignore-case nil)
-
-Default is `smart`.
-
-### Stop completion automatically after inserting specific words ###
-
-Set `ac-stop-words` to words that stops completion automatically. In ruby, some people want to stop completion automatically after inserting "end":
-
-    (add-hook 'ruby-mode-hook
-              (lambda ()
-                (make-local-variable 'ac-stop-words)
-                (add-to-list 'ac-stop-words "end")))
-
-Note that `ac-stop-words` is not a buffer local variable, so you need to make it buffer local with `make-local-variable` if it is buffer specific setting.
-
-### Change colors ###
-
-Colors settings are following:
-
-| Face                 | Description                           |
-|----------------------|---------------------------------------|
-| `ac-completion-face` | Foreground color of inline completion |
-| `ac-candidate-face`  | Color of completion menu              |
-| `ac-selection-face`  | Selection color of completion menu    |
-
-To change face background color, use `set-face-background`. To change face foreground color, use `set-face-foreground`. To set underline, use `set-face-underline`.
-
-    ;; Examples
-    (set-face-background 'ac-candidate-face "lightgray")
-    (set-face-underline 'ac-candidate-face "darkgray")
-    (set-face-background 'ac-selection-face "steelblue")
-
-### Change default sources ###
-
-Read [source](#Source) first if you don't familiar with sources. To change default of sources, use `setq-default`:
-
-    (setq-default ac-sources '(ac-source-words-in-all-buffer))
-
-### Change sources for specific major modes ###
-
-For example, you may want to use specific sources for C++ buffers. To do that, register a hook by `add-hook` and change `ac-sources` properly:
-
-    (add-hook 'c++-mode (lambda () (add-to-list 'ac-sources 'ac-source-semantic)))
-
-### Completion with specific source ###
-
-You can start completion with specific source. For example, if you want to complete file name, do `M-x ac-complete-filename` at point. Or if you want to complete C/C++ member name, do `M-x ac-complete-semantic` at point. Usually, you may bind them to some key like:
-
-    ;; Complete member name by C-c . for C++ mode.
-    (add-hook 'c++-mode-hook
-              (lambda ()
-                (local-set-key (kbd "C-c .") 'ac-complete-semantic)))
-    ;; Complete file name by C-c /
-    (global-set-key (kbd "C-c /") 'ac-complete-filename)
-
-Generally, such commands will be automatically available when sources are defined. Assume that a source named `ac-source-foobar` is being defined for example, a command called `ac-complete-foobar` will be also defined automatically. See also [builtin sources](#Builtin_Sources) for available commands.
-
-If you want to use multiple sources for a command, you need to define a command for it like:
-
-    (defun semantic-and-gtags-complete ()
-      (interactive)
-      (auto-complete '(ac-source-semantic ac-source-gtags)))
-
-`auto-complete` function can take an alternative of `ac-sources`.
-
-### Show help persistently ###
-
-Use `ac-persist-help` instead of `ac-help`, which is bound to `M-<f1>` and `C-M-?`.
-
-### Show a lastly completed candidate help ###
-
-`ac-last-help` command shows a lastly completed candidate help in a `ac-help` (buffer help) form. If you give an argument by `C-u` or just call `ac-last-persist-help`, its help buffer will not disappear automatically.
-
-`ac-last-quick-help` command show a lastly completed candidate help in a `ac-quick-help` (quick help) form. It is useful if you want to see a function documentation, for example.
-
-You may bind keys to these command like:
-
-    (define-key ac-mode-map (kbd "C-c h") 'ac-last-quick-help)
-    (define-key ac-mode-map (kbd "C-c H") 'ac-last-help)
-
-### Show help beautifully ###
-
-If [pos-tip.el](http://www.emacswiki.org/emacs-en/PosTip) is installed, `auto-complete-mode` uses its native rendering engine for displaying quick help instead of legacy one.
-
-Third-party Extensions
-----------------------
-
-### SLIME ###
-
-See [ac-slime](https://github.com/purcell/ac-slime) page.
-
-### Scala ###
-
-See [ENSIME](https://github.com/aemoncannon/ensime) page.
-
-Configuration
--------------
-
-Any configuration item will be set in `.emacs` or with `M-x customize-group RET auto-complete RET`.
-
-### `ac-delay` ###
-
-Delay time to start completion in real number seconds. It is a trade off of responsibility and performance.
-
-### `ac-auto-show-menu` ###
-
-Show completion menu automatically if `t` specified. `t` means always automatically showing completion menu. `nil` means never showing completion menu. Real number means delay time in seconds.
-
-### `ac-show-menu-immediately-on-auto-complete` ###
-
-Whether or not to show completion menu immediately on `auto-complete` command. If inline completion has already been showed, this configuration will be ignored.
-
-### `ac-expand-on-auto-complete` ###
-
-Whether or not to expand a common part of whole candidates.
-
-### `ac-disable-faces` ###
-
-Specify a list of face symbols for disabling auto completion. Auto completion will not be started if a face text property at a point is included in the list.
-
-### `ac-stop-flymake-on-completing` ###
-
-Whether or not to stop Flymake on completion.
-
-### `ac-use-fuzzy` ###
-
-Whether or not to use [fuzzy matching](#Completion_by_Fuzzy_Matching).
-
-### `ac-fuzzy-cursor-color` ###
-
-Change cursor color to specified color when [fuzzy matching](#Completion_by_Fuzzy_Matching) is started. `nil` means never changed. Available colors can be seen with `M-x list-colors-display`.
-
-### `ac-use-comphist` ###
-
-Whether or not to use [candidate suggestion](#Candidate_Suggestion). `nil` means never using it and get performance better maybe.
-
-### `ac-comphist-threshold` ###
-
-Specify a percentage of limiting lower scored candidates. 100% for whole scores.
-
-### `ac-comphist-file` ###
-
-Specify a file stores data of [candidate suggestion](#Candidate_Suggestion).
-
-### `ac-use-quick-help` ###
-
-Whether or not to use quick help.
-
-### `ac-quick-help-delay` ###
-
-Delay time to show quick help in real number seconds.
-
-### `ac-menu-height` ###
-
-Specify an integer of lines of completion menu.
-
-### `ac-quick-help-height` ###
-
-Specify an integer of lines of quick help.
-
-### `ac-quick-help-prefer-pos-tip` ###
-
-Whether or not auto-complete prefers native tooltip with pos-tip than overlap popup for displaying quick help. If non-nil, you also need to install [pos-tip.el](http://www.emacswiki.org/emacs/PosTip) so that displaying tooltip can work well.
-
-### `ac-candidate-limit` ###
-
-Limit a number of candidates. Specifying an integer, the value will be a limit of candidates. `nil` means no limit.
-
-### `ac-modes` ###
-
-Specify major modes as a list of symbols that will be enabled automatically if `global-auto-complete-mode` is enabled.
-
-### `ac-compatible-packages-regexp` ###
-
-Specify a regexp that identifies starting completion or not for that package.
-
-### `ac-non-trigger-commands` ###
-
-Specify commands as a list of symbols that does NOT starts completion automatically.
-
-### `ac-trigger-commands` ###
-
-Specify commands as a list of symbols that starts completion automatically. `self-insert-command` is one of default.
-
-### `ac-trigger-commands-on-completing` ###
-
-Same as [`ac-trigger-commands`](#) expect this will be used on completing.
-
-### `ac-trigger-key` ###
-
-Specify a [trigger key](#Trigger_Key).
-
-### `ac-auto-start` ###
-
-Specify how completion will be started. `t` means always starting completion automatically. `nil` means never started automatically. An integer means completion will not be started until the value is more than a length of the completion target string.
-
-### `ac-stop-words` ###
-
-Specify a list of strings that stops completion.
-
-### `ac-use-dictionary-as-stop-words` ###
-
-Specify whether auto-complete uses dictionaries as stop words.
-
-### `ac-ignore-case` ###
-
-Specify how distinguish case. `t` means always ignoring case. `nil` means never ignoring case. `smart` in symbol means ignoring case only when the completion target string doesn't include upper characters.
-
-### `ac-dwim` ###
-
-"Do What I Mean" function. `t` means:
-
-* After selecting candidates, TAB will behave as RET
-* TAB will behave as RET only on candidate remains
-
-### `ac-use-menu-map` ###
-
-Specify a special keymap (`ac-menu-map`) should be enabled when completion menu is displayed. `ac-menu-map` will be enabled when it is `t` and satisfy one of the following conditions:
-
-* `ac-auto-start` and `ac-auto-show-menu` are not `nil`, and completion menu is displayed after starting completion
-* Completion menu is displayed by `auto-complete` command
-* Completion menu is displayed by `ac-isearch` command
-
-### `ac-use-overriding-local-map` ###
-
-Use only when operations is not affected. Internally it uses `overriding-local-map`, which is too powerful to use with keeping orthogonality. So don't use as much as possible.
-
-### `ac-completion-face` ###
-
-Face of inline completion.
-
-### `ac-candidate-face` ###
-
-Face of completion menu background.
-
-### `ac-selection-face` ###
-
-Face of completion menu selection.
-
-### `global-auto-complete-mode` ###
-
-Whether or not to use `auto-complete-mode` globally. It is `t` in general.
-
-### `ac-user-dictionary` ###
-
-Specify a dictionary as a list of string for [completion by dictionary](#Completion_by_Dictionary).
-
-### `ac-user-dictionary-files` ###
-
-Specify a dictionary files as a list of string for [completion by dictionary](#Completion_by_Dictionary).
-
-### `ac-dictionary-directories` ###
-
-Specify a dictionary directories as a list of string for [completion by dictionary](#Completion_by_Dictionary).
-
-### `ac-sources` ###
-
-Specify sources as a list of [source](#Source). This is a buffer local variable.
-
-### `ac-completing-map` ###
-
-Keymap for completion.
-
-### `ac-menu-map` ###
-
-Keymap for completion on completion menu. See also [`ac-use-menu-map`](#).
-
-### `ac-mode-map` ###
-
-Keymap for `auto-complete-mode` enabled buffers.
-
-Extend
-------
-
-A meaning to extend `auto-complete-mode` is just defining a [source](#Source). This section describe how to define a source.
-
-### Prototype ###
-
-Source basically takes a form of the following:
-
-    (defvar ac-source-mysource1
-      '((prop . value)
-        ...))
-
-As you see, source is just an associate list. You can define a source by combining pairs of defined property and its value.
-
-### Example ###
-
-The most important property for source is [`candidates`](#) property. This property describes how to generate completion candidates by giving a function, an expression, or a variable. A result of evaluation should be a list of strings. Here is an example to generate candidates "Foo", "Bar", and "Baz":
-
-    (defvar ac-source-mysource1
-      '((candidates . (list "Foo" "Bar" "Baz"))))
-
-Then add this source to `ac-sources` and use:
-
-    (setq ac-sources '(ac-source-mysource1))
-
-It is successful if you have "Bar" and "Baz" by inserting "B". The example above has an expression `(list ...)` in `candidates` property. The expression specified there will not be byte-compiled, so you should not use an expression unless it is too simple, because it has a bad affection on performance. You should use a function instead maybe:
-
-    (defun mysource1-candidates ()
-      '("Foo" "Bar" "Baz"))
-    
-    (defvar ac-source-mysource1
-      '((candidates . mysource1-candidates)))
-
-The function specified in `candidates` property will be called without any arguments on every time candidates updated. There is another way: a variable.
-
-### Initialization ###
-
-You may want to initialize a source at first time to complete. Use `init` property in these cases. As same as `candidates` property, specify a function without any parameters or an expression. Here is an example:
-
-    (defvar mysource2-cache nil)
-    
-    (defun mysource2-init ()
-      (setq mysource2-cache '("Huge" "Processing" "Is" "Done" "Here")))
-    
-    (defvar ac-source-mysource2
-      '((init . mysource2-init)
-        (candidates . mysource2-cache)))
-
-In this example, `mysource2-init` function does huge processing, and stores the result into `mysource2-cache` variable. Then specifying the variable in `candidates` property, this source prevents huge processing on every time update completions. There are possible usage:
-
-* Do `require`
-* Open buffers first of all
-
-### Cache ###
-
-Caching strategy is important for `auto-complete-mode`. There are two major ways: `init` property and `cache` property that is described in this section. Specifying `cache` property in source definition, a result of evaluation of `candidates` property will be cached and reused the result as the result of evaluation of `candidates` property next time.
-
-Rewrite the example in previous section by using `cache` property.
-
-    (defun mysource2-candidates ()
-      '("Huge" "Processing" "Is" "Done" "Here"))
-    
-    (defvar ac-source-mysource2
-      '((candidates . mysource2-candidates)
-        (cache)))
-
-There is no performance problem because this source has `cache` property even if `candidates` property will do huge processing.
-
-#### Cache Expiration ####
-
-It is possible to keep among more wider scope than `init` property and `cache` property. It may be useful for remembering all function names which is rarely changed. In these cases, how can we clear cache property not at the expense of performance? This is true time use that functionality.
-
-Use `ac-clear-variable-after-save` to clear cache every time a buffer saved. Here is an example:
-
-    (defvar mysource3-cache nil)
-    
-    (ac-clear-variable-after-save 'mysource3-cache)
-    
-    (defun mysource3-candidates ()
-      (or mysource3-cache
-          (setq mysource3-cache (list (format "Time %s" (current-time-string))))))
-    
-    (defvar ac-source-mysource3
-      '((candidates . mysource3-candidates)))
-
-Add this source to `ac-sources` and complete with "Time". You may see a time when completion has been started. After that, you also see the same time, because `mysource3-candidates` returns the cache as much as possible. Then, save the buffer once and complete with "Time" again. In this time, you may find a new time. An essence of this source is to use `ac-clear-variable-after-save` to manage a variable for cache.
-
-It is also possible to clear cache periodically. Use `ac-clear-variable-every-minute` to do that. A way to use is same to `ac-clear-variable-after-save` except its cache will be cleared every minutes. A builtin source `ac-source-functions` uses this functionality.
-
-### Action ###
-
-[Complete by RET](#) will evaluate a function or an expression specified in `action` property. A builtin sources `ac-source-abbrev` and `ac-source-yasnippet` use this property.
-
-### Omni Completion ###
-
-*Omni Completion* is a type of completion which regards of a context of editing. A file name completion which completes with slashed detected and a member name completion in C/C++ with dots detected are omni completions. To make a source support for omni completion, use `prefix` property. A result of evaluation of `prefix` property must be a beginning point of completion target string. Retuning `nil` means the source is disabled within the context.
-
-Consider a source that completes mail addresses only after "To: ". First of all, define a mail address completion source as same as above.
-
-    (defvar ac-source-to-mailaddr
-      '((candidates . (list "foo1@example.com"
-                            "foo2@example.com"
-                            "foo3@example.com"))))
-    
-    (setq ac-sources '(ac-source-to-mailaddr))
-
-Then enable completions only after "To: " by using `prefix` property. `prefix` property must be one of:
-
-* Regexp
-* Function
-* Expression
-
-Specifying a regexp, `auto-complete-mode` thinks of a point of start of group 1 or group 0 as a beginning point of completion target string by doing `re-search-backward`[^1] with the regexp. If you want to do more complicated, use a function or an expression instead. The beginning point that is evaluated here will be stored into [`ac-point`](#). In above example, regexp is enough.
-
-    ^To: \(.*\)
-
-A reason why capturing group 1 is skipping "To: ". By adding this into the source definition, the source looks like:
-
-    (defvar ac-source-to-mailaddr
-      '((candidates . (list "foo1@example.com"
-                            "foo2@example.com"
-                            "foo3@example.com"))
-        (prefix . "^To: \\(.*\\)")))
-
-Add this source to `ac-sources` and then type "To: ". You will be able to complete mail addresses.
-
-[^1]: Strictly `re-search-backward` with the added adding `\=` at the end
-
-### `ac-define-source` ###
-
-You may use an utility macro called `ac-define-source` which defines a source and a command.
-
-    (ac-define-source mysource3
-      '((candidates . (list "Foo" "Bar" "Baz"))))
-
-This expression will be expanded like:
-
-    (defvar ac-source-mysource3
-      '((candidates . (list "Foo" "Bar" "Baz"))))
-    
-    (defun ac-complete-mysource3 ()
-      (interactive)
-      (auto-complete '(ac-source-mysource3)))
-
-A source will be defined as usual and in addition a command that completes with the source will be defined. Calling `auto-complete` without arguments will use `ac-sources` as default sources and with arguments will use the arguments as default sources. Considering compatibility, it is difficult to answer which you should use `defvar` and `ac-define-source`. Builtin sources are defined with `ac-define-sources`, so you can use them alone by binding some key to these commands such like `ac-complete-filename`. See also [this tips](#Completion_with_specific_source].
-
-### Source Properties ###
-
-#### `init` ####
-
-Specify a function or an expression that is evaluated only once when completion is started.
-
-#### `candidates` ####
-
-Specify a function, an expression, or a variable to calculate candidates. Candidates should be a list of string. If [`cache`](#) property is enabled, this property will be ignored twice or later.
-
-#### `prefix` ####
-
-Specify a regexp, a function, or an expression to find a point of completion target string for [omni completion](#Omni_Completion). This source will be ignored when `nil` returned. If a regexp is specified, a start point of group 1 or group 2 will be used as a value.
-
-#### `requires` ####
-
-Specify a required number of characters of completion target string. If nothing is specified, `auto-complete-mode` uses [`ac-auto-start`](#) instead.
-
-#### `action` ####
-
-Specify a function or an expression that is executed on [completion by RET](#Completion_by_RET).
-
-#### `limit` ####
-
-Specify a limit of candidates. It overrides `ac-candidate-limit` partially.
-
-#### `symbol` ####
-
-Specify a symbol of candidate meaning in one character string. The symbol will be any character, but you should follow the rule:
-
-| Symbol | Meaning          |
-|--------|------------------|
-| s      | Symbol           |
-| f      | Function, Method |
-| v      | Variable         |
-| c      | Constant         |
-| a      | Abbreviation     |
-| d      | Dictionary       |
-
-#### `summary` ####
-
-Specify a summary of candidate in string. It should be used for summarizing the candidate in short string.
-
-#### `cache` ####
-
-Use [cache](#).
-
-#### `require` ####
-
-Specify an integer or `nil`. This source will be ignored when the integer value is lager than a length of completion target string. `nil` means nothing ignored.
-
-#### `candidate-face` ####
-
-Specify a face of candidate. It overrides [`ac-candidate-face`](#) partially.
-
-#### `selection-face` ####
-
-Specify a face of selection. It overrides [`ac-selection-face`](#) partially.
-
-#### `depends` ####
-
-Specify a list of features (which are `require`d) that the source is depending.
-
-#### `available` ####
-
-Specify a function or an expression that describe the source is available or not.
-
-#### `document` ####
-
-Specify a function or an expression that returns documentation of the candidate.
-
-### Variables ###
-
-Here is a list of often used variables.
-
-#### `ac-buffer` ####
-
-A buffer where completion started.
-
-#### `ac-point` ####
-
-A start point of completion target string.
-
-#### `ac-prefix` ####
-
-A string of completion target.
-
-#### `ac-limit` ####
-
-A limit of candidates. Its value may be one of [`ac-candidate-limit`](#) and [`limit`](#) property.
-
-#### `ac-candidates` ####
-
-A list of candidates.
-
-Trouble Shooting
-----------------
-
-### Response Latency ###
-
-To keep much responsibility is very important for `auto-complete-mode`. However it is well known fact that a performance is a trade off of functionalities. List up options related to the performance.
-
-#### `ac-auto-start` #### {#trouble_ac-auto-start}
-
-For a larger number, it reduces a cost of generating completion candidates. Or you can remove the cost by setting `nil` and you can use when you truly need. See [not to complete automatically](#Not_to_complete_automatically) for more details.
-
-#### `ac-delay` #### {#trouble_ac-delay}
-
-For a larger number, it reduces a cost of starting completion.
-
-#### `ac-auto-show-menu` #### {#trouble_ac-auto-show-menu}
-
-For a larger number, it reduces a displaying cost of completion menu.
-
-#### `ac-use-comphist` #### {#trouble_ac-use-comphist}
-
-Setting [`ac-use-comphist`](#) to `nil` to disable [candidate suggestion](#Candidate_Suggestion), it reduces a cost of suggestion.
-
-#### `ac-candidate-limit` #### {#trouble_ac-candidate-limit}
-
-For a property number, it reduces much computation of generating candidates.
-
-### Completion menu is disrupted ###
-
-There is two major cases.
-
-#### Column Computation Case ####
-
-`auto-complete-mode` tries to reduce a cost of computation of columns to show completion menu correctly by using a optimized function at the expense of accuracy. However, it probably causes a menu to be disrupted. Not to use the optimized function, evaluate the following code:
-
-    (setq popup-use-optimized-column-computation nil)
-
-#### Font Case ####
-
-There is a problem when render [IPA font](http://ossipedia.ipa.go.jp/ipafont/) with Xft in Ubuntu 9.10. Use [VL gothic](http://dicey.org/vlgothic/), which renders more suitably. Or disable Xft, then it can render correctly.
-
-We don't good answers now, but you may shot the troubles by changing font size with `set-face-font`. For instance, completion menu may be disrupted when displaying the menu including Japanese in NTEmacs. In such case, it is worth to try to evaluate the following code to fix it:
-
-    (set-face-font 'ac-candidate-face "MS Gothic 11")
-    (set-face-font 'ac-selection-face "MS Gothic 11")
-
-Known Bugs
-----------
-
-### Auto completion will not be started in a buffer `flyspell-mode` enabled ### {#flyspell-mode-bug}
-
-A way of delaying processes of `flyspell-mode` disables auto completion. You can avoid this problem by `M-x ac-flyspell-workaround`. You can write the following code into your `~/.emacs`.
-
-    (ac-flyspell-workaround)
-
-### `linum-mode` tries to display the line numbers even for the comletion menu ### {#linum-mode-bug}
-
-linum-mode tries to add the line numbers even for the comletion menu. To stop that annoying behavior, do `M-x ac-linum-workaround` or add the following code into your `~/.emacs`.
-
-    (ac-linum-workaround)
-
-Reporting Bugs
---------------
-
-Visit [Auto Complete Mode Bug Tracking System](http://cx4a.org/redmine/projects/auto-complete-mode) and create a new ticket.
-
-[GNU Emacs]: http://www.gnu.org/software/emacs/
-[GPLv3]: http://gplv3.fsf.org/
-[GFDL]: http://www.gnu.org/copyleft/fdl.html
diff --git a/elpa/auto-complete-1.4/doc/style.css b/elpa/auto-complete-1.4/doc/style.css
deleted file mode 100644
index 38673121e..000000000
--- a/elpa/auto-complete-1.4/doc/style.css
+++ /dev/null
@@ -1,27 +0,0 @@
-body {
-    margin: 1em;
-}
-
-h1, h2, h3 {
-    margin-top: 1em;
-}
-
-pre {
-    margin: 0.5em 2em;
-    padding: 0.5em;
-    background-color: #eee;
-    border: 1px solid #ddd;
-}
-
-table {
-    margin-left: 1em;
-    background-color: lightgray;
-}
-
-td, th {
-    padding: 0.3em;
-}
-
-td {
-    background-color: white;
-}
diff --git a/elpa/better-defaults-0.1.2/better-defaults-autoloads.el b/elpa/better-defaults-0.1.2/better-defaults-autoloads.el
new file mode 100644
index 000000000..ce2530a59
--- /dev/null
+++ b/elpa/better-defaults-0.1.2/better-defaults-autoloads.el
@@ -0,0 +1,53 @@
+;;; better-defaults-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "better-defaults" "better-defaults.el" (21709
+;;;;;;  4304 0 0))
+;;; Generated autoloads from better-defaults.el
+
+(ido-mode t)
+
+(setq ido-enable-flex-matching t)
+
+(menu-bar-mode -1)
+
+(when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
+
+(when (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
+
+(require 'uniquify)
+
+(setq uniquify-buffer-name-style 'forward)
+
+(require 'saveplace)
+
+(setq-default save-place t)
+
+(global-set-key (kbd "M-/") 'hippie-expand)
+
+(global-set-key (kbd "C-x C-b") 'ibuffer)
+
+(global-set-key (kbd "C-s") 'isearch-forward-regexp)
+
+(global-set-key (kbd "C-r") 'isearch-backward-regexp)
+
+(global-set-key (kbd "C-M-s") 'isearch-forward)
+
+(global-set-key (kbd "C-M-r") 'isearch-backward)
+
+(show-paren-mode 1)
+
+(setq-default indent-tabs-mode nil)
+
+(setq x-select-enable-clipboard t x-select-enable-primary t save-interprogram-paste-before-kill t apropos-do-all t mouse-yank-at-point t save-place-file (concat user-emacs-directory "places") backup-directory-alist `(("." \, (concat user-emacs-directory "backups"))))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; better-defaults-autoloads.el ends here
diff --git a/elpa/better-defaults-0.1.2/better-defaults-pkg.el b/elpa/better-defaults-0.1.2/better-defaults-pkg.el
new file mode 100644
index 000000000..9913bc08f
--- /dev/null
+++ b/elpa/better-defaults-0.1.2/better-defaults-pkg.el
@@ -0,0 +1 @@
+(define-package "better-defaults" "0.1.2" "Fixing weird quirks and poor defaults" 'nil)
diff --git a/elpa/magit-1.0.0/magit-pkg.elc b/elpa/better-defaults-0.1.2/better-defaults-pkg.elc
similarity index 62%
rename from elpa/magit-1.0.0/magit-pkg.elc
rename to elpa/better-defaults-0.1.2/better-defaults-pkg.elc
index 39c7e7a3d..661612552 100644
Binary files a/elpa/magit-1.0.0/magit-pkg.elc and b/elpa/better-defaults-0.1.2/better-defaults-pkg.elc differ
diff --git a/elpa/better-defaults-0.1.2/better-defaults.el b/elpa/better-defaults-0.1.2/better-defaults.el
new file mode 100644
index 000000000..46a9df632
--- /dev/null
+++ b/elpa/better-defaults-0.1.2/better-defaults.el
@@ -0,0 +1,81 @@
+;;; better-defaults.el --- Fixing weird quirks and poor defaults
+
+;; Copyright © 2013 Phil Hagelberg
+
+;; Author: Phil Hagelberg
+;; URL: https://github.com/technomancy/better-defaults
+;; Version: 0.1.2
+;; Created: 2013-04-16
+;; Keywords: convenience
+
+;; This file is NOT part of GNU Emacs.
+
+;;; Commentary:
+
+;; There are a number of unfortunate facts about the way Emacs works
+;; out of the box. While all users will eventually need to learn their
+;; way around in order to customize it to their particular tastes,
+;; this package attempts to address the most obvious of deficiencies
+;; in uncontroversial ways that nearly everyone can agree upon.
+
+;; Obviously there are many further tweaks you could do to improve
+;; Emacs, (like those the Starter Kit and similar packages) but this
+;; package focuses only on those that have near-universal appeal.
+
+;;; 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:
+
+;;;###autoload
+(progn
+  (ido-mode t)
+  (setq ido-enable-flex-matching t)
+
+  (menu-bar-mode -1)
+  (when (fboundp 'tool-bar-mode)
+    (tool-bar-mode -1))
+  (when (fboundp 'scroll-bar-mode)
+    (scroll-bar-mode -1))
+
+  (require 'uniquify)
+  (setq uniquify-buffer-name-style 'forward)
+
+  (require 'saveplace)
+  (setq-default save-place t)
+
+  (global-set-key (kbd "M-/") 'hippie-expand)
+  (global-set-key (kbd "C-x C-b") 'ibuffer)
+
+  (global-set-key (kbd "C-s") 'isearch-forward-regexp)
+  (global-set-key (kbd "C-r") 'isearch-backward-regexp)
+  (global-set-key (kbd "C-M-s") 'isearch-forward)
+  (global-set-key (kbd "C-M-r") 'isearch-backward)
+
+  (show-paren-mode 1)
+  (setq-default indent-tabs-mode nil)
+  (setq x-select-enable-clipboard t
+        x-select-enable-primary t
+        save-interprogram-paste-before-kill t
+        apropos-do-all t
+        mouse-yank-at-point t
+        save-place-file (concat user-emacs-directory "places")
+        backup-directory-alist `(("." . ,(concat user-emacs-directory
+                                                 "backups")))))
+
+(provide 'better-defaults)
+;;; better-defaults.el ends here
diff --git a/elpa/better-defaults-0.1.2/better-defaults.elc b/elpa/better-defaults-0.1.2/better-defaults.elc
new file mode 100644
index 000000000..47d2d9303
Binary files /dev/null and b/elpa/better-defaults-0.1.2/better-defaults.elc differ
diff --git a/elpa/cider-0.8.2/cider-apropos.el b/elpa/cider-0.8.2/cider-apropos.el
new file mode 100644
index 000000000..37ee31674
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-apropos.el
@@ -0,0 +1,119 @@
+;;; cider-apropos.el --- Apropos functionality for Clojure -*- lexical-binding: t -*-
+
+;; Copyright © 2014 Jeff Valk, Bozhidar Batsov
+;;
+;; Author: Jeff Valk <jv@jeffvalk.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:
+
+;; Apropos functionality for Clojure.
+
+;;; Code:
+
+(require 'cider-interaction)
+
+(defconst cider-apropos-buffer "*cider-apropos*")
+
+(push cider-apropos-buffer cider-ancillary-buffers)
+
+(defun cider-apropos-doc (button)
+  "Display documentation for the symbol represented at BUTTON."
+  (cider-doc-lookup (button-get button 'apropos-symbol)))
+
+(defun cider-apropos-summary (query ns docs-p include-private-p case-sensitive-p)
+  "Return a short description for the performed apropos search."
+  (concat (if case-sensitive-p "Case-sensitive " "")
+          (if docs-p "Documentation " "")
+          (format "Apropos for %S" query)
+          (if ns (format " in namespace %S" ns) "")
+          (if include-private-p
+              " (public and private symbols)"
+            " (public symbols only)")))
+
+(defun cider-apropos-highlight (doc query)
+  "Return the DOC string propertized to highlight QUERY matches."
+  (let ((pos 0))
+    (while (string-match query doc pos)
+      (setq pos (match-end 0))
+      (put-text-property (match-beginning 0)
+                         (match-end 0)
+                         'font-lock-face apropos-match-face doc)))
+  doc)
+
+(defun cider-apropos-result (result query docs-p)
+  "Emit a RESULT matching QUERY into current buffer, formatted for DOCS-P."
+  (nrepl-dbind-response result (name type doc)
+    (let* ((label (capitalize (if (string= type "variable") "var" type)))
+           (help (concat "Display doc for this " (downcase label))))
+      (cider-propertize-region (list 'apropos-symbol name
+                                     'action 'cider-apropos-doc
+                                     'help-echo help)
+        (insert-text-button name 'type 'apropos-symbol)
+        (insert "\n  ")
+        (insert-text-button label 'type (intern (concat "apropos-" type)))
+        (insert ": ")
+        (let ((beg (point)))
+          (if docs-p
+              (progn (insert (cider-apropos-highlight doc query))
+                     (newline))
+            (progn (insert doc)
+                   (fill-region beg (point)))))
+        (newline)))))
+
+(defun cider-show-apropos (summary results query docs-p)
+  "Show SUMMARY and RESULTS for QUERY in a pop-up buffer, formatted for DOCS-P."
+  (with-current-buffer (cider-popup-buffer cider-apropos-buffer t)
+    (let ((inhibit-read-only t))
+      (set-syntax-table clojure-mode-syntax-table)
+      (apropos-mode)
+      (cider-mode)
+      (if (boundp 'header-line-format)
+          (setq-local header-line-format summary)
+        (insert summary "\n\n"))
+      (dolist (result results)
+        (cider-apropos-result result query docs-p))
+      (goto-char (point-min)))))
+
+;;;###autoload
+(defun cider-apropos (query &optional ns docs-p privates-p case-sensitive-p)
+  "Show all symbols whose names match QUERY, a regular expression.
+The search may be limited to the namespace NS, and may optionally search doc
+strings, include private vars, and be case sensitive."
+  (interactive
+   (if current-prefix-arg
+       (list (read-string "Clojure Apropos: ")
+             (let ((ns (read-string "Namespace: ")))
+               (if (string= ns "") nil ns))
+             (y-or-n-p "Search doc strings? ")
+             (y-or-n-p "Include private symbols? ")
+             (y-or-n-p "Case-sensitive? "))
+     (list (read-string "Clojure Apropos: "))))
+  (cider-ensure-op-supported "apropos")
+  (-if-let* ((summary (cider-apropos-summary
+                       query ns docs-p privates-p case-sensitive-p))
+             (results (cider-sync-request:apropos query ns docs-p privates-p case-sensitive-p)))
+      (cider-show-apropos summary results query docs-p)
+    (message "No apropos matches for %S" query)))
+
+;;;###autoload
+(defun cider-apropos-documentation ()
+  "Shortcut for (cider-apropos <query> nil t)."
+  (interactive)
+  (cider-apropos (read-string "Clojure documentation Apropos: ") nil t))
+
+(provide 'cider-apropos)
diff --git a/elpa/cider-0.8.2/cider-apropos.elc b/elpa/cider-0.8.2/cider-apropos.elc
new file mode 100644
index 000000000..cf0129ce5
Binary files /dev/null and b/elpa/cider-0.8.2/cider-apropos.elc differ
diff --git a/elpa/cider-0.8.2/cider-autoloads.el b/elpa/cider-0.8.2/cider-autoloads.el
new file mode 100644
index 000000000..a55f15ba1
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-autoloads.el
@@ -0,0 +1,192 @@
+;;; cider-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "cider" "cider.el" (21721 38736 0 0))
+;;; Generated autoloads from cider.el
+
+(autoload 'cider-version "cider" "\
+Display CIDER's version.
+
+\(fn)" t nil)
+
+(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-connect "cider" "\
+Connect to an nREPL server identified by HOST and PORT.
+Create REPL buffer and start an nREPL client connection.
+
+\(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-connect)))
+
+;;;***
+
+;;;### (autoloads nil "cider-apropos" "cider-apropos.el" (21721 38735
+;;;;;;  0 0))
+;;; Generated autoloads from cider-apropos.el
+
+(autoload 'cider-apropos "cider-apropos" "\
+Show all symbols whose names match QUERY, a regular expression.
+The search may be limited to the namespace NS, and may optionally search doc
+strings, include private vars, and be case sensitive.
+
+\(fn QUERY &optional NS DOCS-P PRIVATES-P CASE-SENSITIVE-P)" t nil)
+
+(autoload 'cider-apropos-documentation "cider-apropos" "\
+Shortcut for (cider-apropos <query> nil t).
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-browse-ns" "cider-browse-ns.el" (21721
+;;;;;;  38735 0 0))
+;;; Generated autoloads from cider-browse-ns.el
+
+(autoload 'cider-browse-ns "cider-browse-ns" "\
+List all NAMESPACE's vars in BUFFER.
+
+\(fn NAMESPACE)" t nil)
+
+(autoload 'cider-browse-ns-all "cider-browse-ns" "\
+List all loaded namespaces in BUFFER.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-classpath" "cider-classpath.el" (21721
+;;;;;;  38736 0 0))
+;;; Generated autoloads from cider-classpath.el
+
+(autoload 'cider-classpath "cider-classpath" "\
+List all classpath entries.
+
+\(fn)" t nil)
+
+(autoload 'cider-open-classpath-entry "cider-classpath" "\
+Open a classpath entry.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-grimoire" "cider-grimoire.el" (21721
+;;;;;;  38736 0 0))
+;;; Generated autoloads from cider-grimoire.el
+
+(autoload 'cider-grimoire-web "cider-grimoire" "\
+Open the grimoire documentation for QUERY in the default web browser.
+
+\(fn QUERY)" t nil)
+
+(autoload 'cider-grimoire "cider-grimoire" "\
+Open the grimoire documentation for QUERY in a popup buffer.
+
+\(fn QUERY)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-inspector" "cider-inspector.el" (21721
+;;;;;;  38736 0 0))
+;;; Generated autoloads from cider-inspector.el
+
+(autoload 'cider-inspect "cider-inspector" "\
+Eval the string EXPRESSION and inspect the result.
+
+\(fn EXPRESSION)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-macroexpansion" "cider-macroexpansion.el"
+;;;;;;  (21721 38736 0 0))
+;;; Generated autoloads from cider-macroexpansion.el
+
+(autoload 'cider-macroexpand-1 "cider-macroexpansion" "\
+Invoke 'macroexpand-1' on the expression preceding 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 preceding point.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-mode" "cider-mode.el" (21721 38736 0
+;;;;;;  0))
+;;; Generated autoloads from cider-mode.el
+
+(defvar cider-mode-line '(:eval (format " cider[%s]" (cider-current-ns))) "\
+Mode line ligher for `cider-mode'.
+
+The value of this variable is a mode line template as in
+`mode-line-format'.  See Info Node `(elisp)Mode Line Format' for
+details about mode line templates.
+
+Customize this variable to change how `cider-mode' displays its
+status in the mode line.  The default value displays the current ns.
+Set this variable to nil to disable the mode line
+entirely.")
+
+(custom-autoload 'cider-mode-line "cider-mode" t)
+
+(autoload 'cider-mode "cider-mode" "\
+Minor mode for REPL interaction from a Clojure buffer.
+
+\\{cider-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-scratch" "cider-scratch.el" (21721 38736
+;;;;;;  0 0))
+;;; Generated autoloads from cider-scratch.el
+
+(autoload 'cider-scratch "cider-scratch" "\
+Create a scratch buffer.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "cider-selector" "cider-selector.el" (21721
+;;;;;;  38736 0 0))
+;;; 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-doc.el" "cider-eldoc.el"
+;;;;;;  "cider-interaction.el" "cider-pkg.el" "cider-repl.el" "cider-stacktrace.el"
+;;;;;;  "cider-test.el" "cider-util.el" "nrepl-client.el") (21721
+;;;;;;  38736 167277 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; cider-autoloads.el ends here
diff --git a/elpa/cider-0.8.2/cider-browse-ns.el b/elpa/cider-0.8.2/cider-browse-ns.el
new file mode 100644
index 000000000..972d9fb9c
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-browse-ns.el
@@ -0,0 +1,139 @@
+;;; cider-browse-ns.el --- CIDER namespace browser
+
+;; Copyright © 2014 John Andrews
+
+;; Author: John Andrews <john.m.andrews@gmail.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:
+
+;; (cider-browse-ns)
+;; Display a list of all vars in a namespace.
+;; Pressing <enter> will take you to the cider-doc buffer for that var.
+;; Pressing ^ will take you to a list of all namespaces (akin to dired mode)
+
+;; (cider-browse-ns-all)
+;; Explore clojure namespaces by browsing a list of all namespaces.
+;; Pressing enter expands into a list of that namespace's vars as if by
+;; executing the command (cider-browse-ns "my.ns")
+
+;;; Code:
+
+(require 'cider-repl)
+(require 'cider-client)
+(require 'cider-interaction)
+
+(defvar cider-browse-ns-buffer "*Browse NS*")
+(defvar-local cider-browse-ns-current-ns nil)
+
+;; Utility Functions
+
+(defun cider-browse-ns-properties (text)
+  "Decorate TEXT with a clickable keymap and function face."
+  (propertize text
+              'font-lock-face 'font-lock-function-name-face
+              'mouse-face 'highlight
+              'keymap cider-browse-ns-mouse-map))
+
+
+;; Mode Definition
+
+(defvar cider-browse-ns-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map cider-popup-buffer-mode-map)
+    (define-key map [return] 'cider-browse-ns-operate-on-point)
+    (define-key map "^" 'cider-browse-ns-all)
+    (define-key map "n" 'next-line)
+    (define-key map "p" 'previous-line)
+    map))
+
+(define-derived-mode cider-browse-ns-mode special-mode "browse-ns"
+  "Major mode for browsing Clojure namespaces.
+
+\\{cider-browse-ns-mode-map}"
+  (set-syntax-table clojure-mode-syntax-table)
+  (setq buffer-read-only t)
+  (setq-local electric-indent-chars nil)
+  (setq-local truncate-lines t)
+  (setq-local cider-browse-ns-current-ns nil))
+
+(defun cider-browse-ns-list (buffer title items)
+  "Reset contents of BUFFER.  Then display TITLE at the top and ITEMS are indented underneath."
+  (with-current-buffer buffer
+    (cider-browse-ns-mode)
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (insert (propertize title 'font-lock-face 'cider-doc-strong-face))
+      (newline)
+      (dolist (item items)
+        (insert "  " item)
+        (newline))
+      (goto-char (point-min)))))
+
+(defvar cider-browse-ns-mouse-map (make-sparse-keymap))
+(define-key cider-browse-ns-mouse-map [mouse-1] 'cider-browse-ns-handle-mouse)
+
+
+;; Interactive Functions
+
+;;;###autoload
+(defun cider-browse-ns (namespace)
+  "List all NAMESPACE's vars in BUFFER."
+  (interactive (list (completing-read "Browse namespace: " (cider-sync-request:ns-list))))
+  (with-current-buffer (cider-popup-buffer cider-browse-ns-buffer t)
+    (let ((vars (cider-sync-request:ns-vars namespace)))
+      (cider-browse-ns-list (current-buffer)
+                            namespace
+                            (mapcar (lambda (var)
+                                      (format "/%s"
+                                              (cider-browse-ns-properties var)))
+                                    vars))
+      (setq-local cider-browse-ns-current-ns namespace))))
+
+;;;###autoload
+(defun cider-browse-ns-all ()
+  "List all loaded namespaces in BUFFER."
+  (interactive)
+  (with-current-buffer (cider-popup-buffer cider-browse-ns-buffer t)
+    (let ((names (cider-sync-request:ns-list)))
+      (cider-browse-ns-list (current-buffer)
+                            "All loaded namespaces"
+                            (mapcar (lambda (name)
+                                      (cider-browse-ns-properties name))
+                                    names))
+      (setq-local cider-browse-ns-current-ns nil))))
+
+(defun cider-browse-ns-operate-on-point ()
+  "Expand browser according to thing at current point."
+  (interactive)
+  (let ((line (buffer-substring-no-properties (line-beginning-position) (line-end-position))))
+    (cond
+     ((= 1 (line-number-at-pos))
+      'nothing-to-do)
+     ((string-match " +/\\(.+\\)" line)
+      (cider-doc-lookup (format "%s/%s" cider-browse-ns-current-ns (match-string 1 line))))
+     ('else
+      (cider-browse-ns (replace-regexp-in-string " " "" line))))))
+
+(defun cider-browse-ns-handle-mouse (event)
+  "Handle mouse click EVENT."
+  (interactive "e")
+  (cider-browse-ns-operate-on-point))
+
+(provide 'cider-browse-ns)
+
+;;; cider-browse-ns.el ends here
diff --git a/elpa/cider-0.8.2/cider-browse-ns.elc b/elpa/cider-0.8.2/cider-browse-ns.elc
new file mode 100644
index 000000000..cb25c0f84
Binary files /dev/null and b/elpa/cider-0.8.2/cider-browse-ns.elc differ
diff --git a/elpa/cider-0.8.2/cider-classpath.el b/elpa/cider-0.8.2/cider-classpath.el
new file mode 100644
index 000000000..076378fd6
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-classpath.el
@@ -0,0 +1,104 @@
+;;; cider-classpath.el --- Basic Java classpath browser
+
+;; Copyright © 2014 Bozhidar Batsov
+
+;; 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:
+
+;; Basic Java classpath browser for CIDER.
+
+;;; Code:
+
+(require 'cider-client)
+(require 'cider-interaction)
+
+(defvar cider-classpath-buffer "*Classpath*")
+
+(defvar cider-classpath-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map cider-popup-buffer-mode-map)
+    (define-key map [return] 'cider-classpath-operate-on-point)
+    (define-key map "n" 'next-line)
+    (define-key map "p" 'previous-line)
+    map))
+
+(define-derived-mode cider-classpath-mode special-mode "classpath"
+  "Major mode for browsing the entries in Java's classpath.
+
+\\{cider-classpath-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local electric-indent-chars nil)
+  (setq-local truncate-lines t))
+
+(defun cider-classpath-list (buffer items)
+  "Populate BUFFER with ITEMS."
+  (with-current-buffer buffer
+    (cider-classpath-mode)
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (dolist (item items)
+        (insert item)
+        (newline))
+      (goto-char (point-min)))))
+
+(defun cider-classpath-properties (text)
+  "Decorate TEXT with a clickable keymap and function face."
+  (let ((face (cond
+               ((not (file-exists-p text)) 'font-lock-warning-face)
+               ((file-directory-p text) 'dired-directory)
+               (t 'default))))
+    (propertize text
+                'font-lock-face face
+                'mouse-face 'highlight
+                'keymap cider-classpath-mouse-map)))
+
+(defun cider-classpath-operate-on-point ()
+  "Expand browser according to thing at current point."
+  (interactive)
+  (let* ((bol (line-beginning-position))
+         (eol (line-end-position))
+         (line (buffer-substring-no-properties bol eol)))
+    (find-file-other-window line)))
+
+(defun cider-classpath-handle-mouse (event)
+  "Handle mouse click EVENT."
+  (interactive "e")
+  (cider-classpath-operate-on-point))
+
+;;;###autoload
+(defun cider-classpath ()
+  "List all classpath entries."
+  (interactive)
+  (with-current-buffer (cider-popup-buffer cider-classpath-buffer t)
+    (cider-classpath-list (current-buffer)
+                          (mapcar (lambda (name)
+                                    (cider-classpath-properties name))
+                                  (cider-sync-request:classpath)))))
+
+;;;###autoload
+(defun cider-open-classpath-entry ()
+  "Open a classpath entry."
+  (interactive)
+  (-when-let (entry (completing-read "Classpath entries: " (cider-sync-request:classpath)))
+    (find-file-other-window entry)))
+
+(defvar cider-classpath-mouse-map (make-sparse-keymap))
+(define-key cider-classpath-mouse-map [mouse-1] 'cider-classpath-handle-mouse)
+
+(provide 'cider-classpath)
+
+;;; cider-classpath.el ends here
diff --git a/elpa/cider-0.8.2/cider-classpath.elc b/elpa/cider-0.8.2/cider-classpath.elc
new file mode 100644
index 000000000..593015bc2
Binary files /dev/null and b/elpa/cider-0.8.2/cider-classpath.elc differ
diff --git a/elpa/cider-0.8.2/cider-client.el b/elpa/cider-0.8.2/cider-client.el
new file mode 100644
index 000000000..556cc492d
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-client.el
@@ -0,0 +1,263 @@
+;;; cider-client.el --- A layer of abstraction above the actual client code. -*- lexical-binding: t -*-
+
+;; Copyright © 2013-2014 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"
+    "Everything should be as simple as possible, but not simpler. -Albert Einstein"
+    "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"
+    "Elegance is not a dispensable luxury but a quality that decides between success and failure. -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"
+    "If paredit is not for you, then you need to become the sort of person that paredit is for. -Phil Hagelberg"
+    "Express Yourself. -Madonna"
+    "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!"
+    "nREPL server is up, CIDER REPL is online!"
+    "CIDER REPL 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"
+              (or ns (cider-current-ns)))))
+    (nrepl-request:eval 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-interrupt ()
+  "Interrupt any pending evaluations."
+  (interactive)
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (let ((pending-request-ids (cider-util--hash-keys nrepl-pending-requests)))
+      (dolist (request-id pending-request-ids)
+        (nrepl-request:interrupt request-id (cider-interrupt-handler (current-buffer)))))))
+
+(defun cider-current-repl-buffer ()
+  "The current REPL buffer."
+  (-when-let (repl-buf (nrepl-current-connection-buffer 'no-error))
+    (buffer-local-value 'nrepl-repl-buffer (get-buffer repl-buf))))
+
+(defun cider--var-choice (var-info)
+  "Prompt to choose from among multiple VAR-INFO candidates, if required.
+This is needed only when the symbol queried is an unqualified host platform
+method, and multiple classes have a so-named member.  If VAR-INFO does not
+contain a `candidates' key, it is returned as is."
+  (let ((candidates (nrepl-dict-get var-info "candidates")))
+    (if candidates
+        (let* ((classes (nrepl-dict-keys candidates))
+               (choice (completing-read "Member in class: " classes nil t))
+               (info (nrepl-dict-get candidates choice)))
+          info)
+      var-info)))
+
+(defun cider-var-info (var &optional all)
+  "Return VAR's info as an alist with list cdrs.
+When multiple matching vars are returned you'll be prompted to select one,
+unless ALL is truthy."
+  (when (and var (not (string= var "")))
+    (let ((var-info (cider-sync-request:info var)))
+      (if all var-info (cider--var-choice var-info)))))
+
+(defun cider-member-info (class member)
+  "Return the CLASS MEMBER's info as an alist with list cdrs."
+  (when (and class member)
+    (cider-sync-request:info nil class member)))
+
+
+;;; Requests
+
+(defun cider-request:load-file (file-contents file-path file-name &optional callback)
+  "Perform the nREPL \"load-file\" op.
+FILE-CONTENTS, FILE-PATH and FILE-NAME are details of the file to be
+loaded. If CALLBACK is nil, use `cider-load-file-handler'."
+  (nrepl-send-request (list "op" "load-file"
+                            "session" (nrepl-current-session)
+                            "file" file-contents
+                            "file-path" file-path
+                            "file-name" file-name)
+                      (or callback
+                          (cider-load-file-handler (current-buffer)))))
+
+
+;;; Sync Requests
+(defun cider--sync-request-value (request)
+  "Send sync REQUEST and return the \"value\" slot."
+  (cider-ensure-op-supported (lax-plist-get request "op"))
+  (nrepl-dict-get (nrepl-send-sync-request request) "value"))
+
+(defun cider-sync-request:apropos (query &optional search-ns docs-p privates-p case-sensitive-p)
+  "Send \"apropos\" op with args SEARCH-NS, DOCS-P, PRIVATES-P, CASE-SENSITIVE-P."
+  (-> `("op" "apropos"
+        "ns" ,(cider-current-ns)
+        "query" ,query
+        ,@(when search-ns `("search-ns" ,search-ns))
+        ,@(when docs-p '("docs?" "t"))
+        ,@(when privates-p '("privates?" "t"))
+        ,@(when case-sensitive-p '("case-sensitive?" "t")))
+    (nrepl-send-sync-request)
+    (nrepl-dict-get "apropos-matches")))
+
+(defun cider-sync-request:classpath ()
+  "Return a list of classpath entries."
+  (cider-ensure-op-supported "classpath")
+  (-> (list "op" "classpath"
+            "session" (nrepl-current-session))
+    (nrepl-send-sync-request)
+    (nrepl-dict-get "classpath")))
+
+(defun cider-sync-request:complete (str context)
+  "Return a list of completions for STR using nREPL's \"complete\" op."
+  (-> (list "op" "complete"
+            "session" (nrepl-current-session)
+            "ns" (cider-current-ns)
+            "symbol" str
+            "context" context)
+    (nrepl-send-sync-request)
+    (nrepl-dict-get "completions")))
+
+(defun cider-sync-request:info (symbol &optional class member)
+  "Send \"info\" op with parameters SYMBOL or CLASS and MEMBER."
+  (let ((var-info (-> `("op" "info"
+                        "session" ,(nrepl-current-session)
+                        "ns" ,(cider-current-ns)
+                        ,@(when symbol (list "symbol" symbol))
+                        ,@(when class (list "class" class))
+                        ,@(when member (list "member" member)))
+                    (nrepl-send-sync-request))))
+    (if (member "no-info" (nrepl-dict-get var-info "status"))
+        nil
+      var-info)))
+
+(defun cider-sync-request:eldoc (symbol &optional class member)
+  "Send \"eldoc\" op with parameters SYMBOL or CLASS and MEMBER."
+  (let ((eldoc (-> `("op" "eldoc"
+                     "session" ,(nrepl-current-session)
+                     "ns" ,(cider-current-ns)
+                     ,@(when symbol (list "symbol" symbol))
+                     ,@(when class (list "class" class))
+                     ,@(when member (list "member" member)))
+                 (nrepl-send-sync-request))))
+    (if (member "no-eldoc" (nrepl-dict-get eldoc "status"))
+        nil
+      eldoc)))
+
+(defun cider-sync-request:macroexpand (expander expr &optional display-namespaces)
+  "Macroexpand, using EXPANDER, the given EXPR.
+The default for DISPLAY-NAMESPACES is taken from
+`cider-macroexpansion-display-namespaces'."
+  (cider-ensure-op-supported "macroexpand")
+  (-> (list "op" "macroexpand"
+            "expander" expander
+            "code" expr
+            "ns" (cider-current-ns)
+            "display-namespaces"
+            (or display-namespaces
+                (symbol-name cider-macroexpansion-display-namespaces)))
+    (nrepl-send-sync-request)
+    (nrepl-dict-get "expansion")))
+
+(defun cider-sync-request:ns-list ()
+  "Get a list of the available namespaces."
+  (cider--sync-request-value (list "op" "ns-list"
+                                   "session" (nrepl-current-session))))
+
+(defun cider-sync-request:ns-vars (ns)
+  "Get a list of the vars in NS."
+  (cider--sync-request-value (list "op" "ns-vars"
+                                   "session" (nrepl-current-session)
+                                   "ns" ns)))
+
+(defun cider-sync-request:resource (name)
+  "Perform nREPL \"resource\" op with resource name NAME."
+  (-> (list "op" "resource"
+            "name" name)
+    (nrepl-send-sync-request)
+    (nrepl-dict-get "resource-path")))
+
+(provide 'cider-client)
+
+;;; cider-client.el ends here
diff --git a/elpa/cider-0.8.2/cider-client.elc b/elpa/cider-0.8.2/cider-client.elc
new file mode 100644
index 000000000..3ce5988e3
Binary files /dev/null and b/elpa/cider-0.8.2/cider-client.elc differ
diff --git a/elpa/cider-0.8.2/cider-doc.el b/elpa/cider-0.8.2/cider-doc.el
new file mode 100644
index 000000000..ec66c3445
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-doc.el
@@ -0,0 +1,365 @@
+;;; cider-doc.el --- CIDER documentation functionality -*- lexical-binding: t -*-
+
+;; Copyright © 2014 Jeff Valk
+
+;; Author: Jeff Valk <jv@jeffvalk.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:
+
+;; Mode for formatting and presenting documentation
+
+;;; Code:
+
+(require 'cider-util)
+(require 'org-table)
+(require 'button)
+(require 'dash)
+(require 'easymenu)
+
+
+;;; Variables
+
+(defgroup cider-doc nil
+  "Documentation for CIDER."
+  :prefix "cider-doc-"
+  :group 'cider)
+
+
+(defvar cider-doc-map
+  (let (cider-doc-map)
+    (define-prefix-command 'cider-doc-map)
+    (define-key cider-doc-map (kbd "a") 'cider-apropos)
+    (define-key cider-doc-map (kbd "C-a") 'cider-apropos)
+    (define-key cider-doc-map (kbd "A") 'cider-apropos-documentation)
+    (define-key cider-doc-map (kbd "d") 'cider-doc)
+    (define-key cider-doc-map (kbd "C-d") 'cider-doc)
+    (define-key cider-doc-map (kbd "g") 'cider-grimoire)
+    (define-key cider-doc-map (kbd "C-g") 'cider-grimoire)
+    (define-key cider-doc-map (kbd "h") 'cider-grimoire-web)
+    (define-key cider-doc-map (kbd "j") 'cider-javadoc)
+    (define-key cider-doc-map (kbd "C-j") 'cider-javadoc)
+    cider-doc-map)
+  "CIDER documentation keymap.")
+
+(defvar cider-doc-menu
+  '("Documentation ..."
+    ["CiderDoc" cider-doc]
+    ["JavaDoc in browser" cider-javadoc]
+    ["Grimoire" cider-grimoire]
+    ["Grimoire in browser" cider-grimoire-web]
+    ["Search functions/vars" cider-apropos]
+    ["Search documentation" cider-apropos-documentation])
+  "CIDER documentation submenu.")
+
+
+
+;;; cider-docview-mode
+
+(defgroup cider-docview-mode nil
+  "Formatting/fontifying documentation viewer."
+  :prefix "cider-docview-"
+  :group 'cider)
+
+(defcustom cider-docview-fill-column fill-column
+  "Fill column for docstrings in doc buffer."
+  :type 'list
+  :group 'cider-docview-mode
+  :package-version '(cider . "0.7.0"))
+
+
+
+;; Faces
+
+(defface cider-docview-emphasis-face
+  '((t (:inherit default :underline t)))
+  "Face for emphasized text"
+  :group 'cider-docview-mode
+  :package-version '(cider . "0.7.0"))
+
+(defface cider-docview-strong-face
+  '((t (:inherit default :underline t :weight bold)))
+  "Face for strongly emphasized text"
+  :group 'cider-docview-mode
+  :package-version '(cider . "0.7.0"))
+
+(defface cider-docview-literal-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for literal text"
+  :group 'cider-docview-mode
+  :package-version '(cider . "0.7.0"))
+
+(defface cider-docview-table-border-face
+  '((t (:inherit shadow)))
+  "Face for table borders"
+  :group 'cider-docview-mode
+  :package-version '(cider . "0.7.0"))
+
+
+;; Colors & Theme Support
+
+(defvar cider-docview-code-background-color
+  (cider-scale-background-color)
+  "Background color for code blocks.")
+
+(defadvice enable-theme (after cider-docview-adapt-to-theme activate)
+  "When theme is changed, update `cider-docview-code-background-color'."
+  (setq cider-docview-code-background-color (cider-scale-background-color)))
+
+
+;; Mode & key bindings
+
+(defvar cider-docview-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "q" 'cider-popup-buffer-quit-function)
+    (define-key map "j" 'cider-docview-javadoc)
+    (define-key map "s" 'cider-docview-source)
+    (define-key map (kbd "<backtab>") 'backward-button)
+    (define-key map (kbd "TAB") 'forward-button)
+    (easy-menu-define cider-docview-mode-menu map
+      "Menu for CIDER's doc mode"
+      `("CiderDoc"
+        ["JavaDoc in browser" cider-docview-javadoc]
+        ["Jump to source" cider-docview-source]
+        "--"
+        ["Quit" cider-popup-buffer-quit-function]
+        ))
+    map))
+
+(define-derived-mode cider-docview-mode special-mode "Doc"
+  "Major mode for displaying CIDER documentation
+
+\\{cider-docview-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil)
+  (setq-local cider-docview-symbol nil)
+  (setq-local cider-docview-javadoc-url nil)
+  (setq-local cider-docview-file nil)
+  (setq-local cider-docview-line nil))
+
+
+;;; Interactive functions
+
+(defun cider-docview-javadoc ()
+  "Open the Javadoc for the current class, if available."
+  (interactive)
+  (if cider-docview-javadoc-url
+      (browse-url cider-docview-javadoc-url)
+    (message "No Javadoc available for %s" cider-docview-symbol)))
+
+(defun cider-docview-source ()
+  "Open the source for the current symbol, if available."
+  (interactive)
+  (if cider-docview-file
+      (let ((buffer (and cider-docview-file
+                         (not (cider--tooling-file-p cider-docview-file))
+                         (cider-find-file cider-docview-file))))
+        (cider-jump-to buffer (cons cider-docview-line nil) nil))
+    (message "No source location for %s" cider-docview-symbol)))
+
+
+;;; Font Lock and Formatting
+
+(defun cider-docview-fontify-code-blocks (buffer mode)
+  "Font lock BUFFER code blocks using MODE and remove markdown characters.
+This processes the triple backtick GFM markdown extension.  An overlay is used
+to shade the background.  Blocks are marked to be ignored by other fonification
+and line wrap."
+  (with-current-buffer buffer
+    (save-excursion
+      (while (search-forward-regexp "```\n" nil t)
+        (replace-match "")
+        (let ((beg (point))
+              (bg `(:background ,cider-docview-code-background-color)))
+          (when (search-forward-regexp "```\n" nil t)
+            (replace-match "")
+            (cider-font-lock-region-as mode beg (point))
+            (overlay-put (make-overlay beg (point)) 'font-lock-face bg)
+            (put-text-property beg (point) 'block 'code)))))))
+
+(defun cider-docview-fontify-literals (buffer)
+  "Font lock BUFFER literal text and remove backtick markdown characters.
+Preformatted code text blocks are ignored."
+  (with-current-buffer buffer
+    (save-excursion
+      (while (search-forward "`" nil t)
+        (if (eq (get-text-property (point) 'block) 'code)
+            (forward-char)
+          (progn
+            (replace-match "")
+            (let ((beg (point)))
+              (when (search-forward "`" (line-end-position) t)
+                (replace-match "")
+                (put-text-property beg (point) 'font-lock-face 'cider-docview-literal-face)))))))))
+
+(defun cider-docview-fontify-emphasis (buffer)
+  "Font lock BUFFER emphasized text and remove markdown characters.
+One '*' represents emphasis, multiple '**'s represent strong emphasis.
+Preformatted code text blocks are ignored."
+  (with-current-buffer buffer
+    (save-excursion
+      (while (search-forward-regexp "\\(*+\\)\\(\\w\\)" nil t)
+        (if (eq (get-text-property (point) 'block) 'code)
+            (forward-char)
+          (progn
+            (replace-match "\\2")
+            (let ((beg (1- (point)))
+                  (face (if (> (length (match-string 1)) 1)
+                            'cider-docview-strong-face
+                          'cider-docview-emphasis-face)))
+              (when (search-forward-regexp "\\(\\w\\)\\*+" (line-end-position) t)
+                (replace-match "\\1")
+                (put-text-property beg (point) 'font-lock-face face)))))))))
+
+(defun cider-docview-format-tables (buffer)
+  "Align BUFFER tables and dim borders.
+This processes the GFM table markdown extension using `org-table'.
+Tables are marked to be ignored by line wrap."
+  (with-current-buffer buffer
+    (save-excursion
+      (let ((border 'cider-docview-table-border-face))
+        (org-table-map-tables
+         (lambda ()
+           (org-table-align)
+           (goto-char (org-table-begin))
+           (while (search-forward-regexp "[+|-]" (org-table-end) t)
+             (put-text-property (match-beginning 0) (match-end 0) 'font-lock-face border))
+           (put-text-property (org-table-begin) (org-table-end) 'block 'table)))))))
+
+(defun cider-docview-wrap-text (buffer)
+  "For text in BUFFER not propertized as 'block', apply line wrap."
+  (with-current-buffer buffer
+    (save-excursion
+      (while (not (eobp))
+        (unless (get-text-property (point) 'block)
+          (fill-region (point) (line-end-position)))
+        (forward-line)))))
+
+
+;;; Rendering
+
+(defun cider-docview-render-java-doc (buffer text)
+  "Emit into BUFFER formatted doc TEXT for a Java class or member."
+  (with-current-buffer buffer
+    (let ((beg (point)))
+      (insert text)
+      (save-excursion
+        (goto-char beg)
+        (cider-docview-fontify-code-blocks buffer 'java-mode) ; left alone hereafter
+        (cider-docview-fontify-literals buffer)
+        (cider-docview-fontify-emphasis buffer)
+        (cider-docview-format-tables buffer) ; may contain literals, emphasis
+        (cider-docview-wrap-text buffer))))) ; ignores code, table blocks
+
+(defun cider-docview-render-info (buffer info)
+  "Emit into BUFFER formatted INFO for the Clojure or Java symbol."
+  (let* ((ns      (nrepl-dict-get info "ns"))
+         (name    (nrepl-dict-get info "name"))
+         (added   (nrepl-dict-get info "added"))
+         (depr    (nrepl-dict-get info "deprecated"))
+         (macro   (nrepl-dict-get info "macro"))
+         (special (nrepl-dict-get info "special-form"))
+         (forms   (nrepl-dict-get info "forms-str"))
+         (args    (nrepl-dict-get info "arglists-str"))
+         (doc     (nrepl-dict-get info "doc"))
+         (url     (nrepl-dict-get info "url"))
+         (class   (nrepl-dict-get info "class"))
+         (member  (nrepl-dict-get info "member"))
+         (javadoc (nrepl-dict-get info "javadoc"))
+         (super   (nrepl-dict-get info "super"))
+         (ifaces  (nrepl-dict-get info "interfaces"))
+         (clj-name  (if ns (concat ns "/" name) name))
+         (java-name (if member (concat class "/" member) class)))
+    (with-current-buffer buffer
+      (cl-flet ((emit (text &optional face)
+                      (insert (if face
+                                  (propertize text 'font-lock-face face)
+                                text))
+                      (newline)))
+        (emit (if class java-name clj-name) 'font-lock-function-name-face)
+        (when super
+          (emit (concat "   Extends: " (cider-font-lock-as 'java-mode super))))
+        (when ifaces
+          (emit (concat "Implements: " (cider-font-lock-as 'java-mode (car ifaces))))
+          (dolist (iface (cdr ifaces))
+            (emit (concat "            "(cider-font-lock-as 'java-mode iface)))))
+        (when (or super ifaces)
+          (newline))
+        (when (or forms args)
+          (emit (cider-font-lock-as-clojure (or forms args))))
+        (when (or special macro)
+          (emit (if special "Special Form" "Macro") 'font-lock-comment-face))
+        (when added
+          (emit (concat "Added in " added) 'font-lock-comment-face))
+        (when depr
+          (emit (concat "Deprecated in " depr) 'font-lock-comment-face))
+        (when doc
+          (if class
+              (cider-docview-render-java-doc (current-buffer) doc)
+            (emit (concat "  " doc))))
+        (when url
+          (newline)
+          (insert "  Please see ")
+          (insert-text-button url
+                              'url url
+                              'follow-link t
+                              'action (lambda (x)
+                                        (browse-url (button-get x 'url))))
+          (newline))
+        (when javadoc
+          (newline)
+          (newline)
+          (insert "For additional documentation, see the ")
+          (insert-text-button "Javadoc"
+                              'url javadoc
+                              'follow-link t
+                              'action (lambda (x)
+                                        (browse-url (button-get x 'url))))
+          (insert ".")
+          (newline))
+        (let ((beg (point-min))
+              (end (point-max)))
+          (nrepl-dict-map (lambda (k v)
+                            (put-text-property beg end k v))
+                          info)))
+      (current-buffer))))
+
+(defun cider-docview-render (buffer symbol info)
+  "Emit into BUFFER formatted documentation for SYMBOL's INFO."
+  (with-current-buffer buffer
+    (let ((javadoc (nrepl-dict-get info "javadoc"))
+          (file (nrepl-dict-get info "file"))
+          (line (nrepl-dict-get info "line"))
+          (inhibit-read-only t))
+      (cider-docview-mode)
+
+      (setq-local cider-docview-symbol symbol)
+      (setq-local cider-docview-javadoc-url javadoc)
+      (setq-local cider-docview-file file)
+      (setq-local cider-docview-line line)
+
+      (remove-overlays)
+      (cider-docview-render-info buffer info)
+
+      (goto-char (point-min))
+      (current-buffer))))
+
+
+(provide 'cider-doc)
+
+;;; cider-doc.el ends here
diff --git a/elpa/cider-0.8.2/cider-doc.elc b/elpa/cider-0.8.2/cider-doc.elc
new file mode 100644
index 000000000..7497f3680
Binary files /dev/null and b/elpa/cider-0.8.2/cider-doc.elc differ
diff --git a/elpa/cider-20131221.1231/cider-eldoc.el b/elpa/cider-0.8.2/cider-eldoc.el
similarity index 59%
rename from elpa/cider-20131221.1231/cider-eldoc.el
rename to elpa/cider-0.8.2/cider-eldoc.el
index a2c8c9d0f..bf05e5d00 100644
--- a/elpa/cider-20131221.1231/cider-eldoc.el
+++ b/elpa/cider-0.8.2/cider-eldoc.el
@@ -1,7 +1,7 @@
-;;; cider-eldoc.el --- eldoc support for Clojure
+;;; cider-eldoc.el --- eldoc support for Clojure -*- lexical-binding: t -*-
 
-;; Copyright © 2012-2013 Tim King, Phil Hagelberg
-;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 Bozhidar Batsov, Hugo Duncan, Steve Purcell
 ;;
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Phil Hagelberg <technomancy@gmail.com>
@@ -36,9 +36,12 @@
 (require 'eldoc)
 (require 'dash)
 
-(defvar cider-extra-eldoc-commands '("cider-complete" "yas/expand")
+(defvar cider-extra-eldoc-commands '("yas-expand")
   "Extra commands to be added to eldoc's safe commands list.")
 
+(defvar-local cider-eldoc-last-symbol nil
+  "The eldoc information for the last symbol we checked.")
+
 (defun cider-eldoc-format-thing (thing)
   "Format the eldoc THING."
   (propertize thing 'face 'font-lock-function-name-face))
@@ -76,35 +79,72 @@ POS is the index of the argument to highlight."
 POS is the index of current argument."
   (concat "("
           (mapconcat (lambda (args) (cider-highlight-arglist args pos))
-                     (read arglist) " ") ")"))
+                     arglist
+                     " ")
+          ")"))
+
+(defun cider-eldoc-beginning-of-sexp ()
+  "Move to the beginning of current sexp.
+
+Return the number of nested sexp the point was over or after. "
+  (let ((parse-sexp-ignore-comments t)
+        (num-skipped-sexps 0))
+    (condition-case _
+        (progn
+          ;; First account for the case the point is directly over a
+          ;; beginning of a nested sexp.
+          (condition-case _
+              (let ((p (point)))
+                (forward-sexp -1)
+                (forward-sexp 1)
+                (when (< (point) p)
+                  (setq num-skipped-sexps 1)))
+            (error))
+          (while
+              (let ((p (point)))
+                (forward-sexp -1)
+                (when (< (point) p)
+                  (setq num-skipped-sexps (1+ num-skipped-sexps))))))
+      (error))
+    num-skipped-sexps))
 
 (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))))
+    (let ((argument-index (1- (cider-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) ?\")
+      ;; Don't do anything if current word is inside a string, vector,
+      ;; hash or set literal.
+      (if (member (or (char-after (1- (point))) 0) '(?\" ?\{ ?\[))
           nil
         (list (cider-symbol-at-point) argument-index)))))
 
+(defun cider-eldoc-arglist (thing)
+  "Return the arglist for THING."
+  (when (and (nrepl-op-supported-p "eldoc")
+             thing
+             (not (string= thing ""))
+             (not (string-prefix-p ":" thing)))
+    ;; check if we can used the cached eldoc info
+    (if (string= thing (car cider-eldoc-last-symbol))
+        (cdr cider-eldoc-last-symbol)
+      (-when-let (eldoc-info (cider-sync-request:eldoc (substring-no-properties thing)))
+        (let ((arglist (nrepl-dict-get eldoc-info "eldoc")))
+          (setq cider-eldoc-last-symbol (cons thing arglist))
+          arglist)))))
+
 (defun cider-eldoc ()
   "Backend function for eldoc to show argument list in the echo area."
-  (when (cider-connected-p)
+  (when (and (cider-connected-p)
+             ;; don't clobber an error message in the minibuffer
+             (not (member last-command '(next-error previous-error))))
     (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")
+           (value (cider-eldoc-arglist thing)))
+      (when value
         (format "%s: %s"
                 (cider-eldoc-format-thing thing)
                 (cider-eldoc-format-arglist value pos))))))
@@ -113,7 +153,8 @@ POS is the index of current argument."
   "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))
+  (eldoc-mode +1))
 
 (provide 'cider-eldoc)
-;;; cider-eldoc ends here
+
+;;; cider-eldoc.el ends here
diff --git a/elpa/cider-0.8.2/cider-eldoc.elc b/elpa/cider-0.8.2/cider-eldoc.elc
new file mode 100644
index 000000000..5fa27f18e
Binary files /dev/null and b/elpa/cider-0.8.2/cider-eldoc.elc differ
diff --git a/elpa/cider-0.8.2/cider-grimoire.el b/elpa/cider-0.8.2/cider-grimoire.el
new file mode 100644
index 000000000..0d6dcbfd5
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-grimoire.el
@@ -0,0 +1,97 @@
+;;; cider-grimoire.el --- Grimoire integration -*- lexical-binding: t -*-
+
+;; Copyright © 2014 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 few commands for Grimoire documentation lookup.
+
+;;; Code:
+
+(require 'cider-interaction)
+
+(defconst cider-grimoire-url "http://conj.io/")
+
+(defun cider-grimoire-replace-special (name)
+  "Convert the dashes in NAME to a grimoire friendly format."
+  (->> name
+    (replace-regexp-in-string "\\?" "_QMARK_")
+    (replace-regexp-in-string "\\." "_DOT_")
+    (replace-regexp-in-string "\\/" "_SLASH_")
+    (replace-regexp-in-string "\\(\\`_\\)\\|\\(_\\'\\)" "")))
+
+(defun cider-grimoire-url (name ns clojure-version)
+  "Generate a grimoire url from NAME, NS and CLOJURE-VERSION."
+  (let ((clojure-version (concat (substring clojure-version 0 4) "0"))
+        (base-url cider-grimoire-url))
+    (if name
+        (concat base-url clojure-version "/" ns "/" (cider-grimoire-replace-special name) "/")
+      (concat base-url clojure-version "/" ns "/"))))
+
+(defun cider-grimoire-web-lookup (symbol)
+  "Look up the grimoire documentation for SYMBOL."
+  (-if-let (var-info (cider-var-info symbol))
+      (let ((name (nrepl-dict-get var-info "name"))
+            (ns (nrepl-dict-get var-info "ns")))
+        ;; TODO: add a whitelist of supported namespaces
+        (browse-url (cider-grimoire-url name ns (cider--clojure-version))))
+    (message "Symbol %s not resolved" symbol)))
+
+;;;###autoload
+(defun cider-grimoire-web (query)
+  "Open the grimoire documentation for QUERY in the default web browser."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-grimoire-web-lookup query))
+
+(defun cider-create-grimoire-buffer (content)
+  "Create a new grimoire buffer with CONTENT."
+  (with-current-buffer (cider-popup-buffer "*cider grimoire*" t)
+    (read-only-mode -1)
+    (insert content)
+    (read-only-mode +1)
+    (goto-char (point-min))
+    (current-buffer)))
+
+(defun cider-grimoire-lookup (symbol)
+  "Look up the grimoire documentation for SYMBOL."
+  (-if-let (var-info (cider-var-info symbol))
+      (let ((name (nrepl-dict-get var-info "name"))
+            (ns (nrepl-dict-get var-info "ns"))
+            (url-request-method "GET")
+            (url-request-extra-headers `(("Content-Type" . "text/plain"))))
+        ;; TODO: add a whitelist of supported namespaces
+        (url-retrieve (cider-grimoire-url name ns (cider--clojure-version))
+                      (lambda (_status)
+                        ;; we need to strip the http header
+                        (goto-char (point-min))
+                        (re-search-forward "^$")
+                        (delete-region (point-min) (point))
+                        (delete-blank-lines)
+                        ;; and create a new buffer with whatever is left
+                        (pop-to-buffer (cider-create-grimoire-buffer (buffer-string))))))
+    (message "Symbol %s not resolved" symbol)))
+
+;;;###autoload
+(defun cider-grimoire (query)
+  "Open the grimoire documentation for QUERY in a popup buffer."
+  (interactive "P")
+  (cider-read-symbol-name "Symbol: " 'cider-grimoire-lookup query))
+
+(provide 'cider-grimoire)
diff --git a/elpa/cider-0.8.2/cider-grimoire.elc b/elpa/cider-0.8.2/cider-grimoire.elc
new file mode 100644
index 000000000..958880db8
Binary files /dev/null and b/elpa/cider-0.8.2/cider-grimoire.elc differ
diff --git a/elpa/cider-0.8.2/cider-inspector.el b/elpa/cider-0.8.2/cider-inspector.el
new file mode 100644
index 000000000..bdafe7d47
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-inspector.el
@@ -0,0 +1,238 @@
+;;; cider-inspector.el --- Object inspector -*- lexical-binding: t -*-
+
+;; Copyright © 2013-2014 Vital Reactor, LLC
+;; Copyright © 2014 Bozhidar Batsov
+
+;; Author: Ian Eslick <ian@vitalreactor.com>
+;;         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:
+
+;; Clojure object inspector inspired by SLIME.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'cider-interaction)
+
+;; ===================================
+;; Inspector Key Map and Derived Mode
+;; ===================================
+
+(defconst cider-inspector-buffer "*cider inspect*")
+
+(push cider-inspector-buffer cider-ancillary-buffers)
+
+(defvar cider-inspector-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map cider-popup-buffer-mode-map)
+    (define-key map [return] 'cider-inspector-operate-on-point)
+    (define-key map "\C-m"   'cider-inspector-operate-on-point)
+    (define-key map [mouse-1] 'cider-inspector-operate-on-click)
+    (define-key map "l" 'cider-inspector-pop)
+    (define-key map "g" 'cider-inspector-refresh)
+    (define-key map [tab] 'cider-inspector-next-inspectable-object)
+    (define-key map "\C-i" 'cider-inspector-next-inspectable-object)
+    (define-key map [(shift tab)] 'cider-inspector-previous-inspectable-object) ; Emacs translates S-TAB
+    (define-key map [backtab] 'cider-inspector-previous-inspectable-object) ; to BACKTAB on X.
+    map))
+
+(define-derived-mode cider-inspector-mode fundamental-mode "Inspector"
+  "Major mode for inspecting Clojure data structures.
+
+\\{cider-inspector-mode-map}"
+  (set-syntax-table clojure-mode-syntax-table)
+  (setq buffer-read-only t)
+  (setq-local electric-indent-chars nil)
+  (setq-local truncate-lines t))
+
+;;;###autoload
+(defun cider-inspect (expression)
+  "Eval the string EXPRESSION and inspect the result."
+  (interactive
+   (list (cider-read-from-minibuffer "Inspect value: "
+                                     (cider-sexp-at-point))))
+  (cider-ensure-op-supported "inspect-start")
+  (cider-inspect-sym expression (cider-current-ns)))
+
+;; Operations
+(defun cider-render-response (buffer)
+  (nrepl-make-response-handler
+   buffer
+   (lambda (buffer str)
+     (cider-irender buffer str))
+   '()
+   (lambda (buffer _str)
+     (cider-emit-into-popup-buffer buffer "Oops"))
+   '()))
+
+(defun cider-inspect-sym (sym ns)
+  (let ((buffer (cider-popup-buffer cider-inspector-buffer t)))
+    (nrepl-send-request (list "op" "inspect-start" "sym" sym "ns" ns)
+                        (cider-render-response buffer))))
+
+(defun cider-inspector-pop ()
+  (interactive)
+  (let ((buffer (cider-popup-buffer cider-inspector-buffer t)))
+    (nrepl-send-request (list "op" "inspect-pop")
+                        (cider-render-response buffer))))
+
+(defun cider-inspector-push (idx)
+  (let ((buffer (cider-popup-buffer cider-inspector-buffer t)))
+    (nrepl-send-request (list "op" "inspect-push" "idx" (number-to-string idx))
+                        (cider-render-response buffer))))
+
+(defun cider-inspector-refresh ()
+  (interactive)
+  (let ((buffer (cider-popup-buffer cider-inspector-buffer t)))
+    (nrepl-send-request (list "op" "inspect-refresh")
+                        (cider-render-response buffer))))
+
+;; Render Inspector from Structured Values
+(defun cider-irender (buffer str)
+  (with-current-buffer buffer
+    (cider-inspector-mode)
+    (let ((inhibit-read-only t))
+      (condition-case nil
+          (cider-irender* (car (read-from-string str)))
+        (error (newline) (insert "Inspector error for: " str))))
+    (goto-char (point-min))))
+
+(defun cider-irender* (elements)
+  (dolist (el elements)
+    (cider-irender-el* el)))
+
+(defun cider-irender-el* (el)
+  (cond ((symbolp el) (insert (symbol-name el)))
+        ((stringp el) (insert (propertize el 'font-lock-face 'font-lock-keyword-face)))
+        ((and (consp el) (eq (car el) :newline))
+         (newline))
+        ((and (consp el) (eq (car el) :value))
+         (cider-irender-value (cadr el) (caddr el)))
+        (t (message "Unrecognized inspector object: %s" el))))
+
+(defun cider-irender-value (value idx)
+  (cider-propertize-region
+      (list 'cider-value-idx idx
+            'mouse-face 'highlight)
+    (cider-irender-el* (cider-font-lock-as-clojure value))))
+
+
+;; ===================================================
+;; Inspector Navigation (lifted from SLIME inspector)
+;; ===================================================
+
+(defun cider-find-inspectable-object (direction limit)
+  "Find the next/previous inspectable object.
+DIRECTION can be either 'next or 'prev.
+LIMIT is the maximum or minimum position in the current buffer.
+
+Return a list of two values: If an object could be found, the
+starting position of the found object and T is returned;
+otherwise LIMIT and NIL is returned."
+  (let ((finder (ecase direction
+                  (next 'next-single-property-change)
+                  (prev 'previous-single-property-change))))
+    (let ((prop nil) (curpos (point)))
+      (while (and (not prop) (not (= curpos limit)))
+        (let ((newpos (funcall finder curpos 'cider-value-idx nil limit)))
+          (setq prop (get-text-property newpos 'cider-value-idx))
+          (setq curpos newpos)))
+      (list curpos (and prop t)))))
+
+(defun cider-inspector-next-inspectable-object (arg)
+  "Move point to the next inspectable object.
+With optional ARG, move across that many objects.
+If ARG is negative, move backwards."
+  (interactive "p")
+  (let ((maxpos (point-max)) (minpos (point-min))
+        (previously-wrapped-p nil))
+    ;; Forward.
+    (while (> arg 0)
+      (cl-destructuring-bind (pos foundp)
+          (cider-find-inspectable-object 'next maxpos)
+        (if foundp
+            (progn (goto-char pos) (setq arg (1- arg))
+                   (setq previously-wrapped-p nil))
+          (if (not previously-wrapped-p) ; cycle detection
+              (progn (goto-char minpos) (setq previously-wrapped-p t))
+            (error "No inspectable objects")))))
+    ;; Backward.
+    (while (< arg 0)
+      (cl-destructuring-bind (pos foundp)
+          (cider-find-inspectable-object 'prev minpos)
+        ;; CIDER-OPEN-INSPECTOR inserts the title of an inspector page
+        ;; as a presentation at the beginning of the buffer; skip
+        ;; that.  (Notice how this problem can not arise in ``Forward.'')
+        (if (and foundp (/= pos minpos))
+            (progn (goto-char pos) (setq arg (1+ arg))
+                   (setq previously-wrapped-p nil))
+          (if (not previously-wrapped-p) ; cycle detection
+              (progn (goto-char maxpos) (setq previously-wrapped-p t))
+            (error "No inspectable objects")))))))
+
+(defun cider-inspector-previous-inspectable-object (arg)
+  "Move point to the previous inspectable object.
+With optional ARG, move across that many objects.
+If ARG is negative, move forwards."
+  (interactive "p")
+  (cider-inspector-next-inspectable-object (- arg)))
+
+(defun cider-inspector-property-at-point ()
+  (let* ((properties '(cider-value-idx cider-range-button
+                                       cider-action-number))
+         (find-property
+          (lambda (point)
+            (cl-loop for property in properties
+                     for value = (get-text-property point property)
+                     when value
+                     return (list property value)))))
+    (or (funcall find-property (point))
+        (funcall find-property (1- (point))))))
+
+(defun cider-inspector-operate-on-point ()
+  "Invoke the command for the text at point.
+1. If point is on a value then recursivly call the inspector on
+that value.
+2. If point is on an action then call that action.
+3. If point is on a range-button fetch and insert the range."
+  (interactive)
+  (cl-destructuring-bind (property value)
+      (cider-inspector-property-at-point)
+    (cl-case property
+      (cider-value-idx
+       (cider-inspector-push value))
+      ;; TODO: range and action handlers
+      (t (error "No object at point")))))
+
+(defun cider-inspector-operate-on-click (event)
+  "Move to EVENT's position and operate the part."
+  (interactive "@e")
+  (let ((point (posn-point (event-end event))))
+    (cond ((and point
+                (or (get-text-property point 'cider-value-idx)))
+           ;;                    (get-text-property point 'cider-range-button)
+           ;;                    (get-text-property point 'cider-action-number)))
+           (goto-char point)
+           (cider-inspector-operate-on-point))
+          (t
+           (error "No clickable part here")))))
+
+(provide 'cider-inspector)
+
+;;; cider-inspector.el ends here
diff --git a/elpa/cider-0.8.2/cider-inspector.elc b/elpa/cider-0.8.2/cider-inspector.elc
new file mode 100644
index 000000000..b37355b56
Binary files /dev/null and b/elpa/cider-0.8.2/cider-inspector.elc differ
diff --git a/elpa/cider-0.8.2/cider-interaction.el b/elpa/cider-0.8.2/cider-interaction.el
new file mode 100644
index 000000000..1d320e21e
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-interaction.el
@@ -0,0 +1,1802 @@
+;;; cider-interaction.el --- IDE for Clojure -*- lexical-binding: t -*-
+
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 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 'cider-stacktrace)
+(require 'cider-test)
+(require 'cider-doc)
+
+(require 'clojure-mode)
+(require 'dash)
+(require 'thingatpt)
+(require 'etags)
+(require 'arc-mode)
+(require 'ansi-color)
+(require 'cl-lib)
+(require 'compile)
+(require 'tramp)
+(require 'button)
+(require 'apropos)
+
+(defconst cider-error-buffer "*cider-error*")
+(defconst cider-read-eval-buffer "*cider-read-eval*")
+(defconst cider-doc-buffer "*cider-doc*")
+(defconst cider-result-buffer "*cider-result*")
+(defconst cider-nrepl-session-buffer "*cider-nrepl-session*")
+
+(define-obsolete-variable-alias 'cider-use-local-resources
+  'cider-prefer-local-resources "0.7.0")
+
+(defcustom cider-prefer-local-resources nil
+  "Prefer local resources to remote (tramp) ones when both are available."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-show-error-buffer t
+  "Control the popup behavior of cider stacktraces.
+The following values are possible t or 'always, 'except-in-repl,
+'only-in-repl.  Any other value, including nil, will cause the stacktrace
+not to be automatically shown.
+
+Irespective of the value of this variable, the `cider-error-buffer' is
+always generated in the background.  Use `cider-visit-error-buffer' to
+navigate to this buffer."
+  :type '(choice (const :tag "always" t)
+                 (const except-in-repl)
+                 (const only-in-repl)
+                 (const :tag "never" nil))
+  :group 'cider)
+
+(define-obsolete-variable-alias 'cider-popup-stacktraces
+  'cider-show-error-buffer "0.7.0")
+
+(defcustom cider-auto-jump-to-error t
+  "When non-nil automatically jump to error location during interactive compilation.
+When set to 'errors-only, don't jump to warnings."
+  :type '(choice (const :tag "always" t)
+                 (const errors-only)
+                 (const :tag "never" nil))
+  :group 'cider
+  :package-version '(cider . "0.7.0"))
+
+(defcustom cider-auto-select-error-buffer t
+  "Controls whether to auto-select the error popup buffer."
+  :type 'boolean
+  :group 'cider)
+
+(defcustom cider-interactive-eval-result-prefix "=> "
+  "The prefix displayed in the minibuffer before a result value."
+  :type 'string
+  :group 'cider
+  :package-version '(cider . "0.5.0"))
+
+(defcustom cider-switch-to-repl-command 'cider-switch-to-relevant-repl-buffer
+  "Select the command to be invoked when switching-to-repl.
+The default option is `cider-switch-to-relevant-repl-buffer'.  If
+you'd like to not use smart matching of repl buffer based on
+project directory, you can assign it to `cider-switch-to-current-repl-buffer'
+which will use the default REPL connection."
+  :type 'symbol
+  :group 'cider)
+
+(defcustom cider-prompt-save-file-on-load t
+  "Controls whether to prompt to save the file when loading a buffer."
+  :type 'boolean
+  :group 'cider
+  :package-version '(cider . "0.6.0"))
+
+(defcustom cider-completion-use-context t
+  "When true, uses context at point to improve completion suggestions."
+  :type 'boolean
+  :group 'cider
+  :package-version '(cider . "0.7.0"))
+
+(defcustom cider-annotate-completion-candidates nil
+  "When true, annotate completion candidates with some extra information."
+  :type 'boolean
+  :group 'cider
+  :package-version '(cider . "0.8.0"))
+
+(defconst cider-output-buffer "*cider-out*")
+
+(defcustom cider-interactive-eval-output-destination 'repl-buffer
+  "The destination for stdout and stderr produced from interactive evaluation."
+  :type '(choice (const output-buffer)
+                 (const repl-buffer))
+  :group 'cider
+  :package-version '(cider . "0.7.0"))
+
+(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)
+
+(defvar cider-required-nrepl-ops
+  '("apropos" "classpath" "complete" "eldoc" "info"
+    "inspect-start" "inspect-refresh"
+    "inspect-pop" "inspect-push" "inspect-reset"
+    "macroexpand" "ns-list" "ns-vars"
+    "resource" "stacktrace" "toggle-trace-var" "toggle-trace-ns" "undef")
+  "A list of nREPL ops required by CIDER to function properly.
+
+All of them are provided by CIDER's nREPL middleware (cider-nrepl).")
+
+(defun cider-ensure-op-supported (op)
+  "Check for support of middleware op OP.
+Signal an error if it is not supported."
+  (unless (nrepl-op-supported-p op)
+    (error "Can't find nREPL middleware providing op \"%s\".  Please, install (or update) cider-nrepl %s and restart CIDER" op (upcase cider-version))))
+
+(defun cider--check-required-nrepl-ops ()
+  "Check whether all required nREPL ops are present."
+  (let ((missing-ops (-remove 'nrepl-op-supported-p cider-required-nrepl-ops)))
+    (when missing-ops
+      (cider-repl-emit-interactive-output
+       (format "WARNING: The following required nREPL ops are not supported: \n%s\nPlease, install (or update) cider-nrepl %s and restart CIDER"
+               (cider-string-join missing-ops " ")
+               (upcase cider-version))))))
+
+;;; Connection info
+(defun cider--java-version ()
+  "Retrieve the underlying connection's Java version."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (when nrepl-versions
+      (-> nrepl-versions
+        (nrepl-dict-get "java")
+        (nrepl-dict-get "version-string")))))
+
+(defun cider--clojure-version ()
+  "Retrieve the underlying connection's Clojure version."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (when nrepl-versions
+      (-> nrepl-versions
+        (nrepl-dict-get "clojure")
+        (nrepl-dict-get "version-string")))))
+
+(defun cider--nrepl-version ()
+  "Retrieve the underlying connection's nREPL version."
+  (with-current-buffer (nrepl-current-connection-buffer)
+    (when nrepl-versions
+      (-> nrepl-versions
+        (nrepl-dict-get "nrepl")
+        (nrepl-dict-get "version-string")))))
+
+(defun cider--check-middleware-compatibility-callback (buffer)
+  "A callback to check if the middleware used is compatible with CIDER."
+  (nrepl-make-response-handler
+   buffer
+   (lambda (_buffer result)
+     (let ((middleware-version (read result)))
+       (unless (and middleware-version (equal cider-version middleware-version))
+         (cider-repl-emit-interactive-err-output (format "WARNING: CIDER's version (%s) does not match cider-nrepl's version (%s)" cider-version middleware-version)))))
+   '()
+   '()
+   '()))
+
+(defun cider--check-middleware-compatibility ()
+  "Retrieve the underlying connection's CIDER nREPL version."
+  (cider-eval "(try (require 'cider.nrepl.version)
+                                  (:version-string @(resolve 'cider.nrepl.version/version))
+                               (catch Throwable _ \"not installed\"))"
+              (cider--check-middleware-compatibility-callback (current-buffer))))
+
+(defun cider--connection-info (connection-buffer)
+  "Return info about CONNECTION-BUFFER.
+
+Info contains project name, current REPL namespace, host:port
+endpoint and Clojure version."
+  (with-current-buffer (get-buffer connection-buffer)
+    (format "Active nREPL connection: %s:%s, %s:%s (Java %s, Clojure %s, nREPL %s)"
+            (or (nrepl--project-name nrepl-project-dir) "<no project>")
+            nrepl-buffer-ns
+            (car nrepl-endpoint)
+            (cadr nrepl-endpoint)
+            (cider--java-version)
+            (cider--clojure-version)
+            (cider--nrepl-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)
+  (cider-ensure-connected)
+  (setq nrepl-connection-list
+        (append (cdr nrepl-connection-list)
+                (list (car nrepl-connection-list))))
+  (message (cider--connection-info (car nrepl-connection-list))))
+
+(defun cider-extract-designation-from-current-repl-buffer ()
+  "Extract the designation from the cider repl buffer name."
+  (let ((repl-buffer-name (cider-current-repl-buffer))
+        (template (split-string nrepl-repl-buffer-name-template "%s")))
+    (string-match (format "^%s\\(.*\\)%s"
+                          (regexp-quote (concat (car template) nrepl-buffer-name-separator))
+                          (regexp-quote (cadr template)))
+                  repl-buffer-name)
+    (or (match-string 1 repl-buffer-name) "<no designation>")))
+
+(defun cider-change-buffers-designation ()
+  "Change the designation in cider buffer names.
+Buffer names changed are cider-repl and nrepl-server."
+  (interactive)
+  (cider-ensure-connected)
+  (let* ((designation (read-string (format "Change CIDER buffer designation from '%s': "
+                                           (cider-extract-designation-from-current-repl-buffer))))
+         (new-repl-buffer-name (nrepl-format-buffer-name-template
+                                nrepl-repl-buffer-name-template designation)))
+    (with-current-buffer (cider-current-repl-buffer)
+      (rename-buffer new-repl-buffer-name)
+      (setq-local nrepl-repl-buffer new-repl-buffer-name)
+      (setq-local nrepl-connection-buffer new-repl-buffer-name)
+      (setq nrepl-connection-list
+            (cons new-repl-buffer-name (cdr nrepl-connection-list)))
+      (when nrepl-server-buffer
+        (let ((new-server-buffer-name (nrepl-format-buffer-name-template
+                                       nrepl-server-buffer-name-template designation)))
+          (with-current-buffer nrepl-server-buffer
+            (rename-buffer new-server-buffer-name))
+          (setq-local nrepl-server-buffer new-server-buffer-name))))
+    (message "CIDER buffer designation changed to: %s" designation)))
+
+;;; Switching between REPL & source buffers
+(defvar-local 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 `cider' 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)
+  "Invoke `cider-switch-to-repl-command'."
+  (interactive "p")
+  (funcall cider-switch-to-repl-command arg))
+
+(defun cider-switch-to-current-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 namespace in the REPL buffer to that
+of the namespace in the Clojure source buffer."
+  (interactive "p")
+  (cider-ensure-connected)
+  (let ((buffer (current-buffer)))
+    (when (eq 4 arg)
+      (cider-repl-set-ns (cider-current-ns)))
+    (pop-to-buffer (cider-get-repl-buffer))
+    (cider-remember-clojure-buffer buffer)
+    (goto-char (point-max))))
+
+(defun cider-find-connection-buffer-for-project-directory (project-directory)
+  "Find the relevant connection-buffer for the given PROJECT-DIRECTORY.
+
+A check is made to ensure that all connection buffers have a project-directory
+otherwise there is ambiguity as to which connection buffer should be selected.
+
+If there are multiple connection buffers matching PROJECT-DIRECTORY there
+is ambiguity, therefore nil is returned."
+  (unless (-filter
+           (lambda (conn)
+             (not
+              (with-current-buffer (get-buffer conn)
+                nrepl-project-dir)))
+           nrepl-connection-list)
+    (let ((matching-connections
+           (-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)))
+      (when (= 1 (length matching-connections))
+        (car matching-connections)))))
+
+(defun cider-switch-to-relevant-repl-buffer (&optional arg)
+  "Select the REPL buffer, when possible in an existing window.
+The buffer chosen is based on the file open in the current buffer.
+
+If the REPL buffer cannot be unambiguously determined, the REPL
+buffer is chosen based on the current connection buffer and a
+message raised informing the user.
+
+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 namespace in the REPL buffer to that
+of the namespace in the Clojure source buffer.
+
+With a second prefix ARG the chosen REPL buffer is based on a
+supplied project directory."
+  (interactive "p")
+  (cider-ensure-connected)
+  (let* ((project-directory
+          (or (when (eq 16 arg) (read-directory-name "Project: "))
+              (nrepl-project-directory-for (nrepl-current-dir))))
+         (connection-buffer
+          (or
+           (and (= 1 (length nrepl-connection-list)) (car nrepl-connection-list))
+           (and project-directory
+                (cider-find-connection-buffer-for-project-directory project-directory)))))
+    (when connection-buffer
+      (setq nrepl-connection-list
+            (cons connection-buffer (delq connection-buffer nrepl-connection-list))))
+    (cider-switch-to-current-repl-buffer arg)
+    (message
+     (format (if connection-buffer
+                 "Switched to REPL: %s"
+               "Could not determine relevant nREPL connection, using: %s")
+             (with-current-buffer (nrepl-current-connection-buffer)
+               (format "%s:%s, %s:%s"
+                       (or (nrepl--project-name nrepl-project-dir) "<no project>")
+                       nrepl-buffer-ns
+                       (car nrepl-endpoint)
+                       (cadr nrepl-endpoint)))))))
+
+(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)))
+
+(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 (kbd "TAB") 'complete-symbol)
+    (define-key map (kbd "M-TAB") 'complete-symbol)
+    map)
+  "Minibuffer keymap used for reading Clojure expressions.")
+
+(defun cider-read-from-minibuffer (prompt &optional initial-value)
+  "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 ()
+        (set-syntax-table clojure-mode-syntax-table)
+        (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)))
+
+
+;;; Utilities
+
+(defun cider--clear-compilation-highlights ()
+  "Remove compilation highlights."
+  (remove-overlays (point-min) (point-max) 'cider-note-p t))
+
+(defun cider-clear-compilation-highlights (&optional arg)
+  "Remove compilation highlights.
+
+When invoked with a prefix ARG the command doesn't prompt for confirmation."
+  (interactive "P")
+  (when (or arg (y-or-n-p "Are you sure you want to clear the compilation highlights? "))
+    (cider--clear-compilation-highlights)))
+
+(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-defun-at-point-start-pos ()
+  "Return the starting position of the current defun."
+  (car (cider--region-for-defun-at-point)))
+
+(defun cider-ns-form ()
+  "Retrieve the ns form."
+  (when (clojure-find-ns)
+    (save-excursion
+      (goto-char (match-beginning 0))
+      (cider-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)))
+
+;; FIXME: This doesn't have properly at the beginning of the REPL prompt
+(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) ""))))
+    (if (equal str (concat (cider-current-ns) "> "))
+        ""
+      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 sexp preceding the point."
+  (buffer-substring-no-properties
+   (save-excursion
+     (backward-sexp)
+     (point))
+   (point)))
+
+(defun cider-last-sexp-start-pos ()
+  (save-excursion
+    (backward-sexp)
+    (point)))
+
+;;;
+(defun cider-tramp-prefix (&optional buffer)
+  "Use the filename for BUFFER to determine a tramp prefix.
+Defaults to the current buffer.
+Return the tramp prefix, or nil if BUFFER is local."
+  (let* ((buffer (or buffer (current-buffer)))
+         (name (or (buffer-file-name buffer)
+                   (with-current-buffer buffer
+                     default-directory))))
+    (when (tramp-tramp-file-p name)
+      (let ((vec (tramp-dissect-file-name name)))
+        (tramp-make-tramp-file-name (tramp-file-name-method vec)
+                                    (tramp-file-name-user vec)
+                                    (tramp-file-name-host vec)
+                                    nil)))))
+
+(defun cider--client-tramp-filename (name &optional buffer)
+  "Return the tramp filename for path NAME relative to BUFFER.
+If BUFFER has a tramp prefix, it will be added as a prefix to NAME.
+If the resulting path is an existing tramp file, it returns the path,
+otherwise, nil."
+  (let* ((buffer (or buffer (current-buffer)))
+         (name (concat (cider-tramp-prefix buffer) name)))
+    (if (tramp-handle-file-exists-p name)
+        name)))
+
+(defun cider--server-filename (name)
+  "Return the nREPL server-relative filename for NAME."
+  (if (tramp-tramp-file-p name)
+      (with-parsed-tramp-file-name name nil
+        localname)
+    name))
+
+(defvar cider-from-nrepl-filename-function
+  (if (eq system-type 'cygwin)
+      (lambda (resource) (let ((fixed-resource (replace-regexp-in-string "^/" "" resource)))
+                           (replace-regexp-in-string
+                            "\n" ""
+                            (shell-command-to-string (format "cygpath --unix '%s'" fixed-resource)))))
+    #'identity)
+  "Function to translate nREPL namestrings to Emacs filenames.")
+
+(defun cider--file-path (path)
+  "Return PATH's local or tramp path using `cider-prefer-local-resources'.
+If no local or remote file exists, return nil."
+  (let* ((local-path (funcall cider-from-nrepl-filename-function path))
+         (tramp-path (and local-path (cider--client-tramp-filename local-path))))
+    (cond ((equal local-path "") "")
+          ((and cider-prefer-local-resources (file-exists-p local-path))
+           local-path)
+          ((and tramp-path (file-exists-p tramp-path))
+           tramp-path)
+          ((and local-path (file-exists-p local-path))
+           local-path))))
+
+(defun cider--url-to-file (url)
+  "Return the filename from the resource URL.
+Uses `url-generic-parse-url' to parse the url.  The filename is extracted and
+then url decoded.  If the decoded filename has a Windows device letter followed
+by a colon immediately after the leading '/' then the leading '/' is dropped to
+create a valid path."
+  (let ((filename (url-unhex-string (url-filename (url-generic-parse-url url)))))
+    (if (string-match "^/\\([a-zA-Z]:/.*\\)" filename)
+        (match-string 1 filename)
+      filename)))
+
+(defun cider--tooling-file-p (file-name)
+  "Return t if FILE-NAME is not a 'real' source file.
+Currently, only check if the relative file name starts with 'form-init'
+which nREPL uses for temporary evaluation file names."
+  (string-match-p "\\bform-init" (file-name-nondirectory file-name)))
+
+(defun cider-find-file (url)
+  "Return a buffer visiting the file URL if it exists, or nil otherwise.
+If URL has a scheme prefix, it must represent a fully-qualified file path
+or an entry within a zip/jar archive. If URL doesn't contain a scheme
+prefix and is an absolute path, it is treated as such. Finally, if URL is
+relative, it is expanded within each of the open Clojure buffers till an
+existing file ending with URL has been found."
+  (cond ((string-match "^file:\\(.+\\)" url)
+         (-when-let* ((file (cider--url-to-file (match-string 1 url)))
+                      (path (cider--file-path file)))
+           (find-file-noselect path)))
+        ((string-match "^\\(jar\\|zip\\):\\(file:.+\\)!/\\(.+\\)" url)
+         (-when-let* ((entry (match-string 3 url))
+                      (file  (cider--url-to-file (match-string 2 url)))
+                      (path  (cider--file-path file))
+                      (name  (format "%s:%s" path entry)))
+           (or (get-file-buffer name)
+               (if (tramp-tramp-file-p path)
+                   (progn
+                     ;; Use emacs built in archiving
+                     (find-file path)
+                     (goto-char (point-min))
+                     ;; Make sure the file path is followed by a newline to
+                     ;; prevent eg. clj matching cljs.
+                     (search-forward (concat entry "\n"))
+                     ;; moves up to matching line
+                     (forward-line -1)
+                     (archive-extract)
+                     (current-buffer))
+                 ;; Use external zip program to just extract the single file
+                 (with-current-buffer (generate-new-buffer
+                                       (file-name-nondirectory entry))
+                   (archive-zip-extract path entry)
+                   (set-visited-file-name name)
+                   (setq-local default-directory (file-name-directory path))
+                   (setq-local buffer-read-only t)
+                   (set-buffer-modified-p nil)
+                   (set-auto-mode)
+                   (current-buffer))))))
+        (t (-if-let (path (cider--file-path url))
+               (find-file-noselect path)
+             (unless (file-name-absolute-p url)
+               (let ((cider-buffers (cider-util--clojure-buffers))
+                     (url (file-name-nondirectory url)))
+                 (or (cl-loop for bf in cider-buffers
+                              for path = (with-current-buffer bf
+                                           (expand-file-name url))
+                              if (and path (file-exists-p path))
+                              return (find-file-noselect path))
+                     (cl-loop for bf in cider-buffers
+                              if (string= (buffer-name bf) url)
+                              return bf))))))))
+
+(defun cider-find-var-file (var)
+  "Return the buffer visiting the file in which VAR is defined, or nil if
+not found."
+  (cider-ensure-op-supported "info")
+  (-when-let* ((info (cider-var-info var))
+               (file (nrepl-dict-get info "file")))
+    (cider-find-file file)))
+
+(defun cider-jump-to (buffer &optional pos other-window)
+  "Push current point onto marker ring, and jump to BUFFER and POS.
+POS can be either a numeric position in BUFFER or a cons (LINE . COLUMN)
+where COLUMN can be nil. If OTHER-WINDOW is non-nil don't reuse current
+window."
+  (ring-insert find-tag-marker-ring (point-marker))
+  (if other-window
+      (pop-to-buffer buffer)
+    ;; like switch-to-buffer, but reuse existing window if BUFFER is visible
+    (pop-to-buffer buffer '((display-buffer-reuse-window display-buffer-same-window))))
+  (with-current-buffer buffer
+    (widen)
+    (goto-char (point-min))
+    (cider-mode +1)
+    (if (consp pos)
+        (progn
+          (forward-line (1- (or (car pos) 1)))
+          (if (cdr pos)
+              (move-to-column (cdr pos))
+            (back-to-indentation)))
+      (when pos
+        (goto-char pos)))))
+
+(defun cider-jump-to-resource (path)
+  "Jump to the resource at the resource-relative PATH.
+When called interactively, this operates on point."
+  (interactive (list (thing-at-point 'filename)))
+  (cider-ensure-op-supported "resource")
+  (-if-let* ((resource (cider-sync-request:resource path))
+             (buffer (cider-find-file resource)))
+      (cider-jump-to buffer)
+    (message "Cannot find resource %s" path)))
+
+(defun cider--jump-to-loc-from-info (info &optional other-window)
+  "Jump to location give by INFO.
+INFO object is returned by `cider-var-info' or `cider-member-info'.
+OTHER-WINDOW is passed to `cider-jamp-to'."
+  (let* ((line (nrepl-dict-get info "line"))
+         (file (nrepl-dict-get info "file"))
+         (buffer (and file
+                      (not (cider--tooling-file-p file))
+                      (cider-find-file file))))
+    (if buffer
+        (cider-jump-to buffer (cons line nil) other-window)
+      (message "No source location"))))
+
+(defun cider-jump-to-var (&optional var line)
+  "Jump to the definition of VAR, optionally at a specific LINE.
+When called interactively, this operates on point, or falls back to a prompt."
+  (interactive)
+  (cider-ensure-op-supported "info")
+  (cider-read-symbol-name
+   "Symbol: " (lambda (var)
+                (-if-let (info (cider-var-info var))
+                    (cider--jump-to-loc-from-info info)
+                  (message "Symbol %s not resolved" var)))))
+
+(define-obsolete-function-alias 'cider-jump 'cider-jump-to-var "0.7.0")
+(defalias 'cider-jump-back 'pop-tag-mark)
+
+(defvar cider-completion-last-context nil)
+
+(defun cider-completion-symbol-start-pos ()
+  "Find the starting position of the symbol at point, unless inside a string."
+  (let ((sap (symbol-at-point)))
+    (when (and sap (not (in-string-p)))
+      (car (bounds-of-thing-at-point 'symbol)))))
+
+(defun cider-completion-get-context-at-point ()
+  "Extract the context at point.
+If point is not inside the list, returns nil; otherwise return top-level
+form, with symbol at point replaced by __prefix__."
+  (when (save-excursion
+          (condition-case _
+              (progn
+                (up-list)
+                (check-parens)
+                t)
+            (scan-error nil)
+            (user-error nil)))
+    (save-excursion
+      (let* ((pref-end (point))
+             (pref-start (cider-completion-symbol-start-pos))
+             (context (cider-defun-at-point))
+             (_ (beginning-of-defun))
+             (expr-start (point)))
+        (concat (substring context 0 (- pref-start expr-start))
+                "__prefix__"
+                (substring context (- pref-end expr-start)))))))
+
+(defun cider-completion-get-context ()
+  "Extract context depending on `cider-completion-use-context' and major mode."
+  (let ((context (if (and cider-completion-use-context
+                          ;; Important because `beginning-of-defun' and
+                          ;; `ending-of-defun' work incorrectly in the REPL
+                          ;; buffer, so context extraction fails there.
+                          (derived-mode-p 'clojure-mode))
+                     (or (cider-completion-get-context-at-point)
+                         "nil")
+                   "nil")))
+    (if (string= cider-completion-last-context context)
+        ":same"
+      (setq cider-completion-last-context context)
+      context)))
+
+(defun cider-complete (str)
+  "Complete STR with context at point."
+  (cider-sync-request:complete str (cider-completion-get-context)))
+
+(defun cider-annotate-symbol (symbol)
+  "Append extra information to SYMBOL's name.
+
+Currently we annotate macros, special-forms and functions,
+as it's not obvious from their names alone which is which."
+  (if cider-annotate-completion-candidates
+      (-when-let (info (cider-var-info symbol))
+        (let ((macro   (nrepl-dict-get info "macro"))
+              (special (nrepl-dict-get info "special-form"))
+              (args    (nrepl-dict-get info "arglists-str")))
+          (cond
+           (macro " <m>")
+           (special " <s>")
+           (args " <f>"))))
+    ""))
+
+(defun cider-complete-at-point ()
+  "Complete the symbol at point."
+  (let ((sap (symbol-at-point)))
+    (when (and sap (not (in-string-p)) (cider-connected-p))
+      (let ((bounds (bounds-of-thing-at-point 'symbol)))
+        (list (car bounds) (cdr bounds)
+              (completion-table-dynamic #'cider-complete)
+              :annotation-function #'cider-annotate-symbol
+              :company-doc-buffer #'cider-create-doc-buffer
+              :company-location #'cider-company-location
+              :company-docsig #'cider-company-docsig)))))
+
+(defun cider-company-location (var)
+  "Open VAR's definition in a buffer.
+
+Returns the cons of the buffer itself and the location of VAR's definition
+in the buffer."
+  (-when-let* ((info (cider-var-info var))
+               (file (nrepl-dict-get info "file"))
+               (line (nrepl-dict-get info "line"))
+               (buffer (cider-find-file file)))
+    (with-current-buffer buffer
+      (save-excursion
+        (goto-char (point-min))
+        (forward-line (1- line))
+        (cons buffer (point))))))
+
+(defun cider-company-docsig (thing)
+  "Return signature for THING."
+  (let ((arglist (cider-eldoc-arglist thing)))
+    (when arglist
+      (format "%s: %s"
+              (cider-eldoc-format-thing thing)
+              (cider-eldoc-format-arglist arglist 0)))))
+
+(defun cider-javadoc-handler (symbol-name)
+  "Invoke the nREPL \"info\" op on SYMBOL-NAME if available."
+  (when symbol-name
+    (cider-ensure-op-supported "info")
+    (let* ((info (cider-var-info symbol-name))
+           (url (nrepl-dict-get info "javadoc")))
+      (if url
+          (browse-url url)
+        (error "No Javadoc available for %s" symbol-name)))))
+
+(defun cider-javadoc (query)
+  "Browse Javadoc on the Java symbol QUERY at point."
+  (interactive "P")
+  (cider-read-symbol-name "Javadoc for: " 'cider-javadoc-handler query))
+
+(defun cider-stdin-handler (&optional buffer)
+  "Make a stdin response handler for BUFFER."
+  (nrepl-make-response-handler (or buffer (current-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))
+                               nil))
+
+(defun cider-insert-eval-handler (&optional buffer)
+  "Make a nREPL evaluation handler for the BUFFER.
+The handler simply inserts the result value in BUFFER."
+  (let ((eval-buffer (current-buffer)))
+    (nrepl-make-response-handler (or buffer eval-buffer)
+                                 (lambda (_buffer value)
+                                   (with-current-buffer buffer
+                                     (insert value)))
+                                 (lambda (_buffer out)
+                                   (cider-repl-emit-interactive-output out))
+                                 (lambda (buffer err)
+                                   (cider-handle-compilation-errors err eval-buffer))
+                                 '())))
+
+(defun cider--emit-interactive-eval-output (output repl-emit-function)
+  "Emit output resulting from interactive code evaluation.
+
+The output can be send to either a dedicated output buffer or the current REPL buffer.
+This is controlled via `cider-interactive-eval-output-destination'."
+  (pcase cider-interactive-eval-output-destination
+    (`output-buffer (let ((output-buffer (or (get-buffer cider-output-buffer)
+                                             (cider-popup-buffer cider-output-buffer t))))
+                      (cider-emit-into-popup-buffer output-buffer output)
+                      (pop-to-buffer output-buffer)))
+    (`repl-buffer (funcall repl-emit-function output))
+    (t (error "Unsupported value %s for `cider-interactive-eval-output-destination'"
+              cider-interactive-eval-output-destination))))
+
+(defun cider-emit-interactive-eval-output (output)
+  "Emit output resulting from interactive code evaluation.
+
+The output can be send to either a dedicated output buffer or the current REPL buffer.
+This is controlled via `cider-interactive-eval-output-destination'."
+  (cider--emit-interactive-eval-output output 'cider-repl-emit-interactive-output))
+
+(defun cider-emit-interactive-eval-err-output (output)
+  "Emit err output resulting from interactive code evaluation.
+
+The output can be send to either a dedicated output buffer or the current REPL buffer.
+This is controlled via `cider-interactive-eval-output-destination'."
+  (cider--emit-interactive-eval-output output 'cider-repl-emit-interactive-err-output))
+
+(defun cider--display-interactive-eval-result (value)
+  "Display the result VALUE of an interactive eval operation."
+  (message "%s%s"
+           cider-interactive-eval-result-prefix
+           (cider-font-lock-as-clojure value)))
+
+(defun cider-interactive-eval-handler (&optional buffer)
+  "Make an interactive eval handler for BUFFER."
+  (let ((eval-buffer (current-buffer)))
+    (nrepl-make-response-handler (or buffer eval-buffer)
+                                 (lambda (_buffer value)
+                                   (cider--display-interactive-eval-result value))
+                                 (lambda (_buffer out)
+                                   (cider-emit-interactive-eval-output out))
+                                 (lambda (buffer err)
+                                   (cider-emit-interactive-eval-err-output err)
+                                   (cider-handle-compilation-errors err eval-buffer))
+                                 '())))
+
+(defun cider-load-file-handler (&optional buffer)
+  "Make a load file handler for BUFFER."
+  (let ((eval-buffer (current-buffer)))
+    (nrepl-make-response-handler (or buffer eval-buffer)
+                                 (lambda (buffer value)
+                                   (cider--display-interactive-eval-result value)
+                                   (with-current-buffer buffer
+                                     (run-hooks 'cider-file-loaded-hook)))
+                                 (lambda (_buffer value)
+                                   (cider-emit-interactive-eval-output value))
+                                 (lambda (buffer err)
+                                   (cider-emit-interactive-eval-err-output err)
+                                   (cider-handle-compilation-errors err eval-buffer))
+                                 '()
+                                 (lambda (buffer ex root-ex session)
+                                   (funcall nrepl-err-handler
+                                            buffer ex root-ex session)))))
+
+(defun cider-eval-print-handler (&optional buffer)
+  "Make a handler for evaluating and printing result in BUFFER."
+  (nrepl-make-response-handler (or buffer (current-buffer))
+                               (lambda (buffer value)
+                                 (with-current-buffer buffer
+                                   (insert
+                                    (if (derived-mode-p 'cider-clojure-interaction-mode)
+                                        (format "\n%s\n" value)
+                                      value))))
+                               (lambda (_buffer out)
+                                 (cider-emit-interactive-eval-output out))
+                               (lambda (_buffer err)
+                                 (cider-emit-interactive-eval-err-output err))
+                               '()))
+
+(defun cider-popup-eval-out-handler (&optional buffer)
+  "Make a handler for evaluating and printing stdout/stderr in popup BUFFER.
+
+This is used by pretty-printing commands and intentionally discards their results."
+  (nrepl-make-response-handler (or buffer (current-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)))
+    (if buffer
+        (cider-popup-buffer-display buffer cider-auto-select-error-buffer)
+      (error "No %s buffer" cider-error-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-eval-handler (buffer session)
+  "Display in BUFFER the last SESSION exception, without middleware support."
+  (cider-eval "(clojure.stacktrace/print-cause-trace *e)"
+              (lambda (response)
+                (nrepl-dbind-response response (out)
+                  (when out
+                    (with-current-buffer buffer
+                      (cider-emit-into-color-buffer buffer out)
+                      (compilation-minor-mode +1)))))
+              nil
+              session))
+
+(defun cider-default-err-op-handler (buffer session)
+  "Display in BUFFER the last SESSION exception, with middleware support."
+  (let (causes)
+    (nrepl-send-request
+     (append
+      (list "op" "stacktrace" "session" session)
+      (when cider-stacktrace-print-level
+        (list "print-level" cider-stacktrace-print-level)))
+     (lambda (response)
+       (nrepl-dbind-response response (class status)
+         (cond (class  (setq causes (cons response causes)))
+               (status (when causes
+                         (cider-stacktrace-render buffer (reverse causes))))))))))
+
+(defun cider--show-error-buffer-p (buffer)
+  "Return non-nil if stacktrace buffer must be shown on error.
+Takes into account the current BUFFER and the value of `cider-show-error-buffer'."
+  (let ((replp (with-current-buffer buffer (derived-mode-p 'cider-repl-mode))))
+    (memq cider-show-error-buffer
+          (if replp
+              '(t always only-in-repl)
+            '(t always except-in-repl)))))
+
+(defun cider-default-err-handler (buffer ex root-ex session)
+  "Make an error handler for BUFFER, EX, ROOT-EX and SESSION.
+This function determines how the error buffer is shown, and then delegates
+the actual error content to the eval or op handler."
+  (let* ((error-buffer (if (cider--show-error-buffer-p buffer)
+                           (cider-popup-buffer cider-error-buffer
+                                               cider-auto-select-error-buffer)
+                         (cider-make-popup-buffer cider-error-buffer))))
+    (if (nrepl-op-supported-p "stacktrace")
+        (cider-default-err-op-handler error-buffer session)
+      (cider-default-err-eval-handler error-buffer session))))
+
+(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--goto-expression-start ()
+  "Go to the beginning a list, vector, map or set outside of a string.
+
+We do so by starting and the current position and proceeding backwards
+until we find a delimiters that's not inside a string."
+  (if (and (looking-back "[])}]")
+           (null (nth 3 (syntax-ppss))))
+      (backward-sexp)
+    (while (or (not (looking-at "[({[]"))
+               (nth 3 (syntax-ppss)))
+      (backward-char))))
+
+(defun cider--find-last-error-location (message)
+  "Return the location (begin end buffer) from the Clojure error MESSAGE.
+If location could not be found, return nil."
+  (save-excursion
+    (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)))
+          (-when-let (buffer (cider-find-file file))
+            (with-current-buffer buffer
+              (save-excursion
+                (save-restriction
+                  (widen)
+                  (goto-char (point-min))
+                  (forward-line (1- line))
+                  (move-to-column (or col 0))
+                  (let ((begin (progn (if col (cider--goto-expression-start) (back-to-indentation))
+                                      (point)))
+                        (end (progn (if col (forward-list) (move-end-of-line nil))
+                                    (point))))
+                    (list begin end buffer)))))))))))
+
+(defun cider-handle-compilation-errors (message eval-buffer)
+  "Highlight and jump to compilation error extracted from MESSAGE.
+EVAL-BUFFER is the buffer that was current during user's interactive
+evaluation command. Honor `cider-auto-jump-to-error'."
+  (-when-let* ((loc (cider--find-last-error-location message))
+               (overlay (make-overlay (nth 0 loc) (nth 1 loc) (nth 2 loc)))
+               (info (cider-extract-error-info cider-compilation-regexp message)))
+    (let* ((face (nth 3 info))
+           (note (nth 4 info))
+           (auto-jump (if (eq cider-auto-jump-to-error 'errors-only)
+                          (not (eq face 'cider-warning-highlight-face))
+                        cider-auto-jump-to-error)))
+      (overlay-put overlay 'cider-note-p t)
+      (overlay-put overlay 'font-lock-face face)
+      (overlay-put overlay 'cider-note note)
+      (overlay-put overlay 'help-echo note)
+      (overlay-put overlay 'modification-hooks
+                   (list (lambda (o &rest _args) (delete-overlay o))))
+      (when auto-jump
+        (with-current-buffer eval-buffer
+          (push-mark)
+          ;; At this stage selected window commonly is *cider-error* and we need to
+          ;; re-select the original user window. If eval-buffer is not
+          ;; visible it was probably covered as a result of a small screen or user
+          ;; configuration (https://github.com/clojure-emacs/cider/issues/847). In
+          ;; that case we don't jump at all in order to avoid covering *cider-error*
+          ;; buffer.
+          (-when-let (win (get-buffer-window eval-buffer))
+            (with-selected-window win
+              (cider-jump-to (nth 2 loc) (car loc)))))))))
+
+(defun cider-need-input (buffer)
+  "Handle an need-input request from BUFFER."
+  (with-current-buffer buffer
+    (nrepl-request: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)))
+
+(defvar-local 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 mode)
+  "Create new popup buffer called NAME.
+If SELECT is non-nil, select the newly created window.
+If major MODE is non-nil, enable it for the popup buffer."
+  (-> (cider-make-popup-buffer name mode)
+    (cider-popup-buffer-display select)))
+
+(defun cider-popup-buffer-display (buffer &optional select)
+  "Display BUFFER.
+If SELECT is non-nil, select the BUFFER."
+  (-when-let (win (get-buffer-window buffer))
+    (with-current-buffer buffer
+      (set-window-point win (point))))
+  ;; Non nil `inhibit-same-window' ensures that current window is not covered
+  (if select
+      (pop-to-buffer buffer `(nil . ((inhibit-same-window . ,pop-up-windows))))
+    (display-buffer buffer `(nil . ((inhibit-same-window . ,pop-up-windows)))))
+  buffer)
+
+(defun cider-popup-buffer-quit (&optional kill)
+  "Quit the current (temp) window and bury its buffer using `quit-restore-window'.
+If prefix argument KILL is non-nil, kill the buffer instead of burying it."
+  (interactive)
+  (quit-restore-window (selected-window) (if kill 'kill 'append)))
+
+(defun cider-make-popup-buffer (name &optional mode)
+  "Create a temporary buffer called NAME using major MODE (if specified)."
+  (with-current-buffer (get-buffer-create name)
+    (kill-all-local-variables)
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (when mode
+      (funcall mode))
+    (setq-local cider-popup-output-marker (point-marker))
+    (cider-popup-buffer-mode 1)
+    (setq buffer-read-only t)
+    (current-buffer)))
+
+(defun cider-emit-into-popup-buffer (buffer value)
+  "Emit into BUFFER the provided VALUE."
+  ;; Long string output renders emacs unresponsive and users might intentionally
+  ;; kill the frozen popup buffer. Therefore, we don't re-create the buffer and
+  ;; silently ignore the output.
+  (when (buffer-live-p buffer)
+    (with-current-buffer buffer
+      (let ((inhibit-read-only t)
+            (buffer-undo-list t)
+            (moving (= (point) cider-popup-output-marker)))
+        (save-excursion
+          (goto-char cider-popup-output-marker)
+          (insert (format "%s" value))
+          (indent-sexp)
+          (set-marker cider-popup-output-marker (point)))
+        (when moving (goto-char cider-popup-output-marker))))))
+
+(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))))
+
+(defun cider-current-ns ()
+  "Return current ns.
+The ns is extracted from the ns form.  If missing, use current REPL's ns,
+otherwise fall back to \"user\"."
+  (if (derived-mode-p 'cider-repl-mode)
+      nrepl-buffer-ns
+    (or (clojure-find-ns)
+        (-when-let (repl-buf (cider-current-repl-buffer))
+          (buffer-local-value 'nrepl-buffer-ns (get-buffer repl-buf)))
+        nrepl-buffer-ns
+        "user")))
+
+
+;;; Evaluation
+
+(defun cider-interactive-source-tracking-eval (form &optional start-pos callback)
+  "Evaluate FORM and dispatch the response to CALLBACK.
+START-POS is a starting position of the form in the original context.
+Unlike `cider-interactive-eval' this command will set proper metadata for var
+definitions.  If CALLBACK
+is nil use `cider-interactive-eval-handler'."
+  (cider--clear-compilation-highlights)
+  (-when-let (error-win (get-buffer-window cider-error-buffer))
+    (quit-window nil error-win))
+  (let ((filename (or (buffer-file-name)
+                      (buffer-name))))
+    (cider-request:load-file
+     (cider--dummy-file-contents form start-pos)
+     (funcall cider-to-nrepl-filename-function (cider--server-filename filename))
+     (file-name-nondirectory filename)
+     (or callback (cider-interactive-eval-handler)))))
+
+(defun cider-interactive-eval (form &optional callback)
+  "Evaluate FORM and dispatch the response to CALLBACK.
+This function is the main entry point in CIDER's interactive evaluation
+API.  Most other interactive eval functions should rely on this function.
+If CALLBACK is nil use `cider-interactive-eval-handler'."
+  (cider--clear-compilation-highlights)
+  (-when-let (error-win (get-buffer-window cider-error-buffer))
+    (quit-window nil error-win))
+  (nrepl-request:eval
+   form
+   (or callback (cider-interactive-eval-handler))
+   (cider-current-ns)))
+
+(defun cider--dummy-file-contents (form start-pos)
+  "Wrap FORM to make it suitable for `cider-request:load-file'.
+START-POS is a starting position of the form in the original context."
+  (let* ((ns-form (if (cider-ns-form-p form)
+                      ""
+                    (or (-when-let (form (cider-ns-form))
+                          (replace-regexp-in-string ":reload\\(-all\\)?\\>" "" form))
+                        (format "(ns %s)" (cider-current-ns)))))
+         (ns-form-lines (length (split-string ns-form "\n")))
+         (start-pos (or start-pos 1))
+         (start-line (line-number-at-pos start-pos))
+         (start-column (save-excursion (goto-char start-pos) (current-column))))
+    (concat
+     ns-form
+     (make-string (max 0 (- start-line ns-form-lines)) ?\n)
+     (make-string start-column ? )
+     form)))
+
+(defun cider-eval-region (start end)
+  "Evaluate the region between START and END."
+  (interactive "r")
+  (let ((code (buffer-substring-no-properties start end)))
+    (cider-interactive-source-tracking-eval code start)))
+
+(defun cider-eval-buffer ()
+  "Evaluate the current buffer."
+  (interactive)
+  (cider-eval-region (point-min) (point-max)))
+
+(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")
+  (cider-interactive-eval (cider-last-sexp)
+                          (when prefix (cider-eval-print-handler))))
+
+(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))
+        (start-pos (cider-last-sexp-start-pos)))
+    ;; we have to be sure the evaluation won't result in an error
+    (nrepl-sync-request:eval last-sexp)
+    ;; seems like the sexp is valid, so we can safely kill it
+    (backward-kill-sexp)
+    (cider-interactive-eval last-sexp (cider-eval-print-handler))))
+
+(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 (cider-last-sexp)
+                          (cider-insert-eval-handler (cider-current-repl-buffer)))
+  (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 (cider-last-sexp)
+                          (cider-eval-print-handler)))
+
+(defun cider--pprint-eval-form (form)
+  "Pretty print FORM in popup buffer."
+  (let* ((result-buffer (cider-popup-buffer cider-result-buffer nil 'clojure-mode))
+         (right-margin (max fill-column
+                            (1- (window-width (get-buffer-window result-buffer))))))
+    (cider-interactive-eval (cider-format-pprint-eval form right-margin)
+                            (cider-popup-eval-out-handler result-buffer))))
+
+(defun cider-pprint-eval-last-sexp ()
+  "Evaluate the sexp preceding point and pprint its value in a popup buffer."
+  (interactive)
+  (cider--pprint-eval-form (cider-last-sexp)))
+
+(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")
+  (cider-interactive-source-tracking-eval
+   (cider-defun-at-point)
+   (cider-defun-at-point-start-pos)
+   (when prefix (cider-eval-print-handler))))
+
+(defun cider-pprint-eval-defun-at-point ()
+  "Evaluate the top-level form at point and pprint its value in a popup buffer."
+  (interactive)
+  (cider--pprint-eval-form (cider-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-read-and-eval ()
+  "Read a sexp from the minibuffer and output its result to the echo area."
+  (interactive)
+  (let* ((form (cider-read-from-minibuffer "CIDER Eval: "))
+         (ns-form (if (cider-ns-form-p form) "" (format "(ns %s)" (cider-current-ns)))))
+    (with-current-buffer (get-buffer-create cider-read-eval-buffer)
+      (erase-buffer)
+      (clojure-mode)
+      (unless (string= "" ns-form)
+        (insert ns-form "\n\n"))
+      (insert form)
+      (cider-interactive-eval form))))
+
+
+;; Connection and REPL
+
+(defun cider-insert-in-repl (form eval)
+  "Insert FORM in the REPL buffer and switch to it.
+If EVAL is non-nil the form will also be evaluated."
+  (let ((start-pos (point)))
+    (while (string-match "\\`[ \t\n\r]+\\|[ \t\n\r]+\\'" form)
+      (setq form (replace-match "" t t form)))
+    (with-current-buffer (cider-current-repl-buffer)
+      (insert form)
+      (indent-region start-pos (point))
+      (when eval
+        (cider-repl-return))))
+  (cider-switch-to-repl-buffer))
+
+(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")
+  (cider-insert-in-repl (cider-last-sexp) arg))
+
+(defun cider-insert-defun-in-repl (&optional arg)
+  "Insert the top-level form at point in the REPL buffer.
+If invoked with a prefix ARG eval the expression after inserting it."
+  (interactive "P")
+  (cider-insert-in-repl (cider-defun-at-point) arg))
+
+(defun cider-insert-ns-form-in-repl (&optional arg)
+  "Insert the current buffer's ns form in the REPL buffer.
+If invoked with a prefix ARG eval the expression after inserting it."
+  (interactive "P")
+  (cider-insert-in-repl (cider-ns-form) arg))
+
+(defun cider-ping ()
+  "Check that communication with the nREPL server works."
+  (interactive)
+  (message (read (nrepl-dict-get (nrepl-sync-request:eval "\"PONG\"") "value"))))
+
+(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."
+  (nrepl-current-connection-buffer 'no-error))
+
+(defun cider-ensure-connected ()
+  "Ensure there is a cider connection present, otherwise
+an error is signalled."
+  (unless (cider-connected-p)
+    (error "No active nREPL connection")))
+
+(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
+      (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)))
+
+(defun cider-fetch-vars-form (ns)
+  "Construct a Clojure form to read vars inside for 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-parent-ns (ns)
+  "Go up a level of NS.
+For example \"foo.bar.tar\" -> \"foo.bar\"."
+  (cider-string-join (butlast (split-string ns "\\.")) "."))
+
+
+;;; Completion
+
+(defun cider-completing-read-var-select (prompt callback ns selected targets)
+  "Peform completing read using SELECTED and TARGETS.
+If SELECTED is \"..\" then another selection is made for vars in the parent namespace of
+NS using PROMPT.
+If SELECTED is a namespace then another selection is made against that namespace
+using PROMPT.
+Once a selecton is made CALLBACK is called with SELECTED."
+  ;; TODO: immediate RET gives "" as selected for some reason
+  ;; this is an OK workaround though
+  (cond ((equal "" selected)
+         (cider-completing-read-var-select prompt callback ns (car targets) targets))
+        ((equal "/" (substring selected -1)) ; selected a namespace
+         (cider-completing-read-var prompt (substring selected 0 -1) callback))
+        ((equal ".." selected)
+         (cider-completing-read-var prompt (cider-parent-ns ns) callback))
+        ;; non ido variable selection techniques don't return qualified symbols, so this shouldn't either
+        (t (funcall callback selected))))
+
+(defun cider-completing-read-sym-handler (label completing-read-callback buffer)
+  "Create an nrepl response handler for BUFFER.
+The handler will parse the response from nrepl to create targets for a completing read.
+The result of the completing read will be passed to COMPLETING-READ-CALLBACK."
+  (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 (completing-read label targets nil t)))
+                                     (funcall completing-read-callback selected targets))))
+                               nil nil nil))
+
+(defun cider-completing-read-sym-form (label form callback)
+  "Eval the FORM and pass the result to the response handler."
+  (cider-tooling-eval form (cider-completing-read-sym-handler label callback (current-buffer))))
+
+(defun cider-completing-read-var (prompt ns callback)
+  "Perform completing read var in NS using CALLBACK."
+  (cider-completing-read-sym-form prompt (prin1-to-string (cider-fetch-vars-form ns))
+                                  (lambda (selected targets)
+                                    (cider-completing-read-var-select prompt callback ns selected targets))))
+
+(defun cider-fetch-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-load-fn-into-repl-buffer ()
+  "Browse functions available in current repl buffer.
+Once selected, the name of the fn will appear in the repl buffer in parens
+ready to call."
+  (interactive)
+  (let ((ns (cider-current-ns)))
+    (cider-completing-read-sym-form (format "Fn: %s/" ns)
+                                    (cider-fetch-fns-form ns)
+                                    (lambda (f _targets)
+                                      (with-current-buffer (cider-current-repl-buffer)
+                                        (cider-repl--replace-input (format "(%s)" f))
+                                        (goto-char (- (point-max) 1)))))))
+
+(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 completing 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)))
+    (if (not (or current-prefix-arg
+                 query
+                 (not symbol-name)
+                 (equal "" symbol-name)))
+        (funcall callback symbol-name)
+      (funcall callback (cider-read-from-minibuffer prompt)))))
+
+(defun cider-sync-request:toggle-trace-var (symbol)
+  "Toggle var tracing for SYMBOL."
+  (cider-ensure-op-supported "toggle-trace-var")
+  (-> (list "op" "toggle-trace-var"
+            "ns" (cider-current-ns)
+            "sym" symbol)
+    (nrepl-send-sync-request)))
+
+(defun cider-toggle-trace-var (query)
+  "Toggle var tracing.
+Defaults to the symbol at point.  With prefix arg QUERY or no symbol at
+point, prompts for a var."
+  (interactive "P")
+  (cider-ensure-op-supported "toggle-trace-var")
+  (cider-read-symbol-name
+   "Toggle trace for var: "
+   (lambda (sym)
+     (let* ((trace-response (cider-sync-request:toggle-trace-var sym))
+            (var-name (nrepl-dict-get trace-response "var-name"))
+            (var-status (nrepl-dict-get trace-response "var-status")))
+       (pcase var-status
+         ("not-found" (message "Var %s not found" sym))
+         ("not-traceable" (message "Var %s can't be traced because it's not bound to a function" var-name))
+         (t (message "Var %s %s" var-name var-status)))))
+   query))
+
+(defun cider-sync-request:toggle-trace-ns (ns)
+  "Toggle namespace tracing for NS."
+  (cider-ensure-op-supported "toggle-trace-ns")
+  (-> (list "op" "toggle-trace-ns"
+            "ns" ns)
+    (nrepl-send-sync-request)))
+
+(defun cider-toggle-trace-ns (query)
+  "Toggle ns tracing.
+Defaults to the current ns.  With prefix arg QUERY, prompts for a ns."
+  (interactive "P")
+  (cider-ensure-op-supported "toggle-trace-ns")
+  (let ((ns (if query
+                (completing-read "Toggle trace for ns: " (cider-sync-request:ns-list))
+              (cider-current-ns))))
+    (let* ((trace-response (cider-sync-request:toggle-trace-ns ns))
+           (ns-status (nrepl-dict-get trace-response "ns-status")))
+      (pcase ns-status
+        ("not-found" (message "ns %s not found" ns))
+        (t (message "ns %s %s" ns ns-status))))))
+
+(defun cider-create-doc-buffer (symbol)
+  "Populates *cider-doc* with the documentation for SYMBOL."
+  (-when-let (info (cider-var-info symbol))
+    (cider-docview-render (cider-make-popup-buffer cider-doc-buffer) symbol info)))
+
+(defun cider-doc-lookup (symbol)
+  "Look up documentation for SYMBOL."
+  (-if-let (buffer (cider-create-doc-buffer symbol))
+      (cider-popup-buffer-display buffer t)
+    (message "Symbol %s not resolved" symbol)))
+
+(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-lookup query))
+
+(defun cider-undef (symbol)
+  "Undefine the SYMBOL."
+  (interactive "P")
+  (cider-ensure-op-supported "undef")
+  (cider-read-symbol-name
+   "Undefine symbol: "
+   (lambda (sym)
+     (nrepl-send-request
+      (list "op" "undef"
+            "ns" (cider-current-ns)
+            "symbol" sym)
+      (cider-interactive-eval-handler (current-buffer))))
+   symbol))
+
+(defun cider-refresh ()
+  "Refresh loaded code."
+  (interactive)
+  (cider-tooling-eval
+   "(clojure.core/require 'clojure.tools.namespace.repl) (clojure.tools.namespace.repl/refresh)"
+   (cider-interactive-eval-handler (current-buffer))))
+
+(defun cider-file-string (file)
+  "Read the contents of a FILE and return as a string."
+  (with-current-buffer (find-file-noselect file)
+    (substring-no-properties (buffer-string))))
+
+(defvar cider-to-nrepl-filename-function
+  (if (eq system-type 'cygwin)
+      (lambda (filename)
+        (->> (expand-file-name filename)
+          (format "cygpath.exe --windows '%s'")
+          (shell-command-to-string)
+          (replace-regexp-in-string "\n" "")
+          (replace-regexp-in-string "\\\\" "/")))
+    #'identity)
+  "Function to translate Emacs filenames to nREPL namestrings.")
+
+(defun cider-load-file (filename)
+  "Load (eval) the Clojure file FILENAME in nREPL."
+  (interactive (list
+                (read-file-name "Load file: " nil nil nil
+                                (if (buffer-file-name)
+                                    (file-name-nondirectory
+                                     (buffer-file-name))))))
+  (cider--clear-compilation-highlights)
+  (-when-let (error-win (get-buffer-window cider-error-buffer))
+    (quit-window nil error-win))
+  (cider-request:load-file
+   (cider-file-string filename)
+   (funcall cider-to-nrepl-filename-function (cider--server-filename filename))
+   (file-name-nondirectory filename))
+  (message "Loading %s..." filename))
+
+(defun cider-load-buffer (&optional buffer)
+  "Load (eval) BUFFER's file in nREPL.
+If no buffer is provided the command acts on the current buffer."
+  (interactive)
+  (check-parens)
+  (setq buffer (or buffer (current-buffer)))
+  (with-current-buffer buffer
+    (unless buffer-file-name
+      (error "Buffer %s is not associated with a file" (buffer-name)))
+    (when (and cider-prompt-save-file-on-load
+               (buffer-modified-p)
+               (y-or-n-p (format "Save file %s? " buffer-file-name)))
+      (save-buffer))
+    (cider-load-file buffer-file-name)))
+
+(defalias 'cider-eval-file 'cider-load-file
+  "A convenience alias as some people are confused by the load-* names.")
+
+(defalias 'cider-eval-buffer 'cider-load-buffer
+  "A convenience alias as some people are confused by the load-* names.")
+
+;;; interrupt evaluation
+(defun cider-interrupt-handler (buffer)
+  "Create an interrupt response handler for BUFFER."
+  (nrepl-make-response-handler buffer nil nil nil nil))
+
+(defun cider-describe-nrepl-session ()
+  "Describe an nREPL session."
+  (interactive)
+  (let ((selected-session (completing-read "Describe nREPL session: " (nrepl-sessions))))
+    (when (and selected-session (not (equal selected-session "")))
+      (let* ((session-info (nrepl-sync-request:describe selected-session))
+             (ops (nrepl-dict-keys (nrepl-dict-get session-info "ops")))
+             (session-id (nrepl-dict-get session-info "session"))
+             (session-type (cond
+                            ((equal session-id (nrepl-current-session)) "Active eval")
+                            ((equal session-id (nrepl-current-tooling-session)) "Active tooling")
+                            (t "Unknown"))))
+        (with-current-buffer (cider-popup-buffer cider-nrepl-session-buffer)
+          (read-only-mode -1)
+          (insert (format "Session: %s" session-id))
+          (newline)
+          (insert (format "Type: %s session" session-type))
+          (newline)
+          (insert (format "Supported ops:"))
+          (newline)
+          (-each ops (lambda (op) (insert (format "  * %s" op)) (newline)))))
+      (display-buffer cider-nrepl-session-buffer))))
+
+(defun cider-close-nrepl-session ()
+  "Close an nREPL session for the current connection."
+  (interactive)
+  (let ((selected-session (completing-read "Close nREPL session: " (nrepl-sessions))))
+    (when selected-session
+      (nrepl-sync-request:close selected-session)
+      (message "Closed nREPL session %s" selected-session))))
+
+;;; 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-ancillary-buffers
+  (list cider-error-buffer
+        cider-doc-buffer
+        cider-test-report-buffer
+        cider-nrepl-session-buffer
+        nrepl-message-buffer-name))
+
+(defun cider-close-ancillary-buffers ()
+  "Close buffers that are shared across connections."
+  (interactive)
+  (dolist (buf-name cider-ancillary-buffers)
+    (cider--close-buffer buf-name)))
+
+(defun cider-quit (&optional arg)
+  "Quit CIDER.
+
+With a prefix ARG the command won't ask for confirmation.
+Quitting closes all active nREPL connections and kills all CIDER buffers."
+  (interactive "P")
+  (when (or arg (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-ancillary-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 "P")
+  (let ((project-dir (with-current-buffer (nrepl-current-connection-buffer) nrepl-project-dir)))
+    (cider-quit)
+    ;; Workaround for a nasty race condition https://github.com/clojure-emacs/cider/issues/439
+    ;; TODO: Find a better way to ensure `cider-quit' has finished
+    (message "Waiting for CIDER to quit...")
+    (sleep-for 2)
+    (if project-dir
+        (let ((default-directory project-dir))
+          (cider-jack-in prompt-project))
+      (error "Can't restart CIDER for unknown project"))))
+
+(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-0.8.2/cider-macroexpansion.el
similarity index 53%
rename from elpa/cider-20131221.1231/cider-macroexpansion.el
rename to elpa/cider-0.8.2/cider-macroexpansion.el
index 7620090da..db256e8b7 100644
--- a/elpa/cider-20131221.1231/cider-macroexpansion.el
+++ b/elpa/cider-0.8.2/cider-macroexpansion.el
@@ -1,7 +1,7 @@
-;;; cider-macroexpansion.el --- Macro expansion support
+;;; cider-macroexpansion.el --- Macro expansion support -*- lexical-binding: t -*-
 
-;; Copyright © 2012-2013 Tim King, Phil Hagelberg
-;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 Bozhidar Batsov, Hugo Duncan, Steve Purcell
 ;;
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Phil Hagelberg <technomancy@gmail.com>
@@ -34,7 +34,28 @@
 
 (defconst cider-macroexpansion-buffer "*cider-macroexpansion*")
 
-(push cider-macroexpansion-buffer cider-ancilliary-buffers)
+(push cider-macroexpansion-buffer cider-ancillary-buffers)
+
+(defcustom cider-macroexpansion-display-namespaces 'tidy
+  "Determines if namespaces are displayed in the macroexpansion buffer.
+Possible values are:
+
+  'qualified ;=> Vars are fully-qualified in the expansion
+  'none      ;=> Vars are displayed without namespace qualification
+  'tidy      ;=> Vars that are :refer-ed or defined in the current namespace are
+                 displayed with their simple name, non-refered vars from other
+                 namespaces are refered using the alias for that namespace (if
+                 defined), other vars are displayed fully qualified."
+  :type '(choice (const :tag "Suppress namespaces" none)
+                 (const :tag "Show fully-qualified namespaces" qualified)
+                 (const :tag "Show namespace aliases" tidy))
+  :group 'cider
+  :package-version '(cider . "0.7.0"))
+
+(define-obsolete-variable-alias
+  'cider-macroexpansion-suppress-namespaces
+  'cider-macroexpansion-display-namespaces
+  "0.8.0")
 
 (defun cider-macroexpand-undo (&optional arg)
   "Undo the last macroexpansion, using `undo-only'.
@@ -47,65 +68,52 @@ ARG is passed along to `undo-only'."
   "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 (expander expr)
+  "Macroexpand, use EXPANDER, the given EXPR."
+  (let* ((expansion (cider-sync-request:macroexpand expander expr)))
+    (setq cider-last-macroexpand-expression expr)
+    (cider-initialize-macroexpansion-buffer expansion (cider-current-ns))))
 
 (defun cider-macroexpand-expr-inplace (expander)
-  "Substitute the current form at point with its macroexpansion using EXPANDER."
+  "Substitute the form preceding 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)))))))
+  (let* ((expansion (cider-sync-request:macroexpand expander (cider-last-sexp)))
+         (bounds (cons (save-excursion (backward-sexp) (point)) (point))))
+    (cider-redraw-macroexpansion-buffer
+     expansion (current-buffer) (car bounds) (cdr bounds))))
 
 (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)))
+  (cider-initialize-macroexpansion-buffer cider-last-macroexpand-expression (cider-current-ns)))
 
 ;;;###autoload
 (defun cider-macroexpand-1 (&optional prefix)
-  "Invoke 'macroexpand-1' on the expression at point.
+  "Invoke 'macroexpand-1' on the expression preceding 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))))
+  (let ((expander (if prefix "macroexpand" "macroexpand-1")))
+    (cider-macroexpand-expr expander (cider-last-sexp))))
 
 (defun cider-macroexpand-1-inplace (&optional prefix)
-  "Perform inplace 'macroexpand-1' on the expression at point.
+  "Perform inplace 'macroexpand-1' on the expression preceding point.
 If invoked with a PREFIX argument, use 'macroexpand' instead of
 'macroexpand-1'."
   (interactive "P")
-  (let ((expander (if prefix 'macroexpand 'macroexpand-1)))
+  (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."
+  "Invoke 'clojure.walk/macroexpand-all' on the expression preceding point."
   (interactive)
-  (cider-macroexpand-expr
-   'clojure.walk/macroexpand-all (cider-sexp-at-point)))
+  (cider-macroexpand-expr "macroexpand-all" (cider-last-sexp)))
 
 (defun cider-macroexpand-all-inplace ()
-  "Perform inplace 'clojure.walk/macroexpand-all' on the expression at point."
+  "Perform inplace 'clojure.walk/macroexpand-all' on the expression preceding point."
   (interactive)
-  (cider-macroexpand-expr-inplace 'clojure.walk/macroexpand-all))
+  (cider-macroexpand-expr-inplace "macroexpand-all"))
 
 (defun cider-initialize-macroexpansion-buffer (expansion ns)
   "Create a new Macroexpansion buffer with EXPANSION and namespace NS."
@@ -116,13 +124,13 @@ If invoked with a PREFIX argument, use 'macroexpand' instead of
         (buffer-undo-list t))
     (erase-buffer)
     (insert (format "%s" expansion))
-    (goto-char (point-min))
+    (goto-char (point-max))
     (font-lock-fontify-buffer)))
 
-(defun cider-redraw-macroexpansion-buffer (expansion buffer start end current-point)
+(defun cider-redraw-macroexpansion-buffer (expansion buffer start end)
   "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."
+and point is placed after the expanded form."
   (with-current-buffer buffer
     (let ((buffer-read-only nil))
       (goto-char start)
@@ -130,20 +138,33 @@ and point is placed at CURRENT-POINT."
       (insert (format "%s" expansion))
       (goto-char start)
       (indent-sexp)
-      (goto-char current-point))))
+      (forward-sexp))))
 
 (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)
+    (cider-macroexpansion-mode 1)
     (current-buffer)))
 
-(defvar cider-macroexpansion-minor-mode-map
+(defvar cider-macroexpansion-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)
+    (define-key map (kbd "d") 'cider-doc)
+    (define-key map (kbd "j") 'cider-javadoc)
+    (define-key map (kbd ".") 'cider-jump-to-var)
+    (easy-menu-define cider-macroexpansion-mode-menu map
+      "Menu for CIDER's doc mode"
+      '("Macroexpansion"
+        ["Restart expansion" cider-macroexpand-again]
+        ["Macroexpand-1" cider-macroexpand-1-inplace]
+        ["Macroexpand-all" cider-macroexpand-all-inplace]
+        ["Go to source" cider-jump-to-var]
+        ["Go to doc" cider-doc]
+        ["Go to Javadoc" cider-docview-javadoc]
+        ["Quit" 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))))
@@ -153,13 +174,14 @@ and point is placed at CURRENT-POINT."
       (redefine-key 'undo 'cider-macroexpand-undo))
     map))
 
-(define-minor-mode cider-macroexpansion-minor-mode
-  "Minor mode for nrepl macroexpansion.
+(define-minor-mode cider-macroexpansion-mode
+  "Minor mode for CIDER macroexpansion.
 
-\\{cider-macroexpansion-minor-mode-map}"
+\\{cider-macroexpansion-mode-map}"
   nil
   " Macroexpand"
-  cider-macroexpansion-minor-mode-map)
+  cider-macroexpansion-mode-map)
 
 (provide 'cider-macroexpansion)
+
 ;;; cider-macroexpansion.el ends here
diff --git a/elpa/cider-0.8.2/cider-macroexpansion.elc b/elpa/cider-0.8.2/cider-macroexpansion.elc
new file mode 100644
index 000000000..aa5ed4a39
Binary files /dev/null and b/elpa/cider-0.8.2/cider-macroexpansion.elc differ
diff --git a/elpa/cider-0.8.2/cider-mode.el b/elpa/cider-0.8.2/cider-mode.el
new file mode 100644
index 000000000..aa9acc288
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-mode.el
@@ -0,0 +1,158 @@
+;;; cider-mode.el --- Minor mode for REPL interactions -*- lexical-binding: t -*-
+
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 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)
+
+;;;###autoload
+(defcustom cider-mode-line
+  '(:eval (format " cider[%s]" (cider-current-ns)))
+  "Mode line ligher for `cider-mode'.
+
+The value of this variable is a mode line template as in
+`mode-line-format'.  See Info Node `(elisp)Mode Line Format' for
+details about mode line templates.
+
+Customize this variable to change how `cider-mode' displays its
+status in the mode line.  The default value displays the current ns.
+Set this variable to nil to disable the mode line
+entirely."
+  :group 'cider
+  :type 'sexp
+  :risky t
+  :package-version '(cider "0.7.0"))
+
+(defvar cider-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-d") 'cider-doc-map)
+    (define-key map (kbd "M-.") 'cider-jump-to-var)
+    (define-key map (kbd "M-,") 'cider-jump-back)
+    (define-key map (kbd "C-c M-.") 'cider-jump-to-resource)
+    (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-f") 'cider-pprint-eval-defun-at-point)
+    (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-u") 'cider-undef)
+    (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 M-i") 'cider-inspect)
+    (define-key map (kbd "C-c M-t v") 'cider-toggle-trace-var)
+    (define-key map (kbd "C-c M-t n") 'cider-toggle-trace-ns)
+    (define-key map (kbd "C-c C-z") 'cider-switch-to-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-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 ,")   'cider-test-run-tests)
+    (define-key map (kbd "C-c C-,") 'cider-test-rerun-tests)
+    (define-key map (kbd "C-c M-,") 'cider-test-run-test)
+    (define-key map (kbd "C-c C-t") 'cider-test-show-report)
+    (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-x") 'cider-refresh)
+    (define-key map (kbd "C-c C-q") 'cider-quit)
+    (easy-menu-define cider-mode-menu map
+      "Menu for CIDER mode"
+      `("CIDER"
+        ["Complete symbol" complete-symbol]
+        "--"
+        ,cider-doc-menu
+        "--"
+        ["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" 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 (eval) buffer" cider-load-buffer]
+        ["Load (eval) file" cider-load-file]
+        "--"
+        ["Macroexpand-1" cider-macroexpand-1]
+        ["Macroexpand-all" cider-macroexpand-all]
+        "--"
+        ["Jump to source" cider-jump-to-var]
+        ["Jump to resource" cider-jump-to-resource]
+        ["Jump back" cider-jump-back]
+        "--"
+        ["Run test" cider-test-run-test]
+        ["Run all tests" cider-test-run-tests]
+        ["Rerun failed/erring tests" cider-test-rerun-tests]
+        ["Show test report" cider-test-show-report]
+        "--"
+        ["Inspect" cider-inspect]
+        "--"
+        ["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-repl-toggle-pretty-printing]
+        ["Clear REPL" cider-find-and-clear-repl-buffer]
+        ["Refresh loaded code" cider-refresh]
+        ["Interrupt evaluation" cider-interrupt]
+        ["Quit" cider-quit]
+        ["Restart" cider-restart]
+        "--"
+        ["Describe nREPL session" cider-describe-nrepl-session]
+        ["Close nREPL session" cider-close-nrepl-session]
+        ["Display nREPL connection" cider-display-current-connection-info]
+        ["Rotate nREPL connection" cider-rotate-connection]
+        "--"
+        ["Version info" cider-version]))
+    map))
+
+;;;###autoload
+(define-minor-mode cider-mode
+  "Minor mode for REPL interaction from a Clojure buffer.
+
+\\{cider-mode-map}"
+  nil
+  cider-mode-line
+  cider-mode-map
+  (make-local-variable 'completion-at-point-functions)
+  (add-to-list 'completion-at-point-functions
+               'cider-complete-at-point))
+
+(provide 'cider-mode)
+
+;;; cider-mode.el ends here
diff --git a/elpa/cider-0.8.2/cider-mode.elc b/elpa/cider-0.8.2/cider-mode.elc
new file mode 100644
index 000000000..2294c4874
Binary files /dev/null and b/elpa/cider-0.8.2/cider-mode.elc differ
diff --git a/elpa/cider-0.8.2/cider-pkg.el b/elpa/cider-0.8.2/cider-pkg.el
new file mode 100644
index 000000000..7045544a8
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-pkg.el
@@ -0,0 +1,13 @@
+(define-package "cider" "0.8.2" "Clojure Integrated Development Environment and REPL"
+  '((clojure-mode "3.0.0")
+    (cl-lib "0.5")
+    (dash "2.4.1")
+    (pkg-info "0.4")
+    (emacs "24")
+    (queue "0.1.1"))
+  :keywords
+  '("languages" "clojure" "cider")
+  :url "http://www.github.com/clojure-emacs/cider")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/elpa/cider-20131221.1231/cider-repl.el b/elpa/cider-0.8.2/cider-repl.el
similarity index 70%
rename from elpa/cider-20131221.1231/cider-repl.el
rename to elpa/cider-0.8.2/cider-repl.el
index d39c474d7..4d4a77f3d 100644
--- a/elpa/cider-20131221.1231/cider-repl.el
+++ b/elpa/cider-0.8.2/cider-repl.el
@@ -1,7 +1,7 @@
-;;; cider-repl.el --- REPL interactions
+;;; cider-repl.el --- REPL interactions -*- lexical-binding: t -*-
 
-;; Copyright © 2012-2013 Tim King, Phil Hagelberg
-;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 Bozhidar Batsov, Hugo Duncan, Steve Purcell
 ;;
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Phil Hagelberg <technomancy@gmail.com>
@@ -32,8 +32,9 @@
 
 (require 'cider-client)
 (require 'cider-interaction)
-(require 'cider-version)
+(require 'cider-doc)
 (require 'cider-eldoc) ; for cider-turn-on-eldoc-mode
+(require 'cider-util)
 
 (require 'clojure-mode)
 (require 'easymenu)
@@ -42,6 +43,7 @@
   (defvar paredit-version)
   (defvar paredit-space-for-delimiter-predicates))
 
+
 (defgroup cider-repl nil
   "Interaction with the REPL."
   :prefix "cider-repl-"
@@ -54,9 +56,15 @@
 
 (defface cider-repl-output-face
   '((t (:inherit font-lock-string-face)))
-  "Face for output in the REPL buffer."
+  "Face for STDOUT output in the REPL buffer."
   :group 'cider-repl)
 
+(defface cider-repl-err-output-face
+  '((t (:inherit font-lock-warning-face)))
+  "Face for STDERR output in the REPL buffer."
+  :group 'cider-repl
+  :package-version '(cider . "0.6.0"))
+
 (defface cider-repl-input-face
   '((t (:bold t)))
   "Face for previous input in the REPL buffer."
@@ -67,13 +75,6 @@
   "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.
 
@@ -93,14 +94,19 @@ 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-use-clojure-font-lock nil
+  "Non-nil means to use Clojure mode font-locking for input and result.
+Nil means that `cider-repl-input-face' and `cider-repl-result-face'
+will be used."
+  :type 'boolean
+  :group 'cider-repl
+  :package-version '(cider . "0.5.0"))
+
+(defcustom cider-repl-result-prefix ""
+  "The prefix displayed in the REPL before a result value."
+  :type 'string
+  :group 'cider
+  :package-version '(cider . "0.5.0"))
 
 (defcustom cider-repl-tab-command 'cider-repl-indent-and-complete-symbol
   "Select the command to be invoked by the TAB key.
@@ -110,55 +116,29 @@ you'd like to use the default Emacs behavior use
   :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-local cider-repl-input-start-mark nil)
 
-(defvar cider-repl-prompt-start-mark)
+(defvar-local cider-repl-prompt-start-mark nil)
 
-(defvar cider-repl-old-input-counter 0
+(defvar-local 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-local cider-repl-input-history '()
+  "History list of strings read from the REPL buffer.")
 
-(defvar cider-repl-input-history-items-added 0
+(defvar-local cider-repl-input-history-items-added 0
   "Variable counting the items added in the current session.")
 
-(defvar cider-repl-output-start nil
+(defvar-local cider-repl-output-start nil
   "Marker for the start of output.")
 
-(defvar cider-repl-output-end nil
+(defvar-local 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)
@@ -173,100 +153,87 @@ joined together.")
     (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-buffer-name (&optional project-dir host port)
+  "Generate a REPL buffer name based on current connection buffer.
+PROJECT-DIR, PORT and HOST are as in `nrepl-make-buffer-name'."
+  (with-current-buffer (or (nrepl-current-connection-buffer 'no-error)
+                           (current-buffer))
+    (nrepl-make-buffer-name nrepl-repl-buffer-name-template project-dir host port)))
+
+(defun cider-repl-create (&optional project-dir host port)
+  "Create a REPL buffer and install `cider-repl-mode'.
+PROJECT-DIR, PORT and HOST are as in `nrepl-make-buffer-name'."
+  ;; Connection might not have been set as yet. Please don't send requests here.
+  (let ((buf (nrepl-make-buffer-name nrepl-repl-buffer-name-template
+                                     project-dir host port)))
+    (with-current-buffer (get-buffer-create buf)
+      (unless (derived-mode-p 'cider-repl-mode)
+        (cider-repl-mode))
+      (cider-repl-reset-markers))
+    buf))
+
+(defun cider-repl-require-repl-utils ()
+  "Require standard REPL util functions into the current REPL."
+  (interactive)
+  (cider-eval
+   "(when (clojure.core/resolve 'clojure.main/repl-requires)
+      (clojure.core/map clojure.core/require clojure.main/repl-requires))"
+   (lambda (response) nil)))
+
+(defun cider-repl-set-initial-ns (buffer)
+  "Set the REPL BUFFER's initial namespace (by altering `nrepl-buffer-ns').
+This is \"user\" by default but can be overridden in apps like lein (:init-ns)."
+  ;; we don't want to get a timeout during init
+  (let ((nrepl-sync-request-timeout nil))
+    (with-current-buffer buffer
+      (let ((initial-ns (read (nrepl-dict-get (nrepl-sync-request:eval "(str *ns*)") "value"))))
+        (when initial-ns
+          (setq nrepl-buffer-ns initial-ns))))))
+
+(defun cider-repl-init (buffer &optional no-banner)
+  "Initialize the REPL in BUFFER.
+BUFFER must be a REPL buffer with `cider-repl-mode' and a running
+client process connection. Unless NO-BANNER is non-nil, insert a banner."
+  (cider-repl-set-initial-ns buffer)
+  (cider-repl-require-repl-utils)
+  (unless no-banner
+    (cider-repl--insert-banner-and-prompt buffer))
+  (when cider-repl-display-in-current-window
+    (add-to-list 'same-window-buffer-names buffer))
+  (when cider-repl-pop-to-buffer-on-connect
+    (pop-to-buffer buffer))
+  (cider-remember-clojure-buffer cider-current-clojure-buffer)
+  buffer)
 
 (defun cider-repl--banner ()
   "Generate the welcome REPL buffer banner."
-  (format "; CIDER %s (Clojure %s, nREPL %s)"
-          (cider-version)
+  (format "; CIDER %s (Java %s, Clojure %s, nREPL %s)"
+          (cider--version)
+          (cider--java-version)
           (cider--clojure-version)
-          (cider--backend-version)))
+          (cider--nrepl-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."
+(defun cider-repl--insert-banner-and-prompt (buffer)
+  "Insert REPL banner and REPL prompt in BUFFER."
   (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))))))))))
+    (when (zerop (buffer-size))
+      (insert (propertize (cider-repl--banner) 'font-lock-face 'font-lock-comment-face)))
+    (goto-char (point-max))
+    (cider-repl--mark-output-start)
+    (cider-repl--mark-input-start)
+    (cider-repl--insert-prompt nrepl-buffer-ns)))
 
+(defun cider-get-repl-buffer ()
+  "Return the REPL buffer for current connection."
+  (let ((buffer (get-buffer-create (cider-current-repl-buffer))))
+    (if (buffer-live-p buffer)
+        buffer
+      (error "No active REPL"))))
+
+
 ;;; 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."
@@ -296,7 +263,7 @@ point."
   "Find the next prompt.
 If BACKWARD is non-nil look backward."
   (let ((origin (point))
-        (prop 'cider-prompt))
+        (prop 'cider-repl-prompt))
     (while (progn
              (cider-search-property-change prop backward)
              (not (or (cider-end-of-proprange-p prop) (bobp) (eobp)))))
@@ -343,6 +310,39 @@ If BACKWARD is non-nil search backward."
          (goto-char cider-repl-input-start-mark))
         (t (beginning-of-line 1))))
 
+(defun cider-repl-mode-beginning-of-defun (&optional arg)
+  (if (and arg (< arg 0))
+      (cider-repl-mode-end-of-defun (- arg))
+    (dotimes (_ (or arg 1))
+      (cider-repl-previous-prompt))))
+
+(defun cider-repl-mode-end-of-defun (&optional arg)
+  (if (and arg (< arg 0))
+      (cider-repl-mode-beginning-of-defun (- arg))
+    (dotimes (_ (or arg 1))
+      (cider-repl-next-prompt))))
+
+(defun cider-repl-beginning-of-defun ()
+  "Move to beginning of defun."
+  (interactive)
+  ;; We call `beginning-of-defun' if we're at the start of a prompt
+  ;; already, to trigger `cider-repl-mode-beginning-of-defun' by means
+  ;; of the locally bound `beginning-of-defun-function', in order to
+  ;; jump to the start of the previous prompt.
+  (if (and (not (cider-repl--at-prompt-start-p))
+           (cider-repl--in-input-area-p))
+      (goto-char cider-repl-input-start-mark)
+    (beginning-of-defun)))
+
+(defun cider-repl-end-of-defun ()
+  "Move to end of defun."
+  (interactive)
+  ;; C.f. `cider-repl-beginning-of-defun.'
+  (if (and (not (= (point) (point-max)))
+           (cider-repl--in-input-area-p))
+      (goto-char (point-max))
+    (end-of-defun)))
+
 (defun cider-repl-bol ()
   "Go to the beginning of line or the prompt."
   (interactive)
@@ -390,15 +390,15 @@ Return the position of the prompt beginning."
       (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))
+            '(font-lock-face cider-repl-prompt-face read-only t intangible t
+                             cider-repl-prompt t
+                             rear-nonsticky (cider-repl-prompt read-only font-lock-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.
+(defun cider-repl-emit-output-at-pos (buffer string output-face position &optional bol)
+  "Using BUFFER, insert STRING (applying to it OUTPUT-FACE) at POSITION.
 If BOL is non-nil insert at the beginning of line."
   (with-current-buffer buffer
     (save-excursion
@@ -407,8 +407,8 @@ If BOL is non-nil insert at the beginning of line."
           (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))
+          (cider-propertize-region `(font-lock-face ,output-face
+                                                    rear-nonsticky (font-lock-face))
             (insert-before-markers string)
             (when (and (= (point) cider-repl-prompt-start-mark)
                        (not (bolp)))
@@ -416,21 +416,38 @@ If BOL is non-nil insert at the beginning of line."
               (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."
+(defun cider-repl--emit-interactive-output (string face)
+  "Emit STRING as interactive output using FACE."
   (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)
+    (let ((pos (1- (cider-repl--input-line-beginning-position)))
+          (string (replace-regexp-in-string "\n\\'" "" string)))
+      (cider-repl-emit-output-at-pos (current-buffer) string face pos t)
       (ansi-color-apply-on-region pos (point-max)))))
 
-(defun cider-repl-emit-output (buffer string &optional bol)
-  "Using BUFFER, emit STRING.
+(defun cider-repl-emit-interactive-output (string)
+  "Emit STRING as interactive output."
+  (cider-repl--emit-interactive-output string 'cider-repl-output-face))
+
+(defun cider-repl-emit-interactive-err-output (string)
+  "Emit STRING as interactive err output."
+  (cider-repl--emit-interactive-output string 'cider-repl-err-output-face))
+
+(defun cider-repl--emit-output (buffer string face &optional bol)
+  "Using BUFFER, emit STRING font-locked with FACE.
 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)
+      (cider-repl-emit-output-at-pos buffer string face cider-repl-input-start-mark bol)
       (ansi-color-apply-on-region pos (point-max)))))
 
+(defun cider-repl-emit-output (buffer string)
+  "Using BUFFER, emit STRING as standard output."
+  (cider-repl--emit-output buffer string 'cider-repl-output-face))
+
+(defun cider-repl-emit-err-output (buffer string)
+  "Using BUFFER, emit STRING as error output."
+  (cider-repl--emit-output buffer string 'cider-repl-err-output-face))
+
 (defun cider-repl-emit-prompt (buffer)
   "Emit the REPL prompt into BUFFER."
   (with-current-buffer buffer
@@ -448,10 +465,14 @@ If BOL is non-nil insert at the beginning of the line."
       (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)))))
+          (when (and bol (not (bolp)))
+            (insert-before-markers "\n"))
+          (insert-before-markers (propertize cider-repl-result-prefix 'font-lock-face 'font-lock-comment-face))
+          (if cider-repl-use-clojure-font-lock
+              (insert-before-markers (cider-font-lock-as-clojure string))
+            (cider-propertize-region
+                '(font-lock-face cider-repl-result-face rear-nonsticky (font-lock-face))
+              (insert-before-markers string))))))
     (cider-repl--show-maximum-output)))
 
 (defun cider-repl-newline-and-indent ()
@@ -495,9 +516,9 @@ the symbol."
                ;; 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))
+               (cl-loop do (skip-chars-forward " \t\r\n)")
+                        until (eobp)
+                        do (forward-sexp))
                t)))
           (t t))))
 
@@ -505,11 +526,12 @@ the symbol."
   "Make a nREPL evaluation handler for the REPL BUFFER."
   (nrepl-make-response-handler buffer
                                (lambda (buffer value)
-                                 (cider-repl-emit-result buffer value t))
+                                 (unless cider-repl-use-pretty-printing
+                                   (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))
+                                 (cider-repl-emit-err-output buffer err))
                                (lambda (buffer)
                                  (cider-repl-emit-prompt buffer))))
 
@@ -528,19 +550,28 @@ If NEWLINE is true then add a newline at the end of the input."
       (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)))
+                             ,(cl-incf cider-repl-old-input-counter))))
+    (if cider-repl-use-clojure-font-lock
+        (let ((input-string (buffer-substring cider-repl-input-start-mark end)))
+          (save-excursion
+            ;; TODO: Think of a more efficient way to do that
+            (cider-repl-kill-input)
+            ;; replace the current input with a Clojure font-locked version of itself
+            (insert (cider-font-lock-as-clojure input-string) "\n")))
+      (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 'font-lock-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)))
+         (form (if (and (not (string-match "\\`[ \t\r\n]*\\'" input))
+                        cider-repl-use-pretty-printing)
+                 (cider-format-pprint-eval input (1- (window-width)))
+                 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)))
+    (cider-eval form (cider-repl-handler (current-buffer)))))
 
 (defun cider-repl-return (&optional end-of-input)
   "Evaluate the current input string, or insert a newline.
@@ -607,23 +638,6 @@ text property `cider-old-input'."
   (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 ()
@@ -658,29 +672,25 @@ text property `cider-old-input'."
         (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))"))
+           (propertize ";;; output cleared" 'font-lock-face 'font-lock-comment-face)))))))
 
 (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)
+  (interactive (list (if (or (derived-mode-p 'cider-repl-mode)
+                             (null (cider-ns-form)))
                          (completing-read "Switch to namespace: "
-                                          (cider--all-ns))
+                                          (cider-sync-request:ns-list))
                        (cider-current-ns))))
   (if ns
       (with-current-buffer (cider-current-repl-buffer)
-        (cider-eval
-         (format "(in-ns '%s)" ns)
-         (cider-repl-handler (current-buffer))))
+        (setq nrepl-buffer-ns ns)
+        (cider-repl-emit-prompt (current-buffer)))
     (error "Cannot determine the current namespace")))
 
+
 ;;;;; History
 
 (defcustom cider-repl-wrap-history nil
@@ -688,8 +698,6 @@ namespace to switch to."
   :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.
@@ -706,7 +714,7 @@ 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)))
+    (cl-incf cider-repl-input-history-items-added)))
 
 (defun cider-repl-delete-current-input ()
   "Delete all text after the prompt."
@@ -728,10 +736,10 @@ Return -1 resp the length of the history if no item matches."
                  (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)))
+    (cl-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.
@@ -823,17 +831,13 @@ If USE-CURRENT-INPUT is non-nil, use the current input."
   "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)
+  :group 'cider-repl)
 
 (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)
+  :group 'cider-repl)
 
 (defun cider-repl--history-read-filename ()
   "Ask the user which file to use, defaulting `cider-repl-history-file'."
@@ -846,7 +850,8 @@ It does not yet set the input history."
   (if (file-readable-p filename)
       (with-temp-buffer
         (insert-file-contents filename)
-        (read (current-buffer)))
+        (when (> (buffer-size (current-buffer)) 0)
+            (read (current-buffer))))
     '()))
 
 (defun cider-repl-history-load (&optional filename)
@@ -905,6 +910,7 @@ constructs."
   (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."
@@ -923,6 +929,20 @@ constructs."
 (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)
+(cider-repl-add-shortcut "help" 'cider-repl-shortcuts-help)
+
+(defun cider-repl-shortcuts-help ()
+  "Display a help buffer."
+  (interactive)
+  (ignore-errors (kill-buffer "*CIDER REPL Shortcuts Help*"))
+  (with-current-buffer (get-buffer-create "*CIDER REPL Shortcuts Help*")
+    (insert "CIDER REPL shortcuts:\n\n")
+    (maphash (lambda (k v) (insert (format "%s:\n\t%s\n" k v))) cider-repl-shortcuts)
+    (goto-char (point-min))
+    (help-mode)
+    (display-buffer (current-buffer) t))
+  (cider-repl-handle-shortcut)
+  (current-buffer))
 
 (defun cider-repl--available-shortcuts ()
   "Return the available REPL shortcuts."
@@ -939,31 +959,8 @@ constructs."
          (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'.")
 
@@ -973,14 +970,14 @@ ENDP) DELIM."
 (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 "C-c C-d") 'cider-doc-map)
+    (define-key map (kbd "M-.") 'cider-jump-to-var)
     (define-key map (kbd "M-,") 'cider-jump-back)
+    (define-key map (kbd "C-c M-.") 'cider-jump-to-resource)
     (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)
@@ -999,22 +996,59 @@ ENDP) DELIM."
     (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 (kbd "C-c M-i") 'cider-inspect)
+    (define-key map (kbd "C-c M-t v") 'cider-toggle-trace-var)
+    (define-key map (kbd "C-c M-t n") 'cider-toggle-trace-ns)
+    (define-key map (kbd "C-c C-x") 'cider-refresh)
+    (define-key map (kbd "C-x C-e") 'cider-eval-last-sexp)
+    (define-key map (kbd "C-c C-r") 'cider-eval-region)
     (define-key map (string cider-repl-shortcut-dispatch-char) 'cider-repl-handle-shortcut)
+    (easy-menu-define cider-repl-mode-menu map
+      "Menu for CIDER's REPL mode"
+      `("REPL"
+        ["Complete symbol" complete-symbol]
+        "--"
+        ,cider-doc-menu
+        "--"
+        ["Jump to source" cider-jump-to-var]
+        ["Jump to resource" cider-jump-to-resource]
+        ["Jump back" cider-jump-back]
+        ["Switch to Clojure buffer" cider-switch-to-last-clojure-buffer]
+        "--"
+        ["Inspect" cider-inspect]
+        ["Macroexpand" cider-macroexpand-1]
+        ["Macroexpand all" cider-macroexpand-all]
+        ["Refresh loaded code" cider-refresh]
+        ["Toggle var tracing" cider-toggle-trace-var]
+        ["Toggle ns tracing" cider-toggle-trace-ns]
+        "--"
+        ["Set REPL ns" cider-repl-set-ns]
+        ["Toggle pretty printing" cider-repl-toggle-pretty-printing]
+        "--"
+        ["Next prompt" cider-repl-next-prompt]
+        ["Previous prompt" cider-repl-previous-prompt]
+        ["Clear output" cider-repl-clear-output]
+        ["Clear buffer" cider-repl-clear-buffer]
+        ["Kill input" cider-repl-kill-input]
+        ["Interrupt evaluation" cider-interrupt]
+        "--"
+        ["Quit" cider-quit]
+        ["Restart" cider-restart]
+        "--"
+        ["Version info" cider-version]))
     map))
 
 (define-derived-mode cider-repl-mode fundamental-mode "REPL"
   "Major mode for Clojure REPL interactions.
 
 \\{cider-repl-mode-map}"
+  (lisp-mode-variables nil)
   (setq-local lisp-indent-function 'clojure-indent-function)
   (setq-local indent-line-function 'lisp-indent-line)
   (make-local-variable 'completion-at-point-functions)
@@ -1022,43 +1056,21 @@ ENDP) DELIM."
                'cider-complete-at-point)
   (set-syntax-table cider-repl-mode-syntax-table)
   (cider-turn-on-eldoc-mode)
+  ;; At the REPL, we define beginning-of-defun and end-of-defun to be
+  ;; the start of the previous prompt or next prompt respectively.
+  ;; Notice the interplay with `cider-repl-beginning-of-defun'.
+  (setq-local beginning-of-defun-function 'cider-repl-mode-beginning-of-defun)
+  (setq-local end-of-defun-function 'cider-repl-mode-end-of-defun)
+  (setq-local prettify-symbols-alist clojure--prettify-symbols-alist)
   (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]))
+  (add-hook 'paredit-mode-hook 'clojure-paredit-setup))
 
 
 (provide 'cider-repl)
+
 ;;; cider-repl.el ends here
diff --git a/elpa/cider-0.8.2/cider-scratch.el b/elpa/cider-0.8.2/cider-scratch.el
new file mode 100644
index 000000000..a5dfff755
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-scratch.el
@@ -0,0 +1,71 @@
+;;; cider-scratch.el --- *scratch* buffer for Clojure -*- lexical-binding: t -*-
+
+;; Copyright © 2014 Bozhidar Batsov
+;;
+;; 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:
+
+;; Imitate Emacs's *scratch* buffer.
+
+;;; Code:
+
+(require 'cider-interaction)
+(require 'clojure-mode)
+
+(defvar cider-clojure-interaction-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map clojure-mode-map)
+    (define-key map (kbd "C-j") 'cider-eval-print-last-sexp)
+    map))
+
+(defconst cider-scratch-buffer-name "*cider-scratch*")
+
+;;;###autoload
+(defun cider-scratch ()
+  "Create a scratch buffer."
+  (interactive)
+  (pop-to-buffer (cider-find-or-create-scratch-buffer)))
+
+(defun cider-find-or-create-scratch-buffer ()
+  "Find or create the scratch buffer."
+  (or (get-buffer cider-scratch-buffer-name)
+      (cider-create-scratch-buffer)))
+
+(define-derived-mode cider-clojure-interaction-mode clojure-mode "Clojure Interaction"
+  "Major mode for typing and evaluating Clojure forms.
+Like Lisp mode except that \\[cider-eval-print-last-sexp] evals the Lisp expression
+before point, and prints its value into the buffer, advancing point.
+
+\\{cider-clojure-interaction-mode-map}")
+
+(defun cider-create-scratch-buffer ()
+  "Create a new scratch buffer."
+  (with-current-buffer (get-buffer-create cider-scratch-buffer-name)
+    (cider-clojure-interaction-mode)
+    (insert ";; This buffer is for Clojure experiments and evaluation.\n"
+            ";; Press C-j to evaluate the last expression.\n\n")
+    (current-buffer)))
+
+(provide 'cider-scratch)
+
+;;; cider-scratch.el ends here
diff --git a/elpa/cider-0.8.2/cider-scratch.elc b/elpa/cider-0.8.2/cider-scratch.elc
new file mode 100644
index 000000000..403a90040
Binary files /dev/null and b/elpa/cider-0.8.2/cider-scratch.elc differ
diff --git a/elpa/cider-20131221.1231/cider-selector.el b/elpa/cider-0.8.2/cider-selector.el
similarity index 84%
rename from elpa/cider-20131221.1231/cider-selector.el
rename to elpa/cider-0.8.2/cider-selector.el
index 0e02cdb61..070f1b4fb 100644
--- a/elpa/cider-20131221.1231/cider-selector.el
+++ b/elpa/cider-0.8.2/cider-selector.el
@@ -1,7 +1,7 @@
-;;; cider-selector.el --- Buffer selection command inspired by SLIME's selector
+;;; cider-selector.el --- Buffer selection command inspired by SLIME's selector -*- lexical-binding: t -*-
 
-;; Copyright © 2012-2013 Tim King, Phil Hagelberg
-;; Copyright © 2013 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 Bozhidar Batsov, Hugo Duncan, Steve Purcell
 ;;
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Phil Hagelberg <technomancy@gmail.com>
@@ -32,7 +32,7 @@
 
 (require 'cider-client)
 (require 'cider-interaction)
-(require 'cider-repl) ; for cider-find-or-create-repl-buffer
+(require 'cider-repl) ; for cider-get-repl-buffer
 
 (defconst cider-selector-help-buffer "*Selector Help*"
   "The name of the selector's help buffer.")
@@ -48,12 +48,12 @@ DESCRIPTION is a one-line description of what the key selects.")
 (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)))
+  (cl-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)
@@ -111,8 +111,8 @@ is chosen.  The returned buffer is selected with
   (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)))
+    (cl-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))
@@ -135,21 +135,26 @@ is chosen.  The returned buffer is selected with
 
 (def-cider-selector-method ?r
   "Current REPL buffer."
-  (cider-find-or-create-repl-buffer))
+  (cider-get-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 ?m
+  "*nrepl-messages* buffer."
+  nrepl-message-buffer-name)
+
+(def-cider-selector-method ?x
+  "*cider-error* buffer."
+  cider-error-buffer)
 
 (def-cider-selector-method ?s
  "Cycle to the next CIDER connection's REPL."
  (cider-rotate-connection)
- (cider-find-or-create-repl-buffer))
+ (cider-get-repl-buffer))
 
 (provide 'cider-selector)
+
 ;;; cider-selector.el ends here
diff --git a/elpa/cider-0.8.2/cider-selector.elc b/elpa/cider-0.8.2/cider-selector.elc
new file mode 100644
index 000000000..3cc68762e
Binary files /dev/null and b/elpa/cider-0.8.2/cider-selector.elc differ
diff --git a/elpa/cider-0.8.2/cider-stacktrace.el b/elpa/cider-0.8.2/cider-stacktrace.el
new file mode 100644
index 000000000..05fc64df1
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-stacktrace.el
@@ -0,0 +1,549 @@
+;;; cider-stacktrace.el --- Stacktrace navigator -*- lexical-binding: t -*-
+
+;; Copyright © 2014 Jeff Valk
+
+;; Author: Jeff Valk <jv@jeffvalk.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:
+
+;; Stacktrace filtering and stack frame source navigation
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'button)
+(require 'dash)
+(require 'easymenu)
+(require 'cider-util)
+(require 'cider-client)
+
+;; Variables
+
+(defgroup cider-stacktrace nil
+  "Stacktrace filtering and navigation."
+  :prefix "cider-stacktrace-"
+  :group 'cider)
+
+(defcustom cider-stacktrace-fill-column t
+  "Fill column for error messages in stacktrace display.
+If nil, messages will not be wrapped.  If truthy but non-numeric,
+`fill-column' will be used."
+  :type 'list
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.7.0"))
+
+(defcustom cider-stacktrace-default-filters '(tooling dup)
+  "Frame types to omit from initial stacktrace display."
+  :type 'list
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.6.0"))
+
+(defcustom cider-stacktrace-print-level 50
+  "Set the maximum level of nested data to print.
+Used when displaying stacktrace data (used for clojure's *print-level*)."
+  :type '(choice integer (const nil))
+  :group 'cider
+  :package-version '(cider . "0.8.0"))
+
+(defvar cider-stacktrace-detail-max 2
+  "The maximum detail level for causes.")
+
+(defvar-local cider-stacktrace-hidden-frame-count 0)
+(defvar-local cider-stacktrace-filters nil)
+(defvar-local cider-stacktrace-prior-filters nil)
+(defvar-local cider-stacktrace-cause-visibility nil)
+
+
+;; Faces
+
+(defface cider-stacktrace-error-class-face
+  '((t (:inherit font-lock-warning-face)))
+  "Face for exception class names"
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.6.0"))
+
+(defface cider-stacktrace-error-message-face
+  '((t (:inherit font-lock-doc-face)))
+  "Face for exception messages"
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.7.0"))
+
+(defface cider-stacktrace-filter-shown-face
+  '((t (:inherit button :underline t :weight normal)))
+  "Face for filter buttons representing frames currently visible"
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.6.0"))
+
+(defface cider-stacktrace-filter-hidden-face
+  '((t (:inherit button :underline nil :weight normal)))
+  "Face for filter buttons representing frames currently filtered out"
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.6.0"))
+
+(defface cider-stacktrace-face
+  '((t (:inherit default)))
+  "Face for stack frame text"
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.6.0"))
+
+(defface cider-stacktrace-ns-face
+  '((t (:inherit font-lock-comment-face)))
+  "Face for stack frame namespace name"
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.6.0"))
+
+(defface cider-stacktrace-fn-face
+  '((t (:inherit default :weight bold)))
+  "Face for stack frame function name"
+  :group 'cider-stacktrace
+  :package-version '(cider . "0.6.0"))
+
+
+;; Colors & Theme Support
+
+(defvar cider-stacktrace-frames-background-color
+  (cider-scale-background-color)
+  "Background color for stacktrace frames.")
+
+(defadvice enable-theme (after cider-stacktrace-adapt-to-theme activate)
+  "When theme is changed, update `cider-stacktrace-frames-background-color'."
+  (setq cider-stacktrace-frames-background-color (cider-scale-background-color)))
+
+
+;; Mode & key bindings
+
+(defvar cider-stacktrace-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "M-p") 'cider-stacktrace-previous-cause)
+    (define-key map (kbd "M-n") 'cider-stacktrace-next-cause)
+    (define-key map (kbd "M-.") 'cider-stacktrace-jump)
+    (define-key map "q" 'cider-popup-buffer-quit-function)
+    (define-key map "j" 'cider-stacktrace-toggle-java)
+    (define-key map "c" 'cider-stacktrace-toggle-clj)
+    (define-key map "r" 'cider-stacktrace-toggle-repl)
+    (define-key map "t" 'cider-stacktrace-toggle-tooling)
+    (define-key map "d" 'cider-stacktrace-toggle-duplicates)
+    (define-key map "a" 'cider-stacktrace-toggle-all)
+    (define-key map "1" 'cider-stacktrace-cycle-cause-1)
+    (define-key map "2" 'cider-stacktrace-cycle-cause-2)
+    (define-key map "3" 'cider-stacktrace-cycle-cause-3)
+    (define-key map "4" 'cider-stacktrace-cycle-cause-4)
+    (define-key map "5" 'cider-stacktrace-cycle-cause-5)
+    (define-key map "0" 'cider-stacktrace-cycle-all-causes)
+    (define-key map [tab] 'cider-stacktrace-cycle-current-cause)
+    (define-key map [backtab] 'cider-stacktrace-cycle-all-causes)
+    (easy-menu-define cider-stacktrace-mode-menu map
+      "Menu for CIDER's stacktrace mode"
+      '("Stacktrace"
+        ["Previous cause" cider-stacktrace-previous-cause]
+        ["Next cause" cider-stacktrace-next-cause]
+        "--"
+        ["Jump to frame source" cider-stacktrace-jump]
+        "--"
+        ["Cycle current cause detail" cider-stacktrace-cycle-current-cause]
+        ["Cycle cause #1 detail" cider-stacktrace-cycle-cause-1]
+        ["Cycle cause #2 detail" cider-stacktrace-cycle-cause-2]
+        ["Cycle cause #3 detail" cider-stacktrace-cycle-cause-3]
+        ["Cycle cause #4 detail" cider-stacktrace-cycle-cause-4]
+        ["Cycle cause #5 detail" cider-stacktrace-cycle-cause-5]
+        ["Cycle all cause detail" cider-stacktrace-cycle-all-causes]
+        "--"
+        ["Show/hide Java frames" cider-stacktrace-toggle-java]
+        ["Show/hide Clojure frames" cider-stacktrace-toggle-clj]
+        ["Show/hide REPL frames" cider-stacktrace-toggle-repl]
+        ["Show/hide tooling frames" cider-stacktrace-toggle-tooling]
+        ["Show/hide duplicate frames" cider-stacktrace-toggle-duplicates]
+        ["Show/hide all frames" cider-stacktrace-toggle-all]))
+    map))
+
+(define-derived-mode cider-stacktrace-mode special-mode "Stacktrace"
+  "Major mode for filtering and navigating CIDER stacktraces.
+
+\\{cider-stacktrace-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil)
+  (setq-local cider-stacktrace-prior-filters nil)
+  (setq-local cider-stacktrace-hidden-frame-count 0)
+  (setq-local cider-stacktrace-filters cider-stacktrace-default-filters)
+  (setq-local cider-stacktrace-cause-visibility (apply 'vector (-repeat 10 0))))
+
+
+;; Stacktrace filtering
+
+(defun cider-stacktrace-indicate-filters (filters)
+  "Update enabled state of filter buttons.
+
+Find buttons with a 'filter property; if filter is a member of FILTERS, or
+if filter is nil ('show all') and the argument list is non-nil, fontify the
+button as disabled.  Upon finding text with a 'hidden-count property, stop
+searching and update the hidden count text."
+  (with-current-buffer (get-buffer cider-error-buffer)
+    (save-excursion
+      (goto-char (point-min))
+      (let ((inhibit-read-only t)
+            (get-face (lambda (hide)
+                        (if hide
+                            'cider-stacktrace-filter-hidden-face
+                          'cider-stacktrace-filter-shown-face))))
+        ;; Toggle buttons
+        (while (not (or (get-text-property (point) 'hidden-count) (eobp)))
+          (let ((button (button-at (point))))
+            (when button
+              (let* ((filter (button-get button 'filter))
+                     (face (funcall get-face (if filter
+                                                 (member filter filters)
+                                               filters))))
+                (button-put button 'font-lock-face face)))
+            (goto-char (or (next-property-change (point))
+                           (point-max)))))
+        ;; Update hidden count
+        (when (and (get-text-property (point) 'hidden-count)
+                   (re-search-forward "[0-9]+" (line-end-position) t))
+          (replace-match
+           (number-to-string cider-stacktrace-hidden-frame-count)))))))
+
+(defun cider-stacktrace-apply-filters (filters)
+  "Set visibility on stack frames using FILTERS.
+Update `cider-stacktrace-hidden-frame-count' and indicate filters applied.
+Currently collapsed stacktraces are ignored, and do not contribute to the
+hidden count."
+  (with-current-buffer (get-buffer cider-error-buffer)
+    (save-excursion
+      (goto-char (point-min))
+      (let ((inhibit-read-only t)
+            (hidden 0))
+        (while (not (eobp))
+          (unless (get-text-property (point) 'collapsed)
+            (let* ((flags (get-text-property (point) 'flags))
+                   (hide (if (-intersection filters flags) t nil)))
+              (when hide (setq hidden (+ 1 hidden)))
+              (put-text-property (point) (line-beginning-position 2) 'invisible hide)))
+          (forward-line 1))
+        (setq cider-stacktrace-hidden-frame-count hidden)))
+    (cider-stacktrace-indicate-filters filters)))
+
+(defun cider-stacktrace-apply-cause-visibility ()
+  "Apply `cider-stacktrace-cause-visibility' to causes and reapply filters."
+  (with-current-buffer (get-buffer cider-error-buffer)
+    (save-excursion
+      (goto-char (point-min))
+      (cl-flet ((next-detail (end)
+                             (-when-let (pos (next-single-property-change (point) 'detail))
+                               (when (< pos end)
+                                 (goto-char pos)))))
+        (let ((inhibit-read-only t))
+          ;; For each cause...
+          (while (cider-stacktrace-next-cause)
+            (let* ((num   (get-text-property (point) 'cause))
+                   (level (elt cider-stacktrace-cause-visibility num))
+                   (cause-end (cadr (cider-property-bounds 'cause))))
+              ;; For each detail level within the cause, set visibility.
+              (while (next-detail cause-end)
+                (let* ((detail (get-text-property (point) 'detail))
+                       (detail-end (cadr (cider-property-bounds 'detail)))
+                       (hide (if (> detail level) t nil)))
+                  (add-text-properties (point) detail-end
+                                       (list 'invisible hide
+                                             'collapsed hide))))))))
+      (cider-stacktrace-apply-filters
+       cider-stacktrace-filters))))
+
+
+;; Interactive functions
+
+(defun cider-stacktrace-previous-cause ()
+  "Move point to the previous exception cause, if one exists."
+  (interactive)
+  (with-current-buffer (get-buffer cider-error-buffer)
+    (-when-let (pos (previous-single-property-change (point) 'cause))
+      (goto-char pos))))
+
+(defun cider-stacktrace-next-cause ()
+  "Move point to the next exception cause, if one exists."
+  (interactive)
+  (with-current-buffer (get-buffer cider-error-buffer)
+    (-when-let (pos (next-single-property-change (point) 'cause))
+      (goto-char pos))))
+
+
+(defun cider-stacktrace-cycle-cause (num &optional level)
+  "Update element NUM of `cider-stacktrace-cause-visibility', optionally to LEVEL.
+If LEVEL is not specified, its current value is incremented. When it reaches 3,
+it wraps to 0."
+  (let ((level (or level (1+ (elt cider-stacktrace-cause-visibility num)))))
+    (aset cider-stacktrace-cause-visibility num (mod level 3))
+    (cider-stacktrace-apply-cause-visibility)))
+
+(defun cider-stacktrace-cycle-all-causes ()
+  "Cycle the visibility of all exception causes."
+  (interactive)
+  (with-current-buffer (get-buffer cider-error-buffer)
+    (save-excursion
+      ;; Find nearest cause.
+      (unless (get-text-property (point) 'cause)
+        (cider-stacktrace-next-cause)
+        (unless (get-text-property (point) 'cause)
+          (cider-stacktrace-previous-cause)))
+      ;; Cycle its level, and apply that to all causes.
+      (let* ((num (get-text-property (point) 'cause))
+             (level (1+ (elt cider-stacktrace-cause-visibility num))))
+        (setq-local cider-stacktrace-cause-visibility
+                    (apply 'vector (-repeat 10 (mod level 3))))
+        (cider-stacktrace-apply-cause-visibility)))))
+
+(defun cider-stacktrace-cycle-current-cause ()
+  "Cycle the visibility of current exception at point, if any."
+  (interactive)
+  (with-current-buffer (get-buffer cider-error-buffer)
+    (-when-let (num (get-text-property (point) 'cause))
+      (cider-stacktrace-cycle-cause num))))
+
+(defun cider-stacktrace-cycle-cause-1 ()
+  "Cycle the visibility of exception cause #1."
+  (interactive)
+  (cider-stacktrace-cycle-cause 1))
+
+(defun cider-stacktrace-cycle-cause-2 ()
+  "Cycle the visibility of exception cause #2."
+  (interactive)
+  (cider-stacktrace-cycle-cause 2))
+
+(defun cider-stacktrace-cycle-cause-3 ()
+  "Cycle the visibility of exception cause #3."
+  (interactive)
+  (cider-stacktrace-cycle-cause 3))
+
+(defun cider-stacktrace-cycle-cause-4 ()
+  "Cycle the visibility of exception cause #4."
+  (interactive)
+  (cider-stacktrace-cycle-cause 4))
+
+(defun cider-stacktrace-cycle-cause-5 ()
+  "Cycle the visibility of exception cause #5."
+  (interactive)
+  (cider-stacktrace-cycle-cause 5))
+
+
+(defun cider-stacktrace-toggle-all ()
+  "Reset `cider-stacktrace-filters' if present; otherwise restore prior filters."
+  (interactive)
+  (when cider-stacktrace-filters
+    (setq-local cider-stacktrace-prior-filters
+                cider-stacktrace-filters))
+  (cider-stacktrace-apply-filters
+   (setq cider-stacktrace-filters
+         (unless cider-stacktrace-filters      ; when current filters are nil,
+           cider-stacktrace-prior-filters))))  ;  reenable prior filter set
+
+(defun cider-stacktrace-toggle (flag)
+  "Update `cider-stacktrace-filters' to add or remove FLAG, and apply filters."
+  (cider-stacktrace-apply-filters
+   (setq cider-stacktrace-filters
+         (if (memq flag cider-stacktrace-filters)
+             (remq flag cider-stacktrace-filters)
+           (cons flag cider-stacktrace-filters)))))
+
+(defun cider-stacktrace-toggle-java ()
+  "Toggle display of Java stack frames."
+  (interactive)
+  (cider-stacktrace-toggle 'java))
+
+(defun cider-stacktrace-toggle-clj ()
+  "Toggle display of Clojure stack frames."
+  (interactive)
+  (cider-stacktrace-toggle 'clj))
+
+(defun cider-stacktrace-toggle-repl ()
+  "Toggle display of REPL stack frames."
+  (interactive)
+  (cider-stacktrace-toggle 'repl))
+
+(defun cider-stacktrace-toggle-tooling ()
+  "Toggle display of Tooling stack frames (compiler, nREPL middleware, etc)."
+  (interactive)
+  (cider-stacktrace-toggle 'tooling))
+
+(defun cider-stacktrace-toggle-duplicates ()
+  "Toggle display of stack frames that are duplicates of their descendents."
+  (interactive)
+  (cider-stacktrace-toggle 'dup))
+
+
+;; Text button functions
+
+(defun cider-stacktrace-filter (button)
+  "Apply filter(s) indicated by the BUTTON."
+  (with-temp-message "Filters may also be toggled with the keyboard."
+    (let ((flag (button-get button 'filter)))
+      (if flag
+          (cider-stacktrace-toggle flag)
+        (cider-stacktrace-toggle-all)))
+    (sit-for 5)))
+
+(defun cider-stacktrace-navigate (button)
+  "Navigate to the stack frame source represented by the BUTTON."
+  (let* ((var (button-get button 'var))
+         (class (button-get button 'class))
+         (method (button-get button 'method))
+         (info (or (and var (cider-var-info var))
+                   (and class method (cider-member-info class method))
+                   `(dict "file" ,(button-get button 'file))))
+         ;; stacktrace returns more accurate line numbers
+         (info (nrepl-dict-put info "line" (button-get button 'line))))
+    (cider--jump-to-loc-from-info info t)))
+
+(defun cider-stacktrace-jump ()
+  "Like `cider-jump-to-var', but uses the stack frame source at point, if available."
+  (interactive)
+  (let ((button (button-at (point))))
+    (if (and button (button-get button 'line))
+        (cider-stacktrace-navigate button)
+      (call-interactively 'cider-jump-to-var))))
+
+
+;; Rendering
+
+(defun cider-stacktrace-emit-indented (text indent &optional fill)
+  "Insert TEXT, and INDENT and optionally FILL the entire block."
+  (let ((beg (point)))
+    (insert text)
+    (goto-char beg)
+    (while (not (eobp))
+      (insert indent)
+      (forward-line))
+    (when (and fill cider-stacktrace-fill-column)
+      (when (and (numberp cider-stacktrace-fill-column))
+        (setq-local fill-column cider-stacktrace-fill-column))
+      (setq-local fill-prefix indent)
+      (fill-region beg (point)))))
+
+(defun cider-stacktrace-render-filters (buffer filters)
+  "Emit into BUFFER toggle buttons for each of the FILTERS."
+  (with-current-buffer buffer
+    (insert "  Show: ")
+    (dolist (filter filters)
+      (insert-text-button (first filter)
+                          'filter (second filter)
+                          'follow-link t
+                          'action 'cider-stacktrace-filter
+                          'help-echo (format "Toggle %s stack frames"
+                                             (first filter)))
+      (insert " "))
+    (let ((hidden "(0 frames hidden)"))
+      (put-text-property 0 (length hidden) 'hidden-count t hidden)
+      (insert " " hidden))
+    (newline)))
+
+(defun cider-stacktrace-render-frame (buffer frame)
+  "Emit into BUFFER function call site info for the stack FRAME.
+This associates text properties to enable filtering and source navigation."
+  (with-current-buffer buffer
+    (nrepl-dbind-response frame (file line flags class method name var ns fn)
+      (let ((flags (mapcar 'intern flags))) ; strings -> symbols
+        (insert-text-button (format "%30s:%5d  %s/%s"
+                                    (if (member 'repl flags) "REPL" file) line
+                                    (if (member 'clj flags) ns class)
+                                    (if (member 'clj flags) fn method))
+                            'var var 'class class 'method method
+                            'name name 'file file 'line line
+                            'flags flags 'follow-link t
+                            'action 'cider-stacktrace-navigate
+                            'help-echo "View source at this location"
+                            'font-lock-face 'cider-stacktrace-face)
+        (save-excursion
+          (let ((p4 (point))
+                (p1 (search-backward " "))
+                (p2 (search-forward "/"))
+                (p3 (search-forward-regexp "[^/$]+")))
+            (put-text-property p1 p4 'font-lock-face 'cider-stacktrace-ns-face)
+            (put-text-property p2 p3 'font-lock-face 'cider-stacktrace-fn-face)))
+        (newline)))))
+
+(defun cider-stacktrace-render-cause (buffer cause num note)
+  "Emit into BUFFER the CAUSE NUM, exception class, message, data, and NOTE."
+  (with-current-buffer buffer
+    (nrepl-dbind-response cause (class message data stacktrace)
+      (let ((indent "   ")
+            (class-face 'cider-stacktrace-error-class-face)
+            (message-face 'cider-stacktrace-error-message-face))
+        (cider-propertize-region `(cause ,num)
+          ;; Detail level 0: exception class
+          (cider-propertize-region '(detail 0)
+            (insert (format "%d. " num)
+                    (propertize note 'font-lock-face 'font-lock-comment-face) " "
+                    (propertize class 'font-lock-face class-face))
+            (newline))
+          ;; Detail level 1: message + ex-data
+          (cider-propertize-region '(detail 1)
+            (cider-stacktrace-emit-indented
+             (propertize (or message "(No message)") 'font-lock-face message-face) indent t)
+            (newline)
+            (when data
+              (cider-stacktrace-emit-indented
+               (cider-font-lock-as-clojure data) indent nil)))
+          ;; Detail level 2: stacktrace
+          (cider-propertize-region '(detail 2)
+            (newline)
+            (let ((beg (point))
+                  (bg `(:background ,cider-stacktrace-frames-background-color)))
+              (dolist (frame stacktrace)
+                (cider-stacktrace-render-frame buffer frame))
+              (overlay-put (make-overlay beg (point)) 'font-lock-face bg)))
+          ;; Add line break between causes, even when collapsed.
+          (cider-propertize-region '(detail 0)
+            (newline)))))))
+
+(defun cider-stacktrace-initialize (causes)
+  "Set and apply CAUSES initial visibility, filters, and cursor position."
+  ;; Partially display outermost cause if it's a compiler exception (the
+  ;; description reports reader location of the error).
+  (nrepl-dbind-response (first causes) (class)
+    (when (equal class "clojure.lang.Compiler$CompilerException")
+      (cider-stacktrace-cycle-cause (length causes) 1)))
+  ;; Fully display innermost cause. This also applies visibility/filters.
+  (cider-stacktrace-cycle-cause 1 cider-stacktrace-detail-max)
+  ;; Move point to first stacktrace frame in displayed cause.
+  (goto-char (point-min))
+  (while (cider-stacktrace-next-cause))
+  (goto-char (next-single-property-change (point) 'flags)))
+
+(defun cider-stacktrace-render (buffer causes)
+  "Emit into BUFFER useful stacktrace information for the CAUSES."
+  (with-current-buffer buffer
+    (cider-stacktrace-mode)
+    (let ((inhibit-read-only t))
+      (newline)
+      ;; Stacktrace filters
+      (cider-stacktrace-render-filters
+       buffer
+       `(("Clojure" clj) ("Java" java) ("REPL" repl)
+         ("Tooling" tooling) ("Duplicates" dup) ("All" ,nil)))
+      (newline)
+      ;; Stacktrace exceptions & frames
+      (let ((num (length causes)))
+        (dolist (cause causes)
+          (let ((note (if (= num (length causes)) "Unhandled" "Caused by")))
+            (cider-stacktrace-render-cause buffer cause num note)
+            (setq num (1- num))))))
+    (cider-stacktrace-initialize causes)
+    (font-lock-refresh-defaults)))
+
+(provide 'cider-stacktrace)
+
+;;; cider-stacktrace.el ends here
diff --git a/elpa/cider-0.8.2/cider-stacktrace.elc b/elpa/cider-0.8.2/cider-stacktrace.elc
new file mode 100644
index 000000000..a9d17121b
Binary files /dev/null and b/elpa/cider-0.8.2/cider-stacktrace.elc differ
diff --git a/elpa/cider-0.8.2/cider-test.el b/elpa/cider-0.8.2/cider-test.el
new file mode 100644
index 000000000..232b47b2f
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-test.el
@@ -0,0 +1,470 @@
+;;; cider-test.el --- Test result viewer -*- lexical-binding: t -*-
+
+;; Copyright © 2014 Jeff Valk
+
+;; Author: Jeff Valk <jv@jeffvalk.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:
+
+;; This provides execution, reporting, and navigation support for Clojure tests,
+;; specifically using the `clojure.test' machinery. This functionality replaces
+;; the venerable `clojure-test-mode' (deprecated in June 2014), and relies on
+;; nREPL middleware for report running and session support.
+
+;;; Code:
+
+(require 'cider-util)
+(require 'cider-stacktrace)
+(require 'button)
+(require 'dash)
+(require 'easymenu)
+
+;;; Variables
+
+(defgroup cider-test nil
+  "Presentation and navigation for test results."
+  :prefix "cider-test-"
+  :group 'cider)
+
+(defcustom cider-test-show-report-on-success nil
+  "Whether to show the `*cider-test-report*` buffer on passing tests."
+  :type 'boolean
+  :group 'cider-test
+  :package-version '(cider . "0.8.0"))
+
+(defvar cider-test-last-test-ns nil
+  "The namespace for which tests were last run.")
+
+(defvar cider-test-last-results nil
+  "The results of the last run test.")
+
+(defconst cider-test-report-buffer "*cider-test-report*"
+  "Buffer name in which to display test reports.")
+
+
+;;; Faces
+;; These are as defined in clojure-test-mode.
+
+(defface cider-test-failure-face
+  '((((class color) (background light))
+     :background "orange red")
+    (((class color) (background dark))
+     :background "firebrick"))
+  "Face for failed tests."
+  :group 'cider-test
+  :package-version '(cider . "0.7.0"))
+
+(defface cider-test-error-face
+  '((((class color) (background light))
+     :background "orange1")
+    (((class color) (background dark))
+     :background "orange4"))
+  "Face for erring tests."
+  :group 'cider-test
+  :package-version '(cider . "0.7.0"))
+
+(defface cider-test-success-face
+  '((((class color) (background light))
+     :foreground "black"
+     :background "green")
+    (((class color) (background dark))
+     :foreground "black"
+     :background "green"))
+  "Face for passing tests."
+  :group 'cider-test
+  :package-version '(cider . "0.7.0"))
+
+
+;;; Report mode & key bindings
+;; The primary mode of interacting with test results is the report buffer, which
+;; allows navigation among tests, jumping to test definitions, expected/actual
+;; diff-ing, and cause/stacktrace inspection for test errors.
+
+(defvar cider-test-report-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c ,") 'cider-test-run-tests)
+    (define-key map (kbd "C-c C-,") 'cider-test-rerun-tests)
+    (define-key map (kbd "C-c M-,") 'cider-test-run-test)
+    (define-key map (kbd "M-p") 'cider-test-previous-result)
+    (define-key map (kbd "M-n") 'cider-test-next-result)
+    (define-key map (kbd "M-.") 'cider-test-jump)
+    (define-key map (kbd "t") 'cider-test-jump)
+    (define-key map (kbd "d") 'cider-test-ediff)
+    (define-key map (kbd "e") 'cider-test-stacktrace)
+    (define-key map "q" 'cider-popup-buffer-quit-function)
+    (define-key map (kbd "<backtab>") 'backward-button)
+    (define-key map (kbd "TAB") 'forward-button)
+    (easy-menu-define cider-test-report-mode-menu map
+      "Menu for CIDER's test result mode"
+      '("Test-Report"
+        ["Previous result" cider-test-previous-result]
+        ["Next result" cider-test-next-result]
+        "--"
+        ["Rerun current test" cider-test-run-test]
+        ["Rerun failed/erring tests" cider-test-rerun-tests]
+        ["Rerun all tests" cider-test-run-tests]
+        "--"
+        ["Jump to test definition" cider-test-jump]
+        ["Display test error" cider-test-stacktrace]
+        ["Display expected/actual diff" cider-test-ediff]))
+    map))
+
+(define-derived-mode cider-test-report-mode fundamental-mode "Test Report"
+  "Major mode for presenting Clojure test results.
+
+\\{cider-test-report-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil))
+
+;; Report navigation
+
+(defun cider-test-show-report ()
+  "Show the test report buffer, if one exists."
+  (interactive)
+  (-if-let (report-buffer (get-buffer cider-test-report-buffer))
+      (switch-to-buffer report-buffer)
+    (message "No test report buffer")))
+
+(defun cider-test-previous-result ()
+  "Move point to the previous test result, if one exists."
+  (interactive)
+  (with-current-buffer (get-buffer cider-test-report-buffer)
+    (-when-let (pos (previous-single-property-change (point) 'type))
+      (goto-char pos))))
+
+(defun cider-test-next-result ()
+  "Move point to the next test result, if one exists."
+  (interactive)
+  (with-current-buffer (get-buffer cider-test-report-buffer)
+    (-when-let (pos (next-single-property-change (point) 'type))
+      (goto-char pos))))
+
+(defun cider-test-jump ()
+  "Like `cider-jump-to-var', but uses the test at point's definition, if available."
+  (interactive)
+  (let ((ns   (get-text-property (point) 'ns))
+        (var  (get-text-property (point) 'var))
+        (line (get-text-property (point) 'line)))
+    (if (and ns var)
+        (cider-jump-to-var (concat ns "/" var) line)
+      (call-interactively 'cider-jump-to-var))))
+
+
+;;; Error stacktraces
+
+(defun cider-test-stacktrace-for (ns var index)
+  "Display stacktrace for the erring NS VAR test with the assertion INDEX."
+  (let (causes)
+    (nrepl-send-request
+     (append
+      (list "op" "test-stacktrace" "session" (nrepl-current-session)
+            "ns" ns "var" var "index" index)
+      (when cider-stacktrace-print-level
+        (list "print-level" cider-stacktrace-print-level)))
+     (lambda (response)
+       (nrepl-dbind-response response (class status)
+         (cond (class  (setq causes (cons response causes)))
+               (status (when causes
+                         (cider-stacktrace-render
+                          (cider-popup-buffer cider-error-buffer
+                                              cider-auto-select-error-buffer)
+                          (reverse causes))))))))))
+
+(defun cider-test-stacktrace (&optional button)
+  "Display stacktrace for the erring test at point, optionally from BUTTON."
+  (interactive)
+  (let ((ns    (get-text-property (point) 'ns))
+        (var   (get-text-property (point) 'var))
+        (index (get-text-property (point) 'index))
+        (err   (get-text-property (point) 'error)))
+    (if (and err ns var index)
+        (cider-test-stacktrace-for ns var index)
+      (message "No test error at point"))))
+
+
+;;; Expected vs actual diffing
+
+(defvar cider-test-ediff-buffers nil
+  "The expected/actual buffers used to display diff.")
+
+(defun cider-test-ediff ()
+  "Show diff of the expected vs actual value for the test at point.
+With the actual value, the outermost '(not ...)' s-expression is removed."
+  (interactive)
+  (let ((expected (get-text-property (point) 'expected))
+        (actual   (get-text-property (point) 'actual)))
+    (if (and expected actual)
+        (let ((expected-buffer (generate-new-buffer " *expected*"))
+              (actual-buffer   (generate-new-buffer " *actual*")))
+          (with-current-buffer expected-buffer
+            (insert expected)
+            (clojure-mode))
+          (with-current-buffer actual-buffer
+            (insert actual)
+            (goto-char (point-min))
+            (forward-char)
+            (forward-sexp)
+            (forward-whitespace 1)
+            (let ((beg (point)))
+              (forward-sexp)
+              (let ((actual* (buffer-substring beg (point))))
+                (erase-buffer)
+                (insert actual*)))
+            (clojure-mode))
+          (apply 'ediff-buffers
+                 (setq cider-test-ediff-buffers
+                       (list (buffer-name expected-buffer)
+                             (buffer-name actual-buffer)))))
+      (message "No test failure at point"))))
+
+(defun cider-test-ediff-cleanup ()
+  "Cleanup expected/actual buffers used for diff."
+  (interactive)
+  (mapc (lambda (b) (when (get-buffer b) (kill-buffer b)))
+        cider-test-ediff-buffers))
+
+(add-hook 'ediff-cleanup-hook 'cider-test-ediff-cleanup)
+
+
+;;; Report rendering
+
+(defun cider-test-type-face (type)
+  "Return the font lock face for the test result TYPE."
+  (pcase type
+    ("pass"  'cider-test-success-face)
+    ("fail"  'cider-test-failure-face)
+    ("error" 'cider-test-error-face)
+    (t       'default)))
+
+(defun cider-test-render-summary (buffer summary)
+  "Emit into BUFFER the report SUMMARY statistics."
+  (with-current-buffer buffer
+    (nrepl-dbind-response summary (var test pass fail error)
+      (insert (format "Ran %d tests, in %d test functions\n" test var))
+      (unless (zerop fail)
+        (cider-insert (format "%d failures" fail) 'cider-test-failure-face t))
+      (unless (zerop error)
+        (cider-insert (format "%d errors" error) 'cider-test-error-face t))
+      (when (zerop (+ fail error))
+        (cider-insert (format "%d passed" pass) 'cider-test-success-face t))
+      (newline)
+      (newline))))
+
+(defun cider-test-render-assertion (buffer test)
+  "Emit into BUFFER report detail for the TEST assertion."
+  (with-current-buffer buffer
+    (nrepl-dbind-response test (var context type message expected actual error)
+      (cider-propertize-region (cider-intern-keys (cdr test))
+        (cider-insert (capitalize type) (cider-test-type-face type) nil " in ")
+        (cider-insert var 'font-lock-function-name-face t)
+        (when context  (cider-insert context 'font-lock-doc-face t))
+        (when message  (cider-insert message 'font-lock-doc-string-face t))
+        (when expected (cider-insert "expected: " 'font-lock-comment-face nil
+                                     (cider-font-lock-as-clojure expected)))
+        (when actual   (cider-insert "  actual: " 'font-lock-comment-face)
+              (if error
+                  (progn (insert-text-button
+                          error
+                          'follow-link t
+                          'action 'cider-test-stacktrace
+                          'help-echo "View causes and stacktrace")
+                         (newline))
+                (insert (cider-font-lock-as-clojure actual)))))
+      (newline))))
+
+(defun cider-test-render-report (buffer ns summary results)
+  "Emit into BUFFER the report for the NS, SUMMARY, and test RESULTS."
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t))
+      (cider-test-report-mode)
+      (cider-insert "Test Summary" 'bold t)
+      (cider-insert ns 'font-lock-function-name-face t "\n")
+      (cider-test-render-summary buffer summary)
+      (nrepl-dbind-response summary (fail error)
+        (unless (zerop (+ fail error))
+          (cider-insert "Results" 'bold t "\n")
+          (nrepl-dict-map
+           (lambda (var tests)
+             (dolist (test tests)
+               (nrepl-dbind-response test (type)
+                 (unless (equal "pass" type)
+                   (cider-test-render-assertion buffer test)))))
+           results)))
+      (goto-char (point-min))
+      (current-buffer))))
+
+
+;;; Summary echo
+
+(defun cider-test-echo-summary (summary)
+  "Echo SUMMARY statistics for a test run."
+  (nrepl-dbind-response summary (test fail error)
+    (message
+     (propertize
+      (format "Ran %s tests. %s failures, %s errors." test fail error)
+      'face (cond ((not (zerop error)) 'cider-test-error-face)
+                  ((not (zerop fail))  'cider-test-failure-face)
+                  (t                   'cider-test-success-face))))))
+
+
+;;; Test definition highlighting
+;; On receipt of test results, failing/erring test definitions are highlighted.
+;; Highlights are cleared on the next report run, and may be cleared manually
+;; by the user.
+
+;; NOTE If keybindings specific to test sources are desired, it would be
+;; straightforward to turn this into a `cider-test-mode' minor mode, which we
+;; enable on test sources, much like the legacy `clojure-test-mode'. At present,
+;; though, there doesn't seem to be much value in this, since the report buffer
+;; provides the primary means of interacting with test results.
+
+(defun cider-test-highlight-problem (buffer test)
+  "Highlight the BUFFER test definition for the non-passing TEST."
+  (with-current-buffer buffer
+    (nrepl-dbind-response test (type line message expected actual)
+      (save-excursion
+        (goto-char (point-min))
+        (forward-line (1- line))
+        (forward-whitespace 1)
+        (forward-char)
+        (let ((beg (point)))
+          (forward-sexp)
+          (let ((overlay (make-overlay beg (point))))
+            (overlay-put overlay 'font-lock-face (cider-test-type-face type))
+            (overlay-put overlay 'type type)
+            (overlay-put overlay 'help-echo message)
+            (overlay-put overlay 'message message)
+            (overlay-put overlay 'expected expected)
+            (overlay-put overlay 'actual actual)))))))
+
+(defun cider-test-highlight-problems (ns results)
+  "Highlight all non-passing tests in the NS test RESULTS."
+  (nrepl-dict-map
+   (lambda (var tests)
+     (-when-let (buffer (cider-find-var-file (concat ns "/" var)))
+       (dolist (test tests)
+         (nrepl-dbind-response test (type)
+           (unless (equal "pass" type)
+             (cider-test-highlight-problem buffer test))))))
+   results))
+
+(defun cider-test-clear-highlights ()
+  "Clear highlighting of non-passing tests from the last test run."
+  (interactive)
+  (-when-let (ns cider-test-last-test-ns)
+    (dolist (var (nrepl-dict-keys cider-test-last-results))
+      (-when-let (buffer (cider-find-var-file (concat ns "/" var)))
+        (with-current-buffer buffer
+          (remove-overlays))))))
+
+
+;;; Test namespaces
+;; Test namespace inference exists to enable DWIM test running functions: the
+;; same "run-tests" function should be able to be used in a source file, and in
+;; its corresponding test namespace. To provide this, we need to map the
+;; relationship between those namespaces.
+
+(defcustom cider-test-infer-test-ns 'cider-test-default-test-ns-fn
+  "Function to infer the test namespace for NS.
+The default implementation uses the simple Leiningen convention of appending
+'-test' to the namespace name."
+  :type 'symbol
+  :group 'cider-test
+  :package-version '(cider . "0.7.0"))
+
+(defun cider-test-default-test-ns-fn (ns)
+  "For a NS, return the test namespace, which may be the argument itself.
+This uses the Leiningen convention of appending '-test' to the namespace name."
+  (when ns
+    (let ((suffix "-test"))
+      ;; string-suffix-p is only available in Emacs 24.4+
+      (if (string-match (rx-to-string `(: ,suffix eos) t) ns)
+          ns
+        (concat ns suffix)))))
+
+
+;;; Test execution
+
+(defun cider-test-execute (ns &optional retest tests)
+  "Run tests for NS; optionally RETEST failures or run only specified TESTS.
+Upon test completion, results are echoed and a test report is optionally
+displayed. When test failures/errors occur, their sources are highlighted."
+  (cider-test-clear-highlights)
+  (message "Testing...")
+  (nrepl-send-request
+   (list "ns" ns "op" (if retest "retest" "test")
+         "tests" tests "session" (nrepl-current-session))
+   (lambda (response)
+     (nrepl-dbind-response response (summary results status out err)
+       (cond ((member "namespace-not-found" status)
+              (message "No tests namespace: %s" ns))
+             (out (cider-emit-interactive-eval-output out))
+             (err (cider-emit-interactive-eval-err-output err))
+             (results
+              (nrepl-dbind-response summary (error fail)
+                (setq cider-test-last-test-ns ns)
+                (setq cider-test-last-results results)
+                (cider-test-highlight-problems ns results)
+                (cider-test-echo-summary summary)
+                (when (or (not (zerop (+ error fail)))
+                          cider-test-show-report-on-success)
+                  (cider-test-render-report
+                   (cider-popup-buffer cider-test-report-buffer t)
+                   ns summary results)))))))))
+
+(defun cider-test-rerun-tests ()
+  "Rerun failed and erring tests from the last tested namespace."
+  (interactive)
+  (-if-let (ns cider-test-last-test-ns)
+      (cider-test-execute ns t)
+    (message "No namespace to retest")))
+
+(defun cider-test-run-tests (suppress-inference)
+  "Run all tests for the current Clojure source or test report context.
+
+With a prefix arg SUPPRESS-INFERENCE it will try to run the tests in the
+current ns."
+  (interactive "P")
+  (-if-let (ns (if suppress-inference
+                   (clojure-find-ns)
+                 (or (funcall cider-test-infer-test-ns (clojure-find-ns))
+                     (when (eq major-mode 'cider-test-report-mode)
+                      cider-test-last-test-ns))))
+      (cider-test-execute ns nil)
+    (message "No namespace to test in current context")))
+
+(defun cider-test-run-test ()
+  "Run the test at point.
+The test ns/var exist as text properties on report items and on highlighted
+failed/erred test definitions. When not found, a test definition at point
+is searched."
+  (interactive)
+  (let ((ns  (get-text-property (point) 'ns))
+        (var (get-text-property (point) 'var)))
+    (if (and ns var)
+        (cider-test-execute ns nil (list var))
+      (let ((ns  (clojure-find-ns))
+            (def (clojure-find-def)))
+        (if (and ns (member (first def) '("deftest" "defspec")))
+            (cider-test-execute ns nil (rest def))
+          (message "No test at point"))))))
+
+(provide 'cider-test)
+
+;;; cider-test.el ends here
diff --git a/elpa/cider-0.8.2/cider-util.el b/elpa/cider-0.8.2/cider-util.el
new file mode 100644
index 000000000..fabc39679
--- /dev/null
+++ b/elpa/cider-0.8.2/cider-util.el
@@ -0,0 +1,181 @@
+;;; cider-util.el --- Common utility functions that don't belong anywhere else -*- lexical-binding: t -*-
+
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 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)
+(require 'cl-lib)
+(require 'clojure-mode)
+
+;;; Compatibility
+(eval-and-compile
+  ;; `defvar-local' for Emacs 24.2 and below
+  (unless (fboundp 'defvar-local)
+    (defmacro defvar-local (var val &optional docstring)
+      "Define VAR as a buffer-local variable with default value VAL.
+Like `defvar' but additionally marks the variable as being automatically
+buffer-local wherever it is set."
+      (declare (debug defvar) (doc-string 3))
+      `(progn
+         (defvar ,var ,val ,docstring)
+         (make-variable-buffer-local ',var))))
+
+  ;; `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)))
+
+;;; Text properties
+
+(defun cider-maybe-intern (name)
+  "If NAME is a symbol, return it; otherwise, intern it."
+  (if (symbolp name) name (intern name)))
+
+(defun cider-intern-keys (props)
+  "Copy plist-style PROPS with any non-symbol keys replaced with symbols."
+  (-map-indexed (lambda (i x) (if (oddp i) x (cider-maybe-intern x))) props))
+
+(defmacro cider-propertize-region (props &rest body)
+  "Execute BODY and add PROPS to all the text it inserts.
+More precisely, PROPS are added to the region between the point's
+positions before and after executing BODY."
+  (let ((start (cl-gensym)))
+    `(let ((,start (point)))
+       (prog1 (progn ,@body)
+         (add-text-properties ,start (point) ,props)))))
+
+(put 'cider-propertize-region 'lisp-indent-function 1)
+
+(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."
+  (let ((end (next-single-char-property-change (point) prop)))
+    (list (previous-single-char-property-change end prop) end)))
+
+(defun cider-insert (text &optional face break more-text)
+  "Insert TEXT with FACE, optionally followed by a line BREAK and MORE-TEXT."
+  (insert (if face (propertize text 'font-lock-face face) text))
+  (when more-text (insert more-text))
+  (when break (insert "\n")))
+
+;;; Font lock
+
+(defun cider-font-lock-as (mode string)
+  "Use MODE to font-lock the STRING."
+  (with-temp-buffer
+    (insert string)
+    ;; suppress major mode hooks as we care only about their font-locking
+    ;; otherwise modes like whitespace-mode and paredit might interfere
+    (setq-local delay-mode-hooks t)
+    (setq delayed-mode-hooks nil)
+    (funcall mode)
+    (font-lock-fontify-buffer)
+    (buffer-string)))
+
+(defun cider-font-lock-region-as (mode beg end &optional buffer)
+  "Use MODE to font-lock text between BEG and END.
+
+Unless you specify a BUFFER it will default to the current one."
+  (with-current-buffer (or buffer (current-buffer))
+    (let ((text (buffer-substring beg end)))
+      (delete-region beg end)
+      (goto-char beg)
+      (insert (cider-font-lock-as mode text)))))
+
+(defun cider-font-lock-as-clojure (string)
+  "Font-lock STRING as Clojure code."
+  (cider-font-lock-as 'clojure-mode string))
+
+;;; Colors
+
+(defun cider-scale-color (color scale)
+  "For a COLOR hex string or name, adjust intensity of RGB components by SCALE."
+  (let* ((rgb (color-values color))
+         (scaled-rgb (mapcar (lambda (n)
+                               (format "%04x" (round (+ n (* scale 65535)))))
+                             rgb)))
+    (apply 'concat "#" scaled-rgb)))
+
+(defun cider-scale-background-color ()
+  "Scale the current background color to get a slighted muted version."
+  (let ((color (frame-parameter nil 'background-color))
+        (dark (eq (frame-parameter nil 'background-mode) 'dark)))
+    (cider-scale-color color (if dark 0.05 -0.05))))
+
+(defun cider-format-pprint-eval (form &optional right-margin)
+  "Return a string of Clojure code that will eval and pretty-print FORM.
+Pretty printing will avoid going beyond column RIGHT-MARGIN which defaults
+to `fill-column'."
+  (format "(clojure.core/let [x %s]
+             (binding [clojure.pprint/*print-right-margin* %d]
+               (clojure.pprint/pprint x)) x)"
+          form (or right-margin fill-column)))
+
+(autoload 'pkg-info-version-info "pkg-info.el")
+
+(defun cider--version ()
+  "Retrieve CIDER's version."
+  (condition-case nil
+      (pkg-info-version-info 'cider)
+    (error cider-version)))
+
+;;; Strings
+
+(defun cider-string-join (strings &optional separator)
+  "Join all STRINGS using SEPARATOR."
+  (mapconcat 'identity strings separator))
+
+(defun cider-join-into-alist (candidates &optional separator)
+  "Make an alist from CANDIDATES.
+The keys are the elements joined with SEPARATOR and values are the original
+elements. Useful for `completing-read' when candidates are complex
+objects."
+  (mapcar (lambda (el)
+            (if (listp el)
+                (cons (cider-string-join el (or separator ":")) el)
+              (cons el el)))
+          candidates))
+
+(provide 'cider-util)
+
+;;; cider-util.el ends here
diff --git a/elpa/cider-0.8.2/cider-util.elc b/elpa/cider-0.8.2/cider-util.elc
new file mode 100644
index 000000000..a3c94875b
Binary files /dev/null and b/elpa/cider-0.8.2/cider-util.elc differ
diff --git a/elpa/cider-0.8.2/cider.el b/elpa/cider-0.8.2/cider.el
new file mode 100644
index 000000000..ff779a275
--- /dev/null
+++ b/elpa/cider-0.8.2/cider.el
@@ -0,0 +1,248 @@
+;;; cider.el --- Clojure Integrated Development Environment and REPL -*- lexical-binding: t -*-
+
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 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.8.2
+;; Package-Requires: ((clojure-mode "3.0.0") (cl-lib "0.5") (dash "2.4.1") (pkg-info "0.4") (emacs "24") (queue "0.1.1"))
+;; 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.org
+
+;; (add-to-list 'package-archives
+;;              '("marmalade" . "http://marmalade-repo.org/packages/"))
+;;
+;; or
+;;
+;; (add-to-list 'package-archives
+;;              '("melpa" . "http://melpa.org/packages/") t)
+;;
+;; M-x package-install cider
+
+;;; Usage:
+
+;; M-x cider-jack-in
+
+;;; Code:
+
+(defgroup cider nil
+  "Clojure Interactive Development Environment Reimagined."
+  :prefix "cider-"
+  :group 'applications
+  :link '(url-link :tag "Github" "https://github.com/clojure-emacs/cider")
+  :link '(emacs-commentary-link :tag "Commentary" "cider"))
+
+(require 'cider-client)
+(require 'cider-interaction)
+(require 'cider-eldoc)
+(require 'cider-repl)
+(require 'cider-mode)
+(require 'cider-util)
+(require 'tramp-sh)
+
+(defvar cider-version "0.8.2"
+  "Fallback version used when it cannot be extracted automatically.
+Normally it won't be used, unless `pkg-info' fails to extract the
+version from the CIDER package or library.")
+
+(defcustom cider-lein-command
+  "lein"
+  "The command used to execute Leiningen 2.x."
+  :type 'string
+  :group 'cider)
+
+(defcustom cider-lein-parameters
+  "repl :headless"
+  "Params passed to lein to start an nREPL server via `cider-jack-in'."
+  :type 'string
+  :group 'cider)
+
+(defcustom cider-known-endpoints nil
+  "Specify a list of custom endpoints where each endpoint is a list.
+For example: '((\"label\" \"host\" \"port\")).
+The label is optional so that '(\"host\" \"port\") will suffice.
+This variable is used by `cider-connect'."
+  :type 'list
+  :group 'cider)
+
+(defvar cider-ps-running-nrepls-command "ps u | grep leiningen"
+  "Process snapshot command used in `cider-locate-running-nrepl-ports'.")
+
+(defvar cider-ps-running-nrepl-path-regexp-list
+  '("\\(?:leiningen.original.pwd=\\)\\(.+?\\) -D"
+    "\\(?:-classpath +:?\\(.+?\\)/self-installs\\)")
+  "Regexp list to extract project paths from output of `cider-ps-running-nrepls-command'.
+Sub-match 1 must be the project path.")
+
+(defvar cider-host-history nil
+  "Completion history for connection hosts.")
+
+;;;###autoload
+(defun cider-version ()
+  "Display CIDER's version."
+  (interactive)
+  (message "CIDER %s" (cider--version)))
+
+;;;###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))
+  (if (cider--lein-present-p)
+      (let* ((project (when prompt-project
+                        (read-directory-name "Project: ")))
+             (project-dir (nrepl-project-directory-for
+                           (or project (nrepl-current-dir))))
+             (lein-params (if prompt-project
+                              (read-string (format "nREPL server command: %s "
+                                                   cider-lein-command)
+                                           cider-lein-parameters)
+                            cider-lein-parameters))
+             (cmd (format "%s %s" cider-lein-command lein-params)))
+        (when (nrepl-check-for-repl-buffer nil project-dir)
+          (nrepl-start-server-process project-dir cmd)))
+    (message "The %s executable (specified by `cider-lein-command') isn't on your exec-path"
+             cider-lein-command)))
+
+;;;###autoload
+(defun cider-connect (host port)
+  "Connect to an nREPL server identified by HOST and PORT.
+Create REPL buffer and start an nREPL client connection."
+  (interactive (cider-select-endpoint))
+  (setq cider-current-clojure-buffer (current-buffer))
+  (when (nrepl-check-for-repl-buffer `(,host ,port) nil)
+    (nrepl-start-client-process host port t)))
+
+(defun cider-select-endpoint ()
+  "Interactively select the host and port to connect to."
+  (let* ((ssh-hosts (cider--ssh-hosts))
+         (hosts (-distinct (append (when cider-host-history 
+                                     (list (list (car cider-host-history))))
+                                   (list (list (nrepl-current-host)))
+                                   cider-known-endpoints
+                                   ssh-hosts
+                                   (when (file-remote-p default-directory)
+                                     ;; add localhost even in remote buffers
+                                     (list (list "localhost"))))))
+         (sel-host (cider--completing-read-host hosts))
+         (host (car sel-host))
+         (local-p (or  (nrepl-local-host-p host)
+                       (not (assoc-string host ssh-hosts))))
+         ;; Each lein-port is a list of the form (dir port)
+         (lein-ports (if local-p
+                         ;; might connect to localhost from a remote file
+                         (let* ((change-dir-p (file-remote-p default-directory))
+                                (default-directory (if change-dir-p "~/" default-directory)))
+                           (cider-locate-running-nrepl-ports (unless change-dir-p default-directory)))
+                       (let ((vec (vector "ssh" nil host "" nil))
+                             ;; might connect to a different remote
+                             (dir (when (file-remote-p default-directory)
+                                    (with-parsed-tramp-file-name default-directory cur
+                                      (when (string= cur-host host) default-directory)))))
+                         (tramp-maybe-open-connection vec)
+                         (with-current-buffer (tramp-get-connection-buffer vec)
+                           (cider-locate-running-nrepl-ports dir)))))
+         (ports (append (cdr sel-host) lein-ports))
+         (port (cider--completing-read-port host ports)))
+    (list host port)))
+
+(defun cider--ssh-hosts ()
+  "Retrieve all ssh host from local configuration files."
+  (-map (lambda (s) (list (replace-regexp-in-string ":$" "" s)))
+        (let ((tramp-completion-mode t))
+          (tramp-completion-handle-file-name-all-completions "" "/ssh:"))))
+
+(defun cider--completing-read-host (hosts)
+  "Interactively select host from HOSTS.
+Each element in HOSTS is one of: (host), (host port) or (label host port).
+Return a list of the form (HOST PORT), where PORT can be nil."
+  (let* ((hosts (cider-join-into-alist hosts))
+         (sel-host (completing-read "Host: " hosts nil nil nil
+                                    'cider-host-history (caar hosts)))
+         (host (or (cdr (assoc sel-host hosts)) (list sel-host))))
+    ;; remove the label
+    (if (= 3 (length host)) (cdr host) host)))
+
+(defun cider--completing-read-port (host ports)
+  "Interactively select port for HOST from PORTS."
+  (let* ((ports (cider-join-into-alist ports))
+         (sel-port (completing-read (format "Port for %s: " host) ports
+                                    nil nil nil nil (caar ports)))
+         (port (or (cdr (assoc sel-port ports)) sel-port))
+         (port (if (listp port) (second port) port)))
+    (if (stringp port) (string-to-number port) port)))
+
+(defun cider-locate-running-nrepl-ports (&optional dir)
+  "Locate ports of running nREPL servers.
+When DIR is non-nil also look for nREPL port files in DIR.  Return a list
+of list of the form (project-dir port)."
+  (let* ((paths (cider--running-nrepl-paths))
+         (proj-ports (mapcar (lambda (d)
+                               (-when-let (port (and d (nrepl-extract-port (cider--file-path d))))
+                                 (list (file-name-nondirectory (directory-file-name d)) port)))
+                             (cons (nrepl-project-directory-for dir)
+                                   paths))))
+    (-distinct (delq nil proj-ports))))
+
+(defun cider--running-nrepl-paths ()
+  "Retrieve project paths of running nREPL servers.
+use `cider-ps-running-nrepls-command' and `cider-ps-running-nrepl-path-regexp-list'."
+  (let (paths)
+    (with-temp-buffer
+      (insert (shell-command-to-string cider-ps-running-nrepls-command))
+      (dolist (regexp cider-ps-running-nrepl-path-regexp-list)
+        (goto-char 1)
+        (while (re-search-forward regexp nil t)
+          (setq paths (cons (match-string 1) paths)))))
+    (-distinct paths)))
+
+;; TODO: Implement a check for `cider-lein-command' over tramp
+(defun cider--lein-present-p ()
+  "Check if `cider-lein-command' is on the `exec-path'.
+
+In case `default-directory' is non-local we assume the command is available."
+  (or (file-remote-p default-directory)
+      (executable-find cider-lein-command)
+      (executable-find (concat cider-lein-command ".bat"))))
+
+;;;###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-connect)))
+
+
+(define-obsolete-function-alias 'cider 'cider-connect)
+
+(provide 'cider)
+
+;;; cider.el ends here
diff --git a/elpa/cider-0.8.2/cider.elc b/elpa/cider-0.8.2/cider.elc
new file mode 100644
index 000000000..28e4ea08a
Binary files /dev/null and b/elpa/cider-0.8.2/cider.elc differ
diff --git a/elpa/cider-0.8.2/nrepl-client.el b/elpa/cider-0.8.2/nrepl-client.el
new file mode 100644
index 000000000..e1afe26c3
--- /dev/null
+++ b/elpa/cider-0.8.2/nrepl-client.el
@@ -0,0 +1,1338 @@
+;;; nrepl-client.el --- Client for Clojure nREPL -*- lexical-binding: t -*-
+
+;; Copyright © 2012-2014 Tim King, Phil Hagelberg
+;; Copyright © 2013-2014 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.
+;;
+;; A connection is an abstract idea of the communication between Emacs (client)
+;; and nREPL server.  On Emacs side connections are represented by two running
+;; processes.  The two processes are the server process and client process.  Each
+;; of these is represented by it's own process buffer, filter and sentinel.
+;;
+;; The nREPL communication process can be broadly represented as follows:
+;;
+;;    1) Server process is started as an Emacs subprocess (usually by
+;;      `cider-jack-in')
+;;
+;;    2) Server's process filter (`nrepl-server-filter') detects the connection
+;;       port from the first plain text response from server and starts
+;;       communication process as another Emacs subprocess.  This is the nREPL
+;;       client process (`nrepl-client-filter').  All requests and responses
+;;       handling happen through this client connection.
+;;
+;;    3) Requests are sent by `nrepl-send-request' and
+;;       `nrepl-send-sync-request'.  Request is simply a list containing a
+;;       requested operation name and the parameters required by the
+;;       operation.  Each request has an associated callback that is called once
+;;       the response for the request has arrived.  Besides the above functions
+;;       there are specialized request senders for each type of common
+;;       operations.  Examples are `nrepl-request:eval', `nrepl-request:clone',
+;;       `nrepl-request:describe'.
+;;
+;;    4) Responses from the server are decoded in `nrepl-client-filter' and are
+;;       physically represented by alists whose structure depends on the type of
+;;       the response.  After having been decoded, the data from the response is
+;;       passed over to the callback that was registered by the original
+;;       request.
+;;
+;; Please see the comments in dedicated sections of this file for more detailed
+;; description.
+
+;;; Code:
+(require 'dash)
+(require 'thingatpt)
+(require 'etags)
+(require 'ansi-color)
+(require 'ewoc)
+(require 'cl-lib)
+(require 'cider-util)
+(require 'queue)
+(require 'tramp)
+
+
+;;; Custom
+
+(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 cider-repl 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 "localhost"
+  "The default hostname (or IP address) to connect to."
+  :type 'string
+  :group 'nrepl)
+
+(defcustom nrepl-force-ssh-for-remote-hosts nil
+  "If non-nil, do not attempt a direct connection for remote hosts."
+  :type 'boolean
+  :group 'nrepl)
+
+(defcustom nrepl-port nil
+  "The default port to connect to."
+  :type 'string
+  :group 'nrepl)
+
+(defcustom nrepl-sync-request-timeout 10
+  "The number of seconds to wait for a sync response.
+Setting this to nil disables the timeout functionality."
+  :type 'integer
+  :group 'nrepl)
+
+(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."
+  :type 'boolean
+  :group 'nrepl)
+
+
+;;; nREPL Buffer Names
+
+(defconst nrepl-message-buffer-name "*nrepl-messages*")
+(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*")
+(defconst nrepl-tunnel-buffer-name-template "*nrepl-tunnel%s*")
+
+(defun nrepl-format-buffer-name-template (buffer-name-template designation)
+  "Apply the DESIGNATION to the corresponding BUFFER-NAME-TEMPLATE."
+  (format buffer-name-template
+          (if (> (length designation) 0)
+              (concat nrepl-buffer-name-separator designation)
+            "")))
+
+(defun nrepl-make-buffer-name (buffer-name-template &optional project-dir host port)
+  "Generate a buffer name using BUFFER-NAME-TEMPLATE.
+
+If not supplied PROJECT-DIR, PORT and HOST default to the buffer local
+value of the `nrepl-project-dir' and `nrepl-endpoint'.
+
+The name will include the project name if available or the endpoint host if
+it is not.  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 (or project-dir nrepl-project-dir)))
+         (nrepl-proj-port (or port (cadr nrepl-endpoint))))
+     (nrepl-format-buffer-name-template
+      buffer-name-template
+      (concat (if project-name project-name (or host (car nrepl-endpoint)))
+              (if (and nrepl-proj-port nrepl-buffer-name-show-port)
+                  (format ":%s" nrepl-proj-port) ""))))))
+
+(defun nrepl--make-hidden-name (buffer-name)
+  "Apply a prefix to BUFFER-NAME that will hide the buffer."
+  (concat (if nrepl-hide-special-buffers " " "") buffer-name))
+
+(defun nrepl-connection-buffer-name (&optional project-dir host port)
+  "Return the name of the connection buffer.
+PROJECT-DIR, HOST and PORT are as in `/nrepl-make-buffer-name'."
+  (nrepl--make-hidden-name
+   (nrepl-make-buffer-name nrepl-connection-buffer-name-template
+                           project-dir host port)))
+
+(defun nrepl-server-buffer-name (&optional project-dir host port)
+  "Return the name of the server buffer.
+PROJECT-DIR, HOST and PORT are as in `nrepl-make-buffer-name'."
+  (nrepl--make-hidden-name
+   (nrepl-make-buffer-name nrepl-server-buffer-name-template
+                           project-dir host port)))
+
+(defun nrepl-tunnel-buffer-name (&optional project-dir host port)
+  "Return the name of the tunnel buffer.
+PROJECT-DIR, HOST and PORT are as in `nrepl-make-buffer-name'."
+  (nrepl--make-hidden-name
+   (nrepl-make-buffer-name nrepl-tunnel-buffer-name-template
+                           project-dir host port)))
+
+
+;;; Buffer Local Declarations
+
+;; These variables are used to track the state of nREPL connections
+(defvar-local nrepl-connection-buffer nil)
+(defvar-local nrepl-server-buffer nil)
+(defvar-local nrepl-repl-buffer nil)
+(defvar-local nrepl-endpoint nil)
+(defvar-local nrepl-project-dir nil)
+(defvar-local nrepl-tunnel-buffer nil)
+
+(defvar-local nrepl-session nil
+  "Current nREPL session id.")
+
+(defvar-local nrepl-tooling-session nil
+  "Current nREPL tooling session id.
+To be used for tooling calls (i.e. completion, eldoc, etc)")
+
+(defvar-local nrepl-request-counter 0
+  "Continuation serial number counter.")
+
+(defvar-local nrepl-pending-requests nil)
+
+(defvar-local nrepl-completed-requests nil)
+
+(defvar-local nrepl-buffer-ns nil
+  "Current Clojure namespace of this buffer.")
+
+(defvar-local nrepl-last-sync-response nil
+  "Result of the last sync request.")
+
+(defvar-local nrepl-last-sync-request-timestamp nil
+  "The time when the last sync request was initiated.")
+
+(defvar-local nrepl-ops nil
+  "Available nREPL server ops (from describe).")
+
+(defvar-local nrepl-versions nil
+  "Version information received from the describe op.")
+
+
+;;; Utilities
+(defmacro nrepl-dbind-response (response keys &rest body)
+  "Destructure an nREPL RESPONSE dict.
+Bind the value of the provided KEYS and execute BODY."
+  `(let ,(cl-loop for key in keys
+                  collect `(,key (nrepl-dict-get ,response ,(format "%s" key))))
+     ,@body))
+(put 'nrepl-dbind-response 'lisp-indent-function 2)
+
+(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)
+    (and nrepl-ops (nrepl-dict-get nrepl-ops op))))
+
+(defun nrepl-current-dir ()
+  "Return the directory of the current buffer."
+  (or (-when-let (file-name (buffer-file-name (current-buffer)))
+        (file-name-directory file-name))
+      list-buffers-directory))
+
+(defun nrepl-local-host-p (host)
+  "Return t if HOST is local."
+  (string-match-p tramp-local-host-regexp host))
+
+(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-extract-port (&optional dir)
+  "Read port from .nrepl-port, nrepl-port or target/repl-port files in directory DIR."
+  (-when-let (dir (or dir (nrepl-project-directory-for (nrepl-current-dir))))
+    (or (nrepl--port-from-file (expand-file-name "repl-port" dir))
+        (nrepl--port-from-file (expand-file-name ".nrepl-port" dir))
+        (nrepl--port-from-file (expand-file-name "target/repl-port" dir)))))
+
+(defun nrepl--port-from-file (file)
+  "Attempts to read port from a file named by FILE."
+  (when (file-exists-p file)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (buffer-string))))
+
+
+;;; nREPL dict
+
+(defun nrepl-dict-p (object)
+  "Return t if OBJECT is a nREPL dict."
+  (and (listp object)
+       (eq (car object) 'dict)))
+
+(defun nrepl-dict-empty-p (dict)
+  "Return t if nREPL dict is empty."
+  (null (cdr dict)))
+
+(defun nrepl-dict-get (dict key)
+  "Get from DICT value associated with KEY.
+If dict is nil, return nil."
+  (when dict
+    (if (nrepl-dict-p dict)
+        (lax-plist-get (cdr dict) key)
+      (error "Not a nREPL dict object: %s" dict))))
+
+(defun nrepl-dict-put (dict key value)
+  "Associate in DICT, KEY to VALUE.
+Return new dict.  Dict is modified by side effects."
+  (if (null dict)
+      (list 'dict key value)
+    (if (not (nrepl-dict-p dict))
+        (error "Not a nREPL dict object: %s" dict)
+      (setcdr dict (lax-plist-put (cdr dict) key value))
+      dict)))
+
+(defun nrepl-dict-keys (dict)
+  "Return all the keys in the nREPL DICT."
+  (if (nrepl-dict-p dict)
+      (cl-loop for l on (cdr dict) by #'cddr
+               collect (car l))
+    (error "Not a nREPL dict.")))
+
+(defun nrepl-dict-vals (dict)
+  "Return all the values in the nREPL DICT."
+  (if (nrepl-dict-p dict)
+      (cl-loop for l on (cdr dict) by #'cddr
+               collect (cadr l))
+    (error "Not a nREPL dict.")))
+
+(defun nrepl-dict-map (fn dict)
+  "Map FN on nREPL DICT.
+FN must accept two arguments key and value."
+  (if (nrepl-dict-p dict)
+      (cl-loop for l on (cdr dict) by #'cddr
+               collect (funcall fn (car l) (cadr l)))
+    (error "Not a nREPL dict.")))
+
+(defun nrepl--cons (car list-or-dict)
+  "Generic cons of CAR to LIST-OR-DICT."
+  (if (eq (car list-or-dict) 'dict)
+      (cons 'dict (cons car (cdr list-or-dict)))
+    (cons car list-or-dict)))
+
+(defun nrepl--nreverse (list-or-dict)
+  "Generic `nreverse' which works on LIST-OR-DICT."
+  (if (eq (car list-or-dict) 'dict)
+      (cons 'dict (nreverse (cdr list-or-dict)))
+    (nreverse list-or-dict)))
+
+(defun nrepl--push (obj stack)
+  "Cons OBJ to the top element of the STACK."
+  ;; stack is assumed to be a list
+  (if (eq (caar stack) 'dict)
+      (cons (cons 'dict (cons obj (cdar stack)))
+            (cdr stack))
+    (cons (if (null stack)
+              obj
+            (cons obj (car stack)))
+          (cdr stack))))
+
+(defun nrepl--merge (dict1 dict2 &optional no-join)
+  "Join nREPL dicts DICT1 and DICT2 in a meaningful way.
+String values for non \"id\" and \"session\" keys are concatenated. Lists
+are appended. nREPL dicts merged recursively. All other objects are
+accumulated accumulated into a list. DICT1 is modified destructively and
+then returned."
+  (if no-join
+      (or dict1 dict2)
+    (cond ((null dict1) dict2)
+          ((null dict2) dict1)
+          ((stringp dict1) (concat dict1 dict2))
+          ((nrepl-dict-p dict1)
+           (nrepl-dict-map
+            (lambda (k2 v2)
+              (nrepl-dict-put dict1 k2
+                              (nrepl--merge (nrepl-dict-get dict1 k2) v2
+                                            (member k2 '("id" "session")))))
+            dict2)
+           dict1)
+          ((and (listp dict2) (listp dict1)) (append dict1 dict2))
+          ((listp dict1) (append dict1 (list dict2)))
+          (t (list dict1 dict2)))))
+
+
+;;; Bencode
+
+(cl-defstruct (nrepl-response-queue
+               (:include queue)
+               (:constructor nil)
+               (:constructor nrepl-response-queue (&optional stub)))
+  stub)
+
+(put 'nrepl-response-queue 'function-documentation
+     "Create queue object used by nREPL to store decoded server requests.
+The STUB slot stores a stack of nested, incompletely parsed objects.")
+
+(defun nrepl--bdecode-list (&optional stack)
+  "Decode a bencode list or dict starting at point.
+STACK is as in `nrepl--bdecode-1'."
+  ;; skip leading l or d
+  (forward-char 1)
+  (let* ((istack (nrepl--bdecode-1 stack))
+         (pos0 (point))
+         (info (car istack)))
+    (while (null info)
+      (setq istack (nrepl--bdecode-1 (cdr istack))
+            pos0 (point)
+            info (car istack)))
+    (cond ((eq info :e)
+           (cons nil (cdr istack)))
+          ((eq info :stub)
+           (goto-char pos0)
+           istack)
+          (t istack))))
+
+(defun nrepl--bdecode-1 (&optional stack)
+  "Decode one elementary bencode object starting at point.
+Bencoded object is either list, dict, integer or string.  See
+http://en.wikipedia.org/wiki/Bencode#Encoding_algorithm for the encoding
+rules.
+
+STACK is a list of so far decoded components of the current message.  Car
+of STACK is the innermost incompletely decoded object.  The algorithm pops
+this list when inner object was completely decoded or grows it by one when
+new list or dict was encountered.
+
+The returned value is of the form (INFO . STACK) where INFO is
+:stub, nil, :end or :eob and STACK is either an incomplete parsing state as
+above (INFO is :stub, nil or :eob) or a list of one component representing
+the completely decoded message (INFO is :end).  INFO is nil when an
+elementary non-root object was successfully decoded.  INFO is :end when this
+object is a root list or dict."
+  (cond
+   ;; list
+   ((eq (char-after) ?l)
+    (nrepl--bdecode-list (cons () stack)))
+   ;; dict
+   ((eq (char-after) ?d)
+    (nrepl--bdecode-list (cons '(dict) stack)))
+   ;; end of a list or a dict
+   ((eq (char-after) ?e)
+    (forward-char 1)
+    (cons (if (cdr stack) :e :end)
+          (nrepl--push (nrepl--nreverse (car stack))
+                       (cdr stack))))
+   ;; string
+   ((looking-at "\\([0-9]+\\):")
+    (let ((pos0 (point))
+          (beg (goto-char (match-end 0)))
+          (end (byte-to-position (+ (position-bytes (point))
+                                    (string-to-number (match-string 1))))))
+      (if (null end)
+          (progn (goto-char pos0)
+                 (cons :stub stack))
+        (goto-char end)
+        (cons nil (nrepl--push (buffer-substring-no-properties beg end)
+                               stack)))))
+   ;; integer
+   ((looking-at "i\\(-?[0-9]+\\)e")
+    (goto-char (match-end 0))
+    (cons nil (nrepl--push (string-to-number (match-string 1))
+                           stack)))
+   ;; should happen in tests only as eobp is checked in nrepl-bdecode.
+   ((eobp)
+    (cons :eob stack))
+   ;; truncation in the middle of an integer or in 123: string prefix
+   ((looking-at "[0-9i]")
+    (cons :stub stack))
+   ;; else, throw a quiet error
+   (t
+    (message "Invalid bencode message detected. See %s buffer."
+             nrepl-message-buffer-name)
+    (nrepl-log-message
+     (format "Decoder error at position %d ('%s'):"
+             (point) (buffer-substring (point) (min (+ (point) 10) (point-max)))))
+    (nrepl-log-message (buffer-string))
+    (ding)
+    ;; Ensure loop break and clean queues' states in nrepl-bdecode:
+    (goto-char (point-max))
+    (cons :end nil))))
+
+(defun nrepl--bdecode-message (&optional stack)
+  "Decode one full message starting at point.
+STACK is as in `nrepl--bdecode-1'.  Return a cons (INFO . STACK)."
+  (let* ((istack (nrepl--bdecode-1 stack))
+         (info (car istack))
+         (stack (cdr istack)))
+    (while (or (null info)
+               (eq info :e))
+      (setq istack (nrepl--bdecode-1 stack)
+            info (car istack)
+            stack (cdr istack)))
+    istack))
+
+(defun nrepl-bdecode (string-q &optional response-q)
+  "Decode STRING-Q and place the results into RESPONSE-Q.
+STRING-Q is either a queue of strings or a string.  RESPONSE-Q is a queue of
+server requests (nREPL dicts).  STRING-Q and RESPONSE-Q are modified by side
+effects.
+
+Return a cons (STRING-Q . RESPONSE-Q) where STRING-Q is the original queue
+containing the remainder of the input strings which could not be
+decoded.  RESPONSE-Q is the original queue with successfully decoded messages
+enqueued and with slot STUB containing a nested stack of an incompletely
+decoded message or nil if the strings were completely decoded."
+  (with-temp-buffer
+    (if (queue-p string-q)
+        (while (queue-head string-q)
+          (insert (queue-dequeue string-q)))
+      (insert string-q)
+      (setq string-q (queue-create)))
+    (goto-char 1)
+    (unless response-q
+      (setq response-q (nrepl-response-queue)))
+    (let ((istack (nrepl--bdecode-message
+                   (nrepl-response-queue-stub response-q))))
+      (while (and (eq (car istack) :end)
+                  (not (eobp)))
+        (queue-enqueue response-q (cadr istack))
+        (setq istack (nrepl--bdecode-message)))
+      (unless (eobp)
+        (queue-enqueue string-q (buffer-substring (point) (point-max))))
+      (if (not (eq (car istack) :end))
+          (setf (nrepl-response-queue-stub response-q) (cdr istack))
+        (queue-enqueue response-q (cadr istack))
+        (setf (nrepl-response-queue-stub response-q) nil))
+      (cons string-q response-q))))
+
+(defun nrepl-bencode (object)
+  "Encode OBJECT with bencode.
+Integers, lists and nrepl-dicts are treated according to bencode
+specification.  Everything else is encoded as string."
+  (cond
+   ((integerp object) (format "i%de" object))
+   ((nrepl-dict-p object) (format "d%se" (apply 'concat (-map 'nrepl-bencode (cdr object)))))
+   ((listp object) (format "l%se" (apply 'concat (-map 'nrepl-bencode object))))
+   (t (format "%s:%s" (string-bytes object) object))))
+
+
+;;; Client: Process Filter
+
+(defun nrepl-client-filter (proc string)
+  "Decode message(s) from PROC contained in STRING and dispatch them."
+  ;; (nrepl-log-message string)
+  (let ((string-q (process-get proc :string-q)))
+    (queue-enqueue string-q string)
+    ;; Start decoding only if the last letter is 'e'
+    (when (eq ?e (aref string (1- (length string))))
+      (let ((response-q (process-get proc :response-q)))
+        (nrepl-bdecode string-q response-q)
+        (while (queue-head response-q)
+          (with-current-buffer (process-buffer proc)
+            (nrepl--dispatch-response (queue-dequeue response-q))))))))
+
+(defun nrepl--dispatch-response (response)
+  "Dispatch the RESPONSE to associated callback.
+First we check the callbacks of pending requests.  If no callback was found,
+we check the completed requests, since responses could be received even for
+older requests with \"done\" status."
+  (nrepl-dbind-response response (id)
+    (nrepl-log-message (cons '<- (cdr response)))
+    (let ((callback (or (gethash id nrepl-pending-requests)
+                        (gethash id nrepl-completed-requests))))
+      ;; normally all responses should have an associated callback
+      ;; in some scenarios, however, we get some nREPL responses
+      ;; without a matching request (https://github.com/clojure-emacs/cider/issues/853)
+      ;; until this is resolved we need the fallback handler
+      (if callback
+          (funcall callback response)
+        (message "nREPL: No response handler with id %s found" id)
+        ;; FIXME: This should be removed when we identify what's causing
+        ;; the problems described in https://github.com/clojure-emacs/cider/issues/853
+        (funcall (nrepl--make-fallback-handler) response)))))
+
+(defun nrepl-client-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)
+      (run-hooks 'nrepl-disconnected-hook)))
+
+
+;;; Network
+
+(defun nrepl-connect (host port)
+  "Connect to machine identified by HOST and PORT.
+For local hosts use a direct connection. For remote hosts, if
+`nrepl-force-ssh-for-remote-hosts' is nil, attempt a direct connection
+first. If `nrepl-force-ssh-for-remote-hosts' is non-nil or the direct
+connection failed, try to start a SSH tunneled connection. Return a plist
+of the form (:proc PROC :host \"HOST\" :port PORT) that might contain
+additional key-values depending on the connection type."
+  (let ((localp (if host
+                    (nrepl-local-host-p host)
+                  (not (file-remote-p default-directory)))))
+    (if  localp
+        (nrepl--direct-connect (or host "localhost") port)
+      (or (and host (not nrepl-force-ssh-for-remote-hosts)
+               (nrepl--direct-connect host port 'no-error))
+          (nrepl--ssh-tunnel-connect host port)))))
+
+(defun nrepl--direct-connect (host port &optional no-error)
+  "If HOST and PORT are given, try to `open-network-stream'.
+If NO-ERROR is non-nil, show messages instead of throwing an error."
+  (if (not (and host port))
+      (unless no-error
+        (error "Host (%s) and port (%s) must be provided" host port))
+    (message "nREPL: Establishing direct connection to %s:%s ..." host port)
+    (condition-case nil
+        (prog1 (list :proc (open-network-stream "nrepl" nil host port)
+                     :host host :port port)
+          (message "nREPL: Direct connection established"))
+      (error (let ((mes "nREPL: Direct connection failed"))
+               (if no-error (message mes) (error mes))
+               nil)))))
+
+(defun nrepl--ssh-tunnel-connect (host port)
+  "Connect to a remote machine identified by HOST and PORT through SSH tunnel."
+  (message "nREPL: Establishing SSH tunneled connection ...")
+  (let* ((remote-dir (if host (format "/ssh:%s:" host) default-directory))
+         (ssh (or (executable-find "ssh")
+                  (error "nREPL: Cannot locate 'ssh' executable")))
+         (cmd (nrepl--ssh-tunnel-command ssh remote-dir port))
+         (tunnel-buf (nrepl-tunnel-buffer-name))
+         (tunnel (start-process-shell-command "nrepl-tunnel" tunnel-buf cmd)))
+    (process-put tunnel :waiting-for-port t)
+    (set-process-filter tunnel (nrepl--ssh-tunnel-filter port))
+    (while (and (process-live-p tunnel)
+                (process-get tunnel :waiting-for-port))
+      (accept-process-output nil 0.005))
+    (if (not (process-live-p tunnel))
+        (error "nREPL: SSH port forwarding failed. Check the '%s' buffer." tunnel-buf)
+      (message "nREPL: SSH port forwarding established to localhost:%s" port)
+      (let ((endpoint (nrepl--direct-connect "localhost" port)))
+        (-> endpoint
+          (plist-put :tunnel tunnel)
+          (plist-put :remote-host host))))))
+
+(defun nrepl--ssh-tunnel-command (ssh dir port)
+  "Command string to open SSH tunnel to the host associated with DIR's PORT."
+  (with-parsed-tramp-file-name dir nil
+    ;; this abuses the -v option for ssh to get output when the port
+    ;; forwarding is set up, which is used to synchronise on, so that
+    ;; the port forwarding is up when we try to connect.
+    (format-spec
+     "%s -v -N -L %p:localhost:%p %u'%h'"
+     `((?s . ,ssh)
+       (?p . ,port)
+       (?h . ,host)
+       (?u . ,(if user (format "-l '%s' " user) ""))))))
+
+(defun nrepl--ssh-tunnel-filter (port)
+  "Return a process filter that waits for PORT to appear in process output."
+  (let ((port-string (format "LOCALHOST:%s" port)))
+    (lambda (proc string)
+      (when (string-match port-string string)
+        (process-put proc :waiting-for-port nil))
+      (when (and (process-live-p proc)
+                 (buffer-live-p (process-buffer proc)))
+        (with-current-buffer (process-buffer proc)
+          (let ((moving (= (point) (process-mark proc))))
+            (save-excursion
+              (goto-char (process-mark proc))
+              (insert string)
+              (set-marker (process-mark proc) (point)))
+            (if moving (goto-char (process-mark proc)))))))))
+
+
+;;; Client: Process Handling
+
+;; `nrepl-start-client-process' is called from `nrepl-server-filter'. It
+;; starts the client process described by `nrepl-client-filter' and
+;; `nrepl-client-sentinel'.
+(defun nrepl-start-client-process (&optional host port replp server-proc)
+  "Create new client process identified by HOST and PORT.
+If eitehr HOST or PORT are nil, pick them from the value returned by
+`nrepl-connection-endpoint'.  If REPLP is non-nil create a client
+connection which is associated with a repl buffer.  When non-nil,
+SERVER-PROC must be a running nrepl server process within Emacs.  Return
+the newly created client connection process."
+  (let* ((endpoint (nrepl-connect host port))
+         (client-proc (plist-get endpoint :proc))
+         (host (plist-get endpoint :host))
+         (port (plist-get endpoint :port))
+         (client-buf (if replp
+                         (cider-repl-create default-directory host port)
+                       (nrepl-create-connection-buffer default-directory host port))))
+
+    (set-process-buffer client-proc (get-buffer client-buf))
+
+    (set-process-filter client-proc 'nrepl-client-filter)
+    (set-process-sentinel client-proc 'nrepl-client-sentinel)
+    (set-process-coding-system client-proc 'utf-8-unix 'utf-8-unix)
+
+    (process-put client-proc :string-q (queue-create))
+    (process-put client-proc :response-q (nrepl-response-queue))
+
+    (with-current-buffer client-buf
+      (-when-let (server-buf (and server-proc (process-buffer server-proc)))
+        (setq nrepl-project-dir (buffer-local-value 'nrepl-project-dir server-buf)
+              nrepl-server-buffer server-buf))
+      (setq nrepl-endpoint `(,host ,port)
+            ;; FIXME: REPL and connection buffers are the same thing
+            nrepl-connection-buffer client-buf
+            nrepl-repl-buffer (when replp client-buf)
+            nrepl-buffer-ns "user"
+            nrepl-tunnel-buffer (-when-let (tunnel (plist-get endpoint :tunnel))
+                                  (process-buffer tunnel))
+            nrepl-pending-requests (make-hash-table :test 'equal)
+            nrepl-completed-requests (make-hash-table :test 'equal)))
+
+    (nrepl-make-connection-default client-buf)
+    (nrepl--init-client-sessions client-proc)
+    (nrepl--init-connection-buffer client-buf replp)
+    (cider--check-required-nrepl-ops)
+    (cider--check-middleware-compatibility)
+    (run-hooks 'nrepl-connected-hook)
+
+    client-proc))
+
+(defun nrepl--init-client-sessions (client)
+  "Initialize CLIENT nREPL sessions.
+
+We create two client nREPL sessions per connection - a main session and a tooling
+session. The main session is general purpose and is used for pretty much
+every request that needs a session. The tooling session is used only for
+functionality that's implemented in terms of the \"eval\" op, so that eval requests
+for functionality like pretty-printing won't clobber the values of *1, *2, etc."
+  (let ((response-main (nrepl-sync-request:clone))
+        (response-tooling (nrepl-sync-request:clone)))
+    (nrepl-dbind-response response-main (new-session err)
+      (if new-session
+          (with-current-buffer (process-buffer client)
+            (setq nrepl-session new-session))
+        (error "Could not create new session (%s)" err)))
+    (nrepl-dbind-response response-tooling (new-session err)
+      (if new-session
+          (with-current-buffer (process-buffer client)
+            (setq nrepl-tooling-session new-session))
+        (error "Could not create new tooling session (%s)" err)))))
+
+(defun nrepl--init-connection-buffer (conn-buffer replp)
+  "Initialize CONN-BUFFER as a connection buffer.
+If REPLP is non-nil, initialize as a REPL buffer.
+
+Here we determine the main session's capabilities using the \"describe\" op
+and store that information as buffer-local data in the connection buffer."
+  (let ((description (nrepl-sync-request:describe)))
+    (nrepl-dbind-response description (ops versions)
+      (with-current-buffer conn-buffer
+        (setq nrepl-ops ops)
+        (setq nrepl-versions versions)))
+    (when replp
+      (cider-repl-init conn-buffer))))
+
+(defun nrepl-close-client-sessions ()
+  "Close the nREPL sessions for the active connection."
+  (nrepl-sync-request:close (nrepl-current-session))
+  (nrepl-sync-request:close (nrepl-current-tooling-session)))
+
+(defun nrepl-close (connection-buffer)
+  "Close the nREPL connection for CONNECTION-BUFFER."
+  (interactive (list (nrepl-current-connection-buffer)))
+  (nrepl-close-client-sessions)
+  (nrepl--close-connection-buffer connection-buffer)
+  (run-hooks 'nrepl-disconnected-hook)
+  (nrepl--connections-refresh))
+
+
+;;; Client: Response Handling
+;; After being decoded, responses (aka, messages from the server) are dispatched
+;; to handlers. Handlers are constructed with `nrepl-make-response-handler'.
+
+(defvar nrepl-err-handler 'cider-default-err-handler
+  "Evaluation error handler.")
+
+(defun nrepl-make-response-handler (buffer value-handler stdout-handler
+                                           stderr-handler done-handler
+                                           &optional eval-error-handler)
+  "Make a response handler for connection BUFFER.
+A handler is a function that takes one argument - response received from
+the server process.  The response is an alist that contains at least 'id'
+and 'session' keys.  Other standard response keys are 'value', 'out', 'err'
+and 'status'.
+
+The presence of a particular key determines the type of the response.  For
+example, if 'value' key is present, the response is of type 'value', if
+'out' key is present the response is 'stdout' etc.  Depending on the typea,
+the handler dispatches the appropriate value to one of the supplied
+handlers: VALUE-HANDLER, STDOUT-HANDLER, STDERR-HANDLER, DONE-HANDLER, and
+EVAL-ERROR-HANDLER.  If the optional EVAL-ERROR-HANDLER is nil, the default
+`nrepl-err-handler' is used.  If any of the other supplied handlers are nil
+nothing happens for the coresponding type of response.
+
+When `nrepl-log-messages' is non-nil, *nrepl-messages* buffer contains
+server responses."
+  (lambda (response)
+    (nrepl-dbind-response response (value ns out err status id ex root-ex
+                                          session)
+      (cond (value
+             (with-current-buffer buffer
+               (when (and ns (not (derived-mode-p 'clojure-mode)))
+                 (setq nrepl-buffer-ns ns)))
+             (when value-handler
+               (funcall value-handler buffer value)))
+            (out
+             (when stdout-handler
+               (funcall stdout-handler buffer out)))
+            (err
+             (when stderr-handler
+               (funcall stderr-handler buffer err)))
+            (status
+             (when (member "interrupted" status)
+               (message "Evaluation interrupted."))
+             (when (member "eval-error" status)
+               (funcall (or eval-error-handler nrepl-err-handler)
+                        buffer ex root-ex session))
+             (when (member "namespace-not-found" status)
+               (message "Namespace not found."))
+             (when (member "need-input" status)
+               (cider-need-input buffer))
+             (when (member "done" status)
+               (puthash id (gethash id nrepl-pending-requests) nrepl-completed-requests)
+               (remhash id nrepl-pending-requests)
+               (when done-handler
+                 (funcall done-handler buffer))))))))
+
+(defun nrepl--make-fallback-handler ()
+  "Fallback handler which is invoked when no handler is found.
+Handles only stdout and stderr responses."
+  (nrepl-make-response-handler (cider-current-repl-buffer)
+                               ;; VALUE
+                               '()
+                               ;; STDOUT
+                               (lambda (buffer out)
+                                 ;; fixme: rename into emit-out-output
+                                 (cider-repl-emit-output buffer out))
+                               ;; STDERR
+                               (lambda (buffer err)
+                                 (cider-repl-emit-err-output buffer err))
+                               ;; DONE
+                               '()))
+
+
+;;; Client: Request Core API
+
+;; Requests are messages from an nREPL client (like CIDER) to an nREPL server.
+;; Requests can be asynchronous (sent with `nrepl-send-request') or
+;; synchronous (send with `nrepl-send-sync-request'). The request is a pair list
+;; of operation name and operation parameters. The core operations are described
+;; at https://github.com/clojure/tools.nrepl/blob/master/doc/ops.md. CIDER adds
+;; many more operations through nREPL middleware. See
+;; https://github.com/clojure-emacs/cider-nrepl#supplied-nrepl-middleware for
+;; the up to date list.
+(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 (cl-incf nrepl-request-counter))))
+
+(defun nrepl-send-request (request callback)
+  "Send REQUEST and register response handler CALLBACK.
+REQUEST is a pair list of the form (\"op\" \"operation\" \"par1-name\"
+\"par1\" ... ). See the code of `nrepl-request:clone',
+`nrepl-request:stdin', etc."
+  (let* ((id (nrepl-next-request-id))
+         (request (cons 'dict (lax-plist-put request "id" id)))
+         (message (nrepl-bencode request)))
+    (nrepl-log-message (cons '---> (cdr request)))
+    (with-current-buffer (nrepl-current-connection-buffer)
+      (puthash id callback nrepl-pending-requests)
+      (process-send-string nil message))))
+
+(defun nrepl-send-sync-request (request)
+  "Send REQUEST to the nREPL server synchronously.
+Hold till final \"done\" message has arrived and join all response messages
+of the same \"op\" that came along."
+  (let* ((time0 (current-time))
+         (response (cons 'dict nil)))
+    (nrepl-send-request request (lambda (resp) (nrepl--merge response resp)))
+    (while (not (member "done" (nrepl-dict-get response "status")))
+      (accept-process-output nil 0.01)
+      ;; break out in case we don't receive a response for a while
+      (when (and nrepl-sync-request-timeout
+                 (> (cadr (time-subtract (current-time) time0))
+                    nrepl-sync-request-timeout))
+        (error "Sync nREPL request timed out %s" request)))
+    (-when-let* ((ex (nrepl-dict-get response "ex"))
+                 (err (nrepl-dict-get response "err")))
+      (cider-repl-emit-interactive-err-output err)
+      (message err))
+    (-when-let (id (nrepl-dict-get response "id"))
+      ;; FIXME: This should go away eventually when we get rid of
+      ;; pending-request hash table
+      (with-current-buffer (nrepl-current-connection-buffer)
+        (remhash id nrepl-pending-requests)))
+    response))
+
+(defun nrepl-request:stdin (input callback)
+  "Send a :stdin request with INPUT.
+Register CALLBACK as the response handler."
+  (nrepl-send-request (list "op" "stdin"
+                            "stdin" input
+                            "session" (nrepl-current-session))
+                      callback))
+
+(defun nrepl-request:interrupt (pending-request-id callback)
+  "Send an :interrupt request 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)
+  "Prepare :eval request message for INPUT in the context of NS ans SESSION."
+  (append (and ns (list "ns" ns))
+          (list "op" "eval"
+                "session" (or session (nrepl-current-session))
+                "code" input)))
+
+(defun nrepl-request:eval (input callback &optional ns session)
+  "Send the request INPUT and register the CALLBACK as the response handler.
+If NS is non-nil, include it in the request. SESSION defaults to current session."
+  (nrepl-send-request (nrepl--eval-request input ns session) callback))
+
+(defun nrepl-sync-request:clone ()
+  "Sent a :clone request to create a new client session."
+  (nrepl-send-sync-request '("op" "clone")))
+
+(defun nrepl-sync-request:close (session)
+  "Sent a :close request to close SESSION."
+  (nrepl-send-sync-request (list "op" "close" "session" session)))
+
+(defun nrepl-sync-request:describe (&optional session)
+  "Perform :describe request."
+  (if session
+      (nrepl-send-sync-request (list "session" session "op" "describe"))
+    (nrepl-send-sync-request '("op" "describe"))))
+
+(defun nrepl-sync-request:ls-sessions ()
+  "Perform :ls-sessions request."
+  (nrepl-send-sync-request '("op" "ls-sessions")))
+
+(defun nrepl-sync-request:eval (input &optional ns session)
+  "Send the INPUT to the nREPL server synchronously.
+If NS is non-nil, include it in the request. SESSION defaults to current
+session."
+  (nrepl-send-sync-request (nrepl--eval-request input ns session)))
+
+(defun nrepl-sessions ()
+  "Get a list of active sessions for the current nREPL connections."
+  (nrepl-dict-get (nrepl-sync-request:ls-sessions) "sessions"))
+
+
+;;; Server
+
+;; The server side process is started by `nrepl-start-server-process' and has a
+;; very simple filter that pipes its output directly into its process buffer
+;; (*nrepl-server*). The main purpose of this process is to start the actual
+;; nrepl communication client (`nrepl-client-filter') when the message "nREPL
+;; server started on port ..." is detected.
+
+(defun nrepl-start-server-process (directory cmd)
+  "Start nREPL server process in DIRECTORY using shell command CMD.
+Return a newly created process."
+  (let* ((default-directory (or directory default-directory))
+         (serv-buf (get-buffer-create (generate-new-buffer-name
+                                       (nrepl-server-buffer-name directory))))
+         (serv-proc (start-file-process-shell-command
+                     "nrepl-server" serv-buf cmd)))
+    (set-process-filter serv-proc 'nrepl-server-filter)
+    (set-process-sentinel serv-proc 'nrepl-server-sentinel)
+    (set-process-coding-system serv-proc 'utf-8-unix 'utf-8-unix)
+    (with-current-buffer serv-buf
+      (setq nrepl-project-dir directory))
+    (message "Starting nREPL server via %s..."
+             (propertize cmd 'face 'font-lock-keyword-face))
+    serv-proc))
+
+(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 ((client-proc (nrepl-start-client-process nil port t process)))
+          ;; FIXME: Bad connection tracking system. There can be multiple client
+          ;; connections per server
+          (setq nrepl-connection-buffer (buffer-name (process-buffer client-proc))))))))
+
+(defun nrepl-server-sentinel (process event)
+  "Handle nREPL server PROCESS EVENT."
+  (let* ((nrepl-buffer (process-buffer process))
+         (connection-buffer (buffer-local-value 'nrepl-connection-buffer nrepl-buffer))
+         (problem (if (and nrepl-buffer (buffer-live-p nrepl-buffer))
+                      (with-current-buffer nrepl-buffer
+                        (buffer-substring (point-min) (point-max)))
+                    "")))
+    (when nrepl-buffer
+      (kill-buffer nrepl-buffer))
+    (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 CIDER"))
+     (t (error "Could not start nREPL server: %s" problem)))))
+
+
+;;; Messages
+
+(defcustom nrepl-log-messages nil
+  "If non-nil, log protocol messages to the `nrepl-message-buffer-name' buffer."
+  :type 'boolean
+  :group 'nrepl)
+
+(defconst nrepl-message-buffer-max-size 1000000
+  "Maximum size for the nREPL message buffer.
+Defaults to 1000000 characters, which should be an insignificant
+memory burden, while providing reasonable history.")
+
+(defconst nrepl-message-buffer-reduce-denominator 4
+  "Divisor by which to reduce message buffer size.
+When the maximum size for the nREPL message 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.")
+
+(defvar nrepl-messages-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "n") 'next-line)
+    (define-key map (kbd "p") 'previous-line)
+    map))
+
+(define-derived-mode nrepl-messages-mode special-mode "nREPL Messages"
+  "Major mode for displaying nREPL messages.
+
+\\{nrepl-messages-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil)
+  (setq-local comment-start ";")
+  (setq-local comment-end "")
+  (setq-local paragraph-start "(--->\\|(<-")
+  (setq-local paragraph-separate "(<-"))
+
+(defun nrepl-log-message (msg)
+  "Log the given MSG to the buffer given by `nrepl-message-buffer-name'."
+  (when nrepl-log-messages
+    (with-current-buffer (nrepl-messages-buffer)
+      (setq buffer-read-only nil)
+      (when (> (buffer-size) nrepl-message-buffer-max-size)
+        (goto-char (/ (buffer-size) nrepl-message-buffer-reduce-denominator))
+        (re-search-forward "^(" nil t)
+        (delete-region (point-min) (- (point) 1)))
+      (goto-char (point-max))
+      (nrepl--pp msg)
+      (-when-let (win (get-buffer-window))
+        (set-window-point win (point-max)))
+      (setq buffer-read-only t))))
+
+(defvar nrepl--message-colors
+  '("red" "brown" "coral" "orange" "green" "deep sky blue" "blue" "dark violet")
+  "Colors used in `nrepl-messages-buffer'.")
+
+(defun nrepl--pp (object)
+  "Pretty print nREPL OBJECT."
+  (if (not (and (listp object)
+                (memq (car object) '(<- ---> dict))))
+      (progn (pp object (current-buffer))
+             (unless (listp object) (insert "\n")))
+    (let* ((id (lax-plist-get (cdr object) "id"))
+           (id (and id (mod (string-to-number id)
+                            (length nrepl--message-colors))))
+           (head (format "(%s" (car object)))
+           (foreground (and id (nth id nrepl--message-colors))))
+      (cl-flet ((color (str)
+                       (propertize str 'face `(:weight ultra-bold :foreground ,foreground))))
+        (insert (color head))
+        (let ((indent (+ 2 (- (current-column) (length head)))))
+          (if (null (cdr object))
+              (insert ")\n")
+            (insert "\n")
+            (cl-loop for l on (cdr object) by #'cddr
+                     do (let ((str (format "%s%s  " (make-string indent ? ) (car l))))
+                          (insert str)
+                          (nrepl--pp (cadr l))))
+            (insert (color (format "%s)\n" (make-string (- indent 2) ? ))))))))))
+
+(defun nrepl-messages-buffer ()
+  "Return or create the buffer given by `nrepl-message-buffer-name'.
+The default buffer name is *nrepl-messages*."
+  (or (get-buffer nrepl-message-buffer-name)
+      (let ((buffer (get-buffer-create nrepl-message-buffer-name)))
+        (with-current-buffer buffer
+          (buffer-disable-undo)
+          (nrepl-messages-mode)
+          buffer))))
+
+
+;;; Connection Buffer Management
+
+(defvar nrepl-connection-list nil
+  "A list of connections.")
+
+(defun nrepl-current-host ()
+  "Retrieve the current host."
+  (if (and (stringp buffer-file-name)
+           (file-remote-p buffer-file-name))
+      tramp-current-host
+    nrepl-host))
+
+(defun nrepl-create-connection-buffer (&optional project-dir host port)
+  "Create an nREPL connection buffer.
+PROJECT-DIR, HOST and PORT are as in `nrepl-make-buffer-name'."
+  (let ((buffer (generate-new-buffer (nrepl-connection-buffer-name project-dir host port))))
+    (with-current-buffer buffer
+      (buffer-disable-undo)
+      (setq-local kill-buffer-query-functions nil))
+    buffer))
+
+(defun nrepl-current-connection-buffer (&optional no-error)
+  "The connection to use for nREPL interaction.
+When NO-ERROR is non-nil, don't throw an error when no connection has been
+found."
+  (or nrepl-connection-buffer
+      (car (nrepl-connection-buffers))
+      (unless no-error
+        (error "No nREPL connection buffer"))))
+
+(defun nrepl-connection-buffers ()
+  "Return the connection list.
+Purge the dead buffers from the `nrepl-connection-list' beforehand."
+  (setq nrepl-connection-list
+        (-remove (lambda (buffer)
+                   (not (buffer-live-p (get-buffer buffer))))
+                 nrepl-connection-list)))
+
+;; FIXME: Bad user api; don't burden users with management of
+;; the connection list, same holds for `cider-rotate-connection'.
+(defun nrepl-make-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 (conn-buffer)
+  "Closes CONN-BUFFER, removing it from `nrepl-connection-list'.
+Also closes associated REPL and server buffers."
+  (let ((buffer (get-buffer conn-buffer)))
+    (setq nrepl-connection-list
+          (delq (buffer-name buffer) nrepl-connection-list))
+    (when (buffer-live-p buffer)
+      (dolist (buf `(,(buffer-local-value 'nrepl-server-buffer buffer)
+                     ,(buffer-local-value 'nrepl-tunnel-buffer buffer)
+                     ,buffer))
+        (when buf
+          (cider--close-buffer buf))))))
+
+
+;;; Connection Browser
+
+;; FIXME: Naming conventions are pretty messy here. Some
+;; interactive commands are named with "--". nrepl--project-name` is pretty
+;; often used across cider, so it's not very internal.
+(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 (stack)
+  "Extracts a project name from STACK, possibly nil.
+The project name is the final component of STACK if not nil."
+  (when stack
+    (file-name-nondirectory (directory-file-name stack))))
+
+(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-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)))))
+
+
+(define-obsolete-function-alias 'nrepl-send-request-sync 'nrepl-send-sync-request "0.8.0")
+(define-obsolete-function-alias 'nrepl-send-string 'nrepl-request:eval "0.8.0")
+(define-obsolete-function-alias 'nrepl-send-string-sync 'nrepl-sync-request:eval "0.8.0")
+(define-obsolete-variable-alias 'nrepl-log-events 'nrepl-log-messages "0.7.0")
+
+(provide 'nrepl-client)
+
+;;; nrepl-client.el ends here
diff --git a/elpa/cider-0.8.2/nrepl-client.elc b/elpa/cider-0.8.2/nrepl-client.elc
new file mode 100644
index 000000000..a446dfc0a
Binary files /dev/null and b/elpa/cider-0.8.2/nrepl-client.elc differ
diff --git a/elpa/cider-20131221.1231/cider-autoloads.el b/elpa/cider-20131221.1231/cider-autoloads.el
deleted file mode 100644
index 8e962ef09..000000000
--- a/elpa/cider-20131221.1231/cider-autoloads.el
+++ /dev/null
@@ -1,86 +0,0 @@
-;;; 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
deleted file mode 100644
index 6371231d4..000000000
--- a/elpa/cider-20131221.1231/cider-client.el
+++ /dev/null
@@ -1,172 +0,0 @@
-;;; 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-interaction.el b/elpa/cider-20131221.1231/cider-interaction.el
deleted file mode 100644
index 230bf6f4f..000000000
--- a/elpa/cider-20131221.1231/cider-interaction.el
+++ /dev/null
@@ -1,1211 +0,0 @@
-;;; 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-mode.el b/elpa/cider-20131221.1231/cider-mode.el
deleted file mode 100644
index 32b09c0b7..000000000
--- a/elpa/cider-20131221.1231/cider-mode.el
+++ /dev/null
@@ -1,123 +0,0 @@
-;;; 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
deleted file mode 100644
index 867de7311..000000000
--- a/elpa/cider-20131221.1231/cider-pkg.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(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
deleted file mode 100644
index dda6ce10e..000000000
Binary files a/elpa/cider-20131221.1231/cider-pkg.elc and /dev/null differ
diff --git a/elpa/cider-20131221.1231/cider-util.el b/elpa/cider-20131221.1231/cider-util.el
deleted file mode 100644
index e6fe66a6d..000000000
--- a/elpa/cider-20131221.1231/cider-util.el
+++ /dev/null
@@ -1,57 +0,0 @@
-;;; 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
deleted file mode 100644
index 3d7965ace..000000000
Binary files a/elpa/cider-20131221.1231/cider-util.elc and /dev/null differ
diff --git a/elpa/cider-20131221.1231/cider-version.el b/elpa/cider-20131221.1231/cider-version.el
deleted file mode 100644
index f7b7d0695..000000000
--- a/elpa/cider-20131221.1231/cider-version.el
+++ /dev/null
@@ -1,78 +0,0 @@
-;;; 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
deleted file mode 100644
index 05cd794c8..000000000
Binary files a/elpa/cider-20131221.1231/cider-version.elc and /dev/null differ
diff --git a/elpa/cider-20131221.1231/cider.el b/elpa/cider-20131221.1231/cider.el
deleted file mode 100644
index 78e752e79..000000000
--- a/elpa/cider-20131221.1231/cider.el
+++ /dev/null
@@ -1,111 +0,0 @@
-;;; 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
deleted file mode 100644
index a3a89a5f3..000000000
--- a/elpa/cider-20131221.1231/nrepl-client.el
+++ /dev/null
@@ -1,892 +0,0 @@
-;;; 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
deleted file mode 100644
index 7bc29b5a9..000000000
--- a/elpa/cl-lib-0.3/cl-lib-autoloads.el
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; cl-lib-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads nil nil ("cl-lib-pkg.el" "cl-lib.el") (21016 60933
-;;;;;;  954335))
-
-;;;***
-
-(provide 'cl-lib-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; cl-lib-autoloads.el ends here
diff --git a/elpa/cl-lib-0.3/cl-lib-pkg.el b/elpa/cl-lib-0.3/cl-lib-pkg.el
deleted file mode 100644
index 40996be44..000000000
--- a/elpa/cl-lib-0.3/cl-lib-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "cl-lib" "0.3" "Properly prefixed CL functions and macros" (quote nil))
diff --git a/elpa/cl-lib-0.3/cl-lib.el b/elpa/cl-lib-0.3/cl-lib.el
deleted file mode 100644
index a1df0a230..000000000
--- a/elpa/cl-lib-0.3/cl-lib.el
+++ /dev/null
@@ -1,342 +0,0 @@
-;;; cl-lib.el --- Properly prefixed CL functions and macros  -*- coding: utf-8 -*-
-
-;; Copyright (C) 2012, 2013  Free Software Foundation, Inc.
-
-;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; vcomment: Emacs-24.3's version is 1.0 so this has to stay below.
-;; Version: 0.3
-
-;; 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:
-
-;; This is a forward compatibility package, which provides (a subset of) the
-;; features of the cl-lib package introduced in Emacs-24.3, for use on
-;; previous emacsen.
-
-;; Make sure this is installed *late* in your `load-path`, i.e. after Emacs's
-;; built-in .../lisp/emacs-lisp directory, so that if/when you upgrade to
-;; Emacs-24.3, the built-in version of the file will take precedence, otherwise
-;; you could get into trouble (although we try to hack our way around the
-;; problem in case it happens).
-
-;; This code is largely copied from Emacs-24.3's cl.el, with the alias bindings
-;; simply reversed.
-
-;;; Code:
-
-(when (functionp 'macroexp--compiler-macro)
-  ;; `macroexp--compiler-macro' was introduced as part of the big CL
-  ;; reorganization which moved/reimplemented some of CL into core (mostly the
-  ;; setf and compiler-macro support), so its presence indicates we're running
-  ;; in an Emacs that comes with the new cl-lib.el, where this file should
-  ;; never be loaded!
-  (message "Real cl-lib shadowed by compatibility cl-lib? (%s)" load-file-name)
-  (when load-file-name
-    ;; (message "Let's try to patch things up")
-    (let ((loaddir (file-name-directory load-file-name))
-          load-path-dir)
-      ;; Find the problematic directory from load-path.
-      (dolist (dir load-path)
-        (if (equal loaddir (expand-file-name (file-name-as-directory dir)))
-            (setq load-path-dir dir)))
-      (when load-path-dir
-        ;; (message "Let's move the offending dir to the end")
-        (setq load-path (append (remove load-path-dir load-path)
-                                (list load-path-dir)))
-        ;; Here we could manually load cl-lib and then return immediately.
-        ;; But Emacs currently doesn't provide any way for a file to "return
-        ;; immediately", so instead we make sure the rest of the file does not
-        ;; throw away any pre-existing definition.
-        ))))
-
-(require 'cl)
-
-;; Some of Emacs-24.3's cl.el definition are not just aliases, because either
-;; the feature was dropped from cl-lib.el or because the cl-lib version is
-;; not fully compatible.
-;; Let's just not include them here, since it is very important that if code
-;; works with this cl-lib.el it should also work with Emacs-24.3's cl-lib.el,
-;; whereas the reverse is much less important.
-
-(dolist (var '(
-               ;; loop-result-var
-               ;; loop-result
-               ;; loop-initially
-               ;; loop-finally
-               ;; loop-bindings
-               ;; loop-args
-               ;; bind-inits
-               ;; bind-block
-               ;; lambda-list-keywords
-               float-negative-epsilon
-               float-epsilon
-               least-negative-normalized-float
-               least-positive-normalized-float
-               least-negative-float
-               least-positive-float
-               most-negative-float
-               most-positive-float
-               ;; custom-print-functions
-               ))
-  (let ((new (intern (format "cl-%s" var))))
-    (unless (boundp new) (defvaralias new var))))
-
-(dolist (fun '(
-               (get* . cl-get)
-               (random* . cl-random)
-               (rem* . cl-rem)
-               (mod* . cl-mod)
-               (round* . cl-round)
-               (truncate* . cl-truncate)
-               (ceiling* . cl-ceiling)
-               (floor* . cl-floor)
-               (rassoc* . cl-rassoc)
-               (assoc* . cl-assoc)
-               (member* . cl-member)
-               (delete* . cl-delete)
-               (remove* . cl-remove)
-               (defsubst* . cl-defsubst)
-               (sort* . cl-sort)
-               (function* . cl-function)
-               (defmacro* . cl-defmacro)
-               (defun* . cl-defun)
-               (mapcar* . cl-mapcar)
-
-               remprop
-               getf
-               tailp
-               list-length
-               nreconc
-               revappend
-               concatenate
-               subseq
-               random-state-p
-               make-random-state
-               signum
-               isqrt
-               lcm
-               gcd
-               notevery
-               notany
-               every
-               some
-               mapcon
-               mapcan
-               mapl
-               maplist
-               map
-               equalp
-               coerce
-               tree-equal
-               nsublis
-               sublis
-               nsubst-if-not
-               nsubst-if
-               nsubst
-               subst-if-not
-               subst-if
-               subsetp
-               nset-exclusive-or
-               set-exclusive-or
-               nset-difference
-               set-difference
-               nintersection
-               intersection
-               nunion
-               union
-               rassoc-if-not
-               rassoc-if
-               assoc-if-not
-               assoc-if
-               member-if-not
-               member-if
-               merge
-               stable-sort
-               search
-               mismatch
-               count-if-not
-               count-if
-               count
-               position-if-not
-               position-if
-               position
-               find-if-not
-               find-if
-               find
-               nsubstitute-if-not
-               nsubstitute-if
-               nsubstitute
-               substitute-if-not
-               substitute-if
-               substitute
-               delete-duplicates
-               remove-duplicates
-               delete-if-not
-               delete-if
-               remove-if-not
-               remove-if
-               replace
-               fill
-               reduce
-               compiler-macroexpand
-               define-compiler-macro
-               assert
-               check-type
-               typep
-               deftype
-               defstruct
-               callf2
-               callf
-               letf*
-               letf
-               rotatef
-               shiftf
-               remf
-               psetf
-               (define-setf-method . define-setf-expander)
-               declare
-               the
-               locally
-               multiple-value-setq
-               multiple-value-bind
-               symbol-macrolet
-               macrolet
-               progv
-               psetq
-               do-all-symbols
-               do-symbols
-               dotimes
-               dolist
-               do*
-               do
-               loop
-               return-from
-               return
-               block
-               etypecase
-               typecase
-               ecase
-               case
-               load-time-value
-               eval-when
-               destructuring-bind
-               gentemp
-               gensym
-               pairlis
-               acons
-               subst
-               adjoin
-               copy-list
-               ldiff
-               list*
-               cddddr
-               cdddar
-               cddadr
-               cddaar
-               cdaddr
-               cdadar
-               cdaadr
-               cdaaar
-               cadddr
-               caddar
-               cadadr
-               cadaar
-               caaddr
-               caadar
-               caaadr
-               caaaar
-               cdddr
-               cddar
-               cdadr
-               cdaar
-               caddr
-               cadar
-               caadr
-               caaar
-               tenth
-               ninth
-               eighth
-               seventh
-               sixth
-               fifth
-               fourth
-               third
-               endp
-               rest
-               second
-               first
-               svref
-               copy-seq
-               evenp
-               oddp
-               minusp
-               plusp
-               floatp-safe
-               declaim
-               proclaim
-               nth-value
-               multiple-value-call
-               multiple-value-apply
-               multiple-value-list
-               values-list
-               values
-               pushnew
-               decf
-               incf
-
-               dolist
-               dotimes
-               ))
-  (let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun)))
-               (intern (format "cl-%s" fun)))))
-    (unless (fboundp new) (defalias new fun))))
-
-;; `cl-labels' is not 100% compatible with `labels' when using dynamic scoping
-;; (mostly because it does not turn lambdas that refer to those functions into
-;; closures).  OTOH it is compatible when using lexical scoping.
-
-(unless (fboundp 'cl-labels)
-  (defmacro cl-labels (&rest args)
-    (unless (and (boundp 'lexical-binding) lexical-binding)
-      ;; We used to signal an error rather than a message, but in many uses of
-      ;; cl-labels, the value of lexical-binding doesn't actually matter.
-      ;; More importantly, the value of `lexical-binding' here is unreliable
-      ;; (it does not necessarily reflect faithfully whether the output of this
-      ;; macro will be interpreted as lexically bound code or not).
-      (message "This `cl-labels' requires `lexical-binding' to be non-nil"))
-    `(labels ,@args)))
-
-;;;; ChangeLog:
-
-;; 2013-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
-;; 
-;; 	* cl-lib.el (cl-labels): Demote error to message and improve it.
-;; 
-;; 2012-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>
-;; 
-;; 	* cl-lib.el: Try and patch things up in case we're hiding the real cl-lib.
-;; 
-;; 2012-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
-;; 
-;; 	Add cl-letf and cl-labels.
-;; 
-;; 2012-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
-;; 
-;; 	* packages/cl-lib: New package.
-;; 
-
-
-(provide 'cl-lib)
-;;; cl-lib.el ends here
diff --git a/elpa/cl-lib-0.3/cl-lib.elc b/elpa/cl-lib-0.3/cl-lib.elc
deleted file mode 100644
index 2fa851b51..000000000
Binary files a/elpa/cl-lib-0.3/cl-lib.elc and /dev/null differ
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el b/elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
deleted file mode 100644
index cbb749e23..000000000
--- a/elpa/clojure-mode-20131227.1044/clojure-mode-autoloads.el
+++ /dev/null
@@ -1,47 +0,0 @@
-;;; clojure-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads (clojure-mode) "clojure-mode" "clojure-mode.el"
-;;;;;;  (21184 20178))
-;;; Generated autoloads from clojure-mode.el
-
-(autoload 'clojure-mode "clojure-mode" "\
-Major mode for editing Clojure code - similar to Lisp mode.
-Commands:
-Delete converts tabs to spaces as it moves back.
-Blank lines separate paragraphs.  Semicolons start comments.
-\\{clojure-mode-map}
-Note that `run-lisp' may be used either to start an inferior Lisp job
-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.
-
-\(fn)" t nil)
-
-(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))
-
-;;;***
-
-;;;### (autoloads nil nil ("clojure-mode-pkg.el") (21184 20178 859650))
-
-;;;***
-
-(provide 'clojure-mode-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; clojure-mode-autoloads.el ends here
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el b/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el
deleted file mode 100644
index eebb5c9d0..000000000
--- a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "clojure-mode" "20131227.1044" "Major mode for Clojure code" (quote nil))
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode.el b/elpa/clojure-mode-20131227.1044/clojure-mode.el
deleted file mode 100644
index 27967f20b..000000000
--- a/elpa/clojure-mode-20131227.1044/clojure-mode.el
+++ /dev/null
@@ -1,1227 +0,0 @@
-;;; clojure-mode.el --- Major mode for Clojure code
-
-;; Copyright © 2007-2013 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
-;;
-;; 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.
-
-;;; Commentary:
-
-;; Provides font-lock, indentation, and navigation for the Clojure
-;; programming language (http://clojure.org).
-
-;; Users of older Emacs (pre-22) should get version 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
-;; as you would with any other minor mode; for instance:
-;;
-;;   ;; require or autoload paredit-mode
-;;   (add-hook 'clojure-mode-hook 'paredit-mode)
-
-;; See CIDER (http://github.com/clojure-emacs/cider) for
-;; better interaction with subprocesses via nREPL.
-
-;;; 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
-;; 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 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:
-
-
-;;; 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))
-
-(require 'cl)
-(require 'tramp)
-(require 'inf-lisp)
-(require 'imenu)
-(require 'easymenu)
-
-(declare-function clojure-test-jump-to-implementation  "clojure-test-mode.el")
-
-(defconst clojure-font-lock-keywords
-  (eval-when-compile
-    `( ;; Definitions.
-      (,(concat "(\\(?:clojure.core/\\)?\\("
-                (regexp-opt '("defn" "defn-" "def" "defonce"
-                              "defmulti" "defmethod" "defmacro"
-                              "defstruct" "deftype" "defprotocol"
-                              "defrecord" "deftest" "def\\[a-z\\]"))
-                ;; Function declarations.
-                "\\)\\>"
-                ;; Any whitespace
-                "[ \r\n\t]*"
-                ;; Possibly type or metadata
-                "\\(?:#?^\\(?:{[^}]*}\\|\\sw+\\)[ \r\n\t]*\\)*"
-                "\\(\\sw+\\)?")
-       (1 font-lock-keyword-face)
-       (2 font-lock-function-name-face nil t))
-      ;; (fn name? args ...)
-      (,(concat "(\\(?:clojure.core/\\)?\\(fn\\)[ \t]+"
-                ;; Possibly type
-                "\\(?:#?^\\sw+[ \t]*\\)?"
-                ;; Possibly name
-                "\\(t\\sw+\\)?" )
-       (1 font-lock-keyword-face)
-       (2 font-lock-function-name-face nil t))
-
-      (,(concat "(\\(\\(?:[a-z\.-]+/\\)?def\[a-z\-\]*-?\\)"
-                ;; Function declarations.
-                "\\>"
-                ;; Any whitespace
-                "[ \r\n\t]*"
-                ;; Possibly type or metadata
-                "\\(?:#?^\\(?:{[^}]*}\\|\\sw+\\)[ \r\n\t]*\\)*"
-                "\\(\\sw+\\)?")
-       (1 font-lock-keyword-face)
-       (2 font-lock-function-name-face nil t))
-      ;; Deprecated functions
-      (,(concat
-         "(\\(?:clojure.core/\\)?"
-         (regexp-opt
-          '("add-watcher" "remove-watcher" "add-classpath") t)
-         "\\>")
-       1 font-lock-warning-face)
-      ;; Control structures
-      (,(concat
-         "(\\(?:clojure.core/\\)?"
-         (regexp-opt
-          '("let" "letfn" "do"
-            "case" "cond" "condp"
-            "for" "loop" "recur"
-            "when" "when-not" "when-let" "when-first"
-            "if" "if-let" "if-not"
-            "." ".." "->" "->>" "doto"
-            "and" "or"
-            "dosync" "doseq" "dotimes" "dorun" "doall"
-            "load" "import" "unimport" "ns" "in-ns" "refer"
-            "try" "catch" "finally" "throw"
-            "with-open" "with-local-vars" "binding"
-            "gen-class" "gen-and-load-class" "gen-and-save-class"
-            "handler-case" "handle") t)
-         "\\>")
-       1 font-lock-keyword-face)
-      ;; Built-ins
-      (,(concat
-         "(\\(?:clojure.core/\\)?"
-         (regexp-opt
-          '("*" "*1" "*2" "*3" "*agent*"
-        "*allow-unresolved-vars*" "*assert*" "*clojure-version*" "*command-line-args*" "*compile-files*"
-        "*compile-path*" "*e" "*err*" "*file*" "*flush-on-newline*"
-        "*in*" "*macro-meta*" "*math-context*" "*ns*" "*out*"
-        "*print-dup*" "*print-length*" "*print-level*" "*print-meta*" "*print-readably*"
-        "*read-eval*" "*source-path*" "*use-context-classloader*" "*warn-on-reflection*" "+"
-        "-" "/"
-        "<" "<=" "=" "==" ">"
-        ">=" "accessor" "aclone"
-        "agent" "agent-errors" "aget" "alength" "alias"
-        "all-ns" "alter" "alter-meta!" "alter-var-root" "amap"
-        "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"
-        "await" "await-for" "await1" "bases" "bean"
-        "bigdec" "bigint" "binding" "bit-and" "bit-and-not"
-        "bit-clear" "bit-flip" "bit-not" "bit-or" "bit-set"
-        "bit-shift-left" "bit-shift-right" "bit-test" "bit-xor" "boolean"
-        "boolean-array" "booleans" "bound-fn" "bound-fn*" "butlast"
-        "byte" "byte-array" "bytes" "case" "cast" "char"
-        "char-array" "char-escape-string" "char-name-string" "char?" "chars"
-        "chunk" "chunk-append" "chunk-buffer" "chunk-cons" "chunk-first"
-        "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" "cond->" "cond->>" "conj"
-        "conj!" "cons" "constantly" "construct-proxy" "contains?"
-        "count" "counted?" "create-ns" "create-struct" "cycle"
-        "dec" "decimal?" "declare" "definline" "defmacro"
-        "defmethod" "defmulti" "defn" "defn-" "defonce"
-        "defstruct" "delay" "delay?" "deliver" "deref"
-        "derive" "descendants" "destructure" "disj" "disj!"
-        "dissoc" "dissoc!" "distinct" "distinct?" "doall"
-        "doc" "dorun" "doseq" "dosync" "dotimes"
-        "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" "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"
-        "future-call" "future-cancel" "future-cancelled?" "future-done?" "future?"
-        "gen-class" "gen-interface" "gensym" "get" "get-in"
-        "get-method" "get-proxy-class" "get-thread-bindings" "get-validator" "group-by"
-        "hash" "hash-map" "hash-set" "identical?" "identity" "if-let"
-        "if-not" "ifn?" "import" "in-ns" "inc"
-        "init-proxy" "instance?" "int" "int-array" "integer?"
-        "interleave" "intern" "interpose" "into" "into-array"
-        "ints" "io!" "isa?" "iterate" "iterator-seq"
-        "juxt" "key" "keys" "keyword" "keyword?"
-        "last" "lazy-cat" "lazy-seq" "let" "letfn"
-        "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" "mapv" "map?"
-        "map-indexed" "mapcat" "max" "max-key" "memfn" "memoize"
-        "merge" "merge-with" "meta" "method-sig" "methods"
-        "min" "min-key" "mod" "name" "namespace"
-        "neg?" "newline" "next" "nfirst" "nil?"
-        "nnext" "not" "not-any?" "not-empty" "not-every?"
-        "not=" "ns" "ns-aliases" "ns-imports" "ns-interns"
-        "ns-map" "ns-name" "ns-publics" "ns-refers" "ns-resolve"
-        "ns-unalias" "ns-unmap" "nth" "nthnext" "num"
-        "number?" "odd?" "or" "parents" "partial"
-        "partition" "partition-all" "partition-by" "pcalls" "peek" "persistent!" "pmap"
-        "pop" "pop!" "pop-thread-bindings" "pos?" "pr"
-        "pr-str" "prefer-method" "prefers" "primitives-classnames" "print"
-        "print-ctor" "print-doc" "print-dup" "print-method" "print-namespace-doc"
-        "print-simple" "print-special-doc" "print-str" "printf" "println"
-        "println-str" "prn" "prn-str" "promise" "proxy"
-        "proxy-call-with-super" "proxy-mappings" "proxy-name" "proxy-super" "push-thread-bindings"
-        "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" "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" "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" "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"
-        "subseq" "subvec" "supers" "swap!" "symbol"
-        "symbol?" "sync" "syntax-symbol-anchor" "take" "take-last"
-        "take-nth" "take-while" "test" "the-ns" "time"
-        "to-array" "to-array-2d" "trampoline" "transient" "tree-seq"
-        "true?" "type" "unchecked-add" "unchecked-dec" "unchecked-divide"
-        "unchecked-inc" "unchecked-multiply" "unchecked-negate" "unchecked-remainder" "unchecked-subtract"
-        "underive" "unquote" "unquote-splicing" "update-in" "update-proxy"
-        "use" "val" "vals" "var-get" "var-set"
-        "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"
-        "with-redefs" "with-redefs-fn" "xml-seq" "zero?" "zipmap"
-        ) t)
-         "\\>")
-       1 font-lock-builtin-face)
-      ;;Other namespaces in clojure.jar
-      (,(concat
-         "(\\(?:\.*/\\)?"
-         (regexp-opt
-          '(;; clojure.inspector
-        "atom?" "collection-tag" "get-child" "get-child-count" "inspect"
-        "inspect-table" "inspect-tree" "is-leaf" "list-model" "list-provider"
-        ;; clojure.main
-        "load-script" "main" "repl" "repl-caught" "repl-exception"
-        "repl-prompt" "repl-read" "skip-if-eol" "skip-whitespace" "with-bindings"
-        ;; clojure.set
-        "difference" "index" "intersection" "join" "map-invert"
-        "project" "rename" "rename-keys" "select" "union"
-        ;; clojure.stacktrace
-        "e" "print-cause-trace" "print-stack-trace" "print-throwable" "print-trace-element"
-        ;; clojure.template
-        "do-template" "apply-template"
-        ;; clojure.test
-        "*initial-report-counters*" "*load-tests*" "*report-counters*" "*stack-trace-depth*" "*test-out*"
-        "*testing-contexts*" "*testing-vars*" "are" "assert-any" "assert-expr"
-        "assert-predicate" "compose-fixtures" "deftest" "deftest-" "file-position"
-        "function?" "get-possibly-unbound-var" "inc-report-counter" "is" "join-fixtures"
-        "report" "run-all-tests" "run-tests" "set-test" "successful?"
-        "test-all-vars" "test-ns" "test-var" "testing" "testing-contexts-str"
-        "testing-vars-str" "try-expr" "use-fixtures" "with-test" "with-test-out"
-        ;; clojure.walk
-        "keywordize-keys" "macroexpand-all" "postwalk" "postwalk-demo" "postwalk-replace"
-        "prewalk" "prewalk-demo" "prewalk-replace" "stringify-keys" "walk"
-        ;; clojure.xml
-        "*current*" "*sb*" "*stack*" "*state*" "attrs"
-        "content" "content-handler" "element" "emit" "emit-element"
-        ;; clojure.zip
-        "append-child" "branch?" "children" "down" "edit"
-        "end?" "insert-child" "insert-left" "insert-right" "left"
-        "leftmost" "lefts" "make-node" "next" "node"
-        "path" "prev" "remove" "replace" "right"
-        "rightmost" "rights" "root" "seq-zip" "up"
-        ) t)
-         "\\>")
-       1 font-lock-builtin-face)
-      ;; Constant values (keywords), including as metadata e.g. ^:static
-      ("\\<^?:\\(\\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-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 nil
-  "A mode for Clojure"
-  :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-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
-restart (ie. M-x clojure-mode) of existing clojure mode buffers."
-  :type 'boolean
-  :group 'clojure
-  :safe 'booleanp)
-
-(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
-  :safe 'stringp)
-
-(defcustom clojure-inf-lisp-command "lein repl"
-  "The command used by `inferior-lisp-program'."
-  :type 'string
-  :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-use-backtracking-indent t
-  "Set to non-nil to enable backtracking/context sensitive indentation."
-  :type 'boolean
-  :group 'clojure
-  :safe 'booleanp)
-
-(defcustom clojure-max-backtracking 3
-  "Maximum amount to backtrack up a list to check for context."
-  :type 'integer
-  :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)))
-    (set-keymap-parent map lisp-mode-shared-map)
-    (define-key map (kbd "C-M-x")   'lisp-eval-defun)
-    (define-key map (kbd "C-x C-e") 'lisp-eval-last-sexp)
-    (define-key map (kbd "C-c C-e") 'lisp-eval-last-sexp)
-    (define-key map (kbd "C-c C-l") 'clojure-load-file)
-    (define-key map (kbd "C-c C-r") 'lisp-eval-region)
-    (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'.")
-
-(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)))
-    (modify-syntax-entry ?~ "'   " table)
-    ;; can't safely make commas whitespace since it will apply even
-    ;; inside string literals--ick!
-    ;; (modify-syntax-entry ?, "    " table)
-    (modify-syntax-entry ?\{ "(}" table)
-    (modify-syntax-entry ?\} "){" table)
-    (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-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)'
-describing the last `clojure-load-file' or `clojure-compile-file' command.")
-
-(defvar clojure-test-ns-segment-position -1
-  "Which segment of the ns is \"test\" inserted in your test name convention.
-
-Customize this depending on your project's conventions. Negative
-numbers count from the end:
-
-  leiningen.compile -> leiningen.test.compile (uses 1)
-  clojure.http.client -> clojure.http.test.client (uses -1)")
-
-(defconst clojure-mode-version "2.1.0"
-  "The current version of `clojure-mode'.")
-
-(defun clojure-mode-display-version ()
-  "Display the current `clojure-mode-version' in the minibuffer."
-  (interactive)
-  (message "clojure-mode (version %s)" clojure-mode-version))
-
-;; For compatibility with Emacs < 24, derive conditionally
-(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.
-Commands:
-Delete converts tabs to spaces as it moves back.
-Blank lines separate paragraphs.  Semicolons start comments.
-\\{clojure-mode-map}
-Note that `run-lisp' may be used either to start an inferior Lisp job
-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."
-  (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)
-  (setq-local comment-start-skip
-              "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
-  (setq-local lisp-indent-function 'clojure-indent-function)
-  (when (< emacs-major-version 24)
-    (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)
-                (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'."
-  (interactive)
-  (if (and inferior-lisp-buffer (get-buffer inferior-lisp-buffer))
-      (pop-to-buffer inferior-lisp-buffer t)
-      (run-lisp inferior-lisp-program)))
-
-(defun clojure-load-file (file-name)
-  "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))
-  (comint-check-source file-name) ; Check to see if buffer needs saved.
-  (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-load-command file-name))
-  (switch-to-lisp t))
-
-
-
-(defun clojure-match-next-def ()
-  "Scans the buffer backwards for the next top-level definition.
-Called by `imenu--generic-function'."
-  (when (re-search-backward "^(def\sw*" nil t)
-    (save-excursion
-      (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)
-  (setq-local font-lock-multiline t)
-  (add-to-list 'font-lock-extend-region-functions
-               'clojure-font-lock-extend-region-def t)
-
-  (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)
-    (setq-local open-paren-in-column-0-is-defun-start nil))
-
-  (setq font-lock-defaults
-        '(clojure-font-lock-keywords    ; keywords
-          nil nil
-          (("+-*/.<>=!?$%_&~^:@" . "w")) ; syntax alist
-          nil
-          (font-lock-mark-block-function . mark-defun)
-          (font-lock-syntactic-face-function
-           . lisp-font-lock-syntactic-face-function))))
-
-(defun clojure-font-lock-def-at-point (point)
-  "Find the position range between the top-most def* and the
-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)
-    (error nil))
-
-  (let ((beg-def (point)))
-    (when (and (not (= point beg-def))
-               (looking-at "(def"))
-      (condition-case nil
-          (progn
-            ;; move forward as much as possible until failure (or success)
-            (forward-char)
-            (dotimes (i 4)
-              (forward-sexp)))
-        (error nil))
-      (cons beg-def (point)))))
-
-(defun clojure-font-lock-extend-region-def ()
-  "Move fontification boundaries to always include the first four
-elements of a def* forms."
-  (let ((changed nil))
-    (let ((def (clojure-font-lock-def-at-point font-lock-beg)))
-      (when def
-        (destructuring-bind (def-beg . def-end) def
-          (when (and (< def-beg font-lock-beg)
-                     (< font-lock-beg def-end))
-            (setq font-lock-beg def-beg
-                  changed t)))))
-
-    (let ((def (clojure-font-lock-def-at-point font-lock-end)))
-      (when def
-        (destructuring-bind (def-beg . def-end) def
-          (when (and (< def-beg font-lock-end)
-                     (< font-lock-end def-end))
-            (setq font-lock-end def-end
-                  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.
-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  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))
-    (let ((pos (clojure-find-block-comment-start font-lock-end)))
-      (when pos
-        (when (< (point) font-lock-beg)
-          (setq font-lock-beg (point)
-                changed t))
-        (condition-case nil (forward-sexp) (error nil))
-        (when (> (point) font-lock-end)
-          (setq font-lock-end (point)
-                changed t))))
-    changed))
-
-(defun clojure-font-lock-mark-comment (limit)
-  "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)))
-      (when pos
-        (condition-case nil
-            (add-text-properties (point)
-                                 (progn
-                                   (forward-sexp)
-                                   (point))
-                                 '(face font-lock-comment-face multiline t))
-          (error (forward-char 8))))))
-  nil)
-
-;; Docstring positions
-(put 'ns 'clojure-doc-string-elt 2)
-(put 'defn 'clojure-doc-string-elt 2)
-(put 'defn- 'clojure-doc-string-elt 2)
-(put 'defmulti 'clojure-doc-string-elt 2)
-(put 'defmacro 'clojure-doc-string-elt 2)
-(put 'definline 'clojure-doc-string-elt 2)
-(put 'defprotocol 'clojure-doc-string-elt 2)
-
-
-
-(defun clojure-forward-sexp (n)
-  "Treat record literals like #user.Foo[1] and #user.Foo{:size 1}
-as a single sexp so that slime will send them properly. Arguably
-this behavior is unintuitive for the user pressing (eg) C-M-f
-himself, but since these are single objects I think it's right."
-  (let ((dir (if (> n 0) 1 -1))
-        (forward-sexp-function nil)) ; force the built-in version
-    (while (not (zerop n))
-      (forward-sexp dir)
-      (when (save-excursion ; move back to see if we're in a record literal
-              (and
-               (condition-case nil
-                   (progn (backward-sexp) 't)
-                 ('scan-error nil))
-               (looking-at "#\\w")))
-        (forward-sexp dir)) ; if so, jump over it
-      (setq n (- n dir)))))
-
-(defun clojure-indent-function (indent-point state)
-  "This function is the normal value of the variable `lisp-indent-function'.
-It is used when indenting a line within a function call, to see if the
-called function says anything special about how to indent the line.
-
-INDENT-POINT is the position where the user typed TAB, or equivalent.
-Point is located at the point to indent under (for default indentation);
-STATE is the `parse-partial-sexp' state for that position.
-
-If the current line is in a call to a Lisp function
-which has a non-nil property `lisp-indent-function',
-that specifies how to do the indentation.  The property value can be
-* `defun', meaning indent `defun'-style;
-* an integer N, meaning indent the first N arguments specially
-  like ordinary function arguments and then indent any further
-  arguments like a body;
-* a function to call just as this function was called.
-  If that function returns nil, that means it doesn't specify
-  the indentation.
-
-This function also returns nil meaning don't specify the indentation."
-  (let ((normal-indent (current-column)))
-    (goto-char (1+ (elt state 1)))
-    (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
-    (if (and (elt state 2)
-             (not (looking-at "\\sw\\|\\s_")))
-        ;; car of form doesn't seem to be a symbol
-        (progn
-          (if (not (> (save-excursion (forward-line 1) (point))
-                      calculate-lisp-indent-last-sexp))
-              (progn (goto-char calculate-lisp-indent-last-sexp)
-                     (beginning-of-line)
-                     (parse-partial-sexp (point)
-                                         calculate-lisp-indent-last-sexp 0 t)))
-          ;; Indent under the list or under the first sexp on the same
-          ;; line as calculate-lisp-indent-last-sexp.  Note that first
-          ;; thing on that line has to be complete sexp since we are
-          ;; inside the innermost containing sexp.
-          (backward-prefix-chars)
-          (if (and (eq (char-after (point)) ?\[)
-                   (eq (char-after (elt state 1)) ?\())
-              (+ (current-column) 2) ;; this is probably inside a defn
-            (current-column)))
-      (let* ((function (buffer-substring (point)
-                                         (progn (forward-sexp 1) (point))))
-             (open-paren (elt state 1))
-             (method nil)
-             (function-tail (first
-                             (last
-                              (split-string (substring-no-properties function) "/")))))
-        (setq method (get (intern-soft function-tail) 'clojure-indent-function))
-
-        (cond ((member (char-after open-paren) '(?\[ ?\{))
-               (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-\\)"
-                                      function)))
-               (lisp-indent-defform state indent-point))
-
-              ((integerp method)
-               (lisp-indent-specform method state
-                                     indent-point normal-indent))
-              (method
-               (funcall method indent-point state))
-              (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."
-  (let (indent (path) (depth 0))
-    (goto-char (elt state 1))
-    (while (and (not indent)
-                (< depth clojure-max-backtracking))
-      (let ((containing-sexp (point)))
-        (parse-partial-sexp (1+ containing-sexp) indent-point 1 t)
-        (when (looking-at "\\sw\\|\\s_")
-          (let* ((start (point))
-                 (fn (buffer-substring start (progn (forward-sexp 1) (point))))
-                 (meth (get (intern-soft fn) 'clojure-backtracking-indent)))
-            (let ((n 0))
-              (when (< (point) indent-point)
-                (condition-case ()
-                    (progn
-                      (forward-sexp 1)
-                      (while (< (point) indent-point)
-                        (parse-partial-sexp (point) indent-point 1 t)
-                        (incf n)
-                        (forward-sexp 1)))
-                  (error nil)))
-              (push n path))
-            (when meth
-              (let ((def meth))
-                (dolist (p path)
-                  (if (and (listp def)
-                           (< p (length def)))
-                      (setq def (nth p def))
-                    (if (listp def)
-                        (setq def (car (last def)))
-                      (setq def nil))))
-                (goto-char (elt state 1))
-                (when def
-                  (setq indent (+ (current-column) def)))))))
-        (goto-char containing-sexp)
-        (condition-case ()
-            (progn
-              (backward-up-list 1)
-              (incf depth))
-          (error (setq depth clojure-max-backtracking)))))
-    indent))
-
-;; clojure backtracking indent is experimental and the format for these
-;; entries are subject to change
-(put 'implement 'clojure-backtracking-indent '(4 (2)))
-(put 'letfn 'clojure-backtracking-indent '((2) 2))
-(put 'proxy 'clojure-backtracking-indent '(4 4 (2)))
-(put 'reify 'clojure-backtracking-indent '((2)))
-(put 'deftype 'clojure-backtracking-indent '(4 4 (2)))
-(put 'defrecord 'clojure-backtracking-indent '(4 4 (2)))
-(put 'defprotocol 'clojure-backtracking-indent '(4 (2)))
-(put 'extend-type 'clojure-backtracking-indent '(4 (2)))
-(put 'extend-protocol 'clojure-backtracking-indent '(4 (2)))
-
-(defun put-clojure-indent (sym indent)
-  (put sym 'clojure-indent-function indent))
-
-(defmacro define-clojure-indent (&rest kvs)
-  `(progn
-     ,@(mapcar (lambda (x) `(put-clojure-indent
-                        (quote ,(first x)) ,(second x))) kvs)))
-
-(defun add-custom-clojure-indents (name value)
-  (custom-set-default name value)
-  (mapcar (lambda (x)
-            (put-clojure-indent x 'defun))
-          value))
-
-(defcustom clojure-defun-indents nil
-  "List of symbols to give defun-style indentation to in Clojure
-code, in addition to those that are built-in. You can use this to
-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
-  :set 'add-custom-clojure-indents)
-
-(define-clojure-indent
-  ;; built-ins
-  (ns 1)
-  (fn 'defun)
-  (def 'defun)
-  (defn 'defun)
-  (bound-fn 'defun)
-  (if 1)
-  (if-not 1)
-  (case 1)
-  (condp 2)
-  (when 1)
-  (while 1)
-  (when-not 1)
-  (when-first 1)
-  (do 0)
-  (future 0)
-  (comment 0)
-  (doto 1)
-  (locking 1)
-  (proxy 2)
-  (with-open 1)
-  (with-precision 1)
-  (with-local-vars 1)
-
-  (reify 'defun)
-  (deftype 2)
-  (defrecord 2)
-  (defprotocol 1)
-  (extend 1)
-  (extend-protocol 1)
-  (extend-type 1)
-
-  (try 0)
-  (catch 2)
-  (finally 0)
-
-  ;; binding forms
-  (let 1)
-  (letfn 1)
-  (binding 1)
-  (loop 1)
-  (for 1)
-  (doseq 1)
-  (dotimes 1)
-  (when-let 1)
-  (if-let 1)
-
-  ;; data structures
-  (defstruct 1)
-  (struct-map 1)
-  (assoc 1)
-
-  (defmethod 'defun)
-
-  ;; clojure.test
-  (testing 1)
-  (deftest 'defun)
-  (are 1)
-  (use-fixtures 'defun))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Better docstring filling for clojure-mode
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(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."
-  (when (not (= (point) (point-max)))
-   (buffer-substring-no-properties (point) (1+ (point)))))
-
-(defun clojure-char-before-point ()
-  "Return the char before point or nil if at buffer beginning."
-  (when (not (= (point) (point-min)))
-    (buffer-substring-no-properties (point) (1- (point)))))
-
-;; TODO: Deal with the fact that when point is exactly at the
-;; beginning of a string, it thinks that is the end.
-(defun clojure-string-end ()
-  "Return the position of the \" that ends the string at point.
-
-Note that point must be inside the string - if point is
-positioned at the opening quote, incorrect results will be
-returned."
-  (save-excursion
-    (save-match-data
-      ;; If we're at the end of the string, just return point.
-      (if (and (string= (clojure-char-at-point) "\"")
-               (not (string= (clojure-char-before-point) "\\")))
-          (point)
-        ;; We don't want to get screwed by starting out at the
-        ;; backslash in an escaped quote.
-        (when (string= (clojure-char-at-point) "\\")
-          (backward-char))
-        ;; Look for a quote not preceeded by a backslash
-        (re-search-forward "[^\\]\\\(\\\"\\)")
-        (match-beginning 1)))))
-
-(defun clojure-docstring-start+end-points ()
-  "Return the start and end points of the string at point as a cons."
-  (if (and (fboundp 'paredit-string-start+end-points) paredit-mode)
-      (paredit-string-start+end-points)
-    (cons (clojure-string-start) (clojure-string-end))))
-
-(defun clojure-mark-string ()
-  "Mark the string at point."
-  (interactive)
-  (goto-char (clojure-string-start))
-  (forward-char)
-  (set-mark (clojure-string-end)))
-
-(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)
-  (if (and (fboundp 'paredit-in-string-p) paredit-mode)
-      (unless (paredit-in-string-p)
-        (error "Must be inside a string")))
-  ;; Oddly, save-excursion doesn't do a good job of preserving point.
-  ;; It's probably because we delete the string and then re-insert it.
-  (let ((old-point (point)))
-    (save-restriction
-      (save-excursion
-        (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 string-start
-                                                       string-end)))
-          (delete-region string-start string-end)
-          (insert
-           (with-temp-buffer
-             (insert string)
-             (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 (+ 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-"))
-      "ns"
-      (zero-or-one "+")
-      (one-or-more (any whitespace "\n"))
-      (zero-or-more (or (submatch (zero-or-one "#")
-                                  "^{"
-                                  (zero-or-more (not (any "}")))
-                                  "}")
-                        (zero-or-more "^:"
-                                      (one-or-more (not (any whitespace)))))
-                    (one-or-more (any whitespace "\n")))
-      ;; why is this here? oh (in-ns 'foo) or (ns+ :user)
-      (zero-or-one (any ":'"))
-      (group (one-or-more (not (any "()\"" whitespace))) word-end)))
-
-;; for testing clojure-namespace-name-regex, you can evaluate this code and make
-;; sure foo (or whatever the namespace name is) shows up in results. some of
-;; these currently fail.
-;; (mapcar (lambda (s) (let ((n (string-match clojure-namespace-name-regex s)))
-;;                       (if n (match-string 4 s))))
-;;         '("(ns foo)"
-;;           "(ns
-;; foo)"
-;;           "(ns foo.baz)"
-;;           "(ns ^:bar foo)"
-;;           "(ns ^:bar ^:baz foo)"
-;;           "(ns ^{:bar true} foo)"
-;;           "(ns #^{:bar true} foo)"
-;;           "(ns #^{:fail {}} foo)"
-;;           "(ns ^{:fail2 {}} foo.baz)"
-;;           "(ns ^{} foo)"
-;;           "(ns ^{:skip-wiki true}
-;;   aleph.netty
-;; "
-;;           "(ns
-;;  foo)"
-;;     "foo"))
-
-
-
-(defun clojure-expected-ns ()
-  "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)
-                              (- (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))
-  (clojure-insert-ns-form-at-point))
-
-(defun clojure-update-ns ()
-  "Update the namespace of the current buffer.
-Useful if a file has been renamed."
-  (interactive)
-  (let ((nsname (clojure-expected-ns)))
-    (when nsname
-      (save-restriction
-        (save-excursion
-          (save-match-data
-            (if (clojure-find-ns)
-                (replace-match nsname nil nil nil 4)
-              (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
-        (goto-char (point-min))
-        (when (re-search-forward regexp nil t)
-          (match-string-no-properties 4))))))
-
-(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)
-  "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"
-            (file-name-as-directory
-             (locate-dominating-file buffer-file-name "src/"))
-            (mapconcat 'identity segments "/"))))
-
-(defvar clojure-test-for-fn 'clojure-test-for
-  "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)
-    (clojure-jump-to-test)))
-
-;;;###autoload
-(progn
-  (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)))
-
-(provide 'clojure-mode)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
-;;; clojure-mode.el ends here
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode.elc b/elpa/clojure-mode-20131227.1044/clojure-mode.elc
deleted file mode 100644
index b60d097e0..000000000
Binary files a/elpa/clojure-mode-20131227.1044/clojure-mode.elc and /dev/null differ
diff --git a/elpa/clojure-mode-4.0.1/clojure-mode-autoloads.el b/elpa/clojure-mode-4.0.1/clojure-mode-autoloads.el
new file mode 100644
index 000000000..a640dd414
--- /dev/null
+++ b/elpa/clojure-mode-4.0.1/clojure-mode-autoloads.el
@@ -0,0 +1,26 @@
+;;; clojure-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "clojure-mode" "clojure-mode.el" (21721 38720
+;;;;;;  0 0))
+;;; Generated autoloads from clojure-mode.el
+
+(autoload 'clojure-mode "clojure-mode" "\
+Major mode for editing Clojure code.
+
+\\{clojure-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.\\(clj[sx]?\\|dtm\\|edn\\)\\'" . clojure-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; clojure-mode-autoloads.el ends here
diff --git a/elpa/clojure-mode-4.0.1/clojure-mode-pkg.el b/elpa/clojure-mode-4.0.1/clojure-mode-pkg.el
new file mode 100644
index 000000000..766d892e1
--- /dev/null
+++ b/elpa/clojure-mode-4.0.1/clojure-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "clojure-mode" "4.0.1" "Major mode for Clojure code" '((emacs "24.1")))
diff --git a/elpa/cl-lib-0.3/cl-lib-pkg.elc b/elpa/clojure-mode-4.0.1/clojure-mode-pkg.elc
similarity index 60%
rename from elpa/cl-lib-0.3/cl-lib-pkg.elc
rename to elpa/clojure-mode-4.0.1/clojure-mode-pkg.elc
index 005eecc0d..56d3d4e4f 100644
Binary files a/elpa/cl-lib-0.3/cl-lib-pkg.elc and b/elpa/clojure-mode-4.0.1/clojure-mode-pkg.elc differ
diff --git a/elpa/clojure-mode-4.0.1/clojure-mode.el b/elpa/clojure-mode-4.0.1/clojure-mode.el
new file mode 100644
index 000000000..6fb4c47f6
--- /dev/null
+++ b/elpa/clojure-mode-4.0.1/clojure-mode.el
@@ -0,0 +1,1079 @@
+;;; clojure-mode.el --- Major mode for Clojure code -*- lexical-binding: t; -*-
+
+;; Copyright © 2007-2014 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
+;; Copyright © 2013-2014 Bozhidar Batsov
+;;
+;; Authors: Jeffrey Chu <jochu0@gmail.com>
+;;       Lennart Staflin <lenst@lysator.liu.se>
+;;       Phil Hagelberg <technomancy@gmail.com>
+;;       Bozhidar Batsov <bozhidar@batsov.com>
+;; URL: http://github.com/clojure-emacs/clojure-mode
+;; Keywords: languages clojure clojurescript lisp
+;; Version: 4.0.1
+;; Package-Requires: ((emacs "24.1"))
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Provides font-lock, indentation, and navigation for the Clojure
+;; programming language (http://clojure.org).
+
+;; Using clojure-mode with paredit or smartparens is highly recommended.
+
+;; Here are some example configurations:
+
+;;   ;; require or autoload paredit-mode
+;;   (add-hook 'clojure-mode-hook 'paredit-mode)
+
+;;   ;; require or autoload smartparens
+;;   (add-hook 'clojure-mode-hook 'smartparens-strict-mode)
+
+;; See inf-clojure (http://github.com/clojure-emacs/inf-clojure) for
+;; basic interaction with Clojure subprocesses.
+
+;; See CIDER (http://github.com/clojure-emacs/cider) for
+;; better interaction with subprocesses via nREPL.
+
+;;; 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
+;; 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 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:
+
+
+;;; 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))
+
+(require 'cl)
+(require 'imenu)
+
+(declare-function lisp-fill-paragraph  "lisp-mode" (&optional justify))
+
+(defgroup clojure nil
+  "Major mode for editing Clojure code."
+  :prefix "clojure-"
+  :group 'languages
+  :link '(url-link :tag "Github" "https://github.com/clojure-emacs/clojure-mode")
+  :link '(emacs-commentary-link :tag "Commentary" "clojure-mode"))
+
+(defconst clojure-mode-version "4.0.1"
+  "The current version of `clojure-mode'.")
+
+(defface clojure-keyword-face
+  '((t (:inherit font-lock-constant-face)))
+  "Face used to font-lock Clojure keywords (:something)."
+  :group 'clojure
+  :package-version '(clojure-mode . "3.0.0"))
+
+(defface clojure-character-face
+  '((t (:inherit font-lock-string-face)))
+  "Face used to font-lock Clojure character literals."
+  :group 'clojure
+  :package-version '(clojure-mode . "3.0.0"))
+
+(defface clojure-interop-method-face
+  '((t (:inherit font-lock-preprocessor-face)))
+  "Face used to font-lock interop method names (camelCase)."
+  :group 'clojure
+  :package-version '(clojure-mode . "3.0.0"))
+
+(defcustom clojure-defun-style-default-indent nil
+  "When non-nil, use default indenting for functions and macros.
+Otherwise check `define-clojure-indent' and `put-clojure-indent'."
+  :type 'boolean
+  :group 'clojure
+  :safe 'booleanp)
+
+(defcustom clojure-use-backtracking-indent t
+  "When non-nil, enable context sensitive indentation."
+  :type 'boolean
+  :group 'clojure
+  :safe 'booleanp)
+
+(defcustom clojure-max-backtracking 3
+  "Maximum amount to backtrack up a list to check for context."
+  :type 'integer
+  :group 'clojure
+  :safe 'integerp)
+
+(defcustom clojure-docstring-fill-column fill-column
+  "Value of `fill-column' to use when filling a docstring."
+  :type 'integer
+  :group 'clojure
+  :safe 'integerp)
+
+(defcustom clojure-docstring-fill-prefix-width 2
+  "Width of `fill-prefix' when filling a docstring.
+The default value conforms with the de facto convention for
+Clojure docstrings, aligning the second line with the opening
+double quotes on the third column."
+  :type 'integer
+  :group 'clojure
+  :safe 'integerp)
+
+(defcustom clojure-omit-space-between-tag-and-delimiters '(?\[ ?\{)
+  "Allowed opening delimiter characters after a reader literal tag.
+For example, \[ is allowed 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)))
+    (define-key map (kbd "C-:") 'clojure-toggle-keyword-string)
+    (easy-menu-define clojure-mode-menu map "Clojure Mode Menu"
+      '("Clojure"
+        ["Toggle between string & keyword" clojure-toggle-keyword-string]
+        ["Mark string" clojure-mark-string]
+        ["Insert ns form at point" clojure-insert-ns-form-at-point]
+        ["Insert ns form at beginning" clojure-insert-ns-form]
+        ["Update ns form" clojure-update-ns]
+        "--"
+        ["Version" clojure-mode-display-version]))
+    map)
+  "Keymap for Clojure mode.  Inherits from `lisp-mode-shared-map'.")
+
+(defvar clojure-mode-syntax-table
+  (let ((table (copy-syntax-table emacs-lisp-mode-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)
+    (modify-syntax-entry ?@ "'" table)
+    ;; Make hash a usual word character
+    (modify-syntax-entry ?# "_ p" table)
+    table))
+
+(defconst clojure--prettify-symbols-alist
+  '(("fn"  . ?λ)))
+
+(defun clojure-mode-display-version ()
+  "Display the current `clojure-mode-version' in the minibuffer."
+  (interactive)
+  (message "clojure-mode (version %s)" clojure-mode-version))
+
+(defun clojure-space-for-delimiter-p (endp delim)
+  "Prevent paredit from inserting useless spaces.
+See `paredit-space-for-delimiter-predicates' for the meaning of
+ENDP and DELIM."
+  (if (or (derived-mode-p 'clojure-mode)
+          (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))
+
+(defun clojure-no-space-after-tag (endp delimiter)
+  "Prevent inserting a space after a reader-literal tag?
+
+When a reader-literal tag is followed be an opening delimiter
+listed in `clojure-omit-space-between-tag-and-delimiters', this
+function returns t.
+
+This allows you to write things like #db/id[:db.part/user]
+without inserting a space between the tag and the opening
+bracket.
+
+See `paredit-space-for-delimiter-predicates' for the meaning of
+ENDP and DELIMITER."
+  (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)))))))))
+
+(defun clojure-paredit-setup ()
+  "Make \"paredit-mode\" play nice with `clojure-mode'."
+  (when (>= paredit-version 21)
+    (define-key clojure-mode-map "{" 'paredit-open-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-mode-variables ()
+  "Set up initial buffer-local variables for Clojure mode."
+  (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)
+  (setq fill-paragraph-function 'clojure-fill-paragraph)
+  (setq adaptive-fill-function 'clojure-adaptive-fill-function)
+  (setq-local normal-auto-fill-function 'clojure-auto-fill-function)
+  (setq-local comment-start-skip
+              "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
+  (setq-local indent-line-function 'clojure-indent-line)
+  (setq-local lisp-indent-function 'clojure-indent-function)
+  (setq-local lisp-doc-string-elt-property 'clojure-doc-string-elt)
+  (setq-local parse-sexp-ignore-comments t)
+  (setq-local prettify-symbols-alist clojure--prettify-symbols-alist)
+  (setq-local open-paren-in-column-0-is-defun-start nil))
+
+;;;###autoload
+(define-derived-mode clojure-mode prog-mode "Clojure"
+  "Major mode for editing Clojure code.
+
+\\{clojure-mode-map}"
+  (clojure-mode-variables)
+  (clojure-font-lock-setup)
+  (add-hook 'paredit-mode-hook 'clojure-paredit-setup))
+
+(defsubst clojure-in-docstring-p ()
+  "Check whether point is in a docstring."
+  (eq (get-text-property (1- (point-at-eol)) 'face)
+      'font-lock-doc-face))
+
+(defsubst clojure-docstring-fill-prefix ()
+  "The prefix string used by `clojure-fill-paragraph'.
+
+It is simply `clojure-docstring-fill-prefix-width' number of spaces."
+  (make-string clojure-docstring-fill-prefix-width ? ))
+
+(defun clojure-adaptive-fill-function ()
+  "Clojure adaptive fill function.
+This only takes care of filling docstring correctly."
+  (when (clojure-in-docstring-p)
+    (clojure-docstring-fill-prefix)))
+
+(defun clojure-fill-paragraph (&optional justify)
+  "Like `fill-paragraph', but can handle Clojure docstrings.
+
+If JUSTIFY is non-nil, justify as well as fill the paragraph."
+  (if (clojure-in-docstring-p)
+      (let ((paragraph-start
+             (concat paragraph-start
+                     "\\|\\s-*\\([(;:\"[]\\|~@\\|`(\\|#'(\\)"))
+            (paragraph-separate
+             (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
+            (fill-column (or clojure-docstring-fill-column fill-column))
+            (fill-prefix (clojure-docstring-fill-prefix)))
+        (fill-paragraph justify))
+    (let ((paragraph-start (concat paragraph-start
+                                   "\\|\\s-*\\([(;:\"[]\\|`(\\|#'(\\)"))
+          (paragraph-separate
+           (concat paragraph-separate "\\|\\s-*\".*[,\\.[]$")))
+      (or (fill-comment-paragraph justify)
+          (fill-paragraph justify))
+      ;; Always return `t'
+      t)))
+
+(defun clojure-auto-fill-function ()
+  "Clojure auto-fill function."
+  ;; Check if auto-filling is meaningful.
+  (let ((fc (current-fill-column)))
+    (when (and fc (> (current-column) fc))
+      (let ((fill-column (if (clojure-in-docstring-p)
+                             clojure-docstring-fill-column
+                           fill-column))
+            (fill-prefix (clojure-adaptive-fill-function)))
+        (do-auto-fill)))))
+
+
+
+(defun clojure-match-next-def ()
+  "Scans the buffer backwards for the next \"top-level\" definition.
+Called by `imenu--generic-function'."
+  (when (re-search-backward "^(def\\sw*" nil t)
+    (save-excursion
+      (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)))))
+
+(defconst clojure-font-lock-keywords
+  (eval-when-compile
+    `(;; Top-level variable definition
+      (,(concat "(\\(?:clojure.core/\\)?\\("
+                (regexp-opt '("def" "defonce"))
+                ;; variable declarations
+                "\\)\\>"
+                ;; Any whitespace
+                "[ \r\n\t]*"
+                ;; Possibly type or metadata
+                "\\(?:#?^\\(?:{[^}]*}\\|\\sw+\\)[ \r\n\t]*\\)*"
+                "\\(\\sw+\\)?")
+       (1 font-lock-keyword-face)
+       (2 font-lock-variable-name-face nil t))
+      ;; Type definition
+      (,(concat "(\\(?:clojure.core/\\)?\\("
+                (regexp-opt '("defstruct" "deftype" "defprotocol"
+                              "defrecord"))
+                ;; type declarations
+                "\\)\\>"
+                ;; Any whitespace
+                "[ \r\n\t]*"
+                ;; Possibly type or metadata
+                "\\(?:#?^\\(?:{[^}]*}\\|\\sw+\\)[ \r\n\t]*\\)*"
+                "\\(\\sw+\\)?")
+       (1 font-lock-keyword-face)
+       (2 font-lock-type-face nil t))
+      ;; Function definition (anything that starts with def and is not
+      ;; listed above)
+      (,(concat "(\\(?:[a-z\.-]+/\\)?\\(def\[a-z\-\]*-?\\)"
+                ;; Function declarations
+                "\\>"
+                ;; Any whitespace
+                "[ \r\n\t]*"
+                ;; Possibly type or metadata
+                "\\(?:#?^\\(?:{[^}]*}\\|\\sw+\\)[ \r\n\t]*\\)*"
+                "\\(\\sw+\\)?")
+       (1 font-lock-keyword-face)
+       (2 font-lock-function-name-face nil t))
+      ;; (fn name? args ...)
+      (,(concat "(\\(?:clojure.core/\\)?\\(fn\\)[ \t]+"
+                ;; Possibly type
+                "\\(?:#?^\\sw+[ \t]*\\)?"
+                ;; Possibly name
+                "\\(t\\sw+\\)?" )
+       (1 font-lock-keyword-face)
+       (2 font-lock-function-name-face nil t))
+      ;; lambda arguments - %, %1, %2, etc
+      ("\\<%[1-9]?" (0 font-lock-variable-name-face))
+      ;; Special forms
+      (,(concat
+         "("
+         (regexp-opt
+          '("def" "do" "if" "let" "var" "fn" "loop"
+            "recur" "throw" "try" "catch" "finally"
+            "set!" "new" "."
+            "monitor-enter" "monitor-exit" "quote") t)
+         "\\>")
+       1 font-lock-keyword-face)
+      ;; Built-in binding and flow of control forms
+      (,(concat
+         "(\\(?:clojure.core/\\)?"
+         (regexp-opt
+          '("letfn" "case" "cond" "cond->" "cond->>" "condp"
+            "for" "when" "when-not" "when-let" "when-first" "when-some"
+            "if-let" "if-not" "if-some"
+            ".." "->" "->>" "as->" "doto" "and" "or"
+            "dosync" "doseq" "dotimes" "dorun" "doall"
+            "load" "import" "unimport" "ns" "in-ns" "refer"
+            "with-open" "with-local-vars" "binding"
+            "gen-class" "gen-and-load-class" "gen-and-save-class"
+            "handler-case" "handle" "declare") t)
+         "\\>")
+       1 font-lock-keyword-face)
+      (,(concat
+         "\\<"
+         (regexp-opt
+          '("*1" "*2" "*3" "*agent*"
+            "*allow-unresolved-vars*" "*assert*" "*clojure-version*"
+            "*command-line-args*" "*compile-files*"
+            "*compile-path*" "*e" "*err*" "*file*" "*flush-on-newline*"
+            "*in*" "*macro-meta*" "*math-context*" "*ns*" "*out*"
+            "*print-dup*" "*print-length*" "*print-level*"
+            "*print-meta*" "*print-readably*"
+            "*read-eval*" "*source-path*"
+            "*use-context-classloader*" "*warn-on-reflection*")
+          t)
+         "\\>")
+       0 font-lock-builtin-face)
+      ;; Dynamic variables - *something* or @*something*
+      ("\\<@?\\(\\*[a-z-]*\\*\\)\\>" 1 font-lock-variable-name-face)
+      ;; Global constants - nil, true, false
+      (,(concat
+         "\\<"
+         (regexp-opt
+          '("true" "false" "nil") t)
+         "\\>")
+       0 font-lock-constant-face)
+      ;; Character literals - \1, \a, \newline, \u0000
+      ;; FIXME: handle properly some punctuation characters (like commas and semicolumns)
+      ("\\\\\\([[:punct:]]\\|[a-z0-9]+\\)\\>" 0 'clojure-character-face)
+      ;; Constant values (keywords), including as metadata e.g. ^:static
+      ("\\<^?\\(:\\(\\sw\\|\\s_\\)+\\(\\>\\|\\_>\\)\\)" 1 'clojure-keyword-face)
+      ;; cljx annotations (#+clj and #+cljs)
+      ("#\\+cljs?\\>" 0 font-lock-preprocessor-face)
+      ;; Java interop highlighting
+      ;; CONST SOME_CONST (optionally prefixed by /)
+      ("\\(?:\\<\\|/\\)\\([A-Z]+\\|\\([A-Z]+_[A-Z1-9_]+\\)\\)\\>" 1 font-lock-constant-face)
+      ;; .foo .barBaz .qux01 .-flibble .-flibbleWobble
+      ("\\<\\.-?[a-z][a-zA-Z0-9]*\\>" 0 'clojure-interop-method-face)
+      ;; Foo Bar$Baz Qux_ World_OpenUDP Foo. Babylon15.
+      ("\\(?:\\<\\|\\.\\|/\\|#?^\\)\\([A-Z][a-zA-Z0-9_]*[a-zA-Z0-9$_]+\\.?\\>\\)" 1 font-lock-type-face)
+      ;; foo.bar.baz
+      ("\\<^?\\([a-z][a-z0-9_-]+\\.\\([a-z][a-z0-9_-]*\\.?\\)+\\)" 1 font-lock-type-face)
+      ;; (ns namespace) - special handling for single segment namespaces
+      (,(concat "(\\<ns\\>[ \r\n\t]*"
+                ;; Possibly metadata
+                "\\(?:\\^?{[^}]+}[ \r\n\t]*\\)*"
+                ;; namespace
+                "\\([a-z0-9-]+\\)")
+       (1 font-lock-type-face nil t))
+      ;; foo/ Foo/ @Foo/ /FooBar
+      ("\\(?:\\<\\|\\.\\)@?\\([a-zA-Z][a-zA-Z0-9$_-]*\\)/" 1 font-lock-type-face)
+      ;; fooBar
+      ("\\(?:\\<\\|/\\)\\([a-z]+[A-Z]+[a-zA-Z0-9$]*\\>\\)" 1 'clojure-interop-method-face)
+      ;; Highlight grouping constructs in regular expressions
+      (clojure-font-lock-regexp-groups
+       (1 'font-lock-regexp-grouping-construct prepend))))
+  "Default expressions to highlight in Clojure mode.")
+
+(defun clojure-font-lock-syntactic-face-function (state)
+  "Find and highlight text with a Clojure-friendly syntax table.
+
+This function is passed to `font-lock-syntactic-face-function',
+which is called with a single parameter, STATE (which is, in
+turn, returned by `parse-partial-sexp' at the beginning of the
+highlighted region)."
+  (if (nth 3 state)
+      ;; This might be a (doc)string or a |...| symbol.
+      (let ((startpos (nth 8 state)))
+        (if (eq (char-after startpos) ?|)
+            ;; This is not a string, but a |...| symbol.
+            nil
+          (let* ((listbeg (nth 1 state))
+                 (firstsym (and listbeg
+                                (save-excursion
+                                  (goto-char listbeg)
+                                  (and (looking-at "([ \t\n]*\\(\\(\\sw\\|\\s_\\)+\\)")
+                                       (match-string 1)))))
+                 (docelt (and firstsym
+                              (function-get (intern-soft firstsym)
+                                            lisp-doc-string-elt-property))))
+            (if (and docelt
+                     ;; It's a string in a form that can have a docstring.
+                     ;; Check whether it's in docstring position.
+                     (save-excursion
+                       (when (functionp docelt)
+                         (goto-char (match-end 1))
+                         (setq docelt (funcall docelt)))
+                       (goto-char listbeg)
+                       (forward-char 1)
+                       (condition-case nil
+                           (while (and (> docelt 0) (< (point) startpos)
+                                       (progn (forward-sexp 1) t))
+                             ;; ignore metadata and type hints
+                             (unless (looking-at "[ \n\t]*\\(\\^[A-Z:].+\\|\\^?{.+\\)")
+                               (setq docelt (1- docelt))))
+                         (error nil))
+                       (and (zerop docelt) (<= (point) startpos)
+                            (progn (forward-comment (point-max)) t)
+                            (= (point) (nth 8 state)))))
+                font-lock-doc-face
+              font-lock-string-face))))
+    font-lock-comment-face))
+
+(defun clojure-font-lock-setup ()
+  "Configures font-lock for editing Clojure code."
+  (setq-local font-lock-multiline t)
+  (add-to-list 'font-lock-extend-region-functions
+               'clojure-font-lock-extend-region-def t)
+  (setq font-lock-defaults
+        '(clojure-font-lock-keywords    ; keywords
+          nil nil
+          (("+-*/.<>=!?$%_&~^:@" . "w")) ; syntax alist
+          nil
+          (font-lock-mark-block-function . mark-defun)
+          (font-lock-syntactic-face-function
+           . clojure-font-lock-syntactic-face-function))))
+
+(defun clojure-font-lock-def-at-point (point)
+  "Range between the top-most def* and the fourth element after POINT.
+Note that this means that there is no guarantee of proper font
+locking in def* forms that are not at top level."
+  (goto-char point)
+  (condition-case nil
+      (beginning-of-defun)
+    (error nil))
+
+  (let ((beg-def (point)))
+    (when (and (not (= point beg-def))
+               (looking-at "(def"))
+      (condition-case nil
+          (progn
+            ;; move forward as much as possible until failure (or success)
+            (forward-char)
+            (dotimes (_ 4)
+              (forward-sexp)))
+        (error nil))
+      (cons beg-def (point)))))
+
+(defun clojure-font-lock-extend-region-def ()
+  "Set region boundaries to include the first four elements of def* forms."
+  (let ((changed nil))
+    (let ((def (clojure-font-lock-def-at-point font-lock-beg)))
+      (when def
+        (destructuring-bind (def-beg . def-end) def
+          (when (and (< def-beg font-lock-beg)
+                     (< font-lock-beg def-end))
+            (setq font-lock-beg def-beg
+                  changed t)))))
+    (let ((def (clojure-font-lock-def-at-point font-lock-end)))
+      (when def
+        (destructuring-bind (def-beg . def-end) def
+          (when (and (< def-beg font-lock-end)
+                     (< font-lock-end def-end))
+            (setq font-lock-end def-end
+                  changed t)))))
+    changed))
+
+(defun clojure-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))))))
+
+;; Docstring positions
+(put 'ns 'clojure-doc-string-elt 2)
+(put 'def 'clojure-doc-string-elt 2)
+(put 'defn 'clojure-doc-string-elt 2)
+(put 'defn- 'clojure-doc-string-elt 2)
+(put 'defmulti 'clojure-doc-string-elt 2)
+(put 'defmacro 'clojure-doc-string-elt 2)
+(put 'definline 'clojure-doc-string-elt 2)
+(put 'defprotocol 'clojure-doc-string-elt 2)
+
+
+
+(defun clojure-indent-line ()
+  "Indent current line as Clojure code."
+  (if (clojure-in-docstring-p)
+      (save-excursion
+        (beginning-of-line)
+        (when (looking-at "^\\s-*")
+          (replace-match (clojure-docstring-fill-prefix))))
+    (lisp-indent-line)))
+
+(defun clojure-indent-function (indent-point state)
+  "When indenting a line within a function call, indent properly.
+
+INDENT-POINT is the position where the user typed TAB, or equivalent.
+Point is located at the point to indent under (for default indentation);
+STATE is the `parse-partial-sexp' state for that position.
+
+If the current line is in a call to a Clojure function with a
+non-nil property `clojure-indent-function', that specifies how to do
+the indentation.
+
+The property value can be
+
+- `defun', meaning indent `defun'-style;
+- an integer N, meaning indent the first N arguments specially
+  like ordinary function arguments and then indent any further
+  arguments like a body;
+- a function to call just as this function was called.
+  If that function returns nil, that means it doesn't specify
+  the indentation.
+
+This function also returns nil meaning don't specify the indentation."
+  (let ((normal-indent (current-column)))
+    (goto-char (1+ (elt state 1)))
+    (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
+    (if (and (elt state 2)
+             (not (looking-at "\\sw\\|\\s_")))
+        ;; car of form doesn't seem to be a symbol
+        (progn
+          (if (not (> (save-excursion (forward-line 1) (point))
+                      calculate-lisp-indent-last-sexp))
+              (progn (goto-char calculate-lisp-indent-last-sexp)
+                     (beginning-of-line)
+                     (parse-partial-sexp (point)
+                                         calculate-lisp-indent-last-sexp 0 t)))
+          ;; Indent under the list or under the first sexp on the same
+          ;; line as calculate-lisp-indent-last-sexp.  Note that first
+          ;; thing on that line has to be complete sexp since we are
+          ;; inside the innermost containing sexp.
+          (backward-prefix-chars)
+          (current-column))
+      (let* ((function (buffer-substring (point)
+                                         (progn (forward-sexp 1) (point))))
+             (open-paren (elt state 1))
+             (method nil)
+             (function-tail (first
+                             (last
+                              (split-string (substring-no-properties function) "/")))))
+        (setq method (get (intern-soft function-tail) 'clojure-indent-function))
+        (cond ((member (char-after open-paren) '(?\[ ?\{))
+               (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-\\)"
+                                      function)))
+               (lisp-indent-defform state indent-point))
+              ((integerp method)
+               (lisp-indent-specform method state
+                                     indent-point normal-indent))
+              (method
+               (funcall method indent-point state))
+              (clojure-use-backtracking-indent
+               (clojure-backtracking-indent
+                indent-point state normal-indent)))))))
+
+(defun clojure-backtracking-indent (indent-point state normal-indent)
+  "Experimental backtracking support.
+
+Given an INDENT-POINT, the STATE, and the NORMAL-INDENT, will
+move upwards in an sexp to check for contextual indenting."
+  (let (indent (path) (depth 0))
+    (goto-char (elt state 1))
+    (while (and (not indent)
+                (< depth clojure-max-backtracking))
+      (let ((containing-sexp (point)))
+        (parse-partial-sexp (1+ containing-sexp) indent-point 1 t)
+        (when (looking-at "\\sw\\|\\s_")
+          (let* ((start (point))
+                 (fn (buffer-substring start (progn (forward-sexp 1) (point))))
+                 (meth (get (intern-soft fn) 'clojure-backtracking-indent)))
+            (let ((n 0))
+              (when (< (point) indent-point)
+                (condition-case ()
+                    (progn
+                      (forward-sexp 1)
+                      (while (< (point) indent-point)
+                        (parse-partial-sexp (point) indent-point 1 t)
+                        (incf n)
+                        (forward-sexp 1)))
+                  (error nil)))
+              (push n path))
+            (when meth
+              (let ((def meth))
+                (dolist (p path)
+                  (if (and (listp def)
+                           (< p (length def)))
+                      (setq def (nth p def))
+                    (if (listp def)
+                        (setq def (car (last def)))
+                      (setq def nil))))
+                (goto-char (elt state 1))
+                (when def
+                  (setq indent (+ (current-column) def)))))))
+        (goto-char containing-sexp)
+        (condition-case ()
+            (progn
+              (backward-up-list 1)
+              (incf depth))
+          (error (setq depth clojure-max-backtracking)))))
+    indent))
+
+;; clojure backtracking indent is experimental and the format for these
+;; entries are subject to change
+(put 'implement 'clojure-backtracking-indent '(4 (2)))
+(put 'letfn 'clojure-backtracking-indent '((2) 2))
+(put 'proxy 'clojure-backtracking-indent '(4 4 (2)))
+(put 'reify 'clojure-backtracking-indent '((2)))
+(put 'deftype 'clojure-backtracking-indent '(4 4 (2)))
+(put 'defrecord 'clojure-backtracking-indent '(4 4 (2)))
+(put 'defprotocol 'clojure-backtracking-indent '(4 (2)))
+(put 'extend-type 'clojure-backtracking-indent '(4 (2)))
+(put 'extend-protocol 'clojure-backtracking-indent '(4 (2)))
+(put 'specify 'clojure-backtracking-indent '(4 (2)))
+(put 'specify! 'clojure-backtracking-indent '(4 (2)))
+
+(defun put-clojure-indent (sym indent)
+  "Instruct `clojure-indent-function' to indent the body of SYM by INDENT."
+  (put sym 'clojure-indent-function indent))
+
+(defmacro define-clojure-indent (&rest kvs)
+  "Call `put-clojure-indent' on a series, KVS."
+  `(progn
+     ,@(mapcar (lambda (x) `(put-clojure-indent
+                             (quote ,(first x)) ,(second x)))
+               kvs)))
+
+(defun add-custom-clojure-indents (name value)
+  "Allow `clojure-defun-indents' to indent user-specified macros.
+
+Requires the macro's NAME and a VALUE."
+  (custom-set-default name value)
+  (mapcar (lambda (x)
+            (put-clojure-indent x 'defun))
+          value))
+
+(defcustom clojure-defun-indents nil
+  "List of additional symbols with defun-style indentation in Clojure.
+
+You can use this to let Emacs indent your own macros the same way
+that it indents built-in macros like with-open.  To manually set
+it from Lisp code, use (put-clojure-indent 'some-symbol 'defun)."
+  :type '(repeat symbol)
+  :group 'clojure
+  :set 'add-custom-clojure-indents)
+
+(define-clojure-indent
+  ;; built-ins
+  (ns 1)
+  (fn 'defun)
+  (def 'defun)
+  (defn 'defun)
+  (bound-fn 'defun)
+  (if 1)
+  (if-not 1)
+  (case 1)
+  (cond 0)
+  (condp 2)
+  (cond-> 1)
+  (cond->> 1)
+  (when 1)
+  (while 1)
+  (when-not 1)
+  (when-first 1)
+  (do 0)
+  (future 0)
+  (comment 0)
+  (doto 1)
+  (locking 1)
+  (proxy 2)
+  (as-> 2)
+  (with-open 1)
+  (with-precision 1)
+  (with-local-vars 1)
+
+  (reify 'defun)
+  (deftype 2)
+  (defrecord 2)
+  (defprotocol 1)
+  (extend 1)
+  (extend-protocol 1)
+  (extend-type 1)
+
+  (try 0)
+  (catch 2)
+  (finally 0)
+
+  ;; binding forms
+  (let 1)
+  (letfn 1)
+  (binding 1)
+  (loop 1)
+  (for 1)
+  (doseq 1)
+  (dotimes 1)
+  (when-let 1)
+  (if-let 1)
+  (when-some 1)
+  (if-some 1)
+
+  (defmethod 'defun)
+
+  ;; clojure.test
+  (testing 1)
+  (deftest 'defun)
+  (are 1)
+  (use-fixtures 'defun)
+
+  ;; core.logic
+  (run 'defun)
+  (run* 'defun)
+  (fresh 'defun)
+
+  ;; core.async
+  (alt! 0)
+  (alt!! 0)
+  (go 0)
+  (go-loop 1)
+  (thread 0))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Better docstring filling for clojure-mode
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(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-before beg) (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."
+  (when (not (= (point) (point-max)))
+    (buffer-substring-no-properties (point) (1+ (point)))))
+
+(defun clojure-char-before-point ()
+  "Return the char before point or nil if at buffer beginning."
+  (when (not (= (point) (point-min)))
+    (buffer-substring-no-properties (point) (1- (point)))))
+
+;; TODO: Deal with the fact that when point is exactly at the
+;; beginning of a string, it thinks that is the end.
+(defun clojure-string-end ()
+  "Return the position of the \" that ends the string at point.
+
+Note that point must be inside the string - if point is
+positioned at the opening quote, incorrect results will be
+returned."
+  (save-excursion
+    (save-match-data
+      ;; If we're at the end of the string, just return point.
+      (if (and (string= (clojure-char-at-point) "\"")
+               (not (string= (clojure-char-before-point) "\\")))
+          (point)
+        ;; We don't want to get screwed by starting out at the
+        ;; backslash in an escaped quote.
+        (when (string= (clojure-char-at-point) "\\")
+          (backward-char))
+        ;; Look for a quote not preceeded by a backslash
+        (re-search-forward "[^\\]\\\(\\\"\\)")
+        (match-beginning 1)))))
+
+(defun clojure-mark-string ()
+  "Mark the string at point."
+  (interactive)
+  (goto-char (clojure-string-start))
+  (forward-char)
+  (set-mark (clojure-string-end)))
+
+(defun clojure-toggle-keyword-string ()
+  "Convert the string or keyword at point to keyword or 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))
+      (error "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)))
+
+
+
+(defconst clojure-namespace-name-regex
+  (rx line-start
+      (zero-or-more whitespace)
+      "("
+      (zero-or-one (group (regexp "clojure.core/")))
+      (zero-or-one (submatch "in-"))
+      "ns"
+      (zero-or-one "+")
+      (one-or-more (any whitespace "\n"))
+      (zero-or-more (or (submatch (zero-or-one "#")
+                                  "^{"
+                                  (zero-or-more (not (any "}")))
+                                  "}")
+                        (zero-or-more "^:"
+                                      (one-or-more (not (any whitespace)))))
+                    (one-or-more (any whitespace "\n")))
+      ;; why is this here? oh (in-ns 'foo) or (ns+ :user)
+      (zero-or-one (any ":'"))
+      (group (one-or-more (not (any "()\"" whitespace))) word-end)))
+
+;; for testing clojure-namespace-name-regex, you can evaluate this code and make
+;; sure foo (or whatever the namespace name is) shows up in results. some of
+;; these currently fail.
+;; (mapcar (lambda (s) (let ((n (string-match clojure-namespace-name-regex s)))
+;;                       (if n (match-string 4 s))))
+;;         '("(ns foo)"
+;;           "(ns
+;; foo)"
+;;           "(ns foo.baz)"
+;;           "(ns ^:bar foo)"
+;;           "(ns ^:bar ^:baz foo)"
+;;           "(ns ^{:bar true} foo)"
+;;           "(ns #^{:bar true} foo)"
+;;           "(ns #^{:fail {}} foo)"
+;;           "(ns ^{:fail2 {}} foo.baz)"
+;;           "(ns ^{} foo)"
+;;           "(ns ^{:skip-wiki true}
+;;   aleph.netty
+;; "
+;;           "(ns
+;;  foo)"
+;;     "foo"))
+
+
+
+(defun clojure-expected-ns ()
+  "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)
+                              (- (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)
+  (widen)
+  (goto-char (point-min))
+  (clojure-insert-ns-form-at-point))
+
+(defun clojure-update-ns ()
+  "Update the namespace of the current buffer.
+Useful if a file has been renamed."
+  (interactive)
+  (let ((nsname (clojure-expected-ns)))
+    (when nsname
+      (save-excursion
+        (save-match-data
+          (if (clojure-find-ns)
+              (replace-match nsname nil nil nil 4)
+            (error "Namespace not found")))))))
+
+(defun clojure-find-ns ()
+  "Find the namespace of the current Clojure buffer."
+  (let ((regexp clojure-namespace-name-regex))
+    (save-excursion
+      (save-restriction
+        (widen)
+        (goto-char (point-min))
+        (when (re-search-forward regexp nil t)
+          (match-string-no-properties 4))))))
+
+(defun clojure-find-def ()
+  "Find the var declaration macro and symbol name of the current form.
+Returns a list pair, e.g. (\"defn\" \"abc\") or (\"deftest\" \"some-test\")."
+  (let ((re (concat "(\\(?:\\(?:\\sw\\|\\s_\\)+/\\)?"
+                    ;; Declaration
+                    "\\(def\\sw*\\)\\>"
+                    ;; Any whitespace
+                    "[ \r\n\t]*"
+                    ;; Possibly type or metadata
+                    "\\(?:#?^\\(?:{[^}]*}\\|\\(?:\\sw\\|\\s_\\)+\\)[ \r\n\t]*\\)*"
+                    ;; Symbol name
+                    "\\(\\(?:\\sw\\|\\s_\\)+\\)")))
+    (save-excursion
+      (unless (looking-at re)
+        (beginning-of-defun))
+      (when (search-forward-regexp re nil t)
+        (list (match-string 1)
+              (match-string 2))))))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist
+             '("\\.\\(clj[sx]?\\|dtm\\|edn\\)\\'" . clojure-mode))
+
+(provide 'clojure-mode)
+
+;; Local Variables:
+;; coding: utf-8
+;; byte-compile-warnings: (not cl-functions)
+;; indent-tabs-mode: nil
+;; End:
+
+;;; clojure-mode.el ends here
diff --git a/elpa/clojure-mode-4.0.1/clojure-mode.elc b/elpa/clojure-mode-4.0.1/clojure-mode.elc
new file mode 100644
index 000000000..56384e941
Binary files /dev/null and b/elpa/clojure-mode-4.0.1/clojure-mode.elc differ
diff --git a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
deleted file mode 100644
index 92cb91055..000000000
--- a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-autoloads.el
+++ /dev/null
@@ -1,41 +0,0 @@
-;;; clojure-test-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (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" "\
-A minor mode for running Clojure tests.
-
-\\{clojure-test-mode-map}
-
-\(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 \"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") (21184 20189
-;;;;;;  750997))
-
-;;;***
-
-(provide 'clojure-test-mode-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; clojure-test-mode-autoloads.el ends here
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
deleted file mode 100644
index 5b4e2f9ea..000000000
--- a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index 37d2ef2b3..000000000
Binary files a/elpa/clojure-test-mode-20131227.805/clojure-test-mode-pkg.elc and /dev/null differ
diff --git a/elpa/clojure-test-mode-20131227.805/clojure-test-mode.el b/elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
deleted file mode 100644
index 127578b2a..000000000
--- a/elpa/clojure-test-mode-20131227.805/clojure-test-mode.el
+++ /dev/null
@@ -1,554 +0,0 @@
-;;; clojure-test-mode.el --- Minor mode for Clojure tests
-
-;; Copyright © 2009-2011 Phil Hagelberg
-
-;; Author: Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://emacswiki.org/cgi-bin/wiki/ClojureTestMode
-;; Version: 20131227.805
-;; X-Original-Version: 3.0.0
-;; Keywords: languages, lisp, test
-;; Package-Requires: ((clojure-mode "1.7") (cider "0.4.0"))
-
-;; This file is not part of GNU Emacs.
-
-;;; Commentary:
-
-;; This file provides support for running Clojure tests (using the
-;; clojure.test framework) via nrepl.el and seeing feedback in the test
-;; buffer about which tests failed or errored.
-
-;;; Usage:
-
-;; Once you have an nrepl session active, you can run the tests in the
-;; current buffer with C-c C-,. Failing tests and errors will be
-;; highlighted using overlays. To clear the overlays, use C-c k.
-
-;; You can jump between implementation and test files with <kbd>C-c C-t</kbd> if
-;; your project is laid out in a way that clojure-test-mode expects. Your
-;; project root should have a `src/` directory containing files that correspond
-;; to their namespace. It should also have a `test/` directory containing files
-;; that correspond to their namespace, and the test namespaces should mirror the
-;; implementation namespaces with the addition of "-test" as the suffix to the
-;; last segment of the namespace.
-
-;; So `my.project.frob` would be found in `src/my/project/frob.clj` and its
-;; tests would be in `test/my/project/frob_test.clj` in the
-;; `my.project.frob-test` namespace.
-
-;; This behavior can also be overridden by setting `clojure-test-for-fn` and
-;; `clojure-test-implementation-for-fn` with functions of your choosing.
-;; `clojure-test-for-fn` takes an implementation namespace and returns the full
-;; path of the test file.  `clojure-test-implementation-for-fn` takes a test
-;; namespace and returns the full path for the implementation file.
-
-;;; History:
-
-;; 1.0: 2009-03-12
-;;  * Initial Release
-
-;; 1.1: 2009-04-28
-;;  * Fix to work with latest version of test-is. (circa Clojure 1.0)
-
-;; 1.2: 2009-05-19
-;;  * Add clojure-test-jump-to-(test|implementation).
-
-;; 1.3: 2009-11-10
-;;  * Update to use clojure.test instead of clojure.contrib.test-is.
-;;  * Fix bug suppressing test report output in repl.
-
-;; 1.4: 2010-05-13
-;;  * Fix jump-to-test
-;;  * Update to work with Clojure 1.2.
-;;  * Added next/prev problem.
-;;  * Depend upon slime, not swank-clojure.
-;;  * Don't move the mark when activating.
-
-;; 1.5: 2010-09-16
-;;  * Allow customization of clojure-test-ns-segment-position.
-;;  * Fixes for Clojure 1.2.
-;;  * Check for active slime connection.
-;;  * Fix test toggling with negative segment-position.
-
-;; 1.5.1: 2010-11-27
-;;  * Add marker between each test run.
-
-;; 1.5.2: 2011-03-11
-;;  * Make clojure-test-run-tests force reload. Requires swank-clojure 1.3.0.
-
-;; 1.5.3 2011-03-14
-;;  * Fix clojure-test-run-test to use fixtures.
-
-;; 1.5.4 2011-03-16
-;;  * Fix clojure-test-run-tests to wait until tests are reloaded.
-
-;; 1.5.5 2011-04-08
-;;  * Fix coloring/reporting
-;;  * Don't trigger slime-connected-hook.
-
-;; 1.5.6 2011-06-15
-;;  * Remove heinous clojure.test/report monkeypatch.
-
-;; 1.6.0 2011-11-06
-;;  * Compatibility with Clojure 1.3.
-;;  * Support narrowing.
-;;  * Fix a bug in clojure-test-mode-test-one-in-ns.
-
-;; 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
-;; * Put Testing indicator in modeline while tests are running
-;; * Integrate with M-x next-error
-;; * Error messages need line number.
-;; * Currently show-message needs point to be on the line with the
-;;   "is" invocation; this could be cleaned up.
-
-;;; Code:
-
-(require 'cl)
-(require 'clojure-mode)
-(require 'which-func)
-(require 'nrepl-client)
-(require 'cider-interaction)
-
-;; Faces
-
-(defface clojure-test-failure-face
-  '((((class color) (background light))
-     :background "orange red") ;; TODO: Hard to read strings over this.
-    (((class color) (background dark))
-     :background "firebrick"))
-  "Face for failures in Clojure tests."
-  :group 'clojure-test-mode)
-
-(defface clojure-test-error-face
-  '((((class color) (background light))
-     :background "orange1")
-    (((class color) (background dark))
-     :background "orange4"))
-  "Face for errors in Clojure tests."
-  :group 'clojure-test-mode)
-
-(defface clojure-test-success-face
-  '((((class color) (background light))
-     :foreground "black"
-     :background "green")
-    (((class color) (background dark))
-     :foreground "black"
-     :background "green"))
-  "Face for success in Clojure tests."
-  :group 'clojure-test-mode)
-
-;; Counts
-
-(defvar clojure-test-count 0)
-(defvar clojure-test-failure-count 0)
-(defvar clojure-test-error-count 0)
-
-;; Consts
-
-(defconst clojure-test-ignore-results
-  '(:end-test-ns :begin-test-var :end-test-var)
-  "Results from test-is that we don't use")
-
-;; Support Functions
-
-(defun clojure-test-make-handler (callback)
-  (lexical-let ((buffer (current-buffer))
-                (callback callback))
-    (nrepl-make-response-handler buffer
-                                 (lambda (buffer value)
-                                   (funcall callback buffer value))
-                                 (lambda (buffer value)
-                                   (cider-repl-emit-interactive-output value))
-                                 (lambda (buffer 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 (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 (cider-connected-p)
-    (nrepl-send-string-sync
-     "(ns clojure.test.mode
-        (:use [clojure.test :only [file-position *testing-vars* *test-out*
-                                   join-fixtures *report-counters* do-report
-                                   test-var *initial-report-counters*]]
-              [clojure.pprint :only [pprint]]))
-
-    (def #^{:dynamic true} *clojure-test-mode-out* nil)
-    (def fail-events #{:fail :error})
-    (defn report [event]
-     (if-let [current-test (last clojure.test/*testing-vars*)]
-        (alter-meta! current-test
-                     assoc :status (conj (:status (meta current-test))
-                                     [(:type event)
-                                      (:message event)
-                                      (when (fail-events (:type event))
-                                        (str (:expected event)))
-                                      (when (fail-events (:type event))
-                                        (str (:actual event)))
-                                      (case (:type event)
-                                        :fail (with-out-str (pprint (:actual event)))
-                                        :error (with-out-str
-                                                (clojure.stacktrace/print-cause-trace
-                                                (:actual event)))
-                                        nil)
-                                      (if (and (= (:major *clojure-version*) 1)
-                                               (< (:minor *clojure-version*) 2))
-                                          ((file-position 2) 1)
-                                          (if (= (:type event) :error)
-                                              ((file-position 3) 1)
-                                              (:line event)))])))
-     (binding [*test-out* (or *clojure-test-mode-out* *out*)]
-       ((.getRawRoot #'clojure.test/report) event)))
-
-   (defn clojure-test-mode-test-one-var [test-ns test-name]
-     (let [v (ns-resolve test-ns test-name)
-           once-fixture-fn (join-fixtures (::once-fixtures (meta (find-ns test-ns))))
-           each-fixture-fn (join-fixtures (::each-fixtures (meta (find-ns test-ns))))]
-       (once-fixture-fn
-        (fn []
-          (when (:test (meta v))
-            (each-fixture-fn (fn [] (test-var v))))))))
-
-    ;; adapted from test-ns
-    (defn clojure-test-mode-test-one-in-ns [ns test-name]
-      (binding [*report-counters* (ref *initial-report-counters*)]
-        (let [ns-obj (the-ns ns)]
-          (do-report {:type :begin-test-ns, :ns ns-obj})
-          ;; If the namespace has a test-ns-hook function, call that:
-          (if-let [v (find-var (symbol (str (ns-name ns-obj)) \"test-ns-hook\"))]
-            ((var-get v))
-            ;; Otherwise, just test every var in the namespace.
-            (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 (cider-current-ns) "user")
-     (nrepl-current-tooling-session))))
-
-(defun clojure-test-get-results (buffer result)
-  (with-current-buffer buffer
-    (clojure-test-eval
-     (concat "(map #(cons (str (:name (meta %)))
-                (:status (meta %))) (vals (ns-interns '"
-             (clojure-find-ns) ")))")
-     #'clojure-test-extract-results)))
-
-(defun clojure-test-extract-results (buffer results)
-  (with-current-buffer buffer
-    (let ((result-vars (read results)))
-      (mapc #'clojure-test-extract-result result-vars)
-      (clojure-test-echo-results))))
-
-(defun clojure-test-extract-result (result)
-  "Parse the result from a single test. May contain multiple is blocks."
-  (dolist (is-result (rest result))
-    (unless (member (aref is-result 0) clojure-test-ignore-results)
-      (incf clojure-test-count)
-      (destructuring-bind (event msg expected actual pp-actual line)
-          (coerce is-result 'list)
-        (if (equal :fail event)
-            (progn (incf clojure-test-failure-count)
-                   (clojure-test-highlight-problem
-                    line event (format "Expected %s, got %s" expected actual)
-                    pp-actual))
-          (when (equal :error event)
-            (incf clojure-test-error-count)
-            (clojure-test-highlight-problem
-             line event actual pp-actual))))))
-  (clojure-test-echo-results))
-
-(defun clojure-test-echo-results ()
-  (message
-   (propertize
-    (format "Ran %s tests. %s failures, %s errors."
-            clojure-test-count clojure-test-failure-count
-            clojure-test-error-count)
-    'face
-    (cond ((not (= clojure-test-error-count 0)) 'clojure-test-error-face)
-          ((not (= clojure-test-failure-count 0)) 'clojure-test-failure-face)
-          (t 'clojure-test-success-face)))))
-
-(defun clojure-test-highlight-problem (line event message pp-actual)
-  (save-excursion
-    (goto-char (point-min))
-    (forward-line (1- line))
-    (let ((beg (point)))
-      (end-of-line)
-      (let ((overlay (make-overlay beg (point))))
-        (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)))))
-
-;; Problem navigation
-(defun clojure-test-find-next-problem (here)
-  "Go to the next position with an overlay message.
-Retuns the problem overlay if such a position is found, otherwise nil."
-  (let ((current-overlays (overlays-at here))
-        (next-overlays (next-overlay-change here)))
-    (while (and (not (equal next-overlays (point-max)))
-                (or
-                 (not (overlays-at next-overlays))
-                 (equal (overlays-at next-overlays)
-                        current-overlays)))
-      (setq next-overlays (next-overlay-change next-overlays)))
-    (if (not (equal next-overlays (point-max)))
-        (overlay-start (car (overlays-at next-overlays))))))
-
-(defun clojure-test-find-previous-problem (here)
-  "Go to the next position with the `clojure-test-problem' text property.
-Retuns the problem overlay if such a position is found, otherwise nil."
-  (let ((current-overlays (overlays-at here))
-        (previous-overlays (previous-overlay-change here)))
-    (while (and (not (equal previous-overlays (point-min)))
-                (or
-                 (not (overlays-at previous-overlays))
-                 (equal (overlays-at previous-overlays)
-                        current-overlays)))
-      (setq previous-overlays (previous-overlay-change previous-overlays)))
-    (if (not (equal previous-overlays (point-min)))
-        (overlay-start (car (overlays-at previous-overlays))))))
-
-;; File navigation
-
-(defun clojure-test-implementation-for (namespace)
-  "Returns the path of the src file for the given test namespace."
-  (let* ((namespace (clojure-underscores-for-hyphens namespace))
-         (segments (split-string namespace "\\."))
-         (namespace-end (split-string (car (last segments)) "_"))
-         (namespace-end (mapconcat 'identity (butlast namespace-end 1) "_"))
-         (impl-segments (append (butlast segments 1) (list namespace-end))))
-    (format "%s/src/%s.clj"
-            (locate-dominating-file buffer-file-name "src/")
-            (mapconcat 'identity impl-segments "/"))))
-
-(defvar clojure-test-implementation-for-fn 'clojure-test-implementation-for
-  "Var pointing to the function that will return the full path of the
-Clojure src file for the given test namespace.")
-
-;; Commands
-
-(defun clojure-test-run-tests ()
-  "Run all the tests in the current namespace."
-  (interactive)
-  (save-some-buffers nil (lambda () (equal major-mode 'clojure-mode)))
-  (message "Testing...")
-  (if (not (clojure-in-tests-p))
-      (cider-load-file (buffer-file-name)))
-  (save-window-excursion
-    (if (not (clojure-in-tests-p))
-        (clojure-jump-to-test))
-    (clojure-test-clear)
-    (clojure-test-eval (format "(binding [clojure.test/report clojure.test.mode/report]
-                                       (clojure.test/run-tests '%s))"
-                               (clojure-find-ns))
-                       #'clojure-test-get-results)))
-
-(defun clojure-test-run-test ()
-  "Run the test at point."
-  (interactive)
-  (save-some-buffers nil (lambda () (equal major-mode 'clojure-mode)))
-  (imenu--make-index-alist)
-  (clojure-test-clear)
-  (let* ((f (which-function))
-         (test-name (if (listp f) (first f) f)))
-    (clojure-test-eval (format "(binding [clojure.test/report clojure.test.mode/report]
-                                  (load-file \"%s\")
-                                  (clojure.test.mode/clojure-test-mode-test-one-in-ns '%s '%s)
-                                  (cons (:name (meta (var %s))) (:status (meta (var %s)))))"
-                               (buffer-file-name) (clojure-find-ns)
-                               test-name test-name test-name)
-                       (lambda (buffer result-str)
-                         (with-current-buffer buffer
-                           (let ((result (read result-str)))
-                             (if (cdr result)
-                                 (clojure-test-extract-result result)
-                               (message "Not in a test."))))))))
-
-(defun clojure-test-show-result ()
-  "Show the result of the test under point."
-  (interactive)
-  (let ((overlay (find-if (lambda (o) (overlay-get o 'message))
-                          (overlays-at (point)))))
-    (if overlay
-        (message (replace-regexp-in-string "%" "%%"
-                                           (overlay-get overlay 'message))))))
-
-(defun clojure-test-pprint-result ()
-  "Show the result of the test under point."
-  (interactive)
-  (let ((overlay (find-if (lambda (o) (overlay-get o 'message))
-                          (overlays-at (point)))))
-    (when overlay
-      (with-current-buffer (generate-new-buffer " *test-output*")
-        (buffer-disable-undo)
-        (insert (overlay-get overlay 'actual))
-        (switch-to-buffer-other-window (current-buffer))))))
-
-;;; ediff results
-(defvar clojure-test-ediff-buffers nil)
-
-(defun clojure-test-ediff-cleanup ()
-  "A function for ediff-cleanup-hook, to cleanup the temporary ediff buffers"
-  (mapc (lambda (b) (when (get-buffer b) (kill-buffer b)))
-        clojure-test-ediff-buffers))
-
-(defun clojure-test-ediff-result ()
-  "Show the result of the test under point as an ediff"
-  (interactive)
-  (let ((overlay (find-if (lambda (o) (overlay-get o 'message))
-                          (overlays-at (point)))))
-    (if overlay
-        (let* ((m (overlay-get overlay 'actual)))
-          (let ((tmp-buffer (generate-new-buffer " *clojure-test-mode-tmp*"))
-                (exp-buffer (generate-new-buffer " *expected*"))
-                (act-buffer (generate-new-buffer " *actual*")))
-            (with-current-buffer tmp-buffer
-              (insert m)
-              (clojure-mode)
-              (goto-char (point-min))
-              (forward-char) ; skip a paren
-              (paredit-splice-sexp) ; splice
-              (lexical-let ((p (point))) ; delete "not"
-                (forward-sexp)
-                (delete-region p (point)))
-              (lexical-let ((p (point))) ; splice next sexp
-                (forward-sexp)
-                (backward-sexp)
-                (forward-char)
-                (paredit-splice-sexp))
-              (lexical-let ((p (point))) ; delete operator
-                (forward-sexp)
-                (delete-region p (point)))
-              (lexical-let ((p (point))) ; copy first expr
-                (forward-sexp)
-                (lexical-let ((p2 (point)))
-                  (with-current-buffer exp-buffer
-                    (insert-buffer-substring-as-yank tmp-buffer (+ 1 p) p2))))
-              (lexical-let ((p (point))) ; copy next expr
-                (forward-sexp)
-                (lexical-let ((p2 (point)))
-                  (with-current-buffer act-buffer
-                    (insert-buffer-substring-as-yank tmp-buffer (+ 1 p) p2)))))
-            (kill-buffer tmp-buffer)
-            (setq clojure-test-ediff-buffers
-                  (list (buffer-name exp-buffer) (buffer-name act-buffer)))
-            (ediff-buffers
-             (buffer-name exp-buffer) (buffer-name act-buffer)))))))
-
-(defun clojure-test-load-current-buffer ()
-  (let ((command (format "(clojure.core/load-file \"%s\")\n(in-ns '%s)"
-                         (buffer-file-name)
-                         (clojure-find-ns))))
-    (nrepl-send-string-sync command)))
-
-(defun clojure-test-clear ()
-  "Remove overlays and clear stored results."
-  (interactive)
-  (remove-overlays)
-  (setq clojure-test-count 0
-        clojure-test-failure-count 0
-        clojure-test-error-count 0)
-  (clojure-test-load-current-buffer))
-
-(defun clojure-test-next-problem ()
-  "Go to and describe the next test problem in the buffer."
-  (interactive)
-  (let* ((here (point))
-         (problem (clojure-test-find-next-problem here)))
-    (if problem
-        (goto-char problem)
-      (goto-char here)
-      (message "No next problem."))))
-
-(defun clojure-test-previous-problem ()
-  "Go to and describe the previous compiler problem in the buffer."
-  (interactive)
-  (let* ((here (point))
-         (problem (clojure-test-find-previous-problem here)))
-    (if problem
-        (goto-char problem)
-      (goto-char here)
-      (message "No previous problem."))))
-
-(defun clojure-test-jump-to-implementation ()
-  "Jump from test file to implementation."
-  (interactive)
-  (find-file (funcall clojure-test-implementation-for-fn
-                      (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)))
-    (define-key map (kbd "C-c C-,") 'clojure-test-run-tests)
-    (define-key map (kbd "C-c ,")   'clojure-test-run-tests)
-    (define-key map (kbd "C-c M-,") 'clojure-test-run-test)
-    (define-key map (kbd "C-c C-'") 'clojure-test-ediff-result)
-    (define-key map (kbd "C-c M-'") 'clojure-test-pprint-result)
-    (define-key map (kbd "C-c '")   'clojure-test-show-result)
-    (define-key map (kbd "C-c k")   'clojure-test-clear)
-    (define-key map (kbd "C-c C-t") 'clojure-jump-between-tests-and-code)
-    (define-key map (kbd "M-p")     'clojure-test-previous-problem)
-    (define-key map (kbd "M-n")     'clojure-test-next-problem)
-    map)
-  "Keymap for Clojure test mode.")
-
-;;;###autoload
-(define-minor-mode clojure-test-mode
-  "A minor mode for running Clojure tests.
-
-\\{clojure-test-mode-map}"
-  nil " Test" clojure-test-mode-map
-  (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 \"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))
-
-(provide 'clojure-test-mode)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
-;;; clojure-test-mode.el ends here
diff --git a/elpa/dash-2.1.0/dash-pkg.el b/elpa/dash-2.1.0/dash-pkg.el
deleted file mode 100644
index 823fdf14e..000000000
--- a/elpa/dash-2.1.0/dash-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index 9e803c6db..000000000
--- a/elpa/dash-2.1.0/dash.el
+++ /dev/null
@@ -1,1125 +0,0 @@
-;;; 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/dash-2.1.0/dash-autoloads.el b/elpa/dash-2.10.0/dash-autoloads.el
similarity index 62%
rename from elpa/dash-2.1.0/dash-autoloads.el
rename to elpa/dash-2.10.0/dash-autoloads.el
index f055b0ccf..215c1968f 100644
--- a/elpa/dash-2.1.0/dash-autoloads.el
+++ b/elpa/dash-2.10.0/dash-autoloads.el
@@ -1,18 +1,15 @@
 ;;; dash-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads nil nil ("dash-pkg.el" "dash.el") (21077 32433
-;;;;;;  641771 0))
+;;;### (autoloads nil nil ("dash.el") (21721 36938 460950 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.10.0/dash-pkg.el b/elpa/dash-2.10.0/dash-pkg.el
new file mode 100644
index 000000000..dd7931c5e
--- /dev/null
+++ b/elpa/dash-2.10.0/dash-pkg.el
@@ -0,0 +1 @@
+(define-package "dash" "2.10.0" "A modern list library for Emacs" 'nil)
diff --git a/elpa/dash-2.10.0/dash-pkg.elc b/elpa/dash-2.10.0/dash-pkg.elc
new file mode 100644
index 000000000..02a9e4454
Binary files /dev/null and b/elpa/dash-2.10.0/dash-pkg.elc differ
diff --git a/elpa/dash-2.10.0/dash.el b/elpa/dash-2.10.0/dash.el
new file mode 100644
index 000000000..0d2f33ca4
--- /dev/null
+++ b/elpa/dash-2.10.0/dash.el
@@ -0,0 +1,2178 @@
+;;; dash.el --- A modern list library for Emacs
+
+;; Copyright (C) 2012-2014 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 2.10.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:
+
+(defgroup dash ()
+  "Customize group for dash.el"
+  :group 'lisp
+  :prefix "dash-")
+
+(defun dash--enable-fontlock (symbol value)
+  (when value
+    (dash-enable-font-lock))
+  (set-default symbol value))
+
+(defcustom dash-enable-fontlock nil
+  "If non-nil, enable fontification of dash functions, macros and
+special values."
+  :type 'boolean
+  :set 'dash--enable-fontlock
+  :group 'dash)
+
+(defmacro !cons (car cdr)
+  "Destructive: Set CDR to the cons of CAR and CDR."
+  `(setq ,cdr (cons ,car ,cdr)))
+
+(defmacro !cdr (list)
+  "Destructive: Set LIST to the cdr of LIST."
+  `(setq ,list (cdr ,list)))
+
+(defmacro --each (list &rest body)
+  "Anaphoric form of `-each'."
+  (declare (debug (form body))
+           (indent 1))
+  (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)))))
+
+(defun -each (list fn)
+  "Call FN with every item in LIST. Return nil, used for side-effects only."
+  (--each list (funcall fn it)))
+
+(put '-each 'lisp-indent-function 1)
+
+(defmacro --each-while (list pred &rest body)
+  "Anaphoric form of `-each-while'."
+  (declare (debug (form form body))
+           (indent 2))
+  (let ((l (make-symbol "list"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,c t)
+           (it-index 0))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred) (setq ,c nil) ,@body))
+         (setq it-index (1+ it-index))
+         (!cdr ,l)))))
+
+(defun -each-while (list pred fn)
+  "Call FN with every item in LIST while (PRED item) is non-nil.
+Return nil, used for side-effects only."
+  (--each-while list (funcall pred it) (funcall fn it)))
+
+(put '-each-while 'lisp-indent-function 2)
+
+(defmacro --dotimes (num &rest body)
+  "Repeatedly executes BODY (presumably for side-effects) with `it` bound to integers from 0 through NUM-1."
+  (declare (debug (form body))
+           (indent 1))
+  (let ((n (make-symbol "num")))
+    `(let ((,n ,num)
+           (it 0))
+       (while (< it ,n)
+         ,@body
+         (setq it (1+ it))))))
+
+(defun -dotimes (num fn)
+  "Repeatedly calls FN (presumably for side-effects) passing in integers from 0 through NUM-1."
+  (--dotimes num (funcall fn it)))
+
+(put '-dotimes 'lisp-indent-function 1)
+
+(defun -map (fn list)
+  "Return 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 (form form)))
+  `(mapcar (lambda (it) ,form) ,list))
+
+(defmacro --reduce-from (form initial-value list)
+  "Anaphoric form of `-reduce-from'."
+  (declare (debug (form form form)))
+  `(let ((acc ,initial-value))
+     (--each ,list (setq acc ,form))
+     acc))
+
+(defun -reduce-from (fn initial-value list)
+  "Return 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, return 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'."
+  (declare (debug (form form)))
+  (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)
+  "Return 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 return 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'."
+  (declare (debug (form form form)))
+  `(-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 return 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'."
+  (declare (debug (form form)))
+  `(-reduce-r (lambda (&optional it acc) ,form) ,list))
+
+(defmacro --filter (form list)
+  "Anaphoric form of `-filter'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (when ,form (!cons it ,r)))
+       (nreverse ,r))))
+
+(defun -filter (pred list)
+  "Return 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 (form form)))
+  `(--filter (not ,form) ,list))
+
+(defun -remove (pred list)
+  "Return 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'."
+  (declare (debug (form form)))
+  (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)
+  "Return a new list of the non-nil results of applying FN to the items in LIST."
+  (--keep (funcall fn it) list))
+
+(defun -non-nil (list)
+  "Return all non-nil elements of LIST."
+  (-remove 'null list))
+
+(defmacro --map-indexed (form list)
+  "Anaphoric form of `-map-indexed'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list
+         (!cons ,form ,r))
+       (nreverse ,r))))
+
+(defun -map-indexed (fn list)
+  "Return 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))
+
+(defmacro --map-when (pred rep list)
+  "Anaphoric form of `-map-when'."
+  (declare (debug (form form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (!cons (if ,pred ,rep it) ,r))
+       (nreverse ,r))))
+
+(defun -map-when (pred rep list)
+  "Return 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.
+
+Alias: `-replace-where'
+
+See also: `-update-at'"
+  (--map-when (funcall pred it) (funcall rep it) list))
+
+(defalias '-replace-where '-map-when)
+(defalias '--replace-where '--map-when)
+
+(defun -replace (old new list)
+  "Replace all OLD items in LIST with NEW.
+
+Elements are compared using `equal'.
+
+See also: `-replace-at'"
+  (--map-when (equal it old) new list))
+
+(defmacro --mapcat (form list)
+  "Anaphoric form of `-mapcat'."
+  (declare (debug (form form)))
+  `(apply 'append (--map ,form ,list)))
+
+(defun -mapcat (fn list)
+  "Return the concatenation of the result of mapping FN over LIST.
+Thus function FN should return a list."
+  (--mapcat (funcall fn it) list))
+
+(defun -flatten (l)
+  "Take a nested list L and return its contents as a single, flat list.
+
+See also: `-flatten-n'"
+  (if (and (listp l) (listp (cdr l)))
+      (-mapcat '-flatten l)
+    (list l)))
+
+(defmacro --iterate (form init n)
+  "Anaphoric version of `-iterate'."
+  (declare (debug (form form form)))
+  `(-iterate (lambda (it) ,form) ,init ,n))
+
+(defun -flatten-n (num list)
+  "Flatten NUM levels of a nested LIST.
+
+See also: `-flatten'"
+  (-last-item (--iterate (--mapcat (-list it) it) list (1+ num))))
+
+(defun -concat (&rest lists)
+  "Return a new list with the concatenation of the elements in the supplied LISTS."
+  (apply 'append lists))
+
+(defalias '-copy 'copy-sequence
+  "Create a shallow copy of LIST.")
+
+(defun -splice (pred fun list)
+  "Splice lists generated by FUN in place of elements matching PRED in LIST.
+
+FUN takes the element matching PRED as input.
+
+This function can be used as replacement for `,@' in case you
+need to splice several lists at marked positions (for example
+with keywords).
+
+See also: `-splice-list', `-insert-at'"
+  (let (r)
+    (--each list
+      (if (funcall pred it)
+          (let ((new (funcall fun it)))
+            (--each new (!cons it r)))
+        (!cons it r)))
+    (nreverse r)))
+
+(defmacro --splice (pred form list)
+  "Anaphoric form of `-splice'."
+  `(-splice (lambda (it) ,pred) (lambda (it) ,form) ,list))
+
+(defun -splice-list (pred new-list list)
+  "Splice NEW-LIST in place of elements matching PRED in LIST.
+
+See also: `-splice', `-insert-at'"
+  (-splice pred (lambda (_) new-list) list))
+
+(defun --splice-list (pred new-list list)
+  "Anaphoric form of `-splice-list'."
+  `(-splice-list (lambda (it) ,pred) ,new-list ,list))
+
+(defun -cons* (&rest args)
+  "Make 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."
+  (-reduce-r 'cons args))
+
+(defun -snoc (list elem &rest elements)
+  "Append ELEM to the end of the list.
+
+This is like `cons', but operates on the end of list.
+
+If ELEMENTS is non nil, append these to the list as well."
+  (-concat list (list elem) elements))
+
+(defmacro --first (form list)
+  "Anaphoric form of `-first'."
+  (declare (debug (form form)))
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each-while ,list (not ,n)
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -first (pred list)
+  "Return 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'.
+
+Alias: `-find'"
+  (--first (funcall pred it) list))
+
+(defalias '-find '-first)
+(defalias '--find '--first)
+
+(defmacro --last (form list)
+  "Anaphoric form of `-last'."
+  (declare (debug (form form)))
+  (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
+  "Return the first item of LIST, or nil on an empty list.")
+
+(defun -last-item (list)
+  "Return the last item of LIST, or nil on an empty list."
+  (car (last list)))
+
+(defun -butlast (list)
+  "Return a list of all items in list except for the last."
+  (let (result)
+    (while (cdr list)
+      (!cons (car list) result)
+      (!cdr list))
+    (nreverse result)))
+
+(defmacro --count (pred list)
+  "Anaphoric form of `-count'."
+  (declare (debug (form form)))
+  (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?'."
+  (declare (debug (form form)))
+  `(---truthy? (--first ,form ,list)))
+
+(defun -any? (pred list)
+  "Return t if (PRED x) is non-nil for any x in LIST, else nil.
+
+Alias: `-any-p', `-some?', `-some-p'"
+  (--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?'."
+  (declare (debug (form form)))
+  (let ((a (make-symbol "all")))
+    `(let ((,a t))
+       (--each-while ,list ,a (setq ,a ,form))
+       (---truthy? ,a))))
+
+(defun -all? (pred list)
+  "Return t if (PRED x) is non-nil for all x in LIST, else nil.
+
+Alias: `-all-p', `-every?', `-every-p'"
+  (--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?'."
+  (declare (debug (form form)))
+  `(--all? (not ,form) ,list))
+
+(defun -none? (pred list)
+  "Return t if (PRED x) is nil for all x in LIST, else nil.
+
+Alias: `-none-p'"
+  (--none? (funcall pred it) list))
+
+(defalias '-none-p '-none?)
+(defalias '--none-p '--none?)
+
+(defmacro --only-some? (form list)
+  "Anaphoric form of `-only-some?'."
+  (declare (debug (form form)))
+  (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)
+  "Return `t` if at least one item of LIST matches PRED and at least one item of LIST does not match PRED.
+Return `nil` both if all items match the predicate or if none of the items match the predicate.
+
+Alias: `-only-some-p'"
+  (--only-some? (funcall pred it) list))
+
+(defalias '-only-some-p '-only-some?)
+(defalias '--only-some-p '--only-some?)
+
+(defun -slice (list from &optional to step)
+  "Return copy of LIST, starting from index FROM to index TO.
+
+FROM or TO may be negative.  These values are then interpreted
+modulo the length of the list.
+
+If STEP is a number, only each STEPth item in the resulting
+section is returned.  Defaults to 1."
+  (let ((length (length list))
+        (new-list nil))
+    ;; to defaults to the end of the list
+    (setq to (or to length))
+    (setq step (or step 1))
+    ;; 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
+    (--each-while list (< it-index to)
+      (when (and (>= it-index from)
+                 (= (mod (- from it-index) step) 0))
+        (push it new-list)))
+    (nreverse new-list)))
+
+(defun -take (n list)
+  "Return 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)))
+
+(defalias '-drop 'nthcdr "Return the tail of LIST without the first N items.")
+
+(defmacro --take-while (form list)
+  "Anaphoric form of `-take-while'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each-while ,list ,form (!cons it ,r))
+       (nreverse ,r))))
+
+(defun -take-while (pred list)
+  "Return 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'."
+  (declare (debug (form form)))
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list))
+       (while (and ,l (let ((it (car ,l))) ,form))
+         (!cdr ,l))
+       ,l)))
+
+(defun -drop-while (pred list)
+  "Return 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)
+  "Return 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)
+  "Return a list with X inserted into LIST at position N.
+
+See also: `-splice', `-splice-list'"
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cadr split-list)))))
+
+(defun -replace-at (n x list)
+  "Return a list with element at Nth position in LIST replaced with X.
+
+See also: `-replace'"
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cdr (cadr split-list))))))
+
+(defun -update-at (n func list)
+  "Return a list with element at Nth position in LIST replaced with `(func (nth n list))`.
+
+See also: `-map-when'"
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons (funcall func (car (cadr split-list))) (cdr (cadr split-list))))))
+
+(defmacro --update-at (n form list)
+  "Anaphoric version of `-update-at'."
+  (declare (debug (form form form)))
+  `(-update-at ,n (lambda (it) ,form) ,list))
+
+(defun -remove-at (n list)
+  "Return a list with element at Nth position in LIST removed.
+
+See also: `-remove-at-indices', `-remove'"
+  (-remove-at-indices (list n) list))
+
+(defun -remove-at-indices (indices list)
+  "Return a list whose elements are elements from LIST without
+elements selected as `(nth i list)` for all i
+from INDICES.
+
+See also: `-remove-at', `-remove'"
+  (let* ((indices (-sort '< indices))
+         (diffs (cons (car indices) (-map '1- (-zip-with '- (cdr indices) indices))))
+         r)
+    (--each diffs
+      (let ((split (-split-at it list)))
+        (!cons (car split) r)
+        (setq list (cdr (cadr split)))))
+    (!cons list r)
+    (apply '-concat (nreverse r))))
+
+(defmacro --split-with (pred list)
+  "Anaphoric form of `-split-with'."
+  (declare (debug (form form)))
+  (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)
+  "Return 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 -split-on (item list)
+  "Split the LIST each time ITEM is found.
+
+Unlike `-partition-by', the ITEM is discarded from the results.
+Empty lists are also removed from the result.
+
+Comparison is done by `equal'.
+
+See also `-split-when'"
+  (declare (debug (form form)))
+  `(-split-when (lambda (it) (equal it ,item)) ,list))
+
+(defmacro --split-when (form list)
+  "Anaphoric version of `-split-when'."
+  (declare (debug (form form)))
+  `(-split-when (lambda (it) ,form) ,list))
+
+(defun -split-when (fn list)
+  "Split the LIST on each element where FN returns non-nil.
+
+Unlike `-partition-by', the \"matched\" element is discarded from
+the results.  Empty lists are also removed from the result.
+
+This function can be thought of as a generalization of
+`split-string'."
+  (let (r s)
+    (while list
+      (if (not (funcall fn (car list)))
+          (push (car list) s)
+        (when s (push (nreverse s) r))
+        (setq s nil))
+      (!cdr list))
+    (when s (push (nreverse s) r))
+    (nreverse r)))
+
+(defmacro --separate (form list)
+  "Anaphoric form of `-separate'."
+  (declare (debug (form form)))
+  (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)
+  "Return 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)
+  "Return 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)
+  "Return 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)
+  "Return 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)
+  "Return 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'."
+  (declare (debug (form form)))
+  (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)
+  "Apply 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'."
+  (declare (debug (form form)))
+  (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)
+  "Apply FN to the first item in LIST. That is the header
+value. Apply 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'."
+  (declare (debug (form form)))
+  (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)
+  "Return 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)
+  "Return 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`."
+  (declare (debug (form form form)))
+  (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 (&rest lists)
+  "Zip LISTS together.  Group the head of each list, followed by the
+second elements of each list, and so on. The lengths of the returned
+groupings are equal to the length of the shortest input list.
+
+If two lists are provided as arguments, return the groupings as a list
+of cons cells. Otherwise, return the groupings as a list of lists. "
+  (let (results)
+    (while (-none? 'null lists)
+      (setq results (cons (mapcar 'car lists) results))
+      (setq lists (mapcar 'cdr lists)))
+    (setq results (nreverse results))
+    (if (= (length lists) 2)
+        ; to support backward compatability, return
+        ; a cons cell if two lists were provided
+        (--map (cons (car it) (cadr it)) results)
+      results)))
+
+(defun -zip-fill (fill-value &rest lists)
+  "Zip LISTS, with FILL-VALUE padded onto the shorter lists. The
+lengths of the returned groupings are equal to the length of the
+longest input list."
+  (apply '-zip (apply '-pad (cons fill-value lists))))
+
+(defun -cycle (list)
+  "Return an infinite copy of LIST that will cycle through the
+elements and repeat from the beginning."
+  (let ((newlist (-map 'identity list)))
+    (nconc newlist newlist)))
+
+(defun -pad (fill-value &rest lists)
+  "Appends FILL-VALUE to the end of each list in LISTS such that they
+will all have the same length."
+  (let* ((annotations (-annotate 'length lists))
+         (n (-max (-map 'car annotations))))
+    (--map (append (cdr it) (-repeat (- n (car it)) fill-value)) annotations)))
+
+(defun -annotate (fn list)
+  "Return a list of cons cells where each cell is FN applied to each
+element of LIST paired with the unmodified element of LIST."
+  (-zip (-map fn list) list))
+
+(defmacro --annotate (form list)
+  "Anaphoric version of `-annotate'."
+  (declare (debug (form form)))
+  `(-annotate (lambda (it) ,form) ,list))
+
+(defun dash--table-carry (lists restore-lists &optional re)
+  "Helper for `-table' and `-table-flat'.
+
+If a list overflows, carry to the right and reset the list.
+
+Return how many lists were re-seted."
+  (while (and (not (car lists))
+              (not (equal lists '(nil))))
+    (setcar lists (car restore-lists))
+    (pop (cadr lists))
+    (!cdr lists)
+    (!cdr restore-lists)
+    (when re
+      (push (nreverse (car re)) (cadr re))
+      (setcar re nil)
+      (!cdr re))))
+
+(defun -table (fn &rest lists)
+  "Compute outer product of LISTS using function FN.
+
+The function FN should have the same arity as the number of
+supplied lists.
+
+The outer product is computed by applying fn to all possible
+combinations created by taking one element from each list in
+order.  The dimension of the result is (length lists).
+
+See also: `-table-flat'"
+  (let ((restore-lists (copy-sequence lists))
+        (last-list (last lists))
+        (re (--map nil (number-sequence 1 (length lists)))))
+    (while (car last-list)
+      (let ((item (apply fn (-map 'car lists))))
+        (push item (car re))
+        (pop (car lists))
+        (dash--table-carry lists restore-lists re)))
+    (nreverse (car (last re)))))
+
+(defun -table-flat (fn &rest lists)
+  "Compute flat outer product of LISTS using function FN.
+
+The function FN should have the same arity as the number of
+supplied lists.
+
+The outer product is computed by applying fn to all possible
+combinations created by taking one element from each list in
+order.  The results are flattened, ignoring the tensor structure
+of the result.  This is equivalent to calling:
+
+  (-flatten-n (1- (length lists)) (-table fn lists))
+
+but the implementation here is much more efficient.
+
+See also: `-flatten-n', `-table'"
+  (let ((restore-lists (copy-sequence lists))
+        (last-list (last lists))
+        re)
+    (while (car last-list)
+      (push (apply fn (-map 'car lists)) re)
+      (pop (car lists))
+      (dash--table-carry lists restore-lists))
+    (nreverse re)))
+
+(defun -partial (fn &rest args)
+  "Take a function FN and fewer than the normal arguments to FN,
+and return 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)
+  "Return the indices of all elements in LIST satisfying the
+predicate PRED, in ascending order."
+  (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'."
+  (declare (debug (form form)))
+  `(-find-indices (lambda (it) ,form) ,list))
+
+(defun -find-index (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."
+  (car (-find-indices pred list)))
+
+(defmacro --find-index (form list)
+  "Anaphoric version of `-find-index'."
+  (declare (debug (form form)))
+  `(-find-index (lambda (it) ,form) ,list))
+
+(defun -find-last-index (pred list)
+  "Take a predicate PRED and a LIST and return the index of the
+last element in the list satisfying the predicate, or nil if
+there is no such element."
+  (-last-item (-find-indices pred list)))
+
+(defmacro --find-last-index (form list)
+  "Anaphoric version of `-find-last-index'."
+  `(-find-last-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)))
+
+(defmacro -> (x &optional form &rest more)
+  "Thread the expr through the forms. Insert 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, insert 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)
+  "Thread the expr through the forms. Insert 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, insert 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)
+  "Thread the expr through the forms. Insert X at the position
+signified by the token `it' in the first form. If there are more
+forms, insert 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)
+
+(defun -grade-up (comparator list)
+  "Grade 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)
+  "Grade 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))))
+
+(defun dash--match-ignore-place-p (symbol)
+  "Return non-nil if SYMBOL is a symbol and starts with _."
+  (and (symbolp symbol)
+       (eq (aref (symbol-name symbol) 0) ?_)))
+
+(defun dash--match-cons-skip-cdr (skip-cdr source)
+  "Helper function generating idiomatic shifting code."
+  (cond
+   ((= skip-cdr 0)
+    `(pop ,source))
+   (t
+    `(progn
+       (setq ,s (nthcdr ,skip-cdr ,s))
+       (pop ,s)))))
+
+(defun dash--match-cons-get-car (skip-cdr source)
+  "Helper function generating idiomatic code to get nth car."
+  (cond
+   ((= skip-cdr 0)
+    `(car ,source))
+   ((= skip-cdr 1)
+    `(cadr ,source))
+   (t
+    `(nth ,skip-cdr ,source))))
+
+(defun dash--match-cons-get-cdr (skip-cdr source)
+  "Helper function generating idiomatic code to get nth cdr."
+  (cond
+   ((= skip-cdr 0)
+    source)
+   ((= skip-cdr 1)
+    `(cdr ,source))
+   (t
+    `(nthcdr ,skip-cdr ,source))))
+
+(defun dash--match-cons (match-form source)
+  "Setup a cons matching environment and call the real matcher."
+  (let ((s (make-symbol "--dash-source--"))
+        (n 0)
+        (m match-form))
+    (while (and (consp m)
+                (symbolp (car m))
+                (eq (aref (symbol-name (car m)) 0) ?_))
+      (setq n (1+ n)) (!cdr m))
+    (cond
+     ;; handle improper lists
+     ((and (consp m)
+           (not (cdr m)))
+      (dash--match (car m) (dash--match-cons-get-car n source)))
+     ;; handle other special types
+     ((> n 0)
+      (dash--match m (dash--match-cons-get-cdr n source)))
+     ;; this is the only entry-point for dash--match-cons-1, that's
+     ;; why we can't simply use the above branch, it would produce
+     ;; infinite recursion
+     (t
+      (cons (list s source) (dash--match-cons-1 match-form s))))))
+
+(defun dash--match-cons-1 (match-form source &optional props)
+  "Match MATCH-FORM against SOURCE.
+
+MATCH-FORM is a proper or improper list.  Each element of
+MATCH-FORM is either a symbol, which gets bound to the respective
+value in source or another match form which gets destructured
+recursively.
+
+If the cdr of last cons cell in the list is `nil', matching stops
+there.
+
+SOURCE is a proper or improper list."
+  (let ((skip-cdr (or (plist-get props :skip-cdr) 0)))
+    (cond
+     ((consp match-form)
+      (cond
+       ((cdr match-form)
+        (cond
+         ((and (symbolp (car match-form))
+               (eq (car match-form) '&keys))
+          (dash--match-kv (cons '&plist (cdr match-form)) (dash--match-cons-get-cdr skip-cdr source)))
+         ((dash--match-ignore-place-p (car match-form))
+          (dash--match-cons-1 (cdr match-form) source
+                              (plist-put props :skip-cdr (1+ skip-cdr))))
+         (t
+          (-concat (dash--match (car match-form) (dash--match-cons-skip-cdr skip-cdr source))
+                   (dash--match-cons-1 (cdr match-form) source)))))
+       (t ;; Last matching place, no need for shift
+        (dash--match (car match-form) (dash--match-cons-get-car skip-cdr source)))))
+     ((eq match-form nil)
+      nil)
+     (t ;; Handle improper lists.  Last matching place, no need for shift
+      (dash--match match-form (dash--match-cons-get-cdr skip-cdr source))))))
+
+(defun dash--vector-tail (seq start)
+  "Return the tail of SEQ starting at START."
+  (cond
+   ((vectorp seq)
+    (let* ((re-length (- (length seq) start))
+           (re (make-vector re-length 0)))
+      (--dotimes re-length (aset re it (aref seq (+ it start))))
+      re))
+   ((stringp seq)
+    (substring seq start))))
+
+(defun dash--match-vector (match-form source)
+  "Setup a vector matching environment and call the real matcher."
+  (let ((s (make-symbol "--dash-source--")))
+    (cond
+     ;; don't bind `s' if we only have one sub-pattern
+     ((= (length match-form) 1)
+      (dash--match (aref match-form 0) `(aref ,source 0)))
+     ;; don't bind `s' if we only have one sub-pattern which is not ignored
+     ((let* ((ignored-places (mapcar 'dash--match-ignore-place-p match-form))
+             (ignored-places-n (length (-remove 'null ignored-places))))
+        (when (= ignored-places-n (1- (length match-form)))
+          (let ((n (-find-index 'null ignored-places)))
+            (dash--match (aref match-form n) `(aref ,source ,n))))))
+     (t
+      (cons (list s source) (dash--match-vector-1 match-form s))))))
+
+(defun dash--match-vector-1 (match-form source)
+  "Match MATCH-FORM against SOURCE.
+
+MATCH-FORM is a vector.  Each element of MATCH-FORM is either a
+symbol, which gets bound to the respective value in source or
+another match form which gets destructured recursively.
+
+If second-from-last place in MATCH-FORM is the symbol &rest, the
+next element of the MATCH-FORM is matched against the tail of
+SOURCE, starting at index of the &rest symbol.  This is
+conceptually the same as the (head . tail) match for improper
+lists, where dot plays the role of &rest.
+
+SOURCE is a vector.
+
+If the MATCH-FORM vector is shorter than SOURCE vector, only
+the (length MATCH-FORM) places are bound, the rest of the SOURCE
+is discarded."
+  (let ((i 0)
+        (l (length match-form))
+        (re))
+    (while (< i l)
+      (let ((m (aref match-form i)))
+        (push (cond
+               ((and (symbolp m)
+                     (eq m '&rest))
+                (prog1 (dash--match
+                        (aref match-form (1+ i))
+                        `(dash--vector-tail ,source ,i))
+                  (setq i l)))
+               ((and (symbolp m)
+                     ;; do not match symbols starting with _
+                     (not (eq (aref (symbol-name m) 0) ?_)))
+                (list (list m `(aref ,source ,i))))
+               ((not (symbolp m))
+                (dash--match m `(aref ,source ,i))))
+              re)
+        (setq i (1+ i))))
+    (-flatten-n 1 (nreverse re))))
+
+(defun dash--match-kv (match-form source)
+  "Setup a kv matching environment and call the real matcher.
+
+kv can be any key-value store, such as plist, alist or hash-table."
+  (let ((s (make-symbol "--dash-source--")))
+    (cond
+     ;; don't bind `s' if we only have one sub-pattern (&type key val)
+     ((= (length match-form) 3)
+      (dash--match-kv-1 (cdr match-form) source (car match-form)))
+     (t
+      (cons (list s source) (dash--match-kv-1 (cdr match-form) s (car match-form)))))))
+
+(defun dash--match-kv-1 (match-form source type)
+  "Match MATCH-FORM against SOURCE of type TYPE.
+
+MATCH-FORM is a proper list of the form (key1 place1 ... keyN
+placeN).  Each placeK is either a symbol, which gets bound to the
+value of keyK retrieved from the key-value store, or another
+match form which gets destructured recursively.
+
+SOURCE is a key-value store of type TYPE, which can be a plist,
+an alist or a hash table.
+
+TYPE is a token specifying the type of the key-value store.
+Valid values are &plist, &alist and &hash."
+  (-flatten-n 1 (-map
+                 (lambda (kv)
+                   (let* ((k (car kv))
+                          (v (cadr kv))
+                          (getter (cond
+                                   ((eq type '&plist)
+                                    `(plist-get ,source ,k))
+                                   ((eq type '&alist)
+                                    `(cdr (assoc ,k ,source)))
+                                   ((eq type '&hash)
+                                    `(gethash ,k ,source)))))
+                     (cond
+                      ((symbolp v)
+                       (list (list v getter)))
+                      (t (dash--match v getter)))))
+                 (-partition 2 match-form))))
+
+(defun dash--match-symbol (match-form source)
+  "Bind a symbol.
+
+This works just like `let', there is no destructuring."
+  (list (list match-form source)))
+
+(defun dash--match (match-form source)
+  "Match MATCH-FORM against SOURCE.
+
+This function tests the MATCH-FORM and dispatches to specific
+matchers based on the type of the expression.
+
+Key-value stores are disambiguated by placing a token &plist,
+&alist or &hash as a first item in the MATCH-FORM."
+  (cond
+   ((symbolp match-form)
+    (dash--match-symbol match-form source))
+   ((consp match-form)
+    (cond
+     ((memq (car match-form) '(&plist &alist &hash))
+      (dash--match-kv match-form source))
+     ((eq (car match-form) '&keys)
+      (dash--match-kv (cons '&plist (cdr match-form)) source))
+     (t (dash--match-cons match-form source))))
+   ((vectorp match-form)
+    (dash--match-vector match-form source))))
+
+(defmacro -let* (varlist &rest body)
+  "Bind variables according to VARLIST then eval BODY.
+
+VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+PATTERN is matched against the SOURCE structurally.  SOURCE is
+only evaluated once for each PATTERN.
+
+Each SOURCE can refer to the symbols already bound by this
+VARLIST.  This is useful if you want to destructure SOURCE
+recursively but also want to name the intermediate structures.
+
+See `-let' for the list of all possible patterns."
+  (declare (debug ((&rest (sexp form)) body))
+           (indent 1))
+  (let ((bindings (--mapcat (dash--match (car it) (cadr it)) varlist)))
+    `(let* ,bindings
+       ,@body)))
+
+(defmacro -let (varlist &rest body)
+  "Bind variables according to VARLIST then eval BODY.
+
+VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+PATTERN is matched against the SOURCE \"structurally\".  SOURCE
+is only evaluated once for each PATTERN.  Each PATTERN is matched
+recursively, and can therefore contain sub-patterns which are
+matched against corresponding sub-expressions of SOURCE.
+
+All the SOURCEs are evalled before any symbols are
+bound (i.e. \"in parallel\").
+
+If VARLIST only contains one (PATTERN SOURCE) element, you can
+optionally specify it using a vector and discarding the
+outer-most parens.  Thus
+
+  (-let ((PATTERN SOURCE)) ..)
+
+becomes
+
+  (-let [PATTERN SOURCE] ..).
+
+`-let' uses a convention of not binding places (symbols) starting
+with _ whenever it's possible.  You can use this to skip over
+entries you don't care about.  However, this is not *always*
+possible (as a result of implementation) and these symbols might
+get bound to undefined values.
+
+Following is the overview of supported patterns.  Remember that
+patterns can be matched recursively, so every a, b, aK in the
+following can be a matching construct and not necessarily a
+symbol/variable.
+
+Symbol:
+
+  a - bind the SOURCE to A.  This is just like regular `let'.
+
+Conses and lists:
+
+  (a) - bind `car' of cons/list to A
+
+  (a . b) - bind car of cons to A and `cdr' to B
+
+  (a b) - bind car of list to A and `cadr' to B
+
+  (a1 a2 a3  ...) - bind 0th car of list to A1, 1st to A2, 2nd to A3 ...
+
+  (a1 a2 a3 ... aN . rest) - as above, but bind the Nth cdr to REST.
+
+Vectors:
+
+  [a] - bind 0th element of a non-list sequence to A (works with
+        vectors, strings, bit arrays...)
+
+  [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st to
+                   A1, 2nd to A2, ...
+                   If the PATTERN is shorter than SOURCE, the values at
+                   places not in PATTERN are ignored.
+                   If the PATTERN is longer than SOURCE, an `error' is
+                   thrown.
+
+  [a1 a2 a3 ... &rest rest] ) - as above, but bind the rest of
+                                the sequence to REST.  This is
+                                conceptually the same as improper list
+                                matching (a1 a2 ... aN . rest)
+
+Key/value stores:
+
+  (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                 SOURCE plist to aK.  If the
+                                 value is not found, aK is nil.
+
+  (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                 SOURCE alist to aK.  If the
+                                 value is not found, aK is nil.
+
+  (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                SOURCE hash table to aK.  If the
+                                value is not found, aK is nil.
+
+Further, special keyword &keys supports \"inline\" matching of
+plist-like key-value pairs, similarly to &keys keyword of
+`cl-defun'.
+
+  (a1 a2 ... aN &keys key1 b1 ... keyN bK)
+
+This binds N values from the list to a1 ... aN, then interprets
+the cdr as a plist (see key/value matching above)."
+  (declare (debug ((&rest (sexp form)) body))
+           (indent 1))
+  (if (vectorp varlist)
+      `(let* ,(dash--match (aref varlist 0) (aref varlist 1))
+         ,@body)
+    (let* ((inputs (--map-indexed (list (make-symbol (format "input%d" it-index)) (cadr it)) varlist))
+           (new-varlist (--map (list (caar it) (cadr it)) (-zip varlist inputs))))
+      `(let ,inputs
+         (-let* ,new-varlist ,@body)))))
+
+(defmacro -lambda (match-form &rest body)
+  "Return a lambda which destructures its input as MATCH-FORM and executes BODY.
+
+Note that you have to enclose the MATCH-FORM in a pair of parens,
+such that:
+
+  (-lambda (x) body)
+  (-lambda (x y ...) body)
+
+has the usual semantics of `lambda'.  Furthermore, these get
+translated into normal lambda, so there is no performance
+penalty.
+
+See `-let' for the description of destructuring mechanism."
+  (declare (doc-string 2) (indent defun)
+           (debug (&define sexp
+                           [&optional stringp]
+                           [&optional ("interactive" interactive)]
+                           def-body)))
+  (cond
+   ((not (consp match-form))
+    (signal 'wrong-type-argument "match-form must be a list"))
+   ;; no destructuring, so just return regular lambda to make things faster
+   ((-all? 'symbolp match-form)
+    `(lambda ,match-form ,@body))
+   (t
+    (let* ((inputs (--map-indexed (list it (make-symbol (format "input%d" it-index))) match-form)))
+      ;; TODO: because inputs to the lambda are evaluated only once,
+      ;; -let* need not to create the extra bindings to ensure that.
+      ;; We should find a way to optimize that.  Not critical however.
+      `(lambda ,(--map (cadr it) inputs)
+         (-let* ,inputs ,@body))))))
+
+(defmacro -if-let* (vars-vals then &rest 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.
+
+Note: binding is done according to `-let'."
+  (declare (debug ((&rest (symbolp form)) form body))
+           (indent 2))
+  (->> vars-vals
+    (-mapcat (-lambda ((pat src)) (dash--match pat src)))
+    (-reduce-r-from
+     (-lambda ((var val) memo)
+       `(let ((,var ,val))
+          (if ,var ,memo ,@else)))
+     then)))
+
+(defmacro -if-let (var-val then &rest 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.
+
+Note: binding is done according to `-let'."
+  (declare (debug ((symbolp form) form body))
+           (indent 2))
+  `(-if-let* (,var-val) ,then ,@else))
+
+(defmacro --if-let (val then &rest else)
+  "If VAL evaluates to non-nil, bind it to `it' and do THEN,
+otherwise do ELSE."
+  (declare (debug (form form body))
+           (indent 2))
+  `(-if-let (it ,val) ,then ,@else))
+
+(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.
+
+Note: binding is done according to `-let'."
+  (declare (debug ((&rest (symbolp form)) body))
+           (indent 1))
+  `(-if-let* ,vars-vals (progn ,@body)))
+
+(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.
+
+Note: binding is done according to `-let'."
+  (declare (debug ((symbolp form) body))
+           (indent 1))
+  `(-if-let ,var-val (progn ,@body)))
+
+(defmacro --when-let (val &rest body)
+  "If VAL evaluates to non-nil, bind it to `it' and execute
+body."
+  (declare (debug (form body))
+           (indent 1))
+  `(--if-let ,val (progn ,@body)))
+
+(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)))
+
+(defalias '-uniq '-distinct)
+
+(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)))
+
+(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 non-nil if LIST contains ELEMENT.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that's non-nil.
+
+Alias: `-contains-p'"
+  (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 -same-items? (list list2)
+  "Return true if LIST and LIST2 has the same items.
+
+The order of the elements in the lists does not matter.
+
+Alias: `-same-items-p'"
+  (let ((length-a (length list))
+        (length-b (length list2)))
+    (and
+     (= length-a length-b)
+     (= length-a (length (-intersection list list2))))))
+
+(defalias '-same-items-p '-same-items?)
+
+(defun -is-prefix? (prefix list)
+  "Return non-nil if PREFIX is prefix of LIST.
+
+Alias: `-is-prefix-p'"
+  (--each-while list (equal (car prefix) it)
+    (!cdr prefix))
+  (not prefix))
+
+(defun -is-suffix? (suffix list)
+  "Return non-nil if SUFFIX is suffix of LIST.
+
+Alias: `-is-suffix-p'"
+  (-is-prefix? (nreverse suffix) (nreverse list)))
+
+(defun -is-infix? (infix list)
+  "Return non-nil if INFIX is infix of LIST.
+
+This operation runs in O(n^2) time
+
+Alias: `-is-infix-p'"
+  (let (done)
+    (while (and (not done) list)
+      (setq done (-is-prefix? infix list))
+      (!cdr list))
+    done))
+
+(defalias '-is-prefix-p '-is-prefix?)
+(defalias '-is-suffix-p '-is-suffix?)
+(defalias '-is-infix-p '-is-infix?)
+
+(defun -sort (comparator list)
+  "Sort LIST, stably, comparing elements using COMPARATOR.
+Return 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 (form form)))
+  `(-sort (lambda (it other) ,form) ,list))
+
+(defun -list (&rest args)
+  "Return a list with ARGS.
+
+If first item of ARGS is already a list, simply return ARGS.  If
+not, return a list with ARGS as elements."
+  (let ((arg (car args)))
+    (if (listp arg) arg args)))
+
+(defun -repeat (n x)
+  "Return a list with X repeated N times.
+Return 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\"."
+  (declare (debug (form form)))
+  `(-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\"."
+  (declare (debug (form form)))
+  `(-min-by (lambda (it other) ,form) ,list))
+
+(defun -iterate (fun init n)
+  "Return a list of iterated applications of FUN to INIT.
+
+This means a list of form:
+
+  (init (fun init) (fun (fun init)) ...)
+
+N is the length of the returned list."
+  (if (= n 0) nil
+    (let ((r (list init)))
+      (--dotimes (1- n)
+        (push (funcall fun (car r)) r))
+      (nreverse r))))
+
+(defun -fix (fn list)
+  "Compute the (least) fixpoint of FN with initial input LIST.
+
+FN is called at least once, results are compared with `equal'."
+  (let ((re (funcall fn list)))
+    (while (not (equal list re))
+      (setq list re)
+      (setq re (funcall fn re)))
+    re))
+
+(defmacro --fix (form list)
+  "Anaphoric form of `-fix'."
+  `(-fix (lambda (it) ,form) ,list))
+
+(defun -unfold (fun seed)
+  "Build a list from SEED using FUN.
+
+This is \"dual\" operation to `-reduce-r': while -reduce-r
+consumes a list to produce a single value, `-unfold' takes a
+seed value and builds a (potentially infinite!) list.
+
+FUN should return `nil' to stop the generating process, or a
+cons (A . B), where A will be prepended to the result and B is
+the new seed."
+  (let ((last (funcall fun seed)) r)
+    (while last
+      (push (car last) r)
+      (setq last (funcall fun (cdr last))))
+    (nreverse r)))
+
+(defmacro --unfold (form seed)
+  "Anaphoric version of `-unfold'."
+  (declare (debug (form form)))
+  `(-unfold (lambda (it) ,form) ,seed))
+
+(defun -cons-pair? (con)
+  "Return non-nil if CON is true cons pair.
+That is (A . B) where B is not a list."
+  (and (listp con)
+       (not (listp (cdr con)))))
+
+(defun -cons-to-list (con)
+  "Convert a cons pair to a list with `car' and `cdr' of the pair respectively."
+  (list (car con) (cdr con)))
+
+(defun -value-to-list (val)
+  "Convert a value to a list.
+
+If the value is a cons pair, make a list with two elements, `car'
+and `cdr' of the pair respectively.
+
+If the value is anything else, wrap it in a list."
+  (cond
+   ((-cons-pair? val) (-cons-to-list val))
+   (t (list val))))
+
+(defun -tree-mapreduce-from (fn folder init-value tree)
+  "Apply FN to each element of TREE, and make a list of the results.
+If elements of TREE are lists themselves, apply FN recursively to
+elements of these nested lists.
+
+Then reduce the resulting lists using FOLDER and initial value
+INIT-VALUE. See `-reduce-r-from'.
+
+This is the same as calling `-tree-reduce-from' after `-tree-map'
+but is twice as fast as it only traverse the structure once."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) (funcall fn tree))
+   ((listp tree)
+    (-reduce-r-from folder init-value (mapcar (lambda (x) (-tree-mapreduce-from fn folder init-value x)) tree)))
+   (t (funcall fn tree))))
+
+(defmacro --tree-mapreduce-from (form folder init-value tree)
+  "Anaphoric form of `-tree-mapreduce-from'."
+  (declare (debug (form form form form)))
+  `(-tree-mapreduce-from (lambda (it) ,form) (lambda (it acc) ,folder) ,init-value ,tree))
+
+(defun -tree-mapreduce (fn folder tree)
+  "Apply FN to each element of TREE, and make a list of the results.
+If elements of TREE are lists themselves, apply FN recursively to
+elements of these nested lists.
+
+Then reduce the resulting lists using FOLDER and initial value
+INIT-VALUE. See `-reduce-r-from'.
+
+This is the same as calling `-tree-reduce' after `-tree-map'
+but is twice as fast as it only traverse the structure once."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) (funcall fn tree))
+   ((listp tree)
+    (-reduce-r folder (mapcar (lambda (x) (-tree-mapreduce fn folder x)) tree)))
+   (t (funcall fn tree))))
+
+(defmacro --tree-mapreduce (form folder tree)
+  "Anaphoric form of `-tree-mapreduce'."
+  (declare (debug (form form form)))
+  `(-tree-mapreduce (lambda (it) ,form) (lambda (it acc) ,folder) ,tree))
+
+(defun -tree-map (fn tree)
+  "Apply FN to each element of TREE while preserving the tree structure."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) (funcall fn tree))
+   ((listp tree)
+    (mapcar (lambda (x) (-tree-map fn x)) tree))
+   (t (funcall fn tree))))
+
+(defmacro --tree-map (form tree)
+  "Anaphoric form of `-tree-map'."
+  (declare (debug (form form)))
+  `(-tree-map (lambda (it) ,form) ,tree))
+
+(defun -tree-reduce-from (fn init-value tree)
+  "Use FN to reduce elements of list TREE.
+If elements of TREE are lists themselves, apply the reduction recursively.
+
+FN is first applied to INIT-VALUE and first element of the list,
+then on this result and second element from the list etc.
+
+The initial value is ignored on cons pairs as they always contain
+two elements."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) tree)
+   ((listp tree)
+    (-reduce-r-from fn init-value (mapcar (lambda (x) (-tree-reduce-from fn init-value x)) tree)))
+   (t tree)))
+
+(defmacro --tree-reduce-from (form init-value tree)
+  "Anaphoric form of `-tree-reduce-from'."
+  (declare (debug (form form form)))
+  `(-tree-reduce-from (lambda (it acc) ,form) ,init-value ,tree))
+
+(defun -tree-reduce (fn tree)
+  "Use FN to reduce elements of list TREE.
+If elements of TREE are lists themselves, apply the reduction recursively.
+
+FN is first applied to first element of the list and second
+element, then on this result and third element from the list etc.
+
+See `-reduce-r' for how exactly are lists of zero or one element handled."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) tree)
+   ((listp tree)
+    (-reduce-r fn (mapcar (lambda (x) (-tree-reduce fn x)) tree)))
+   (t tree)))
+
+(defmacro --tree-reduce (form tree)
+  "Anaphoric form of `-tree-reduce'."
+  (declare (debug (form form)))
+  `(-tree-reduce (lambda (it acc) ,form) ,tree))
+
+(defun -tree-map-nodes (pred fun tree)
+  "Call FUN on each node of TREE that satisfies PRED.
+
+If PRED returns nil, continue descending down this node.  If PRED
+returns non-nil, apply FUN to this node and do not descend
+further."
+  (if (funcall pred tree)
+      (funcall fun tree)
+    (if (and (listp tree)
+             (not (-cons-pair? tree)))
+        (-map (lambda (x) (-tree-map-nodes pred fun x)) tree)
+      tree)))
+
+(defmacro --tree-map-nodes (pred form tree)
+  "Anaphoric form of `-tree-map-nodes'."
+  `(-tree-map-nodes (lambda (it) ,pred) (lambda (it) ,form) ,tree))
+
+(defun -tree-seq (branch children tree)
+  "Return a sequence of the nodes in TREE, in depth-first search order.
+
+BRANCH is a predicate of one argument that returns non-nil if the
+passed argument is a branch, that is, a node that can have children.
+
+CHILDREN is a function of one argument that returns the children
+of the passed branch node.
+
+Non-branch nodes are simply copied."
+  (cons tree
+        (when (funcall branch tree)
+          (-mapcat (lambda (x) (-tree-seq branch children x))
+                   (funcall children tree)))))
+
+(defmacro --tree-seq (branch children tree)
+  "Anaphoric form of `-tree-seq'."
+  `(-tree-seq (lambda (it) ,branch) (lambda (it) ,children) ,tree))
+
+(defun -clone (list)
+  "Create a deep copy of LIST.
+The new list has the same elements and structure but all cons are
+replaced with new ones.  This is useful when you need to clone a
+structure such as plist or alist."
+  (-tree-map 'identity list))
+
+(defun dash-enable-font-lock ()
+  "Add syntax highlighting to dash functions, macros and magic values."
+  (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"
+                             "-non-nil"
+                             "-keep"
+                             "--keep"
+                             "-map-indexed"
+                             "--map-indexed"
+                             "-splice"
+                             "--splice"
+                             "-splice-list"
+                             "--splice-list"
+                             "-map-when"
+                             "--map-when"
+                             "-replace-where"
+                             "--replace-where"
+                             "-replace"
+                             "-flatten"
+                             "-flatten-n"
+                             "-concat"
+                             "-mapcat"
+                             "--mapcat"
+                             "-copy"
+                             "-cons*"
+                             "-snoc"
+                             "-first"
+                             "--first"
+                             "-find"
+                             "--find"
+                             "-last"
+                             "--last"
+                             "-first-item"
+                             "-last-item"
+                             "-butlast"
+                             "-count"
+                             "--count"
+                             "-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"
+                             "-slice"
+                             "-take"
+                             "-drop"
+                             "-take-while"
+                             "--take-while"
+                             "-drop-while"
+                             "--drop-while"
+                             "-split-at"
+                             "-rotate"
+                             "-insert-at"
+                             "-replace-at"
+                             "-update-at"
+                             "--update-at"
+                             "-remove-at"
+                             "-remove-at-indices"
+                             "-split-with"
+                             "--split-with"
+                             "-split-on"
+                             "-split-when"
+                             "--split-when"
+                             "-separate"
+                             "--separate"
+                             "-partition-all-in-steps"
+                             "-partition-in-steps"
+                             "-partition-all"
+                             "-partition"
+                             "-partition-by"
+                             "--partition-by"
+                             "-partition-by-header"
+                             "--partition-by-header"
+                             "-group-by"
+                             "--group-by"
+                             "-interpose"
+                             "-interleave"
+                             "-zip-with"
+                             "--zip-with"
+                             "-zip"
+                             "-zip-fill"
+                             "-cycle"
+                             "-pad"
+                             "-annotate"
+                             "--annotate"
+                             "-table"
+                             "-table-flat"
+                             "-partial"
+                             "-elem-index"
+                             "-elem-indices"
+                             "-find-indices"
+                             "--find-indices"
+                             "-find-index"
+                             "--find-index"
+                             "-find-last-index"
+                             "--find-last-index"
+                             "-select-by-indices"
+                             "-grade-up"
+                             "-grade-down"
+                             "->"
+                             "->>"
+                             "-->"
+                             "-when-let"
+                             "-when-let*"
+                             "--when-let"
+                             "-if-let"
+                             "-if-let*"
+                             "--if-let"
+                             "-let*"
+                             "-let"
+                             "-lambda"
+                             "-distinct"
+                             "-uniq"
+                             "-union"
+                             "-intersection"
+                             "-difference"
+                             "-contains?"
+                             "-contains-p"
+                             "-same-items?"
+                             "-same-items-p"
+                             "-is-prefix-p"
+                             "-is-prefix?"
+                             "-is-suffix-p"
+                             "-is-suffix?"
+                             "-is-infix-p"
+                             "-is-infix?"
+                             "-sort"
+                             "--sort"
+                             "-list"
+                             "-repeat"
+                             "-sum"
+                             "-product"
+                             "-max"
+                             "-min"
+                             "-max-by"
+                             "--max-by"
+                             "-min-by"
+                             "--min-by"
+                             "-iterate"
+                             "--iterate"
+                             "-fix"
+                             "--fix"
+                             "-unfold"
+                             "--unfold"
+                             "-cons-pair?"
+                             "-cons-to-list"
+                             "-value-to-list"
+                             "-tree-mapreduce-from"
+                             "--tree-mapreduce-from"
+                             "-tree-mapreduce"
+                             "--tree-mapreduce"
+                             "-tree-map"
+                             "--tree-map"
+                             "-tree-reduce-from"
+                             "--tree-reduce-from"
+                             "-tree-reduce"
+                             "--tree-reduce"
+                             "-tree-seq"
+                             "--tree-seq"
+                             "-tree-map-nodes"
+                             "--tree-map-nodes"
+                             "-clone"
+                             "-rpartial"
+                             "-juxt"
+                             "-applify"
+                             "-on"
+                             "-flip"
+                             "-const"
+                             "-cut"
+                             "-orfn"
+                             "-andfn"
+                             "-iteratefn"
+                             "-fixfn"
+                             "-prodfn"
+                             ))
+             (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
deleted file mode 100644
index 9f9b20fc0..000000000
--- a/elpa/elisp-slime-nav-0.2/elisp-slime-nav-autoloads.el
+++ /dev/null
@@ -1,38 +0,0 @@
-;;; 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
deleted file mode 100644
index 92a54aba1..000000000
--- a/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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.2/elisp-slime-nav-pkg.elc b/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.elc
deleted file mode 100644
index 57dd13536..000000000
Binary files a/elpa/elisp-slime-nav-0.2/elisp-slime-nav-pkg.elc and /dev/null differ
diff --git a/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el b/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el
deleted file mode 100644
index 7e76e5dfb..000000000
--- a/elpa/elisp-slime-nav-0.2/elisp-slime-nav.el
+++ /dev/null
@@ -1,81 +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.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
deleted file mode 100644
index 0929a286b..000000000
Binary files a/elpa/elisp-slime-nav-0.2/elisp-slime-nav.elc and /dev/null differ
diff --git a/elpa/elisp-slime-nav-0.8/elisp-slime-nav-autoloads.el b/elpa/elisp-slime-nav-0.8/elisp-slime-nav-autoloads.el
new file mode 100644
index 000000000..44b5e76e8
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.8/elisp-slime-nav-autoloads.el
@@ -0,0 +1,49 @@
+;;; elisp-slime-nav-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "elisp-slime-nav" "elisp-slime-nav.el" (21721
+;;;;;;  36935 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" "\
+Find the elisp thing at point, be it a function, variable, library or face.
+
+With a prefix arg, or if there is no thing at point, prompt for
+the symbol to jump to.
+
+Argument SYM-NAME is the 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, or if there is not \"thing\" at point, prompt
+for the symbol to jump to.
+
+Argument SYM-NAME is the thing to find.
+
+\(fn SYM-NAME)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; elisp-slime-nav-autoloads.el ends here
diff --git a/elpa/elisp-slime-nav-0.8/elisp-slime-nav-pkg.el b/elpa/elisp-slime-nav-0.8/elisp-slime-nav-pkg.el
new file mode 100644
index 000000000..46a98d1ed
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.8/elisp-slime-nav-pkg.el
@@ -0,0 +1 @@
+(define-package "elisp-slime-nav" "0.8" "Make M-. and M-, work in elisp like they do in slime" '((cl-lib "0.2")) :url "https://github.com/purcell/elisp-slime-nav" :keywords '("navigation" "slime" "elisp" "emacs-lisp"))
diff --git a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc b/elpa/elisp-slime-nav-0.8/elisp-slime-nav-pkg.elc
similarity index 58%
rename from elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc
rename to elpa/elisp-slime-nav-0.8/elisp-slime-nav-pkg.elc
index dc4b76150..a5e05604e 100644
Binary files a/elpa/clojure-mode-20131227.1044/clojure-mode-pkg.elc and b/elpa/elisp-slime-nav-0.8/elisp-slime-nav-pkg.elc differ
diff --git a/elpa/elisp-slime-nav-0.8/elisp-slime-nav.el b/elpa/elisp-slime-nav-0.8/elisp-slime-nav.el
new file mode 100644
index 000000000..461eae1ed
--- /dev/null
+++ b/elpa/elisp-slime-nav-0.8/elisp-slime-nav.el
@@ -0,0 +1,116 @@
+;;; 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.8
+;; X-Original-Version: DEV
+;; 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 (or current-prefix-arg (null at-point))
+        (completing-read "Symbol: "
+                         (elisp-slime-nav--all-navigable-symbol-names)
+                         nil t nil nil at-point)
+      at-point)))
+
+;;;###autoload
+(defun elisp-slime-nav-find-elisp-thing-at-point (sym-name)
+  "Find the elisp thing at point, be it a function, variable, library or face.
+
+With a prefix arg, or if there is no thing at point, prompt for
+the symbol to jump to.
+
+Argument SYM-NAME is the 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, or if there is not \"thing\" at point, prompt
+for the symbol to jump to.
+
+Argument SYM-NAME is the 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.8/elisp-slime-nav.elc b/elpa/elisp-slime-nav-0.8/elisp-slime-nav.elc
new file mode 100644
index 000000000..53a64e453
Binary files /dev/null and b/elpa/elisp-slime-nav-0.8/elisp-slime-nav.elc differ
diff --git a/elpa/epl-20131101.405/epl-autoloads.el b/elpa/epl-20131101.405/epl-autoloads.el
deleted file mode 100644
index 308a221c2..000000000
--- a/elpa/epl-20131101.405/epl-autoloads.el
+++ /dev/null
@@ -1,17 +0,0 @@
-;;; epl-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads nil nil ("epl-pkg.el" "epl.el") (21184 20185 12190))
-
-;;;***
-
-(provide 'epl-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; epl-autoloads.el ends here
diff --git a/elpa/epl-20131101.405/epl-pkg.el b/elpa/epl-20131101.405/epl-pkg.el
deleted file mode 100644
index f3b8d5ecd..000000000
--- a/elpa/epl-20131101.405/epl-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "epl" "20131101.405" "Emacs Package Library" (quote ((cl-lib "0.3"))))
diff --git a/elpa/epl-20131101.405/epl-pkg.elc b/elpa/epl-20131101.405/epl-pkg.elc
deleted file mode 100644
index 677d17581..000000000
Binary files a/elpa/epl-20131101.405/epl-pkg.elc and /dev/null differ
diff --git a/elpa/epl-20131101.405/epl.el b/elpa/epl-20131101.405/epl.el
deleted file mode 100644
index 5ccca2dfe..000000000
--- a/elpa/epl-20131101.405/epl.el
+++ /dev/null
@@ -1,553 +0,0 @@
-;;; epl.el --- Emacs Package Library -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2013 Sebastian Wiesner
-
-;; Author: Sebastian Wiesner <lunaryorn@gmail.com>
-;; Maintainer: Johan Andersson <johan.rejeep@gmail.com>
-;;     Sebastian Wiesner <lunaryorn@gmail.com>
-;; Version: 20131101.405
-;; X-Original-Version: 0.5-cvs
-;; Package-Requires: ((cl-lib "0.3"))
-;; Keywords: convenience
-;; URL: http://github.com/cask/epl
-
-;; This file is NOT part of GNU 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 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 package management library for Emacs, based on package.el.
-
-;; The purpose of this library is to wrap all the quirks and hassle of
-;; package.el into a sane API.
-
-;; The following functions comprise the public interface of this library:
-
-;;; Package directory selection
-
-;; `epl-package-dir' gets the directory of packages.
-
-;; `epl-default-package-dir' gets the default package directory.
-
-;; `epl-change-package-dir' changes the directory of packages.
-
-;;; Package system management
-
-;; `epl-initialize' initializes the package system and activates all
-;; packages.
-
-;; `epl-reset' resets the package system.
-
-;; `epl-refresh' refreshes all package archives.
-
-;; `epl-add-archive' adds a new package archive.
-
-;;; Package objects
-
-;; Struct `epl-requirement' describes a requirement of a package with `name' and
-;; `version' slots.
-
-;; `epl-requirement-version-string' gets a requirement version as string.
-
-;; Struct `epl-package' describes an installed or installable package with a
-;; `name' and some internal `description'.
-
-;; `epl-package-version' gets the version of a package.
-
-;; `epl-package-version-string' gets the version of a package as string.
-
-;; `epl-package-summary' gets the summary of a package.
-
-;; `epl-package-requirements' gets the requirements of a package.
-
-;; `epl-package-directory' gets the installation directory of a package.
-
-;; `epl-package-from-buffer' creates a package object for the package contained
-;; in the current buffer.
-
-;; `epl-package-from-file' creates a package object for a package file, either
-;; plain lisp or tarball.
-
-;; `epl-package-from-descriptor-file' creates a package object for a package
-;; description (i.e. *-pkg.el) file.
-
-;;; Package database access
-
-;; `epl-package-installed-p' determines whether a package is installed.
-
-;; `epl-installed-packages' and `epl-available-packages' get all packages
-;; installed and available for installation respectively.
-
-;; `epl-find-installed-package' and `epl-find-available-packages' find installed
-;; and available packages by name.
-
-;; `epl-find-upgrades' finds all upgradable packages.
-
-;;; Package operations
-
-;; `epl-package-install' installs a package.
-
-;; `epl-package-delete' deletes a package.
-
-;; `epl-upgrade' upgrades packages.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'package)
-
-(defun epl--package-desc-p (package)
-  "Whether PACKAGE is a `package-desc' object.
-
-Like `package-desc-p', but return nil, if `package-desc-p' is not
-defined as function."
-  (and (fboundp 'package-desc-p) (package-desc-p package)))
-
-
-;;;; Package directory
-(defun epl-package-dir ()
-  "Get the directory of packages."
-  package-user-dir)
-
-(defun epl-default-package-dir ()
-  "Get the default directory of packages."
-  (eval (car (get 'package-user-dir 'standard-value))))
-
-(defun epl-change-package-dir (directory)
-  "Change the directory of packages to DIRECTORY."
-  (setq package-user-dir directory)
-  (epl-initialize))
-
-
-;;;; Package system management
-(defvar epl--load-path-before-initialize nil
-  "Remember the load path for `epl-reset'.")
-
-(defun epl-initialize (&optional no-activate)
-  "Load Emacs Lisp packages and activate them.
-
-With NO-ACTIVATE non-nil, do not activate packages."
-  (setq epl--load-path-before-initialize load-path)
-  (package-initialize no-activate))
-
-(defalias 'epl-refresh 'package-refresh-contents)
-
-(defun epl-add-archive (name url)
-  "Add a package archive with NAME and URL."
-  (add-to-list 'package-archives (cons name url)))
-
-(defun epl-reset ()
-  "Reset the package system.
-
-Clear the list of installed and available packages, the list of
-package archives and reset the package directory."
-  (setq package-alist nil
-        package-archives nil
-        package-archive-contents nil
-        load-path epl--load-path-before-initialize)
-  (when (boundp 'package-obsolete-alist) ; Legacy package.el
-    (setq package-obsolete-alist nil))
-  (epl-change-package-dir (epl-default-package-dir)))
-
-
-;;;; Package structures
-(cl-defstruct (epl-requirement
-               (:constructor epl-requirement-create))
-  "Structure describing a requirement.
-
-Slots:
-
-`name' The name of the required package, as symbol.
-
-`version' The version of the required package, as version list."
-  name
-  version)
-
-(defun epl-requirement-version-string (requirement)
-  "The version of a REQUIREMENT, as string."
-  (package-version-join (epl-requirement-version requirement)))
-
-(cl-defstruct (epl-package (:constructor epl-package-create))
-  "Structure representing a package.
-
-Slots:
-
-`name' The package name, as symbol.
-
-`description' The package description.
-
-The format package description varies between package.el
-variants.  For `package-desc' variants, it is simply the
-corresponding `package-desc' object.  For legacy variants, it is
-a vector `[VERSION REQS DOCSTRING]'.
-
-Do not access `description' directly, but instead use the
-`epl-package' accessors."
-  name
-  description)
-
-(defmacro epl-package-as-description (var &rest body)
-  "Cast VAR to a package description in BODY.
-
-VAR is a symbol, bound to an `epl-package' object.  This macro
-casts this object to the `description' object, and binds the
-description to VAR in BODY."
-  (declare (indent 1))
-  (unless (symbolp var)
-    (signal 'wrong-type-argument (list #'symbolp var)))
-  `(if (epl-package-p ,var)
-       (let ((,var (epl-package-description ,var)))
-         ,@body)
-     (signal 'wrong-type-argument (list #'epl-package-p ,var))))
-
-(defun epl-package--package-desc-p (package)
-  "Whether the description of PACKAGE is a `package-desc'."
-  (epl--package-desc-p (epl-package-description package)))
-
-(defun epl-package-version (package)
-  "Get the version of PACKAGE, as version list."
-  (epl-package-as-description package
-    (cond
-     ((fboundp 'package-desc-version) (package-desc-version package))
-     ;; Legacy
-     ((fboundp 'package-desc-vers)
-      (let ((version (package-desc-vers package)))
-        (if (listp version) version (version-to-list version))))
-     (:else (error "Cannot get version from %S" package)))))
-
-(defun epl-package-version-string (package)
-  "Get the version from a PACKAGE, as string."
-  (package-version-join (epl-package-version package)))
-
-(defun epl-package-summary (package)
-  "Get the summary of PACKAGE, as string."
-  (epl-package-as-description package
-    (cond
-     ((fboundp 'package-desc-summary) (package-desc-summary package))
-     ((fboundp 'package-desc-doc) (package-desc-doc package)) ; Legacy
-     (:else (error "Cannot get summary from %S" package)))))
-
-(defun epl-requirement--from-req (req)
-  "Create a `epl-requirement' from a `package-desc' REQ."
-  (cl-destructuring-bind (name version) req
-    (epl-requirement-create :name name
-                            :version (if (listp version) version
-                                       (version-to-list version)))))
-
-(defun epl-package-requirements (package)
-  "Get the requirements of PACKAGE.
-
-The requirements are a list of `epl-requirement' objects."
-  (epl-package-as-description package
-    (mapcar #'epl-requirement--from-req (package-desc-reqs package))))
-
-(defun epl-package-directory (package)
-  "Get the directory PACKAGE is installed to.
-
-Return the absolute path of the installation directory of
-PACKAGE, or nil, if PACKAGE is not installed."
-  (cond
-   ((fboundp 'package-desc-dir)
-    (package-desc-dir (epl-package-description package)))
-   ((fboundp 'package--dir)
-    (package--dir (epl-package-name package)
-                  (epl-package-version-string package)))
-   (:else (error "Cannot get package directory from %S" package))))
-
-(defun epl-package-->= (pkg1 pkg2)
-  "Determine whether PKG1 is before PKG2 by version."
-  (not (version-list-< (epl-package-version pkg1)
-                       (epl-package-version pkg2))))
-
-(defun epl-package--from-package-desc (package-desc)
-  "Create an `epl-package' from a PACKAGE-DESC.
-
-PACKAGE-DESC is a `package-desc' object, from recent package.el
-variants."
-  (if (and (fboundp 'package-desc-name)
-           (epl--package-desc-p package-desc))
-      (epl-package-create :name (package-desc-name package-desc)
-                          :description package-desc)
-    (signal 'wrong-type-argument (list 'epl--package-desc-p package-desc))))
-
-(defun epl-package--parse-info (info)
-  "Parse a package.el INFO."
-  (if (epl--package-desc-p info)
-      (epl-package--from-package-desc info)
-    ;; For legacy package.el, info is a vector [NAME REQUIRES DESCRIPTION
-    ;; VERSION COMMENTARY].  We need to re-shape this vector into the
-    ;; `package-alist' format [VERSION REQUIRES DESCRIPTION] to attach it to the
-    ;; new `epl-package'.
-    (let ((name (intern (aref info 0)))
-          (info (vector (aref info 3) (aref info 1) (aref info 2))))
-      (epl-package-create :name name :description info))))
-
-(defun epl-package-from-buffer (&optional buffer)
-  "Create an `epl-package' object from BUFFER.
-
-BUFFER defaults to the current buffer."
-  (let ((info (with-current-buffer (or buffer (current-buffer))
-                (package-buffer-info))))
-    (epl-package--parse-info info)))
-
-(defun epl-package-from-lisp-file (file-name)
-  "Parse the package headers the file at FILE-NAME.
-
-Return an `epl-package' object with the header metadata."
-  (with-temp-buffer
-    (insert-file-contents file-name)
-    (epl-package-from-buffer (current-buffer))))
-
-(defun epl-package-from-tar-file (file-name)
-  "Parse the package tarball at FILE-NAME.
-
-Return a `epl-package' object with the meta data of the tarball
-package in FILE-NAME."
-  (condition-case nil
-      ;; In legacy package.el, `package-tar-file-info' takes the name of the tar
-      ;; file to parse as argument.  In modern package.el, it has no arguments
-      ;; and works on the current buffer.  Hence, we just try to call the legacy
-      ;; version, and if that fails because of a mismatch between formal and
-      ;; actual arguments, we use the modern approach.  To avoid spurious
-      ;; signature warnings by the byte compiler, we suppress warnings when
-      ;; calling the function.
-      (epl-package--parse-info (with-no-warnings
-                                 (package-tar-file-info file-name)))
-    (wrong-number-of-arguments
-     (with-temp-buffer
-       (insert-file-contents-literally file-name)
-       ;; Switch to `tar-mode' to enable extraction of the file.  Modern
-       ;; `package-tar-file-info' relies on `tar-mode', and signals an error if
-       ;; called in a buffer with a different mode.
-       (tar-mode)
-       (epl-package--parse-info (with-no-warnings
-                                  (package-tar-file-info)))))))
-
-(defun epl-package-from-file (file-name)
-  "Parse the package at FILE-NAME.
-
-Return an `epl-package' object with the meta data of the package
-at FILE-NAME."
-  (if (string-match-p (rx ".tar" string-end) file-name)
-      (epl-package-from-tar-file file-name)
-    (epl-package-from-lisp-file file-name)))
-
-(defun epl-package--parse-descriptor-requirement (requirement)
-  "Parse a REQUIREMENT in a package descriptor."
-  ;; This function is only called on legacy package.el.  On package-desc
-  ;; package.el, we just let package.el do the work.
-  (cl-destructuring-bind (name version-string) requirement
-    (list name (version-to-list version-string))))
-
-(defun epl-package-from-descriptor-file (descriptor-file)
-  "Load a `epl-package' from a package DESCRIPTOR-FILE.
-
-A package descriptor is a file defining a new package.  Its name
-typically ends with -pkg.el."
-  (with-temp-buffer
-    (insert-file-contents descriptor-file)
-    (goto-char (point-min))
-    (let ((sexp (read (current-buffer))))
-      (unless (eq (car sexp) 'define-package)
-        (error "%S is no valid package descriptor" descriptor-file))
-      (if (and (fboundp 'package-desc-from-define)
-               (fboundp 'package-desc-name))
-          ;; In Emacs snapshot, we can conveniently call a function to parse the
-          ;; descriptor
-          (let ((desc (apply #'package-desc-from-define (cdr sexp))))
-            (epl-package-create :name (package-desc-name desc)
-                                :description desc))
-        ;; In legacy package.el, we must manually deconstruct the descriptor,
-        ;; because the load function has eval's the descriptor and has a lot of
-        ;; global side-effects.
-        (cl-destructuring-bind
-            (name version-string summary requirements) (cdr sexp)
-          (epl-package-create
-           :name (intern name)
-           :description
-           (vector (version-to-list version-string)
-                   (mapcar #'epl-package--parse-descriptor-requirement
-                           ;; Strip the leading `quote' from the package list
-                           (cadr requirements))
-                   summary)))))))
-
-
-;;;; Package database access
-(defun epl-package-installed-p (package)
-  "Determine whether a PACKAGE is installed.
-
-PACKAGE is either a package name as symbol, or a package object."
-  (let ((name (if (epl-package-p package)
-                  (epl-package-name package)
-                package))
-        (version (when (epl-package-p package)
-                   (epl-package-version package))))
-    (package-installed-p name version)))
-
-(defun epl--parse-package-list-entry (entry)
-  "Parse a list of packages from ENTRY.
-
-ENTRY is a single entry in a package list, e.g. `package-alist',
-`package-archive-contents', etc.  Typically it is a cons cell,
-but the exact format varies between package.el versions.  This
-function tries to parse all known variants.
-
-Return a list of `epl-package' objects parsed from ENTRY."
-  (let ((descriptions (cdr entry)))
-    (cond
-     ((listp descriptions)
-      (sort (mapcar #'epl-package--from-package-desc descriptions)
-            #'epl-package-->=))
-     ;; Legacy package.el has just a single package in an entry, which is a
-     ;; standard description vector
-     ((vectorp descriptions)
-      (list (epl-package-create :name (car entry)
-                                :description descriptions)))
-     (:else (error "Cannot parse entry %S" entry)))))
-
-(defun epl-installed-packages ()
-  "Get all installed packages.
-
-Return a list of package objects."
-  (apply #'append (mapcar #'epl--parse-package-list-entry package-alist)))
-
-(defun epl--find-package-in-list (name list)
-  "Find a package by NAME in a package LIST.
-
-Return a list of corresponding `epl-package' objects."
-  (let ((entry (assq name list)))
-    (when entry
-      (epl--parse-package-list-entry entry))))
-
-(defun epl-find-installed-package (name)
-  "Find an installed package by NAME.
-
-NAME is a package name, as symbol.
-
-Return the installed package as `epl-package' object, or nil, if
-no package with NAME is installed."
-  ;; FIXME: We must return *all* installed packages here
-  (car (epl--find-package-in-list name package-alist)))
-
-(defun epl-available-packages ()
-  "Get all packages available for installed.
-
-Return a list of package objects."
-  (apply #'append (mapcar #'epl--parse-package-list-entry
-                          package-archive-contents)))
-
-(defun epl-find-available-packages (name)
-  "Find available packages for NAME.
-
-NAME is a package name, as symbol.
-
-Return a list of available packages for NAME, sorted by version
-number in descending order.  Return nil, if there are no packages
-for NAME."
-  (epl--find-package-in-list name package-archive-contents))
-
-(cl-defstruct (epl-upgrade
-               (:constructor epl-upgrade-create))
-  "Structure describing an upgradable package.
-Slots:
-
-`installed' The installed package
-
-`available' The package available for installation."
-  installed
-  available)
-
-(defun epl-find-upgrades (&optional packages)
-  "Find all upgradable PACKAGES.
-
-PACKAGES is a list of package objects to upgrade, defaulting to
-all installed packages.
-
-Return a list of `epl-upgrade' objects describing all upgradable
-packages."
-  (let ((packages (or packages (epl-installed-packages)))
-        upgrades)
-    (dolist (pkg packages)
-      (let* ((version (epl-package-version pkg))
-             (name (epl-package-name pkg))
-             ;; Find the latest available package for NAME
-             (available-pkg (car (epl-find-available-packages name)))
-             (available-version (when available-pkg
-                                  (epl-package-version available-pkg))))
-        (when (and available-version (version-list-< version available-version))
-          (push (epl-upgrade-create :installed pkg
-                                    :available available-pkg)
-                upgrades))))
-    (nreverse upgrades)))
-
-
-;;;; Package operations
-
-(defun epl-package-install (package &optional force)
-  "Install a PACKAGE.
-
-PACKAGE is a `epl-package' object.  If FORCE is given and
-non-nil, install PACKAGE, even if it is already installed."
-  (when (or force (not (epl-package-installed-p package)))
-    (if (epl-package--package-desc-p package)
-        (package-install (epl-package-description package))
-      ;; The legacy API installs by name.  We have no control over versioning,
-      ;; etc.
-      (package-install (epl-package-name package)))))
-
-(defun epl-package-delete (package)
-  "Delete a PACKAGE.
-
-PACKAGE is a `epl-package' object to delete."
-  ;; package-delete allows for packages being trashed instead of fully deleted.
-  ;; Let's prevent his silly behavior
-  (let ((delete-by-moving-to-trash nil))
-    ;; The byte compiler will warn us that we are calling `package-delete' with
-    ;; the wrong number of arguments, since it can't infer that we guarantee to
-    ;; always call the correct version.  Thus we suppress all warnings when
-    ;; calling `package-delete'.  I wish there was a more granular way to
-    ;; disable just that specific warning, but it is what it is.
-    (if (epl-package--package-desc-p package)
-        (with-no-warnings
-          (package-delete (epl-package-description package)))
-      ;; The legacy API deletes by name (as string!) and version instead by
-      ;; descriptor.  Hence `package-delete' takes two arguments.  For some
-      ;; insane reason, the arguments are strings here!
-      (let ((name (symbol-name (epl-package-name package)))
-            (version (epl-package-version-string package)))
-        (with-no-warnings
-          (package-delete name version))))))
-
-(defun epl-upgrade (&optional packages preserve-obsolete)
-  "Upgrade PACKAGES.
-
-PACKAGES is a list of package objects to upgrade, defaulting to
-all installed packages.
-
-The old versions of the updated packages are deleted, unless
-PRESERVE-OBSOLETE is non-nil.
-
-Return a list of all performed upgrades, as a list of
-`epl-upgrade' objects."
-  (let ((upgrades (epl-find-upgrades packages)))
-    (dolist (upgrade upgrades)
-      (epl-package-install (epl-upgrade-available upgrade) 'force)
-      (unless preserve-obsolete
-        (epl-package-delete (epl-upgrade-installed upgrade))))
-    upgrades))
-
-(provide 'epl)
-
-;;; epl.el ends here
diff --git a/elpa/epl-20131101.405/epl.elc b/elpa/epl-20131101.405/epl.elc
deleted file mode 100644
index 9bc99ce2b..000000000
Binary files a/elpa/epl-20131101.405/epl.elc and /dev/null differ
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
deleted file mode 100644
index 87214941a..000000000
--- a/elpa/find-file-in-project-3.0/find-file-in-project-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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.0/find-file-in-project-pkg.elc b/elpa/find-file-in-project-3.0/find-file-in-project-pkg.elc
deleted file mode 100644
index 712bbcb5c..000000000
Binary files a/elpa/find-file-in-project-3.0/find-file-in-project-pkg.elc and /dev/null differ
diff --git a/elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el b/elpa/find-file-in-project-3.3/find-file-in-project-autoloads.el
similarity index 78%
rename from elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
rename to elpa/find-file-in-project-3.3/find-file-in-project-autoloads.el
index 4a517d883..59266e1ac 100644
--- a/elpa/find-file-in-project-3.0/find-file-in-project-autoloads.el
+++ b/elpa/find-file-in-project-3.3/find-file-in-project-autoloads.el
@@ -1,10 +1,10 @@
 ;;; find-file-in-project-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads (find-file-in-project) "find-file-in-project" "find-file-in-project.el"
-;;;;;;  (20166 22148))
+;;;### (autoloads nil "find-file-in-project" "find-file-in-project.el"
+;;;;;;  (21721 36934 0 0))
 ;;; Generated autoloads from find-file-in-project.el
 
 (autoload 'find-file-in-project "find-file-in-project" "\
@@ -32,16 +32,9 @@ setting the variable `ffip-project-root'.
 
 ;;;***
 
-;;;### (autoloads nil nil ("find-file-in-project-pkg.el") (20166
-;;;;;;  22148 967146))
-
-;;;***
-
-(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.3/find-file-in-project-pkg.el b/elpa/find-file-in-project-3.3/find-file-in-project-pkg.el
new file mode 100644
index 000000000..c270c352b
--- /dev/null
+++ b/elpa/find-file-in-project-3.3/find-file-in-project-pkg.el
@@ -0,0 +1 @@
+(define-package "find-file-in-project" "3.3" "Find files in a project quickly." 'nil)
diff --git a/elpa/find-file-in-project-3.3/find-file-in-project-pkg.elc b/elpa/find-file-in-project-3.3/find-file-in-project-pkg.elc
new file mode 100644
index 000000000..ce117ed9c
Binary files /dev/null and b/elpa/find-file-in-project-3.3/find-file-in-project-pkg.elc differ
diff --git a/elpa/find-file-in-project-3.0/find-file-in-project.el b/elpa/find-file-in-project-3.3/find-file-in-project.el
similarity index 72%
rename from elpa/find-file-in-project-3.0/find-file-in-project.el
rename to elpa/find-file-in-project-3.3/find-file-in-project.el
index 795e547e8..d0f7ae5c1 100644
--- a/elpa/find-file-in-project-3.0/find-file-in-project.el
+++ b/elpa/find-file-in-project-3.3/find-file-in-project.el
@@ -1,13 +1,12 @@
-
 ;;; find-file-in-project.el --- Find files in a project quickly.
 
-;; Copyright (C) 2006-2009, 2011
+;; Copyright (C) 2006-2009, 2011-2012
 ;;   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.0
+;; Version: 3.3
 ;; Created: 2008-03-18
 ;; Keywords: project, convenience
 ;; EmacsWiki: FindFileInProject
@@ -61,16 +60,22 @@
 
 ;;; Code:
 
+(require 'cl)
+
 (defvar ffip-project-file ".git"
   "The file that should be used to define a project root.
 
-May be set using .dir-locals.el.")
+May be set using .dir-locals.el. Checks each entry if set to a list.")
 
 (defvar ffip-patterns
   '("*.html" "*.org" "*.txt" "*.md" "*.el" "*.clj" "*.py" "*.rb" "*.js" "*.pl"
     "*.sh" "*.erl" "*.hs" "*.ml")
   "List of patterns to look for with `find-file-in-project'.")
 
+(defvar ffip-prune-patterns
+  '(".git")
+  "List of directory patterns to not decend into when listing files in `find-file-in-project'.")
+
 (defvar ffip-find-options ""
   "Extra options to pass to `find' when using `find-file-in-project'.
 
@@ -87,51 +92,64 @@ 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)
-                            (locate-dominating-file default-directory
-                                                    ffip-project-file)))))
+                            (if (listp ffip-project-file)
+                                (some (apply-partially '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))))
 
 (defun ffip-join-patterns ()
-  "Turn `ffip-paterns' into a string that `find' can use."
+  "Turn `ffip-patterns' into a string that `find' can use."
   (mapconcat (lambda (pat) (format "-name \"%s\"" pat))
              ffip-patterns " -or "))
 
+(defun ffip-prune-patterns ()
+  "Turn `ffip-prune-patterns' into a string that `find' can use."
+  (mapconcat (lambda (pat) (format "-name \"%s\"" pat))
+             ffip-prune-patterns " -or "))
+
+
 (defun ffip-project-files ()
   "Return an alist of all filenames in the project and their path.
 
 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))
+  (let ((file-alist nil)
+        (root (expand-file-name (or ffip-project-root (ffip-project-root)
+                                    (error "No project root found")))))
     (mapcar (lambda (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))
+              (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)))
             (split-string (shell-command-to-string
-                           (format "find %s -type f \\( %s \\) %s | head -n %s"
-                                   (or ffip-project-root
-                                       (ffip-project-root)
-                                       (error "No project root found"))
-                                   (ffip-join-patterns)
-                                   ffip-find-options
-                                   ffip-limit))))))
+                           (format "find %s -type d -a \\( %s \\) -prune -o -type f \\( %s \\) -print %s | head -n %s"
+                                   root (ffip-prune-patterns) (ffip-join-patterns)
+                                   ffip-find-options ffip-limit))))))
 
 ;;;###autoload
 (defun find-file-in-project ()
diff --git a/elpa/find-file-in-project-3.0/find-file-in-project.elc b/elpa/find-file-in-project-3.3/find-file-in-project.elc
similarity index 50%
rename from elpa/find-file-in-project-3.0/find-file-in-project.elc
rename to elpa/find-file-in-project-3.3/find-file-in-project.elc
index 16b1b8bb8..5b150671e 100644
Binary files a/elpa/find-file-in-project-3.0/find-file-in-project.elc and b/elpa/find-file-in-project-3.3/find-file-in-project.elc differ
diff --git a/elpa/git-commit-mode-0.15.0/git-commit-mode-autoloads.el b/elpa/git-commit-mode-0.15.0/git-commit-mode-autoloads.el
new file mode 100644
index 000000000..456b039d8
--- /dev/null
+++ b/elpa/git-commit-mode-0.15.0/git-commit-mode-autoloads.el
@@ -0,0 +1,28 @@
+;;; git-commit-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "git-commit-mode" "git-commit-mode.el" (21721
+;;;;;;  36913 0 0))
+;;; Generated autoloads from git-commit-mode.el
+
+(autoload 'git-commit-mode "git-commit-mode" "\
+Major mode for editing git commit messages.
+
+This mode helps with editing git commit messages both by
+providing commands to do common tasks, and by highlighting the
+basic structure of and errors in git commit messages.
+
+\(fn)" t nil)
+
+(dolist (pattern '("/COMMIT_EDITMSG\\'" "/NOTES_EDITMSG\\'" "/MERGE_MSG\\'" "/TAG_EDITMSG\\'" "/PULLREQ_EDITMSG\\'")) (add-to-list 'auto-mode-alist (cons pattern 'git-commit-mode)))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; git-commit-mode-autoloads.el ends here
diff --git a/elpa/git-commit-mode-0.15.0/git-commit-mode-pkg.el b/elpa/git-commit-mode-0.15.0/git-commit-mode-pkg.el
new file mode 100644
index 000000000..be8b11a92
--- /dev/null
+++ b/elpa/git-commit-mode-0.15.0/git-commit-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "git-commit-mode" "0.15.0" "Major mode for editing git commit messages" 'nil :url "https://github.com/magit/git-modes" :keywords '("convenience" "vc" "git"))
diff --git a/elpa/git-commit-mode-0.15.0/git-commit-mode-pkg.elc b/elpa/git-commit-mode-0.15.0/git-commit-mode-pkg.elc
new file mode 100644
index 000000000..1e5b51f0e
Binary files /dev/null and b/elpa/git-commit-mode-0.15.0/git-commit-mode-pkg.elc differ
diff --git a/elpa/git-commit-mode-0.15.0/git-commit-mode.el b/elpa/git-commit-mode-0.15.0/git-commit-mode.el
new file mode 100644
index 000000000..a91f211b3
--- /dev/null
+++ b/elpa/git-commit-mode-0.15.0/git-commit-mode.el
@@ -0,0 +1,662 @@
+;;; git-commit-mode.el --- Major mode for editing git commit messages -*- lexical-binding: t; -*-
+;; Version: 0.15.0
+
+;; Copyright (c) 2010-2012  Florian Ragwitz
+;; Copyright (c) 2012-2013  Sebastian Wiesner
+;; Copyright (C) 2010-2014  The Magit Project Developers
+
+;; Authors: Jonas Bernoulli <jonas@bernoul.li>
+;;	Sebastian Wiesner <lunaryorn@gmail.com>
+;;	Florian Ragwitz <rafl@debian.org>
+;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
+;; Homepage: https://github.com/magit/git-modes
+;; Keywords: convenience vc git
+
+;; This file is not part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; A major mode for editing Git commit messages.
+
+;;;; Formatting
+
+;; Highlight the formatting of git commit messages and indicate errors according
+;; to the guidelines for commit messages (see
+;; http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+;;
+;; Highlight the first line (aka "summary") specially if it exceeds 50
+;; characters (configurable using `git-commit-summary-max-length').
+;;
+;; Enable `auto-fill-mode' and set the `fill-column' to 72 according to the
+;; aforementioned guidelines (configurable using `git-commit-fill-column').
+
+;;;; Headers
+
+;; Provide commands to insert standard headers into commit messages.
+;;
+;; - C-c C-s inserts Signed-off-by (`git-commit-signoff').
+;; - C-C C-a inserts Acked-by (`git-commit-ack').
+;; - C-c C-t inserts Tested-by (`git-commit-test').
+;; - C-c C-r inserts Reviewed-by (`git-commit-review').
+;; - C-c C-o inserts Cc (`git-commit-cc').
+;; - C-c C-p inserts Reported-by (`git-commit-reported').
+
+;;;; Committing
+
+;; C-c C-c finishes a commit.
+;;
+;; Check a buffer for stylistic errors before committing, and ask for
+;; confirmation before committing with style errors.
+
+;;; Code:
+
+(require 'log-edit)
+(require 'ring)
+(require 'server)
+
+;;; Options
+;;;; Variables
+
+(defgroup git-commit nil
+  "Edit Git commit messages."
+  :prefix "git-commit-"
+  :group 'tools)
+
+(defcustom git-commit-confirm-commit nil
+  "Whether to ask for confirmation before committing.
+
+If t, ask for confirmation before creating a commit with style
+errors, unless the commit is forced.  If nil, never ask for
+confirmation before committing."
+  :group 'git-commit
+  :type '(choice (const :tag "On style errors" t)
+                 (const :tag "Never" nil)))
+
+(defcustom git-commit-mode-hook '(turn-on-auto-fill flyspell-mode)
+  "Hook run when entering Git Commit mode."
+  :options '(turn-on-auto-fill flyspell-mode git-commit-save-message)
+  :type 'hook
+  :group 'git-commit)
+
+(defcustom git-commit-kill-buffer-hook '(git-commit-save-message)
+  "Hook run when killing a Git Commit mode buffer.
+This hook is run by both `git-commit-commit'
+and `git-commit-abort'."
+  :options '(git-commit-save-message)
+  :type 'hook
+  :group 'git-commit)
+
+(defcustom git-commit-summary-max-length 50
+  "Fontify characters beyond this column in summary lines as errors."
+  :group 'git-commit
+  :type 'number)
+
+(defcustom git-commit-fill-column 72
+  "Automatically wrap commit message lines beyond this column."
+  :group 'git-commit
+  :type 'number)
+
+(defcustom git-commit-known-pseudo-headers
+  '("Signed-off-by" "Acked-by" "Cc"
+    "Suggested-by" "Reported-by" "Tested-by" "Reviewed-by")
+  "A list of git pseudo headers to be highlighted."
+  :group 'git-commit
+  :type '(repeat string))
+
+;;;; Faces
+
+(defgroup git-commit-faces nil
+  "Faces for highlighting Git commit messages."
+  :prefix "git-commit-"
+  :group 'git-commit
+  :group 'faces)
+
+(defface git-commit-summary-face
+  '((t :inherit font-lock-type-face))
+  "Face used to highlight the summary in git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-overlong-summary-face
+  '((t :inherit font-lock-warning-face))
+  "Face used to highlight overlong parts of git commit message summaries"
+  :group 'git-commit-faces)
+
+(defface git-commit-nonempty-second-line-face
+  '((t :inherit font-lock-warning-face))
+  "Face used to highlight text on the second line of git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-note-face
+  '((t :inherit font-lock-string-face))
+  "Face used to highlight notes in git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-pseudo-header-face
+  '((t :inherit font-lock-string-face))
+  "Font used to hightlight pseudo headers in git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-known-pseudo-header-face
+  '((t :inherit font-lock-keyword-face))
+  "Face used to hightlight common pseudo headers in git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-branch-face
+  '((t :inherit font-lock-variable-name-face))
+  "Face used to highlight the branch name in comments in git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-no-branch-face
+  '((t :inherit git-commit-branch-face))
+  "Face used when a commit is going to be made outside of any branches"
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-heading-face
+  '((t :inherit git-commit-known-pseudo-header-face))
+  "Face used to highlight section headings in the default
+comments in git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-file-face
+  '((t :inherit git-commit-pseudo-header-face))
+  "Face used to highlight file names in the default comments in
+git commit messages"
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-action-face
+  '((t :inherit git-commit-branch-face))
+  "Face used to highlight what has happened to files in the
+default comments in git commit messages"
+  :group 'git-commit-faces)
+
+;;; Keymap
+
+(defvar git-commit-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-c") 'git-commit-commit)
+    (define-key map (kbd "C-c C-k") 'git-commit-abort)
+    (define-key map (kbd "C-c C-s") 'git-commit-signoff)
+    (define-key map (kbd "C-c C-a") 'git-commit-ack)
+    (define-key map (kbd "C-c C-t") 'git-commit-test)
+    (define-key map (kbd "C-c C-r") 'git-commit-review)
+    (define-key map (kbd "C-c C-o") 'git-commit-cc)
+    (define-key map (kbd "C-c C-p") 'git-commit-reported)
+    (define-key map (kbd "C-c C-i") 'git-commit-suggested)
+    (define-key map (kbd "C-c M-s") 'git-commit-save-message)
+    (define-key map (kbd "M-p")     'git-commit-prev-message)
+    (define-key map (kbd "M-n")     'git-commit-next-message)
+    (define-key map [remap server-edit]          'git-commit-commit)
+    (define-key map [remap kill-buffer]          'git-commit-abort)
+    (define-key map [remap ido-kill-buffer]      'git-commit-abort)
+    (define-key map [remap iswitchb-kill-buffer] 'git-commit-abort)
+    ;; Old bindings to avoid confusion
+    (define-key map (kbd "C-c C-x s") 'git-commit-signoff)
+    (define-key map (kbd "C-c C-x a") 'git-commit-ack)
+    (define-key map (kbd "C-c C-x t") 'git-commit-test)
+    (define-key map (kbd "C-c C-x r") 'git-commit-review)
+    (define-key map (kbd "C-c C-x o") 'git-commit-cc)
+    (define-key map (kbd "C-c C-x p") 'git-commit-reported)
+    map)
+  "Key map used by `git-commit-mode'.")
+
+;;; Menu
+
+(require 'easymenu)
+(easy-menu-define git-commit-mode-menu git-commit-mode-map
+  "Git Commit Mode Menu"
+  '("Commit"
+    ["Previous" git-commit-prev-message t]
+    ["Next" git-commit-next-message t]
+    "-"
+    ["Ack" git-commit-ack :active t
+     :help "Insert an 'Acked-by' header"]
+    ["Sign-Off" git-commit-signoff :active t
+     :help "Insert a 'Signed-off-by' header"]
+    ["Tested-by" git-commit-test :active t
+     :help "Insert a 'Tested-by' header"]
+    ["Reviewed-by" git-commit-review :active t
+     :help "Insert a 'Reviewed-by' header"]
+    ["CC" git-commit-cc t
+     :help "Insert a 'Cc' header"]
+    ["Reported" git-commit-reported :active t
+     :help "Insert a 'Reported-by' header"]
+    ["Suggested" git-commit-suggested t
+     :help "Insert a 'Suggested-by' header"]
+    "-"
+    ["Save" git-commit-save-message t]
+    ["Cancel" git-commit-abort t]
+    ["Commit" git-commit-commit t]))
+
+;;; Committing
+
+(defvar git-commit-commit-hook nil
+  "Hook run by `git-commit-commit' unless clients exist.
+Only use this if you know what you are doing.")
+
+(defvar git-commit-previous-winconf nil)
+
+(defmacro git-commit-restore-previous-winconf (&rest body)
+  "Run BODY and then restore `git-commit-previous-winconf'.
+When `git-commit-previous-winconf' is nil or was created from
+another frame do nothing."
+  (declare (indent 0))
+  (let ((winconf (make-symbol "winconf"))
+        (frame   (make-symbol "frame")))
+    `(let ((,winconf git-commit-previous-winconf)
+           (,frame (selected-frame)))
+       ,@body
+       (when (and ,winconf
+                  (equal ,frame (window-configuration-frame ,winconf)))
+         (set-window-configuration ,winconf)
+         (setq git-commit-previous-winconf nil)))))
+
+(defun git-commit-commit (&optional force)
+  "Finish editing the commit message and commit.
+
+Check for stylistic errors in the current commit, and ask the
+user for confirmation depending on `git-commit-confirm-commit'.
+If FORCE is non-nil or if a raw prefix arg is given, commit
+immediately without asking.
+
+Return t, if the commit was successful, or nil otherwise."
+  (interactive "P")
+  (if (and git-commit-confirm-commit
+           (git-commit-has-style-errors-p)
+           (not force)
+           (not (y-or-n-p "Commit despite stylistic errors?")))
+      (message "Commit canceled due to stylistic errors.")
+    (save-buffer)
+    (run-hooks 'git-commit-kill-buffer-hook)
+    (remove-hook 'kill-buffer-query-functions
+                 'git-commit-kill-buffer-noop t)
+    (git-commit-restore-previous-winconf
+      (if (git-commit-buffer-clients)
+          (server-edit)
+        (run-hook-with-args 'git-commit-commit-hook)
+        (kill-buffer)))))
+
+(defun git-commit-abort ()
+  "Abort the commit.
+The commit message is saved to the kill ring."
+  (interactive)
+  (when (< emacs-major-version 24)
+    ;; Emacsclient doesn't exit with non-zero when -error is used.
+    ;; Instead cause Git to error out by feeding it an empty file.
+    (erase-buffer))
+  (save-buffer)
+  (run-hooks 'git-commit-kill-buffer-hook)
+  (remove-hook 'kill-buffer-hook 'server-kill-buffer t)
+  (remove-hook 'kill-buffer-query-functions 'git-commit-kill-buffer-noop t)
+  (git-commit-restore-previous-winconf
+    (let ((buffer  (current-buffer))
+          (clients (git-commit-buffer-clients)))
+      (if clients
+          (progn
+            (dolist (client clients)
+              (ignore-errors
+                (server-send-string client "-error Commit aborted by user"))
+              (delete-process client))
+            (when (buffer-live-p buffer)
+              (kill-buffer buffer)))
+        (kill-buffer))))
+  (accept-process-output nil 0.1)
+  (message (concat "Commit aborted."
+                   (when (memq 'git-commit-save-message
+                               git-commit-kill-buffer-hook)
+                     "  Message saved to `log-edit-comment-ring'."))))
+
+(defun git-commit-buffer-clients ()
+  (and (fboundp 'server-edit)
+       (boundp 'server-buffer-clients)
+       server-buffer-clients))
+
+;;; History
+
+(defun git-commit-save-message ()
+  "Save current message to `log-edit-comment-ring'."
+  (interactive)
+  (let ((message (buffer-substring
+                  (point-min)
+                  (git-commit-find-pseudo-header-position))))
+    (when (and (string-match "^\\s-*\\sw" message)
+               (or (ring-empty-p log-edit-comment-ring)
+                   (not (ring-member log-edit-comment-ring message))))
+      ;; if index is nil, we end up cycling back to message we just saved!
+      (unless log-edit-comment-ring-index
+        (setq log-edit-comment-ring-index 0))
+      (ring-insert log-edit-comment-ring message))))
+
+(defun git-commit-prev-message (arg)
+  "Cycle backward through message history, after saving current message.
+With a numeric prefix ARG, go back ARG comments."
+  (interactive "*p")
+  (git-commit-save-message)
+  (save-restriction
+    (narrow-to-region (point-min) (git-commit-find-pseudo-header-position))
+    (log-edit-previous-comment arg)))
+
+(defun git-commit-next-message (arg)
+  "Cycle forward through message history, after saving current message.
+With a numeric prefix ARG, go forward ARG comments."
+  (interactive "*p")
+  (git-commit-prev-message (- arg)))
+
+;;; Headers
+
+(defun git-commit-find-pseudo-header-position ()
+  "Find the position at which commit pseudo headers should be inserted.
+
+Those headers usually live at the end of a commit message, but
+before any trailing comments git or the user might have
+inserted."
+  (save-excursion
+    (goto-char (point-max))
+    (if (re-search-backward "^[^#\n]" nil t)
+        ;; we found last non-empty non-comment line, headers go after
+        (forward-line 1)
+      ;; there's only blanks & comments, headers go before comments
+      (goto-char (point-min))
+      (and (re-search-forward "^#" nil t) (forward-line 0)))
+    (skip-chars-forward "\n")
+    (point)))
+
+(defun git-commit-determine-pre-for-pseudo-header ()
+  "Find the characters to insert before the pseudo header.
+Returns either zero, one or two newlines after computation.
+
+`point' either points to an empty line (with a non-empty previous
+line) or the end of a non-empty line."
+  (let ((pre "")
+        (prev-line nil))
+    (if (not (eq (point) (point-at-bol)))
+        (progn
+          (setq pre (concat pre "\n"))
+          (setq prev-line (thing-at-point 'line)))
+      ;; else: (point) is at an empty line
+      (when (not (eq (point) (point-min)))
+        (setq prev-line
+              (save-excursion
+                (forward-line -1)
+                (thing-at-point 'line)))))
+
+    ;; we have prev-line now; if it doesn't match any known pseudo
+    ;; header, add a newline
+    (when prev-line
+      (if (not (delq nil (mapcar (lambda (pseudo-header)
+                                   (string-match pseudo-header prev-line))
+                                 git-commit-known-pseudo-headers)))
+          (setq pre (concat pre "\n"))))
+    pre))
+
+(defun git-commit-insert-header (type name email)
+  "Insert a header into the commit message.
+The inserted header has the format 'TYPE: NAME <EMAIL>'.
+
+The header is inserted at the position returned by
+`git-commit-find-pseudo-header-position'.  When this position
+isn't after an existing header or a newline, an extra newline is
+inserted before the header."
+  (let ((header-at (git-commit-find-pseudo-header-position)))
+    (save-excursion
+      (goto-char header-at)
+      (let ((pre (git-commit-determine-pre-for-pseudo-header)))
+        (insert (format "%s%s: %s <%s>\n" pre type name email))))))
+
+(defun git-commit-insert-header-as-self (type)
+  "Insert a header with the name and email of the current user.
+The inserted header has the format 'TYPE: NAME <EMAIL>'.
+Also see `git-commit-insert-header'."
+  (git-commit-insert-header
+   type
+   (or (getenv "GIT_AUTHOR_NAME")
+       (getenv "GIT_COMMITTER_NAME")
+       (ignore-errors (car (process-lines "git" "config" "user.name")))
+       user-full-name)
+   (or (getenv "GIT_AUTHOR_EMAIL")
+       (getenv "GIT_COMMITTER_EMAIL")
+       (getenv "EMAIL")
+       (ignore-errors (car (process-lines "git" "config" "user.email")))
+       user-mail-address)))
+
+(defmacro git-define-git-commit-self (action header)
+  "Create function git-commit-ACTION.
+ACTION will be part of the function name.
+HEADER is the actual header to be inserted into the comment."
+  (let ((func-name (intern (concat "git-commit-" action))))
+    `(defun ,func-name ()
+       ,(format "Insert a '%s' header at the end of the commit message.
+
+The author name and email address used for the header are
+retrieved automatically with the same mechanism git uses."
+                header)
+       (interactive)
+       (git-commit-insert-header-as-self ,header))))
+
+(git-define-git-commit-self "ack"     "Acked-by")
+(git-define-git-commit-self "review"  "Reviewed-by")
+(git-define-git-commit-self "signoff" "Signed-off-by")
+(git-define-git-commit-self "test"    "Tested-by")
+
+(defmacro git-define-git-commit (action header)
+  "Create interactive function git-commit-ACTION.
+ACTION will be part of the function name.
+HEADER is the actual header to be inserted into the comment."
+  (let ((func-name (intern (concat "git-commit-" action))))
+    `(defun ,func-name (name email)
+       ,(format "Insert a '%s' header at the end of the commit message.
+The value of the header is determined by NAME and EMAIL.
+
+When called interactively, both NAME and EMAIL are read from the
+minibuffer."
+                header)
+       (interactive
+        (list (read-string "Name: ")
+              (read-string "Email: ")))
+       (git-commit-insert-header ,header name email))))
+
+(git-define-git-commit "cc"        "Cc")
+(git-define-git-commit "reported"  "Reported-by")
+(git-define-git-commit "suggested" "Suggested-by")
+
+(defconst git-commit-comment-headings-alist
+  '(("Not currently on any branch."   . git-commit-no-branch-face)
+    ("Changes to be committed:"       . git-commit-comment-heading-face)
+    ("Untracked files:"               . git-commit-comment-heading-face)
+    ("Changed but not updated:"       . git-commit-comment-heading-face)
+    ("Changes not staged for commit:" . git-commit-comment-heading-face)
+    ("Unmerged paths:"                . git-commit-comment-heading-face))
+  "Headings in message comments.
+
+The `car' of each cell is the heading text, the `cdr' the face to
+use for fontification.")
+
+(defun git-commit-summary-regexp ()
+  (concat
+   ;; Skip empty lines or comments before the summary
+   "\\`\\(?:^\\(?:\\s-*\\|\\s<.*\\)\n\\)*"
+   ;; The summary line
+   (format "\\(.\\{0,%d\\}\\)\\(.*\\)" git-commit-summary-max-length)
+   ;; Non-empty non-comment second line
+   ;;
+   ;; For instant highlighting of non-empty second lines in font-lock,
+   ;; the last capturing group must capture the empty string ("") in
+   ;; "summary line\n".
+   ;; That's why the simpler regex "\\(?:\n\\([^\n#].*\\)\\)?",
+   ;; which captures 'nil', can't be used.
+   "\\(?:\n\\#\\|\n\\(.*\\)\\)?"))
+
+(defun git-commit-has-style-errors-p ()
+  "Check whether the current buffer has style errors.
+
+Return t, if the current buffer has style errors, or nil
+otherwise."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward (git-commit-summary-regexp) nil t)
+      (or (string-match-p ".+" (or (match-string 2) ""))
+          (string-match-p "^.+$" (or (match-string 3) ""))))))
+
+;;; Font-Lock
+
+(defun git-commit-mode-summary-font-lock-keywords (&optional errors)
+  "Create font lock keywords to fontify the Git summary.
+
+If ERRORS is non-nil create keywords that highlight errors in the
+summary line, not the summary line itself."
+  (if errors
+      `(,(git-commit-summary-regexp)
+        (2 'git-commit-overlong-summary-face t t)
+        (3 'git-commit-nonempty-second-line-face t t))
+    `(,(git-commit-summary-regexp)
+      (1 'git-commit-summary-face t))))
+
+(defun git-commit-mode-heading-keywords ()
+  "Create font lock keywords to fontify comment headings.
+
+Known comment headings are provided by `git-commit-comment-headings'."
+  (mapcar (lambda (cell) `(,(format "^\\s<\\s-+\\(%s\\)$"
+                                    (regexp-quote (car cell)))
+                           (1 ',(cdr cell) t)))
+          git-commit-comment-headings-alist))
+
+(defun git-commit-mode-font-lock-keywords ()
+  (append
+   `(("^\\s<.*$" . 'font-lock-comment-face)
+     ("^\\s<\\s-On branch \\(.*\\)$" (1 'git-commit-branch-face t))
+     ("^\\s<\t\\(?:\\([^:]+\\):\\s-+\\)?\\(.*\\)$"
+      (1 'git-commit-comment-action-face t t)
+      (2 'git-commit-comment-file-face t))
+     (,(concat "^\\("
+               (regexp-opt git-commit-known-pseudo-headers)
+               ":\\)\\(\s.*\\)$")
+      (1 'git-commit-known-pseudo-header-face)
+      (2 'git-commit-pseudo-header-face))
+     ("^\\<\\S-+:\\s-.*$" . 'git-commit-pseudo-header-face)
+     (eval . (git-commit-mode-summary-font-lock-keywords))
+     ("\\[[^\n]+?\\]" (0 'git-commit-note-face t)) ; Notes override summary line
+     ;; Warnings from overlong lines and nonempty second line override
+     ;; everything
+     (eval . (git-commit-mode-summary-font-lock-keywords t)))
+   (git-commit-mode-heading-keywords)))
+
+(defun git-commit-font-lock-diff ()
+  "Add font lock on diff."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward "^diff --git" nil t)
+      (let ((beg (match-beginning 0)))
+        (let* ((buffer (current-buffer))
+               (font-lock-verbose nil)
+               (font-lock-support-mode nil)
+               (text (with-temp-buffer
+                       (insert
+                        (with-current-buffer buffer
+                          (buffer-substring-no-properties beg (point-max))))
+                       (diff-mode)
+                       (font-lock-fontify-buffer)
+                       (let ((pos (point-min))
+                             next)
+                         (while (setq next (next-single-property-change pos 'face))
+                           (put-text-property pos next 'font-lock-face
+                                              (get-text-property pos 'face))
+                           (setq pos next)))
+                       (buffer-string))))
+          (delete-region beg (point-max))
+          (insert text))))))
+
+;;; Mode
+
+(defvar git-commit-mode-syntax-table
+  (let ((table (make-syntax-table text-mode-syntax-table)))
+    (modify-syntax-entry ?#  "<" table)
+    (modify-syntax-entry ?\n ">" table)
+    (modify-syntax-entry ?\r ">" table)
+    table)
+  "Syntax table used by `git-commit-mode'.")
+
+;;;###autoload
+(define-derived-mode git-commit-mode text-mode "Git Commit"
+  "Major mode for editing git commit messages.
+
+This mode helps with editing git commit messages both by
+providing commands to do common tasks, and by highlighting the
+basic structure of and errors in git commit messages."
+  ;; Font locking
+  (setq font-lock-defaults (list (git-commit-mode-font-lock-keywords) t))
+  (set (make-local-variable 'font-lock-multiline) t)
+  (git-commit-font-lock-diff)
+  ;; Filling according to the guidelines
+  (setq fill-column git-commit-fill-column)
+  ;; Recognize changelog-style paragraphs
+  (set (make-local-variable 'paragraph-start)
+       (concat paragraph-start "\\|*\\|("))
+  ;; Treat lines starting with a hash/pound as comments
+  (set (make-local-variable 'comment-start) "#")
+  (set (make-local-variable 'comment-start-skip)
+       (concat "^" (regexp-quote comment-start) "+"
+               "\\s-*"))
+  (set (make-local-variable 'comment-use-syntax) nil)
+  ;; Do not remember point location in commit messages
+  (when (boundp 'save-place)
+    (setq save-place nil))
+  ;; If the commit summary is empty, insert a newline after point
+  (when (string= "" (buffer-substring-no-properties
+                     (line-beginning-position)
+                     (line-end-position)))
+    (open-line 1))
+  ;; Make sure `git-commit-abort' cannot be by-passed
+  (add-hook 'kill-buffer-query-functions
+            'git-commit-kill-buffer-noop nil t)
+  ;; Make the wrong usage info from `server-execute' go way
+  (run-with-timer 0.01 nil (lambda (m) (message "%s" m))
+                  (substitute-command-keys
+                   (concat "Type \\[git-commit-commit] "
+                           (let ((n (buffer-file-name)))
+                             (cond ((equal n "TAG_EDITMSG") "to tag")
+                                   ((or (equal n "NOTES_EDITMSG")
+                                        (equal n "PULLREQ_EDITMSG"))
+                                    "when done")
+                                   (t "to commit")))
+                           " (\\[git-commit-abort] to abort)."))))
+
+(defun git-commit-kill-buffer-noop ()
+  (message
+   (substitute-command-keys
+    "Don't kill this buffer.  Instead abort using \\[git-commit-abort]."))
+  nil)
+
+(defun git-commit-mode-flyspell-verify ()
+  (not (nth 4 (syntax-ppss)))) ; not inside a comment
+
+(eval-after-load 'flyspell
+  '(put 'git-commit-mode 'flyspell-mode-predicate
+        'git-commit-mode-flyspell-verify))
+
+;;;###autoload
+(dolist (pattern '("/COMMIT_EDITMSG\\'" "/NOTES_EDITMSG\\'"
+                   "/MERGE_MSG\\'" "/TAG_EDITMSG\\'"
+                   "/PULLREQ_EDITMSG\\'"))
+  (add-to-list 'auto-mode-alist (cons pattern 'git-commit-mode)))
+
+(defun git-commit-auto-mode-enable ()
+  (message "git-commit-auto-mode-enable is obsolete and doesn't do anything"))
+(make-obsolete 'git-commit-auto-mode-enable "This mode is a noop now" "")
+
+(provide 'git-commit-mode)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; git-commit-mode.el ends here
diff --git a/elpa/git-commit-mode-0.15.0/git-commit-mode.elc b/elpa/git-commit-mode-0.15.0/git-commit-mode.elc
new file mode 100644
index 000000000..c3da61d43
Binary files /dev/null and b/elpa/git-commit-mode-0.15.0/git-commit-mode.elc differ
diff --git a/elpa/git-rebase-mode-0.15.0/git-rebase-mode-autoloads.el b/elpa/git-rebase-mode-0.15.0/git-rebase-mode-autoloads.el
new file mode 100644
index 000000000..18a6e946b
--- /dev/null
+++ b/elpa/git-rebase-mode-0.15.0/git-rebase-mode-autoloads.el
@@ -0,0 +1,29 @@
+;;; git-rebase-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "git-rebase-mode" "git-rebase-mode.el" (21721
+;;;;;;  36911 0 0))
+;;; Generated autoloads from git-rebase-mode.el
+
+(autoload 'git-rebase-mode "git-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\\'" . git-rebase-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; git-rebase-mode-autoloads.el ends here
diff --git a/elpa/git-rebase-mode-0.15.0/git-rebase-mode-pkg.el b/elpa/git-rebase-mode-0.15.0/git-rebase-mode-pkg.el
new file mode 100644
index 000000000..f82072ddc
--- /dev/null
+++ b/elpa/git-rebase-mode-0.15.0/git-rebase-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "git-rebase-mode" "0.15.0" "Major mode for editing git rebase files" 'nil :url "https://github.com/magit/git-modes" :keywords '("convenience" "vc" "git"))
diff --git a/elpa/git-rebase-mode-0.15.0/git-rebase-mode-pkg.elc b/elpa/git-rebase-mode-0.15.0/git-rebase-mode-pkg.elc
new file mode 100644
index 000000000..ff56c6c34
Binary files /dev/null and b/elpa/git-rebase-mode-0.15.0/git-rebase-mode-pkg.elc differ
diff --git a/elpa/git-rebase-mode-0.15.0/git-rebase-mode.el b/elpa/git-rebase-mode-0.15.0/git-rebase-mode.el
new file mode 100644
index 000000000..533440961
--- /dev/null
+++ b/elpa/git-rebase-mode-0.15.0/git-rebase-mode.el
@@ -0,0 +1,378 @@
+;;; git-rebase-mode.el --- Major mode for editing git rebase files
+;; Version: 0.15.0
+
+;; Copyright (C) 2010-2014  The Magit Project Developers
+
+;; Author: Phil Jackson <phil@shellarchive.co.uk>
+;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
+;; Homepage: https://github.com/magit/git-modes
+;; Keywords: convenience vc git
+
+;; This file is not part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this file.  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 'easymenu)
+(require 'server)
+(require 'thingatpt)
+
+;;; Options
+;;;; Variables
+
+(defgroup git-rebase nil
+  "Edit Git rebase sequences."
+  :group 'tools)
+
+(defcustom git-rebase-auto-advance nil
+  "If non-nil, moves point forward a line after running an action."
+  :group 'git-rebase
+  :type 'boolean)
+
+(defcustom git-rebase-remove-instructions nil
+  "Whether to remove the instructions from the rebase buffer.
+Because you have seen them before and can still remember."
+  :group 'git-rebase
+  :type 'boolean)
+
+;;;; Faces
+
+(defgroup git-rebase-faces nil
+  "Faces used by Git-Rebase mode."
+  :group 'faces
+  :group 'git-rebase)
+
+(defface git-rebase-hash
+  '((((class color) (background light))
+     :foreground "firebrick")
+    (((class color) (background dark))
+     :foreground "tomato"))
+  "Face for commit hashes."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-description nil
+  "Face for commit descriptions."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-killed-action
+  '((((class color))
+     :inherit font-lock-comment-face
+     :strike-through t))
+  "Face for commented action and exec lines."
+  :group 'git-rebase-faces)
+
+(define-obsolete-face-alias 'git-rebase-description-face
+  'git-rebase-description "1.0.0")
+(define-obsolete-face-alias 'git-rebase-killed-action-face
+  'git-rebase-killed-action "1.0.0")
+
+;;; Regexps
+
+(defconst git-rebase-action-line-re
+  (concat "^#?"
+          "\\([efprs]\\|pick\\|reword\\|edit\\|squash\\|fixup\\) "
+          "\\([a-z0-9]\\{4,40\\}\\) "
+          "\\(.*\\)")
+  "Regexp matching action lines in rebase buffers.")
+
+(defconst git-rebase-exec-line-re
+  "^#?\\(x\\|exec\\)[[:space:]]\\(.*\\)"
+  "Regexp matching exec lines in rebase buffer.")
+
+(defconst git-rebase-dead-line-re
+  (format "^#\\(?:%s\\|%s\\)"
+          (substring git-rebase-action-line-re 1)
+          (substring git-rebase-exec-line-re 1))
+  "Regexp matching commented action and exex lines in rebase buffers.")
+
+;;; Keymaps
+
+(defvar git-rebase-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map special-mode-map)
+    (define-key map (kbd "q")       'git-rebase-server-edit)
+    (define-key map (kbd "C-c C-c") 'git-rebase-server-edit)
+    (define-key map (kbd "a")       'git-rebase-abort)
+    (define-key map (kbd "C-c C-k") 'git-rebase-abort)
+    (define-key map [remap undo]    'git-rebase-undo)
+    (define-key map (kbd "RET") 'git-rebase-show-commit)
+    (define-key map (kbd "x")   'git-rebase-exec)
+    (define-key map (kbd "c")   'git-rebase-pick)
+    (define-key map (kbd "r")   'git-rebase-reword)
+    (define-key map (kbd "e")   'git-rebase-edit)
+    (define-key map (kbd "s")   'git-rebase-squash)
+    (define-key map (kbd "f")   'git-rebase-fixup)
+    (define-key map (kbd "k")   'git-rebase-kill-line)
+    (define-key map (kbd "C-k") 'git-rebase-kill-line)
+    (define-key map (kbd "p")   'git-rebase-backward-line)
+    (define-key map (kbd "n")   'forward-line)
+    (define-key map (kbd "M-p") 'git-rebase-move-line-up)
+    (define-key map (kbd "M-n") 'git-rebase-move-line-down)
+    (define-key map (kbd "M-<up>") 'git-rebase-move-line-up)
+    (define-key map (kbd "M-<down>") 'git-rebase-move-line-down)
+    map)
+  "Keymap for Git-Rebase mode.")
+
+(easy-menu-define git-rebase-mode-menu git-rebase-mode-map
+  "Git-Rebase mode menu"
+  '("Rebase"
+    ["Pick" git-rebase-pick t]
+    ["Reword" git-rebase-reword t]
+    ["Edit" git-rebase-edit t]
+    ["Squash" git-rebase-squash t]
+    ["Fixup" git-rebase-fixup t]
+    ["Kill" git-rebase-kill-line t]
+    ["Move Down" git-rebase-move-line-down t]
+    ["Move Up" git-rebase-move-line-up t]
+    ["Execute" git-rebase-exec t]
+    "---"
+    ["Abort" git-rebase-abort t]
+    ["Done" git-rebase-server-edit t]))
+
+;;; Utilities
+
+(defun git-rebase-edit-line (change-to)
+  (when (git-rebase-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)
+      (when git-rebase-auto-advance
+        (forward-line)))))
+
+(defmacro git-rebase-define-action (sym)
+  (declare (indent defun))
+  (let ((fn (intern (format "git-rebase-%s" sym))))
+    `(progn
+       (defun ,fn ()
+	 (interactive)
+	 (git-rebase-edit-line ,(symbol-name sym)))
+       (put ',fn 'definition-name ',sym))))
+
+(defun git-rebase-looking-at-action ()
+  "Return non-nil if looking at an action line."
+  (save-excursion
+    (goto-char (point-at-bol))
+    (looking-at git-rebase-action-line-re)))
+
+(defun git-rebase-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 git-rebase-action-line-re)
+        (looking-at git-rebase-exec-line-re))))
+
+(defun git-rebase-looking-at-exec ()
+  "Return non-nil if cursor is on an exec line."
+  (string-match git-rebase-exec-line-re (thing-at-point 'line)))
+
+(defun git-rebase-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 git-rebase-exec-line-re line))))
+
+;;; Commands
+
+(git-rebase-define-action pick)
+(git-rebase-define-action reword)
+(git-rebase-define-action edit)
+(git-rebase-define-action squash)
+(git-rebase-define-action fixup)
+
+(defun git-rebase-move-line-up ()
+  "Move the current action line up."
+  (interactive)
+  (when (git-rebase-looking-at-action-or-exec)
+    (let ((buffer-read-only nil)
+          (col (current-column)))
+      (goto-char (point-at-bol))
+      (unless (bobp)
+        (transpose-lines 1)
+        (forward-line -2))
+      (move-to-column col))))
+
+(defun git-rebase-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 (git-rebase-looking-at-action-or-exec)
+             (save-excursion
+               (forward-line)
+               (git-rebase-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 git-rebase-server-edit ()
+  "Save the action buffer and end the session."
+  (interactive)
+  (save-buffer)
+  (server-edit))
+
+(defun git-rebase-abort ()
+  "Abort this rebase.
+This is dune 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))
+      (erase-buffer)
+      (save-buffer)
+      (server-edit))))
+
+(defun git-rebase-kill-line ()
+  "Kill the current action line."
+  (interactive)
+  (when (and (not (eq (char-after (point-at-bol)) ?#))
+             (git-rebase-looking-at-action-or-exec))
+    (beginning-of-line)
+    (let ((inhibit-read-only t))
+      (insert "#"))
+    (forward-line)))
+
+(defun git-rebase-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 (git-rebase-looking-at-exec))
+    (let ((new-line (git-rebase-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)))
+   ((git-rebase-looking-at-killed-exec)
+    (save-excursion
+      (beginning-of-line)
+      (let ((buffer-read-only nil))
+        (delete-char 1))))
+   (t
+    (let ((inhibit-read-only t)
+          (line (git-rebase-read-exec-line)))
+      (unless (equal "" line)
+        (move-end-of-line nil)
+        (newline)
+        (insert (concat "exec " line))))
+    (move-beginning-of-line nil))))
+
+(defun git-rebase-read-exec-line (&optional initial-line)
+  (read-shell-command "Execute: " initial-line))
+
+(defun git-rebase-undo (&optional arg)
+  "A thin wrapper around `undo', which allows undoing in read-only buffers."
+  (interactive "P")
+  (let ((inhibit-read-only t))
+    (undo arg)))
+
+(defun git-rebase-show-commit (&optional arg)
+  "Show the commit on the current line if any."
+  (interactive "P")
+  (save-excursion
+    (goto-char (point-at-bol))
+    (when (looking-at git-rebase-action-line-re)
+      (let ((commit (match-string 2)))
+        (if (fboundp 'magit-show-commit)
+            (let ((default-directory (expand-file-name "../../")))
+              (magit-show-commit commit))
+          (shell-command (concat "git show " commit)))))))
+
+(defun git-rebase-backward-line (&optional n)
+  "Move N lines backward (forward if N is negative).
+Like `forward-line' but go into the opposite direction."
+  (interactive "p")
+  (forward-line (* n -1)))
+
+;;; Mode
+
+;;;###autoload
+(define-derived-mode git-rebase-mode special-mode "Git 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 '(git-rebase-mode-font-lock-keywords t t))
+  (when git-rebase-remove-instructions
+    (let ((inhibit-read-only t))
+      (flush-lines "^\\($\\|#\\)"))))
+
+(defvar git-rebase-mode-font-lock-keywords
+  `((,git-rebase-action-line-re
+     (1 font-lock-keyword-face)
+     (2 'git-rebase-hash)
+     (3 'git-rebase-description))
+    (,git-rebase-exec-line-re 1 font-lock-keyword-face)
+    ("^#.*"                   0 font-lock-comment-face)
+    (,git-rebase-dead-line-re 0 'git-rebase-killed-action t))
+  "Font lock keywords for Git-Rebase mode.")
+
+(defun git-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 "git-rebase-" (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 'git-rebase-mode-hook 'git-rebase-mode-show-keybindings t)
+
+(defun git-rebase-mode-disable-before-save-hook ()
+  (set (make-local-variable 'before-save-hook) nil))
+
+(add-hook 'git-rebase-mode-hook 'git-rebase-mode-disable-before-save-hook)
+
+;;;###autoload
+(add-to-list 'auto-mode-alist
+             '("/git-rebase-todo\\'" . git-rebase-mode))
+
+(provide 'git-rebase-mode)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; git-rebase-mode.el ends here
diff --git a/elpa/git-rebase-mode-0.15.0/git-rebase-mode.elc b/elpa/git-rebase-mode-0.15.0/git-rebase-mode.elc
new file mode 100644
index 000000000..434a7c2e1
Binary files /dev/null and b/elpa/git-rebase-mode-0.15.0/git-rebase-mode.elc differ
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el b/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el
deleted file mode 100644
index b30b27926..000000000
--- a/elpa/highlight-indentation-0.5.0/highlight-indentation-autoloads.el
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; 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
deleted file mode 100644
index dec836ad9..000000000
--- a/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index 1491b2671..000000000
Binary files a/elpa/highlight-indentation-0.5.0/highlight-indentation-pkg.elc and /dev/null differ
diff --git a/elpa/highlight-indentation-0.5.0/highlight-indentation.el b/elpa/highlight-indentation-0.5.0/highlight-indentation.el
deleted file mode 100644
index bc3d61016..000000000
--- a/elpa/highlight-indentation-0.5.0/highlight-indentation.el
+++ /dev/null
@@ -1,71 +0,0 @@
-;;; 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
deleted file mode 100644
index 1aaa80bd2..000000000
Binary files a/elpa/highlight-indentation-0.5.0/highlight-indentation.elc and /dev/null differ
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.el b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.el
deleted file mode 100644
index f699b608f..000000000
--- a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "idle-highlight-mode" "1.1.2" "highlight the word the point is on" (quote nil))
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
deleted file mode 100644
index 52cba8f67..000000000
Binary files a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-pkg.elc and /dev/null differ
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc b/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc
deleted file mode 100644
index 7ae0cd238..000000000
Binary files a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.elc and /dev/null differ
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-autoloads.el
similarity index 60%
rename from elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
rename to elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-autoloads.el
index 15c89e8e0..42028af58 100644
--- a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode-autoloads.el
+++ b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-autoloads.el
@@ -1,10 +1,10 @@
 ;;; idle-highlight-mode-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads (idle-highlight-mode) "idle-highlight-mode" "idle-highlight-mode.el"
-;;;;;;  (20166 22149))
+;;;### (autoloads nil "idle-highlight-mode" "idle-highlight-mode.el"
+;;;;;;  (21721 36933 0 0))
 ;;; Generated autoloads from idle-highlight-mode.el
 
 (autoload 'idle-highlight-mode "idle-highlight-mode" "\
@@ -14,16 +14,9 @@ Idle-Highlight Minor Mode
 
 ;;;***
 
-;;;### (autoloads nil nil ("idle-highlight-mode-pkg.el") (20166 22149
-;;;;;;  568029))
-
-;;;***
-
-(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.3/idle-highlight-mode-pkg.el b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-pkg.el
new file mode 100644
index 000000000..e55c4f7f7
--- /dev/null
+++ b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "idle-highlight-mode" "1.1.3" "highlight the word the point is on" 'nil :url "http://www.emacswiki.org/cgi-bin/wiki/IdleHighlight" :keywords '("convenience"))
diff --git a/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-pkg.elc b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-pkg.elc
new file mode 100644
index 000000000..7a63afb5b
Binary files /dev/null and b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode-pkg.elc differ
diff --git a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.el b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode.el
similarity index 73%
rename from elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.el
rename to elpa/idle-highlight-mode-1.1.3/idle-highlight-mode.el
index 9738834a4..d0a497ec1 100644
--- a/elpa/idle-highlight-mode-1.1.2/idle-highlight-mode.el
+++ b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode.el
@@ -4,7 +4,8 @@
 
 ;; Author: Phil Hagelberg, Cornelius Mika
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/IdleHighlight
-;; Version: 1.1.2
+;; Version: 1.1.3
+;; X-Original-Version: 1.1.3
 ;; Created: 2008-05-13
 ;; Keywords: convenience
 ;; EmacsWiki: IdleHighlight
@@ -44,7 +45,7 @@
 ;;   (make-local-variable 'column-number-mode)
 ;;   (column-number-mode t)
 ;;   (if window-system (hl-line-mode t))
-;;   (idle-highlight t))
+;;   (idle-highlight-mode t))
 ;;
 ;; (add-hook 'emacs-lisp-mode-hook 'my-coding-hook)
 ;; (add-hook 'ruby-mode-hook 'my-coding-hook)
@@ -64,6 +65,16 @@
  "Face used to highlight other occurrences of the word at point."
  :group 'idle-highlight)
 
+(defcustom idle-highlight-exceptions '("end")
+  "List of words to be excepted from highlighting."
+  :group 'idle-highlight
+  :type '(repeat string))
+
+(defcustom idle-highlight-idle-time 0.5
+  "Time after which to highlight the word at point."
+  :group 'idle-highlight
+  :type 'float)
+
 (defvar idle-highlight-regexp nil
  "Buffer-local regexp to be idle-highlighted.")
 
@@ -75,19 +86,18 @@
   (if idle-highlight-mode
       (let* ((target-symbol (symbol-at-point))
              (target (symbol-name target-symbol)))
-        (if (and target-symbol
-                 (not (in-string-p))
-                 (looking-at-p "\\s_\\|\\sw") ;; Symbol characters
-                 ;; TODO: no need to highlight keywords like if
-                 (not (equal target "end"))) 
-            (progn (idle-highlight-unhighlight)
-                   (setq idle-highlight-regexp (concat "\\<" (regexp-quote target) "\\>"))
-                   (highlight-regexp idle-highlight-regexp 'idle-highlight))
-          (idle-highlight-unhighlight)
-          (setq idle-highlight-regexp nil)))))
+        (idle-highlight-unhighlight)
+        (when (and target-symbol
+                   (not (in-string-p))
+                   (looking-at-p "\\s_\\|\\sw") ;; Symbol characters
+                   (not (member target idle-highlight-exceptions)))
+          (setq idle-highlight-regexp (concat "\\<" (regexp-quote target) "\\>"))
+          (highlight-regexp idle-highlight-regexp 'idle-highlight)))))
 
 (defsubst idle-highlight-unhighlight ()
-  (if idle-highlight-regexp (unhighlight-regexp idle-highlight-regexp)))
+  (when idle-highlight-regexp
+    (unhighlight-regexp idle-highlight-regexp)
+    (setq idle-highlight-regexp nil)))
 
 ;;;###autoload
 (define-minor-mode idle-highlight-mode
@@ -96,7 +106,8 @@
   (if idle-highlight-mode
       (progn (unless idle-highlight-global-timer
                (setq idle-highlight-global-timer
-                     (run-with-idle-timer 0.5 :repeat 'idle-highlight-word-at-point)))
+                     (run-with-idle-timer idle-highlight-idle-time
+                                          :repeat 'idle-highlight-word-at-point)))
              (set (make-local-variable 'idle-highlight-regexp) nil))
     (idle-highlight-unhighlight)))
 
diff --git a/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode.elc b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode.elc
new file mode 100644
index 000000000..eda19cda4
Binary files /dev/null and b/elpa/idle-highlight-mode-1.1.3/idle-highlight-mode.elc differ
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el
deleted file mode 100644
index acc3c2798..000000000
--- a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-autoloads.el
+++ /dev/null
@@ -1,70 +0,0 @@
-;;; 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
deleted file mode 100644
index 6575d4ca0..000000000
--- a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "ido-ubiquitous" "0.7" "Use ido (nearly) everywhere." (quote nil))
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el b/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el
deleted file mode 100644
index 679cc447d..000000000
--- a/elpa/ido-ubiquitous-0.7/ido-ubiquitous.el
+++ /dev/null
@@ -1,199 +0,0 @@
-
-;;; 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
deleted file mode 100644
index b695c899b..000000000
Binary files a/elpa/ido-ubiquitous-0.7/ido-ubiquitous.elc and /dev/null differ
diff --git a/elpa/ido-ubiquitous-2.17/ido-ubiquitous-autoloads.el b/elpa/ido-ubiquitous-2.17/ido-ubiquitous-autoloads.el
new file mode 100644
index 000000000..0439e0ad2
--- /dev/null
+++ b/elpa/ido-ubiquitous-2.17/ido-ubiquitous-autoloads.el
@@ -0,0 +1,42 @@
+;;; ido-ubiquitous-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "ido-ubiquitous" "ido-ubiquitous.el" (21721
+;;;;;;  36931 0 0))
+;;; Generated autoloads from ido-ubiquitous.el
+
+(define-obsolete-variable-alias 'ido-ubiquitous 'ido-ubiquitous-mode "0.8")
+
+(define-obsolete-function-alias 'ido-ubiquitous 'ido-ubiquitous-mode "0.8")
+
+(defvar ido-ubiquitous-mode nil "\
+Non-nil if Ido-Ubiquitous mode is enabled.
+See the command `ido-ubiquitous-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 `ido-ubiquitous-mode'.")
+
+(custom-autoload 'ido-ubiquitous-mode "ido-ubiquitous" nil)
+
+(autoload 'ido-ubiquitous-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 customize
+  when ido completion is or is not used by customizing
+  `ido-ubiquitous-command-overrides' or
+  `ido-ubiquitous-function-overrides'.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; ido-ubiquitous-autoloads.el ends here
diff --git a/elpa/ido-ubiquitous-2.17/ido-ubiquitous-pkg.el b/elpa/ido-ubiquitous-2.17/ido-ubiquitous-pkg.el
new file mode 100644
index 000000000..d6dc0d1fa
--- /dev/null
+++ b/elpa/ido-ubiquitous-2.17/ido-ubiquitous-pkg.el
@@ -0,0 +1 @@
+(define-package "ido-ubiquitous" "2.17" "Use ido (nearly) everywhere." '((emacs "24.1")) :url "https://github.com/DarwinAwardWinner/ido-ubiquitous" :keywords '("convenience" "completion" "ido"))
diff --git a/elpa/ido-ubiquitous-2.17/ido-ubiquitous-pkg.elc b/elpa/ido-ubiquitous-2.17/ido-ubiquitous-pkg.elc
new file mode 100644
index 000000000..e1c6d60a9
Binary files /dev/null and b/elpa/ido-ubiquitous-2.17/ido-ubiquitous-pkg.elc differ
diff --git a/elpa/ido-ubiquitous-2.17/ido-ubiquitous.el b/elpa/ido-ubiquitous-2.17/ido-ubiquitous.el
new file mode 100644
index 000000000..f851ef2e2
--- /dev/null
+++ b/elpa/ido-ubiquitous-2.17/ido-ubiquitous.el
@@ -0,0 +1,926 @@
+;; -*- lexical-binding: t -*-
+
+;;; ido-ubiquitous.el --- Use ido (nearly) everywhere.
+
+;; Author: Ryan C. Thompson
+;; URL: https://github.com/DarwinAwardWinner/ido-ubiquitous
+;; Version: 2.17
+;; X-Original-Version: 2.16
+;; Created: 2011-09-01
+;; Keywords: convenience, completion, ido
+;; EmacsWiki: InteractivelyDoThings
+;; Package-Requires: ((emacs "24.1"))
+
+;; This file is NOT part of GNU Emacs.
+
+;;; Commentary:
+
+;; If you use the excellent `ido-mode' for efficient completion of
+;; file names and buffers, you might wonder if you can get ido-style
+;; completion everywhere else too. Well, that's what this package
+;; does! ido-ubiquitous is here to enable ido-style completion for
+;; (almost) every function that uses the standard completion function
+;; `completing-read'.
+
+;; To use this package, call `ido-ubiquitous-mode' to enable the mode,
+;; or use `M-x customize-variable ido-ubiquitous-mode' it to enable it
+;; permanently. Note that `ido-ubiquotous-mode' has no effect unless
+;; `ido-mode' is also enabled. Once the mode is enabled, most
+;; functions that use `completing-read' will now have ido completion.
+;; If you decide in the middle of a command that you would rather not
+;; use ido, just C-f or C-b at the end/beginning of the input to fall
+;; back to non-ido completion (this is the same shortcut as when using
+;; ido for buffers or files).
+
+;; Note that `completing-read' has some quirks and complex behavior
+;; that ido cannot emulate. Ido-ubiquitous attempts to detect some of
+;; these quirks and avoid using ido when it sees them. So some
+;; functions will not have ido completion even when this mode is
+;; enabled. Some other functions have ido disabled in them because
+;; their packages already provide support for ido via other means (for
+;; example, org-mode and magit). See `M-x customize-group
+;; ido-ubiquitous' and read about the override variables for more
+;; information.
+
+;;; 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:
+
+(defconst ido-ubiquitous-version "2.16"
+  "Currently running version of ido-ubiquitous.
+
+Note that when you update ido-ubiquitous, this variable may not
+be updated until you restart Emacs.")
+
+(eval-when-compile
+  (when (or (not (boundp 'completing-read-function))
+            (< emacs-major-version 24))
+    (error "Could not find required variable `completing-read-function'. Are you using Emacs version 24 or higher? If you have Emacs 23 or lower, please downgrade to ido-ubiquitous version 1.7.")))
+
+(require 'ido)
+(require 'advice)
+(require 'cl-lib)
+;; Only exists in emacs 24.4 and up; we use a workaround for earlier
+;; versions.
+(require 'nadvice nil 'noerror)
+
+;; Declare this ahead of time to quiet the compiler
+(defvar ido-ubiquitous-fallback-completing-read-function)
+
+;;; Internal utility functions
+
+(defun ido-ubiquitous--as-string (sym-or-str)
+  "Return name of symbol, return string as is."
+  (if (symbolp sym-or-str)
+      (symbol-name sym-or-str)
+    sym-or-str))
+
+(defun ido-ubiquitous--as-symbol (sym-or-str)
+  "Return name of symbol, return string as is."
+  (if (symbolp sym-or-str)
+      sym-or-str
+    (intern sym-or-str)))
+
+;;; Custom widget definitions
+
+;; We need to define some custom widget types for use in the override
+;; variables.
+
+(define-widget 'lazy-notag 'lazy
+  "Like lazy widget, but does not display its tag, only its value."
+  :format "%v")
+
+;; Define matcher functions and widgets for match specifications
+(defvar ido-ubiquitous-match-spec-widget-types nil
+  "List of widget names for match specs.")
+(defvar ido-ubiquitous-spec-matchers nil
+  "Alist of functions for matching function specs against function names.")
+(cl-loop for (widget-name widget-tag key field-type matcher) in
+         '((exact-match "Exact match" exact string string=)
+           (prefix-match "Prefix match" prefix string string-prefix-p)
+           (regexp-match "Regexp match" regexp regexp string-match-p))
+         do (define-widget (ido-ubiquitous--as-symbol widget-name) 'lazy-notag widget-tag
+              :menu-tag widget-tag
+              :type `(list :tag ,widget-tag :format "%v"
+                           (const :format ""
+                                  :tag ,widget-tag
+                                  ,key)
+                           (,field-type :tag ,widget-tag)))
+         do (add-to-list 'ido-ubiquitous-match-spec-widget-types
+                         widget-name 'append)
+         do (add-to-list 'ido-ubiquitous-spec-matchers
+                         (cons key matcher) 'append))
+
+(define-widget 'ido-ubiquitous-match-spec 'lazy-notag
+  "Choice of exact, prefix, or regexp match."
+  :type `(choice :tag "Match type"
+                 ,@ido-ubiquitous-match-spec-widget-types))
+
+(define-widget 'ido-ubiquitous-command-override-spec 'lazy-notag
+  "Choice of override action plus match specification."
+  :type '(cons :tag "Override rule"
+               (choice :tag "For matching commands"
+                       (const :menu-tag "Disable"
+                              :tag "Disable ido-ubiquitous"
+                              disable)
+                       (const :menu-tag "Enable"
+                              :tag "Enable ido-ubiquitous in normal default mode"
+                              enable)
+                       (const :menu-tag "Enable old-style default"
+                              :tag "Enable ido-ubiquitous in old-style default mode"
+                              enable-old))
+               ido-ubiquitous-match-spec))
+
+(define-widget 'ido-ubiquitous-function-override-spec 'lazy-notag
+  "Choice of override action and function name. (Exact match only.)"
+  :type '(list :tag "Override rule"
+               (choice :tag "Do the following"
+                       (const :menu-tag "Disable"
+                              :tag "Disable ido-ubiquitous"
+                              disable)
+                       (const :menu-tag "Enable"
+                              :tag "Enable ido-ubiquitous in normal default mode"
+                              enable)
+                       (const :menu-tag "Enable old-style default"
+                              :tag "Enable ido-ubiquitous in old-style default mode"
+                              enable-old))
+               (const :format "" exact)
+               (string :tag "For function")))
+
+;;; Custom Declarations
+
+(defgroup ido-ubiquitous nil
+  "Use ido for (almost) all completion."
+  :group 'ido)
+
+;;;###autoload
+(define-obsolete-variable-alias 'ido-ubiquitous
+  'ido-ubiquitous-mode "0.8")
+;;;###autoload
+(define-obsolete-function-alias 'ido-ubiquitous
+  'ido-ubiquitous-mode "0.8")
+
+;;;###autoload
+(define-minor-mode ido-ubiquitous-mode
+  "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 customize
+  when ido completion is or is not used by customizing
+  `ido-ubiquitous-command-overrides' or
+  `ido-ubiquitous-function-overrides'."
+
+  nil
+  :global t
+  :group 'ido-ubiquitous
+  ;; Handle warning about ido disabled
+  (when ido-ubiquitous-mode
+    (ido-ubiquitous-warn-about-ido-disabled))
+  ;; Ensure emacs 23 code disabled (in case user upgraded in this session)
+  (ignore-errors
+    (ad-disable-advice 'completing-read 'around 'ido-ubiquitous-legacy)
+    (ad-activate 'completing-read))
+  ;; Actually enable/disable the mode
+  (setq completing-read-function
+        (if ido-ubiquitous-mode
+            'completing-read-ido
+          (or ido-ubiquitous-fallback-completing-read-function
+              'completing-read-default))))
+
+(defcustom ido-ubiquitous-max-items 30000
+  "Max collection size to use ido-ubiquitous on.
+
+If `ido-ubiquitous-mode' is active and `completing-read' is
+called on a COLLECTION with greater than this number of items in
+it, the fallback completion method will be used instead. To
+disable fallback based on collection size, set this to nil."
+  :type '(choice (const :tag "No limit" nil)
+                 (integer
+                  :tag "Limit" :value 5000
+                  :validate
+                  (lambda (widget)
+                    (let ((v (widget-value widget)))
+                      (if (and (integerp v)
+                               (> v 0))
+                          nil
+                        (widget-put widget :error "This field should contain a positive integer")
+                        widget)))))
+  :group 'ido-ubiquitous)
+
+(defcustom ido-ubiquitous-fallback-completing-read-function
+  ;; Initialize to the current value of `completing-read-function',
+  ;; unless that is already set to the ido completer, in which case
+  ;; use `completing-read-default'.
+  (if (eq completing-read-function 'completing-read-ido)
+      'completing-read-default
+    completing-read-function)
+  "Alternate completing-read function to use when ido is not wanted.
+
+This will be used for functions that are incompatibile with ido
+or if ido cannot handle the completion arguments.
+
+If you turn off ido-ubiquitous mode, `completing-read-function'
+will be set back to this."
+  :type '(choice (const :tag "Standard emacs completion"
+                        completing-read-default)
+                 (function :tag "Other function"))
+  :group 'ido-ubiquitous)
+
+(define-obsolete-variable-alias
+  'ido-ubiquitous-enable-compatibility-globally
+  'ido-ubiquitous-enable-old-style-default
+  "2.0")
+
+(defcustom ido-ubiquitous-enable-old-style-default t
+  "Allow ido to emulate a quirk of `completing-read'.
+
+From the `completing-read' docstring:
+
+> If the input is null, `completing-read' returns DEF, or the
+> first element of the list of default values, or an empty string
+> if DEF is nil, regardless of the value of REQUIRE-MATCH.
+
+If this variable is non-nil, then ido-ubiquitous will attempt to
+emulate this behavior. Specifically, if RET is pressed
+immediately upon entering completion, an empty string will be
+returned instead of the first element in the list. This behavior
+is only enabled when ido is being used as a substitute for
+`completing-read', and not when it is used directly.
+
+This odd behavior is required for compatibility with an old-style
+usage pattern whereby the default was requested by returning an
+empty string. In this mode, the caller receives the empty string
+and handles the default case manually, while `completing-read'
+never has any knowledge of the default. This is a problem for
+ido, which always returns the first element in the list when the
+input is empty. Without knowledge of the default, it cannot
+ensure that the default is first on the list, so returning the
+first item is not the correct behavior. Instead, it must return
+an empty string like `completing-read'.
+
+You can termporarily invert this behavior by prefixing \"RET\"
+with \"C-u\".
+
+If you want to enable old-style default selection selectively for
+specific commands or functions, set appropriate overrides in
+`ido-ubiquitous-command-overrides' or
+`ido-ubiquitous-function-overrides'."
+  :type 'boolean
+  :group 'ido-ubiquitous)
+
+(defconst ido-ubiquitous-default-command-overrides
+  '(;; If you want ido for M-x, install smex
+    (disable exact "execute-extended-command")
+    ;; Wanderlust uses new-style default
+    (enable prefix "wl-")
+    ;; Info functions use old-style default selection
+    (enable-old prefix "Info-")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/4
+    (enable exact "webjump")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/28
+    (enable regexp "\\`\\(find\\|load\\|locate\\)-library\\'")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/37
+    ;; Org and Magit already support ido natively
+    (disable prefix "org-")
+    (disable prefix "magit-")
+    ;; https://github.com/bbatsov/prelude/issues/488
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/44
+    ;; tmm implements its own non-standard completion mechanics
+    (disable prefix "tmm-")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/47
+    ;; theme functions don't need old-style compatibility
+    (enable regexp "\\`\\(load\\|enable\\|disable\\|describe\\|custom-theme-visit\\)-theme\\'")
+    )
+  "Default value of `ido-ubiquitous-command-overrides'.
+
+You can restore these using the command `ido-ubiquitous-restore-default-overrides'.")
+
+(defconst ido-ubiquitous-default-function-overrides
+  '((disable exact "read-file-name")
+    (disable exact "read-file-name-internal")
+    (disable exact "read-buffer")
+    (disable exact "gnus-emacs-completing-read")
+    (disable exact "gnus-iswitchb-completing-read")
+    (disable exact "grep-read-files")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/36
+    (enable exact "bookmark-completing-read")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/4
+    (enable-old exact "webjump-read-choice")
+    (enable-old exact "webjump-read-url-choice")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/9
+    (disable exact "isearchp-read-unicode-char")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/37
+    (disable exact "org-completing-read")
+    (disable exact "org-completing-read-no-i")
+    (disable exact "org-iswitchb-completing-read")
+    (disable exact "org-icompleting-read")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/38
+    (enable exact "read-char-by-name")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/39
+    (disable exact "Info-read-node-name")
+    ;; https://github.com/purcell/emacs.d/issues/182#issuecomment-44212927
+    (disable exact "tmm-menubar")
+    ;; https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/58
+    ;; https://github.com/mooz/js2-mode/issues/181
+    (enable exact "imenu--completion-buffer"))
+  "Default value of `ido-ubiquitous-function-overrides'.
+
+You can restore these using the command `ido-ubiquitous-restore-default-overrides'.")
+
+(defcustom ido-ubiquitous-command-overrides ido-ubiquitous-default-command-overrides
+  "List of command override specifications for ido-ubiquitous
+
+Each override specification describes how ido-ubiquitous should
+behave one or many commands. A specification has the
+form `(BEHAVIOR MATCH-TYPE MATCH-TEXT)'. BEHAVIOR is one of the
+following:
+
+  * `disable': ido-ubiquitous should not be used at all for the
+    specified commands;
+  * `enable': ido-ubiquitous may be used with the specified
+    commands, without emulating the old-style default selection
+    of `completing-read';
+  * `enable-old': ido-ubiquitous may be used with the specified
+    commands, and should emulate the old-style default selection
+    of `completing-read'.
+
+MATCH-TYPE affects how MATCH-TEXT is interpreted, as follows:
+
+  * `exact': the specification only affects the one command
+    whose name is MATCH-TEXT;
+  * `prefix': the specification affects any command whose name
+    starts with MATCH-TEXT (This is useful for specifying a
+    certain behavior for an entire package);
+  * `regexp': the specification affects any command whose name
+    matches MATCH-TEXT (with MATCH-TEXT being interpreted as a
+    regular expression)
+
+MATCH-TEXT should be a string.
+
+Since this variable's has a somewhat complex structure, it is
+recommended that you set this variable through Customize.
+
+Note that this variable only affects *commands*, which are
+functions marked as interactive. See
+`ido-ubiquitous-function-overrides' for how to modify the
+behavior of ido-ubiquitous for arbitrary functions.
+
+If you need to add a new specification to this list, please also
+file a bug report at https://github.com/DarwinAwardWinner/ido-ubiquitous/issues"
+  :type '(repeat ido-ubiquitous-command-override-spec)
+  :group 'ido-ubiquitous)
+
+(defmacro ido-ubiquitous-with-override (override &rest body)
+  "Eval BODY with specicified OVERRIDE in place.
+
+The OVERRIDE argument is evaluated normally, so if it is a
+literal symbol, it must be quoted.
+
+See `ido-ubiquitous-command-overrides' for valid override types."
+  ;; Eval override
+  `(let ((ido-ubiquitous-next-override ,override))
+     ,@body))
+(put 'ido-ubiquitous-with-override 'lisp-indent-function
+     (get 'prog1 'lisp-indent-function))
+
+(defun ido-ubiquitous-apply-function-override (func override)
+  "Set the override property on FUNC to OVERRIDE and set up advice to apply the override."
+  (setq func (ido-ubiquitous--as-symbol func)
+        override (ido-ubiquitous--as-symbol override))
+  (put func 'ido-ubiquitous-override override)
+  (when override
+    (let ((docstring
+           (format "Override ido-ubiquitous behavior in %s if its `ido-ubiquitous-override' property is non-nil." func)))
+      (eval
+       `(defadvice ,func (around ido-ubiquitous-override activate)
+          ,docstring
+          (ido-ubiquitous-with-override
+           (get ',func 'ido-ubiquitous-override)
+           ad-do-it))))))
+
+(defun ido-ubiquitous-set-function-overrides (sym newval)
+  "Custom setter function for `ido-ubiquitous-function-overrides'.
+
+In addition to setting the variable, this also sets up advice on
+each function to apply the appropriate override."
+  ;; Unset all previous overrides
+  (when (boundp sym)
+    (let ((oldval (eval sym)))
+      (cl-loop for (_action _match-type func) in oldval
+               do (ido-ubiquitous-apply-function-override func nil))))
+  ;; Ensure that function names are strings, not symbols
+  (setq newval
+        (cl-loop for (action match-type func) in newval
+                 collect (list action match-type
+                               (ido-ubiquitous--as-string func))))
+  (set-default sym newval)
+  ;; set new overrides
+  (cl-loop for (action _match-type func) in (eval sym)
+           do (ido-ubiquitous-apply-function-override func action)))
+
+(defcustom ido-ubiquitous-function-overrides ido-ubiquitous-default-function-overrides
+  "List of function override specifications for ido-ubiquitous
+
+Function override specifications have a similar structure to
+command override specifications (see
+`ido-ubiquitous-command-overrides'). A function override
+specification has the form `(BEHAVIOR MATCH-TYPE MATCH-TEXT)'.
+However, `MATCH-TYPE' may ONLY be `exact'; No other match type is
+supported.
+
+If you need to add a new specification to this list, please also file a
+bug report at https://github.com/DarwinAwardWinner/ido-ubiquitous/issues
+
+Setting this variable directly has no effect. You must set it
+through Customize."
+  :type '(repeat ido-ubiquitous-function-override-spec)
+  :set 'ido-ubiquitous-set-function-overrides
+  :group 'ido-ubiquitous)
+
+(defcustom ido-ubiquitous-allow-on-functional-collection nil
+  "Allow ido completion when COLLECTION is a function.
+
+The `completing-read' function allows its COLLECTION argument to
+be a function instead of a list of choices. Some such functions
+simply return a list of completions and are suitable for use with
+ido, but others implement more complex behavior and will result
+in incorrect behavior if used with ido. Since there is no way to
+tell the difference, this preference defaults to nil, which means
+that ido-ubiquitous will not work when COLLECTION is a function
+unless there is a specific override in effect. To disable this
+safeguard and guarantee breakage on some functions, you may set
+this to non-nil, but this is not recommended."
+  :type 'boolean
+  :group 'ido-ubiquitous)
+
+;;; ido-ubiquitous core
+
+(defvar ido-ubiquitous-next-call-replaces-completing-read nil
+  "If t, then the next call to `ido-completing-read' is by ido-ubiquitous.")
+(defvar ido-ubiquitous-this-call-replaces-completing-read nil
+  "If t, then the current call to `ido-completing-read' is by ido-ubiquitous.")
+(defvar ido-ubiquitous-next-override nil
+  "This holds the override to be applied on the next call to `completing-read'.")
+(defvar ido-ubiquitous-active-override nil
+  "This holds the override being applied to the current call to `completing-read'.")
+
+(defun ido-ubiquitous-completing-read (&rest args)
+  "Wrapper for `ido-completing-read' that enables ido-ubiquitous features.
+
+Unlike `ido-completing-read', this function can return with
+`ido-exit' set to `fallback', and any function that calls this
+should check the value of `ido-exit' and handle this case
+appropriately. For example, see `completing-read-ido'."
+  (let ((ido-ubiquitous-next-call-replaces-completing-read t))
+    (apply 'ido-completing-read args)))
+
+(defadvice ido-completing-read (around detect-replacing-cr activate)
+  "Enable workarounds if this call was done through ido-ubiquitous.
+
+This advice implements the logic required for
+`ido-completing-read' to handle a number of special cases that
+`completing-read' can handle. It only has an effect if
+`ido-completing-read' is called through
+`ido-ubiquitous-completing-read', so other packages that use
+`ido-completing-read', such as `smex', will not be affected."
+  (let* ((orig-args (ad-get-args 0))
+         (ido-ubiquitous-this-call-replaces-completing-read
+          ido-ubiquitous-next-call-replaces-completing-read)
+         (ido-ubiquitous-next-call-replaces-completing-read nil)
+         (error-during-setup nil))
+    (when ido-ubiquitous-this-call-replaces-completing-read
+      (condition-case nil
+          (progn
+            ;; ido doesn't natively handle DEF being a list. If DEF is
+            ;; a list, prepend it to CHOICES and set DEF to just the
+            ;; car of the default list.
+            (when (and def (listp def))
+              (setq choices
+                    (append def
+                            (nreverse (cl-set-difference choices def)))
+                    def (car def)))
+            ;; Work around a bug in ido when both INITIAL-INPUT and
+            ;; DEF are provided More info:
+            ;; https://github.com/technomancy/ido-ubiquitous/issues/18
+            (let ((initial (cond ((null initial-input) "")
+                                 ((stringp initial-input) initial-input)
+                                 ((consp initial-input) (car initial-input))
+                                 (t initial-input))))
+              (when (and def initial
+                         (stringp initial)
+                         (not (string= initial "")))
+                ;; Both default and initial input were provided. So
+                ;; keep the initial input and preprocess the choices
+                ;; list to put the default at the head, then proceed
+                ;; with default = nil.
+                (setq choices (cons def (remove def choices))
+                      def nil))))
+        (error
+         (progn
+           (warn "ido-ubiquitous: failed during setup. Falling back to standard completion")
+           (setq error-during-setup t)))))
+    ;; For ido-ubiquitous, only attempt ido completion if setup
+    ;; completed without error
+    (if (not error-during-setup)
+        ad-do-it
+      (setq ad-return-value
+            (apply ido-ubiquitous-fallback-completing-read-function
+                   orig-args)))))
+
+(defun completing-read-ido (prompt collection &optional predicate
+                                   require-match initial-input
+                                   hist def inherit-input-method)
+  "ido-based method for reading from the minibuffer with completion.
+
+See `completing-read' for the meaning of the arguments.
+
+This function is a wrapper for `ido-completing-read' designed to
+be used as the value of `completing-read-function'. Importantly,
+it detects edge cases that ido cannot handle and uses normal
+completion for them."
+  (let* (;; Save the original arguments in case we need to do the
+         ;; fallback
+         (orig-args
+          (list prompt collection predicate require-match
+                initial-input hist def inherit-input-method))
+         ;; Set the active override and clear the "next" one so it
+         ;; doesn't apply to nested calls.
+         (ido-ubiquitous-active-override ido-ubiquitous-next-override)
+         (ido-ubiquitous-next-override nil)
+         ;; Check for conditions that ido can't or shouldn't handle
+         (ido-allowed
+          (and ido-mode
+               ido-ubiquitous-mode
+               ;; Check for disable override
+               (not (eq ido-ubiquitous-active-override 'disable))
+               ;; Can't handle this arg
+               (not inherit-input-method)
+               ;; Can't handle this being set
+               (not (bound-and-true-p completion-extra-properties))))
+         ;; Check if ido can handle this collection. If collection is
+         ;; a function, require an override to be ok. Also,
+         ;; collection-ok should never be true when ido-allowed is
+         ;; false.
+         (collection-ok
+          (and ido-allowed
+               (or ido-ubiquitous-allow-on-functional-collection
+                   (not (functionp collection))
+                   (memq ido-ubiquitous-active-override '(enable enable-old)))))
+         ;; Pre-expand list of possible completions, but only if we
+         ;; have a chance of using ido. This is executed after the
+         ;; ido-allowed check to avoid unnecessary work if ido isn't
+         ;; going to used.
+         (_ignore ;; (Return value doesn't matter).
+          (when (and ido-allowed collection-ok)
+            (setq collection (all-completions "" collection predicate)
+                  ;; Don't need this any more
+                  predicate nil)))
+         (collection-ok
+          ;; Don't use ido if the collection is empty or too large.
+          (and collection-ok
+               collection
+               (or (null ido-ubiquitous-max-items)
+                   (<= (length collection) ido-ubiquitous-max-items))))
+         ;; Final check for everything
+         (ido-allowed (and ido-allowed collection-ok))
+         (result
+          (if ido-allowed
+              (ido-ubiquitous-completing-read
+               prompt collection
+               predicate require-match initial-input hist def
+               inherit-input-method)
+            (setq ido-exit 'fallback))))
+    ;; (message "Result: %S" result)
+    ;; (message "ido-exit: %S" ido-exit)
+    ;; Do the fallback if necessary. This could either be because ido
+    ;; can't handle the arguments, or the user indicated during
+    ;; completion that they wanted to fall back to non-ido completion.
+    (if (memq 'fallback (list ido-exit result))
+        (apply ido-ubiquitous-fallback-completing-read-function
+               orig-args)
+      result)))
+
+;; Fallback on magic C-f and C-b
+(defadvice ido-magic-forward-char (before ido-ubiquitous-fallback activate)
+  "Allow falling back in ido-ubiquitous."
+  (when ido-ubiquitous-this-call-replaces-completing-read
+    ;; `ido-context-switch-command' is already let-bound at this
+    ;; point.
+    (setq ido-context-switch-command #'ido-fallback-command)))
+
+(defadvice ido-magic-backward-char (before ido-ubiquitous-fallback activate)
+  "Allow falling back in ido-ubiquitous."
+  (when ido-ubiquitous-this-call-replaces-completing-read
+    ;; `ido-context-switch-command' is already let-bound at this
+    ;; point.
+    (setq ido-context-switch-command #'ido-fallback-command)))
+
+;;; Old-style default support
+
+(defvar ido-ubiquitous-initial-item nil
+  "The first item selected when ido starts.
+
+This is initialized to the first item in the list of completions
+when ido starts, and is cleared when any character is entered
+into the prompt or the list is cycled. If it is non-nil and still
+equal to the first item in the completion list when ido exits,
+then if `ido-ubiquitous-enable-old-style-default' is
+non-nil, ido returns an empty string instead of the first item on
+the list.")
+
+(defadvice ido-read-internal (before clear-initial-item activate)
+  (setq ido-ubiquitous-initial-item nil))
+
+(defadvice ido-make-choice-list (after set-initial-item activate)
+  (when (and ad-return-value (listp ad-return-value))
+    (setq ido-ubiquitous-initial-item (car ad-return-value))))
+
+(defadvice ido-next-match (after clear-initial-item activate)
+  (setq ido-ubiquitous-initial-item nil))
+
+(defadvice ido-prev-match (after clear-initial-item activate)
+  (setq ido-ubiquitous-initial-item nil))
+
+(defadvice ido-exit-minibuffer (around compatibility activate)
+  "Emulate a quirk of `completing-read'.
+
+> If the input is null, `completing-read' returns DEF, or the
+> first element of the list of default values, or an empty string
+> if DEF is nil, regardless of the value of REQUIRE-MATCH.
+
+See `ido-ubiquitous-enable-old-style-default', which
+controls whether this advice has any effect."
+  (condition-case nil
+      (let* ((enable-oldstyle
+              (and
+               ;; Completing a list, not a buffer or file
+               (eq ido-cur-item 'list)
+               ;; Only enable if we are replacing `completing-read'
+               ido-ubiquitous-this-call-replaces-completing-read
+               ;; Default is nil
+               (null ido-default-item)
+               ;; Input is empty
+               (string= ido-text "")
+               ;; Old-style default enabled
+               (if ido-ubiquitous-active-override
+                   (eq ido-ubiquitous-active-override 'enable-old)
+                 ido-ubiquitous-enable-old-style-default)
+               ;; First item on the list hasn't changed
+               (string= (car ido-cur-list)
+                        ido-ubiquitous-initial-item)))
+             ;; Prefix inverts oldstyle behavior
+             (should-invert current-prefix-arg)
+             (actually-enable-oldstyle
+              (if should-invert (not enable-oldstyle) enable-oldstyle)))
+        (if actually-enable-oldstyle
+            (ido-select-text)
+          ad-do-it))
+    (error ad-do-it))
+  (setq ido-ubiquitous-initial-item nil))
+
+;;; Overrides
+
+(defun ido-ubiquitous-restore-default-overrides (&optional save)
+  "Re-add the default overrides for ido-ubiquitous.
+
+This will ensure that the default overrides are all present and
+at the head of the list in `ido-ubiquitous-command-overrides' and
+`ido-ubiquitous-function-overrides'. User-added overrides will
+not be removed, but they may be masked if one of the default
+overrides affects the same functions.
+
+With a prefix arg, also save the above variables' new values for
+future sessions."
+  (interactive "P")
+  (let ((setter (if save
+                    'customize-save-variable
+                  'customize-set-variable)))
+    (cl-loop for (var def) in '((ido-ubiquitous-command-overrides
+                                 ido-ubiquitous-default-command-overrides)
+                                (ido-ubiquitous-function-overrides
+                                 ido-ubiquitous-default-function-overrides))
+             do (let* ((curval (eval var))
+                       (defval (eval def))
+                       (newval (delete-dups (append defval curval))))
+                  (funcall setter var newval)))
+    (message (if save
+                 "ido-ubiquitous: Restored default command and function overrides and saved for future sessions."
+               "ido-ubiquitous: Restored default command and function overrides for current session only. Call again with prefix to save for future sessions."))))
+
+(defun ido-ubiquitous-spec-match (spec symbol)
+  "Returns t if SPEC matches SYMBOL (which should be a function name).
+
+See `ido-ubiquitous-command-overrides'."
+  (when (and symbol (symbolp symbol))
+    (cl-destructuring-bind (type text) spec
+      (let ((matcher (cdr (assoc type ido-ubiquitous-spec-matchers)))
+            (text (ido-ubiquitous--as-string text))
+            (symname (ido-ubiquitous--as-string symbol)))
+        (when (null matcher)
+          (error "ido-ubiquitous: Unknown match spec type \"%s\". See `ido-ubiquitous-spec-matchers' for valid types." type))
+        (funcall matcher text symname)))))
+
+(defun ido-ubiquitous-get-command-override (cmd)
+  "Return the override associated with the command CMD.
+
+If there is no override set for CMD in
+`ido-ubiquitous-command-overrides', return nil."
+  (when (and cmd (symbolp cmd))
+    (cl-loop for (action . spec) in ido-ubiquitous-command-overrides
+             when (memq action '(disable enable enable-old nil))
+             when (ido-ubiquitous-spec-match spec cmd)
+             return action
+             finally return nil)))
+
+;;; Workaround for https://github.com/DarwinAwardWinner/ido-ubiquitous/issues/24
+
+;; When `call-interactively' is advised, `called-interactively-p'
+;; always returns nil. So we redefine it (and `interactive-p') to test
+;; the correct condition.
+
+(defsubst ido-ubiquitous--looks-like-advised-orig (func)
+  "Returns t if FUNC is a symbol starting with \"ad-Orig-\".
+
+Such symbols are used to store the original definitions of
+functions that have been advised by `defadvice' or similar."
+  (and (symbolp func)
+       (string-prefix-p "ad-Orig-" (symbol-name func))))
+
+(defsubst ido-ubiquitous--looks-like-call-interactively (func)
+  "Returns t if FUNC looks like the function `call-interactively'.
+
+FUNC \"looks like\" `call-interactively' if it is the literal
+symbol `call-interactively', or the value of `(symbol-function
+'call-interactively)', or a symbol whose `symbol-function' is the
+same as that of `call-interactively'.
+
+This function is used to determine whether a given function was
+\"called by\" `call-interactively' and therefore was called
+interactively."
+  (when func
+    (eq (symbol-function 'call-interactively)
+        (if (symbolp func)
+            (symbol-function func)
+          func))))
+
+(defun ido-ubiquitous--backtrace-from (fun)
+  "Return all backtrace frames, starting with the one for FUN.
+
+FUN may be a list of functions, in which case the first one found
+on the stack will be used."
+  (let ((stack
+         (cl-loop for i upfrom 0
+                  for frame = (backtrace-frame i)
+                  while frame
+                  collect frame))
+        (funcs (if (functionp fun)
+                   (list fun)
+                 fun)))
+    (while (and stack
+                (not (memq (cl-cadar stack) funcs)))
+      (setq stack (cdr stack)))
+    stack))
+
+(defun ido-ubiquitous--clean-advice-from-backtrace (stack)
+  "Takes a stack trace and cleans all evidence of advice.
+
+Specifically, for each call to a function starting with
+\"ad-Orig-\", that call and all prior calls up to but not
+including the advised function's original name are deleted from
+the stack."
+  (let ((skipping-until nil))
+    (cl-loop for frame in stack
+             for func = (cadr frame)
+             ;; Check if we found the frame we we're skipping to
+             if (and skipping-until
+                     (eq func skipping-until))
+             do (setq skipping-until nil)
+             ;; If we're looking at an the original form of an advised
+             ;; function, skip until the real name of that function.
+             if (and (not skipping-until)
+                     (ido-ubiquitous--looks-like-advised-orig func))
+             do (setq skipping-until
+                      (intern
+                       (substring (symbol-name func)
+                                  (eval-when-compile (length "ad-Orig-")))))
+             unless skipping-until collect frame)))
+
+(defsubst ido-ubiquitous--interactive-internal ()
+  "Eqivalent of the INTERACTIVE macro in the Emacs C source.
+
+This is an internal function that should never be called
+directly.
+
+See the C source for the logic behind this function."
+  (and (not executing-kbd-macro)
+       (not noninteractive)))
+
+(defun ido-ubiquitous--interactive-p-internal ()
+  "Equivalent of C function \"interactive_p\".
+
+This is an internal function that should never be called
+directly.
+
+See the C source for the logic behind this function."
+  (let ((stack
+         ;; We clean advice from the backtrace. This ensures that we
+         ;; get the right answer even if `call-interactively' has been
+         ;; advised.
+         (ido-ubiquitous--clean-advice-from-backtrace
+          (cdr
+           (ido-ubiquitous--backtrace-from
+            '(called-interactively-p interactive-p))))))
+    ;; See comments in the C function for the logic here.
+    (while (and stack
+                (or (eq (cl-cadar stack) 'bytecode)
+                    (null (caar stack))))
+      (setq stack (cdr stack)))
+    ;; Top of stack is now the function that we want to know
+    ;; about. Pop it, then check if the next function is
+    ;; `call-interactively', using a more permissive test than the default.
+    (ido-ubiquitous--looks-like-call-interactively (cl-cadadr stack))))
+
+(defadvice call-interactively (around ido-ubiquitous activate)
+  "Implements the behavior specified in `ido-ubiquitous-command-overrides'."
+  (ido-ubiquitous-with-override
+   (ido-ubiquitous-get-command-override (ad-get-arg 0))
+   ad-do-it))
+
+;; Work around `called-interactively-p' in Emacs 24.3 and earlier,
+;; which always returns nil when `call-interactively' is advised.
+(when (not (and (featurep 'nadvice)
+                (boundp 'called-interactively-p-functions)))
+
+  (defadvice interactive-p (around ido-ubiquitous activate)
+    "Return the correct result when `call-interactively' is advised.
+
+This advice completely overrides the original definition."
+    (condition-case nil
+        (setq ad-return-value
+              (and (ido-ubiquitous--interactive-internal)
+                   (ido-ubiquitous--interactive-p-internal)))
+      ;; In case of error in the advice, fall back to the default
+      ;; implementation
+      (error ad-do-it)))
+
+  (defadvice called-interactively-p (around ido-ubiquitous activate)
+    "Return the correct result when `call-interactively' is advised.
+
+This advice completely overrides the original definition."
+    (condition-case nil
+        (setq ad-return-value
+              (and (or (ido-ubiquitous--interactive-internal)
+                       (not (eq kind 'interactive)))
+                   (ido-ubiquitous--interactive-p-internal)))
+      ;; In case of error in the advice, fall back to the default
+      ;; implementation
+      (error ad-do-it))))
+
+;;; Other
+
+(defun ido-ubiquitous-warn-about-ido-disabled ()
+  "Warn if ido-ubiquitous is enabled without ido.
+
+Don't warn if emacs is still initializing, since ido-ubiquitous
+could be enabled first during init."
+  (when (and ido-ubiquitous-mode
+             after-init-time
+             (not (bound-and-true-p ido-mode)))
+    (warn "ido-ubiquitous-mode enabled without ido mode. ido-ubiquitous requires ido mode to be enabled.")))
+
+(defun ido-ubiquitous-initialize ()
+  "Do initial setup for ido-ubiquitous.
+
+This only needs to be called once when the file is first loaded."
+  ;; Clean up old versions of ido-ubiquitous that defined advice on
+  ;; `completing-read' instead of modifying
+  ;; `completing-read-function'.
+  (when (ad-find-advice 'completing-read 'around 'ido-ubiquitous)
+    (ad-remove-advice 'completing-read 'around 'ido-ubiquitous)
+    (ad-activate 'completing-read))
+  ;; Make sure the mode is turned on/off as specified by the value of
+  ;; the mode variable
+  (ido-ubiquitous-mode (if ido-ubiquitous-mode 1 0)))
+(ido-ubiquitous-initialize)
+
+(provide 'ido-ubiquitous)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; ido-ubiquitous.el ends here
diff --git a/elpa/ido-ubiquitous-2.17/ido-ubiquitous.elc b/elpa/ido-ubiquitous-2.17/ido-ubiquitous.elc
new file mode 100644
index 000000000..72107d503
Binary files /dev/null and b/elpa/ido-ubiquitous-2.17/ido-ubiquitous.elc differ
diff --git a/elpa/inf-ruby-2.4.0/inf-ruby-autoloads.el b/elpa/inf-ruby-2.4.0/inf-ruby-autoloads.el
new file mode 100644
index 000000000..02b4e65e6
--- /dev/null
+++ b/elpa/inf-ruby-2.4.0/inf-ruby-autoloads.el
@@ -0,0 +1,92 @@
+;;; inf-ruby-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "inf-ruby" "inf-ruby.el" (21721 36888 0 0))
+;;; Generated autoloads from inf-ruby.el
+
+(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.")
+
+(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.
+
+The following commands are available:
+
+\\{inf-ruby-minor-mode-map}
+
+\(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 `*NAME*'.
+If there is a process already running in `*NAME*', switch to that buffer.
+
+NAME defaults to \"ruby\". COMMAND defaults to the default entry
+in `inf-ruby-implementations'.
+
+\(Type \\[describe-mode] in the process buffer for the 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" "\
+Run the appropriate Ruby console command.
+The command and and the directory to run it from are detected
+automatically.
+
+\(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)
+
+(autoload 'inf-ruby-file-contents-match "inf-ruby" "\
+
+
+\(fn FILE REGEXP &optional MATCH-GROUP)" nil nil)
+ (dolist (mode ruby-source-modes) (add-hook (intern (format "%s-hook" mode)) 'inf-ruby-minor-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; inf-ruby-autoloads.el ends here
diff --git a/elpa/inf-ruby-2.4.0/inf-ruby-pkg.el b/elpa/inf-ruby-2.4.0/inf-ruby-pkg.el
new file mode 100644
index 000000000..ff2d336fb
--- /dev/null
+++ b/elpa/inf-ruby-2.4.0/inf-ruby-pkg.el
@@ -0,0 +1 @@
+(define-package "inf-ruby" "2.4.0" "Run a Ruby process in a buffer" 'nil :url "http://github.com/nonsequitur/inf-ruby" :keywords '("languages" "ruby"))
diff --git a/elpa/inf-ruby-2.4.0/inf-ruby-pkg.elc b/elpa/inf-ruby-2.4.0/inf-ruby-pkg.elc
new file mode 100644
index 000000000..b136f3873
Binary files /dev/null and b/elpa/inf-ruby-2.4.0/inf-ruby-pkg.elc differ
diff --git a/elpa/inf-ruby-2.4.0/inf-ruby.el b/elpa/inf-ruby-2.4.0/inf-ruby.el
new file mode 100644
index 000000000..fdf31c4e1
--- /dev/null
+++ b/elpa/inf-ruby-2.4.0/inf-ruby.el
@@ -0,0 +1,705 @@
+;;; 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.4.0
+;; X-Original-Version: 2.4.0
+
+;; 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:
+;;
+;; inf-ruby provides a REPL buffer connected to a Ruby 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)
+;;    (add-hook 'ruby-mode-hook 'inf-ruby-minor-mode)
+;;
+;; Or, for enh-ruby-mode:
+;;
+;;    (add-hook 'enh-ruby-mode-hook 'inf-ruby-minor-mode)
+;;
+;; Installation via ELPA interface does the above for you
+;; automatically.
+;;
+;; Additionally, consider adding
+;;
+;;    (add-hook 'after-init-hook 'inf-ruby-switch-setup)
+;;
+;; to your init file to easily switch from common Ruby compilation
+;; modes to interact with a debugger.
+;;
+;; To call `inf-ruby-console-auto' more easily, you can, for example,
+;; replace the original `inf-ruby' binding:
+;;
+;;   (eval-after-load 'inf-ruby
+;;     '(define-key inf-ruby-minor-mode-map
+;;        (kbd "C-c C-s") 'inf-ruby-console-auto))
+
+;;; Code:
+
+(require 'comint)
+(require 'compile)
+(require 'ruby-mode)
+(require 'thingatpt)
+
+(eval-when-compile
+  (defvar rspec-compilation-mode-map)
+  (defvar ruby-compilation-mode-map))
+
+(defgroup inf-ruby nil
+  "Run Ruby process in a buffer"
+  :group 'languages)
+
+(defcustom inf-ruby-prompt-read-only t
+  "If non-nil, the prompt will be read-only.
+
+Also see the description of `ielm-prompt-read-only'."
+  :type 'boolean
+  :group 'inf-ruby)
+
+(defcustom inf-ruby-implementations
+  '(("ruby"     . "irb --prompt default --noreadline -r irb/completion")
+    ("jruby"    . "jruby -S irb --prompt default --noreadline -r irb/completion")
+    ("rubinius" . "rbx -r irb/completion")
+    ("yarv"     . "irb1.9 -r irb/completion")
+    ("macruby"  . "macirb -r irb/completion")
+    ("pry"      . "pry"))
+  "An alist of ruby implementations to irb executable names."
+  :type '(repeat (cons string string))
+  :group 'inf-ruby)
+
+(defcustom inf-ruby-default-implementation "ruby"
+  "Which Ruby implementation to use if none is specified."
+  :type `(choice ,@(mapcar (lambda (item) (list 'const (car item)))
+                           inf-ruby-implementations))
+  :group 'inf-ruby)
+
+(defconst inf-ruby-prompt-format
+  (concat
+   (mapconcat
+    #'identity
+    '("\\(^%s> *\\)"                      ; Simple
+      "\\(^(rdb:1) *\\)"                  ; Debugger
+      "\\(^(byebug) *\\)"                 ; byebug
+      "\\(^\\(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") 'completion-at-point)
+    (define-key map (kbd "C-x C-q") 'inf-ruby-maybe-switch-to-compilation)
+    (define-key map (kbd "C-c C-z") 'ruby-switch-to-last-ruby-buffer)
+    map)
+  "Mode map for `inf-ruby-mode'.")
+
+;;;###autoload
+(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)
+(make-variable-buffer-local 'inf-ruby-at-top-level-prompt-p)
+
+(defvar inf-ruby-last-prompt nil)
+(make-variable-buffer-local 'inf-ruby-last-prompt)
+
+(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'."
+  (warn "`inf-ruby-setup-keybindings' is deprecated, please don't use it anymore.")
+  (warn "If you're using `inf-ruby' from Git, please look up the new usage instructions."))
+
+(make-obsolete 'inf-ruby-setup-keybindings 'add-hook "2.3.1")
+
+(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.
+
+The following commands are available:
+
+\\{inf-ruby-minor-mode-map}"
+  :lighter "" :keymap inf-ruby-minor-mode-map)
+
+(defvar inf-ruby-buffer nil "Current Ruby process buffer.")
+
+(defun inf-ruby-mode ()
+  "Major mode for interacting with an inferior Ruby REPL process.
+
+A simple IRB process can be fired up with \\[inf-ruby].
+
+To launch a REPL with project-specific console instead, type
+\\[inf-ruby-console-auto].  It recognizes several
+project types, including Rails, gems and anything with `racksh'
+in their Gemfile.
+
+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:
+`RET' after the end of the process' output sends the text from the
+    end of process to point.
+`RET' before the end of the process' output copies the sexp ending at point
+    to the end of the process' output, and sends it.
+`DEL' converts tabs to spaces as it moves back.
+`TAB' completes the input at point. IRB, Pry and Bond completion is supported.
+`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.
+
+The following commands are available:
+
+\\{inf-ruby-mode-map}"
+  (interactive)
+  (let ((orig-mode-line-process mode-line-process))
+    (comint-mode)
+    (when orig-mode-line-process
+      (setq mode-line-process orig-mode-line-process)))
+  (setq comint-prompt-regexp inf-ruby-prompt-pattern)
+  (ruby-mode-variables)
+  (setq major-mode 'inf-ruby-mode)
+  (setq mode-name "Inf-Ruby")
+  (use-local-map inf-ruby-mode-map)
+  (add-hook 'comint-output-filter-functions 'inf-ruby-output-filter nil t)
+  (setq comint-get-old-input 'inf-ruby-get-old-input)
+  (set (make-local-variable 'compilation-error-regexp-alist)
+       inf-ruby-error-regexp-alist)
+  (set (make-local-variable 'comint-prompt-read-only) inf-ruby-prompt-read-only)
+  (when (eq system-type 'windows-nt)
+    (setq comint-process-echoes t))
+  (add-hook 'completion-at-point-functions 'inf-ruby-completion-at-point nil 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-last-prompt (car (last (split-string output "\n")))
+          inf-ruby-at-top-level-prompt-p
+          (string-match inf-ruby-first-prompt-pattern
+                        inf-ruby-last-prompt))))
+
+;; 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 `*NAME*'.
+If there is a process already running in `*NAME*', switch to that buffer.
+
+NAME defaults to \"ruby\". COMMAND defaults to the default entry
+in `inf-ruby-implementations'.
+
+\(Type \\[describe-mode] in the process buffer for the 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))
+            (buffer (current-buffer))
+            (process-environment process-environment))
+        ;; http://debbugs.gnu.org/15775
+        (setenv "PAGER" (executable-find "cat"))
+        (set-buffer (apply 'make-comint name (car commandlist)
+                           nil (cdr commandlist)))
+        (inf-ruby-mode)
+        (ruby-remember-ruby-buffer buffer)))
+  (pop-to-buffer (setq inf-ruby-buffer (format "*%s*" name))))
+
+(defun inf-ruby-proc ()
+  "Return the current inferior Ruby 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
+  (concat "(IRB.conf[:MAIN_CONTEXT] && IRB.conf[:MAIN_CONTEXT].workspace.binding) || "
+          "(defined?(Pry) && Pry.toplevel_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))))
+
+(defvar ruby-last-ruby-buffer nil
+  "The last buffer we switched to `inf-ruby' from.")
+
+(defun ruby-remember-ruby-buffer (buffer)
+  (setq ruby-last-ruby-buffer buffer))
+
+(defun ruby-switch-to-inf (eob-p)
+  "Switch to the ruby process buffer.
+With argument, positions cursor at end of buffer."
+  (interactive "P")
+  (let ((buffer (current-buffer)))
+    (if (and inf-ruby-buffer (get-buffer inf-ruby-buffer))
+        (progn
+          (pop-to-buffer inf-ruby-buffer)
+          (ruby-remember-ruby-buffer buffer))
+      (error "No current process buffer, see variable inf-ruby-buffer")))
+  (cond (eob-p
+         (push-mark)
+         (goto-char (point-max)))))
+
+(defun ruby-switch-to-last-ruby-buffer ()
+  "Switch back to the last Ruby buffer."
+  (interactive)
+  (if (and ruby-last-ruby-buffer
+           (buffer-live-p ruby-last-ruby-buffer))
+      (pop-to-buffer ruby-last-ruby-buffer)
+    (message "Don't know the original Ruby buffer")))
+
+(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)
+  "Escape single quotes, double quotes and newlines in STR."
+  (replace-regexp-in-string "'" "\\\\'"
+    (replace-regexp-in-string "\n" "\\\\n"
+      (replace-regexp-in-string "\\\\" "\\\\\\\\" str))))
+
+(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 (move-beginning-of-line 1)
+                                                 (point))
+                                 (point)))
+         (comint-filt (process-filter proc))
+         (kept "") completions
+         ;; Guard against running completions in parallel:
+         inf-ruby-at-top-level-prompt-p)
+    (unless (equal "(rdb:1) " inf-ruby-last-prompt)
+      (set-process-filter proc (lambda (proc string) (setq kept (concat kept string))))
+      (unwind-protect
+          (let ((completion-snippet
+                 (format
+                  (concat
+                   "proc { |expr, line|"
+                   "  require 'ostruct';"
+                   "  old_wp = defined?(Bond) && Bond.started? && Bond.agent.weapon;"
+                   "  begin"
+                   "    Bond.agent.instance_variable_set('@weapon',"
+                   "      OpenStruct.new(line_buffer: line)) if old_wp;"
+                   "    if defined?(_pry_.complete) then"
+                   "      puts _pry_.complete(expr)"
+                   "    else"
+                   "      completer = if defined?(_pry_) then"
+                   "        Pry.config.completer.build_completion_proc(binding, _pry_)"
+                   "      elsif old_wp then"
+                   "        Bond.agent"
+                   "      elsif defined?(IRB::InputCompletor::CompletionProc) then"
+                   "        IRB::InputCompletor::CompletionProc"
+                   "      end and puts completer.call(expr).compact"
+                   "    end"
+                   "  ensure"
+                   "    Bond.agent.instance_variable_set('@weapon', old_wp) if old_wp "
+                   "  end "
+                   "}.call('%s', '%s')\n")
+                  (ruby-escape-single-quoted expr)
+                  (ruby-escape-single-quoted line))))
+            (process-send-string proc completion-snippet)
+            (while (and (not (string-match inf-ruby-prompt-pattern kept))
+                        (accept-process-output proc 2)))
+            (setq completions (butlast (split-string kept "\r?\n") 2))
+            ;; Subprocess echoes output on Windows and OS X.
+            (when (and completions (string= (concat (car completions) "\n") completion-snippet))
+              (setq completions (cdr 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 ()
+  "Return bounds of expression at point to complete."
+  (when (not (memq (char-syntax (following-char)) '(?w ?_)))
+    (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 ()
+  "Return expression at point to complete."
+  (let ((bounds (inf-ruby-completion-bounds-of-expr-at-point)))
+    (and bounds
+         (buffer-substring (car bounds) (cdr bounds)))))
+
+(defun inf-ruby-completion-at-point ()
+  "Retrieve the list of completions and prompt the user.
+Returns the selected completion or nil."
+  (let ((bounds (inf-ruby-completion-bounds-of-expr-at-point)))
+    (when bounds
+      (list (car bounds) (cdr bounds)
+            (when inf-ruby-at-top-level-prompt-p
+              (if (fboundp 'completion-table-with-cache)
+                  (completion-table-with-cache #'inf-ruby-completions)
+                (completion-table-dynamic #'inf-ruby-completions)))))))
+
+(defvar inf-ruby-orig-compilation-mode nil
+  "Original compilation mode before switching to `inf-ruby-mode'.")
+
+(defvar inf-ruby-orig-process-filter nil
+  "Original process filter before switching to `inf-ruby-mode'.")
+
+(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)
+  (let ((mode major-mode))
+    (inf-ruby-mode)
+    (make-local-variable 'inf-ruby-orig-compilation-mode)
+    (setq inf-ruby-orig-compilation-mode mode))
+  (let ((proc (get-buffer-process (current-buffer))))
+    (when proc
+      (make-local-variable 'inf-ruby-orig-process-filter)
+      (setq inf-ruby-orig-process-filter (process-filter proc))
+      (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)))))
+
+(defun inf-ruby-maybe-switch-to-compilation ()
+  "Switch to compilation mode this buffer was in before
+`inf-ruby-switch-from-compilation' was called, if it was.
+Otherwise, just toggle read-only status."
+  (interactive)
+  (if inf-ruby-orig-compilation-mode
+      (let ((orig-mode-line-process mode-line-process)
+            (proc (get-buffer-process (current-buffer)))
+            (filter inf-ruby-orig-process-filter))
+        (funcall inf-ruby-orig-compilation-mode)
+        (setq mode-line-process orig-mode-line-process)
+        (when proc
+          (set-process-filter proc filter)))
+    (toggle-read-only)))
+
+;;;###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)
+  "Find matching console command for DIR, if any."
+  (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 ()
+  "Run the appropriate Ruby console command.
+The command and and the directory to run it from are detected
+automatically."
+  (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 (file-name-as-directory dir))
+         (envs (inf-ruby-console-rails-envs))
+         (env (completing-read "Rails environment: " envs nil t
+                               nil nil (car (member "development" envs))))
+         (with-bundler (file-exists-p "Gemfile")))
+    (run-ruby (concat (when with-bundler "bundle exec ")
+                      "rails console "
+                      env)
+              "rails")))
+
+(defun inf-ruby-console-rails-envs ()
+  (let ((files (file-expand-wildcards "config/environments/*.rb")))
+    (if (null files)
+        (error "No files in %s" (expand-file-name "config/environments/"))
+      (mapcar #'file-name-base files))))
+
+;;;###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 (file-name-as-directory dir))
+         (gemspec (car (file-expand-wildcards "*.gemspec")))
+         (base-command
+          (if (file-exists-p "Gemfile")
+              (if (inf-ruby-file-contents-match gemspec "\\$LOAD_PATH")
+                  "bundle exec irb"
+                "bundle exec irb -I lib")
+            "irb -I lib"))
+         (name (inf-ruby-file-contents-match
+                gemspec "\\.name[ \t]*=[ \t]*\"\\([^\"]+\\)\"" 1))
+         args files)
+    (unless (file-exists-p "lib")
+      (error "The directory must contain a 'lib' subdirectory"))
+    (let ((feature (and name (replace-regexp-in-string "-" "/" name))))
+      (if (and feature (file-exists-p (concat "lib/" feature ".rb")))
+          ;; There exists the main file corresponding to the gem name,
+          ;; let's require it.
+          (setq args (concat " -r " feature))
+        ;; Let's require all non-directory files under lib, instead.
+        (dolist (item (directory-files "lib"))
+          (unless (file-directory-p (format "lib/%s" item))
+            (push item files)))
+        (setq args
+              (mapconcat
+               (lambda (file)
+                 (concat " -r " (file-name-sans-extension file)))
+               files
+               ""))))
+    (run-ruby (concat base-command args) "gem")))
+
+;;;###autoload
+(defun inf-ruby-console-default (dir)
+  "Run racksh, custom console.rb, or just IRB, in DIR."
+  (interactive "D")
+  (let ((default-directory (file-name-as-directory dir)))
+    (unless (file-exists-p "Gemfile")
+      (error "The directory must contain a Gemfile"))
+    (cond
+     ((inf-ruby-file-contents-match "Gemfile" "[\"']racksh[\"']")
+      (run-ruby "bundle exec racksh" "racksh"))
+     ((inf-ruby-file-contents-match "Gemfile" "[\"']pry[\"']")
+      (run-ruby "bundle exec pry" "pry"))
+     ((file-exists-p "console.rb")
+      (run-ruby "bundle exec ruby console.rb" "console.rb"))
+     (t
+      (run-ruby "bundle console")))))
+
+;;;###autoload
+(defun inf-ruby-file-contents-match (file regexp &optional match-group)
+  (with-temp-buffer
+    (insert-file-contents file)
+    (when (re-search-forward regexp nil t)
+      (if match-group
+          (match-string match-group)
+        t))))
+
+;;;###autoload (dolist (mode ruby-source-modes) (add-hook (intern (format "%s-hook" mode)) 'inf-ruby-minor-mode))
+
+(provide 'inf-ruby)
+;;; inf-ruby.el ends here
diff --git a/elpa/inf-ruby-2.4.0/inf-ruby.elc b/elpa/inf-ruby-2.4.0/inf-ruby.elc
new file mode 100644
index 000000000..c566529c7
Binary files /dev/null and b/elpa/inf-ruby-2.4.0/inf-ruby.elc differ
diff --git a/elpa/magit-1.0.0/50magit.el b/elpa/magit-1.0.0/50magit.el
deleted file mode 100644
index b04034db0..000000000
--- a/elpa/magit-1.0.0/50magit.el
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; Autoloads for magit
-
-(autoload 'magit-status "magit" nil t)
diff --git a/elpa/magit-1.0.0/Makefile b/elpa/magit-1.0.0/Makefile
deleted file mode 100644
index 274c5d952..000000000
--- a/elpa/magit-1.0.0/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 47bdf7043..000000000
--- a/elpa/magit-1.0.0/README.md
+++ /dev/null
@@ -1,76 +0,0 @@
-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
deleted file mode 100644
index f1a90aa7a..000000000
--- a/elpa/magit-1.0.0/magit-autoloads.el
+++ /dev/null
@@ -1,28 +0,0 @@
-;;; 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.0.0/magit-key-mode.el b/elpa/magit-1.0.0/magit-key-mode.el
deleted file mode 100644
index 21d523690..000000000
--- a/elpa/magit-1.0.0/magit-key-mode.el
+++ /dev/null
@@ -1,471 +0,0 @@
-(require 'assoc)
-
-(defvar magit-key-mode-key-maps '()
-  "This will be filled lazily with proper `define-key' built
-  keymaps as they're requested.")
-
-(defvar magit-key-mode-buf-name "*magit-key*"
-  "Name of the buffer.")
-
-(defvar magit-key-mode-current-args '()
-  "Will contain the arguments to be passed to git.")
-
-(defvar magit-key-mode-current-options '()
-  "Will contain the arguments to be passed to git.")
-
-(defvar magit-log-mode-window-conf nil
-  "Will hold the pre-menu configuration of magit.")
-
-(defvar magit-key-mode-groups
-  '((logging
-     (man-page "git-log")
-     (actions
-      ("l" "Short" magit-display-log)
-      ("L" "Long" magit-log-long)
-      ("h" "Reflog" magit-reflog)
-      ("rl" "Ranged short" magit-display-log-ranged)
-      ("rL" "Ranged long" magit-log-long-ranged)
-      ("rh" "Ranged reflog" magit-reflog-ranged))
-     (switches
-      ("-m" "Only merge commits" "--merges")
-      ("-f" "First parent" "--first-parent")
-      ("-i" "Case insensitive patterns" "-i")
-      ("-pr" "Pickaxe regex" "--pickaxe-regex")
-      ("-n" "Name only" "--name-only")
-      ("-am" "All match" "--all-match")
-      ("-al" "All" "--all"))
-     (arguments
-      ("=r" "Relative" "--relative=" read-directory-name)
-      ("=c" "Committer" "--committer=" read-from-minibuffer)
-      ("=>" "Since" "--since=" read-from-minibuffer)
-      ("=<" "Before" "--before=" read-from-minibuffer)
-      ("=s" "Pickaxe search" "-S" read-from-minibuffer)
-      ("=a" "Author" "--author=" read-from-minibuffer)
-      ("=g" "Grep" "--grep=" read-from-minibuffer)))
-
-    (running
-     (actions
-      ("!" "Command from root" magit-shell-command)
-      (":" "Git command" magit-git-command)
-      ("g" "git gui" magit-run-git-gui)
-      ("k" "gitk" magit-run-gitk)))
-
-    (fetching
-     (man-page "git-fetch")
-     (actions
-      ("f" "Current" magit-fetch-current)
-      ("a" "All" magit-remote-update)
-      ("o" "Other" magit-fetch)))
-
-    (pushing
-     (man-page "git-push")
-     (actions
-      ("P" "Push" magit-push)
-      ("t" "Push tags" magit-push-tags))
-     (switches
-      ("-f" "Force" "--force")
-      ("-d" "Dry run" "-n")))
-
-    (pulling
-     (man-page "git-pull")
-     (actions
-      ("F" "Pull" magit-pull))
-     (switches
-      ("-r" "Rebase" "--rebase")))
-
-    (branching
-     (man-page "git-branch")
-     (actions
-      ("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)))
-
-    (tagging
-     (man-page "git-tag")
-     (actions
-      ("t" "Lightweight" magit-tag)
-      ("a" "Annotated" magit-annotated-tag))
-     (switches
-      ("-f" "Force" "-f")))
-
-    (stashing
-     (man-page "git-stash")
-     (actions
-      ("z" "Save" magit-stash)
-      ("s" "Snapshot" magit-stash-snapshot))
-     (switches
-      ("-k" "Keep index" "--keep-index")))
-
-    (merging
-     (man-page "git-merge")
-     (actions
-      ("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)))
-
-    (rewriting
-     (actions
-      ("b" "Begin" magit-rewrite-start)
-      ("s" "Stop" magit-rewrite-stop)
-      ("a" "Abort" magit-rewrite-abort)
-      ("f" "Finish" magit-rewrite-finish)
-      ("*" "Set unused" magit-rewrite-set-unused)
-      ("." "Set used" magit-rewrite-set-used)))
-
-    (submodule
-     (man-page "git-submodule")
-     (actions
-      ("u" "Update" magit-submodule-update)
-      ("b" "Both update and init" magit-submodule-update-init)
-      ("i" "Init" magit-submodule-init)
-      ("s" "Sync" magit-submodule-sync))))
-  "Holds the key, help, function mapping for the log-mode. If you
-  modify this make sure you reset `magit-key-mode-key-maps' to
-  nil.")
-
-(defun magit-key-mode-delete-group (group)
-  "Delete a group from `magit-key-mode-key-maps'."
-  (let ((items (assoc group magit-key-mode-groups)))
-    (when items
-      ;; reset the cache
-      (setq magit-key-mode-key-maps nil)
-      ;; delete the whole group
-      (setq magit-key-mode-groups
-            (delq items magit-key-mode-groups))
-      ;; unbind the defun
-      (magit-key-mode-de-generate group))
-    magit-key-mode-groups))
-
-(defun magit-key-mode-add-group (group)
-  "Add a new group to `magit-key-mode-key-maps'. If there's
-already a group of that name then this will completely remove it
-and put in its place an empty one of the same name."
-  (when (assoc group magit-key-mode-groups)
-    (magit-key-mode-delete-group group))
-  (setq magit-key-mode-groups
-        (cons (list group '(actions)) magit-key-mode-groups)))
-
-(defun magit-key-mode-key-defined-p (for-group key)
-  "If KEY is defined as any of switch, argument or action within
-FOR-GROUP then return t"
-  (catch 'result
-    (let ((options (magit-key-mode-options-for-group for-group)))
-      (dolist (type '(actions switches arguments))
-        (when (assoc key (assoc type options))
-          (throw 'result t))))))
-
-(defun magit-key-mode-update-group (for-group thing &rest args)
-  "Abstraction for setting values in `magit-key-mode-key-maps'."
-  (let* ((options (magit-key-mode-options-for-group for-group))
-         (things (assoc thing options))
-         (key (car args)))
-    (if (cdr things)
-        (if (magit-key-mode-key-defined-p for-group key)
-            (error "%s is already defined in the %s group." key for-group)
-          (setcdr (cdr things) (cons args (cddr things))))
-      (setcdr things (list args)))
-    (setq magit-key-mode-key-maps nil)
-    things))
-
-(defun magit-key-mode-insert-argument (for-group key desc arg read-func)
-  "Add a new binding (KEY) in FOR-GROUP which will use READ-FUNC
-to receive input to apply to argument ARG git is run. DESC should
-be a brief description of the binding."
-  (magit-key-mode-update-group for-group 'arguments key desc arg read-func))
-
-(defun magit-key-mode-insert-switch (for-group key desc switch)
-  "Add a new binding (KEY) in FOR-GROUP which will add SWITCH to git's
-command line when it runs. DESC should be a brief description of
-the binding."
-  (magit-key-mode-update-group for-group 'switches key desc switch))
-
-(defun magit-key-mode-insert-action (for-group key desc func)
-  "Add a new binding (KEY) in FOR-GROUP which will run command
-FUNC. DESC should be a brief description of the binding."
-  (magit-key-mode-update-group for-group 'actions key desc func))
-
-(defun magit-key-mode-options-for-group (for-group)
-  "Retrieve the options (switches, commands and arguments) for
-the group FOR-GROUP."
-  (or (cdr (assoc for-group magit-key-mode-groups))
-      (error "Unknown group '%s'" for-group)))
-
-(defun magit-key-mode-help (for-group)
-  "Provide help for a key (which the user is prompted for) within
-FOR-GROUP."
-  (let* ((opts (magit-key-mode-options-for-group for-group))
-         (seq (read-key-sequence "Enter command prefix: "))
-         (actions (cdr (assoc 'actions opts))))
-    ;; 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."
-  (interactive)
-  (let* ((key (or (get-text-property (point) 'key-group-executor)
-                  (error "Nothing at point to do.")))
-         (def (lookup-key (current-local-map) key)))
-    (call-interactively def)))
-
-(defun magit-key-mode-build-keymap (for-group)
-  "Construct a normal looking keymap for the key mode to use and
-put it in magit-key-mode-key-maps for fast lookup."
-  (let* ((options (magit-key-mode-options-for-group for-group))
-         (actions (cdr (assoc 'actions options)))
-         (switches (cdr (assoc 'switches options)))
-         (arguments (cdr (assoc 'arguments options))))
-    (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)
-          (define-key map (car k) `(lambda ()
-                                     (interactive)
-                                     (magit-key-mode-command ',(nth 2 k))))))
-      (when switches
-        (dolist (k switches)
-          (define-key map (car k) `(lambda ()
-                                     (interactive)
-                                     (magit-key-mode-add-option
-                                      ',for-group
-                                      ,(nth 2 k))))))
-      (when arguments
-        (dolist (k arguments)
-          (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 '()))
-    ;; why can't maphash return a list?!
-    (maphash (lambda (k v)
-               (push (concat k (shell-quote-argument v)) args))
-             magit-key-mode-current-args)
-    (let ((magit-custom-options (append args magit-key-mode-current-options)))
-      (set-window-configuration magit-log-mode-window-conf)
-      (when func
-        (call-interactively func))
-      (magit-key-mode-kill-buffer))))
-
-(defvar magit-key-mode-current-args nil
-  "A hash-table of current argument set (which will eventually
-  make it to the git command-line).")
-
-(defun magit-key-mode-add-argument (for-group arg-name input-func)
-  (let ((input (funcall input-func (concat arg-name ": "))))
-    (puthash arg-name input magit-key-mode-current-args)
-   (magit-key-mode-redraw for-group)))
-
-(defvar magit-key-mode-current-options '()
-  "Current option set (which will eventually make it to the git
-  command-line).")
-
-(defun magit-key-mode-add-option (for-group option-name)
-  "Toggles the appearance of OPTION-NAME in
-`magit-key-mode-current-options'."
-  (if (not (member option-name magit-key-mode-current-options))
-      (add-to-list 'magit-key-mode-current-options option-name)
-    (setq magit-key-mode-current-options
-          (delete option-name magit-key-mode-current-options)))
-  (magit-key-mode-redraw for-group))
-
-(defun magit-key-mode-kill-buffer ()
-  (interactive)
-  (kill-buffer magit-key-mode-buf-name))
-
-(defvar magit-log-mode-window-conf nil
-  "Pre-popup window configuration.")
-
-(defun magit-key-mode (for-group &optional original-opts)
-  "Mode for magit key selection. All commands, switches and
-options can be toggled/actioned with the key combination
-highlighted before the description."
-  (interactive)
-  ;; save the window config to restore it as was (no need to make this
-  ;; buffer local)
-  (setq magit-log-mode-window-conf
-        (current-window-configuration))
-  ;; setup the mode, draw the buffer
-  (let ((buf (get-buffer-create magit-key-mode-buf-name)))
-    (delete-other-windows)
-    (split-window-vertically)
-    (other-window 1)
-    (switch-to-buffer buf)
-    (kill-all-local-variables)
-    (set (make-local-variable
-          'magit-key-mode-current-options)
-         original-opts)
-    (set (make-local-variable
-          'magit-key-mode-current-args)
-         (make-hash-table))
-    (magit-key-mode-redraw for-group))
-  (message
-   (concat
-    "Type a prefix key to toggle it. Run 'actions' with their prefixes. "
-    "'?' for more help.")))
-
-(defun magit-key-mode-get-key-map (for-group)
-  "Get or build the keymap for FOR-GROUP."
-  (or (cdr (assoc for-group magit-key-mode-key-maps))
-      (magit-key-mode-build-keymap for-group)))
-
-(defun magit-key-mode-redraw (for-group)
-  "(re)draw the magit key buffer."
-  (let ((buffer-read-only nil)
-        (old-point (point)))
-    (erase-buffer)
-    (make-local-variable 'font-lock-defaults)
-    (use-local-map (magit-key-mode-get-key-map for-group))
-    (magit-key-mode-draw for-group)
-    (delete-trailing-whitespace)
-    (setq mode-name "magit-key-mode" major-mode 'magit-key-mode)
-    (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)))
-
-(defvar magit-key-mode-args-in-cols nil
-  "When true, draw arguments in columns as with switches and
-  options.")
-
-(defun magit-key-mode-draw-args (args)
-  "Draw the args part of the menu."
-  (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."
-  (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."
-  (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."
-  (let ((longest-act (apply 'max (mapcar 'length strings))))
-    (while strings
-      (let ((str (car strings)))
-        (let ((padding (make-string (- (+ longest-act 3) (length str)) ? )))
-          (insert str)
-          (if (or one-col-each
-                  (and (> (+ (length padding) ;
-                             (current-column)
-                             longest-act)
-                          (window-width))
-                       (cdr strings)))
-              (insert "\n")
-            (insert padding))))
-      (setq strings (cdr strings))))
-  (insert "\n"))
-
-(defun magit-key-mode-draw (for-group)
-  "Function used to draw actions, switches and parameters."
-  (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))))
-    (magit-key-mode-draw-switches switches)
-    (magit-key-mode-draw-args arguments)
-    (magit-key-mode-draw-actions actions)
-    (insert "\n")))
-
-(defun magit-key-mode-de-generate (group)
-  "Unbind the function for GROUP."
-  (fmakunbound
-   (intern (concat "magit-key-mode-popup-" (symbol-name group)))))
-
-(defun magit-key-mode-generate (group)
-  "Generate the key-group menu for GROUP"
-  (let ((opts (magit-key-mode-options-for-group group)))
-    (eval
-     `(defun ,(intern (concat "magit-key-mode-popup-" (symbol-name group))) nil
-        ,(concat "Key menu for " (symbol-name group))
-        (interactive)
-        (magit-key-mode (quote ,group))))))
-
-;; create the interactive functions for the key mode popups (which are
-;; applied in the top-level key maps)
-(mapc (lambda (g)
-        (magit-key-mode-generate (car g)))
-      magit-key-mode-groups)
-
-(provide 'magit-key-mode)
diff --git a/elpa/magit-1.0.0/magit-key-mode.elc b/elpa/magit-1.0.0/magit-key-mode.elc
deleted file mode 100644
index 0ae053edf..000000000
Binary files a/elpa/magit-1.0.0/magit-key-mode.elc and /dev/null differ
diff --git a/elpa/magit-1.0.0/magit-pkg.el b/elpa/magit-1.0.0/magit-pkg.el
deleted file mode 100644
index edb7ee7ea..000000000
--- a/elpa/magit-1.0.0/magit-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index 59335e594..000000000
--- a/elpa/magit-1.0.0/magit-pkg.el.in
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "magit" "@VERSION@" "Control Git from Emacs.")
diff --git a/elpa/magit-1.0.0/magit-svn.el b/elpa/magit-1.0.0/magit-svn.el
deleted file mode 100644
index ebf55768a..000000000
--- a/elpa/magit-1.0.0/magit-svn.el
+++ /dev/null
@@ -1,203 +0,0 @@
-;;; 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) 2010  Yann Hodique
-;;
-;; Magit is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; Magit is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This plug-in provides git-svn functionality as a separate component of Magit
-
-;;; Code:
-
-(require 'magit)
-(eval-when-compile
-  (require 'cl))
-
-;; git svn commands
-
-(defun magit-svn-find-rev (rev &optional branch)
-  (interactive
-   (list (read-string "SVN revision: ")
-         (if current-prefix-arg
-             (read-string "In branch: "))))
-  (let* ((sha (apply 'magit-git-string
-                     `("svn"
-                       "find-rev"
-                       ,(concat "r" rev)
-                       ,@(when branch (list branch))))))
-    (if sha
-        (magit-show-commit
-         (magit-with-section sha 'commit
-           (magit-set-section-info sha)
-           sha))
-      (error "Revision %s could not be mapped to a commit" rev))))
-
-(defun magit-svn-create-branch (name)
-  (interactive "sBranch name: ")
-  (magit-run-git "svn" "branch" name))
-
-(defun magit-svn-rebase ()
-  (interactive)
-  (magit-run-git-async "svn" "rebase"))
-
-(defun magit-svn-dcommit ()
-  (interactive)
-  (magit-run-git-async "svn" "dcommit"))
-
-(defun magit-svn-enabled ()
-  (not (null (magit-svn-get-ref-info))))
-
-(defun magit-svn-get-local-ref (url)
-  (let ((branches (cons (magit-get "svn-remote" "svn" "fetch")
-                        (magit-get-all "svn-remote" "svn" "branches")))
-        (base-url (magit-get "svn-remote" "svn" "url"))
-        (result nil))
-    (while branches
-      (let* ((pats (split-string (pop branches) ":"))
-             (src (replace-regexp-in-string "\\*" "\\\\(.*\\\\)" (car pats)))
-             (dst (replace-regexp-in-string "\\*" "\\\\1" (cadr pats)))
-             (base-url (replace-regexp-in-string "\\+" "\\\\+" base-url))
-             (pat1 (concat "^" src "$"))
-             (pat2 (cond ((equal src "") (concat "^" base-url "$"))
-                         (t (concat "^" base-url "/" src "$")))))
-        (cond ((string-match pat1 url)
-               (setq result (replace-match dst nil nil url))
-               (setq branches nil))
-              ((string-match pat2 url)
-               (setq result (replace-match dst nil nil url))
-               (setq branches nil)))))
-    result))
-
-(defvar magit-svn-get-ref-info-cache nil
-  "A cache for svn-ref-info.
-As `magit-get-svn-ref-info' might be considered a quite
-expensive operation a cache is taken so that `magit-status'
-doesn't repeatedly call it.")
-
-(defun magit-svn-get-ref-info (&optional use-cache)
-  "Gather details about the current git-svn repository.
-Return nil if there isn't one.  Keys of the alist are ref-path,
-trunk-ref-name and local-ref-name.
-If USE-CACHE is non-nil then return the value of `magit-get-svn-ref-info-cache'."
-  (if (and use-cache magit-svn-get-ref-info-cache)
-      magit-svn-get-ref-info-cache
-    (let* ((fetch (magit-get "svn-remote" "svn" "fetch"))
-           (url)
-           (revision))
-      (when fetch
-        (let* ((ref (cadr (split-string fetch ":")))
-               (ref-path (file-name-directory ref))
-               (trunk-ref-name (file-name-nondirectory ref)))
-          (set (make-local-variable
-                'magit-svn-get-ref-info-cache)
-                (list
-                 (cons 'ref-path ref-path)
-                 (cons 'trunk-ref-name trunk-ref-name)
-                 ;; get the local ref from the log. This is actually
-                 ;; the way that git-svn does it.
-                 (cons 'local-ref
-                       (with-temp-buffer
-                         (insert (or (magit-git-string "log" "--first-parent")
-                                     ""))
-                         (goto-char (point-min))
-                         (cond ((re-search-forward "git-svn-id: \\(.+/.+?\\)@\\([0-9]+\\)" nil t)
-                                (setq url (match-string 1)
-                                      revision (match-string 2))
-                                (magit-svn-get-local-ref url))
-                               (t
-                                (setq url (magit-get "svn-remote" "svn" "url"))
-                                nil))))
-                 (cons 'revision revision)
-                 (cons 'url url))))))))
-
-(defun magit-svn-get-ref (&optional use-cache)
-  "Get the best guess remote ref for the current git-svn based branch.
-If USE-CACHE is non nil, use the cached information."
-  (let ((info (magit-svn-get-ref-info use-cache)))
-    (cdr (assoc 'local-ref info))))
-
-(magit-define-inserter svn-unpulled (&optional use-cache)
-  (when (magit-svn-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-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)")
-
-(defun magit-svn-remote-string ()
-  (let ((svn-info (magit-svn-get-ref-info)))
-    (when svn-info
-      (concat (cdr (assoc 'url svn-info))
-              " @ "
-              (cdr (assoc 'revision svn-info))))))
-
-(defun magit-svn-remote-update ()
-  (interactive)
-  (when (magit-svn-enabled)
-    (magit-run-git-async "svn" "fetch")))
-
-(easy-menu-define magit-svn-extension-menu
-  nil
-  "Git SVN extension menu"
-  '("Git SVN"
-    ["Create branch" magit-svn-create-branch (magit-svn-enabled)]
-    ["Rebase" magit-svn-rebase (magit-svn-enabled)]
-    ["Fetch" magit-svn-remote-update (magit-svn-enabled)]
-    ["Commit" magit-svn-dcommit (magit-svn-enabled)]))
-
-(easy-menu-add-item 'magit-mode-menu
-                    '("Extensions")
-                    magit-svn-extension-menu)
-
-(add-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
-  (magit-key-mode-add-group 'svn)
-
-  (magit-key-mode-insert-action 'svn "r" "Rebase" 'magit-svn-rebase)
-  (magit-key-mode-insert-action 'svn "c" "DCommit" 'magit-svn-dcommit)
-  (magit-key-mode-insert-action 'svn "f" "Fetch" 'magit-svn-remote-update)
-  (magit-key-mode-insert-action 'svn "s" "Find rev" 'magit-svn-find-rev)
-  (magit-key-mode-insert-action 'svn "B" "Create branch" 'magit-svn-create-branch)
-
-  ;; generate and bind the menu popup function
-  (magit-key-mode-generate 'svn))
-
-(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
deleted file mode 100644
index db50b5c58..000000000
Binary files a/elpa/magit-1.0.0/magit-svn.elc and /dev/null differ
diff --git a/elpa/magit-1.0.0/magit-topgit.el b/elpa/magit-1.0.0/magit-topgit.el
deleted file mode 100644
index c4e320084..000000000
--- a/elpa/magit-1.0.0/magit-topgit.el
+++ /dev/null
@@ -1,88 +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)
-
-;;; 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
deleted file mode 100644
index 43949ae57..000000000
Binary files a/elpa/magit-1.0.0/magit-topgit.elc and /dev/null differ
diff --git a/elpa/magit-1.0.0/magit.el b/elpa/magit-1.0.0/magit.el
deleted file mode 100644
index 01442d672..000000000
--- a/elpa/magit-1.0.0/magit.el
+++ /dev/null
@@ -1,4746 +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) 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
deleted file mode 100644
index f3d8d1731..000000000
Binary files a/elpa/magit-1.0.0/magit.elc and /dev/null differ
diff --git a/elpa/magit-1.0.0/magit.info b/elpa/magit-1.0.0/magit.info
deleted file mode 100644
index 2da7e9737..000000000
--- a/elpa/magit-1.0.0/magit.info
+++ /dev/null
@@ -1,913 +0,0 @@
-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, 2011 Marius Vollmer
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.2 or any later version published by the Free Software
-     Foundation; with no Invariant Sections, with no Front-Cover Texts,
-     and with no Back-Cover Texts.
-
-
-File: magit.info,  Node: Top,  Next: Introduction,  Up: (dir)
-
-Magit User Manual
-*****************
-
-Magit is an interface to the version control system Git, implemented as
-an extension to Emacs.
-
-* 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::
-
-
-File: magit.info,  Node: Introduction,  Next: Acknowledgments,  Prev: Top,  Up: Top
-
-1 Introduction
-**************
-
-With Magit, you can inspect and modify your Git repositories with
-Emacs.  You can review and commit the changes you have made to the
-tracked files, for example, and you can browse the history of past
-changes.  There is support for cherry picking, reverting, merging,
-rebasing, and other common Git operations.
-
-   Magit is not a complete interface to Git; it just aims to make the
-most common Git operations convenient.  Thus, Magit will likely not
-save you from learning Git itself.
-
-   This manual provides a tour of all Magit features.  It does not give
-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
-is probably a good idea to bind `magit-status' to a key of your choice.
-
-   In addition to the status buffer, Magit will also create buffers that
-show lists of commits, buffers with diffs, and other kinds of buffers.
-All these buffers are in `magit-mode' and have the same key bindings.
-Not all commands make sense in all contexts, but a given key will
-always do the same thing in all Magit buffers.
-
-   Naturally, Magit runs the `git' command to do most of the work.  The
-`*magit-process*' buffer contains the transcript of the most recent
-command.  You can switch to it with `$'.
-
-
-File: magit.info,  Node: Acknowledgments,  Next: Sections,  Prev: Introduction,  Up: Top
-
-2 Acknowledgments
-*****************
-
-From day one of the first Magit announcement, John Wiegley has
-contributed numerous fixes, UI improvements, and new features.  Thanks!
-
-   Linh Dang and Christian Neukirchen also contributed from day one.
-Thanks!
-
-   Phil Hagelberg joined a few days later.  Thanks!
-
-   Alex Ott contributed support for git svn.  Thanks!
-
-   Marcin Bachry contributed bug fixes and support for decorated logs.
-Thanks!
-
-   Alexey Voinov fixed bugs.  Thanks!
-
-   Rémi Vanicat helped with Tramp support.  Thanks!
-
-
-File: magit.info,  Node: Sections,  Next: Status,  Prev: Acknowledgments,  Up: Top
-
-3 Sections
-**********
-
-All Magit buffers are structured into nested 'sections'.  These
-sections can be hidden and shown individually.  When a section is
-hidden, only its first line is shown and all its children are
-completely invisible.
-
-   The most fine-grained way to control the visibility of sections is
-the `TAB' key.  It will to toggle the current section (the section that
-contains point) between being hidden and being shown.
-
-   Typing `S-TAB' toggles the visibility of the children of the current
-section.  When all of them are shown, they will all be hidden.
-Otherwise, when some or all are hidden, they will all be shown.
-
-   The digit keys `1', `2', `3', and `4' control the visibility of
-sections based on levels.  Hitting `2', for example, will show sections
-on levels one and two, and will hide sections on level 3.  However,
-only sections that are a parent or child of the current section are
-affected.
-
-   For example, when the current section is on level 3 and you hit `1',
-the grand-parent of the current section (which is on level one) will be
-shown, and the parent of the current section (level 2) will be hidden.
-The visibility of no other section will be changed.
-
-   This sounds a bit complicated, but you'll figure it out.
-
-   Using `M-1', `M-2', `M-3', and `M-4' is similar to the unmodified
-digits, but now all sections on the respective level are affected,
-regardless of whether or not they are related to the current section.
-
-   For example, `M-1' will only show the first lines of the top-level
-sections and will hide everything else.  Typing `M-4' on the other hand
-will show everything.
-
-   Because of the way the status buffer is set up, some changes to
-section visibility are more common than others.  Files are on level 2
-and diff hunks are on level 4.  Thus, you can type `2' to collapse the
-diff of the current file, and `M-2' to collapse all files.  This
-returns the status buffer to its default setup and is a quick way to
-unclutter it after drilling down into the modified files.
-
-   Because `2' and `M-2' are so common in the status buffer, they are
-bound to additional, more mnemonic keys: `M-h' (hide) and `M-H' (hide
-all).  Likewise `4' and `M-4' are also available as `M-s' (show) and
-`M-S' (show all).
-
-   In other buffers than the status buffer, `M-h', `M-H', `M-s', and
-`M-S' might work on different levels than on 2 and 4, but they keep
-their general meaning: `M-H' hides all detail, and `M-S' shows
-everything.
-
-
-File: magit.info,  Node: Status,  Next: Untracked files,  Prev: Sections,  Up: Top
-
-4 Status
-********
-
-Running `M-x magit-status' displays the main interface of Magit, the
-status buffer.  You can have multiple status buffers active at the same
-time, each associated with its own Git repository.
-
-   When invoking `M-x magit-status' from within a Git repository, it
-will switch to the status buffer of that repository.  Otherwise, it
-will prompt for a directory.  With a prefix argument, it will always
-prompt.
-
-   You can set `magit-repo-dirs' to customize how `magit-status' asks
-for the repository to work on.  When `magit-repo-dirs' is nil,
-`magit-status' will simply ask for a directory.
-
-   If you specify a directory that is not a Git repository, `M-x
-magit-status' will offer to initialize it as one.
-
-   When `magit-repo-dirs' is not nil, it is treated as a list of
-directory names, and `magit-status' will find all Git repositories in
-those directories and offer them for completion.  (Magit will only look
-`magit-repo-dirs-depth' levels deep, however.)
-
-   With two prefix arguments, `magit-status' will always prompt for a
-raw directory.
-
-   Thus, you would normally set `magit-repo-dirs' to the places where
-you keep most of your Git repositories and switch between them with
-`C-u M-x magit-status'.  If you want to go to a repository outside of
-your normal working areas, or if you want to create a new repository,
-you would use `C-u C-u M-x magit-status'.
-
-   You need to explicitly refresh the status buffer when you have made
-changes to the repository from outside of Emacs.  You can type `g' in
-the status buffer itself, or just use `M-x magit-status' instead of
-`C-x b' when switching to it.  You also need to refresh the status
-buffer in this way after saving a file in Emacs.
-
-   The header at the top of the status buffer shows a short summary of
-the repository state: where it is located, which branch is checked out,
-etc.  Below the header are a number of sections that show details about
-the working tree and the staging area.  You can hide and show them as
-described in the previous section.
-
-   The first section shows _Untracked files_, if there are any.  See
-*note Untracked files:: for more details.
-
-   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
-information.
-
-   During a history rewriting session, the status buffer shows the
-_Pending changes_ and _Pending commits_ sections.  See *note
-Rewriting:: for more details.
-
-
-File: magit.info,  Node: Untracked files,  Next: Staging and Committing,  Prev: Status,  Up: Top
-
-5 Untracked files
-*****************
-
-Untracked files are shown in the _Untracked files_ section.
-
-   You can add 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,
-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.  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.
-
-
-File: magit.info,  Node: Staging and Committing,  Next: History,  Prev: Untracked files,  Up: Top
-
-6 Staging and Committing
-************************
-
-Comitting with Git is a two step process: first you add the changes you
-want to commit to a 'staging area', and then you commit them to the
-repository.  This allows you to only commit a subset of your local
-changes.
-
-   Magit allows you to ignore the staging area if you wish.  As long as
-your staging area is unused, Magit will show your uncomitted changes in
-a section named _Changes_.
-
-   When the staging area is in use, Magit uses two sections: _Unstaged
-changes_ and _Staged changes_.  The _Staged changes_ section shows the
-changes that will be included in the next commit, while the _Unstaged
-changes_ section shows the changes that will be left out.
-
-   To move 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.
-
-   If the region is active when you type `s' or `u', only the changes
-in the region are staged or unstaged.  (This works line by line: if the
-beginning of a line is in the region it is included in the changes,
-otherwise it is not.)
-
-   Typing `C-u s' will ask you for a name of a file to be staged, for
-example to stage files that are hidden.
-
-   To move all hunks of all diffs into the staging area in one go, type
-`S'.  To unstage everything, type `U'.
-
-   Typing `C-u S' will stage all untracked files in addition to the
-changes to tracked files.
-
-   You can discard uncommitted changes by moving point into a hunk and
-typing `k'.  The changes to discard are selected as with `s' and `u'.
-
-   Before committing, you should write a short description of the
-changes.
-
-   Type `c' to pop up a buffer where you can write your change
-description.  Once you are happy with the description, type `C-c C-c'
-in that buffer to perform the commit.
-
-   If you want to write changes in a `ChangeLog' file, you can use `C-x
-4 a' on a diff hunk.
-
-   Typing `c' when the staging area is unused is a special situation.
-Normally, the next commit would be empty, but you can configure Magit
-to do something more useful by customizing the
-`magit-commit-all-when-nothing-staged' variable.  One choice is to
-instruct the subsequent `C-c C-c' to commit all changes.  Another
-choice is stage everything at the time of hitting `c'.
-
-   You can type `C-c C-a' in the buffer with the change description to
-toggle a flag that determines whether the next commit will _amend_ the
-current commit in HEAD.
-
-   Typing `C-c C-s' will toggle the `--signoff' option.  The default is
-determined by the `magit-commit-signoff' customization variable.
-
-   Typing `C-c C-e' will toggle the `--allow-empty' option.  This
-allows you to make commits that serve as notes, without including any
-changes.
-
-   If you change your mind and don't want to go ahead with your commit
-while you are in the `*magit-log-edit*' buffer, you can just switch to
-another buffer, continue editing there, staging and unstaging things
-until you are happy, and then return to the `*magit-log-edit*' buffer,
-maybe via `C-x b', or by hitting `c' again in a Magit buffer.
-
-   If you want to erase the `*magit-log-edit*' buffer and bury it, you
-can hit `C-c C-k' in it.
-
-   Typing `C' will also pop up the change description buffer, but in
-addition, it will try to insert a ChangeLog-style entry for the change
-that point is in.
-
-
-File: magit.info,  Node: History,  Next: Reflogs,  Prev: Staging and Committing,  Up: Top
-
-7 History
-*********
-
-To show the repository history of your current head, type `l l'.  A new
-buffer will be shown that displays the history in a terse form.  The
-first paragraph of each commit message is displayed, next to a
-representation of the relationships between commits.
-
-   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. 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 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.  Typing `SPC' and `DEL' will also
-show the information, but will scroll the new buffer up or down
-(respectively) when typed again.
-
-   Typing `a' will apply the current commit to your current branch.
-This is useful when you are browsing the history of some other branch
-and you want to `cherry-pick' some changes from it.  A typical
-situation is applying selected bug fixes from the development version
-of a program to a release branch.  The cherry-picked changes will not
-be committed automatically; you need to do that explicitly.
-
-   Typing `A' will cherry-pick the current commit and will also commit
-the changes automatically when there have not been any conflicts.
-
-   Typing `v' will revert the current commit.  Thus, it will apply the
-changes made by that commit in reverse.  This is obviously useful to
-cleanly undo changes that turned out to be wrong.  As with `a', you
-need to commit the changes explicitly.
-
-   Typing `C-w' will copy the sha1 of the current commit into the kill
-ring.
-
-   Typing `=' will show the differences from the current commit to the
-"marked" commit.
-
-   You can mark the current commit by typing `.'.  When the current
-commit is already marked, typing `.' will unmark it.  To unmark the
-marked commit no matter where point is, use `C-u .'.
-
-   Some commands, such as `=', will use the current commit and the
-marked commit as implicit arguments.  Other commands will offer the
-marked commit as a default when prompting for their arguments.
-
-   To grep the history press `s'.
-
-
-File: magit.info,  Node: Reflogs,  Next: Diffing,  Prev: History,  Up: Top
-
-8 Reflogs
-*********
-
-You can use `l h' and `l H' to browse your _reflog_, the local history
-of changes made to your repository heads.  Typing `H' will ask for a
-head, while `l h' will show the reflog of `HEAD'.
-
-   The resulting buffer is just like the buffer produced by `l l' and
-`l L' that shows the commit history.
-
-
-File: magit.info,  Node: Diffing,  Next: Tagging,  Prev: Reflogs,  Up: Top
-
-9 Diffing
-*********
-
-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
-working tree.  As usual when point is in a diff header for a file, all
-changes for that file are applied, and when it is in a hunk, only that
-hunk is.  When the region is active, the applied changes are restricted
-to that region.
-
-   Typing `v' will apply the selected changes in reverse.
-
-
-File: magit.info,  Node: Tagging,  Next: Resetting,  Prev: Diffing,  Up: Top
-
-10 Tagging
-**********
-
-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
-to the `*magit-log-edit*' buffer.  You can edit it, if you like.
-
-
-File: magit.info,  Node: Resetting,  Next: Stashing,  Prev: Tagging,  Up: Top
-
-11 Resetting
-************
-
-Once you have added a commit to your local repository, you can not
-change that commit anymore in any way.  But you can reset your current
-head to an earlier commit and start over.
-
-   If you have published your history already, rewriting it in this way
-can be confusing and should be avoided.  However, rewriting your local
-history is fine and it is often cleaner to fix mistakes this way than
-by reverting commits (with `v', for example).
-
-   Typing `x' will ask for a revision and reset your current head to
-it.  No changes will be made to your working tree and staging area.
-Thus, the _Staged changes_ section in the status buffer will show the
-changes that you have removed from your commit history.  You can commit
-the changes again as if you had just made them, thus rewriting history.
-
-   Typing `x' while point is in a line that describes a commit will
-offer this commit as the default revision to reset to.  Thus, you can
-move point to one of the commits in the _Unpushed commits_ section and
-hit `x RET' to reset your current head to it.
-
-   Type `X' to reset your working tree and staging area to the most
-recently committed state.  This will discard your local modifications,
-so be careful.
-
-   You can give a prefix to `x' if you want to reset both the current
-head and your working tree to a given commit.  This is the same as
-first using an unprefixed `x' to reset only the head, and then using
-`X'.
-
-
-File: magit.info,  Node: Stashing,  Next: Branching,  Prev: Resetting,  Up: Top
-
-12 Stashing
-***********
-
-You can create a new stash with `z z'.  Your stashes will be listed in
-the status buffer, and you can apply them with `a' and pop them with
-`A'.  To drop a stash, use `k'.
-
-   With a prefix argument, both `a' and `A' will attempt to reinstate
-the index as well as the working tree from the stash.
-
-   Typing `z 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
-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 list,  Prev: Stashing,  Up: Top
-
-13 Branching
-************
-
-The current branch is indicated in the header of the status buffer.
-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.
-
-   If you try to switch to a remote branch, Magit will offer to create a
-local tracking branch for it instead.  This way, you can easily start
-working on new branches that have appeared in a remote repository.
-
-   Typing `b 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 `b B'.
-
-   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 list,  Next: Wazzup,  Prev: Branching,  Up: Top
-
-14 The branch list
-******************
-
-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.
-
-   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 list,  Up: Top
-
-15 Wazzup
-*********
-
-Typing `w' will show a summary of how your other branches relate to the
-current branch.
-
-   For each branch, you will get a section that lists the commits in
-that branch that are not in the current branch.  The sections are
-initially collapsed; you need to explicitly open them with `TAB' (or
-similar) to show the lists of commits.
-
-   When point is on a _N unmerged commits in ..._ title, the
-corresponding branch will be offered as the default for a merge.
-
-   Hitting `i' on a branch title will ignore this branch in the wazzup
-view.  You can use `C-u w' to show all branches, including the ignored
-ones.  Hitting `i' on an already ignored branch in that view will
-unignore it.
-
-
-File: magit.info,  Node: Merging,  Next: Rebasing,  Prev: Wazzup,  Up: Top
-
-16 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 `m m' to initiate merge.
-
-   After initiating a merge, the header of the status buffer might
-remind you that the next commit will be a merge commit (with more than
-one parent).  If you want to abort a manual merge, just do a hard reset
-to HEAD with `X'.
-
-   Merges can fail if the two branches you 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
-example with `S'.
-
-   You can not stage individual hunks one by one as you resolve them,
-you can only stage whole files once all conflicts in them have been
-resolved.
-
-
-File: magit.info,  Node: Rebasing,  Next: Rewriting,  Prev: Merging,  Up: Top
-
-17 Rebasing
-***********
-
-Typing `R' in the status buffer will initiate a rebase or, if one is
-already in progress, ask you how to continue.
-
-   When a rebase is stopped in the middle because of a conflict, the
-header of the status buffer will indicate how far along you are in the
-series of commits that are being replayed.  When that happens, you
-should resolve the conflicts and stage everything and hit `R c' to
-continue the rebase.  Alternatively, hitting `c' or `C' while in the
-middle of a rebase will also ask you whether to continue the rebase.
-
-   Of course, you can initiate a rebase in any number of ways, by
-configuring `git pull' to rebase instead of merge, for example.  Such a
-rebase can be finished with `R' as well.
-
-
-File: magit.info,  Node: Rewriting,  Next: Pushing and Pulling,  Prev: Rebasing,  Up: Top
-
-18 Rewriting
-************
-
-As hinted at earlier, you can rewrite your commit history.  For
-example, you can reset the current head to an earlier commit with `x'.
-This leaves the working tree unchanged, and the status buffer will show
-all the changes that have been made since that new value of the current
-head.  You can commit these changes again, possibly splitting them into
-multiple commits as you go along.
-
-   Amending your last commit is a common special case of rewriting
-history like this.
-
-   Another common way to rewrite history is to reset the head to an
-earlier commit, and then to cherry pick the previous commits in a
-different order.  You could pick them from the reflog, for example.
-
-   Magit has several commands that can simplify the book keeping
-associated with rewriting.  These commands all start with the `r'
-prefix key.
-
-   Typing `r b' will start a rewrite operation.  You will be prompted
-for a _base_ commit, 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
-applied.  Magit shows which commits have been applied by changing their
-marker from `*' to `.'.
-
-   Using `A' will immediately commit the commit (as usual).  If you
-want to combine multiple previous commits into a single new one, use
-`a' to apply them all to your working tree, and then commit them
-together.
-
-   Magit has no explicit support for rewriting merge commits.  It will
-happily include merge commits in the list of pending commits, but there
-is no way of replaying them automatically.  You have to redo the merge
-explicitly.
-
-   You can also use `v' to revert a commit when you have changed your
-mind.  This will change the `.' mark back to `*'.
-
-   Once you are done with the rewrite, type `r 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 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.
-
-   You can change the `*' and `.' marks of a pending commit explicitly
-with `r *' and `r .'.
-
-   In addition to a list of pending commits, the status buffer will show
-the _Pending changes_.  This section shows the diff between the
-original head and the current head.  You can use it to review the
-changes that you still need to rewrite, and you can apply hunks from
-it, like from any other diff.
-
-
-File: magit.info,  Node: Pushing and Pulling,  Next: Submodules,  Prev: Rewriting,  Up: Top
-
-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.
-When no default remote repository has been configured yet for the
-current branch, you will be prompted as well.  Typing `P p' will only
-push the current branch to the remote.  In other words, it will run
-`git push <remote> <branch>'.  The branch will be created in the remote
-if it doesn't exist already.  The local branch will be configured so
-that it pulls from the new remote branch.
-
-   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.
-
-   In this case, the status buffer will also have a _Unpushed commits_
-section that shows the commits on your current head that are not in the
-branch named `<remote>/<branch>'.  This section works just like the
-history buffer: you can see details about a commit with `RET', compare
-two of them with `.' and `=', and you can reset your current head to
-one of them with `x', for example. If you want to push the changes then
-type `P p'.
-
-   When the remote branch has changes that are not in the current
-branch, Magit shows them in a section called _Unpulled changes_.  Typing
-`F p' will merge them into the current branch.
-
-
-File: magit.info,  Node: Submodules,  Next: Using Magit Extensions,  Prev: Pushing and Pulling,  Up: Top
-
-20 Submodules
-*************
-
-`M u'
-     Update the submodules, with a prefix argument it will initializing.
-
-`M i'
-     Initialize the submodules.
-
-`M b'
-     Update and initialize the submodules in one go.
-
-`M s'
-     Synchronizes submodules' remote URL configuration setting to the
-     value specified in .gitmodules.
-
-
-File: magit.info,  Node: Using Magit Extensions,  Next: Using Git Directly,  Prev: Submodules,  Up: Top
-
-21 Magit Extensions
-*******************
-
-* Menu:
-
-* Interfacing with Subversion::
-* Interfacing with Topgit::
-* Developing Extensions::
-
-
-File: magit.info,  Node: Interfacing with Subversion,  Next: Interfacing with Topgit,  Up: Using Magit Extensions
-
-21.1 Interfacing with Subversion
-================================
-
-Typing `N r' runs `git svn rebase', typing `N c' runs `git svn dcommit'
-and typing `N f' runs `git svn fetch'.
-
-   `N s' will prompt you for a (numeric, Subversion) revision and then
-search for a corresponding Git sha1 for the commit. This is limited to
-the path of the remote Subversion repository. With a prefix (`C-u N s'
-the user will also be prompted for a branch to search in.
-
-
-File: magit.info,  Node: Interfacing with Topgit,  Next: Developing Extensions,  Prev: Interfacing with Subversion,  Up: Using Magit Extensions
-
-21.2 Interfacing with Topgit
-============================
-
-Topgit (http://repo.or.cz/r/topgit.git) is a patch queue manager that
-aims at being close as possible to raw Git, which makes it easy to use
-with Magit. In particular, it does not require to use a different set of
-commands for "commit", "update",… operations.
-
-   `magit-topgit.el' provides basic integration with Magit, mostly by
-providing a "Topics" section.
-
-   Topgit branches can be created the regular way, by using a "t/"
-prefix by convention. So, creating a "t/foo" branch will actually
-populate the "Topics" section with one more branch after committing
-`.topdeps' and `.topmsg'.
-
-   Also, the way we pull (see *note Pushing and Pulling::) such a
-branch is slightly different, since it requires updating the various
-dependencies of that branch. This should be mostly transparent, except
-in case of conflicts.
-
-
-File: magit.info,  Node: Developing Extensions,  Prev: Interfacing with Topgit,  Up: Using Magit Extensions
-
-21.3 Developing Extensions
-==========================
-
-Magit provides a generic mechanism to allow cooperation with Git-related
-systems, such as foreign VCS, patch systems,…
-
-   In particular it allows to:
-
-   * Define sections to display specific informations about the current
-     state of the repository, and place them relatively to existing
-     sections.
-
-     `magit-define-inserter' automagically defines two hooks called
-     `magit-before-insert-SECTION-hook' and
-     `magit-after-insert-SECTION-hook' that allow to generate and place
-     more sections.
-
-     In the following example, we use the builtin "stashes" section to
-     place our own "foo" one.
-
-          (magit-define-inserter foo ()
-            (magit-git-section 'foo
-                               "Foo:" 'foo-wash-function
-                               "foo" "arg1" "arg2"))
-          (add-hook 'magit-after-insert-stashes-hook 'magit-insert-foo)
-
-   * Define new types of objects in those sections.
-
-     The function `foo-wash-function' defined above post-processes each
-     line of the output of the "git foo arg1 arg2" command, and is able
-     to associate a type to certain lines.
-
-     A simple implementation could be:
-
-          (defun foo-wash-function ()
-            (let ((foo (buffer-substring (line-beginning-position) (line-end-position))))
-              (goto-char (line-beginning-position))
-              (magit-with-section foo 'foo
-                (magit-set-section-info foo)
-                (forward-line))))
-
-     In this case, every line of the command output is transformed into
-     an object of type `'foo'.
-
-   * Alter behavior of generic commands to dispatch them correctly to
-     the relevant system, optionally making use of the newly defined
-     types.
-
-          (magit-add-action (item info "discard")
-            ((foo)
-             (do-something-meaningful-for-discarding-a-foo)))
-
-     This will alter the behavior of `k', when applied to those objects.
-
-   * Plug a different logic into basic commands, to reflect the
-     presence of the extension.
-
-     `magit-define-command' automagically defines a
-     `magit-CMD-command-hook' that can contain a list of functions to
-     call before the actual core code. Execution stops after the first
-     hook that returns a non-nil value. This leaves room for extension
-     logic.
-
-          (add-hook 'magit-create-branch-command-hook 'foo-create-branch)
-
-     The function `foo-create-branch' will be called each time an
-     attempt is made to create a branch, and can, for example, react to
-     a certain name convention.
-
-   * Define new commands and associated menu.
-
-     This part is not really specific to extensions, except that menus
-     take place in the "Extensions" submenu.
-
-
-
-File: magit.info,  Node: Using Git Directly,  Prev: Using Magit Extensions,  Up: Top
-
-22 Using Git Directly
-*********************
-
-For situations when Magit doesn't do everything you need, you can run
-raw Git commands using `:'.  This will prompt for a Git command, run
-it, and refresh the status buffer.  The output can be viewed by typing
-`$'.
-
-
-
-Tag Table:
-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
deleted file mode 100644
index 6c200866e..000000000
--- a/elpa/magit-1.0.0/magit.spec
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index ae7ec453d..000000000
--- a/elpa/magit-1.0.0/magit.spec.in
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index aeac0c271..000000000
--- a/elpa/magit-1.0.0/magit.texi
+++ /dev/null
@@ -1,847 +0,0 @@
-\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-90150116/AUTHORS.md b/elpa/magit-90150116/AUTHORS.md
new file mode 100644
index 000000000..08023d13d
--- /dev/null
+++ b/elpa/magit-90150116/AUTHORS.md
@@ -0,0 +1,180 @@
+Authors
+=======
+
+Also see https://github.com/magit/magit/graphs/contributors.
+Names below are sorted alphabetically.
+
+Author
+------
+
+- Marius Vollmer <marius.vollmer@gmail.com>
+
+Maintainer
+----------
+
+- Jonas Bernoulli <jonas@bernoul.li>
+
+Retired Maintainers
+-------------------
+
+- Nicolas Dudebout <nicolas.dudebout@gatech.edu>
+- Peter J. Weisberg <pj@irregularexpressions.net>
+- Phil Jackson <phil@shellarchive.co.uk>
+- Rémi Vanicat <vanicat@debian.org>
+- Yann Hodique <yann.hodique@gmail.com>
+
+Contributors
+------------
+
+- aaa707 <aaa707b@gmail.com>
+- Aaron Culich <aculich@gmail.com>
+- Abdo Roig-Maranges <abdo.roig@gmail.com>
+- acple <silentsphere110@gmail.com>
+- Adam Spiers <emacs@adamspiers.org>
+- Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+- Alan Falloon <alan.falloon@gmail.com>
+- Alexey Voinov <alexey.v.voinov@gmail.com>
+- Alex Ott <alexott@gmail.com>
+- Andreas Fuchs <asf@boinkor.net>
+- Andreas Liljeqvist <andreas.liljeqvist@robacks.se>
+- Andreas Rottmann <a.rottmann@gmx.at>
+- Andrei Chițu <andrei.chitu1@gmail.com>
+- Andrew Kirkpatrick <andrew.kirkpatrick@adelaide.edu.au>
+- Andrey Smirnov <andrew.smirnov@gmail.com>
+- Bastian Beischer <beischer@physik.rwth-aachen.de>
+- Ben Walton <bwalton@artsci.utoronto.ca>
+- Bradley Wright <brad@intranation.com>
+- Brandon W Maister <quodlibetor@gmail.com>
+- Brian Warner <warner@lothar.com>
+- Bryan Shell <bryan.shell@orbitz.com>
+- Chris Bernard <cebernard@gmail.com>
+- Chris Done <chrisdone@gmail.com>
+- Chris Moore <dooglus@gmail.com>
+- Chris Ring <chris@ringthis.com>
+- Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
+- Christian Kluge <ckfrakturfreak@web.de>
+- Christopher Monsanto <chris@monsan.to>
+- Cornelius Mika <cornelius.mika@gmail.com>
+- Craig Andera <candera@wangdera.com>
+- Dale Hagglund <dale.hagglund@gmail.com>
+- Damien Cassou <damien.cassou@gmail.com>
+- Daniel Brockman <daniel@gointeractive.se>
+- Daniel Farina <drfarina@acm.org>
+- Daniel Hackney <dan@haxney.org>
+- Dan LaManna <dan.lamanna@gmail.com>
+- David Abrahams <dave@boostpro.com>
+- David Hull <david.hull@openx.com>
+- David Wallin <david.wallin@gmail.com>
+- Dennis Paskorz <dennis@walltowall.com>
+- Divye Kapoor <divye@google.com>
+- Dominique Quatravaux <domq@google.com>
+- Eli Barzilay <eli@barzilay.org>
+- Eric Davis <ed@npri.org>
+- Eric Schulte <schulte.eric@gmail.com>
+- Evgkeni Sampelnikof <esabof@gmail.com>
+- Felix Geller <fgeller@gmail.com>
+- Feng Li <fengli@blackmagicdesign.com>
+- George Kadianakis <desnacked@gmail.com>
+- Graham Clark <grclark@gmail.com>
+- Greg A. Woods <woods@planix.com>
+- Greg Sexton <gregsexton@gmail.com>
+- Hannu Koivisto <azure@iki.fi>
+- Hans-Peter Deifel <hpdeifel@gmx.de>
+- Ian Eure <ian.eure@gmail.com>
+- Jan Tatarik <jan.tatarik@xing.com>
+- Jasper St. Pierre <jstpierre@mecheye.net>
+- Jeff Bellegarde <jbellegarde@whitepages.com>
+- Jeff Dairiki <dairiki@dairiki.org>
+- Jesse Alama <jesse.alama@gmail.com>
+- John Wiegley <johnw@newartisans.com>
+- Jonas Bernoulli <jonas@bernoul.li>
+- Jonathan Roes <jroes@jroes.net>
+- Julien Danjou <julien@danjou.info>
+- Justin Caratzas <justin.caratzas@gmail.com>
+- Kimberly Wolk <kimwolk@hotmail.com>
+- Kyle Meyer <kyle@kyleam.com>
+- Laurent Laffont <laurent.laffont@gmail.com>
+- Leandro Facchinetti <me@leafac.com>
+- Lele Gaifax <lele@metapensiero.it>
+- Leo Liu <sdl.web@gmail.com>
+- Leonardo Etcheverry <leo@kalio.net>
+- Lluís Vilanova <vilanova@ac.upc.edu>
+- Loic Dachary <loic@dachary.org>
+- Luís Borges de Oliveira <lbo@siscog.pt>
+- Luke Amdor <luke.amdor@gmail.com>
+- Manuel Vázquez Acosta <mva.led@gmail.com>
+- Marcel Wolf <mwolf@ml1.net>
+- Marc Herbert <marc.herbert@gmail.com>
+- Marcin Bachry <hegel666@gmail.com>
+- Marco Craveiro <marco.craveiro@gmail.com>
+- Marian Schubert <marian.schubert@gooddata.com>
+- Marius Vollmer <marius.vollmer@gmail.com>
+- Mark Hepburn <Mark.Hepburn@csiro.au>
+- Matus Goljer <dota.keys@gmail.com>
+- Miles Bader <miles@gnu.org>
+- Mitchel Humpherys <mitch.special@gmail.com>
+- Moritz Bunkus <moritz@bunkus.org>
+- Nathan Weizenbaum <nex342@gmail.com>
+- Nguyễn Tuấn Anh <ubolonton@gmail.com>
+- Nic Ferier <nic@ferrier.me.uk>
+- Nick Alcock <nick.alcock@oracle.com>
+- Nick Alexander <nalexander@mozilla.com>
+- Nick Dimiduk <ndimiduk@gmail.com>
+- Nicolas Dudebout <nicolas.dudebout@gatech.edu>
+- Nicolas Richard <theonewiththeevillook@yahoo.fr>
+- Noam Postavsky <npostavs@users.sourceforge.net>
+- Ole Arndt <oliver.arndt@cegedim.com>
+- Óscar Fuentes <ofv@wanadoo.es>
+- Paul Stadig <paul@stadig.name>
+- Pavel Holejsovsky <pavel.holejsovsky@upek.com>
+- Pekka Pessi <nospam@pessi.fi>
+- Peter J. Weisberg <pj@irregularexpressions.net>
+- Philippe Vaucher <philippe.vaucher@gmail.com>
+- Philipp Haselwarter <philipp@haselwarter.org>
+- Philip Weaver <philip.weaver@gmail.com>
+- Phil Jackson <phil@shellarchive.co.uk>
+- Pieter Praet <pieter@praet.org>
+- Prathamesh Sonpatki <csonpatki@gmail.com>
+- rabio <rabiodev@o2.pl>
+- Raimon Grau <raimonster@gmail.com>
+- Ramkumar Ramachandra <artagnon@gmail.com>
+- Remco van 't Veer <rwvtveer@xs4all.nl>
+- Rémi Vanicat <vanicat@debian.org>
+- René Stadler <mail@renestadler.de>
+- Robert Boone <robo4288@gmail.com>
+- Robin Green <greenrd@greenrd.org>
+- Roger Crew <crew@cs.stanford.edu>
+- Romain Francoise <romain@orebokech.com>
+- Ron Parker <rparker@a123systems.com>
+- Roy Crihfield <rscrihf@gmail.com>
+- Rüdiger Sonderfeld <ruediger@c-plusplus.de>
+- Rüdiger Sonderfeld <ruediger@c-plusplus.net>
+- Ryan C. Thompson <rct@thompsonclan.org>
+- Samuel Bronson <naesten@gmail.com>
+- Sanjoy Das <sanjoy@playingwithpointers.com>
+- Sean Bryant <sbryant@hackinggibsons.com>
+- Sebastian Wiesner <lunaryorn@gmail.com>
+- Sébastien Gross <seb@chezwam.org>
+- Seong-Kook Shin <cinsky@gmail.com>
+- Sergey Pashinin <sergey@pashinin.com>
+- Sergey Vinokurov <serg.foo@gmail.com>
+- Servilio Afre Puentes <afrepues@mcmaster.ca>
+- Štěpán Němec <stepnem@gmail.com>
+- Steven Chow <steve@myfreestuffapp.com>
+- Steven Thomas <sthomas314@gmail.com>
+- Steve Purcell <steve@sanityinc.com>
+- Suhail Shergill <suhailshergill@gmail.com>
+- Takafumi Arakaki <aka.tkf@gmail.com>
+- Teruki Shigitani <teruki.shigitani@gmail.com>
+- Thierry Volpiatto <thierry.volpiatto@gmail.com>
+- Thomas Frössman <thomasf@jossystem.se>
+- Thomas Jost <thomas.jost@gmail.com>
+- Thomas Riccardi <riccardi.thomas@gmail.com>
+- Tibor Simko <tibor.simko@cern.ch>
+- Timo Juhani Lindfors <timo.lindfors@iki.fi>
+- Ting-Yu Lin <aethanyc@gmail.com>
+- Tom Feist <shabble@metavore.org>
+- Wilfred Hughes <me@wilfred.me.uk>
+- Win Treese <treese@acm.org>
+- Yann Hodique <yann.hodique@gmail.com>
+- York Zhao <gtdplatform@gmail.com>
diff --git a/elpa/magit-90150116/README.md b/elpa/magit-90150116/README.md
new file mode 100644
index 000000000..778ee163a
--- /dev/null
+++ b/elpa/magit-90150116/README.md
@@ -0,0 +1,271 @@
+[![Build Status](https://travis-ci.org/magit/magit.svg?branch=master)](https://travis-ci.org/magit/magit)
+[![Gratipay](http://img.shields.io/gratipay/magit.png)](https://www.gratipay.com/magit)
+
+It's Magit!  An Emacs mode for Git
+==================================
+
+**The Magit wiki contains a list of [FREQUENTLY ASKED QUESTIONS][faq],
+please do consult it.**
+
+**Magit is in [FEATURE FREEZE][roadmap], please keep that in mind
+when making feature requests.**
+
+Magit is an interface to the version control system [Git][git],
+implemented as an [Emacs][emacs] extension.
+
+Unlike the [VC][vc] package which is part of Emacs and strives to
+provide a unified interface to various version control systems, Magit
+only supports Git and can therefore better take advantage of its
+native features.
+
+Magit supports GNU Emacs 23.2 or later; 24.1 or later is recommended.
+Magit supports Git 1.7.2.5 or later; 1.8.2 or later is recommended.
+The minimal versions are those available in Debian oldstable.
+
+### Table of Contents
+
+* [Getting Started](#getting-started)
+* [Getting Help](#getting-help)
+* [Contributions](#contributions)
+* [Installation](#installation)
+  * [Installing from Melpa](#installing-from-melpa)
+  * [Installing from Git](#installing-from-git)
+* [Dependencies](#dependencies)
+
+Getting Started
+===============
+
+To get started with Magit, run <kbd>M-x magit-status</kbd>.  If you
+are inside a Git repository this opens a buffer that summarizes its
+status.  Otherwise you are first prompted for a repository.  Read the
+short help for `magit-status-mode` (<kbd>C-h m</kbd> in the status
+buffer).
+
+Then edit and save some files, refresh the status buffer
+(<kbd>g</kbd>), stage changes (<kbd>s</kbd>) and commit (<kbd>c</kbd>)
+them.
+
+For more details consult the Magit user manual.  You can read it with
+<kbd>C-u C-h i magit.info</kbd> or [on the web][manual].
+
+We can also recommend [this][mastering-intro] introduction from the
+Mastering Emacs blog.  It even describes some new features that are
+not yet documented in the manual.
+
+Magit also has a [website][website].
+
+Getting Help
+============
+
+When something breaks please see the [FAQ][faq].  If that doesn't help
+check the list of [all open issues][issues].
+
+If everything else fails please open a [new issue][issues] or ask for
+help on the [mailing list][group].
+
+Contributions
+=============
+
+Magit is [hosted on Github][development].  Please contribute by
+suggesting features on the [issue tracker][issues] or by making code
+contributions using [pull requests][pulls].  Before opening a pull
+request make sure to read the brief [guidelines][contributing].
+
+Please also consider supporting development using
+[gratipay][gratipay].  Thank you!
+
+Magit was started by [Marius Vollmer][marius] and is now maintained
+by [Jonas Bernoulli][jonas].  Other Magitians (former maintainers)
+are [Nicolas Dudebout][nicolas], [Peter J. Weisberg][peter],
+[Phil Jackson][phil], [Rémi Vanicat][remi], and [Yann Hodique][yann].
+
+Many more people have [contributed code][contributors] and suggested
+features.
+
+Thanks to all of you, may (the history of) the source be with you!
+
+Installation
+============
+
+Beginning with version 24.1 Emacs includes a package management
+facility known as Elpa or `package.el`.  Using an Elpa package
+repository is the easiest and recommended way to install and update
+Magit and its dependencies.  Among other things using `package.el`
+is recommended because that automatically takes care of installing
+dependencies.
+
+Also see [Which version should I install?][faq-which]
+
+### Installing from Melpa
+
+If you have already used Melpa to install some other package then
+all you have to do is:
+
+<kbd>M-x package-install RET magit RET</kbd>
+
+This installs Magit as well as all of its dependencies and makes
+them available in the current and future Emacs sessions.
+
+If this is the first time you are using Melpa, then you have to
+configure `package.el` once.
+
+```lisp
+(require 'package)
+(add-to-list 'package-archives
+             '("melpa" . "http://melpa.org/packages/") t)
+```
+
+Then evaluate these forms, update the package cache, and install
+Magit as above.  To update the cache use:
+
+<kbd>M-x package-refresh-contents RET</kbd>
+
+You might also want to have a look at the more detailed
+[instructions][melpa-intro] provided by the Melpa project.  Among
+other things it explains how to install only some packages from Melpa
+and others from Marmalade, and how to use `package.el` with older
+versions of Emacs.
+
+### Installing from Git
+
+If you want to contribute to Magit you should run it directly from the
+Git repository.
+
+First get the repository:
+
+```sh
+$ git clone git://github.com/magit/magit.git
+```
+
+Then you should byte compile the libraries and generate the
+documentation, though that is not required:
+
+```sh
+$ make lisp docs
+```
+
+Unless all dependencies are installed at `../DEPENDENCY` you have to
+tell `make` where to find them, e.g.:
+
+```sh
+$ EFLAGS="-L /path/to/git-modes" make lisp docs
+```
+
+Then add this to you init file:
+
+```lisp
+(add-to-list 'load-path "/path/to/git-modes")
+(add-to-list 'load-path "/path/to/magit")
+(eval-after-load 'info
+  '(progn (info-initialize)
+          (add-to-list 'Info-directory-list "/path/to/magit/")))
+(require 'magit)
+```
+
+If you are using an Emacs version before 24.3, then you also have to
+install `cl-lib` and tell `make` as well as Emacs where to find it.
+
+To view available make targets use:
+
+```sh
+$ make help
+```
+
+To update use:
+
+```sh
+$ git pull
+$ make lisp docs
+```
+
+Before creating a pull request always run:
+
+```sh
+$ make lisp test
+```
+
+You may also build Magit manually:
+
+```sh
+$ emacs -Q --batch -L . -L /path/to/DEPENCENCY -f batch-byte-compile *.el
+$ makeinfo -o magit.info magit.texi
+$ install-info --dir=dir magit.info
+```
+
+Dependencies
+============
+
+If you install Magit using `package.el` then dependencies are
+automatically being taken care of.  Otherwise you have to track down
+dependencies and install them manually.
+
+* `cl-lib` is a new library in Emacs 24.3.  Like the old `cl` it
+  provides various Common Lisp forms, but differs in that symbols are
+  prefixed with `cl-`.  A forward compatibility `cl-lib` for older
+  versions of Emacs is available from the GNU Elpa repository.  You
+  can install it using `package.el` or get it [here][cl-lib].
+
+* `git-commit-mode` which is part of the [git-modes][git-modes]
+  repository and available as a separate package from Melpa.
+
+* `git-rebase-mode` which is part of the [git-modes][git-modes]
+  repository and available as a separate package from Melpa.
+
+### Optional Dependencies
+
+The following libraries build on third-party tools or git subcommands
+that are not installed by the Git base-package on some distributions:
+
+* `magit-stgit.el` requires [`stgit`][stgit].
+* `magit-svn.el` requires the official Git subcommand `svn`.
+* `magit-topgit.el` requires [`topgit`][topgit].
+* `magit-wip.el` requires [`git-wip`][git-wip].
+
+### Dependencies of Tests
+
+To run tests the following libraries are also required:
+
+* `ert` is a tool for automated testing.  It is part of Emacs
+  starting with version 24.1.  You can also obtain an old version from
+  the former development [repository][ert].
+
+
+[contributing]: https://github.com/magit/magit/blob/master/CONTRIBUTING.md
+[contributors]: https://github.com/magit/magit/contributors
+[development]: http://github.com/magit/magit
+[download]: https://github.com/magit/magit/releases/download/1.2.1/magit-1.2.1.tar.gz
+[faq]: https://github.com/magit/magit/wiki/FAQ
+[faq-which]: https://github.com/magit/magit/wiki/FAQ#which-version-should-i-install
+[group]: https://groups.google.com/forum/?fromgroups#!forum/magit
+[issues]: https://github.com/magit/magit/issues
+[knownissues]: https://github.com/magit/magit/wiki/Known-issues
+[manual]: http://magit.github.io/documentation.html
+[owners]: https://github.com/magit?tab=members
+[pulls]: https://github.com/magit/magit/pulls
+[roadmap]: https://github.com/magit/magit/issues/1645
+[screencast]: http://vimeo.com/2871241
+[website]: http://magit.github.io
+
+[jonas]: https://github.com/tarsius
+[marius]: https://github.com/mvollmer
+[nicolas]: https://github.com/dudebout
+[peter]: https://github.com/pjweisberg
+[phil]: https://github.com/philjackson
+[remi]: https://github.com/vanicat
+[yann]: https://github.com/sigma
+
+[cl-lib]: http://elpa.gnu.org/packages/cl-lib.html
+[emacs]: http://www.gnu.org/software/emacs
+[ert]: https://github.com/ohler/ert
+[git-wip]: https://github.com/bartman/git-wip
+[git]: http://git-scm.com
+[gitflow]: https://github.com/nvie/gitflow
+[gratipay]: https://gratipay.com/magit
+[git-modes]: https://github.com/magit/git-modes
+[marmalade]: http://marmalade-repo.org
+[mastering-intro]: http://www.masteringemacs.org/article/introduction-magit-emacs-mode-git
+[melpa]: http://melpa.milkbox.net
+[melpa-intro]: http://melpa.milkbox.net/#/getting-started
+[stgit]: http://www.procode.org/stgit
+[topgit]: https://github.com/greenrd/topgit
+[vc]: http://www.gnu.org/software/emacs/manual/html_node/emacs/Version-Control.html
diff --git a/elpa/magit-90150116/dir b/elpa/magit-90150116/dir
new file mode 100644
index 000000000..5fec54397
--- /dev/null
+++ b/elpa/magit-90150116/dir
@@ -0,0 +1,18 @@
+This is the file .../info/dir, which contains the
+topmost node of the Info hierarchy, called (dir)Top.
+The first time you invoke Info you start off looking at this node.
+
+File: dir,	Node: Top	This is the top of the INFO tree
+
+  This (the Directory node) gives a menu of major topics.
+  Typing "q" exits, "?" lists all Info commands, "d" returns here,
+  "h" gives a primer for first-timers,
+  "mEmacs<Return>" visits the Emacs manual, etc.
+
+  In Emacs, you can click mouse button 2 on a menu item or cross reference
+  to select it.
+
+* Menu:
+
+Emacs
+* Magit: (magit).               Using Git from Emacs with Magit.
diff --git a/elpa/magit-90150116/magit-autoloads.el b/elpa/magit-90150116/magit-autoloads.el
new file mode 100644
index 000000000..134291709
--- /dev/null
+++ b/elpa/magit-90150116/magit-autoloads.el
@@ -0,0 +1,578 @@
+;;; magit-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "magit" "magit.el" (21721 36920 0 0))
+;;; Generated autoloads from magit.el
+
+(autoload 'magit-git-command "magit" "\
+Execute a Git subcommand asynchronously, displaying the output.
+With a prefix argument run Git in the root of the current
+repository.  Non-interactively run Git in DIRECTORY with ARGS.
+
+\(fn ARGS DIRECTORY)" t nil)
+
+(autoload 'magit-show-commit "magit" "\
+Show information about COMMIT.
+
+\(fn COMMIT &optional NOSELECT)" t nil)
+
+(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.
+
+Depending on option `magit-status-buffer-switch-function' the
+status buffer is shown in another window (the default) or the
+current window.  Non-interactively optional SWITCH-FUNCTION
+can be used to override this.
+
+\(fn DIR &optional SWITCH-FUNCTION)" t nil)
+
+(autoload 'magit-stage-all "magit" "\
+Add all remaining changes in tracked files to staging area.
+With a prefix argument, add remaining untracked files as well.
+\('git add [-u] .').
+
+\(fn &optional INCLUDING-UNTRACKED)" t nil)
+
+(autoload 'magit-unstage-all "magit" "\
+Remove all changes from staging area.
+\('git reset --mixed HEAD').
+
+\(fn)" t nil)
+
+(autoload 'magit-dired-jump "magit" "\
+Visit current item in dired.
+With a prefix argument, visit in other window.
+
+\(fn &optional OTHER-WINDOW)" t nil)
+
+(autoload 'magit-show "magit" "\
+Display and select a buffer containing FILE as stored in REV.
+
+Insert the contents of FILE as stored in the revision REV into a
+buffer.  Then select the buffer using `pop-to-buffer' or with a
+prefix argument using `switch-to-buffer'.  Non-interactivity use
+SWITCH-FUNCTION to switch to the buffer, if that is nil simply
+return the buffer, without displaying it.
+
+\(fn REV FILE &optional SWITCH-FUNCTION)" t nil)
+
+(autoload 'magit-merge "magit" "\
+Merge REVISION into the current 'HEAD', leaving changes uncommitted.
+With a prefix argument, skip editing the log message and commit.
+\('git merge [--no-commit] REVISION').
+
+\(fn REVISION &optional DO-COMMIT)" t nil)
+
+(autoload 'magit-merge-abort "magit" "\
+Abort the current merge operation.
+
+\(fn)" t nil)
+
+(autoload 'magit-checkout "magit" "\
+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 branch.
+\('git checkout [-b] REVISION').
+
+\(fn REVISION)" t nil)
+
+(autoload 'magit-create-branch "magit" "\
+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').
+
+\(fn BRANCH PARENT)" t nil)
+
+(autoload 'magit-delete-branch "magit" "\
+Delete the 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').
+
+\(fn BRANCH &optional FORCE)" t nil)
+
+(autoload 'magit-rename-branch "magit" "\
+Rename branch OLD to NEW.
+With prefix, forces the rename even if NEW already exists.
+\('git branch [-m|-M] OLD NEW').
+
+\(fn OLD NEW &optional FORCE)" t nil)
+
+(autoload 'magit-add-remote "magit" "\
+Add the REMOTE and fetch it.
+\('git remote add REMOTE URL').
+
+\(fn REMOTE URL)" t nil)
+
+(autoload 'magit-remove-remote "magit" "\
+Delete the REMOTE.
+\('git remote rm REMOTE').
+
+\(fn REMOTE)" t nil)
+
+(autoload 'magit-rename-remote "magit" "\
+Rename remote OLD to NEW.
+\('git remote rename OLD NEW').
+
+\(fn OLD NEW)" t nil)
+
+(autoload 'magit-interactive-rebase "magit" "\
+Start a git rebase -i session, old school-style.
+
+\(fn COMMIT)" t nil)
+
+(autoload 'magit-reset-head "magit" "\
+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').
+
+\(fn REVISION &optional HARD)" t nil)
+
+(autoload 'magit-reset-head-hard "magit" "\
+Switch 'HEAD' to REVISION, losing all changes.
+Uncomitted changes in both working tree and staging area are lost.
+\('git reset --hard REVISION').
+
+\(fn REVISION)" t nil)
+
+(autoload 'magit-reset-working-tree "magit" "\
+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.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'magit-fetch "magit" "\
+Fetch from REMOTE.
+
+\(fn REMOTE)" t nil)
+
+(autoload 'magit-fetch-current "magit" "\
+Run fetch for default remote.
+
+If there is no default remote, ask for one.
+
+\(fn)" t nil)
+
+(autoload 'magit-remote-update "magit" "\
+Update all remotes.
+
+\(fn)" t nil)
+
+(autoload 'magit-pull "magit" "\
+Run git pull.
+
+If there is no default remote, the user is prompted for one and
+its values is saved with git config.  If there is no default
+merge branch, the user is prompted for one and its values is
+saved with git config.  With a prefix argument, the default
+remote is not used and the user is prompted for a remote.  With
+two prefix arguments, the default merge branch is not used and
+the user is prompted for a merge branch.  Values entered by the
+user because of prefix arguments are not saved with git config.
+
+\(fn)" t nil)
+
+(autoload 'magit-push-tags "magit" "\
+Push tags to a remote repository.
+
+Push tags to the current branch's remote.  If that isn't set push
+to \"origin\" or if that remote doesn't exit but only a single
+remote is defined use that.  Otherwise or with a prefix argument
+ask the user what remote to use.
+
+\(fn)" t nil)
+
+(autoload 'magit-push "magit" "\
+Push the current branch to a remote repository.
+
+This command runs the `magit-push-remote' hook.  By default that
+means running `magit-push-dwim'.  So unless you have customized
+the hook this command behaves like this:
+
+With a single prefix argument ask the user what branch to push
+to.  With two or more prefix arguments also ask the user what
+remote to push to.  Otherwise use the remote and branch as
+configured using the Git variables `branch.<name>.remote' and
+`branch.<name>.merge'.  If the former is undefined ask the user.
+If the latter is undefined push without specifing the remote
+branch explicitly.
+
+Also see option `magit-set-upstream-on-push'.
+
+\(fn)" t nil)
+
+(autoload 'magit-commit "magit" "\
+Create a new commit on HEAD.
+With a prefix argument amend to the commit at HEAD instead.
+\('git commit [--amend]').
+
+\(fn &optional AMENDP)" t nil)
+
+(autoload 'magit-commit-amend "magit" "\
+Amend the last commit.
+\('git commit --amend').
+
+\(fn)" t nil)
+
+(autoload 'magit-commit-extend "magit" "\
+Amend the last commit, without editing the message.
+With a prefix argument do change the committer date, otherwise
+don't.  The option `magit-commit-extend-override-date' can be
+used to inverse the meaning of the prefix argument.
+\('git commit --no-edit --amend [--keep-date]').
+
+\(fn &optional OVERRIDE-DATE)" t nil)
+
+(autoload 'magit-commit-reword "magit" "\
+Reword the last commit, ignoring staged changes.
+
+With a prefix argument do change the committer date, otherwise
+don't.  The option `magit-commit-rewrite-override-date' can be
+used to inverse the meaning of the prefix argument.
+
+Non-interactively respect the optional OVERRIDE-DATE argument
+and ignore the option.
+
+\('git commit --only --amend').
+
+\(fn &optional OVERRIDE-DATE)" t nil)
+
+(autoload 'magit-commit-fixup "magit" "\
+Create a fixup commit.
+With a prefix argument the user is always queried for the commit
+to be fixed.  Otherwise the current or marked commit may be used
+depending on the value of option `magit-commit-squash-commit'.
+\('git commit [--no-edit] --fixup=COMMIT').
+
+\(fn &optional COMMIT)" t nil)
+
+(autoload 'magit-commit-squash "magit" "\
+Create a squash commit.
+With a prefix argument the user is always queried for the commit
+to be fixed.  Otherwise the current or marked commit may be used
+depending on the value of option `magit-commit-squash-commit'.
+\('git commit [--no-edit] --fixup=COMMIT').
+
+\(fn &optional COMMIT FIXUP)" t nil)
+
+(autoload 'magit-tag "magit" "\
+Create a new tag with the given NAME at REV.
+With a prefix argument annotate the tag.
+\('git tag [--annotate] NAME REV').
+
+\(fn NAME REV &optional ANNOTATE)" t nil)
+
+(autoload 'magit-delete-tag "magit" "\
+Delete the tag with the given NAME.
+\('git tag -d NAME').
+
+\(fn NAME)" t nil)
+
+(autoload 'magit-stash "magit" "\
+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')
+
+\(fn DESCRIPTION)" t nil)
+
+(autoload 'magit-stash-snapshot "magit" "\
+Create new stash of working tree and staging area; keep changes in place.
+\('git stash save \"Snapshot...\"; git stash apply stash@{0}')
+
+\(fn)" t nil)
+
+(autoload 'magit-submodule-update "magit" "\
+Update the submodule of the current git repository.
+With a prefix arg, do a submodule update --init.
+
+\(fn &optional INIT)" t nil)
+
+(autoload 'magit-submodule-update-init "magit" "\
+Update and init the submodule of the current git repository.
+
+\(fn)" t nil)
+
+(autoload 'magit-submodule-init "magit" "\
+Initialize the submodules.
+
+\(fn)" t nil)
+
+(autoload 'magit-submodule-sync "magit" "\
+Synchronizes submodule's remote URL configuration.
+
+\(fn)" t nil)
+
+(autoload 'magit-bisect-start "magit" "\
+Start a bisect session.
+
+Bisecting a bug means to find the commit that introduced it.
+This command starts such a bisect session by asking for a know
+good and a bad commit.  To move the session forward use the
+other actions from the bisect popup (\\<magit-status-mode-map>\\[magit-key-mode-popup-bisecting]).
+
+\(fn BAD GOOD)" t nil)
+
+(autoload 'magit-bisect-reset "magit" "\
+After bisecting cleanup bisection state and return to original HEAD.
+
+\(fn)" t nil)
+
+(autoload 'magit-bisect-good "magit" "\
+While bisecting, mark the current commit as good.
+Use this after you have asserted that the commit does not contain
+the bug in question.
+
+\(fn)" t nil)
+
+(autoload 'magit-bisect-bad "magit" "\
+While bisecting, mark the current commit as bad.
+Use this after you have asserted that the commit does contain the
+bug in question.
+
+\(fn)" t nil)
+
+(autoload 'magit-bisect-skip "magit" "\
+While bisecting, skip the current commit.
+Use this if for some reason the current commit is not a good one
+to test.  This command lets Git choose a different one.
+
+\(fn)" t nil)
+
+(autoload 'magit-bisect-run "magit" "\
+Bisect automatically by running commands after each step.
+
+\(fn CMDLINE)" t nil)
+
+(autoload 'magit-log "magit" "\
+
+
+\(fn &optional RANGE)" t nil)
+
+(autoload 'magit-log-ranged "magit" "\
+
+
+\(fn RANGE)" t nil)
+
+(autoload 'magit-log-long "magit" "\
+
+
+\(fn &optional RANGE)" t nil)
+
+(autoload 'magit-log-long-ranged "magit" "\
+
+
+\(fn RANGE)" t nil)
+
+(autoload 'magit-file-log "magit" "\
+Display the log for the currently visited file or another one.
+With a prefix argument show the log graph.
+
+\(fn FILE &optional USE-GRAPH)" t nil)
+
+(autoload 'magit-reflog "magit" "\
+Display the reflog of the current branch.
+With a prefix argument another branch can be chosen.
+
+\(fn REF)" t nil)
+
+(autoload 'magit-reflog-head "magit" "\
+Display the HEAD reflog.
+
+\(fn)" t nil)
+
+(autoload 'magit-cherry "magit" "\
+Show commits in a branch that are not merged in the upstream branch.
+
+\(fn HEAD UPSTREAM)" t nil)
+
+(autoload 'magit-save-index "magit" "\
+Add the content of current file as if it was the index.
+
+\(fn)" t nil)
+
+(autoload 'magit-interactive-resolve "magit" "\
+Resolve a merge conflict using Ediff.
+
+\(fn FILE)" t nil)
+
+(autoload 'magit-diff "magit" "\
+Show differences between two commits.
+RANGE should be a range (A..B or A...B) but can also be a single
+commit.  If one side of the range is omitted, then it defaults
+to HEAD.  If just a commit is given, then changes in the working
+tree relative to that commit are shown.
+
+\(fn RANGE &optional WORKING ARGS)" t nil)
+
+(autoload 'magit-diff-working-tree "magit" "\
+Show differences between a commit and the current working tree.
+
+\(fn REV)" t nil)
+
+(autoload 'magit-diff-staged "magit" "\
+Show differences between the index and the HEAD commit.
+
+\(fn)" t nil)
+
+(autoload 'magit-diff-unstaged "magit" "\
+Show differences between the current working tree and index.
+
+\(fn)" t nil)
+
+(autoload 'magit-diff-stash "magit" "\
+Show changes in a stash.
+A Stash consist of more than just one commit.  This command uses
+a special diff range so that the stashed changes actually were a
+single commit.
+
+\(fn STASH &optional NOSELECT)" t nil)
+
+(autoload 'magit-wazzup "magit" "\
+Show a list of branches in a dedicated buffer.
+Unlike in the buffer created by `magit-branch-manager' each
+branch can be expanded to show a list of commits not merged
+into the selected branch.
+
+\(fn BRANCH)" t nil)
+
+(autoload 'magit-branch-manager "magit" "\
+Show a list of branches in a dedicated buffer.
+
+\(fn)" t nil)
+
+(autoload 'magit-init "magit" "\
+Create or reinitialize a Git repository.
+Read directory name and initialize it as new Git repository.
+
+If the directory is below an existing repository, then the user
+has to confirm that a new one should be created inside; or when
+the directory is the root of the existing repository, whether
+it should be reinitialized.
+
+Non-interactively DIRECTORY is always (re-)initialized.
+
+\(fn DIRECTORY)" t nil)
+
+(autoload 'magit-add-change-log-entry "magit" "\
+Find change log file and add date entry and item for current change.
+This differs from `add-change-log-entry' (which see) in that
+it acts on the current hunk in a Magit buffer instead of on
+a position in a file-visiting buffer.
+
+\(fn &optional WHOAMI FILE-NAME OTHER-WINDOW)" t nil)
+
+(autoload 'magit-add-change-log-entry-other-window "magit" "\
+Find change log file in other window and add entry and item.
+This differs from `add-change-log-entry-other-window' (which see)
+in that it acts on the current hunk in a Magit buffer instead of
+on a position in a file-visiting buffer.
+
+\(fn &optional WHOAMI FILE-NAME)" t nil)
+
+(autoload 'magit-run-git-gui "magit" "\
+Run `git gui' for the current git repository.
+
+\(fn)" t nil)
+
+(autoload 'magit-run-git-gui-blame "magit" "\
+Run `git gui blame' on the given FILENAME and COMMIT.
+Interactively run it for the current file and the HEAD, with a
+prefix or when the current file cannot be determined let the user
+choose.  When the current buffer is visiting FILENAME instruct
+blame to center around the line point is on.
+
+\(fn COMMIT FILENAME &optional LINENUM)" t nil)
+
+(autoload 'magit-run-gitk "magit" "\
+Run Gitk for the current git repository.
+Without a prefix argument run `gitk --all', with
+a prefix argument run gitk without any arguments.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "magit-blame" "magit-blame.el" (21721 36920
+;;;;;;  0 0))
+;;; Generated autoloads from magit-blame.el
+
+(autoload 'magit-blame-mode "magit-blame" "\
+Display blame information inline.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "magit-key-mode" "magit-key-mode.el" (21721
+;;;;;;  36920 0 0))
+;;; Generated autoloads from magit-key-mode.el
+
+(defvar magit-key-mode-groups '((dispatch (actions ("b" "Branching" magit-key-mode-popup-branching) ("B" "Bisecting" magit-key-mode-popup-bisecting) ("c" "Committing" magit-key-mode-popup-committing) ("d" "Diff worktree" magit-diff-working-tree) ("D" "Diff" magit-diff) ("f" "Fetching" magit-key-mode-popup-fetching) ("F" "Pulling" magit-key-mode-popup-pulling) ("g" "Refresh Buffers" magit-refresh-all) ("l" "Logging" magit-key-mode-popup-logging) ("m" "Merging" magit-key-mode-popup-merging) ("M" "Remoting" magit-key-mode-popup-remoting) ("P" "Pushing" magit-key-mode-popup-pushing) ("o" "Submoduling" magit-key-mode-popup-submodule) ("r" "Rewriting" magit-key-mode-popup-rewriting) ("R" "Rebasing" magit-rebase-step) ("s" "Show Status" magit-status) ("S" "Stage all" magit-stage-all) ("t" "Tagging" magit-key-mode-popup-tagging) ("U" "Unstage all" magit-unstage-all) ("v" "Show Commit" magit-show-commit) ("V" "Show File" magit-show) ("w" "Wazzup" magit-wazzup) ("X" "Reset worktree" magit-reset-working-tree) ("y" "Cherry" magit-cherry) ("z" "Stashing" magit-key-mode-popup-stashing) ("!" "Running" magit-key-mode-popup-running) ("$" "Show Process" magit-process))) (logging (man-page "git-log") (actions ("l" "Short" magit-log) ("L" "Long" magit-log-long) ("h" "Head Reflog" magit-reflog-head) ("f" "File log" magit-file-log) ("rl" "Ranged short" magit-log-ranged) ("rL" "Ranged long" magit-log-long-ranged) ("rh" "Reflog" magit-reflog)) (switches ("-m" "Only merge commits" "--merges") ("-s" "No merge commits" "--no-merges") ("-do" "Date Order" "--date-order") ("-f" "First parent" "--first-parent") ("-i" "Case insensitive patterns" "-i") ("-pr" "Pickaxe regex" "--pickaxe-regex") ("-g" "Show Graph" "--graph") ("-n" "Name only" "--name-only") ("-am" "All match" "--all-match") ("-al" "All" "--all")) (arguments ("=r" "Relative" "--relative=" read-directory-name) ("=c" "Committer" "--committer=" read-from-minibuffer) ("=>" "Since" "--since=" read-from-minibuffer) ("=<" "Before" "--before=" read-from-minibuffer) ("=a" "Author" "--author=" read-from-minibuffer) ("=g" "Grep messages" "--grep=" read-from-minibuffer) ("=G" "Grep patches" "-G" read-from-minibuffer) ("=L" "Trace evolution of line range [long log only]" "-L" magit-read-file-trace) ("=s" "Pickaxe search" "-S" read-from-minibuffer) ("=b" "Branches" "--branches=" read-from-minibuffer) ("=R" "Remotes" "--remotes=" read-from-minibuffer))) (running (actions ("!" "Git Subcommand (from root)" magit-git-command-topdir) (":" "Git Subcommand (from pwd)" magit-git-command) ("g" "Git Gui" magit-run-git-gui) ("k" "Gitk" magit-run-gitk))) (fetching (man-page "git-fetch") (actions ("f" "Current" magit-fetch-current) ("a" "All" magit-remote-update) ("o" "Other" magit-fetch)) (switches ("-p" "Prune" "--prune"))) (pushing (man-page "git-push") (actions ("P" "Push" magit-push) ("t" "Push tags" magit-push-tags)) (switches ("-f" "Force" "--force") ("-d" "Dry run" "-n") ("-u" "Set upstream" "-u"))) (pulling (man-page "git-pull") (actions ("F" "Pull" magit-pull)) (switches ("-f" "Force" "--force") ("-r" "Rebase" "--rebase"))) (branching (man-page "git-branch") (actions ("v" "Branch manager" magit-branch-manager) ("b" "Checkout" magit-checkout) ("c" "Create" magit-create-branch) ("r" "Rename" magit-rename-branch) ("k" "Delete" magit-delete-branch)) (switches ("-t" "Set upstream configuration" "--track") ("-m" "Merged to HEAD" "--merged") ("-M" "Merged to master" "--merged=master") ("-n" "Not merged to HEAD" "--no-merged") ("-N" "Not merged to master" "--no-merged=master")) (arguments ("=c" "Contains" "--contains=" magit-read-rev-with-default) ("=m" "Merged" "--merged=" magit-read-rev-with-default) ("=n" "Not merged" "--no-merged=" magit-read-rev-with-default))) (remoting (man-page "git-remote") (actions ("v" "Remote manager" magit-branch-manager) ("a" "Add" magit-add-remote) ("r" "Rename" magit-rename-remote) ("k" "Remove" magit-remove-remote))) (tagging (man-page "git-tag") (actions ("t" "Create" magit-tag) ("k" "Delete" magit-delete-tag)) (switches ("-a" "Annotate" "--annotate") ("-f" "Force" "--force") ("-s" "Sign" "--sign"))) (stashing (man-page "git-stash") (actions ("v" "View" magit-diff-stash) ("z" "Save" magit-stash) ("s" "Snapshot" magit-stash-snapshot) ("a" "Apply" magit-stash-apply) ("p" "Pop" magit-stash-pop) ("k" "Drop" magit-stash-drop)) (switches ("-k" "Keep index" "--keep-index") ("-u" "Include untracked files" "--include-untracked") ("-a" "Include all files" "--all"))) (committing (man-page "git-commit") (actions ("c" "Commit" magit-commit) ("a" "Amend" magit-commit-amend) ("e" "Extend" magit-commit-extend) ("r" "Reword" magit-commit-reword) ("f" "Fixup" magit-commit-fixup) ("s" "Squash" magit-commit-squash)) (switches ("-a" "Stage all modified and deleted files" "--all") ("-e" "Allow empty commit" "--allow-empty") ("-v" "Show diff of changes to be committed" "--verbose") ("-n" "Bypass git hooks" "--no-verify") ("-s" "Add Signed-off-by line" "--signoff") ("-R" "Claim authorship and reset author date" "--reset-author")) (arguments ("=A" "Override the author" "--author=" read-from-minibuffer) ("=S" "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key))) (merging (man-page "git-merge") (actions ("m" "Merge" magit-merge) ("A" "Abort" magit-merge-abort)) (switches ("-ff" "Fast-forward only" "--ff-only") ("-nf" "No fast-forward" "--no-ff") ("-sq" "Squash" "--squash")) (arguments ("-st" "Strategy" "--strategy=" read-from-minibuffer))) (rewriting (actions ("b" "Begin" magit-rewrite-start) ("s" "Stop" magit-rewrite-stop) ("a" "Abort" magit-rewrite-abort) ("f" "Finish" magit-rewrite-finish) ("d" "Diff pending" magit-rewrite-diff-pending) ("*" "Set unused" magit-rewrite-set-unused) ("." "Set used" magit-rewrite-set-used))) (apply-mailbox (man-page "git-am") (actions ("J" "Apply Mailbox" magit-apply-mailbox)) (switches ("-s" "add a Signed-off-by line to the commit message" "--signoff") ("-3" "allow fall back on 3way merging if needed" "--3way") ("-k" "pass -k flag to git-mailinfo" "--keep") ("-c" "strip everything before a scissors line" "--scissors") ("-p" "pass it through git-apply" "-p") ("-r" "override error message when patch failure occurs" "--resolvemsg") ("-d" "lie about committer date" "--committer-date-is-author-date") ("-D" "use current timestamp for author date" "--ignore-date") ("-b" "pass -b flag to git-mailinfo" "--keep-non-patch")) (arguments ("=p" "format the patch(es) are in" "--patch-format=" read-from-minibuffer))) (submodule (man-page "git-submodule") (actions ("u" "Update" magit-submodule-update) ("b" "Both update and init" magit-submodule-update-init) ("i" "Init" magit-submodule-init) ("s" "Sync" magit-submodule-sync))) (bisecting (man-page "git-bisect") (actions ("b" "Bad" magit-bisect-bad) ("g" "Good" magit-bisect-good) ("k" "Skip" magit-bisect-skip) ("r" "Reset" magit-bisect-reset) ("s" "Start" magit-bisect-start) ("u" "Run" magit-bisect-run))) (diff-options (actions ("s" "Set" magit-set-diff-options) ("d" "Set default" magit-set-default-diff-options) ("c" "Save default" magit-save-default-diff-options) ("r" "Reset to default" magit-reset-diff-options) ("h" "Toggle Hunk Refinement" magit-diff-toggle-refine-hunk)) (switches ("-m" "Show smallest possible diff" "--minimal") ("-p" "Use patience diff algorithm" "--patience") ("-h" "Use histogram diff algorithm" "--histogram") ("-b" "Ignore whitespace changes" "--ignore-space-change") ("-w" "Ignore all whitespace" "--ignore-all-space") ("-W" "Show surrounding functions" "--function-context")))) "\
+Holds the key, help, function mapping for the log-mode.
+If you modify this make sure you reset `magit-key-mode-keymaps'
+to nil.")
+ (mapc (lambda (g) (eval `(autoload ',(intern (concat "magit-key-mode-popup-" (symbol-name (car g)))) "magit-key-mode" ,(concat "Key menu for " (symbol-name (car g))) t))) magit-key-mode-groups)
+
+;;;***
+
+;;;### (autoloads nil "magit-wip" "magit-wip.el" (21721 36920 0 0))
+;;; Generated autoloads from magit-wip.el
+
+(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 nil nil ("magit-pkg.el") (21721 36920 763320 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; magit-autoloads.el ends here
diff --git a/elpa/magit-90150116/magit-blame.el b/elpa/magit-90150116/magit-blame.el
new file mode 100644
index 000000000..839b9069a
--- /dev/null
+++ b/elpa/magit-90150116/magit-blame.el
@@ -0,0 +1,307 @@
+;;; magit-blame.el --- blame support for Magit
+
+;; Copyright (C) 2012-2014  The Magit Project Developers
+;;
+;; For a full list of contributors, see the AUTHORS.md file
+;; at the top-level directory of this distribution and at
+;; https://raw.github.com/magit/magit/master/AUTHORS.md
+
+;; Author: Yann Hodique <yann.hodique@gmail.com>
+;; Package: magit
+
+;; Contains code from Egg (Emacs Got Git) <https://github.com/byplayer/egg>,
+;; released under the GNU General Public License version 3 or later.
+
+;; 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:
+
+;; Control git-blame from Magit.
+;; This code has been backported from Egg (Magit fork) to Magit.
+
+;;; Code:
+
+(eval-when-compile (require 'cl-lib))
+(require 'magit)
+(require 'easymenu)
+
+;;; Options
+
+(defgroup magit-blame nil
+  "Git-blame support for Magit."
+  :group 'magit-extensions)
+
+(defcustom magit-blame-ignore-whitespace t
+  "Ignore whitespace when determining blame information."
+  :group 'magit-blame
+  :type 'boolean)
+
+(defcustom magit-time-format-string "%Y-%m-%dT%T%z"
+  "How to format time in magit-blame header."
+  :group 'magit-blame
+  :type 'string)
+
+(defface magit-blame-header
+  '((t :inherit magit-section-title))
+  "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)
+
+;;; Keymaps
+
+(defvar magit-blame-map
+  (let ((map (make-sparse-keymap)))
+    (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}")
+
+(easy-menu-define magit-blame-mode-menu magit-blame-map
+  "Magit blame menu"
+  '("Blame"
+    ["Locate Commit" magit-blame-locate-commit t]
+    ["Next" magit-blame-next-chunk t]
+    ["Previous" magit-blame-previous-chunk t]
+    "---"
+    ["Quit" magit-blame-mode t]))
+
+;;; Mode
+
+(defvar-local magit-blame-buffer-read-only nil)
+
+;;;###autoload
+(define-minor-mode magit-blame-mode
+  "Display blame information inline."
+  :keymap magit-blame-map
+  :lighter " blame"
+  (unless (buffer-file-name)
+    (user-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))
+
+  (cond (magit-blame-mode
+         (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))
+        (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)
+                (when (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
+          (apply 'magit-git-insert "blame" "--porcelain"
+                 `(,@(and magit-blame-ignore-whitespace (list "-w")) "--"
+                   ,(file-name-nondirectory (buffer-file-name buffer))))
+          (magit-blame-parse buffer (current-buffer)))))))
+
+;;; Commands
+
+(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)
+      (when (overlay-get ov :blame)
+        (setq sha1 (plist-get (nth 3 (overlay-get ov :blame)) :sha1))))
+    (when sha1
+      (magit-show-commit sha1))))
+
+(defun magit-blame-next-chunk ()
+  "Go to the next blame chunk."
+  (interactive)
+  (let ((next (next-single-property-change (point) :blame)))
+    (when next
+      (goto-char next))))
+
+(defun magit-blame-previous-chunk ()
+  "Go to the previous blame chunk."
+  (interactive)
+  (let ((prev (previous-single-property-change (point) :blame)))
+    (when prev
+      (goto-char prev))))
+
+;;; Parse
+
+(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)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; magit-blame.el ends here
diff --git a/elpa/magit-90150116/magit-blame.elc b/elpa/magit-90150116/magit-blame.elc
new file mode 100644
index 000000000..d1f31b771
Binary files /dev/null and b/elpa/magit-90150116/magit-blame.elc differ
diff --git a/elpa/magit-90150116/magit-key-mode.el b/elpa/magit-90150116/magit-key-mode.el
new file mode 100644
index 000000000..1eaed74ea
--- /dev/null
+++ b/elpa/magit-90150116/magit-key-mode.el
@@ -0,0 +1,735 @@
+;;; magit-key-mode.el --- interactively tune git invocation
+
+;; Copyright (C) 2010-2014  The Magit Project Developers
+;;
+;; For a full list of contributors, see the AUTHORS.md file
+;; at the top-level directory of this distribution and at
+;; https://raw.github.com/magit/magit/master/AUTHORS.md
+
+;; Author: Phil Jackson <phil@shellarchive.co.uk>
+;; Package: magit
+
+;; 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 library implements `magit-key-mode' which is used throughout
+;; Magit to let the user interactively select the command, switches
+;; and options to call Git with.  It can be though of as a way to
+;; provide "postfix" arguments.
+
+;;; Code:
+
+(require 'magit)
+
+(eval-when-compile (require 'cl-lib))
+
+(defvar magit-key-mode-keymaps)
+(defvar magit-key-mode-last-buffer)
+(defvar magit-pre-key-mode-window-conf)
+
+;;; Options
+
+(defcustom magit-key-mode-show-usage t
+  "Whether to show usage information when entering a popup."
+  :group 'magit
+  :type 'boolean)
+
+;;; Faces
+
+(defface magit-key-mode-header-face
+  '((t :inherit font-lock-keyword-face))
+  "Face for key mode header lines."
+  :group 'magit-faces)
+
+(defface magit-key-mode-button-face
+  '((t :inherit font-lock-builtin-face))
+  "Face for key mode buttons."
+  :group 'magit-faces)
+
+(defface magit-key-mode-switch-face
+  '((t :inherit font-lock-warning-face))
+  "Face for key mode switches."
+  :group 'magit-faces)
+
+(defface magit-key-mode-args-face
+  '((t :inherit widget-field))
+  "Face for key mode switch arguments."
+  :group 'magit-faces)
+
+;;; Keygroups
+;;;###autoload
+(defvar magit-key-mode-groups
+  '((dispatch
+     (actions
+      ("b" "Branching"       magit-key-mode-popup-branching)
+      ("B" "Bisecting"       magit-key-mode-popup-bisecting)
+      ("c" "Committing"      magit-key-mode-popup-committing)
+      ("d" "Diff worktree"   magit-diff-working-tree)
+      ("D" "Diff"            magit-diff)
+      ("f" "Fetching"        magit-key-mode-popup-fetching)
+      ("F" "Pulling"         magit-key-mode-popup-pulling)
+      ("g" "Refresh Buffers" magit-refresh-all)
+      ("l" "Logging"         magit-key-mode-popup-logging)
+      ("m" "Merging"         magit-key-mode-popup-merging)
+      ("M" "Remoting"        magit-key-mode-popup-remoting)
+      ("P" "Pushing"         magit-key-mode-popup-pushing)
+      ("o" "Submoduling"     magit-key-mode-popup-submodule)
+      ("r" "Rewriting"       magit-key-mode-popup-rewriting)
+      ("R" "Rebasing"        magit-rebase-step)
+      ("s" "Show Status"     magit-status)
+      ("S" "Stage all"       magit-stage-all)
+      ("t" "Tagging"         magit-key-mode-popup-tagging)
+      ("U" "Unstage all"     magit-unstage-all)
+      ("v" "Show Commit"     magit-show-commit)
+      ("V" "Show File"       magit-show)
+      ("w" "Wazzup"          magit-wazzup)
+      ("X" "Reset worktree"  magit-reset-working-tree)
+      ("y" "Cherry"          magit-cherry)
+      ("z" "Stashing"        magit-key-mode-popup-stashing)
+      ("!" "Running"         magit-key-mode-popup-running)
+      ("$" "Show Process"    magit-process)))
+
+    (logging
+     (man-page "git-log")
+     (actions
+      ("l" "Short" magit-log)
+      ("L" "Long" magit-log-long)
+      ("h" "Head Reflog" magit-reflog-head)
+      ("f" "File log" magit-file-log)
+      ("rl" "Ranged short" magit-log-ranged)
+      ("rL" "Ranged long" magit-log-long-ranged)
+      ("rh" "Reflog" magit-reflog))
+     (switches
+      ("-m" "Only merge commits" "--merges")
+      ("-s" "No merge commits" "--no-merges")
+      ("-do" "Date Order" "--date-order")
+      ("-f" "First parent" "--first-parent")
+      ("-i" "Case insensitive patterns" "-i")
+      ("-pr" "Pickaxe regex" "--pickaxe-regex")
+      ("-g" "Show Graph" "--graph")
+      ("-n" "Name only" "--name-only")
+      ("-am" "All match" "--all-match")
+      ("-al" "All" "--all"))
+     (arguments
+      ("=r" "Relative" "--relative=" read-directory-name)
+      ("=c" "Committer" "--committer=" read-from-minibuffer)
+      ("=>" "Since" "--since=" read-from-minibuffer)
+      ("=<" "Before" "--before=" read-from-minibuffer)
+      ("=a" "Author" "--author=" read-from-minibuffer)
+      ("=g" "Grep messages" "--grep=" read-from-minibuffer)
+      ("=G" "Grep patches" "-G" read-from-minibuffer)
+      ("=L" "Trace evolution of line range [long log only]"
+       "-L" magit-read-file-trace)
+      ("=s" "Pickaxe search" "-S" read-from-minibuffer)
+      ("=b" "Branches" "--branches=" read-from-minibuffer)
+      ("=R" "Remotes" "--remotes=" read-from-minibuffer)))
+
+    (running
+     (actions
+      ("!" "Git Subcommand (from root)" magit-git-command-topdir)
+      (":" "Git Subcommand (from pwd)" magit-git-command)
+      ("g" "Git Gui" magit-run-git-gui)
+      ("k" "Gitk" magit-run-gitk)))
+
+    (fetching
+     (man-page "git-fetch")
+     (actions
+      ("f" "Current" magit-fetch-current)
+      ("a" "All" magit-remote-update)
+      ("o" "Other" magit-fetch))
+     (switches
+      ("-p" "Prune" "--prune")))
+
+    (pushing
+     (man-page "git-push")
+     (actions
+      ("P" "Push" magit-push)
+      ("t" "Push tags" magit-push-tags))
+     (switches
+      ("-f" "Force" "--force")
+      ("-d" "Dry run" "-n")
+      ("-u" "Set upstream" "-u")))
+
+    (pulling
+     (man-page "git-pull")
+     (actions
+      ("F" "Pull" magit-pull))
+     (switches
+      ("-f" "Force" "--force")
+      ("-r" "Rebase" "--rebase")))
+
+    (branching
+     (man-page "git-branch")
+     (actions
+      ("v" "Branch manager" magit-branch-manager)
+      ("b" "Checkout" magit-checkout)
+      ("c" "Create" magit-create-branch)
+      ("r" "Rename" magit-rename-branch)
+      ("k" "Delete" magit-delete-branch))
+     (switches
+      ("-t" "Set upstream configuration" "--track")
+      ("-m" "Merged to HEAD" "--merged")
+      ("-M" "Merged to master" "--merged=master")
+      ("-n" "Not merged to HEAD" "--no-merged")
+      ("-N" "Not merged to master" "--no-merged=master"))
+     (arguments
+      ("=c" "Contains" "--contains=" magit-read-rev-with-default)
+      ("=m" "Merged" "--merged=" magit-read-rev-with-default)
+      ("=n" "Not merged" "--no-merged=" magit-read-rev-with-default)))
+
+    (remoting
+     (man-page "git-remote")
+     (actions
+      ("v" "Remote manager" magit-branch-manager)
+      ("a" "Add" magit-add-remote)
+      ("r" "Rename" magit-rename-remote)
+      ("k" "Remove" magit-remove-remote)))
+
+    (tagging
+     (man-page "git-tag")
+     (actions
+      ("t" "Create" magit-tag)
+      ("k" "Delete" magit-delete-tag))
+     (switches
+      ("-a" "Annotate" "--annotate")
+      ("-f" "Force" "--force")
+      ("-s" "Sign" "--sign")))
+
+    (stashing
+     (man-page "git-stash")
+     (actions
+      ("v" "View" magit-diff-stash)
+      ("z" "Save" magit-stash)
+      ("s" "Snapshot" magit-stash-snapshot)
+      ("a" "Apply" magit-stash-apply)
+      ("p" "Pop" magit-stash-pop)
+      ("k" "Drop" magit-stash-drop))
+     (switches
+      ("-k" "Keep index" "--keep-index")
+      ("-u" "Include untracked files" "--include-untracked")
+      ("-a" "Include all files" "--all")))
+
+    (committing
+     (man-page "git-commit")
+     (actions
+      ("c" "Commit" magit-commit)
+      ("a" "Amend"  magit-commit-amend)
+      ("e" "Extend" magit-commit-extend)
+      ("r" "Reword" magit-commit-reword)
+      ("f" "Fixup"  magit-commit-fixup)
+      ("s" "Squash" magit-commit-squash))
+     (switches
+      ("-a" "Stage all modified and deleted files" "--all")
+      ("-e" "Allow empty commit" "--allow-empty")
+      ("-v" "Show diff of changes to be committed" "--verbose")
+      ("-n" "Bypass git hooks" "--no-verify")
+      ("-s" "Add Signed-off-by line" "--signoff")
+      ("-R" "Claim authorship and reset author date" "--reset-author"))
+     (arguments
+      ("=A" "Override the author" "--author=" read-from-minibuffer)
+      ("=S" "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key)))
+
+    (merging
+     (man-page "git-merge")
+     (actions
+      ("m" "Merge" magit-merge)
+      ("A" "Abort" magit-merge-abort))
+     (switches
+      ("-ff" "Fast-forward only" "--ff-only")
+      ("-nf" "No fast-forward" "--no-ff")
+      ("-sq" "Squash" "--squash"))
+     (arguments
+      ("-st" "Strategy" "--strategy=" read-from-minibuffer)))
+
+    (rewriting
+     (actions
+      ("b" "Begin" magit-rewrite-start)
+      ("s" "Stop" magit-rewrite-stop)
+      ("a" "Abort" magit-rewrite-abort)
+      ("f" "Finish" magit-rewrite-finish)
+      ("d" "Diff pending" magit-rewrite-diff-pending)
+      ("*" "Set unused" magit-rewrite-set-unused)
+      ("." "Set used" magit-rewrite-set-used)))
+
+    (apply-mailbox
+     (man-page "git-am")
+     (actions
+      ("J" "Apply Mailbox" magit-apply-mailbox))
+     (switches
+      ("-s" "add a Signed-off-by line to the commit message" "--signoff")
+      ("-3" "allow fall back on 3way merging if needed" "--3way")
+      ("-k" "pass -k flag to git-mailinfo" "--keep")
+      ("-c" "strip everything before a scissors line" "--scissors")
+      ("-p" "pass it through git-apply" "-p")
+      ("-r" "override error message when patch failure occurs" "--resolvemsg")
+      ("-d" "lie about committer date" "--committer-date-is-author-date")
+      ("-D" "use current timestamp for author date" "--ignore-date")
+      ("-b" "pass -b flag to git-mailinfo" "--keep-non-patch"))
+     (arguments
+      ("=p" "format the patch(es) are in" "--patch-format=" read-from-minibuffer)))
+
+    (submodule
+     (man-page "git-submodule")
+     (actions
+      ("u" "Update" magit-submodule-update)
+      ("b" "Both update and init" magit-submodule-update-init)
+      ("i" "Init" magit-submodule-init)
+      ("s" "Sync" magit-submodule-sync)))
+
+    (bisecting
+     (man-page "git-bisect")
+     (actions
+      ("b" "Bad" magit-bisect-bad)
+      ("g" "Good" magit-bisect-good)
+      ("k" "Skip" magit-bisect-skip)
+      ("r" "Reset" magit-bisect-reset)
+      ("s" "Start" magit-bisect-start)
+      ("u" "Run" magit-bisect-run)))
+
+    (diff-options
+     (actions
+      ("s" "Set" magit-set-diff-options)
+      ("d" "Set default" magit-set-default-diff-options)
+      ("c" "Save default" magit-save-default-diff-options)
+      ("r" "Reset to default" magit-reset-diff-options)
+      ("h" "Toggle Hunk Refinement" magit-diff-toggle-refine-hunk))
+     (switches
+      ("-m" "Show smallest possible diff" "--minimal")
+      ("-p" "Use patience diff algorithm" "--patience")
+      ("-h" "Use histogram diff algorithm" "--histogram")
+      ("-b" "Ignore whitespace changes" "--ignore-space-change")
+      ("-w" "Ignore all whitespace" "--ignore-all-space")
+      ("-W" "Show surrounding functions" "--function-context"))
+     ))
+  "Holds the key, help, function mapping for the log-mode.
+If you modify this make sure you reset `magit-key-mode-keymaps'
+to nil.")
+
+(defun magit-key-mode-delete-group (group)
+  "Delete a group from `magit-key-mode-keymaps'."
+  (let ((items (assoc group magit-key-mode-groups)))
+    (when items
+      ;; reset the cache
+      (setq magit-key-mode-keymaps nil)
+      ;; delete the whole group
+      (setq magit-key-mode-groups
+            (delq items magit-key-mode-groups))
+      ;; unbind the defun
+      (magit-key-mode-de-generate group))
+    magit-key-mode-groups))
+
+(defun magit-key-mode-add-group (group)
+  "Add a new group to `magit-key-mode-keymaps'.
+If there already is a group of that name then this will
+completely remove it and put in its place an empty one of the
+same name."
+  (when (assoc group magit-key-mode-groups)
+    (magit-key-mode-delete-group group))
+  (setq magit-key-mode-groups
+        (cons (list group (list 'actions) (list 'switches) (list 'arguments))
+              magit-key-mode-groups)))
+
+(defun magit-key-mode-key-defined-p (for-group key)
+  "Return t if KEY is defined as any option within FOR-GROUP.
+The option may be a switch, argument or action."
+  (catch 'result
+    (let ((options (magit-key-mode-options-for-group for-group)))
+      (dolist (type '(actions switches arguments))
+        (when (assoc key (assoc type options))
+          (throw 'result t))))))
+
+(defun magit-key-mode-update-group (for-group thing &rest args)
+  "Abstraction for setting values in `magit-key-mode-keymaps'."
+  (let* ((options (magit-key-mode-options-for-group for-group))
+         (things (assoc thing options))
+         (key (car args)))
+    (if (cdr things)
+        (if (magit-key-mode-key-defined-p for-group key)
+            (error "%s is already defined in the %s group." key for-group)
+          (setcdr (cdr things) (cons args (cddr things))))
+      (setcdr things (list args)))
+    (setq magit-key-mode-keymaps nil)
+    things))
+
+(defun magit-key-mode-insert-argument (for-group key desc arg read-func)
+  "Add a new binding KEY in FOR-GROUP which will use READ-FUNC
+to receive input to apply to argument ARG git is run.  DESC should
+be a brief description of the binding."
+  (magit-key-mode-update-group for-group 'arguments key desc arg read-func))
+
+(defun magit-key-mode-insert-switch (for-group key desc switch)
+  "Add a new binding KEY in FOR-GROUP which will add SWITCH to git's
+command line when it runs.  DESC should be a brief description of
+the binding."
+  (magit-key-mode-update-group for-group 'switches key desc switch))
+
+(defun magit-key-mode-insert-action (for-group key desc func)
+  "Add a new binding KEY in FOR-GROUP which will run command FUNC.
+DESC should be a brief description of the binding."
+  (magit-key-mode-update-group for-group 'actions key desc func))
+
+(defun magit-key-mode-options-for-group (for-group)
+  "Retrieve the options for the group FOR-GROUP.
+This includes switches, commands and arguments."
+  (or (cdr (assoc for-group magit-key-mode-groups))
+      (error "Unknown group '%s'" for-group)))
+
+;;; Commands
+
+(defun magit-key-mode-help (for-group)
+  "Provide help for a key within FOR-GROUP.
+The user is prompted for the key."
+  (let* ((opts (magit-key-mode-options-for-group for-group))
+         (man-page (cadr (assoc 'man-page opts)))
+         (seq (read-key-sequence
+               (format "Enter command prefix%s: "
+                       (if man-page
+                           (format ", `?' for man `%s'" man-page)
+                         ""))))
+         (actions (cdr (assoc 'actions opts))))
+    (cond
+      ;; if it is an action popup the help for the to-be-run function
+      ((assoc seq actions) (describe-function (nth 2 (assoc seq actions))))
+      ;; if there is "?" show a man page if there is one
+      ((equal seq "?")
+       (if man-page
+           (man man-page)
+         (error "No man page associated with `%s'" for-group)))
+      (t (error "No help associated with `%s'" seq)))))
+
+(defun magit-key-mode-exec-at-point ()
+  "Run action/args/option at point."
+  (interactive)
+  (let ((key (or (get-text-property (point) 'key-group-executor)
+                 (error "Nothing at point to do."))))
+    (call-interactively (lookup-key (current-local-map) key))))
+
+(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 " ")))
+
+;;; Keymaps
+
+(defvar magit-key-mode-keymaps nil
+  "This will be filled lazily with proper keymaps.
+These keymaps are created using `define-key' as they're requested.")
+
+(defun magit-key-mode-build-keymap (for-group)
+  "Construct a normal looking keymap for the key mode to use.
+Put it in `magit-key-mode-keymaps' 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)))
+
+    (let ((defkey (lambda (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)))))
+      (dolist (k actions)
+        (funcall defkey k `(magit-key-mode-command ',(nth 2 k))))
+      (dolist (k switches)
+        (funcall defkey k `(magit-key-mode-toggle-option ',for-group ,(nth 2 k))))
+      (dolist (k arguments)
+        (funcall defkey k `(magit-key-mode-add-argument
+                            ',for-group ,(nth 2 k) ',(nth 3 k)))))
+
+    (push (cons for-group map) magit-key-mode-keymaps)
+    map))
+
+;;; Toggling and Running
+
+(defvar magit-key-mode-prefix nil
+  "Prefix argument to the command that brought up the key-mode window.
+For internal use.  Used by the command that's eventually invoked.")
+
+(defvar magit-key-mode-current-args nil
+  "A hash-table of current argument set.
+These will eventually make it to the git command-line.")
+
+(defvar magit-key-mode-current-options nil
+  "Current option set.
+These will eventually make it to the git command-line.")
+
+(defvar magit-custom-options nil
+  "List of custom options to pass to Git.
+Do not customize this (used in the `magit-key-mode' implementation).")
+
+(defun magit-key-mode-command (func)
+  (let ((current-prefix-arg (or current-prefix-arg magit-key-mode-prefix))
+        (magit-custom-options magit-key-mode-current-options))
+    (maphash (lambda (k v)
+               (push (concat k v) magit-custom-options))
+             magit-key-mode-current-args)
+    (set-window-configuration magit-pre-key-mode-window-conf)
+    (kill-buffer magit-key-mode-last-buffer)
+    (when func
+      (setq this-command func)
+      (call-interactively this-command))))
+
+(defun magit-key-mode-add-argument (for-group arg-name input-func)
+  (let ((input (funcall input-func (concat arg-name ": "))))
+    (puthash arg-name input magit-key-mode-current-args)
+    (magit-key-mode-redraw for-group)))
+
+(defun magit-key-mode-toggle-option (for-group option-name)
+  "Toggles the appearance of OPTION-NAME in `magit-key-mode-current-options'."
+  (if (member option-name magit-key-mode-current-options)
+      (setq magit-key-mode-current-options
+            (delete option-name magit-key-mode-current-options))
+    (add-to-list 'magit-key-mode-current-options option-name))
+  (magit-key-mode-redraw for-group))
+
+;;; Mode
+
+(defvar magit-key-mode-buf-name "*magit-key: %s*"
+  "Format string to create the name of the magit-key buffer.")
+
+(defvar magit-key-mode-last-buffer nil
+  "Store the last magit-key buffer used.")
+
+(defvar magit-pre-key-mode-window-conf nil
+  "Will hold the pre-menu configuration of magit.")
+
+(defun magit-key-mode (for-group &optional original-opts)
+  "Mode for magit key selection.
+All commands, switches and options can be toggled/actioned with
+the key combination highlighted before the description."
+  (interactive)
+  ;; save the window config to restore it as was (no need to make this
+  ;; buffer local)
+  (setq magit-pre-key-mode-window-conf
+        (current-window-configuration))
+  ;; setup the mode, draw the buffer
+  (let ((buf (get-buffer-create (format magit-key-mode-buf-name
+                                        (symbol-name for-group)))))
+    (setq magit-key-mode-last-buffer buf)
+    (split-window-vertically)
+    (other-window 1)
+    (switch-to-buffer buf)
+    (kill-all-local-variables)
+    (set (make-local-variable 'scroll-margin) 0)
+    (set (make-local-variable
+          'magit-key-mode-current-options)
+         original-opts)
+    (set (make-local-variable
+          'magit-key-mode-current-args)
+         (make-hash-table))
+    (set (make-local-variable 'magit-key-mode-prefix) current-prefix-arg)
+    (magit-key-mode-redraw for-group))
+  (when magit-key-mode-show-usage
+    (message (concat "Type a prefix key to toggle it. "
+                     "Run 'actions' with their prefixes. "
+                     "'?' for more help."))))
+
+(defun magit-key-mode-get-key-map (for-group)
+  "Get or build the keymap for FOR-GROUP."
+  (or (cdr (assoc for-group magit-key-mode-keymaps))
+      (magit-key-mode-build-keymap for-group)))
+
+(defun magit-key-mode-redraw (for-group)
+  "(re)draw the magit key buffer."
+  (let ((buffer-read-only nil)
+        (current-exec (get-text-property (point) 'key-group-executor))
+        (new-exec-pos)
+        (old-point (point))
+        (is-first (zerop (buffer-size)))
+        (actions-p nil))
+    (erase-buffer)
+    (make-local-variable 'font-lock-defaults)
+    (use-local-map (magit-key-mode-get-key-map for-group))
+    (setq actions-p (magit-key-mode-draw for-group))
+    (delete-trailing-whitespace)
+    (setq mode-name "magit-key-mode" major-mode 'magit-key-mode)
+    (when current-exec
+      (setq new-exec-pos
+            (cdr (assoc current-exec
+                        (magit-key-mode-build-exec-point-alist)))))
+    (cond ((and is-first actions-p)
+           (goto-char actions-p)
+           (magit-key-mode-jump-to-next-exec))
+          (new-exec-pos
+           (goto-char new-exec-pos)
+           (skip-chars-forward " "))
+          (t
+           (goto-char old-point))))
+  (setq buffer-read-only t)
+  (fit-window-to-buffer))
+
+(defun magit-key-mode-build-exec-point-alist ()
+  (save-excursion
+    (goto-char (point-min))
+    (let* ((exec (get-text-property (point) 'key-group-executor))
+           (exec-alist (and exec `((,exec . ,(point))))))
+      (cl-do nil ((eobp) (nreverse exec-alist))
+        (when (not (eq exec (get-text-property (point) 'key-group-executor)))
+          (setq exec (get-text-property (point) 'key-group-executor))
+          (when exec (push (cons exec (point)) exec-alist)))
+        (forward-char)))))
+
+;;; Draw Buffer
+
+(defun magit-key-mode-draw-header (header)
+  "Draw a header with the correct face."
+  (insert (propertize header 'face 'magit-key-mode-header-face) "\n"))
+
+(defvar magit-key-mode-args-in-cols nil
+  "When true, draw arguments in columns as with switches and options.")
+
+(defun magit-key-mode-draw-args (args)
+  "Draw the args part of the menu."
+  (magit-key-mode-draw-buttons
+   "Args"
+   args
+   (lambda (x)
+     (format "(%s) %s"
+             (nth 2 x)
+             (propertize (gethash (nth 2 x) magit-key-mode-current-args "")
+                         'face 'magit-key-mode-args-face)))
+   (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 'magit-key-mode-switch-face)
+                        s))))))
+
+(defun magit-key-mode-draw-actions (actions)
+  "Draw the actions part of the menu."
+  (magit-key-mode-draw-buttons "Actions" actions nil))
+
+(defun magit-key-mode-draw-buttons (section xs maker
+                                    &optional one-col-each)
+  (when xs
+    (magit-key-mode-draw-header section)
+    (magit-key-mode-draw-in-cols
+     (mapcar (lambda (x)
+               (let* ((head (propertize (car x) 'face 'magit-key-mode-button-face))
+                      (desc (nth 1 x))
+                      (more (and maker (funcall maker x)))
+                      (text (format " %s: %s%s%s"
+                                    head desc (if more " " "") (or more ""))))
+                 (propertize text 'key-group-executor (car x))))
+             xs)
+     one-col-each)))
+
+(defun magit-key-mode-draw-in-cols (strings one-col-each)
+  "Given a list of strings, print in columns (using `insert').
+If ONE-COL-EACH is true then don't columify, but rather, draw
+each item on one line."
+  (let ((longest-act (apply 'max (mapcar 'length strings))))
+    (while strings
+      (let ((str (car strings)))
+        (let ((padding (make-string (- (+ longest-act 3) (length str)) ? )))
+          (insert str)
+          (if (or one-col-each
+                  (and (> (+ (length padding) ;
+                             (current-column)
+                             longest-act)
+                          (window-width))
+                       (cdr strings)))
+              (insert "\n")
+            (insert padding))))
+      (setq strings (cdr strings))))
+  (insert "\n"))
+
+(defun magit-key-mode-draw (for-group)
+  "Draw actions, switches and parameters.
+Return the point before the actions part, if any, nil otherwise."
+  (let* ((options (magit-key-mode-options-for-group for-group))
+         (switches (cdr (assoc 'switches options)))
+         (arguments (cdr (assoc 'arguments options)))
+         (actions (cdr (assoc 'actions options)))
+         (p nil))
+    (magit-key-mode-draw-switches switches)
+    (magit-key-mode-draw-args arguments)
+    (when actions (setq p (point-marker)))
+    (magit-key-mode-draw-actions actions)
+    (insert "\n")
+    p))
+
+;;; Generate Groups
+
+(defun magit-key-mode-de-generate (group)
+  "Unbind the function for GROUP."
+  (fmakunbound
+   (intern (concat "magit-key-mode-popup-" (symbol-name group)))))
+
+(defun magit-key-mode-generate (group)
+  "Generate the key-group menu for GROUP."
+  (let ((opts (magit-key-mode-options-for-group group)))
+    (eval
+     `(defun ,(intern (concat "magit-key-mode-popup-" (symbol-name group))) nil
+        ,(concat "Key menu for " (symbol-name group))
+        (interactive)
+        (magit-key-mode
+         (quote ,group)
+         ;; As a tempory kludge it is okay to do this here.
+         ,(cl-case group
+            (logging
+             '(list "--graph"))
+            (diff-options
+             '(when (local-variable-p 'magit-diff-options)
+                magit-diff-options))))))))
+
+;; create the interactive functions for the key mode popups (which are
+;; applied in the top-level key maps)
+(mapc (lambda (g)
+        (magit-key-mode-generate (car g)))
+      magit-key-mode-groups)
+
+;;;###autoload (mapc (lambda (g) (eval `(autoload ',(intern (concat "magit-key-mode-popup-" (symbol-name (car g)))) "magit-key-mode" ,(concat "Key menu for " (symbol-name (car g))) t))) magit-key-mode-groups)
+
+(provide 'magit-key-mode)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; magit-key-mode.el ends here
diff --git a/elpa/magit-90150116/magit-key-mode.elc b/elpa/magit-90150116/magit-key-mode.elc
new file mode 100644
index 000000000..d9e4970be
Binary files /dev/null and b/elpa/magit-90150116/magit-key-mode.elc differ
diff --git a/elpa/magit-90150116/magit-pkg.el b/elpa/magit-90150116/magit-pkg.el
new file mode 100644
index 000000000..2528f7f5f
--- /dev/null
+++ b/elpa/magit-90150116/magit-pkg.el
@@ -0,0 +1,9 @@
+(define-package "magit" "90150116" "control Git from Emacs"
+  '((cl-lib "0.3")
+    (git-commit-mode "0.14.0")
+    (git-rebase-mode "0.14.0"))
+  :keywords
+  '("vc" "tools"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/elpa/magit-90150116/magit-wip.el b/elpa/magit-90150116/magit-wip.el
new file mode 100644
index 000000000..4de3d6150
--- /dev/null
+++ b/elpa/magit-90150116/magit-wip.el
@@ -0,0 +1,143 @@
+;;; magit-wip.el --- git-wip plug-in for Magit
+
+;; Copyright (C) 2012-2014  The Magit Project Developers
+;;
+;; For a full list of contributors, see the AUTHORS.md file
+;; at the top-level directory of this distribution and at
+;; https://raw.github.com/magit/magit/master/AUTHORS.md
+
+;; Author: Jonas Bernoulli <jonas@bernoul.li>
+;; Keywords: vc tools
+;; Package: magit
+
+;; 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.
+
+;; 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.
+;;
+;;   (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)
+
+(defun magit-wip-mode (&rest ignore)
+  (message "magit-wip-mode is obsolete and doesn't do anything"))
+(make-obsolete 'magit-wip-mode "This mode is a noop now" "2.0.0")
+
+;;; Options
+
+(defgroup magit-wip nil
+  "Git-Wip support for Magit."
+  :group 'magit-extensions)
+
+(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
+%g the root of the git repository
+%r the name of the file being saved,
+   relative to the repository root."
+  :group 'magit-wip
+  :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
+%g the root of the git repository
+%r the name of the file being saved,
+   relative to the repository root."
+  :group 'magit-wip
+  :type '(choice (const :tag "No message" nil) string))
+
+(defvar magit-wip-save-mode-lighter " Wip")
+
+;;; Mode
+
+;;;###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 t t)
+    (remove-hook 'after-save-hook 'magit-wip-save t)))
+
+;;;###autoload
+(define-globalized-minor-mode global-magit-wip-save-mode
+  magit-wip-save-mode turn-on-magit-wip-save
+  :group 'magit-wip)
+
+(defun turn-on-magit-wip-save ()
+  "Conditionally turn on magit-wip-save-mode.
+
+Turn on magit-wip-save-mode if the buffer is a file in a git
+repository where wip-save is enabled in git config.
+
+You can activate it with git config magit.extension wip-save."
+  (when (and (buffer-file-name)
+             (magit-get-top-dir)
+             (magit-git-true "rev-parse" "--is-inside-work-tree")
+             (member "wip-save" (magit-get-all "magit.extension")))
+    (if (magit-git-success "wip" "-h")
+        (magit-wip-save-mode 1)
+      (message "Git command 'git wip' cannot be found"))))
+
+(defun magit-wip-save ()
+  (let* ((filename (expand-file-name (file-truename (buffer-file-name))))
+         (filedir  (file-name-directory filename))
+         (toplevel (magit-get-top-dir filedir))
+         (blobname (file-relative-name filename toplevel))
+         (spec `((?f . ,filename)
+                 (?r . ,blobname)
+                 (?g . ,toplevel))))
+    (when (and toplevel (file-writable-p toplevel)
+               (not (member blobname
+                            (let ((default-directory filedir))
+                              (magit-git-lines
+                               "ls-files" "--other" "--ignored"
+                               "--exclude-standard" "--full-name")))))
+      (magit-run-git "wip" "save"
+                     (format-spec magit-wip-commit-message spec)
+                     "--editor" "--" filename)
+      (when magit-wip-echo-area-message
+        (message (format-spec magit-wip-echo-area-message spec))))))
+
+(provide 'magit-wip)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; magit-wip.el ends here
diff --git a/elpa/magit-90150116/magit-wip.elc b/elpa/magit-90150116/magit-wip.elc
new file mode 100644
index 000000000..78c0758ca
Binary files /dev/null and b/elpa/magit-90150116/magit-wip.elc differ
diff --git a/elpa/magit-90150116/magit.el b/elpa/magit-90150116/magit.el
new file mode 100644
index 000000000..dd3ada9d1
--- /dev/null
+++ b/elpa/magit-90150116/magit.el
@@ -0,0 +1,7824 @@
+;;; magit.el --- control Git from Emacs
+
+;; Copyright (C) 2008-2014  The Magit Project Developers
+;;
+;; For a full list of contributors, see the AUTHORS.md file
+;; at the top-level directory of this distribution and at
+;; https://raw.github.com/magit/magit/master/AUTHORS.md
+
+;; Author: Marius Vollmer <marius.vollmer@gmail.com>
+;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
+;; Former-Maintainers:
+;;	Nicolas Dudebout  <nicolas.dudebout@gatech.edu>
+;;	Peter J. Weisberg <pj@irregularexpressions.net>
+;;	Phil Jackson      <phil@shellarchive.co.uk>
+;;	Rémi Vanicat      <vanicat@debian.org>
+;;	Yann Hodique      <yann.hodique@gmail.com>
+
+;; Keywords: vc tools
+;; Package: magit
+;; Package-Requires: ((cl-lib "0.3") (git-commit-mode "0.14.0") (git-rebase-mode "0.14.0"))
+
+;; Magit requires at least GNU Emacs 23.2 and Git 1.7.2.5.
+;; These are the versions shipped by Debian oldstable (6.0, Squeeze).
+
+;; Contains code from GNU Emacs <https://www.gnu.org/software/emacs/>,
+;; released under the GNU General Public License version 3 or later.
+
+;; 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:
+
+(defvar magit-version 'undefined
+  "The version of Magit that you're using.
+Use the function by the same name instead of this variable.")
+;; The value is set at the end of this file, using the
+;; function `magit-version' which is also defined there.
+
+;;;; Dependencies
+
+(when (version< emacs-version "23.2")
+  (error "Magit requires at least GNU Emacs 23.2"))
+
+;; Users may choose to use `magit-log-edit' instead of the preferred
+;; `git-commit-mode', by simply putting it on the `load-path'.  If
+;; it can be found there then it is loaded at the end of this file.
+(unless (locate-library "magit-log-edit")
+  (require 'git-commit-mode))
+
+(require 'git-rebase-mode)
+
+(require 'ansi-color)
+(require 'autorevert)
+(require 'cl-lib)
+(require 'diff-mode)
+(require 'easymenu)
+(require 'epa)
+(require 'format-spec)
+(require 'grep)
+(require 'help-mode)
+(require 'ring)
+(require 'server)
+(require 'tramp)
+(require 'view)
+
+(eval-when-compile
+  (require 'dired)
+  (require 'dired-x)
+  (require 'ediff)
+  (require 'eshell)
+  (require 'ido)
+  (require 'iswitchb)
+  (require 'package nil t)
+  (require 'view))
+
+;;;; Declarations
+
+(if (featurep 'vc-git)
+    (defalias 'magit-grep 'vc-git-grep)
+  (defalias 'magit-grep 'lgrep))
+
+(declare-function dired-jump 'dired-x)
+(declare-function dired-uncache 'dired)
+(declare-function ediff-cleanup-mess 'ediff)
+(declare-function eshell-parse-arguments 'eshell)
+(declare-function ido-completing-read 'ido)
+(declare-function iswitchb-read-buffer 'iswitchb)
+(declare-function package-desc-vers 'package)
+(declare-function package-desc-version 'package)
+(declare-function package-version-join 'package)
+(declare-function view-mode 'view)
+
+(defvar git-commit-previous-winconf)
+(defvar magit-commit-buffer-name)
+(defvar magit-custom-options)
+(defvar magit-log-buffer-name)
+(defvar magit-marked-commit)
+(defvar magit-process-buffer-name)
+(defvar magit-reflog-buffer-name)
+(defvar magit-refresh-args)
+(defvar magit-stash-buffer-name)
+(defvar magit-status-buffer-name)
+(defvar magit-this-process)
+(defvar package-alist)
+
+;;;; Compatibility
+
+(eval-and-compile
+
+  ;; Added in Emacs 24.3
+  (unless (fboundp 'user-error)
+    (defalias 'user-error 'error))
+
+  ;; Added in Emacs 24.3 (mirrors/emacs@b335efc3).
+  (unless (fboundp 'setq-local)
+    (defmacro setq-local (var val)
+      "Set variable VAR to value VAL in current buffer."
+      (list 'set (list 'make-local-variable (list 'quote var)) val)))
+
+  ;; Added in Emacs 24.3 (mirrors/emacs@b335efc3).
+  (unless (fboundp 'defvar-local)
+    (defmacro defvar-local (var val &optional docstring)
+      "Define VAR as a buffer-local variable with default value VAL.
+Like `defvar' but additionally marks the variable as being automatically
+buffer-local wherever it is set."
+      (declare (debug defvar) (doc-string 3))
+      (list 'progn (list 'defvar var val docstring)
+            (list 'make-variable-buffer-local (list 'quote var)))))
+
+  ;; Added in Emacs 24.1
+  (unless (fboundp 'run-hook-wrapped)
+    (defun run-hook-wrapped-1 (hook fns wrap-function &rest args)
+      (cl-loop for fn in fns
+               if (and (eq fn t)
+                       (local-variable-p hook)
+                       (default-boundp hook)
+                       (apply 'run-hook-wrapped-1 nil
+                              (default-value hook) wrap-function args))
+               return it
+               else if (and (functionp fn) (apply wrap-function fn args))
+               return it))
+
+    (defun run-hook-wrapped  (hook wrap-function &rest args)
+      "Run HOOK, passing each function through WRAP-FUNCTION.
+I.e. instead of calling each function FUN directly with arguments ARGS,
+it calls WRAP-FUNCTION with arguments FUN and ARGS.
+As soon as a call to WRAP-FUNCTION returns non-nil, `run-hook-wrapped'
+aborts and returns that value."
+      (when (boundp hook)
+        (let ((fns (symbol-value hook)))
+          (apply 'run-hook-wrapped-1 hook
+                 (if (functionp fns) (list fns) fns)
+                 wrap-function args)))))
+  )
+
+
+;;; Settings
+;;;; Custom Groups
+
+(defgroup magit nil
+  "Controlling Git from Emacs."
+  :group 'tools)
+
+(defgroup magit-process nil
+  "Git and other external processes used by Magit."
+  :group 'magit)
+
+(defgroup magit-modes nil
+  "Modes provided by Magit."
+  :group 'magit)
+
+(defgroup magit-status nil
+  "Inspect and manipulate Git repositories."
+  :group 'magit-modes)
+
+(defgroup magit-diff nil
+  "Inspect and manipulate Git diffs."
+  :group 'magit-modes)
+
+(defgroup magit-commit nil
+  "Inspect and manipulate Git commits."
+  :group 'magit-modes)
+
+(defgroup magit-log nil
+  "Inspect and manipulate Git history."
+  :group 'magit-modes)
+
+(defgroup magit-extensions nil
+  "Extensions to Magit."
+  :group 'magit)
+
+(defgroup magit-faces nil
+  "Faces used by Magit."
+  :group 'magit
+  :group 'faces)
+
+(when (featurep 'gitattributes-mode)
+  (custom-add-to-group 'magit-modes 'gitattributes-mode 'custom-group))
+
+(when (featurep 'git-commit-mode)
+  (custom-add-to-group 'magit-modes 'git-commit       'custom-group)
+  (custom-add-to-group 'magit-faces 'git-commit-faces 'custom-group))
+
+(when (featurep 'git-rebase-mode)
+  (custom-add-to-group 'magit-modes 'git-rebase       'custom-group)
+  (custom-add-to-group 'magit-faces 'git-rebase-faces 'custom-group))
+
+(custom-add-to-group 'magit 'vc-follow-symlinks 'custom-variable)
+
+;;;; Custom Options
+;;;;; Processes
+
+(defcustom magit-git-executable
+  (or (and (eq system-type 'windows-nt)
+           ;; On Windows asking for "git" from $PATH might also return
+           ;; a "git.exe" or "git.cmd".  Using "bin/git.exe" directly
+           ;; is faster than using one of the wrappers "cmd/git.exe"
+           ;; or "cmd/git.cmd".  The wrappers are likely to come
+           ;; earlier on $PATH, and so we have to exlicitly use
+           ;; the former.
+           (let ((exe (executable-find "git.exe")))
+             (when exe
+               (let ((alt (directory-file-name (file-name-directory exe))))
+                 (if (and (equal (file-name-nondirectory alt) "cmd")
+                          (setq alt (expand-file-name
+                                     (convert-standard-filename "bin/git.exe")
+                                     (file-name-directory alt)))
+                          (file-executable-p alt))
+                     alt
+                   exe)))))
+      ;; When the only cost is finding the executable, then it it
+      ;; better not to cache the full path.  It might not be installed
+      ;; in the same location on machines whose repositories are
+      ;; accessed using Tramp.
+      "git")
+  "The Git executable used by Magit."
+  :group 'magit-process
+  :type 'string)
+
+(defcustom magit-git-standard-options
+  '("--no-pager" "-c" "core.preloadindex=true")
+  "Standard options when running Git.
+Be careful what you add here, especially if you are using
+tramp to connect to servers with ancient Git versions."
+  :group 'magit-process
+  :type '(repeat string))
+
+(defcustom magit-gitk-executable
+  (or (and (eq system-type 'windows-nt)
+           (let ((exe (expand-file-name
+                       "gitk" (file-name-nondirectory magit-git-executable))))
+             (and (file-executable-p exe) exe)))
+      (executable-find "gitk") "gitk")
+  "The Gitk executable."
+  :group 'magit-process
+  :set-after '(magit-git-executable)
+  :type 'string)
+
+(defun magit-locate-emacsclient ()
+  "Search for a suitable Emacsclient executable."
+  (let ((path (cl-copy-list exec-path)) fixup client)
+    (when invocation-directory
+      (setq path (cons (directory-file-name invocation-directory) path))
+      (when (eq system-type 'darwin)
+        (setq fixup (expand-file-name "bin" invocation-directory))
+        (when (file-directory-p fixup)
+          (push fixup path))
+        (when (string-match "^Emacs-\\(powerpc\\|i386\\|x86_64\\)-\\(.+\\)"
+                            invocation-name)
+          (setq fixup (expand-file-name
+                       (format "bin-%s-%s"
+                               (match-string 1 invocation-name)
+                               (match-string 2 invocation-name))
+                       invocation-directory))
+          (when (file-directory-p fixup)
+            (push fixup path)))
+        (when (string-match-p "Cellar" invocation-directory)
+          (setq fixup (expand-file-name "../../../bin" invocation-directory))
+          (when (file-directory-p fixup)
+            (push fixup path))))
+      (setq path (delete-dups path)))
+    (setq client (magit-locate-emacsclient-1 path 3))
+    (if client
+        (shell-quote-argument client)
+      (display-warning 'magit (format "\
+Cannot determine a suitable Emacsclient
+
+Determining an Emacsclient executable suitable for the
+current Emacs instance failed.  For more information
+please see https://github.com/magit/magit/wiki/Emacsclient."))
+      nil)))
+
+(defun magit-take (n l) ; until we get to use `-take' from dash
+  (let (r) (dotimes (_ n) (and l (push (pop l) r))) (nreverse r)))
+
+(defun magit-locate-emacsclient-1 (path depth)
+  (let* ((version-lst (magit-take depth (split-string emacs-version "\\.")))
+         (version-reg (concat "^" (mapconcat #'identity version-lst "\\."))))
+    (or (locate-file-internal
+         "emacsclient" path
+         (cl-mapcan
+          (lambda (v) (cl-mapcar (lambda (e) (concat v e)) exec-suffixes))
+          (nconc (cl-mapcon (lambda (v)
+                              (setq v (mapconcat #'identity (reverse v) "."))
+                              (list v (concat "-" v)))
+                            (reverse version-lst))
+                 (list "")))
+         (lambda (exec)
+           (ignore-errors
+             (string-match-p version-reg (magit-emacsclient-version exec)))))
+        (and (> depth 1)
+             (magit-locate-emacsclient-1 path (1- depth))))))
+
+(defun magit-emacsclient-version (exec)
+  (cadr (split-string (car (process-lines exec "--version")))))
+
+(defcustom magit-emacsclient-executable (magit-locate-emacsclient)
+  "The Emacsclient executable.
+If the default is nil, or commiting or rebasing is somehow broken,
+please see https://github.com/magit/magit/wiki/Emacsclient."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :type '(choice (string :tag "Executable")
+                 (const :tag "Don't use Emacsclient" nil)))
+
+(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-process
+  :type '(choice (const :tag "pipe" nil)
+                 (const :tag "pty" t)))
+
+(defcustom magit-process-popup-time -1
+  "Popup the process buffer if a command takes longer than this many seconds."
+  :group 'magit-process
+  :type '(choice (const :tag "Never" -1)
+                 (const :tag "Immediately" 0)
+                 (integer :tag "After this many seconds")))
+
+(defcustom magit-process-log-max 32
+  "Maximum number of sections to keep in a process log buffer.
+When adding a new section would go beyond the limit set here,
+then the older half of the sections are remove.  Sections that
+belong to processes that are still running are never removed."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :type 'integer)
+
+(defcustom magit-process-quote-curly-braces
+  (and (eq system-type 'windows-nt)
+       (let ((case-fold-search t))
+         (string-match-p "cygwin" magit-git-executable))
+       t)
+  "Whether curly braces should be quoted when calling git.
+This may be necessary when using Windows.  On all other system
+types this must always be nil.
+
+We are not certain when quoting is needed, but it appears it is
+needed when using Cygwin Git but not when using stand-alone Git.
+The default value is set based on that assumptions.  If this
+turns out to be wrong you can customize this option but please
+also comment on issue #816."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :set-after '(magit-git-executable)
+  :type 'boolean)
+
+(defcustom magit-process-yes-or-no-prompt-regexp
+   " [\[(]\\([Yy]\\(?:es\\)?\\)[/|]\\([Nn]o?\\)[\])] ?[?:] ?$"
+  "Regexp matching Yes-or-No prompts of git and its subprocesses."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :type 'regexp)
+
+(defcustom magit-process-password-prompt-regexps
+  '("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$"
+    "^\\(Enter \\)?[Pp]assword\\( for '.*'\\)?: ?$"
+    "^.*'s password: ?$"
+    "^Yubikey for .*: ?$")
+  "List of regexps matching password prompts of git and its subprocesses."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :type '(repeat (regexp)))
+
+(defcustom magit-process-username-prompt-regexps
+  '("^Username for '.*': ?$")
+  "List of regexps matching username prompts of git and its subprocesses."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :type '(repeat (regexp)))
+
+(defconst magit-server-window-type
+  '(choice
+    (const :tag "Use selected window"
+           :match (lambda (widget value)
+                    (not (functionp value)))
+           nil)
+    (function-item :tag "Display in new frame" switch-to-buffer-other-frame)
+    (function-item :tag "Use pop-to-buffer" pop-to-buffer)
+    (function :tag "Other function")))
+
+(defcustom magit-server-window-for-commit 'pop-to-buffer
+  "Function used to select a window for displaying commit message buffers.
+It should take one argument (a buffer) and display and select it.
+A common value is `pop-to-buffer'.  It can also be nil in which
+case the selected window is used."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :type magit-server-window-type)
+
+(defcustom magit-server-window-for-rebase server-window
+  "Function used to select a window for displaying interactive rebase buffers.
+It should take one argument (a buffer) and display and select it.
+A common value is `pop-to-buffer'.  It can also be nil in which
+case the selected window is used."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-process
+  :set-after '(server-window)
+  :type magit-server-window-type)
+
+;;;;; Staging
+
+(defcustom magit-stage-all-confirm t
+  "Whether to require confirmation before staging all changes.
+This reduces the risk of accidentally losing the index.  If
+nothing at all is staged yet, then always stage without requiring
+confirmation, because it can be undone without the risk of losing
+a carefully crafted index."
+  :package-version '(magit . "2.0.0")
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-unstage-all-confirm t
+  "Whether to require confirmation before unstaging all changes.
+This reduces the risk of accidentally losing of the index.  If
+there are no staged changes at all, then always unstage without
+confirmation, because it can be undone without the risk of losing
+a carefully crafted index."
+  :package-version '(magit . "2.0.0")
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-revert-item-confirm t
+  "Whether to require confirmation before reverting hunks.
+If you disable this, consider enabling `magit-revert-backup'
+instead."
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-revert-backup nil
+  "Whether to backup a hunk before reverting it.
+The hunk is stored in \".git/magit/reverted.diff\" and can be
+applied using `magit-revert-undo'.  Older hunks are available
+in the same directory as numbered backup files and have to be
+applied manually.  Only individual hunks are backed up; when
+a complete file is reverted (which requires confirmation) no
+backup is created."
+  :package-version '(magit . "2.1.0")
+  :group 'magit
+  :type 'boolean)
+
+(defcustom magit-save-some-buffers t
+  "Whether certain commands save modified buffers before running.
+
+nil        don't save buffers.
+t          ask which buffers to save.
+`dontask'  save all 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-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)))
+
+;;;;; Highlighting
+
+(defun magit-set-variable-and-refresh (symbol value)
+  "Set SYMBOL to VALUE and call `magit-refresh-all'."
+  (set-default symbol value)
+  ;; If magit isn't fully loaded yet no buffer that might
+  ;; need refreshing can exist and we can take a shortcut.
+  ;; We also don't want everything to repeatedly refresh
+  ;; when evaluating this file.
+  (when (and (featurep 'magit) (not buffer-file-name))
+    (magit-refresh-all)))
+
+(defcustom magit-highlight-whitespace t
+  "Specify 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
+  :set 'magit-set-variable-and-refresh
+  :type '(choice (const :tag "Always" t)
+                 (const :tag "Never" nil)
+                 (const :tag "In status buffer" status)))
+
+(defcustom magit-highlight-trailing-whitespace t
+  "Whether to highlight whitespace at the end of a line in diffs.
+Used only when `magit-highlight-whitespace' is non-nil."
+  :group 'magit
+  :set 'magit-set-variable-and-refresh
+  :type 'boolean)
+
+(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
+  :set 'magit-set-variable-and-refresh
+  :type `(repeat (cons (string :tag "Directory regexp")
+                       (choice (const :tag "Tabs" tabs)
+                               (integer :tag "Spaces" :value ,tab-width)
+                               (const :tag "Neither" nil))))) ;^FIXME
+
+(defcustom magit-item-highlight-face 'magit-item-highlight
+  "The face used to highlight the current section.
+
+By default the highlighting of the current section is done using
+the background color specified by face `magit-item-highlight'.
+
+If you don't want to use the background to do the highlighting,
+this *might* by as easy as customizing that face.  However if you
+are using a theme, which in turn sets the background color of
+that face then, due to limitations in face inheritance when using
+themes, you might be forced to use another face.
+
+Unfortunately it is only possible to override a face attribute,
+set by a theme, but not to drop it entirely.  This means that one
+has to explicitly use the `default' background color, to make it
+appear *as if* the background wasn't used.
+
+One reason you might want to *not* use the background, is that
+doing so forces the use of overlays for parts of diffs and for
+refnames.  Using overlays potentially degrades performance when
+generating large diffs.  Also see option `magit-use-overlays'."
+  :package-version '(magit . "2.0.0")
+  :group 'magit
+  :group 'magit-faces
+  :type '(choice (const magit-item-highlight)
+                 (const bold)
+                 (face  :tag "Other face")
+                 (const :tag "Don't highlight" nil)))
+
+(defcustom magit-use-overlays
+  (not (eq magit-item-highlight-face 'bold))
+  "Whether to use overlays to highlight various diff components.
+
+This has to be non-nil if the current section is highlighted by
+changing the background color.  Otherwise background colors that
+hold semantic meaning, like that of the added and removed lines
+in diffs, as well as section headings, would be shadowed by the
+highlighting.
+
+To select the face used for highlighting customize the option
+`magit-item-highlight-face'.  If you set that to `bold' or some
+other face that does not use the background then you can set this
+option to nil.  Doing so could potentially improve performance
+when generating large diffs."
+  :package-version '(magit . "2.1.0")
+  :group 'magit
+  :group 'magit-faces
+  :set-after '(magit-item-highlight-face)
+  :type 'boolean)
+
+(define-obsolete-variable-alias 'magit-diff-use-overlays
+  'magit-use-overlays "2.1.0")
+
+;;;;; Completion
+
+(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-remote-ref-format 'remote-slash-branch
+  "How to format refs when autocompleting, in particular for remotes.
+
+Autocompletion is used by functions like `magit-checkout',
+`magit-interactive-rebase' and others which offer branch name
+completion.
+
+`remote-slash-branch'  Format refs as \"remote/branch\".
+`branch-then-remote'   Format refs as \"branch (remote)\"."
+  :package-version '(magit . "2.0.0")
+  :group 'magit
+  :type '(choice (const :tag "branch (remote)" branch-then-remote)
+                 (const :tag "remote/branch" remote-slash-branch)))
+
+(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 directory))
+
+(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)
+
+;;;;; Modes
+;;;;;; Common
+
+(defcustom magit-mode-hook nil
+  "Hook run when entering a Magit mode derived mode."
+  :options '(magit-load-config-extensions)
+  :group 'magit-modes
+  :type 'hook)
+
+(defcustom magit-show-xref-buttons '(magit-diff-mode magit-commit-mode)
+  "List of modes whose buffers should contain history buttons.
+Currently only `magit-diff-mode' and `magit-commit-mode' are
+supported."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type '(repeat (choice (const magit-diff-mode)
+                         (const magit-commit-mode))))
+
+(defcustom magit-show-child-count nil
+  "Whether to append the number of childen to section headings."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type 'boolean)
+
+(defvar magit-status-line-align-to 9)
+
+(defcustom magit-restore-window-configuration nil
+  "Whether quitting a Magit buffer restores previous window configuration.
+
+Function `magit-mode-display-buffer' is used to display and
+select Magit buffers.  Unless the buffer was already displayed in
+a window of the selected frame it also stores the previous window
+configuration.  If this option is non-nil that configuration will
+later be restored by `magit-mode-quit-window', provided the
+buffer has not since been displayed in another frame.
+
+This works best when only two windows are usually displayed in a
+frame.  If this isn't the case setting this to t might often lead
+to undesirable behaviour.  Also quitting a Magit buffer while
+another Magit buffer that was created earlier is still displayed
+will cause that buffer to be hidden, which might or might not be
+what you want."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type 'boolean)
+
+(defcustom magit-refs-namespaces
+  '(("^\\(HEAD\\)$"              magit-log-head-label-head nil)
+    ("^refs/tags/\\(.+\\)"       magit-log-head-label-tags nil)
+    ("^refs/heads/\\(.+\\)"      magit-log-head-label-local nil)
+    ("^refs/remotes/\\(.+\\)"    magit-log-head-label-remote nil)
+    ("^refs/bisect/\\(bad\\)"    magit-log-head-label-bisect-bad nil)
+    ("^refs/bisect/\\(skip.*\\)" magit-log-head-label-bisect-skip nil)
+    ("^refs/bisect/\\(good.*\\)" magit-log-head-label-bisect-good nil)
+    ("^refs/wip/\\(.+\\)"        magit-log-head-label-wip nil)
+    ("^refs/patches/\\(.+\\)"    magit-log-head-label-patches nil)
+    ("^\\(bad\\):"               magit-log-head-label-bisect-bad nil)
+    ("^\\(skip\\):"              magit-log-head-label-bisect-skip nil)
+    ("^\\(good\\):"              magit-log-head-label-bisect-good nil)
+    ("\\(.+\\)"                  magit-log-head-label-default nil))
+  "How different refs should be formatted for display.
+
+Each entry controls how a certain type of ref is displayed, and
+has the form (REGEXP FACE FORMATTER).  REGEXP is a regular
+expression used to match full refs.  The first entry whose REGEXP
+matches the reference is used.  The first regexp submatch becomes
+the \"label\" that represents the ref and is propertized with
+font FONT.  If FORMATTER is non-nil it should be a function that
+takes two arguments, the full ref and the face.  It is supposed
+to return a propertized label that represents the ref.
+
+Currently this variable is only used in logs and the branch
+manager but it will be used in more places in the future."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type '(repeat
+          (list regexp
+                face
+                (choice (const :tag "first submatch is label" nil)
+                        (function :tag "format using function")))))
+
+;;;;;; Status
+
+(defcustom magit-status-mode-hook nil
+  "Hook run when the `magit-status' buffer is created."
+  :group 'magit-status
+  :type 'hook)
+
+(defcustom magit-status-sections-hook
+  '(magit-insert-status-local-line
+    magit-insert-status-remote-line
+    magit-insert-status-head-line
+    magit-insert-status-tags-line
+    magit-insert-status-merge-line
+    magit-insert-status-rebase-lines
+    magit-insert-empty-line
+    magit-insert-rebase-sequence
+    magit-insert-bisect-output
+    magit-insert-bisect-rest
+    magit-insert-bisect-log
+    magit-insert-stashes
+    magit-insert-untracked-files
+    magit-insert-pending-commits
+    magit-insert-unstaged-changes
+    magit-insert-staged-changes
+    magit-insert-unpulled-commits
+    magit-insert-unpushed-commits)
+  "Hook run to insert sections into the status buffer.
+
+This option allows reordering the sections and adding sections
+that are by default displayed in other Magit buffers.  Doing the
+latter is currently not recommended because not all functions
+that insert sections have been adapted yet.  Only inserters that
+take no argument can be used and some functions exist that begin
+with the `magit-insert-' prefix but do not insert a section.
+
+Note that there are already plans to improve this and to add
+similar hooks for other Magit modes."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-status
+  :type 'hook)
+
+(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-status
+  :type '(radio (function-item switch-to-buffer)
+                (function-item pop-to-buffer)
+                (function :tag "Other")))
+
+(defcustom magit-status-show-sequence-help t
+  "Whether to show instructions on how to proceed a stopped action.
+When this is non-nil and a commit failed to apply during a merge
+or rebase, then show instructions on how to continue."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-status
+  :type 'boolean)
+
+(defcustom magit-status-tags-line-subject 'head
+  "Whether tag or head is the subject on tags line in status buffer.
+
+This controls how the words \"ahead\" and \"behind\" are used on
+the tags line in the status buffer.  The tags line does not
+actually display complete sentences, but when thinking about when
+to use which term, it helps imagining it did.  This option
+controls whether the tag names should be considered the subjects
+or objects in these sentences.
+
+`tag'   The previous tag is *behind* HEAD by N commits.
+        The next tag is *ahead* of HEAD by N commits.
+`head'  HEAD is *ahead* of the previous tag by N commits.
+        HEAD is *behind* the next tag by N commits.
+
+If the value is `tag' the commit counts are fontified; otherwise
+they are not (due to semantic considerations)."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-status
+  :type '(choice (const :tag "tags are the subjects" tag)
+                 (const :tag "head is the subject" head)))
+
+;;;;;; Diff
+
+(defun magit-set-default-diff-options (symbol value)
+  "Set the default for `magit-diff-options' based on popup value.
+Also set the local value in all Magit buffers and refresh them.
+\n(fn)" ; The arguments are an internal implementation detail.
+  (interactive (list 'magit-diff-options magit-custom-options))
+  (set-default symbol value)
+  (when (and (featurep 'magit) (not buffer-file-name))
+    (dolist (buffer (buffer-list))
+      (when (derived-mode-p 'magit-mode)
+        (with-current-buffer buffer
+          (with-no-warnings
+            (setq-local magit-diff-options value))
+          (magit-mode-refresh-buffer))))))
+
+(defcustom magit-diff-options nil
+  "Git options used to display diffs.
+
+For more information about the options see man:git-diff.
+This variable can be conveniently set in Magit buffers
+using `magit-key-mode-popup-diff-options' (bound to \
+\\<magit-mode-map>\\[magit-key-mode-popup-diff-options]).
+
+Please note that not all of these options are supported by older
+versions of Git, which could become a problem if you use tramp to
+access repositories on a system with such a version.  If you see
+whitespace where you would have expected a diff, this likely is
+the cause, and the only (currently) workaround is to not make the
+problematic option a member of the default value."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-diff
+  :set 'magit-set-default-diff-options
+  :type '(set :greedy t
+              (const :tag
+                     "--minimal              Show smallest possible diff"
+                     "--minimal")
+              (const :tag
+                     "--patience             Use patience diff algorithm"
+                     "--patience")
+              (const :tag
+                     "--histogram            Use histogram diff algorithm"
+                     "--histogram")
+              (const :tag
+                     "--ignore-space-change  Ignore whitespace changes"
+                     "--ignore-space-change")
+              (const :tag
+                     "--ignore-all-space     Ignore all whitespace"
+                     "--ignore-all-space")
+              (const :tag
+                     "--function-context     Show surrounding functions"
+                     "--function-context")))
+
+(put 'magit-diff-options 'permanent-local t)
+
+(defcustom magit-show-diffstat t
+  "Whether to show diffstat in diff and commit buffers."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-diff
+  :group 'magit-commit
+  :type 'boolean)
+
+(defcustom magit-diff-refine-hunk nil
+  "Show fine (word-granularity) differences within diff hunks.
+
+There are three possible settings:
+
+nil    never show fine differences
+t      show fine differences for the selected diff hunk only
+`all'  show fine differences for all displayed diff hunks"
+  :group 'magit-diff
+  :type '(choice (const :tag "Never" nil)
+                 (const :tag "Selected only" t)
+                 (const :tag "All" all))
+  :set 'magit-set-variable-and-refresh)
+
+;;;;;; Commit
+
+(defcustom magit-commit-ask-to-stage t
+  "Whether to ask to stage everything when committing and nothing is staged."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-commit
+  :type 'boolean)
+
+(defcustom magit-commit-extend-override-date nil
+  "Whether using `magit-commit-extend' changes the committer date."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-commit
+  :type 'boolean)
+
+(defcustom magit-commit-reword-override-date nil
+  "Whether using `magit-commit-reword' changes the committer date."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-commit
+  :type 'boolean)
+
+(defcustom magit-commit-squash-commit nil
+  "Whether to target the marked or current commit when squashing.
+
+When this is nil then the command `magit-commit-fixup' and
+`magit-commit-squash' always require that the user explicitly
+selects a commit.  This is also the case when these commands are
+used with a prefix argument, in which case this option is ignored.
+
+Otherwise this controls which commit to target, either the
+current or marked commit.  Or if both can be used, which should
+be preferred."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-commit
+  :type
+  '(choice
+    (const :tag "Always prompt" nil)
+    (const :tag "Prefer current commit, else use marked" current-or-marked)
+    (const :tag "Prefer marked commit, else use current" marked-or-current)
+    (const :tag "Use current commit, if any" current)
+    (const :tag "Use marked commit, if any" marked)))
+
+(defcustom magit-expand-staged-on-commit nil
+  "Whether to expand staged changes when creating a commit.
+When this is non-nil and the current buffer is the status buffer
+expand the section containing staged changes.  If this is `full'
+always expand all subsections; if it is t subsections that were
+previously hidden remain hidden.
+
+In the event that expanding very large patches takes a long time
+\\<global-map>\\[keyboard-quit] can be used to abort that step.
+This is especially useful when you would normally not look at the
+changes, e.g. because you are committing some binary files."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-commit
+  :type '(choice (const :tag "Expand all subsections" full)
+                 (const :tag "Expand top section" t)
+                 (const :tag "Don't expand" nil)))
+
+;;;;;; Log
+
+(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-log
+  :type 'boolean)
+
+(defcustom magit-log-cutoff-length 100
+  "The maximum number of commits to show in the log and whazzup buffers."
+  :group 'magit-log
+  :type 'integer)
+
+(defcustom magit-log-infinite-length 99999
+  "Number of log used to show as maximum for `magit-log-cutoff-length'."
+  :group 'magit-log
+  :type 'integer)
+
+(defcustom magit-log-format-graph-function nil
+  "Function used to format graphs in log buffers.
+The function is called with one argument, the propertized graph
+of a single line in as a string.  It has to return the formatted
+string.  This option can also be nil, in which case the graph is
+inserted as is."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-log
+  :type '(choice (const :tag "insert as is" nil)
+                 (function-item magit-log-format-unicode-graph)
+                 function))
+
+(defcustom magit-log-format-unicode-graph-alist
+  '((?/ . ?╱) (?| . ?│) (?\\ . ?╲) (?* . ?◆) (?o . ?◇))
+  "Alist used by `magit-log-format-unicode-graph' to translate chars."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-log
+  :type '(repeat (cons :format "%v\n"
+                       (character :format "replace %v ")
+                       (character :format "with %v"))))
+
+(defcustom magit-log-show-gpg-status nil
+  "Display signature verification information as part of the log."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-log
+  :type 'boolean)
+
+(defcustom magit-log-show-margin t
+  "Whether to use a margin when showing `oneline' logs.
+When non-nil the author name and date are displayed in the margin
+of the log buffer if that contains a `oneline' log.  This can be
+toggled temporarily using the command `magit-log-toggle-margin'."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-log
+  :type 'boolean)
+
+(put 'magit-log-show-margin 'permanent-local t)
+
+(defcustom magit-log-margin-spec '(25 nil magit-duration-spec)
+  "How to format the margin for `oneline' logs.
+
+When the log buffer contains a `oneline' log, then it optionally
+uses the right margin to display the author name and author date.
+This is also supported in the reflog buffer.
+
+Logs that are shown together with other non-log information (e.g.
+in the status buffer) are never accompanied by a margin.  The
+same applies to `long' logs, in this case because that would be
+redundant.
+
+This option controls how that margin is formatted, the other
+option affecting this is `magit-log-show-margin'; if that is nil
+then no margin is displayed at all.  To toggle this temporarily
+use the command `magit-log-show-margin'.
+
+The value has the form (WIDTH CHARACTERP DURATION-SPEC).  The
+width of the margin is controlled using WIDTH, an integer.  When
+CHARACTERP is non-nil time units are shown as single characters,
+otherwise the full name of the unit is displayed.  DURATION-SPEC
+has to be a variable, its value controls which time units are
+used, how many seconds they contain, and what their names are."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-log
+  :type '(list (integer  :tag "Margin width")
+               (choice   :tag "Time unit style"
+                         (const :tag "Character" t)
+                         (const :tag "Word" nil))
+               (variable :tag "Duration spec variable")))
+
+(defcustom magit-duration-spec
+  `((?Y "year"   "years"   ,(round (* 60 60 24 365.2425)))
+    (?M "month"  "months"  ,(round (* 60 60 24 30.436875)))
+    (?w "week"   "weeks"   ,(* 60 60 24 7))
+    (?d "day"    "days"    ,(* 60 60 24))
+    (?h "hour"   "hours"   ,(* 60 60))
+    (?m "minute" "minutes" 60)
+    (?s "second" "seconds" 1))
+  "Units used to display durations in a human format.
+The value is a list of time units, beginning with the longest.
+Each element has the form ((CHAR UNIT UNITS SECONDS)..).  UNIT
+is the time unit, UNITS is the plural of that unit.  CHAR is a
+character that can be used as abbreviation and must be unique
+amoung all elements.  SECONDS is the number of seconds in one
+UNIT.  Also see option `magit-log-margin-spec'."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-log
+  :type '(repeat (list (character :tag "Unit character")
+                       (string    :tag "Unit singular string")
+                       (string    :tag "Unit plural string")
+                       (integer   :tag "Seconds in unit"))))
+
+(defcustom magit-ellipsis #x2026 ; "horizontal ellipsis"
+  "Character appended to abreviated text.
+Currently this is used only in the log margin, but might later
+be used elsewhere too.  Filenames that were abbreviated by Git
+are left as-is."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-log
+  :type 'character)
+
+;;;;;; Others
+
+(defcustom magit-auto-revert-mode-lighter " MRev"
+  "String to display when Magit-Auto-Revert mode is active."
+  :group 'magit-modes)
+
+(define-minor-mode magit-auto-revert-mode
+  "Toggle global Magit-Auto-Revert mode.
+With prefix ARG, enable Magit-Auto-Revert mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Magit-Auto-Revert mode is a global minor mode that, after Magit
+has run a Git command, reverts buffers associated with files that
+have changed on disk and are tracked in the current Git repository."
+  :group 'magit-modes
+  :lighter magit-auto-revert-mode-lighter
+  :global t
+  :init-value t)
+
+(defcustom magit-merge-warn-dirty-worktree t
+  "Whether to issue a warning when attempting to start a merge in a dirty worktree."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type 'boolean)
+
+(defcustom magit-push-hook '(magit-push-dwim)
+  "Hook run by `magit-push' to actually do the work.
+See `magit-push' and `magit-push-dwim' for more information."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type 'hook)
+
+(defcustom magit-set-upstream-on-push nil
+  "Whether `magit-push' may set upstream when pushing a branch.
+This only applies if the branch does not have an upstream set yet.
+
+nil        don't use --set-upstream.
+t          ask if --set-upstream should be used.
+`dontask'  always use --set-upstream.
+`refuse'   refuse to push unless a remote branch has already been set."
+  :group 'magit-modes
+  :type '(choice (const :tag "Never" nil)
+                 (const :tag "Ask" t)
+                 (const :tag "Ask if not set" askifnotset)
+                 (const :tag "Refuse" refuse)
+                 (const :tag "Always" dontask)))
+
+(defcustom magit-wazzup-sections-hook
+  '(magit-insert-wazzup-head-line
+    magit-insert-empty-line
+    magit-insert-wazzup-branches)
+  "Hook run to insert sections into the wazzup buffer."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type 'hook)
+
+(defcustom magit-cherry-sections-hook
+  '(magit-insert-cherry-head-line
+    magit-insert-cherry-upstream-line
+    magit-insert-cherry-help-lines
+    magit-insert-empty-line
+    magit-insert-cherry-commits)
+  "Hook run to insert sections into the cherry buffer."
+  :package-version '(magit . "2.0.0")
+  :group 'magit-modes
+  :type 'hook)
+
+;;;; Custom Faces
+
+(defface magit-section-title
+  '((t :inherit header-line))
+  "Face for section titles."
+  :group 'magit-faces)
+
+(defface magit-branch
+  '((((class color) (background light))
+     :background "Grey85"
+     :foreground "LightSkyBlue4")
+    (((class color) (background dark))
+     :background "Grey13"
+     :foreground "LightSkyBlue1"))
+  "Face for branches."
+  :group 'magit-faces)
+
+(defface magit-tag
+  '((((class color) (background light))
+     :background "LemonChiffon1"
+     :foreground "goldenrod4")
+    (((class color) (background dark))
+     :background "LemonChiffon1"
+     :foreground "goldenrod4"))
+  "Face for tags."
+  :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-del
+  '((t :inherit diff-removed))
+  "Face for lines in a diff that have been deleted."
+  :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-merge-current
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for merge conflict marker 'current' line."
+  :group 'magit-faces)
+
+(defface magit-diff-merge-separator
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for merge conflict marker seperator."
+  :group 'magit-faces)
+
+(defface magit-diff-merge-diff3-separator
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for merge conflict marker seperator."
+  :group 'magit-faces)
+
+(defface magit-diff-merge-proposed
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for merge conflict marker 'proposed' line."
+  :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-author
+  '((((class color) (background light))
+     :foreground "firebrick")
+    (((class color) (background dark))
+     :foreground "tomato"))
+  "Face for the author element of the log output."
+  :group 'magit-faces)
+
+(defface magit-log-date
+  '((t))
+  "Face for the date 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-cherry-unmatched
+  '((t :foreground "cyan"))
+  "Face for unmatched cherry commits.")
+
+(defface magit-cherry-equivalent
+  '((t :foreground "magenta"))
+  "Face for equivalent cherry commits.")
+
+(defface magit-item-highlight
+  '((t :inherit secondary-selection))
+  "Face for highlighting the current item."
+  :group 'magit-faces)
+
+(defface magit-item-mark
+  '((t :inherit highlight))
+  "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-skip
+  '((((class color) (background light))
+     :box t
+     :background "light goldenrod"
+     :foreground "dark goldenrod")
+    (((class color) (background dark))
+     :box t
+     :background "light goldenrod"
+     :foreground "dark goldenrod"))
+  "Face for skipped 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)
+
+(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-head
+  '((((class color) (background light))
+     :box t
+     :background "Grey70"
+     :foreground "Black")
+    (((class color) (background dark))
+     :box t
+     :background "Grey20"
+     :foreground "White"))
+  "Face for working 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)
+
+(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)
+
+(defface magit-signature-good
+  '((t :foreground "green"))
+  "Face for good signatures."
+  :group 'magit-faces)
+
+(defface magit-signature-bad
+  '((t :foreground "red"))
+  "Face for bad signatures."
+  :group 'magit-faces)
+
+(defface magit-signature-untrusted
+  '((t :foreground "cyan"))
+  "Face for good untrusted signatures."
+  :group 'magit-faces)
+
+(defface magit-signature-none
+  '((t :inherit magit-log-message))
+  "Face for unsigned commits."
+  :group 'magit-faces)
+
+
+(defface magit-log-reflog-label-commit
+  '((((class color) (background light))
+     :box t
+     :background "LemonChiffon1"
+     :foreground "goldenrod4")
+    (((class color) (background dark))
+     :box t
+     :background "LemonChiffon1"
+     :foreground "goldenrod4"))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-amend
+  '((t :inherit magit-log-reflog-label-commit))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-merge
+  '((t :inherit magit-log-reflog-label-commit))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-checkout
+  '((((class color) (background light))
+     :box t
+     :background "Grey85"
+     :foreground "LightSkyBlue4")
+    (((class color) (background dark))
+     :box t
+     :background "Grey13"
+     :foreground "LightSkyBlue1"))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-reset
+  '((((class color) (background light))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4")
+    (((class color) (background dark))
+     :box t
+     :background "IndianRed1"
+     :foreground "IndianRed4"))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-rebase
+  '((((class color) (background light))
+     :box t
+     :background "Grey85"
+     :foreground "OliveDrab4")
+    (((class color) (background dark))
+     :box t
+     :background "Grey11"
+     :foreground "DarkSeaGreen2"))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-cherry-pick
+'((((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 reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-remote
+  '((((class color) (background light))
+     :box t
+     :background "Grey50")
+    (((class color) (background dark))
+     :box t
+     :background "Grey50"))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-log-reflog-label-other
+  '((((class color) (background light))
+     :box t
+     :background "Grey50")
+    (((class color) (background dark))
+     :box t
+     :background "Grey50"))
+  "Face for reflog subject labels shown in reflog buffer."
+  :group 'magit-faces)
+
+(defface magit-process-ok
+  '((t :inherit magit-section-title
+       :foreground "green"))
+  "Face for zero exit-status."
+  :group 'magit-faces)
+
+(defface magit-process-ng
+  '((t :inherit magit-section-title
+       :foreground "red"))
+  "Face for non-zero exit-status."
+  :group 'magit-faces)
+
+;;;; Keymaps
+
+;; Not an option to avoid advertising it.
+(defvar magit-rigid-key-bindings nil
+  "Use rigid key bindings instead of thematic key popups.
+If you enable this a lot of functionality is lost.  You most
+likely don't want that.  This variable only has an effect if
+set before loading libary `magit'.")
+
+(when (boundp 'git-commit-mode-map)
+  (define-key git-commit-mode-map (kbd "C-c C-d") 'magit-diff-staged))
+
+(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-key-mode-popup-dispatch)
+    (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)
+    (define-key map (kbd "RET") 'magit-visit-item)
+    (define-key map (kbd "C-<return>") 'magit-dired-jump)
+    (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)
+    (cond (magit-rigid-key-bindings
+           (define-key map (kbd "c") 'magit-commit)
+           (define-key map (kbd "m") 'magit-merge)
+           (define-key map (kbd "b") 'magit-checkout)
+           (define-key map (kbd "M") 'magit-branch-manager)
+           (define-key map (kbd "r") 'undefined)
+           (define-key map (kbd "f") 'magit-fetch-current)
+           (define-key map (kbd "F") 'magit-pull)
+           (define-key map (kbd "J") 'magit-apply-mailbox)
+           (define-key map (kbd "!") 'magit-git-command-topdir)
+           (define-key map (kbd "P") 'magit-push)
+           (define-key map (kbd "t") 'magit-tag)
+           (define-key map (kbd "l") 'magit-log)
+           (define-key map (kbd "o") 'magit-submodule-update)
+           (define-key map (kbd "B") 'undefined)
+           (define-key map (kbd "z") 'magit-stash))
+          (t
+           (define-key map (kbd "c") 'magit-key-mode-popup-committing)
+           (define-key map (kbd "m") 'magit-key-mode-popup-merging)
+           (define-key map (kbd "b") 'magit-key-mode-popup-branching)
+           (define-key map (kbd "M") 'magit-key-mode-popup-remoting)
+           (define-key map (kbd "r") 'magit-key-mode-popup-rewriting)
+           (define-key map (kbd "f") 'magit-key-mode-popup-fetching)
+           (define-key map (kbd "F") 'magit-key-mode-popup-pulling)
+           (define-key map (kbd "J") 'magit-key-mode-popup-apply-mailbox)
+           (define-key map (kbd "!") 'magit-key-mode-popup-running)
+           (define-key map (kbd "P") 'magit-key-mode-popup-pushing)
+           (define-key map (kbd "t") 'magit-key-mode-popup-tagging)
+           (define-key map (kbd "l") 'magit-key-mode-popup-logging)
+           (define-key map (kbd "o") 'magit-key-mode-popup-submodule)
+           (define-key map (kbd "B") 'magit-key-mode-popup-bisecting)
+           (define-key map (kbd "z") 'magit-key-mode-popup-stashing)))
+    (define-key map (kbd "$") 'magit-process)
+    (define-key map (kbd "E") 'magit-interactive-rebase)
+    (define-key map (kbd "R") 'magit-rebase-step)
+    (define-key map (kbd "e") 'magit-ediff)
+    (define-key map (kbd "w") 'magit-wazzup)
+    (define-key map (kbd "y") 'magit-cherry)
+    (define-key map (kbd "q") 'magit-mode-quit-window)
+    (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-key-mode-popup-diff-options)
+    (define-key map (kbd "H") 'magit-diff-toggle-refine-hunk)
+    (define-key map (kbd "S") 'magit-stage-all)
+    (define-key map (kbd "U") 'magit-unstage-all)
+    (define-key map (kbd "X") 'magit-reset-working-tree)
+    (define-key map (kbd "C-c C-c") 'magit-key-mode-popup-dispatch)
+    (define-key map (kbd "C-c C-e") 'magit-key-mode-popup-dispatch)
+    map)
+  "Parent keymap for all keymaps of modes derived from `magit-mode'.")
+
+(defvar magit-commit-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-mode-map)
+    (define-key map (kbd "C-c C-b") 'magit-go-backward)
+    (define-key map (kbd "C-c C-f") 'magit-go-forward)
+    (define-key map (kbd "SPC") 'scroll-up)
+    (define-key map (kbd "DEL") 'scroll-down)
+    (define-key map (kbd "j") 'magit-jump-to-diffstats)
+    map)
+  "Keymap for `magit-commit-mode'.")
+
+(defvar magit-status-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-mode-map)
+    (define-key map (kbd "s") 'magit-stage-item)
+    (define-key map (kbd "u") 'magit-unstage-item)
+    (define-key map (kbd "i") 'magit-ignore-item)
+    (define-key map (kbd "I") 'magit-ignore-item-locally)
+    (define-key map (kbd "j") 'magit-section-jump-map)
+    (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-commit-add-log)
+    map)
+  "Keymap for `magit-status-mode'.")
+
+(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)))
+    (set-keymap-parent map magit-mode-map)
+    (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)
+    (define-key map (kbd "h") 'magit-log-toggle-margin)
+    map)
+  "Keymap for `magit-log-mode'.")
+
+(defvar magit-cherry-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-mode-map)
+    map)
+  "Keymap for `magit-cherry-mode'.")
+
+(defvar magit-reflog-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-log-mode-map)
+    map)
+  "Keymap for `magit-reflog-mode'.")
+
+(defvar magit-diff-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-mode-map)
+    (define-key map (kbd "C-c C-b") 'magit-go-backward)
+    (define-key map (kbd "C-c C-f") 'magit-go-forward)
+    (define-key map (kbd "SPC") 'scroll-up)
+    (define-key map (kbd "DEL") 'scroll-down)
+    (define-key map (kbd "j") 'magit-jump-to-diffstats)
+    map)
+  "Keymap for `magit-diff-mode'.")
+
+(defvar magit-wazzup-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-mode-map)
+    (define-key map (kbd ".") 'magit-mark-item)
+    (define-key map (kbd "=") 'magit-diff-with-mark)
+    (define-key map (kbd "i") 'magit-ignore-item)
+    map)
+  "Keymap for `magit-wazzup-mode'.")
+
+(defvar magit-branch-manager-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-mode-map)
+    (define-key map (kbd "c") 'magit-create-branch)
+    (define-key map (kbd "a") 'magit-add-remote)
+    (define-key map (kbd "r") 'magit-rename-item)
+    (define-key map (kbd "k") 'magit-discard-item)
+    (define-key map (kbd "T") 'magit-change-what-branch-tracks)
+    map)
+  "Keymap for `magit-branch-manager-mode'.")
+
+(defvar magit-process-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map magit-mode-map)
+    map)
+  "Keymap for `magit-process-mode'.")
+
+(defvar magit-section-jump-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "z") 'magit-jump-to-stashes)
+    (define-key map (kbd "n") 'magit-jump-to-untracked)
+    (define-key map (kbd "u") 'magit-jump-to-unstaged)
+    (define-key map (kbd "s") 'magit-jump-to-staged)
+    (define-key map (kbd "f") 'magit-jump-to-unpulled)
+    (define-key map (kbd "p") 'magit-jump-to-unpushed)
+    (define-key map (kbd "r") 'magit-jump-to-pending)
+    map)
+  "Submap for jumping to sections in `magit-status-mode'.")
+(fset 'magit-section-jump-map magit-section-jump-map)
+
+(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-key-mode-popup-committing t]
+    ["Add log entry" magit-commit-add-log t]
+    ["Tag" magit-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-merge t]
+    ["Interactive resolve" magit-interactive-resolve 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-process t]
+    ["Quit Magit" magit-mode-quit-window t]))
+
+
+;;; Utilities (1)
+;;;; Minibuffer Input
+
+(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 (car 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 ((reply (ido-completing-read
+                prompt
+                (if (consp (car choices))
+                    (mapcar #'car choices)
+                  choices)
+                predicate require-match initial-input hist def)))
+    (or (and (consp (car choices))
+             (cdr (assoc reply choices)))
+        reply)))
+
+(defun magit-builtin-completing-read
+  (prompt choices &optional predicate require-match initial-input hist def)
+  "Magit wrapper for standard `completing-read' function."
+  (let ((reply (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)))
+    (if (string= reply "")
+        (if require-match
+            (user-error "Nothing selected")
+          nil)
+      reply)))
+
+(defun magit-completing-read
+  (prompt collection &optional predicate require-match initial-input hist def)
+  "Call function in `magit-completing-read-function' to read user input.
+
+Read `completing-read' documentation for the meaning of the argument."
+  (funcall magit-completing-read-function
+           (concat prompt ": ") collection predicate
+           require-match initial-input hist def))
+
+(defvar magit-gpg-secret-key-hist nil)
+
+(defun magit-read-gpg-secret-key (prompt)
+  (let ((keys (mapcar
+               (lambda (key)
+                 (list (epg-sub-key-id (car (epg-key-sub-key-list key)))
+                       (let ((id-obj (car (epg-key-user-id-list key)))
+                             (id-str nil))
+                         (when id-obj
+                           (setq id-str (epg-user-id-string id-obj))
+                           (if (stringp id-str)
+                               id-str
+                             (epg-decode-dn id-obj))))))
+               (epg-list-keys (epg-make-context epa-protocol) nil t))))
+    (magit-completing-read prompt keys nil nil nil 'magit-gpg-secret-key-hist
+                           (car (or magit-gpg-secret-key-hist keys)))))
+
+;;;; Various Utilities
+
+(defmacro magit-bind-match-strings (varlist &rest body)
+  (declare (indent 1))
+  (let ((i 0))
+    `(let ,(mapcar (lambda (var)
+                     (list var (list 'match-string (cl-incf i))))
+                   varlist)
+       ,@body)))
+
+(defun magit-file-line (file)
+  "Return the first line of FILE as a string."
+  (when (file-regular-p file)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (buffer-substring-no-properties (point-min)
+                                      (line-end-position)))))
+
+(defun magit-file-lines (file &optional keep-empty-lines)
+  "Return a list of strings containing one element per line in FILE.
+Unless optional argument KEEP-EMPTY-LINES is t, trim all empty lines."
+  (when (file-regular-p file)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (split-string (buffer-string) "\n" (not keep-empty-lines)))))
+
+(defvar-local magit-file-name ()
+  "Name of file the buffer shows a different version of.")
+
+(defun magit-buffer-file-name (&optional relative)
+  (let* ((topdir (magit-get-top-dir))
+         (filename (or buffer-file-name
+                       (when (buffer-base-buffer)
+                         (with-current-buffer (buffer-base-buffer)
+                           buffer-file-name))
+                       (when magit-file-name
+                         (expand-file-name magit-file-name topdir)))))
+    (when filename
+      (setq filename (file-truename filename))
+      (if relative
+          (file-relative-name filename topdir)
+        filename))))
+
+(defun magit-format-duration (duration spec width)
+  (cl-destructuring-bind (char unit units weight)
+      (car spec)
+    (let ((cnt (round (/ duration weight 1.0))))
+      (if (or (not (cdr spec))
+              (>= (/ duration weight) 1))
+          (if (= width 1)
+              (format "%3i%c" cnt char)
+            (format (format "%%3i %%-%is" width) cnt
+                    (if (= cnt 1) unit units)))
+        (magit-format-duration duration (cdr spec) width)))))
+
+(defun magit-flatten-onelevel (list)
+  (cl-mapcan (lambda (elt)
+               (cond ((consp elt) (copy-sequence elt))
+                     (elt (list elt))))
+             list))
+
+(defun magit-insert (string face &rest args)
+  (if magit-use-overlays
+      (let ((start (point)))
+        (insert string)
+        (let ((ov (make-overlay start (point) nil t)))
+          (overlay-put ov 'face face)
+          ;; (overlay-put ov 'priority 10)
+          (overlay-put ov 'evaporate t)))
+    (insert (propertize string 'face face)))
+  (apply #'insert args))
+
+(defun magit-put-face-property (start end face)
+  (if magit-use-overlays
+      (let ((ov (make-overlay start end nil t)))
+        (overlay-put ov 'face face)
+        ;; (overlay-put ov 'priority 10)
+        (overlay-put ov 'evaporate t))
+    (put-text-property start end 'face face)))
+
+;;;; Buffer Margins
+
+(defun magit-set-buffer-margin (width enable)
+  (let ((window (get-buffer-window)))
+    (when window
+      (with-selected-window window
+        (set-window-margins nil (car (window-margins)) (if enable width 0))
+        (let ((fn (apply-partially
+                   (lambda (width)
+                     (let ((window (get-buffer-window)))
+                       (when window
+                         (with-selected-window window
+                           (set-window-margins nil (car (window-margins))
+                                               width)))))
+                   width)))
+          (if enable
+              (add-hook  'window-configuration-change-hook fn nil t)
+            (remove-hook 'window-configuration-change-hook fn t)))))))
+
+(defun magit-make-margin-overlay (&rest strings)
+  (let ((o (make-overlay (point) (line-end-position) nil t)))
+    (overlay-put o 'evaporate t)
+    (overlay-put o 'before-string
+                 (propertize "o" 'display
+                             (list '(margin right-margin)
+                                   (apply #'concat strings))))))
+
+(defvar-local magit-log-margin-timeunit-width nil)
+
+(defun magit-log-margin-set-timeunit-width ()
+  (cl-destructuring-bind (width characterp duration-spec)
+      magit-log-margin-spec
+    (setq magit-log-margin-timeunit-width
+          (if characterp
+              1
+            (apply 'max (mapcar (lambda (e)
+                                  (max (length (nth 1 e))
+                                       (length (nth 2 e))))
+                                (symbol-value duration-spec)))))))
+
+;;;; Emacsclient Support
+
+(defmacro magit-with-emacsclient (server-window &rest body)
+  "Arrange for Git to use Emacsclient as \"the git editor\".
+
+Git processes that use \"the editor\" have to be asynchronous.
+The use of this macro ensures that such processes inside BODY use
+Emacsclient as \"the editor\" by setting the environment variable
+$GIT_EDITOR accordingly around calls to Git and starting the
+server if necessary."
+  (declare (indent 1))
+  `(let* ((process-environment process-environment)
+          (magit-process-popup-time -1))
+     ;; Make sure the client is usable.
+     (magit-assert-emacsclient "use `magit-with-emacsclient'")
+     ;; Make sure server-use-tcp's value is valid.
+     (unless (featurep 'make-network-process '(:family local))
+       (setq server-use-tcp t))
+     ;; Make sure the server is running.
+     (unless server-process
+       (when (server-running-p server-name)
+         (setq server-name (format "server%s" (emacs-pid)))
+         (when (server-running-p server-name)
+           (server-force-delete server-name)))
+       (server-start))
+     ;; Tell Git to use the client.
+     (setenv "GIT_EDITOR"
+             (concat magit-emacsclient-executable
+     ;; Tell the client where the server file is.
+                     (and (not server-use-tcp)
+                          (concat " --socket-name="
+                                  (expand-file-name server-name
+                                                    server-socket-dir)))))
+     (when server-use-tcp
+       (setenv "EMACS_SERVER_FILE"
+               (expand-file-name server-name server-auth-dir)))
+     ;; As last resort fallback to a new Emacs instance.
+     (setenv "ALTERNATE_EDITOR"
+             (expand-file-name invocation-name invocation-directory))
+     ;; Git has to be called asynchronously in BODY or we create a
+     ;; dead lock.  By the time Emacsclient is called the dynamic
+     ;; binding is no longer in effect and our primitives don't
+     ;; support callbacks.  Temporarily set the default value and
+     ;; restore the old value using a timer.
+     (let ((window ,server-window))
+       (unless (equal window server-window)
+         (run-at-time "1 sec" nil
+                      (apply-partially (lambda (value)
+                                         (setq server-window value))
+                                       server-window))
+         (setq-default server-window window)))
+     ,@body))
+
+(defun magit-use-emacsclient-p ()
+  (and magit-emacsclient-executable
+       (not (tramp-tramp-file-p default-directory))))
+
+(defun magit-assert-emacsclient (action)
+  (unless magit-emacsclient-executable
+    (user-error "Cannot %s when `magit-emacsclient-executable' is nil" action))
+  (when (tramp-tramp-file-p default-directory)
+    (user-error "Cannot %s when accessing repository using tramp" action)))
+
+;;;; Git Config
+
+(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."
+  (magit-git-true "config" "--bool" (mapconcat 'identity keys ".")))
+
+(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 "."))))
+
+;;;; Git Low-Level
+
+(defun magit-git-repo-p (dir)
+  (file-exists-p (expand-file-name ".git" dir)))
+
+(defun magit-git-dir (&optional path)
+  "Return absolute path to the GIT_DIR for the current repository.
+If optional PATH is non-nil it has to be a path relative to the
+GIT_DIR and its absolute path is returned"
+  (let ((gitdir (magit-git-string "rev-parse" "--git-dir")))
+    (when gitdir
+      (setq gitdir (file-name-as-directory
+                    (magit-expand-git-file-name gitdir)))
+      (if path
+          (expand-file-name (convert-standard-filename path) gitdir)
+        gitdir))))
+
+(defun magit-no-commit-p ()
+  "Return non-nil if there is no commit in the current git repository."
+  (not (magit-git-string "rev-list" "-1" "HEAD")))
+
+(defun magit-get-top-dir (&optional directory)
+  "Return the top directory for the current repository.
+
+Determine the repository which contains `default-directory' in
+either its work tree or git control directory and return its top
+directory.  If there is no top directory, because the repository
+is bare, return the control directory instead.
+
+If optional DIRECTORY is non-nil then return the top directory of
+the repository that contains that instead.  DIRECTORY has to be
+an existing directory."
+  (setq directory (if directory
+                      (file-name-as-directory
+                       (expand-file-name directory))
+                    default-directory))
+  (unless (file-directory-p directory)
+    (error "%s isn't an existing directory" directory))
+  (let* ((default-directory directory)
+         (top (magit-git-string "rev-parse" "--show-toplevel")))
+    (if top
+        (file-name-as-directory (magit-expand-git-file-name top))
+      (let ((gitdir (magit-git-dir)))
+        (when gitdir
+          (if (magit-bare-repo-p)
+              gitdir
+            (file-name-directory (directory-file-name gitdir))))))))
+
+(defun magit-expand-git-file-name (filename)
+  (when (tramp-tramp-file-p default-directory)
+    (setq filename (file-relative-name filename
+                                       (with-parsed-tramp-file-name
+                                           default-directory nil
+                                         localname))))
+  (expand-file-name filename))
+
+(defun magit-file-relative-name (file)
+  "Return the path of FILE relative to the repository root.
+If FILE isn't inside a Git repository then return nil."
+  (setq file (file-truename file))
+  (let ((topdir (magit-get-top-dir (file-name-directory file))))
+    (and topdir (substring file (length topdir)))))
+
+(defun magit-bare-repo-p ()
+  "Return t if the current repository is bare."
+  (magit-git-true "rev-parse" "--is-bare-repository"))
+
+(defun magit-get-ref (ref)
+  (magit-git-string "symbolic-ref" "-q" ref))
+
+(defun magit-get-current-branch ()
+  (let ((head (magit-get-ref "HEAD")))
+    (when (and head (string-match "^refs/heads/" head))
+      (substring head 11))))
+
+(defun magit-get-remote/branch (&optional branch verify)
+  "Return the remote-tracking branch of BRANCH used for pulling.
+Return a string of the form \"REMOTE/BRANCH\".
+
+If optional BRANCH is nil return the remote-tracking branch of
+the current branch.  If optional VERIFY is non-nil verify that
+the remote branch exists; else return nil."
+  (save-match-data
+    (let (remote remote-branch remote/branch)
+      (and (or branch (setq branch (magit-get-current-branch)))
+           (setq remote (magit-get "branch" branch "remote"))
+           (setq remote-branch (magit-get "branch" branch "merge"))
+           (string-match "^refs/heads/\\(.+\\)" remote-branch)
+           (setq remote/branch
+                 (concat remote "/" (match-string 1 remote-branch)))
+           (or (not verify)
+               (magit-git-success "rev-parse" "--verify" remote/branch))
+           remote/branch))))
+
+(defun magit-get-tracked-branch (&optional branch qualified pretty)
+  "Return the name of the tracking branch the local branch name BRANCH.
+
+If optional QUALIFIED is non-nil return the full branch path,
+otherwise try to shorten it to a name (which may fail).  If
+optional PRETTY is non-nil additionally format the branch name
+according to option `magit-remote-ref-format'."
+  (unless branch
+    (setq branch (magit-get-current-branch)))
+  (when branch
+    (let ((remote (magit-get "branch" branch "remote"))
+          (merge  (magit-get "branch" branch "merge")))
+      (when (and (not merge)
+                 (not (equal remote ".")))
+        (setq merge branch))
+      (when (and remote merge)
+        (if (string= remote ".")
+            (cond (qualified merge)
+                  ((string-match "^refs/heads/" merge)
+                   (substring merge 11))
+                  ((string-match "^refs/" merge)
+                   merge))
+          (let* ((fetch (mapcar (lambda (f) (split-string f "[+:]" t))
+                                (magit-get-all "remote" remote "fetch")))
+                 (match (cadr (assoc merge fetch))))
+            (unless match
+              (let* ((prefix (nreverse (split-string merge "/")))
+                     (unique (list (car prefix))))
+                (setq prefix (cdr prefix))
+                (setq fetch
+                      (cl-mapcan
+                       (lambda (f)
+                         (cl-destructuring-bind (from to) f
+                           (setq from (nreverse (split-string from "/")))
+                           (when (equal (car from) "*")
+                             (list (list (cdr from) to)))))
+                       fetch))
+                (while (and prefix (not match))
+                  (if (setq match (cadr (assoc prefix fetch)))
+                      (setq match (concat (substring match 0 -1)
+                                          (mapconcat 'identity unique "/")))
+                    (push (car prefix) unique)
+                    (setq prefix (cdr prefix))))))
+            (cond ((not match) nil)
+                  (qualified match)
+                  ((string-match "^refs/remotes/" match)
+                   (if pretty
+                       (magit-format-ref match)
+                     (substring match 13)))
+                  (t match))))))))
+
+(defun magit-get-previous-branch ()
+  "Return the refname of the previously checked out branch.
+Return nil if the previously checked out branch no longer exists."
+  (magit-name-rev (magit-git-string "rev-parse" "--verify" "@{-1}")))
+
+(defun magit-get-current-tag (&optional with-distance-p)
+  "Return the closest tag reachable from \"HEAD\".
+
+If optional WITH-DISTANCE-P is non-nil then return (TAG COMMITS),
+if it is `dirty' return (TAG COMMIT DIRTY). COMMITS is the number
+of commits in \"HEAD\" but not in TAG and DIRTY is t if there are
+uncommitted changes, nil otherwise."
+  (let ((tag (magit-git-string "describe" "--long" "--tags"
+                               (and (eq with-distance-p 'dirty) "--dirty"))))
+    (save-match-data
+      (when tag
+        (string-match
+         "\\(.+\\)-\\(?:0[0-9]*\\|\\([0-9]+\\)\\)-g[0-9a-z]+\\(-dirty\\)?$" tag)
+        (if with-distance-p
+            (list (match-string 1 tag)
+                  (string-to-number (or (match-string 2 tag) "0"))
+                  (and (match-string 3 tag) t))
+          (match-string 1 tag))))))
+
+(defun magit-get-next-tag (&optional with-distance-p)
+  "Return the closest tag from which \"HEAD\" is reachable.
+
+If no such tag can be found or if the distance is 0 (in which
+case it is the current tag, not the next) return nil instead.
+
+If optional WITH-DISTANCE-P is non-nil then return (TAG COMMITS)
+where COMMITS is the number of commits in TAG but not in \"HEAD\"."
+  (let ((rev (magit-git-string "describe" "--contains" "HEAD")))
+    (save-match-data
+      (when (and rev (string-match "^[^^~]+" rev))
+        (let ((tag (match-string 0 rev)))
+          (unless (equal tag (magit-get-current-tag))
+            (if with-distance-p
+                (list tag (car (magit-rev-diff-count tag "HEAD")))
+              tag)))))))
+
+(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"))))
+    (unless (string= remote "")
+      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-success "show-ref" "--verify" ref))
+
+(defun magit-rev-parse (&rest args)
+  "Execute `git rev-parse ARGS', returning first line of output.
+If there is no output return nil."
+  (apply #'magit-git-string "rev-parse" args))
+
+(defun magit-ref-ambiguous-p (ref)
+  "Return whether or not REF is ambiguous."
+  ;; An ambiguous ref does not cause `git rev-parse --abbrev-ref'
+  ;; to exits with a non-zero status.  But there is nothing on
+  ;; stdout in that case.
+  (not (magit-git-string "rev-parse" "--abbrev-ref" ref)))
+
+(defun magit-rev-diff-count (a b)
+  "Return the commits in A but not B and vice versa.
+Return a list of two integers: (A>B B>A)."
+  (mapcar 'string-to-number
+          (split-string (magit-git-string "rev-list"
+                                          "--count" "--left-right"
+                                          (concat a "..." b))
+                        "\t")))
+
+(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-file-uptodate-p (file)
+  (magit-git-success "diff" "--quiet" "--" file))
+
+(defun magit-anything-staged-p ()
+  (magit-git-failure "diff" "--quiet" "--cached"))
+
+(defun magit-anything-unstaged-p ()
+  (magit-git-failure "diff" "--quiet"))
+
+(defun magit-anything-modified-p ()
+  (or (magit-anything-staged-p)
+      (magit-anything-unstaged-p)))
+
+(defun magit-commit-parents (commit)
+  (cdr (split-string (magit-git-string "rev-list" "-1" "--parents" commit))))
+
+(defun magit-assert-one-parent (commit command)
+  (when (> (length (magit-commit-parents commit)) 1)
+    (user-error "Cannot %s a merge commit" command)))
+
+(defun magit-decode-git-path (path)
+  (if (eq (aref path 0) ?\")
+      (string-as-multibyte (read path))
+    path))
+
+(defun magit-abbrev-length ()
+  (string-to-number (or (magit-get "core.abbrev") "7")))
+
+(defun magit-abbrev-arg ()
+  (format "--abbrev=%d" (magit-abbrev-length)))
+
+;;;; Git Revisions
+
+(defvar magit-uninteresting-refs
+  '("^refs/stash$"
+    "^refs/remotes/[^/]+/HEAD$"
+    "^refs/remotes/[^/]+/top-bases$"
+    "^refs/top-bases$"))
+
+(cl-defun magit-list-interesting-refs (&optional uninteresting
+                                                 (refs nil srefs))
+  (cl-loop for ref in (if srefs
+                          refs
+                        (mapcar (lambda (l)
+                                  (cadr (split-string l " ")))
+                                (magit-git-lines "show-ref")))
+           with label
+           unless (or (cl-loop for i in
+                               (cl-typecase uninteresting
+                                 (null magit-uninteresting-refs)
+                                 (list uninteresting)
+                                 (string (cons (format "^refs/heads/%s$"
+                                                       uninteresting)
+                                               magit-uninteresting-refs)))
+                               thereis (string-match i ref))
+                      (not (setq label (magit-format-ref ref))))
+           collect (cons label ref)))
+
+(defun magit-format-ref (ref)
+  (cond ((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))
+           (substring ref 13)))
+        (t ref)))
+
+(defvar magit-read-file-hist nil)
+
+(defun magit-read-file-from-rev (revision &optional default)
+  (unless revision
+    (setq revision "HEAD"))
+  (let ((default-directory (magit-get-top-dir)))
+    (magit-completing-read
+     (format "Retrieve file from %s" revision)
+     (magit-git-lines "ls-tree" "-r" "-t" "--name-only" revision)
+     nil 'require-match
+     nil 'magit-read-file-hist
+     (or default (magit-buffer-file-name t)))))
+
+(defun magit-read-file-trace (ignored)
+  (let ((file  (magit-read-file-from-rev "HEAD"))
+        (trace (read-string "Trace: ")))
+    (if (string-match
+         "^\\(/.+/\\|:[^:]+\\|[0-9]+,[-+]?[0-9]+\\)\\(:\\)?$" trace)
+        (concat trace (or (match-string 2 trace) ":") file)
+      (user-error "Trace is invalid, see man git-log"))))
+
+(defvar magit-read-rev-history nil
+  "The history of inputs to `magit-read-rev' and `magit-read-tag'.")
+
+(defun magit-read-tag (prompt &optional require-match)
+  (magit-completing-read prompt (magit-git-lines "tag") nil
+                         require-match nil 'magit-read-rev-history))
+
+(defun magit-read-rev (prompt &optional default uninteresting noselection)
+  (let* ((interesting-refs
+          (mapcar (lambda (elt)
+                    (setcdr elt (replace-regexp-in-string
+                                 "^refs/heads/" "" (cdr elt)))
+                    elt)
+                  (magit-list-interesting-refs uninteresting)))
+         (reply (magit-completing-read prompt interesting-refs nil nil nil
+                                       'magit-read-rev-history default))
+         (rev (or (cdr (assoc reply interesting-refs)) reply)))
+    (when (equal rev ".")
+      (setq rev magit-marked-commit))
+    (unless (or rev noselection)
+      (user-error "No rev selected"))
+    rev))
+
+(defun magit-read-rev-with-default (prompt)
+  (magit-read-rev prompt
+                  (let ((branch (or (magit-guess-branch) "HEAD")))
+                    (when branch
+                      (if (string-match "^refs/\\(.*\\)" branch)
+                          (match-string 1 branch)
+                        branch)))))
+
+(defun magit-read-rev-range (op &optional def-beg def-end)
+  (let ((beg (magit-read-rev (format "%s range or start" op) def-beg)))
+    (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 nil t)))
+          (if end (cons beg end) beg))))))
+
+(defun magit-read-stash (prompt)
+  (let ((n (read-number prompt 0))
+        (l (1- (length (magit-git-lines "stash" "list")))))
+    (if (> n l)
+        (user-error "No stash older than stash@{%i}" l)
+      (format "stash@{%i}" n))))
+
+(defun magit-read-remote (prompt &optional default require-match)
+  (magit-completing-read prompt (magit-git-lines "remote")
+                         nil require-match nil nil
+                         (or default (magit-guess-remote))))
+
+(defun magit-read-remote-branch (prompt remote &optional default)
+  (let ((branch (magit-completing-read
+                 prompt
+                 (cl-mapcan
+                  (lambda (b)
+                    (and (not (string-match " -> " b))
+                         (string-match (format "^ *%s/\\(.*\\)$"
+                                               (regexp-quote remote)) b)
+                         (list (match-string 1 b))))
+                  (magit-git-lines "branch" "-r"))
+                 nil nil nil nil default)))
+    (unless (string= branch "")
+      branch)))
+
+(defun magit-format-ref-label (ref)
+  (cl-destructuring-bind (re face fn)
+      (cl-find-if (lambda (ns)
+                    (string-match (car ns) ref))
+                  magit-refs-namespaces)
+    (if fn
+        (funcall fn ref face)
+      (propertize (or (match-string 1 ref) ref) 'face face))))
+
+(defun magit-format-ref-labels (string)
+  (save-match-data
+    (mapconcat 'magit-format-ref-label
+               (mapcar 'cdr
+                       (magit-list-interesting-refs
+                        nil (split-string string "\\(tag: \\|[(), ]\\)" t)))
+               " ")))
+
+(defun magit-insert-ref-labels (string)
+  (save-match-data
+    (dolist (ref (split-string string "\\(tag: \\|[(), ]\\)" t) " ")
+      (cl-destructuring-bind (re face fn)
+          (cl-find-if (lambda (elt) (string-match (car elt) ref))
+                      magit-refs-namespaces)
+        (if fn
+            (let ((text (funcall fn ref face)))
+              (magit-insert text (get-text-property 1 'face text) ?\s))
+        (magit-insert (or (match-string 1 ref) ref) face ?\s))))))
+
+(defun magit-format-rev-summary (rev)
+  (let ((s (magit-git-string "log" "-1"
+                             (concat "--pretty=format:%h %s") rev)))
+    (when s
+      (string-match " " s)
+      (put-text-property 0 (match-beginning 0) 'face 'magit-log-sha1 s)
+      s)))
+
+;;; Magit Api
+;;;; Section Api
+;;;;; Section Core
+
+(cl-defstruct magit-section
+  type info
+  beginning content-beginning end
+  hidden needs-refresh-on-show highlight
+  diff-status diff-file2 diff-range
+  process
+  parent children)
+
+(defvar-local magit-root-section nil
+  "The root section in the current buffer.
+All other sections are descendants of this section.  The value
+of this variable is set by `magit-with-section' and you should
+never modify it.")
+(put 'magit-root-section 'permanent-local t)
+
+;;;;; Section Creation
+
+(defvar magit-with-section--parent nil
+  "For use by `magit-with-section' only.")
+
+(defvar magit-with-section--oldroot nil
+  "For use by `magit-with-section' only.")
+
+(defmacro magit-with-section (arglist &rest body)
+  "\n\n(fn (NAME TYPE &optional INFO HEADING NOHIGHLIGHT COLLAPSE) &rest ARGS)"
+  (declare (indent 1) (debug ((form form &optional form form form) body)))
+  (let ((s (car arglist)))
+    `(let ((,s (make-magit-section
+                :type ',(nth 1 arglist)
+                :info  ,(nth 2 arglist)
+                :highlight (not ,(nth 4 arglist))
+                :beginning (point-marker)
+                :content-beginning (point-marker)
+                :parent magit-with-section--parent)))
+       (setf (magit-section-hidden ,s)
+             (let ((old (and magit-with-section--oldroot
+                             (magit-find-section (magit-section-path ,s)
+                                                 magit-with-section--oldroot))))
+               (if old
+                   (magit-section-hidden old)
+                 ,(nth 5 arglist))))
+       (let ((magit-with-section--parent ,s)
+             (magit-with-section--oldroot
+              (or magit-with-section--oldroot
+                  (unless magit-with-section--parent
+                    (prog1 magit-root-section
+                      (setq magit-root-section ,s))))))
+         ,@body)
+       (when ,s
+         (set-marker-insertion-type (magit-section-content-beginning ,s) t)
+         (let ((heading ,(nth 3 arglist)))
+           (when heading
+             (save-excursion
+               (goto-char (magit-section-beginning ,s))
+               (insert
+                (if (string-match-p "\n$" heading)
+                    (substring heading 0 -1)
+		  (propertize
+		   (let (c)
+		     (if (and magit-show-child-count
+                              (string-match-p ":$" heading)
+			      (> (setq c (length (magit-section-children ,s))) 0))
+			 (format "%s (%s):" (substring heading 0 -1) c)
+		       heading))
+		   'face 'magit-section-title)))
+               (insert "\n"))))
+         (set-marker-insertion-type (magit-section-beginning ,s) t)
+         (goto-char (max (point) ; smaller if there is no content
+                         (magit-section-content-beginning ,s)))
+         (setf (magit-section-end ,s) (point-marker))
+         (save-excursion
+           (goto-char (magit-section-beginning ,s))
+           (let ((end (magit-section-end ,s)))
+             (while (< (point) end)
+               (let ((next (or (next-single-property-change
+                                (point) 'magit-section)
+                               end)))
+                 (unless (get-text-property (point) 'magit-section)
+                   (put-text-property (point) next 'magit-section ,s))
+                 (goto-char next)))))
+         (if (eq ,s magit-root-section)
+             (magit-section-set-hidden magit-root-section nil)
+           (setf (magit-section-children (magit-section-parent ,s))
+                 (nconc (magit-section-children (magit-section-parent ,s))
+                        (list ,s)))))
+       ,s)))
+
+(defmacro magit-cmd-insert-section (arglist washer program &rest args)
+  "\n\n(fn (TYPE &optional HEADING) WASHER PROGRAM &rest ARGS)"
+  (declare (indent 2))
+  `(magit-with-section (section ,(car arglist)
+                                ',(car arglist)
+                                ,(cadr arglist) t)
+     (apply #'process-file ,program nil (list t nil) nil
+            (magit-flatten-onelevel (list ,@args)))
+     (unless (eq (char-before) ?\n)
+       (insert "\n"))
+     (save-restriction
+       (narrow-to-region (magit-section-content-beginning section) (point))
+       (goto-char (point-min))
+       (funcall ,washer)
+       (goto-char (point-max)))
+     (let ((parent   (magit-section-parent section))
+           (head-beg (magit-section-beginning section))
+           (body-beg (magit-section-content-beginning section)))
+       (if (= (point) body-beg)
+           (if (not parent)
+               (insert "(empty)\n")
+             (delete-region head-beg body-beg)
+             (setq section nil))
+         (insert "\n")))))
+
+(defmacro magit-git-insert-section (arglist washer &rest args)
+  "\n\n(fn (TYPE &optional HEADING) WASHER &rest ARGS)"
+  (declare (indent 2))
+  `(magit-cmd-insert-section ,arglist
+       ,washer
+     magit-git-executable
+     magit-git-standard-options ,@args))
+
+(defmacro magit-insert-line-section (arglist line)
+  "\n\n(fn (TYPE &optional INFO) line)"
+  (declare (indent 1))
+  (let ((l (cl-gensym "line")))
+    `(let ((,l (concat ,line "\n")))
+       (when (string-match "^\\([^:]+\\):\\( \\)" ,l)
+         (setq ,l (replace-match
+                   (make-string (max 1 (- magit-status-line-align-to
+                                          (length (match-string 1 ,l))))
+                                ?\s)
+                   t t ,l 2)))
+       (magit-with-section (section ,(car arglist) ',(car arglist) ,l t)
+         (setf (magit-section-info section) ,(cadr arglist))))))
+
+;;;;; Section Searching
+
+(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-info (car secs)))))
+        (setq secs (cdr secs)))
+      (when (car secs)
+        (magit-find-section (cdr path) (car secs))))))
+
+(defun magit-section-path (section)
+  "Return the path of SECTION."
+  (let ((parent (magit-section-parent section)))
+    (when parent
+      (append (magit-section-path parent)
+              (list (magit-section-info section))))))
+
+(defun magit-find-section-after (pos)
+  "Find the first section that begins after POS."
+  (magit-find-section-after* pos (list magit-root-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)))
+    (cl-do* ((current (or (magit-section-parent section)
+                          section)
+                      next)
+             (next (unless (magit-section-hidden current)
+                     (magit-find-section-before*
+                      pos (magit-section-children current)))
+                   (unless (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-root-section))
+
+;;;;; Section Jumping
+
+(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* ((section (magit-current-section))
+         (parent  (magit-section-parent section))
+         (next    (and parent (magit-find-section-after*
+                               (1- (magit-section-end section))
+                               (magit-section-children parent)))))
+    (if next
+        (magit-goto-section next)
+      (magit-goto-next-section))))
+
+(defun magit-goto-previous-sibling-section ()
+  "Go to the previous sibling section."
+  (interactive)
+  (let* ((section (magit-current-section))
+         (parent  (magit-section-parent section))
+         (prev    (and parent (magit-find-section-before*
+                               (magit-section-beginning section)
+                               (magit-section-children parent)))))
+    (if prev
+        (magit-goto-section prev)
+      (magit-goto-previous-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)
+         (or (eq (car magit-refresh-args) 'oneline)
+             (get-buffer-window magit-commit-buffer-name)))
+    (magit-show-commit (magit-section-info section) t))))
+
+(defun magit-goto-section-at-path (path)
+  "Go to the section described by PATH."
+  (let ((sec (magit-find-section path magit-root-section)))
+    (if sec
+        (goto-char (magit-section-beginning sec))
+      (message "No such section"))))
+
+(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))))
+    `(progn
+       (defun ,fun (&optional expand) ,(format "\
+Jump to section '%s'.
+With a prefix argument also expand it." title)
+         (interactive "P")
+         (if (magit-goto-section-at-path '(,sym))
+             (when expand
+               (with-local-quit
+                 (if (eq magit-expand-staged-on-commit 'full)
+                     (magit-show-level 4 nil)
+                   (magit-expand-section)))
+               (recenter 0))
+           (message ,(format "Section '%s' wasn't found" title))))
+       (put ',fun 'definition-name ',sym))))
+
+(magit-define-section-jumper stashes   "Stashes")
+(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 unpulled  "Unpulled commits")
+(magit-define-section-jumper unpushed  "Unpushed commits")
+(magit-define-section-jumper diffstats "Diffstats")
+
+;;;;; Section Hooks
+
+(defun magit-add-section-hook (hook function &optional at append local)
+  "Add to the value of section hook HOOK the function FUNCTION.
+
+Add FUNCTION at the beginning of the hook list unless optional
+APPEND is non-nil, in which case FUNCTION is added at the end.
+If FUNCTION already is a member then move it to the new location.
+
+If optional AT is non-nil and a member of the hook list, then add
+FUNCTION next to that instead.  Add before or after AT depending
+on APPEND.  If only FUNCTION is a member of the list, then leave
+it where ever it already is.
+
+If optional LOCAL is non-nil, then modify the hook's buffer-local
+value rather than its global value.  This makes the hook local by
+copying the default value.  That copy is then modified.
+
+HOOK should be a symbol.  If HOOK is void, it is first set to nil.
+HOOK's value must not be a single hook function.  FUNCTION should
+be a function that takes no arguments and inserts one or multiple
+sections at point, moving point forward.  FUNCTION may choose not
+to insert its section(s), when doing so would not make sense.  It
+should not be abused for other side-effects.  To remove FUNCTION
+again use `remove-hook'."
+  (or (boundp hook) (set hook nil))
+  (or (default-boundp hook) (set-default hook nil))
+  (let ((value (if local
+                   (if (local-variable-p hook)
+                       (symbol-value hook)
+                     (unless (local-variable-if-set-p hook)
+                       (make-local-variable hook))
+                     (copy-sequence (default-value hook)))
+                 (default-value hook))))
+    (if at
+        (when (setq at (member at value))
+          (setq value (delq function value))
+          (if append
+              (push function (cdr at))
+            (push (car at) (cdr at))
+            (setcar at function)))
+      (setq value (delq function value)))
+    (unless (member function value)
+      (setq value (if append
+                      (append value (list function))
+                    (cons function value))))
+    (if local
+        (set hook value)
+      (set-default hook value))))
+
+;;;;; Section Utilities
+
+(defun magit-map-sections (function section)
+  "Apply FUNCTION to SECTION and recursively its subsections."
+  (funcall function section)
+  (mapc (apply-partially 'magit-map-sections function)
+        (magit-section-children section)))
+
+(defun magit-wash-sequence (function)
+  "Repeatedly call FUNCTION until it returns nil or eob is reached.
+FUNCTION has to move point forward or return nil."
+  (while (and (not (eobp)) (funcall function))))
+
+(defun magit-section-parent-info (section)
+  (setq section (magit-section-parent section))
+  (when section (magit-section-info   section)))
+
+(defun magit-section-siblings (section &optional direction)
+  (let ((parent (magit-section-parent section)))
+    (when parent
+      (let ((siblings (magit-section-children parent)))
+        (cl-ecase direction
+          (prev (member section (reverse siblings)))
+          (next (member section siblings))
+          (nil  siblings))))))
+
+(defun magit-section-region-siblings (&optional key)
+  (let ((beg (magit-find-section-at (region-beginning)))
+        (end (magit-find-section-at (region-end))))
+    (if (eq beg end)
+        (list (if key (funcall key beg) beg))
+      (goto-char (region-end))
+      (when (bolp)
+        (setq end (magit-find-section-at (1- (point)))))
+      (while (> (length (magit-section-path beg))
+                (length (magit-section-path end)))
+        (setq beg (magit-section-parent beg)))
+      (while (> (length (magit-section-path end))
+                (length (magit-section-path beg)))
+        (setq end (magit-section-parent end)))
+      (let* ((parent   (magit-section-parent beg))
+             (siblings (magit-section-children parent)))
+        (if (eq parent (magit-section-parent end))
+            (mapcar (or key #'identity)
+                    (cl-intersection (memq beg siblings)
+                                     (memq end (reverse siblings))))
+          (user-error "Ambitious cross-section region"))))))
+
+(defun magit-diff-section-for-diffstat (section)
+  (let ((file (magit-section-info section)))
+    (cl-find-if (lambda (s)
+                  (and (eq (magit-section-type s) 'diff)
+                       (string-equal (magit-section-info s) file)))
+                (magit-section-children magit-root-section))))
+
+;;;;; Section Visibility
+
+(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)))
+      (when (< beg end)
+        (put-text-property beg end 'invisible hidden)))
+    (unless 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, the section will be hidden if it is
+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 (magit-section-type (magit-current-section)) 'hunk)
+    (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))
+           ((with-no-warnings
+              (cl-notany #'magit-section-hidden (magit-section-children s)))
+            (magit-section-set-hidden s t))
+           (t
+            (magit-section-expand s))))))
+
+(defun magit-section-lineage (section)
+  "Return list of parent, grand-parents... for SECTION."
+  (when section
+    (cons section (magit-section-lineage (magit-section-parent section)))))
+
+(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."
+  (if all
+      (magit-section-show-level magit-root-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 their 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 their 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)))
+
+(magit-define-level-shower 1)
+(magit-define-level-shower 2)
+(magit-define-level-shower 3)
+(magit-define-level-shower 4)
+
+;;;;; Section Highlighting
+
+(defvar-local magit-highlighted-section nil)
+(defvar-local magit-highlight-overlay nil)
+
+(defun magit-highlight-section ()
+  "Highlight current section.
+If its HIGHLIGHT slot is nil, then don't highlight it."
+  (let ((section (magit-current-section))
+        (refinep (lambda ()
+                   (and magit-highlighted-section
+                        (eq magit-diff-refine-hunk t)
+                        (eq (magit-section-type magit-highlighted-section)
+                            'hunk)))))
+    (unless (eq section magit-highlighted-section)
+      (when (funcall refinep)
+        (magit-diff-unrefine-hunk magit-highlighted-section))
+      (setq magit-highlighted-section section)
+      (unless magit-highlight-overlay
+        (overlay-put (setq magit-highlight-overlay (make-overlay 1 1))
+                     'face magit-item-highlight-face))
+      (cond ((and section (magit-section-highlight section))
+             (when (funcall refinep)
+               (magit-diff-refine-hunk section))
+             (move-overlay magit-highlight-overlay
+                           (magit-section-beginning section)
+                           (magit-section-end section)
+                           (current-buffer)))
+            (t
+             (delete-overlay magit-highlight-overlay))))))
+
+;;;;; Section Actions
+
+(defun magit-section-context-type (section)
+  (cons (magit-section-type section)
+        (let ((parent (magit-section-parent section)))
+          (when parent
+            (magit-section-context-type parent)))))
+
+(defun magit-section-match-1 (l1 l2)
+  (or (null l1)
+      (if (eq (car l1) '*)
+          (or (magit-section-match-1 (cdr l1) l2)
+              (and l2
+                   (magit-section-match-1 l1 (cdr l2))))
+        (and l2
+             (equal (car l1) (car l2))
+             (magit-section-match-1 (cdr l1) (cdr l2))))))
+
+(defun magit-section-match (condition &optional section)
+  (unless section
+    (setq section (magit-current-section)))
+  (cond ((eq condition t) t)
+        ((not section)  nil)
+        ((listp condition)
+         (cl-find t condition :test
+                  (lambda (_ condition)
+                    (magit-section-match condition section))))
+        (t
+         (magit-section-match-1 (if (symbolp condition)
+                                    (list condition)
+                                  (append condition nil))
+                                (magit-section-context-type section)))))
+
+(defmacro magit-section-case (slots &rest clauses)
+  (declare (indent 1))
+  `(let* ((it (magit-current-section))
+          ,@(mapcar
+             (lambda (slot)
+               `(,slot
+                 (and it (,(intern (format "magit-section-%s" slot)) it))))
+             slots))
+     (cond ,@(mapcar (lambda (clause)
+                       `((magit-section-match ',(car clause) it)
+                         ,@(cdr clause)))
+                     clauses))))
+
+(defconst magit-section-action-success
+  (make-symbol "magit-section-action-success"))
+
+(defmacro magit-section-action (opname slots &rest clauses)
+  (declare (indent 2) (debug (sexp &rest (sexp body))))
+  (let ((value (cl-gensym "value")))
+    `(let ((,value
+            (or (run-hook-wrapped
+                 ',(intern (format "magit-%s-hook" opname))
+                 (lambda (fn section)
+                   (when (magit-section-match
+                          (or (get fn 'magit-section-action-context)
+                              (error "%s undefined for %s"
+                                     'magit-section-action-context fn))
+                          section)
+                     (funcall fn (magit-section-info section))))
+                 (magit-current-section))
+                (magit-section-case ,slots
+                  ,@clauses
+                  (t (user-error
+                      (if (magit-current-section)
+                          ,(format "Cannot %s this section" opname)
+                        ,(format "Nothing to %s here" opname))))))))
+       (unless (eq ,value magit-section-action-success)
+         ,value))))
+
+;;;; Process Api
+;;;;; Process Commands
+
+(defun magit-process ()
+  "Display Magit process buffer."
+  (interactive)
+  (let ((buf (magit-process-buffer)))
+    (if (buffer-live-p buf)
+        (pop-to-buffer buf)
+      (user-error "Process buffer doesn't exist"))))
+
+(defun magit-process-kill ()
+  "Kill the process at point."
+  (interactive)
+  (magit-section-case (info)
+    (process (if (eq (process-status info) 'run)
+                 (when (yes-or-no-p "Kill this process? ")
+                   (kill-process info))
+               (user-error "Process isn't running")))))
+
+(defvar magit-git-command-history nil)
+
+;;;###autoload
+(defun magit-git-command (args directory)
+  "Execute a Git subcommand asynchronously, displaying the output.
+With a prefix argument run Git in the root of the current
+repository.  Non-interactively run Git in DIRECTORY with ARGS."
+  (interactive (magit-git-command-read-args))
+  (require 'eshell)
+  (magit-mode-display-buffer (magit-process-buffer nil t)
+                             'magit-process-mode 'pop-to-buffer)
+  (goto-char (point-max))
+  (let ((default-directory directory))
+    (magit-run-git-async
+     (with-temp-buffer
+       (insert args)
+       (mapcar 'eval (eshell-parse-arguments (point-min)
+                                             (point-max)))))))
+
+(defun magit-git-command-topdir (args directory)
+  "Execute a Git subcommand asynchronously, displaying the output.
+Run Git in the root of the current repository.
+\n(fn)" ; arguments are for internal use
+  (interactive (magit-git-command-read-args t))
+  (magit-git-command args directory))
+
+(defun magit-git-command-read-args (&optional root)
+  (let ((dir (if (or root current-prefix-arg)
+                 (or (magit-get-top-dir)
+                     (user-error "Not inside a Git repository"))
+               default-directory)))
+    (list (read-string (format "Git subcommand (in %s): "
+                               (abbreviate-file-name dir))
+                       nil 'magit-git-command-history)
+          dir)))
+
+;;;;; Process Mode
+
+(define-derived-mode magit-process-mode magit-mode "Magit Process"
+  "Mode for looking at git process output.")
+
+(defvar magit-process-buffer-name "*magit-process*"
+  "Name of buffer where output of processes is put.")
+
+(defun magit-process-buffer (&optional topdir create)
+  (or (magit-mode-get-buffer magit-process-buffer-name
+                             'magit-process-mode topdir)
+      (with-current-buffer (magit-mode-get-buffer-create
+                            magit-process-buffer-name
+                            'magit-process-mode topdir)
+        (magit-process-mode)
+        (let* ((inhibit-read-only t)
+               (s (magit-with-section (section processbuf nil nil t)
+                    (insert "\n"))))
+          (set-marker-insertion-type (magit-section-beginning s) nil)
+          (set-marker-insertion-type (magit-section-content-beginning s) nil)
+          (current-buffer)))))
+
+;;;;; Synchronous Processes
+
+(defun magit-git-exit-code (&rest args)
+  "Execute Git with ARGS, returning its exit code."
+  (apply #'process-file magit-git-executable nil nil nil
+         (append magit-git-standard-options
+                 (magit-flatten-onelevel args))))
+
+(defun magit-git-success (&rest args)
+  "Execute Git with ARGS, returning t if its exit code is 0."
+  (= (apply #'magit-git-exit-code args) 0))
+
+(defun magit-git-failure (&rest args)
+  "Execute Git with ARGS, returning t if its exit code is 1."
+  (= (apply #'magit-git-exit-code args) 1))
+
+(defun magit-git-string (&rest args)
+  "Execute Git with ARGS, returning the first line of its output.
+If there is no output return nil.  If the output begins with a
+newline return an empty string."
+  (with-temp-buffer
+    (apply #'process-file magit-git-executable nil (list t nil) nil
+           (append magit-git-standard-options
+                   (magit-flatten-onelevel args)))
+    (unless (= (point-min) (point-max))
+      (goto-char (point-min))
+      (buffer-substring-no-properties
+       (line-beginning-position)
+       (line-end-position)))))
+
+(defun magit-git-true (&rest args)
+  "Execute Git with ARGS, returning t if it prints \"true\".
+Return t if the first (and usually only) output line is the
+string \"true\", otherwise return nil."
+  (equal (apply #'magit-git-string args) "true"))
+
+(defun magit-git-false (&rest args)
+  "Execute Git with ARGS, returning t if it prints \"false\".
+Return t if the first (and usually only) output line is the
+string \"false\", otherwise return nil."
+  (equal (apply #'magit-git-string args) "false"))
+
+(defun magit-git-insert (&rest args)
+  "Execute Git with ARGS, inserting its output at point."
+  (apply #'process-file magit-git-executable nil (list t nil) nil
+         (append magit-git-standard-options
+                 (magit-flatten-onelevel args))))
+
+(defun magit-git-lines (&rest args)
+  "Execute Git with ARGS, returning its output as a list of lines.
+Empty lines anywhere in the output are omitted."
+  (with-temp-buffer
+    (apply #'process-file magit-git-executable nil (list t nil) nil
+           (append magit-git-standard-options
+                   (magit-flatten-onelevel args)))
+    (split-string (buffer-string) "\n" 'omit-nulls)))
+
+(defun magit-run-git (&rest args)
+  "Call Git synchronously in a separate process, and refresh.
+
+The arguments ARGS specify command line arguments.  The first
+level of ARGS is flattened, so each member of ARGS has to be a
+string or a list of strings.
+
+Option `magit-git-executable' specifies which Git executable is
+used.  The arguments in option `magit-git-standard-options' are
+prepended to ARGS.
+
+After Git returns, the current buffer (if it is a Magit buffer)
+as well as the current repository's status buffer are refreshed.
+Unmodified buffers visiting files that are tracked in the current
+repository are reverted if `magit-auto-revert-mode' is active.
+
+Process output goes into a new section in a buffer specified by
+variable `magit-process-buffer-name'."
+  (apply #'magit-call-git (magit-process-quote-arguments args))
+  (magit-refresh))
+
+(defun magit-call-git (&rest args)
+  "Call Git synchronously in a separate process.
+
+The arguments ARGS specify command line arguments.  The first
+level of ARGS is flattened, so each member of ARGS has to be a
+string or a list of strings.
+
+Option `magit-git-executable' specifies which Git executable is
+used.  The arguments in option `magit-git-standard-options' are
+prepended to ARGS.
+
+Process output goes into a new section in a buffer specified by
+variable `magit-process-buffer-name'."
+  (apply #'magit-call-process magit-git-executable
+         (append magit-git-standard-options args)))
+
+(defun magit-call-process (program &rest args)
+  "Call PROGRAM synchronously in a separate process.
+
+The arguments ARGS specify command line arguments.  The first
+level of ARGS is flattened, so each member of ARGS has to be a
+string or a list of strings.
+
+Process output goes into a new section in a buffer specified by
+variable `magit-process-buffer-name'."
+  (setq args (magit-flatten-onelevel args))
+  (cl-destructuring-bind (process-buf . section)
+      (magit-process-setup program args)
+    (magit-process-finish
+     (let ((inhibit-read-only t))
+       (apply #'process-file program nil process-buf nil args))
+     process-buf (current-buffer) default-directory section)))
+
+(defun magit-run-git-with-input (input &rest args)
+  "Call Git in a separate process.
+
+The first argument, INPUT, has to be a buffer or the name of an
+existing buffer.  The content of that buffer is used as the
+process' standard input.
+
+The remaining arguments, ARGS, specify command line arguments.
+The first level of ARGS is flattened, so each member of ARGS has
+to be a string or a list of strings.
+
+Option `magit-git-executable' specifies which Git executable is
+used.  The arguments in option `magit-git-standard-options' are
+prepended to ARGS.
+
+After Git returns, the current buffer (if it is a Magit buffer)
+as well as the current repository's status buffer are refreshed.
+Unmodified buffers visiting files that are tracked in the current
+repository are reverted if `magit-auto-revert-mode' is active.
+
+This function actually starts a asynchronous process, but it then
+waits for that process to return."
+  (apply #'magit-start-git input args)
+  (magit-process-wait)
+  (magit-refresh))
+
+(defun magit-run-git-with-logfile (file &rest args)
+  "Call Git in a separate process and log its output.
+And log the output to FILE.  This function might have a
+short halflive.  See `magit-run-git' for more information."
+  (apply #'magit-start-git nil args)
+  (process-put magit-this-process 'logfile file)
+  (set-process-filter magit-this-process 'magit-process-logfile-filter)
+  (magit-process-wait)
+  (magit-refresh))
+
+;;;;; Asynchronous Processes
+
+(defvar magit-this-process nil)
+
+(defun magit-run-git-async (&rest args)
+  "Start Git, prepare for refresh, and return the process object.
+
+If optional argument INPUT is non-nil, it has to be a buffer or
+the name of an existing buffer.  The content of that buffer is
+used as the process' standard input.
+
+The remaining arguments, ARGS, specify command line arguments.
+The first level of ARGS is flattened, so each member of ARGS has
+to be a string or a list of strings.
+
+Display the command line arguments in the echo area.
+
+After Git returns some buffers are refreshed: the buffer that was
+current when `magit-start-process' was called (if it is a Magit
+buffer and still alive), as well as the respective Magit status
+buffer.  Unmodified buffers visiting files that are tracked in
+the current repository are reverted if `magit-auto-revert-mode'
+is active.
+
+See `magit-start-process' for more information."
+  (message "Running %s %s" magit-git-executable
+           (mapconcat 'identity (magit-flatten-onelevel args) " "))
+  (apply #'magit-start-git nil args))
+
+(defun magit-start-git (&optional input &rest args)
+  "Start Git, prepare for refresh, and return the process object.
+
+If optional argument INPUT is non-nil, it has to be a buffer or
+the name of an existing buffer.  The buffer content becomes the
+processes standard input.
+
+The remaining arguments, ARGS, specify command line arguments.
+The first level of ARGS is flattened, so each member of ARGS has
+to be a string or a list of strings.
+
+After Git returns some buffers are refreshed: the buffer that was
+current when `magit-start-process' was called (if it is a Magit
+buffer and still alive), as well as the respective Magit status
+buffer.  Unmodified buffers visiting files that are tracked in
+the current repository are reverted if `magit-auto-revert-mode'
+is active.
+
+See `magit-start-process' for more information."
+  (apply #'magit-start-process magit-git-executable input
+         (append magit-git-standard-options
+                 (magit-process-quote-arguments args))))
+
+(defun magit-start-process (program &optional input &rest args)
+  "Start PROGRAM, prepare for refresh, and return the process object.
+
+If optional argument INPUT is non-nil, it has to be a buffer or
+the name of an existing buffer.  The buffer content becomes the
+processes standard input.
+
+The remaining arguments, ARGS, specify command line arguments.
+The first level of ARGS is flattened, so each member of ARGS has
+to be a string or a list of strings.
+
+The process is started using `start-file-process' and then setup
+to use the sentinel `magit-process-sentinel' and the filter
+`magit-process-filter'.  Information required by these functions
+is stored in the process object.  When this function returns the
+process has not started to run yet so it is possible to override
+the sentinel and filter.
+
+After the process returns, `magit-process-sentinel' refreshes the
+buffer that was current when `magit-start-process' was called (if
+it is a Magit buffer and still alive), as well as the respective
+Magit status buffer.  Unmodified buffers visiting files that are
+tracked in the current repository are reverted if
+`magit-auto-revert-mode' is active."
+  (setq args (magit-flatten-onelevel args))
+  (cl-destructuring-bind (process-buf . section)
+      (magit-process-setup program args)
+    (let* ((process-connection-type
+            ;; Don't use a pty, because it would set icrnl
+            ;; which would modify the input (issue #20).
+            (and (not input) magit-process-connection-type))
+           (process (apply 'start-file-process
+                           (file-name-nondirectory program)
+                           process-buf program args)))
+      (set-process-sentinel process #'magit-process-sentinel)
+      (set-process-filter   process #'magit-process-filter)
+      (set-process-buffer   process process-buf)
+      (process-put process 'section section)
+      (process-put process 'command-buf (current-buffer))
+      (process-put process 'default-dir default-directory)
+      (setf (magit-section-process section) process)
+      (with-current-buffer process-buf
+        (set-marker (process-mark process) (point)))
+      (when input
+        (with-current-buffer input
+          (process-send-region process (point-min) (point-max))
+          (process-send-eof    process)))
+      (setq magit-this-process process)
+      (setf (magit-section-info section) process)
+      (magit-process-display-buffer process)
+      process)))
+
+;;;;; Process Internals
+
+(defun magit-process-setup (program args)
+  (magit-process-set-mode-line program args)
+  (let ((buf (magit-process-buffer)))
+    (if  buf
+        (magit-process-truncate-log buf)
+      (setq buf (magit-process-buffer nil t)))
+    (with-current-buffer buf
+      (goto-char (1- (point-max)))
+      (let* ((inhibit-read-only t)
+             (magit-with-section--parent magit-root-section)
+             ;; Kids, don't do this ^^^^ at home.
+             (s (magit-with-section
+                    (section process nil
+                             (mapconcat 'identity (cons program args) " "))
+                  (insert "\n"))))
+        (set-marker-insertion-type (magit-section-content-beginning s) nil)
+        (insert "\n")
+        (backward-char 2)
+        (cons (current-buffer) s)))))
+
+(defun magit-process-truncate-log (buffer)
+  (with-current-buffer buffer
+    (let* ((head nil)
+           (tail (magit-section-children magit-root-section))
+           (count (length tail)))
+      (when (> (1+ count) magit-process-log-max)
+        (while (and (cdr tail)
+                    (> count (/ magit-process-log-max 2)))
+          (let* ((inhibit-read-only t)
+                 (section (car tail))
+                 (process (magit-section-process section)))
+            (cond ((not process))
+                  ((memq (process-status process) '(exit signal))
+                   (delete-region (magit-section-beginning section)
+                                  (1+ (magit-section-end section)))
+                   (cl-decf count))
+                  (t
+                   (push section head))))
+          (pop tail))
+        (setf (magit-section-children magit-root-section)
+              (nconc (reverse head) tail))))))
+
+(defun magit-process-sentinel (process event)
+  "Default sentinel used by `magit-start-process'."
+  (when (memq (process-status process) '(exit signal))
+    (setq event (substring event 0 -1))
+    (magit-process-unset-mode-line)
+    (when (string-match "^finished" event)
+      (message (concat (capitalize (process-name process)) " finished")))
+    (magit-process-finish process)
+    (when (eq process magit-this-process)
+      (setq magit-this-process nil))
+    (magit-refresh (and (buffer-live-p (process-get process 'command-buf))
+                        (process-get process 'command-buf)))))
+
+(defun magit-process-filter (proc string)
+  "Default filter used by `magit-start-process'."
+  (with-current-buffer (process-buffer proc)
+    (let ((inhibit-read-only t))
+      (magit-process-yes-or-no-prompt proc string)
+      (magit-process-username-prompt  proc string)
+      (magit-process-password-prompt  proc string)
+      (goto-char (process-mark proc))
+      (setq string (propertize string 'invisible
+                               (magit-section-hidden
+                                (process-get proc 'section))))
+      ;; 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-and-inherit (substring string (+ ret-pos 1))))
+              (t
+               (insert-and-inherit string))))
+      (set-marker (process-mark proc) (point)))))
+
+(defun magit-process-logfile-filter (process string)
+  "Special filter used by `magit-run-git-with-logfile'."
+  (magit-process-filter process string)
+  (let ((file (process-get process 'logfile)))
+    (with-temp-file file
+      (when (file-exists-p file)
+        (insert-file-contents file)
+        (goto-char (point-max)))
+      (insert string)
+      (write-region (point-min) (point-max) file))))
+
+(defun magit-process-yes-or-no-prompt (proc string)
+  "Forward yes-or-no prompts to the user."
+  (let ((beg (string-match magit-process-yes-or-no-prompt-regexp string))
+        (max-mini-window-height 30))
+    (when beg
+      (process-send-string
+       proc
+       (downcase
+        (concat (match-string (if (yes-or-no-p (substring string 0 beg)) 1 2)
+                              string)
+                "\n"))))))
+
+(defun magit-process-password-prompt (proc string)
+  "Forward password prompts to the user."
+  (let ((prompt (magit-process-match-prompt
+                 magit-process-password-prompt-regexps string)))
+    (when prompt
+      (process-send-string proc (concat (read-passwd prompt) "\n")))))
+
+(defun magit-process-username-prompt (proc string)
+  "Forward username prompts to the user."
+  (let ((prompt (magit-process-match-prompt
+                 magit-process-username-prompt-regexps string)))
+    (when prompt
+      (process-send-string proc
+                           (concat (read-string prompt nil nil
+                                                (user-login-name))
+                                   "\n")))))
+
+(defun magit-process-match-prompt (prompts string)
+  (when (cl-find-if (lambda (regex)
+                      (string-match regex string))
+                    prompts)
+    (let ((prompt (match-string 0 string)))
+      (cond ((string-match ": $" prompt) prompt)
+            ((string-match ":$"  prompt) (concat prompt " "))
+            (t                           (concat prompt ": "))))))
+
+(defun magit-process-wait ()
+  (while (and magit-this-process
+              (eq (process-status magit-this-process) 'run))
+    (sit-for 0.1 t)))
+
+(defun magit-process-set-mode-line (program args)
+  (when (equal program magit-git-executable)
+    (setq args (nthcdr (1+ (length magit-git-standard-options)) args)))
+  (magit-map-magit-buffers
+   (apply-partially (lambda (s)
+                      (setq mode-line-process s))
+                    (concat " " program
+                            (and args (concat " " (car args)))))))
+
+(defun magit-process-unset-mode-line ()
+  (magit-map-magit-buffers (lambda () (setq mode-line-process nil))))
+
+(defvar magit-process-error-message-re
+  (concat "^\\(?:error\\|fatal\\|git\\): \\(.*\\)" paragraph-separate))
+
+(defun magit-process-finish (arg &optional process-buf command-buf
+                                 default-dir section)
+  (unless (integerp arg)
+    (setq process-buf (process-buffer arg)
+          command-buf (process-get arg 'command-buf)
+          default-dir (process-get arg 'default-dir)
+          section     (process-get arg 'section)
+          arg         (process-exit-status arg)))
+  (when (featurep 'dired)
+    (dired-uncache default-dir))
+  (when (buffer-live-p process-buf)
+    (with-current-buffer process-buf
+      (let ((inhibit-read-only t)
+            (mark (magit-section-beginning section)))
+        (set-marker-insertion-type mark nil)
+        (goto-char mark)
+        (insert (propertize (format "%3s " arg)
+                            'magit-section section
+                            'face (if (= arg 0)
+                                      'magit-process-ok
+                                    'magit-process-ng))))))
+  (unless (= arg 0)
+    (message ; `error' would prevent refresh
+     "%s ... [%s buffer %s for details]"
+     (or (and (buffer-live-p process-buf)
+              (with-current-buffer process-buf
+                (save-excursion
+                  (goto-char (magit-section-end section))
+                  (when (re-search-backward
+                         magit-process-error-message-re
+                         (magit-section-content-beginning section)
+                         t)
+                    (match-string 1)))))
+         "Git failed")
+     (let ((key (and (buffer-live-p command-buf)
+                     (with-current-buffer command-buf
+                       (car (where-is-internal
+                             'magit-process-display-buffer))))))
+       (if key (format "Hit %s to see" (key-description key)) "See"))
+     (buffer-name process-buf)))
+  arg)
+
+(defun magit-process-display-buffer (process)
+  (when (process-live-p process)
+    (let ((buf (process-buffer process)))
+      (cond ((not (buffer-live-p buf)))
+            ((= magit-process-popup-time 0)
+             (pop-to-buffer buf))
+            ((> magit-process-popup-time 0)
+             (run-with-timer magit-process-popup-time nil
+                             (lambda (p)
+                               (when (eq (process-status p) 'run)
+                                 (let ((buf (process-buffer p)))
+                                   (when (buffer-live-p buf)
+                                     (pop-to-buffer buf)))))
+                             process))))))
+
+(defun magit-process-quote-arguments (args)
+  "Quote each argument in list ARGS as an argument to Git.
+Except when `magit-process-quote-curly-braces' is non-nil ARGS is
+returned unchanged.  This is required to works around strangeness
+of the Windows \"Powershell\"."
+  (if magit-process-quote-curly-braces
+      (mapcar (apply-partially 'replace-regexp-in-string
+                               "{\\([0-9]+\\)}" "\\\\{\\1\\\\}")
+              (magit-flatten-onelevel args))
+    args))
+
+;;;; Mode Api
+;;;;; Mode Foundation
+
+(define-derived-mode magit-mode special-mode "Magit"
+  "Parent major mode from which Magit major modes inherit.
+
+Please see the manual for a complete description of Magit.
+
+\\{magit-mode-map}"
+  (buffer-disable-undo)
+  (setq truncate-lines t)
+  (add-hook 'pre-command-hook  #'magit-remember-point nil t)
+  (add-hook 'post-command-hook #'magit-correct-point-after-command t t)
+  (add-hook 'post-command-hook #'magit-highlight-section t t)
+  ;; Emacs' normal method of showing trailing whitespace gives weird
+  ;; results when `magit-whitespace-warning-face' is different from
+  ;; `trailing-whitespace'.
+  (when (and magit-highlight-whitespace
+             magit-highlight-trailing-whitespace)
+    (setq show-trailing-whitespace nil)))
+
+(defvar-local magit-refresh-function nil)
+(put 'magit-refresh-function 'permanent-local t)
+
+(defvar-local magit-refresh-args nil)
+(put 'magit-refresh-args 'permanent-local t)
+
+(defmacro magit-mode-setup
+  (buffer switch-func mode refresh-func &rest refresh-args)
+  "Display and select BUFFER, turn on MODE, and refresh a first time.
+Display BUFFER using `magit-mode-display-buffer', then turn on
+MODE in BUFFER, set the local value of `magit-refresh-function'
+to REFRESH-FUNC and that of `magit-refresh-args' to REFRESH-ARGS
+and finally \"refresh\" a first time.  All arguments are
+evaluated before switching to BUFFER."
+  (let ((mode-symb (cl-gensym "mode-symb"))
+        (toplevel  (cl-gensym "toplevel"))
+        (init-args (cl-gensym "init-args"))
+        (buf-symb  (cl-gensym "buf-symb")))
+    `(let* ((,mode-symb ,mode)
+            (,toplevel  (magit-get-top-dir))
+            (,init-args (list ,mode-symb ,refresh-func ,@refresh-args))
+            (,buf-symb  (magit-mode-display-buffer
+                         ,buffer ,mode-symb ,switch-func)))
+       (if ,toplevel
+           (with-current-buffer ,buf-symb
+             (apply #'magit-mode-init ,toplevel ,init-args))
+         (user-error "Not inside a Git repository")))))
+
+(defun magit-mode-init (dir mode refresh-func &rest refresh-args)
+  "Turn on MODE and refresh in the current buffer.
+Turn on MODE, set the local value of `magit-refresh-function' to
+REFRESH-FUNC and that of `magit-refresh-args' to REFRESH-ARGS and
+finally \"refresh\" a first time.
+
+Also see `magit-mode-setup', a more convenient variant."
+  (cl-case mode
+    (magit-commit-mode
+     (magit-setup-xref (cons #'magit-show-commit refresh-args))
+     (goto-char (point-min)))
+    (magit-diff-mode
+     (magit-setup-xref (cons #'magit-diff refresh-args))
+     (goto-char (point-min))))
+  (setq default-directory dir
+        magit-refresh-function refresh-func
+        magit-refresh-args refresh-args)
+  (funcall mode)
+  (magit-mode-refresh-buffer))
+
+(defvar-local magit-previous-window-configuration nil)
+(put 'magit-previous-window-configuration 'permanent-local t)
+
+(defun magit-mode-display-buffer (buffer mode &optional switch-function)
+  "Display BUFFER in some window and select it.
+BUFFER may be a buffer or a string, the name of a buffer.  Return
+the buffer.
+
+Unless BUFFER is already displayed in the selected frame store the
+previous window configuration as a buffer local value, so that it
+can later be restored by `magit-mode-quit-window'.
+
+Then display and select BUFFER using SWITCH-FUNCTION.  If that is
+nil either use `pop-to-buffer' if the current buffer's major mode
+derives from Magit mode; or else use `switch-to-buffer'.
+
+This is only intended for buffers whose major modes derive from
+Magit mode."
+  (cond ((stringp buffer)
+         (setq buffer (magit-mode-get-buffer-create buffer mode)))
+        ((not (bufferp buffer))
+         (signal 'wrong-type-argument (list 'bufferp nil))))
+  (unless (get-buffer-window buffer (selected-frame))
+    (with-current-buffer (get-buffer-create buffer)
+      (setq magit-previous-window-configuration
+            (current-window-configuration))))
+  (funcall (or switch-function
+               (if (derived-mode-p 'magit-mode)
+                   'switch-to-buffer
+                 'pop-to-buffer))
+           buffer)
+  buffer)
+
+(defun magit-mode-get-buffer (format mode &optional topdir create)
+  (if (not (string-match-p "%[Tt]" format))
+      (funcall (if create #'get-buffer-create #'get-buffer) format)
+    (unless topdir
+      (setq topdir (magit-get-top-dir)))
+    (let ((name (format-spec
+                 format `((?T . ,topdir)
+                          (?t . ,(file-name-nondirectory
+                                  (directory-file-name topdir)))))))
+      (or (cl-find-if
+           (lambda (buf)
+             (with-current-buffer buf
+               (and (or (not mode) (eq major-mode mode))
+                    (equal (expand-file-name default-directory) topdir)
+                    (string-match-p (format "^%s\\(?:<[0-9]+>\\)?$"
+                                            (regexp-quote name))
+                                    (buffer-name)))))
+           (buffer-list))
+          (and create (generate-new-buffer name))))))
+
+(defun magit-mode-get-buffer-create (format mode &optional topdir)
+  (magit-mode-get-buffer format mode topdir t))
+
+(cl-defun magit-mode-refresh-buffer (&optional (buffer (current-buffer)))
+  (with-current-buffer buffer
+    (when magit-refresh-function
+      (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 ((inhibit-read-only t)
+              (section-line (and old-section
+                                 (count-lines
+                                  (magit-section-beginning old-section)
+                                  (point))))
+              (line-char (- old-point (point))))
+          (erase-buffer)
+          (apply magit-refresh-function
+                 magit-refresh-args)
+          (let ((s (and old-path (magit-find-section old-path magit-root-section))))
+            (cond (s
+                   (goto-char (magit-section-beginning s))
+                   (forward-line section-line)
+                   (forward-char line-char))
+                  (t
+                   (save-restriction
+                     (widen)
+                     (goto-char (point-min))
+                     (forward-line (1- old-line)))))))
+        (magit-highlight-section)
+        (magit-refresh-marked-commits-in-buffer)))))
+
+(defun magit-mode-quit-window (&optional kill-buffer)
+  "Bury the current buffer and delete its window.
+With a prefix argument, kill the buffer instead.
+
+If `magit-restore-window-configuration' is non-nil and the last
+configuration stored by `magit-mode-display-buffer' originates
+from the selected frame then restore it after burrying/killing
+the buffer.  Finally reset the window configuration to nil."
+  (interactive "P")
+  (let ((winconf magit-previous-window-configuration)
+        (buffer (current-buffer))
+        (frame (selected-frame)))
+    (quit-window kill-buffer (selected-window))
+    (when winconf
+      (when (and magit-restore-window-configuration
+                 (equal frame (window-configuration-frame winconf)))
+        (set-window-configuration winconf)
+        (when (buffer-live-p buffer)
+          (with-current-buffer buffer
+            (setq magit-previous-window-configuration nil)))))
+    (run-hook-with-args 'magit-mode-quit-window-hook buffer)))
+
+;;;;; Mode Utilities
+
+(defun magit-map-magit-buffers (func &optional dir)
+  (dolist (buf (buffer-list))
+    (with-current-buffer buf
+      (when (and (derived-mode-p 'magit-mode)
+                 (or (null dir)
+                     (equal default-directory dir)))
+        (funcall func)))))
+
+;;;;; (section kludges)
+
+(defvar-local magit-last-point nil)
+(put 'magit-last-point 'permanent-local t)
+
+(defun magit-remember-point ()
+  (setq magit-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."
+  (when (invisible-p (point))
+    (let ((end (magit-invisible-region-end (point))))
+      (goto-char (if (= end magit-last-point)
+                     (magit-invisible-region-start (point))
+                   end))))
+  (setq disable-point-adjustment t))
+
+;;;;; Buffer History
+
+(defun magit-go-backward ()
+  "Move backward in current buffer's history."
+  (interactive)
+  (if help-xref-stack
+      (help-xref-go-back (current-buffer))
+    (user-error "No previous entry in buffer's history")))
+
+(defun magit-go-forward ()
+  "Move forward in current buffer's history."
+  (interactive)
+  (if help-xref-forward-stack
+      (help-xref-go-forward (current-buffer))
+    (user-error "No next entry in buffer's history")))
+
+(defun magit-xref-insert-buttons ()
+  (when (and (or (eq magit-show-xref-buttons t)
+                 (apply 'derived-mode-p magit-show-xref-buttons))
+	     (or help-xref-stack help-xref-forward-stack))
+    (insert "\n")
+    (when help-xref-stack
+      (magit-xref-insert-button help-back-label
+                                'magit-xref-backward))
+    (when help-xref-forward-stack
+      (when help-xref-stack
+	(insert " "))
+      (magit-xref-insert-button help-forward-label
+                                'magit-xref-forward))))
+
+(defun magit-xref-insert-button (label type)
+  (magit-with-section (section button label)
+    (insert-text-button label 'type type
+                        'help-args (list (current-buffer)))))
+
+(define-button-type 'magit-xref-backward
+  :supertype 'help-back
+  'mouse-face magit-item-highlight-face
+  'help-echo (purecopy "mouse-2, RET: go back to previous history entry"))
+
+(define-button-type 'magit-xref-forward
+  :supertype 'help-forward
+  'mouse-face magit-item-highlight-face
+  'help-echo (purecopy "mouse-2, RET: go back to next history entry"))
+
+(defun magit-setup-xref (item)
+  (when help-xref-stack-item
+    (push (cons (point) help-xref-stack-item) help-xref-stack)
+    (setq help-xref-forward-stack nil))
+  (when (called-interactively-p 'interactive)
+    (let ((tail (nthcdr 10 help-xref-stack)))
+      (if tail (setcdr tail nil))))
+  (setq help-xref-stack-item item))
+
+;;;;; Refresh Machinery
+
+(defun magit-refresh (&optional buffer)
+  "Refresh some buffers belonging to the current repository.
+
+Refresh the current buffer if its major mode derives from
+`magit-mode', and refresh the corresponding status buffer.
+If the global `magit-auto-revert-mode' is turned on, then
+also revert all unmodified buffers that visit files being
+tracked in the current repository."
+  (interactive (list (current-buffer)))
+  (unless buffer
+    (setq buffer (current-buffer)))
+  (with-current-buffer buffer
+    (when (derived-mode-p 'magit-mode)
+      (magit-mode-refresh-buffer buffer))
+    (let (status)
+      (when (and (not (eq major-mode 'magit-status-mode))
+                 (setq status (magit-mode-get-buffer
+                               magit-status-buffer-name
+                               'magit-status-mode)))
+        (magit-mode-refresh-buffer status))))
+  (when magit-auto-revert-mode
+    (magit-revert-buffers)))
+
+(defun magit-refresh-all ()
+  "Refresh all buffers belonging to the current repository.
+
+Refresh all Magit buffers belonging to the current repository.
+If the global `magit-auto-revert-mode' is turned on, then also
+revert all unmodified buffers that visit files being tracked in
+the current repository."
+  (interactive)
+  (magit-map-magit-buffers #'magit-mode-refresh-buffer default-directory)
+  (magit-revert-buffers))
+
+(defun magit-revert-buffers ()
+  (let ((topdir (magit-get-top-dir)))
+    (when topdir
+      (let ((gitdir  (magit-git-dir))
+            (tracked (magit-git-lines "ls-tree" "-r" "--name-only" "HEAD")))
+        (dolist (buf (buffer-list))
+          (with-current-buffer buf
+            (let ((file (buffer-file-name)))
+              (and file (string-prefix-p topdir file)
+                   (not (string-prefix-p gitdir file))
+                   (member (file-relative-name file topdir) tracked)
+                   (let ((auto-revert-mode t))
+                     (auto-revert-handler)
+                     (run-hooks 'magit-revert-buffer-hook))))))))))
+
+;;; (misplaced)
+;;;; Diff Options
+
+(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-set-diff-options ()
+  "Set local `magit-diff-options' based on popup state.
+And refresh the current Magit buffer."
+  (interactive)
+  (setq-local magit-diff-options magit-custom-options)
+  (magit-refresh))
+
+;; `magit-set-default-diff-options' is defined in "Options"/"Setters".
+
+(defun magit-save-default-diff-options ()
+  "Set and save the default for `magit-diff-options' based on popup value.
+Also set the local value in all Magit buffers and refresh them."
+  (interactive)
+  (customize-save-variable 'magit-diff-options magit-custom-options))
+
+(defun magit-reset-diff-options ()
+  "Reset local `magit-diff-options' to default value.
+And refresh the current Magit buffer."
+  (interactive)
+  (setq-local magit-diff-options (default-value 'magit-diff-options))
+  (magit-refresh))
+
+;;;; Raw Diff Washing
+
+(defun magit-insert-diff (section file status)
+  (let ((beg (point)))
+    (apply 'magit-git-insert "-c" "diff.submodule=short" "diff"
+           `(,(magit-diff-U-arg) ,@magit-diff-options "--" ,file))
+    (unless (eq (char-before) ?\n)
+      (insert "\n"))
+    (save-restriction
+      (narrow-to-region beg (point))
+      (goto-char beg)
+      (magit-wash-diff-section section)
+      (goto-char (point-max)))))
+
+(defun magit-wash-raw-diffs (&optional staged)
+  (let (previous)
+    (magit-wash-sequence
+     (lambda ()
+       (setq previous (magit-wash-raw-diff previous staged))))))
+
+(defun magit-wash-raw-diff (previous staged)
+  (when (looking-at
+         ":\\([0-7]+\\) \\([0-7]+\\) [0-9a-f]+ [0-9a-f]+ \\(.\\)[0-9]*\t\\([^\t\n]+\\)$")
+    (let ((file (magit-decode-git-path (match-string-no-properties 4)))
+          (status (cl-ecase (string-to-char (match-string-no-properties 3))
+                    (?A 'new)
+                    (?C 'copy)
+                    (?D 'deleted)
+                    (?M 'modified)
+                    (?T 'typechange)
+                    (?U 'unmerged)
+                    (?X 'unknown))))
+      (delete-region (point) (1+ (line-end-position)))
+      (unless (or ;; Unmerged files get two entries; we ignore the second.
+                  (equal file previous)
+                  ;; Ignore staged, unmerged files.
+                  (and staged (eq status 'unmerged)))
+        (magit-with-section (section diff file nil nil
+                                     (not (derived-mode-p
+                                           'magit-diff-mode
+                                           'magit-commit-mode)))
+          (if (not (magit-section-hidden section))
+              (magit-insert-diff section file status)
+            (setf (magit-section-diff-status section) status)
+            (setf (magit-section-needs-refresh-on-show section) t)
+            (magit-insert-diff-title status file nil))))
+      file)))
+
+;;; Modes (1)
+;;;; Commit Mode
+;;;;; Commit Core
+
+(define-derived-mode magit-commit-mode magit-mode "Magit"
+  "Mode for looking at a git commit.
+
+\\<magit-commit-mode-map>Type `\\[magit-visit-item]` to visit the changed file, \
+`\\[magit-toggle-section]` to hide or show a hunk,
+`\\[magit-diff-larger-hunks]` and `\\[magit-diff-smaller-hunks]` to change the \
+size of the hunks.
+Type `\\[magit-apply-item]` to apply a change to your worktree and \
+`\\[magit-revert-item]` to reverse it.
+
+\\{magit-commit-mode-map}
+Unless shadowed by the mode specific bindings above, bindings
+from the parent keymap `magit-mode-map' are also available."
+  :group 'magit)
+
+(defvar magit-commit-buffer-name "*magit-commit*"
+  "Name of buffer used to display a commit.")
+
+;;;###autoload
+(defun magit-show-commit (commit &optional noselect)
+  "Show information about COMMIT."
+  (interactive (list (magit-read-rev-with-default
+                      "Show commit (hash or ref)")))
+  (when (magit-git-failure "cat-file" "commit" commit)
+    (user-error "%s is not a commit" commit))
+  (magit-mode-setup magit-commit-buffer-name
+                    (if noselect 'display-buffer 'pop-to-buffer)
+                    #'magit-commit-mode
+                    #'magit-refresh-commit-buffer
+                    commit))
+
+(defun magit-show-item-or-scroll-up ()
+  "Update commit or status buffer for item at point.
+
+Either show the commit or stash at point in another buffer,
+or if that buffer is already displayed in the current frame
+and contains information about that commit or stash, then
+instead scroll the buffer up.  If there is no commit or
+stash at point, then prompt for a commit."
+  (interactive)
+  (magit-show-item-or-scroll 'scroll-up))
+
+(defun magit-show-item-or-scroll-down ()
+  "Update commit or status buffer for item at point.
+
+Either show the commit or stash at point in another buffer,
+or if that buffer is already displayed in the current frame
+and contains information about that commit or stash, then
+instead scroll the buffer down.  If there is no commit or
+stash at point, then prompt for a commit."
+  (interactive)
+  (magit-show-item-or-scroll 'scroll-down))
+
+(defun magit-show-item-or-scroll (fn)
+  (let (rev cmd buf win)
+    (magit-section-case (info)
+      (commit (setq rev info
+                    cmd 'magit-show-commit
+                    buf magit-commit-buffer-name))
+      (stash  (setq rev info
+                    cmd 'magit-diff-stash
+                    buf magit-stash-buffer-name)))
+    (if rev
+        (if (and (setq buf (get-buffer buf))
+                 (setq win (get-buffer-window buf))
+                 (with-current-buffer buf
+                   (equal rev (car magit-refresh-args))))
+            (with-selected-window win
+              (condition-case err
+                  (funcall fn)
+                (error
+                 (goto-char (cl-case fn
+                              (scroll-up   (point-min))
+                              (scroll-down (point-max)))))))
+          (funcall cmd rev t))
+      (call-interactively 'magit-show-commit))))
+
+(defun magit-refresh-commit-buffer (commit)
+  (magit-git-insert-section (commitbuf nil)
+      #'magit-wash-commit
+    "log" "-1" "--decorate=full"
+    "--pretty=medium" (magit-diff-U-arg)
+    "--cc" "-p" (and magit-show-diffstat "--stat")
+    magit-diff-options commit))
+
+;;;;; Commit Washing
+
+(defun magit-wash-commit ()
+  (looking-at "^commit \\([a-z0-9]+\\)\\(?: \\(.+\\)\\)?$")
+  (let ((rev  (match-string 1))
+        (refs (match-string 2)))
+    (delete-region (point) (1+ (line-end-position)))
+    (magit-with-section
+        (section headers 'headers
+         (concat (propertize rev 'face 'magit-log-sha1)
+                 (and refs (concat " "(magit-format-ref-labels refs)))
+                 "\n"))
+      (while (re-search-forward "^\\([a-z]+\\): +\\(.+\\)$" nil t)
+        (when (string-match-p (match-string 1) "Merge")
+          (let ((revs (match-string 2)))
+            (delete-region (match-beginning 2) (match-end 2))
+            (dolist (rev (split-string revs))
+              (magit-insert-commit-button rev)
+              (insert ?\s)))))
+      (forward-line)))
+  (forward-line)
+  (let ((bound (save-excursion
+                 (when (re-search-forward "^diff" nil t)
+                   (copy-marker (match-beginning 0)))))
+        (summary (buffer-substring-no-properties
+                  (point) (line-end-position))))
+    (delete-region (point) (1+ (line-end-position)))
+    (magit-with-section (section message 'message (concat summary "\n"))
+      (cond ((re-search-forward "^---" bound t)
+             (goto-char (match-beginning 0))
+             (delete-region (match-beginning 0) (match-end 0)))
+            ((re-search-forward "^.[^ ]" bound t)
+             (goto-char (1- (match-beginning 0)))))))
+  (forward-line)
+  (when magit-show-diffstat
+    (magit-wash-diffstats))
+  (forward-line)
+  (magit-wash-diffs))
+
+(defun magit-insert-commit-button (hash)
+  (magit-with-section (section commit hash)
+    (insert-text-button hash
+                        'help-echo "Visit commit"
+                        'action (lambda (button)
+                                  (save-excursion
+                                    (goto-char button)
+                                    (magit-visit-item)))
+                        'follow-link t
+                        'mouse-face magit-item-highlight-face
+                        'face 'magit-log-sha1)))
+
+;;;; Status Mode
+
+(define-derived-mode magit-status-mode magit-mode "Magit"
+  "Mode for looking at git status.
+
+\\<magit-status-mode-map>Type `\\[magit-stage-item]` to stage (add) an item, \
+`\\[magit-unstage-item]` to unstage it.
+Type `\\[magit-key-mode-popup-committing]` to have a popup to commit, type \
+`\\[magit-key-mode-popup-dispatch]` to see others
+available popup.
+Type `\\[magit-visit-item]` to visit something, and \
+`\\[magit-toggle-section]` to show or hide section.
+
+More information can be found in Info node `(magit)Status'
+
+Other key binding:
+\\{magit-status-mode-map}"
+  :group 'magit)
+
+(defvar magit-status-buffer-name "*magit: %t*"
+  "Name of buffer used to display a repository's status.")
+
+;;;###autoload
+(defun magit-status (dir &optional switch-function)
+  "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.
+
+Depending on option `magit-status-buffer-switch-function' the
+status buffer is shown in another window (the default) or the
+current window.  Non-interactively optional SWITCH-FUNCTION
+can be used to override this."
+  (interactive (list (if current-prefix-arg
+                         (magit-read-top-dir
+                          (> (prefix-numeric-value current-prefix-arg)
+                             4))
+                       (or (magit-get-top-dir)
+                           (magit-read-top-dir nil)))))
+  (magit-save-some-buffers)
+  (let ((topdir (magit-get-top-dir dir)))
+    (when (or topdir
+              (and (yes-or-no-p
+                    (format "There is no Git repository in %s.  Create one? "
+                            dir))
+                   (progn
+                     (magit-init dir)
+                     (setq topdir (magit-get-top-dir dir)))))
+      (let ((default-directory topdir))
+        (magit-mode-setup magit-status-buffer-name
+                          (or switch-function
+                              magit-status-buffer-switch-function)
+                          #'magit-status-mode
+                          #'magit-refresh-status)))))
+
+(defalias 'magit-status-internal 'magit-status) ; forward compatibility
+
+(defun magit-refresh-status ()
+  (magit-git-exit-code "update-index" "--refresh")
+  (magit-with-section (section status 'status nil t)
+    (run-hooks 'magit-status-sections-hook))
+  (run-hooks 'magit-refresh-status-hook))
+
+;;; Sections
+;;;; Real Sections
+
+(defun magit-insert-stashes ()
+   ;; #1427 Set log.date to work around an issue in Git <1.7.10.3.
+  (let ((stashes (magit-git-lines "-c" "log.date=default" "stash" "list")))
+    (when stashes
+      (magit-with-section (section stashes 'stashes "Stashes:" t)
+        (dolist (stash stashes)
+          (string-match "^\\(stash@{\\([0-9]+\\)}\\): \\(.+\\)$" stash)
+          (let ((stash (match-string 1 stash))
+                (number (match-string 2 stash))
+                (message (match-string 3 stash)))
+            (magit-with-section (section stash stash)
+              (insert number ": " message "\n"))))
+        (insert "\n")))))
+
+(defun magit-insert-untracked-files ()
+  (magit-with-section (section untracked 'untracked "Untracked files:" t)
+    (let ((files (cl-mapcan
+                  (lambda (f)
+                    (when (eq (aref f 0) ??) (list f)))
+                  (magit-git-lines
+                   "status" "--porcelain"))))
+      (if (not files)
+          (setq section nil)
+        (dolist (file files)
+          (setq file (magit-decode-git-path (substring file 3)))
+          (magit-with-section (section file file)
+            (insert "\t" file "\n")))
+        (insert "\n")))))
+
+(defun magit-insert-pending-commits ()
+  (let* ((info (magit-read-rewrite-info))
+         (pending (cdr (assq 'pending info))))
+    (when pending
+      (magit-with-section (section pending 'pending "Pending commits:" t)
+        (dolist (p pending)
+          (let* ((commit (car p))
+                 (properties (cdr p))
+                 (used (plist-get properties 'used)))
+            (magit-with-section (section commit commit)
+              (insert (magit-git-string
+                       "log" "-1"
+                       (if used
+                           "--pretty=format:. %s"
+                         "--pretty=format:* %s")
+                       commit "--")
+                      "\n")))))
+      (insert "\n"))))
+
+(defun magit-insert-unstaged-changes ()
+  (let ((magit-current-diff-range (cons 'index 'working))
+        (magit-diff-options (copy-sequence magit-diff-options)))
+    (magit-git-insert-section (unstaged "Unstaged changes:")
+        #'magit-wash-raw-diffs
+      "diff-files")))
+
+(defun magit-insert-staged-changes ()
+  (let ((no-commit (not (magit-git-success "log" "-1" "HEAD"))))
+    (when (or no-commit (magit-anything-staged-p))
+      (let ((magit-current-diff-range (cons "HEAD" 'index))
+            (base (if no-commit
+                      (magit-git-string "mktree")
+                    "HEAD"))
+            (magit-diff-options (append '("--cached") magit-diff-options)))
+        (magit-git-insert-section (staged "Staged changes:")
+            (apply-partially #'magit-wash-raw-diffs t)
+          "diff-index" "--cached" base)))))
+
+(defun magit-insert-unpulled-or-recent-commits ()
+  (let ((tracked (magit-get-tracked-branch nil t)))
+    (if (and tracked
+             (not (equal (magit-git-string "rev-parse" "HEAD")
+                         (magit-git-string "rev-parse" tracked))))
+        (magit-insert-unpulled-commits)
+      (magit-git-insert-section (recent "Recent commits:")
+          (apply-partially 'magit-wash-log 'unique)
+        "log" "--format=format:%h %s" "-n" "10"))))
+
+(defun magit-insert-unpulled-commits ()
+  (let ((tracked (magit-get-tracked-branch nil t)))
+    (when tracked
+      (magit-git-insert-section (unpulled "Unpulled commits:")
+          (apply-partially 'magit-wash-log 'unique)
+        "log" "--format=format:%h %s" (concat "HEAD.." tracked)))))
+
+(defun magit-insert-unpushed-commits ()
+  (let ((tracked (magit-get-tracked-branch nil t)))
+    (when tracked
+      (magit-git-insert-section (unpushed "Unpushed commits:")
+          (apply-partially 'magit-wash-log 'unique)
+        "log" "--format=format:%h %s" (concat tracked "..HEAD")))))
+
+(defun magit-insert-unpulled-cherries ()
+  (let ((tracked (magit-get-tracked-branch nil t)))
+    (when tracked
+      (magit-git-insert-section (unpulled "Unpulled commits:")
+          (apply-partially 'magit-wash-log 'cherry)
+        "cherry" "-v" (magit-abbrev-arg) (magit-get-current-branch) tracked))))
+
+(defun magit-insert-unpushed-cherries ()
+  (let ((tracked (magit-get-tracked-branch nil t)))
+    (when tracked
+      (magit-git-insert-section (unpushed "Unpushed commits:")
+          (apply-partially 'magit-wash-log 'cherry)
+        "cherry" "-v" (magit-abbrev-arg) tracked))))
+
+;;;; Line Sections
+
+(defun magit-insert-empty-line ()
+  (insert "\n"))
+
+(defun magit-insert-status-local-line ()
+  (let ((branch (or (magit-get-current-branch) "(detached)")))
+    (magit-insert-line-section (branch branch)
+      (concat "Local: "
+              (propertize branch 'face 'magit-branch)
+              " " (abbreviate-file-name default-directory)))))
+
+(defun magit-insert-status-remote-line ()
+  (let* ((branch  (magit-get-current-branch))
+         (tracked (magit-get-tracked-branch branch)))
+    (when tracked
+      (magit-insert-line-section (branch tracked)
+        (concat "Remote: "
+                (and (magit-get-boolean "branch" branch "rebase") "onto ")
+                (magit-format-tracked-line tracked branch))))))
+
+(defun magit-format-tracked-line (tracked branch)
+  (when tracked
+    (setq tracked (propertize tracked 'face 'magit-branch))
+    (let ((remote (magit-get "branch" branch "remote")))
+      (concat (if (string= "." remote)
+                  (concat "branch " tracked)
+                (when (string-match (concat "^" remote) tracked)
+                  (setq tracked (substring tracked (1+ (length remote)))))
+                (concat tracked " @ " remote
+                        " (" (magit-get "remote" remote "url") ")"))))))
+
+(defun magit-insert-status-head-line ()
+  (let ((hash (magit-git-string "rev-parse" "--verify" "HEAD")))
+    (if hash
+        (magit-insert-line-section (commit hash)
+          (concat "Head: " (magit-format-rev-summary "HEAD")))
+      (magit-insert-line-section (no-commit)
+        "Head: nothing committed yet"))))
+
+(defun magit-insert-status-tags-line ()
+  (let* ((current-tag (magit-get-current-tag t))
+         (next-tag (magit-get-next-tag t))
+         (both-tags (and current-tag next-tag t))
+         (tag-subject (eq magit-status-tags-line-subject 'tag)))
+    (when (or current-tag next-tag)
+      (magit-insert-line-section (line)
+        (concat
+         (if both-tags "Tags: " "Tag: ")
+         (and current-tag (apply 'magit-format-status-tag-sentence
+                                 tag-subject current-tag))
+         (and both-tags ", ")
+         (and next-tag (apply 'magit-format-status-tag-sentence
+                              (not tag-subject) next-tag)))))))
+
+(defun magit-format-status-tag-sentence (behindp tag cnt &rest ignored)
+  (concat (propertize tag 'face 'magit-tag)
+          (and (> cnt 0)
+               (concat (if (eq magit-status-tags-line-subject 'tag)
+                           (concat " (" (propertize (format "%s" cnt)
+                                                    'face 'magit-branch))
+                         (format " (%i" cnt))
+                       " " (if behindp "behind" "ahead") ")"))))
+
+;;;; Progress Sections
+
+(defun magit-insert-status-merge-line ()
+  (let ((heads (magit-file-lines (magit-git-dir "MERGE_HEAD"))))
+    (when heads
+      (magit-insert-line-section (line)
+        (concat
+         "Merging: "
+         (mapconcat 'identity (mapcar 'magit-name-rev heads) ", ")
+         (and magit-status-show-sequence-help
+              "; Resolve conflicts, or press \"m A\" to Abort"))))))
+
+(defun magit-insert-status-rebase-lines ()
+  (let ((rebase (magit-rebase-info)))
+    (when rebase
+      (magit-insert-line-section (line)
+        (concat (if (nth 4 rebase) "Applying" "Rebasing")
+               (apply 'format ": onto %s (%s of %s)" rebase)
+               (and magit-status-show-sequence-help
+                    "; Press \"R\" to Abort, Skip, or Continue")))
+      (when (and (null (nth 4 rebase)) (nth 3 rebase))
+        (magit-insert-line-section (line)
+          (concat "Stopped: "
+                  (magit-format-rev-summary (nth 3 rebase))))))))
+
+(defun magit-insert-rebase-sequence ()
+  (let ((f (magit-git-dir "rebase-merge/git-rebase-todo")))
+    (when (file-exists-p f)
+      (magit-with-section (section rebase-todo 'rebase-todo "Rebasing:" t)
+        (cl-loop
+         for line in (magit-file-lines f)
+         when (string-match
+               "^\\(pick\\|reword\\|edit\\|squash\\|fixup\\) \\([^ ]+\\) \\(.*\\)$"
+               line)
+         do (let ((cmd  (match-string 1 line))
+                  (hash (match-string 2 line))
+                  (msg  (match-string 3 line)))
+              (magit-with-section (section commit hash)
+                (insert cmd " ")
+                (insert (propertize
+                         (magit-git-string "rev-parse" "--short" hash)
+                         'face 'magit-log-sha1))
+                (insert " " msg "\n"))))
+        (insert "\n")))))
+
+(defun magit-insert-bisect-output ()
+  (when (magit-bisecting-p)
+    (let ((lines
+           (or (magit-file-lines (magit-git-dir "BISECT_CMD_OUTPUT"))
+               (list "Bisecting: (no saved bisect output)"
+                     "It appears you have invoked `git bisect' from a shell."
+                     "There is nothing wrong with that, we just cannot display"
+                     "anything useful here.  Consult the shell output instead.")))
+          (done-re "^[a-z0-9]\\{40\\} is the first bad commit$"))
+      (magit-with-section
+          (section bisect-output 'bisect-output
+                   (propertize
+                    (or (and (string-match done-re (car lines)) (pop lines))
+                        (cl-find-if (apply-partially 'string-match done-re)
+                                    lines)
+                        (pop lines))
+                    'face 'magit-section-title)
+                   t t)
+        (dolist (line lines)
+          (insert line "\n"))))
+    (insert "\n")))
+
+(defun magit-insert-bisect-rest ()
+  (when (magit-bisecting-p)
+    (magit-git-insert-section (bisect-view "Bisect Rest:")
+        (apply-partially 'magit-wash-log 'bisect-vis)
+      "bisect" "visualize" "git" "log"
+      "--pretty=format:%h%d %s" "--decorate=full")))
+
+(defun magit-insert-bisect-log ()
+  (when (magit-bisecting-p)
+    (magit-git-insert-section (bisect-log "Bisect Log:")
+        #'magit-wash-bisect-log
+      "bisect" "log")))
+
+(defun magit-wash-bisect-log ()
+  (let (beg)
+    (while (progn (setq beg (point-marker))
+                  (re-search-forward "^\\(git bisect [^\n]+\n\\)" nil t))
+      (let ((heading (match-string-no-properties 1)))
+        (delete-region (match-beginning 0) (match-end 0))
+        (save-restriction
+          (narrow-to-region beg (point))
+          (goto-char (point-min))
+          (magit-with-section (section bisect-log 'bisect-log heading nil t)
+            (magit-wash-sequence
+             (apply-partially 'magit-wash-log-line 'bisect-log
+                              (magit-abbrev-length)))))))
+    (when (re-search-forward
+           "# first bad commit: \\[\\([a-z0-9]\\{40\\}\\)\\] [^\n]+\n" nil t)
+      (let ((hash (match-string-no-properties 1)))
+        (delete-region (match-beginning 0) (match-end 0))
+        (magit-with-section
+            (section 'bisect-log 'bisect-log
+                     (concat hash " is the first bad commit\n")))))))
+
+(defun magit-bisecting-p ()
+  (file-exists-p (magit-git-dir "BISECT_LOG")))
+
+;;; Utilities (2)
+;;;; Save Buffers
+
+(defvar magit-default-directory nil)
+
+(defun magit-save-some-buffers (&optional msg pred topdir)
+  "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 (or topdir 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 directory passed to `magit-status'."
+  (and buffer-file-name
+       (let ((topdir (magit-get-top-dir magit-default-directory)))
+         (and topdir
+              (equal (file-remote-p topdir) (file-remote-p buffer-file-name))
+              ;; ^ Avoid needlessly connecting to unrelated tramp remotes.
+              (string= topdir (magit-get-top-dir
+                               (file-name-directory buffer-file-name)))))))
+
+;;; Porcelain
+;;;; Apply
+;;;;; Apply Commands
+;;;;;; Apply
+
+(defun magit-apply-item ()
+  "Apply the item at point to the current working tree."
+  (interactive)
+  (magit-section-action apply (info)
+    (([* unstaged] [* staged])
+     (user-error "Change is already in your working tree"))
+    (hunk   (magit-apply-hunk-item it))
+    (diff   (magit-apply-diff-item it))
+    (stash  (magit-stash-apply info))
+    (commit (magit-apply-commit info))))
+
+;;;;;; Stage
+
+(defun magit-stage-item (&optional file)
+  "Add the item at point to the staging area.
+With a prefix argument, prompt for a file to be staged instead."
+  (interactive
+   (when current-prefix-arg
+     (list (file-relative-name (read-file-name "File to stage: " nil nil t)
+                               (magit-get-top-dir)))))
+  (if file
+      (magit-run-git "add" file)
+    (magit-section-action stage (info)
+      ([file untracked]
+       (magit-run-git
+        (cond
+         ((use-region-p)
+          (cons "add" (magit-section-region-siblings #'magit-section-info)))
+         ((and (string-match-p "/$" info)
+               (file-exists-p (expand-file-name ".git" info)))
+          (let ((repo (read-string
+                       "Add submodule tracking remote repo (empty to abort): "
+                       (let ((default-directory
+                               (file-name-as-directory
+                                (expand-file-name info default-directory))))
+                         (magit-get "remote.origin.url")))))
+            (if (equal repo "")
+                (user-error "Abort")
+              (list "submodule" "add" repo (substring info 0 -1)))))
+         (t
+          (list "add" info)))))
+      (untracked
+       (magit-run-git "add" "--" (magit-git-lines "ls-files" "--other"
+                                                  "--exclude-standard")))
+      ([hunk diff unstaged]
+       (magit-apply-hunk-item it "--cached"))
+      ([diff unstaged]
+       (magit-run-git "add" "-u"
+                      (if (use-region-p)
+                          (magit-section-region-siblings #'magit-section-info)
+                        info)))
+      (unstaged
+       (magit-stage-all))
+      ([* staged]
+       (user-error "Already staged"))
+      (hunk (user-error "Can't stage this hunk"))
+      (diff (user-error "Can't stage this diff")))))
+
+;;;###autoload
+(defun magit-stage-all (&optional including-untracked)
+  "Add all remaining changes in tracked files to staging area.
+With a prefix argument, add remaining untracked files as well.
+\('git add [-u] .')."
+  (interactive "P")
+  (when (or (not magit-stage-all-confirm)
+            (not (magit-anything-staged-p))
+            (yes-or-no-p "Stage all changes? "))
+    (if including-untracked
+        (magit-run-git "add" ".")
+      (magit-run-git "add" "-u" "."))))
+
+;;;;;; Unstage
+
+(defun magit-unstage-item ()
+  "Remove the item at point from the staging area."
+  (interactive)
+  (magit-section-action unstage (info)
+    ([hunk diff staged]
+     (magit-apply-hunk-item it "--reverse" "--cached"))
+    ([diff staged]
+     (when (eq info 'unmerged)
+       (user-error "Can't unstage an unmerged file.  Resolve it first"))
+     (let ((files (if (use-region-p)
+                      (magit-section-region-siblings #'magit-section-info)
+                    (list info))))
+       (if (magit-no-commit-p)
+           (magit-run-git "rm" "--cached" "--" files)
+         (magit-run-git "reset" "-q" "HEAD" "--" files))))
+    (staged
+     (magit-unstage-all))
+    ([* unstaged]
+     (user-error "Already unstaged"))
+    (hunk (user-error "Can't unstage this hunk"))
+    (diff (user-error "Can't unstage this diff"))))
+
+;;;###autoload
+(defun magit-unstage-all ()
+  "Remove all changes from staging area.
+\('git reset --mixed HEAD')."
+  (interactive)
+  (when (or (not magit-unstage-all-confirm)
+            (and (not (magit-anything-unstaged-p))
+                 (not (magit-git-lines "ls-files" "--others" "-t"
+                                       "--exclude-standard")))
+            (yes-or-no-p "Unstage all changes? "))
+    (magit-run-git "reset" "HEAD" "--")))
+
+;;;;;; Discard
+
+(defun magit-discard-item ()
+  "Remove the change introduced by the item at point."
+  (interactive)
+  (magit-section-action discard (info parent-info)
+    ([file untracked]
+     (when (yes-or-no-p (format "Delete %s? " info))
+       (if (and (file-directory-p info)
+                (not (file-symlink-p info)))
+           (delete-directory info 'recursive)
+         (delete-file info))
+       (magit-refresh)))
+    (untracked
+     (when (yes-or-no-p "Delete all untracked files and directories? ")
+       (magit-run-git "clean" "-df")))
+    ([hunk diff unstaged]
+     (when (yes-or-no-p (if (use-region-p)
+                            "Discard changes in region? "
+                          "Discard hunk? "))
+       (magit-apply-hunk-item it "--reverse")))
+    ([hunk diff staged]
+     (if (magit-file-uptodate-p parent-info)
+         (when (yes-or-no-p (if (use-region-p)
+                                "Discard changes in region? "
+                              "Discard hunk? "))
+           (magit-apply-hunk-item it "--reverse" "--index"))
+       (user-error "Can't discard this hunk.  Please unstage it first")))
+    ([diff unstaged]
+     (magit-discard-diff it nil))
+    ([diff staged]
+     (if (magit-file-uptodate-p (magit-section-info it))
+         (magit-discard-diff it t)
+       (user-error "Can't discard staged changes to this file.  \
+Please unstage it first")))
+    (hunk   (user-error "Can't discard this hunk"))
+    (diff   (user-error "Can't discard this diff"))
+    (stash  (when (yes-or-no-p "Discard stash? ")
+              (magit-stash-drop info)))
+    (branch (when (yes-or-no-p
+                   (if current-prefix-arg
+                       (concat "Force delete branch [" info "]? ")
+                     (concat "Delete branch [" info "]? ")))
+              (magit-delete-branch info current-prefix-arg)))
+    (remote (when (yes-or-no-p "Remove remote? ")
+              (magit-remove-remote info)))))
+
+;;;;;; Revert
+
+(defun magit-revert-item ()
+  "Revert the item at point.
+The change introduced by the item is reversed in the current
+working tree."
+  (interactive)
+  (magit-section-action revert (info)
+    ([* unstaged] (magit-discard-item))
+    (commit (when (or (not magit-revert-item-confirm)
+                      (yes-or-no-p "Revert this commit? "))
+              (magit-revert-commit info)))
+    (diff   (when (or (not magit-revert-item-confirm)
+                      (yes-or-no-p "Revert this diff? "))
+              (magit-apply-diff-item it "--reverse")))
+    (hunk   (when (or (not magit-revert-item-confirm)
+                      (yes-or-no-p "Revert this hunk? "))
+              (magit-apply-hunk-item it "--reverse")))))
+
+(defun magit-revert-commit (commit)
+  (magit-assert-one-parent commit "revert")
+  (magit-run-git "revert" "--no-commit" commit))
+
+(defconst magit-revert-backup-file "magit/reverted.diff")
+
+(defun magit-revert-undo ()
+  "Re-apply the previously reverted hunk.
+Also see option `magit-revert-backup'."
+  (interactive)
+  (let ((file (magit-git-dir magit-revert-backup-file)))
+    (if (file-readable-p file)
+        (magit-run-git "apply" file)
+      (user-error "No backups exist"))
+    (magit-refresh)))
+
+;;;;; Apply Core
+
+(defun magit-discard-diff (diff stagedp)
+  (let ((file (magit-section-info diff)))
+    (cl-case (magit-section-diff-status diff)
+      (deleted
+       (when (yes-or-no-p (format "Resurrect %s? " file))
+         (when stagedp
+           (magit-run-git "reset" "-q" "--" file))
+         (magit-run-git "checkout" "--" file)))
+      (new
+       (when (yes-or-no-p (format "Delete %s? " file))
+         (magit-run-git "rm" "-f" "--" file)))
+      (t
+       (when (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-apply-commit (commit)
+  (magit-assert-one-parent commit "cherry-pick")
+  (magit-run-git "cherry-pick" "--no-commit" commit))
+
+(defun magit-apply-diff-item (diff &rest args)
+  (when (zerop magit-diff-context-lines)
+    (setq args (cons "--unidiff-zero" args)))
+  (let ((buf (generate-new-buffer " *magit-input*")))
+    (unwind-protect
+        (progn (magit-insert-diff-item-patch diff buf)
+               (magit-run-git-with-input
+                buf "apply" args "--ignore-space-change" "-"))
+      (kill-buffer buf))))
+
+(defun magit-apply-hunk-item (hunk &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."
+  (when (string-match "^diff --cc" (magit-section-parent-info hunk))
+    (user-error (concat "Cannot un-/stage individual resolution hunks.  "
+                        "Please stage the whole file.")))
+  (let ((use-region (use-region-p)))
+    (when (zerop magit-diff-context-lines)
+      (setq args (cons "--unidiff-zero" args))
+      (when use-region
+        (user-error (concat "Not enough context to partially apply hunk.  "
+                            "Use `+' to increase context."))))
+    (let ((buf (generate-new-buffer " *magit-input*")))
+      (unwind-protect
+          (progn (if use-region
+                     (magit-insert-hunk-item-region-patch
+                      hunk (member "--reverse" args)
+                      (region-beginning) (region-end) buf)
+                   (magit-insert-hunk-item-patch hunk buf))
+                 (magit-revert-backup buf args)
+                 (magit-run-git-with-input
+                  buf "apply" args "--ignore-space-change" "-"))
+        (kill-buffer buf)))))
+
+(defun magit-insert-diff-item-patch (diff buf)
+  (magit-insert-region (magit-section-content-beginning diff)
+                       (magit-section-end diff)
+                       buf))
+
+(defun magit-insert-hunk-item-patch (hunk buf)
+  (magit-diff-item-insert-header (magit-section-parent 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-section-parent 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))
+        (cond ((and (<= beg (point)) (< (point) end))
+               (magit-insert-current-line buf))
+              ((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-diff-item-insert-header (diff buf)
+  (magit-insert-region (magit-section-content-beginning diff)
+                       (if (magit-section-children diff)
+                           (magit-section-beginning
+                            (car (magit-section-children diff)))
+                         (magit-section-end diff))
+                       buf))
+
+(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-revert-backup (buffer args)
+  (when (and magit-revert-backup (member "--reverse" args))
+    (with-current-buffer buffer
+      (let ((buffer-file-name (magit-git-dir magit-revert-backup-file))
+            (make-backup-files t)
+            (backup-directory-alist nil)
+            (version-control t)
+            (kept-old-versions 0)
+            (kept-new-versions 10))
+        (make-directory (file-name-directory buffer-file-name) t)
+        (save-buffer 16)))))
+
+;;;; Visit
+
+(defun magit-visit-item (&optional other-window)
+  "Visit current item.
+With a prefix argument, visit in other window."
+  (interactive "P")
+  (magit-section-action visit (info parent-info)
+    ((diff diffstat [file untracked])
+     (magit-visit-file-item info other-window))
+    (hunk   (magit-visit-file-item parent-info other-window
+                                   (magit-hunk-item-target-line it)
+                                   (current-column)))
+    (commit (magit-show-commit info))
+    (stash  (magit-diff-stash info))
+    (branch (magit-checkout info))))
+
+(defun magit-visit-file-item (file &optional other-window line column)
+  (unless file
+    (user-error "Can't get pathname for this file"))
+  (unless (file-exists-p file)
+    (user-error "Can't visit deleted file: %s" file))
+  (if (file-directory-p file)
+      (progn
+        (setq file (file-name-as-directory (expand-file-name file)))
+        (if (equal (magit-get-top-dir (file-name-directory file))
+                   (magit-get-top-dir))
+            (magit-dired-jump other-window)
+          (magit-status file (if other-window
+                                 'pop-to-buffer
+                               'switch-to-buffer))))
+    (if other-window
+        (find-file-other-window file)
+      (find-file file))
+    (when line
+      (goto-char (point-min))
+      (forward-line (1- line))
+      (when (> column 0)
+        (move-to-column (1- column))))))
+
+(defun magit-hunk-item-target-line (hunk)
+  (save-excursion
+    (beginning-of-line)
+    (let ((line (line-number-at-pos)))
+      (goto-char (magit-section-beginning hunk))
+      (unless (looking-at "@@+ .* \\+\\([0-9]+\\)\\(,[0-9]+\\)? @@+")
+        (user-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
+          (unless (looking-at "-")
+            (setq target (+ target 1)))
+          (forward-line))
+        target))))
+
+;;;###autoload
+(defun magit-dired-jump (&optional other-window)
+  "Visit current item in dired.
+With a prefix argument, visit in other window."
+  (interactive "P")
+  (require 'dired-x)
+  (dired-jump other-window
+              (file-truename
+               (magit-section-action dired-jump (info parent-info)
+                 ([file untracked] info)
+                 ((diff diffstat) info)
+                 (hunk parent-info)
+                 (t default-directory)))))
+
+(defvar-local magit-file-log-file nil)
+(defvar-local magit-show-current-version nil)
+
+;;;###autoload
+(defun magit-show (rev file &optional switch-function)
+  "Display and select a buffer containing FILE as stored in REV.
+
+Insert the contents of FILE as stored in the revision REV into a
+buffer.  Then select the buffer using `pop-to-buffer' or with a
+prefix argument using `switch-to-buffer'.  Non-interactivity use
+SWITCH-FUNCTION to switch to the buffer, if that is nil simply
+return the buffer, without displaying it."
+  ;; REV may also be one of the symbols `index' or `working' but
+  ;; that is only intended for use by `magit-ediff'.
+  (interactive
+   (let (rev file section)
+     (magit-section-case (info parent)
+       (commit (setq file magit-file-log-file rev info))
+       (hunk   (setq section parent))
+       (diff   (setq section it)))
+     (if section
+         (setq rev  (car (magit-diff-range section))
+               file (magit-section-info section))
+       (unless rev
+         (setq rev (magit-get-current-branch))))
+     (setq rev  (magit-read-rev "Retrieve file from revision" rev)
+           file (cl-case rev
+                  (working (read-file-name "Find file: "))
+                  (index   (magit-read-file-from-rev "HEAD" file))
+                  (t       (magit-read-file-from-rev rev file))))
+     (list rev file (if current-prefix-arg
+                        'switch-to-buffer
+                      'pop-to-buffer))))
+  (let (buffer)
+    (if (eq rev 'working)
+        (setq buffer (find-file-noselect file))
+      (let ((name (format "%s.%s" file
+                          (if (symbolp rev)
+                              (format "@{%s}" rev)
+                            (replace-regexp-in-string "/" ":" rev)))))
+        (setq buffer (get-buffer name))
+        (when buffer
+          (with-current-buffer buffer
+            (if (and (equal file magit-file-name)
+                     (equal rev  magit-show-current-version))
+                (let ((inhibit-read-only t))
+                  (erase-buffer))
+              (setq buffer nil))))
+        (with-current-buffer
+            (or buffer (setq buffer (create-file-buffer name)))
+          (setq buffer-read-only t)
+          (with-silent-modifications
+            (if (eq rev 'index)
+                (let ((temp (car (split-string
+                                  (magit-git-string "checkout-index"
+                                                    "--temp" file)
+                                  "\t")))
+                      (inhibit-read-only t))
+                  (insert-file-contents temp nil nil nil t)
+                  (delete-file temp))
+              (magit-git-insert "cat-file" "-p" (concat rev ":" file))))
+          (let ((buffer-file-name (expand-file-name file (magit-get-top-dir))))
+            (normal-mode t))
+          (setq magit-file-name file)
+          (setq magit-show-current-version rev)
+          (goto-char (point-min)))))
+    (when switch-function
+      (with-current-buffer buffer
+        (funcall switch-function (current-buffer))))
+    buffer))
+
+;;;; Act
+;;;;; Merging
+
+;;;###autoload
+(defun magit-merge (revision &optional do-commit)
+  "Merge REVISION into the current 'HEAD', leaving changes uncommitted.
+With a prefix argument, skip editing the log message and commit.
+\('git merge [--no-commit] REVISION')."
+  (interactive (list (magit-read-rev "Merge"
+                                     (or (magit-guess-branch)
+                                         (magit-get-previous-branch)))
+                     current-prefix-arg))
+  (when (or (not (magit-anything-modified-p))
+            (not magit-merge-warn-dirty-worktree)
+            (yes-or-no-p
+             "Running merge in a dirty worktree could cause data loss.  Continue?"))
+    (magit-run-git "merge" revision magit-custom-options
+                   (unless do-commit "--no-commit"))
+    (when (file-exists-p ".git/MERGE_MSG")
+      (let ((magit-custom-options nil))
+        (magit-commit)))))
+
+;;;###autoload
+(defun magit-merge-abort ()
+  "Abort the current merge operation."
+  (interactive)
+  (if (file-exists-p (magit-git-dir "MERGE_HEAD"))
+      (when (yes-or-no-p "Abort merge? ")
+        (magit-run-git-async "merge" "--abort"))
+    (user-error "No merge in progress")))
+
+;;;;; Branching
+
+;;;###autoload
+(defun magit-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 branch.
+\('git checkout [-b] REVISION')."
+  (interactive
+   (list (let ((current-branch (magit-get-current-branch))
+               (default (or (magit-guess-branch)
+                            (magit-get-previous-branch))))
+           (magit-read-rev (format "Switch from '%s' to" current-branch)
+                           (unless (string= current-branch default)
+                             default)
+                           current-branch))))
+  (magit-save-some-buffers)
+  (or (and (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" revision)
+           (let ((remote (match-string 1 revision))
+                 (branch (match-string 2 revision)))
+             (and (yes-or-no-p (format "Create local branch for %s? " branch))
+                  (let ((local (read-string
+                                (format "Call local branch (%s): " branch)
+                                nil nil branch)))
+                    (if (magit-ref-exists-p (concat "refs/heads/" local))
+                        (user-error "'%s' already exists" local)
+                      (magit-run-git "checkout" "-b" local revision)
+                      t)))))
+      (magit-run-git "checkout" revision)))
+
+;;;###autoload
+(defun magit-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
+   (list (read-string "Create branch: ")
+         (magit-read-rev "Parent" (or (magit-guess-branch)
+                                      (magit-get-current-branch)))))
+  (cond ((run-hook-with-args-until-success
+          'magit-create-branch-hook branch parent))
+        ((and branch (not (string= branch "")))
+         (magit-save-some-buffers)
+         (magit-run-git "checkout" magit-custom-options
+                        "-b" branch parent))))
+
+;;;###autoload
+(defun magit-delete-branch (branch &optional force)
+  "Delete the 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"
+                                     (or (magit-guess-branch)
+                                         (magit-get-previous-branch)))
+                     current-prefix-arg))
+  (if (string-match "^\\(?:refs/\\)?remotes/\\([^/]+\\)/\\(.+\\)" branch)
+      (magit-run-git-async "push"
+                           (match-string 1 branch)
+                           (concat ":" (match-string 2 branch)))
+    (let* ((current (magit-get-current-branch))
+           (is-current (string= branch current))
+           (is-master (string= branch "master"))
+           (args (list "branch"
+                       (if force "-D" "-d")
+                       branch)))
+      (cond
+       ((and is-current is-master)
+        (message "Cannot delete master branch while it's checked out."))
+       (is-current
+        (if (and (magit-ref-exists-p "refs/heads/master")
+                 (y-or-n-p "Cannot delete current branch.  Switch to master first? "))
+            (progn
+              (magit-checkout "master")
+              (magit-run-git args))
+          (message "The current branch was not deleted.")))
+       (t
+        (magit-run-git args))))))
+
+;;;###autoload
+(defun magit-rename-branch (old new &optional force)
+  "Rename branch OLD to NEW.
+With prefix, forces the rename even if NEW already exists.
+\('git branch [-m|-M] OLD NEW')."
+  (interactive
+   (let* ((old (magit-read-rev-with-default "Old name"))
+          (new (read-string "New name: " old)))
+     (list old new current-prefix-arg)))
+  (if (or (null new) (string= new "")
+          (string= old new))
+      (message "Cannot rename branch \"%s\" to \"%s\"." old new)
+    (magit-run-git "branch" (if force "-M" "-m") old new)))
+
+(defun magit-guess-branch ()
+  "Return a branch name depending on the context of cursor.
+If no branch is found near the cursor return nil."
+  (magit-section-case (info parent-info)
+    (branch          info)
+    ([commit wazzup] parent-info)
+    ([commit       ] (magit-name-rev info))
+    ([       wazzup] info)))
+
+;;;;; Remoting
+
+;;;###autoload
+(defun magit-add-remote (remote url)
+  "Add the REMOTE and fetch it.
+\('git remote add REMOTE URL')."
+  (interactive (list (read-string "Remote name: ")
+                     (read-string "Remote url: ")))
+  (magit-run-git-async "remote" "add" "-f" remote url))
+
+;;;###autoload
+(defun magit-remove-remote (remote)
+  "Delete the REMOTE.
+\('git remote rm REMOTE')."
+  (interactive (list (magit-read-remote "Delete remote")))
+  (magit-run-git "remote" "rm" remote))
+
+;;;###autoload
+(defun magit-rename-remote (old new)
+  "Rename remote OLD to NEW.
+\('git remote rename OLD NEW')."
+  (interactive
+   (let* ((old (magit-read-remote "Old name"))
+          (new (read-string "New name: " old)))
+     (list old new)))
+  (if (or (null old) (string= old "")
+          (null new) (string= new "")
+          (string= old new))
+      (message "Cannot rename remote \"%s\" to \"%s\"." old new)
+    (magit-run-git "remote" "rename" old new)))
+
+(defun magit-guess-remote ()
+  (magit-section-case (info parent-info)
+    (remote info)
+    (branch parent-info)
+    (t      (if (string= info ".") info (magit-get-current-remote)))))
+
+;;;;; Rebase
+
+(defun magit-rebase-info ()
+  "Return a list indicating the state of an in-progress rebase.
+
+The returned list has the form (ONTO DONE TOTAL STOPPED AM).
+ONTO is the commit being rebased onto.
+DONE and TOTAL are integers with obvious meanings.
+STOPPED is the SHA-1 of the commit at which rebase stopped.
+AM is non-nil if the current rebase is actually a git-am.
+
+Return nil if there is no rebase in progress."
+  (let ((m (magit-git-dir "rebase-merge"))
+        (a (magit-git-dir "rebase-apply")))
+    (cond
+     ((file-directory-p m) ; interactive
+      (list
+       (magit-name-rev (magit-file-line  (expand-file-name "onto" m)))
+       (length         (magit-file-lines (expand-file-name "done" m)))
+       (cl-loop for line in (magit-file-lines
+                             (expand-file-name "git-rebase-todo.backup" m))
+                count (string-match "^[^#\n]" line))
+       (magit-file-line (expand-file-name "stopped-sha" m))
+       nil))
+
+     ((file-regular-p (expand-file-name "onto" a)) ; non-interactive
+      (list
+       (magit-name-rev       (magit-file-line (expand-file-name "onto" a)))
+       (1- (string-to-number (magit-file-line (expand-file-name "next" a))))
+       (string-to-number     (magit-file-line (expand-file-name "last" a)))
+       (let ((patch-header (magit-file-line
+                            (car (directory-files a t "^[0-9]\\{4\\}$")))))
+         (when (string-match "^From \\([a-z0-9]\\{40\\}\\) " patch-header)
+           (match-string 1 patch-header)))
+       nil))
+
+     ((file-regular-p (expand-file-name "applying" a)) ; am
+      (list
+       (magit-name-rev       "HEAD")
+       (1- (string-to-number (magit-file-line (expand-file-name "next" a))))
+       (string-to-number     (magit-file-line (expand-file-name "last" a)))
+       (let ((patch-header (magit-file-line
+                            (car (directory-files a t "^[0-9]\\{4\\}$")))))
+         (when (string-match "^From \\([a-z0-9]\\{40\\}\\) " patch-header)
+           (match-string 1 patch-header)))
+       t)))))
+
+(defun magit-rebase-step ()
+  "Initiate or continue a rebase."
+  (interactive)
+  (let ((rebase (magit-rebase-info)))
+    (if rebase
+        (let ((cursor-in-echo-area t)
+              (message-log-max nil)
+              (am (nth 4 rebase)))
+          (message "%s in progress. [A]bort, [S]kip, or [C]ontinue? "
+                   (if am "Apply mailbox" "Rebase"))
+          (cl-case (read-event)
+            ((?A ?a) (magit-run-git-async (if am "am" "rebase") "--abort"))
+            ((?S ?s) (magit-run-git-async (if am "am" "rebase") "--skip"))
+            ((?C ?c) (magit-with-emacsclient magit-server-window-for-commit
+                       (magit-run-git-async (if am "am" "rebase") "--continue")))))
+      (let* ((branch (magit-get-current-branch))
+             (rev (magit-read-rev
+                   "Rebase to"
+                   (magit-get-tracked-branch branch)
+                   branch)))
+        (magit-run-git "rebase" rev)))))
+
+;;;###autoload
+(defun magit-interactive-rebase (commit)
+  "Start a git rebase -i session, old school-style."
+  (interactive (let ((commit (magit-section-case (info) (commit info))))
+                 (list (if commit
+                           (concat commit "^")
+                         (magit-read-rev "Interactively rebase to"
+                                         (magit-guess-branch))))))
+  (magit-assert-emacsclient "rebase interactively")
+  (magit-with-emacsclient magit-server-window-for-rebase
+    (magit-run-git-async "rebase" "-i" commit)))
+
+;;;;; AM
+
+(defun magit-apply-mailbox (&optional file-or-dir)
+  "Apply a series of patches from a mailbox."
+  (interactive "fmbox or Maildir file or directory: ")
+  (magit-with-emacsclient magit-server-window-for-rebase
+    (magit-run-git-async "am" file-or-dir)))
+
+;;;;; Reset
+
+;;;###autoload
+(defun magit-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-guess-branch) "HEAD"))
+                     current-prefix-arg))
+  (magit-run-git "reset" (if hard "--hard" "--soft") revision "--"))
+
+;;;###autoload
+(defun magit-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-guess-branch) "HEAD"))))
+  (magit-reset-head revision t))
+
+;;;###autoload
+(defun magit-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")
+      (when include-untracked
+        (magit-run-git "clean" "-fd" (if include-ignored "-x" ""))))))
+
+;;;;; Rewriting
+
+(defun magit-read-rewrite-info ()
+  (when (file-exists-p (magit-git-dir "magit-rewrite-info"))
+    (with-temp-buffer
+      (insert-file-contents (magit-git-dir "magit-rewrite-info"))
+      (goto-char (point-min))
+      (read (current-buffer)))))
+
+(defun magit-write-rewrite-info (info)
+  (with-temp-file (magit-git-dir "magit-rewrite-info")
+    (prin1 info (current-buffer))
+    (princ "\n" (current-buffer))))
+
+(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-refresh))
+    t))
+
+(add-hook 'magit-apply-hook 'magit-rewrite-apply)
+(put  'magit-rewrite-apply 'magit-section-action-context [commit pending])
+(defun magit-rewrite-apply (commit)
+  (magit-apply-commit commit)
+  (magit-rewrite-set-commit-property commit 'used t))
+
+(add-hook 'magit-cherry-pick-hook 'magit-rewrite-pick)
+(put  'magit-rewrite-pick 'magit-section-action-context [commit pending])
+(defun magit-rewrite-pick (commit)
+  (magit-cherry-pick-commit commit)
+  (magit-rewrite-set-commit-property commit 'used t))
+
+(add-hook 'magit-revert-hook 'magit-rewrite-revert)
+(put  'magit-rewrite-revert 'magit-section-action-context [commit pending])
+(defun magit-rewrite-revert (commit)
+  (when (or (not magit-revert-item-confirm)
+            (yes-or-no-p "Revert this commit? "))
+    (magit-revert-commit commit)
+    (magit-rewrite-set-commit-property commit 'used nil)))
+
+(defun magit-rewrite-set-used ()
+  (interactive)
+  (magit-section-case (info)
+    ([commit pending]
+     (magit-rewrite-set-commit-property info 'used t)
+     (magit-refresh))))
+
+(defun magit-rewrite-set-unused ()
+  (interactive)
+  (magit-section-case (info)
+    ([commit pending]
+     (magit-rewrite-set-commit-property info 'used nil)
+     (magit-refresh))))
+
+(defun magit-rewrite-start (from &optional onto)
+  (interactive (list (magit-read-rev-with-default "Rewrite from")))
+  (when (magit-anything-modified-p)
+    (user-error "You have uncommitted changes"))
+  (or (not (magit-read-rewrite-info))
+      (user-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))
+                       (user-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
+        (user-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
+        (user-error "No rewrite in progress"))
+    (when (magit-anything-modified-p)
+      (user-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-rewrite-finish-step)
+  (magit-refresh))
+
+(defun magit-rewrite-finish-step ()
+  (let ((info (magit-read-rewrite-info)))
+    (or info
+        (user-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-git-success "cherry-pick" commit)
+             (magit-rewrite-set-commit-property commit 'used t)
+             (magit-rewrite-finish-step))
+            (t
+             (magit-refresh)
+             (error "Could not apply %s" commit))))))
+
+(defun magit-rewrite-diff-pending ()
+  (interactive)
+  (let* ((info (magit-read-rewrite-info))
+         (orig (cadr (assq 'orig info))))
+    (if orig
+        (magit-diff orig nil "-R")
+      (user-error "No rewrite in progress"))))
+
+(defun magit-rewrite-diff-pending-transition ()
+  (interactive)
+  (message "Please remove magit-insert-pending-changes from your magit-status-sections-hook, or move to magit-rewrite-diff-pending"))
+
+(define-obsolete-function-alias
+  'magit-insert-pending-changes 'magit-rewrite-diff-pending-transition
+  "382351845e"
+  "https://github.com/magit/magit/commit/382351845eca2425713f640f9bb55756c9ddf723")
+
+;;;;; Fetching
+
+;;;###autoload
+(defun magit-fetch (remote)
+  "Fetch from REMOTE."
+  (interactive (list (magit-read-remote "Fetch remote")))
+  (magit-run-git-async "fetch" remote magit-custom-options))
+
+;;;###autoload
+(defun magit-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 "Fetch remote"))))
+
+;;;###autoload
+(defun magit-remote-update ()
+  "Update all remotes."
+  (interactive)
+  (or (run-hook-with-args-until-success 'magit-remote-update-hook)
+      (magit-run-git-async "remote" "update" magit-custom-options)))
+
+;;;;; Pulling
+
+;;;###autoload
+(defun magit-pull ()
+  "Run git pull.
+
+If there is no default remote, the user is prompted for one and
+its values is saved with git config.  If there is no default
+merge branch, the user is prompted for one and its values is
+saved with git config.  With a prefix argument, the default
+remote is not used and the user is prompted for a remote.  With
+two prefix arguments, the default merge branch is not used and
+the user is prompted for a merge branch.  Values entered by the
+user because of prefix arguments are not saved with git config."
+  (interactive)
+  (or (run-hook-with-args-until-success 'magit-pull-hook)
+      (let* ((branch (magit-get-current-branch))
+             (branch-remote (magit-get-remote branch))
+             (branch-merge (magit-get "branch" branch "merge"))
+             (branch-merge-name (and branch-merge
+                                     (save-match-data
+                                       (string-match "^refs/heads/\\(.+\\)" branch-merge)
+                                       (match-string 1 branch-merge))))
+             (choose-remote (>= (prefix-numeric-value current-prefix-arg) 4))
+             (choose-branch (>= (prefix-numeric-value current-prefix-arg) 16))
+             (remote-needed (or choose-remote
+                                (not branch-remote)))
+             (branch-needed (or choose-branch
+                                (not branch-merge-name)))
+             (chosen-branch-remote
+              (if remote-needed
+                  (magit-read-remote "Pull from remote" branch-remote)
+                branch-remote))
+             (chosen-branch-merge-name
+              (if branch-needed
+                  (magit-read-remote-branch (format "Pull branch from remote %s"
+                                                    chosen-branch-remote)
+                                            chosen-branch-remote)
+                branch-merge-name)))
+        (when (and (not branch-remote)
+                   (not choose-remote))
+          (magit-set chosen-branch-remote "branch" branch "remote"))
+        (when (and (not branch-merge-name)
+                   (not choose-branch))
+          (magit-set (format "%s" chosen-branch-merge-name)
+                     "branch" branch "merge"))
+        (magit-run-git-async
+         "pull" magit-custom-options
+         (and choose-remote chosen-branch-remote)
+         (and (or choose-remote choose-branch)
+              (list (format "refs/heads/%s:refs/remotes/%s/%s"
+                            chosen-branch-merge-name
+                            chosen-branch-remote
+                            chosen-branch-merge-name)))))))
+
+;;;;; Pushing
+
+;;;###autoload
+(defun magit-push-tags ()
+  "Push tags to a remote repository.
+
+Push tags to the current branch's remote.  If that isn't set push
+to \"origin\" or if that remote doesn't exit but only a single
+remote is defined use that.  Otherwise or with a prefix argument
+ask the user what remote to use."
+  (interactive)
+  (let* ((branch  (magit-get-current-branch))
+         (remotes (magit-git-lines "remote"))
+         (remote  (or (and branch (magit-get-remote branch))
+                      (car (member  "origin" remotes))
+                      (and (= (length remotes) 1)
+                           (car remotes)))))
+    (when (or current-prefix-arg (not remote))
+      (setq remote (magit-read-remote "Push to remote")))
+    (magit-run-git-async "push" remote "--tags" magit-custom-options)))
+
+;;;###autoload
+(defun magit-push ()
+  "Push the current branch to a remote repository.
+
+This command runs the `magit-push-remote' hook.  By default that
+means running `magit-push-dwim'.  So unless you have customized
+the hook this command behaves like this:
+
+With a single prefix argument ask the user what branch to push
+to.  With two or more prefix arguments also ask the user what
+remote to push to.  Otherwise use the remote and branch as
+configured using the Git variables `branch.<name>.remote' and
+`branch.<name>.merge'.  If the former is undefined ask the user.
+If the latter is undefined push without specifing the remote
+branch explicitly.
+
+Also see option `magit-set-upstream-on-push'."
+  (interactive)
+  (run-hook-with-args-until-success 'magit-push-hook current-prefix-arg))
+
+(defun magit-push-dwim (arg)
+  "Push the current branch to a remote repository.
+
+With a single prefix argument ask the user what remote to push
+to.  With two or more prefix arguments also ask the user the
+name of the remote branch to push to.
+
+Otherwise use the remote and branch as configured using the
+Git variables `branch.<name>.remote' and `branch.<name>.merge'.
+If the former is undefined ask the user.  If the latter is
+undefined push without specifing the remote branch explicitly.
+
+Also see option `magit-set-upstream-on-push'."
+  (interactive "P")
+  (let* ((branch (or (magit-get-current-branch)
+                     (user-error "Don't push a detached head.  That's gross")))
+         (auto-remote (magit-get-remote branch))
+         (used-remote (if (or arg (not auto-remote))
+                          (magit-read-remote
+                           (format "Push %s to remote" branch) auto-remote)
+                        auto-remote))
+         (auto-branch (and (equal used-remote auto-remote)
+                           (magit-get "branch" branch "merge")))
+         (used-branch (if (>= (prefix-numeric-value arg) 16)
+                          (magit-read-remote-branch
+                           (format "Push %s as branch" branch)
+                           used-remote auto-branch)
+                        auto-branch)))
+    (cond ;; Pushing to what's already configured.
+          ((and auto-branch
+                (equal auto-branch used-branch)
+                (equal auto-remote used-remote)))
+          ;; Setting upstream because of magit-custom-options.
+          ((member "-u" magit-custom-options))
+          ;; Two prefix arguments; ignore magit-set-upstream-on-push.
+          ((>= (prefix-numeric-value arg) 16)
+           (and (yes-or-no-p "Set upstream while pushing? ")
+                (setq magit-custom-options
+                      (cons "-u" magit-custom-options))))
+          ;; Else honor magit-set-upstream-on-push.
+          ((eq magit-set-upstream-on-push 'refuse)
+           (user-error "Not pushing since no upstream has been set."))
+          ((or (eq magit-set-upstream-on-push 'dontask)
+               (and (eq magit-set-upstream-on-push t)
+                    (yes-or-no-p "Set upstream while pushing? ")))
+           (setq magit-custom-options (cons "-u" magit-custom-options))))
+    (magit-run-git-async
+     "push" "-v" used-remote
+     (if used-branch (format "%s:%s" branch used-branch) branch)
+     magit-custom-options)))
+
+;;;;; Committing
+
+;;;###autoload
+(defun magit-commit (&optional amendp)
+  "Create a new commit on HEAD.
+With a prefix argument amend to the commit at HEAD instead.
+\('git commit [--amend]')."
+  (interactive "P")
+  (let ((args magit-custom-options))
+    (when amendp
+      (setq args (cons "--amend" args)))
+    (when (setq args (magit-commit-assert args))
+      (magit-commit-maybe-expand)
+      (magit-commit-internal "commit" args))))
+
+;;;###autoload
+(defun magit-commit-amend ()
+  "Amend the last commit.
+\('git commit --amend')."
+  (interactive)
+  (magit-commit-maybe-expand)
+  (magit-commit-internal "commit" (cons "--amend" magit-custom-options)))
+
+;;;###autoload
+(defun magit-commit-extend (&optional override-date)
+  "Amend the last commit, without editing the message.
+With a prefix argument do change the committer date, otherwise
+don't.  The option `magit-commit-extend-override-date' can be
+used to inverse the meaning of the prefix argument.
+\('git commit --no-edit --amend [--keep-date]')."
+  (interactive (list (if current-prefix-arg
+                         (not magit-commit-reword-override-date)
+                       magit-commit-reword-override-date)))
+  (magit-commit-maybe-expand)
+  (let ((process-environment process-environment))
+    (unless override-date
+      (setenv "GIT_COMMITTER_DATE"
+              (magit-git-string "log" "-1" "--format:format=%cd")))
+    (magit-commit-internal "commit" (nconc (list "--no-edit" "--amend")
+                                           magit-custom-options))))
+
+;;;###autoload
+(defun magit-commit-reword (&optional override-date)
+  "Reword the last commit, ignoring staged changes.
+
+With a prefix argument do change the committer date, otherwise
+don't.  The option `magit-commit-rewrite-override-date' can be
+used to inverse the meaning of the prefix argument.
+
+Non-interactively respect the optional OVERRIDE-DATE argument
+and ignore the option.
+
+\('git commit --only --amend')."
+  (interactive (list (if current-prefix-arg
+                         (not magit-commit-reword-override-date)
+                       magit-commit-reword-override-date)))
+  (let ((process-environment process-environment))
+    (unless override-date
+      (setenv "GIT_COMMITTER_DATE"
+              (magit-git-string "log" "-1" "--format:format=%cd")))
+    (magit-commit-internal "commit" (nconc (list "--only" "--amend")
+                                           magit-custom-options))))
+
+(defvar-local magit-commit-squash-args  nil)
+(defvar-local magit-commit-squash-fixup nil)
+
+(defvar magit-commit-unmark-after-squash t)
+
+;;;###autoload
+(defun magit-commit-fixup (&optional commit)
+  "Create a fixup commit.
+With a prefix argument the user is always queried for the commit
+to be fixed.  Otherwise the current or marked commit may be used
+depending on the value of option `magit-commit-squash-commit'.
+\('git commit [--no-edit] --fixup=COMMIT')."
+  (interactive (list (magit-commit-squash-commit)))
+  (magit-commit-squash commit t))
+
+;;;###autoload
+(defun magit-commit-squash (&optional commit fixup)
+  "Create a squash commit.
+With a prefix argument the user is always queried for the commit
+to be fixed.  Otherwise the current or marked commit may be used
+depending on the value of option `magit-commit-squash-commit'.
+\('git commit [--no-edit] --fixup=COMMIT')."
+  (interactive (list (magit-commit-squash-commit)))
+  (let ((args magit-custom-options))
+    (cond
+     ((not commit)
+      (magit-commit-assert args)
+      (magit-log)
+      (setq magit-commit-squash-args  args
+            magit-commit-squash-fixup fixup)
+      (add-hook 'magit-mark-commit-hook 'magit-commit-squash-marked t t)
+      (add-hook 'magit-mode-quit-window-hook 'magit-commit-squash-abort t t)
+      (message "Select commit using \".\", or abort using \"q\""))
+     ((setq args (magit-commit-assert args))
+      (when (eq args t) (setq args nil))
+      (magit-commit-internal
+       "commit"
+       (nconc (list "--no-edit"
+                    (concat (if fixup "--fixup=" "--squash=") commit))
+              args))))))
+
+(defun magit-commit-squash-commit ()
+  (unless (or current-prefix-arg
+              (eq magit-commit-squash-commit nil))
+    (let ((current (magit-section-case (info) (commit info))))
+      (cl-ecase magit-commit-squash-commit
+        (current-or-marked (or current magit-marked-commit))
+        (marked-or-current (or magit-marked-commit current))
+        (current current)
+        (marked magit-marked-commit)))))
+
+(defun magit-commit-squash-marked ()
+  (when magit-marked-commit
+    (magit-commit-squash magit-marked-commit magit-commit-squash-fixup))
+  (when magit-commit-unmark-after-squash
+    (setq magit-marked-commit nil))
+  (kill-local-variable 'magit-commit-squash-fixup)
+  (remove-hook 'magit-mark-commit-hook 'magit-commit-squash-marked t)
+  (remove-hook 'magit-mode-quit-window-hook 'magit-commit-squash-abort t)
+  (magit-mode-quit-window))
+
+(defun magit-commit-squash-abort (buffer)
+  (when (buffer-live-p buffer)
+    (with-current-buffer buffer
+      (remove-hook 'magit-mark-commit-hook 'magit-commit-squash-marked t)
+      (remove-hook 'magit-mode-quit-window-hook 'magit-commit-squash-abort t))))
+
+(defun magit-commit-assert (args)
+  (cond
+   ((or (magit-anything-staged-p)
+        (member "--allow-empty" args)
+        (member "--all" args)
+        (member "--amend" args))
+    (or args (list "--")))
+   ((and (magit-rebase-info)
+         (y-or-n-p "Nothing staged.  Continue in-progress rebase? "))
+    (magit-run-git-async "rebase" "--continue")
+    nil)
+   (magit-commit-ask-to-stage
+    (magit-commit-maybe-expand t)
+    (when (y-or-n-p "Nothing staged.  Stage and commit everything? ")
+      (magit-run-git "add" "-u" ".")
+      (or args (list "--"))))
+   (t
+    (user-error "Nothing staged.  Set --allow-empty, --all, or --amend in popup"))))
+
+(defun magit-commit-maybe-expand (&optional unstaged)
+  (when (and magit-expand-staged-on-commit
+             (derived-mode-p 'magit-status-mode))
+    (if unstaged
+        (magit-jump-to-unstaged t)
+      (magit-jump-to-staged t))))
+
+(defun magit-commit-internal (subcmd args)
+  (setq git-commit-previous-winconf (current-window-configuration))
+  (if (magit-use-emacsclient-p)
+      (magit-with-emacsclient magit-server-window-for-commit
+        (magit-run-git-async subcmd args))
+    (let ((topdir (magit-get-top-dir))
+          (editmsg (magit-git-dir (if (equal subcmd "tag")
+                                      "TAG_EDITMSG"
+                                    "COMMIT_EDITMSG"))))
+      (when (and (member "--amend" args)
+                 (not (file-exists-p editmsg)))
+        (with-temp-file editmsg
+          (magit-git-insert "log" "-1" "--format=format:%B" "HEAD")))
+      (with-current-buffer (find-file-noselect editmsg)
+        (funcall (if (functionp magit-server-window-for-commit)
+                     magit-server-window-for-commit
+                   'switch-to-buffer)
+                 (current-buffer))
+        (add-hook 'git-commit-commit-hook
+                  (apply-partially
+                   (lambda (default-directory editmsg args)
+                     (magit-run-git args)
+                     (ignore-errors (delete-file editmsg)))
+                   topdir editmsg
+                   `(,subcmd
+                     ,"--cleanup=strip"
+                     ,(concat "--file=" (file-relative-name
+                                         (buffer-file-name)
+                                         topdir))
+                     ,@args))
+                  nil t)))))
+
+(defun magit-commit-add-log ()
+  "Add a template for the current hunk to the commit message buffer."
+  (interactive)
+  (let* ((section (magit-current-section))
+         (fun (if (eq (magit-section-type section) 'hunk)
+                  (save-window-excursion
+                    (save-excursion
+                      (magit-visit-item)
+                      (add-log-current-defun)))
+                nil))
+         (file (magit-section-info
+                (cl-case (magit-section-type section)
+                  (hunk (magit-section-parent section))
+                  (diff section)
+                  (t    (user-error "No change at point")))))
+         (locate-buffer (lambda ()
+                          (cl-find-if
+                           (lambda (buf)
+                             (with-current-buffer buf
+                               (derived-mode-p 'git-commit-mode)))
+                           (append (buffer-list (selected-frame))
+                                   (buffer-list)))))
+         (buffer (funcall locate-buffer)))
+    (unless buffer
+      (unless (magit-commit-assert nil)
+        (user-error "Abort"))
+      (magit-commit)
+      (while (not (setq buffer (funcall locate-buffer)))
+        (sit-for 0.01)))
+    (pop-to-buffer buffer)
+    (goto-char (point-min))
+    (cond ((not (re-search-forward (format "^\\* %s" (regexp-quote file))
+                                   nil t))
+           ;; No entry for file, create it.
+           (goto-char (point-max))
+           (forward-comment -1000)
+           (unless (or (bobp) (looking-back "\\(\\*[^\n]+\\|\n\\)"))
+             (insert "\n"))
+           (insert (format "\n* %s" file))
+           (when fun
+             (insert (format " (%s)" fun)))
+           (insert ": "))
+          (fun
+           ;; found entry for file, look for fun
+           (let ((limit (save-excursion
+                          (or (and (re-search-forward "^\\* " nil t)
+                                   (match-beginning 0))
+                              (progn (goto-char (point-max))
+                                     (forward-comment -1000)
+                                     (point))))))
+             (cond ((re-search-forward
+                     (format "(.*\\_<%s\\_>.*):" (regexp-quote fun))
+                     limit t)
+                    ;; found it, goto end of current entry
+                    (if (re-search-forward "^(" 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))))))
+
+;;;;; Tagging
+
+;;;###autoload
+(defun magit-tag (name rev &optional annotate)
+  "Create a new tag with the given NAME at REV.
+With a prefix argument annotate the tag.
+\('git tag [--annotate] NAME REV')."
+  (interactive (list (magit-read-tag "Tag name")
+                     (magit-read-rev "Place tag on"
+                                     (or (magit-guess-branch) "HEAD"))
+                     current-prefix-arg))
+  (let ((args (append magit-custom-options (list name rev))))
+    (if (or (member "--sign" args)
+            (member "--annotate" args)
+            (and annotate (setq args (cons "--annotate" args))))
+        (magit-commit-internal "tag" args)
+      (magit-run-git "tag" args))))
+
+;;;###autoload
+(defun magit-delete-tag (name)
+  "Delete the tag with the given NAME.
+\('git tag -d NAME')."
+  (interactive (list (magit-read-tag "Delete Tag" t)))
+  (magit-run-git "tag" "-d" magit-custom-options name))
+
+;;;;; Stashing
+
+(defvar magit-read-stash-history nil
+  "The history of inputs to `magit-stash'.")
+
+;;;###autoload
+(defun magit-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 (list (read-string "Stash description: " nil
+                                  'magit-read-stash-history)))
+  (magit-run-git-async "stash" "save" magit-custom-options "--" description))
+
+;;;###autoload
+(defun magit-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-call-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}"))
+
+(defun magit-stash-apply (stash)
+  "Apply a stash on top of the current working tree state.
+\('git stash apply stash@{N}')"
+  (interactive (list (magit-read-stash "Apply stash (number): ")))
+  (magit-run-git "stash" "apply" stash))
+
+(defun magit-stash-pop (stash)
+  "Apply a stash on top of working tree state and remove from stash list.
+\('git stash pop stash@{N}')"
+  (interactive (list (magit-read-stash "Pop stash (number): ")))
+  (magit-run-git "stash" "pop" stash))
+
+(defun magit-stash-drop (stash)
+  "Remove a stash from the stash list.
+\('git stash drop stash@{N}')"
+  (interactive (list (magit-read-stash "Drop stash (number): ")))
+  (magit-run-git "stash" "drop" stash))
+
+;;;;; Cherry-Pick
+
+(defun magit-cherry-pick-item ()
+  "Cherry-pick them item at point."
+  (interactive)
+  (magit-section-action cherry-pick (info)
+    (commit (magit-cherry-pick-commit info))
+    (stash  (magit-stash-pop info))))
+
+(defun magit-cherry-pick-commit (commit)
+  (magit-assert-one-parent commit "cherry-pick")
+  (magit-run-git "cherry-pick" commit))
+
+;;;;; Submoduling
+
+;;;###autoload
+(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)))
+    (magit-run-git-async "submodule" "update" (and init "--init"))))
+
+;;;###autoload
+(defun magit-submodule-update-init ()
+  "Update and init the submodule of the current git repository."
+  (interactive)
+  (magit-submodule-update t))
+
+;;;###autoload
+(defun magit-submodule-init ()
+  "Initialize the submodules."
+  (interactive)
+  (let ((default-directory (magit-get-top-dir)))
+    (magit-run-git-async "submodule" "init")))
+
+;;;###autoload
+(defun magit-submodule-sync ()
+  "Synchronizes submodule's remote URL configuration."
+  (interactive)
+  (let ((default-directory (magit-get-top-dir)))
+    (magit-run-git-async "submodule" "sync")))
+
+;;;;; Bisecting
+
+;;;###autoload
+(defun magit-bisect-start (bad good)
+  "Start a bisect session.
+
+Bisecting a bug means to find the commit that introduced it.
+This command starts such a bisect session by asking for a know
+good and a bad commit.  To move the session forward use the
+other actions from the bisect popup (\
+\\<magit-status-mode-map>\\[magit-key-mode-popup-bisecting])."
+  (interactive
+   (if (magit-bisecting-p)
+       (user-error "Already bisecting")
+     (list (magit-read-rev "Start bisect with known bad revision" "HEAD")
+           (magit-read-rev "Good revision" (magit-guess-branch)))))
+  (magit-run-git-bisect "start" (list bad good) t))
+
+;;;###autoload
+(defun magit-bisect-reset ()
+  "After bisecting cleanup bisection state and return to original HEAD."
+  (interactive)
+  (when (yes-or-no-p "Reset bisect?")
+    (magit-run-git "bisect" "reset")
+    (ignore-errors (delete-file (magit-git-dir "BISECT_CMD_OUTPUT")))))
+
+;;;###autoload
+(defun magit-bisect-good ()
+  "While bisecting, mark the current commit as good.
+Use this after you have asserted that the commit does not contain
+the bug in question."
+  (interactive)
+  (magit-run-git-bisect "good"))
+
+;;;###autoload
+(defun magit-bisect-bad ()
+  "While bisecting, mark the current commit as bad.
+Use this after you have asserted that the commit does contain the
+bug in question."
+  (interactive)
+  (magit-run-git-bisect "bad"))
+
+;;;###autoload
+(defun magit-bisect-skip ()
+  "While bisecting, skip the current commit.
+Use this if for some reason the current commit is not a good one
+to test.  This command lets Git choose a different one."
+  (interactive)
+  (magit-run-git-bisect "skip"))
+
+;;;###autoload
+(defun magit-bisect-run (cmdline)
+  "Bisect automatically by running commands after each step."
+  (interactive (list (read-shell-command "Bisect shell command: ")))
+  (magit-run-git-bisect "run" (list cmdline)))
+
+(defun magit-run-git-bisect (subcommand &optional args no-assert)
+  (unless (or no-assert (magit-bisecting-p))
+    (user-error "Not bisecting"))
+  (let ((file (magit-git-dir "BISECT_CMD_OUTPUT"))
+        (default-directory (magit-get-top-dir)))
+    (ignore-errors (delete-file file))
+    (magit-run-git-with-logfile file "bisect" subcommand args)
+    (magit-process-wait)
+    (magit-refresh)))
+
+;;;;; Logging
+
+;;;###autoload
+(defun magit-log (&optional range)
+  (interactive)
+  (cond ((not range) (setq range "HEAD"))
+        ;; Forward compatibility kludge.
+        ((listp range) (setq range (car range))))
+  (magit-mode-setup magit-log-buffer-name nil
+                    #'magit-log-mode
+                    #'magit-refresh-log-buffer
+                    'oneline range magit-custom-options))
+
+;;;###autoload
+(defun magit-log-ranged (range)
+  (interactive (list (magit-read-rev-range "Log" "HEAD")))
+  (magit-log range))
+
+;;;###autoload
+(defun magit-log-long (&optional range)
+  (interactive)
+  (unless range (setq range "HEAD"))
+  (magit-mode-setup magit-log-buffer-name nil
+                    #'magit-log-mode
+                    #'magit-refresh-log-buffer
+                    'long range magit-custom-options))
+
+;;;###autoload
+(defun magit-log-long-ranged (range)
+  (interactive (list (magit-read-rev-range "Long Log" "HEAD")))
+  (magit-log-long range))
+
+;;;###autoload
+(defun magit-file-log (file &optional use-graph)
+  "Display the log for the currently visited file or another one.
+With a prefix argument show the log graph."
+  (interactive
+   (list (magit-read-file-from-rev (magit-get-current-branch)
+                                   (magit-buffer-file-name t))
+         current-prefix-arg))
+  (magit-mode-setup magit-log-buffer-name nil
+                    #'magit-log-mode
+                    #'magit-refresh-log-buffer
+                    'oneline "HEAD"
+                    `(,@(and use-graph (list "--graph"))
+                      ,@magit-custom-options
+                      "--follow")
+                    file))
+
+;;;###autoload
+(defun magit-reflog (ref)
+  "Display the reflog of the current branch.
+With a prefix argument another branch can be chosen."
+  (interactive (let ((branch (magit-get-current-branch)))
+                 (if (and branch (not current-prefix-arg))
+                     (list branch)
+                   (list (magit-read-rev "Reflog of" branch)))))
+  (magit-mode-setup magit-reflog-buffer-name nil
+                    #'magit-reflog-mode
+                    #'magit-refresh-reflog-buffer ref))
+
+;;;###autoload
+(defun magit-reflog-head ()
+  "Display the HEAD reflog."
+  (interactive)
+  (magit-reflog "HEAD"))
+
+;;; Modes (2)
+;;;; Log Mode
+;;;;; Log Core
+
+(define-derived-mode magit-log-mode magit-mode "Magit Log"
+  "Mode for looking at git log.
+
+\\<magit-log-mode-map>Type `\\[magit-visit-item]` to visit a commit, and \
+`\\[magit-show-item-or-scroll-up]` to just show it.
+Type `\\[magit-log-show-more-entries]` to show more commits, \
+and `\\[magit-refresh]` to refresh the log.
+Type `\\[magit-diff-working-tree]` to see the diff between current commit and your working tree,
+Type `\\[magit-diff]` to see diff between any two version
+Type `\\[magit-apply-item]` to apply the change of the current commit to your wortree,
+and `\\[magit-cherry-pick-item]` to apply and commit the result.
+Type `\\[magit-revert-item]` to revert a commit, and `\\[magit-reset-head]` reset your current head to a commit,
+
+More information can be found in Info node `(magit)History'
+
+Other key binding:
+\\{magit-log-mode-map}"
+  :group 'magit)
+
+(defvar magit-log-buffer-name "*magit-log*"
+  "Name of buffer used to display log entries.")
+
+(defun magit-refresh-log-buffer (style range args &optional file)
+  (magit-set-buffer-margin (car magit-log-margin-spec)
+                           (and magit-log-show-margin
+                                (eq (car magit-refresh-args) 'oneline)))
+  (magit-log-margin-set-timeunit-width)
+  (setq magit-file-log-file file)
+  (when (consp range)
+    (setq range (concat (car range) ".." (cdr range))))
+  (magit-git-insert-section
+      (logbuf (concat "Commits"
+                      (and file  (concat " for file " file))
+                      (and range (concat " in " range))))
+      (apply-partially 'magit-wash-log style 'color t)
+    "log"
+    (format "--max-count=%d" magit-log-cutoff-length)
+    "--decorate=full" "--color"
+    (cl-case style
+      (long    (if magit-log-show-gpg-status
+                   (list "--stat" "--show-signature")
+                 "--stat"))
+      (oneline (concat "--pretty=format:%h%d "
+                       (and magit-log-show-gpg-status "%G?")
+                       "[%an][%at]%s")))
+    args range "--" file)
+  (save-excursion
+    (goto-char (point-min))
+    (magit-format-log-margin)))
+
+;;;;; Log Washing
+
+(defconst magit-log-oneline-re
+  (concat "^"
+          "\\(?4:\\(?: *[-_/|\\*o.] *\\)+ *\\)?"   ; graph
+          "\\(?:"
+          "\\(?1:[0-9a-fA-F]+\\) "                 ; sha1
+          "\\(?:\\(?3:([^()]+)\\) \\)?"            ; refs
+          "\\(?7:[BGUN]\\)?"                       ; gpg
+          "\\[\\(?5:[^]]*\\)\\]"                   ; author
+          "\\[\\(?6:[^]]*\\)\\]"                   ; date
+          "\\(?2:.*\\)"                            ; msg
+          "\\)?$"))
+
+(defconst magit-log-long-re
+  (concat "^"
+          "\\(?4:\\(?:[-_/|\\*o.] *\\)+ *\\)?"     ; graph
+          "\\(?:"
+          "\\(?:commit \\(?1:[0-9a-fA-F]+\\)"      ; sha1
+          "\\(?: \\(?3:([^()]+)\\)\\)?\\)"         ; refs
+          "\\|"
+          "\\(?2:.+\\)\\)$"))                      ; "msg"
+
+(defconst magit-log-unique-re
+  (concat "^"
+          "\\(?1:[0-9a-fA-F]+\\) "                 ; sha1
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defconst magit-log-cherry-re
+  (concat "^"
+          "\\(?8:[-+]\\) "                         ; cherry
+          "\\(?1:[0-9a-fA-F]+\\) "                 ; sha1
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defconst magit-log-bisect-vis-re
+  (concat "^"
+          "\\(?1:[0-9a-fA-F]+\\) "                 ; sha1
+          "\\(?:\\(?3:([^()]+)\\) \\)?"            ; refs
+          "\\(?2:.+\\)$"))                         ; msg
+
+(defconst magit-log-bisect-log-re
+  (concat "^# "
+	  "\\(?3:bad:\\|skip:\\|good:\\) "         ; "refs"
+	  "\\[\\(?1:[^]]+\\)\\] "                  ; sha1
+	  "\\(?2:.+\\)$"))                         ; msg
+
+(defconst magit-log-reflog-re
+  (concat "^"
+          "\\(?1:[^ ]+\\) "                        ; sha1
+          "\\[\\(?5:[^]]*\\)\\] "                  ; author
+          "\\(?6:[^ ]*\\) "                        ; date
+          "[^@]+@{\\(?9:[^}]+\\)} "                ; refsel
+          "\\(?10:merge\\|[^:]+\\)?:? ?"           ; refsub
+          "\\(?2:.+\\)?$"))                        ; msg
+
+(defconst magit-reflog-subject-re
+  (concat "\\([^ ]+\\) ?"                          ; command (1)
+          "\\(\\(?: ?-[^ ]+\\)+\\)?"               ; option  (2)
+          "\\(?: ?(\\([^)]+\\))\\)?"))             ; type    (3)
+
+(defvar magit-log-count nil)
+
+(defun magit-wash-log (style &optional color longer)
+  (when color
+    (let ((ansi-color-apply-face-function
+           (lambda (beg end face)
+             (when face
+               (put-text-property beg end 'font-lock-face face)))))
+      (ansi-color-apply-on-region (point-min) (point-max))))
+  (when (eq style 'cherry)
+    (reverse-region (point-min) (point-max)))
+  (let ((magit-log-count 0))
+    (magit-wash-sequence (apply-partially 'magit-wash-log-line style
+                                          (magit-abbrev-length)))
+    (when (and longer
+               (= magit-log-count magit-log-cutoff-length))
+      (magit-with-section (section longer 'longer)
+        (insert-text-button "type \"e\" to show more history"
+                            'action (lambda (button)
+                                      (magit-log-show-more-entries))
+                            'follow-link t
+                            'mouse-face magit-item-highlight-face)))))
+
+(defun magit-wash-log-line (style abbrev)
+  (looking-at (cl-ecase style
+                (oneline magit-log-oneline-re)
+                (long    magit-log-long-re)
+                (unique  magit-log-unique-re)
+                (cherry  magit-log-cherry-re)
+                (reflog  magit-log-reflog-re)
+                (bisect-vis magit-log-bisect-vis-re)
+                (bisect-log magit-log-bisect-log-re)))
+  (magit-bind-match-strings
+      (hash msg refs graph author date gpg cherry refsel refsub)
+    (delete-region (point) (point-at-eol))
+    (when cherry
+      (magit-insert cherry (if (string= cherry "-")
+                               'magit-cherry-equivalent
+                             'magit-cherry-unmatched) ?\s))
+    (unless (eq style 'long)
+      (when (eq style 'bisect-log)
+	(setq hash (magit-git-string "rev-parse" "--short" hash)))
+      (if hash
+          (insert (propertize hash 'face 'magit-log-sha1) ?\s)
+        (insert (make-string (1+ abbrev) ? ))))
+    (when graph
+      (if magit-log-format-graph-function
+          (insert (funcall magit-log-format-graph-function graph))
+        (insert graph)))
+    (when (and hash (eq style 'long))
+      (magit-insert (if refs hash (magit-rev-parse hash)) 'magit-log-sha1 ?\s))
+    (when refs
+      (magit-insert-ref-labels refs))
+    (when refsub
+      (insert (format "%-2s " refsel))
+      (insert (magit-log-format-reflog refsub)))
+    (when msg
+      (magit-insert msg (cl-case (and gpg (aref gpg 0))
+                          (?G 'magit-signature-good)
+                          (?B 'magit-signature-bad)
+                          (?U 'magit-signature-untrusted)
+                          (?N 'magit-signature-none)
+                          (t  'magit-log-message))))
+    (goto-char (line-beginning-position))
+    (magit-format-log-margin author date)
+    (if hash
+        (magit-with-section (section commit hash)
+          (when (derived-mode-p 'magit-log-mode)
+            (cl-incf magit-log-count))
+          (forward-line)
+          (when (eq style 'long)
+            (magit-wash-sequence
+             (lambda ()
+               (looking-at magit-log-long-re)
+               (when (match-string 2)
+                 (magit-wash-log-line 'long abbrev))))))
+      (forward-line)))
+  t)
+
+(defun magit-log-format-unicode-graph (string)
+  "Translate ascii characters to unicode characters.
+Whether that actually is an improvment depends on the unicode
+support of the font in use.  The translation is done using the
+alist in `magit-log-format-unicode-graph-alist'."
+  (replace-regexp-in-string
+   "[/|\\*o ]"
+   (lambda (str)
+     (propertize
+      (string (or (cdr (assq (aref str 0)
+                             magit-log-format-unicode-graph-alist))
+                  (aref str 0)))
+      'face (get-text-property 0 'face str)))
+   string))
+
+(defun magit-format-log-margin (&optional author date)
+  (when magit-log-show-margin
+    (cl-destructuring-bind (width characterp duration-spec)
+        magit-log-margin-spec
+      (if author
+          (magit-make-margin-overlay
+           (propertize (truncate-string-to-width
+                        author (- width 1 3 (if characterp 0 1)
+                                  magit-log-margin-timeunit-width 1)
+                        nil ?\s (make-string 1 magit-ellipsis))
+                       'face 'magit-log-author)
+           " "
+           (propertize (magit-format-duration
+                        (abs (truncate (- (float-time)
+                                          (string-to-number date))))
+                        (symbol-value duration-spec)
+                        magit-log-margin-timeunit-width)
+                       'face 'magit-log-date)
+           (propertize " " 'face 'fringe))
+        (magit-make-margin-overlay
+         (propertize (make-string (1- width) ?\s) 'face 'default)
+         (propertize " " 'face 'fringe))))))
+
+;;;;; Log Commands
+
+(defun magit-log-toggle-margin ()
+  "Show or hide the log margin.
+This command can only be used inside log buffers (usually
+*magit-log*) and only if that displays a `oneline' log.
+Also see option `magit-log-show-margin'."
+  (interactive)
+  (unless (derived-mode-p 'magit-log-mode)
+    (user-error "The log margin cannot be used outside of log buffers"))
+  (when (eq (car magit-refresh-args) 'long)
+    (user-error "The log margin cannot be used with verbose logs"))
+  (if magit-log-show-margin
+      (magit-set-buffer-margin (car magit-log-margin-spec)
+                               (not (cdr (window-margins))))
+    (setq-local magit-log-show-margin t)
+    (magit-refresh)))
+
+(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")
+  (setq-local magit-log-cutoff-length
+              (cond ((numberp arg) (+ magit-log-cutoff-length arg))
+                    (arg magit-log-infinite-length)
+                    (t (* magit-log-cutoff-length 2))))
+  (let ((old-point (point)))
+    (magit-refresh)
+    (goto-char old-point)))
+
+;;;; Cherry Mode
+
+(define-derived-mode magit-cherry-mode magit-mode "Magit Cherry"
+  "Mode for looking at commits not merged upstream.
+
+\\<magit-cherry-mode-map>Type `\\[magit-toggle-section]` to show or hide \
+section, `\\[magit-visit-item]` to visit an item and \
+`\\[magit-show-item-or-scroll-up]` to show it.
+Type `\\[magit-diff-working-tree]` to display change with your working tree, \
+when `\\[magit-diff]` to display change
+between any two commit.
+Type `\\[magit-cherry-pick-item]` to cherry-pick a commit, and \
+`\\[magit-apply-item]` to apply its change to your
+working tree, without committing, and `\\[magit-key-mode-popup-merging]` to \
+merge.
+`\\[magit-refresh]` will refresh current buffer.
+
+
+Other key binding:
+\\{magit-cherry-mode-map}")
+
+(defvar magit-cherry-buffer-name "*magit-cherry*"
+  "Name of buffer used to display commits not merged upstream.")
+
+;;;###autoload
+(defun magit-cherry (head upstream)
+  "Show commits in a branch that are not merged in the upstream branch."
+  (interactive
+   (let  ((head (magit-read-rev "Cherry head" (magit-get-current-branch))))
+     (list head (magit-read-rev "Cherry upstream"
+                                (magit-get-tracked-branch head nil t)))))
+  (magit-mode-setup magit-cherry-buffer-name nil
+                    #'magit-cherry-mode
+                    #'magit-refresh-cherry-buffer upstream head))
+
+(defun magit-refresh-cherry-buffer (upstream head)
+  (magit-with-section (section cherry 'cherry nil t)
+    (run-hooks 'magit-cherry-sections-hook)))
+
+(defun magit-insert-cherry-head-line ()
+  (magit-insert-line-section (line)
+    (concat "Head: "
+            (propertize (cadr magit-refresh-args) 'face 'magit-branch) " "
+            (abbreviate-file-name default-directory))))
+
+(defun magit-insert-cherry-upstream-line ()
+  (magit-insert-line-section (line)
+    (concat "Upstream: "
+            (propertize (car magit-refresh-args) 'face 'magit-branch))))
+
+(defun magit-insert-cherry-help-lines ()
+  (when (derived-mode-p 'magit-cherry-mode)
+    (insert "\n")
+    (magit-insert-line-section (line)
+      (concat (propertize "-" 'face 'magit-cherry-equivalent)
+              " equivalent exists in both refs"))
+    (magit-insert-line-section (line)
+      (concat (propertize "+" 'face 'magit-cherry-unmatched)
+              " unmatched commit tree"))))
+
+(defun magit-insert-cherry-commits ()
+  (magit-git-insert-section (cherries "Cherry commits:")
+      (apply-partially 'magit-wash-log 'cherry)
+    "cherry" "-v" (magit-abbrev-arg) magit-refresh-args))
+
+;;;; Reflog Mode
+
+(defvar magit-reflog-buffer-name "*magit-reflog*"
+  "Name of buffer used to display reflog entries.")
+
+(define-derived-mode magit-reflog-mode magit-log-mode "Magit Reflog"
+  "Mode for looking at git reflog.
+
+\\<magit-reflog-mode-map>Type `\\[magit-visit-item]` to visit a commit, and \
+`\\[magit-show-item-or-scroll-up]` to just show it.
+Type `\\[magit-diff-working-tree]` to see the diff between current commit and \
+your working tree,
+Type `\\[magit-diff]` to see the between any two version.
+Type `\\[magit-reset-head]` to reset your head to the current commit, and \
+`\\[magit-apply-item]` to apply its change
+to your working tree and `\\[magit-cherry-pick-item]` to cherry pick it.
+
+More information can be found in Info node `(magit)Reflogs'
+
+Other key binding:
+\\{magit-reflog-mode-map}"
+  :group 'magit)
+
+(defun magit-refresh-reflog-buffer (ref)
+  (magit-log-margin-set-timeunit-width)
+  (magit-git-insert-section
+      (reflogbuf (format "Local history of branch %s" ref))
+      (apply-partially 'magit-wash-log 'reflog t)
+    "reflog" "show" "--format=format:%h [%an] %ct %gd %gs"
+    (format "--max-count=%d" magit-log-cutoff-length) ref))
+
+(defvar magit-reflog-labels
+  '(("commit"      . magit-log-reflog-label-commit)
+    ("amend"       . magit-log-reflog-label-amend)
+    ("merge"       . magit-log-reflog-label-merge)
+    ("checkout"    . magit-log-reflog-label-checkout)
+    ("branch"      . magit-log-reflog-label-checkout)
+    ("reset"       . magit-log-reflog-label-reset)
+    ("rebase"      . magit-log-reflog-label-rebase)
+    ("cherry-pick" . magit-log-reflog-label-cherry-pick)
+    ("initial"     . magit-log-reflog-label-commit)
+    ("pull"        . magit-log-reflog-label-remote)
+    ("clone"       . magit-log-reflog-label-remote)))
+
+(defun magit-log-format-reflog (subject)
+  (let* ((match (string-match magit-reflog-subject-re subject))
+         (command (and match (match-string 1 subject)))
+         (option  (and match (match-string 2 subject)))
+         (type    (and match (match-string 3 subject)))
+         (label (if (string= command "commit")
+                    (or type command)
+                  command))
+         (text (if (string= command "commit")
+                   label
+                 (mapconcat #'identity
+                            (delq nil (list command option type))
+                            " "))))
+    (format "%-16s "
+            (propertize text 'face
+                        (or (cdr (assoc label magit-reflog-labels))
+                            'magit-log-reflog-label-other)))))
+
+;;;; Ediff Support
+
+(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 (eq (magit-section-type (magit-current-section)) 'diffstat)
+      (setq diff (magit-diff-section-for-diffstat diff)))
+    (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)))
+    (when (eq 'hunk (magit-section-type diff))
+      (setq diff (magit-section-parent diff)))
+    (unless (eq 'diff (magit-section-type diff))
+      (user-error "No diff at this location"))
+    (let* ((status (magit-section-diff-status diff))
+           (file1  (magit-section-info diff))
+           (file2  (magit-section-diff-file2 diff))
+           (range  (magit-diff-range diff)))
+      (cond
+       ((memq status '(new deleted typechange))
+        (message "Why ediff a %s file?" status))
+       ((and (eq status 'unmerged)
+             (eq (cdr range) 'working))
+        (magit-interactive-resolve file1))
+       ((consp (car range))
+        (magit-ediff-buffers3 (magit-show (caar range) file2)
+                              (magit-show (cdar range) file2)
+                              (magit-show (cdr range) file1)))
+       (t
+        (magit-ediff-buffers  (magit-show (car range) file2)
+                              (magit-show (cdr range) file1)))))))
+
+(defun magit-ediff-buffers (a b)
+  (setq magit-ediff-buffers (list a b))
+  (setq magit-ediff-windows (current-window-configuration))
+  (ediff-buffers a b '(magit-ediff-add-cleanup)))
+
+(defun magit-ediff-buffers3 (a b c)
+  (setq magit-ediff-buffers (list a b c))
+  (setq magit-ediff-windows (current-window-configuration))
+  (ediff-buffers3 a b c '(magit-ediff-add-cleanup)))
+
+(defun magit-diff-range (diff)
+  (if (eq major-mode 'magit-commit-mode)
+      (let ((revs (split-string
+                   (magit-git-string "rev-list" "-1" "--parents"
+                                     (car (last magit-refresh-args))))))
+        (when (= (length revs) 2)
+          (cons (cadr revs) (car revs))))
+    (magit-section-diff-range diff)))
+
+(defun magit-ediff-add-cleanup ()
+  (make-local-variable 'magit-ediff-buffers)
+  (setq-default magit-ediff-buffers ())
+
+  (make-local-variable 'magit-ediff-windows)
+  (setq-default magit-ediff-windows ())
+
+  (add-hook 'ediff-cleanup-hook 'magit-ediff-restore 'append 'local))
+
+(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)
+    (when (and (null (buffer-file-name buffer))
+               (buffer-live-p buffer))
+      (with-current-buffer buffer
+        (when (and (eq magit-show-current-version 'index)
+                   (buffer-modified-p))
+          (magit-save-index)))
+      (kill-buffer buffer)))
+  (let ((buf (current-buffer)))
+    (set-window-configuration magit-ediff-windows)
+    (set-buffer buf)))
+
+;;;###autoload
+(defun magit-save-index ()
+  "Add the content of current file as if it was the index."
+  (interactive)
+  (unless (eq magit-show-current-version 'index)
+    (user-error "Current buffer doesn't visit the index version of a file"))
+  (when (y-or-n-p (format "Stage current version of %s? " magit-file-name))
+    (let ((buf (current-buffer))
+          (name (magit-git-dir "magit-add-index")))
+      (with-temp-file name
+        (insert-buffer-substring buf))
+      (let ((hash (magit-git-string "hash-object" "-t" "blob" "-w"
+                                    (concat "--path=" magit-file-name)
+                                    "--" name))
+            (perm (substring (magit-git-string "ls-files" "-s"
+                                               magit-file-name)
+                             0 6)))
+        (magit-run-git "update-index" "--cacheinfo"
+                       perm hash magit-file-name)))))
+
+;;;###autoload
+(defun magit-interactive-resolve (file)
+  "Resolve a merge conflict using Ediff."
+  (interactive (list (magit-section-case (info) (diff (cadr info)))))
+  (require 'ediff)
+  (let ((merge-status (magit-git-lines "ls-files" "-u" "--" file))
+        (base-buffer)
+        (our-buffer (generate-new-buffer (concat file ".current")))
+        (their-buffer (generate-new-buffer (concat file ".merged")))
+        (merger-buffer)
+        (windows (current-window-configuration)))
+    (unless merge-status
+      (user-error "Cannot resolve %s" file))
+    (when (string-match "^[0-9]+ [0-9a-f]+ 1" (car merge-status))
+      (pop merge-status)
+      (setq base-buffer (generate-new-buffer (concat file ".base")))
+      (with-current-buffer base-buffer
+        (magit-git-insert "cat-file" "blob" (concat ":1:" file))))
+    ;; If the second or third version do not exit, we use an empty buffer for the deleted file
+    (with-current-buffer our-buffer
+      (when (string-match "^[0-9]+ [0-9a-f]+ 2" (car merge-status))
+        (pop merge-status)
+        (magit-git-insert "cat-file" "blob" (concat ":2:" file)))
+      (let ((buffer-file-name file))
+        (normal-mode t)))
+    (with-current-buffer their-buffer
+      (when (string-match "^[0-9]+ [0-9a-f]+ 3" (car merge-status))
+        (magit-git-insert "cat-file" "blob" (concat ":3:" file)))
+      (let ((buffer-file-name file))
+        (normal-mode t)))
+    ;; We have now created the 3 buffer with ours, theirs and the ancestor files
+    (if base-buffer
+        (setq merger-buffer (ediff-merge-buffers-with-ancestor
+                             our-buffer their-buffer base-buffer nil nil file))
+      (setq merger-buffer (ediff-merge-buffers our-buffer their-buffer nil nil file)))
+    (with-current-buffer merger-buffer
+      (setq ediff-show-clashes-only t)
+      (setq-local 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)
+                        (windows magit-ediff-windows))
+                    (ediff-cleanup-mess)
+                    (kill-buffer buffer-A)
+                    (kill-buffer buffer-B)
+                    (when (bufferp buffer-Ancestor)
+                      (kill-buffer buffer-Ancestor))
+                    (set-window-configuration windows)))))))
+
+;;;; Diff Mode
+;;;;; Diff Core
+
+(define-derived-mode magit-diff-mode magit-mode "Magit Diff"
+  "Mode for looking at a git diff.
+
+\\<magit-diff-mode-map>Type `\\[magit-visit-item]` to visit the changed file, \
+`\\[magit-toggle-section]` to hide or show a hunk,
+`\\[magit-diff-larger-hunks]` and `\\[magit-diff-smaller-hunks]` to change \
+the size of the hunks.
+Type `\\[magit-apply-item]` to apply a change to your worktree and \
+`\\[magit-revert-item]` to reverse it.
+You can also use `\\[magit-ediff]` to see the current change with ediff.
+
+More information can be found in Info node `(magit)Diffing'
+
+\\{magit-diff-mode-map}"
+  :group 'magit)
+
+(defvar magit-diff-buffer-name "*magit-diff*"
+  "Name of buffer used to display a diff.")
+
+(defvar magit-stash-buffer-name "*magit-stash*"
+  "Name of buffer used to display a stash.")
+
+;;;;; Diff Entry Commands
+
+;;;###autoload
+(defun magit-diff (range &optional working args)
+  "Show differences between two commits.
+RANGE should be a range (A..B or A...B) but can also be a single
+commit.  If one side of the range is omitted, then it defaults
+to HEAD.  If just a commit is given, then changes in the working
+tree relative to that commit are shown."
+  (interactive (list (magit-read-rev-range "Diff")))
+  (magit-mode-setup magit-diff-buffer-name
+                    #'pop-to-buffer
+                    #'magit-diff-mode
+                    #'magit-refresh-diff-buffer range working args))
+
+;;;###autoload
+(defun magit-diff-working-tree (rev)
+  "Show differences between a commit and the current working tree."
+  (interactive (list (magit-read-rev-with-default "Diff working tree with")))
+  (magit-diff (or rev "HEAD") t))
+
+;;;###autoload
+(defun magit-diff-staged ()
+  "Show differences between the index and the HEAD commit."
+  (interactive)
+  (magit-diff nil nil (list "--cached")))
+
+;;;###autoload
+(defun magit-diff-unstaged ()
+  "Show differences between the current working tree and index."
+  (interactive)
+  (magit-diff nil))
+
+;;;###autoload
+(defun magit-diff-stash (stash &optional noselect)
+  "Show changes in a stash.
+A Stash consist of more than just one commit.  This command uses
+a special diff range so that the stashed changes actually were a
+single commit."
+  (interactive (list (magit-read-stash "Show stash (number): ")))
+  (magit-mode-setup magit-commit-buffer-name
+                    (if noselect 'display-buffer 'pop-to-buffer)
+                    #'magit-diff-mode
+                    #'magit-refresh-diff-buffer
+                    (concat stash "^2^.." stash)))
+
+(defun magit-diff-with-mark (range)
+  "Show difference between the marked commit and the one at point.
+If there is no commit at point, then prompt for one."
+  (interactive
+   (let* ((marked (or magit-marked-commit (user-error "No commit marked")))
+          (current (magit-get-current-branch))
+          (is-current (string= (magit-name-rev marked) current))
+          (commit (or (magit-guess-branch)
+                      (magit-read-rev
+                       (format "Diff marked commit %s with" marked)
+                       (unless is-current current)
+                       current))))
+     (list (concat marked ".." commit))))
+  (magit-diff range))
+
+(defun magit-refresh-diff-buffer (range &optional working args)
+  (let ((magit-current-diff-range
+         (cond (working (cons range 'working))
+               ((null range) nil)
+               ((consp range)
+                (prog1 range
+                  (setq range (concat (car range) ".." (cdr range)))))
+               ((string-match "^\\([^.]+\\)\\.\\.\\([^.]\\)$" range)
+                (cons (match-string 1 range)
+                      (match-string 2 range))))))
+    (magit-git-insert-section
+        (diffbuf (cond (working
+                        (format "Changes from %s to working tree" range))
+                       ((not range)
+                        (if (member "--cached" args)
+                            "Staged changes"
+                          "Unstaged changes"))
+                       (t
+                        (format "Changes in %s" range))))
+        #'magit-wash-diffs
+      "diff" (magit-diff-U-arg)
+      (and magit-show-diffstat "--patch-with-stat")
+      range args "--")))
+
+;;;;; Diff Washing
+
+(defconst magit-diff-statline-re
+  (concat "^ ?"
+          "\\(.*\\)"     ; file
+          "\\( +| +\\)"  ; separator
+          "\\([0-9]+\\|Bin\\(?: +[0-9]+ -> [0-9]+ bytes\\)?$\\) ?"
+          "\\(\\+*\\)"   ; add
+          "\\(-*\\)$"))  ; del
+
+(defvar magit-current-diff-range nil
+  "Used internally when setting up magit diff sections.")
+
+(defvar-local magit-diffstat-cached-sections nil)
+(put 'magit-diffstat-cached-sections 'permanent-local t)
+
+(defun magit-wash-diffs ()
+  (magit-wash-diffstats)
+  (when (re-search-forward "^diff" nil t)
+    (goto-char (line-beginning-position))
+    (magit-wash-sequence #'magit-wash-diff))
+  (goto-char (point-max))
+  (magit-xref-insert-buttons))
+
+(defun magit-wash-diffstats ()
+  (let ((beg (point)))
+    (when (re-search-forward "^ ?\\([0-9]+ +files? change[^\n]*\n\\)" nil t)
+      (let ((heading (match-string-no-properties 1)))
+        (delete-region (match-beginning 0) (match-end 0))
+        (goto-char beg)
+        (magit-with-section (section diffstats 'diffstats heading)
+          (magit-wash-sequence #'magit-wash-diffstat)))
+      (setq magit-diffstat-cached-sections
+            (nreverse magit-diffstat-cached-sections)))))
+
+(defun magit-wash-diffstat ()
+  (when (looking-at magit-diff-statline-re)
+    (magit-bind-match-strings (file sep cnt add del)
+      (delete-region (point) (1+ (line-end-position)))
+      (magit-with-section (section diffstat 'diffstat)
+        (insert " " file sep cnt " ")
+        (when add (insert (propertize add 'face 'magit-diff-add)))
+        (when del (insert (propertize del 'face 'magit-diff-del)))
+        (insert "\n")
+        (push section magit-diffstat-cached-sections)))))
+
+(defun magit-wash-diff ()
+  (magit-with-section (section diff (buffer-substring-no-properties
+                                     (line-beginning-position)
+                                     (line-end-position)))
+    (setq section (magit-wash-diff-section section))))
+
+(defun magit-wash-diff-section (section)
+  (cond ((re-search-forward "^\\* Unmerged path \\(.*\\)" nil t)
+         (forward-line 0)
+         (let ((file (magit-decode-git-path (match-string-no-properties 1))))
+           (delete-region (point) (line-end-position))
+           (insert "\tUnmerged " file "\n")
+           (setf (magit-section-diff-status section) 'unmerged)
+           (setf (magit-section-info section) file)
+           section))
+        ((re-search-forward "^diff" nil t)
+         (forward-line 0)
+         (let ((file (cond
+                      ((looking-at "^diff --git \\(\".*\"\\) \\(\".*\"\\)$")
+                       (substring (magit-decode-git-path
+                                   (match-string-no-properties 2)) 2))
+                      ((looking-at "^diff --git ./\\(.*\\) ./\\(.*\\)$")
+                       (match-string-no-properties 2))
+                      ((looking-at "^diff --cc +\\(.*\\)$")
+                       (match-string-no-properties 1))))
+               (end (save-excursion
+                      (forward-line) ;; skip over "diff" line
+                      (if (re-search-forward "^diff\\|^@@" nil t)
+                          (goto-char (match-beginning 0))
+                        (goto-char (point-max)))
+                      (point-marker))))
+           (when magit-diffstat-cached-sections
+             (setf (magit-section-info (pop magit-diffstat-cached-sections))
+                   file))
+           (let  ((status (cond
+                           ((looking-at "^diff --cc")
+                            'unmerged)
+                           ((save-excursion
+                              (re-search-forward "^new file" end t))
+                            'new)
+                           ((save-excursion
+                              (re-search-forward "^deleted" end t))
+                            (setf (magit-section-hidden section) t)
+                            'deleted)
+                           ((save-excursion
+                              (re-search-forward "^rename" end t))
+                            'renamed)
+                           (t
+                            'modified)))
+                  (file2 (cond
+                          ((save-excursion
+                             (re-search-forward "^rename from \\(.*\\)"
+                                                    end t))
+                           (match-string-no-properties 1)))))
+             (setf (magit-section-diff-status section) status)
+             (setf (magit-section-info        section) file)
+             (setf (magit-section-diff-file2  section) (or file2 file))
+             (setf (magit-section-diff-range  section) magit-current-diff-range)
+             (magit-insert-diff-title status file file2)
+             (when (re-search-forward
+                    "\\(--- \\(.*\\)\n\\+\\+\\+ \\(.*\\)\n\\)" nil t)
+               (magit-put-face-property (match-beginning 1) (match-end 1)
+                                        'magit-diff-hunk-header)
+               (magit-put-face-property (match-beginning 2) (match-end 2)
+                                        'magit-diff-file-header)
+               (magit-put-face-property (match-beginning 3) (match-end 3)
+                                        'magit-diff-file-header))
+             (goto-char end)
+             (magit-wash-sequence #'magit-wash-hunk)))
+         section)))
+
+(defun magit-insert-diff-title (status file file2)
+  (insert (format "\t%-10s " (capitalize (symbol-name status)))
+          file
+          (if (eq status 'renamed) (format "   (from %s)" file2) "")
+          "\n"))
+
+(defun magit-wash-hunk ()
+  (when (looking-at "^@@\\(@\\)?.+")
+    (let ((merging (match-beginning 1)))
+      (magit-with-section (section hunk (match-string 0))
+        (magit-put-face-property (point) (line-end-position)
+                                 'magit-diff-hunk-header)
+        (forward-line)
+        (while (not (or (eobp) (looking-at "^diff\\|^@@")))
+          (magit-put-face-property
+           (point) (line-end-position)
+           (cond
+            ((looking-at "^\\+\\+<<<<<<<") 'magit-diff-merge-current)
+            ((looking-at "^\\+\\+=======") 'magit-diff-merge-separator)
+            ((looking-at "^\\+\\+|||||||") 'magit-diff-merge-diff3-separator)
+            ((looking-at "^\\+\\+>>>>>>>") 'magit-diff-merge-proposed)
+            ((looking-at (if merging  "^\\(\\+\\| \\+\\)" "^\\+"))
+             (magit-diff-highlight-whitespace merging)
+             'magit-diff-add)
+            ((looking-at (if merging  "^\\(-\\| \\-\\)" "^-"))
+             (magit-diff-highlight-whitespace merging)
+             'magit-diff-del)
+            (t
+             'magit-diff-none)))
+            (forward-line))
+        (when (eq magit-diff-refine-hunk 'all)
+          (magit-diff-refine-hunk section))))
+    t))
+
+(defun magit-diff-highlight-whitespace (merging)
+  (when (and magit-highlight-whitespace
+             (or (derived-mode-p 'magit-status-mode)
+                 (not (eq magit-highlight-whitespace 'status))))
+    (let ((prefix (if merging "^[-\\+\s]\\{2\\}" "^[-\\+]"))
+          (indent
+           (if (local-variable-p 'magit-highlight-indentation)
+               magit-highlight-indentation
+             (setq-local
+              magit-highlight-indentation
+              (cdr (cl-find-if (lambda (pair)
+                                 (string-match-p (car pair) default-directory))
+                               (default-value 'magit-highlight-indentation)
+                               :from-end t))))))
+      (when (and magit-highlight-trailing-whitespace
+                 (looking-at (concat prefix ".*?\\([ \t]+\\)$")))
+        (magit-put-face-property (match-beginning 1) (match-end 1)
+                                 'magit-whitespace-warning-face))
+      (when (or (and (eq indent 'tabs)
+                     (looking-at (concat prefix "\\( *\t[ \t]*\\)")))
+                (and (integerp indent)
+                     (looking-at (format "%s\\([ \t]* \\{%s,\\}[ \t]*\\)"
+                                         prefix indent))))
+        (magit-put-face-property (match-beginning 1) (match-end 1)
+                                 'magit-whitespace-warning-face)))))
+
+;;;;; Diff Mode Commands
+
+(defun magit-diff-toggle-refine-hunk (&optional other)
+  "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 variable `magit-diff-refine-hunk' to change the default mode."
+  (interactive "P")
+  (let ((hunk (and magit-highlighted-section
+                   (eq (magit-section-type magit-highlighted-section) 'hunk)
+                   magit-highlighted-section))
+        (old magit-diff-refine-hunk))
+    (setq-local magit-diff-refine-hunk
+                (if other
+                    (if (eq old 'all) t 'all)
+                  (not old)))
+    (cond ((or (eq old 'all)
+               (eq magit-diff-refine-hunk 'all))
+           (magit-refresh))
+          ((not hunk))
+          (magit-diff-refine-hunk
+           (magit-diff-refine-hunk hunk))
+          (t
+           (magit-diff-unrefine-hunk hunk)))
+    (message "magit-diff-refine-hunk: %s" magit-diff-refine-hunk)))
+
+(defun magit-diff-refine-hunk (hunk)
+  (save-excursion
+    (goto-char (magit-section-beginning hunk))
+    ;; `diff-refine-hunk' does not handle combined diffs.
+    (unless (looking-at "@@@")
+      (diff-refine-hunk))))
+
+(defun magit-diff-unrefine-hunk (hunk)
+  (remove-overlays (magit-section-beginning hunk)
+                   (magit-section-end hunk)
+                   'diff-mode 'fine))
+
+;;;; Wazzup Mode
+
+(define-derived-mode magit-wazzup-mode magit-mode "Magit Wazzup"
+  "Mode for looking at git commits not merged into current HEAD.
+
+\\<magit-wazzup-mode-map>Type `\\[magit-toggle-section]` to show or hide \
+section, `\\[magit-visit-item]` to visit an item \
+`\\[magit-show-item-or-scroll-up]` to show it.
+Type `\\[magit-diff-working-tree]` to display change with your working tree, \
+and `\\[magit-diff]` to display change
+between any two commit.
+Type `\\[magit-cherry-pick-item]` to cherry-pick a commit, and \
+`\\[magit-apply-item]` to apply its change to your
+working tree, without committing, and `\\[magit-key-mode-popup-merging]` \
+to merge those change.
+Type `\\[magit-refresh]` to refresh current buffer.
+
+More information can be found in Info node `(magit)Wazzup'
+
+\\{magit-wazzup-mode-map}"
+  :group 'magit)
+
+(defvar magit-wazzup-buffer-name "*magit-wazzup*"
+  "Name of buffer used to display commits not merged into current HEAD.")
+
+;;;###autoload
+(defun magit-wazzup (branch)
+  "Show a list of branches in a dedicated buffer.
+Unlike in the buffer created by `magit-branch-manager' each
+branch can be expanded to show a list of commits not merged
+into the selected branch."
+  (interactive
+   (let ((branch (magit-get-current-branch)))
+     (list (if current-prefix-arg
+               (magit-read-rev "Wazzup branch" branch)
+             branch))))
+  (magit-mode-setup magit-wazzup-buffer-name nil
+                    #'magit-wazzup-mode
+                    #'magit-refresh-wazzup-buffer branch))
+
+(defun magit-refresh-wazzup-buffer (head)
+  (magit-with-section (section wazzupbuf 'wazzupbuf nil t)
+    (run-hooks 'magit-wazzup-sections-hook)))
+
+(defun magit-insert-wazzup-head-line ()
+  (magit-insert-line-section (line)
+    (concat "Head: "
+            (propertize (car magit-refresh-args) 'face 'magit-branch) " "
+            (abbreviate-file-name default-directory))))
+
+(defun magit-insert-wazzup-branches ()
+  (dolist (upstream (magit-git-lines "show-ref"))
+    (setq  upstream (cadr (split-string upstream " ")))
+    (when (and (not (string-match-p "HEAD$" upstream))
+               (string-match-p "^refs/\\(heads\\|remotes\\)/" upstream))
+      (magit-insert-wazzup-commits upstream (car magit-refresh-args)))))
+
+(defun magit-insert-wazzup-commits (upstream head)
+  (let ((count (string-to-number
+                (magit-git-string "rev-list" "--count" "--right-only"
+                                  (concat head "..." upstream)))))
+    (when (> count 0)
+      (magit-with-section
+          (section wazzup upstream
+                   (format "%3s %s\n" count (magit-format-ref-label upstream))
+                   nil t)
+        (cond
+         ((magit-section-hidden section)
+          (setf (magit-section-hidden section) t)
+          (setf (magit-section-needs-refresh-on-show section) t))
+         (t
+          (let ((beg (point)))
+            (magit-git-insert "cherry" "-v" "--abbrev" head upstream)
+            (save-restriction
+              (narrow-to-region beg (point))
+              (goto-char (point-min))
+              (magit-wash-log 'cherry)))))))))
+
+;;;; Branch Manager Mode
+;;;;; (core)
+
+(define-derived-mode magit-branch-manager-mode magit-mode "Magit Branch"
+  "Mode for looking at git branches.
+
+\\<magit-branch-manager-mode-map>Type `\\[magit-visit-item]` to checkout a branch, `\\[magit-reset-head]' to reset current branch,
+you can also merge the branch with `\\[magit-key-mode-popup-merging]`
+
+Type `\\[magit-discard-item]' to delete a branch, or `\\[universal-argument] \\[magit-discard-item]' to force the deletion.
+Type `\\[magit-rename-item]' to Rename a branch.
+
+More information can be found in Info node `(magit)The branch list'
+
+\\{magit-branch-manager-mode-map}
+Unless shadowed by the mode specific bindings above, bindings
+from the parent keymap `magit-mode-map' are also available.")
+
+(defvar magit-branches-buffer-name "*magit-branches*"
+  "Name of buffer used to display and manage branches.")
+
+;;;###autoload
+(defun magit-branch-manager ()
+  "Show a list of branches in a dedicated buffer."
+  (interactive)
+  (if (magit-get-top-dir) ; Kludge for #1215
+      (magit-mode-setup magit-branches-buffer-name nil
+                        #'magit-branch-manager-mode
+                        #'magit-refresh-branch-manager)
+    (user-error "There is no Git repository here")))
+
+(defun magit-refresh-branch-manager ()
+  (magit-git-insert-section (branchbuf nil)
+      #'magit-wash-branches
+    "branch" "-vva" magit-custom-options))
+
+;;;;; Branch List Washing
+
+(defconst magit-wash-branch-line-re
+  (concat "^\\([ *] \\)"                 ; 1: current branch marker
+          "\\(.+?\\) +"                  ; 2: branch name
+          "\\(?:"
+          "\\([0-9a-fA-F]+\\)"           ; 3: sha1
+          " "
+          "\\(?:\\["
+          "\\([^:\n]+?\\)"               ; 4: tracking
+          "\\(?:: \\)?"
+          "\\(?:ahead \\([0-9]+\\)\\)?"  ; 5: ahead
+          "\\(?:, \\)?"
+          "\\(?:behind \\([0-9]+\\)\\)?" ; 6: behind
+          "\\] \\)?"
+          "\\(?:.*\\)"                   ; message
+          "\\|"                          ; or
+          "-> "                          ; the pointer to
+          "\\(.+\\)"                     ; 7: a ref
+          "\\)\n"))
+
+(defun magit-wash-branch-line (&optional remote-name)
+  (when (looking-at magit-wash-branch-line-re)
+  ;; ^ Kludge for #1162.  v Don't reindent for now.
+  (let* ((marker      (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))
+         (branch-face (and (equal marker "* ") 'magit-branch)))
+    (delete-region (point) (line-beginning-position 2))
+    (magit-with-section (section branch branch)
+      (insert (propertize (or sha1 (make-string 7 ? ))
+                          'face 'magit-log-sha1)
+              " " marker
+              (propertize (if (string-match-p "^remotes/" branch)
+                              (substring branch 8)
+                            branch)
+                          'face branch-face))
+       (when other-ref
+         (insert " -> " (substring other-ref (+ 1 (length remote-name)))))
+       (when (and tracking
+                  (equal (magit-get-tracked-branch branch t)
+                         (concat "refs/remotes/" tracking)))
+         (insert " [")
+         ;; getting rid of the tracking branch name if it is
+         ;; the same as the branch name
+         (let* ((remote (magit-get "branch" branch "remote"))
+                (merge  (substring tracking (+ 1 (length remote)))))
+           (insert (propertize (if (string= branch merge)
+                                   (concat "@ " remote)
+                                 (concat merge " @ " remote))
+                               'face 'magit-log-head-label-remote)))
+         (when (or ahead behind)
+           (insert ":")
+           (and ahead (insert "ahead " (propertize ahead 'face branch-face)))
+           (and ahead behind (insert ", "))
+           (and behind (insert "behind "
+                               (propertize behind 'face
+                                           'magit-log-head-label-remote))))
+         (insert "]"))
+       (insert "\n")))))
+
+(defun magit-wash-remote-branches-group (group)
+  (let* ((remote (car group))
+         (url (magit-get "remote" remote "url"))
+         (push-url (magit-get "remote" remote "pushurl"))
+         (urls (concat url (and push-url (concat ", " push-url))))
+         (marker (cadr group)))
+    (magit-with-section
+        (section remote remote (format "%s (%s):" remote urls) t)
+      (magit-wash-branches-between-point-and-marker marker remote)
+      (insert "\n"))))
+
+(defun magit-wash-branches-between-point-and-marker (marker &optional remote-name)
+  (save-restriction
+    (narrow-to-region (point) marker)
+    (magit-wash-sequence
+     (apply-partially 'magit-wash-branch-line remote-name))))
+
+(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 (re-search-forward
+                                     (format "^  remotes/%s/" 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
+          (cl-loop for remote in remotes
+                   for end-markers on (cdr markers)
+                   for marker = (cl-loop for x in end-markers thereis x)
+                   collect (list remote marker))))
+    ;; actual displaying of information
+    (magit-with-section (section local "." "Local:" t)
+      (magit-wash-branches-between-point-and-marker
+       (cl-loop for x in markers thereis x))
+      (insert "\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)))
+
+;;;;; (commands)
+
+(defun magit-rename-item ()
+  "Rename the item at point."
+  (interactive)
+  (magit-section-action rename ()
+    (branch (call-interactively 'magit-rename-branch))
+    (remote (call-interactively 'magit-rename-remote))))
+
+(defun magit-change-what-branch-tracks ()
+  "Change which remote branch the current branch tracks."
+  (interactive)
+  (let* ((branch (magit-guess-branch))
+         (track (magit-read-rev "Track branch"))
+         (track-
+          (cond ((string-match "^\\([^ ]+\\) +(\\(.+\\))$" track)
+                 (cons (match-string 2 track)
+                       (concat "refs/heads/" (match-string 1 track))))
+                ((string-match "^\\(?:refs/remotes/\\)?\\([^/]+\\)/\\(.+\\)"
+                               track)
+                 (cons (match-string 1 track)
+                       (concat "refs/heads/" (match-string 2 track))))
+                (t
+                 (user-error "Cannot parse the remote and branch name")))))
+    (magit-set (car track-) "branch" branch "remote")
+    (magit-set (cdr track-) "branch" branch "merge")
+    (magit-refresh)))
+
+;;; Miscellaneous
+;;;; Miscellaneous Commands
+
+;;;###autoload
+(defun magit-init (directory)
+  "Create or reinitialize a Git repository.
+Read directory name and initialize it as new Git repository.
+
+If the directory is below an existing repository, then the user
+has to confirm that a new one should be created inside; or when
+the directory is the root of the existing repository, whether
+it should be reinitialized.
+
+Non-interactively DIRECTORY is always (re-)initialized."
+  (interactive
+   (let* ((dir (file-name-as-directory
+                (expand-file-name
+                 (read-directory-name "Create repository in: "))))
+          (top (magit-get-top-dir dir)))
+     (if (and top
+              (not (yes-or-no-p
+                    (if (string-equal top dir)
+                        (format "Reinitialize existing repository %s? " dir)
+                      (format "%s is a repository.  Create another in %s? "
+                              top dir)))))
+         (user-error "Abort")
+       (list dir))))
+  (magit-run-git "init" (expand-file-name directory)))
+
+(defun magit-copy-item-as-kill ()
+  "Copy sha1 of commit at point into kill ring."
+  (interactive)
+  (magit-section-action copy (info)
+    ((branch commit file diff)
+     (kill-new info)
+     (message "%s" info))))
+
+(defun magit-ignore-item (edit &optional local)
+  "Ignore the item at point.
+With a prefix argument edit the ignore string."
+  (interactive "P")
+  (magit-section-action ignore (info)
+    ([file untracked]
+     (magit-ignore-file (concat "/" info) edit local)
+     (magit-refresh))
+    (diff
+     (when (yes-or-no-p (format "%s is tracked.  Untrack and ignore? " info))
+       (magit-ignore-file (concat "/" info) edit local)
+       (magit-run-git "rm" "--cached" info)))))
+
+(defun magit-ignore-item-locally (edit)
+  "Ignore the item at point locally only.
+With a prefix argument edit the ignore string."
+  (interactive "P")
+  (magit-ignore-item edit t))
+
+(defun magit-ignore-file (file &optional edit local)
+  "Add FILE to the list of files to ignore.
+If EDIT is non-nil, prompt the user for the string to be ignored
+instead of using FILE.  The changes are written to .gitignore
+except if LOCAL is non-nil in which case they are written to
+.git/info/exclude."
+  (let* ((local-ignore-dir (magit-git-dir "info/"))
+         (ignore-file (if local
+                          (concat local-ignore-dir "exclude")
+                        ".gitignore")))
+    (when edit
+      (setq file (magit-ignore-edit-string file)))
+    (when (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))))
+
+(defun magit-ignore-edit-string (file)
+  "Prompt the user for the string to be ignored.
+A list of predefined values with wildcards is derived from the
+filename FILE."
+  (let* ((extension (concat "*." (file-name-extension file)))
+         (extension-in-dir (concat (file-name-directory file) extension))
+         (filename (file-name-nondirectory file))
+         (completions (list extension extension-in-dir filename file)))
+    (magit-completing-read "File/pattern to ignore"
+                           completions nil nil nil nil file)))
+
+;;;; Commit Mark
+
+(defvar magit-marked-commit nil)
+
+(defvar-local magit-mark-overlay nil)
+(put 'magit-mark-overlay 'permanent-local t)
+
+(defun magit-mark-item (&optional unmark)
+  "Mark the commit at point.
+Some commands act on the marked commit by default or use it as
+default when prompting for a commit."
+  (interactive "P")
+  (if unmark
+      (setq magit-marked-commit nil)
+    (magit-section-action mark (info)
+      (commit (setq magit-marked-commit
+                    (if (equal magit-marked-commit info) nil info)))))
+  (magit-refresh-marked-commits)
+  (run-hooks 'magit-mark-commit-hook))
+
+(defun magit-refresh-marked-commits ()
+  (magit-map-magit-buffers #'magit-refresh-marked-commits-in-buffer))
+
+(defun magit-refresh-marked-commits-in-buffer ()
+  (unless magit-mark-overlay
+    (setq magit-mark-overlay (make-overlay 1 1))
+    (overlay-put magit-mark-overlay 'face 'magit-item-mark))
+  (delete-overlay magit-mark-overlay)
+  (magit-map-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))))
+   magit-root-section))
+
+;;;; ChangeLog
+
+;;;###autoload
+(defun magit-add-change-log-entry (&optional whoami file-name other-window)
+  "Find change log file and add date entry and item for current change.
+This differs from `add-change-log-entry' (which see) in that
+it acts on the current hunk in a Magit buffer instead of on
+a position in a file-visiting buffer."
+  (interactive (list current-prefix-arg
+		     (prompt-for-change-log-name)))
+  (let (buf pos)
+    (save-window-excursion
+      (magit-visit-item)
+      (setq buf (current-buffer)
+            pos (point)))
+    (save-excursion
+      (with-current-buffer buf
+        (goto-char pos)
+        (add-change-log-entry whoami file-name other-window)))))
+
+;;;###autoload
+(defun magit-add-change-log-entry-other-window (&optional whoami file-name)
+  "Find change log file in other window and add entry and item.
+This differs from `add-change-log-entry-other-window' (which see)
+in that it acts on the current hunk in a Magit buffer instead of
+on a position in a file-visiting buffer."
+  (interactive (and current-prefix-arg
+                    (list current-prefix-arg
+                          (prompt-for-change-log-name))))
+  (magit-add-change-log-entry whoami file-name t))
+
+;;;; Read Repository
+
+(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-nil, 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)
+               (user-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)))))
+
+(defun magit-list-repos (dirs)
+  (magit-list-repos-remove-conflicts
+   (cl-loop for dir in dirs
+            append (cl-loop for repo in
+                            (magit-list-repos* dir magit-repo-dirs-depth)
+                    collect (cons (file-name-nondirectory repo) repo)))))
+
+(defun magit-list-repos* (dir depth)
+  "Return a list of repos found in DIR, recursing up to DEPTH levels deep."
+  (if (file-readable-p (expand-file-name ".git" dir))
+      (list (expand-file-name dir))
+    (and (> depth 0)
+         (file-accessible-directory-p dir)
+         (not (member (file-name-nondirectory dir)
+                      '(".." ".")))
+         (cl-loop for entry in (directory-files dir t nil t)
+                  append (magit-list-repos* entry (1- depth))))))
+
+(defun magit-list-repos-remove-conflicts (alist)
+  (let ((dict (make-hash-table :test 'equal))
+        (alist (delete-dups alist))
+        (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-list-repos-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))
+
+;;;; External Tools
+
+;;;###autoload
+(defun magit-run-git-gui ()
+  "Run `git gui' for the current git repository."
+  (interactive)
+  (let* ((default-directory (magit-get-top-dir)))
+    (call-process magit-git-executable nil 0 nil "gui")))
+
+;;;###autoload
+(defun magit-run-git-gui-blame (commit filename &optional linenum)
+  "Run `git gui blame' on the given FILENAME and COMMIT.
+Interactively run it for the current file and the HEAD, with a
+prefix or when the current file cannot be determined let the user
+choose.  When the current buffer is visiting FILENAME instruct
+blame to center around the line point is on."
+  (interactive
+   (let (revision filename)
+     (when (or current-prefix-arg
+               (not (setq revision "HEAD"
+                          filename (magit-buffer-file-name t))))
+       (setq revision (magit-read-rev "Retrieve from revision" "HEAD")
+             filename (magit-read-file-from-rev revision)))
+     (list revision filename
+           (and (equal filename
+                       (ignore-errors
+                         (magit-file-relative-name (buffer-file-name))))
+                (line-number-at-pos)))))
+  (let ((default-directory (magit-get-top-dir)))
+    (apply #'call-process magit-git-executable nil 0 nil "gui" "blame"
+           `(,@(and linenum (list (format "--line=%d" linenum)))
+             ,commit
+             ,filename))))
+
+;;;###autoload
+(defun magit-run-gitk (arg)
+  "Run Gitk for the current git repository.
+Without a prefix argument run `gitk --all', with
+a prefix argument run gitk without any arguments."
+  (interactive "P")
+  (apply #'call-process magit-gitk-executable nil 0 nil
+         (if arg nil (list "--all"))))
+
+;;;; Maintenance Tools
+
+(defun magit-describe-item ()
+  "Show information about the section at point.
+This command is intended for debugging purposes."
+  (interactive)
+  (let* ((section (magit-current-section))
+         (head-beg (magit-section-beginning section))
+         (body-beg (magit-section-content-beginning section)))
+    (message "Section: %s %s%s-%s %S %S"
+             (magit-section-type section)
+             (marker-position (magit-section-beginning section))
+             (if (and body-beg (not (= body-beg head-beg))
+                      (< body-beg (magit-section-end section)))
+                 (format "-%s" (marker-position body-beg))
+               "")
+             (marker-position (magit-section-end section))
+             (magit-section-info section)
+             (magit-section-context-type section))))
+
+;;;; Magit Extensions
+
+(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)))))
+
+;;; magit.el ends soon
+
+(defconst magit-font-lock-keywords
+  (eval-when-compile
+    `((,(concat "(\\(" (regexp-opt
+                        '("magit-define-level-shower"
+                          "magit-define-section-jumper"))
+                "\\)\\>[ \t'\(]*\\(\\sw+\\)?")
+       (1 font-lock-keyword-face)
+       (2 font-lock-function-name-face nil t))
+      (,(concat "(" (regexp-opt
+                     '("magit-with-section"
+                       "magit-cmd-insert-section"
+                       "magit-git-insert-section"
+                       "magit-insert-line-section"
+                       "magit-section-action"
+                       "magit-section-case"
+                       "magit-add-action-clauses"
+                       "magit-bind-match-strings"
+                       "magit-visiting-file-item"
+                       "magit-tests--with-temp-dir"
+                       "magit-tests--with-temp-repo"
+                       "magit-tests--with-temp-clone") t)
+                "\\>")
+       . 1)))
+  "Magit expressions to highlight in Emacs-Lisp mode.
+To highlight Magit expressions add something like this to your
+init file:
+
+  (require 'magit)
+  (font-lock-add-keywords 'emacs-lisp-mode
+                          magit-font-lock-keywords)")
+
+(defun magit-version (&optional noerror)
+  "The version of Magit that you're using.\n\n\(fn)"
+  (interactive)
+  (let ((toplib (or load-file-name buffer-file-name)))
+    (unless (and toplib
+                 (equal (file-name-nondirectory toplib) "magit.el"))
+      (setq toplib (locate-library "magit.el")))
+    (when toplib
+      (let* ((dir (file-name-directory toplib))
+             (static (expand-file-name "magit-version.el" dir))
+             (gitdir (expand-file-name ".git" dir)))
+        (cond ((file-exists-p gitdir)
+               (setq magit-version
+                     (let ((default-directory dir))
+                       (magit-git-string "describe" "--tags" "--dirty")))
+               (ignore-errors (delete-file static)))
+              ((file-exists-p static)
+               (load-file static))
+              ((featurep 'package)
+               (setq magit-version
+                     (or (ignore-errors ; < 24.3.50
+                           (package-version-join
+                            (package-desc-vers
+                             (cdr (assq 'magit package-alist)))))
+                         (ignore-errors ; >= 24.3.50
+                           (package-version-join
+                            (package-desc-version
+                             (cadr (assq 'magit package-alist)))))))))))
+    (if (stringp magit-version)
+        (when (called-interactively-p 'any)
+          (message "magit-%s" magit-version))
+      (if noerror
+          (progn (setq magit-version 'error)
+                 (message "Cannot determine Magit's version"))
+        (user-error "Cannot determine Magit's version")))
+    magit-version))
+
+(cl-eval-when (load eval) (magit-version t))
+
+(define-obsolete-variable-alias 'magit-cherry-insert-sections-hook
+  'magit-cherry-sections-hook "2.0.0")
+(define-obsolete-variable-alias 'magit-status-insert-sections-hook
+  'magit-status-sections-hook "2.0.0")
+(define-obsolete-variable-alias 'magit-wazzup-insert-sections-hook
+  'magit-wazzup-sections-hook "2.0.0")
+
+(define-obsolete-variable-alias 'magit-quote-curly-braces
+  'magit-process-quote-curly-braces "2.0.0")
+
+(provide 'magit)
+
+;; rest of magit core
+(require 'magit-key-mode)
+
+;; If `magit-log-edit' is available and `git-commit-mode' is not
+;; loaded, then we have no choice but to assume the user actually
+;; wants to use the former.
+(unless (featurep 'git-commit-mode)
+  (require 'magit-log-edit nil t))
+
+;; Local Variables:
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+;;; magit.el ends here
diff --git a/elpa/magit-90150116/magit.elc b/elpa/magit-90150116/magit.elc
new file mode 100644
index 000000000..1fe3c1137
Binary files /dev/null and b/elpa/magit-90150116/magit.elc differ
diff --git a/elpa/magit-90150116/magit.info b/elpa/magit-90150116/magit.info
new file mode 100644
index 000000000..728b3d739
--- /dev/null
+++ b/elpa/magit-90150116/magit.info
@@ -0,0 +1,1550 @@
+This is magit.info, produced by makeinfo version 5.2 from magit.texi.
+
+Copyright © 2008-2013 Magit contributors.  (See the header of magit.el
+for the lengthy list of Magit contributors.)
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.2 or any later version published by the Free Software
+     Foundation; with no Invariant Sections, with no Front-Cover Texts,
+     and with no Back-Cover Texts.  A copy of the license is included in
+     the section entitled “GNU Free Documentation License”.
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Magit: (magit).        Using Git from Emacs with Magit.
+END-INFO-DIR-ENTRY
+
+
+File: magit.info,  Node: Top,  Next: Introduction,  Up: (dir)
+
+Magit User Manual
+*****************
+
+Magit is an interface to the version control system Git, implemented as
+an Emacs extension.
+
+   Unlike Emacs’s native Version Control package which strives to
+provide a unified interface to various version control systems, Magit
+only supports Git and can therefor better take advantage of its native
+features.
+
+   Magit supports GNU Emacs 23.2 or later; 24.1 or later is recommended.
+Magit supports Git 1.7.2.5 or later; 1.8.2 or later is recommended.  The
+minimal versions are those available in Debian oldstable.
+
+   When something breaks please see the curated list of known issues
+(https://github.com/magit/magit/wiki/Known-Issues) and the FAQ
+(https://github.com/magit/magit/wiki/FAQ).  If that doesn’t help check
+the list of all open issues issues
+(https://github.com/magit/magit/issues).
+
+   If everything else fails please open a new issue or ask for help on
+the mailing list
+(https://groups.google.com/forum/?fromgroups#!forum/magit).
+
+* Menu:
+
+* Introduction::
+* Acknowledgments::
+* Sections::
+* Status::
+* Untracked files::
+* Staging and Committing::
+* History::
+* Reflogs::
+* Commit Buffer::
+* Diffing::
+* Tagging::
+* Resetting::
+* Stashing::
+* Branches and Remotes::
+* Wazzup::
+* Merging::
+* Rebasing::
+* Interactive Rebasing::
+* Rewriting::
+* Pushing and Pulling::
+* Submodules::
+* Bisecting::
+* Finding commits not merged upstream::
+* Using Magit Extensions::
+* Using Git Directly::
+* GNU Free Documentation License::
+
+
+File: magit.info,  Node: Introduction,  Next: Acknowledgments,  Prev: Top,  Up: Top
+
+1 Introduction
+**************
+
+With Magit, you can inspect and modify your Git repositories with Emacs.
+You can review and commit the changes you have made to the tracked
+files, for example, and you can browse the history of past changes.
+There is support for cherry picking, reverting, merging, rebasing, and
+other common Git operations.
+
+   Magit is not a complete interface to Git; it just aims to make the
+most common Git operations convenient.  Thus, Magit will likely not save
+you from learning Git itself.
+
+   This manual provides a tour of many Magit features.  It isn’t an
+introduction to version control in general, or to Git in particular.
+
+   The main entry point to Magit is ‘M-x magit-status’, which puts you
+in Magit’s status buffer.  You will be using it frequently, so it is
+probably a good idea to globally bind ‘magit-status’ to a key of your
+choice.
+
+   In addition to the status buffer, Magit will also create buffers that
+show lists of commits, buffers with diffs, and other kinds of buffers.
+All these buffers are in a mode derived from ‘magit-mode’ and have the
+similar key bindings.  Not all commands make sense in all contexts, but
+a given key will do the same thing in different Magit buffers.
+
+   Naturally, Magit runs the ‘git’ command to do most of the work.  The
+‘*magit-process*’ buffer contains the transcript of the most recent
+command.  You can switch to it with ‘$’.
+
+
+File: magit.info,  Node: Acknowledgments,  Next: Sections,  Prev: Introduction,  Up: Top
+
+2 Acknowledgments
+*****************
+
+Our thank goes to all current and past contributors, Marius Vollmer who
+started the project, and all retired and current maintainers, Phil
+Jackson, Peter J. Weisberg, Rémi Vanicat, Nicolas Dudebout, Yann
+Hodique, and Jonas Bernoulli.
+
+   For a full list of contributors, see the AUTHORS.md file at the
+top-level directory of this distribution or at
+<https://github.com/magit/magit/tree/master/AUTHORS.md>.
+
+
+File: magit.info,  Node: Sections,  Next: Status,  Prev: Acknowledgments,  Up: Top
+
+3 Sections
+**********
+
+All Magit buffers are structured into nested ’sections’.  These sections
+can be hidden and shown individually.  When a section is hidden, only
+its first line is shown and all its children are completely invisible.
+
+   The most fine-grained way to control the visibility of sections is
+the ‘TAB’ key.  It will to toggle the current section (the section that
+contains point) between being hidden and being shown.
+
+   Typing ‘S-TAB’ toggles the visibility of the children of the current
+section.  When all of them are shown, they will all be hidden.
+Otherwise, when some or all are hidden, they will all be shown.
+
+   The digit keys ‘1’, ‘2’, ‘3’, and ‘4’ control the visibility of
+sections based on levels.  Hitting ‘2’, for example, will show sections
+on levels one and two, and will hide sections on level 3.  However, only
+sections that are a parent or child of the current section are affected.
+
+   For example, when the current section is on level 3 and you hit ‘1’,
+the grand-parent of the current section (which is on level one) will be
+shown, and the parent of the current section (level 2) will be hidden.
+The visibility of no other section will be changed.
+
+   This sounds a bit complicated, but you’ll figure it out.
+
+   Using ‘M-1’, ‘M-2’, ‘M-3’, and ‘M-4’ is similar to the unmodified
+digits, but now all sections on the respective level are affected,
+regardless of whether or not they are related to the current section.
+
+   For example, ‘M-1’ will only show the first lines of the top-level
+sections and will hide everything else.  Typing ‘M-4’ on the other hand
+will show everything.
+
+   Because of the way the status buffer is set up, some changes to
+section visibility are more common than others.  Files are on level 2
+and diff hunks are on level 4.  Thus, you can type ‘2’ to collapse the
+diff of the current file, and ‘M-2’ to collapse all files.  This returns
+the status buffer to its default setup and is a quick way to unclutter
+it after drilling down into the modified files.
+
+   Because ‘2’ and ‘M-2’ are so common in the status buffer, they are
+bound to additional, more mnemonic keys: ‘M-h’ (hide) and ‘M-H’ (hide
+all).  Likewise ‘4’ and ‘M-4’ are also available as ‘M-s’ (show) and
+‘M-S’ (show all).
+
+   In other buffers than the status buffer, ‘M-h’, ‘M-H’, ‘M-s’, and
+‘M-S’ might work on different levels than on 2 and 4, but they keep
+their general meaning: ‘M-H’ hides all detail, and ‘M-S’ shows
+everything.
+
+
+File: magit.info,  Node: Status,  Next: Untracked files,  Prev: Sections,  Up: Top
+
+4 Status
+********
+
+Running ‘M-x magit-status’ displays the main interface of Magit, the
+status buffer.  You can have multiple status buffers active at the same
+time, each associated with its own Git repository.
+
+   When invoking ‘M-x magit-status’ from within a Git repository, it
+will switch to the status buffer of that repository.  Otherwise, it will
+prompt for a directory.  With a prefix argument, it will always prompt.
+
+   You can set ‘magit-repo-dirs’ to customize how ‘magit-status’ asks
+for the repository to work on.  When ‘magit-repo-dirs’ is nil,
+‘magit-status’ will simply ask for a directory.
+
+   If you specify a directory that is not a Git repository, ‘M-x
+magit-status’ will offer to initialize it as one.
+
+   When ‘magit-repo-dirs’ is not nil, it is treated as a list of
+directory names, and ‘magit-status’ will find all Git repositories in
+those directories and offer them for completion.  (Magit will only look
+‘magit-repo-dirs-depth’ levels deep, however.)
+
+   With two prefix arguments, ‘magit-status’ will always prompt for a
+raw directory.
+
+   Thus, you would normally set ‘magit-repo-dirs’ to the places where
+you keep most of your Git repositories and switch between them with ‘C-u
+M-x magit-status’.  If you want to go to a repository outside of your
+normal working areas, or if you want to create a new repository, you
+would use ‘C-u C-u M-x magit-status’.
+
+   You need to explicitly refresh the status buffer when you have made
+changes to the repository from outside of Emacs.  You can type ‘g’ in
+the status buffer itself, or just use ‘M-x magit-status’ instead of ‘C-x
+b’ when switching to it.  You also need to refresh the status buffer in
+this way after saving a file in Emacs.
+
+   The header at the top of the status buffer shows a short summary of
+the repository state: where it is located, which branch is checked out,
+etc.  Below the header are a number of sections that show details about
+the working tree and the staging area.  You can hide and show them as
+described in the previous section.
+
+   The first section shows _Untracked files_, if there are any.  See
+*note Untracked files:: for more details.
+
+   The next two sections show your local changes.  They are explained
+fully in the next chapter, *note Staging and Committing::.
+
+   If the current branch is associated with a remote tracking branch,
+the status buffer shows the differences between the current branch and
+the tracking branch.  See *note Pushing and Pulling:: for more
+information.
+
+   During a history rewriting session, the status buffer shows the
+_Pending changes_ and _Pending commits_ sections.  See *note Rewriting::
+for more details.
+
+
+File: magit.info,  Node: Untracked files,  Next: Staging and Committing,  Prev: Status,  Up: Top
+
+5 Untracked files
+*****************
+
+Untracked files are shown in the _Untracked files_ section.
+
+   You can add an untracked file to the staging area with ‘s’.  If point
+is on the _Untracked files_ section title when you hit ‘s’, all
+untracked files are staged.
+
+   Typing ‘C-u S’ anywhere will also stage all untracked files, together
+with all changes to the tracked files.
+
+   You can instruct Git to ignore them by typing ‘i’.  This will add the
+filename to the ‘.gitignore’ file.  Typing ‘C-u i’ will ask you for the
+name of the file to ignore.  This is useful to ignore whole directories,
+for example.  In this case, the minibuffer’s future history (accessible
+with ‘M-n’) contains predefined values (such as wildcards) that might be
+of interest.  If prefix argument is negative (for example after typing
+‘C-- i’), the prompt proposes wildcard by default.  The ‘I’ command is
+similar to ‘i’ but will add the file to ‘.git/info/exclude’ instead.
+
+   To delete an untracked file forever, use ‘k’.  If point is on the
+_Untracked files_ section title when you hit ‘k’, all untracked files
+are deleted.
+
+
+File: magit.info,  Node: Staging and Committing,  Next: History,  Prev: Untracked files,  Up: Top
+
+6 Staging and Committing
+************************
+
+Committing with Git is a two step process: first you add the changes you
+want to commit to a ’staging area’ or ’index’, and then you commit them
+to the repository.  This allows you to only commit a subset of the
+changes in the working tree.  If you are not familiar with this concept
+yet, then you should change that as soon as possible using one of the
+fine Git tutorials.  If you don’t, then Git and by extension Magit will
+seem rather strange.
+
+   Magit shows uncommitted changes in two sections, depending on whether
+the changes have been staged yet.  The _Staged changes_ section shows
+the changes that will be included in the next commit, while the
+_Unstaged changes_ section shows the changes that will be left out.
+
+   To move an unstaged hunk into the staging area, move point into the
+hunk and type ‘s’.  Likewise, to unstage a hunk, move point into it and
+type ‘u’.  If point is in a diff header when you type ‘s’ or ‘u’, all
+hunks belonging to that diff are moved at the same time.
+
+   Currently it is only possible to stage from the status buffer.
+Staging and unstaging from diff buffers that show unstaged and staged
+changes is not possible yet.
+
+   If the region is active when you type ‘s’ or ‘u’, only the changes in
+the region are staged or unstaged.  (This works line by line: if the
+beginning of a line is in the region it is included in the changes,
+otherwise it is not.)
+
+   To change the size of the hunks, you can type ‘+’ or ‘-’ to increase
+and decrease, respectively.  Typing ‘0’ will reset the hunk size to the
+default.
+
+   Typing ‘C-u s’ will ask you for a name of a file to be staged, for
+example to stage files that are hidden.
+
+   To move all hunks of all diffs into the staging area in one go, type
+‘S’.  To unstage everything, type ‘U’.
+
+   Typing ‘C-u S’ will stage all untracked files in addition to the
+changes to tracked files.
+
+   You can discard uncommitted changes by moving point into a hunk and
+typing ‘k’.  The changes to discard are selected as with ‘s’ and ‘u’.
+
+   Before committing, you should write a short description of the
+changes.
+
+   Type ‘c c’ to pop up a buffer where you can write your change
+description.  Once you are happy with the description, type ‘C-c C-c’ in
+that buffer to perform the commit.
+
+   If you want to write changes in a ‘ChangeLog’ file, you can use ‘C-x
+4 a’ on a diff hunk.
+
+   Typing ‘c c’ when the staging area is unused is a special situation.
+Normally, the next commit would be empty, but you can configure Magit to
+do something more useful by customizing the
+‘magit-commit-all-when-nothing-staged’ variable.  One choice is to
+instruct the subsequent ‘C-c C-c’ to commit all changes.  Another choice
+is stage everything at the time of hitting ‘c c’.
+
+   Typing ‘M-n’ or ‘M-p’ will cycle through the ‘log-edit-comment-ring’,
+which will have your previous log messages.  This is particularly useful
+if you have a hook that occasionally causes git to refuse your commit.
+
+   To abort a commit use ‘C-c C-k’.  The commit message is saved and can
+later be retrieved in the commit message buffer using ‘M-n’ and ‘M-p’.
+
+   Typing ‘C’ will also pop up the change description buffer, but in
+addition, it will try to insert a ChangeLog-style entry for the change
+that point is in.
+
+
+File: magit.info,  Node: History,  Next: Reflogs,  Prev: Staging and Committing,  Up: Top
+
+7 History
+*********
+
+To show the repository history of your current head, type ‘l l’.  A new
+buffer will be shown that displays the history in a terse form.  The
+first paragraph of each commit message is displayed, next to a
+representation of the relationships between commits.
+
+   To show the repository history between two branches or between any
+two points of the history, type ‘l r l’.  You will be prompted to enter
+references for starting point and ending point of the history range; you
+can use auto-completion to specify them.  A typical use case for ranged
+history log display would be ‘l r l master RET new-feature RET’ that
+will display commits on the new-feature branch that are not in master;
+these commits can then be inspected and cherry-picked, for example.
+
+   More thorough filtering can be done by supplying ‘l’ with one or more
+suffix arguments, as displayed in its popup.  ‘=g’ (’Grep’) for example,
+limits the output to commits of which the log message matches a specific
+string/regex.
+
+   Typing ‘l L’ (or ‘l C-u L’) will show the log in a more verbose form.
+
+   Magit will show only ‘magit-log-cutoff-length’ entries.  ‘e’ will
+show twice as many entries.  ‘C-u e’ will show all entries, and given a
+numeric prefix argument, ‘e’ will add this number of entries.
+
+   You can move point to a commit and then cause various things to
+happen with it.  (The following commands work in any list of commits,
+such as the one shown in the _Unpushed commits_ section.)
+
+   Typing ‘RET’ will pop up more information about the current commit
+and move point into the new buffer.  *Note Commit Buffer::.  Typing
+‘SPC’ and ‘DEL’ will also show the information, but will scroll the new
+buffer up or down (respectively) when typed again.
+
+   Typing ‘a’ will apply the current commit to your current branch.
+This is useful when you are browsing the history of some other branch
+and you want to ‘cherry-pick’ some changes from it.  A typical situation
+is applying selected bug fixes from the development version of a program
+to a release branch.  The cherry-picked changes will not be committed
+automatically; you need to do that explicitly.
+
+   Typing ‘A’ will cherry-pick the current commit and will also commit
+the changes automatically when there have not been any conflicts.
+
+   Typing ‘v’ will revert the current commit.  Thus, it will apply the
+changes made by that commit in reverse.  This is obviously useful to
+cleanly undo changes that turned out to be wrong.  As with ‘a’, you need
+to commit the changes explicitly.
+
+   Typing ‘C-w’ will copy the sha1 of the current commit into the kill
+ring.
+
+   Typing ‘=’ will show the differences from the current commit to the
+"marked" commit.
+
+   You can mark the current commit by typing ‘.’.  When the current
+commit is already marked, typing ‘.’ will unmark it.  To unmark the
+marked commit no matter where point is, use ‘C-u .’.
+
+   Some commands, such as ‘=’, will use the current commit and the
+marked commit as implicit arguments.  Other commands will offer the
+marked commit as a default when prompting for their arguments.
+
+
+File: magit.info,  Node: Reflogs,  Next: Commit Buffer,  Prev: History,  Up: Top
+
+8 Reflogs
+*********
+
+You can use ‘l h’ and ‘l H’ to browse your _reflog_, the local history
+of changes made to your repository heads.  Typing ‘H’ will ask for a
+head, while ‘l h’ will show the reflog of ‘HEAD’.
+
+   The resulting buffer is just like the buffer produced by ‘l l’ and ‘l
+L’ that shows the commit history.
+
+
+File: magit.info,  Node: Commit Buffer,  Next: Diffing,  Prev: Reflogs,  Up: Top
+
+9 Commit Buffer
+***************
+
+When you view a commit (perhaps by selecting it in the log buffer, *note
+History::), the “commit buffer” is displayed, showing you information
+about the commit and letting you interact with it.
+
+   By placing your cursor within the diff or hunk and typing ‘a’, you
+can apply the same patch to your working copy.  This is useful when you
+want to copy a change from another branch, but don’t necessarily want to
+cherry-pick the whole commit.
+
+   By typing ‘v’ you can apply the patch in reverse, removing all the
+lines that were added and adding all the lines that were removed.  This
+is a convenient way to remove a change after determining that it
+introduced a bug.
+
+   If the commit message refers to any other commits in the repository
+by their unique hash, the hash will be highlighted and you will be able
+to visit the referenced commit either by clicking on it or by moving
+your cursor onto it and pressing ‘RET’.
+
+   The commit buffer maintains a history of the commits it has shown.
+After visiting a referenced commit you can type ‘C-c C-b’ to get back to
+where you came from.  To go forward in the history, type ‘C-c C-f’.
+There are also ‘[back]’ and ‘[forward]’ buttons at the bottom of the
+buffer.
+
+
+File: magit.info,  Node: Diffing,  Next: Tagging,  Prev: Commit Buffer,  Up: Top
+
+10 Diffing
+**********
+
+Magit typically shows diffs in the “unified” format.
+
+   In any buffer that shows a diff, you can type ‘e’ anywhere within the
+diff to show the two versions of the file in Ediff.  If the diff is of a
+file in the status buffer that needs to be merged, you will be able to
+use Ediff as an interactive merge tool.  Otherwise, Ediff will simply
+show the two versions of the file.
+
+   To show the changes from your working tree to another revision, type
+‘d’.  To show the changes between two arbitrary revisions, type ‘D’.
+
+   You can use ‘a’ within the diff output to apply the changes to your
+working tree.  As usual when point is in a diff header for a file, all
+changes for that file are applied, and when it is in a hunk, only that
+hunk is.  When the region is active, the applied changes are restricted
+to that region.
+
+   Typing ‘v’ will apply the selected changes in reverse.
+
+
+File: magit.info,  Node: Tagging,  Next: Resetting,  Prev: Diffing,  Up: Top
+
+11 Tagging
+**********
+
+Typing ‘t t’ will make a lightweight tag.  Typing ‘t - a t’ will make an
+annotated tag.  It will put you in the normal ‘*magit-log-edit’ buffer
+for writing commit messages, but typing ‘C-c C-c’ in it will make the
+tag instead.  This is controlled by the ‘Tag’ field that will be added
+to the ‘*magit-log-edit*’ buffer.  You can edit it, if you like.
+
+
+File: magit.info,  Node: Resetting,  Next: Stashing,  Prev: Tagging,  Up: Top
+
+12 Resetting
+************
+
+Once you have added a commit to your local repository, you can not
+change that commit anymore in any way.  But you can reset your current
+head to an earlier commit and start over.
+
+   If you have published your history already, rewriting it in this way
+can be confusing and should be avoided.  However, rewriting your local
+history is fine and it is often cleaner to fix mistakes this way than by
+reverting commits (with ‘v’, for example).
+
+   Typing ‘x’ will ask for a revision and reset your current head to it.
+No changes will be made to your working tree and staging area.  Thus,
+the _Staged changes_ section in the status buffer will show the changes
+that you have removed from your commit history.  You can commit the
+changes again as if you had just made them, thus rewriting history.
+
+   Typing ‘x’ while point is in a line that describes a commit will
+offer this commit as the default revision to reset to.  Thus, you can
+move point to one of the commits in the _Unpushed commits_ section and
+hit ‘x RET’ to reset your current head to it.
+
+   Type ‘X’ to reset your working tree and staging area to the most
+recently committed state.  This will discard your local modifications,
+so be careful.
+
+   You can give a prefix to ‘x’ if you want to reset both the current
+head and your working tree to a given commit.  This is the same as first
+using an unprefixed ‘x’ to reset only the head, and then using ‘X’.
+
+
+File: magit.info,  Node: Stashing,  Next: Branches and Remotes,  Prev: Resetting,  Up: Top
+
+13 Stashing
+***********
+
+You can create a new stash with ‘z z’.  Your stashes will be listed in
+the status buffer, and you can apply them with ‘a’ and pop them with
+‘A’.  To drop a stash, use ‘k’.
+
+   With a prefix argument, both ‘a’ and ‘A’ will attempt to reinstate
+the index as well as the working tree from the stash.
+
+   Typing ‘z -k z’ will create a stash just like ‘z z’, but will leave
+the changes in your working tree and index.  This makes it easier to,
+for example, test multiple variations of the same change.
+
+   If you just want to make quick snapshots in between edits, you can
+use ‘z s’, which automatically enters a timestamp as description, and
+keeps your working tree and index intact by default.
+
+   You can visit and show stashes in the usual way: Typing ‘SPC’ and
+‘DEL’ will pop up a buffer with the description of the stash and scroll
+it, typing ‘RET’ will move point into that buffer.  Using ‘C-u RET’ will
+move point into that buffer in other window.
+
+
+File: magit.info,  Node: Branches and Remotes,  Next: Wazzup,  Prev: Stashing,  Up: Top
+
+14 Branches and Remotes
+***********************
+
+The current branch is indicated in the header of the status buffer.  If
+this branch is tracking a remote branch, the latter is also indicated.
+
+   Branches and remotes can be manipulated directly with a popup menu or
+through the branch manager.  Using the popup menu allows you to quickly
+make changes from any magit buffer.  The branch manager is a separate
+buffer called ‘*magit-branches*’.  It displays information about
+branches and remotes and offers a local key map for shorter key
+bindings.  The two interaction methods are described in more details
+below.
+
+* Menu:
+
+* Branches Popup::
+* Remotes Popup::
+* Branches in the Branch Manager::
+* Remotes in the Branch Manager::
+
+
+File: magit.info,  Node: Branches Popup,  Next: Remotes Popup,  Up: Branches and Remotes
+
+14.1 Branches Popup
+===================
+
+Typing ‘b’ will display a popup menu to manipulate branches.
+
+   You can switch to a different branch by typing ‘b b’.  This will
+immediately checkout the branch into your working copy, so you shouldn’t
+have any local modifications when switching branches.
+
+   If you try to switch to a remote branch, Magit will offer to create a
+local tracking branch for it instead.  This way, you can easily start
+working on new branches that have appeared in a remote repository.
+
+   Typing ‘b b’ while point is at a commit description will offer that
+commit as the default to switch to.  This will result in a detached
+head.
+
+   To create a new branch and switch to it immediately, type ‘b c’.
+
+   To delete a branch, type ‘b k’.  If you’re currently on that branch,
+Magit will offer to switch to the ’master’ branch.
+
+   Typing ‘b r’ will let you rename a branch.  Unless a branch with the
+same name already exists, obviously...
+
+   Deleting a branch is only possible if it’s already fully merged into
+HEAD or its upstream branch.  Unless you type ‘b C-u k’, that is.  Here
+be dragons...
+
+   Typing ‘b v’ will launch the branch manager.
+
+
+File: magit.info,  Node: Remotes Popup,  Next: Branches in the Branch Manager,  Prev: Branches Popup,  Up: Branches and Remotes
+
+14.2 Remotes Popup
+==================
+
+Typing ‘M’ will display a popup menu to manipulate remotes.
+
+   To add a new remote, type ‘M a’.
+
+   To delete a remote type ‘M k’.
+
+   Typing ‘M r’ will let you rename a remote.
+
+
+File: magit.info,  Node: Branches in the Branch Manager,  Next: Remotes in the Branch Manager,  Prev: Remotes Popup,  Up: Branches and Remotes
+
+14.3 Branches in the Branch Manager
+===================================
+
+In the branch manager, each branch is displayed on a separate line.  The
+current local branch is marked by a “*” in front of the name.  Remote
+branches are grouped by the remote they come from.
+
+   If a local branch tracks a remote branch some extra information is
+printed on the branch line.  The format is the following: “<branch>
+[<remote-branch>  <remote>: ahead <a>, behind <b>]”.  “<remote-branch>”
+is omitted if it is identical to “<branch>”.  “ahead” and “behind”
+information are only displayed if necessary.
+
+   To check out a branch, move your cursor to the desired branch and
+press ‘RET’.
+
+   Typing ‘c’ will create a new branch.
+
+   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.
+
+   Typing ‘r’ on a branch will rename it.
+
+   Typing ‘T’ on a local branch, changes which remote branch it tracks.
+
+
+File: magit.info,  Node: Remotes in the Branch Manager,  Prev: Branches in the Branch Manager,  Up: Branches and Remotes
+
+14.4 Remotes in the Branch Manager
+==================================
+
+In the branch manager, each remote is displayed on a separate line.  The
+format is the following “<remote> (<url>, <push-url>)”.  “<push-url>” is
+omitted if it is not set.  The associated branches are listed under this
+line.
+
+   Typing ‘a’ will add a new remote.
+
+   Typing ‘k’ will delete the remote in the current line.
+
+   Typing ‘r’ on a remote will rename it.
+
+
+File: magit.info,  Node: Wazzup,  Next: Merging,  Prev: Branches and Remotes,  Up: Top
+
+15 Wazzup
+*********
+
+Typing ‘w’ will show a summary of how your other branches relate to the
+current branch.
+
+   For each branch, you will get a section that lists the commits in
+that branch that are not in the current branch.  The sections are
+initially collapsed; you need to explicitly open them with ‘TAB’ (or
+similar) to show the lists of commits.
+
+   When point is on a _N unmerged commits in ..._  title, the
+corresponding branch will be offered as the default for a merge.
+
+   Hitting ‘i’ on a branch title will ignore this branch in the wazzup
+view.  You can use ‘C-u w’ to show all branches, including the ignored
+ones.  Hitting ‘i’ on an already ignored branch in that view will
+unignore it.
+
+
+File: magit.info,  Node: Merging,  Next: Rebasing,  Prev: Wazzup,  Up: Top
+
+16 Merging
+**********
+
+Magit offers two ways to merge branches: manual and automatic.  A manual
+merge will apply all changes to your working tree and staging area, but
+will not commit them, while an automatic merge will go ahead and commit
+them immediately.
+
+   Type ‘m m’ to initiate merge.
+
+   After initiating a merge, the header of the status buffer might
+remind you that the next commit will be a merge commit (with more than
+one parent).  If you want to abort a manual merge, just do a hard reset
+to HEAD with ‘X’.
+
+   Merges can fail if the two branches you want to merge introduce
+conflicting changes.  In that case, the automatic merge stops before the
+commit, essentially falling back to a manual merge.  You need to resolve
+the conflicts for example with ‘e’ and stage the resolved files, for
+example with ‘S’.
+
+   You can not stage individual hunks one by one as you resolve them,
+you can only stage whole files once all conflicts in them have been
+resolved.
+
+
+File: magit.info,  Node: Rebasing,  Next: Interactive Rebasing,  Prev: Merging,  Up: Top
+
+17 Rebasing
+***********
+
+Typing ‘R’ in the status buffer will initiate a rebase or, if one is
+already in progress, ask you how to continue.
+
+   When a rebase is stopped in the middle because of a conflict, the
+header of the status buffer will indicate how far along you are in the
+series of commits that are being replayed.  When that happens, you
+should resolve the conflicts and stage everything and hit ‘R c’ to
+continue the rebase.  Alternatively, hitting ‘c’ or ‘C’ while in the
+middle of a rebase will also ask you whether to continue the rebase.
+
+   Of course, you can initiate a rebase in any number of ways, by
+configuring ‘git pull’ to rebase instead of merge, for example.  Such a
+rebase can be finished with ‘R’ as well.
+
+
+File: magit.info,  Node: Interactive Rebasing,  Next: Rewriting,  Prev: Rebasing,  Up: Top
+
+18 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
+
+19 Rewriting
+************
+
+As hinted at earlier, you can rewrite your commit history.  For example,
+you can reset the current head to an earlier commit with ‘x’.  This
+leaves the working tree unchanged, and the status buffer will show all
+the changes that have been made since that new value of the current
+head.  You can commit these changes again, possibly splitting them into
+multiple commits as you go along.
+
+   Amending your last commit is a common special case of rewriting
+history like this.
+
+   Another common way to rewrite history is to reset the head to an
+earlier commit, and then to cherry pick the previous commits in a
+different order.  You could pick them from the reflog, for example.
+
+   Magit has several commands that can simplify the book keeping
+associated with rewriting.  These commands all start with the ‘r’ prefix
+key.
+
+   (Unless you already do so, we recommend that you don’t use the
+functionality described here.  It is semi-deprecated and will be removed
+once its unique features have been ported to the ‘git rebase
+--interactive’ workflow.  Even now the latter is almost always the
+better option.)
+
+   Typing ‘r b’ will start a rewrite operation.  You will be prompted
+for a _base_ commit.  This commit and all subsequent commits up until
+the current head are then put in a list of _Pending commits_, after
+which the current head will be reset to the _parent_ of the base commit.
+This can be configured to behave like ‘git rebase’, i.e.  exclude the
+selected base commit from the rewrite operation, with the
+‘magit-rewrite-inclusive’ variable.
+
+   You would then typically use ‘a’ and ‘A’ to cherry pick commits from
+the list of pending commits in the desired order, until all have been
+applied.  Magit shows which commits have been applied by changing their
+marker from ‘*’ to ‘.’.
+
+   Using ‘A’ will immediately commit the commit (as usual).  If you want
+to combine multiple previous commits into a single new one, use ‘a’ to
+apply them all to your working tree, and then commit them together.
+
+   Magit has no explicit support for rewriting merge commits.  It will
+happily include merge commits in the list of pending commits, but there
+is no way of replaying them automatically.  You have to redo the merge
+explicitly.
+
+   You can also use ‘v’ to revert a commit when you have changed your
+mind.  This will change the ‘.’ mark back to ‘*’.
+
+   Once you are done with the rewrite, type ‘r s’ to remove the book
+keeping information from the status buffer.
+
+   If you rather wish to start over, type ‘r a’.  This will abort the
+rewriting, resetting the current head back to the value it had before
+the rewrite was started with ‘r b’.
+
+   Typing ‘r f’ will _finish_ the rewrite: it will apply all unused
+commits one after the other, as if you would use ‘A’ with all of them.
+
+   You can change the ‘*’ and ‘.’ marks of a pending commit explicitly
+with ‘r *’ and ‘r .’.
+
+   In addition to a list of pending commits, the status buffer will show
+the _Pending changes_.  This section shows the diff between the original
+head and the current head.  You can use it to review the changes that
+you still need to rewrite, and you can apply hunks from it, like from
+any other diff.
+
+
+File: magit.info,  Node: Pushing and Pulling,  Next: Submodules,  Prev: Rewriting,  Up: Top
+
+20 Pushing and Pulling
+**********************
+
+Magit will run ‘git push’ when you type ‘P P’.  If you give a prefix
+argument to ‘P P’, you will be prompted for the repository to push to.
+When no default remote repository has been configured yet for the
+current branch, you will be prompted as well.  Typing ‘P P’ will only
+push the current branch to the remote.  In other words, it will run ‘git
+push <remote> <branch>’.  The branch will be created in the remote if it
+doesn’t exist already.  The local branch will be configured so that it
+pulls from the new remote branch.  If you give a double prefix argument
+to ‘P P’, you will be prompted in addition for the target branch to push
+to.  In other words, it will run ‘git push <remote> <branch>:<target>’.
+
+   Typing ‘f f’ will run ‘git fetch’.  It will prompt for the name of
+the remote to update if there is no default one.  Typing ‘f o’ will
+always prompt for the remote.  Typing ‘F F’ will run ‘git pull’.  When
+you don’t have a default branch configured to be pulled into the current
+one, you will be asked for it.
+
+   If there is a default remote repository for the current branch, Magit
+will show that repository in the status buffer header.
+
+   In this case, the status buffer will also have a _Unpushed commits_
+section that shows the commits on your current head that are not in the
+branch named ‘<remote>/<branch>’.  This section works just like the
+history buffer: you can see details about a commit with ‘RET’, compare
+two of them with ‘.’ and ‘=’, and you can reset your current head to one
+of them with ‘x’, for example.  If you want to push the changes then
+type ‘P P’.
+
+   When the remote branch has changes that are not in the current
+branch, Magit shows them in a section called _Unpulled changes_.  Typing
+‘F F’ will fetch and merge them into the current branch.
+
+
+File: magit.info,  Node: Submodules,  Next: Bisecting,  Prev: Pushing and Pulling,  Up: Top
+
+21 Submodules
+*************
+
+‘o u’
+     Update the submodules, with a prefix argument it will also
+     initialize them.
+
+‘o i’
+     Initialize the submodules.
+
+‘o b’
+     Update and initialize the submodules in one go (same as C-u o u).
+
+‘o s’
+     Synchronizes submodules’ remote URL configuration setting to the
+     value specified in .gitmodules.
+
+
+File: magit.info,  Node: Bisecting,  Next: Finding commits not merged upstream,  Prev: Submodules,  Up: Top
+
+22 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: Finding commits not merged upstream,  Next: Using Magit Extensions,  Prev: Bisecting,  Up: Top
+
+23 Finding commits not merged upstream
+**************************************
+
+One of the comforts of git is that it can tell you which commits have
+been merged upstream but not locally and vice versa.  Git’s sub-command
+for this is ‘cherry’ (not to be confused with ‘cherry-pick’).  Magit has
+support for this by invoking ‘magit-cherry’ which is bound to ‘y’ by
+default.
+
+   Magit will then ask you first for the upstream revision (which
+defaults to the currently tracked remote branch if any) and the head
+revision (which defaults to the current branch) to use in the
+comparison.  You will then see a new buffer in which all commits are
+listed with a directional marker, their revision and the commit
+message’s first line.  The directional marker is either ‘+’ indicating a
+commit that’s present in upstream but not in head or ‘-’ which indicates
+a commit present in head but not in upstream.
+
+   From this list you can use the usual key bindings for cherry-picking
+individual commits (‘a’ for cherry-picking without committing and ‘A’
+for the same plus the automatic commit).  The buffer is refreshed
+automatically after each cherry-pick.
+
+
+File: magit.info,  Node: Using Magit Extensions,  Next: Using Git Directly,  Prev: Finding commits not merged upstream,  Up: Top
+
+24 Magit Extensions
+*******************
+
+* Menu:
+
+* Activating extensions::
+* Interfacing with Subversion::
+* Interfacing with Topgit::
+* Interfacing with StGit::
+
+
+File: magit.info,  Node: Activating extensions,  Next: Interfacing with Subversion,  Up: Using Magit Extensions
+
+24.1 Activating extensions
+==========================
+
+Magit comes with a couple of shipped extensions that allow interaction
+with ‘git-svn’, ‘topgit’ and ‘stgit’.  See following sections for
+specific details on how to use them.
+
+   Extensions can be activated globally or on a per-repository basis.
+Since those extensions are implemented as minor modes, one can use for
+example ‘M-x magit-topgit-mode’ to toggle the ‘topgit’ extension, making
+the corresponding section and commands (un)available.
+
+   In order to do that automatically (and for every repository), one can
+use for example:
+
+     (add-hook 'magit-mode-hook 'turn-on-magit-topgit)
+
+   Magit also allows configuring different extensions, based on the git
+repository configuration.
+
+     (add-hook 'magit-mode-hook 'magit-load-config-extensions)
+
+   This will read git configuration variables and activate the relevant
+extensions.
+
+   For example, after running the following commands, the ‘topgit’
+extension will be loaded for every repository, while the ‘svn’ one will
+be loaded only for the current one.
+
+     $ git config --global --add magit.extension topgit
+     $ git config --add magit.extension svn
+
+   Note the ‘--add’ flag, which means that each extension gets its own
+line in the ‘config’ file.
+
+
+File: magit.info,  Node: Interfacing with Subversion,  Next: Interfacing with Topgit,  Prev: Activating extensions,  Up: Using Magit Extensions
+
+24.2 Interfacing with Subversion
+================================
+
+Typing ‘N r’ runs ‘git svn rebase’, typing ‘N c’ runs ‘git svn dcommit’
+and typing ‘N f’ runs ‘git svn fetch’.
+
+   ‘N s’ will prompt you for a (numeric, Subversion) revision and then
+search for a corresponding Git sha1 for the commit.  This is limited to
+the path of the remote Subversion repository.  With a prefix (‘C-u N s’
+the user will also be prompted for a branch to search in.
+
+
+File: magit.info,  Node: Interfacing with Topgit,  Next: Interfacing with StGit,  Prev: Interfacing with Subversion,  Up: Using Magit Extensions
+
+24.3 Interfacing with Topgit
+============================
+
+Topgit (http://repo.or.cz/r/topgit.git) is a patch queue manager that
+aims at being close as possible to raw Git, which makes it easy to use
+with Magit.  In particular, it does not require to use a different set
+of commands for “commit”, “update”, and other operations.
+
+   ‘magit-topgit.el’ provides basic integration with Magit, mostly by
+providing a “Topics” section.
+
+   Topgit branches can be created the regular way, by using a “t/”
+prefix by convention.  So, creating a “t/foo” branch will actually
+populate the “Topics” section with one more branch after committing
+‘.topdeps’ and ‘.topmsg’.
+
+   Also, the way we pull (see *note Pushing and Pulling::) such a branch
+is slightly different, since it requires updating the various
+dependencies of that branch.  This should be mostly transparent, except
+in case of conflicts.
+
+
+File: magit.info,  Node: Interfacing with StGit,  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: Using Git Directly,  Next: GNU Free Documentation License,  Prev: Using Magit Extensions,  Up: Top
+
+25 Using Git Directly
+*********************
+
+For situations when Magit doesn’t do everything you need, you can run
+raw Git commands using ‘:’.  This will prompt for a Git command, run it,
+and refresh the status buffer.  The output can be viewed by typing ‘$’.
+
+
+File: magit.info,  Node: GNU Free Documentation License,  Prev: Using Git Directly,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                      Version 1.2, November 2002
+
+     Copyright © 2000,2001,2002 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     functional and useful document "free" in the sense of freedom: to
+     assure everyone the effective freedom to copy and redistribute it,
+     with or without modifying it, either commercially or
+     noncommercially.  Secondarily, this License preserves for the
+     author and publisher a way to get credit for their work, while not
+     being considered responsible for modifications made by others.
+
+     This License is a kind of “copyleft”, which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.  We
+     recommend this License principally for works whose purpose is
+     instruction or reference.
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work, in any medium,
+     that contains a notice placed by the copyright holder saying it can
+     be distributed under the terms of this License.  Such a notice
+     grants a world-wide, royalty-free license, unlimited in duration,
+     to use that work under the conditions stated herein.  The
+     “Document”, below, refers to any such manual or work.  Any member
+     of the public is a licensee, and is addressed as “you”.  You accept
+     the license if you copy, modify or distribute the work in a way
+     requiring permission under copyright law.
+
+     A “Modified Version” of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A “Secondary Section” is a named appendix or a front-matter section
+     of the Document that deals exclusively with the relationship of the
+     publishers or authors of the Document to the Document’s overall
+     subject (or to related matters) and contains nothing that could
+     fall directly within that overall subject.  (Thus, if the Document
+     is in part a textbook of mathematics, a Secondary Section may not
+     explain any mathematics.)  The relationship could be a matter of
+     historical connection with the subject or with related matters, or
+     of legal, commercial, philosophical, ethical or political position
+     regarding them.
+
+     The “Invariant Sections” are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in the
+     notice that says that the Document is released under this License.
+     If a section does not fit the above definition of Secondary then it
+     is not allowed to be designated as Invariant.  The Document may
+     contain zero Invariant Sections.  If the Document does not identify
+     any Invariant Sections then there are none.
+
+     The “Cover Texts” are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.  A
+     Front-Cover Text may be at most 5 words, and a Back-Cover Text may
+     be at most 25 words.
+
+     A “Transparent” copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, that is suitable for revising the document
+     straightforwardly with generic text editors or (for images composed
+     of pixels) generic paint programs or (for drawings) some widely
+     available drawing editor, and that is suitable for input to text
+     formatters or for automatic translation to a variety of formats
+     suitable for input to text formatters.  A copy made in an otherwise
+     Transparent file format whose markup, or absence of markup, has
+     been arranged to thwart or discourage subsequent modification by
+     readers is not Transparent.  An image format is not Transparent if
+     used for any substantial amount of text.  A copy that is not
+     “Transparent” is called “Opaque”.
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and standard-conforming
+     simple HTML, PostScript or PDF designed for human modification.
+     Examples of transparent image formats include PNG, XCF and JPG.
+     Opaque formats include proprietary formats that can be read and
+     edited only by proprietary word processors, SGML or XML for which
+     the DTD and/or processing tools are not generally available, and
+     the machine-generated HTML, PostScript or PDF produced by some word
+     processors for output purposes only.
+
+     The “Title Page” means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, “Title
+     Page” means the text near the most prominent appearance of the
+     work’s title, preceding the beginning of the body of the text.
+
+     A section “Entitled XYZ” means a named subunit of the Document
+     whose title either is precisely XYZ or contains XYZ in parentheses
+     following text that translates XYZ in another language.  (Here XYZ
+     stands for a specific section name mentioned below, such as
+     “Acknowledgements”, “Dedications”, “Endorsements”, or “History”.)
+     To “Preserve the Title” of such a section when you modify the
+     Document means that it remains a section “Entitled XYZ” according
+     to this definition.
+
+     The Document may include Warranty Disclaimers next to the notice
+     which states that this License applies to the Document.  These
+     Warranty Disclaimers are considered to be included by reference in
+     this License, but only as regards disclaiming warranties: any other
+     implication that these Warranty Disclaimers may have is void and
+     has no effect on the meaning of this License.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow the
+     conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies (or copies in media that commonly
+     have printed covers) of the Document, numbering more than 100, and
+     the Document’s license notice requires Cover Texts, you must
+     enclose the copies in covers that carry, clearly and legibly, all
+     these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the title
+     equally prominent and visible.  You may add other material on the
+     covers in addition.  Copying with changes limited to the covers, as
+     long as they preserve the title of the Document and satisfy these
+     conditions, can be treated as verbatim copying in other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a machine-readable
+     Transparent copy along with each Opaque copy, or state in or with
+     each Opaque copy a computer-network location from which the general
+     network-using public has access to download using public-standard
+     network protocols a complete Transparent copy of the Document, free
+     of added material.  If you use the latter option, you must take
+     reasonably prudent steps, when you begin distribution of Opaque
+     copies in quantity, to ensure that this Transparent copy will
+     remain thus accessible at the stated location until at least one
+     year after the last time you distribute an Opaque copy (directly or
+     through your agents or retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of copies,
+     to give them a chance to provide you with an updated version of the
+     Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with the
+     Modified Version filling the role of the Document, thus licensing
+     distribution and modification of the Modified Version to whoever
+     possesses a copy of it.  In addition, you must do these things in
+     the Modified Version:
+
+       A. Use in the Title Page (and on the covers, if any) a title
+          distinct from that of the Document, and from those of previous
+          versions (which should, if there were any, be listed in the
+          History section of the Document).  You may use the same title
+          as a previous version if the original publisher of that
+          version gives permission.
+
+       B. List on the Title Page, as authors, one or more persons or
+          entities responsible for authorship of the modifications in
+          the Modified Version, together with at least five of the
+          principal authors of the Document (all of its principal
+          authors, if it has fewer than five), unless they release you
+          from this requirement.
+
+       C. State on the Title page the name of the publisher of the
+          Modified Version, as the publisher.
+
+       D. Preserve all the copyright notices of the Document.
+
+       E. Add an appropriate copyright notice for your modifications
+          adjacent to the other copyright notices.
+
+       F. Include, immediately after the copyright notices, a license
+          notice giving the public permission to use the Modified
+          Version under the terms of this License, in the form shown in
+          the Addendum below.
+
+       G. Preserve in that license notice the full lists of Invariant
+          Sections and required Cover Texts given in the Document’s
+          license notice.
+
+       H. Include an unaltered copy of this License.
+
+       I. Preserve the section Entitled “History”, Preserve its Title,
+          and add to it an item stating at least the title, year, new
+          authors, and publisher of the Modified Version as given on the
+          Title Page.  If there is no section Entitled “History” in the
+          Document, create one stating the title, year, authors, and
+          publisher of the Document as given on its Title Page, then add
+          an item describing the Modified Version as stated in the
+          previous sentence.
+
+       J. Preserve the network location, if any, given in the Document
+          for public access to a Transparent copy of the Document, and
+          likewise the network locations given in the Document for
+          previous versions it was based on.  These may be placed in the
+          “History” section.  You may omit a network location for a work
+          that was published at least four years before the Document
+          itself, or if the original publisher of the version it refers
+          to gives permission.
+
+       K. For any section Entitled “Acknowledgements” or “Dedications”,
+          Preserve the Title of the section, and preserve in the section
+          all the substance and tone of each of the contributor
+          acknowledgements and/or dedications given therein.
+
+       L. Preserve all the Invariant Sections of the Document, unaltered
+          in their text and in their titles.  Section numbers or the
+          equivalent are not considered part of the section titles.
+
+       M. Delete any section Entitled “Endorsements”.  Such a section
+          may not be included in the Modified Version.
+
+       N. Do not retitle any existing section to be Entitled
+          “Endorsements” or to conflict in title with any Invariant
+          Section.
+
+       O. Preserve any Warranty Disclaimers.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option designate
+     some or all of these sections as invariant.  To do this, add their
+     titles to the list of Invariant Sections in the Modified Version’s
+     license notice.  These titles must be distinct from any other
+     section titles.
+
+     You may add a section Entitled “Endorsements”, provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties—for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition of
+     a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end of
+     the list of Cover Texts in the Modified Version.  Only one passage
+     of Front-Cover Text and one of Back-Cover Text may be added by (or
+     through arrangements made by) any one entity.  If the Document
+     already includes a cover text for the same cover, previously added
+     by you or by arrangement made by the same entity you are acting on
+     behalf of, you may not add another; but you may replace the old
+     one, on explicit permission from the previous publisher that added
+     the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination all
+     of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice, and that you preserve all
+     their Warranty Disclaimers.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections Entitled
+     “History” in the various original documents, forming one section
+     Entitled “History”; likewise combine any sections Entitled
+     “Acknowledgements”, and any sections Entitled “Dedications”.  You
+     must delete all sections Entitled “Endorsements.”
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the documents
+     in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow this
+     License in all other respects regarding verbatim copying of that
+     document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of a
+     storage or distribution medium, is called an “aggregate” if the
+     copyright resulting from the compilation is not used to limit the
+     legal rights of the compilation’s users beyond what the individual
+     works permit.  When the Document is included in an aggregate, this
+     License does not apply to the other works in the aggregate which
+     are not themselves derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one half
+     of the entire aggregate, the Document’s Cover Texts may be placed
+     on covers that bracket the Document within the aggregate, or the
+     electronic equivalent of covers if the Document is in electronic
+     form.  Otherwise they must appear on printed covers that bracket
+     the whole aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License, and all the license notices in the
+     Document, and any Warranty Disclaimers, provided that you also
+     include the original English version of this License and the
+     original versions of those notices and disclaimers.  In case of a
+     disagreement between the translation and the original version of
+     this License or a notice or disclaimer, the original version will
+     prevail.
+
+     If a section in the Document is Entitled “Acknowledgements”,
+     “Dedications”, or “History”, the requirement (section 4) to
+     Preserve its Title (section 1) will typically require changing the
+     actual title.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses terminated
+     so long as such parties remain in full compliance.
+
+  10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     <http://www.gnu.org/copyleft/>.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License “or any later version” applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If the
+     Document does not specify a version number of this License, you may
+     choose any version ever published (not as a draft) by the Free
+     Software Foundation.
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+       Copyright (C)  YEAR  YOUR NAME.
+       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, no Front-Cover Texts, and no Back-Cover
+       Texts.  A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+
+   If you have Invariant Sections, Front-Cover Texts and Back-Cover
+Texts, replace the “with…Texts.” line with this:
+
+         with the Invariant Sections being LIST THEIR TITLES, with
+         the Front-Cover Texts being LIST, and with the Back-Cover Texts
+         being LIST.
+
+   If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+   If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of free
+software license, such as the GNU General Public License, to permit
+their use in free software.
+
+
+
+Tag Table:
+Node: Top724
+Node: Introduction2264
+Node: Acknowledgments3783
+Node: Sections4320
+Node: Status6996
+Node: Untracked files9803
+Node: Staging and Committing11062
+Node: History14602
+Node: Reflogs17888
+Node: Commit Buffer18320
+Node: Diffing19680
+Node: Tagging20691
+Node: Resetting21169
+Node: Stashing22725
+Node: Branches and Remotes23848
+Node: Branches Popup24673
+Node: Remotes Popup25976
+Node: Branches in the Branch Manager26342
+Node: Remotes in the Branch Manager27563
+Node: Wazzup28144
+Node: Merging28958
+Node: Rebasing30024
+Node: Interactive Rebasing30874
+Node: Rewriting32225
+Node: Pushing and Pulling35634
+Node: Submodules37644
+Node: Bisecting38110
+Node: Finding commits not merged upstream39383
+Node: Using Magit Extensions40687
+Node: Activating extensions40983
+Node: Interfacing with Subversion42404
+Node: Interfacing with Topgit43036
+Node: Interfacing with StGit44110
+Node: Using Git Directly45108
+Node: GNU Free Documentation License45506
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/elpa/paredit-22/paredit-autoloads.el~ b/elpa/paredit-22/paredit-autoloads.el~
deleted file mode 100644
index a7098d995..000000000
--- a/elpa/paredit-22/paredit-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; paredit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'paredit-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; paredit-autoloads.el ends here
diff --git a/elpa/paredit-22/paredit-pkg.el b/elpa/paredit-22/paredit-pkg.el
deleted file mode 100644
index 7b7e26d34..000000000
--- a/elpa/paredit-22/paredit-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "paredit" "22" "minor mode for editing parentheses  -*- Mode: Emacs-Lisp -*-" (quote nil))
diff --git a/elpa/paredit-22/paredit-pkg.elc b/elpa/paredit-22/paredit-pkg.elc
deleted file mode 100644
index 249a95883..000000000
Binary files a/elpa/paredit-22/paredit-pkg.elc and /dev/null differ
diff --git a/elpa/paredit-22/paredit.elc b/elpa/paredit-22/paredit.elc
deleted file mode 100644
index 721bcb87d..000000000
Binary files a/elpa/paredit-22/paredit.elc and /dev/null differ
diff --git a/elpa/paredit-22/paredit-autoloads.el b/elpa/paredit-24/paredit-autoloads.el
similarity index 58%
rename from elpa/paredit-22/paredit-autoloads.el
rename to elpa/paredit-24/paredit-autoloads.el
index a27ccb27a..f7f880b65 100644
--- a/elpa/paredit-22/paredit-autoloads.el
+++ b/elpa/paredit-24/paredit-autoloads.el
@@ -1,33 +1,32 @@
 ;;; paredit-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads (paredit-mode) "paredit" "paredit.el" (20166 22150))
+;;;### (autoloads nil "paredit" "paredit.el" (21721 36908 0 0))
 ;;; Generated autoloads from paredit.el
 
 (autoload 'paredit-mode "paredit" "\
 Minor mode for pseudo-structurally editing Lisp code.
 With a prefix argument, enable Paredit Mode even if there are
-  imbalanced parentheses in the buffer.
-Paredit behaves badly if parentheses are imbalanced, so exercise
+  unbalanced parentheses in the buffer.
+Paredit behaves badly if parentheses are unbalanced, so exercise
   caution when forcing Paredit Mode to be enabled, and consider
-  fixing imbalanced parentheses instead.
+  fixing unbalanced parentheses instead.
 \\<paredit-mode-map>
 
 \(fn &optional ARG)" t nil)
 
-;;;***
-
-;;;### (autoloads nil nil ("paredit-pkg.el") (20166 22150 922167))
+(autoload 'enable-paredit-mode "paredit" "\
+Turn on pseudo-structural editing of Lisp code.
+
+\(fn)" t nil)
 
 ;;;***
 
-(provide 'paredit-autoloads)
 ;; Local Variables:
 ;; version-control: never
 ;; no-byte-compile: t
 ;; no-update-autoloads: t
-;; coding: utf-8
 ;; End:
 ;;; paredit-autoloads.el ends here
diff --git a/elpa/paredit-24/paredit-pkg.el b/elpa/paredit-24/paredit-pkg.el
new file mode 100644
index 000000000..ac7e9745e
--- /dev/null
+++ b/elpa/paredit-24/paredit-pkg.el
@@ -0,0 +1 @@
+(define-package "paredit" "24" "minor mode for editing parentheses" 'nil :keywords '("lisp"))
diff --git a/elpa/paredit-24/paredit-pkg.elc b/elpa/paredit-24/paredit-pkg.elc
new file mode 100644
index 000000000..b333f9aa8
Binary files /dev/null and b/elpa/paredit-24/paredit-pkg.elc differ
diff --git a/elpa/paredit-22/paredit.el b/elpa/paredit-24/paredit.el
similarity index 63%
rename from elpa/paredit-22/paredit.el
rename to elpa/paredit-24/paredit.el
index 6830bb7cb..daf3e6003 100644
--- a/elpa/paredit-22/paredit.el
+++ b/elpa/paredit-24/paredit.el
@@ -1,16 +1,13 @@
 ;;; paredit.el --- minor mode for editing parentheses  -*- Mode: Emacs-Lisp -*-
 
-;; Copyright (C) 2005--2010 Taylor R. Campbell
+;; Copyright (C) 2005--2014 Taylor R. Campbell
 
 ;; Author: Taylor R. Campbell
-;; Version: 22
+;; Version: 24
+;; X-Original-Version: 24
 ;; Created: 2005-07-31
 ;; Keywords: lisp
 
-;; NOTE:  THIS IS A BETA VERSION OF PAREDIT.  USE AT YOUR OWN RISK.
-;; THIS FILE IS SUBJECT TO CHANGE, AND NOT SUITABLE FOR DISTRIBUTION
-;; BY PACKAGE MANAGERS SUCH AS APT, PKGSRC, MACPORTS, &C.
-
 ;; Paredit 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
@@ -24,39 +21,15 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with paredit.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; -*- Mode: Emacs-Lisp; outline-regexp: "\n;;;;+" -*-
-
-;;;;;; Paredit: Parenthesis-Editing Minor Mode
-;;;;;; Version 22 (beta)
-
-;;; NOTE:  THIS IS A BETA VERSION OF PAREDIT.  USE AT YOUR OWN RISK.
-;;; THIS FILE IS SUBJECT TO CHANGE, AND NOT SUITABLE FOR DISTRIBUTION
-;;; BY PACKAGE MANAGERS SUCH AS APT, PKGSRC, MACPORTS, &C.
-
-;;; Copyright (c) 2005--2010, Taylor R. Campbell
-;;;
-;;; Paredit 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.
-;;;
-;;; Paredit 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 paredit.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; This file is permanently stored at
-;;;   <http://mumble.net/~campbell/emacs/paredit-22.el>.
-;;;
 ;;; The currently released version of paredit is available at
 ;;;   <http://mumble.net/~campbell/emacs/paredit.el>.
 ;;;
 ;;; The latest beta version of paredit is available at
 ;;;   <http://mumble.net/~campbell/emacs/paredit-beta.el>.
 ;;;
+;;; The Git repository for paredit is available at
+;;;   <http://mumble.net/~campbell/git/paredit.git>
+;;;
 ;;; Release notes are available at
 ;;;   <http://mumble.net/~campbell/emacs/paredit.release>.
 
@@ -68,7 +41,7 @@
 ;;;     "Turn on pseudo-structural editing of Lisp code."
 ;;;     t)
 ;;;
-;;; Enable Paredit Mode on the fly with `M-x enable-paredit-mode RET',
+;;; Start Paredit Mode on the fly with `M-x enable-paredit-mode RET',
 ;;; or always enable it in a major mode `M' (e.g., `lisp') with:
 ;;;
 ;;;   (add-hook M-mode-hook 'enable-paredit-mode)
@@ -76,121 +49,78 @@
 ;;; Customize paredit using `eval-after-load':
 ;;;
 ;;;   (eval-after-load 'paredit
-;;;     '(progn ...redefine keys, &c....))
+;;;     '(progn
+;;;        (define-key paredit-mode-map (kbd "ESC M-A-C-s-)")
+;;;          'paredit-dwim)))
 ;;;
-;;; Paredit should run in GNU Emacs 21 or later and XEmacs 21.5 or
-;;; later.  Paredit is highly unlikely to work in earlier versions of
-;;; GNU Emacs, and it may have obscure problems in earlier versions of
-;;; XEmacs due to the way its syntax parser reports conditions, as a
-;;; result of which the code that uses the syntax parser must mask all
-;;; error conditions, not just those generated by the syntax parser.
+;;; Send questions, bug reports, comments, feature suggestions, &c.,
+;;; via email to the author's surname at mumble.net.
 ;;;
-;;; Questions, bug reports, comments, feature suggestions, &c., may be
-;;; addressed via email to the author's surname at mumble.net or via
-;;; IRC to the user named Riastradh on irc.freenode.net in the #paredit
-;;; channel.
+;;; Paredit should run in GNU Emacs 21 or later and XEmacs 21.5.28 or
+;;; later.
+
+;;; The paredit minor mode, Paredit Mode, binds common character keys,
+;;; such as `(', `)', `"', and `\', to commands that carefully insert
+;;; S-expression structures in the buffer:
 ;;;
-;;; Please contact the author rather than forking your own versions, to
-;;; prevent the dissemination of random variants floating about the
-;;; internet unbeknownst to the author.  Laziness is not an excuse:
-;;; your laziness costs me confusion and time trying to support
-;;; paredit, so if you fork paredit, you make the world a worse place.
+;;;   ( inserts `()', leaving the point in the middle;
+;;;   ) moves the point over the next closing delimiter;
+;;;   " inserts `""' if outside a string, or inserts an escaped
+;;;      double-quote if in the middle of a string, or moves over the
+;;;      closing double-quote if at the end of a string; and
+;;;   \ prompts for the character to escape, to avoid inserting lone
+;;;      backslashes that may break structure.
 ;;;
-;;; *** WARNING *** IMPORTANT *** DO NOT SUBMIT BUGS BEFORE READING ***
+;;; In comments, these keys insert themselves.  If necessary, you can
+;;; insert these characters literally outside comments by pressing
+;;; `C-q' before these keys, in case a mistake has broken the
+;;; structure.
 ;;;
-;;; If you plan to submit a bug report, where some sequence of keys in
-;;; Paredit Mode, or some sequence of paredit commands, doesn't do what
-;;; you wanted, then it is helpful to isolate an example in a very
-;;; small buffer, and it is **ABSOLUTELY**ESSENTIAL** that you supply,
-;;; along with the sequence of keys or commands,
+;;; These key bindings are designed so that when typing new code in
+;;; Paredit Mode, you can generally type exactly the same sequence of
+;;; keys you would have typed without Paredit Mode.
 ;;;
-;;;   (1) the version of Emacs,
-;;;   (2) the version of paredit.el[*], and
-;;;   (3) the **COMPLETE** state of the buffer used to reproduce the
-;;;       problem, including major mode, minor modes, local key
-;;;       bindings, entire contents of the buffer, leading line breaks
-;;;       or spaces, &c.
+;;; Paredit Mode also binds common editing keys, such as `DEL', `C-d',
+;;; and `C-k', to commands that respect S-expression structures in the
+;;; buffer:
 ;;;
-;;; It is often extremely difficult to reproduce problems, especially
-;;; with commands such as `paredit-kill'.  If you do not supply **ALL**
-;;; of this information, then it is highly probable that I cannot
-;;; reproduce your problem no matter how hard I try, and the effect of
-;;; submitting a bug without this information is only to waste your
-;;; time and mine.  So, please, include all of the above information.
+;;;   DEL deletes the previous character, unless it is a delimiter: DEL
+;;;        will move the point backward over a closing delimiter, and
+;;;        will delete a delimiter pair together if between an open and
+;;;        closing delimiter;
 ;;;
-;;; [*] If you are using a beta version of paredit, be sure that you
-;;;     are using the *latest* edition of the beta version, available
-;;;     at <http://mumble.net/~campbell/emacs/paredit-beta.el>.  If you
-;;;     are not using a beta version, then upgrade either to that or to
-;;;     the latest release version; I cannot support older versions,
-;;;     and I can't fathom any reason why you might be using them.  So
-;;;     the answer to item (2) should be either `release' or `beta'.
-
-;;; The paredit minor mode, Paredit Mode, binds a number of simple
-;;; keys, notably `(', `)', `"', and `\', to commands that more
-;;; carefully insert S-expression structures in the buffer.  The
-;;; parenthesis delimiter keys (round or square) are defined to insert
-;;; parenthesis pairs and move past the closing delimiter,
-;;; respectively; the double-quote key is multiplexed to do both, and
-;;; also to insert an escape if within a string; and backslashes prompt
-;;; the user for the next character to input, because a lone backslash
-;;; can break structure inadvertently.  These all have their ordinary
-;;; behaviour when inside comments, and, outside comments, if truly
-;;; necessary, you can insert them literally with `C-q'.
+;;;   C-d deletes the next character in much the same manner; and
 ;;;
-;;; The key bindings are designed so that when typing new code in
-;;; Paredit Mode, you can generally use exactly the same keystrokes as
-;;; you would have used without Paredit Mode.  Earlier versions of
-;;; paredit.el did not conform to this, because Paredit Mode bound `)'
-;;; to a command that would insert a newline.  Now `)' is bound to a
-;;; command that does not insert a newline, and `M-)' is bound to the
-;;; command that inserts a newline.  To revert to the former behaviour,
-;;; add the following forms to an `eval-after-load' form for paredit.el
-;;; in your .emacs file:
+;;;   C-k kills all S-expressions that begin anywhere between the point
+;;;        and the end of the line or the closing delimiter of the
+;;;        enclosing list, whichever is first.
 ;;;
-;;;   (define-key paredit-mode-map (kbd ")")
-;;;     'paredit-close-round-and-newline)
-;;;   (define-key paredit-mode-map (kbd "M-)")
-;;;     'paredit-close-round)
+;;; If necessary, you can delete a character, kill a line, &c.,
+;;; irrespective of S-expression structure, by pressing `C-u' before
+;;; these keys, in case a mistake has broken the structure.
 ;;;
-;;; Paredit Mode also binds the usual keys for deleting and killing, so
-;;; that they will not destroy any S-expression structure by killing or
-;;; deleting only one side of a parenthesis or quote pair.  If the
-;;; point is on a closing delimiter, `DEL' will move left over it; if
-;;; it is on an opening delimiter, `C-d' will move right over it.  Only
-;;; if the point is between a pair of delimiters will `C-d' or `DEL'
-;;; delete them, and in that case it will delete both simultaneously.
-;;; `M-d' and `M-DEL' kill words, but skip over any S-expression
-;;; structure.  `C-k' kills from the start of the line, either to the
-;;; line's end, if it contains only balanced expressions; to the first
-;;; closing delimiter, if the point is within a form that ends on the
-;;; line; or up to the end of the last expression that starts on the
-;;; line after the point.
+;;; Finally, Paredit Mode binds some keys to complex S-expression
+;;; editing operations.  For example, `C-<right>' makes the enclosing
+;;; list slurp up an S-expression to its right (here `|' denotes the
+;;; point):
 ;;;
-;;; The behaviour of the commands for deleting and killing can be
-;;; overridden by passing a `C-u' prefix argument: `C-u DEL' will
-;;; delete a character backward, `C-u C-d' will delete a character
-;;; forward, and `C-u C-k' will kill text from the point to the end of
-;;; the line, irrespective of the S-expression structure in the buffer.
-;;; This can be used to fix mistakes in a buffer, but should generally
-;;; be avoided.
+;;;   (foo (bar | baz) quux)  C-<right>  (foo (bar | baz quux))
 ;;;
-;;; Paredit performs automatic reindentation as locally as possible, to
-;;; avoid interfering with custom indentation used elsewhere in some
-;;; S-expression.  Only the advanced S-expression manipulation commands
-;;; automatically reindent, and only the forms that were immediately
-;;; operated upon (and their subforms).
+;;; Some paredit commands automatically reindent code.  When they do,
+;;; they try to indent as locally as possible, to avoid interfering
+;;; with any indentation you might have manually written.  Only the
+;;; advanced S-expression manipulation commands automatically reindent,
+;;; and only the forms that they immediately operated upon (and their
+;;; subforms).
 ;;;
 ;;; This code is written for clarity, not efficiency.  It frequently
 ;;; walks over S-expressions redundantly.  If you have problems with
-;;; the time it takes to execute some of the commands, let me know, but
-;;; first be sure that what you're doing is reasonable: it is
-;;; preferable to avoid immense S-expressions in code anyway.
+;;; the time it takes to execute some of the commands, let me know.
 
 ;;; This assumes Unix-style LF line endings.
 
-(defconst paredit-version 22)
-(defconst paredit-beta-p t)
+(defconst paredit-version 24)
+(defconst paredit-beta-p nil)
 
 (eval-and-compile
 
@@ -240,6 +170,21 @@ Signal an error if no clause matches."
 
   (put 'paredit-ignore-sexp-errors 'lisp-indent-function 0)
 
+  (defmacro paredit-preserving-column (&rest body)
+    "Evaluate BODY and restore point to former column, relative to code.
+Assumes BODY will change only indentation.
+If point was on code, it moves with the code.
+If point was on indentation, it stays in indentation."
+    (let ((column (make-symbol "column"))
+          (indentation (make-symbol "indentation")))
+      `(let ((,column (current-column))
+             (,indentation (paredit-current-indentation)))
+         (let ((value (progn ,@body)))
+           (paredit-restore-column ,column ,indentation)
+           value))))
+
+  (put 'paredit-preserving-column 'lisp-indent-function 0)
+
   nil)
 
 ;;;; Minor Mode Definition
@@ -247,32 +192,34 @@ Signal an error if no clause matches."
 (defvar paredit-mode-map (make-sparse-keymap)
   "Keymap for the paredit minor mode.")
 
+(defvar paredit-override-check-parens-function
+  (lambda (condition) condition nil)
+  "Function to tell whether unbalanced text should inhibit Paredit Mode.")
+
 ;;;###autoload
 (define-minor-mode paredit-mode
   "Minor mode for pseudo-structurally editing Lisp code.
 With a prefix argument, enable Paredit Mode even if there are
-  imbalanced parentheses in the buffer.
-Paredit behaves badly if parentheses are imbalanced, so exercise
+  unbalanced parentheses in the buffer.
+Paredit behaves badly if parentheses are unbalanced, so exercise
   caution when forcing Paredit Mode to be enabled, and consider
-  fixing imbalanced parentheses instead.
+  fixing unbalanced parentheses instead.
 \\<paredit-mode-map>"
   :lighter " Paredit"
-  ;; If we're enabling paredit-mode, the prefix to this code that
-  ;; DEFINE-MINOR-MODE inserts will have already set PAREDIT-MODE to
-  ;; true.  If this is the case, then first check the parentheses, and
-  ;; if there are any imbalanced ones we must inhibit the activation of
-  ;; paredit mode.  We skip the check, though, if the user supplied a
-  ;; prefix argument interactively.
+  ;; Setting `paredit-mode' to false here aborts enabling Paredit Mode.
   (if (and paredit-mode
            (not current-prefix-arg))
-      (if (not (fboundp 'check-parens))
-          (paredit-warn "`check-parens' is not defined; %s"
-                        "be careful of malformed S-expressions.")
-          (condition-case condition
-              (check-parens)
-            (error (setq paredit-mode nil)
-                   (signal (car condition) (cdr condition)))))))
+      (condition-case condition
+          (check-parens)
+        (error
+         (if (not (funcall paredit-override-check-parens-function condition))
+             (progn (setq paredit-mode nil)
+                    (signal (car condition) (cdr condition))))))))
+
+(defun paredit-override-check-parens-interactively (condition)
+  (y-or-n-p (format "Enable Paredit Mode despite condition %S? " condition)))
 
+;;;###autoload
 (defun enable-paredit-mode ()
   "Turn on pseudo-structural editing of Lisp code."
   (interactive)
@@ -327,33 +274,37 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
                 ("(a b |c d)"
                  "(a b [|] c d)")
                 ("(foo \"bar |baz\" quux)"
-                 "(foo \"bar [baz\" quux)"))
+                 "(foo \"bar [|baz\" quux)"))
    ("]"         paredit-close-square
                 ("(define-key keymap [frob|  ] 'frobnicate)"
                  "(define-key keymap [frob]| 'frobnicate)")
                 ("; [Bar.|"
                  "; [Bar.]|"))
+
    ("\""        paredit-doublequote
                 ("(frob grovel |full lexical)"
-                 "(frob grovel \"|\" full lexical)")
+                 "(frob grovel \"|\" full lexical)"
+                 "(frob grovel \"\"| full lexical)")
                 ("(foo \"bar |baz\" quux)"
-                 "(foo \"bar \\\"|baz\" quux)"))
+                 "(foo \"bar \\\"|baz\" quux)")
+                ("(frob grovel)   ; full |lexical"
+                 "(frob grovel)   ; full \"|lexical"))
    ("M-\""      paredit-meta-doublequote
                 ("(foo \"bar |baz\" quux)"
-                 "(foo \"bar baz\"\n     |quux)")
+                 "(foo \"bar baz\"| quux)")
                 ("(foo |(bar #\\x \"baz \\\\ quux\") zot)"
                  ,(concat "(foo \"|(bar #\\\\x \\\"baz \\\\"
                           "\\\\ quux\\\")\" zot)")))
    ("\\"        paredit-backslash
-                ("(string #|)\n  ; Escaping character... (x)"
+                ("(string #|)\n  ; Character to escape: x"
                  "(string #\\x|)")
-                ("\"foo|bar\"\n  ; Escaping character... (\")"
+                ("\"foo|bar\"\n  ; Character to escape: \""
                  "\"foo\\\"|bar\""))
    (";"         paredit-semicolon
                 ("|(frob grovel)"
                  ";|(frob grovel)")
                 ("(frob |grovel)"
-                 "(frob ;grovel\n)")
+                 "(frob ;|grovel\n )")
                 ("(frob |grovel (bloit\n               zargh))"
                  "(frob ;|grovel\n (bloit\n  zargh))")
                 ("(frob grovel)          |"
@@ -363,10 +314,10 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
                  "(foo bar)                               ; |baz")
                 ("(frob grovel)|"
                  "(frob grovel)                           ;|")
-                ("    (foo bar)\n|\n    (baz quux)"
-                 "    (foo bar)\n    ;; |\n    (baz quux)")
-                ("    (foo bar) |(baz quux)"
-                 "    (foo bar)\n    ;; |\n    (baz quux)")
+                ("(zot (foo bar)\n|\n     (baz quux))"
+                 "(zot (foo bar)\n     ;; |\n     (baz quux))")
+                ("(zot (foo bar) |(baz quux))"
+                 "(zot (foo bar)\n     ;; |\n     (baz quux))")
                 ("|(defun hello-world ...)"
                  ";;; |\n(defun hello-world ...)"))
 
@@ -374,7 +325,7 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
                 ("(let ((n (frobbotz))) |(display (+ n 1)\nport))"
                  ,(concat "(let ((n (frobbotz)))"
                           "\n  |(display (+ n 1)"
-                          "\n            port))")))
+                          "\n           port))")))
 
    "Deleting & Killing"
    (("C-d" ,@paredit-forward-delete-keys)
@@ -445,15 +396,18 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
    (("M-<up>" "ESC <up>")
                 paredit-splice-sexp-killing-backward
                 ("(foo (let ((x 5)) |(sqrt n)) bar)"
-                 "(foo (sqrt n) bar)"))
+                 "(foo |(sqrt n) bar)"))
    (("M-<down>" "ESC <down>")
                 paredit-splice-sexp-killing-forward
                 ("(a (b c| d e) f)"
-                 "(a b c f)"))
+                 "(a b c| f)"))
    ("M-r"       paredit-raise-sexp
                 ("(dynamic-wind in (lambda () |body) out)"
                  "(dynamic-wind in |body out)"
                  "|body"))
+   ("M-?"       paredit-convolute-sexp
+                ("(let ((x 5) (y 3)) (frob |(zwonk)) (wibblethwop))"
+                 "(frob |(let ((x 5) (y 3)) (zwonk) (wibblethwop)))"))
 
    "Barfage & Slurpage"
    (("C-)" "C-<right>")
@@ -490,7 +444,7 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
                  "\"Hello, |world!\"")
                 ("hello-\n|  world"
                  "hello-|world"))
-   ("C-c C-M-l" paredit-recentre-on-sexp)
+   ("C-c C-M-l" paredit-recenter-on-sexp)
    ("M-q"       paredit-reindent-defun)
    ))
        nil)                             ; end of PROGN
@@ -578,50 +532,38 @@ Paredit behaves badly if parentheses are imbalanced, so exercise
   "Insert HTML for a paredit quick reference table."
   (interactive)
   (let ((insert-lines
-         (lambda (&rest lines)
-           (mapc (lambda (line) (insert line) (newline))
-                 lines)))
-        (html-keys
-         (lambda (keys)
-           (mapconcat 'paredit-html-quote keys ", ")))
-        (html-example
-         (lambda (example)
-           (concat "<table><tr><td><pre>"
-                   (mapconcat 'paredit-html-quote
-                              example
-                              (concat "</pre></td></tr><tr><td>"
-                                      "&nbsp;&nbsp;&nbsp;&nbsp;---&gt;"
-                                      "</td></tr><tr><td><pre>"))
-                   "</pre></td></tr></table>")))
-        (firstp t))
+         (lambda (&rest lines) (dolist (line lines) (insert line) (newline))))
+        (initp nil))
     (paredit-do-commands (spec keys fn examples)
-        (progn (if (not firstp)
-                   (insert "</table>\n")
-                   (setq firstp nil))
-               (funcall insert-lines
-                        (concat "<h3>" spec "</h3>")
-                        "<table border=\"1\" cellpadding=\"1\">"
-                        "  <tr>"
-                        "    <th>Command</th>"
-                        "    <th>Keys</th>"
-                        "    <th>Examples</th>"
-                        "  </tr>"))
-      (let ((name (symbol-name fn)))
-        (if (string-match (symbol-name 'paredit-) name)
-            (funcall insert-lines
-                     "  <tr>"
-                     (concat "    <td><tt>" name "</tt></td>")
-                     (concat "    <td align=\"center\">"
-                             (funcall html-keys keys)
-                             "</td>")
-                     (concat "    <td>"
-                             (if examples
-                                 (mapconcat html-example examples
-                                            "<hr>")
-                                 "(no examples)")
-                             "</td>")
-                     "  </tr>")))))
-  (insert "</table>\n"))
+        (progn (if initp
+                   (funcall insert-lines "</table>")
+                   (setq initp t))
+               (funcall insert-lines (concat "<h3>" spec "</h3>"))
+               (funcall insert-lines "<table>"))
+      (let ((name (symbol-name fn))
+            (keys
+             (mapconcat (lambda (key)
+                          (concat "<tt>" (paredit-html-quote key) "</tt>"))
+                        keys
+                        ", ")))
+        (funcall insert-lines "<tr>")
+        (funcall insert-lines (concat "  <th align=\"left\">" keys "</th>"))
+        (funcall insert-lines (concat "  <th align=\"left\">" name "</th>"))
+        (funcall insert-lines "</tr>")
+        (funcall insert-lines
+                 "<tr><td colspan=\"2\"><table cellpadding=\"5\"><tr>")
+        (dolist (example examples)
+          (let ((prefix "<td><table border=\"1\"><tr><td><table><tr><td><pre>")
+                (examples
+                 (mapconcat 'paredit-html-quote
+                            example
+                            (concat "</pre></td></tr>"
+                                    "<tr><th>&darr;</th></tr>"
+                                    "<tr><td><pre>")))
+                (suffix "</pre></td></tr></table></td></tr></table></td>"))
+            (funcall insert-lines (concat prefix examples suffix))))
+        (funcall insert-lines "</tr></table></td></tr>")))
+    (funcall insert-lines "</table>")))
 
 (defun paredit-html-quote (string)
   (with-temp-buffer
@@ -658,7 +600,8 @@ If in a character literal, do nothing.  This prevents changing what was
                     (paredit-in-comment-p))
                 (insert ,open))
                ((not (paredit-in-char-p))
-                (paredit-insert-pair n ,open ,close 'goto-char))))
+                (paredit-insert-pair n ,open ,close 'goto-char)
+                (save-excursion (backward-up-list) (indent-sexp)))))
        (defun ,(paredit-conc-name "paredit-close-" name) ()
          ,(concat "Move past one closing delimiter and reindent.
 \(Agnostic to the specific closing delimiter.)
@@ -705,30 +648,32 @@ Used by `paredit-yank-pop'; for internal paredit use only.")
   'paredit-close-square-and-newline)
 
 (defun paredit-move-past-close (close)
-  (cond ((or (paredit-in-string-p)
-             (paredit-in-comment-p))
-         (insert close))
-        ((not (paredit-in-char-p))
-         (paredit-move-past-close-and-reindent close)
-         (paredit-blink-paren-match nil))))
+  (paredit-move-past-close-and close
+    (lambda ()
+      (paredit-blink-paren-match nil))))
 
 (defun paredit-move-past-close-and-newline (close)
+  (paredit-move-past-close-and close
+    (lambda ()
+      (let ((comment.point (paredit-find-comment-on-line)))
+        (newline)
+        (if comment.point
+            (save-excursion
+              (forward-line -1)
+              (end-of-line)
+              (indent-to (cdr comment.point))
+              (insert (car comment.point)))))
+      (lisp-indent-line)
+      (paredit-ignore-sexp-errors (indent-sexp))
+      (paredit-blink-paren-match t))))
+
+(defun paredit-move-past-close-and (close if-moved)
   (if (or (paredit-in-string-p)
           (paredit-in-comment-p))
       (insert close)
     (if (paredit-in-char-p) (forward-char))
     (paredit-move-past-close-and-reindent close)
-    (let ((comment.point (paredit-find-comment-on-line)))
-      (newline)
-      (if comment.point
-          (save-excursion
-            (forward-line -1)
-            (end-of-line)
-            (indent-to (cdr comment.point))
-            (insert (car comment.point)))))
-    (lisp-indent-line)
-    (paredit-ignore-sexp-errors (indent-sexp))
-    (paredit-blink-paren-match t)))
+    (funcall if-moved)))
 
 (defun paredit-find-comment-on-line ()
   "Find a margin comment on the current line.
@@ -765,15 +710,40 @@ If such a comment exists, delete the comment (including all leading
       (insert open)
       (save-excursion
         ;; Move past the desired region.
-        (cond (n (funcall forward
-                          (save-excursion
-                            (forward-sexp (prefix-numeric-value n))
-                            (point))))
-              (regionp (funcall forward (+ end (if spacep 2 1)))))
+        (cond (n
+               (funcall forward
+                        (paredit-scan-sexps-hack (point)
+                                                 (prefix-numeric-value n))))
+              (regionp
+               (funcall forward (+ end (if spacep 2 1)))))
+        ;; The string case can happen if we are inserting string
+        ;; delimiters.  The comment case may happen by moving to the
+        ;; end of a buffer that has a comment with no trailing newline.
+        (if (and (not (paredit-in-string-p))
+                 (paredit-in-comment-p))
+            (newline))
         (insert close)
         (if (paredit-space-for-delimiter-p t close)
             (insert " "))))))
 
+;++ This needs a better name...
+
+(defun paredit-scan-sexps-hack (point n)
+  (save-excursion
+    (goto-char point)
+    (let ((direction (if (< 0 n) +1 -1))
+          (magnitude (abs n))
+          (count 0))
+      (catch 'exit
+        (while (< count magnitude)
+          (let ((p
+                 (paredit-handle-sexp-errors (scan-sexps (point) direction)
+                   nil)))
+            (if (not p) (throw 'exit nil))
+            (goto-char p))
+          (setq count (+ count 1)))))
+    (point)))
+
 (defun paredit-region-safe-for-insert-p ()
   (save-excursion
     (let ((beginning (region-beginning))
@@ -876,7 +846,7 @@ Each predicate should examine only text before the point, if ENDP is
                   ;; The above line is a perfect example of why the
                   ;; following test is necessary.
                   (not (paredit-in-char-p (1- (point))))))
-      (backward-delete-char 1))))
+      (delete-char -1))))
 
 (defun paredit-blink-paren-match (another-line-p)
   (if (and blink-matching-paren
@@ -906,31 +876,38 @@ If in a character literal, do nothing.  This prevents accidentally
   delimiter unintentionally."
   (interactive "P")
   (cond ((paredit-in-string-p)
-         (if (eq (cdr (paredit-string-start+end-points))
-                 (point))
-             (forward-char)             ; We're on the closing quote.
-             (insert ?\\ ?\" )))
+         (if (eq (point) (- (paredit-enclosing-string-end) 1))
+             (forward-char)             ; Just move past the closing quote.
+           ;; Don't split a \x into an escaped backslash and a string end.
+           (if (paredit-in-string-escape-p) (forward-char))
+           (insert ?\\ ?\" )))
         ((paredit-in-comment-p)
          (insert ?\" ))
         ((not (paredit-in-char-p))
          (paredit-insert-pair n ?\" ?\" 'paredit-forward-for-quote))))
 
 (defun paredit-meta-doublequote (&optional n)
+  "Move to the end of the string.
+If not in a string, act as `paredit-doublequote'; if not prefix argument
+ is specified and the region is not active or `transient-mark-mode' is
+ disabled, the default is to wrap one S-expression, however, not zero."
+  (interactive "P")
+  (if (not (paredit-in-string-p))
+      (paredit-doublequote (or n (and (not (paredit-region-active-p)) 1)))
+      (goto-char (paredit-enclosing-string-end))))
+
+(defun paredit-meta-doublequote-and-newline (&optional n)
   "Move to the end of the string, insert a newline, and indent.
-If not in a string, act as `paredit-doublequote'; if no prefix argument
-  is specified and the region is not active or `transient-mark-mode' is
-  disabled, the default is to wrap one S-expression, however, not
-  zero."
+If not in a string, act as `paredit-doublequote'; if not prefix argument
+ is specified and the region is not active or `transient-mark-mode' is
+ disabled, the default is to wrap one S-expression, however, not zero."
   (interactive "P")
   (if (not (paredit-in-string-p))
-      (paredit-doublequote (or n
-                               (and (not (paredit-region-active-p))
-                                    1)))
-    (let ((start+end (paredit-string-start+end-points)))
-      (goto-char (1+ (cdr start+end)))
-      (newline)
-      (lisp-indent-line)
-      (paredit-ignore-sexp-errors (indent-sexp)))))
+      (paredit-doublequote (or n (and (not (paredit-region-active-p)) 1)))
+      (progn (goto-char (paredit-enclosing-string-end))
+             (newline)
+             (lisp-indent-line)
+             (paredit-ignore-sexp-errors (indent-sexp)))))
 
 (defun paredit-forward-for-quote (end)
   (let ((state (paredit-current-parse-state)))
@@ -968,36 +945,28 @@ If not in a string, act as `paredit-doublequote'; if no prefix argument
 (defun paredit-backslash ()
   "Insert a backslash followed by a character to escape."
   (interactive)
+  (cond ((paredit-in-string-p) (paredit-backslash-interactive))
+        ((paredit-in-comment-p) (insert ?\\))
+        ((paredit-in-char-p) (forward-char) (paredit-backslash-interactive))
+        (t (paredit-backslash-interactive))))
+
+(defun paredit-backslash-interactive ()
   (insert ?\\ )
-  ;; This funny conditional is necessary because PAREDIT-IN-COMMENT-P
-  ;; assumes that PAREDIT-IN-STRING-P already returned false; otherwise
-  ;; it may give erroneous answers.
-  (if (or (paredit-in-string-p)
-          (not (paredit-in-comment-p)))
-      (let ((delp t))
-        (unwind-protect (setq delp
-                              (call-interactively 'paredit-escape))
-          ;; We need this in an UNWIND-PROTECT so that the backlash is
-          ;; left in there *only* if PAREDIT-ESCAPE return NIL normally
-          ;; -- in any other case, such as the user hitting C-g or an
-          ;; error occurring, we must delete the backslash to avoid
-          ;; leaving a dangling escape.  (This control structure is a
-          ;; crock.)
-          (if delp (backward-delete-char 1))))))
-
-;;; This auxiliary interactive function returns true if the backslash
-;;; should be deleted and false if not.
-
-(defun paredit-escape (char)
-  ;; I'm too lazy to figure out how to do this without a separate
-  ;; interactive function.
-  (interactive "cEscaping character...")
-  (if (eq char 127)                     ; The backslash was a typo, so
-      t                                 ; the luser wants to delete it.
-    (insert char)                       ; (Is there a better way to
-    nil))                               ; express the rubout char?
-                                        ; ?\^? works, but ugh...)
-
+  ;; Read a character to insert after the backslash.  If anything
+  ;; goes wrong -- the user hits delete (entering the rubout
+  ;; `character'), aborts with C-g, or enters non-character input
+  ;; -- then delete the backslash to avoid a dangling escape.
+  (let ((delete-p t))
+    (unwind-protect
+        (let ((char (read-char "Character to escape: ")))
+          (if (not (eq char ?\^?))
+              (progn (message "Character to escape: %c" char)
+                     (insert char)
+                     (setq delete-p nil))))
+      (if delete-p
+          (progn (message "Deleting escape.")
+                 (delete-char -1))))))
+
 (defun paredit-newline ()
   "Insert a newline and indent it.
 This is like `newline-and-indent', but it not only indents the line
@@ -1013,7 +982,8 @@ If in a comment and if followed by invalid structure, call
          (newline))
         ((paredit-in-comment-p)
          (if (paredit-region-ok-p (point) (point-at-eol))
-             (progn (newline-and-indent) (indent-sexp))
+             (progn (newline-and-indent)
+                    (paredit-ignore-sexp-errors (indent-sexp)))
              (indent-new-comment-line)))
         (t
          (if (paredit-in-char-p)
@@ -1030,11 +1000,12 @@ If the point is in a string or a comment, fill the paragraph instead,
   (interactive "P")
   (if (or (paredit-in-string-p)
           (paredit-in-comment-p))
-      (fill-paragraph argument)
-    (save-excursion
-      (end-of-defun)
-      (beginning-of-defun)
-      (indent-sexp))))
+      (lisp-fill-paragraph argument)
+    (paredit-preserving-column
+      (save-excursion
+        (end-of-defun)
+        (beginning-of-defun)
+        (indent-sexp)))))
 
 ;;;; Comment Insertion
 
@@ -1060,25 +1031,37 @@ If a list begins on the line after the point but ends on a different
           (insert (make-string (or n 1) ?\; ))))))
 
 (defun paredit-semicolon-find-line-break-point ()
-  (let ((line-break-point nil)
-        (eol (point-at-eol)))
-    (and (save-excursion
-           (paredit-handle-sexp-errors
-               (progn
-                 (while
-                     (progn
-                       (setq line-break-point (point))
-                       (forward-sexp)
-                       (and (eq eol (point-at-eol))
-                            (not (eobp)))))
-                 (backward-sexp)
-                 (eq eol (point-at-eol)))
-             ;; If we hit the end of an expression, but the closing
-             ;; delimiter is on another line, don't break the line.
-             (save-excursion
-               (paredit-skip-whitespace t (point-at-eol))
-               (not (or (eolp) (eq (char-after) ?\; ))))))
-         line-break-point)))
+  (and (not (eolp))                   ;Implies (not (eobp)).
+       (let ((eol (point-at-eol)))
+         (save-excursion
+           (catch 'exit
+             (while t
+               (let ((line-break-point (point)))
+                 (cond ((paredit-handle-sexp-errors (progn (forward-sexp) t)
+                          nil)
+                        ;; Successfully advanced by an S-expression.
+                        ;; If that S-expression started on this line
+                        ;; and ended on another one, break here.
+                        (cond ((not (eq eol (point-at-eol)))
+                               (throw 'exit
+                                      (and (save-excursion
+                                             (backward-sexp)
+                                             (eq eol (point-at-eol)))
+                                           line-break-point)))
+                              ((eobp)
+                               (throw 'exit nil))))
+                       ((save-excursion
+                          (paredit-skip-whitespace t (point-at-eol))
+                          (or (eolp) (eobp) (eq (char-after) ?\;)))
+                        ;; Can't move further, but there's no closing
+                        ;; delimiter we're about to clobber -- either
+                        ;; it's on the next line or we're at the end of
+                        ;; the buffer.  Don't break the line.
+                        (throw 'exit nil))
+                       (t
+                        ;; Can't move because we hit a delimiter at the
+                        ;; end of this line.  Break here.
+                        (throw 'exit line-break-point))))))))))
 
 (defun paredit-semicolon-with-line-break (line-break-point n)
   (let ((line-break-marker (make-marker)))
@@ -1183,8 +1166,9 @@ This is expected to be called only in `paredit-comment-dwim'; do not
            (insert ";;; "))
           ((or code-after-p (not code-before-p))
            ;; Code comment
-           (if code-before-p (newline))
-           (lisp-indent-line)
+           (if code-before-p
+               (newline-and-indent)
+               (lisp-indent-line))
            (insert ";; ")
            (if code-after-p
                (save-excursion
@@ -1209,7 +1193,7 @@ With a `C-u' prefix argument, simply delete a character forward,
   without regard for delimiter balancing."
   (interactive "P")
   (cond ((or (consp argument) (eobp))
-         (delete-char 1))
+         (delete-char +1))
         ((integerp argument)
          (if (< argument 0)
              (paredit-backward-delete argument)
@@ -1219,15 +1203,12 @@ With a `C-u' prefix argument, simply delete a character forward,
         ((paredit-in-string-p)
          (paredit-forward-delete-in-string))
         ((paredit-in-comment-p)
-         ;++ What to do here?  This could move a partial S-expression
-         ;++ into a comment and thereby invalidate the file's form,
-         ;++ or move random text out of a comment.
-         (delete-char 1))
+         (paredit-forward-delete-in-comment))
         ((paredit-in-char-p)            ; Escape -- delete both chars.
-         (backward-delete-char 1)
-         (delete-char 1))
+         (delete-char -1)
+         (delete-char +1))
         ((eq (char-after) ?\\ )         ; ditto
-         (delete-char 2))
+         (delete-char +2))
         ((let ((syn (char-syntax (char-after))))
            (or (eq syn ?\( )
                (eq syn ?\" )))
@@ -1236,18 +1217,27 @@ With a `C-u' prefix argument, simply delete a character forward,
                  nil))
              (forward-char)
            (message "Deleting spurious opening delimiter.")
-           (delete-char 1)))
+           (delete-char +1)))
         ((and (not (paredit-in-char-p (1- (point))))
               (eq (char-syntax (char-after)) ?\) )
               (eq (char-before) (matching-paren (char-after))))
-         (backward-delete-char 1)       ; Empty list -- delete both
-         (delete-char 1))               ;   delimiters.
+         (delete-char -1)               ; Empty list -- delete both
+         (delete-char +1))              ;   delimiters.
+        ((eq ?\; (char-after))
+         (paredit-forward-delete-comment-start))
+        ((eq (char-syntax (char-after)) ?\) )
+         (if (paredit-handle-sexp-errors
+                 (save-excursion (forward-char) (backward-sexp) t)
+               nil)
+             (message "End of list!")
+             (progn
+               (message "Deleting spurious closing delimiter.")
+               (delete-char +1))))
         ;; Just delete a single character, if it's not a closing
         ;; delimiter.  (The character literal case is already handled
         ;; by now.)
-        ((not (eq (char-syntax (char-after)) ?\) ))
-         (delete-char 1))))
-
+        (t (delete-char +1))))
+
 (defun paredit-forward-delete-in-string ()
   (let ((start+end (paredit-string-start+end-points)))
     (cond ((not (eq (point) (cdr start+end)))
@@ -1256,20 +1246,40 @@ With a `C-u' prefix argument, simply delete a character forward,
            (cond ((paredit-in-string-escape-p)
                   ;; We're right after the backslash, so backward
                   ;; delete it before deleting the escaped character.
-                  (backward-delete-char 1))
+                  (delete-char -1))
                  ((eq (char-after) ?\\ )
                   ;; If we're not in a string escape, but we are on a
                   ;; backslash, it must start the escape for the next
                   ;; character, so delete the backslash before deleting
                   ;; the next character.
-                  (delete-char 1)))
-           (delete-char 1))
+                  (delete-char +1)))
+           (delete-char +1))
           ((eq (1- (point)) (car start+end))
            ;; If it is the close-quote, delete only if we're also right
            ;; past the open-quote (i.e. it's empty), and then delete
            ;; both quotes.  Otherwise we refuse to delete it.
-           (backward-delete-char 1)
-           (delete-char 1)))))
+           (delete-char -1)
+           (delete-char +1)))))
+
+(defun paredit-check-forward-delete-in-comment ()
+  ;; Point is in a comment, possibly at eol.  We are about to delete
+  ;; some characters forward; if we are at eol, we are about to delete
+  ;; the line break.  Refuse to do so if if moving the next line into
+  ;; the comment would break structure.
+  (if (eolp)
+      (let ((next-line-start (point-at-bol 2))
+            (next-line-end (point-at-eol 2)))
+        (paredit-check-region next-line-start next-line-end))))
+
+(defun paredit-forward-delete-in-comment ()
+  (paredit-check-forward-delete-in-comment)
+  (delete-char +1))
+
+(defun paredit-forward-delete-comment-start ()
+  ;; Point precedes a comment start (not at eol).  Refuse to delete a
+  ;; comment start if the comment contains unbalanced junk.
+  (paredit-check-region (+ (point) 1) (point-at-eol))
+  (delete-char +1))
 
 (defun paredit-backward-delete (&optional argument)
   "Delete a character backward or move backward over a delimiter.
@@ -1283,7 +1293,7 @@ With a `C-u' prefix argument, simply delete a character backward,
   (interactive "P")
   (cond ((or (consp argument) (bobp))
          ;++ Should this untabify?
-         (backward-delete-char 1))
+         (delete-char -1))
         ((integerp argument)
          (if (< argument 0)
              (paredit-forward-delete (- 0 argument))
@@ -1293,12 +1303,12 @@ With a `C-u' prefix argument, simply delete a character backward,
         ((paredit-in-string-p)
          (paredit-backward-delete-in-string))
         ((paredit-in-comment-p)
-         (backward-delete-char 1))
+         (paredit-backward-delete-in-comment))
         ((paredit-in-char-p)            ; Escape -- delete both chars.
-         (backward-delete-char 1)
-         (delete-char 1))
+         (delete-char -1)
+         (delete-char +1))
         ((paredit-in-char-p (1- (point)))
-         (backward-delete-char 2))      ; ditto
+         (delete-char -2))              ; ditto
         ((let ((syn (char-syntax (char-before))))
            (or (eq syn ?\) )
                (eq syn ?\" )))
@@ -1307,16 +1317,31 @@ With a `C-u' prefix argument, simply delete a character backward,
                  nil))
              (backward-char)
            (message "Deleting spurious closing delimiter.")
-           (backward-delete-char 1)))
+           (delete-char -1)))
         ((and (eq (char-syntax (char-before)) ?\( )
               (eq (char-after) (matching-paren (char-before))))
-         (backward-delete-char 1)       ; Empty list -- delete both
-         (delete-char 1))               ;   delimiters.
+         (delete-char -1)               ; Empty list -- delete both
+         (delete-char +1))              ;   delimiters.
+        ((bolp)
+         (paredit-backward-delete-maybe-comment-end))
+        ((eq (char-syntax (char-before)) ?\( )
+         (if (paredit-handle-sexp-errors
+                 (save-excursion (backward-char) (forward-sexp) t)
+               nil)
+             (message "Beginning of list!")
+             (progn
+               (message "Deleting spurious closing delimiter.")
+               (delete-char -1))))
         ;; Delete it, unless it's an opening delimiter.  The case of
         ;; character literals is already handled by now.
-        ((not (eq (char-syntax (char-before)) ?\( ))
-         (backward-delete-char-untabify 1))))
-
+        (t
+         ;; Turn off the @#&*&!^&(%^ botch in GNU Emacs 24 that changed
+         ;; `backward-delete-char' and `backward-delete-char-untabify'
+         ;; semantically so that they delete the region in transient
+         ;; mark mode.
+         (let ((delete-active-region nil))
+           (backward-delete-char-untabify +1)))))
+
 (defun paredit-backward-delete-in-string ()
   (let ((start+end (paredit-string-start+end-points)))
     (cond ((not (eq (1- (point)) (car start+end)))
@@ -1325,20 +1350,43 @@ With a `C-u' prefix argument, simply delete a character backward,
                ;; If we're on a string escape, since we're about to
                ;; delete the backslash, we must first delete the
                ;; escaped char.
-               (delete-char 1))
-           (backward-delete-char 1)
+               (delete-char +1))
+           (delete-char -1)
            (if (paredit-in-string-escape-p)
                ;; If, after deleting a character, we find ourselves in
                ;; a string escape, we must have deleted the escaped
                ;; character, and the backslash is behind the point, so
                ;; backward delete it.
-               (backward-delete-char 1)))
+               (delete-char -1)))
           ((eq (point) (cdr start+end))
            ;; If it is the open-quote, delete only if we're also right
            ;; past the close-quote (i.e. it's empty), and then delete
            ;; both quotes.  Otherwise we refuse to delete it.
-           (backward-delete-char 1)
-           (delete-char 1)))))
+           (delete-char -1)
+           (delete-char +1)))))
+
+(defun paredit-backward-delete-in-comment ()
+  ;; Point is in a comment, possibly just after the comment start.
+  ;; Refuse to delete a comment start if the comment contains
+  ;; unbalanced junk.
+  (if (save-excursion
+        (backward-char)
+        ;; Must call `paredit-in-string-p' before
+        ;; `paredit-in-comment-p'.
+        (not (or (paredit-in-string-p) (paredit-in-comment-p))))
+      (paredit-check-region (point) (point-at-eol)))
+  (backward-delete-char-untabify +1))
+
+(defun paredit-backward-delete-maybe-comment-end ()
+  ;; Point is at bol, possibly just after a comment end (i.e., the
+  ;; previous line may have had a line comment).  Refuse to delete a
+  ;; comment end if moving the current line into the previous line's
+  ;; comment would break structure.
+  (if (save-excursion
+        (backward-char)
+        (and (not (paredit-in-string-p)) (paredit-in-comment-p)))
+      (paredit-check-region (point-at-eol) (point-at-bol)))
+  (delete-char -1))
 
 ;;;; Killing
 
@@ -1357,7 +1405,7 @@ With a numeric prefix argument N, do `kill-line' that many times."
         ((paredit-in-string-p)
          (paredit-kill-line-in-string))
         ((paredit-in-comment-p)
-         (kill-line))
+         (paredit-kill-line-in-comment))
         ((save-excursion (paredit-skip-whitespace t (point-at-eol))
                          (or (eolp) (eq (char-after) ?\; )))
          ;** Be careful about trailing backslashes.
@@ -1378,6 +1426,12 @@ With a numeric prefix argument N, do `kill-line' that many times."
                    (min (point-at-eol)
                         (cdr (paredit-string-start+end-points)))))))
 
+(defun paredit-kill-line-in-comment ()
+  ;; The variable `kill-whole-line' is not relevant: the point is in a
+  ;; comment, and hence not at the beginning of the line.
+  (paredit-check-forward-delete-in-comment)
+  (kill-line))
+
 (defun paredit-kill-sexps-on-line ()
   (if (paredit-in-char-p)               ; Move past the \ and prefix.
       (backward-char 2))                ; (# in Scheme/CL, ? in elisp)
@@ -1610,160 +1664,203 @@ With a numeric prefix argument N, do `kill-line' that many times."
                                    (t
                                     (point))))))))
 
-;;;; Safe Region Killing/Copying
-
-;;; This is an experiment.  It's not enough: `paredit-kill-ring-save'
-;;; is always safe; it's `yank' that's not safe, but even trickier to
-;;; implement than `paredit-kill-region'.  Also, the heuristics for
-;;; `paredit-kill-region' are slightly too conservative -- they will
-;;; sometimes reject killing regions that would be safe to kill.
-;;; (Consider, e,g., a region that starts in a comment and ends in the
-;;; middle of a symbol at the end of a line: that's safe to kill, but
-;;; `paredit-kill-region' won't allow it.)  I don't know whether they
-;;; are too liberal: I haven't constructed a region that is unsafe to
-;;; kill but which `paredit-kill-region' will kill, but I haven't ruled
-;;; out the possibility either.
-
-(defun paredit-kill-ring-save (beginning end)
-  "Save the balanced region, but don't kill it, like `kill-ring-save'.
-If the text of the region is imbalanced, signal an error instead.
-With a prefix argument, disregard any imbalance."
+;;;; Deleting Regions
+
+(defun paredit-delete-region (start end)
+  "Delete the text between point and mark, like `delete-region'.
+If that text is unbalanced, signal an error instead.
+With a prefix argument, skip the balance check."
   (interactive "r")
-  (if (not current-prefix-arg)
-      (paredit-check-region beginning end))
-  (setq this-command 'kill-ring-save)
-  (kill-ring-save beginning end))
-
-(defun paredit-kill-region (beginning end &optional yank-handler)
-  "Kill balanced text between point and mark, like `kill-region'.
-If that text is imbalanced, signal an error instead."
+  (if (and start end (not current-prefix-arg))
+      (paredit-check-region-for-delete start end))
+  (setq this-command 'delete-region)
+  (delete-region start end))
+
+(defun paredit-kill-region (start end)
+  "Kill the text between point and mark, like `kill-region'.
+If that text is unbalanced, signal an error instead.
+With a prefix argument, skip the balance check."
   (interactive "r")
-  (if (and beginning end)
-      ;; Check that region begins and ends in a sufficiently similar
-      ;; state, so that deleting it will leave the buffer balanced.
-      (save-excursion
-        (goto-char beginning)
-        (let* ((state (paredit-current-parse-state))
-               (state* (parse-partial-sexp beginning end nil nil state)))
-          (paredit-check-region-state state state*))))
+  (if (and start end (not current-prefix-arg))
+      (paredit-check-region-for-delete start end))
   (setq this-command 'kill-region)
-  (kill-region beginning end yank-handler))
-
-(defun paredit-check-region-state (beginning-state end-state)
-  (paredit-check-region-state-depth beginning-state end-state)
-  (paredit-check-region-state-string beginning-state end-state)
-  (paredit-check-region-state-comment beginning-state end-state)
-  (paredit-check-region-state-char-quote beginning-state end-state))
-
-(defun paredit-check-region-state-depth (beginning-state end-state)
-  (let ((beginning-depth (nth 0 beginning-state))
+  (kill-region start end))
+
+(defun paredit-check-region-for-delete (start end)
+  "Signal an error deleting text between START and END is unsafe."
+  (save-excursion
+    (goto-char start)
+    (let* ((start-state (paredit-current-parse-state))
+           (end-state (parse-partial-sexp start end nil nil start-state)))
+      (paredit-check-region-for-delete:depth start start-state end end-state)
+      (paredit-check-region-for-delete:string start start-state end end-state)
+      (paredit-check-region-for-delete:comment start start-state end end-state)
+      (paredit-check-region-for-delete:char-quote start start-state
+                                                  end end-state))))
+
+(defun paredit-check-region-for-delete:depth (start start-state end end-state)
+  (let ((start-depth (nth 0 start-state))
         (end-depth (nth 0 end-state)))
-    (if (not (= beginning-depth end-depth))
+    (if (not (= start-depth end-depth))
         (error "Mismatched parenthesis depth: %S at start, %S at end."
-               beginning-depth
+               start-depth
                end-depth))))
 
-(defun paredit-check-region-state-string (beginning-state end-state)
-  (let ((beginning-string-p (nth 3 beginning-state))
+(defun paredit-check-region-for-delete:string (start start-state end end-state)
+  (let ((start-string-p (nth 3 start-state))
         (end-string-p (nth 3 end-state)))
-    (if (not (eq beginning-string-p end-string-p))
+    (if (not (eq start-string-p end-string-p))
         (error "Mismatched string state: start %sin string, end %sin string."
-               (if beginning-string-p "" "not ")
+               (if start-string-p "" "not ")
                (if end-string-p "" "not ")))))
-
-(defun paredit-check-region-state-comment (beginning-state end-state)
-  (let ((beginning-comment-state (nth 4 beginning-state))
+
+(defun paredit-check-region-for-delete:comment
+    (start start-state end end-state)
+  (let ((start-comment-state (nth 4 start-state))
         (end-comment-state (nth 4 end-state)))
-    (if (not (or (eq beginning-comment-state end-comment-state)
-                 (and (eq beginning-comment-state nil)
-                      (eq end-comment-state t)
-                      (eolp))))
+    (if (not (or (eq start-comment-state end-comment-state)
+                 ;; If we are moving text into or out of a line
+                 ;; comment, make sure that the text is balanced.  (The
+                 ;; comment state may be a number, not t or nil at all,
+                 ;; for nestable comments, which are not handled by
+                 ;; this heuristic (or any of paredit, really).)
+                 (and (or (and (eq start-comment-state nil)
+                               (eq end-comment-state t))
+                          (and (eq start-comment-state t)
+                               (eq end-comment-state nil)))
+                      (save-excursion
+                        (goto-char end)
+                        (paredit-region-ok-p (point) (point-at-eol))))))
         (error "Mismatched comment state: %s"
-               (cond ((and (integerp beginning-comment-state)
+               (cond ((and (integerp start-comment-state)
                            (integerp end-comment-state))
                       (format "depth %S at start, depth %S at end."
-                              beginning-comment-state
+                              start-comment-state
                               end-comment-state))
-                     ((integerp beginning-comment-state)
+                     ((integerp start-comment-state)
                       "start in nested comment, end otherwise.")
                      ((integerp end-comment-state)
                       "end in nested comment, start otherwise.")
-                     (beginning-comment-state
+                     (start-comment-state
                       "start in comment, end not in comment.")
                      (end-comment-state
                       "end in comment, start not in comment.")
                      (t
                       (format "start %S, end %S."
-                              beginning-comment-state
+                              start-comment-state
                               end-comment-state)))))))
 
-(defun paredit-check-region-state-char-quote (beginning-state end-state)
-  (let ((beginning-char-quote (nth 5 beginning-state))
+(defun paredit-check-region-for-delete:char-quote
+    (start start-state end end-state)
+  (let ((start-char-quote (nth 5 start-state))
         (end-char-quote (nth 5 end-state)))
-    (if (not (eq beginning-char-quote end-char-quote))
+    (if (not (eq start-char-quote end-char-quote))
         (let ((phrase "character quotation"))
           (error "Mismatched %s: start %sin %s, end %sin %s."
                  phrase
-                 (if beginning-char-quote "" "not ")
+                 (if start-char-quote "" "not ")
                  phrase
                  (if end-char-quote "" "not ")
                  phrase)))))
 
-;;;; Cursor and Screen Movement
+;;;; Point Motion
 
 (eval-and-compile
-  (defmacro defun-saving-mark (name bvl doc &rest body)
+  (defmacro defun-motion (name bvl doc &rest body)
     `(defun ,name ,bvl
        ,doc
        ,(xcond ((paredit-xemacs-p)
                 '(interactive "_"))
                ((paredit-gnu-emacs-p)
-                '(interactive)))
+                ;++ Not sure this is sufficient for the `^'.
+                (if (fboundp 'handle-shift-selection)
+                    '(interactive "^p")
+                    '(interactive "p"))))
        ,@body)))
 
-(defun-saving-mark paredit-forward ()
+(defun-motion paredit-forward (&optional arg)
   "Move forward an S-expression, or up an S-expression forward.
 If there are no more S-expressions in this one before the closing
   delimiter, move past that closing delimiter; otherwise, move forward
   past the S-expression following the point."
-  (paredit-handle-sexp-errors
-      (forward-sexp)
-    ;++ Is it necessary to use UP-LIST and not just FORWARD-CHAR?
-    (if (paredit-in-string-p) (forward-char) (up-list))))
+  (let ((n (or arg 1)))
+    (cond ((< 0 n) (dotimes (i n)       (paredit-move-forward)))
+          ((< n 0) (dotimes (i (- n))   (paredit-move-backward))))))
 
-(defun-saving-mark paredit-backward ()
+(defun-motion paredit-backward (&optional arg)
   "Move backward an S-expression, or up an S-expression backward.
 If there are no more S-expressions in this one before the opening
   delimiter, move past that opening delimiter backward; otherwise, move
   move backward past the S-expression preceding the point."
-  (paredit-handle-sexp-errors
-      (backward-sexp)
-    (if (paredit-in-string-p) (backward-char) (backward-up-list))))
-
-;;; Why is this not in lisp.el?
+  (let ((n (or arg 1)))
+    (cond ((< 0 n) (dotimes (i n)       (paredit-move-backward)))
+          ((< n 0) (dotimes (i (- n))   (paredit-move-forward))))))
+
+(defun paredit-move-forward ()
+  (cond ((paredit-in-string-p)
+         (let ((end (paredit-enclosing-string-end)))
+           ;; `forward-sexp' and `up-list' may move into the next string
+           ;; in the buffer.  Don't do that; move out of the current one.
+           (if (paredit-handle-sexp-errors
+                   (progn (paredit-handle-sexp-errors (forward-sexp)
+                            (up-list))
+                          (<= end (point)))
+                 t)
+               (goto-char end))))
+        ((paredit-in-char-p)
+         (forward-char))
+        (t
+         (paredit-handle-sexp-errors (forward-sexp)
+           (up-list)))))
 
-(defun backward-down-list (&optional arg)
-  "Move backward and descend into one level of parentheses.
-With ARG, do this that many times.
-A negative argument means move forward but still descend a level."
-  (interactive "p")
-  (down-list (- (or arg 1))))
+(defun paredit-move-backward ()
+  (cond ((paredit-in-string-p)
+         (let ((start (paredit-enclosing-string-start)))
+           (if (paredit-handle-sexp-errors
+                   (progn (paredit-handle-sexp-errors (backward-sexp)
+                            (backward-up-list))
+                          (<= (point) start))
+                 t)
+               (goto-char start))))
+        ((paredit-in-char-p)
+         ;++ Corner case: a buffer of `\|x'.  What to do?
+         (backward-char 2))
+        (t
+         (paredit-handle-sexp-errors (backward-sexp)
+           (backward-up-list)))))
+
+;;;; Window Positioning
 
-;;; Thanks to Marco Baringer for suggesting & writing this function.
+(defalias 'paredit-recentre-on-sexp 'paredit-recenter-on-sexp)
 
-(defun paredit-recentre-on-sexp (&optional n)
-  "Recentre the screen on the S-expression following the point.
+(defun paredit-recenter-on-sexp (&optional n)
+  "Recenter the screen on the S-expression following the point.
 With a prefix argument N, encompass all N S-expressions forward."
   (interactive "P")
+  (let* ((p (point))
+         (end-point (progn (forward-sexp n) (point)))
+         (start-point (progn (goto-char end-point) (backward-sexp n) (point))))
+    ;; Point is at beginning of first S-expression.
+    (let ((p-visible nil) (start-visible nil))
+      (save-excursion
+        (forward-line (/ (count-lines start-point end-point) 2))
+        (recenter)
+        (setq p-visible (pos-visible-in-window-p p))
+        (setq start-visible (pos-visible-in-window-p start-point)))
+      (cond ((not start-visible)
+             ;; Implies (not p-visible).  Put the start at the top of
+             ;; the screen.
+             (recenter 0))
+            (p-visible
+             ;; Go back to p if we can.
+             (goto-char p))))))
+
+(defun paredit-recenter-on-defun ()
+  "Recenter the screen on the definition at point."
+  (interactive)
   (save-excursion
-    (forward-sexp n)
-    (let ((end-point (point)))
-      (backward-sexp n)
-      (let* ((start-point (point))
-             (start-line (count-lines (point-min) (point)))
-             (lines-on-sexps (count-lines start-point end-point)))
-        (goto-line (+ start-line (/ lines-on-sexps 2)))
-        (recenter)))))
+    (beginning-of-defun)
+    (paredit-recenter-on-sexp)))
 
 (defun paredit-focus-on-defun ()
   "Moves display to the top of the definition at point."
@@ -1823,13 +1920,15 @@ With a prefix argument N, encompass all N S-expressions forward."
                   'paredit-up/down)))))
 
 (defun paredit-find-next-string-start (horizontal-direction limit)
-  (let ((next-char (if (< 0 horizontal-direction) 'char-after 'char-before))
-        (pastp (if (< 0 horizontal-direction) '< '>)))
+  (let ((buffer-limit-p (if (< 0 horizontal-direction) 'eobp 'bobp))
+        (next-char (if (< 0 horizontal-direction) 'char-after 'char-before))
+        (pastp (if (< 0 horizontal-direction) '> '<)))
     (paredit-handle-sexp-errors
         (save-excursion
           (catch 'exit
             (while t
-              (if (and limit (funcall pastp (point) limit))
+              (if (or (funcall buffer-limit-p)
+                      (and limit (funcall pastp (point) limit)))
                   (throw 'exit nil))
               (forward-sexp horizontal-direction)
               (save-excursion
@@ -1838,34 +1937,30 @@ With a prefix argument N, encompass all N S-expressions forward."
                     (throw 'exit (+ (point) horizontal-direction)))))))
       nil)))
 
-(defun paredit-forward-down (&optional argument)
+(defun-motion paredit-forward-down (&optional argument)
   "Move forward down into a list.
 With a positive argument, move forward down that many levels.
 With a negative argument, move backward down that many levels."
-  (interactive "p")
   (paredit-up/down (or argument +1) -1))
 
-(defun paredit-backward-up (&optional argument)
+(defun-motion paredit-backward-up (&optional argument)
   "Move backward up out of the enclosing list.
 With a positive argument, move backward up that many levels.
 With a negative argument, move forward up that many levels.
 If in a string initially, that counts as one level."
-  (interactive "p")
   (paredit-up/down (- 0 (or argument +1)) +1))
 
-(defun paredit-forward-up (&optional argument)
+(defun-motion paredit-forward-up (&optional argument)
   "Move forward up out of the enclosing list.
 With a positive argument, move forward up that many levels.
 With a negative argument, move backward up that many levels.
 If in a string initially, that counts as one level."
-  (interactive "p")
   (paredit-up/down (or argument +1) +1))
 
-(defun paredit-backward-down (&optional argument)
+(defun-motion paredit-backward-down (&optional argument)
   "Move backward down into a list.
 With a positive argument, move backward down that many levels.
 With a negative argument, move forward down that many levels."
-  (interactive "p")
   (paredit-up/down (- 0 (or argument +1)) -1))
 
 ;;;; Depth-Changing Commands:  Wrapping, Splicing, & Raising
@@ -1895,15 +1990,6 @@ By default OPEN and CLOSE are round delimiters."
       (backward-char)))
   (save-excursion (backward-up-list) (indent-sexp)))
 
-(defun paredit-count-sexps-forward ()
-  (save-excursion
-    (let ((n 0))
-      (paredit-ignore-sexp-errors
-        (while (not (eobp))
-          (forward-sexp)
-          (setq n (+ n 1))))
-      n)))
-
 (defun paredit-yank-pop (&optional argument)
   "Replace just-yanked text with the next item in the kill ring.
 If this command follows a `yank', just run `yank-pop'.
@@ -1934,12 +2020,6 @@ The argument is passed on to `yank' or `yank-pop'; see their
          (save-excursion (backward-up-list) (indent-sexp)))
         (t (error "Last command was not a yank or a wrap: %s" last-command))))
 
-;;; Thanks to Marco Baringer for the suggestion of a prefix argument
-;;; for PAREDIT-SPLICE-SEXP.  (I, Taylor R. Campbell, however, still
-;;; implemented it, in case any of you lawyer-folk get confused by the
-;;; remark in the top of the file about explicitly noting code written
-;;; by other people.)
-
 (defun paredit-splice-sexp (&optional argument)
   "Splice the list that the point is on by removing its delimiters.
 With a prefix argument as in `C-u', kill all S-expressions backward in
@@ -1956,23 +2036,43 @@ Inside a string, unescape all backslashes, or signal an error if doing
   (interactive "P")
   (if (paredit-in-string-p)
       (paredit-splice-string argument)
-      (save-excursion
-        (paredit-kill-surrounding-sexps-for-splice argument)
-        (let ((end (point)))
-          (backward-up-list)            ; Go up to the beginning...
-          (save-excursion
-            (forward-char 1)            ; (Skip over leading whitespace
-            (paredit-skip-whitespace t end)
-            (setq end (point)))         ;   for the `delete-region'.)
-          (let ((indent-start nil) (indent-end nil))
+    (if (paredit-in-comment-p)
+        (error "Can't splice comment."))
+    (paredit-handle-sexp-errors (paredit-enclosing-list-start)
+      (error "Can't splice top level."))
+    (paredit-kill-surrounding-sexps-for-splice argument)
+    (let ((delete-start (paredit-enclosing-list-start))
+          (delete-end
+           (let ((limit
+                  (save-excursion
+                    (paredit-ignore-sexp-errors (forward-sexp) (backward-sexp))
+                    (point))))
+             (save-excursion
+               (backward-up-list)
+               (forward-char +1)
+               (paredit-skip-whitespace t limit)
+               (point)))))
+      (let ((end-marker (make-marker)))
+        (save-excursion
+          (up-list)
+          (delete-char -1)
+          (set-marker end-marker (point)))
+        (delete-region delete-start delete-end)
+        (paredit-splice-reindent delete-start (marker-position end-marker))))))
+
+(defun paredit-splice-reindent (start end)
+  (paredit-preserving-column
+    ;; If we changed the first subform of the enclosing list, we must
+    ;; reindent the whole enclosing list.
+    (if (paredit-handle-sexp-errors
             (save-excursion
-              (setq indent-start (point))
-              (forward-sexp)            ; Go forward an expression, to
-              (backward-delete-char 1)  ;   delete the end delimiter.
-              (setq indent-end (point)))
-            (delete-region (point) end) ; ...to delete the open char.
-            ;; Reindent only the region we preserved.
-            (indent-region indent-start indent-end))))))
+              (backward-up-list)
+              (down-list)
+              (paredit-ignore-sexp-errors (forward-sexp))
+              (< start (point)))
+          nil)
+        (save-excursion (backward-up-list) (indent-sexp))
+        (paredit-indent-region start end))))
 
 (defun paredit-kill-surrounding-sexps-for-splice (argument)
   (cond ((or (paredit-in-string-p)
@@ -2051,7 +2151,10 @@ If the point is on an S-expression, such as a string or a symbol, not
       (delete-region (point) (scan-sexps (point) 1))
       (let* ((indent-start (point))
              (indent-end (save-excursion (insert sexps) (point))))
-        (indent-region indent-start indent-end)))))
+        (indent-region indent-start indent-end nil)))))
+
+;;; The effects of convolution on the surrounding whitespace are pretty
+;;; random.  If you have better suggestions, please let me know.
 
 (defun paredit-convolute-sexp (&optional n)
   "Convolute S-expressions.
@@ -2061,6 +2164,8 @@ Wrap the enclosing list in a new list prefixed by the saved text.
 With a prefix argument N, move up N lists before wrapping."
   (interactive "p")
   (paredit-lose-if-not-in-sexp 'paredit-convolute-sexp)
+  ;; Make sure we can move up before destroying anything.
+  (save-excursion (backward-up-list n) (backward-up-list))
   (let (open close)                     ;++ Is this a good idea?
     (let ((prefix
            (let ((end (point)))
@@ -2070,14 +2175,19 @@ With a prefix argument N, move up N lists before wrapping."
                (backward-up-list)
                (save-excursion (forward-sexp)
                                (setq close (char-before))
-                               (backward-delete-char 1))
+                               (delete-char -1))
                (setq open (char-after))
-               (delete-region (point) end)))))
+               (delete-region (point) end)
+               ;; I'm not sure this makes sense...
+               (if (not (eolp)) (just-one-space))))))
       (backward-up-list n)
       (paredit-insert-pair 1 open close 'goto-char)
       (insert prefix)
-      (backward-up-list)
-      (paredit-ignore-sexp-errors (indent-sexp)))))
+      ;; I'm not sure this makes sense either...
+      (if (not (eolp)) (just-one-space))
+      (save-excursion
+        (backward-up-list)
+        (paredit-ignore-sexp-errors (indent-sexp))))))
 
 (defun paredit-splice-string (argument)
   (let ((original-point (point))
@@ -2116,13 +2226,14 @@ With a prefix argument N, move up N lists before wrapping."
                 (search-forward "\\" nil t))
       (delete-char -1)
       (forward-char))
-    (condition-case condition
-        (progn (check-parens) (buffer-string))
-      (error nil))))
+    (paredit-handle-sexp-errors
+        (progn (scan-sexps (point-min) (point-max))
+               (buffer-string))
+      nil)))
 
 ;;;; Slurpage & Barfage
 
-(defun paredit-forward-slurp-sexp ()
+(defun paredit-forward-slurp-sexp (&optional argument)
   "Add the S-expression following the current list into that list
   by moving the closing delimiter.
 Automatically reindent the newly slurped S-expression with respect to
@@ -2130,65 +2241,127 @@ Automatically reindent the newly slurped S-expression with respect to
 If in a string, move the opening double-quote forward by one
   S-expression and escape any intervening characters as necessary,
   without altering any indentation or formatting."
-  (interactive)
+  (interactive "P")
   (save-excursion
-    (cond ((or (paredit-in-comment-p)
-               (paredit-in-char-p))
+    (cond ((paredit-in-comment-p)
            (error "Invalid context for slurping S-expressions."))
+          ((numberp argument)
+           (if (< argument 0)
+               (paredit-forward-barf-sexp (- 0 argument))
+               (while (< 0 argument)
+                 (paredit-forward-slurp-sexp)
+                 (setq argument (- argument 1)))))
           ((paredit-in-string-p)
-           (paredit-forward-slurp-into-string))
+           ;; If there is anything to slurp into the string, take that.
+           ;; Otherwise, try to slurp into the enclosing list.
+           (if (save-excursion
+                 (goto-char (paredit-enclosing-string-end))
+                 (paredit-handle-sexp-errors (progn (forward-sexp) nil)
+                   t))
+               (progn
+                 (goto-char (paredit-enclosing-string-end))
+                 (paredit-forward-slurp-into-list argument))
+               (paredit-forward-slurp-into-string argument)))
           (t
-           (paredit-forward-slurp-into-list)))))
-
-(defun paredit-forward-slurp-into-list ()
-  (up-list)                             ; Up to the end of the list to
-  (let ((close (char-before)))          ;   save and delete the closing
-    (backward-delete-char 1)            ;   delimiter.
-    (catch 'return                      ; Go to the end of the desired
-      (while t                          ;   S-expression, going up a
-        (paredit-handle-sexp-errors     ;   list if it's not in this,
-            (progn (paredit-forward-and-indent)
-                   (throw 'return nil))
-          (up-list)
-          (setq close                   ; adjusting for mixed
-                (prog1 (char-before)    ;   delimiters as necessary,
-                  (backward-delete-char 1)
-                  (insert close))))))
-    (insert close)))                    ; to insert that delimiter.
-
-(defun paredit-forward-slurp-into-string ()
-  (goto-char (1+ (cdr (paredit-string-start+end-points))))
-  ;; Signal any errors that we might get first, before mucking with the
-  ;; buffer's contents.
-  (save-excursion (forward-sexp))
-  (let ((close (char-before)))
-    (backward-delete-char 1)
-    (paredit-forward-for-quote (save-excursion (forward-sexp) (point)))
-    (insert close)))
-
-(defun paredit-forward-barf-sexp ()
+           (paredit-forward-slurp-into-list argument)))))
+
+(defun paredit-forward-slurp-into-list (&optional argument)
+  (let ((nestedp nil))
+    (save-excursion
+      (up-list)                            ; Up to the end of the list to
+      (let ((close (char-before)))         ;   save and delete the closing
+        (delete-char -1)                   ;   delimiter.
+        (let ((start (point)))
+          (catch 'return                   ; Go to the end of the desired
+            (while t                       ;   S-expression, going up a
+              (paredit-handle-sexp-errors  ;   list if it's not in this,
+                  (progn (forward-sexp)
+                         (if argument
+                             (paredit-ignore-sexp-errors
+                               (while (not (eobp))
+                                 (forward-sexp))))
+                         (throw 'return nil))
+                (setq nestedp t)
+                (up-list)
+                (setq close                ; adjusting for mixed
+                      (prog1 (char-before) ;   delimiters as necessary,
+                        (delete-char -1)
+                        (insert close))))))
+          (insert close)                   ;  to insert that delimiter.
+          (indent-region start (point) nil))))
+    (if (and (not nestedp)
+             (eq (save-excursion (paredit-skip-whitespace nil) (point))
+                 (save-excursion (backward-up-list) (forward-char) (point)))
+             (eq (save-excursion (forward-sexp) (backward-sexp) (point))
+                 (save-excursion (paredit-skip-whitespace t) (point))))
+        (delete-region (save-excursion (paredit-skip-whitespace nil) (point))
+                       (save-excursion (paredit-skip-whitespace t) (point))))))
+
+(defun paredit-forward-slurp-into-string (&optional argument)
+  (let ((start (paredit-enclosing-string-start))
+        (end (paredit-enclosing-string-end)))
+    (goto-char end)
+    ;; Signal any errors that we might get first, before mucking with
+    ;; the buffer's contents.
+    (save-excursion (forward-sexp))
+    (let ((close (char-before)))
+      ;; Skip intervening whitespace if we're slurping into an empty
+      ;; string.  XXX What about nonempty strings?
+      (if (and (= (+ start 2) end)
+               (eq (save-excursion (paredit-skip-whitespace t) (point))
+                   (save-excursion (forward-sexp) (backward-sexp) (point))))
+          (delete-region (- (point) 1)
+                         (save-excursion (paredit-skip-whitespace t) (point)))
+          (delete-char -1))
+      (paredit-forward-for-quote
+       (save-excursion
+         (forward-sexp)
+         (if argument
+             (while (paredit-handle-sexp-errors (progn (forward-sexp) t) nil)))
+         (point)))
+      (insert close))))
+
+(defun paredit-forward-barf-sexp (&optional argument)
   "Remove the last S-expression in the current list from that list
   by moving the closing delimiter.
 Automatically reindent the newly barfed S-expression with respect to
   its new enclosing form."
-  (interactive)
+  (interactive "P")
   (paredit-lose-if-not-in-sexp 'paredit-forward-barf-sexp)
-  (save-excursion
-    (up-list)                           ; Up to the end of the list to
-    (let ((close (char-before)))        ;   save and delete the closing
-      (backward-delete-char 1)          ;   delimiter.
-      (paredit-ignore-sexp-errors       ; Go back to where we want to
-        (backward-sexp))                ;   insert the delimiter.
-      (paredit-skip-whitespace nil)     ; Skip leading whitespace.
-      (cond ((bobp)
-             (error "Barfing all subexpressions with no open-paren?"))
-            ((paredit-in-comment-p)     ; Don't put the close-paren in
-             (newline-and-indent)))     ;   a comment.
-      (insert close))
-    ;; Reindent all of the newly barfed S-expressions.
-    (paredit-forward-and-indent)))
+  (if (and (numberp argument) (< argument 0))
+      (paredit-forward-slurp-sexp (- 0 argument))
+    (let ((start (point)) (end nil))
+      (save-excursion
+        (up-list)                       ; Up to the end of the list to
+        (let ((close (char-before)))    ;   save and delete the closing
+          (delete-char -1)              ;   delimiter.
+          (setq end (point))
+          (paredit-ignore-sexp-errors   ; Go back to where we want to
+            (if (or (not argument)      ;   insert the delimiter.
+                    (numberp argument))
+                (backward-sexp argument)
+                (while (paredit-handle-sexp-errors
+                           (save-excursion (backward-sexp) (<= start (point)))
+                         nil)
+                  (backward-sexp))))
+          (paredit-skip-whitespace nil) ; Skip leading whitespace.
+          (cond ((bobp)
+                 ;++ We'll have deleted the close, but there's no open.
+                 ;++ Is that OK?
+                 (error "Barfing all subexpressions with no open-paren?"))
+                ((paredit-in-comment-p) ; Don't put the close-paren in
+                 (newline)))            ;   a comment.
+          (insert close))
+        ;; Reindent all of the newly barfed S-expressions.  Start at the
+        ;; start of the first barfed S-expression, not at the close we
+        ;; just inserted.
+        (forward-sexp)
+        (backward-sexp)
+        (if (or (not argument) (numberp argument))
+            (paredit-forward-and-indent argument)
+            (indent-region (point) end))))))
 
-(defun paredit-backward-slurp-sexp ()
+(defun paredit-backward-slurp-sexp (&optional argument)
   "Add the S-expression preceding the current list into that list
   by moving the closing delimiter.
 Automatically reindent the whole form into which new S-expression was
@@ -2196,72 +2369,133 @@ Automatically reindent the whole form into which new S-expression was
 If in a string, move the opening double-quote backward by one
   S-expression and escape any intervening characters as necessary,
   without altering any indentation or formatting."
-  (interactive)
+  (interactive "P")
   (save-excursion
-    (cond ((or (paredit-in-comment-p)
-               (paredit-in-char-p))
+    (cond ((paredit-in-comment-p)
            (error "Invalid context for slurping S-expressions."))
+          ((numberp argument)
+           (if (< argument 0)
+               (paredit-backward-barf-sexp (- 0 argument))
+               (while (< 0 argument)
+                 (paredit-backward-slurp-sexp)
+                 (setq argument (- argument 1)))))
           ((paredit-in-string-p)
-           (paredit-backward-slurp-into-string))
+           ;; If there is anything to slurp into the string, take that.
+           ;; Otherwise, try to slurp into the enclosing list.
+           (if (save-excursion
+                 (goto-char (paredit-enclosing-string-start))
+                 (paredit-handle-sexp-errors (progn (backward-sexp) nil)
+                   t))
+               (progn
+                 (goto-char (paredit-enclosing-string-start))
+                 (paredit-backward-slurp-into-list argument))
+               (paredit-backward-slurp-into-string argument)))
           (t
-           (paredit-backward-slurp-into-list)))))
+           (paredit-backward-slurp-into-list argument)))))
 
-(defun paredit-backward-slurp-into-list ()
-  (backward-up-list)
-  (let ((open (char-after)))
-    (delete-char 1)
-    (catch 'return
-      (while t
-        (paredit-handle-sexp-errors
-            (progn (backward-sexp) (throw 'return nil))
-          (backward-up-list)
-          (setq open
-                (prog1 (char-after)
-                  (save-excursion (insert open) (delete-char 1)))))))
-    (insert open))
-  ;; Reindent the line at the beginning of wherever we inserted the
-  ;; opening delimiter, and then indent the whole S-expression.
-  (backward-up-list)
-  (lisp-indent-line)
-  (indent-sexp))
-
-(defun paredit-backward-slurp-into-string ()
-  (goto-char (car (paredit-string-start+end-points)))
-  ;; Signal any errors that we might get first, before mucking with the
-  ;; buffer's contents.
-  (save-excursion (backward-sexp))
-  (let ((open (char-after))
-        (target (point)))
-    (delete-char 1)
-    (backward-sexp)
-    (insert open)
-    (paredit-forward-for-quote target)))
+(defun paredit-backward-slurp-into-list (&optional argument)
+  (let ((nestedp nil))
+    (save-excursion
+      (backward-up-list)
+      (let ((open (char-after)))
+        (delete-char +1)
+        (catch 'return
+          (while t
+            (paredit-handle-sexp-errors
+                (progn (backward-sexp)
+                       (if argument
+                           (paredit-ignore-sexp-errors
+                             (while (not (bobp))
+                               (backward-sexp))))
+                       (throw 'return nil))
+              (setq nestedp t)
+              (backward-up-list)
+              (setq open
+                    (prog1 (char-after)
+                      (save-excursion (insert open) (delete-char +1)))))))
+        (insert open))
+      ;; Reindent the line at the beginning of wherever we inserted the
+      ;; opening delimiter, and then indent the whole S-expression.
+      (backward-up-list)
+      (lisp-indent-line)
+      (indent-sexp))
+    ;; If we slurped into an empty list, don't leave dangling space:
+    ;; (foo |).
+    (if (and (not nestedp)
+             (eq (save-excursion (paredit-skip-whitespace nil) (point))
+                 (save-excursion (backward-sexp) (forward-sexp) (point)))
+             (eq (save-excursion (up-list) (backward-char) (point))
+                 (save-excursion (paredit-skip-whitespace t) (point))))
+        (delete-region (save-excursion (paredit-skip-whitespace nil) (point))
+                       (save-excursion (paredit-skip-whitespace t) (point))))))
+
+(defun paredit-backward-slurp-into-string (&optional argument)
+  (let ((start (paredit-enclosing-string-start))
+        (end (paredit-enclosing-string-end)))
+    (goto-char start)
+    ;; Signal any errors that we might get first, before mucking with
+    ;; the buffer's contents.
+    (save-excursion (backward-sexp))
+    (let ((open (char-after))
+          (target (point)))
+      ;; Skip intervening whitespace if we're slurping into an empty
+      ;; string.  XXX What about nonempty strings?
+      (if (and (= (+ start 2) end)
+               (eq (save-excursion (paredit-skip-whitespace nil) (point))
+                   (save-excursion (backward-sexp) (forward-sexp) (point))))
+          (delete-region (save-excursion (paredit-skip-whitespace nil) (point))
+                         (+ (point) 1))
+          (delete-char +1))
+      (backward-sexp)
+      (if argument
+          (paredit-ignore-sexp-errors
+            (while (not (bobp))
+              (backward-sexp))))
+      (insert open)
+      (paredit-forward-for-quote target))))
 
-(defun paredit-backward-barf-sexp ()
+(defun paredit-backward-barf-sexp (&optional argument)
   "Remove the first S-expression in the current list from that list
   by moving the closing delimiter.
 Automatically reindent the barfed S-expression and the form from which
   it was barfed."
-  (interactive)
+  (interactive "P")
   (paredit-lose-if-not-in-sexp 'paredit-backward-barf-sexp)
-  (save-excursion
-    (backward-up-list)
-    (let ((open (char-after)))
-      (delete-char 1)
-      (paredit-ignore-sexp-errors
-        (paredit-forward-and-indent))
-      (while (progn (paredit-skip-whitespace t)
-                    (eq (char-after) ?\; ))
-        (forward-line 1))
-      (if (eobp)
-          (error "Barfing all subexpressions with no close-paren?"))
-      ;** Don't use `insert' here.  Consider, e.g., barfing from
-      ;**   (foo|)
-      ;** and how `save-excursion' works.
-      (insert-before-markers open))
-    (backward-up-list)
-    (lisp-indent-line)
-    (indent-sexp)))
+  (if (and (numberp argument) (< argument 0))
+      (paredit-backward-slurp-sexp (- 0 argument))
+    (let ((end (make-marker)))
+      (set-marker end (point))
+      (save-excursion
+        (backward-up-list)
+        (let ((open (char-after)))
+          (delete-char +1)
+          (paredit-ignore-sexp-errors
+            (paredit-forward-and-indent
+             (if (or (not argument) (numberp argument))
+                 argument
+                 (let ((n 0))
+                   (save-excursion
+                     (while (paredit-handle-sexp-errors
+                                (save-excursion
+                                  (forward-sexp)
+                                  (<= (point) end))
+                              nil)
+                       (forward-sexp)
+                       (setq n (+ n 1))))
+                   n))))
+          (while (progn (paredit-skip-whitespace t) (eq (char-after) ?\; ))
+            (forward-line 1))
+          (if (eobp)
+              ;++ We'll have deleted the close, but there's no open.
+              ;++ Is that OK?
+              (error "Barfing all subexpressions with no close-paren?"))
+          ;** Don't use `insert' here.  Consider, e.g., barfing from
+          ;**   (foo|)
+          ;** and how `save-excursion' works.
+          (insert-before-markers open))
+        (backward-up-list)
+        (lisp-indent-line)
+        (indent-sexp)))))
 
 ;;;; Splitting & Joining
 
@@ -2274,56 +2508,92 @@ Automatically reindent the barfed S-expression and the form from which
         ((or (paredit-in-comment-p)
              (paredit-in-char-p))
          (error "Invalid context for splitting S-expression."))
-        (t (let ((open  (save-excursion (backward-up-list)
-                                        (char-after)))
-                 (close (save-excursion (up-list)
-                                        (char-before))))
-             (delete-horizontal-space)
-             (insert close)
-             (save-excursion (insert ?\ )
-                             (insert open)
-                             (backward-char)
-                             (indent-sexp))))))
+        (t
+         (let ((open (save-excursion (backward-up-list) (char-after)))
+               (close (save-excursion (up-list) (char-before))))
+           (delete-horizontal-space)
+           (insert close)
+           (save-excursion
+             (insert ?\ )
+             (insert open)
+             (backward-char)
+             (indent-sexp))))))
 
 (defun paredit-join-sexps ()
   "Join the S-expressions adjacent on either side of the point.
 Both must be lists, strings, or atoms; error if there is a mismatch."
   (interactive)
-  ;++ How ought this to handle comments intervening symbols or strings?
-  (save-excursion
-    (if (or (paredit-in-comment-p)
-            (paredit-in-string-p)
-            (paredit-in-char-p))
-        (error "Invalid context for joining S-expressions.")
-      (let ((left-point  (paredit-point-at-sexp-end))
-            (right-point (paredit-point-at-sexp-start)))
-        (let ((left-char (char-before left-point))
-              (right-char (char-after right-point)))
-          (let ((left-syntax (char-syntax left-char))
-                (right-syntax (char-syntax right-char)))
-            (cond ((>= left-point right-point)
-                   (error "Can't join a datum with itself."))
-                  ((and (eq left-syntax  ?\) )
-                        (eq right-syntax ?\( )
-                        (eq left-char (matching-paren right-char))
-                        (eq right-char (matching-paren left-char)))
-                   ;; Leave intermediate formatting alone.
-                   (goto-char right-point)
-                   (delete-char 1)
-                   (goto-char left-point)
-                   (backward-delete-char 1)
+  (cond ((paredit-in-comment-p) (error "Can't join S-expressions in comment."))
+        ((paredit-in-string-p) (error "Nothing to join in a string."))
+        ((paredit-in-char-p) (error "Can't join characters.")))
+  (let ((left-point (paredit-point-at-sexp-end))
+        (right-point (paredit-point-at-sexp-start)))
+    (let ((left-char (char-before left-point))
+          (right-char (char-after right-point)))
+      (let ((left-syntax (char-syntax left-char))
+            (right-syntax (char-syntax right-char)))
+        (cond ((< right-point left-point)
+               (error "Can't join a datum with itself."))
+              ((and (eq left-syntax ?\) )
+                    (eq right-syntax ?\( )
+                    (eq left-char (matching-paren right-char))
+                    (eq right-char (matching-paren left-char)))
+               (paredit-join-lists-internal left-point right-point)
+               (paredit-preserving-column
+                 (save-excursion
                    (backward-up-list)
-                   (indent-sexp))
-                  ((and (eq left-syntax  ?\" )
-                        (eq right-syntax ?\" ))
-                   ;; Delete any intermediate formatting.
-                   (delete-region (1- left-point)
-                                  (1+ right-point)))
-                  ((and (memq left-syntax  '(?w ?_)) ; Word or symbol
-                        (memq right-syntax '(?w ?_)))
-                   (delete-region left-point right-point))
-                  (t
-                   (error "Mismatched S-expressions to join.")))))))))
+                   (indent-sexp))))
+              ((and (eq left-syntax ?\" )
+                    (eq right-syntax ?\" ))
+               ;; Delete any intermediate formatting.
+               (delete-region (1- left-point) (1+ right-point)))
+              ((and (memq left-syntax '(?w ?_)) ; Word or symbol
+                    (memq right-syntax '(?w ?_)))
+               (delete-region left-point right-point))
+              (t (error "Mismatched S-expressions to join.")))))))
+
+(defun paredit-join-lists-internal (left-point right-point)
+  (save-excursion
+    ;; Leave intermediate formatting alone.
+    (goto-char right-point)
+    (delete-char +1)
+    (goto-char left-point)
+    (delete-char -1)
+    ;; Kludge: Add an extra space in several conditions.
+    (if (or
+         ;; (foo)| ;x\n(bar) => (foo | ;x\nbar), not (foo|  ;x\nbar).
+         (and (not (eolp))
+              (save-excursion
+                (paredit-skip-whitespace t (point-at-eol))
+                (eq (char-after) ?\;)))
+         ;; (foo)|(bar) => (foo| bar), not (foo|bar).
+         (and (= left-point right-point)
+              (not (or (eq ?\  (char-syntax (char-before)))
+                       (eq ?\  (char-syntax (char-after)))))))
+        (insert ?\  ))))
+
+;++ How ought paredit-join to handle comments intervening symbols or strings?
+;++ Idea:
+;++
+;++   "foo"   |        ;bar
+;++   "baz"      ;quux
+;++
+;++ =>
+;++
+;++   "foo|baz"       ;bar
+;++              ;quux
+;++
+;++ The point should stay where it is relative to the comments, and the
+;++ the comments' columns should all be preserved, perhaps.  Hmmmm...
+;++ What about this?
+;++
+;++   "foo"           ;bar
+;++       |           ;baz
+;++   "quux"          ;zot
+
+;++ Should rename:
+;++     paredit-point-at-sexp-start     -> paredit-start-of-sexp-after-point
+;++     paredit-point-at-sexp-end       -> paredit-end-of-sexp-before-point
 
 ;;;; Variations on the Lurid Theme
 
@@ -2334,7 +2604,7 @@ Both must be lists, strings, or atoms; error if there is a mismatch."
   (interactive)
   (paredit-lose-if-not-in-sexp 'paredit-add-to-previous-list)
   (save-excursion
-    (backward-down-list)
+    (down-list -1)                      ;++ backward-down-list...
     (paredit-forward-slurp-sexp)))
 
 (defun paredit-add-to-next-list ()
@@ -2380,31 +2650,11 @@ This assumes that `paredit-in-string-p' has already returned true."
         (backward-char)))
     oddp))
 
-(defun paredit-in-char-p (&optional argument)
-  "True if the point is immediately after a character literal.
-A preceding escape character, not preceded by another escape character,
-  is considered a character literal prefix.  (This works for elisp,
-  Common Lisp, and Scheme.)
-Assumes that `paredit-in-string-p' is false, so that it need not handle
-  long sequences of preceding backslashes in string escapes.  (This
-  assumes some other leading character token -- ? in elisp, # in Scheme
-  and Common Lisp.)"
-  (let ((argument (or argument (point))))
-    (and (eq (char-before argument) ?\\ )
-         (not (eq (char-before (1- argument)) ?\\ )))))
-
-(defun paredit-indent-sexps ()
-  "If in a list, indent all following S-expressions in the list."
-  (let ((start (point))
-        (end (paredit-handle-sexp-errors (progn (up-list) (point)) nil)))
-    (if end
-        (indent-region start end))))
-
-(defun paredit-forward-and-indent ()
-  "Move forward an S-expression, indenting it with `indent-region'."
-  (let ((start (point)))
-    (forward-sexp)
-    (indent-region start (point))))
+(defun paredit-in-char-p (&optional position)
+  "True if point is on a character escape outside a string."
+  (save-excursion
+    (goto-char (or position (point)))
+    (paredit-in-string-escape-p)))
 
 (defun paredit-skip-whitespace (trailing-p &optional limit)
   "Skip past any whitespace, or until the point LIMIT is reached.
@@ -2434,6 +2684,56 @@ Do not append to any current kill, and
         (last-command nil))
     (kill-region start end)))
 
+;;;;; Reindentation utilities
+
+;++ Should `paredit-indent-sexps' and `paredit-forward-and-indent' use
+;++ `paredit-indent-region' rather than `indent-region'?
+
+(defun paredit-indent-sexps ()
+  "If in a list, indent all following S-expressions in the list."
+  (let* ((start (point))
+         (end (paredit-handle-sexp-errors (progn (up-list) (point)) nil)))
+    (if end
+        (indent-region start end nil))))
+
+(defun paredit-forward-and-indent (&optional n)
+  "Move forward by N S-expressions, indenting them with `indent-region'."
+  (let ((start (point)))
+    (forward-sexp n)
+    (indent-region start (point) nil)))
+
+(defun paredit-indent-region (start end)
+  "Indent the region from START to END.
+Don't reindent the line starting at START, however."
+  (if (not (<= start end))
+      (error "Incorrectly related points: %S, %S" start end))
+  (save-excursion
+    (goto-char start)
+    (let ((bol (point-at-bol)))
+      ;; Skip all S-expressions that end on the starting line, but
+      ;; don't go past `end'.
+      (if (and (save-excursion (goto-char end) (not (eq bol (point-at-bol))))
+               (paredit-handle-sexp-errors
+                   (catch 'exit
+                     (while t
+                       (save-excursion
+                         (forward-sexp)
+                         (if (not (eq bol (point-at-bol)))
+                             (throw 'exit t))
+                         (if (not (< (point) end))
+                             (throw 'exit nil)))
+                       (forward-sexp)))
+                 nil))
+          (progn
+            ;; Point is still on the same line, but precedes an
+            ;; S-expression that ends on a different line.
+            (if (not (eq bol (point-at-bol)))
+                (error "Internal error -- we moved forward a line!"))
+            (goto-char (+ 1 (point-at-eol)))
+            (if (not (<= (point) end))
+                (error "Internal error -- we frobnitzed the garfnut!"))
+            (indent-region (point) end nil))))))
+
 ;;;;; S-expression Parsing Utilities
 
 ;++ These routines redundantly traverse S-expressions a great deal.
@@ -2473,6 +2773,22 @@ This assumes that `paredit-in-string-p' has already returned true, i.e.
       (forward-sexp 1)
       (cons start (1- (point))))))
 
+(defun paredit-enclosing-string-start ()
+  (car (paredit-string-start+end-points)))
+
+(defun paredit-enclosing-string-end ()
+  (+ 1 (cdr (paredit-string-start+end-points))))
+
+(defun paredit-enclosing-list-start ()
+  (save-excursion
+    (backward-up-list)
+    (point)))
+
+(defun paredit-enclosing-list-end ()
+  (save-excursion
+    (up-list)
+    (point)))
+
 (defun paredit-in-comment-p (&optional state)
   "True if parse state STATE is within a comment.
 If no parse state is supplied, compute one from the beginning of the
@@ -2481,6 +2797,43 @@ If no parse state is supplied, compute one from the beginning of the
   ;;    else an integer (the current comment nesting)
   (and (nth 4 (or state (paredit-current-parse-state)))
        t))
+
+(defun paredit-prefix-numeric-value (argument)
+  ;++ Kludgerific.
+  (cond ((integerp argument) argument)
+        ((eq argument '-) -1)
+        ((consp argument)
+         (cond ((equal argument '(4)) (paredit-count-sexps-forward))   ;C-u
+               ((equal argument '(16)) (paredit-count-sexps-backward)) ;C-u C-u
+               (t (error "Invalid prefix argument: %S" argument))))
+        ((paredit-region-active-p)
+         (save-excursion
+           (save-restriction
+             (narrow-to-region (region-beginning) (region-end))
+             (cond ((= (point) (point-min)) (paredit-count-sexps-forward))
+                   ((= (point) (point-max)) (paredit-count-sexps-backward))
+                   (t
+                    (error "Point %S is not start or end of region: %S..%S"
+                           (point) (region-beginning) (region-end)))))))
+        (t 1)))
+
+(defun paredit-count-sexps-forward ()
+  (save-excursion
+    (let ((n 0) (p nil))                ;hurk
+      (paredit-ignore-sexp-errors
+        (while (setq p (scan-sexps (point) +1))
+          (goto-char p)
+          (setq n (+ n 1))))
+      n)))
+
+(defun paredit-count-sexps-backward ()
+  (save-excursion
+    (let ((n 0) (p nil))                ;hurk
+      (paredit-ignore-sexp-errors
+        (while (setq p (scan-sexps (point) -1))
+          (goto-char p)
+          (setq n (+ n 1))))
+      n)))
 
 (defun paredit-point-at-sexp-boundary (n)
   (cond ((< n 0) (paredit-point-at-sexp-start))
@@ -2506,28 +2859,46 @@ If no parse state is supplied, compute one from the beginning of the
       (error "Invalid context for command `%s'." command)))
 
 (defun paredit-check-region (start end)
-  (save-restriction
-    (narrow-to-region start end)
-    (if (fboundp 'check-parens)
-        (check-parens)
-        (save-excursion
-          (goto-char (point-min))
-          (while (not (eobp))
-            (forward-sexp))))))
+  "Signal an error if text between `start' and `end' is unbalanced."
+  ;; `narrow-to-region' will move the point, so avoid calling it if we
+  ;; don't need to.  We don't want to use `save-excursion' because we
+  ;; want the point to move if `check-parens' reports an error.
+  (if (not (paredit-region-ok-p start end))
+      (save-restriction
+        (narrow-to-region start end)
+        (check-parens))))
 
 (defun paredit-region-ok-p (start end)
-  (paredit-handle-sexp-errors
-      (progn
-        (save-restriction
-          (narrow-to-region start end)
-          ;; Can't use `check-parens' here -- it signals the wrong kind
-          ;; of errors.
-          (save-excursion
-            (goto-char (point-min))
-            (while (not (eobp))
-              (forward-sexp))))
-        t)
-    nil))
+  "Return true iff the region between `start' and `end' is balanced.
+This is independent of context -- it doesn't check what state the
+  text at `start' is in."
+  (save-excursion
+    (paredit-handle-sexp-errors
+        (progn
+          (save-restriction
+            (narrow-to-region start end)
+            (scan-sexps (point-min) (point-max)))
+          t)
+      nil)))
+
+(defun paredit-current-indentation ()
+  (save-excursion
+    (back-to-indentation)
+    (current-column)))
+
+(defun paredit-restore-column (column indentation)
+  ;; Preserve the point's position either in the indentation or in the
+  ;; code: if on code, move with the code; if in indentation, leave it
+  ;; in the indentation, either where it was (if still on indentation)
+  ;; or at the end of the indentation (if the code moved far enough
+  ;; left).
+  (let ((indentation* (paredit-current-indentation)))
+    (goto-char
+     (+ (point-at-bol)
+        (cond ((not (< column indentation))
+               (+ column (- indentation* indentation)))
+              ((<= indentation* column) indentation*)
+              (t column))))))
 
 ;;;; Initialization
 
@@ -2537,5 +2908,8 @@ If no parse state is supplied, compute one from the beginning of the
 
 (provide 'paredit)
 
-;;; aoeu
+;;; Local Variables:
+;;; outline-regexp: "\n;;;;+"
+;;; End:
+
 ;;; paredit.el ends here
diff --git a/elpa/paredit-24/paredit.elc b/elpa/paredit-24/paredit.elc
new file mode 100644
index 000000000..a60755208
Binary files /dev/null and b/elpa/paredit-24/paredit.elc differ
diff --git a/elpa/pkg-info-20131101.408/pkg-info-autoloads.el b/elpa/pkg-info-0.5/pkg-info-autoloads.el
similarity index 56%
rename from elpa/pkg-info-20131101.408/pkg-info-autoloads.el
rename to elpa/pkg-info-0.5/pkg-info-autoloads.el
index 1f55e6d34..fa4acf830 100644
--- a/elpa/pkg-info-20131101.408/pkg-info-autoloads.el
+++ b/elpa/pkg-info-0.5/pkg-info-autoloads.el
@@ -1,13 +1,32 @@
 ;;; pkg-info-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads (pkg-info-version-info pkg-info-package-version
-;;;;;;  pkg-info-defining-library-version pkg-info-library-version)
-;;;;;;  "pkg-info" "pkg-info.el" (21184 20186))
+;;;### (autoloads nil "pkg-info" "pkg-info.el" (21721 38730 0 0))
 ;;; Generated autoloads from pkg-info.el
 
+(autoload 'pkg-info-library-original-version "pkg-info" "\
+Get the original version in the header of LIBRARY.
+
+The original version is stored in the X-Original-Version header.
+This header is added by the MELPA package archive to preserve
+upstream version numbers.
+
+LIBRARY is either a symbol denoting a named feature, or a library
+name as string.
+
+If SHOW is non-nil, show the version in the minibuffer.
+
+Return the version from the header of LIBRARY as list.  Signal an
+error if the LIBRARY was not found or had no X-Original-Version
+header.
+
+See Info node `(elisp)Library Headers' for more information
+about library headers.
+
+\(fn LIBRARY &optional SHOW)" t nil)
+
 (autoload 'pkg-info-library-version "pkg-info" "\
 Get the version in the header of LIBRARY.
 
@@ -24,6 +43,27 @@ about library headers.
 
 \(fn LIBRARY &optional SHOW)" t nil)
 
+(autoload 'pkg-info-defining-library-original-version "pkg-info" "\
+Get the original version of the library defining FUNCTION.
+
+The original version is stored in the X-Original-Version header.
+This header is added by the MELPA package archive to preserve
+upstream version numbers.
+
+If SHOW is non-nil, show the version in mini-buffer.
+
+This function is mainly intended to find the version of a major
+or minor mode, i.e.
+
+   (pkg-info-defining-library-version 'flycheck-mode)
+
+Return the version of the library defining FUNCTION.  Signal an
+error if FUNCTION is not a valid function, if its defining
+library was not found, or if the library had no proper version
+header.
+
+\(fn FUNCTION &optional SHOW)" t nil)
+
 (autoload 'pkg-info-defining-library-version "pkg-info" "\
 Get the version of the library defining FUNCTION.
 
@@ -34,10 +74,10 @@ or minor mode, i.e.
 
    (pkg-info-defining-library-version 'flycheck-mode)
 
-Return the version of the library defining FUNCTION (as by
-`pkg-info-locate-library-version').  Signal an error if FUNCTION
-is not a valid function, if its defining library was not found,
-or if the library had no proper version header.
+Return the version of the library defining FUNCTION.  Signal an
+error if FUNCTION is not a valid function, if its defining
+library was not found, or if the library had no proper version
+header.
 
 \(fn FUNCTION &optional SHOW)" t nil)
 
@@ -73,15 +113,9 @@ version.
 
 ;;;***
 
-;;;### (autoloads nil nil ("pkg-info-pkg.el") (21184 20186 468049))
-
-;;;***
-
-(provide 'pkg-info-autoloads)
 ;; Local Variables:
 ;; version-control: never
 ;; no-byte-compile: t
 ;; no-update-autoloads: t
-;; coding: utf-8
 ;; End:
 ;;; pkg-info-autoloads.el ends here
diff --git a/elpa/pkg-info-0.5/pkg-info-pkg.el b/elpa/pkg-info-0.5/pkg-info-pkg.el
new file mode 100644
index 000000000..d7c2e6ee6
--- /dev/null
+++ b/elpa/pkg-info-0.5/pkg-info-pkg.el
@@ -0,0 +1 @@
+(define-package "pkg-info" "0.5" "Information about packages" '((dash "1.6.0") (epl "0.4")))
diff --git a/elpa/pkg-info-0.5/pkg-info-pkg.elc b/elpa/pkg-info-0.5/pkg-info-pkg.elc
new file mode 100644
index 000000000..ba8cfc0f6
Binary files /dev/null and b/elpa/pkg-info-0.5/pkg-info-pkg.elc differ
diff --git a/elpa/pkg-info-20131101.408/pkg-info.el b/elpa/pkg-info-0.5/pkg-info.el
similarity index 61%
rename from elpa/pkg-info-20131101.408/pkg-info.el
rename to elpa/pkg-info-0.5/pkg-info.el
index d54c839a9..ed2235f66 100644
--- a/elpa/pkg-info-20131101.408/pkg-info.el
+++ b/elpa/pkg-info-0.5/pkg-info.el
@@ -1,12 +1,11 @@
 ;;; pkg-info.el --- Information about packages       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013  Sebastian Wiesner
+;; Copyright (C) 2013, 2014  Sebastian Wiesner
 
 ;; Author: Sebastian Wiesner <lunaryorn@gmail.com>
 ;; URL: https://github.com/lunaryorn/pkg-info.el
 ;; Keywords: convenience
-;; Version: 20131101.408
-;; X-Original-Version: 0.5-cvs
+;; Version: 0.5
 ;; Package-Requires: ((dash "1.6.0") (epl "0.4"))
 
 ;; This file is not part of GNU Emacs.
@@ -47,6 +46,7 @@
 (require 'epl)
 (require 'dash)
 
+(require 'lisp-mnt)
 (require 'find-func)
 
 
@@ -75,6 +75,11 @@ Return VERSION."
                                     load-path
                                     (get-load-suffixes))))
 
+(defun pkg-info--read-function ()
+  "Read a function name from minibuffer."
+  (let ((input (completing-read "Function: " obarray #'boundp :require-match)))
+    (if (string= input "") nil (intern input))))
+
 (defun pkg-info--read-package ()
   "Read a package name from minibuffer."
   (let* ((installed (epl-installed-packages))
@@ -84,6 +89,68 @@ Return VERSION."
     (completing-read "Installed package: " names nil 'require-match
                      nil nil default)))
 
+(defun pkg-info-library-source (library)
+  "Get the source file of LIBRARY.
+
+LIBRARY is either a symbol denoting a named feature, or a library
+name as string.
+
+Return the source file of LIBRARY as string."
+  (find-library-name (if (symbolp library) (symbol-name library) library)))
+
+(defun pkg-info-defining-library (function)
+  "Get the source file of the library defining FUNCTION.
+
+FUNCTION is a function symbol.
+
+Return the file name of the library as string.  Signal an error
+if the library does not exist, or if the definition of FUNCTION
+was not found."
+  (unless (functionp function)
+    (signal 'wrong-type-argument (list 'functionp function)))
+  (let ((library (symbol-file function 'defun)))
+    (unless library
+      (error "Can't find definition of %s" function))
+    library))
+
+(defun pkg-info-x-original-version (file)
+  "Read the X-Original-Version header from FILE.
+
+Return the value as version list, or return nil if FILE lacks
+this header.  Signal an error, if the value of the header is not
+a valid version."
+  (let ((version-str (with-temp-buffer
+                       (insert-file-contents file)
+                       (lm-header "X-Original-Version"))))
+    (when version-str
+      (version-to-list version-str))))
+
+;;;###autoload
+(defun pkg-info-library-original-version (library &optional show)
+  "Get the original version in the header of LIBRARY.
+
+The original version is stored in the X-Original-Version header.
+This header is added by the MELPA package archive to preserve
+upstream version numbers.
+
+LIBRARY is either a symbol denoting a named feature, or a library
+name as string.
+
+If SHOW is non-nil, show the version in the minibuffer.
+
+Return the version from the header of LIBRARY as list.  Signal an
+error if the LIBRARY was not found or had no X-Original-Version
+header.
+
+See Info node `(elisp)Library Headers' for more information
+about library headers."
+  (interactive (list (pkg-info--read-library) t))
+  (let ((version (pkg-info-x-original-version
+                  (pkg-info-library-source library))))
+    (if version
+        (pkg-info--show-version-and-return version show)
+      (error "Library %s has no original version" library))))
+
 ;;;###autoload
 (defun pkg-info-library-version (library &optional show)
   "Get the version in the header of LIBRARY.
@@ -99,11 +166,32 @@ error if the LIBRARY was not found or had no proper header.
 See Info node `(elisp)Library Headers' for more information
 about library headers."
   (interactive (list (pkg-info--read-library) t))
-  (let* ((library-name (if (symbolp library) (symbol-name library) library))
-         (source (find-library-name library-name))
+  (let* ((source (pkg-info-library-source library))
          (version (epl-package-version (epl-package-from-file source))))
     (pkg-info--show-version-and-return version show)))
 
+;;;###autoload
+(defun pkg-info-defining-library-original-version (function &optional show)
+  "Get the original version of the library defining FUNCTION.
+
+The original version is stored in the X-Original-Version header.
+This header is added by the MELPA package archive to preserve
+upstream version numbers.
+
+If SHOW is non-nil, show the version in mini-buffer.
+
+This function is mainly intended to find the version of a major
+or minor mode, i.e.
+
+   (pkg-info-defining-library-version 'flycheck-mode)
+
+Return the version of the library defining FUNCTION.  Signal an
+error if FUNCTION is not a valid function, if its defining
+library was not found, or if the library had no proper version
+header."
+  (interactive (list (pkg-info--read-function) t))
+  (pkg-info-library-original-version (pkg-info-defining-library function) show))
+
 ;;;###autoload
 (defun pkg-info-defining-library-version (function &optional show)
   "Get the version of the library defining FUNCTION.
@@ -115,19 +203,12 @@ or minor mode, i.e.
 
    (pkg-info-defining-library-version 'flycheck-mode)
 
-Return the version of the library defining FUNCTION (as by
-`pkg-info-locate-library-version').  Signal an error if FUNCTION
-is not a valid function, if its defining library was not found,
-or if the library had no proper version header."
-  (interactive
-   (let ((input (completing-read "Function: " obarray #'boundp :require-match)))
-     (list (if (string= input "") nil (intern input)) t)))
-  (unless (functionp function)
-    (signal 'wrong-type-argument (list 'functionp function)))
-  (let ((library (symbol-file function 'defun)))
-    (unless library
-      (error "Can't find definition of %s" function))
-    (pkg-info-library-version library show)))
+Return the version of the library defining FUNCTION.  Signal an
+error if FUNCTION is not a valid function, if its defining
+library was not found, or if the library had no proper version
+header."
+  (interactive (list (pkg-info--read-function) t))
+  (pkg-info-library-version (pkg-info-defining-library function) show))
 
 ;;;###autoload
 (defun pkg-info-package-version (package &optional show)
@@ -167,7 +248,14 @@ version."
                        (pkg-info--read-package))
                      t))
   (let* ((package (or package (if (stringp library) (intern library) library)))
-         (lib-version (pkg-info-library-version library))
+         (orig-version (condition-case nil
+                           (pkg-info-library-original-version library)
+                         (error nil)))
+         ;; If we have X-Original-Version, we assume that MELPA replaced the
+         ;; library version with its generated version, so we use the
+         ;; X-Original-Version header instead, and ignore the library version
+         ;; header
+         (lib-version (or orig-version (pkg-info-library-version library)))
          (pkg-version (condition-case nil
                           (pkg-info-package-version package)
                         (error nil)))
diff --git a/elpa/pkg-info-0.5/pkg-info.elc b/elpa/pkg-info-0.5/pkg-info.elc
new file mode 100644
index 000000000..74b626b5b
Binary files /dev/null and b/elpa/pkg-info-0.5/pkg-info.elc differ
diff --git a/elpa/pkg-info-20131101.408/pkg-info-pkg.el b/elpa/pkg-info-20131101.408/pkg-info-pkg.el
deleted file mode 100644
index ebafed5d6..000000000
--- a/elpa/pkg-info-20131101.408/pkg-info-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "pkg-info" "20131101.408" "Information about packages" (quote ((dash "1.6.0") (epl "0.4"))))
diff --git a/elpa/pkg-info-20131101.408/pkg-info-pkg.elc b/elpa/pkg-info-20131101.408/pkg-info-pkg.elc
deleted file mode 100644
index 137cea05e..000000000
Binary files a/elpa/pkg-info-20131101.408/pkg-info-pkg.elc and /dev/null differ
diff --git a/elpa/pkg-info-20131101.408/pkg-info.elc b/elpa/pkg-info-20131101.408/pkg-info.elc
deleted file mode 100644
index bdfe20463..000000000
Binary files a/elpa/pkg-info-20131101.408/pkg-info.elc and /dev/null differ
diff --git a/elpa/popup-0.5/popup-autoloads.el b/elpa/popup-0.5.2/popup-autoloads.el
similarity index 62%
rename from elpa/popup-0.5/popup-autoloads.el
rename to elpa/popup-0.5.2/popup-autoloads.el
index ea87ae39e..f6eabacc4 100644
--- a/elpa/popup-0.5/popup-autoloads.el
+++ b/elpa/popup-0.5.2/popup-autoloads.el
@@ -1,18 +1,15 @@
 ;;; popup-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads nil nil ("popup-pkg.el" "popup.el") (20887 42932
-;;;;;;  288158))
+;;;### (autoloads nil nil ("popup.el") (21721 36904 251605 0))
 
 ;;;***
 
-(provide 'popup-autoloads)
 ;; Local Variables:
 ;; version-control: never
 ;; no-byte-compile: t
 ;; no-update-autoloads: t
-;; coding: utf-8
 ;; End:
 ;;; popup-autoloads.el ends here
diff --git a/elpa/popup-0.5.2/popup-pkg.el b/elpa/popup-0.5.2/popup-pkg.el
new file mode 100644
index 000000000..44634bf9f
--- /dev/null
+++ b/elpa/popup-0.5.2/popup-pkg.el
@@ -0,0 +1 @@
+(define-package "popup" "0.5.2" "Visual Popup User Interface" '((cl-lib "0.3")) :keywords '("lisp"))
diff --git a/elpa/popup-0.5/popup-pkg.elc b/elpa/popup-0.5.2/popup-pkg.elc
similarity index 62%
rename from elpa/popup-0.5/popup-pkg.elc
rename to elpa/popup-0.5.2/popup-pkg.elc
index 7888ce4ee..a68dfc142 100644
Binary files a/elpa/popup-0.5/popup-pkg.elc and b/elpa/popup-0.5.2/popup-pkg.elc differ
diff --git a/elpa/popup-0.5/popup.el b/elpa/popup-0.5.2/popup.el
similarity index 68%
rename from elpa/popup-0.5/popup.el
rename to elpa/popup-0.5.2/popup.el
index 8a50293eb..0518e8e70 100644
--- a/elpa/popup-0.5/popup.el
+++ b/elpa/popup-0.5.2/popup.el
@@ -1,10 +1,12 @@
 ;;; popup.el --- Visual Popup User Interface
 
-;; Copyright (C) 2009, 2010, 2011, 2012  Tomohiro Matsuyama
+;; Copyright (C) 2009, 2010, 2011, 2012, 2013  Tomohiro Matsuyama
 
 ;; Author: Tomohiro Matsuyama <tomo@cx4a.org>
 ;; Keywords: lisp
-;; Version: 0.5
+;; Version: 0.5.2
+;; X-Original-Version: 0.5.2
+;; Package-Requires: ((cl-lib "0.3"))
 
 ;; 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
@@ -28,12 +30,21 @@
 
 ;;; Code:
 
-(require 'cl)
+(require 'cl-lib)
+
+(defconst popup-version "0.5.2")
 
 
 
 ;;; Utilities
 
+(defun popup-calculate-max-width (max-width)
+  "Determines whether the width desired is
+character or window proportion based, And returns the result."
+  (cl-typecase max-width
+    (integer max-width)
+    (float (* (ceiling (/ (round (* max-width (window-width))) 10.0)) 10))))
+
 (defvar popup-use-optimized-column-computation t
   "Use the optimized column computation routine.
 If there is a problem, please set it nil.")
@@ -53,7 +64,7 @@ If there is a problem, please set it nil.")
 (defun popup-x-to-string (x)
   "Convert any object to string effeciently.
 This is faster than `prin1-to-string' in many cases."
-  (typecase x
+  (cl-typecase x
     (string x)
     (symbol (symbol-name x))
     (integer (number-to-string x))
@@ -65,15 +76,15 @@ This is faster than `prin1-to-string' in many cases."
 splitting with WIDTH."
   ;; Expand tabs into 4 spaces
   (setq string (replace-regexp-in-string "\t" "    " string))
-  (loop with len = (length string)
-        with w = 0
-        for l from 0
-        for c in (append string nil)
-        while (<= (incf w (char-width c)) width)
-        finally return
-        (if (< l len)
-            (cons (substring string 0 l) (substring string l))
-          (list string))))
+  (cl-loop with len = (length string)
+           with w = 0
+           for l from 0
+           for c in (append string nil)
+           while (<= (cl-incf w (char-width c)) width)
+           finally return
+           (if (< l len)
+               (cons (substring string 0 l) (substring string l))
+             (list string))))
 
 (defun popup-fill-string (string &optional width max-width justify squeeze)
   "Split STRING into fixed width strings and return a cons cell
@@ -132,23 +143,11 @@ untouched."
   (declare (indent 0))
   `(save-excursion
      (let ((buffer-undo-list t)
-           (buffer-read-only nil)
+           (inhibit-read-only t)
            (modified (buffer-modified-p)))
        (unwind-protect
            (progn ,@body)
          (set-buffer-modified-p modified)))))
-  
-(defun popup-preferred-width (list)
-  "Return the preferred width to show LIST beautifully."
-  (loop with tab-width = 4
-        for item in list
-        for summary = (popup-item-summary item)
-        maximize (string-width (popup-x-to-string item)) into width
-        if (stringp summary)
-        maximize (+ (string-width summary) 2) into summary-width
-        finally return
-        (let ((total (+ (or width 0) (or summary-width 0))))
-          (* (ceiling (/ total 10.0)) 10))))
 
 (defun popup-window-full-width-p (&optional window)
   "A portable version of `window-full-width-p'."
@@ -162,10 +161,10 @@ untouched."
     (setq window (selected-window)))
   (unless (popup-window-full-width-p window)
     (let ((t-p-w-w (buffer-local-value 'truncate-partial-width-windows
-				       (window-buffer window))))
+                                       (window-buffer window))))
       (if (integerp t-p-w-w)
-	  (< (window-width window) t-p-w-w)
-	t-p-w-w))))
+          (< (window-width window) t-p-w-w)
+        t-p-w-w))))
 
 (defun popup-current-physical-column ()
   "Return the current physical column."
@@ -213,6 +212,11 @@ buffer."
   "Face for popup."
   :group 'popup)
 
+(defface popup-summary-face
+  '((t (:inherit popup-face :foreground "dimgray")))
+  "Face for popup summary."
+  :group 'popup)
+
 (defface popup-scroll-bar-foreground-face
   '((t (:background "black")))
   "Foreground face for scroll-bar."
@@ -234,10 +238,10 @@ buffer."
   (propertize " " 'face 'popup-scroll-bar-background-face)
   "Background character for scroll-bar.")
 
-(defstruct popup
+(cl-defstruct popup
   point row column width height min-height direction overlays keymap
   parent depth
-  face mouse-face selection-face
+  face mouse-face selection-face summary-face
   margin-left margin-right margin-left-cancel scroll-bar symbol
   cursor offset scroll-top current-height list newlines
   pattern original-list)
@@ -245,12 +249,12 @@ buffer."
 (defun popup-item-propertize (item &rest properties)
   "Same as `propertize' except that this avoids overriding
 existed value with `nil' property."
-  (loop for (k v) on properties by 'cddr
-        if v append (list k v) into props
-        finally return
-        (apply 'propertize
-               (popup-x-to-string item)
-               props)))
+  (cl-loop for (k v) on properties by 'cddr
+           if v append (list k v) into props
+           finally return
+           (apply 'propertize
+                  (popup-x-to-string item)
+                  props)))
 
 (defun popup-item-property (item property)
   "Same as `get-text-property' except that this returns nil if
@@ -258,16 +262,16 @@ ITEM is not string."
   (if (stringp item)
       (get-text-property 0 property item)))
 
-(defun* popup-make-item (name
-                         &key
-                         value
-                         face
-                         mouse-face
-                         selection-face
-                         sublist
-                         document
-                         symbol
-                         summary)
+(cl-defun popup-make-item (name
+                           &key
+                           value
+                           face
+                           mouse-face
+                           selection-face
+                           sublist
+                           document
+                           symbol
+                           summary)
   "Utility function to make popup item. See also
 `popup-item-propertize'."
   (popup-item-propertize name
@@ -309,17 +313,17 @@ ITEM is not string."
 (defun popup-item-show-help-with-event-loop (item)
   (save-window-excursion
     (when (popup-item-show-help-1 item)
-      (loop do (clear-this-command-keys)
-            for key = (read-key-sequence-vector nil)
-            do
-            (case (key-binding key)
-              ('scroll-other-window
-               (scroll-other-window))
-              ('scroll-other-window-down
-               (scroll-other-window-down nil))
-              (t
-               (setq unread-command-events (append key unread-command-events))
-               (return)))))))
+      (cl-loop do (clear-this-command-keys)
+               for key = (read-key-sequence-vector nil)
+               do
+               (cl-case (key-binding key)
+                 (scroll-other-window
+                  (scroll-other-window))
+                 (scroll-other-window-down
+                  (scroll-other-window-down nil))
+                 (otherwise
+                  (setq unread-command-events (append key unread-command-events))
+                  (cl-return)))))))
 
 (defun popup-item-show-help (item &optional persist)
   "Display the documentation of ITEM with `display-buffer'. If
@@ -336,7 +340,7 @@ usual."
   (popup-set-filtered-list popup list)
   (setf (popup-pattern popup) nil)
   (setf (popup-original-list popup) list))
-  
+
 (defun popup-set-filtered-list (popup list)
   (let ((offset
          (if (> (popup-direction popup) 0)
@@ -367,13 +371,26 @@ usual."
     (and (eq (overlay-get overlay 'display) nil)
          (eq (overlay-get overlay 'after-string) nil))))
 
-(defun* popup-set-line-item (popup line &key item face mouse-face margin-left margin-right scroll-bar-char symbol summary keymap)
+(cl-defun popup-set-line-item (popup
+                               line
+                               &key
+                               item
+                               face
+                               mouse-face
+                               margin-left
+                               margin-right
+                               scroll-bar-char
+                               symbol
+                               summary
+                               summary-face
+                               keymap)
   (let* ((overlay (popup-line-overlay popup line))
          (content (popup-create-line-string popup (popup-x-to-string item)
                                             :margin-left margin-left
                                             :margin-right margin-right
                                             :symbol symbol
-                                            :summary summary))
+                                            :summary summary
+                                            :summary-face summary-face))
          (start 0)
          (prefix (overlay-get overlay 'prefix))
          (postfix (overlay-get overlay 'postfix))
@@ -401,20 +418,36 @@ usual."
                          scroll-bar-char
                          postfix))))
 
-(defun* popup-create-line-string (popup string &key margin-left margin-right symbol summary)
+(cl-defun popup-create-line-string (popup
+                                    string
+                                    &key
+                                    margin-left
+                                    margin-right
+                                    symbol
+                                    summary
+                                    summary-face)
   (let* ((popup-width (popup-width popup))
          (summary-width (string-width summary))
-         (content-width (- popup-width
-                           (if (> summary-width 0)
-                               (+ summary-width 2)
-                             0)))
+         (content-width (max
+                         (min popup-width (string-width string))
+                         (- popup-width
+                            (if (> summary-width 0)
+                                (+ summary-width 2)
+                              0))))
          (string (car (popup-substring-by-width string content-width)))
          (string-width (string-width string))
-         (spacing (max (- popup-width string-width summary-width) 0)))
+         (spacing (max (- popup-width string-width summary-width)
+                       (if (> popup-width string-width) 1 0)))
+         (truncated-summary
+          (car (popup-substring-by-width
+                summary (max (- popup-width string-width spacing) 0)))))
+    (when summary-face
+      (put-text-property 0 (length truncated-summary)
+                         'face summary-face truncated-summary))
     (concat margin-left
             string
             (make-string spacing ? )
-            summary
+            truncated-summary
             symbol
             margin-right)))
 
@@ -444,27 +477,33 @@ number at the point."
         -1
       1)))
 
-(defun* popup-create (point
-                      width
-                      height
-                      &key
-                      min-height
-                      around
-                      (face 'popup-face)
-                      mouse-face
-                      (selection-face face)
-                      scroll-bar
-                      margin-left
-                      margin-right
-                      symbol
-                      parent
-                      parent-offset
-                      keymap)
+(cl-defun popup-create (point
+                        width
+                        height
+                        &key
+                        min-height
+                        max-width
+                        around
+                        (face 'popup-face)
+                        mouse-face
+                        (selection-face face)
+                        (summary-face 'popup-summary-face)
+                        scroll-bar
+                        margin-left
+                        margin-right
+                        symbol
+                        parent
+                        parent-offset
+                        keymap)
   "Create a popup instance at POINT with WIDTH and HEIGHT.
 
 MIN-HEIGHT is a minimal height of the popup. The default value is
 0.
 
+MAX-WIDTH is the maximum width of the popup. The default value is
+nil (no limit). If a floating point, the value refers to the ratio of
+the window. If an integer, limit is in characters.
+
 If AROUND is non-nil, the popup will be displayed around the
 point but not at the point.
 
@@ -495,7 +534,8 @@ KEYMAP is a keymap that will be put on the popup contents."
   (unless point
     (setq point
           (if parent (popup-child-point parent parent-offset) (point))))
-
+  (when max-width
+    (setq width (min width (popup-calculate-max-width max-width))))
   (save-excursion
     (goto-char point)
     (let* ((row (line-number-at-pos))
@@ -530,34 +570,34 @@ KEYMAP is a keymap that will be put on the popup contents."
         (popup-save-buffer-state
           (goto-char (point-max))
           (insert (make-string newlines ?\n))))
-      
+
       ;; Case: the popup overflows
       (if overflow
           (if foldable
               (progn
-                (decf column (- popup-width margin-left margin-right))
+                (cl-decf column (- popup-width margin-left margin-right))
                 (unless around (move-to-column column)))
             (when (not truncate-lines)
               ;; Truncate.
               (let ((d (1+ (- popup-width (- window-width column)))))
-                (decf popup-width d)
-                (decf width d)))
-            (decf column margin-left))
-        (decf column margin-left))
+                (cl-decf popup-width d)
+                (cl-decf width d)))
+            (cl-decf column margin-left))
+        (cl-decf column margin-left))
 
       ;; Case: no space at the left
       (when (and (null parent)
                  (< column 0))
         ;; Cancel margin left
         (setq column 0)
-        (decf popup-width margin-left)
+        (cl-decf popup-width margin-left)
         (setq margin-left-cancel t))
-      
+
       (dotimes (i height)
         (let (overlay begin w (dangle t) (prefix "") (postfix ""))
           (when around
             (popup-vertical-motion column direction))
-	  (setq around t
+          (setq around t
                 current-column (popup-current-physical-column))
 
           (when (> current-column column)
@@ -576,7 +616,7 @@ KEYMAP is a keymap that will be put on the popup contents."
           (setq w (+ popup-width (length prefix)))
           (while (and (not (eolp)) (> w 0))
             (setq dangle nil)
-            (decf w (char-width (char-after)))
+            (cl-decf w (char-width (char-after)))
             (forward-char))
           (if (< w 0)
               (setq postfix (make-string (- w) ? )))
@@ -588,11 +628,11 @@ KEYMAP is a keymap that will be put on the popup contents."
           (overlay-put overlay 'postfix postfix)
           (overlay-put overlay 'width width)
           (aset overlays
-		(if (> direction 0) i (- height i 1))
-		overlay)))
-      (loop for p from (- 10000 (* depth 1000))
-            for overlay in (nreverse (append overlays nil))
-            do (overlay-put overlay 'priority p))
+                (if (> direction 0) i (- height i 1))
+                overlay)))
+      (cl-loop for p from (- 10000 (* depth 1000))
+               for overlay in (nreverse (append overlays nil))
+               do (overlay-put overlay 'priority p))
       (let ((it (make-popup :point point
                             :row row
                             :column column
@@ -605,6 +645,7 @@ KEYMAP is a keymap that will be put on the popup contents."
                             :face face
                             :mouse-face mouse-face
                             :selection-face selection-face
+                            :summary-face summary-face
                             :margin-left margin-left
                             :margin-right margin-right
                             :margin-left-cancel margin-left-cancel
@@ -634,104 +675,108 @@ KEYMAP is a keymap that will be put on the popup contents."
         (popup-save-buffer-state
           (goto-char (point-max))
           (dotimes (i newlines)
-            (if (= (char-before) ?\n)
+            (if (and (char-before)
+                     (= (char-before) ?\n))
                 (delete-char -1)))))))
   nil)
 
 (defun popup-draw (popup)
   "Draw POPUP."
-  (loop with height = (popup-height popup)
-        with min-height = (popup-min-height popup)
-        with popup-face = (popup-face popup)
-        with mouse-face = (popup-mouse-face popup)
-        with selection-face = (popup-selection-face popup)
-        with list = (popup-list popup)
-        with length = (length list)
-        with thum-size = (max (/ (* height height) (max length 1)) 1)
-        with page-size = (/ (+ 0.0 (max length 1)) height)
-        with scroll-bar = (popup-scroll-bar popup)
-        with margin-left = (make-string (if (popup-margin-left-cancel popup) 0 (popup-margin-left popup)) ? )
-        with margin-right = (make-string (popup-margin-right popup) ? )
-        with symbol = (popup-symbol popup)
-        with cursor = (popup-cursor popup)
-        with scroll-top = (popup-scroll-top popup)
-        with offset = (popup-offset popup)
-        with keymap = (popup-keymap popup)
-        for o from offset
-        for i from scroll-top
-        while (< o height)
-        for item in (nthcdr scroll-top list)
-        for page-index = (* thum-size (/ o thum-size))
-        for face = (if (= i cursor)
-                       (or (popup-item-selection-face item) selection-face)
-                     (or (popup-item-face item) popup-face))
-        for empty-char = (propertize " " 'face face)
-        for scroll-bar-char = (if scroll-bar
-                                  (cond
-                                   ((and (not (eq scroll-bar :always))
-                                         (<= page-size 1))
-                                    empty-char)
-                                   ((and (> page-size 1)
-                                         (>= cursor (* page-index page-size))
-                                         (< cursor (* (+ page-index thum-size) page-size)))
-                                    popup-scroll-bar-foreground-char)
-                                   (t
-                                    popup-scroll-bar-background-char))
-                                "")
-        for sym = (if symbol
-                      (concat " " (or (popup-item-symbol item) " "))
-                    "")
-        for summary = (or (popup-item-summary item) "")
-        
-        do
-        ;; Show line and set item to the line
-        (popup-set-line-item popup o
-                             :item item
-                             :face face
-                             :mouse-face mouse-face
-                             :margin-left margin-left
-                             :margin-right margin-right
-                             :scroll-bar-char scroll-bar-char
-                             :symbol sym
-                             :summary summary
-                             :keymap keymap)
-        
-        finally
-        ;; Remember current height
-        (setf (popup-current-height popup) (- o offset))
-
-        ;; Hide remaining lines
-        (let ((scroll-bar-char (if scroll-bar (propertize " " 'face popup-face) ""))
-              (symbol (if symbol " " "")))
-          (if (> (popup-direction popup) 0)
-              (progn
-                (when min-height
-                  (while (< o min-height)
-                    (popup-set-line-item popup o
-                                         :item ""
-                                         :face popup-face
-                                         :margin-left margin-left
-                                         :margin-right margin-right
-                                         :scroll-bar-char scroll-bar-char
-                                         :symbol symbol
-                                         :summary "")
-                    (incf o)))
-                (while (< o height)
-                  (popup-hide-line popup o)
-                  (incf o)))
-            (loop with h = (if min-height (- height min-height) offset)
-                  for o from 0 below offset
-                  if (< o h)
-                  do (popup-hide-line popup o)
-                  if (>= o h)
-                  do (popup-set-line-item popup o
-                                          :item ""
-                                          :face popup-face
-                                          :margin-left margin-left
-                                          :margin-right margin-right
-                                          :scroll-bar-char scroll-bar-char
-                                          :symbol symbol
-                                          :summary ""))))))
+  (cl-loop with height = (popup-height popup)
+           with min-height = (popup-min-height popup)
+           with popup-face = (popup-face popup)
+           with mouse-face = (popup-mouse-face popup)
+           with selection-face = (popup-selection-face popup)
+           with summary-face-0 = (popup-summary-face popup)
+           with list = (popup-list popup)
+           with length = (length list)
+           with thum-size = (max (/ (* height height) (max length 1)) 1)
+           with page-size = (/ (+ 0.0 (max length 1)) height)
+           with scroll-bar = (popup-scroll-bar popup)
+           with margin-left = (make-string (if (popup-margin-left-cancel popup) 0 (popup-margin-left popup)) ? )
+           with margin-right = (make-string (popup-margin-right popup) ? )
+           with symbol = (popup-symbol popup)
+           with cursor = (popup-cursor popup)
+           with scroll-top = (popup-scroll-top popup)
+           with offset = (popup-offset popup)
+           with keymap = (popup-keymap popup)
+           for o from offset
+           for i from scroll-top
+           while (< o height)
+           for item in (nthcdr scroll-top list)
+           for page-index = (* thum-size (/ o thum-size))
+           for face = (if (= i cursor)
+                          (or (popup-item-selection-face item) selection-face)
+                        (or (popup-item-face item) popup-face))
+           for summary-face = (unless (= i cursor) summary-face-0)
+           for empty-char = (propertize " " 'face face)
+           for scroll-bar-char = (if scroll-bar
+                                     (cond
+                                      ((and (not (eq scroll-bar :always))
+                                            (<= page-size 1))
+                                       empty-char)
+                                      ((and (> page-size 1)
+                                            (>= cursor (* page-index page-size))
+                                            (< cursor (* (+ page-index thum-size) page-size)))
+                                       popup-scroll-bar-foreground-char)
+                                      (t
+                                       popup-scroll-bar-background-char))
+                                   "")
+           for sym = (if symbol
+                         (concat " " (or (popup-item-symbol item) " "))
+                       "")
+           for summary = (or (popup-item-summary item) "")
+
+           do
+           ;; Show line and set item to the line
+           (popup-set-line-item popup o
+                                :item item
+                                :face face
+                                :mouse-face mouse-face
+                                :margin-left margin-left
+                                :margin-right margin-right
+                                :scroll-bar-char scroll-bar-char
+                                :symbol sym
+                                :summary summary
+                                :summary-face summary-face
+                                :keymap keymap)
+
+           finally
+           ;; Remember current height
+           (setf (popup-current-height popup) (- o offset))
+
+           ;; Hide remaining lines
+           (let ((scroll-bar-char (if scroll-bar (propertize " " 'face popup-face) ""))
+                 (symbol (if symbol " " "")))
+             (if (> (popup-direction popup) 0)
+                 (progn
+                   (when min-height
+                     (while (< o min-height)
+                       (popup-set-line-item popup o
+                                            :item ""
+                                            :face popup-face
+                                            :margin-left margin-left
+                                            :margin-right margin-right
+                                            :scroll-bar-char scroll-bar-char
+                                            :symbol symbol
+                                            :summary "")
+                       (cl-incf o)))
+                   (while (< o height)
+                     (popup-hide-line popup o)
+                     (cl-incf o)))
+               (cl-loop with h = (if min-height (- height min-height) offset)
+                        for o from 0 below offset
+                        if (< o h)
+                        do (popup-hide-line popup o)
+                        if (>= o h)
+                        do (popup-set-line-item popup o
+                                                :item ""
+                                                :face popup-face
+                                                :margin-left margin-left
+                                                :margin-right margin-right
+                                                :scroll-bar-char scroll-bar-char
+                                                :symbol symbol
+                                                :summary ""))))))
 
 (defun popup-hide (popup)
   "Hide POPUP."
@@ -747,6 +792,16 @@ KEYMAP is a keymap that will be put on the popup contents."
           (setq hidden nil))))
     hidden))
 
+(defun popup-jump (popup cursor)
+  "Jump to a position specified by CURSOR of POPUP and draw."
+  (let ((scroll-top (popup-scroll-top popup)))
+    ;; Do not change page as much as possible.
+    (unless (and (<= scroll-top cursor)
+                 (< cursor (+ scroll-top (popup-height popup))))
+      (setf (popup-scroll-top popup) cursor))
+    (setf (popup-cursor popup) cursor)
+    (popup-draw popup)))
+
 (defun popup-select (popup i)
   "Select the item at I of POPUP and draw."
   (setq i (+ i (popup-offset popup)))
@@ -786,11 +841,23 @@ KEYMAP is a keymap that will be put on the popup contents."
             scroll-top (max (- length height) 0)))
      ((= cursor (1- scroll-top))
       ;; Go to previous page
-      (decf scroll-top)))
+      (cl-decf scroll-top)))
     (setf (popup-cursor popup) cursor
           (popup-scroll-top popup) scroll-top)
     (popup-draw popup)))
 
+(defun popup-page-next (popup)
+  "Select next item of POPUP per `popup-height' range.
+Pages down through POPUP."
+  (dotimes (counter (1- (popup-height popup)))
+    (popup-next popup)))
+
+(defun popup-page-previous (popup)
+  "Select previous item of POPUP per `popup-height' range.
+Pages up through POPUP."
+  (dotimes (counter (1- (popup-height popup)))
+    (popup-previous popup)))
+
 (defun popup-scroll-down (popup &optional n)
   "Scroll down N of POPUP and draw."
   (let ((scroll-top (min (+ (popup-scroll-top popup) (or n 1))
@@ -822,35 +889,40 @@ KEYMAP is a keymap that will be put on the popup contents."
   (let ((map (make-sparse-keymap)))
     ;(define-key map "\r"        'popup-isearch-done)
     (define-key map "\C-g"      'popup-isearch-cancel)
+    (define-key map "\C-b"      'popup-isearch-close)
+    (define-key map [left]      'popup-isearch-close)
     (define-key map "\C-h"      'popup-isearch-delete)
     (define-key map (kbd "DEL") 'popup-isearch-delete)
     map))
 
+(defvar popup-menu-show-quick-help-function 'popup-menu-show-quick-help
+  "Function used for showing quick help by `popup-menu*'.")
+
 (defsubst popup-isearch-char-p (char)
   (and (integerp char)
        (<= 32 char)
        (<= char 126)))
 
 (defun popup-isearch-filter-list (pattern list)
-  (loop with regexp = (regexp-quote pattern)
-        for item in list
-        do
-        (unless (stringp item)
-          (setq item (popup-item-propertize (popup-x-to-string item)
-                                            'value item)))
-        if (string-match regexp item)
-        collect
-        (let ((beg (match-beginning 0))
-              (end (match-end 0)))
-          (alter-text-property 0 (length item) 'face
-                               (lambda (prop)
-                                 (unless (eq prop 'popup-isearch-match)
-                                   prop))
-                               item)
-          (put-text-property beg end
-                             'face 'popup-isearch-match
-                             item)
-          item)))
+  (cl-loop with regexp = (regexp-quote pattern)
+           for item in list
+           do
+           (unless (stringp item)
+             (setq item (popup-item-propertize (popup-x-to-string item)
+                                               'value item)))
+           if (string-match regexp item)
+           collect
+           (let ((beg (match-beginning 0))
+                 (end (match-end 0)))
+             (alter-text-property 0 (length item) 'face
+                                  (lambda (prop)
+                                    (unless (eq prop 'popup-isearch-match)
+                                      prop))
+                                  item)
+             (put-text-property beg end
+                                'face 'popup-isearch-match
+                                item)
+             item)))
 
 (defun popup-isearch-prompt (popup pattern)
   (format "Pattern: %s" (if (= (length (popup-list popup)) 0)
@@ -867,12 +939,12 @@ KEYMAP is a keymap that will be put on the popup contents."
         (funcall callback list)))
   (popup-draw popup))
 
-(defun* popup-isearch (popup
-                       &key
-                       (cursor-color popup-isearch-cursor-color)
-                       (keymap popup-isearch-keymap)
-                       callback
-                       help-delay)
+(cl-defun popup-isearch (popup
+                         &key
+                         (cursor-color popup-isearch-cursor-color)
+                         (keymap popup-isearch-keymap)
+                         callback
+                         help-delay)
   "Start isearch on POPUP. This function is synchronized, meaning
 event loop waits for quiting of isearch.
 
@@ -892,7 +964,7 @@ HELP-DELAY is a delay of displaying helps."
         (old-cursor-color (frame-parameter (selected-frame) 'cursor-color))
         prompt key binding)
     (unwind-protect
-        (block nil
+        (cl-block nil
           (if cursor-color
               (set-cursor-color cursor-color))
           (while t
@@ -908,17 +980,22 @@ HELP-DELAY is a delay of displaying helps."
                      (popup-isearch-char-p (aref key 0)))
                 (setq pattern (concat pattern key)))
                ((eq binding 'popup-isearch-done)
-                (return nil))
+                (cl-return nil))
                ((eq binding 'popup-isearch-cancel)
                 (popup-isearch-update popup "" callback)
-                (return t))
+                (cl-return t))
+               ((eq binding 'popup-isearch-close)
+                (popup-isearch-update popup "" callback)
+                (setq unread-command-events
+                      (append (listify-key-sequence key) unread-command-events))
+                (cl-return nil))
                ((eq binding 'popup-isearch-delete)
                 (if (> (length pattern) 0)
                     (setq pattern (substring pattern 0 (1- (length pattern))))))
                (t
                 (setq unread-command-events
                       (append (listify-key-sequence key) unread-command-events))
-                (return nil)))
+                (cl-return nil)))
               (popup-isearch-update popup pattern callback))))
       (if old-cursor-color
           (set-cursor-color old-cursor-color)))))
@@ -934,23 +1011,25 @@ HELP-DELAY is a delay of displaying helps."
 
 (defvar popup-tip-max-width 80)
 
-(defun* popup-tip (string
-                   &key
-                   point
-                   (around t)
-                   width
-                   (height 15)
-                   min-height
-                   truncate
-                   margin
-                   margin-left
-                   margin-right
-                   scroll-bar
-                   parent
-                   parent-offset
-                   nowait
-                   prompt
-                   &aux tip lines)
+(cl-defun popup-tip (string
+                     &key
+                     point
+                     (around t)
+                     width
+                     (height 15)
+                     min-height
+                     max-width
+                     truncate
+                     margin
+                     margin-left
+                     margin-right
+                     scroll-bar
+                     parent
+                     parent-offset
+                     nowait
+                     nostrip
+                     prompt
+                     &aux tip lines)
   "Show a tooltip of STRING at POINT. This function is
 synchronized unless NOWAIT specified. Almost arguments are same
 as `popup-create' except for TRUNCATE, NOWAIT, and PROMPT.
@@ -960,22 +1039,27 @@ If TRUNCATE is non-nil, the tooltip can be truncated.
 If NOWAIT is non-nil, this function immediately returns the
 tooltip instance without entering event loop.
 
+If `NOSTRIP` is non-nil, `STRING` properties are not stripped.
+
 PROMPT is a prompt string when reading events during event loop."
   (if (bufferp string)
       (setq string (with-current-buffer string (buffer-string))))
-  ;; TODO strip text (mainly face) properties
-  (setq string (substring-no-properties string))
+
+  (unless nostrip
+    ;; TODO strip text (mainly face) properties
+    (setq string (substring-no-properties string)))
 
   (and (eq margin t) (setq margin 1))
   (or margin-left (setq margin-left margin))
   (or margin-right (setq margin-right margin))
-  
+
   (let ((it (popup-fill-string string width popup-tip-max-width)))
     (setq width (car it)
           lines (cdr it)))
-  
+
   (setq tip (popup-create point width height
                           :min-height min-height
+                          :max-width max-width
                           :around around
                           :margin-left margin-left
                           :margin-right margin-right
@@ -1007,7 +1091,7 @@ PROMPT is a prompt string when reading events during event loop."
 ;;; Popup Menu
 
 (defface popup-menu-face
-  '((t (:background "lightgray" :foreground "black")))
+  '((t (:inherit popup-face)))
   "Face for popup menu."
   :group 'popup)
 
@@ -1021,12 +1105,14 @@ PROMPT is a prompt string when reading events during event loop."
   "Face for popup menu selection."
   :group 'popup)
 
+(defface popup-menu-summary-face
+  '((t (:inherit popup-summary-face)))
+  "Face for popup summary."
+  :group 'popup)
+
 (defvar popup-menu-show-tip-function 'popup-tip
   "Function used for showing tooltip by `popup-menu-show-quick-help'.")
 
-(defvar popup-menu-show-quick-help-function 'popup-menu-show-quick-help
-  "Function used for showing quick help by `popup-menu*'.")
-
 (defun popup-menu-show-help (menu &optional persist item)
   (popup-item-show-help (or item (popup-selected-item menu)) persist))
 
@@ -1059,8 +1145,8 @@ PROMPT is a prompt string when reading events during event loop."
 
 (defun popup-menu-item-of-mouse-event (event)
   (when (and (consp event)
-             (memq (first event) '(mouse-1 mouse-2 mouse-3 mouse-4 mouse-5)))
-    (let* ((position (second event))
+             (memq (cl-first event) '(mouse-1 mouse-2 mouse-3 mouse-4 mouse-5)))
+    (let* ((position (cl-second event))
            (object (elt position 4)))
       (when (consp object)
         (get-text-property (cdr object) 'popup-item (car object))))))
@@ -1094,18 +1180,18 @@ PROMPT is a prompt string when reading events during event loop."
 
 (defun popup-menu-fallback (event default))
 
-(defun* popup-menu-event-loop (menu
-                               keymap
-                               fallback
-                               &key
-                               prompt
-                               help-delay
-                               isearch
-                               isearch-cursor-color
-                               isearch-keymap
-                               isearch-callback
-                               &aux key binding)
-  (block nil
+(cl-defun popup-menu-event-loop (menu
+                                 keymap
+                                 fallback
+                                 &key
+                                 prompt
+                                 help-delay
+                                 isearch
+                                 isearch-cursor-color
+                                 isearch-keymap
+                                 isearch-callback
+                                 &aux key binding)
+  (cl-block nil
     (while (popup-live-p menu)
       (and isearch
            (popup-isearch menu
@@ -1115,7 +1201,7 @@ PROMPT is a prompt string when reading events during event loop."
                           :help-delay help-delay)
            (keyboard-quit))
       (setq key (popup-menu-read-key-sequence keymap prompt help-delay))
-      (setq binding (lookup-key keymap key))
+      (setq binding (and key (lookup-key keymap key)))
       (cond
        ((or (null key) (zerop (length key)))
         (unless (funcall popup-menu-show-quick-help-function menu nil :prompt prompt)
@@ -1123,31 +1209,41 @@ PROMPT is a prompt string when reading events during event loop."
           (push (read-event prompt) unread-command-events)))
        ((eq (lookup-key (current-global-map) key) 'keyboard-quit)
         (keyboard-quit)
-        (return))
+        (cl-return))
        ((eq binding 'popup-close)
         (if (popup-parent menu)
-            (return)))
+            (cl-return)))
        ((memq binding '(popup-select popup-open))
         (let* ((item (or (popup-menu-item-of-mouse-event (elt key 0))
                          (popup-selected-item menu)))
-               (index (position item (popup-list menu)))
+               (index (cl-position item (popup-list menu)))
                (sublist (popup-item-sublist item)))
-          (unless index (return))
+          (unless index (cl-return))
           (if sublist
-              (popup-aif (popup-cascade-menu sublist
-                                             :around nil
-                                             :margin-left (popup-margin-left menu)
-                                             :margin-right (popup-margin-right menu)
-                                             :scroll-bar (popup-scroll-bar menu)
-                                             :parent menu
-                                             :parent-offset index)
-                  (and it (return it)))
+              (popup-aif (let (popup-use-optimized-column-computation)
+                           (popup-cascade-menu sublist
+                                               :around nil
+                                               :margin-left (popup-margin-left menu)
+                                               :margin-right (popup-margin-right menu)
+                                               :scroll-bar (popup-scroll-bar menu)
+                                               :parent menu
+                                               :parent-offset index
+                                               :help-delay help-delay
+                                               :isearch isearch
+                                               :isearch-cursor-color isearch-cursor-color
+                                               :isearch-keymap isearch-keymap
+                                               :isearch-callback isearch-callback))
+                  (and it (cl-return it)))
             (if (eq binding 'popup-select)
-                (return (popup-item-value-or-self item))))))
+                (cl-return (popup-item-value-or-self item))))))
        ((eq binding 'popup-next)
         (popup-next menu))
        ((eq binding 'popup-previous)
         (popup-previous menu))
+       ((eq binding 'popup-page-next)
+        (popup-page-next menu))
+       ((eq binding 'popup-page-previous)
+        (popup-page-previous menu))
        ((eq binding 'popup-help)
         (popup-menu-show-help menu))
        ((eq binding 'popup-isearch)
@@ -1161,29 +1257,70 @@ PROMPT is a prompt string when reading events during event loop."
        (t
         (funcall fallback key (key-binding key)))))))
 
-(defun* popup-menu* (list
-                     &key
-                     point
-                     (around t)
-                     (width (popup-preferred-width list))
-                     (height 15)
-                     margin
-                     margin-left
-                     margin-right
-                     scroll-bar
-                     symbol
-                     parent
-                     parent-offset
-                     (keymap popup-menu-keymap)
-                     (fallback 'popup-menu-fallback)
-                     help-delay
-                     nowait
-                     prompt
-                     isearch
-                     (isearch-cursor-color popup-isearch-cursor-color)
-                     (isearch-keymap popup-isearch-keymap)
-                     isearch-callback
-                     &aux menu event)
+(defun popup-preferred-width (list)
+  "Return the preferred width to show LIST beautifully."
+  (cl-loop with tab-width = 4
+           for item in list
+           for summary = (popup-item-summary item)
+           maximize (string-width (popup-x-to-string item)) into width
+           if (stringp summary)
+           maximize (+ (string-width summary) 2) into summary-width
+           finally return
+           (let ((total (+ (or width 0) (or summary-width 0))))
+             (* (ceiling (/ total 10.0)) 10))))
+
+(defvar popup-menu-keymap
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\r"        'popup-select)
+    (define-key map "\C-f"      'popup-open)
+    (define-key map [right]     'popup-open)
+    (define-key map "\C-b"      'popup-close)
+    (define-key map [left]      'popup-close)
+
+    (define-key map "\C-n"      'popup-next)
+    (define-key map [down]      'popup-next)
+    (define-key map "\C-p"      'popup-previous)
+    (define-key map [up]        'popup-previous)
+
+    (define-key map [next]      'popup-page-next)
+    (define-key map [prior]     'popup-page-previous)
+
+    (define-key map [f1]        'popup-help)
+    (define-key map (kbd "\C-?") 'popup-help)
+
+    (define-key map "\C-s"      'popup-isearch)
+
+    (define-key map [mouse-1]   'popup-select)
+    (define-key map [mouse-4]   'popup-previous)
+    (define-key map [mouse-5]   'popup-next)
+    map))
+
+(cl-defun popup-menu* (list
+                       &key
+                       point
+                       (around t)
+                       (width (popup-preferred-width list))
+                       (height 15)
+                       max-width
+                       margin
+                       margin-left
+                       margin-right
+                       scroll-bar
+                       symbol
+                       parent
+                       parent-offset
+                       cursor
+                       (keymap popup-menu-keymap)
+                       (fallback 'popup-menu-fallback)
+                       help-delay
+                       nowait
+                       prompt
+                       isearch
+                       (isearch-cursor-color popup-isearch-cursor-color)
+                       (isearch-keymap popup-isearch-keymap)
+                       isearch-callback
+                       initial-index
+                       &aux menu event)
   "Show a popup menu of LIST at POINT. This function returns a
 value of the selected item. Almost arguments are same as
 `popup-create' except for KEYMAP, FALLBACK, HELP-DELAY, PROMPT,
@@ -1216,7 +1353,10 @@ during event loop. The default value is `popup-isearch-keymap'.
 
 ISEARCH-CALLBACK is a function taking one argument.  `popup-menu'
 calls ISEARCH-CALLBACK, if specified, after isearch finished or
-isearch canceled. The arguments is whole filtered list of items."
+isearch canceled. The arguments is whole filtered list of items.
+
+If `INITIAL-INDEX' is non-nil, this is an initial index value for
+`popup-select'. Only positive integer is valid."
   (and (eq margin t) (setq margin 1))
   (or margin-left (setq margin-left margin))
   (or margin-right (setq margin-right margin))
@@ -1224,12 +1364,14 @@ isearch canceled. The arguments is whole filtered list of items."
            (integerp margin-right)
            (> margin-right 0))
       ;; Make scroll-bar space as margin-right
-      (decf margin-right))
+      (cl-decf margin-right))
   (setq menu (popup-create point width height
+                           :max-width max-width
                            :around around
                            :face 'popup-menu-face
                            :mouse-face 'popup-menu-mouse-face
                            :selection-face 'popup-menu-selection-face
+                           :summary-face 'popup-menu-summary-face
                            :margin-left margin-left
                            :margin-right margin-right
                            :scroll-bar scroll-bar
@@ -1239,7 +1381,12 @@ isearch canceled. The arguments is whole filtered list of items."
   (unwind-protect
       (progn
         (popup-set-list menu list)
-        (popup-draw menu)
+        (if cursor
+            (popup-jump menu cursor)
+          (popup-draw menu))
+        (when initial-index
+          (dotimes (_i (min (- (length list) 1) initial-index))
+            (popup-next menu)))
         (if nowait
             menu
           (popup-menu-event-loop menu keymap fallback
@@ -1268,28 +1415,5 @@ the sub menu."
          :symbol t
          args))
 
-(defvar popup-menu-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\r"        'popup-select)
-    (define-key map "\C-f"      'popup-open)
-    (define-key map [right]     'popup-open)
-    (define-key map "\C-b"      'popup-close)
-    (define-key map [left]      'popup-close)
-
-    (define-key map "\C-n"      'popup-next)
-    (define-key map [down]      'popup-next)
-    (define-key map "\C-p"      'popup-previous)
-    (define-key map [up]        'popup-previous)
-
-    (define-key map [f1]        'popup-help)
-    (define-key map (kbd "\C-?") 'popup-help)
-
-    (define-key map "\C-s"      'popup-isearch)
-
-    (define-key map [mouse-1]   'popup-select)
-    (define-key map [mouse-4]   'popup-previous)
-    (define-key map [mouse-5]   'popup-next)
-    map))
-
 (provide 'popup)
 ;;; popup.el ends here
diff --git a/elpa/popup-0.5.2/popup.elc b/elpa/popup-0.5.2/popup.elc
new file mode 100644
index 000000000..2b888b9bb
Binary files /dev/null and b/elpa/popup-0.5.2/popup.elc differ
diff --git a/elpa/popup-0.5/popup-pkg.el b/elpa/popup-0.5/popup-pkg.el
deleted file mode 100644
index bcb89b0a4..000000000
--- a/elpa/popup-0.5/popup-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "popup" "0.5" "Visual Popup User Interface" (quote nil))
diff --git a/elpa/popup-0.5/popup.elc b/elpa/popup-0.5/popup.elc
deleted file mode 100644
index 05c226153..000000000
Binary files a/elpa/popup-0.5/popup.elc and /dev/null differ
diff --git a/elpa/projectile-0.9.2/projectile-autoloads.el b/elpa/projectile-0.11.0/projectile-autoloads.el
similarity index 57%
rename from elpa/projectile-0.9.2/projectile-autoloads.el
rename to elpa/projectile-0.11.0/projectile-autoloads.el
index 94f5d3286..4f92129f0 100644
--- a/elpa/projectile-0.9.2/projectile-autoloads.el
+++ b/elpa/projectile-0.11.0/projectile-autoloads.el
@@ -1,15 +1,38 @@
 ;;; projectile-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads (projectile-global-mode projectile-mode) "projectile"
-;;;;;;  "projectile.el" (21077 32442 0 0))
+;;;### (autoloads nil "projectile" "projectile.el" (21721 36899 0
+;;;;;;  0))
 ;;; Generated autoloads from projectile.el
 
+(autoload 'projectile-commander "projectile" "\
+Execute a Projectile command with a single letter.
+The user is prompted for a single character indicating the action to invoke.
+The `?' character describes then
+available actions.
+
+See `def-projectile-commander-method' for defining new methods.
+
+\(fn)" t nil)
+
+(defvar projectile-mode-line-lighter "Projectile" "\
+The default lighter for `projectile-mode'.")
+
+(custom-autoload 'projectile-mode-line-lighter "projectile" t)
+
 (autoload 'projectile-mode "projectile" "\
 Minor mode to assist project management and navigation.
 
+When called interactively, toggle `projectile-mode'.  With prefix
+ARG, enable `projectile-mode' if ARG is positive, otherwise disable
+it.
+
+When called from Lisp, enable `projectile-mode' if ARG is omitted,
+nil or positive.  If ARG is `toggle', toggle `projectile-mode'.
+Otherwise behave as if called interactively.
+
 \\{projectile-mode-map}
 
 \(fn &optional ARG)" t nil)
@@ -37,16 +60,9 @@ See `projectile-mode' for more information on Projectile mode.
 
 ;;;***
 
-;;;### (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.11.0/projectile-pkg.el b/elpa/projectile-0.11.0/projectile-pkg.el
new file mode 100644
index 000000000..a9aa90aec
--- /dev/null
+++ b/elpa/projectile-0.11.0/projectile-pkg.el
@@ -0,0 +1 @@
+(define-package "projectile" "0.11.0" "Manage and navigate projects in Emacs easily" '((s "1.6.0") (dash "1.5.0") (pkg-info "0.4")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience"))
diff --git a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc b/elpa/projectile-0.11.0/projectile-pkg.elc
similarity index 58%
rename from elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc
rename to elpa/projectile-0.11.0/projectile-pkg.elc
index c68d5dddd..3edae8391 100644
Binary files a/elpa/ido-ubiquitous-0.7/ido-ubiquitous-pkg.elc and b/elpa/projectile-0.11.0/projectile-pkg.elc differ
diff --git a/elpa/projectile-0.11.0/projectile.el b/elpa/projectile-0.11.0/projectile.el
new file mode 100644
index 000000000..1f48f9e87
--- /dev/null
+++ b/elpa/projectile-0.11.0/projectile.el
@@ -0,0 +1,2169 @@
+;;; projectile.el --- Manage and navigate projects in Emacs easily -*- lexical-binding: t -*-
+
+;; Copyright © 2011-2014 Bozhidar Batsov <bozhidar@batsov.com>
+
+;; Author: Bozhidar Batsov <bozhidar@batsov.com>
+;; URL: https://github.com/bbatsov/projectile
+;; Keywords: project, convenience
+;; Version: 0.11.0
+;; X-Original-Version: 0.11.0
+;; Package-Requires: ((s "1.6.0") (dash "1.5.0") (pkg-info "0.4"))
+
+;; This file is NOT part of GNU 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 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:
+
+(require 'thingatpt)
+(require 's)
+(require 'dash)
+(require 'grep)           ; For `rgrep'
+(require 'pkg-info)       ; For `pkg-info-version-info'
+(require 'ibuffer)
+(require 'ibuf-ext)
+
+;;;; Compatibility
+(eval-and-compile
+  (unless (fboundp 'defvar-local)
+    (defmacro defvar-local (var val &optional docstring)
+      "Define VAR as a buffer-local variable with default value VAL.
+Like `defvar' but additionally marks the variable as being automatically
+buffer-local wherever it is set."
+      (declare (debug defvar) (doc-string 3))
+      `(progn
+         (defvar ,var ,val ,docstring)
+         (make-variable-buffer-local ',var)))))
+
+
+;;; Customization
+(defgroup projectile nil
+  "Manage and navigate projects easily."
+  :group 'tools
+  :group 'convenience)
+
+(defcustom projectile-indexing-method (if (eq system-type 'windows-nt) 'native 'alien)
+  "Specifies the indexing method used by Projectile.
+
+There are two indexing methods - native and alien.
+
+The native method is implemented in Emacs Lisp (therefore it is
+native to Emacs).  It's advantage is that is portable and will
+work everywhere that Emacs does.  It's disadvantage is that is a
+bit slow (especially for large projects).  Generally it's a good
+idea to pair the native indexing method with caching.
+
+The alien indexing method uses external tools (e.g. git, find,
+etc) to speed up the indexing process.  The disadvantage of this
+method is that it's not well supported on Windows systems.
+
+By default alien indexing is the default on all operating
+systems, except Windows."
+  :group 'projectile
+  :type 'symbol
+  :options '(native alien))
+
+(defcustom projectile-enable-caching (eq projectile-indexing-method 'native)
+  "When t enables project files caching.
+
+Project caching is automatically enabled by default if you're
+using the native indexing method."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-file-exists-local-cache-expire nil
+  "Number of seconds before file existence cache expires for a
+file on a local file system.
+
+ A value of nil disables this cache."
+
+  :group 'projectile
+  :type '(choice (const :tag "Disabled" nil)
+                 (integer :tag "Seconds")))
+
+(defcustom projectile-file-exists-remote-cache-expire (* 5 60)
+  "Number of seconds before file existence cache expires for a
+file on a remote file system such as tramp.
+
+ A value of nil disables this cache."
+  :group 'projectile
+  :type '(choice (const :tag "Disabled" nil)
+                 (integer :tag "Seconds")))
+
+(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-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"
+  "The command Projectile's going to use to generate a TAGS file."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-sort-order 'default
+  "The sort order used for a project's files."
+  :group 'projectile
+  :type 'symbol
+  :options '(default recentf recently-active access-time modification-time))
+
+(defcustom projectile-buffers-filter-function nil
+  "A function used to filter the buffers in `projectile-project-buffers'.
+
+The function should accept and return a list of Emacs buffers.
+Two example filter functions are shipped by default - `projectile-buffers-with-file'
+and `projectile-buffers-with-file-or-process'."
+  :group 'projectile
+  :type 'symbol)
+
+(defcustom projectile-project-root-files
+  '("rebar.config"       ; Rebar project file
+    "project.clj"        ; Leiningen project file
+    "pom.xml"            ; Maven project file
+    "build.sbt"          ; SBT project file
+    "build.gradle"       ; Gradle project file
+    "Gemfile"            ; Bundler file
+    "requirements.txt"   ; Pip file
+    "package.json"       ; npm package file
+    "gulpfile.js"        ; Gulp build file
+    "Gruntfile.js"       ; Grunt project file
+    "bower.json"         ; Bower project file
+    "composer.json"      ; Composer project file
+    )
+  "A list of files considered to mark the root of a project."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-project-root-files-top-down-recurring
+  '(".svn" ; Svn VCS root dir
+    "CVS"  ; Csv VCS root dir
+    )
+  "A list of files considered to mark the root of a project.
+This root files pattern stops at the parentmost match."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-project-root-files-bottom-up
+  '(".projectile" ; projectile project marker
+    ".git"        ; Git VCS root dir
+    ".hg"         ; Mercurial VCS root dir
+    ".fslckout"   ; Fossil VCS root dir
+    ".bzr"        ; Bazaar VCS root dir
+    "_darcs"      ; Darcs VCS root dir
+    )
+  "A list of files considered to mark the root of a project.
+This root files pattern overrides discovery of any root files
+pattern that would have found a project root in a subdirectory."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-project-root-files-functions
+  '(projectile-root-bottom-up
+    projectile-root-top-down
+    projectile-root-top-down-recurring)
+  "A list of functions for finding project roots."
+  :group 'projectile
+  :type '(repeat function))
+
+(defcustom projectile-globally-ignored-files
+  '("TAGS")
+  "A list of files globally ignored by projectile."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-globally-ignored-directories
+  '(".idea"
+    ".eunit"
+    ".git"
+    ".hg"
+    ".fslckout"
+    ".bzr"
+    "_darcs"
+    ".tox"
+    ".svn"
+    "build")
+  "A list of directories globally ignored by projectile."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-globally-ignored-modes
+  '("erc-mode"
+    "help-mode"
+    "completion-list-mode"
+    "Buffer-menu-mode"
+    "gnus-.*-mode"
+    "occur-mode")
+  "A list of regular expressions for major modes ignored by projectile.
+
+If a buffer is using a given major mode, projectile will ignore
+it for functions working with buffers."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-find-file-hook nil
+  "Hooks run when a file is opened with `projectile-find-file'."
+  :group 'projectile
+  :type 'hook)
+
+(defcustom projectile-find-dir-hook nil
+  "Hooks run when a directory is opened with `projectile-find-dir'."
+  :group 'projectile
+  :type 'hook)
+
+(defcustom projectile-switch-project-action 'projectile-find-file
+  "Action invoked after switching projects with `projectile-switch-project'.
+
+Any function that does not take arguments will do."
+  :group 'projectile
+  :type 'symbol)
+
+(defcustom projectile-find-dir-includes-top-level nil
+  "If true, add top-level dir to options offered by `projectile-find-dir'."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-use-git-grep nil
+  "If true, use `vc-git-grep' in git projects."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-remember-window-configs nil
+  "If true, restore the last window configuration when switching projects.
+If no configuration exists, just run `projectile-switch-project-action' as usual."
+  :group 'projectile
+  :type 'boolean)
+
+;;; Idle Timer
+(defvar projectile-idle-timer nil
+  "The timer object created when `project-enable-idle-timer' is non-nil.")
+
+(defcustom projectile-idle-timer-seconds 30
+  "The idle period to use when `projectile-enable-idle-timer' is non-nil."
+  :group 'projectile
+  :type 'number)
+
+(defcustom projectile-idle-timer-hook '(projectile-regenerate-tags)
+  "The hook run when `projectile-enable-idle-timer' is non-nil."
+  :group 'projectile
+  :type '(repeat symbol))
+
+(defcustom projectile-enable-idle-timer nil
+  "Enables idle timer hook `projectile-idle-timer-functions'.
+
+When `projectile-enable-idle-timer' is non-nil, the hook
+`projectile-idle-timer-hook' is run each time Emacs has been idle
+for `projectile-idle-timer-seconds' seconds and we're in a
+project."
+  :group 'projectile
+  :set (lambda (symbol value)
+         (set symbol value)
+         (when projectile-idle-timer
+           (cancel-timer projectile-idle-timer))
+         (setq projectile-idle-timer nil)
+         (when projectile-enable-idle-timer
+           (setq projectile-idle-timer (run-with-idle-timer
+                                        projectile-idle-timer-seconds t
+                                        (lambda ()
+                                          (when (projectile-project-p)
+                                            (run-hooks 'projectile-idle-timer-hook)))))))
+  :type 'boolean)
+
+;;; Serialization
+(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 (let (print-length) (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)
+
+(defcustom projectile-ignored-projects nil
+  "A list of projects not to be added to `projectile-known-projects'."
+  :group 'projectile
+  :type 'list
+  :package-version '(projectile . "0.11.0"))
+
+
+;;; Version information
+
+(defun projectile-version (&optional show-version)
+  "Get the Projectile 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 t))
+  (let ((version (pkg-info-version-info 'projectile)))
+    (when show-version
+      (message "Projectile version: %s" version))
+    version))
+
+
+;;; Caching
+(defvar projectile-file-exists-cache
+  (make-hash-table :test 'equal)
+  "Cached `projectile-file-exists-p' results.")
+
+(defvar projectile-file-exists-cache-timer nil
+  "Timer for scheduling`projectile-file-exists-cache-cleanup'.")
+
+(defun projectile-file-exists-cache-cleanup ()
+  "Removed timed out cache entries and reschedules or remove the
+timer if no more items are in the cache."
+  (let ((now (current-time)))
+    (maphash (lambda (key value)
+               (if (time-less-p (cdr value) now)
+                   (remhash key  projectile-file-exists-cache)))
+             projectile-file-exists-cache)
+    (setq projectile-file-exists-cache-timer
+          (if (> (hash-table-count projectile-file-exists-cache) 0)
+              (run-with-timer 10 nil 'projectile-file-exists-cache-cleanup)))))
+
+(defun projectile-file-exists-p (filename)
+  "Return t if file FILENAME exist.
+A wrapper around `file-exists-p' with additional caching support."
+  (let* ((file-remote (file-remote-p filename))
+         (expire-seconds
+          (if file-remote
+              (and projectile-file-exists-remote-cache-expire
+                   (> projectile-file-exists-remote-cache-expire 0)
+                   projectile-file-exists-remote-cache-expire)
+            (and projectile-file-exists-local-cache-expire
+                 (> projectile-file-exists-local-cache-expire 0)
+                 projectile-file-exists-local-cache-expire)))
+         (remote-file-name-inhibit-cache (if expire-seconds
+                                             expire-seconds
+                                           remote-file-name-inhibit-cache)))
+    (if (not expire-seconds)
+        (file-exists-p filename)
+      (let* ((current-time (current-time))
+             (cached (gethash filename projectile-file-exists-cache))
+             (cached-value (if cached (car cached)))
+             (cached-expire (if cached (cdr cached)))
+             (cached-expired (if cached (time-less-p cached-expire current-time) t))
+             (value (or (and (not cached-expired) cached-value)
+                        (if (file-exists-p filename) 'found 'notfound))))
+        (when (or (not cached) cached-expired)
+          (puthash filename
+                   (cons value (time-add current-time (seconds-to-time expire-seconds)))
+                   projectile-file-exists-cache))
+        (unless projectile-file-exists-cache-timer
+          (setq projectile-file-exists-cache-timer
+                (run-with-timer 10 nil 'projectile-file-exists-cache-cleanup)))
+        (equal value 'found)))))
+
+(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-purge-file-from-cache (file)
+  "Purge FILE from the cache of the current project."
+  (interactive
+   (list (projectile-completing-read
+          "Remove file from cache: "
+          (projectile-current-project-files))))
+  (let* ((project-root (projectile-project-root))
+         (project-cache (gethash project-root projectile-projects-cache)))
+    (if (projectile-file-cached-p file project-root)
+        (progn
+          (puthash project-root (remove file project-cache) projectile-projects-cache)
+          (projectile-serialize-cache)
+          (message "%s removed from cache" file))
+      (error "%s is not in the cache" file))))
+
+(defun projectile-purge-dir-from-cache (dir)
+  "Purge DIR from the cache of the current project."
+  (interactive
+   (list (projectile-completing-read
+          "Remove directory from cache: "
+          (projectile-current-project-dirs))))
+  (let* ((project-root (projectile-project-root))
+         (project-cache (gethash project-root projectile-projects-cache)))
+    (puthash project-root
+             (-filter (lambda (file)
+                        (s-starts-with-p dir file))
+                      project-cache)
+             projectile-projects-cache)))
+
+(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))
+         (abs-current-file (buffer-file-name (current-buffer)))
+         (current-file (file-relative-name abs-current-file current-project)))
+    (unless (or (projectile-file-cached-p current-file current-project)
+                (projectile-ignored-directory-p (file-name-directory abs-current-file))
+                (projectile-ignored-file-p abs-current-file))
+      (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."
+               (propertize current-file 'face 'font-lock-keyword-face)
+               (propertize current-project 'face 'font-lock-keyword-face)))))
+
+;; 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)))
+
+(defun projectile-maybe-invalidate-cache (force)
+  "Invalidate if FORCE or project's dirconfig newer than cache."
+  (when (or force (file-newer-than-file-p (projectile-dirconfig-file)
+                                          projectile-cache-file))
+    (projectile-invalidate-cache nil)))
+
+
+;;; Window configurations
+(defvar projectile-window-config-map
+  (make-hash-table :test 'equal)
+  "A mapping from project names to their latest window configurations.")
+
+(defun projectile-save-window-config (project-name)
+  "Save PROJECT-NAME's configuration to `projectile-window-config-map'."
+  (puthash project-name (current-window-configuration) projectile-window-config-map))
+
+(defun projectile-get-window-config (project-name)
+  "Return the window configuration corresponding to PROJECT-NAME.
+If no such window configuration exists,
+returns nil."
+  (gethash project-name projectile-window-config-map))
+
+(defun projectile-restore-window-config (project-name)
+  "Restore the window configuration corresponding to the PROJECT-NAME.
+Returns nil if no window configuration was found"
+  (let ((window-config (projectile-get-window-config project-name)))
+    (when window-config
+      (set-window-configuration window-config))))
+
+(defadvice projectile-switch-project (before projectile-save-window-configuration-before-switching-projects activate)
+  "Save the current project's window configuration before switching projects."
+  (when (and projectile-remember-window-configs
+             (projectile-project-p))
+    (projectile-save-window-config (projectile-project-name))))
+
+(defadvice projectile-kill-buffers (before projectile-remove-window-configuration-before-kill-buffers activate)
+  "Remove's this project's window configuration from the table before killing buffers."
+  (remhash (projectile-project-name) projectile-window-config-map))
+
+(defadvice projectile-kill-buffers (after projectile-restore-window-configuration-after-kill-buffers activate)
+  "Restore previous (if any) project's window configuration after killing a project's buffers."
+  (when (and projectile-remember-window-configs
+             (projectile-project-p))
+    (projectile-restore-window-config (projectile-project-name))))
+
+
+;;; Project root related utilities
+(defun projectile-parent (path)
+  "Return the parent directory of PATH.
+PATH may be a file or directory and directory paths may end with a slash."
+  (directory-file-name (file-name-directory (directory-file-name (expand-file-name path)))))
+
+(defun projectile-locate-dominating-file (file name)
+  "Look up the directory hierarchy from FILE for a directory containing NAME.
+Stop at the first parent directory containing a file NAME,
+and return the directory.  Return nil if not found.
+Instead of a string, NAME can also be a predicate taking one argument
+\(a directory) and returning a non-nil value if that directory is the one for
+which we're looking."
+  ;; copied from files.el (stripped comments) emacs-24 bzr branch 2014-03-28 10:20
+  (setq file (abbreviate-file-name file))
+  (let ((root nil)
+        try)
+    (while (not (or root
+                    (null file)
+                    (string-match locate-dominating-stop-dir-regexp file)))
+      (setq try (if (stringp name)
+                    (projectile-file-exists-p (expand-file-name name file))
+                  (funcall name file)))
+      (cond (try (setq root file))
+            ((equal file (setq file (file-name-directory
+                                     (directory-file-name file))))
+             (setq file nil))))
+    (if root (file-name-as-directory root))))
+
+(defun projectile-root-bottom-up (dir &optional list)
+  "Identify a project root in DIR by looking at `projectile-project-root-files-bottom-up'.
+Returns a project root directory path or nil if not found."
+  (--reduce-from
+   (or acc
+       (projectile-locate-dominating-file dir it))
+   nil
+   (or list projectile-project-root-files-bottom-up (list))))
+
+(defun projectile-root-top-down (dir &optional list)
+  "Identify a project root in DIR by looking at `projectile-project-root-files-top-down'.
+Returns a project root directory path or nil if not found."
+  (projectile-locate-dominating-file
+   dir
+   (lambda (dir)
+     (--first (projectile-file-exists-p (expand-file-name it dir))
+              (or list projectile-project-root-files (list))))))
+
+(defun projectile-root-top-down-recurring (dir &optional list)
+  "Identify a project root in DIR by looking at `projectile-project-root-files-top-down-recurring'.
+Returns a project root directory path or nil if not found."
+  (--reduce-from
+   (or acc
+       (projectile-locate-dominating-file
+        dir
+        (lambda (dir)
+          (and (projectile-file-exists-p (expand-file-name it dir))
+               (or (string-match locate-dominating-stop-dir-regexp (projectile-parent dir))
+                   (not (projectile-file-exists-p (expand-file-name it (projectile-parent dir)))))))))
+   nil
+   (or list projectile-project-root-files-top-down-recurring (list))))
+
+(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."
+  (file-truename
+   (let ((dir (file-truename default-directory)))
+     (or (--reduce-from
+          (or acc (funcall it dir)) nil
+          projectile-project-root-files-functions)
+         (if projectile-require-project-root
+             (error "You're not in a project")
+           default-directory)))))
+
+(defun projectile-file-truename (file-name)
+  "Return the truename of FILE-NAME.
+A thin wrapper around `file-truename' that handles nil."
+  (when file-name
+    (file-truename 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))))
+
+
+;;; Project indexing
+(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 (eq projectile-indexing-method 'native)
+            (projectile-dir-files-native root directory)
+          ;; use external tools to get the project files
+          (projectile-remove-ignored (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) (file-relative-name file root))
+        (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)
+                             (file-relative-name (expand-file-name f directory) root))
+                           (projectile-get-repo-files)))
+    files-list))
+
+(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 -R --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 "svn list -R . | grep -v '$/' | tr '\\n' '\\0'"
+  "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 absolute-file
+                                                   directory 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 absolute-file
+                                                   directory patterns))))
+          (setq files-list (cons
+                            (expand-file-name current-file directory)
+                            files-list))))))))
+
+(defun projectile-remove-ignored (files)
+  "Remove ignored files and folders from FILES.
+
+Operates on filenames relative to the project root."
+  (let ((ignored (append (projectile-ignored-files-rel)
+                         (projectile-ignored-directories-rel))))
+    (-remove (lambda (file)
+               (--any-p  (s-starts-with-p it file) ignored))
+             files)))
+
+(defun projectile-buffers-with-file (buffers)
+  "Return only those BUFFERS backed by files."
+  (--filter (buffer-file-name it) buffers))
+
+(defun projectile-buffers-with-file-or-process (buffers)
+  "Return only those BUFFERS backed by files or processes."
+  (--filter (or (buffer-file-name it)
+                (get-buffer-process it)) buffers))
+
+(defun projectile-project-buffers ()
+  "Get a list of project buffers."
+  (let* ((project-root (projectile-project-root))
+         (all-buffers (-filter (lambda (buffer)
+                                 (projectile-project-buffer-p buffer project-root))
+                               (buffer-list))))
+    (if projectile-buffers-filter-function
+        (funcall projectile-buffers-filter-function all-buffers)
+      all-buffers)))
+
+(defun projectile-process-current-project-buffers (action)
+  "Process the current project's buffers using ACTION."
+  (let ((project-buffers (projectile-project-buffers)))
+    (dolist (buffer project-buffers)
+      (funcall action buffer))))
+
+(defun projectile-project-buffer-files ()
+  "Get a list of project buffer files."
+  (let ((project-root (projectile-project-root)))
+    (->> (projectile-buffers-with-file (projectile-project-buffers))
+      (-map (lambda (buffer)
+              (file-relative-name (buffer-file-name buffer) project-root))))))
+
+(defun projectile-project-buffer-p (buffer project-root)
+  "Check if BUFFER is under PROJECT-ROOT."
+  (with-current-buffer buffer
+    (and (not (s-starts-with? " " (buffer-name buffer)))
+         (not (projectile-ignored-buffer-p buffer))
+         (s-starts-with? project-root (file-truename default-directory)))))
+
+(defun projectile-ignored-buffer-p (buffer)
+  "Check if BUFFER should be ignored."
+  (with-current-buffer buffer
+    (--any-p (s-matches? (concat "^" it "$")
+                         (symbol-name major-mode))
+             projectile-globally-ignored-modes)))
+
+(defun projectile-recently-active-files ()
+  "Get list of recently active files.
+
+Files are ordered by recently active buffers, and then recently
+opened through use of recentf."
+  (let ((project-buffer-files (projectile-project-buffer-files)))
+    (append project-buffer-files
+            (-difference (projectile-recentf-files)
+                         project-buffer-files))))
+
+(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-switch-to-buffer-other-window ()
+  "Switch to a project buffer and show it in another window."
+  (interactive)
+  (switch-to-buffer-other-window
+   (projectile-completing-read
+    "Switch to buffer: "
+    (projectile-project-buffer-names))))
+
+(defun projectile-display-buffer ()
+  "Display a project buffer in another window without selecting it."
+  (interactive)
+  (display-buffer
+   (projectile-completing-read
+    "Display buffer: "
+    (projectile-project-buffer-names))))
+
+(defun projectile-project-buffers-other-buffer ()
+  "Switch to the most recently selected buffer project buffer.
+Only buffers not visible in windows are returned."
+  (interactive)
+  (switch-to-buffer (car (projectile-project-buffers-non-visible))) nil t)
+
+(defun projectile-project-buffers-non-visible ()
+  "Get a list of non visible project buffers."
+  (-filter (lambda (buffer)
+             (not (get-buffer-window buffer 'visible)))
+           (projectile-project-buffers)))
+
+(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 (file directory 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-ignored-directories-rel ()
+  "Return list of ignored directories, relative to the root."
+  (let ((project-root (projectile-project-root)))
+    (--map (file-relative-name it project-root) (projectile-ignored-directories))))
+
+(defun projectile-ignored-files-rel ()
+  "Return list of ignored files, relative to the root."
+  (let ((project-root (projectile-project-root)))
+    (--map (file-relative-name it project-root) (projectile-ignored-files))))
+
+(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)))
+    (-flatten (-map
+               (lambda (pattern)
+                 (or (file-expand-wildcards pattern t)
+                     (projectile-expand-root pattern)))
+               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 (projectile-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)))
+          (cons (-map (lambda (dir) (projectile-ensure-trailing-slash
+                                     (projectile-strip-dir-prefix dir))) (car separated-vals))
+                (-map 'projectile-strip-dir-prefix (cadr separated-vals))))))))
+
+(defun projectile-ensure-trailing-slash (dir)
+  "Append / to DIR if missing."
+  (if (s-ends-with? "/" dir) dir
+    (concat dir "/")))
+
+(defun projectile-strip-dir-prefix (dir)
+  "Strip + or - prefix from DIR."
+  (s-chop-prefixes '("-" "+") dir))
+
+(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 &optional initial-input)
+  "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 nil nil initial-input))
+     ((eq projectile-completion-system 'default)
+      (completing-read prompt choices nil nil initial-input))
+     ((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)))
+    (projectile-sort-files files)))
+
+(defun projectile-process-current-project-files (action)
+  "Process the current project's files using ACTION."
+  (let ((project-files (projectile-current-project-files))
+        default-directory (projectile-project-root))
+    (dolist (filename project-files)
+     (funcall action filename))))
+
+(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))
+
+
+;;; Interactive commands
+(defun projectile-find-file (&optional arg)
+  "Jump to a project's file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (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-file-other-window (&optional arg)
+  "Jump to a project's file using completion and show it in another window.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (let ((file (projectile-completing-read "Find file: "
+                                          (projectile-current-project-files))))
+    (find-file-other-window (expand-file-name file (projectile-project-root)))
+    (run-hooks 'projectile-find-file-hook)))
+
+(defun projectile-sort-files (files)
+  "Sort FILES according to `projectile-sort-order'."
+  (pcase projectile-sort-order
+    (`default files)
+    (`recentf (projectile-sort-by-recentf-first files))
+    (`recently-active (projectile-sort-by-recently-active-first files))
+    (`modification-time (projectile-sort-by-modification-time files))
+    (`access-time (projectile-sort-by-access-time files))))
+
+(defun projectile-sort-by-recentf-first (files)
+  "Sort FILES by a recent first scheme."
+  (let ((project-recentf-files (projectile-recentf-files)))
+    (append project-recentf-files
+            (-difference files project-recentf-files))))
+
+(defun projectile-sort-by-recently-active-first (files)
+  "Sort FILES by most recently active buffers or opened files."
+  (let ((project-recently-active-files (projectile-recently-active-files)))
+    (append project-recently-active-files
+            (-difference files project-recently-active-files))))
+
+(defun projectile-sort-by-modification-time (files)
+  "Sort FILES by modification time."
+  (let ((default-directory (projectile-project-root)))
+   (-sort (lambda (file1 file2)
+            (let ((file1-mtime (nth 5 (file-attributes file1)))
+                  (file2-mtime (nth 5 (file-attributes file2))))
+              (not (time-less-p file1-mtime file2-mtime))))
+          files)))
+
+(defun projectile-sort-by-access-time (files)
+  "Sort FILES by access time."
+  (let ((default-directory (projectile-project-root)))
+    (-sort (lambda (file1 file2)
+             (let ((file1-atime (nth 4 (file-attributes file1)))
+                   (file2-atime (nth 4 (file-attributes file2))))
+               (not (time-less-p file1-atime file2-atime))))
+           files)))
+
+(defun projectile-find-dir (&optional arg)
+  "Jump to a project's directory using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (let ((dir (projectile-complete-dir)))
+    (dired (expand-file-name dir (projectile-project-root)))
+    (run-hooks 'projectile-find-dir-hook)))
+
+(defun projectile-find-dir-other-window (&optional arg)
+  "Jump to a project's directory in other window using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((dir (projectile-complete-dir)))
+    (dired-other-window (expand-file-name dir (projectile-project-root)))
+    (run-hooks 'projectile-find-dir-hook)))
+
+(defun projectile-complete-dir ()
+  (projectile-completing-read
+   "Find dir: "
+   (if projectile-find-dir-includes-top-level
+       (append '("./") (projectile-current-project-dirs))
+     (projectile-current-project-dirs))))
+
+(defun projectile-find-test-file (&optional arg)
+  "Jump to a project's test file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (let ((file (projectile-completing-read "Find test file: "
+                                          (projectile-current-project-test-files))))
+    (find-file (expand-file-name file (projectile-project-root)))))
+
+(defcustom projectile-test-files-prefixes '("test_")
+  "Some common prefixes of test files."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-test-files-suffices '("_test" "_spec" "Spec" "Test" "-test")
+  "Some common suffices of test files."
+  :group 'projectile
+  :type '(repeat string))
+
+(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."
+  (or (-any? (lambda (prefix)
+               (s-starts-with? prefix (file-name-nondirectory file)))
+             projectile-test-files-prefixes)
+      (-any? (lambda (suffix)
+               (s-ends-with? suffix (file-name-sans-extension file)))
+             projectile-test-files-suffices)))
+
+(defun projectile-current-project-test-files ()
+  "Return a list of test files for the current project."
+  (projectile-test-files (projectile-current-project-files)))
+
+(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-django '("manage.py"))
+(defvar projectile-python-pip '("requirements.txt"))
+(defvar projectile-python-egg '("setup.py"))
+(defvar projectile-maven '("pom.xml"))
+(defvar projectile-gradle '("build.gradle"))
+(defvar projectile-grails '("application.properties" "grails-app"))
+(defvar projectile-lein '("project.clj"))
+(defvar projectile-rebar '("rebar"))
+(defvar projectile-sbt '("build.sbt"))
+(defvar projectile-make '("Makefile"))
+(defvar projectile-grunt '("Gruntfile.js"))
+(defvar projectile-gulp '("gulpfile.js"))
+
+(defun projectile-go ()
+  (-any? (lambda (file)
+           (string= (file-name-extension file) "go")) (projectile-current-project-files)))
+
+(defcustom projectile-go-function 'projectile-go
+  "Function to determine if project's type is go."
+  :group 'projectile
+  :type 'function)
+
+(defun projectile-project-type ()
+  "Determine the project's type based on its structure."
+  (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-django) 'django)
+   ((projectile-verify-files projectile-python-pip)'python)
+   ((projectile-verify-files projectile-python-egg) 'python)
+   ((projectile-verify-files projectile-symfony) 'symfony)
+   ((projectile-verify-files projectile-lein) 'lein)
+   ((projectile-verify-files projectile-maven) 'maven)
+   ((projectile-verify-files projectile-gradle) 'gradle)
+   ((projectile-verify-files projectile-grails) 'grails)
+   ((projectile-verify-files projectile-rebar) 'rebar)
+   ((projectile-verify-files projectile-sbt) 'sbt)
+   ((projectile-verify-files projectile-make) 'make)
+   ((projectile-verify-files projectile-gulp) 'gulp)
+   ((projectile-verify-files projectile-grunt) 'grunt)
+   ((funcall projectile-go-function) 'go)
+   (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."
+  (projectile-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
+     ((projectile-file-exists-p (expand-file-name ".git" project-root)) 'git)
+     ((projectile-file-exists-p (expand-file-name ".hg" project-root)) 'hg)
+     ((projectile-file-exists-p (expand-file-name ".fossil" project-root)) 'fossil)
+     ((projectile-file-exists-p (expand-file-name ".bzr" project-root)) 'bzr)
+     ((projectile-file-exists-p (expand-file-name "_darcs" project-root)) 'darcs)
+     ((projectile-file-exists-p (expand-file-name ".svn" project-root)) 'svn)
+     ((projectile-locate-dominating-file project-root ".git") 'git)
+     ((projectile-locate-dominating-file project-root ".hg") 'hg)
+     ((projectile-locate-dominating-file project-root ".fossil") 'fossil)
+     ((projectile-locate-dominating-file project-root ".bzr") 'bzr)
+     ((projectile-locate-dominating-file project-root "_darcs") 'darcs)
+     ((projectile-locate-dominating-file project-root ".svn") 'svn)
+     (t 'none))))
+
+(defun projectile-find-implementation-or-test (file-name)
+  "Given a FILE-NAME return the matching implementation or test filename."
+  (unless file-name (error "The current buffer is not visiting a file"))
+  (if (projectile-test-file-p file-name)
+      ;; find the matching impl file
+      (let ((impl-file (projectile-find-matching-file file-name)))
+        (if impl-file
+            (projectile-expand-root impl-file)
+          (error "No matching source file found")))
+    ;; find the matching test file
+    (let ((test-file (projectile-find-matching-test file-name)))
+      (if test-file
+          (projectile-expand-root test-file)
+        (error "No matching test file found")))))
+
+(defun projectile-find-implementation-or-test-other-window ()
+  "Open matching implementation or test file in other window."
+  (interactive)
+  (find-file-other-window
+   (projectile-find-implementation-or-test (buffer-file-name))))
+
+(defun projectile-toggle-between-implementation-and-test ()
+  "Toggle between an implementation file and its test file."
+  (interactive)
+  (find-file
+   (projectile-find-implementation-or-test (buffer-file-name))))
+
+(defun projectile-test-affix (project-type)
+  "Find test files affix based on PROJECT-TYPE."
+  (or (funcall projectile-test-prefix-function project-type)
+      (funcall projectile-test-suffix-function project-type)
+      (error "Project type not supported!")))
+
+(defcustom projectile-test-prefix-function 'projectile-test-prefix
+  "Function to find test files prefix based on PROJECT-TYPE."
+  :group 'projectile
+  :type 'function)
+
+(defcustom projectile-test-suffix-function 'projectile-test-suffix
+  "Function to find test files suffix based on PROJECT-TYPE."
+  :group 'projectile
+  :type 'function)
+
+(defun projectile-test-prefix (project-type)
+  "Find default test files prefix based on PROJECT-TYPE."
+  (cond
+   ((member project-type '(django python)) "test_")))
+
+(defun projectile-test-suffix (project-type)
+  "Find default test files suffix based on PROJECT-TYPE."
+  (cond
+   ((member project-type '(rails-rspec ruby-rspec)) "_spec")
+   ((member project-type '(rails-test ruby-test lein go)) "_test")
+   ((member project-type '(maven symfony)) "Test")
+   ((member project-type '(gradle grails)) "Spec")))
+
+(defun projectile-find-matching-test (file)
+  "Compute the name of the test matching FILE."
+  (let ((basename (file-name-nondirectory (file-name-sans-extension file)))
+        (test-affix (projectile-test-affix (projectile-project-type))))
+    (-first (lambda (current-file)
+              (let ((current-file-basename (file-name-nondirectory (file-name-sans-extension current-file))))
+                (or (s-equals? current-file-basename (concat test-affix basename))
+                    (s-equals? current-file-basename (concat basename test-affix)))))
+            (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)))
+        (test-affix (projectile-test-affix (projectile-project-type))))
+    (-first (lambda (current-file)
+              (let ((current-file-basename (file-name-nondirectory (file-name-sans-extension current-file))))
+                (or (s-equals? (concat test-affix current-file-basename) basename)
+                    (s-equals? (concat current-file-basename test-affix) basename))))
+            (projectile-current-project-files))))
+
+(defun projectile-grep-default-files ()
+  "Try to find a default pattern for `projectile-grep'.
+This is a subset of `grep-read-files', where either a matching entry from
+`grep-files-aliases' or file name extension pattern is returned."
+  (when buffer-file-name
+    (let* ((fn (file-name-nondirectory buffer-file-name))
+           (default-alias
+             (let ((aliases (remove (assoc "all" grep-files-aliases)
+                                    grep-files-aliases))
+                   alias)
+               (while aliases
+                 (setq alias (car aliases)
+                       aliases (cdr aliases))
+                 (if (string-match (mapconcat
+                                    'wildcard-to-regexp
+                                    (split-string (cdr alias) nil t)
+                                    "\\|")
+                                   fn)
+                     (setq aliases nil)
+                   (setq alias nil)))
+               (cdr alias)))
+           (default-extension
+             (let ((ext (file-name-extension fn)))
+               (and ext (concat "*." ext)))))
+      (or default-alias default-extension))))
+
+(defun projectile-grep (&optional arg)
+  "Perform rgrep in the project.
+
+With a prefix ARG asks for files (globbing-aware) which to grep in.
+With prefix ARG of `-' (such as `M--'), default the files (without prompt),
+to `projectile-grep-default-files'."
+  (interactive "P")
+  (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))))
+         (files (and arg (or (and (equal current-prefix-arg '-)
+                                  (projectile-grep-default-files))
+                             (read-string (projectile-prepend-project-name "Grep in: ")
+                                          (projectile-grep-default-files))))))
+    (dolist (root-dir roots)
+      (require 'grep)
+      ;; in git projects users have the option to use `vc-git-grep' instead of `rgrep'
+      (if (and (eq (projectile-project-vcs) 'git) projectile-use-git-grep)
+          (vc-git-grep search-regexp (or files "") root-dir)
+        ;; paths for find-grep should relative and without trailing /
+        (let ((grep-find-ignored-directories (-union (-map (lambda (dir) (s-chop-suffix "/" (file-relative-name dir root-dir)))
+                                                           (cdr (projectile-ignored-directories))) grep-find-ignored-directories))
+              (grep-find-ignored-files (-union (-map (lambda (file) (file-relative-name file root-dir)) (projectile-ignored-files)) grep-find-ignored-files)))
+          (grep-compute-defaults)
+          (rgrep search-regexp (or files "* .*") root-dir))))))
+
+(defun projectile-ack (regexp &optional arg)
+  "Run an ack search with REGEXP in the project.
+
+With a prefix argument ARG prompts you for a directory on which the search is performed ."
+  (interactive
+   (list (read-from-minibuffer
+          (projectile-prepend-project-name "Ack search for: ")
+          (projectile-symbol-at-point))
+         current-prefix-arg))
+  (if (require 'ack-and-a-half nil 'noerror)
+      (let* ((saved-arguments ack-and-a-half-arguments)
+             (root (if arg
+                       (expand-file-name (projectile-complete-dir) (projectile-project-root))
+                     (projectile-project-root)))
+             (ack-and-a-half-arguments
+              (append saved-arguments
+                      (-union (-map (lambda (path)
+                                      (concat "--ignore-dir=" (file-name-nondirectory (directory-file-name path))))
+                                    (projectile-ignored-directories))
+                              (-map (lambda (path)
+                                      (concat "--ignore-file=is:" (file-relative-name path root)))
+                                    (projectile-ignored-files))))))
+        (ack-and-a-half regexp t root))
+    (error "ack-and-a-half not available")))
+
+(defun projectile-ag (search-term &optional arg)
+  "Run an ag search with SEARCH-TERM in the project.
+
+With an optional prefix argument ARG SEARCH-TERM is interpreted as a
+regular expression."
+  (interactive
+   (list (read-from-minibuffer
+          (projectile-prepend-project-name "Ag search for: ")
+          (projectile-symbol-at-point))
+         current-prefix-arg))
+  (if (fboundp 'ag-regexp)
+      (let ((ag-command (if arg 'ag-regexp 'ag))
+            ;; reset the prefix arg, otherwise it will affect the ag-command
+            (current-prefix-arg nil))
+        (funcall ag-command search-term (projectile-project-root)))
+    (error "Ag is not available")))
+
+(defun projectile-tags-exclude-patterns ()
+  "Return a string with exclude patterns for ctags."
+  (mapconcat (lambda (pattern) (format "--exclude=%s"
+                                       (directory-file-name pattern)))
+             (projectile-ignored-directories-rel) " "))
+
+(defun projectile-regenerate-tags ()
+  "Regenerate the project's [e|g]tags."
+  (interactive)
+  (if (boundp 'ggtags-mode)
+      (progn
+        (let* ((ggtags-project-root (projectile-project-root))
+               (default-directory ggtags-project-root))
+          (ggtags-ensure-project)
+          (ggtags-update-tags t)))
+    (let* ((project-root (projectile-project-root))
+           (tags-exclude (projectile-tags-exclude-patterns))
+           (default-directory project-root))
+      (shell-command (format projectile-tags-command tags-exclude))
+      (visit-tags-table project-root t))))
+
+(defun projectile-visit-project-tags-table ()
+  "Visit the current project's tags table."
+  (when (and (projectile-project-p) (file-exists-p (projectile-expand-root "TAGS")))
+    (visit-tags-table (projectile-project-root) t)))
+
+(defun projectile-find-tag ()
+  "Find tag in project."
+  (interactive)
+  (let ((tags (if (boundp 'ggtags-mode)
+                  (projectile--tags (all-completions "" ggtags-completion-table))
+                ;; we have to manually reset the tags-completion-table every time
+                (setq tags-completion-table nil)
+                (tags-completion-table)
+                (projectile--tags tags-completion-table))))
+    (find-tag (projectile-completing-read "Find tag: "
+                                          tags
+                                          (projectile-symbol-at-point)))))
+
+(defun projectile--tags (completion-table)
+  "Find tags using COMPLETION-TABLE."
+  (-reject 'null
+           (-map (lambda (x)
+                   (unless (integerp x)
+                     (prin1-to-string x t)))
+                 completion-table)))
+
+(defmacro projectile-with-default-dir (dir &rest body)
+  "Invoke in DIR the BODY."
+  (declare (debug t) (indent 1))
+  `(let ((default-directory ,dir))
+     ,@body))
+
+(defun projectile-run-command-in-root ()
+  "Invoke `execute-extended-command' in the project's root."
+  (interactive)
+  (projectile-with-default-dir (projectile-project-root)
+    (call-interactively 'execute-extended-command)))
+
+(defun projectile-run-shell-command-in-root ()
+  "Invoke `shell-command' in the project's root."
+  (interactive)
+  (projectile-with-default-dir (projectile-project-root)
+    (call-interactively 'shell-command)))
+
+(defun projectile-run-async-shell-command-in-root ()
+  "Invoke `async-shell-command' in the project's root."
+  (interactive)
+  (projectile-with-default-dir (projectile-project-root)
+    (call-interactively 'async-shell-command)))
+
+(defun projectile-files-in-project-directory (directory)
+  "Return a list of files in DIRECTORY."
+  (let ((dir (file-relative-name (expand-file-name directory) (projectile-project-root))))
+    (-filter (lambda (file) (s-starts-with-p dir file))
+             (projectile-current-project-files))))
+
+(defun projectile-unixy-system-p ()
+  "Check to see if unixy text utilities are installed."
+  (--all? (executable-find it) '("grep" "cut" "uniq")))
+
+(defun projectile-files-from-cmd (cmd directory)
+  "Use a grep-like CMD to search for files within DIRECTORY.
+
+CMD should include the necessary search params and should output
+equivalently to grep -H (colon-deliminated, with the relative
+filename as the first column).  Returns a list of expanded
+filenames."
+  (let ((default-directory directory))
+    (->> (s-trim (shell-command-to-string
+                  (concat cmd " | cut -d: -f1 | uniq")))
+      (s-split "\n+")
+      (-filter 's-present?)
+      (--map (concat directory (s-chop-prefix "./" it))))))
+
+(defun projectile-files-with-string (string directory)
+  "Return a list of all files containing STRING in DIRECTORY.
+
+Tries to use ag, ack, git-grep, and grep in that order.  If those
+are impossible (for instance on Windows), returns a list of all
+files in the project."
+  (if (projectile-unixy-system-p)
+      (let* ((search-term (shell-quote-argument string))
+             (cmd (cond ((executable-find "ag")
+                         (concat "ag --literal --nocolor --noheading -- "
+                                 search-term))
+                        ((executable-find "ack")
+                         (concat "ack --noheading --nocolor -- "
+                                 search-term))
+                        ((and (executable-find "git")
+                              (eq (projectile-project-vcs) 'git))
+                         (concat "git grep -H "
+                                 search-term))
+                        (t
+                         (concat "grep -rH "
+                                 search-term
+                                 " .")))))
+        (projectile-files-from-cmd cmd directory))
+    ;; we have to reject directories as a workaround to work with git submodules
+    (-reject 'file-directory-p
+             (-map 'projectile-expand-root (projectile-dir-files directory)))))
+
+(defun projectile-replace (arg)
+  "Replace a string in the project using `tags-query-replace'.
+
+With a prefix argument ARG prompts you for a directory on which to run the replacement."
+  (interactive "P")
+  (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))))
+         (directory (if arg
+                        (read-directory-name "Replace in directory: ")
+                      (projectile-project-root)))
+         (files (projectile-files-with-string old-text directory)))
+    (tags-query-replace old-text new-text nil (cons 'list 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-save-project-buffers ()
+  "Save all project buffers."
+  (interactive)
+  (--each (projectile-project-buffers)
+    (with-current-buffer it
+      (when buffer-file-name
+        (save-buffer)))))
+
+(defun projectile-dired ()
+  "Open `dired' at the root of the project."
+  (interactive)
+  (dired (projectile-project-root)))
+
+(defun projectile-vc ()
+  "Open `vc-dir' at the root of the project.
+
+For git projects `magit-status' is used if available."
+  (interactive)
+  (cond
+   ((and (eq (projectile-project-vcs) 'git) (fboundp 'magit-status))
+    (magit-status (projectile-project-root)))
+   (t (vc-dir (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) (file-relative-name file project-root)))))
+    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-django-compile-cmd "python manage.py runserver")
+(defvar projectile-django-test-cmd "python manage.py test")
+(defvar projectile-python-compile-cmd "python setup.py build")
+(defvar projectile-python-test-cmd "python -m unittest discover")
+(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-gradle-compile-cmd "gradle build")
+(defvar projectile-gradle-test-cmd "gradle test")
+(defvar projectile-grails-compile-cmd "grails package")
+(defvar projectile-grails-test-cmd "grails test-app")
+(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-sbt-compile-cmd "sbt compile")
+(defvar projectile-sbt-test-cmd "sbt test")
+(defvar projectile-make-compile-cmd "make")
+(defvar projectile-make-test-cmd "make test")
+(defvar projectile-grunt-compile-cmd "grunt")
+(defvar projectile-grunt-test-cmd "grunt test")
+(defvar projectile-gulp-compile-cmd "gulp")
+(defvar projectile-gulp-test-cmd "gulp test")
+(defvar projectile-go-compile-cmd "go build ./...")
+(defvar projectile-go-test-cmd "go 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 'django) projectile-django-compile-cmd)
+   ((eq project-type 'python) projectile-python-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)
+   ((eq project-type 'gradle) projectile-gradle-compile-cmd)
+   ((eq project-type 'grails) projectile-grails-compile-cmd)
+   ((eq project-type 'sbt) projectile-sbt-compile-cmd)
+   ((eq project-type 'grunt) projectile-grunt-compile-cmd)
+   ((eq project-type 'gulp) projectile-gulp-compile-cmd)
+   ((eq project-type 'go) projectile-go-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 'django) projectile-django-test-cmd)
+   ((eq project-type 'python) projectile-python-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)
+   ((eq project-type 'gradle) projectile-gradle-test-cmd)
+   ((eq project-type 'grails) projectile-grails-test-cmd)
+   ((eq project-type 'sbt) projectile-sbt-test-cmd)
+   ((eq project-type 'grunt) projectile-grunt-test-cmd)
+   ((eq project-type 'gulp) projectile-gulp-test-cmd)
+   ((eq project-type 'go) projectile-go-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 test command for PROJECT."
+  (or (gethash project projectile-test-cmd-map)
+      (projectile-default-test-command (projectile-project-type))))
+
+(defun projectile-compile-project (arg)
+  "Run project compilation command.
+
+Normally you'll be prompted for a compilation command, unless
+variable `compilation-read-command'.  You can force the prompt
+with a prefix ARG."
+  (interactive "P")
+  (let* ((project-root (projectile-project-root))
+         (default-cmd (projectile-compilation-command project-root))
+         (compilation-cmd (if (or compilation-read-command arg)
+                              (compilation-read-command default-cmd)
+                            default-cmd))
+         (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 (arg)
+  "Run project test command.
+
+Normally you'll be prompted for a compilation command, unless
+variable `compilation-read-command'.  You can force the prompt
+with a prefix ARG."
+  (interactive "P")
+  (let* ((project-root (projectile-project-root))
+         (default-cmd (projectile-test-command project-root))
+         (test-cmd (if (or compilation-read-command arg)
+                       (compilation-read-command default-cmd)
+                     default-cmd))
+         (default-directory project-root))
+    (puthash project-root test-cmd projectile-test-cmd-map)
+    (compilation-start test-cmd)))
+
+(defun projectile-relevant-known-projects ()
+  "Return a list of known projects except the current one (if present)."
+  (if (projectile-project-p)
+      (-difference projectile-known-projects
+                   (list (abbreviate-file-name (projectile-project-root))))
+    projectile-known-projects))
+
+(defun projectile-switch-project (&optional arg)
+  "Switch to a project we have visited before.
+Invokes the command referenced by `projectile-switch-project-action' on switch.
+With a prefix ARG invokes `projectile-commander' instead of
+`projectile-switch-project-action.'"
+  (interactive "P")
+  (let* ((project-to-switch
+          (projectile-completing-read "Switch to project: "
+                                      (projectile-relevant-known-projects))))
+    (projectile-switch-project-by-name project-to-switch arg)))
+
+(defun projectile-switch-project-by-name (project-to-switch &optional arg)
+  "Switch to project by project name PROJECT-TO-SWITCH.
+Invokes the command referenced by `projectile-switch-project-action' on switch.
+With a prefix ARG invokes `projectile-commander' instead of
+`projectile-switch-project-action.'"
+  (let* ((default-directory project-to-switch)
+         (switch-project-action (if arg
+                                    'projectile-commander
+                                  projectile-switch-project-action)))
+    (if projectile-remember-window-configs
+        (unless (projectile-restore-window-config (projectile-project-name))
+          (funcall switch-project-action)
+          (delete-other-windows))
+      (funcall switch-project-action))
+    (run-hooks 'projectile-switch-project-hook)))
+
+
+(defun projectile-find-file-in-directory (&optional directory)
+  "Jump to a file in a (maybe regular) DIRECTORY.
+
+This command will first prompt for the directory the file is in."
+  (interactive "DFind file in directory: ")
+  (let ((default-directory directory)
+        (projectile-require-project-root nil))
+    (if (projectile-project-p)
+        ;; target directory is in a project
+        (let ((file (projectile-completing-read "Find file: "
+                                                (projectile-dir-files directory))))
+          (find-file (expand-file-name file (projectile-project-root)))
+          (run-hooks 'projectile-find-file-hook))
+      ;; target directory is not in a project
+      (projectile-find-file))))
+
+(defun projectile-find-file-in-known-projects ()
+  "Jump to a file in any of the known projects."
+  (interactive)
+  (let ((projectile-require-project-root nil)
+        (all-files nil))
+    (-each projectile-known-projects
+      (lambda (project)
+        (let ((default-directory project))
+          (setq all-files (append all-files (-map (lambda (file)
+                                                    (expand-file-name file project))
+                                                  (projectile-current-project-files)))))))
+    (find-file (projectile-completing-read "Find file in projects: " all-files))))
+
+(defcustom projectile-switch-project-hook nil
+  "Hooks run when project is switched."
+  :group 'projectile
+  :type 'hook)
+
+
+(defun projectile-cleanup-known-projects ()
+  "Remove known projects that don't exist anymore."
+  (interactive)
+  (setq projectile-known-projects (--filter (projectile-file-exists-p it) projectile-known-projects))
+  (projectile-save-known-projects))
+
+(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 (&optional project)
+  "Remove PROJECT from the list of known projects."
+  (interactive (list (projectile-completing-read "Remove from known projects: "
+                                                 projectile-known-projects)))
+  (setq projectile-known-projects
+        (--reject (string= project it) projectile-known-projects))
+  (projectile-save-known-projects)
+  (message "Project %s removed from the list of known projects." project))
+
+(defun projectile-remove-current-project-from-known-projects ()
+  "Remove the current project from the list of known projects."
+  (interactive)
+  (projectile-remove-known-project (abbreviate-file-name (projectile-project-root))))
+
+(defun projectile-ignored-projects ()
+  "A list of projects that should not be save in `projectile-known-projects'."
+  (-map 'file-truename projectile-ignored-projects))
+
+(defun projectile-add-known-project (project-root)
+  "Add PROJECT-ROOT to the list of known projects."
+  (unless (member project-root (projectile-ignored-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))
+
+(define-ibuffer-filter projectile-files
+  "Show Ibuffer with all buffers in the current project."
+  (:reader (read-directory-name "Project root: " (ignore-errors (projectile-project-root)))
+           :description nil)
+  (with-current-buffer buf
+    (equal (file-name-as-directory (expand-file-name qualifier))
+           (ignore-errors (projectile-project-root)))))
+
+(defun projectile-ibuffer-by-project (project-root)
+  "Open an IBuffer window showing all buffers in PROJECT-ROOT."
+  (let ((project-name (file-name-nondirectory (directory-file-name project-root))))
+    (ibuffer nil (format "*%s Buffers*" project-name)
+             (list (cons 'projectile-files project-root)))))
+
+(defun projectile-ibuffer (prefix)
+  "Open an IBuffer window showing all buffers in the current project.
+
+Let user choose another project when PREFIX is supplied."
+  (interactive "p")
+  (let ((project-root (if (= prefix 4)
+                          (projectile-completing-read
+                           "Project name: "
+                           (projectile-relevant-known-projects))
+                        (projectile-project-root))))
+
+    (projectile-ibuffer-by-project project-root)))
+
+;;;; projectile-commander
+
+(defconst projectile-commander-help-buffer "*Commander Help*")
+
+(defvar projectile-commander-methods nil
+  "List of file-selection methods for the `projectile-commander' command.
+Each element is a list (KEY DESCRIPTION FUNCTION).
+DESCRIPTION is a one-line description of what the key selects.")
+
+;;;###autoload
+(defun projectile-commander ()
+  "Execute a Projectile command with a single letter.
+The user is prompted for a single character indicating the action to invoke.
+The `?' character describes then
+available actions.
+
+See `def-projectile-commander-method' for defining new methods."
+  (interactive)
+  (message "Commander [%s]: "
+           (apply #'string (mapcar #'car projectile-commander-methods)))
+  (let* ((ch (save-window-excursion
+               (select-window (minibuffer-window))
+               (read-char)))
+         (method (cl-find ch projectile-commander-methods :key #'car)))
+    (cond (method
+           (funcall (cl-caddr method)))
+          (t
+           (message "No method for character: ?\\%c" ch)
+           (ding)
+           (sleep-for 1)
+           (discard-input)
+           (projectile-commander)))))
+
+(defmacro def-projectile-commander-method (key description &rest body)
+  "Define a new `projectile-commander' method.
+
+KEY is the key the user will enter to choose this method.
+
+DESCRIPTION is a one-line sentence describing how the method.
+
+BODY is a series of forms which are evaluated when the find
+is chosen."
+  (let ((method `(lambda ()
+                   ,@body)))
+    `(setq projectile-commander-methods
+           (cl-sort (cons (list ,key ,description ,method)
+                          (cl-remove ,key projectile-commander-methods :key #'car))
+                    #'< :key #'car))))
+
+(def-projectile-commander-method ?? "Commander help buffer."
+  (ignore-errors (kill-buffer projectile-commander-help-buffer))
+  (with-current-buffer (get-buffer-create projectile-commander-help-buffer)
+    (insert "Projectile Commander Methods:\n\n")
+    (loop for (key line nil) in projectile-commander-methods
+          do (insert (format "%c:\t%s\n" key line)))
+    (goto-char (point-min))
+    (help-mode)
+    (display-buffer (current-buffer) t))
+  (projectile-commander))
+
+(def-projectile-commander-method ?a
+  "Run ack on project."
+  (call-interactively 'projectile-ack))
+
+(def-projectile-commander-method ?A
+  "Find ag on project."
+  (call-interactively 'projectile-ag))
+
+(def-projectile-commander-method ?f
+  "Find file in project."
+  (projectile-find-file))
+
+(def-projectile-commander-method ?T
+  "Find test file in project."
+  (projectile-find-test-file))
+
+(def-projectile-commander-method ?b
+  "Switch to project buffer."
+  (projectile-switch-to-buffer))
+
+(def-projectile-commander-method ?d
+  "Find directory in project."
+  (projectile-find-dir))
+
+(def-projectile-commander-method ?D
+  "Open project root in dired."
+  (projectile-dired))
+
+(def-projectile-commander-method ?v
+  "Open project root in vc-dir or magit."
+  (projectile-vc))
+
+(def-projectile-commander-method ?R
+  "Regenerate the project's [e|g]tags."
+  (projectile-regenerate-tags))
+
+(def-projectile-commander-method ?g
+  "Run grep on project."
+  (projectile-grep))
+
+(def-projectile-commander-method ?s
+  "Switch project."
+  (projectile-switch-project))
+
+(def-projectile-commander-method ?o
+  "Run multi-occur on project buffers."
+  (projectile-multi-occur))
+
+(def-projectile-commander-method ?j
+  "Find tag in project."
+  (projectile-find-tag))
+
+(def-projectile-commander-method ?k
+  "Kill all project buffers."
+  (projectile-kill-buffers))
+
+(def-projectile-commander-method ?e
+  "Find recently visited file in project."
+  (projectile-recentf))
+
+;;; Minor mode
+(defvar projectile-command-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "4 b") 'projectile-switch-to-buffer-other-window)
+    (define-key map (kbd "4 C-o") 'projectile-display-buffer)
+    (define-key map (kbd "4 f") 'projectile-find-file-other-window)
+    (define-key map (kbd "4 t") 'projectile-find-implementation-or-test-other-window)
+    (define-key map (kbd "!") 'projectile-run-shell-command-in-root)
+    (define-key map (kbd "&") 'projectile-run-async-shell-command-in-root)
+    (define-key map (kbd "a") 'projectile-ack)
+    (define-key map (kbd "A") 'projectile-ag)
+    (define-key map (kbd "b") 'projectile-switch-to-buffer)
+    (define-key map (kbd "c") 'projectile-compile-project)
+    (define-key map (kbd "d") 'projectile-find-dir)
+    (define-key map (kbd "4 d") 'projectile-find-dir-other-window)
+    (define-key map (kbd "D") 'projectile-dired)
+    (define-key map (kbd "e") 'projectile-recentf)
+    (define-key map (kbd "f") 'projectile-find-file)
+    (define-key map (kbd "F") 'projectile-find-file-in-known-projects)
+    (define-key map (kbd "g") 'projectile-grep)
+    (define-key map (kbd "i") 'projectile-invalidate-cache)
+    (define-key map (kbd "I") 'projectile-ibuffer)
+    (define-key map (kbd "j") 'projectile-find-tag)
+    (define-key map (kbd "k") 'projectile-kill-buffers)
+    (define-key map (kbd "l") 'projectile-find-file-in-directory)
+    (define-key map (kbd "m") 'projectile-commander)
+    (define-key map (kbd "o") 'projectile-multi-occur)
+    (define-key map (kbd "p") 'projectile-test-project)
+    (define-key map (kbd "r") 'projectile-replace)
+    (define-key map (kbd "R") 'projectile-regenerate-tags)
+    (define-key map (kbd "s") 'projectile-switch-project)
+    (define-key map (kbd "S") 'projectile-save-project-buffers)
+    (define-key map (kbd "t") 'projectile-toggle-between-implementation-and-test)
+    (define-key map (kbd "T") 'projectile-find-test-file)
+    (define-key map (kbd "v") 'projectile-vc)
+    (define-key map (kbd "z") 'projectile-cache-current-file)
+    (define-key map (kbd "ESC") 'projectile-project-buffers-other-buffer)
+    map)
+  "Keymap for Projectile commands after `projectile-keymap-prefix'")
+(fset 'projectile-command-map projectile-command-map)
+
+(defvar projectile-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map projectile-keymap-prefix 'projectile-command-map)
+    map)
+  "Keymap for Projectile mode.")
+
+(easy-menu-change
+ '("Tools") "Projectile"
+ '(["Find file" projectile-find-file]
+   ["Find file in known projects" projectile-find-file-in-known-projects]
+   ["Find test file" projectile-find-test-file]
+   ["Find directory" projectile-find-dir]
+   ["Find file in directory" projectile-find-file-in-directory]
+   ["Switch to buffer" projectile-switch-to-buffer]
+   ["Jump between implementation file and test file" projectile-toggle-between-implementation-and-test]
+   ["Kill project buffers" projectile-kill-buffers]
+   ["Recent files" projectile-recentf]
+   "--"
+   ["Open project in dired" projectile-dired]
+   ["Switch to project" projectile-switch-project]
+   ["Find in project (grep)" projectile-grep]
+   ["Find in project (ack)" projectile-ack]
+   ["Replace in project" projectile-replace]
+   ["Multi-occur in project" projectile-multi-occur]
+   "--"
+   ["Cache current file" projectile-cache-current-file]
+   ["Invalidate cache" projectile-invalidate-cache]
+   ["Regenerate [e|g]tags" projectile-regenerate-tags]
+   "--"
+   ["Compile project" projectile-compile-project]
+   ["Test project" projectile-test-project]
+   "--"
+   ["About" projectile-version])
+ "Search Files (Grep)...")
+
+(easy-menu-change '("Tools") "--" nil "Search Files (Grep)...")
+
+;;;###autoload
+(defcustom projectile-mode-line-lighter "Projectile"
+  "The default lighter for `projectile-mode'."
+  :group 'projectile
+  :type 'string)
+
+(defvar-local projectile-mode-line (format " %s" projectile-mode-line-lighter)
+  "The dynamic mode line lighter variable for `projectile-mode'.")
+
+(defun projectile-update-mode-line ()
+  "Report project in mode-line."
+  (let* ((project-name (projectile-project-name))
+         (message (format " %s[%s]" projectile-mode-line-lighter project-name)))
+    (setq projectile-mode-line message))
+  (force-mode-line-update))
+
+;;;###autoload
+(define-minor-mode projectile-mode
+  "Minor mode to assist project management and navigation.
+
+When called interactively, toggle `projectile-mode'.  With prefix
+ARG, enable `projectile-mode' if ARG is positive, otherwise disable
+it.
+
+When called from Lisp, enable `projectile-mode' if ARG is omitted,
+nil or positive.  If ARG is `toggle', toggle `projectile-mode'.
+Otherwise behave as if called interactively.
+
+\\{projectile-mode-map}"
+  :lighter projectile-mode-line
+  :keymap projectile-mode-map
+  :group 'projectile
+  :require 'projectile
+  (cond
+   (projectile-mode
+    (add-hook 'find-file-hook 'projectile-cache-files-find-file-hook t t)
+    (add-hook 'find-file-hook 'projectile-cache-projects-find-file-hook t t)
+    (add-hook 'projectile-find-dir-hook 'projectile-cache-projects-find-file-hook)
+    (add-hook 'find-file-hook 'projectile-update-mode-line t t)
+    (add-hook 'find-file-hook 'projectile-visit-project-tags-table t t))
+   (t
+    (remove-hook 'find-file-hook 'projectile-cache-files-find-file-hook t)
+    (remove-hook 'find-file-hook 'projectile-cache-projects-find-file-hook t)
+    (remove-hook 'find-file-hook 'projectile-update-mode-line t)
+    (remove-hook 'find-file-hook 'projectile-visit-project-tags-table t))))
+
+;;;###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."
+  (projectile-global-mode +1))
+
+(defun projectile-global-off ()
+  "Disable Projectile global minor mode."
+  (projectile-global-mode -1))
+
+(provide 'projectile)
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+
+;;; projectile.el ends here
diff --git a/elpa/projectile-0.11.0/projectile.elc b/elpa/projectile-0.11.0/projectile.elc
new file mode 100644
index 000000000..cda70bbf2
Binary files /dev/null and b/elpa/projectile-0.11.0/projectile.elc differ
diff --git a/elpa/projectile-0.9.2/projectile-pkg.el b/elpa/projectile-0.9.2/projectile-pkg.el
deleted file mode 100644
index 9d4df7e3b..000000000
--- a/elpa/projectile-0.9.2/projectile-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index 98da5149b..000000000
--- a/elpa/projectile-0.9.2/projectile.el
+++ /dev/null
@@ -1,1015 +0,0 @@
-;;; 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/queue-0.1.1/queue-autoloads.el b/elpa/queue-0.1.1/queue-autoloads.el
new file mode 100644
index 000000000..832bbb556
--- /dev/null
+++ b/elpa/queue-0.1.1/queue-autoloads.el
@@ -0,0 +1,19 @@
+;;; queue-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "queue" "queue.el" (21721 38728 0 0))
+;;; Generated autoloads from queue.el
+
+(defalias 'make-queue 'queue-create "\
+Create an empty queue data structure.")
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; queue-autoloads.el ends here
diff --git a/elpa/queue-0.1.1/queue-pkg.el b/elpa/queue-0.1.1/queue-pkg.el
new file mode 100644
index 000000000..adeecde03
--- /dev/null
+++ b/elpa/queue-0.1.1/queue-pkg.el
@@ -0,0 +1 @@
+(define-package "queue" "0.1.1" "Queue data structure" 'nil :url "http://www.dr-qubit.org/emacs.php" :keywords '("extensions" "data structures" "queue"))
diff --git a/elpa/queue-0.1.1/queue-pkg.elc b/elpa/queue-0.1.1/queue-pkg.elc
new file mode 100644
index 000000000..74f4b2116
Binary files /dev/null and b/elpa/queue-0.1.1/queue-pkg.elc differ
diff --git a/elpa/queue-0.1.1/queue.el b/elpa/queue-0.1.1/queue.el
new file mode 100644
index 000000000..aab8c1de8
--- /dev/null
+++ b/elpa/queue-0.1.1/queue.el
@@ -0,0 +1,173 @@
+;;; queue.el --- Queue data structure  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 1991-1995, 2008-2009, 2012  Free Software Foundation, Inc
+
+;; Author: Inge Wallin <inge@lysator.liu.se>
+;;         Toby Cubitt <toby-predictive@dr-qubit.org>
+;; Maintainer: Toby Cubitt <toby-predictive@dr-qubit.org>
+;; Version: 0.1.1
+;; Keywords: extensions, data structures, queue
+;; URL: http://www.dr-qubit.org/emacs.php
+;; Repository: http://www.dr-qubit.org/git/predictive.git
+
+;; This file is part of Emacs.
+;;
+;; GNU Emacs is free software: you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free
+;; Software Foundation, either version 3 of the License, or (at your option)
+;; any later version.
+;;
+;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+;; more details.
+;;
+;; You should have received a copy of the GNU General Public License along
+;; with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+;; These queues can be used both as a first-in last-out (FILO) and as a
+;; first-in first-out (FIFO) stack, i.e. elements can be added to the front or
+;; back of the queue, and can be removed from the front. (This type of data
+;; structure is sometimes called an "output-restricted deque".)
+;;
+;; You create a queue using `make-queue', add an element to the end of the
+;; queue using `queue-enqueue', and push an element onto the front of the
+;; queue using `queue-prepend'. To remove the first element from a queue, use
+;; `queue-dequeue'. A number of other queue convenience functions are also
+;; provided, all starting with the prefix `queue-'.  Functions with prefix
+;; `queue--' are for internal use only, and should never be used outside this
+;; package.
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+
+(defstruct (queue
+            ;; A tagged list is the pre-defstruct representation.
+            ;; (:type list)
+	    :named
+	    (:constructor nil)
+	    (:constructor queue-create ())
+	    (:copier nil))
+  head tail)
+
+
+;;;###autoload
+(defalias 'make-queue 'queue-create
+  "Create an empty queue data structure.")
+
+
+(defun queue-enqueue (queue element)
+  "Append an ELEMENT to the end of the QUEUE."
+  (if (queue-head queue)
+      (setcdr (queue-tail queue)
+	      (setf (queue-tail queue) (cons element nil)))
+    (setf (queue-head queue)
+	  (setf (queue-tail queue) (cons element nil)))))
+
+(defalias 'queue-append 'queue-enqueue)
+
+
+(defun queue-prepend (queue element)
+  "Prepend an ELEMENT to the front of the QUEUE."
+  (if (queue-head queue)
+      (push element (queue-head queue))
+    (setf (queue-head queue)
+	  (setf (queue-tail queue) (cons element nil)))))
+
+
+(defun queue-dequeue (queue)
+  "Remove the first element of QUEUE and return it.
+Returns nil if the queue is empty."
+  (unless (cdr (queue-head queue)) (setf (queue-tail queue) nil))
+  (pop (queue-head queue)))
+
+
+(defun queue-empty (queue)
+  "Return t if QUEUE is empty, otherwise return nil."
+  (null (queue-head queue)))
+
+
+(defun queue-first (queue)
+  "Return the first element of QUEUE or nil if it is empty,
+without removing it from the QUEUE."
+  (car (queue-head queue)))
+
+
+(defun queue-nth (queue n)
+  "Return the nth element of a queue, without removing it.
+If the length of the queue is less than N, return nil. The first
+element in the queue has index 0."
+  (nth n (queue-head queue)))
+
+
+(defun queue-last (queue)
+  "Return the last element of QUEUE, without removing it.
+Returns nil if the QUEUE is empty."
+  (car (queue-tail queue)))
+
+
+(defun queue-all (queue)
+  "Return a list of all elements of QUEUE or nil if it is empty.
+The oldest element in the queue is the first in the list."
+  (queue-head queue))
+
+
+(defun queue-copy (queue)
+  "Return a copy of QUEUE.
+The new queue contains the elements of QUEUE in the same
+order. The elements themselves are *not* copied."
+  (let ((q (queue-create))
+	(list (queue-head queue)))
+    (when (queue-head queue)
+      (setf (queue-head q) (cons (car (queue-head queue)) nil)
+	    (queue-tail q) (queue-head q))
+      (while (setq list (cdr list))
+	(setf (queue-tail q)
+	      (setcdr (queue-tail q) (cons (car list) nil)))))
+    q))
+
+
+(defun queue-length (queue)
+  "Return the number of elements in QUEUE."
+  (length (queue-head queue)))
+
+
+(defun queue-clear (queue)
+  "Remove all elements from QUEUE."
+  (setf (queue-head queue) nil
+	(queue-tail queue) nil))
+
+;;;; ChangeLog:
+
+;; 2014-05-15  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	queue.el: fix buggy queue-first and queue-empty definitions.
+;; 
+;; 2012-04-30  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	Minor fixes to commentaries, package headers, and whitespace
+;; 
+;; 	* queue.el: fix description of data structure in Commentary; add
+;; 	Maintainer
+;; 	 header.
+;; 
+;; 	* queue.el, heap.el, tNFA.el, trie.el, dict-tree.el: trivial whitespace
+;; 	fixes.
+;; 
+;; 2012-04-29  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	Add queue.el
+;; 
+
+
+
+(provide 'queue)
+
+
+;;; queue.el ends here
diff --git a/elpa/queue-0.1.1/queue.elc b/elpa/queue-0.1.1/queue.elc
new file mode 100644
index 000000000..f0f79a4e7
Binary files /dev/null and b/elpa/queue-0.1.1/queue.elc differ
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el
deleted file mode 100644
index 2d0a90806..000000000
--- a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-autoloads.el
+++ /dev/null
@@ -1,61 +0,0 @@
-;;; 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
deleted file mode 100644
index 46adb6133..000000000
--- a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "rainbow-delimiters" "1.3.4" "Highlight nested parens, brackets, braces a different color at each depth." (quote nil))
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc
deleted file mode 100644
index 25caafc4e..000000000
Binary files a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters-pkg.elc and /dev/null differ
diff --git a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el b/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el
deleted file mode 100644
index e3c6ce029..000000000
--- a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.el
+++ /dev/null
@@ -1,520 +0,0 @@
-;;; 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
deleted file mode 100644
index 1119a7df5..000000000
Binary files a/elpa/rainbow-delimiters-1.3.4/rainbow-delimiters.elc and /dev/null differ
diff --git a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el b/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el
deleted file mode 100644
index 4f25d3c12..000000000
--- a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-autoloads.el
+++ /dev/null
@@ -1,61 +0,0 @@
-;;; 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
deleted file mode 100644
index ceaf273b3..000000000
--- a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index 4a8b46249..000000000
--- a/elpa/rainbow-delimiters-20131015.1304/rainbow-delimiters.el
+++ /dev/null
@@ -1,544 +0,0 @@
-;;; 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-pkg.el b/elpa/s-1.7.0/s-pkg.el
deleted file mode 100644
index 94c1d0179..000000000
--- a/elpa/s-1.7.0/s-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "s" "1.7.0" "The long lost Emacs string manipulation library." (quote nil))
diff --git a/elpa/s-1.7.0/s-autoloads.el b/elpa/s-1.9.0/s-autoloads.el
similarity index 62%
rename from elpa/s-1.7.0/s-autoloads.el
rename to elpa/s-1.9.0/s-autoloads.el
index b832d58a6..792997486 100644
--- a/elpa/s-1.7.0/s-autoloads.el
+++ b/elpa/s-1.9.0/s-autoloads.el
@@ -1,18 +1,15 @@
 ;;; s-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads nil nil ("s-pkg.el" "s.el") (21077 32440 527954
-;;;;;;  0))
+;;;### (autoloads nil nil ("s.el") (21721 36895 537670 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.9.0/s-pkg.el b/elpa/s-1.9.0/s-pkg.el
new file mode 100644
index 000000000..4728be96a
--- /dev/null
+++ b/elpa/s-1.9.0/s-pkg.el
@@ -0,0 +1 @@
+(define-package "s" "1.9.0" "The long lost Emacs string manipulation library." 'nil)
diff --git a/elpa/s-1.9.0/s-pkg.elc b/elpa/s-1.9.0/s-pkg.elc
new file mode 100644
index 000000000..db5bfa97d
Binary files /dev/null and b/elpa/s-1.9.0/s-pkg.elc differ
diff --git a/elpa/s-1.7.0/s.el b/elpa/s-1.9.0/s.el
similarity index 96%
rename from elpa/s-1.7.0/s.el
rename to elpa/s-1.9.0/s.el
index 995f620b0..14ce15ce9 100644
--- a/elpa/s-1.7.0/s.el
+++ b/elpa/s-1.9.0/s.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012 Magnar Sveen
 
 ;; Author: Magnar Sveen <magnars@gmail.com>
-;; Version: 1.7.0
+;; Version: 1.9.0
 ;; Keywords: strings
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -264,6 +264,14 @@ This is a simple wrapper around the built-in `string-match-p'."
   "Is S nil or the empty string?"
   (or (null s) (string= "" s)))
 
+(defun s-present? (s)
+  "Is S anything but nil or the empty string?"
+  (not (s-blank? s)))
+
+(defun s-presence (s)
+  "Return S if it's `s-present?', otherwise return nil."
+  (and (s-present? s) s))
+
 (defun s-lowercase? (s)
   "Are all the letters in S in lower case?"
   (let ((case-fold-search nil))
@@ -359,7 +367,7 @@ 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))
+        (i 0))
     (while (and (< i (length string))
                 (string-match regex string i))
       (setq i (1+ (match-beginning 0)))
@@ -404,7 +412,7 @@ When START is non-nil the search will start at that index."
 (defun s-split-words (s)
   "Split S into list of words."
   (s-split
-   "[^[:lower:][:upper:]0-9]+"
+   "[^[:word:]0-9]+"
    (let ((case-fold-search nil))
      (replace-regexp-in-string
       "\\([[:lower:]]\\)\\([[:upper:]]\\)" "\\1 \\2"
@@ -534,5 +542,15 @@ the variable `s-lex-value-as-lisp' is `t' and then they are
 interpolated with \"%S\"."
   (s-lex-fmt|expand format-str))
 
+(defun s-count-matches (regexp s &optional start end)
+  "Count occurrences of `regexp' in `s'.
+
+`start', inclusive, and `end', exclusive, delimit the part of `s'
+to match. "
+  (with-temp-buffer
+    (insert s)
+    (goto-char (point-min))
+    (count-matches regexp (or start 1) (or end (point-max)))))
+
 (provide 's)
 ;;; s.el ends here
diff --git a/elpa/s-1.9.0/s.elc b/elpa/s-1.9.0/s.elc
new file mode 100644
index 000000000..49c65beed
Binary files /dev/null and b/elpa/s-1.9.0/s.elc differ
diff --git a/elpa/smex-1.1.1/smex-pkg.el b/elpa/smex-1.1.1/smex-pkg.el
deleted file mode 100644
index 7456ac0e5..000000000
--- a/elpa/smex-1.1.1/smex-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "smex" "1.1.1" "M-x interface with Ido-style fuzzy matching." (quote nil))
diff --git a/elpa/smex-1.1.1/smex-pkg.elc b/elpa/smex-1.1.1/smex-pkg.elc
deleted file mode 100644
index bec545ebb..000000000
Binary files a/elpa/smex-1.1.1/smex-pkg.elc and /dev/null differ
diff --git a/elpa/smex-1.1.1/smex.elc b/elpa/smex-1.1.1/smex.elc
deleted file mode 100644
index ca574008b..000000000
Binary files a/elpa/smex-1.1.1/smex.elc and /dev/null differ
diff --git a/elpa/smex-1.1.1/smex-autoloads.el b/elpa/smex-3.0/smex-autoloads.el
similarity index 62%
rename from elpa/smex-1.1.1/smex-autoloads.el
rename to elpa/smex-3.0/smex-autoloads.el
index b466f5214..d012ce1d8 100644
--- a/elpa/smex-1.1.1/smex-autoloads.el
+++ b/elpa/smex-3.0/smex-autoloads.el
@@ -1,27 +1,26 @@
 ;;; smex-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads (smex-initialize) "smex" "smex.el" (20166 22147))
+;;;### (autoloads nil "smex" "smex.el" (21721 36893 0 0))
 ;;; Generated autoloads from smex.el
 
-(autoload 'smex-initialize "smex" "\
+(autoload 'smex "smex" "\
 
 
 \(fn)" t nil)
 
-;;;***
-
-;;;### (autoloads nil nil ("smex-pkg.el") (20166 22147 529156))
+(autoload 'smex-initialize "smex" "\
+
+
+\(fn)" t nil)
 
 ;;;***
 
-(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-3.0/smex-pkg.el b/elpa/smex-3.0/smex-pkg.el
new file mode 100644
index 000000000..d2309e502
--- /dev/null
+++ b/elpa/smex-3.0/smex-pkg.el
@@ -0,0 +1 @@
+(define-package "smex" "3.0" "M-x interface with Ido-style fuzzy matching." 'nil)
diff --git a/elpa/smex-3.0/smex-pkg.elc b/elpa/smex-3.0/smex-pkg.elc
new file mode 100644
index 000000000..f172bfa7d
Binary files /dev/null and b/elpa/smex-3.0/smex-pkg.elc differ
diff --git a/elpa/smex-1.1.1/smex.el b/elpa/smex-3.0/smex.el
similarity index 78%
rename from elpa/smex-1.1.1/smex.el
rename to elpa/smex-3.0/smex.el
index db2105fdd..36d5b2e40 100644
--- a/elpa/smex-1.1.1/smex.el
+++ b/elpa/smex-3.0/smex.el
@@ -1,10 +1,10 @@
 ;;; smex.el --- M-x interface with Ido-style fuzzy matching.
 
-;; Copyright (C) 2009, 2010 Cornelius Mika
+;; Copyright (C) 2009-2014 Cornelius Mika and contributors
 ;;
-;; Author: Cornelius Mika <cornelius.mika@gmail.com>
+;; Author: Cornelius Mika <cornelius.mika@gmail.com> and contributors
 ;; URL: http://github.com/nonsequitur/smex/
-;; Version: 1.1.1
+;; Version: 3.0
 ;; Keywords: convenience, usability
 
 ;; This file is not part of GNU Emacs.
@@ -24,15 +24,14 @@
 ;; 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
@@ -60,6 +59,13 @@ Must be set before initializing Smex."
   :type 'string
   :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)
@@ -70,52 +76,72 @@ Must be set before initializing Smex."
 ;;--------------------------------------------------------------------------------
 ;; Smex Interface
 
+;;;###autoload
 (defun smex ()
   (interactive)
+  (unless smex-initialized-p
+    (smex-initialize))
   (if (smex-already-running)
-      (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-update-and-rerun)
+    (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))))
+  (let* ((chosen-item-name (smex-completing-read commands initial-input))
+         (chosen-item (intern chosen-item-name)))
     (if smex-custom-action
         (let ((action smex-custom-action))
           (setq smex-custom-action nil)
           (funcall action chosen-item))
       (unwind-protect
-          (progn (setq prefix-arg current-prefix-arg)
-                 (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?
-        (run-at-time 0.01 nil (lambda (cmd) (setq last-repeatable-command cmd))
-                     chosen-item)))))
+          (execute-extended-command current-prefix-arg chosen-item-name)
+        (smex-rank chosen-item)))))
 
 (defun smex-major-mode-commands ()
   "Like `smex', but limited to commands that are relevant to the active major mode."
   (interactive)
-  (let ((commands (union (extract-commands-from-keymap (current-local-map))
-                         (extract-commands-from-features major-mode))))
+  (let ((commands (delete-dups (append (smex-extract-commands-from-keymap (current-local-map))
+                                       (smex-extract-commands-from-features major-mode)))))
     (setq commands (smex-sort-according-to-cache commands))
-    (setq commands (mapcar (lambda (command) (symbol-name command)) commands))
+    (setq commands (mapcar #'symbol-name 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 t)
-        (ido-max-prospects 10))
-    (ido-completing-read smex-prompt-string choices nil nil initial-input)))
+        (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 'extended-command-history (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)))
 
 (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))
 
@@ -160,6 +186,16 @@ Must be set before initializing Smex."
                   (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)
@@ -177,37 +213,40 @@ Must be set before initializing Smex."
   (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-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)))
+  (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))
 
 (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 smex-save-file-not-empty-p ()
+  (string-match-p "\[^[:space:]\]" (buffer-string)))
+
 (defun smex-save-history ()
   "Updates `smex-history'"
   (setq smex-history nil)
@@ -340,65 +379,39 @@ 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))
 
-(defvar smex-old-message nil
-  "A temporary storage used by `smex-show-key-advice'")
-
-(defun smex-show-key-advice (command)
-  "Shows the keybinding for command, if available. Like `execute-extended-command'."
-  (let ((advice (smex-key-advice command)))
-    (when advice
-      (if (current-message)
-          (progn
-            (run-at-time 2 nil (lambda (advice)
-                                 (setq smex-old-message (current-message))
-                                 (smex-unlogged-message advice)) advice)
-
-            (run-at-time 4.5 nil (lambda (advice)
-                                 (if (equal (current-message) advice)
-                                     (smex-unlogged-message smex-old-message))) advice))
-        (smex-unlogged-message advice)))))
-
-(defun smex-key-advice (command)
-  (let ((keys (where-is-internal command)))
-    (if keys
-        (format "You can run the command `%s' with %s"
-                command
-                (mapconcat 'key-description keys ", ")))))
-
-(defun smex-unlogged-message (string)
-  "Bypasses logging in *Messages*"
-  (let (message-log-max)
-    (message "%s" string)))
-
-(defun extract-commands-from-keymap (map)
+(defun smex-extract-commands-from-keymap (map)
   (let (commands)
-    (parse-keymap map)
+    (smex-parse-keymap map commands)
     commands))
 
-(defun parse-keymap (map)
+(defun smex-parse-keymap (map commands)
   (map-keymap (lambda (binding element)
                 (if (and (listp element) (eq 'keymap (car element)))
-                    (parse-keymap element)
+                    (smex-parse-keymap element commands)
                           ; Strings are commands, too. Reject them.
                   (if (and (symbolp element) (commandp element))
-                      (setq commands (cons element commands)))))
+                      (push element commands))))
               map))
 
-(defun extract-commands-from-features (mode)
+(defun smex-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)
@@ -411,15 +424,6 @@ 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."
@@ -431,10 +435,12 @@ sorted by frequency of use."
                                             command-item))
                                         smex-data))))
     (view-buffer-other-window "*Smex: Unbound Commands*")
-    (toggle-read-only nil)
-    (erase-buffer)
-    (ido-pp 'unbound-commands)
-    (beginning-of-buffer)))
+    (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))))
 
 (provide 'smex)
 ;;; smex.el ends here
diff --git a/elpa/smex-3.0/smex.elc b/elpa/smex-3.0/smex.elc
new file mode 100644
index 000000000..d96c9c7c6
Binary files /dev/null and b/elpa/smex-3.0/smex.elc differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el b/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
deleted file mode 100644
index 5e9d36e5e..000000000
--- a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el
+++ /dev/null
@@ -1,43 +0,0 @@
-;;; starter-kit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (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)))
-
-(mapc 'require '(uniquify starter-kit-defuns starter-kit-misc))
-
-(setq esk-system-config (concat user-emacs-directory system-name ".el") esk-user-config (concat user-emacs-directory user-login-name ".el") esk-user-dir (concat user-emacs-directory user-login-name))
-
-(add-to-list 'load-path esk-user-dir)
-
-(setq smex-save-file (concat user-emacs-directory ".smex-items"))
-
-(smex-initialize)
-
-(global-set-key (kbd "M-x") 'smex)
-
-(when (file-exists-p esk-system-config) (load esk-system-config))
-
-(when (file-exists-p esk-user-config) (load esk-user-config))
-
-(when (file-exists-p esk-user-dir) (mapc 'load (directory-files esk-user-dir nil "^[^#].*el$")))
-
-;;;***
-
-;;;### (autoloads nil nil ("starter-kit-defuns.el" "starter-kit-misc.el"
-;;;;;;  "starter-kit-pkg.el") (20166 22154 260459))
-
-;;;***
-
-(provide 'starter-kit-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; starter-kit-autoloads.el ends here
diff --git a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el~ b/elpa/starter-kit-2.0.3/starter-kit-autoloads.el~
deleted file mode 100644
index 7a34ba7d8..000000000
--- a/elpa/starter-kit-2.0.3/starter-kit-autoloads.el~
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; starter-kit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-(provide 'starter-kit-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; starter-kit-autoloads.el ends here
diff --git a/elpa/starter-kit-2.0.3/starter-kit-defuns.el b/elpa/starter-kit-2.0.3/starter-kit-defuns.el
deleted file mode 100644
index a96105b0d..000000000
--- a/elpa/starter-kit-2.0.3/starter-kit-defuns.el
+++ /dev/null
@@ -1,175 +0,0 @@
-;;; starter-kit-defuns.el --- Saner defaults and goodies: function defs.
-;;
-;; Copyright (c) 2008-2010 Phil Hagelberg and contributors
-;;
-;; Author: Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/StarterKit
-;; Version: 2.0.2
-;; Keywords: convenience
-
-;; This file is not part of GNU Emacs.
-
-;;; Commentary:
-
-;; "Emacs outshines all other editing software in approximately the
-;; same way that the noonday sun does the stars. It is not just bigger
-;; and brighter; it simply makes everything else vanish."
-;; -Neal Stephenson, "In the Beginning was the Command Line"
-
-;; This file contains all the function definitions for the starter kit.
-
-;;; 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
-;; 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 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:
-
-;;; These belong in prog-mode-hook:
-
-;; We have a number of turn-on-* functions since it's advised that lambda
-;; functions not go in hooks. Repeatedly evaling an add-to-list with a
-;; hook value will repeatedly add it since there's no way to ensure
-;; that a byte-compiled lambda doesn't already exist in the list.
-
-(defun esk-local-column-number-mode ()
-  (make-local-variable 'column-number-mode)
-  (column-number-mode t))
-
-(defun esk-local-comment-auto-fill ()
-  (set (make-local-variable 'comment-auto-fill-only-comments) t)
-  (auto-fill-mode t))
-
-(defun esk-turn-on-hl-line-mode ()
-  (when (> (display-color-cells) 8)
-    (hl-line-mode t)))
-
-(defun esk-turn-on-save-place-mode ()
-  (require 'saveplace)
-  (setq save-place t))
-
-(defun esk-turn-on-whitespace ()
-  (whitespace-mode t))
-
-(defun esk-turn-on-paredit ()
-  (paredit-mode t))
-
-(defun esk-turn-on-idle-highlight-mode ()
-  (idle-highlight-mode t))
-
-(defun esk-pretty-lambdas ()
-  (font-lock-add-keywords
-   nil `(("(?\\(lambda\\>\\)"
-          (0 (progn (compose-region (match-beginning 1) (match-end 1)
-                                    ,(make-char 'greek-iso8859-7 107))
-                    nil))))))
-
-(defun esk-add-watchwords ()
-  (font-lock-add-keywords
-   nil '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\|NOCOMMIT\\)"
-          1 font-lock-warning-face t))))
-
-(add-hook 'prog-mode-hook 'esk-local-column-number-mode)
-(add-hook 'prog-mode-hook 'esk-local-comment-auto-fill)
-(add-hook 'prog-mode-hook 'esk-turn-on-hl-line-mode)
-(add-hook 'prog-mode-hook 'esk-turn-on-save-place-mode)
-(add-hook 'prog-mode-hook 'esk-pretty-lambdas)
-(add-hook 'prog-mode-hook 'esk-add-watchwords)
-(add-hook 'prog-mode-hook 'esk-turn-on-idle-highlight-mode)
-
-(defun esk-prog-mode-hook ()
-  (run-hooks 'prog-mode-hook))
-
-(defun esk-turn-off-tool-bar ()
-  (tool-bar-mode -1))
-
-(defun esk-untabify-buffer ()
-  (interactive)
-  (untabify (point-min) (point-max)))
-
-(defun esk-indent-buffer ()
-  (interactive)
-  (indent-region (point-min) (point-max)))
-
-(defun esk-cleanup-buffer ()
-  "Perform a bunch of operations on the whitespace content of a buffer."
-  (interactive)
-  (esk-indent-buffer)
-  (esk-untabify-buffer)
-  (delete-trailing-whitespace))
-
-;; Commands
-
-(defun esk-eval-and-replace ()
-  "Replace the preceding sexp with its value."
-  (interactive)
-  (backward-kill-sexp)
-  (condition-case nil
-      (prin1 (eval (read (current-kill 0)))
-             (current-buffer))
-    (error (message "Invalid expression")
-           (insert (current-kill 0)))))
-
-(defun esk-sudo-edit (&optional arg)
-  (interactive "p")
-  (if (or arg (not buffer-file-name))
-      (find-file (concat "/sudo:root@localhost:" (ido-read-file-name "File: ")))
-    (find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name))))
-
-(defun esk-lorem ()
-  "Insert a lorem ipsum."
-  (interactive)
-  (insert "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do "
-          "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim"
-          "ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut "
-          "aliquip ex ea commodo consequat. Duis aute irure dolor in "
-          "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla "
-          "pariatur. Excepteur sint occaecat cupidatat non proident, sunt in "
-          "culpa qui officia deserunt mollit anim id est laborum."))
-
-(defun esk-suck-it (suckee)
-  "Insert a comment of appropriate length about what can suck it."
-  (interactive "MWhat can suck it? ")
-  (let ((prefix (concat ";; " suckee " can s"))
-        (postfix "ck it!")
-        (col (current-column)))
-    (insert prefix)
-    (dotimes (_ (- 80 col (length prefix) (length postfix))) (insert "u"))
-    (insert postfix)))
-
-(defun esk-insert-date ()
-  "Insert a time-stamp according to locale's date and time format."
-  (interactive)
-  (insert (format-time-string "%c" (current-time))))
-
-(defun esk-pairing-bot ()
-  "If you can't pair program with a human, use this instead."
-  (interactive)
-  (message (if (y-or-n-p "Do you have a test for that? ") "Good." "Bad!")))
-
-(defun esk-paredit-nonlisp ()
-  "Turn on paredit mode for non-lisps."
-  (interactive)
-  (set (make-local-variable 'paredit-space-for-delimiter-predicates)
-       '((lambda (endp delimiter) nil)))
-  (paredit-mode 1))
-
-;; A monkeypatch to cause annotate to ignore whitespace
-(defun vc-git-annotate-command (file buf &optional rev)
-  (let ((name (file-relative-name file)))
-    (vc-git-command buf 0 name "blame" "-w" rev)))
-
-(provide 'starter-kit-defuns)
-;;; starter-kit-defuns.el ends here
diff --git a/elpa/starter-kit-2.0.3/starter-kit-defuns.elc b/elpa/starter-kit-2.0.3/starter-kit-defuns.elc
deleted file mode 100644
index db515b49e..000000000
Binary files a/elpa/starter-kit-2.0.3/starter-kit-defuns.elc and /dev/null differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit-misc.el b/elpa/starter-kit-2.0.3/starter-kit-misc.el
deleted file mode 100644
index 077be72b2..000000000
--- a/elpa/starter-kit-2.0.3/starter-kit-misc.el
+++ /dev/null
@@ -1,135 +0,0 @@
-;;; starter-kit-misc.el --- Saner defaults and goodies: miscellany
-;;
-;; Copyright (c) 2008-2010 Phil Hagelberg and contributors
-;;
-;; Author: Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/StarterKit
-;; Version: 2.0.2
-;; Keywords: convenience
-
-;; This file is not part of GNU Emacs.
-
-;;; Commentary:
-
-;; "Emacs outshines all other editing software in approximately the
-;; same way that the noonday sun does the stars. It is not just bigger
-;; and brighter; it simply makes everything else vanish."
-;; -Neal Stephenson, "In the Beginning was the Command Line"
-
-;; This file contains setqs and things that aren't bindings or defuns.
-
-;;; 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
-;; 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 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:
-
-(when window-system
-  (setq frame-title-format '(buffer-file-name "%f" ("%b")))
-  (tooltip-mode -1)
-  (mouse-wheel-mode t)
-  (blink-cursor-mode -1))
-
-;; can't do it at launch or emacsclient won't always honor it
-(add-hook 'before-make-frame-hook 'esk-turn-off-tool-bar)
-
-(setq visible-bell t
-      inhibit-startup-message t
-      color-theme-is-global t
-      sentence-end-double-space nil
-      shift-select-mode nil
-      mouse-yank-at-point t
-      uniquify-buffer-name-style 'forward
-      whitespace-style '(face trailing lines-tail tabs)
-      whitespace-line-column 80
-      ediff-window-setup-function 'ediff-setup-windows-plain
-      oddmuse-directory "~/.emacs.d/oddmuse"
-      save-place-file "~/.emacs.d/places"
-      backup-directory-alist `(("." . ,(expand-file-name "~/.emacs.d/backups")))
-      diff-switches "-u")
-
-(add-to-list 'safe-local-variable-values '(lexical-binding . t))
-(add-to-list 'safe-local-variable-values '(whitespace-line-column . 80))
-
-;; Set this to whatever browser you use
-;; (setq browse-url-browser-function 'browse-url-firefox)
-;; (setq browse-url-browser-function 'browse-default-macosx-browser)
-;; (setq browse-url-browser-function 'browse-default-windows-browser)
-;; (setq browse-url-browser-function 'browse-default-kde)
-;; (setq browse-url-browser-function 'browse-default-epiphany)
-;; (setq browse-url-browser-function 'browse-default-w3m)
-;; (setq browse-url-browser-function 'browse-url-generic
-;;       browse-url-generic-program "~/src/conkeror/conkeror")
-
-;; Highlight matching parentheses when the point is on them.
-(show-paren-mode 1)
-
-;; ido-mode is like magic pixie dust!
-(ido-mode t)
-(ido-ubiquitous t)
-(setq ido-enable-prefix nil
-      ido-enable-flex-matching t
-      ido-auto-merge-work-directories-length nil
-      ido-create-new-buffer 'always
-      ido-use-filename-at-point 'guess
-      ido-use-virtual-buffers t
-      ido-handle-duplicate-virtual-buffers 2
-      ido-max-prospects 10)
-
-(set-default 'indent-tabs-mode nil)
-(set-default 'indicate-empty-lines t)
-(set-default 'imenu-auto-rescan t)
-
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
-(add-hook 'text-mode-hook 'turn-on-flyspell)
-
-(defalias 'yes-or-no-p 'y-or-n-p)
-(defalias 'auto-tail-revert-mode 'tail-mode)
-
-(random t) ;; Seed the random-number generator
-
-;; Hippie expand: at times perhaps too hip
-(dolist (f '(try-expand-line try-expand-list try-complete-file-name-partially))
-  (delete f hippie-expand-try-functions-list))
-
-;; Add this back in at the end of the list.
-(add-to-list 'hippie-expand-try-functions-list 'try-complete-file-name-partially t)
-
-(eval-after-load 'grep
-  '(when (boundp 'grep-find-ignored-files)
-     (add-to-list 'grep-find-ignored-files "*.class")))
-
-;; Cosmetics
-
-(eval-after-load 'diff-mode
-  '(progn
-     (set-face-foreground 'diff-added "green4")
-     (set-face-foreground 'diff-removed "red3")))
-
-(eval-after-load 'magit
-  '(progn
-     (set-face-foreground 'magit-diff-add "green4")
-     (set-face-foreground 'magit-diff-del "red3")))
-
-;; Get around the emacswiki spam protection
-(eval-after-load 'oddmuse
-  (add-hook 'oddmuse-mode-hook
-            (lambda ()
-              (unless (string-match "question" oddmuse-post)
-                (setq oddmuse-post (concat "uihnscuskc=1;" oddmuse-post))))))
-
-(provide 'starter-kit-misc)
-;;; starter-kit-misc.el ends here
diff --git a/elpa/starter-kit-2.0.3/starter-kit-misc.elc b/elpa/starter-kit-2.0.3/starter-kit-misc.elc
deleted file mode 100644
index 0b08c039b..000000000
Binary files a/elpa/starter-kit-2.0.3/starter-kit-misc.elc and /dev/null differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit-pkg.el b/elpa/starter-kit-2.0.3/starter-kit-pkg.el
deleted file mode 100644
index 650f39a77..000000000
--- a/elpa/starter-kit-2.0.3/starter-kit-pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(define-package "starter-kit" "2.0.3"
-  "Saner defaults and goodies."
-  '((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")))
diff --git a/elpa/starter-kit-2.0.3/starter-kit-pkg.elc b/elpa/starter-kit-2.0.3/starter-kit-pkg.elc
deleted file mode 100644
index 5a22d2301..000000000
Binary files a/elpa/starter-kit-2.0.3/starter-kit-pkg.elc and /dev/null differ
diff --git a/elpa/starter-kit-2.0.3/starter-kit.el b/elpa/starter-kit-2.0.3/starter-kit.el
deleted file mode 100644
index 0098e50f8..000000000
--- a/elpa/starter-kit-2.0.3/starter-kit.el
+++ /dev/null
@@ -1,66 +0,0 @@
-;;; starter-kit.el --- Saner defaults and goodies.
-;;
-;; Copyright (c) 2008-2011 Phil Hagelberg and contributors
-;;
-;; Author: Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/StarterKit
-;; Version: 2.0.2
-;; Keywords: convenience
-
-;; This file is not part of GNU Emacs.
-
-;;; Commentary:
-
-;; "Emacs outshines all other editing software in approximately the
-;; same way that the noonday sun does the stars. It is not just bigger
-;; and brighter; it simply makes everything else vanish."
-;; -Neal Stephenson, "In the Beginning was the Command Line"
-
-;; This file just brings together other pieces of the starter kit plus
-;; user- and host-specific configs.
-
-;;; 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
-;; 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 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:
-
-;;;###autoload
-(progn
-  ;; Turn off mouse interface early in startup to avoid momentary display
-  (dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode))
-    (when (fboundp mode) (funcall mode -1)))
-
-  (mapc 'require '(uniquify starter-kit-defuns starter-kit-misc))
-
-  ;; You can keep system- or user-specific customizations here
-  (setq esk-system-config (concat user-emacs-directory system-name ".el")
-        esk-user-config (concat user-emacs-directory user-login-name ".el")
-        esk-user-dir (concat user-emacs-directory user-login-name))
-
-  (add-to-list 'load-path esk-user-dir)
-
-  (setq smex-save-file (concat user-emacs-directory ".smex-items"))
-  (smex-initialize)
-  (global-set-key (kbd "M-x") 'smex)
-
-  (when (file-exists-p esk-system-config) (load esk-system-config))
-  (when (file-exists-p esk-user-config) (load esk-user-config))
-  (when (file-exists-p esk-user-dir)
-    (mapc 'load (directory-files esk-user-dir nil "^[^#].*el$"))))
-
-(provide 'starter-kit)
-;;; starter-kit.el ends here
diff --git a/elpa/starter-kit-2.0.3/starter-kit.elc b/elpa/starter-kit-2.0.3/starter-kit.elc
deleted file mode 100644
index 3ff2af4fa..000000000
Binary files a/elpa/starter-kit-2.0.3/starter-kit.elc and /dev/null differ
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.el b/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.el
deleted file mode 100644
index 25146debe..000000000
--- a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "starter-kit-bindings" "2.0.2" "Saner defaults and goodies: bindings" (quote ((starter-kit "2.0.2"))))
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
deleted file mode 100644
index 56121e496..000000000
Binary files a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-pkg.elc and /dev/null differ
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-autoloads.el
similarity index 92%
rename from elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
rename to elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-autoloads.el
index 5d5d0104c..a273a9641 100644
--- a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings-autoloads.el
+++ b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-autoloads.el
@@ -1,10 +1,10 @@
 ;;; starter-kit-bindings-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
 ;;;### (autoloads nil "starter-kit-bindings" "starter-kit-bindings.el"
-;;;;;;  (20184 56041))
+;;;;;;  (21721 36891 0 0))
 ;;; Generated autoloads from starter-kit-bindings.el
 
 (global-set-key (kbd "C-c f") 'find-file-in-project)
@@ -65,16 +65,9 @@
 
 ;;;***
 
-;;;### (autoloads nil nil ("starter-kit-bindings-pkg.el") (20184
-;;;;;;  56041 900829))
-
-;;;***
-
-(provide 'starter-kit-bindings-autoloads)
 ;; Local Variables:
 ;; version-control: never
 ;; no-byte-compile: t
 ;; no-update-autoloads: t
-;; coding: utf-8
 ;; End:
 ;;; starter-kit-bindings-autoloads.el ends here
diff --git a/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-pkg.el b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-pkg.el
new file mode 100644
index 000000000..2f4f4f267
--- /dev/null
+++ b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-pkg.el
@@ -0,0 +1 @@
+(define-package "starter-kit-bindings" "2.0.3" "Saner defaults and goodies: bindings" '((starter-kit "2.0.2")) :url "http://www.emacswiki.org/cgi-bin/wiki/StarterKit" :keywords '("convenience"))
diff --git a/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-pkg.elc b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-pkg.elc
new file mode 100644
index 000000000..31bd1689e
Binary files /dev/null and b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings-pkg.elc differ
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.el b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings.el
similarity index 98%
rename from elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.el
rename to elpa/starter-kit-bindings-2.0.3/starter-kit-bindings.el
index 238345686..3b9de7208 100644
--- a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.el
+++ b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings.el
@@ -4,7 +4,8 @@
 ;;
 ;; Author: Phil Hagelberg <technomancy@gmail.com>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/StarterKit
-;; Version: 2.0.2
+;; Version: 2.0.3
+;; X-Original-Version: 2.0.2
 ;; Keywords: convenience
 ;; Package-Requires: ((starter-kit "2.0.2"))
 
diff --git a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings.elc
similarity index 92%
rename from elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc
rename to elpa/starter-kit-bindings-2.0.3/starter-kit-bindings.elc
index f8e41f68d..66c9e92de 100644
Binary files a/elpa/starter-kit-bindings-2.0.2/starter-kit-bindings.elc and b/elpa/starter-kit-bindings-2.0.3/starter-kit-bindings.elc differ
diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
deleted file mode 100644
index 5db145386..000000000
--- a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-autoloads.el
+++ /dev/null
@@ -1,52 +0,0 @@
-;;; starter-kit-lisp-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (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)
-
-(add-hook 'emacs-lisp-mode-hook 'esk-remove-elc-on-save)
-
-(add-hook 'emacs-lisp-mode-hook 'esk-prog-mode-hook)
-
-(add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode)
-
-(defun esk-remove-elc-on-save nil "\
-If you're saving an elisp file, likely the .elc is no longer valid." (make-local-variable (quote after-save-hook)) (add-hook (quote after-save-hook) (lambda nil (if (file-exists-p (concat buffer-file-name "c")) (delete-file (concat buffer-file-name "c"))))))
-
-(define-key emacs-lisp-mode-map (kbd "C-c v") 'eval-buffer)
-
-(define-key read-expression-map (kbd "TAB") 'lisp-complete-symbol)
-
-(define-key lisp-mode-shared-map (kbd "RET") 'reindent-then-newline-and-indent)
-
-(defface esk-paren-face '((((class color) (background dark)) (:foreground "grey50")) (((class color) (background light)) (:foreground "grey55"))) "\
-Face used to dim parentheses." :group (quote starter-kit-faces))
-
-(eval-after-load 'paredit '(define-key paredit-mode-map (kbd "M-)") 'paredit-forward-slurp-sexp))
-
-(dolist (mode '(scheme emacs-lisp lisp clojure)) (when (> (display-color-cells) 8) (font-lock-add-keywords (intern (concat (symbol-name mode) "-mode")) '(("(\\|)" quote esk-paren-face)))) (add-hook (intern (concat (symbol-name mode) "-mode-hook")) 'esk-turn-on-paredit) (add-hook (intern (concat (symbol-name mode) "-mode-hook")) 'esk-turn-on-paredit))
-
-(defun esk-pretty-fn nil (font-lock-add-keywords nil `(("(\\(fn\\>\\)" (0 (progn (compose-region (match-beginning 1) (match-end 1) "ƒ") nil))))))
-
-(add-hook 'clojure-mode-hook 'esk-pretty-fn)
-
-;;;***
-
-;;;### (autoloads nil nil ("starter-kit-lisp-pkg.el") (20184 56040
-;;;;;;  964735))
-
-;;;***
-
-(provide 'starter-kit-lisp-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; starter-kit-lisp-autoloads.el ends here
diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.el b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.el
deleted file mode 100644
index 4aa15de13..000000000
--- a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "starter-kit-lisp" "2.0.3" "Saner defaults and goodies for lisp languages" (quote ((starter-kit "2.0.2") (elisp-slime-nav "0.1"))))
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
deleted file mode 100644
index 01164c403..000000000
Binary files a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp-pkg.elc and /dev/null differ
diff --git a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.el b/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.el
deleted file mode 100644
index 7216740ac..000000000
--- a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.el
+++ /dev/null
@@ -1,95 +0,0 @@
-;;; starter-kit-lisp.el --- Saner defaults and goodies for lisp languages
-;;
-;; Copyright (c) 2008-2011 Phil Hagelberg and contributors
-;;
-;; Author: Phil Hagelberg <technomancy@gmail.com>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/StarterKit
-;; Version: 2.0.3
-;; Keywords: convenience
-;; Package-Requires: ((starter-kit "2.0.2") (elisp-slime-nav "0.1"))
-
-;; This file is not part of GNU Emacs.
-
-;;; Commentary:
-
-;; "Emacs outshines all other editing software in approximately the
-;; same way that the noonday sun does the stars. It is not just bigger
-;; and brighter; it simply makes everything else vanish."
-;; -Neal Stephenson, "In the Beginning was the Command Line"
-
-;; This file contains tweaks specific to Lisp languages.
-
-;;; 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
-;; 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 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:
-
-;; Emacs Lisp
-
-;;;###autoload
-(progn
-  (add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
-  (add-hook 'emacs-lisp-mode-hook 'esk-remove-elc-on-save)
-  (add-hook 'emacs-lisp-mode-hook 'esk-prog-mode-hook)
-  (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode)
-
-  (defun esk-remove-elc-on-save ()
-    "If you're saving an elisp file, likely the .elc is no longer valid."
-    (make-local-variable 'after-save-hook)
-    (add-hook 'after-save-hook
-              (lambda ()
-                (if (file-exists-p (concat buffer-file-name "c"))
-                    (delete-file (concat buffer-file-name "c"))))))
-
-  (define-key emacs-lisp-mode-map (kbd "C-c v") 'eval-buffer)
-
-;;; Enhance Lisp Modes
-
-  (define-key read-expression-map (kbd "TAB") 'lisp-complete-symbol)
-  (define-key lisp-mode-shared-map (kbd "RET") 'reindent-then-newline-and-indent)
-
-  ;; TODO: look into parenface package
-  (defface esk-paren-face
-    '((((class color) (background dark))
-       (:foreground "grey50"))
-      (((class color) (background light))
-       (:foreground "grey55")))
-    "Face used to dim parentheses."
-    :group 'starter-kit-faces)
-
-  (eval-after-load 'paredit
-    ;; need a binding that works in the terminal
-    '(define-key paredit-mode-map (kbd "M-)") 'paredit-forward-slurp-sexp))
-
-  (dolist (mode '(scheme emacs-lisp lisp clojure))
-    (when (> (display-color-cells) 8)
-      (font-lock-add-keywords (intern (concat (symbol-name mode) "-mode"))
-                              '(("(\\|)" . 'esk-paren-face))))
-    (add-hook (intern (concat (symbol-name mode) "-mode-hook"))
-              'esk-turn-on-paredit)
-    (add-hook (intern (concat (symbol-name mode) "-mode-hook"))
-              'esk-turn-on-paredit))
-
-  (defun esk-pretty-fn ()
-    (font-lock-add-keywords nil `(("(\\(fn\\>\\)"
-                                   (0 (progn (compose-region (match-beginning 1)
-                                                             (match-end 1)
-                                                             "\u0192") nil))))))
-  (add-hook 'clojure-mode-hook 'esk-pretty-fn))
-
-(provide 'starter-kit-lisp)
-;;; starter-kit-lisp.el ends here
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
deleted file mode 100644
index fef3ddd81..000000000
Binary files a/elpa/starter-kit-lisp-2.0.3/starter-kit-lisp.elc and /dev/null differ
diff --git a/elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el
similarity index 80%
rename from elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
rename to elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el
index 939affa50..557828547 100644
--- a/elpa/starter-kit-ruby-2.0/starter-kit-ruby-autoloads.el
+++ b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-autoloads.el
@@ -1,24 +1,28 @@
 ;;; starter-kit-ruby-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads nil "starter-kit-ruby" "starter-kit-ruby.el" (20184
-;;;;;;  56042))
+;;;### (autoloads nil "starter-kit-ruby" "starter-kit-ruby.el" (21721
+;;;;;;  36890 0 0))
 ;;; Generated autoloads from starter-kit-ruby.el
 
-(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)))
+(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)))
 
 (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))
@@ -27,6 +31,8 @@
 
 (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)))
 
@@ -40,24 +46,13 @@ 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") (20184 56042
-;;;;;;  635313))
-
-;;;***
-
-(provide 'starter-kit-ruby-autoloads)
 ;; Local Variables:
 ;; version-control: never
 ;; no-byte-compile: t
 ;; no-update-autoloads: t
-;; coding: utf-8
 ;; End:
 ;;; starter-kit-ruby-autoloads.el ends here
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
new file mode 100644
index 000000000..76cfea54a
--- /dev/null
+++ b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.el
@@ -0,0 +1 @@
+(define-package "starter-kit-ruby" "2.0.3" "Saner defaults and goodies for Ruby" '((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
new file mode 100644
index 000000000..ae3b027c9
Binary files /dev/null and b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby-pkg.elc differ
diff --git a/elpa/starter-kit-ruby-2.0/starter-kit-ruby.el b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el
similarity index 90%
rename from elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
rename to elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.el
index ef5e11aa4..63c71d4bc 100644
--- a/elpa/starter-kit-ruby-2.0/starter-kit-ruby.el
+++ b/elpa/starter-kit-ruby-2.0.3/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
+;; Version: 2.0.3
 ;; Keywords: convenience
-
+;; Package-Requires: ((inf-ruby "2.2.3") (starter-kit "2.0.1"))
 ;; This file is not part of GNU Emacs.
 
 ;;; Commentary:
@@ -18,6 +18,8 @@
 
 ;; 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
@@ -44,7 +46,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)))
 
@@ -52,15 +54,18 @@
 
   ;; 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
+  ;; We never want to edit Rubinius bytecode or MacRuby binaries
   (add-to-list 'completion-ignored-extensions ".rbc")
+  (add-to-list 'completion-ignored-extensions ".rbo")
 
 ;;; Rake
 
@@ -92,9 +97,6 @@ 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/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc
new file mode 100644
index 000000000..57d570915
Binary files /dev/null and b/elpa/starter-kit-ruby-2.0.3/starter-kit-ruby.elc differ
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
deleted file mode 100644
index 8f99a5a5b..000000000
--- a/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "starter-kit-ruby" "2.0" "Saner defaults and goodies for Ruby" (quote nil))
diff --git a/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc b/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc
deleted file mode 100644
index 3ee9d9314..000000000
Binary files a/elpa/starter-kit-ruby-2.0/starter-kit-ruby-pkg.elc and /dev/null differ
diff --git a/init.el b/init.el
index 87937bb72..7aa4d1fee 100644
--- a/init.el
+++ b/init.el
@@ -3,9 +3,24 @@
              '("marmalade" . "http://marmalade-repo.org/packages/") t)
 (add-to-list 'package-archives
              '("tromey" . "http://tromey.com/elpa/") t)
+(add-to-list 'package-archives
+             '("melpa-stable" . "http://melpa-stable.milkbox.net/packages/"))
+
 (package-initialize)
 
 (when (not package-archive-contents)
   (package-refresh-contents))
 
+;;add dependecies here, download them if none-exists
+(defvar my-packages '(better-defaults
+                      projectile
+                      clojure-mode
+                      cider
+                      ac-nrepl
+                      projectile))
+
+(dolist (p my-packages)
+  (unless (package-installed-p p)
+    (package-install p)))
+
 (load "~/.emacs.d/user.el")
diff --git a/projectile-bookmarks.eld b/projectile-bookmarks.eld
new file mode 100644
index 000000000..f833f99f1
--- /dev/null
+++ b/projectile-bookmarks.eld
@@ -0,0 +1 @@
+("~/DemoProjects/core-async-showcase/" "~/.emacs.d/" "~/DemoProjects/4clojure/" "~/DemoProjects/sicp-in-clj/" "~/DemoProjects/core-ansyc-demo/" "~/DemoProjects/clj-http/" "~/DemoProjects/co-async-playbook/" "~/Downloads/homework_by_kzhang/" "~/DemoProjects/clojure-go/config-service-clj/")
\ No newline at end of file
diff --git a/themes/color-theme-solarized-pkg.el b/themes/color-theme-solarized-pkg.el
new file mode 100644
index 000000000..850550e9a
--- /dev/null
+++ b/themes/color-theme-solarized-pkg.el
@@ -0,0 +1 @@
+(define-package "color-theme-solarized" "%%version%%" "Solarized themes for Emacs" '((color-theme "6.5.5")))
diff --git a/themes/color-theme-solarized.el b/themes/color-theme-solarized.el
new file mode 100644
index 000000000..298ae944b
--- /dev/null
+++ b/themes/color-theme-solarized.el
@@ -0,0 +1,51 @@
+;;; Author: Ethan Schoonover, Solarized; Greg Pfeil, Emacs adaptation
+;;; URL: http://ethanschoonover.com/solarized
+
+;;; This file is not (YET) part of GNU Emacs.
+
+;;; # Usage
+
+;;; 1. Install the color-theme package
+;;;   (http://www.emacswiki.org/cgi-bin/wiki/ColorTheme)
+;;; 2. Load this file
+;;; 3. M-x color-theme-solarized
+
+(let ((current-file-name (or load-file-name buffer-file-name)))
+  (if current-file-name
+    (let* ((reqname (concat (file-name-directory current-file-name)
+                            "solarized-definitions.el"))
+           (compreqname (concat reqname "c")))
+      (require 'solarized-definitions
+               (if (file-exists-p compreqname) compreqname reqname)))
+    (require 'solarized-definitions)))
+
+(eval-when-compile
+  (require 'color-theme))
+
+;;;###autoload
+(defun color-theme-solarized ()
+  "Color theme by Ethan Schoonover, created 2011-03-24.
+Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
+  (interactive)
+  (color-theme-install
+   `(color-theme-solarized () () ,@(solarized-color-definitions))))
+
+(add-to-list 'color-themes
+             `(color-theme-solarized
+               "Solarized"
+               ,solarized-description))
+
+;;;###autoload
+(defun color-theme-solarized-dark ()
+  "Color theme by Ethan Schoonover, created 2011-03-24.
+Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
+  (declare (obsolete color-theme-solarized "2013-05-01"))
+  (color-theme-solarized))
+;;;###autoload
+(defun color-theme-solarized-light ()
+  "Color theme by Ethan Schoonover, created 2011-03-24.
+Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
+  (declare (obsolete color-theme-solarized "2013-05-01"))
+  (color-theme-solarized))
+
+(provide 'color-theme-solarized)
diff --git a/themes/solarized-dark-theme.el b/themes/solarized-dark-theme.el
new file mode 100644
index 000000000..b7b9cf0ab
--- /dev/null
+++ b/themes/solarized-dark-theme.el
@@ -0,0 +1,11 @@
+(require 'solarized-definitions
+         (locate-file "solarized-definitions.el" custom-theme-load-path
+                      '("c" "")))
+
+(create-solarized-theme solarized-dark
+                        (concat "This theme is obsolete since 2013-05-01;
+use `solarized' instead.
+
+"
+                                solarized-description)
+                        (solarized-color-definitions))
diff --git a/themes/solarized-definitions.el b/themes/solarized-definitions.el
new file mode 100644
index 000000000..b42784b56
--- /dev/null
+++ b/themes/solarized-definitions.el
@@ -0,0 +1,598 @@
+(eval-when-compile
+  (unless (require 'cl-lib nil t)
+    (require 'cl)
+    (defalias 'cl-case 'case)
+    (defalias 'cl-copy-list 'copy-list))
+  )
+
+(defconst solarized-description
+  "Color theme by Ethan Schoonover, created 2011-03-24.
+Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized.")
+
+(defcustom solarized-termcolors 16
+  "This is set to 16 by default, meaning that Solarized will attempt to use the
+standard 16 colors of your terminal emulator. You will need to set those colors
+to the correct Solarized values either manually or by importing one of the many
+colorscheme available for popular terminal emulators and Xdefaults."
+  :type 'integer
+  :options '(16 256)
+  :group 'solarized)
+
+(defcustom solarized-degrade nil
+  "For test purposes only; when in GUI mode, forces Solarized to use the 256
+degraded color mode to test the approximate color values for accuracy."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-diff-mode 'normal
+  "Sets the level of highlighting to use in diff-like modes."
+  :type 'symbol
+  :options '(high normal low)
+  :group 'solarized)
+
+(defcustom solarized-bold t
+  "Stops Solarized from displaying bold when nil."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-underline t
+  "Stops Solarized from displaying underlines when nil."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-italic t
+  "Stops Solarized from displaying italics when nil."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-contrast 'normal
+  "Stick with normal! It's been carefully tested. Setting this option to high or
+low does use the same Solarized palette but simply shifts some values up or
+down in order to expand or compress the tonal range displayed."
+  :type 'symbol
+  :options '(high normal low)
+  :group 'solarized)
+
+(defcustom solarized-broken-srgb
+  (if (and (eq system-type 'darwin) (eq window-system 'ns))
+      (not (and (boundp 'ns-use-srgb-colorspace)
+                ns-use-srgb-colorspace))
+    nil)
+  "Emacs bug #8402 results in incorrect color handling on Macs. If this is t
+\(the default on Macs), Solarized works around it with alternative colors.
+However, these colors are not totally portable, so you may be able to edit
+the \"Gen RGB\" column in solarized-definitions.el to improve them further."
+  :type 'boolean
+  :group 'solarized)
+
+;; FIXME: The Generic RGB colors will actually vary from device to device, but
+;;        hopefully these are closer to the intended colors than the sRGB values
+;;        that Emacs seems to dislike
+(defvar solarized-colors           ; ANSI(Solarized terminal)
+  ;; name     sRGB      Gen RGB   256       16              8
+  '((base03  "#002b36" "#042028" "#1c1c1c" "brightblack"   "black")
+    (base02  "#073642" "#0a2832" "#262626" "black"         "black")
+    (base01  "#586e75" "#465a61" "#585858" "brightgreen"   "green")
+    (base00  "#657b83" "#52676f" "#626262" "brightyellow"  "yellow")
+    (base0   "#839496" "#708183" "#808080" "brightblue"    "blue")
+    (base1   "#93a1a1" "#81908f" "#8a8a8a" "brightcyan"    "cyan")
+    (base2   "#eee8d5" "#e9e2cb" "#e4e4e4" "white"         "white")
+    (base3   "#fdf6e3" "#fcf4dc" "#ffffd7" "brightwhite"   "white")
+    (yellow  "#b58900" "#a57705" "#af8700" "yellow"        "yellow")
+    (orange  "#cb4b16" "#bd3612" "#d75f00" "brightred"     "red")
+    (red     "#dc322f" "#c60007" "#d70000" "red"           "red")
+    (magenta "#d33682" "#c61b6e" "#af005f" "magenta"       "magenta")
+    (violet  "#6c71c4" "#5859b7" "#5f5faf" "brightmagenta" "magenta")
+    (blue    "#268bd2" "#2075c7" "#0087ff" "blue"          "blue")
+    (cyan    "#2aa198" "#259185" "#00afaf" "cyan"          "cyan")
+    (green   "#859900" "#728a05" "#5f8700" "green"         "green"))
+  "This is a table of all the colors used by the Solarized color theme. Each
+   column is a different set, one of which will be chosen based on term
+   capabilities, etc.")
+
+(defun solarized-face-for-index (facespec index &optional light)
+  "Creates a face from facespec where the colors use the names from
+  `solarized-colors`."
+  (let ((new-fontspec (cl-copy-list facespec)))
+    (dolist (property '(:foreground :background :color))
+      (let ((color-name (plist-get new-fontspec property)))
+        (when color-name
+          ;; NOTE: We try to turn an 8-color term into a 10-color term by not
+          ;;       using default background and foreground colors, expecting the
+          ;;       user to have the right colors set for them.
+          (when (and (= index 5)
+                     (or (and (eq property :background)
+                              (eq color-name 'back))
+                         (and (eq property :foreground)
+                              (member color-name '(base0 base1)))))
+            (setf color-name nil))
+          (when (eq color-name 'back)
+            (setf color-name 'base03))
+          (when light
+            (setf color-name
+                  (cl-case color-name
+                    (base03 'base3)
+                    (base02 'base2)
+                    (base01 'base1)
+                    (base00 'base0)
+                    (base0 'base00)
+                    (base1 'base01)
+                    (base2 'base02)
+                    (base3 'base03)
+                    (otherwise color-name))))
+          (plist-put new-fontspec
+                     property
+                     (nth index (assoc color-name solarized-colors))))))
+    (when (plist-get new-fontspec :box)
+      (plist-put new-fontspec
+                 :box
+                 (solarized-face-for-index (plist-get new-fontspec :box) index
+                                           light)))
+    new-fontspec))
+
+(defun create-face-spec (name facespec)
+  `(,name ((((background dark) (type graphic))
+            ,(solarized-face-for-index facespec
+                                       (cond (solarized-degrade     3)
+                                             (solarized-broken-srgb 2)
+                                             (t                     1))))
+           (((background dark) (type tty) (min-colors 256))
+            ,(solarized-face-for-index facespec
+                                       (if (= solarized-termcolors 16) 4 3)))
+           (((background dark) (type tty) (min-colors  16))
+            ,(solarized-face-for-index facespec 4))
+           (((background dark) (type tty) (min-colors   8))
+            ,(solarized-face-for-index facespec 5))
+           (((background light) (type graphic))
+            ,(solarized-face-for-index facespec
+                                       (cond (solarized-degrade     3)
+                                             (solarized-broken-srgb 2)
+                                             (t                     1))
+                                       t))
+           (((background light) (type tty) (min-colors 256))
+            ,(solarized-face-for-index facespec
+                                       (if (= solarized-termcolors 16) 4 3)
+                                       t))
+           (((background light) (type tty) (min-colors  16))
+            ,(solarized-face-for-index facespec 4 t))
+           (((background light) (type tty) (min-colors   8))
+            ,(solarized-face-for-index facespec 5 t)))))
+
+(defun solarized-color-definitions ()
+  (let ((bold        (if solarized-bold 'bold 'normal))
+        (bright-bold (if solarized-bold 'normal 'bold))
+        (underline   (if solarized-underline t nil))
+        (opt-under   nil)
+        (italic      (if solarized-italic 'italic 'normal)))
+    (cond ((eq 'high solarized-contrast)
+           (let ((orig-base3 base3))
+             (rotatef base01 base00 base0 base1 base2 base3)
+             (setf base3 orig-base3)))
+          ((eq 'low solarized-contrast)
+           (setf back      base02
+                 opt-under t)))
+    (let ((bg-back   '(:background back))
+          (bg-base03 '(:background base03))
+          (bg-base02 '(:background base02))
+          (bg-base01 '(:background base01))
+          (bg-base00 '(:background base00))
+          (bg-base0 '(:background base0))
+          (bg-base1 '(:background base1))
+          (bg-base2 '(:background base2))
+          (bg-base3 '(:background base3))
+          (bg-green '(:background green))
+          (bg-yellow '(:background yellow))
+          (bg-orange '(:background orange))
+          (bg-red '(:background red))
+          (bg-magenta '(:background magenta))
+          (bg-violet '(:background violet))
+          (bg-blue '(:background blue))
+          (bg-cyan '(:background cyan))
+
+          (fg-base03 '(:foreground base03))
+          (fg-base02 '(:foreground base02))
+          (fg-base01 '(:foreground base01))
+          (fg-base00 '(:foreground base00))
+          (fg-base0 '(:foreground base0))
+          (fg-base1 '(:foreground base1))
+          (fg-base2 '(:foreground base2))
+          (fg-base3 '(:foreground base3))
+          (fg-green '(:foreground green))
+          (fg-yellow '(:foreground yellow))
+          (fg-orange '(:foreground orange))
+          (fg-red '(:foreground red))
+          (fg-magenta '(:foreground magenta))
+          (fg-violet '(:foreground violet))
+          (fg-blue '(:foreground blue))
+          (fg-cyan '(:foreground cyan))
+
+          (fmt-none `(:weight normal :slant normal  :underline nil        :inverse-video nil))
+          (fmt-bold `(:weight ,bold  :slant normal  :underline nil        :inverse-video nil))
+          (fmt-bldi `(:weight ,bold                 :underline nil        :inverse-video nil))
+          (fmt-undr `(:weight normal :slant normal  :underline ,underline :inverse-video nil))
+          (fmt-undb `(:weight ,bold  :slant normal  :underline ,underline :inverse-video nil))
+          (fmt-undi `(:weight normal                :underline ,underline :inverse-video nil))
+          (fmt-uopt `(:weight normal :slant normal  :underline ,opt-under :inverse-video nil))
+          ;; FIXME: don’t hardcode the SRGB color names
+          (fmt-curl-red    `(:weight normal :slant normal :underline (:color "#dc322f" :style wave) :inverse-video nil))
+          (fmt-curl-yellow `(:weight normal :slant normal :underline (:color "#b58900" :style wave) :inverse-video nil))
+          (fmt-ital `(:weight normal :slant ,italic :underline nil        :inverse-video nil))
+          ;; FIXME: not quite the same
+          (fmt-stnd `(:weight normal :slant normal  :underline nil        :inverse-video t))
+          (fmt-revr `(:weight normal :slant normal  :underline nil        :inverse-video t))
+          (fmt-revb `(:weight ,bold  :slant normal  :underline nil        :inverse-video t))
+          (fmt-revbb `(:weight ,bright-bold :slant normal :underline nil  :inverse-video t))
+          (fmt-revbbu `(:weight ,bright-bold :slant normal :underline ,underline :inverse-video t)))
+      (eval-after-load 'ansi-color
+        '(setf ansi-color-names-vector [,base02 ,red ,green ,yellow ,blue ,magenta ,cyan ,base00]))
+      (mapcar (lambda (face) (apply 'create-face-spec face))
+              `(;; basic
+                (default (,@fg-base0 ,@bg-back))   ; Normal
+                (cursor (,@fg-base03 ,@bg-base0))  ; Cursor
+                (error (,@fmt-bold ,@fg-red))      ; Error
+                (escape-glyph-face (,@fg-red))
+                (fringe (,@fg-base01 ,@bg-base02))
+                (linum (,@fmt-none ,@fg-base01 ,@bg-base02))
+                (header-line (,@fg-base0 ,@bg-base02 ,@fmt-revbb)) ; Pmenu
+                (highlight (,@bg-base02))
+                (hl-line (:underline ,opt-under ,@bg-base02)) ; CursorLine
+                (isearch (,@fmt-stnd ,@fg-orange ,@bg-back)) ; IncSearch
+                (isearch-fail (,@fmt-stnd ,@fg-orange ,@bg-back)) ; IncSearch
+                (lazy-highlight (,@fmt-revr ,@fg-yellow ,@bg-back)) ; Search
+                (link (,@fmt-undr ,@fg-violet))
+                (link-visited (,@fmt-undr ,@fg-magenta))
+                (match ((t (,@fmt-revr ,@fg-yellow ,@bg-back)))) ; Occur
+                (menu (,@fg-base0 ,@bg-base02))
+                (minibuffer-prompt (,@fmt-bold ,@fg-cyan)) ; Question
+                (mode-line ; StatusLine
+                 (,@fg-base1 ,@bg-base02 ,@fmt-revbb :box nil))
+                (mode-line-inactive    ; StatusLineNC
+                 (,@fg-base00 ,@bg-base02 ,@fmt-revbb :box nil))
+                (region (,@fg-base01 ,@bg-base03 ,@fmt-revbb)) ; Visual
+                (secondary-selection (,@bg-base02))
+                (shadow (,@fg-base01))
+                (trailing-whitespace (,@fmt-revr ,@fg-red))
+                (vertical-border (,@fg-base0))
+                ;; comint
+                (comint-highlight-prompt (,@fg-blue))
+                ;; compilation
+                (compilation-info (,@fmt-bold ,@fg-green))
+                (compilation-warning (,@fmt-bold ,@fg-orange))
+                ;; custom
+                (custom-button
+                 (,@fg-base1 ,@bg-base02 :box (:line-width 2 :style released-button)))
+                (custom-button-mouse
+                 (,@fmt-revr ,@fg-base1 ,@bg-base02 :inherit custom-button))
+                (custom-button-pressed
+                 (,@fmt-revr ,@fg-base1 ,@bg-base02
+                             :box (:line-width 2 :style pressed-button)
+                             :inherit custom-button-mouse))
+                (custom-changed (,@fmt-revr ,@fg-blue ,@bg-base3))
+                (custom-comment (,@fg-base1 ,@bg-base02))
+                (custom-comment-tag (,@fg-base1 ,@bg-base02))
+                (custom-documentation (:inherit default))
+                (custom-group-tag (,@fg-base1))
+                (custom-group-tag-1 (,@fmt-bold ,@fg-base1))
+                (custom-invalid (,@fmt-revr ,@fg-red ,@bg-back))
+                (custom-link (,@fg-violet))
+                (custom-state (,@fg-green))
+                (custom-variable-tag (,@fg-base1))
+                ;; diff - DiffAdd, DiffChange, DiffDelete, and DiffText
+                ,@(cl-case solarized-diff-mode
+                    (high
+                     `((diff-added (,@fmt-revr ,@fg-green))
+                       (diff-changed (,@fmt-revr ,@fg-yellow))
+                       (diff-removed (,@fmt-revr ,@fg-red))
+                       (diff-refine-change
+                        (,@fmt-revr ,@fg-blue ,@bg-back))))
+                    (low
+                     `((diff-added (,@fmt-undr ,@fg-green))
+                       (diff-changed (,@fmt-undr ,@fg-yellow))
+                       (diff-removed (,@fmt-bold ,@fg-red))
+                       (diff-refine-change (,@fmt-undr ,@fg-blue ,@bg-back))))
+                    (normal
+                     (if window-system
+                         `((diff-added (,@fmt-bold ,@fg-green ,@bg-base02))
+                           (diff-changed (,@fmt-bold ,@fg-yellow ,@bg-base02))
+                           (diff-removed (,@fmt-bold ,@fg-red ,@bg-base02))
+                           (diff-refine-change (,@fmt-bold ,@fg-blue ,@bg-base02)))
+                       `((diff-added (,@fg-green ,@bg-base02))
+                         (diff-changed (,@fg-yellow ,@bg-base02))
+                         (diff-removed (,@fg-red ,@bg-base02))
+                         (diff-refine-change (,@fg-blue ,@bg-base02))))))
+                (diff-file-header (,@bg-back))
+                (diff-header (,@fg-base1 ,@bg-back))
+                ;; IDO
+                (ido-only-match (,@fg-green))
+                (ido-subdir (,@fg-blue))
+                (ido-first-match (,@fmt-bold ,@fg-green))
+                ;; emacs-wiki
+                (emacs-wiki-bad-link-face (,@fmt-undr ,@fg-red))
+                (emacs-wiki-link-face (,@fmt-undr ,@fg-blue))
+                (emacs-wiki-verbatim-face (,@fmt-undr ,@fg-base00))
+                ;; eshell
+                (eshell-ls-archive (,@fg-magenta))
+                (eshell-ls-backup (,@fg-yellow))
+                (eshell-ls-clutter (,@fg-orange))
+                (eshell-ls-directory (,@fg-blue)) ; Directory
+                (eshell-ls-executable (,@fg-green))
+                (eshell-ls-missing (,@fg-red))
+                (eshell-ls-product (,@fg-yellow))
+                (eshell-ls-readonly (,@fg-base1))
+                (eshell-ls-special (,@fg-violet))
+                (eshell-ls-symlink (,@fg-cyan))
+                (eshell-ls-unreadable (,@fg-base00))
+                (eshell-prompt (,@fmt-bold ,@fg-green))
+                ;; font-lock
+                (font-lock-builtin-face (,@fmt-none ,@fg-green)) ; Statement
+                (font-lock-comment-face (,@fmt-ital ,@fg-base01)) ; Comment
+                (font-lock-constant-face (,@fmt-none ,@fg-cyan)) ; Constant
+                (font-lock-function-name-face ; Identifier
+                 (,@fmt-none ,@fg-blue))
+                (font-lock-keyword-face (,@fmt-none ,@fg-green)) ; Statement
+                (font-lock-string-face (,@fmt-none ,@fg-cyan)) ; Constant
+                (font-lock-type-face (,@fmt-none ,@fg-yellow)) ; Type
+                (font-lock-variable-name-face ; Identifier
+                 (,@fmt-none ,@fg-blue))
+                (font-lock-warning-face (,@fmt-bold ,@fg-red)) ; Error
+                (font-lock-doc-face (,@fmt-ital ,@fg-base01)) ; Comment
+                (font-lock-doc-string-face ; Comment (XEmacs-only)
+                 (,@fmt-ital ,@fg-base01))
+                (font-lock-color-constant-face (,@fmt-none ,@fg-green))
+                (font-lock-comment-delimiter-face ; Comment
+                 (,@fmt-ital ,@fg-base01))
+                (font-lock-preprocessor-face (,@fmt-none ,@fg-orange)) ; PreProc
+                (font-lock-reference-face (,@fmt-none ,@fg-cyan))
+                (font-lock-negation-char-face (,@fmt-none ,@fg-red))
+                (font-lock-other-type-face (,@fmt-ital ,@fg-blue))
+                (font-lock-regexp-grouping-construct (,@fmt-none ,@fg-orange))
+                (font-lock-special-keyword-face (,@fmt-none ,@fg-red)) ; Special
+                (font-lock-exit-face (,@fmt-none ,@fg-red))
+                (font-lock-other-emphasized-face (,@fmt-bldi ,@fg-violet))
+                (font-lock-regexp-grouping-backslash (,@fmt-none ,@fg-yellow))
+                ;; info
+                (info-xref (,@fmt-undr ,@fg-blue))
+                (info-xref-visited (,@fg-magenta :inherit info-xref))
+                ;; org
+                (org-block-background (,@bg-base02))
+                (org-hide (,@fg-base03))
+                (org-todo (,@fmt-bold ,@fg-base03 ,@bg-red))
+                (org-done (,@fmt-bold ,@fg-green))
+                (org-todo-kwd-face (,@fg-red ,@bg-base03))
+                (org-done-kwd-face (,@fg-green ,@bg-base03))
+                (org-project-kwd-face (,@fg-violet ,@bg-base03))
+                (org-waiting-kwd-face (,@fg-orange ,@bg-base03))
+                (org-someday-kwd-face (,@fg-blue ,@bg-base03))
+                (org-started-kwd-face (,@fg-yellow ,@bg-base03))
+                (org-cancelled-kwd-face (,@fg-green ,@bg-base03))
+                (org-delegated-kwd-face (,@fg-cyan ,@bg-base03))
+                ;; table
+                (table-cell (,@fmt-none ,@fg-base0 ,@bg-back))
+                ;; outline - pandocBlockQuoteLeader*
+                (outline-1 (,@fmt-none ,@fg-blue))
+                (outline-2 (,@fmt-none ,@fg-cyan))
+                (outline-3 (,@fmt-none ,@fg-yellow))
+                (outline-4 (,@fmt-none ,@fg-red))
+                (outline-5 (,@fmt-none ,@fg-base0))
+                (outline-6 (,@fmt-none ,@fg-base01))
+                (outline-7 (,@fmt-none ,@fg-orange))
+                (outline-8 (,@fmt-none ,@fg-violet))
+                ;; show-paren - MatchParen
+                (show-paren-match (,@fmt-bold ,@fg-cyan ,@bg-base02))
+                (show-paren-mismatch (,@fmt-bold ,@fg-red ,@bg-base01))
+                ;; speedbar
+                ;; (speedbar-button-face (,@fmt-none ,@fg-base1))
+                (speedbar-button-face
+                 (,@fg-base1 ,@bg-base02
+                             :box (:line-width 2 :style released-button)))
+                (speedbar-directory-face (,@fmt-none ,@fg-blue))
+                (speedbar-file-face (,@fmt-none ,@fg-green))
+                ;; (speedbar-highlight-face (,@bg-base02))
+                (speedbar-highlight-face
+                 (,@fmt-revr ,@fg-base1 ,@bg-base02
+                             :inherit speedbar-button-face))
+                ;; (speedbar-selected-face (,@fmt-undr ,@fg-yellow))
+                (speedbar-selected-face (,@fmt-none ,@bg-base02 ,@fg-green))
+                (speedbar-separator-face (,@fmt-stnd))
+                (speedbar-tag-face (,@fmt-none ,@fg-blue))
+                ;; widgets
+                (widget-field
+                 (,@fg-base1 ,@bg-base02 :box (:line-width 1 :color base2)
+                             :inherit default))
+                (widget-single-line-field (:inherit widget-field))
+                ;; extra modules
+                ;; -------------
+                ;; col-highlight -- Highlight the current column.
+                ;; http://www.emacswiki.org/emacs/col-highlight.el
+                (col-highlight (,@bg-base02))
+                ;; ace-jump-mode
+                (ace-jump-face-background (,@fmt-none ,@fg-base01))
+                (ace-jump-face-foreground (,@fmt-bold ,@fg-red))
+                ;; bm visual bookmarks
+                (bm-fringe-face (,@bg-orange ,@fg-base03))
+                (bm-fringe-persistent-face (,@bg-blue ,@fg-base03))
+                ;; Flymake
+                (flymake-errline (,@fmt-bold ,@fg-red)) ; Error
+                (flymake-warnline (,@fmt-bold ,@fg-red))
+                ;; column-marker
+                (column-marker-1 (,@bg-base01))
+                (column-marker-2 (,@bg-cyan))
+                (column-marker-3 (,@bg-violet))
+                ;; jabber
+                (jabber-activity-face (,@fmt-bold ,@fg-red))
+                (jabber-activity-personal-face (,@fmt-bold ,@fg-blue))
+                (jabber-chat-error (,@fmt-bold ,@fg-red))
+                (jabber-chat-prompt-foreign (,@fmt-bold ,@fg-red))
+                (jabber-chat-prompt-local (,@fmt-bold ,@fg-blue))
+                (jabber-chat-prompt-system (,@fmt-bold ,@fg-green))
+                (jabber-chat-text-foreign (,@fg-base1))
+                (jabber-chat-text-local (,@fg-base0))
+                (jabber-chat-rare-time-face (,@fmt-undr ,@fg-green))
+                (jabber-roster-user-away (,@fmt-ital ,@fg-green))
+                (jabber-roster-user-chatty (,@fmt-bold ,@fg-orange))
+                (jabber-roster-user-dnd (,@fmt-ital ,@fg-red))
+                (jabber-roster-user-error
+                 (:weight light :slant italic ,@fg-red))
+                (jabber-roster-user-offline (,@fg-base01))
+                (jabber-roster-user-online (,@fmt-bold ,@fg-blue))
+                (jabber-roster-user-xa (,@fmt-ital ,@fg-magenta))
+                ;; git-gutter
+                (git-gutter:modified (,@fg-violet))
+                (git-gutter:added (,@fg-green))
+                (git-gutter:deleted (,@fg-red))
+                ;; gnus - these are taken from mutt, not VIM
+                (gnus-cite-1 (,@fmt-none ,@fg-blue))    ; quoted
+                (gnus-cite-2 (,@fmt-none ,@fg-cyan))    ; quoted1
+                (gnus-cite-3 (,@fmt-none ,@fg-yellow))  ; quoted2
+                (gnus-cite-4 (,@fmt-none ,@fg-red))     ; quoted3
+                (gnus-cite-5 (,@fmt-none ,@fg-orange))  ; quoted4
+                (gnus-cite-6 (,@fmt-none ,@fg-violet))
+                (gnus-cite-7 (,@fmt-none ,@fg-green))
+                (gnus-cite-8 (,@fmt-none ,@fg-magenta))
+                (gnus-cite-9 (,@fmt-none ,@fg-base00))
+                (gnus-cite-10 (,@fmt-none ,@fg-base01))
+                (gnus-cite-11 (,@fmt-none ,@fg-base02))
+                (gnus-group-mail-1 (,@fmt-bold ,@fg-base3))
+                (gnus-group-mail-1-empty (,@fg-base3))
+                (gnus-group-mail-2 (,@fmt-bold ,@fg-base2))
+                (gnus-group-mail-2-empty (,@fg-base2))
+                (gnus-group-mail-3 (,@fmt-bold ,@fg-magenta))
+                (gnus-group-mail-3-empty (,@fg-magenta))
+                (gnus-group-mail-low (,@fmt-bold ,@fg-base00))
+                (gnus-group-mail-low-empty (,@fg-base00))
+                (gnus-group-news-1 (,@fmt-bold ,@fg-base1))
+                (gnus-group-news-1-empty (,@fg-base1))
+                (gnus-group-news-2 (,@fmt-bold ,@fg-blue))
+                (gnus-group-news-2-empty (,@fg-blue))
+                (gnus-group-news-low (,@fmt-bold ,@fg-violet))
+                (gnus-group-news-low-empty (,@fg-violet))
+                (gnus-emphasis-highlight-words ; highlight
+                 (,@fmt-none ,fg-yellow))
+                (gnus-header-content (,@fmt-none ,@fg-base01)) ; hdrdefault
+                (gnus-header-from (,@fmt-none ,@fg-base00)) ; header ^From
+                (gnus-header-name (,@fmt-none ,@fg-base01)) ; hdrdefault
+                (gnus-header-newsgroups (,@fmt-none ,@fg-base02)) ; hdrdefault
+                (gnus-header-subject (,@fmt-none ,@fg-blue)) ; header ^Subject
+                (gnus-server-agent (,@fmt-bold ,@fg-base3))
+                (gnus-server-closed (,@fmt-ital ,@fg-base1))
+                (gnus-server-denied (,@fmt-bold ,@fg-base2))
+                (gnus-server-offline (,@fmt-bold ,@fg-green))
+                (gnus-server-opened (,@fmt-bold ,@fg-cyan))
+                (gnus-signature (,@fmt-none ,@fg-base01)) ; signature
+                (gnus-splash (,@fg-base2))
+                (gnus-summary-cancelled ; deleted messages
+                 (,@fmt-none ,@fg-red))
+                (gnus-summary-high-ancient
+                 (,@fmt-bold :inherit gnus-summary-normal-ancient))
+                (gnus-summary-high-read
+                 (,@fmt-bold :inherit gnus-summary-normal-read))
+                (gnus-summary-high-ticked
+                 (,@fmt-bold :inherit gnus-summary-normal-ticked))
+                (gnus-summary-high-undownloaded
+                 (,@fmt-bold :inherit gnus-summary-normal-undownloaded))
+                (gnus-summary-high-unread
+                 (,@fmt-bold :inherit gnus-summary-normal-unread))
+                (gnus-summary-low-ancient
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-low-read
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-low-unread
+                 (,@fmt-ital :inherit gnus-summary-normal-unread))
+                (gnus-summary-low-ticked
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-low-undownloaded
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-normal-ancient ; old messages
+                 (,@fmt-none ,@fg-blue))
+                (gnus-summary-normal-read ; read messages
+                 (,@fmt-none ,@fg-base01))
+                (gnus-summary-normal-ticked (,@fmt-none ,@fg-red)) ; flagged
+                (gnus-summary-normal-undownloaded (,@fmt-none ,@fg-base2))
+                (gnus-summary-normal-unread ; unread messages
+                 (,@fmt-none ,@fg-blue))
+                (gnus-summary-selected ; indicator
+                 (,@fmt-none ,@fg-base03 ,@bg-yellow))
+                ;; Message
+                (message-mml (,@fg-blue))
+                (message-cited-text (,@fg-base2))
+                (message-separator (,@fg-base3))
+                (message-header-xheader (,@fg-violet))
+                (message-header-name (,@fg-cyan))
+                (message-header-other (,@fg-red))
+                (message-header-newsgroups (,@fmt-bldi ,@fg-yellow))
+                (message-header-subject (,@fg-base00))
+                (message-header-cc (,@fmt-bold ,@fg-green))
+                (message-header-to (,@fmt-bold ,@fg-base1))
+                ;; minimap
+                (minimap-active-region-background (,@bg-base02))
+                (minimap-semantic-function-face (,bg-base3))
+                (minimap-semantic-type-face (,bg-base3))
+                (minimap-semantic-variable-face (,bg-base3))
+                ;; parenface
+                (paren-face (,@fg-base01)) ; NB: local, don’t commit
+                (parenthesis (,@fg-base01)) ; NB: local, don’t commit
+                ;; rainbow-delimiters
+                (rainbow-delimiters-depth-1-face (,@fg-cyan))
+                (rainbow-delimiters-depth-2-face (,@fg-yellow))
+                (rainbow-delimiters-depth-3-face (,@fg-blue))
+                (rainbow-delimiters-depth-4-face (,@fg-red))
+                (rainbow-delimiters-depth-5-face (,@fg-green))
+                (rainbow-delimiters-depth-6-face (,@fg-blue))
+                (rainbow-delimiters-depth-7-face (,@fg-orange))
+                (rainbow-delimiters-depth-8-face (,@fg-magenta))
+                (rainbow-delimiters-depth-9-face (,@fg-base0))
+                ;; slime
+                (slime-error-face (,@fmt-revr ,@fg-red)) ; ErrorMsg
+                (slime-note-face (,@fg-yellow))
+                (slime-repl-inputted-output-face (,@fg-red))
+                (slime-repl-output-mouseover-face (:box (:color base3)))
+                (slime-style-warning-face (,@fmt-bold ,@fg-orange))
+                (slime-warning-face (,@fmt-bold ,@fg-red)) ; WarningMsg
+                ;; whitespace
+                (whitespace-empty (,@fg-red))
+                (whitespace-hspace (,@fg-orange))
+                (whitespace-indentation (,@fg-base02))
+                (whitespace-space (,@fg-base02))
+                (whitespace-space-after-tab (,@fg-cyan))
+                (whitespace-space-before-tab (,@fmt-bold ,@fg-red))
+                (whitespace-tab (,@fg-base02))
+                (whitespace-trailing (,@fmt-bold ,@fg-red ,@bg-base02))
+                (whitespace-highlight-face (,@fg-red ,@bg-blue))
+                (whitespace-line (,@fg-magenta))
+                ;; rcirc
+                (rcirc-my-nick (,@fg-blue))
+                (rcirc-nick-in-message (,@fg-orange))
+                (rcirc-other-nick (,@fg-green))
+                (rcirc-prompt (,@fg-yellow))
+                (rcirc-bright-nick (,@fg-magenta))
+                (rcirc-server (,@fg-base1))
+                (rcirc-timestamp (,@fg-base01))
+                ;;font-latex
+                (font-latex-warning-face (,@fg-red))
+                (font-latex-sectioning-5-face (,@fg-violet))
+                ;;flyspell
+                (flyspell-incorrect (,@fmt-curl-red)) ; SpellBad
+                (flyspell-duplicate (,@fmt-curl-yellow))
+                ;;ansi-term
+                (term-color-black (,@fg-base02))
+                (term-color-red (,@fg-red))
+                (term-color-green (,@fg-green))
+                (term-color-yellow (,@fg-yellow))
+                (term-color-blue (,@fg-blue))
+                (term-color-magenta (,@fg-magenta))
+                (term-color-cyan (,@fg-cyan))
+                (term-color-white (,@fg-base00)))))))
+
+;;;###autoload
+(when (boundp 'custom-theme-load-path)
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+
+(defmacro create-solarized-theme (name description color-definitions)
+  `(progn
+     (deftheme ,name ,description)
+     (apply 'custom-theme-set-faces
+            ',name ,color-definitions)
+     (provide-theme ',name)))
+
+(provide 'solarized-definitions)
diff --git a/themes/solarized-light-theme.el b/themes/solarized-light-theme.el
new file mode 100644
index 000000000..5abdbfa2b
--- /dev/null
+++ b/themes/solarized-light-theme.el
@@ -0,0 +1,11 @@
+(require 'solarized-definitions
+         (locate-file "solarized-definitions.el" custom-theme-load-path
+                      '("c" "")))
+
+(create-solarized-theme solarized-light
+                        (concat "This theme is obsolete since 2013-05-01;
+use `solarized' instead.
+
+"
+                                solarized-description)
+                        (solarized-color-definitions))
diff --git a/themes/solarized-theme.el b/themes/solarized-theme.el
new file mode 100644
index 000000000..729011ed7
--- /dev/null
+++ b/themes/solarized-theme.el
@@ -0,0 +1,6 @@
+(require 'solarized-definitions
+         (locate-file "solarized-definitions.el" custom-theme-load-path
+                      '("c" "")))
+
+(create-solarized-theme solarized
+                        solarized-description (solarized-color-definitions))
diff --git a/user.el b/user.el
index 3e7cd97c8..9da0a49e1 100644
--- a/user.el
+++ b/user.el
@@ -10,7 +10,7 @@
 ;; values in order to set the width (in characters wide) and height
 ;; (in lines high) Emacs will have whenever you start it
 
-;; (setq initial-frame-alist '((top . 0) (left . 0) (width . 20) (height . 20)))
+;;(setq initial-frame-alist '((top . 0) (left . 0) (width . 180) (height . 120)))
 
 
 ;; Place downloaded elisp files in this directory. You'll then be able
@@ -35,7 +35,8 @@
 (add-to-list 'load-path "~/.emacs.d/themes")
 ;; Uncomment this to increase font size
 ;; (set-face-attribute 'default nil :height 140)
-(load-theme 'tomorrow-night-bright t)
+(load-theme 'zenburn t)
+
 
 ;; Flyspell often slows down editing so it's turned off
 (remove-hook 'text-mode-hook 'turn-on-flyspell)
@@ -48,5 +49,84 @@
 
 (setq ido-use-filename-at-point nil)
 
+;; clojure auto-complete
+(require 'ac-cider)
+
+;; replace (fn[]()) and #(%) form of functions to lambda
+(defun my-replace-symbol ()
+  (dolist (mode '(clojure-mode clojurescript-mode cider-mode))
+    (eval-after-load mode
+      (font-lock-add-keywords
+       mode '(
+             ("(\\(fn\\)[\[[:space:]]"  ; anon funcs 1
+             (0 (progn (compose-region (match-beginning 1)
+                                       (match-end 1) "λ")
+                       nil)))
+             ("\\(#\\)("                ; anon funcs 2
+             (0 (progn (compose-region (match-beginning 1)
+                                       (match-end 1) "λ")
+                       nil)))
+             )))))
+
+;;send code to repl
+(defun cider-eval-expression-at-point-in-repl ()
+  (interactive)
+  (let ((form (cider-sexp-at-point)))
+    ;; Strip excess whitespace
+    (while (string-match "\\`\s+\\|\n+\\'" form)
+      (setq form (replace-match "" t t form)))
+    (set-buffer (cider-find-or-create-repl-buffer))
+    (goto-char (point-max))
+    (insert form)
+    (cider-repl-return)))
+(global-set-key (kbd "C-`") 'cider-eval-expression-at-point-in-repl)
+
+(global-rainbow-delimiters-mode)
+(projectile-global-mode)
+(setq projectile-indexing-method 'native)
+;;(setq projectile-enable-caching t)
+;;(global-prettify-symbols-mode 1)
+
+;;(add-hook 'clojure-mode-hook 'my-clojure-hook)
+(add-hook 'cider-repl-mode-hook #'rainbow-delimiters-mode)
+(add-hook 'after-init-hook 'my-replace-symbol)
+
+;; Auto complete
+(require 'auto-complete-config)
+;(add-to-list 'ac-dictionary-directories "~/.emacs.d/ac-dict")
+(setq ac-delay 0.2)
+(setq ac-use-quick-help t)
+(setq ac-quick-help-delay 0.5)
+(setq ac-use-fuzzy 1)
+(setq ac-auto-start 1)
+(setq ac-auto-show-menu 1)
+(ac-config-default)
+
+;; ac-nrepl
+(require 'ac-nrepl)
+(add-hook 'cider-mode-hook 'ac-nrepl-setup)
+(add-hook 'cider-repl-mode-hook 'ac-nrepl-setup)
+(add-to-list 'ac-modes 'cider-mode)
+(add-to-list 'ac-modes 'cider-repl-mode)
+
+;;ido enhencement from flx
+(require 'flx-ido)
+(ido-mode 1)
+(ido-everywhere 1)
+(flx-ido-mode 1)
+;; disable ido faces to see flx highlights.
+(setq ido-enable-flex-matching t)
+(setq ido-use-faces nil)
+
+;;remove Flyspell check
+(remove-hook 'text-mode-hook 'turn-on-flyspell)
+
+(defun set-auto-complete-as-completion-at-point-function ()
+  (setq completion-at-point-functions '(auto-complete)))
+
+(add-hook 'auto-complete-mode-hook 'set-auto-complete-as-completion-at-point-function)
+(add-hook 'cider-repl-mode-hook 'set-auto-complete-as-completion-at-point-function)
+(add-hook 'cider-mode-hook 'set-auto-complete-as-completion-at-point-function)
+
 ;; Save here instead of littering current directory with emacs backup files
 (setq backup-directory-alist `(("." . "~/.saves")))
diff --git a/vendor/flx-ido.el b/vendor/flx-ido.el
new file mode 100644
index 000000000..bc85adab8
--- /dev/null
+++ b/vendor/flx-ido.el
@@ -0,0 +1,289 @@
+;;; flx-ido.el --- flx integration for ido
+
+;; Copyright © 2013 Le Wang
+
+;; Author: Le Wang
+;; Maintainer: Le Wang
+;; Description: flx integration for ido
+;; Created: Sun Apr 21 20:38:36 2013 (+0800)
+;; Version: 0.5
+;; URL: https://github.com/lewang/flx
+;; Package-Requires: ((flx "0.1") (cl-lib "0.3"))
+
+;; 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 this program; 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 package provides a more powerful alternative to `ido-mode''s
+;; built-in flex matching.
+
+;;; Acknowledgments
+
+;; Scott Frazer's blog entry
+;; http://scottfrazersblog.blogspot.com.au/2009/12/emacs-better-ido-flex-matching.html
+;; provided a lot of inspiration.
+;;
+;; ido-hacks was helpful for ido optimization and fontification ideas
+
+;;; Installation:
+
+;; Add the following code to your init file:
+;;
+;;     (require 'flx-ido)
+;;     (ido-mode 1)
+;;     (ido-everywhere 1)
+;;     (flx-ido-mode 1)
+;;     ;; disable ido faces to see flx highlights.
+;;     (setq ido-enable-flex-matching t)
+;;     (setq ido-use-faces nil)
+
+;;; Code:
+
+(require 'ido)
+(require 'flx)
+
+(eval-when-compile
+  (defvar ido-cur-item))
+
+(defcustom flx-ido-threshold 6000
+  "Threshold for activating flx algorithm.
+
+Flx will not kick in until collection is filtered below this
+size with idos' default \"flex\" algorithm."
+  :group 'ido)
+
+
+(defcustom flx-ido-use-faces t
+  "Use `flx-highlight-face' to indicate characters contributing to best score."
+  :group 'ido)
+
+(unless (fboundp 'delete-consecutive-dups)
+  (defun delete-consecutive-dups (list &optional circular)
+    "Destructively remove `equal' consecutive duplicates from LIST.
+First and last elements are considered consecutive if CIRCULAR is
+non-nil."
+    (let ((tail list) last)
+      (while (consp tail)
+        (if (equal (car tail) (cadr tail))
+            (setcdr tail (cddr tail))
+          (setq last (car tail)
+                tail (cdr tail))))
+      (if (and circular
+               (cdr list)
+               (equal last (car list)))
+          (nbutlast list)
+        list))))
+
+(defvar flx-ido-narrowed-matches-hash (make-hash-table :test 'equal)
+  "Key is a query string.  Value is a list of narrowed matches.")
+
+(defvar flx-ido-debug nil)
+
+(defun flx-ido-debug (&rest args)
+  "Debugging util function.
+ARGS passed to message."
+  (when flx-ido-debug
+      (apply 'message args)))
+
+(defun flx-ido-is-prefix-match (str prefix)
+  "Return t if STR starts with PREFIX."
+  (when (and str prefix)
+    (let ((length (length prefix)))
+      (eq t (compare-strings prefix 0 length
+                             str 0 length)))))
+
+(defun flx-ido-narrowed (query items)
+  "Get the value from `flx-ido-narrowed-matches-hash' with the
+longest prefix match."
+  (flx-ido-debug "flx-ido-narrowed saw %s items" (length items))
+  (if (zerop (length query))
+      (list t (nreverse items))
+    (let ((query-key (flx-ido-key-for-query query))
+          best-match
+          exact
+          res)
+      (cl-loop for key being the hash-key of flx-ido-narrowed-matches-hash
+               do (when (and (>= (length query-key) (length key))
+                             (flx-ido-is-prefix-match query-key key)
+                             (or (null best-match)
+                                 (> (length key) (length best-match))))
+                    (setq best-match key)
+                    (when (= (length key)
+                             (length query-key))
+                      (setq exact t)
+                      (cl-return))))
+      (setq res (cond (exact
+                       (gethash best-match flx-ido-narrowed-matches-hash))
+                      (best-match
+                       (flx-ido-undecorate (gethash best-match flx-ido-narrowed-matches-hash)))
+                      (t
+                       (flx-ido-undecorate items))))
+      (list exact res))))
+
+(defun flx-ido-undecorate (strings)
+  "Remove decorations from STRINGS."
+  (flx-ido-decorate strings t))
+
+
+(defun flx-ido-decorate (things &optional clear)
+  "Add ido text properties to THINGS.
+If CLEAR is specified, clear them instead."
+  (if flx-ido-use-faces
+      (let ((decorate-count (min ido-max-prospects
+                                 (length things))))
+        (nconc
+         (cl-loop for thing in things
+               for i from 0 below decorate-count
+               collect (if clear
+                           (flx-propertize thing nil)
+                         (flx-propertize (car thing) (cdr thing))))
+         (if clear
+             (nthcdr decorate-count things)
+           (mapcar 'car (nthcdr decorate-count things)))))
+    (if clear
+        things
+      (mapcar 'car things))))
+
+(defun flx-ido-match-internal (query items)
+  "Match QUERY against ITEMS using flx scores.
+
+If filtered item count is still greater than `flx-ido-threshold', then use flex."
+  (flx-ido-debug "flx-ido-match-internal saw %s items" (length items))
+  (let ((flex-result (flx-flex-match query items)))
+    (flx-ido-debug "flex result count: %s" (length flex-result))
+    (if (< (length flex-result) flx-ido-threshold)
+        (let* ((matches (cl-loop for item in flex-result
+                                 for string = (ido-name item)
+                                 for score = (flx-score string query flx-file-cache)
+                                 if score
+                                 collect (cons item score)
+                                 into matches
+                                 finally return matches)))
+          (flx-ido-decorate (delete-consecutive-dups
+                             (sort matches
+                                   (lambda (x y) (> (cadr x) (cadr y))))
+                             t)))
+      flex-result)))
+
+(defun flx-ido-key-for-query (query)
+  "Canonicalize QUERY to form key."
+  (concat ido-current-directory query))
+
+(defun flx-ido-cache (query items)
+  "Possibly insert items into cache."
+  (if (memq ido-cur-item '(file dir))
+      items
+    (puthash (flx-ido-key-for-query query) items flx-ido-narrowed-matches-hash)))
+
+(defun flx-ido-reset ()
+  "Clean up flx variables between ido sessions."
+  (clrhash flx-ido-narrowed-matches-hash))
+
+(defun flx-ido-match (query items)
+  "Better sorting for flx ido matching."
+  (cl-destructuring-bind (exact res-items)
+      (flx-ido-narrowed query items)
+    (flx-ido-debug "exact: %s\nbefore hash count %s " exact (hash-table-count flx-ido-narrowed-matches-hash))
+    (flx-ido-cache query (if exact
+                             res-items
+                           (flx-ido-match-internal query res-items)))))
+
+(defun flx-ido-query-to-regexp (query)
+  "Convert QUERY to flx style case folding regexp."
+  (let* ((breakdown-str (mapcar (lambda (c)
+                                  (apply 'string c (when (= (downcase c) c)
+                                                       (list (upcase c)))))
+                                query))
+         (re (concat (format "[%s]" (nth 0 breakdown-str))
+                     (mapconcat (lambda (c)
+                                  (format "[^%s]*[%s]" c c))
+                                (cdr breakdown-str) ""))))
+    re))
+
+(defun flx-flex-match (query items)
+  "Reimplement ido's flex matching.
+Our implementation always uses flex and doesn't care about substring matches."
+  (if (zerop (length query))
+      items
+    (let* ((case-fold-search nil)
+           (re (flx-ido-query-to-regexp query))
+           matches)
+      (mapc
+       (lambda (item)
+         (let ((name (ido-name item)))
+           (if (string-match re name)
+               (setq matches (cons item matches)))))
+       items)
+      (delete-consecutive-dups (nreverse matches) t))))
+
+(defadvice ido-exit-minibuffer (around flx-ido-reset activate)
+  "Remove flx properties after."
+  (let* ((obj (car ido-matches))
+         (str (if (consp obj)
+                  (car obj)
+                obj)))
+    (when (and flx-ido-mode str)
+      (remove-text-properties 0 (length str)
+                              '(face flx-highlight-face) str))
+    (flx-ido-reset))
+
+  ad-do-it)
+
+(defadvice ido-read-internal (before flx-ido-reset activate)
+  "Clear flx narrowed hash beforehand."
+  (when flx-ido-mode
+    (flx-ido-reset)))
+
+(defadvice ido-restrict-to-matches (before flx-ido-reset activate)
+  "Clear flx narrowed hash."
+  (when flx-ido-mode
+    (flx-ido-reset)))
+
+(defadvice ido-set-matches-1 (around flx-ido-set-matches-1 activate compile)
+  "Choose between the regular ido-set-matches-1 and flx-ido-match"
+  (if (not flx-ido-mode)
+      ad-do-it
+    (let* ((query ido-text)
+           (original-items (ad-get-arg 0)))
+      (flx-ido-debug "query: %s" query)
+      (flx-ido-debug "id-set-matches-1 sees %s items" (length original-items))
+      (setq ad-return-value (flx-ido-match query original-items)))
+    (flx-ido-debug "id-set-matches-1 returning %s items starting with %s " (length ad-return-value) (car ad-return-value))))
+
+(defadvice ido-kill-buffer-at-head (before flx-ido-reset activate)
+  "Keep up with modification as required."
+  (when flx-ido-mode
+    ;; if not at EOB, query text is deleted.
+    (when (eobp)
+      (flx-ido-reset))))
+
+(add-hook 'ido-minibuffer-setup-hook 'flx-ido-reset nil)
+
+;;;###autoload
+(define-minor-mode flx-ido-mode
+  "Toggle flx ido mode"
+  :init-value nil
+  :lighter ""
+  :group 'ido
+  :global t)
+
+(provide 'flx-ido)
+
+;;; flx-ido.el ends here
diff --git a/vendor/flx.el b/vendor/flx.el
new file mode 100644
index 000000000..ba7b8e8df
--- /dev/null
+++ b/vendor/flx.el
@@ -0,0 +1,356 @@
+;;; flx.el --- fuzzy matching with good sorting
+
+;; Copyright © 2013 Le Wang
+
+;; Author: Le Wang
+;; Maintainer: Le Wang
+;; Description: fuzzy matching with good sorting
+;; Created: Wed Apr 17 01:01:41 2013 (+0800)
+;; Version: 0.5
+;; Package-Requires: ((cl-lib "0.3"))
+;; URL: https://github.com/lewang/flx
+
+;; 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 this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Implementation notes
+;; --------------------
+;;
+;; Use defsubst instead of defun
+;;
+;; * Using bitmaps to check for matches worked out to be SLOWER than just
+;;   scanning the string and using `flx-get-matches'.
+;;
+;; * Consing causes GC, which can often slowdown Emacs more than the benefits
+;;   of an optimization.
+
+;;; Acknowledgments
+
+;; Scott Frazer's blog entry http://scottfrazersblog.blogspot.com.au/2009/12/emacs-better-ido-flex-matching.html
+;; provided a lot of inspiration.
+;; ido-hacks was helpful for ido optimization
+
+;;; Code:
+
+(require 'cl-lib)
+
+(defface flx-highlight-face  '((t (:inherit font-lock-variable-name-face :bold t :underline t)))
+  "Face used by flx for highlighting flx match characters."
+  :group 'flx)
+
+;;; Do we need more word separators than ST?
+(defsubst flx-word-p (char)
+  "Check if CHAR is a word character."
+  (and char
+       (not (memq char '(?\  ?- ?_ ?: ?. ?/ ?\\)))))
+
+(defsubst flx-capital-p (char)
+  "Check if CHAR is an uppercase character."
+  (and char
+       (flx-word-p char)
+       (= char (upcase char))))
+
+(defsubst flx-boundary-p (last-char char)
+  "Check is LAST-CHAR is the end of a word and CHAR the start of the next.
+
+The function is camel-case aware."
+  (or (null last-char)
+      (and (not (flx-capital-p last-char))
+           (flx-capital-p char))
+      (and (not (flx-word-p last-char))
+           (flx-word-p char))))
+
+(defsubst flx-inc-vec (vec &optional inc beg end)
+  "increment each element of vectory by INC(default=1)
+from BEG (inclusive) to end (not inclusive).
+"
+  (or inc
+      (setq inc 1))
+  (or beg
+      (setq beg 0))
+  (or end
+      (setq end (length vec)))
+  (while (< beg end)
+    (cl-incf (aref vec beg) inc)
+    (cl-incf beg))
+  vec)
+
+(defun flx-get-hash-for-string (str heatmap-func)
+  "Return hash-table for string where keys are characters value
+  is a sorted list of indexes for character occurrences."
+  (let* ((res (make-hash-table :test 'eq :size 32))
+         (str-len (length str))
+         down-char)
+    (cl-loop for index from (1- str-len) downto 0
+             for char = (aref str index)
+          do (progn
+               ;; simulate `case-fold-search'
+               (if (flx-capital-p char)
+                   (progn
+                     (push index (gethash char res))
+                     (setq down-char (downcase char)))
+                 (setq down-char char))
+               (push index (gethash down-char res))))
+    (puthash 'heatmap (funcall heatmap-func str) res)
+    res))
+
+;; So we store one fixnum per character.  Is this too memory inefficient?
+(defun flx-get-heatmap-str (str &optional group-separator)
+  "Generate heat map vector of string.
+
+See documentation for logic."
+  (let* ((str-len (length str))
+         (str-last-index (1- str-len))
+         ;; ++++ base
+         (scores (make-vector str-len -35))
+         (penalty-lead ?.)
+         (groups-alist (list (list -1 0))))
+    ;; ++++ final char bonus
+    (cl-incf (aref scores str-last-index) 1)
+    ;; Establish baseline mapping
+    (cl-loop for char across str
+          for index from 0
+          with last-char = nil
+          with group-word-count = 0
+          do (progn
+               (let ((effective-last-char
+                      ;; before we find any words, all separaters are
+                      ;; considered words of length 1.  This is so "foo/__ab"
+                      ;; gets penalized compared to "foo/ab".
+                      (if (zerop group-word-count) nil last-char)))
+                 (when (flx-boundary-p effective-last-char char)
+                   (setcdr (cdar groups-alist) (cons index (cl-cddar groups-alist))))
+                 (when (and (not (flx-word-p last-char))
+                            (flx-word-p char))
+                   (cl-incf group-word-count)))
+               ;; ++++ -45 penalize extension
+               (when (eq last-char penalty-lead)
+                 (cl-incf (aref scores index) -45))
+               (when (eq group-separator char)
+                 (setcar (cdar groups-alist) group-word-count)
+                 (setq group-word-count 0)
+                 (push (nconc (list index group-word-count)) groups-alist))
+               (if (= index str-last-index)
+                   (setcar (cdar groups-alist) group-word-count)
+                 (setq last-char char))))
+    (let* ((group-count (length groups-alist))
+           (separator-count (1- group-count)))
+      ;; ++++ slash group-count penalty
+      (unless (zerop separator-count)
+        (flx-inc-vec scores (* -2 group-count)))
+      ;; score each group further
+      (cl-loop for group in groups-alist
+            for index from separator-count downto 0
+            with last-group-limit = nil
+            with basepath-found = nil
+            do (let ((group-start (car group))
+                     (word-count (cadr group))
+                     ;; this is the number of effective word groups
+                     (words-length (length (cddr group)))
+                     basepath-p)
+                 (when (and (not (zerop words-length))
+                            (not basepath-found))
+                   (setq basepath-found t)
+                   (setq basepath-p t))
+                 (let (num)
+                   (setq num
+                         (if basepath-p
+                             (+ 35
+                                ;; ++++ basepath separator-count boosts
+                                (if (> separator-count 1)
+                                    (1- separator-count)
+                                  0)
+                                ;; ++++ basepath word count penalty
+                                (- word-count))
+                           ;; ++++ non-basepath penalties
+                           (if (= index 0)
+                               -3
+                             (+ -5 (1- index)))))
+                   (flx-inc-vec scores num (1+ group-start) last-group-limit))
+                 (cl-loop for word in (cddr group)
+                       for word-index from (1- words-length) downto 0
+                       with last-word = (or last-group-limit
+                                            str-len)
+                       do (progn
+                            (cl-incf (aref scores word)
+                                  ;; ++++  beg word bonus AND
+                                  85)
+                            (cl-loop for index from word below last-word
+                                  for char-i from 0
+                                  do (cl-incf (aref scores index)
+                                           (-
+                                            ;; ++++ word order penalty
+                                            (* -3 word-index)
+                                            ;; ++++ char order penalty
+                                            char-i)))
+                            (setq last-word word)))
+                 (setq last-group-limit (1+ group-start)))))
+    scores))
+
+(defun flx-get-heatmap-file (filename)
+  "Return heatmap vector for filename."
+  (flx-get-heatmap-str filename ?/))
+
+
+(defsubst flx-bigger-sublist (sorted-list val)
+  "return sublist bigger than VAL from sorted SORTED-LIST
+
+  if VAL is nil, return entire list."
+  (if val
+      (cl-loop for sub on sorted-list
+            do (when (> (car sub) val)
+                 (cl-return sub)))
+      sorted-list))
+
+(defun flx-get-matches (hash query &optional greater-than q-index)
+  "Return list of all unique indexes into str where query can match.
+
+That is all character sequences of query that occur in str are returned.
+
+HASH accept as the cached analysis of str.
+sstr
+e.g. (\"aab\" \"ab\") returns
+       '((0 2) (1 2)
+"
+
+  (setq q-index (or q-index 0))
+  (let* ((q-char (aref query q-index))
+         (indexes (flx-bigger-sublist
+                   (gethash q-char hash) greater-than)))
+    (if (< q-index (1- (length query)))
+        (apply                        ; `mapcan'
+         'nconc
+         (mapcar
+          (lambda (index)
+            (let ((next-matches-for-rest (flx-get-matches hash query  index (1+ q-index))))
+              (when next-matches-for-rest
+                (mapcar (lambda (match)
+                          (cons index match))
+                        next-matches-for-rest))))
+          indexes))
+      (mapcar 'list indexes))))
+
+(defun flx-make-filename-cache ()
+  "Return cache hashtable appropraite for storeing filenames."
+  (flx-make-string-cache 'flx-get-heatmap-file))
+
+(defun flx-make-string-cache (&optional heat-func)
+  "Return cache hashtable appropraite for storeing strings."
+  (let ((hash (make-hash-table :test 'equal
+                               :size 4096)))
+    (puthash 'heatmap-func (or heat-func 'flx-get-heatmap-str) hash)
+    hash))
+
+(defun flx-process-cache (str cache)
+  "Get calculated heatmap from cache, add it if necessary."
+  (let ((res (when cache
+               (gethash str cache))))
+    (or res
+        (progn
+          (setq res (flx-get-hash-for-string
+                     str
+                     (or (and cache (gethash 'heatmap-func cache))
+                         'flx-get-heatmap-str)))
+          (when cache
+            (puthash str res cache))
+          res))))
+
+
+(defun flx-score (str query &optional cache)
+  "return best score matching QUERY against STR"
+  (unless (or (zerop (length query))
+              (zerop (length str)))
+    (let* ((info-hash (flx-process-cache str cache))
+           (heatmap (gethash 'heatmap info-hash))
+           (matches (flx-get-matches info-hash query))
+           (query-length (length query))
+           (full-match-boost (and (< query-length 5)
+                                  (> query-length 1)))
+           (best-score nil))
+      (mapc (lambda (match-positions)
+              (let ((score (if (and
+                                full-match-boost
+                                (= (length match-positions)
+                                   (length str)))
+                               10000
+                             0))
+                    (contiguous-count 0)
+                    last-match)
+                (cl-loop for index in match-positions
+                      do (progn
+                           (if (and last-match
+                                    (= (1+ last-match) index))
+                               (cl-incf contiguous-count)
+                             (setq contiguous-count 0))
+                           (cl-incf score (aref heatmap index))
+                           (when (> contiguous-count 0)
+                             (cl-incf score (+ 45 (* 15 (min contiguous-count 4)))))
+                           (setq last-match index)))
+                (if (or (null best-score)
+                        (> score (car best-score)))
+                    (setq best-score (cons score match-positions)))))
+            matches)
+      best-score)))
+
+
+(defun flx-propertize (obj score &optional add-score)
+  "Return propertized copy of obj according to score.
+
+SCORE of nil means to clear the properties."
+  (let ((block-started (cadr score))
+        (last-char nil)
+        (str (if (consp obj)
+                 (substring-no-properties (car obj))
+               (substring-no-properties obj))))
+
+    (unless (null score)
+      (cl-loop for char in (cdr score)
+            do (progn
+                 (when (and last-char
+                            (not (= (1+ last-char) char)))
+                   (put-text-property block-started  (1+ last-char) 'face 'flx-highlight-face str)
+                   (setq block-started char))
+                 (setq last-char char)))
+      (put-text-property block-started  (1+ last-char) 'face 'flx-highlight-face str)
+      (when add-score
+        (setq str (format "%s [%s]" str (car score)))))
+    (if (consp obj)
+        (cons str (cdr obj))
+      str)))
+
+
+
+(defvar flx-file-cache nil
+  "Cached heatmap info about strings.")
+
+;;; reset value on every file load.
+(setq flx-file-cache (flx-make-filename-cache))
+
+(defvar flx-strings-cache nil
+  "Cached heatmap info about filenames.")
+
+;;; reset value on every file load.
+(setq flx-strings-cache (flx-make-string-cache))
+
+
+(provide 'flx)
+
+;;; flx.el ends here