diff --git a/.gitignore b/.gitignore
index 2fe01e92..5c34475b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ eproject.lst
 *.elc
 .smex-items
 places
-backups
\ No newline at end of file
+backups
+eshell
+url
\ No newline at end of file
diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents
index 1d7e1990..936c4548 100644
--- a/elpa/archives/gnu/archive-contents
+++ b/elpa/archives/gnu/archive-contents
@@ -18,7 +18,7 @@
 	      [(0 4 1)
 	       nil "Major mode for CoffeeScript files" tar])
  (company .
-	  [(0 6 2)
+	  [(0 6 7)
 	   nil "Modular in-buffer completion framework" tar])
  (csv-mode .
 	   [(1 1)
@@ -47,6 +47,9 @@
  (eldoc-eval .
 	     [(0 1)
 	      nil "Enable eldoc support when minibuffer is in use." single])
+ (enwc .
+       [(1 0)
+	nil "The Emacs Network Client" tar])
  (epoch-view .
 	     [(0 0 1)
 	      nil "Minor mode to visualize epoch timestamps" single])
@@ -54,7 +57,7 @@
 			[(1 1)
 			 nil "Parse and browse f90 interfaces" single])
  (ggtags .
-	 [(0 6 2)
+	 [(0 6 3)
 	  nil "GNU Global source code tagging system" single])
  (heap .
        [(0 3)
@@ -70,9 +73,12 @@
 	    ((emacs
 	      (24 1)))
 	    "Improved JavaScript editing mode" single])
+ (jumpc .
+	[(2 0)
+	 nil "jump to previous insertion points" single])
  (lex .
-      [(1 0)
-       nil "Lexical analyser construction" single])
+      [(1 1)
+       nil "Lexical analyser construction" tar])
  (lmc .
       [(1 1)
        nil "Little Man Computer in Elisp" single])
@@ -107,7 +113,7 @@
 	 [(0 8)
 	  nil "OAuth 2.0 Authorization Protocol" single])
  (org .
-      [(20130318)
+      [(20130408)
        nil "Outline-based notes management and organizer" tar])
  (quarter-plane .
 		[(0 1)
diff --git a/elpa/archives/marmalade/archive-contents b/elpa/archives/marmalade/archive-contents
index 89476619..5541477c 100644
--- a/elpa/archives/marmalade/archive-contents
+++ b/elpa/archives/marmalade/archive-contents
@@ -1 +1 @@
-(1(paredit .[(22)()"minor mode for editing parentheses  -*- Mode: Emacs-Lisp -*-"single])(sass-mode .[(3 0 14)((haml-mode (3 0 14)))"Major mode for editing Sass files"single])(perspective .[(1 9)()"switch between named \"perspectives\" of the editor"single])(slime .[(20100404 1)()"Superior Lisp Interaction Mode for Emacs"single])(slime-repl .[(20100404)((slime (20100404)))"Read-Eval-Print Loop written in Emacs Lisp"single])(scpaste .[(0 6)((htmlize (1 39)))"Paste to the web via scp."single])(idle-highlight .[(1 0)()"highlight the word the point is on"single])(magit .[(1 2 0)()"Control Git from Emacs."tar])(durendal .[(0 2)((clojure-mode (1 7)) (slime (20100404)) (paredit (22)))"A bucket of tricks for Clojure and Slime."single])(htmlize .[(1 39)()"Convert buffer text and decorations to HTML."single])(furl .[(0 0 2)()"Friendly URL retrieval"single])(marmalade .[(0 0 4)((furl (0 0 2)))"Elisp interface for the Emacs Lisp package server."single])(yari .[(0 5)()"Yet Another RI interface for Emacs"single])(enclose .[(0 0 2)()"Enclose cursor within punctuation pairs"single])(html-script-src .[(0 0 2)()"Insert <script src=\"..\"> for popular JavaScript libraries"single])(mactag .[(0 0 1)()"Mode for automatically handle multiple tags files with Mactag rubygem"single])(undo-tree .[(0 3 1)()"Treat undo history as a tree"single])(diminish .[(0 44)()"Diminished modes are minor modes with no modeline display"single])(notify .[(2010 8 20)()"notification front-end"single])(keywiz .[(1 4)()"Emacs key sequence quiz"single])(descbinds-anything .[(1 5)((anything (1 287)))"Yet Another `describe-bindings' with `anything'."single])(autopair .[(0 3)()"Automagically pair braces and quotes like TextMate"single])(highlight-parentheses .[(1 0 1)()"highlight surrounding parentheses"single])(anything .[(1 287)()"open anything / QuickSilver-like candidate-selection framework"single])(anything-config .[(0 4 1)()"Predefined configurations for `anything.el'"single])(anything-match-plugin .[(1 27)()"Humane match plug-in for anything"single])(closure-template-html-mode .[(0 1)()"highlighting for google closure templates"single])(gist .[(1 1 1)((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0)))"Emacs integration for gist.github.com"single])(highlight-symbol .[(1 1)()"automatic and manual symbol highlighting"single])(color-theme-twilight .[(0 1)()"Twilight Colour Theme for Emacs."single])(browse-kill-ring .[(1 3 1)()"interactively insert items from kill-ring -*- coding: utf-8 -*-"single])(buffer-move .[(0 4)()"swap buffers between windows"single])(dired-single .[(1 7 0)()"reuse the current dired buffer to visit another directory"single])(php-mode .[(1 5 0)()"major mode for editing PHP code"single])(c-eldoc .[(0 5)()"helpful description of the arguments to C functions"single])(full-ack .[(0 2 3)()"a front-end for ack"single])(find-file-in-project .[(3 2)()"Find files in a project quickly."single])(project .[(1 0)()"Keep track of the current project"single])(goto-last-change .[(1 2)()"Move point through buffer-undo-list positions -*-unibyte: t; coding: iso-8859-1;-*-"single])(http-twiddle .[(1 0)()"send & twiddle & resend HTTP requests"single])(mac-key-mode .[(2010 1 3)()"provide mac-style key bindings on Carbon Emacs"single])(flymake-cursor .[(1 0 2)((flymake (0 3)))"Show flymake messages in the minibuffer after delay"tar])(multi-term .[(0 8 8)()"Managing multiple terminal buffers in Emacs."single])(parenface .[(1 1)()"Provide a face for parens in lisp modes."single])(redo+ .[(1 15)()"Redo/undo system for Emacs"single])(gnuplot .[(0 6 0)()"drive gnuplot from within emacs"single])(speck .[(2010 5 25)()"minor mode for spell checking"single])(hexrgb .[(21 0)()"Functions to manipulate colors, including RGB hex strings."single])(icomplete+ .[(21 0)()"Extensions to `icomplete.el'."single])(lacarte .[(22 0)()"Execute menu items as commands, with completion."single])(synonyms .[(1 0)()"Look up synonyms for a word or phrase in a thesaurus."single])(ecb .[(2 40)()"Emacs Code Browser"tar])(predictive .[(0 19 5)()"Predictive Mode (Contains Dependencies)"tar])(rw-hunspell .[(0 2)()"special functions for Hunspell in ispell.el"single])(rw-ispell .[(0 1)()"additional functions for ispell.el"single])(rw-language-and-country-codes .[(0 1)()"Language & Country Codes"single])(yas-jit .[(0 8 3)()"Loads Yasnippets on demand (makes start up faster)"single])(ntcmd .[(1 0)()"major mode for editing cmd scripts"single])(org-table-comment .[(0 2)()" Org table comment modes."single])(anything-extension .[(0 2)()"Extension functions for anything.el"single])(powershell .[(0 2 1)()"run powershell as an inferior shell in emacs"single])(cdlatex .[(4 0)()"Fast input methods for LaTeX environments and math"single])(anything-R .[(0 1 2010)()"anything-sources and some utilities for GNU R."single])(anything-el-swank-fuzzy .[(0 1 2009)()"anything-sources for el-swank-fuzzy.el"single])(anything-ipython .[(0 1 2009)()" Ipython anything"single])(color-file-completion .[(1 0 1)()"add colors to file completion"single])(color-theme-emacs-revert-theme .[(0 1)()"Color-theme revert to emacs colors"single])(anything-complete .[(1 86)()"completion with anything"single])(anything-obsolete .[(0 1)()"obsolete functions of anything"single])(ipython .[(2927)()"Adds support for IPython to python-mode.el"single])(el-swank-fuzzy .[(0 1)()"fuzzy symbol completion."single])(fold-dwim .[(1 2)()"Unified user interface for Emacs folding modes"single])(fold-dwim-org .[(0 2)((fold-dwim (1 2)))"Fold DWIM bound to org key-strokes."single])(fuzzy-match .[(1 4)()"fuzzy matching"single])(w32-browser .[(21 0)()"Run Windows application associated with a file."single])(crosshairs .[(22 0)()"Highlight the current line and column."single])(csv-mode .[(1 50)()"major mode for editing comma-separated value files"single])(vline .[(1 10)()"show vertical line (column highlighting) mode."single])(hl-line+ .[(22 0)()"Extensions to hl-line.el."single])(col-highlight .[(22 0)((vline (1 10)))"Highlight the current column."single])(color-theme-vim-insert-mode .[(0 1)()"Color theme VIM insert mode"single])(cursor-chg .[(20 1)()"Change cursor dynamically, depending on the context."single])(cygwin-mount .[(2001)()"Teach EMACS about cygwin styles and mount points."single])(header2 .[(21 0)()"Support for creation and update of file headers."single])(lib-requires .[(21 0)()"Commands to list Emacs Lisp library dependencies."single])(linum-off .[(0 1)()"Provides an interface for turning line-numbering off"single])(pos-tip .[(0 4 5)()"Show tooltip at point -*- coding: utf-8 -*-"single])(key-choices .[(0 201)((color-theme-vim-insert-mode (0 1)) (color-theme-emacs-revert-theme (0 1)))"Key Choices -- Also Viper has different colors in different modes"single])(tabbar .[(2 0 1)()"Display a tab bar in the header line  -*-no-byte-compile: t; -*-"single])(elein .[(0 2 2)()"running leiningen commands from emacs"single])(sumatra-forward .[(2008 10 8)()"Provides Sumatra Forward search"single])(org-outlook .[(0 3)()"Outlook org"single])(slime-fuzzy .[(20100404)((slime (20100404)))"Fuzzy symbol completion for Slime"single])(color-theme-complexity .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(starter-kit .[(2 0 3)((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 1)) (ido-ubiquitous (0 3)) (magit (0 8 1)))"Saner defaults and goodies."tar])(starter-kit-lisp .[(2 0 3)((starter-kit (2 0 2)) (elisp-slime-nav (0 1)))"Saner defaults and goodies for lisp languages"single])(starter-kit-js .[(2 0 1)((starter-kit (2 0 1)))"Saner defaults and goodies for Javascript"single])(starter-kit-ruby .[(2 0 3)((inf-ruby (2 2 3)) (starter-kit (2 0 1)))"Saner defaults and goodies for Ruby"single])(geben .[(0 26)()"A remote debugging environment for Emacs."tar])(maxframe .[(0 5 1)()"maximize the emacs frame based on display size"single])(mode-compile .[(2 29)()" Smart command for compiling files"single])(swank-cdt .[(1 0 1)()"swank-cdt helper functions"single])(find-file-in-git-repo .[(0 1 2)()"Utility to find files in a git repo"single])(idle-highlight-mode .[(1 1 2)()"highlight the word the point is on"single])(smex .[(2 0)()"M-x interface with Ido-style fuzzy matching."single])(protobuf-mode .[(0 3)()"major mode for editing protocol buffers."single])(haskell-mode .[(2 8 0)()"Haskell editing mode"tar])(znc .[(0 0 2)((cl (2 2)) (erc (5 3)))"ZNC + ERC "single])(slime-clj .[(0 1 5)()"slime extensions for swank-clj"single])(go-mode .[(12869)()"Major mode for the Go programming language."tar])(scala-mode .[(0 0 2)()"Scala major mode"tar])(json .[(1 2)()"JavaScript Object Notation parser / generator"single])(magit-simple-keys .[(1 0 0)((magit (1 0 0)))"simple keybindings for Magit"single])(rainbow-delimiters .[(1 3 4)()"Highlight nested parens, brackets, braces a different color at each depth."single])(nyan-mode .[(0 1)()"Nyan Cat shows position in current buffer in mode-line."single])(anything-git .[(1 1 1)()"Show git files in anything"single])(xml-gen .[(0 4)()"A DSL for generating XML."single])(jump .[(2 2)((findr (0 7)) (inflections (1 1)))"build functions which contextually jump between files"single])(dotassoc .[(0 0 1)()"dot access embedded alists"single])(rcirc-ssh .[(0 0 7)((kv (0 0 3)))"do irc over ssh sessions -*- lexical-binding: t -*-"single])(weather-metno .[(20121023)()"Weather data from met.no in Emacs"tar])(systemtap-mode .[(0 2)()"A mode for SystemTap"single])(mocker .[(0 2 4)((eieio (1 3)) (el-x (0 2 1)))"mocking framework for emacs"single])(kpm-list .[(1 0)()"An emacs buffer list that tries to intelligently group together buffers."single])(weechat .[(0 1)((s (1 3 1)))"Chat via WeeChat's relay protocol in Emacs"tar])(switch-window .[(0 9)()"A *visual* way to choose a window to switch to"single])(yaml-mode .[(0 0 7)()"Major mode for editing YAML files"single])(prolog .[(1 22)()"major mode for editing and running Prolog (and Mercury) code"single])(graphviz-dot-mode .[(0 3 7)()"Mode for the dot-language used by graphviz (att)."single])(perlcritic .[(1 10)()"minor mode for Perl::Critic integration"single])(gh .[(0 7 2)((eieio (1 3)) (pcache (0 2 3)) (logito (0 1)))"A GitHub library for Emacs"tar])(vala-mode .[(0 1)()"Vala mode derived mode"single])(alpha .[(1 0)()"increase frame transparency"single])(color-theme-ir-black .[(1 0 1)((color-theme (6 6 1)))"pastel color theme "single])(calfw-gcal .[(0 0 1)()"edit Google calendar for calfw.el."single])(python .[(20120402)()"Python's flying circus support for Emacs"single])(htmlfontify .[(0 21)()"htmlise a buffer/source tree with optional hyperlinks"single])(oddmuse .[(20090222)()"edit pages on an Oddmuse wiki"single])(wgrep .[(2 1 3)()"Writable grep buffer and apply the changes to files"single])(langtool .[(1 2 0)()"Grammer check utility using LanguageTool"single])(gather .[(1 0 0)()"Gather string in buffer."single])(starter-kit-bindings .[(2 0 2)((starter-kit (2 0 2)))"Saner defaults and goodies: bindings"single])(hl-sentence .[(2)()"highlight a sentence based on customizable face"single])(color-theme-eclipse .[(0 0 2)((color-theme (6 6 1)))"Eclipse color theme for GNU Emacs."single])(bm .[(1 53)()"Visible bookmarks in buffer."single])(color-theme-tangotango .[(0 0 2)((color-theme (6 6 1)))"Tango Palette color theme for Emacs."single])(color-theme-railscasts .[(0 0 2)((color-theme (6 6 1)))"Railscasts color theme for GNU Emacs."single])(color-theme-tango .[(0 0 2)((color-theme (6 6 1)))"Tango palette color theme for GNU Emacs."single])(color-theme-github .[(0 0 3)((color-theme (6 6 1)))"Github color theme for GNU Emacs."single])(color-theme-dpaste .[(0 0 1)((color-theme (6 6 1)))"Dpaste color theme for GNU Emacs."single])(nose .[(0 1 1)()"Easy Python test running in Emacs"single])(dpaste .[(0 2)()"Emacs integration for dpaste.com"single])(offlineimap .[(0 1)()"Run OfflineIMAP from Emacs"single])(scss-mode .[(0 5 0)()"Major mode for editing SCSS files"single])(highlight-indentation .[(0 5 0)()"Function for highlighting indentation"single])(feature-mode .[(0 4)()"Major mode for editing Gherkin (i.e. Cucumber) user stories"tar])(dired-details .[(1 3 1)()"make file details hide-able in dired"single])(dired-details+ .[(1 0)()"Enhancements to library `dired-details+.el'."single])(python-pep8 .[(1 1)()"minor mode for running `pep8'"single])(python-pylint .[(1 1)()"minor mode for running `pylint'"single])(workgroups .[(0 2 0)()"workgroups for windows (for Emacs)"single])(closure-lint-mode .[(0 1)()"minor mode for the Closure Linter"single])(httpd .[(1 0 1)()"HTTP/1.0 web server for emacs"single])(pep8 .[(1 2)()"run the python pep8 checker putting hits in a grep buffer"single])(cppcheck .[(1 0)()"run cppcheck putting hits in a grep buffer"single])(grin .[(1 0)()"run grin and grind (python replacements for grep and find) putting hits in a grep buffer"single])(pyflakes .[(1 0)()"run the python pyflakes checker putting hits in a grep buffer"single])(pylint .[(1 0)()"run the python pylint checker putting hits in a grep buffer"single])(fastnav .[(1 0 7)()"Fast navigation and editing routines."single])(confluence .[(1 6)((xml-rpc (1 6 7)))"Confluence major mode"tar])(tuareg .[(2 0 5)((caml (3 12 0 1)))"OCaml mode for Emacs."tar])(pp-c-l .[(1 0)()"Display Control-l characters in a pretty way"single])(js-comint .[(0 0 1)()"Run javascript in an inferior process window."single])(magithub .[(0 2)((magit (0 8)) (json (1 2)))"Magit extensions for using GitHub"single])(cmake-mode .[(20110824)()"major-mode for editing CMake sources"single])(smart-operator .[(1 9 20110812)()"Insert operators with surrounding spaces smartly"single])(ibuffer-vc .[(0 5)()"Group ibuffer's list by VC project, or show VC status"single])(elisp-slime-nav .[(0 3)()"Make M-. and M-, work in elisp like they do in slime"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 .[(1 6)()"Use ido (nearly) everywhere."single])(bigint .[(1 0 0)()"A simple bigint package for emacs"single])(dizzee .[(0 1 1)()"A more pleasant way to manage your project's subprocesses in Emacs."tar])(color-theme-dg .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(gimme .[(2 1)()"The XMMS2 interface we all love! Check out http://gimmeplayer.org for more info."tar])(deft .[(0 3)()"quickly browse, filter, and edit plain text notes"single])(pony-mode .[(0 2)()"Minor mode for working with Django Projects"tar])(clojurescript-mode .[(0 5)()"Major mode for ClojureScript code"single])(fsvn .[(0 9 13)()"Another frontend of subversion."tar])(starter-kit-eshell .[(2 0 3)()"Saner defaults and goodies: eshell tweaks"single])(yasnippet-bundle .[(0 6 1)()"Yet another snippet extension (Auto compiled bundle)"single])(yasnippet .[(0 6 1)()"Yasnippet template engine"tar])(ido-yes-or-no .[(1 1)((ido (0)))"Use Ido to answer yes-or-no questions"single])(caml .[(3 12 0 1)()"OCaml code editing commands for Emacs"tar])(dtrt-indent .[(0 2 0)()"Adapt to foreign indentation offsets"single])(windsize .[(0 1)()"Simple, intuitive window resizing"single])(textmate .[(5)()"TextMate minor mode for Emacs"single])(xml-rpc .[(1 6 8)()"An elisp implementation of clientside XML-RPC"single])(coffee-mode .[(0 3 0)()"Major mode to edit CoffeeScript files in Emacs"single])(sr-speedbar .[(0 1 8)()"Same frame speedbar"single])(desktop .[(0 1)()"save partial status of Emacs when killed"single])(evil-numbers .[(0 3)()"increment/decrement numbers like in vim"single])(lolcode-mode .[(0 2)()"Major mode for editing LOLCODE"single])(dedicated .[(1 0 0)()"A very simple minor mode for dedicated buffers"single])(csharp-mode .[(0 8 6)()"C# mode derived mode"single])(color-theme-actress .[(0 2 2)((color-theme (6 6 1)))"A dark color theme for GNU Emacs."single])(ghc .[(1 10 2)((haskell-mode (2 8 0)))"Happy Haskell programming on Emacs"tar])(org-email .[(0 6)()"use org for an email database -*- lexical-binding: t -*-"single])(ahg .[(0 99)()"Alberto's Emacs interface for Mercurial (Hg)"single])(lua-mode .[(20110428)()"a major-mode for editing Lua scripts"single])(ac-slime .[(0 3)()"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])(ac-ja .[(0 0 1)()"auto-complete-mode source for Japanese "single])(rcirc-notify .[(0 6)()"libnotify popups"single])(jira .[(0 3 3)()"Connect to JIRA issue tracking software"single])(color-theme-blackboard .[(0 0 2)((color-theme (6 6 1)))"Blackboard Colour Theme for Emacs."single])(color-theme-wombat .[(0 0 1)((color-theme (6 6 1)))"The wombat color theme for Emacs."single])(color-theme-wombat+ .[(0 0 2)((color-theme (6 6 1)))"wombat with improvements and many more faces"single])(color-theme-active .[(0 0 1)((color-theme (6 6 1)))"Active theme inspired by jEdit theme of the same name"single])(color-theme-colorful-obsolescence .[(0 0 1)((color-theme (6 6 1)))"Colorful Obsolescence theme designed for partially transparent windows"single])(apache-mode .[(2 0)()"major mode for editing Apache configuration files"single])(highline .[(7 2 2)()"minor mode to highlight current line in buffer"single])(mic-paren .[(3 8)()"advanced highlighting of matching parentheses"single])(pytest .[(0 2 1)()"Easy Python test running in Emacs"single])(wikidoc .[(0 8 1)()"use elisp doc strings to make other documentation"single])(regex-tool .[(1 2)()"A regular expression evaluation tool for programmers"single])(tabkey2 .[(1 40)()"Use second tab key pressed for what you want"single])(ioccur .[(0 2)()"Incremental occur."single])(javadoc-help .[(1 0)()"Javadoc-Help.  Look up Java class on online javadocs in browser."single])(macro-math .[(1 0)()"in-buffer mathematical operations"single])(winpoint .[(1 4)()"Remember buffer positions per-window, not per buffer"single])(scheme-complete .[(0 8 2)()"Smart tab completion for Emacs"single])(ruby-compilation .[(0 12)((inf-ruby (2 2 1)))"run a ruby process in a compilation buffer"single])(flymake-jshint .[(1 0)()"making flymake work with JSHint"single])(doc-mode .[(0 2)()"convenient editing of in-code documentation"single])(gccsense .[(0 2)()"GCCSense client for Emacs"single])(p4 .[(11 0)()"Perforce-Emacs Integration Library"single])(pager .[(2 0)()"windows-scroll commands"single])(pastebin .[(0 1)()"A simple interface to the www.pastebin.com webservice"single])(cache .[(0 1)()"implementation of a hash table whose key-value pairs expire"single])(command-frequency .[(1 1)()"Track command frequencies"single])(guess-offset .[(0 1 1)()"Automatically determine c-basic-offset"single])(loccur .[(1 1 1)()"Perform an occur-like folding in current buffer"single])(recursive-narrow .[(1 0)()"narrow-to-region that operates recursively"single])(member-function .[(0 3 1)()"expand member functions for C++ classes"single])(window-number .[(1 0 1)()"Jump to a window by number"single])(gtags .[(3 3)()"gtags facility for Emacs"single])(pymacs .[(0 25)()"Interface between Emacs Lisp and Python"single])(pysmell .[(0 7 2)()"Complete python code using heuristic static analysis"single])(eieio .[(1 4)()"Enhanced Implememntation of Emacs Interpreted Objects"tar])(rudel .[(0 3)((eieio (1 4)))"A collaborative editing framework for Emacs"tar])(jabber .[(0 8 90)()"A Jabber client for Emacs."tar])(citrus-mode .[(0 0 2)()"Major mode for editing Citrus files"single])(lineno .[(0 1)()"Alternate mode to display line numbers."single])(emacsd-tile .[(0 1)()"tiling windows for emacs"single])(iy-go-to-char .[(1 0)()"Go to next CHAR which is similar to \"f\" in vim"single])(jenkins-watch .[(1 2)()"Watch continuous integration build status -*- indent-tabs-mode: t; tab-width: 8 -*-"single])(peepopen .[(0 1 0)()"Graphical file chooser for Emacs on Mac OS X."single])(levenshtein .[(1 0)()"Edit distance between two strings."single])(gopher .[(0 0 2)()"easily access and navigate Gopher servers"single])(clojure-project-mode .[(1 0)((project-mode (1 0)))"Extends project-mode for Clojure projects"single])(ruby-block .[(0 0 11)()"highlight matching block"single])(pretty-lambdada .[(22 0)()"Show the word `lambda' as the Greek letter."single])(rect-mark .[(1 4)()"Mark a rectangle of text with highlighting."single])(evernote-mode .[(0 41)()"Evernote client for Emacs"tar])(jaunte .[(0 0 0)()"Emacs Hit a Hint"single])(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])(clips-mode .[(0 6)()"Major mode for editing CLIPS code and REPL"tar])(n3-mode .[(20071215)()"mode for Notation 3"single])(wcheck-mode .[(2012 1 29)()"A general interface for text checkers"single])(suomalainen-kalenteri .[(2011 11 20)()"Finnish holidays for Emacs calendar."single])(org2blog .[(0 5)((org (7 7)) (xml-rpc (1 6 8)))"Blog from Org mode to wordpress"tar])(pcache .[(0 2 3)((eieio (1 3)))"persistent caching for Emacs"single])(idle-require .[(1 0)()"load elisp libraries while Emacs is idle"single])(find-things-fast .[(20111123)()"An emacs mode to find things fast and move around in a project quickly"tar])(color-theme-gruber-darker .[(1)((color-theme (6 6 1)))"Gruber Darker color theme for Emacs by Jason Blevins"single])(dna-mode .[(1 44)()"a major mode for editing dna sequences"single])(perl-myvar .[(1 25)()"Declare lexicaly scoped vars as my()."single])(nlet .[(1 10)()"schemes 'named let' for emacs."single])(ssh-config-mode .[(1 13)()"Mode for fontification of ~/.ssh/config"single])(win-switch .[(1 0 8)()"fast, dynamic bindings for window-switching/resizing"single])(j-mode .[(0 3)()"Major mode for editing J programs"single])(nginx-mode .[(1 1)()"major mode for editing nginx config files"single])(vimgolf .[(0 9 2)()"VimGolf interface for the One True Editor"single])(flymake-csslint .[(1 1 0)((flymake (0 3)))"making flymake work with CSSLint"tar])(typing .[(1 1 4)()"A game for fast typers, inspired by The Typing Of The Dead."single])(zenburn-theme .[(1 8)()"A low contrast color theme for Emacs."single])(solarized-theme .[(0 5 0)()"The Solarized color theme, ported to Emacs."tar])(etags-select .[(1 13)()"Select from multiple tags"single])(etags-table .[(1 1)()"Set tags table(s) based on current file"single])(tintin-mode .[(1 0 0)()"Mayor mode for editing tintin++ scripts"single])(org-cua-dwim .[(0 5)()"Org-mode and Cua mode compatibility layer"single])(otp .[(1 0)()"a one-time password creator"single])(bookmark+ .[(20111214)()"Bookmark Plus"tar])(sentence-highlight .[(0 1)()"highlight the current sentence"single])(smartrep .[(0 0 3)()"Support sequential operation which omitted prefix keys."single])(tabula-rasa-mode .[(0 1 0)()"Distraction free writing mode"single])(abl-mode .[(0 9 0)()"Python TDD minor mode"single])(groovy-mode .[(20110609)()"Groovy mode derived mode"single])(grails-mode .[(0 1)()"minor-mode that adds some Grails project management to a grails project"single])(inf-groovy .[(2 0)()"minor-mode that adds some Grails project management to a grails project"single])(tidy .[(2 12)()"Interface to the HTML Tidy program"single])(httpcode .[(0 1)()"explains the meaning of an HTTP status code"single])(d-mode .[(2 0 4)()"D Programming Language mode for (X)Emacs"tar])(git-commit .[(0 1)()"Major mode for editing git commit messages"single])(color-theme-library .[(0 0 10)((color-theme (6 6 1)))"The real color theme functions"single])(sauron .[(0 8)()"Track (erc/org/dbus/...) events and react to them."tar])(quickrun .[(1 5)()"Run commands quickly"single])(rcirc-ucomplete .[(1 0 1)()"Unambiguous non-cycling completion for rcirc"single])(cl-format .[(1 0)()"CL format routine."tar])(color-theme-cobalt .[(0 0 2)((color-theme (6 6 1)))"Cobalt Color Theme for Emacs"single])(refheap .[(0 0 3)()"A library for pasting to https://refheap.com"single])(ctags-update .[(0 1 2)()"auto update TAGS in parent directory using exuberant-ctags -*- coding:utf-8 -*-"single])(peep-open .[(0 0 2)()"PeepOpen plugin for emacs."single])(org-mime .[(20120112)()"org html export for text/html MIME emails"single])(eh-basic .[(0 0 2)((starter-kit (2 0 2)) (browse-kill-ring (1 3 1)))"tuamshu's emacs basic configure"tar])(eh-gnus .[(0 0 6)()"tuamshu's gnus configure"tar])(eh-functions .[(0 0 1)((starter-kit (2 0 2)))"tuamshu's emacs functions"tar])(eh-keybindings .[(0 0 1)((eh-functions (0 0 1)) (starter-kit-bindings (2 0 2)))"tuamshu's emacs keybindings"tar])(magit-gh-pulls .[(0 3)((gh (0 4 3)) (magit (1 1 0)))"GitHub pull requests extension for Magit"single])(highlight-80+ .[(1 0)()"highlight characters beyond column 80"single])(jump-char .[(0 1)()"navigation by char"single])(color-theme-molokai .[(0 1)()"Molokai color theme by Lloyd"single])(pointback .[(0 2)()"Restore window points when returning to buffers"single])(uci-mode .[(1 0 0)()"Major mode for UCI configuration files"single])(erlang .[(2 4 1)()"Major modes for editing and running Erlang"single])(thumb-through .[(0 3)()"Plain text reader of HTML documents"single])(unbound .[(0 1)()"find convenient unbound keystrokes"single])(ido-better-flex .[(0 0 2)()"A better flex (fuzzy) algorithm for Ido."single])(popup .[(0 5)()"Visual Popup User Interface"single])(fancy-mode .[(0 1)()"Major mode for programming with the Fancy language."single])(haxe-mode .[(0 3 1)()"An Emacs major mode for haXe"single])(expand-region .[(0 8 0)()"Increase selected region by semantic units."tar])(ack-and-a-half .[(1 1 3)()"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])(linear-undo .[(5 2)()"Intuitive undo/redo."single])(smooth-scroll .[(1 2)()"Minor mode for smooth scrolling and in-place scrolling."single])(xlicense .[(1 1)()"Insert pre-defined license text"tar])(flymake-d .[(0 1)()"A flymake handler for d-mode files"single])(flymake-tuareg .[(0 1)()"A flymake handler for tuareg-mode files"tar])(track-closed-files .[(0 1)()"Keep track of recently closed files"single])(color-theme-monokai .[(0 0 5)((color-theme (6 5 5)))"Monokai Color Theme for Emacs."single])(drupal-mode .[(0 2 0)((php-mode (1 5 0)))"Advanced minor mode for Drupal development"tar])(screen-lines .[(0 55)()"a minor mode for screen-line-based point motion"single])(ctypes .[(1 2)()"Enhanced Font lock support for custom defined types."single])(moinmoin-mode .[(1 0)((screen-lines (0 55)))"a major mode to edit MoinMoin wiki pages"single])(pc-mode .[(0 1)()"major mode for editing PC code,"single])(mediawiki .[(2 2 3)()"mediawiki frontend"single])(workspaces .[(0 1)()"Workspaces for Emacsen "single])(pivotal-tracker .[(1 2 0)()"Interact with Pivotal Tracker through its API"single])(sublime .[(0 0 7)((coffee-mode (0 3 0)) (find-file-in-project (3 0)) (haml-mode (3 0 14)) (ido-ubiquitous (1 0)) (less-css-mode (0 6)) (magit (1 1 1)) (markdown-mode (1 8 1)) (monokai-theme (0 0 6)) (paredit (22)) (sass-mode (3 0 14)) (smex (1 1 2)) (yaml-mode (0 0 7)) (yasnippet (0 6 1)))"REQUIRES EMACS 24 - Sublime Text 2 Emulation for Emacs"tar])(logito .[(0 1)((eieio (1 3)))"logging library for Emacs"single])(jade-mode .[(0 1)()"Major mode for editing jade templates."single])(stylus-mode .[(0 1)()"Major mode for editing stylus templates."single])(sws-mode .[(0 1)()"SWS mode"single])(javap .[(8)()"Javap major mode"single])(javap-mode .[(9)()"Javap major mode"single])(anything-show-completion .[(20091119)()"Show selection in buffer for anything completion"single])(pastels-on-dark-theme .[(0 3)()"Pastels on Dark theme for Emacs 24"single])(color-theme-solarized .[(20120301)()"Solarized themes for Emacs"tar])(deferred .[(0 3 1)()"Simple asynchronous functions for emacs lisp"single])(concurrent .[(0 3 1)((deferred (0 3 1)))"Concurrent utility functions for emacs lisp"single])(epc .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)))"A RPC stack for the Emacs Lisp"single])(edbi .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)) (epc (0 1 1)))"Emacs Database Interface"tar])(color-theme .[(6 5 5)()"install color themes"single])(cacoo .[(2 1 2)((concurrent (0 3 1)))"Minor mode for Cacoo : http://cacoo.com"tar])(imgur .[(0 1)((anything (1 287)))"imgur client for Emacs"single])(tango-2-theme .[(1 0 0)()"Tango 2 color theme for GNU Emacs 24"single])(puppet-mode .[(0 2)()"A simple mode for editing puppet manifests"single])(po.foo .[(3 0 20)((haml-mode (3 0 20)))"Sass major mode"single])(po.elscreen .[(1 4 6)()" Screen for Emacsen(this is not original)"single])(po-elscreen .[(1 4 6)()" Screen for Emacsen(this is not original. original is http://www.morishima.net/~naoto/elscreen-en/?lang=en)"single])(quack .[(0 42)()"enhanced support for editing and running Scheme code"single])(dired+ .[(21 2)()"Extensions to Dired."single])(rspec-mode .[(1 6)((ruby-mode (1 0)))"Enhance ruby-mode for RSpec"single])(fakir .[(0 0 16)()"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 9)()"REQUIRES EMACS 24: Monokai Color Theme for Emacs."single])(fuzzy .[(0 1)()"Fuzzy Matching"single])(auto-complete .[(1 4)((popup (0 5)))"Auto Completion for GNU Emacs"tar])(bitlbee .[(1 0)()"Help get Bitlbee (http://www.bitlbee.org) up and running"single])(lorem-ipsum .[(0 1)()"Insert dummy pseudo Latin text."single])(typopunct .[(1 0)()"Automatic typographical punctuation marks"single])(twittering-mode .[(2 0 0)()"Major mode for Twitter"single])(flymake-phpcs .[(1 0 5)((flymake (0 3)))"Flymake handler for PHP to invoke PHP-CodeSniffer"tar])(flex-autopair .[(0 3)()"Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable."single])(color-theme-dawn-night .[(1 0)()"color theme of dawn and night."single])(weather .[(2012 3 27 2)()"Get weather reports via worldweatheronline.com"single])(flymake-perlcritic .[(1 0 3)((flymake (0 3)))"Flymake handler for Perl to invoke Perl::Critic"tar])(jsshell-bundle .[(2012 4 7)()"JSShell generated bundle"single])(rfringe .[(1 0 1)()"indicate relative locations in the fringe"single])(flyphpcs .[(1 0 1)()"Flymake for PHP via PHP-CodeSniffer"single])(defaultcontent .[(1 4)()"a templating tool. Fill new files with default content."single])(flymake-for-jslint-for-wsh .[(1 3 0)((flymake (0 3)))"use flymake with js code, on Windows"single])(tfs .[(0 2 7)()"MS Team Foundation Server commands for Emacs."single])(dropdown-list .[(1 45)()"Drop-down menu interface"single])(thesaurus .[(2012 4 7)()"replace a word with a synonym looked up in a web service."single])(fly-jshint-wsh .[(2 0 3)((flymake (0 3)))"use flymake with jshint on js code, on Windows"single])(watch-buffer .[(1 0 1)()"run a shell command when saving a buffer"single])(smarter-compile .[(2012 4 9)()"a smarter wrapper for `compile'"single])(hungry-delete .[(1 0)()"hungry delete minor mode"single])(align-cljlet .[(0 3)((clojure-mode (1 11 5)))"Space align various Clojure forms "single])(idomenu .[(0 1)()"imenu tag selection with ido"single])(drag-stuff .[(0 0 4)()"Drag stuff (lines, words, region, etc...) around"single])(w32-registry .[(2012 4 6)()"read the registry from elisp"single])(jsshell .[(2012 4 7)()"Run a javascript command interpreter in emacs on Windows."single])(shadchen .[(1 0)()"pattern matching for elisp"single])(cycbuf .[(0 5 0)()"Cycle buffers code by Martin Pohlack, inspired by"single])(yascroll .[(0 2 0)()"Yet Another Scroll Bar Mode"single])(anything-exuberant-ctags .[(0 1 2)()"Exuberant ctags anything.el interface"single])(ess .[(5 14)()"Edit and interact with statistical programs like R, S-Plus, SAS, Stata and JAGS"tar])(anything-git-goto .[(0 1 0)()"Quick listing of:"single])(twilight-theme .[(1 0 0)()"Twilight theme for GNU Emacs 24 (deftheme)"single])(jtags .[(0 97)()"enhanced tags functionality for Java development"single])(jtags-extras .[(0 3 0)()"jtags related functionality for Java development"single])(phantomjs .[(0 0 11)()"Control phantomjs from Emacs			"tar])(oz .[(16513)()"Major mode for editing Oz programs"tar])(load-theme-buffer-local .[(0 0 2)()"Install emacs24 color themes by buffer."single])(color-theme-buffer-local .[(0 0 2)()"Install color-themes by buffer."single])(elisp-depend .[(1 0 2)()"Parse depend libraries of elisp file."single])(key-chord .[(0 5 20080915)()"map pairs of simultaneously pressed keys to commands"single])(shell-here .[(1 1)()"Open a shell relative to the working directory"single])(symbols-mode .[(0 3)()"List symbols of object files"single])(handlebars-mode .[(1 3)()"A major mode for editing Handlebars files."single])(dircmp .[(1)()"Compare and sync directories."single])(ascii .[(3 1)()"ASCII code display."single])(frame-tag .[(0 1 0)()"Minor mode that assigns a unique number to each frame for easy switching"single])(org-blog .[(1 18 1 1)()"create and publish a blog with org-mode"single])(ruby-tools .[(0 1 0)()"Collection of handy functions for ruby-mode"single])(unfill .[(0 1)()"The inverse of fill-paragraph and fill-region"single])(modeline-posn .[(22 0)()"Set up `mode-line-position'."single])(mark-multiple .[(1 0)()"A library that sorta lets you mark several regions at once"single])(mark-more-like-this .[(1 0)()"Mark additional regions in buffer matching current region."single])(openwith .[(20120531)()"Open files with external programs"single])(isearch+ .[(21 0)()"Extensions to `isearch.el'."single])(mouse+ .[(21 0)()"Extensions to `mouse.el'."single])(zencoding-mode .[(0 5 1)()"Unfold CSS-selector-like expressions to markup"single])(smart-mode-line .[(1 7 1)()"A color coded smart mode-line."single])(flymake .[(0 4 13)()"a universal on-the-fly syntax checker"single])(slime-ritz .[(0 6 0)()"slime extensions for ritz"single])(r-autoyas .[(0 28)()"Provides automatically created yasnippets for R function argument lists."single])(key-combo .[(1 5 1)()"map key sequence to commands"single])(ujelly-theme .[(1 0 16)()"Ujelly theme for GNU Emacs 24 (deftheme)"single])(guru-mode .[(0 1)()"Become an Emacs guru"single])(zen-and-art-theme .[(1 0 1)()"zen and art color theme for GNU Emacs 24"single])(save-visited-files .[(1 3)()"save opened files across sessions"single])(ruby-end .[(0 2 0)()"Automatic insertion of end blocks for Ruby"single])(git-auto-commit-mode .[(4 1)()"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 .[(0 3 0 20130316)((php-mode (1 5 0)))"Extra features for `php-mode'"tar])(repository-root .[(1 0 3)()"deduce the repository root directory for a given file"single])(grep-a-lot .[(1 0 6)()"manages multiple search results buffers for grep.el"single])(grep-o-matic .[(1 0 4)()"auto grep word under cursor"single])(el-spec .[(0 2)()"ruby's rspec like syntax test frame work"single])(wc-mode .[(1 1)()"Running word count with goals (minor mode)"single])(legalese .[(1 0)()"Add legalese to your program files"single])(scad-mode .[(90 0)()"SCAD mode derived mode"single])(android-mode .[(0 2 1)()"Minor mode for Android application development"single])(ttl-mode .[(0 1)()"mode for Turtle(RDF)"single])(zeitgeist .[(0 1)()"integrates Emacs with Zeitgeist."single])(dispass .[(1)()"Generate and disperse/dispell passwords"single])(writegood-mode .[(1 2)()"Polish up poor writing on the fly"single])(nrepl .[(0 1 7)((clojure-mode (2 0 0)))"Client for Clojure nREPL"single])(fill-column-indicator .[(1 83)()"Graphically indicate the fill column"single])(shell-switcher .[(0 1 5 1)()"Easily switch between shell buffers, like with alt+tab."tar])(github-theme .[(0 0 3)()"Github color theme for GNU Emacs 24"single])(sokoban .[(1 23)()"Play the Sokoban game in emacs"single])(package-store .[(0 3)()"a package cache"single])(python-mode .[(6 0 10)()"Python major mode"tar])(code-headers .[(0 7)()"Navigate code with headers embedded in comments.  -*- mode: Emacs-Lisp; lexical-binding: t; -*"single])(dix .[(0 1 0)()"minor mode for editing Apertium XML dictionary files"single])(tron-theme .[(12)()"A theme loosely based on Tron: Legacy colors"single])(no-easy-keys .[(1 0 2)()"Learn the proper Emacs movement keys"single])(makefile-runner .[(1 1 2)()"Searches for Makefile and fetches targets"single])(elnode .[(0 9 9 6 7)((web (0 1 4)) (creole (0 8 14)) (fakir (0 0 14)) (db (0 0 5)) (kv (0 0 9)))"The Emacs webserver."tar])(midje-mode .[(0 1 2)((slime (1 0)) (clojure-mode (1 0)))"Minor mode for running Midje tests in emacs, see: https://github.com/dnaumov/midje-mode"tar])(gnusnotes .[(0 9 2)()"Adding per-message notes in gnus summary buffer"single])(rinari .[(2 10)((ruby-mode (1 0)) (inf-ruby (2 2 1)) (ruby-compilation (0 8)) (jump (2 0)))"Rinari Is Not A Rails IDE"single])(web .[(0 3 6)()"useful HTTP client -*- lexical-binding: t -*-"single])(eredis .[(0 5 0)()"eredis, a Redis client in emacs lisp"single])(multi-project .[(0 0 8)()"Easily work with multiple projects."single])(bbdb2erc .[(0 1 0)()"make bbdb show if pal is online with ERC, click i to chat"single])(egison-mode .[(0 1 3)()"Egison editing mode"single])(mongo .[(0 5)()"A MongoDB client."tar])(cm-mode .[(0 1 0)()"Wrapper for CodeMirror-style Emacs modes"single])(ruby-test-mode .[(1 5)((ruby-mode (1 0)))"Minor mode for Behaviour and Test Driven"single])(marmalade-test .[(0 0 1)()"A test tarball package."tar])(ruby-mode .[(1 1)()"ruby-mode package"tar])(hjkl-mode .[(0 1)((key-chord (0 5)))"import some vim's key bindings"tar])(edit-list .[(0 4)()"edit a single list"single])(persistent-soft .[(0 8 6)((pcache (0 2 3)) (list-utils (0 2 0)))"Persistent storage, returning nil on failure"single])(hippie-namespace .[(0 5 6)()"Special treatment for namespace prefixes in hippie-expand"single])(nav-flash .[(1 0 8)()"Briefly highlight the current line"single])(ucs-utils .[(0 7 2)((persistent-soft (0 8 6)) (pcache (0 2 3)))"Utilities for Unicode characters"single])(back-button .[(0 6 4)((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Visual navigation through mark rings"single])(nsis-mode .[(0 44)()"NSIS-mode"single])(window-end-visible .[(0 0 3)()"Find the last visible point in a window"single])(unicode-enbox .[(0 1 3)((string-utils (0 0 1)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Surround a string with box-drawing characters"single])(dynamic-fonts .[(0 6 2)((font-utils (0 6 8)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Set faces based on available fonts"single])(minimal-session-saver .[(0 6 0)()"Very lean session saver"single])(unicode-progress-reporter .[(0 5 3)((emacs (24 1 0)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Progress-reporter with fancy characters"single])(mongo-elnode .[(0 5 0)((mongo (0 5)) (elnode (0 9 9)))"elnode adapter for mongo-el"single])(eimp .[(1 4 0)()"Emacs Image Manipulation Package"single])(org-presie .[(0 0 5)((framesize (0 0 1)) (eimp (1 4 0)) (org (7 8 9)))"simple presentation with an org file"single])(ido-load-library .[(0 1 2)((persistent-soft (0 8 6)) (pcache (0 2 3)))"Load-library alternative using ido-completing-read"single])(ac-nrepl .[(0 17)((nrepl (0 1)) (auto-complete (1 4)))"auto-complete sources for Clojure using nrepl completions"single])(applescript-mode .[(1 1)()"major mode for editing AppleScript source"single])(ssh .[(1 2)()"Support for remote logins using ssh."single])(nrepl-ritz .[(0 6 0)((nrepl (0 1 5)))"nrepl extensions for ritz"single])(doctags .[(0 1)()"Generation of tags documentation in Doxygen syntax"single])(buffer-utils .[(0 0 3)()"Buffer-manipulation utility functions"single])(lisp-editing .[(0 0 5)()"lisp editing tools"single])(exec-path-from-shell .[(0 4)()"Make Emacs use the $PATH set up by the user's shell"single])(go-play .[(0 0 1)()"Paste to play.golang.org"single])(yagist .[(0 8 3)((json (1 2 0)))"Yet Another Emacs integration for gist.github.com"single])(margo .[(2012 9 18)((web (0 1 8)) (json (1 2)))"Client for MarGo, providing Go utilities"single])(shoes-off .[(0 1 8)((kv (0 0 5)) (anaphora (0 0 4)))"irc bouncer"single])(multiple-cursors .[(1 2 1)()"Multiple cursors for Emacs."tar])(eshell-manual .[(0 0 3)()"An updated manual for Eshell."tar])(plantuml-mode .[(0 2)()"Major mode for plantuml"single])(hackernews .[(0 1)((json (1 2)))"Access the hackernews aggregator from Emacs"tar])(esk .[(0 1)()"Emacs Search Kit - An easy way to find files and/or strings in a project"tar])(hide-comnt .[(40)()"Hide/show comments in code."tar])(pretty-mode-plus .[(1 1)()"Redisplay parts of the buffer as pretty symbols."tar])(s .[(1 3 1)()"The long lost Emacs string manipulation library."single])(gitconfig-mode .[(0 3)()"Major mode for editing .gitconfig files -*- lexical-binding: t; -*-"single])(git-commit-mode .[(0 11)()"Major mode for editing git commit messages -*- lexical-binding: t; -*-"single])(db .[(0 0 6)((kv (0 0 11)))"A database for EmacsLisp  -*- lexical-binding: t -*-"single])(notmuch-labeler .[(0 1)()"Improves notmuch way of displaying labels through fonts, pictures, and hyperlinks."tar])(gitignore-mode .[(0 1)()"Major mode for editing .gitconfig files"single])(save-packages .[(0 20121012)()"save and restore installed packages"single])(cmake-project .[(0 6)()"Integrates CMake build process with Emacs"single])(combinators .[(0 0 1)()"-*- lexical-binding: t; -*-"single])(livescript-mode .[(0 0 1)()"Major mode for LiveScript files in Emacs"single])(visible-color-code .[(0 0 1)()"color code strings in current buffer, this elisp show you one as real color."single])(dash .[(1 1 0)()"A modern list library for Emacs"single])(seclusion-mode .[(1 1 1)()"Edit in seclusion. A Dark Room mode."single])(pde .[(0 2 16)()"Perl Development Environment"tar])(tt-mode .[(20121117 2045)()"Emacs major mode for editing Template Toolkit files."tar])(pod-mode .[(20121117 2120)()"Major mode for editing .pod-files."tar])(ercn .[(1 0 2)()"Flexible ERC notifications"single])(bufshow .[(0 1 0)()"A simple presentation tool for Emacs."tar])(parenface-plus .[(1 1)()"Provide a face for parens in lispy modes."tar])(el-x .[(0 2 1)((cl-lib (0 2)))"Emacs-lisp extensions."tar])(json-mode .[(0 1 2)()"Major mode for editing JSON files"single])(buffer-stack .[(1 5)()"Enhanced intelligent switch-to-other-buffer replacement."single])(ag .[(0 15)()"A front-end for ag, the C ack replacement."single])(gnomenm .[(0 0 3)()"Emacs interface to Gnome nmcli command"single])(sequence .[(0 0 1)()"makes sequences of numbers -*- lexical-binding: t -*-"single])(rvm .[(1 3 0)()"Emacs integration for rvm"single])(soothe-theme .[(0 3 14)()"a dark colorful theme for Emacs24."single])(macro-utils .[(1 0)()"Utilities for writing macros."single])(toml-mode .[(0 1 3)()"Mojor mode for editing TOML files"single])(cryptol-mode .[(0 0 2)()"Cryptol major mode for Emacs"single])(paste-kde .[(0 1)((web (0 3 6)))"paste text to KDE's pastebin service"single])(proc-net .[(0 0 1)()"network process tools"single])(drupal-spell .[(0 2 0)()"Aspell extra dictionary for Drupal"tar])(thread-dump .[(1 0)()"java thread dump viewer"single])(bitly .[(1 0)()"Shorten URLs using the bitly.com shortener service"single])(alert .[(0 5 10)((string-utils (0 0 2)))"Alternatives to `message'"single])(org-readme .[(20130322 924)((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0)))"Integrates Readme.org and Commentary/Change-logs."single])(yaoddmuse .[(0 1 1)()"Yet another oddmuse for Emacs"single])(unicode-fonts .[(0 3 4)((font-utils (0 6 8)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Configure Unicode fonts"single])(button-lock .[(0 9 10)()"Clickable text defined by regular expression"single])(wiki-nav .[(0 6 4)((button-lock (0 9 6)) (nav-flash (1 0 0)))"Simple file navigation using [[WikiStrings]]"single])(unicode-whitespace .[(0 2 3)((ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"teach whitespace-mode about fancy characters"single])(ecb-snapshot .[(20120830)()"Emacs Code Browser CVS snapshot"tar])(pabbrev .[(3 1)()"Predictive abbreviation expansion"single])(ignoramus .[(0 6 4)()"Ignore backups, build files, et al."single])(flyspell-lazy .[(0 6 4)()"Improve flyspell responsiveness using idle timers"single])(browse-url-dwim .[(0 6 4)((string-utils (0 0 3)))"Context-sensitive external browse URL or Internet search"single])(fixmee .[(0 8 2)((button-lock (0 9 8)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 0 6)) (tabulated-list (0)))"Quickly navigate to FIXME notices in code"single])(kv .[(0 0 12)()"key/value data structure functions"single])(less-css-mode .[(0 12)()"Major mode for editing LESS CSS files (lesscss.org)"single])(oauth .[(1 0 3)()"An Emacs oauth client. See https://github.com/psanford/emacs-oauth/"tar])(tumblesocks .[(0 0 5)((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1)))"An Emacs tumblr client."tar])(uuid .[(0 0 3)()"UUID's for EmacsLisp"single])(mustache-mode .[(1 2)()"A major mode for editing Mustache files."single])(erc-hl-nicks .[(1 3 1)()"ERC nick highlighter that ignores uniquifying chars when colorizing"single])(pcmpl-args .[(0 1 1)()"Enhanced shell command completion    -*- lexical-binding: t -*-"single])(el-autoyas .[(0 5)()"Automatically create Emacs-Lisp Yasnippets"single])(anaphora .[(0 1 0)()"anaphoric macros providing implicit temp variables"single])(textmate-to-yas .[(0 17)()"Import Textmate macros into yasnippet syntax"single])(ghci-completion .[(0 1 3)()"Completion for GHCi commands in inferior-haskell buffers -*- lexical-binding: t; -*-"single])(slim-mode .[(1 1)()"Major mode for editing Slim files"single])(google-translate .[(0 3 2)()"Emacs interface to Google Translate"single])(list-utils .[(0 3 0)()"List-manipulation utility functions"single])(pcre2el .[(1 1)()"PCRE/Elisp/rx/SRE regexp syntax converter and utilities"single])(font-utils .[(0 6 8)((persistent-soft (0 8 6)) (pcache (0 2 3)))"Utility functions for working with fonts"single])(rcirc-robots .[(0 0 7)((kv (0 0 8)) (anaphora (0 0 5)))"robots based on rcirc irc -*- lexical-binding: t -*-"single])(org-ehtml .[(0 20120928)((elnode (0 9 9)) (org-plus-contrib (20120928)))"Export Org-mode files as editable web pages"tar])(geiser .[(0 3)()"GNU Emacs and Scheme talk to each other"tar])(diff-hl .[(1 4 4)((cl-lib (0 2)))"Highlight uncommitted changes -*- lexical-binding: t -*-"single])(virtualenv .[(1 2)()"Virtualenv for Python  -*- coding: utf-8 -*-"single])(sprintly-mode .[(0 0 4)((furl (0 0 2)))"Major mode for dealing with sprint.ly"single])(text-language .[(0 20121008)()"tracking, setting, guessing language of text"single])(color-theme-sanityinc-solarized .[(2 22)()"A version of Ethan Schoonover's Solarized themes"tar])(typo .[(1 1)()"Minor mode for typographic editing"single])(ws-trim .[(1 4)()"Tools and minor mode to trim whitespace on text lines"single])(flymake-checkers .[(0 3)()"Flymake reloaded with useful checkers"single])(hardhat .[(0 3 6)((ignoramus (0 6 2)))"Protect against clobbering user-writable files"single])(string-utils .[(0 2 8)((list-utils (0 1 2)))"String-manipulation utilities"single])(smooth-scrolling .[(1 0 1)()"Make emacs scroll smoothly"single])(flymake-go .[(2013 3 14)((flymake (0 4 13)))"A flymake handler for go-mode files"single])(gitty .[(1 0)()"vc-mode extension for fast git interaction"single])(mote-mode .[(1 0 0)((ruby-mode (1 1)))"Mote minor mode"single])(hideshowvis .[(0 5)()"Add markers to the fringe for regions foldable by hideshow.el"single])(inflections .[(1 1)()"convert english words between singular and plural"single])(findr .[(0 7)()"Breadth-first file-finding facility for (X)Emacs"single])(smart-forward .[(1 0 0)((expand-region (0 8 0)))"Semantic navigatioin"single])(osx-browse .[(0 8 6)((browse-url-dwim (0 6 2)))"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 0)()"Vector-manipulation utility functions"single])(config-block .[(0 0 1)()"config-block is utility for individual settings (e.g. .emacs)."single])(namakemono .[(0 0 1)()"utility function set for namakemono"single])(bang .[(0 1 0)()"A modern list library for Emacs"single])(roy-mode .[(0 1 0)()"Roy major mode"single])(pcsv .[(1 3 0)()"Parser of csv -*- lexical-binding: t -*-"single])(wgrep-ack .[(0 1 1)((wgrep (2 1 1)))"Writable ack-and-a-half buffer and apply the changes to files"single])(flymake-lua .[(1 0)()"Flymake for Lua"single])(rcirc-color .[(0 2)()"color nicks"single])(inform-mode .[(1 6 1)()"Major mode for Inform 6 interactive fiction code"single])(expectations-mode .[(0 0 4)((nrepl (0 1 5)) (clojure-mode (1 11)))"Minor mode for expectations tests"single])(octomacs .[(0 0 1)()"Octopress interface for Emacs"single])(highlight .[(21 0)()"Highlighting commands."single])(region-list-edit .[(20100530 808)()"Add/delete a region into/from a region list, such as ‘((4 . 7) (11 . 15) (17 . 17) (20 . 25))."single])(zjl-hl .[(20121028 1901)((highlight (21 0)) (region-list-edit (20100530 808)))"Highlight variable and function call and others in c/emacs, make life easy."single])(simp .[(0 2 0)()"Simple project definition, chiefly for project file finding and grepping."tar])(pyde .[(0 6)((pymacs (0 25)) (auto-complete (1 4)) (yasnippet (0 8)) (fuzzy (0 1)) (pyvirtualenv (1 0)))"Python Development Environment"single])(truthy .[(0 2 6)((list-utils (0 1 2)))"Test the content of a value"single])(syntactic-sugar .[(0 9 2)()"Effect-free forms such as if/then/else"single])(elpakit .[(0 0 18)((anaphora (0 0 6)) (dash (1 0 3)))"package archive builder"single])(bug-reference-github .[(0 1 0)()"Automatically set `bug-reference-url-format' in Github repositories."single])(color-theme-sanityinc-tomorrow .[(1 8)()"A version of Chris Kempson's various Tomorrow themes"tar])(macrostep .[(0 3)()"interactive macro stepper for Emacs Lisp"single])(qsimpleq-theme .[(0 1 3)()"Based on solarized color theme for Emacs."single])(flymake-easy .[(0 4)()"Helpers for easily building flymake checkers"single])(flymake-ruby .[(0 8)((flymake-easy (0 1)))"A flymake handler for ruby-mode files"single])(flymake-shell .[(0 8)((flymake-easy (0 1)))"A flymake syntax-checker for shell scripts"single])(flymake-coffee .[(0 10)((flymake-easy (0 1)))"A flymake handler for coffee script"single])(flymake-php .[(0 5)((flymake-easy (0 1)))"A flymake handler for php-mode files"single])(flymake-sass .[(0 6)((flymake-easy (0 1)))"Flymake handler for sass files"single])(flymake-css .[(0 3)((flymake-easy (0 1)))"Flymake support for css using csslint"single])(flymake-haml .[(0 7)((flymake-easy (0 1)))"A flymake handler for haml files"single])(flymake-jslint .[(0 9)((flymake-easy (0 1)))"A flymake handler for javascript using jslint"single])(ess-smart-underscore .[(0 74)()"Ess Smart Underscore"single])(skinny .[(0 0 3)((elnode (0 9 9 6 1)) (creole (0 8 17)))"a blog engine with elnode -*- lexical-binding: t -*-"single])(auto-indent-mode .[(0 97)()"Auto indent Minor mode"single])(flymake-python-pyflakes .[(0 4)((flymake-easy (0 4)))"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 6)()"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 .[(0 9)((auto-complete (1 4)) (fuzzy (0 1)) (yasnippet (0 8)) (virtualenv (1 2)) (highlight-indentation (0 5 0)) (find-file-in-project (3 2)) (idomenu (0 1)) (nose (0 1 1)) (iedit (0 97)))"Emacs Lisp Python Environment"tar])(ace-jump-mode .[(2 0 0 0)()"a quick cursor location minor mode for emacs -*- coding: utf-8-unix -*-"single])(osx-location .[(0 2)()"Watch and respond to changes in geographical location on OS X"tar])(elpa-audit .[(0 4)()"Handy functions for inspecting and comparing package archives"single])(multi-web-mode .[(0 1)()"multiple major mode support for web editing"single])(flycheck .[(0 7 1)((s (1 3 1)) (dash (1 0 3)))"Flymake done rightFlycheck provides on-the-fly syntax checker with- major-mode based checkers,- simple declarative checker definitions,- built-in checkers for many languages,- standard error navigation,- easy customization,- and a clean, concise and understandable implementation."tar])(chicken-scheme .[(1 0 4)()"Scheme-mode extensions for Chicken Scheme"single])(minimap .[(1 0)()"Sidebar showing a \"mini-map\" of a buffer"single])(session-manager .[(0 5)()"Support for the Gnome Session Manager"single])(ctable .[(0 1 1)()"Table component for Emacs Lisp"single])(grr .[(1 0 0)()"Simple Growl notifications for Emacs and Mac OS X"single])(simpleclip .[(0 2 2)()"Simplified access to the system clipboard"single])(esxml .[(0 1 5)((kv (0 0 5)))"Library for working with xml via esxml and sxml"single])(cpputils-cmake .[(0 2 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 2)()"Buffer modification tracking"single])(lui .[(1 1)((tracking (1 2)))"Linewise User Interface"tar])(circe .[(1 1 1)((lui (1 1)) (lcs (1 1)))"Client for IRC in Emacs"tar])(iedit .[(0 97)()"Edit multiple regions in the same way simultaneously."tar])(let-recur .[(0 0 5)()"Simplified implementation of recur -*- lexical-binding:t -*-"single])(wgrep-helm .[(0 1 0)((wgrep (2 1 1)))"Writable helm-grep-mode buffer and apply the changes to files"single])(otter-mode .[(1 2)()"Major mode for source files of the Otter automated theorem prover"single])(sql-indent .[(1 10)()"indentation of SQL statements"single])(maildir .[(0 0 13)()"a full maildir handling tool -*- lexical-binding: t -*-"single])(huskie .[(0 0 1)((anaphora (0 0 6)))"chainsaw powered logging"single])(tabbar-ruler .[(0 25)((tabbar (2 0 1)))"Setup tabbar to look pretty..."single])(color-theme-x .[(1 3)()"convert color themes to X11 resource settings"single])(gplusify .[(1 0)()"Add Google Plus markup to a piece of code"single])(diatheke .[(1 0)()"A minor mode using the diatheke command-line Bible tool"single])(inf-ruby .[(2 2 4)()"Run a ruby process in a buffer"single])(extend-dnd .[(0 4)()"R drag and Drop"single])(wxwidgets-help .[(0 0 3)()"Look up wxWidgets API by using local html manual."tar])(sudden-death .[(0 2)()"Totsuzen-no-Shi"single])(fold-this .[(0 1 0)()"Just fold this region please"single])(dart-mode .[(0 9)()"Major mode for editing Dart files"single])(subshell-proc .[(0 2)()"Functions for working with comints"single])(pg .[(0 12)()"Emacs Lisp interface to the PostgreSQL RDBMS"single])(db-pg .[(0 0 3)((pg (0 12)) (db (0 0 6)))"A PostgreSQL adapter for emacs-db"single])(hippie-expand-haskell .[(0 0 1)()"Hippie expand try function using ghc's completion function."single])(slamhound .[(2 0 0)()"Rip Clojure namespaces apart and rebuild them."single])(clojure-mode .[(2 0 0)()"Major mode for Clojure code"single])(clojure-test-mode .[(2 0 0)((clojure-mode (1 7)) (nrepl (0 1 5)))"Minor mode for Clojure tests"single])(late-night-theme .[(0 0)()"Late Night theme for Emacs 24"single])(creole-mode .[(0 0 4)()"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 .[(0 0 2)()"Comment/uncomment lines efficiently. Like Nerd Commenter in Vim"tar])(projectile .[(0 8)((s (1 0 0)) (dash (1 0 0)))"Manage and navigate projects in Emacs easily"single])(keyfreq .[(0 0 3)((json (1 2)))"track command frequencies"single])(robe .[(0 7)((inf-ruby (2 2 4)))"Code navigation, documentation lookup and completion for Ruby"tar])(dropbox .[(0 9)((json (1 2)) (oauth (1 0 3)))"Emacs backend for dropbox"single])(simple-mode-line .[(0 1)()"Simplified Mode Line for Emacs 24"single])(pov-mode .[(3 3)()"Major mode for editing POV-Ray scene files."tar])(creole .[(0 8 21)()"A parser for the Creole Wiki language"single])(tup-mode .[(1 2)()"Major mode for editing files for Tup"single])(bbcode-mode .[(1 1 0)()"Major mode for writing BBCode markup"single])(markup-faces .[(1 0 0)()"collection of faces for markup language modes"single])(flymake-json .[(0 1)((flymake-easy (0 1)))"A flymake handler for json using jsonlint"single])(adoc-mode .[(0 6 2)((markup-faces (1 0 0)))"a major-mode for editing AsciiDoc files in Emacs"single])(hardcore-mode .[(1 0 0)()"Disable arrow keys + optionally backspace and return"single])(spotify .[(0 1)()"Control the spotify application from emacs via D-Bus"single])(hlinum .[(1 0)()"Extension for linum.el to highlight current line number"single])(aes .[(0 5)()"Implementation of AES"single])(kwin .[(0 1)()"communcate with the KWin window manager"single])(clj-refactor .[(0 2 0)((s (1 3 1)) (dash (1 0 3)) (yasnippet (0 6 1)))"A collection of clojure refactoring functions"single])(awk-it .[(0 76)()"Run AWK interactively on region!"single])(nemerle .[(0 2)()"major mode for editing nemerle programs"single])(markdown-mode .[(1 9)()"Emacs Major mode for Markdown-formatted text files"single])(evil-leader .[(0 2 1)((evil (0)))"let there be <leader>"single])(nimrod-mode .[(0 1 5)((auto-complete (1 4)))"A major mode for the Nimrod programming language"single])(rbenv .[(0 0 2)()"Emacs integration for rbenv"single])(evil .[(1 0 1)((undo-tree (0 5 1)))"Extensible Vi layer for Emacs."tar])(world-time-mode .[(0 0 2)()"show whole days of world-time diffs"single])(inline-crypt .[(0 1 2)()"Simple inline encryption via openssl"tar])(tagedit .[(1 3 1)((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])(purple-haze-theme .[(0 0 7)()"an overtly purple color theme for Emacs24."single])(gruber-darker-theme .[(0 2)()"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 1)((key-chord (0 5 20080915)))"change the size of frames in Emacs"single])(deep-thought-theme .[(0 1 1)()"Emacs 24 theme with the Answer to The Ultimate Question"single])(image-dired+ .[(0 5 7)()"Image-dired extensions"single])(erefactor .[(0 6 7)()"Emacs-Lisp refactoring utilities"single])(generate-autoloads .[(0 0 10)()"A package to help you lazy-load everything"single])(lisp-infection .[(0 0 10)()"Commands to *enhance* S-exp editing"single])(backtrace-mode .[(0 0 10)()"A better way to browse /var/log/messages files"single])(tabulated-list .[(0)()"generic major mode for tabulated lists."single])(package .[(1 0)((tabulated-list (0)))"Simple package system for Emacs"single])(ert .[(0)()"Emacs Lisp Regression Testing"single])(nurumacs .[(3 5 4)()"smooth-scrolling and minimap, like sublime editor"single])(mark-tools .[(0 3)()"Some simple tools to access the mark-ring in Emacs"single])(cedit .[(0 0 0)()"paredit-like commands for c-like languages"single])(todotxt .[(0 2 2)()"A major mode for editing todo.txt files"single])(git-gutter .[(0 28)()"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 1)()"Core Emacs configuration. This should be the minimum in every emacs config."single])(edebug-x .[(1 2)((dash (1 1 0)))"Extensions for Edebug"single])(loop .[(1 1)()"friendly imperative loop structures"single])(tex-smart-umlauts .[(1 1 0)()"Smart umlaut conversion for TeX."single])(ht .[(0 7)()"The missing hash table library for Emacs"single])(haml-mode .[(3 1 0)((ruby-mode (1 0)))"Major mode for editing Haml files"single])(flymake-hlint .[(0 2)((flymake-easy (0 1)))"A flymake handler for haskell-mode files using hlint"single])(django-theme .[(1 3 0)()"Custom face theme for Emacs"single])(pinboard .[(0 0 1)()"get stuff from pinboard -*- lexical-binding: t -*-"single])(isea .[(0 0 2)((elpakit (0 0 18)))"interactive server eval at mode, a comint for a daemonized emacs -*- lexical-binding: t -*-"single])(wrap-region .[(0 7 1)()"Wrap text with punctation or tag"single])(lexbind-mode .[(0 7)()"Puts the value of lexical-binding in the mode line"single])(auto-highlight-symbol .[(1 55)()"Automatic highlighting current symbol minor mode"single])(dot-mode .[(1 12)()"minor mode to repeat typing or commands"single])(main-line .[(1 2 7)()"modeline replacement forked from an early version of powerline.el"single])(electric-case .[(2 2 1)()"insert camelCase, snake_case words without \"Shift\"ing"single])(mc-jump .[(1 0 0)()"like \"jump-char\", but \"multiple-cursors\" friendly"single])(scratch-palette .[(1 0 1)()"add scratch notes for each file"single])(scratch-pop .[(1 0 0)()"popup scratch"single])(outlined-elisp-mode .[(1 0 5)()"outline-minor-mode settings for emacs lisp"single])(show-css .[(1 1)()"Show the css of the html attribute the cursor is on"single])(dpaste_de .[(0 1)((web (0 3 6)))"Emacs mode to paste to dpaste.de"single])(supergenpass .[(0 1)()"SuperGenPass for Emacs"single])(with-namespace .[(1 1)()"Poor-man's namespaces for elisp"single])(flymake-haskell-multi .[(0 2)((flymake-easy (0 1)))"Syntax-check haskell-mode using both ghc and hlint"single])(sackspace .[(0 7)()"A better backspace"single])(volatile-highlights .[(1 10)()"Minor mode for visual feedback on some operations."single])(everything .[(0 1 5)()"Bridge to MS Windows desktop-search engine Everything"single])(fetchmacs .[(1 0 1)()"A major mode for the Fetchnotes note taking service"single])(grapnel .[(0 5 1)()"HTTP request lib with flexible callback dispatch"single]))
\ No newline at end of file
+(1(paredit .[(22)()"minor mode for editing parentheses  -*- Mode: Emacs-Lisp -*-"single])(sass-mode .[(3 0 14)((haml-mode (3 0 14)))"Major mode for editing Sass files"single])(perspective .[(1 9)()"switch between named \"perspectives\" of the editor"single])(slime .[(20100404 1)()"Superior Lisp Interaction Mode for Emacs"single])(slime-repl .[(20100404)((slime (20100404)))"Read-Eval-Print Loop written in Emacs Lisp"single])(scpaste .[(0 6)((htmlize (1 39)))"Paste to the web via scp."single])(idle-highlight .[(1 0)()"highlight the word the point is on"single])(magit .[(1 2 0)()"Control Git from Emacs."tar])(durendal .[(0 2)((clojure-mode (1 7)) (slime (20100404)) (paredit (22)))"A bucket of tricks for Clojure and Slime."single])(htmlize .[(1 39)()"Convert buffer text and decorations to HTML."single])(furl .[(0 0 2)()"Friendly URL retrieval"single])(marmalade .[(0 0 4)((furl (0 0 2)))"Elisp interface for the Emacs Lisp package server."single])(yari .[(0 5)()"Yet Another RI interface for Emacs"single])(enclose .[(0 0 2)()"Enclose cursor within punctuation pairs"single])(html-script-src .[(0 0 2)()"Insert <script src=\"..\"> for popular JavaScript libraries"single])(mactag .[(0 0 1)()"Mode for automatically handle multiple tags files with Mactag rubygem"single])(undo-tree .[(0 3 1)()"Treat undo history as a tree"single])(diminish .[(0 44)()"Diminished modes are minor modes with no modeline display"single])(notify .[(2010 8 20)()"notification front-end"single])(keywiz .[(1 4)()"Emacs key sequence quiz"single])(descbinds-anything .[(1 5)((anything (1 287)))"Yet Another `describe-bindings' with `anything'."single])(autopair .[(0 3)()"Automagically pair braces and quotes like TextMate"single])(highlight-parentheses .[(1 0 1)()"highlight surrounding parentheses"single])(anything .[(1 287)()"open anything / QuickSilver-like candidate-selection framework"single])(anything-config .[(0 4 1)()"Predefined configurations for `anything.el'"single])(anything-match-plugin .[(1 27)()"Humane match plug-in for anything"single])(closure-template-html-mode .[(0 1)()"highlighting for google closure templates"single])(gist .[(1 1 1)((eieio (1 3)) (gh (0 7 2)) (tabulated-list (0)))"Emacs integration for gist.github.com"single])(highlight-symbol .[(1 1)()"automatic and manual symbol highlighting"single])(color-theme-twilight .[(0 1)()"Twilight Colour Theme for Emacs."single])(browse-kill-ring .[(1 3 1)()"interactively insert items from kill-ring -*- coding: utf-8 -*-"single])(buffer-move .[(0 4)()"swap buffers between windows"single])(dired-single .[(1 7 0)()"reuse the current dired buffer to visit another directory"single])(php-mode .[(1 5 0)()"major mode for editing PHP code"single])(c-eldoc .[(0 5)()"helpful description of the arguments to C functions"single])(full-ack .[(0 2 3)()"a front-end for ack"single])(find-file-in-project .[(3 2)()"Find files in a project quickly."single])(project .[(1 0)()"Keep track of the current project"single])(goto-last-change .[(1 2)()"Move point through buffer-undo-list positions -*-unibyte: t; coding: iso-8859-1;-*-"single])(http-twiddle .[(1 0)()"send & twiddle & resend HTTP requests"single])(mac-key-mode .[(2010 1 3)()"provide mac-style key bindings on Carbon Emacs"single])(flymake-cursor .[(1 0 2)((flymake (0 3)))"Show flymake messages in the minibuffer after delay"tar])(multi-term .[(0 8 8)()"Managing multiple terminal buffers in Emacs."single])(parenface .[(1 1)()"Provide a face for parens in lisp modes."single])(redo+ .[(1 15)()"Redo/undo system for Emacs"single])(gnuplot .[(0 6 0)()"drive gnuplot from within emacs"single])(speck .[(2010 5 25)()"minor mode for spell checking"single])(hexrgb .[(21 0)()"Functions to manipulate colors, including RGB hex strings."single])(icomplete+ .[(21 0)()"Extensions to `icomplete.el'."single])(lacarte .[(22 0)()"Execute menu items as commands, with completion."single])(synonyms .[(1 0)()"Look up synonyms for a word or phrase in a thesaurus."single])(ecb .[(2 40)()"Emacs Code Browser"tar])(predictive .[(0 19 5)()"Predictive Mode (Contains Dependencies)"tar])(rw-hunspell .[(0 2)()"special functions for Hunspell in ispell.el"single])(rw-ispell .[(0 1)()"additional functions for ispell.el"single])(rw-language-and-country-codes .[(0 1)()"Language & Country Codes"single])(yas-jit .[(0 8 3)()"Loads Yasnippets on demand (makes start up faster)"single])(ntcmd .[(1 0)()"major mode for editing cmd scripts"single])(org-table-comment .[(0 2)()" Org table comment modes."single])(anything-extension .[(0 2)()"Extension functions for anything.el"single])(powershell .[(0 2 1)()"run powershell as an inferior shell in emacs"single])(cdlatex .[(4 0)()"Fast input methods for LaTeX environments and math"single])(anything-R .[(0 1 2010)()"anything-sources and some utilities for GNU R."single])(anything-el-swank-fuzzy .[(0 1 2009)()"anything-sources for el-swank-fuzzy.el"single])(anything-ipython .[(0 1 2009)()" Ipython anything"single])(color-file-completion .[(1 0 1)()"add colors to file completion"single])(color-theme-emacs-revert-theme .[(0 1)()"Color-theme revert to emacs colors"single])(anything-complete .[(1 86)()"completion with anything"single])(anything-obsolete .[(0 1)()"obsolete functions of anything"single])(ipython .[(2927)()"Adds support for IPython to python-mode.el"single])(el-swank-fuzzy .[(0 1)()"fuzzy symbol completion."single])(fold-dwim .[(1 2)()"Unified user interface for Emacs folding modes"single])(fold-dwim-org .[(0 2)((fold-dwim (1 2)))"Fold DWIM bound to org key-strokes."single])(fuzzy-match .[(1 4)()"fuzzy matching"single])(w32-browser .[(21 0)()"Run Windows application associated with a file."single])(crosshairs .[(22 0)()"Highlight the current line and column."single])(csv-mode .[(1 50)()"major mode for editing comma-separated value files"single])(vline .[(1 10)()"show vertical line (column highlighting) mode."single])(hl-line+ .[(22 0)()"Extensions to hl-line.el."single])(col-highlight .[(22 0)((vline (1 10)))"Highlight the current column."single])(color-theme-vim-insert-mode .[(0 1)()"Color theme VIM insert mode"single])(cursor-chg .[(20 1)()"Change cursor dynamically, depending on the context."single])(cygwin-mount .[(2001)()"Teach EMACS about cygwin styles and mount points."single])(header2 .[(21 0)()"Support for creation and update of file headers."single])(lib-requires .[(21 0)()"Commands to list Emacs Lisp library dependencies."single])(linum-off .[(0 1)()"Provides an interface for turning line-numbering off"single])(pos-tip .[(0 4 5)()"Show tooltip at point -*- coding: utf-8 -*-"single])(key-choices .[(0 201)((color-theme-vim-insert-mode (0 1)) (color-theme-emacs-revert-theme (0 1)))"Key Choices -- Also Viper has different colors in different modes"single])(tabbar .[(2 0 1)()"Display a tab bar in the header line  -*-no-byte-compile: t; -*-"single])(elein .[(0 2 2)()"running leiningen commands from emacs"single])(sumatra-forward .[(2008 10 8)()"Provides Sumatra Forward search"single])(org-outlook .[(0 3)()"Outlook org"single])(slime-fuzzy .[(20100404)((slime (20100404)))"Fuzzy symbol completion for Slime"single])(color-theme-complexity .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(starter-kit .[(2 0 3)((paredit (22)) (idle-highlight-mode (1 1 1)) (find-file-in-project (3 0)) (smex (1 1 1)) (ido-ubiquitous (0 3)) (magit (0 8 1)))"Saner defaults and goodies."tar])(starter-kit-lisp .[(2 0 3)((starter-kit (2 0 2)) (elisp-slime-nav (0 1)))"Saner defaults and goodies for lisp languages"single])(starter-kit-js .[(2 0 1)((starter-kit (2 0 1)))"Saner defaults and goodies for Javascript"single])(starter-kit-ruby .[(2 0 3)((inf-ruby (2 2 3)) (starter-kit (2 0 1)))"Saner defaults and goodies for Ruby"single])(geben .[(0 26)()"A remote debugging environment for Emacs."tar])(maxframe .[(0 5 1)()"maximize the emacs frame based on display size"single])(mode-compile .[(2 29)()" Smart command for compiling files"single])(swank-cdt .[(1 0 1)()"swank-cdt helper functions"single])(find-file-in-git-repo .[(0 1 2)()"Utility to find files in a git repo"single])(idle-highlight-mode .[(1 1 2)()"highlight the word the point is on"single])(smex .[(2 0)()"M-x interface with Ido-style fuzzy matching."single])(protobuf-mode .[(0 3)()"major mode for editing protocol buffers."single])(haskell-mode .[(2 8 0)()"Haskell editing mode"tar])(znc .[(0 0 2)((cl (2 2)) (erc (5 3)))"ZNC + ERC "single])(slime-clj .[(0 1 5)()"slime extensions for swank-clj"single])(go-mode .[(12869)()"Major mode for the Go programming language."tar])(scala-mode .[(0 0 2)()"Scala major mode"tar])(json .[(1 2)()"JavaScript Object Notation parser / generator"single])(magit-simple-keys .[(1 0 0)((magit (1 0 0)))"simple keybindings for Magit"single])(rainbow-delimiters .[(1 3 4)()"Highlight nested parens, brackets, braces a different color at each depth."single])(nyan-mode .[(0 1)()"Nyan Cat shows position in current buffer in mode-line."single])(anything-git .[(1 1 1)()"Show git files in anything"single])(xml-gen .[(0 4)()"A DSL for generating XML."single])(jump .[(2 2)((findr (0 7)) (inflections (1 1)))"build functions which contextually jump between files"single])(dotassoc .[(0 0 1)()"dot access embedded alists"single])(rcirc-ssh .[(0 0 7)((kv (0 0 3)))"do irc over ssh sessions -*- lexical-binding: t -*-"single])(weather-metno .[(20121023)()"Weather data from met.no in Emacs"tar])(systemtap-mode .[(0 2)()"A mode for SystemTap"single])(mocker .[(0 2 4)((eieio (1 3)) (el-x (0 2 1)))"mocking framework for emacs"single])(kpm-list .[(1 0)()"An emacs buffer list that tries to intelligently group together buffers."single])(weechat .[(0 1)((s (1 3 1)))"Chat via WeeChat's relay protocol in Emacs"tar])(batch-mode .[(1 0)()"major mode for editing ESRI batch scrips"single])(switch-window .[(0 9)()"A *visual* way to choose a window to switch to"single])(yaml-mode .[(0 0 7)()"Major mode for editing YAML files"single])(prolog .[(1 22)()"major mode for editing and running Prolog (and Mercury) code"single])(graphviz-dot-mode .[(0 3 7)()"Mode for the dot-language used by graphviz (att)."single])(perlcritic .[(1 10)()"minor mode for Perl::Critic integration"single])(gh .[(0 7 2)((eieio (1 3)) (pcache (0 2 3)) (logito (0 1)))"A GitHub library for Emacs"tar])(vala-mode .[(0 1)()"Vala mode derived mode"single])(alpha .[(1 0)()"increase frame transparency"single])(color-theme-ir-black .[(1 0 1)((color-theme (6 6 1)))"pastel color theme "single])(calfw-gcal .[(0 0 1)()"edit Google calendar for calfw.el."single])(python .[(20120402)()"Python's flying circus support for Emacs"single])(htmlfontify .[(0 21)()"htmlise a buffer/source tree with optional hyperlinks"single])(oddmuse .[(20090222)()"edit pages on an Oddmuse wiki"single])(wgrep .[(2 1 3)()"Writable grep buffer and apply the changes to files"single])(langtool .[(1 2 0)()"Grammer check utility using LanguageTool"single])(gather .[(1 0 0)()"Gather string in buffer."single])(starter-kit-bindings .[(2 0 2)((starter-kit (2 0 2)))"Saner defaults and goodies: bindings"single])(hl-sentence .[(2)()"highlight a sentence based on customizable face"single])(color-theme-eclipse .[(0 0 2)((color-theme (6 6 1)))"Eclipse color theme for GNU Emacs."single])(bm .[(1 53)()"Visible bookmarks in buffer."single])(color-theme-tangotango .[(0 0 2)((color-theme (6 6 1)))"Tango Palette color theme for Emacs."single])(color-theme-railscasts .[(0 0 2)((color-theme (6 6 1)))"Railscasts color theme for GNU Emacs."single])(color-theme-tango .[(0 0 2)((color-theme (6 6 1)))"Tango palette color theme for GNU Emacs."single])(color-theme-github .[(0 0 3)((color-theme (6 6 1)))"Github color theme for GNU Emacs."single])(color-theme-dpaste .[(0 0 1)((color-theme (6 6 1)))"Dpaste color theme for GNU Emacs."single])(nose .[(0 1 1)()"Easy Python test running in Emacs"single])(dpaste .[(0 2)()"Emacs integration for dpaste.com"single])(offlineimap .[(0 1)()"Run OfflineIMAP from Emacs"single])(scss-mode .[(0 5 0)()"Major mode for editing SCSS files"single])(highlight-indentation .[(0 5 0)()"Function for highlighting indentation"single])(feature-mode .[(0 4)()"Major mode for editing Gherkin (i.e. Cucumber) user stories"tar])(dired-details .[(1 3 1)()"make file details hide-able in dired"single])(dired-details+ .[(1 0)()"Enhancements to library `dired-details+.el'."single])(python-pep8 .[(1 1)()"minor mode for running `pep8'"single])(python-pylint .[(1 1)()"minor mode for running `pylint'"single])(workgroups .[(0 2 0)()"workgroups for windows (for Emacs)"single])(closure-lint-mode .[(0 1)()"minor mode for the Closure Linter"single])(httpd .[(1 0 1)()"HTTP/1.0 web server for emacs"single])(pep8 .[(1 2)()"run the python pep8 checker putting hits in a grep buffer"single])(cppcheck .[(1 0)()"run cppcheck putting hits in a grep buffer"single])(grin .[(1 0)()"run grin and grind (python replacements for grep and find) putting hits in a grep buffer"single])(pyflakes .[(1 0)()"run the python pyflakes checker putting hits in a grep buffer"single])(pylint .[(1 0)()"run the python pylint checker putting hits in a grep buffer"single])(fastnav .[(1 0 7)()"Fast navigation and editing routines."single])(confluence .[(1 6)((xml-rpc (1 6 7)))"Confluence major mode"tar])(tuareg .[(2 0 5)((caml (3 12 0 1)))"OCaml mode for Emacs."tar])(pp-c-l .[(1 0)()"Display Control-l characters in a pretty way"single])(js-comint .[(0 0 1)()"Run javascript in an inferior process window."single])(magithub .[(0 2)((magit (0 8)) (json (1 2)))"Magit extensions for using GitHub"single])(cmake-mode .[(20110824)()"major-mode for editing CMake sources"single])(smart-operator .[(1 9 20110812)()"Insert operators with surrounding spaces smartly"single])(elisp-slime-nav .[(0 3)()"Make M-. and M-, work in elisp like they do in slime"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 .[(1 6)()"Use ido (nearly) everywhere."single])(bigint .[(1 0 0)()"A simple bigint package for emacs"single])(dizzee .[(0 1 1)()"A more pleasant way to manage your project's subprocesses in Emacs."tar])(color-theme-dg .[(0 1 0)((color-theme (6 6 0)))"A black and green color theme for Emacs."single])(gimme .[(2 1)()"The XMMS2 interface we all love! Check out http://gimmeplayer.org for more info."tar])(deft .[(0 3)()"quickly browse, filter, and edit plain text notes"single])(pony-mode .[(0 2)()"Minor mode for working with Django Projects"tar])(clojurescript-mode .[(0 5)()"Major mode for ClojureScript code"single])(fsvn .[(0 9 13)()"Another frontend of subversion."tar])(starter-kit-eshell .[(2 0 3)()"Saner defaults and goodies: eshell tweaks"single])(yasnippet-bundle .[(0 6 1)()"Yet another snippet extension (Auto compiled bundle)"single])(yasnippet .[(0 6 1)()"Yasnippet template engine"tar])(ido-yes-or-no .[(1 1)((ido (0)))"Use Ido to answer yes-or-no questions"single])(caml .[(3 12 0 1)()"OCaml code editing commands for Emacs"tar])(dtrt-indent .[(0 2 0)()"Adapt to foreign indentation offsets"single])(windsize .[(0 1)()"Simple, intuitive window resizing"single])(textmate .[(5)()"TextMate minor mode for Emacs"single])(xml-rpc .[(1 6 8)()"An elisp implementation of clientside XML-RPC"single])(coffee-mode .[(0 3 0)()"Major mode to edit CoffeeScript files in Emacs"single])(sr-speedbar .[(0 1 8)()"Same frame speedbar"single])(desktop .[(0 1)()"save partial status of Emacs when killed"single])(evil-numbers .[(0 3)()"increment/decrement numbers like in vim"single])(lolcode-mode .[(0 2)()"Major mode for editing LOLCODE"single])(dedicated .[(1 0 0)()"A very simple minor mode for dedicated buffers"single])(csharp-mode .[(0 8 6)()"C# mode derived mode"single])(color-theme-actress .[(0 2 2)((color-theme (6 6 1)))"A dark color theme for GNU Emacs."single])(ghc .[(1 10 2)((haskell-mode (2 8 0)))"Happy Haskell programming on Emacs"tar])(org-email .[(0 6)()"use org for an email database -*- lexical-binding: t -*-"single])(ahg .[(0 99)()"Alberto's Emacs interface for Mercurial (Hg)"single])(lua-mode .[(20110428)()"a major-mode for editing Lua scripts"single])(ac-slime .[(0 3)()"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])(ac-ja .[(0 0 1)()"auto-complete-mode source for Japanese "single])(rcirc-notify .[(0 6)()"libnotify popups"single])(jira .[(0 3 3)()"Connect to JIRA issue tracking software"single])(color-theme-blackboard .[(0 0 2)((color-theme (6 6 1)))"Blackboard Colour Theme for Emacs."single])(color-theme-wombat .[(0 0 1)((color-theme (6 6 1)))"The wombat color theme for Emacs."single])(color-theme-wombat+ .[(0 0 2)((color-theme (6 6 1)))"wombat with improvements and many more faces"single])(color-theme-active .[(0 0 1)((color-theme (6 6 1)))"Active theme inspired by jEdit theme of the same name"single])(color-theme-colorful-obsolescence .[(0 0 1)((color-theme (6 6 1)))"Colorful Obsolescence theme designed for partially transparent windows"single])(apache-mode .[(2 0)()"major mode for editing Apache configuration files"single])(highline .[(7 2 2)()"minor mode to highlight current line in buffer"single])(mic-paren .[(3 8)()"advanced highlighting of matching parentheses"single])(pytest .[(0 2 1)()"Easy Python test running in Emacs"single])(wikidoc .[(0 8 1)()"use elisp doc strings to make other documentation"single])(regex-tool .[(1 2)()"A regular expression evaluation tool for programmers"single])(tabkey2 .[(1 40)()"Use second tab key pressed for what you want"single])(ioccur .[(0 2)()"Incremental occur."single])(javadoc-help .[(1 0)()"Javadoc-Help.  Look up Java class on online javadocs in browser."single])(macro-math .[(1 0)()"in-buffer mathematical operations"single])(winpoint .[(1 4)()"Remember buffer positions per-window, not per buffer"single])(scheme-complete .[(0 8 2)()"Smart tab completion for Emacs"single])(ruby-compilation .[(0 12)((inf-ruby (2 2 1)))"run a ruby process in a compilation buffer"single])(flymake-jshint .[(1 0)()"making flymake work with JSHint"single])(doc-mode .[(0 2)()"convenient editing of in-code documentation"single])(gccsense .[(0 2)()"GCCSense client for Emacs"single])(p4 .[(11 0)()"Perforce-Emacs Integration Library"single])(pager .[(2 0)()"windows-scroll commands"single])(pastebin .[(0 1)()"A simple interface to the www.pastebin.com webservice"single])(cache .[(0 1)()"implementation of a hash table whose key-value pairs expire"single])(command-frequency .[(1 1)()"Track command frequencies"single])(guess-offset .[(0 1 1)()"Automatically determine c-basic-offset"single])(loccur .[(1 1 1)()"Perform an occur-like folding in current buffer"single])(recursive-narrow .[(1 0)()"narrow-to-region that operates recursively"single])(member-function .[(0 3 1)()"expand member functions for C++ classes"single])(window-number .[(1 0 1)()"Jump to a window by number"single])(gtags .[(3 3)()"gtags facility for Emacs"single])(pymacs .[(0 25)()"Interface between Emacs Lisp and Python"single])(pysmell .[(0 7 2)()"Complete python code using heuristic static analysis"single])(eieio .[(1 4)()"Enhanced Implememntation of Emacs Interpreted Objects"tar])(rudel .[(0 3)((eieio (1 4)))"A collaborative editing framework for Emacs"tar])(jabber .[(0 8 90)()"A Jabber client for Emacs."tar])(citrus-mode .[(0 0 2)()"Major mode for editing Citrus files"single])(lineno .[(0 1)()"Alternate mode to display line numbers."single])(emacsd-tile .[(0 1)()"tiling windows for emacs"single])(iy-go-to-char .[(1 0)()"Go to next CHAR which is similar to \"f\" in vim"single])(jenkins-watch .[(1 2)()"Watch continuous integration build status -*- indent-tabs-mode: t; tab-width: 8 -*-"single])(peepopen .[(0 1 0)()"Graphical file chooser for Emacs on Mac OS X."single])(levenshtein .[(1 0)()"Edit distance between two strings."single])(gopher .[(0 0 2)()"easily access and navigate Gopher servers"single])(clojure-project-mode .[(1 0)((project-mode (1 0)))"Extends project-mode for Clojure projects"single])(ruby-block .[(0 0 11)()"highlight matching block"single])(pretty-lambdada .[(22 0)()"Show the word `lambda' as the Greek letter."single])(rect-mark .[(1 4)()"Mark a rectangle of text with highlighting."single])(evernote-mode .[(0 41)()"Evernote client for Emacs"tar])(jaunte .[(0 0 0)()"Emacs Hit a Hint"single])(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])(clips-mode .[(0 6)()"Major mode for editing CLIPS code and REPL"tar])(n3-mode .[(20071215)()"mode for Notation 3"single])(suomalainen-kalenteri .[(2011 11 20)()"Finnish holidays for Emacs calendar."single])(org2blog .[(0 5)((org (7 7)) (xml-rpc (1 6 8)))"Blog from Org mode to wordpress"tar])(pcache .[(0 2 3)((eieio (1 3)))"persistent caching for Emacs"single])(idle-require .[(1 0)()"load elisp libraries while Emacs is idle"single])(find-things-fast .[(20111123)()"An emacs mode to find things fast and move around in a project quickly"tar])(color-theme-gruber-darker .[(1)((color-theme (6 6 1)))"Gruber Darker color theme for Emacs by Jason Blevins"single])(dna-mode .[(1 44)()"a major mode for editing dna sequences"single])(perl-myvar .[(1 25)()"Declare lexicaly scoped vars as my()."single])(nlet .[(1 10)()"schemes 'named let' for emacs."single])(ssh-config-mode .[(1 13)()"Mode for fontification of ~/.ssh/config"single])(win-switch .[(1 0 8)()"fast, dynamic bindings for window-switching/resizing"single])(j-mode .[(0 3)()"Major mode for editing J programs"single])(nginx-mode .[(1 1)()"major mode for editing nginx config files"single])(vimgolf .[(0 9 2)()"VimGolf interface for the One True Editor"single])(flymake-csslint .[(1 1 0)((flymake (0 3)))"making flymake work with CSSLint"tar])(typing .[(1 1 4)()"A game for fast typers, inspired by The Typing Of The Dead."single])(zenburn-theme .[(1 8)()"A low contrast color theme for Emacs."single])(solarized-theme .[(0 5 0)()"The Solarized color theme, ported to Emacs."tar])(etags-select .[(1 13)()"Select from multiple tags"single])(etags-table .[(1 1)()"Set tags table(s) based on current file"single])(tintin-mode .[(1 0 0)()"Mayor mode for editing tintin++ scripts"single])(org-cua-dwim .[(0 5)()"Org-mode and Cua mode compatibility layer"single])(otp .[(1 0)()"a one-time password creator"single])(bookmark+ .[(20111214)()"Bookmark Plus"tar])(sentence-highlight .[(0 1)()"highlight the current sentence"single])(smartrep .[(0 0 3)()"Support sequential operation which omitted prefix keys."single])(tabula-rasa-mode .[(0 1 0)()"Distraction free writing mode"single])(abl-mode .[(0 9 0)()"Python TDD minor mode"single])(groovy-mode .[(20110609)()"Groovy mode derived mode"single])(grails-mode .[(0 1)()"minor-mode that adds some Grails project management to a grails project"single])(inf-groovy .[(2 0)()"minor-mode that adds some Grails project management to a grails project"single])(tidy .[(2 12)()"Interface to the HTML Tidy program"single])(httpcode .[(0 1)()"explains the meaning of an HTTP status code"single])(d-mode .[(2 0 4)()"D Programming Language mode for (X)Emacs"tar])(git-commit .[(0 1)()"Major mode for editing git commit messages"single])(color-theme-library .[(0 0 10)((color-theme (6 6 1)))"The real color theme functions"single])(sauron .[(0 8)()"Track (erc/org/dbus/...) events and react to them."tar])(rcirc-ucomplete .[(1 0 1)()"Unambiguous non-cycling completion for rcirc"single])(cl-format .[(1 0)()"CL format routine."tar])(color-theme-cobalt .[(0 0 2)((color-theme (6 6 1)))"Cobalt Color Theme for Emacs"single])(refheap .[(0 0 3)()"A library for pasting to https://refheap.com"single])(ctags-update .[(0 1 2)()"auto update TAGS in parent directory using exuberant-ctags -*- coding:utf-8 -*-"single])(peep-open .[(0 0 2)()"PeepOpen plugin for emacs."single])(org-mime .[(20120112)()"org html export for text/html MIME emails"single])(eh-basic .[(0 0 2)((starter-kit (2 0 2)) (browse-kill-ring (1 3 1)))"tuamshu's emacs basic configure"tar])(eh-gnus .[(0 0 6)()"tuamshu's gnus configure"tar])(eh-functions .[(0 0 1)((starter-kit (2 0 2)))"tuamshu's emacs functions"tar])(eh-keybindings .[(0 0 1)((eh-functions (0 0 1)) (starter-kit-bindings (2 0 2)))"tuamshu's emacs keybindings"tar])(magit-gh-pulls .[(0 3)((gh (0 4 3)) (magit (1 1 0)))"GitHub pull requests extension for Magit"single])(highlight-80+ .[(1 0)()"highlight characters beyond column 80"single])(jump-char .[(0 1)()"navigation by char"single])(color-theme-molokai .[(0 1)()"Molokai color theme by Lloyd"single])(pointback .[(0 2)()"Restore window points when returning to buffers"single])(uci-mode .[(1 0 0)()"Major mode for UCI configuration files"single])(erlang .[(2 4 1)()"Major modes for editing and running Erlang"single])(thumb-through .[(0 3)()"Plain text reader of HTML documents"single])(unbound .[(0 1)()"find convenient unbound keystrokes"single])(ido-better-flex .[(0 0 2)()"A better flex (fuzzy) algorithm for Ido."single])(popup .[(0 5)()"Visual Popup User Interface"single])(fancy-mode .[(0 1)()"Major mode for programming with the Fancy language."single])(haxe-mode .[(0 3 1)()"An Emacs major mode for haXe"single])(expand-region .[(0 8 0)()"Increase selected region by semantic units."tar])(ack-and-a-half .[(1 1 3)()"Yet another front-end for ack"single])(test-case-mode .[(0 1 8)()"unit test front-end"single])(multi-eshell .[(0 0 1)()"makes it easier to use multiple shells within emacs"single])(mo-git-blame .[(0 1 0)()"An interactive, iterative 'git blame' mode for Emacs"single])(slime-js .[(0 0 1)((slime-repl (20100404)) (slime (20100404)))"Slime extension for swank-js."single])(smooth-scroll .[(1 2)()"Minor mode for smooth scrolling and in-place scrolling."single])(xlicense .[(1 1)()"Insert pre-defined license text"tar])(flymake-d .[(0 1)()"A flymake handler for d-mode files"single])(flymake-tuareg .[(0 1)()"A flymake handler for tuareg-mode files"tar])(track-closed-files .[(0 1)()"Keep track of recently closed files"single])(color-theme-monokai .[(0 0 5)((color-theme (6 5 5)))"Monokai Color Theme for Emacs."single])(drupal-mode .[(0 2 0)((php-mode (1 5 0)))"Advanced minor mode for Drupal development"tar])(screen-lines .[(0 55)()"a minor mode for screen-line-based point motion"single])(ctypes .[(1 2)()"Enhanced Font lock support for custom defined types."single])(moinmoin-mode .[(1 0)((screen-lines (0 55)))"a major mode to edit MoinMoin wiki pages"single])(pc-mode .[(0 1)()"major mode for editing PC code,"single])(mediawiki .[(2 2 3)()"mediawiki frontend"single])(workspaces .[(0 1)()"Workspaces for Emacsen "single])(pivotal-tracker .[(1 2 0)()"Interact with Pivotal Tracker through its API"single])(sublime .[(0 0 7)((coffee-mode (0 3 0)) (find-file-in-project (3 0)) (haml-mode (3 0 14)) (ido-ubiquitous (1 0)) (less-css-mode (0 6)) (magit (1 1 1)) (markdown-mode (1 8 1)) (monokai-theme (0 0 6)) (paredit (22)) (sass-mode (3 0 14)) (smex (1 1 2)) (yaml-mode (0 0 7)) (yasnippet (0 6 1)))"REQUIRES EMACS 24 - Sublime Text 2 Emulation for Emacs"tar])(logito .[(0 1)((eieio (1 3)))"logging library for Emacs"single])(jade-mode .[(0 1)()"Major mode for editing jade templates."single])(stylus-mode .[(0 1)()"Major mode for editing stylus templates."single])(sws-mode .[(0 1)()"SWS mode"single])(javap .[(8)()"Javap major mode"single])(javap-mode .[(9)()"Javap major mode"single])(anything-show-completion .[(20091119)()"Show selection in buffer for anything completion"single])(pastels-on-dark-theme .[(0 3)()"Pastels on Dark theme for Emacs 24"single])(color-theme-solarized .[(20120301)()"Solarized themes for Emacs"tar])(deferred .[(0 3 1)()"Simple asynchronous functions for emacs lisp"single])(concurrent .[(0 3 1)((deferred (0 3 1)))"Concurrent utility functions for emacs lisp"single])(epc .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)))"A RPC stack for the Emacs Lisp"single])(edbi .[(0 1 1)((concurrent (0 3 1)) (ctable (0 1 1)) (epc (0 1 1)))"Emacs Database Interface"tar])(color-theme .[(6 5 5)()"install color themes"single])(cacoo .[(2 1 2)((concurrent (0 3 1)))"Minor mode for Cacoo : http://cacoo.com"tar])(imgur .[(0 1)((anything (1 287)))"imgur client for Emacs"single])(tango-2-theme .[(1 0 0)()"Tango 2 color theme for GNU Emacs 24"single])(puppet-mode .[(0 2)()"A simple mode for editing puppet manifests"single])(po.foo .[(3 0 20)((haml-mode (3 0 20)))"Sass major mode"single])(po.elscreen .[(1 4 6)()" Screen for Emacsen(this is not original)"single])(po-elscreen .[(1 4 6)()" Screen for Emacsen(this is not original. original is http://www.morishima.net/~naoto/elscreen-en/?lang=en)"single])(quack .[(0 42)()"enhanced support for editing and running Scheme code"single])(dired+ .[(21 2)()"Extensions to Dired."single])(rspec-mode .[(1 6)((ruby-mode (1 0)))"Enhance ruby-mode for RSpec"single])(fakir .[(0 0 16)()"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 9)()"REQUIRES EMACS 24: Monokai Color Theme for Emacs."single])(fuzzy .[(0 1)()"Fuzzy Matching"single])(auto-complete .[(1 4)((popup (0 5)))"Auto Completion for GNU Emacs"tar])(bitlbee .[(1 0)()"Help get Bitlbee (http://www.bitlbee.org) up and running"single])(lorem-ipsum .[(0 1)()"Insert dummy pseudo Latin text."single])(typopunct .[(1 0)()"Automatic typographical punctuation marks"single])(twittering-mode .[(2 0 0)()"Major mode for Twitter"single])(flymake-phpcs .[(1 0 5)((flymake (0 3)))"Flymake handler for PHP to invoke PHP-CodeSniffer"tar])(flex-autopair .[(0 3)()"Automatically insert pair braces and quotes, insertion conditions & actions are highly customizable."single])(color-theme-dawn-night .[(1 0)()"color theme of dawn and night."single])(weather .[(2012 3 27 2)()"Get weather reports via worldweatheronline.com"single])(flymake-perlcritic .[(1 0 3)((flymake (0 3)))"Flymake handler for Perl to invoke Perl::Critic"tar])(jsshell-bundle .[(2012 4 7)()"JSShell generated bundle"single])(rfringe .[(1 0 1)()"indicate relative locations in the fringe"single])(flyphpcs .[(1 0 1)()"Flymake for PHP via PHP-CodeSniffer"single])(defaultcontent .[(1 4)()"a templating tool. Fill new files with default content."single])(flymake-for-jslint-for-wsh .[(1 3 0)((flymake (0 3)))"use flymake with js code, on Windows"single])(tfs .[(0 2 7)()"MS Team Foundation Server commands for Emacs."single])(dropdown-list .[(1 45)()"Drop-down menu interface"single])(thesaurus .[(2012 4 7)()"replace a word with a synonym looked up in a web service."single])(fly-jshint-wsh .[(2 0 3)((flymake (0 3)))"use flymake with jshint on js code, on Windows"single])(watch-buffer .[(1 0 1)()"run a shell command when saving a buffer"single])(smarter-compile .[(2012 4 9)()"a smarter wrapper for `compile'"single])(hungry-delete .[(1 0)()"hungry delete minor mode"single])(align-cljlet .[(0 3)((clojure-mode (1 11 5)))"Space align various Clojure forms "single])(idomenu .[(0 1)()"imenu tag selection with ido"single])(drag-stuff .[(0 0 4)()"Drag stuff (lines, words, region, etc...) around"single])(w32-registry .[(2012 4 6)()"read the registry from elisp"single])(jsshell .[(2012 4 7)()"Run a javascript command interpreter in emacs on Windows."single])(shadchen .[(1 0)()"pattern matching for elisp"single])(cycbuf .[(0 5 0)()"Cycle buffers code by Martin Pohlack, inspired by"single])(yascroll .[(0 2 0)()"Yet Another Scroll Bar Mode"single])(anything-exuberant-ctags .[(0 1 2)()"Exuberant ctags anything.el interface"single])(ess .[(5 14)()"Edit and interact with statistical programs like R, S-Plus, SAS, Stata and JAGS"tar])(anything-git-goto .[(0 1 0)()"Quick listing of:"single])(twilight-theme .[(1 0 0)()"Twilight theme for GNU Emacs 24 (deftheme)"single])(jtags .[(0 97)()"enhanced tags functionality for Java development"single])(jtags-extras .[(0 3 0)()"jtags related functionality for Java development"single])(phantomjs .[(0 0 11)()"Control phantomjs from Emacs			"tar])(oz .[(16513)()"Major mode for editing Oz programs"tar])(load-theme-buffer-local .[(0 0 2)()"Install emacs24 color themes by buffer."single])(color-theme-buffer-local .[(0 0 2)()"Install color-themes by buffer."single])(elisp-depend .[(1 0 2)()"Parse depend libraries of elisp file."single])(key-chord .[(0 5 20080915)()"map pairs of simultaneously pressed keys to commands"single])(shell-here .[(1 1)()"Open a shell relative to the working directory"single])(symbols-mode .[(0 3)()"List symbols of object files"single])(handlebars-mode .[(1 3)()"A major mode for editing Handlebars files."single])(dircmp .[(1)()"Compare and sync directories."single])(ascii .[(3 1)()"ASCII code display."single])(frame-tag .[(0 1 0)()"Minor mode that assigns a unique number to each frame for easy switching"single])(org-blog .[(1 18 1 1)()"create and publish a blog with org-mode"single])(ruby-tools .[(0 1 0)()"Collection of handy functions for ruby-mode"single])(unfill .[(0 1)()"The inverse of fill-paragraph and fill-region"single])(modeline-posn .[(22 0)()"Set up `mode-line-position'."single])(mark-multiple .[(1 0)()"A library that sorta lets you mark several regions at once"single])(mark-more-like-this .[(1 0)()"Mark additional regions in buffer matching current region."single])(openwith .[(20120531)()"Open files with external programs"single])(isearch+ .[(21 0)()"Extensions to `isearch.el'."single])(mouse+ .[(21 0)()"Extensions to `mouse.el'."single])(zencoding-mode .[(0 5 1)()"Unfold CSS-selector-like expressions to markup"single])(smart-mode-line .[(1 7 1)()"A color coded smart mode-line."single])(flymake .[(0 4 13)()"a universal on-the-fly syntax checker"single])(slime-ritz .[(0 6 0)()"slime extensions for ritz"single])(r-autoyas .[(0 28)()"Provides automatically created yasnippets for R function argument lists."single])(key-combo .[(1 5 1)()"map key sequence to commands"single])(ujelly-theme .[(1 0 20)()"Ujelly theme for GNU Emacs 24 (deftheme)"single])(guru-mode .[(0 1)()"Become an Emacs guru"single])(zen-and-art-theme .[(1 0 1)()"zen and art color theme for GNU Emacs 24"single])(save-visited-files .[(1 3)()"save opened files across sessions"single])(ruby-end .[(0 2 0)()"Automatic insertion of end blocks for Ruby"single])(git-auto-commit-mode .[(4 2 1)()"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 .[(0 4 1 20130410)((php-mode (1 5 0)))"Extra features for `php-mode'"tar])(repository-root .[(1 0 3)()"deduce the repository root directory for a given file"single])(grep-a-lot .[(1 0 6)()"manages multiple search results buffers for grep.el"single])(grep-o-matic .[(1 0 4)()"auto grep word under cursor"single])(el-spec .[(0 2)()"ruby's rspec like syntax test frame work"single])(wc-mode .[(1 1)()"Running word count with goals (minor mode)"single])(legalese .[(1 0)()"Add legalese to your program files"single])(scad-mode .[(90 0)()"SCAD mode derived mode"single])(android-mode .[(0 2 1)()"Minor mode for Android application development"single])(ttl-mode .[(0 1)()"mode for Turtle(RDF)"single])(zeitgeist .[(0 1)()"integrates Emacs with Zeitgeist."single])(dispass .[(1)()"Generate and disperse/dispell passwords"single])(writegood-mode .[(1 2)()"Polish up poor writing on the fly"single])(nrepl .[(0 1 7)((clojure-mode (2 0 0)))"Client for Clojure nREPL"single])(fill-column-indicator .[(1 83)()"Graphically indicate the fill column"single])(shell-switcher .[(0 1 5 1)()"Easily switch between shell buffers, like with alt+tab."tar])(github-theme .[(0 0 3)()"Github color theme for GNU Emacs 24"single])(sokoban .[(1 23)()"Play the Sokoban game in emacs"single])(package-store .[(0 3)()"a package cache"single])(python-mode .[(6 0 10)()"Python major mode"tar])(code-headers .[(0 7)()"Navigate code with headers embedded in comments.  -*- mode: Emacs-Lisp; lexical-binding: t; -*"single])(dix .[(0 1 0)()"minor mode for editing Apertium XML dictionary files"single])(tron-theme .[(12)()"A theme loosely based on Tron: Legacy colors"single])(no-easy-keys .[(1 0 2)()"Learn the proper Emacs movement keys"single])(makefile-runner .[(1 1 2)()"Searches for Makefile and fetches targets"single])(elnode .[(0 9 9 6 7)((web (0 1 4)) (creole (0 8 14)) (fakir (0 0 14)) (db (0 0 5)) (kv (0 0 9)))"The Emacs webserver."tar])(midje-mode .[(0 1 2)((slime (1 0)) (clojure-mode (1 0)))"Minor mode for running Midje tests in emacs, see: https://github.com/dnaumov/midje-mode"tar])(gnusnotes .[(0 9 2)()"Adding per-message notes in gnus summary buffer"single])(rinari .[(2 10)((ruby-mode (1 0)) (inf-ruby (2 2 1)) (ruby-compilation (0 8)) (jump (2 0)))"Rinari Is Not A Rails IDE"single])(web .[(0 3 6)()"useful HTTP client -*- lexical-binding: t -*-"single])(eredis .[(0 5 0)()"eredis, a Redis client in emacs lisp"single])(multi-project .[(0 0 8)()"Easily work with multiple projects."single])(bbdb2erc .[(0 1 0)()"make bbdb show if pal is online with ERC, click i to chat"single])(egison-mode .[(0 1 3)()"Egison editing mode"single])(mongo .[(0 5)()"A MongoDB client."tar])(cm-mode .[(0 1 0)()"Wrapper for CodeMirror-style Emacs modes"single])(ruby-test-mode .[(1 5)((ruby-mode (1 0)))"Minor mode for Behaviour and Test Driven"single])(marmalade-test .[(0 0 1)()"A test tarball package."tar])(ruby-mode .[(1 1)()"ruby-mode package"tar])(hjkl-mode .[(0 1)((key-chord (0 5)))"import some vim's key bindings"tar])(edit-list .[(0 4)()"edit a single list"single])(persistent-soft .[(0 8 6)((pcache (0 2 3)) (list-utils (0 2 0)))"Persistent storage, returning nil on failure"single])(hippie-namespace .[(0 5 6)()"Special treatment for namespace prefixes in hippie-expand"single])(nav-flash .[(1 0 8)()"Briefly highlight the current line"single])(ucs-utils .[(0 7 2)((persistent-soft (0 8 6)) (pcache (0 2 3)))"Utilities for Unicode characters"single])(back-button .[(0 6 4)((nav-flash (1 0 0)) (smartrep (0 0 3)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Visual navigation through mark rings"single])(nsis-mode .[(0 44)()"NSIS-mode"single])(window-end-visible .[(0 0 3)()"Find the last visible point in a window"single])(unicode-enbox .[(0 1 3)((string-utils (0 0 1)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Surround a string with box-drawing characters"single])(dynamic-fonts .[(0 6 2)((font-utils (0 6 8)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Set faces based on available fonts"single])(minimal-session-saver .[(0 6 0)()"Very lean session saver"single])(unicode-progress-reporter .[(0 5 3)((emacs (24 1 0)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Progress-reporter with fancy characters"single])(mongo-elnode .[(0 5 0)((mongo (0 5)) (elnode (0 9 9)))"elnode adapter for mongo-el"single])(eimp .[(1 4 0)()"Emacs Image Manipulation Package"single])(org-presie .[(0 0 5)((framesize (0 0 1)) (eimp (1 4 0)) (org (7 8 9)))"simple presentation with an org file"single])(ido-load-library .[(0 1 2)((persistent-soft (0 8 6)) (pcache (0 2 3)))"Load-library alternative using ido-completing-read"single])(ac-nrepl .[(0 17)((nrepl (0 1)) (auto-complete (1 4)))"auto-complete sources for Clojure using nrepl completions"single])(applescript-mode .[(1 1)()"major mode for editing AppleScript source"single])(ssh .[(1 2)()"Support for remote logins using ssh."single])(nrepl-ritz .[(0 6 0)((nrepl (0 1 5)))"nrepl extensions for ritz"single])(doctags .[(0 1)()"Generation of tags documentation in Doxygen syntax"single])(buffer-utils .[(0 0 3)()"Buffer-manipulation utility functions"single])(lisp-editing .[(0 0 5)()"lisp editing tools"single])(exec-path-from-shell .[(0 4)()"Make Emacs use the $PATH set up by the user's shell"single])(go-play .[(0 0 1)()"Paste to play.golang.org"single])(yagist .[(0 8 3)((json (1 2 0)))"Yet Another Emacs integration for gist.github.com"single])(margo .[(2012 9 18)((web (0 1 8)) (json (1 2)))"Client for MarGo, providing Go utilities"single])(shoes-off .[(0 1 8)((kv (0 0 5)) (anaphora (0 0 4)))"irc bouncer"single])(multiple-cursors .[(1 2 1)()"Multiple cursors for Emacs."tar])(eshell-manual .[(0 0 3)()"An updated manual for Eshell."tar])(plantuml-mode .[(0 2)()"Major mode for plantuml"single])(hackernews .[(0 1)((json (1 2)))"Access the hackernews aggregator from Emacs"tar])(esk .[(0 1)()"Emacs Search Kit - An easy way to find files and/or strings in a project"tar])(hide-comnt .[(40)()"Hide/show comments in code."tar])(pretty-mode-plus .[(1 1)()"Redisplay parts of the buffer as pretty symbols."tar])(s .[(1 3 1)()"The long lost Emacs string manipulation library."single])(gitconfig-mode .[(0 3)()"Major mode for editing .gitconfig files -*- lexical-binding: t; -*-"single])(git-commit-mode .[(0 11)()"Major mode for editing git commit messages -*- lexical-binding: t; -*-"single])(db .[(0 0 6)((kv (0 0 11)))"A database for EmacsLisp  -*- lexical-binding: t -*-"single])(notmuch-labeler .[(0 1)()"Improves notmuch way of displaying labels through fonts, pictures, and hyperlinks."tar])(gitignore-mode .[(0 1)()"Major mode for editing .gitconfig files"single])(save-packages .[(0 20121012)()"save and restore installed packages"single])(cmake-project .[(0 6)()"Integrates CMake build process with Emacs"single])(combinators .[(0 0 1)()"-*- lexical-binding: t; -*-"single])(livescript-mode .[(0 0 1)()"Major mode for LiveScript files in Emacs"single])(visible-color-code .[(0 0 1)()"color code strings in current buffer, this elisp show you one as real color."single])(dash .[(1 1 0)()"A modern list library for Emacs"single])(seclusion-mode .[(1 1 1)()"Edit in seclusion. A Dark Room mode."single])(pde .[(0 2 16)()"Perl Development Environment"tar])(tt-mode .[(20121117 2045)()"Emacs major mode for editing Template Toolkit files."tar])(pod-mode .[(20121117 2120)()"Major mode for editing .pod-files."tar])(ercn .[(1 0 2)()"Flexible ERC notifications"single])(bufshow .[(0 1 0)()"A simple presentation tool for Emacs."tar])(parenface-plus .[(1 1)()"Provide a face for parens in lispy modes."tar])(el-x .[(0 2 1)((cl-lib (0 2)))"Emacs-lisp extensions."tar])(json-mode .[(0 1 2)()"Major mode for editing JSON files"single])(buffer-stack .[(1 5)()"Enhanced intelligent switch-to-other-buffer replacement."single])(ag .[(0 15)()"A front-end for ag, the C ack replacement."single])(gnomenm .[(0 0 3)()"Emacs interface to Gnome nmcli command"single])(sequence .[(0 0 1)()"makes sequences of numbers -*- lexical-binding: t -*-"single])(rvm .[(1 3 0)()"Emacs integration for rvm"single])(soothe-theme .[(0 3 16)((emacs (24 1)))"a dark colorful theme for Emacs24."single])(macro-utils .[(1 0)()"Utilities for writing macros."single])(toml-mode .[(0 1 3)()"Mojor mode for editing TOML files"single])(cryptol-mode .[(0 0 2)()"Cryptol major mode for Emacs"single])(paste-kde .[(0 1)((web (0 3 6)))"paste text to KDE's pastebin service"single])(proc-net .[(0 0 1)()"network process tools"single])(drupal-spell .[(0 2 1)()"Aspell extra dictionary for Drupal"tar])(thread-dump .[(1 0)()"java thread dump viewer"single])(bitly .[(1 0)()"Shorten URLs using the bitly.com shortener service"single])(color-theme-heroku .[(1 0 0)()"Heroku color theme"single])(github-browse-file .[(0 2 1)()"View the file you're editing on GitHub"single])(alert .[(0 5 10)((string-utils (0 0 2)))"Alternatives to `message'"single])(org-readme .[(20130322 924)((http-post-simple (1 0)) (yaoddmuse (0 1 1)) (header2 (21 0)) (lib-requires (21 0)))"Integrates Readme.org and Commentary/Change-logs."single])(yaoddmuse .[(0 1 1)()"Yet another oddmuse for Emacs"single])(unicode-fonts .[(0 3 4)((font-utils (0 6 8)) (ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"Configure Unicode fonts"single])(button-lock .[(0 9 10)()"Clickable text defined by regular expression"single])(wiki-nav .[(0 6 4)((button-lock (0 9 6)) (nav-flash (1 0 0)))"Simple file navigation using [[WikiStrings]]"single])(unicode-whitespace .[(0 2 3)((ucs-utils (0 7 2)) (persistent-soft (0 8 6)) (pcache (0 2 3)))"teach whitespace-mode about fancy characters"single])(ecb-snapshot .[(20120830)()"Emacs Code Browser CVS snapshot"tar])(pabbrev .[(3 1)()"Predictive abbreviation expansion"single])(ignoramus .[(0 6 4)()"Ignore backups, build files, et al."single])(flyspell-lazy .[(0 6 4)()"Improve flyspell responsiveness using idle timers"single])(browse-url-dwim .[(0 6 4)((string-utils (0 0 3)))"Context-sensitive external browse URL or Internet search"single])(fixmee .[(0 8 2)((button-lock (0 9 8)) (nav-flash (1 0 0)) (back-button (0 6 0)) (smartrep (0 0 3)) (string-utils (0 0 6)) (tabulated-list (0)))"Quickly navigate to FIXME notices in code"single])(kv .[(0 0 15)()"key/value data structure functions"single])(less-css-mode .[(0 12)()"Major mode for editing LESS CSS files (lesscss.org)"single])(oauth .[(1 0 3)()"An Emacs oauth client. See https://github.com/psanford/emacs-oauth/"tar])(tumblesocks .[(0 0 5)((htmlize (1 39)) (oauth (1 0 3)) (markdown-mode (1 8 1)))"An Emacs tumblr client."tar])(uuid .[(0 0 3)()"UUID's for EmacsLisp"single])(mustache-mode .[(1 2)()"A major mode for editing Mustache files."single])(erc-hl-nicks .[(1 3 1)()"ERC nick highlighter that ignores uniquifying chars when colorizing"single])(pcmpl-args .[(0 1 1)()"Enhanced shell command completion    -*- lexical-binding: t -*-"single])(el-autoyas .[(0 5)()"Automatically create Emacs-Lisp Yasnippets"single])(anaphora .[(0 1 0)()"anaphoric macros providing implicit temp variables"single])(textmate-to-yas .[(0 17)()"Import Textmate macros into yasnippet syntax"single])(ghci-completion .[(0 1 3)()"Completion for GHCi commands in inferior-haskell buffers -*- lexical-binding: t; -*-"single])(slim-mode .[(1 1)()"Major mode for editing Slim files"single])(google-translate .[(0 3 2)()"Emacs interface to Google Translate"single])(list-utils .[(0 3 0)()"List-manipulation utility functions"single])(pcre2el .[(1 1)()"PCRE/Elisp/rx/SRE regexp syntax converter and utilities"single])(font-utils .[(0 6 8)((persistent-soft (0 8 6)) (pcache (0 2 3)))"Utility functions for working with fonts"single])(rcirc-robots .[(0 0 7)((kv (0 0 8)) (anaphora (0 0 5)))"robots based on rcirc irc -*- lexical-binding: t -*-"single])(org-ehtml .[(0 20120928)((elnode (0 9 9)) (org-plus-contrib (20120928)))"Export Org-mode files as editable web pages"tar])(geiser .[(0 3)()"GNU Emacs and Scheme talk to each other"tar])(diff-hl .[(1 4 4)((cl-lib (0 2)))"Highlight uncommitted changes -*- lexical-binding: t -*-"single])(virtualenv .[(1 2)()"Virtualenv for Python  -*- coding: utf-8 -*-"single])(sprintly-mode .[(0 0 4)((furl (0 0 2)))"Major mode for dealing with sprint.ly"single])(text-language .[(0 20121008)()"tracking, setting, guessing language of text"single])(color-theme-sanityinc-solarized .[(2 24)()"A version of Ethan Schoonover's Solarized themes"tar])(typo .[(1 1)()"Minor mode for typographic editing"single])(ws-trim .[(1 4)()"Tools and minor mode to trim whitespace on text lines"single])(flymake-checkers .[(0 3)()"Flymake reloaded with useful checkers"single])(hardhat .[(0 3 6)((ignoramus (0 6 2)))"Protect against clobbering user-writable files"single])(string-utils .[(0 2 8)((list-utils (0 1 2)))"String-manipulation utilities"single])(smooth-scrolling .[(1 0 1)()"Make emacs scroll smoothly"single])(flymake-go .[(2013 3 14)((flymake (0 4 13)))"A flymake handler for go-mode files"single])(gitty .[(1 0)()"vc-mode extension for fast git interaction"single])(mote-mode .[(1 0 0)((ruby-mode (1 1)))"Mote minor mode"single])(hideshowvis .[(0 5)()"Add markers to the fringe for regions foldable by hideshow.el"single])(inflections .[(1 1)()"convert english words between singular and plural"single])(findr .[(0 7)()"Breadth-first file-finding facility for (X)Emacs"single])(smart-forward .[(1 0 0)((expand-region (0 8 0)))"Semantic navigatioin"single])(osx-browse .[(0 8 6)((browse-url-dwim (0 6 2)))"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 0)()"Vector-manipulation utility functions"single])(config-block .[(0 0 1)()"config-block is utility for individual settings (e.g. .emacs)."single])(namakemono .[(0 0 1)()"utility function set for namakemono"single])(bang .[(0 1 0)()"A modern list library for Emacs"single])(roy-mode .[(0 1 0)()"Roy major mode"single])(pcsv .[(1 3 1)()"Parser of csv -*- lexical-binding: t -*-"single])(wgrep-ack .[(0 1 1)((wgrep (2 1 1)))"Writable ack-and-a-half buffer and apply the changes to files"single])(flymake-lua .[(1 0)()"Flymake for Lua"single])(rcirc-color .[(0 2)()"color nicks"single])(inform-mode .[(1 6 1)()"Major mode for Inform 6 interactive fiction code"single])(expectations-mode .[(0 0 4)((nrepl (0 1 5)) (clojure-mode (1 11)))"Minor mode for expectations tests"single])(octomacs .[(0 0 1)()"Octopress interface for Emacs"single])(highlight .[(21 0)()"Highlighting commands."single])(region-list-edit .[(20100530 808)()"Add/delete a region into/from a region list, such as ‘((4 . 7) (11 . 15) (17 . 17) (20 . 25))."single])(zjl-hl .[(20121028 1901)((highlight (21 0)) (region-list-edit (20100530 808)))"Highlight variable and function call and others in c/emacs, make life easy."single])(simp .[(0 2 0)()"Simple project definition, chiefly for project file finding and grepping."tar])(pyde .[(0 6)((pymacs (0 25)) (auto-complete (1 4)) (yasnippet (0 8)) (fuzzy (0 1)) (pyvirtualenv (1 0)))"Python Development Environment"single])(truthy .[(0 2 6)((list-utils (0 1 2)))"Test the content of a value"single])(syntactic-sugar .[(0 9 2)()"Effect-free forms such as if/then/else"single])(elpakit .[(0 0 19)((anaphora (0 0 6)) (dash (1 0 3)))"package archive builder"single])(bug-reference-github .[(0 1 0)()"Automatically set `bug-reference-url-format' in Github repositories."single])(color-theme-sanityinc-tomorrow .[(1 9)()"A version of Chris Kempson's various Tomorrow themes"tar])(macrostep .[(0 3)()"interactive macro stepper for Emacs Lisp"single])(qsimpleq-theme .[(0 1 3)()"Based on solarized color theme for Emacs."single])(flymake-easy .[(0 5)()"Helpers for easily building flymake checkers"single])(flymake-ruby .[(0 8)((flymake-easy (0 1)))"A flymake handler for ruby-mode files"single])(flymake-shell .[(0 8)((flymake-easy (0 1)))"A flymake syntax-checker for shell scripts"single])(flymake-coffee .[(0 10)((flymake-easy (0 1)))"A flymake handler for coffee script"single])(flymake-php .[(0 5)((flymake-easy (0 1)))"A flymake handler for php-mode files"single])(flymake-sass .[(0 6)((flymake-easy (0 1)))"Flymake handler for sass files"single])(flymake-css .[(0 3)((flymake-easy (0 1)))"Flymake support for css using csslint"single])(flymake-haml .[(0 7)((flymake-easy (0 1)))"A flymake handler for haml files"single])(flymake-jslint .[(0 9)((flymake-easy (0 1)))"A flymake handler for javascript using jslint"single])(ess-smart-underscore .[(0 74)()"Ess Smart Underscore"single])(skinny .[(0 0 3)((elnode (0 9 9 6 1)) (creole (0 8 17)))"a blog engine with elnode -*- lexical-binding: t -*-"single])(auto-indent-mode .[(0 97)()"Auto indent Minor mode"single])(pyvirtualenv .[(1 1)()"Python Pyvirtualenv support"single])(find-file-in-repository .[(1 3)()"Quickly find files in a git, mercurial or other repository"single])(page-break-lines .[(0 7)()"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 .[(0 9)((auto-complete (1 4)) (fuzzy (0 1)) (yasnippet (0 8)) (virtualenv (1 2)) (highlight-indentation (0 5 0)) (find-file-in-project (3 2)) (idomenu (0 1)) (nose (0 1 1)) (iedit (0 97)))"Emacs Lisp Python Environment"tar])(ace-jump-mode .[(2 0 0 0)()"a quick cursor location minor mode for emacs -*- coding: utf-8-unix -*-"single])(osx-location .[(0 2)()"Watch and respond to changes in geographical location on OS X"tar])(elpa-audit .[(0 4)()"Handy functions for inspecting and comparing package archives"single])(multi-web-mode .[(0 1)()"multiple major mode support for web editing"single])(flycheck .[(0 8)((s (1 3 1)) (dash (1 0 3)))"Flymake done rightFlycheck provides on-the-fly syntax checker with- major-mode based checkers,- simple declarative checker definitions,- built-in checkers for many languages,- standard error navigation,- easy customization,- and a clean, concise and understandable implementation."tar])(chicken-scheme .[(1 0 4)()"Scheme-mode extensions for Chicken Scheme"single])(minimap .[(1 0)()"Sidebar showing a \"mini-map\" of a buffer"single])(session-manager .[(0 5)()"Support for the Gnome Session Manager"single])(ctable .[(0 1 1)()"Table component for Emacs Lisp"single])(grr .[(1 0 0)()"Simple Growl notifications for Emacs and Mac OS X"single])(simpleclip .[(0 2 2)()"Simplified access to the system clipboard"single])(esxml .[(0 1 5)((kv (0 0 5)))"Library for working with xml via esxml and sxml"single])(cpputils-cmake .[(0 3 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 2)()"Buffer modification tracking"single])(lui .[(1 1)((tracking (1 2)))"Linewise User Interface"tar])(circe .[(1 1 1)((lui (1 1)) (lcs (1 1)))"Client for IRC in Emacs"tar])(iedit .[(0 97)()"Edit multiple regions in the same way simultaneously."tar])(let-recur .[(0 0 5)()"Simplified implementation of recur -*- lexical-binding:t -*-"single])(wgrep-helm .[(0 1 0)((wgrep (2 1 1)))"Writable helm-grep-mode buffer and apply the changes to files"single])(otter-mode .[(1 2)()"Major mode for source files of the Otter automated theorem prover"single])(sql-indent .[(1 10)()"indentation of SQL statements"single])(maildir .[(0 0 14)()"a full maildir handling tool -*- lexical-binding: t -*-"single])(huskie .[(0 0 1)((anaphora (0 0 6)))"chainsaw powered logging"single])(tabbar-ruler .[(0 27)((tabbar (2 0 1)))"Setup tabbar to look pretty..."single])(color-theme-x .[(1 3)()"convert color themes to X11 resource settings"single])(gplusify .[(1 0)()"Add Google Plus markup to a piece of code"single])(diatheke .[(1 0)()"A minor mode using the diatheke command-line Bible tool"single])(inf-ruby .[(2 2 4)()"Run a ruby process in a buffer"single])(extend-dnd .[(0 5)()"R drag and Drop"single])(wxwidgets-help .[(0 0 3)()"Look up wxWidgets API by using local html manual."tar])(sudden-death .[(0 2)()"Totsuzen-no-Shi"single])(fold-this .[(0 1 0)()"Just fold this region please"single])(dart-mode .[(0 9)()"Major mode for editing Dart files"single])(subshell-proc .[(0 2)()"Functions for working with comints"single])(pg .[(0 12)()"Emacs Lisp interface to the PostgreSQL RDBMS"single])(db-pg .[(0 0 3)((pg (0 12)) (db (0 0 6)))"A PostgreSQL adapter for emacs-db"single])(hippie-expand-haskell .[(0 0 1)()"Hippie expand try function using ghc's completion function."single])(slamhound .[(2 0 0)()"Rip Clojure namespaces apart and rebuild them."single])(clojure-mode .[(2 1 0)()"Major mode for Clojure code"single])(clojure-test-mode .[(2 1 0)((clojure-mode (1 7)) (nrepl (0 1 7)))"Minor mode for Clojure tests"single])(late-night-theme .[(0 0)()"Late Night theme for Emacs 24"single])(creole-mode .[(0 0 4)()"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 .[(0 0 4)()"Comment/uncomment lines efficiently. Like Nerd Commenter in Vim"tar])(projectile .[(0 8)((s (1 0 0)) (dash (1 0 0)))"Manage and navigate projects in Emacs easily"single])(keyfreq .[(0 0 3)((json (1 2)))"track command frequencies"single])(robe .[(0 7 1)((inf-ruby (2 2 4)))"Code navigation, documentation lookup and completion for Ruby"tar])(dropbox .[(0 9)((json (1 2)) (oauth (1 0 3)))"Emacs backend for dropbox"single])(simple-mode-line .[(0 1)()"Simplified Mode Line for Emacs 24"single])(pov-mode .[(3 3)()"Major mode for editing POV-Ray scene files."tar])(creole .[(0 9 20130407)((el-x (0 2 1)))"A parser for the Creole Wiki language"single])(tup-mode .[(1 2)()"Major mode for editing files for Tup"single])(bbcode-mode .[(1 1 0)()"Major mode for writing BBCode markup"single])(markup-faces .[(1 0 0)()"collection of faces for markup language modes"single])(flymake-json .[(0 1)((flymake-easy (0 1)))"A flymake handler for json using jsonlint"single])(adoc-mode .[(0 6 2)((markup-faces (1 0 0)))"a major-mode for editing AsciiDoc files in Emacs"single])(hardcore-mode .[(1 0 0)()"Disable arrow keys + optionally backspace and return"single])(spotify .[(0 1)()"Control the spotify application from emacs via D-Bus"single])(hlinum .[(1 0)()"Extension for linum.el to highlight current line number"single])(aes .[(0 5)()"Implementation of AES"single])(kwin .[(0 1)()"communcate with the KWin window manager"single])(clj-refactor .[(0 2 0)((s (1 3 1)) (dash (1 0 3)) (yasnippet (0 6 1)))"A collection of clojure refactoring functions"single])(awk-it .[(0 76)()"Run AWK interactively on region!"single])(nemerle .[(0 2)()"major mode for editing nemerle programs"single])(markdown-mode .[(1 9)()"Emacs Major mode for Markdown-formatted text files"single])(evil-leader .[(0 2 1)((evil (0)))"let there be <leader>"single])(nimrod-mode .[(0 1 5)((auto-complete (1 4)))"A major mode for the Nimrod programming language"single])(rbenv .[(0 0 2)()"Emacs integration for rbenv"single])(evil .[(1 0 1)((undo-tree (0 5 1)))"Extensible Vi layer for Emacs."tar])(world-time-mode .[(0 0 2)()"show whole days of world-time diffs"single])(inline-crypt .[(0 1 3)()"Simple inline encryption via openssl"tar])(tagedit .[(1 3 1)((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])(purple-haze-theme .[(0 0 7)()"an overtly purple color theme for Emacs24."single])(gruber-darker-theme .[(0 3)()"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 1)((key-chord (0 5 20080915)))"change the size of frames in Emacs"single])(deep-thought-theme .[(0 1 1)()"Emacs 24 theme with the Answer to The Ultimate Question"single])(image-dired+ .[(0 6 0)()"Image-dired extensions"single])(erefactor .[(0 6 9)()"Emacs-Lisp refactoring utilities"single])(generate-autoloads .[(0 0 10)()"A package to help you lazy-load everything"single])(lisp-infection .[(0 0 10)()"Commands to *enhance* S-exp editing"single])(backtrace-mode .[(0 0 10)()"A better way to browse /var/log/messages files"single])(tabulated-list .[(0)()"generic major mode for tabulated lists."single])(package .[(1 0)((tabulated-list (0)))"Simple package system for Emacs"single])(ert .[(0)()"Emacs Lisp Regression Testing"single])(nurumacs .[(3 5 4)()"smooth-scrolling and minimap, like sublime editor"single])(mark-tools .[(0 3)()"Some simple tools to access the mark-ring in Emacs"single])(cedit .[(0 0 0)()"paredit-like commands for c-like languages"single])(todotxt .[(0 2 2)()"A major mode for editing todo.txt files"single])(git-gutter .[(0 39)()"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 2)()"Core Emacs configuration. This should be the minimum in every emacs config."single])(edebug-x .[(1 2)((dash (1 1 0)))"Extensions for Edebug"single])(loop .[(1 1)()"friendly imperative loop structures"single])(tex-smart-umlauts .[(1 1 0)()"Smart umlaut conversion for TeX."single])(ht .[(0 7)()"The missing hash table library for Emacs"single])(haml-mode .[(3 1 0)((ruby-mode (1 0)))"Major mode for editing Haml files"single])(flymake-hlint .[(0 2)((flymake-easy (0 1)))"A flymake handler for haskell-mode files using hlint"single])(django-theme .[(1 3 0)()"Custom face theme for Emacs"single])(pinboard .[(0 0 1)()"get stuff from pinboard -*- lexical-binding: t -*-"single])(isea .[(0 0 2)((elpakit (0 0 18)))"interactive server eval at mode, a comint for a daemonized emacs -*- lexical-binding: t -*-"single])(wrap-region .[(0 7 1)()"Wrap text with punctation or tag"single])(lexbind-mode .[(0 8)()"Puts the value of lexical-binding in the mode line"single])(auto-highlight-symbol .[(1 55)()"Automatic highlighting current symbol minor mode"single])(dot-mode .[(1 12)()"minor mode to repeat typing or commands"single])(main-line .[(1 2 8)()"modeline replacement forked from an early version of powerline.el"single])(electric-case .[(2 2 1)()"insert camelCase, snake_case words without \"Shift\"ing"single])(scratch-palette .[(1 0 1)()"add scratch notes for each file"single])(scratch-pop .[(1 0 0)()"popup scratch"single])(outlined-elisp-mode .[(1 0 5)()"outline-minor-mode settings for emacs lisp"single])(show-css .[(1 1)()"Show the css of the html attribute the cursor is on"single])(dpaste_de .[(0 1)((web (0 3 6)))"Emacs mode to paste to dpaste.de"single])(supergenpass .[(0 1)()"SuperGenPass for Emacs"single])(with-namespace .[(1 1)()"Poor-man's namespaces for elisp"single])(flymake-haskell-multi .[(0 2)((flymake-easy (0 1)))"Syntax-check haskell-mode using both ghc and hlint"single])(sackspace .[(0 8 1)()"A better backspace"single])(volatile-highlights .[(1 10)()"Minor mode for visual feedback on some operations."single])(everything .[(0 1 5)()"Bridge to MS Windows desktop-search engine Everything"single])(fetchmacs .[(1 0 1)()"A major mode for the Fetchnotes note taking service"single])(grapnel .[(0 5 1)()"HTTP request lib with flexible callback dispatch"single])(tumble .[(1 5)()"an Tumblr mode for Emacs"single])(rubyinterpol .[(0 1)()"Ruby-like String Interpolation for format"single])(smartparens .[(1 4 3)((dash (1 1 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 1)((helm (1 0)))"GNU GLOBAL helm interface"single])(quickrun .[(1 8 4)()"Run commands quickly"single])(git-gutter-fringe .[(0 11)((git-gutter (0 38)) (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])(charmap .[(0 0 0)()"Unicode table for Emacs"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])(phi-search .[(1 1 0)()"inferior isearch compatible with \"multiple-cursors\""single])(ruby-hash-syntax .[(0 1)()"Toggle ruby hash syntax between classic and 1.9 styles"single])(psgml .[(1 4 0)()"Lennart Staflin's Psgml package, with Elisp syntax fixed for Emacsen >=24."tar])(swarmhacker .[(0 0 1)()"simple swarm chat"single])(theme-changer .[(2 0 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])(wcheck-mode .[(2013 4 7)()"A general interface for text checkers"single])(sea-before-storm-theme .[(0 3)()"Sea Before Storm color theme for Emacs 24"single])(flymake-python-pyflakes .[(0 6)((flymake-easy (0 4)))"A flymake handler for python-mode files using pyflakes (or flake8)"single])(ibuffer-vc .[(0 6)((cl-lib (0 2)))"Group ibuffer's list by VC project, or show VC status"single])(letcheck .[(0 2)()"Check the erroneous assignments in let forms"single])(clippy .[(1 0)((pos-tip (1 0)))"Show tooltip with function documentation at point"single])(wacspace .[(0 1)((dash (1 1 0)))"The WACky WorkSPACE manager for emACS -*- lexical-binding: t -*-"single])(kanban .[(0 1 1)()"Parse org-todo headlines to use org-tables as Kanban tables"single]))
\ No newline at end of file
diff --git a/elpa/evil-1.0.1/COPYING b/elpa/evil-1.0.1/COPYING
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/elpa/evil-1.0.1/COPYING
@@ -0,0 +1,674 @@
+                    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/evil-1.0.1/evil-autoloads.el b/elpa/evil-1.0.1/evil-autoloads.el
new file mode 100644
index 00000000..a7a21dd6
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-autoloads.el
@@ -0,0 +1,26 @@
+;;; evil-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil "evil-core" "evil-core.el" (20836 47458))
+;;; Generated autoloads from evil-core.el
+ (autoload 'evil-mode "evil" "Toggle evil in all buffers" t)
+
+;;;***
+
+;;;### (autoloads nil nil ("evil-commands.el" "evil-common.el" "evil-digraphs.el"
+;;;;;;  "evil-ex.el" "evil-integration.el" "evil-macros.el" "evil-maps.el"
+;;;;;;  "evil-pkg.el" "evil-repeat.el" "evil-search.el" "evil-states.el"
+;;;;;;  "evil-types.el" "evil-vars.el" "evil.el") (20836 47458 860825))
+
+;;;***
+
+(provide 'evil-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; evil-autoloads.el ends here
diff --git a/elpa/evil-1.0.1/evil-commands.el b/elpa/evil-1.0.1/evil-commands.el
new file mode 100644
index 00000000..80b3c531
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-commands.el
@@ -0,0 +1,3611 @@
+;;; evil-commands.el --- Evil commands and operators
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-common)
+(require 'evil-digraphs)
+(require 'evil-search)
+(require 'evil-ex)
+(require 'evil-types)
+
+;;; Motions
+
+;; Movement commands, or motions, are defined with the macro
+;; `evil-define-motion'. A motion is a command with an optional
+;; argument COUNT (interactively accessed by the code "<c>").
+;; It may specify the :type command property (e.g., :type line),
+;; which determines how it is handled by an operator command.
+;; Furthermore, the command must have the command properties
+;; :keep-visual t and :repeat motion; these are automatically
+;; set by the `evil-define-motion' macro.
+
+;;; Code:
+
+(evil-define-motion evil-forward-char (count &optional crosslines noerror)
+  "Move cursor to the right by COUNT characters.
+Movement is restricted to the current line unless CROSSLINES is non-nil.
+If NOERROR is non-nil, don't signal an error upon reaching the end
+of the line or the buffer; just return nil."
+  :type exclusive
+  (interactive "<c>" (list evil-cross-lines
+                           (evil-kbd-macro-suppress-motion-error)))
+  (cond
+   (noerror
+    (condition-case nil
+        (evil-forward-char count crosslines nil)
+      (error nil)))
+   ((not crosslines)
+    ;; for efficiency, narrow the buffer to the projected
+    ;; movement before determining the current line
+    (evil-with-restriction
+        (point)
+        (save-excursion
+          (evil-forward-char (1+ (or count 1)) t t)
+          (point))
+      (evil-narrow-to-line
+        (evil-forward-char count t noerror))))
+   (t
+    (evil-motion-loop (nil (or count 1))
+      (forward-char)
+      ;; don't put the cursor on a newline
+      (when (and evil-move-cursor-back
+                 (not (evil-visual-state-p))
+                 (not (evil-operator-state-p))
+                 (eolp) (not (eobp)) (not (bolp)))
+        (forward-char))))))
+
+(evil-define-motion evil-backward-char (count &optional crosslines noerror)
+  "Move cursor to the left by COUNT characters.
+Movement is restricted to the current line unless CROSSLINES is non-nil.
+If NOERROR is non-nil, don't signal an error upon reaching the beginning
+of the line or the buffer; just return nil."
+  :type exclusive
+  (interactive "<c>" (list evil-cross-lines
+                           (evil-kbd-macro-suppress-motion-error)))
+  (cond
+   (noerror
+    (condition-case nil
+        (evil-backward-char count crosslines nil)
+      (error nil)))
+   ((not crosslines)
+    ;; restrict movement to the current line
+    (evil-with-restriction
+        (save-excursion
+          (evil-backward-char (1+ (or count 1)) t t)
+          (point))
+        (1+ (point))
+      (evil-narrow-to-line
+        (evil-backward-char count t noerror))))
+   (t
+    (evil-motion-loop (nil (or count 1))
+      (backward-char)
+      ;; don't put the cursor on a newline
+      (unless (or (evil-visual-state-p) (evil-operator-state-p))
+        (evil-adjust-cursor))))))
+
+(evil-define-motion evil-next-line (count)
+  "Move the cursor COUNT lines down."
+  :type line
+  (let (line-move-visual)
+    (evil-line-move (or count 1))))
+
+(evil-define-motion evil-previous-line (count)
+  "Move the cursor COUNT lines up."
+  :type line
+  (let (line-move-visual)
+    (evil-line-move (- (or count 1)))))
+
+(evil-define-motion evil-next-visual-line (count)
+  "Move the cursor COUNT screen lines down."
+  :type exclusive
+  (let ((line-move-visual t))
+    (evil-line-move (or count 1))))
+
+(evil-define-motion evil-previous-visual-line (count)
+  "Move the cursor COUNT screen lines up."
+  :type exclusive
+  (let ((line-move-visual t))
+    (evil-line-move (- (or count 1)))))
+
+;; used for repeated commands like "dd"
+(evil-define-motion evil-line (count)
+  "Move COUNT - 1 lines down."
+  :type line
+  (let (line-move-visual)
+    ;; Catch bob and eob errors. These are caused when not moving
+    ;; point starting in the first or last line, respectively. In this
+    ;; case the current line should be selected.
+    (condition-case err
+        (evil-line-move (1- (or count 1)))
+      ((beginning-of-buffer end-of-buffer)))))
+
+(evil-define-motion evil-beginning-of-line ()
+  "Move the cursor to the beginning of the current line."
+  :type exclusive
+  (move-beginning-of-line nil))
+
+(evil-define-motion evil-end-of-line (count)
+  "Move the cursor to the end of the current line.
+If COUNT is given, move COUNT - 1 lines downward first."
+  :type inclusive
+  (move-end-of-line count)
+  (when evil-track-eol
+    (setq temporary-goal-column most-positive-fixnum
+          this-command 'next-line))
+  (unless (evil-visual-state-p)
+    (evil-adjust-cursor)
+    (when (eolp)
+      ;; prevent "c$" and "d$" from deleting blank lines
+      (setq evil-this-type 'exclusive))))
+
+(evil-define-motion evil-beginning-of-visual-line ()
+  "Move the cursor to the first character of the current screen line."
+  :type exclusive
+  (if (fboundp 'beginning-of-visual-line)
+      (beginning-of-visual-line)
+    (beginning-of-line)))
+
+(evil-define-motion evil-end-of-visual-line (count)
+  "Move the cursor to the last character of the current screen line.
+If COUNT is given, move COUNT - 1 screen lines downward first."
+  :type inclusive
+  (if (fboundp 'end-of-visual-line)
+      (end-of-visual-line count)
+    (end-of-line count)))
+
+(evil-define-motion evil-beginning-of-line-or-digit-argument ()
+  "Move the cursor to the beginning of the current line.
+This function passes its command to `digit-argument' (usually a 0)
+if it is not the first event."
+  :type exclusive
+  (cond
+   (current-prefix-arg
+    (setq this-command #'digit-argument)
+    (call-interactively #'digit-argument))
+   (t
+    (setq this-command #'evil-beginning-of-line)
+    (call-interactively #'evil-beginning-of-line))))
+
+(evil-define-motion evil-first-non-blank ()
+  "Move the cursor to the first non-blank character of the current line."
+  :type exclusive
+  (evil-narrow-to-line (back-to-indentation)))
+
+(evil-define-motion evil-last-non-blank (count)
+  "Move the cursor to the last non-blank character of the current line.
+If COUNT is given, move COUNT - 1 lines downward first."
+  :type inclusive
+  (goto-char
+   (save-excursion
+     (evil-move-beginning-of-line count)
+     (if (re-search-forward "[ \t]*$")
+         (max (line-beginning-position)
+              (1- (match-beginning 0)))
+       (line-beginning-position)))))
+
+(evil-define-motion evil-first-non-blank-of-visual-line ()
+  "Move the cursor to the first non blank character
+of the current screen line."
+  :type exclusive
+  (evil-beginning-of-visual-line)
+  (skip-chars-forward " \t\r"))
+
+(evil-define-motion evil-next-line-first-non-blank (count)
+  "Move the cursor COUNT lines down on the first non-blank character."
+  :type line
+  (evil-next-line (or count 1))
+  (evil-first-non-blank))
+
+(evil-define-motion evil-next-line-1-first-non-blank (count)
+  "Move the cursor COUNT-1 lines down on the first non-blank character."
+  :type line
+  (evil-next-line (1- (or count 1)))
+  (evil-first-non-blank))
+
+(evil-define-motion evil-previous-line-first-non-blank (count)
+  "Move the cursor COUNT lines up on the first non-blank character."
+  :type line
+  (evil-previous-line (or count 1))
+  (evil-first-non-blank))
+
+(evil-define-motion evil-goto-line (count)
+  "Go to the first non-blank character of line COUNT.
+By default the last line."
+  :jump t
+  :type line
+  (if (null count)
+      (goto-char (point-max))
+    (goto-char (point-min))
+    (forward-line (1- count)))
+  (evil-first-non-blank))
+
+(evil-define-motion evil-goto-first-line (count)
+  "Go to the first non-blank character of line COUNT.
+By default the first line."
+  :jump t
+  :type line
+  (evil-goto-line (or count 1)))
+
+(evil-define-motion evil-move-empty-lines (count)
+  "Move to the next or previous empty line, repeated COUNT times."
+  :type exclusive
+  (evil-motion-loop (var (or count 1))
+    (cond
+     ((< var 0)
+      (goto-char
+       (or (save-excursion
+             (unless (bobp)
+               (backward-char)
+               (re-search-backward "^$" nil t)))
+           (point))))
+     (t
+      (let ((orig (point)))
+        (when (re-search-forward "^$" nil t)
+          (if (eobp)
+              (goto-char orig)
+            (forward-char))))))))
+
+(evil-define-union-move evil-move-word (count)
+  "Move by words."
+  (evil-move-chars "^ \t\r\n[:word:]" count)
+  (let ((word-separating-categories evil-cjk-word-separating-categories)
+        (word-combining-categories evil-cjk-word-combining-categories))
+    (evil-forward-word count))
+  (evil-move-empty-lines count))
+
+(evil-define-union-move evil-move-WORD (count)
+  "Move by WORDs."
+  (evil-move-chars evil-bigword count)
+  (evil-move-empty-lines count))
+
+(evil-define-motion evil-forward-word-begin (count &optional bigword)
+  "Move the cursor to the beginning of the COUNT-th next word.
+If BIGWORD is non-nil, move by WORDS."
+  :type exclusive
+  (let ((move (if bigword #'evil-move-WORD #'evil-move-word))
+        (orig (point)))
+    (prog1 (if (and evil-want-change-word-to-end
+                    (not (looking-at "[[:space:]]"))
+                    (eq evil-this-operator #'evil-change))
+               (evil-move-end count move)
+             (evil-move-beginning count move))
+      ;; if we reached the beginning of a word on a new line in
+      ;; Operator-Pending state, go back to the end of the previous
+      ;; line
+      (when (and (evil-operator-state-p)
+                 (> (line-beginning-position) orig)
+                 (looking-back "^[[:space:]]*" (line-beginning-position)))
+        ;; move cursor back as long as the line contains only
+        ;; whitespaces and is non-empty
+        (evil-move-end-of-line 0)
+        ;; skip non-empty lines containing only spaces
+        (while (and (looking-back "^[[:space:]]+$" (line-beginning-position))
+                    (not (<= (line-beginning-position) orig)))
+          (evil-move-end-of-line 0))
+        ;; but if the previous line is empty, delete this line
+        (when (bolp) (forward-char))))))
+
+(evil-define-motion evil-forward-word-end (count &optional bigword)
+  "Move the cursor to the end of the COUNT-th next word.
+If BIGWORD is non-nil, move by WORDS."
+  :type inclusive
+  (let ((move (if bigword #'evil-move-WORD #'evil-move-word)))
+    ;; if changing a one-letter word, don't move point to the
+    ;; next word (which would change two words)
+    (if (and (evil-operator-state-p)
+             (looking-at "[[:word:]]"))
+        (prog1 (evil-move-end count move)
+          (unless (bobp) (backward-char)))
+      (evil-move-end count move nil t))))
+
+(evil-define-motion evil-backward-word-begin (count &optional bigword)
+  "Move the cursor to the beginning of the COUNT-th previous word.
+If BIGWORD is non-nil, move by WORDS."
+  :type exclusive
+  (let ((move (if bigword #'evil-move-WORD #'evil-move-word)))
+    (evil-move-beginning (- (or count 1)) move)))
+
+(evil-define-motion evil-backward-word-end (count &optional bigword)
+  "Move the cursor to the end of the COUNT-th previous word.
+If BIGWORD is non-nil, move by WORDS."
+  :type inclusive
+  (let ((move (if bigword #'evil-move-WORD #'evil-move-word)))
+    (evil-move-end (- (or count 1)) move nil t)))
+
+(evil-define-motion evil-forward-WORD-begin (count)
+  "Move the cursor to the beginning of the COUNT-th next WORD."
+  :type exclusive
+  (evil-forward-word-begin count t))
+
+(evil-define-motion evil-forward-WORD-end (count)
+  "Move the cursor to the end of the COUNT-th next WORD."
+  :type inclusive
+  (evil-forward-word-end count t))
+
+(evil-define-motion evil-backward-WORD-begin (count)
+  "Move the cursor to the beginning of the COUNT-th previous WORD."
+  :type exclusive
+  (evil-backward-word-begin count t))
+
+(evil-define-motion evil-backward-WORD-end (count)
+  "Move the cursor to the end of the COUNT-th previous WORD."
+  :type inclusive
+  (evil-backward-word-end count t))
+
+;; section movement
+(evil-define-motion evil-forward-section-begin (count)
+  "Move the cursor to the beginning of the COUNT-th next section."
+  :jump t
+  :type exclusive
+  (beginning-of-defun (- (or count 1))))
+
+(evil-define-motion evil-forward-section-end (count)
+  "Move the cursor to the end of the COUNT-th next section."
+  :jump t
+  :type inclusive
+  (end-of-defun (or count 1)))
+
+(evil-define-motion evil-backward-section-begin (count)
+  "Move the cursor to the beginning of the COUNT-th previous section."
+  :jump t
+  :type exclusive
+  (beginning-of-defun (or count 1)))
+
+(evil-define-motion evil-backward-section-end (count)
+  "Move the cursor to the end of the COUNT-th previous section."
+  :jump t
+  :type inclusive
+  (end-of-defun (- (or count 1))))
+
+(evil-define-motion evil-forward-sentence (count)
+  "Move to the next COUNT-th beginning of a sentence or end of a paragraph."
+  :jump t
+  :type exclusive
+  (let ((count (or count 1))
+        beg-sentence end-paragraph)
+    (when (evil-eobp)
+      (signal 'end-of-buffer nil))
+    (evil-motion-loop (nil count)
+      (unless (eobp)
+        (setq beg-sentence
+              (save-excursion
+                (and (zerop (evil-move-beginning 1 #'evil-move-sentence))
+                     (point)))
+              end-paragraph
+              (save-excursion
+                (forward-paragraph)
+                (point)))
+        (evil-goto-min beg-sentence end-paragraph)))))
+
+(evil-define-motion evil-backward-sentence (count)
+  "Move to the previous COUNT-th beginning of a sentence or paragraph."
+  :jump t
+  :type exclusive
+  (let ((count (or count 1))
+        beg-sentence beg-paragraph)
+    (when (bobp)
+      (signal 'beginning-of-buffer nil))
+    (evil-motion-loop (nil count)
+      (unless (bobp)
+        (setq beg-sentence
+              (save-excursion
+                (and (zerop (evil-move-beginning -1 #'evil-move-sentence))
+                     (point)))
+              beg-paragraph
+              (save-excursion
+                (backward-paragraph)
+                (point)))
+        (evil-goto-max beg-sentence beg-paragraph)))))
+
+(evil-define-motion evil-forward-paragraph (count)
+  "Move to the end of the COUNT-th next paragraph."
+  :jump t
+  :type exclusive
+  (evil-move-end count #'forward-paragraph #'backward-paragraph))
+
+(evil-define-motion evil-backward-paragraph (count)
+  "Move to the beginning of the COUNT-th previous paragraph."
+  :jump t
+  :type exclusive
+  (evil-move-beginning (- (or count 1))
+                       #'forward-paragraph #'backward-paragraph))
+
+(evil-define-motion evil-jump-item (count)
+  "Find the next item in this line after or under the cursor
+and jump to the corresponding one."
+  :jump t
+  :type inclusive
+  (cond
+   ;; COUNT% jumps to a line COUNT percentage down the file
+   (count
+    (goto-char
+     (evil-normalize-position
+      (let ((size (- (point-max) (point-min))))
+        (+ (point-min)
+           (if (> size 80000)
+               (* count (/ size 100))
+             (/ (* count size) 100))))))
+    (back-to-indentation)
+    (setq evil-this-type 'line))
+   ((and (evil-looking-at-start-comment t)
+         (let ((pnt (point)))
+           (forward-comment 1)
+           (or (not (bolp))
+               (prog1 nil (goto-char pnt)))))
+    (backward-char))
+   ((and (not (eolp)) (evil-looking-at-end-comment t))
+    (forward-comment -1))
+   ((and
+     (memq major-mode '(c-mode c++-mode))
+     (require 'hideif nil t)
+     (with-no-warnings
+       (let* ((hif-else-regexp (concat hif-cpp-prefix "\\(?:else\\|elif[ \t]+\\)"))
+              (hif-ifx-else-endif-regexp
+               (concat hif-ifx-regexp "\\|" hif-else-regexp "\\|" hif-endif-regexp)))
+         (cond
+          ((save-excursion (beginning-of-line) (or (hif-looking-at-ifX) (hif-looking-at-else)))
+           (hif-find-next-relevant)
+           (while (hif-looking-at-ifX)
+             (hif-ifdef-to-endif)
+             (hif-find-next-relevant))
+           t)
+          ((save-excursion (beginning-of-line) (hif-looking-at-endif))
+           (hif-endif-to-ifdef)
+           t))))))
+   (t
+    (let* ((open (point-max))
+           (close (point-max))
+           (open-pair (condition-case nil
+                          (save-excursion
+                            (setq open (1- (scan-lists (point) 1 -1)))
+                            (when (< open (line-end-position))
+                              (goto-char open)
+                              (forward-list)
+                              (1- (point))))
+                        (error nil)))
+           (close-pair (condition-case nil
+                           (save-excursion
+                             (setq close (1- (scan-lists (point) 1 1)))
+                             (when (< close (line-end-position))
+                               (goto-char (1+ close))
+                               (backward-list)
+                               (point)))
+                         (error nil))))
+      (cond
+       ((not (or open-pair close-pair))
+        ;; nothing found, check if we are inside a string
+        (let ((pnt (point))
+              (state (syntax-ppss (point))))
+          (if (not (evil-in-string-p))
+              ;; no, then we really failed
+              (error "No matching item found on the current line")
+            ;; yes, go to the end of the string and try again
+            (let ((endstr (evil-string-end (point) (line-end-position))))
+              (when (or (evil-in-string-p endstr) ; not at end of string
+                        (condition-case nil
+                            (progn
+                              (goto-char endstr)
+                              (evil-jump-item)
+                              nil)
+                          (error t)))
+                ;; failed again, go back to original point
+                (goto-char pnt)
+                (error "No matching item found on the current line"))))))
+       ((< open close) (goto-char open-pair))
+       (t (goto-char close-pair)))))))
+
+(evil-define-motion evil-previous-open-paren (count)
+  "Go to [count] previous unmatched '('."
+  :type exclusive
+  (let ((range (save-excursion
+                 (backward-char)
+                 (evil-paren-range count nil nil nil ?\( ?\)))))
+    (when range
+      (goto-char (evil-range-beginning range)))))
+
+(evil-define-motion evil-next-close-paren (count)
+  "Go to [count] next unmatched ')'."
+  :type exclusive
+  (let ((range (save-excursion
+                 (forward-char)
+                 (evil-paren-range count nil nil nil ?\( ?\)))))
+    (when range
+      (goto-char (1- (evil-range-end range))))))
+
+(evil-define-motion evil-previous-open-brace (count)
+  "Go to [count] previous unmatched '{'."
+  :type exclusive
+  (let ((range (save-excursion
+                 (backward-char)
+                 (evil-paren-range count nil nil nil ?\{ ?\}))))
+    (when range
+      (goto-char (evil-range-beginning range)))))
+
+(evil-define-motion evil-next-close-brace (count)
+  "Go to [count] next unmatched '}'."
+  :type exclusive
+  (let ((range (save-excursion
+                 (forward-char)
+                 (evil-paren-range count nil nil nil ?\{ ?\}))))
+    (when range
+      (goto-char (1- (evil-range-end range))))))
+
+(evil-define-motion evil-find-char (count char)
+  "Move to the next COUNT'th occurrence of CHAR."
+  :jump t
+  :type inclusive
+  (interactive "<c><C>")
+  (setq count (or count 1))
+  (let ((fwd (> count 0)))
+    (setq evil-last-find (list #'evil-find-char char fwd))
+    (when fwd (forward-char))
+    (let ((case-fold-search nil))
+      (unless (prog1
+                  (search-forward (char-to-string char)
+                                  (unless evil-cross-lines
+                                    (if fwd
+                                        (line-end-position)
+                                      (line-beginning-position)))
+                                  t count)
+                (when fwd (backward-char)))
+        (error "Can't find %c" char)))))
+
+(evil-define-motion evil-find-char-backward (count char)
+  "Move to the previous COUNT'th occurrence of CHAR."
+  :jump t
+  :type exclusive
+  (interactive "<c><C>")
+  (evil-find-char (- (or count 1)) char))
+
+(evil-define-motion evil-find-char-to (count char)
+  "Move before the next COUNT'th occurrence of CHAR."
+  :jump t
+  :type inclusive
+  (interactive "<c><C>")
+  (unwind-protect
+      (progn
+        (evil-find-char count char)
+        (if (> (or count 1) 0)
+            (backward-char)
+          (forward-char)))
+    (setcar evil-last-find #'evil-find-char-to)))
+
+(evil-define-motion evil-find-char-to-backward (count char)
+  "Move before the previous COUNT'th occurrence of CHAR."
+  :jump t
+  :type exclusive
+  (interactive "<c><C>")
+  (evil-find-char-to (- (or count 1)) char))
+
+(evil-define-motion evil-repeat-find-char (count)
+  "Repeat the last find COUNT times."
+  :jump t
+  :type inclusive
+  (setq count (or count 1))
+  (if evil-last-find
+      (let ((cmd (car evil-last-find))
+            (char (nth 1 evil-last-find))
+            (fwd (nth 2 evil-last-find))
+            evil-last-find)
+        (funcall cmd (if fwd count (- count)) char)
+        (unless (nth 2 evil-last-find)
+          (setq evil-this-type 'exclusive)))
+    (error "No previous search")))
+
+(evil-define-motion evil-repeat-find-char-reverse (count)
+  "Repeat the last find COUNT times in the opposite direction."
+  :jump t
+  :type inclusive
+  (evil-repeat-find-char (- (or count 1))))
+
+;; ceci n'est pas une pipe
+(evil-define-motion evil-goto-column (count)
+  "Go to column COUNT on the current line.
+Columns are counted from zero."
+  :type exclusive
+  (move-to-column (or count 0)))
+
+(evil-define-command evil-goto-mark (char &optional noerror)
+  "Go to the marker specified by CHAR."
+  :keep-visual t
+  :repeat nil
+  :type exclusive
+  (interactive (list (read-char)))
+  (let ((marker (evil-get-marker char)))
+    (cond
+     ((markerp marker)
+      (switch-to-buffer (marker-buffer marker))
+      (goto-char (marker-position marker)))
+     ((numberp marker)
+      (goto-char marker))
+     ((consp marker)
+      (when (or (find-buffer-visiting (car marker))
+                (and (y-or-n-p (format "Visit file %s again? "
+                                       (car marker)))
+                     (find-file (car marker))))
+        (goto-char (cdr marker))))
+     ((not noerror)
+      (error "Marker `%c' is not set%s" char
+             (if (evil-global-marker-p char) ""
+               " in this buffer"))))))
+
+(evil-define-command evil-goto-mark-line (char &optional noerror)
+  "Go to the line of the marker specified by CHAR."
+  :keep-visual t
+  :repeat nil
+  :type line
+  (interactive (list (read-char)))
+  (evil-goto-mark char noerror)
+  (evil-first-non-blank))
+
+(evil-define-motion evil-jump-backward (count)
+  "Go to older position in jump list.
+To go the other way, press \
+\\<evil-motion-state-map>\\[evil-jump-forward]."
+  (let ((current-pos (make-marker))
+        (count (or count 1)) i)
+    (unless evil-jump-list
+      (move-marker current-pos (point))
+      (add-to-list 'evil-jump-list current-pos))
+    (evil-motion-loop (nil count)
+      (setq current-pos (make-marker))
+      ;; skip past duplicate entries in the mark ring
+      (setq i (length mark-ring))
+      (while (progn (move-marker current-pos (point))
+                    (set-mark-command 0)
+                    (setq i (1- i))
+                    (and (= (point) current-pos) (> i 0))))
+      ;; Already there?
+      (move-marker current-pos (point))
+      (unless (= current-pos (car-safe evil-jump-list))
+        (add-to-list 'evil-jump-list current-pos)))))
+
+(evil-define-motion evil-jump-forward (count)
+  "Go to newer position in jump list.
+To go the other way, press \
+\\<evil-motion-state-map>\\[evil-jump-backward]."
+  (let ((count (or count 1))
+        current-pos next-pos)
+    (evil-motion-loop (nil count)
+      (setq current-pos (car-safe evil-jump-list)
+            next-pos (car (cdr-safe evil-jump-list)))
+      (when next-pos
+        (push-mark current-pos t nil)
+        (unless (eq (marker-buffer next-pos) (current-buffer))
+          (switch-to-buffer (marker-buffer next-pos)))
+        (goto-char next-pos)
+        (pop evil-jump-list)))))
+
+(evil-define-motion evil-jump-to-tag (arg)
+  "Jump to tag under point.
+If called with a prefix argument, provide a prompt
+for specifying the tag."
+  :jump t
+  (interactive "P")
+  (if arg (call-interactively #'find-tag)
+    (let ((tag (thing-at-point 'symbol)))
+      (find-tag tag))))
+
+(evil-define-motion evil-lookup ()
+  "Look up the keyword at point.
+Calls `evil-lookup-func'."
+  (funcall evil-lookup-func))
+
+(evil-define-motion evil-ret (count)
+  "Move the cursor COUNT lines down.
+If point is on a widget or a button, click on it.
+In Insert state, insert a newline."
+  :type line
+  (let* ((field  (get-char-property (point) 'field))
+         (button (get-char-property (point) 'button))
+         (doc    (get-char-property (point) 'widget-doc))
+         (widget (or field button doc)))
+    (cond
+     ((and widget
+           (fboundp 'widget-type)
+           (fboundp 'widget-button-press)
+           (or (and (symbolp widget)
+                    (get widget 'widget-type))
+               (and (consp widget)
+                    (get (widget-type widget) 'widget-type))))
+      (when (evil-operator-state-p)
+        (setq evil-inhibit-operator t))
+      (when (fboundp 'widget-button-press)
+        (widget-button-press (point))))
+     ((and (fboundp 'button-at)
+           (fboundp 'push-button)
+           (button-at (point)))
+      (when (evil-operator-state-p)
+        (setq evil-inhibit-operator t))
+      (push-button))
+     ((or (evil-emacs-state-p)
+          (and (evil-insert-state-p)
+               (not buffer-read-only)))
+      (if (not evil-auto-indent)
+          (newline count)
+        (delete-horizontal-space t)
+        (newline count)
+        (indent-according-to-mode)))
+     (t
+      (evil-next-line-first-non-blank count)))))
+
+(evil-define-motion evil-window-top (count)
+  "Move the cursor to line COUNT from the top of the window
+on the first non-blank character."
+  :jump t
+  :type line
+  (move-to-window-line (or count 0))
+  (back-to-indentation))
+
+(evil-define-motion evil-window-middle ()
+  "Move the cursor to the middle line in the window
+on the first non-blank character."
+  :jump t
+  :type line
+  (move-to-window-line
+   (/ (1+ (save-excursion (move-to-window-line -1))) 2))
+  (back-to-indentation))
+
+(evil-define-motion evil-window-bottom (count)
+  "Move the cursor to line COUNT from the bottom of the window
+on the first non-blank character."
+  :jump t
+  :type line
+  (move-to-window-line (- (or count 1)))
+  (back-to-indentation))
+
+;; scrolling
+(evil-define-command evil-scroll-line-up (count)
+  "Scrolls the window COUNT lines upwards."
+  :repeat nil
+  :keep-visual t
+  (interactive "p")
+  (scroll-down count))
+
+(evil-define-command evil-scroll-line-down (count)
+  "Scrolls the window COUNT lines downwards."
+  :repeat nil
+  :keep-visual t
+  (interactive "p")
+  (scroll-up count))
+
+(evil-define-command evil-scroll-up (count)
+  "Scrolls the window and the cursor COUNT lines upwards.
+The default is half the screen."
+  :repeat nil
+  :keep-visual t
+  (interactive "P")
+  (evil-save-column
+    (let ((p (point))
+          (c (or count (/ (evil-num-visible-lines) 2))))
+      (save-excursion
+        (scroll-down (min (evil-max-scroll-up) c)))
+      (forward-line (- c))
+      (when (= (line-number-at-pos p)
+               (line-number-at-pos (point)))
+        (signal 'beginning-of-buffer nil)))))
+
+(evil-define-command evil-scroll-down (count)
+  "Scrolls the window and the cursor COUNT lines downwards.
+The default is half the screen."
+  :repeat nil
+  :keep-visual t
+  (interactive "P")
+  (evil-save-column
+    (let ((p (point))
+          (c (or count (/ (evil-num-visible-lines) 2))))
+      (save-excursion
+        (scroll-up (min (evil-max-scroll-down) c)))
+      (forward-line c)
+      (when (= (line-number-at-pos p)
+               (line-number-at-pos (point)))
+        (signal 'end-of-buffer nil)))))
+
+(evil-define-command evil-scroll-page-up (count)
+  "Scrolls the window COUNT pages upwards."
+  :repeat nil
+  :keep-visual t
+  (interactive "p")
+  (evil-save-column
+    (dotimes (i count)
+      (scroll-down nil))))
+
+(evil-define-command evil-scroll-page-down (count)
+  "Scrolls the window COUNT pages upwards."
+  :repeat nil
+  :keep-visual t
+  (interactive "p")
+  (evil-save-column
+    (dotimes (i count)
+      (scroll-up nil))))
+
+(evil-define-command evil-scroll-line-to-top (count)
+  "Scrolls line number COUNT (or the cursor line) to the top of the window."
+  :repeat nil
+  :keep-visual t
+  (interactive "P")
+  (evil-save-column
+    (let ((line (or count (line-number-at-pos (point)))))
+      (goto-char (point-min))
+      (forward-line (1- line)))
+    (recenter 0)))
+
+(evil-define-command evil-scroll-line-to-center (count)
+  "Scrolls line number COUNT (or the cursor line) to the center of the window."
+  :repeat nil
+  :keep-visual t
+  (interactive "P")
+  (evil-save-column
+    (when count
+      (goto-char (point-min))
+      (forward-line (1- count)))
+    (recenter nil)))
+
+(evil-define-command evil-scroll-line-to-bottom (count)
+  "Scrolls line number COUNT (or the cursor line) to the bottom of the window."
+  :repeat nil
+  :keep-visual t
+  (interactive "P")
+  (evil-save-column
+    (let ((line (or count (line-number-at-pos (point)))))
+      (goto-char (point-min))
+      (forward-line (1- line)))
+    (recenter -1)))
+
+(evil-define-command evil-scroll-bottom-line-to-top (count)
+  "Scrolls the line right below the window,
+or line COUNT to the top of the window."
+  :repeat nil
+  :keep-visual t
+  (interactive "P")
+  (if count
+      (progn
+        (goto-char (point-min))
+        (forward-line (1- count)))
+    (goto-char (window-end))
+    (evil-move-cursor-back))
+  (recenter 0)
+  (evil-first-non-blank))
+
+(evil-define-command evil-scroll-top-line-to-bottom (count)
+  "Scrolls the line right below the window,
+or line COUNT to the top of the window."
+  :repeat nil
+  :keep-visual t
+  (interactive "P")
+  (if count
+      (progn
+        (goto-char (point-min))
+        (forward-line (1- count)))
+    (goto-char (window-start)))
+  (recenter -1)
+  (evil-first-non-blank))
+
+;;; Text objects
+
+;; Text objects are defined with `evil-define-text-object'. In Visual
+;; state, they modify the current selection; in Operator-Pending
+;; state, they return a pair of buffer positions. Outer text objects
+;; are bound in the keymap `evil-outer-text-objects-map', and inner
+;; text objects are bound in `evil-inner-text-objects-map'.
+;;
+;; Common text objects like words, WORDS, paragraphs and sentences are
+;; defined via a corresponding move-function. This function must have
+;; the following properties:
+;;
+;;   1. Take exactly one argument, the count.
+;;   2. When the count is positive, move point forward to the first
+;;      character after the end of the next count-th object.
+;;   3. When the count is negative, move point backward to the first
+;;      character of the count-th previous object.
+;;   4. If point is placed on the first character of an object, the
+;;      backward motion does NOT count that object.
+;;   5. If point is placed on the last character of an object, the
+;;      forward motion DOES count that object.
+;;   6. The return value is "count left", i.e., in forward direction
+;;      count is decreased by one for each successful move and in
+;;      backward direction count is increased by one for each
+;;      successful move, returning the final value of count.
+;;      Therefore, if the complete move is successful, the return
+;;      value is 0.
+;;
+;; A useful macro in this regard is `evil-motion-loop', which quits
+;; when point does not move further and returns the count difference.
+;; It also provides a "unit value" of 1 or -1 for use in each
+;; iteration. For example, a hypothetical "foo-bar" move could be
+;; written as such:
+;;
+;;     (defun foo-bar (count)
+;;       (evil-motion-loop (var count)
+;;         (forward-foo var) ; `var' is 1 or -1 depending on COUNT
+;;         (forward-bar var)))
+;;
+;; If "forward-foo" and "-bar" didn't accept negative arguments,
+;; we could choose their backward equivalents by inspecting `var':
+;;
+;;     (defun foo-bar (count)
+;;       (evil-motion-loop (var count)
+;;         (cond
+;;          ((< var 0)
+;;           (backward-foo 1)
+;;           (backward-bar 1))
+;;          (t
+;;           (forward-foo 1)
+;;           (forward-bar 1)))))
+;;
+;; After a forward motion, point has to be placed on the first
+;; character after some object, unless no motion was possible at all.
+;; Similarly, after a backward motion, point has to be placed on the
+;; first character of some object. This implies that point should
+;; NEVER be moved to eob or bob, unless an object ends or begins at
+;; eob or bob. (Usually, Emacs motions always move as far as possible.
+;; But we want to use the motion-function to identify certain objects
+;; in the buffer, and thus exact movement to object boundaries is
+;; required.)
+
+(evil-define-text-object evil-a-word (count &optional beg end type)
+  "Select a word."
+  (evil-an-object-range count beg end type #'evil-move-word))
+
+(evil-define-text-object evil-inner-word (count &optional beg end type)
+  "Select inner word."
+  (evil-inner-object-range count beg end type #'evil-move-word))
+
+(evil-define-text-object evil-a-WORD (count &optional beg end type)
+  "Select a WORD."
+  (evil-an-object-range count beg end type #'evil-move-WORD))
+
+(evil-define-text-object evil-inner-WORD (count &optional beg end type)
+  "Select inner WORD."
+  (evil-inner-object-range count beg end type #'evil-move-WORD))
+
+(evil-define-text-object evil-a-sentence (count &optional beg end type)
+  "Select a sentence."
+  (evil-an-object-range count beg end type #'evil-move-sentence nil nil t))
+
+(evil-define-text-object evil-inner-sentence (count &optional beg end type)
+  "Select inner sentence."
+  (evil-inner-object-range count beg end type #'evil-move-sentence))
+
+(evil-define-text-object evil-a-paragraph (count &optional beg end type)
+  "Select a paragraph."
+  :type line
+  (evil-an-object-range count beg end type #'evil-move-paragraph nil nil t))
+
+(evil-define-text-object evil-inner-paragraph (count &optional beg end type)
+  "Select inner paragraph."
+  :type line
+  (evil-inner-object-range count beg end type #'evil-move-paragraph))
+
+(evil-define-text-object evil-a-paren (count &optional beg end type)
+  "Select a parenthesis."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?\( ?\)))
+
+(evil-define-text-object evil-inner-paren (count &optional beg end type)
+  "Select inner parenthesis."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?\( ?\) t))
+
+(evil-define-text-object evil-a-bracket (count &optional beg end type)
+  "Select a square bracket."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?\[ ?\]))
+
+(evil-define-text-object evil-inner-bracket (count &optional beg end type)
+  "Select inner square bracket."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?\[ ?\] t))
+
+(evil-define-text-object evil-a-curly (count &optional beg end type)
+  "Select a curly bracket (\"brace\")."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?{ ?}))
+
+(evil-define-text-object evil-inner-curly (count &optional beg end type)
+  "Select inner curly bracket (\"brace\")."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?{ ?} t))
+
+(evil-define-text-object evil-an-angle (count &optional beg end type)
+  "Select an angle bracket."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?< ?>))
+
+(evil-define-text-object evil-inner-angle (count &optional beg end type)
+  "Select inner angle bracket."
+  :extend-selection nil
+  (evil-paren-range count beg end type ?< ?> t))
+
+(evil-define-text-object evil-a-single-quote (count &optional beg end type)
+  "Select a single-quoted expression."
+  :extend-selection t
+  (evil-quote-range count beg end type ?' ?'))
+
+(evil-define-text-object evil-inner-single-quote (count &optional beg end type)
+  "Select inner single-quoted expression."
+  :extend-selection nil
+  (evil-quote-range count beg end type ?' ?' t))
+
+(evil-define-text-object evil-a-double-quote (count &optional beg end type)
+  "Select a double-quoted expression."
+  :extend-selection t
+  (evil-quote-range count beg end type ?\" ?\"))
+
+(evil-define-text-object evil-inner-double-quote (count &optional beg end type)
+  "Select inner double-quoted expression."
+  :extend-selection nil
+  (evil-quote-range count beg end type ?\" ?\" t))
+
+(evil-define-text-object evil-a-back-quote (count &optional beg end type)
+  "Select a back-quoted expression."
+  :extend-selection t
+  (evil-quote-range count beg end type ?\` ?\`))
+
+(evil-define-text-object evil-inner-back-quote (count &optional beg end type)
+  "Select inner back-quoted expression."
+  :extend-selection nil
+  (evil-quote-range count beg end type ?\` ?\` t))
+
+(evil-define-text-object evil-a-tag (count &optional beg end type)
+  "Select a tag block."
+  :extend-selection nil
+  (evil-xml-range count beg end type))
+
+(evil-define-text-object evil-inner-tag (count &optional beg end type)
+  "Select inner tag block."
+  :extend-selection nil
+  (evil-xml-range count beg end type t))
+
+(evil-define-text-object evil-a-symbol (count &optional beg end type)
+  "Select a symbol."
+  (require 'thingatpt)
+  (evil-an-object-range count beg end type #'forward-symbol))
+
+(evil-define-text-object evil-inner-symbol (count &optional beg end type)
+  "Select inner symbol."
+  (require 'thingatpt)
+  (evil-inner-object-range count beg end type #'forward-symbol))
+
+;;; Operator commands
+
+(evil-define-operator evil-yank (beg end type register yank-handler)
+  "Saves the characters in motion into the kill-ring."
+  :move-point nil
+  :repeat nil
+  (interactive "<R><x><y>")
+  (cond
+   ((and (fboundp 'cua--global-mark-active)
+         (fboundp 'cua-copy-region-to-global-mark)
+         (cua--global-mark-active))
+    (cua-copy-region-to-global-mark beg end))
+   ((eq type 'block)
+    (evil-yank-rectangle beg end register yank-handler))
+   ((eq type 'line)
+    (evil-yank-lines beg end register yank-handler))
+   (t
+    (evil-yank-characters beg end register yank-handler))))
+
+(evil-define-operator evil-yank-line (beg end type register)
+  "Saves whole lines into the kill-ring."
+  :motion evil-line
+  :move-point nil
+  (interactive "<R><x>")
+  (evil-yank beg end type register))
+
+(evil-define-operator evil-delete (beg end type register yank-handler)
+  "Delete text from BEG to END with TYPE.
+Save in REGISTER or in the kill-ring with YANK-HANDLER."
+  (interactive "<R><x><y>")
+  (unless register
+    (let ((text (filter-buffer-substring beg end)))
+      (unless (string-match-p "\n" text)
+        ;; set the small delete register
+        (evil-set-register ?- text))))
+  (evil-yank beg end type register yank-handler)
+  (cond
+   ((eq type 'block)
+    (evil-apply-on-block #'delete-region beg end nil))
+   ((and (eq type 'line)
+         (= end (point-max))
+         (or (= beg end)
+             (/= (char-before end) ?\n))
+         (/= beg (point-min))
+         (=  (char-before beg) ?\n))
+    (delete-region (1- beg) end))
+   (t
+    (delete-region beg end)))
+  ;; place cursor on beginning of line
+  (when (and (evil-called-interactively-p)
+             (eq type 'line))
+    (evil-first-non-blank)))
+
+(evil-define-operator evil-delete-line (beg end type register yank-handler)
+  "Delete to end of line."
+  :motion nil
+  :keep-visual t
+  (interactive "<R><x>")
+  ;; act linewise in Visual state
+  (let* ((beg (or beg (point)))
+         (end (or end beg)))
+    (when (evil-visual-state-p)
+      (unless (memq type '(line block))
+        (let ((range (evil-expand beg end 'line)))
+          (setq beg (evil-range-beginning range)
+                end (evil-range-end range)
+                type (evil-type range))))
+      (evil-exit-visual-state))
+    (cond
+     ((eq type 'block)
+      ;; equivalent to $d, i.e., we use the block-to-eol selection and
+      ;; call `evil-delete'. In this case we fake the call to
+      ;; `evil-end-of-line' by setting `temporary-goal-column' and
+      ;; `last-command' appropriately as `evil-end-of-line' would do.
+      (let ((temporary-goal-column most-positive-fixnum)
+            (last-command 'next-line))
+        (evil-delete beg end 'block register yank-handler)))
+     ((eq type 'line)
+      (evil-delete beg end type register yank-handler))
+     (t
+      (evil-delete beg (line-end-position) type register yank-handler)))))
+
+(evil-define-operator evil-delete-whole-line
+  (beg end type register yank-handler)
+  "Delete whole line."
+  :motion evil-line
+  (interactive "<R><x>")
+  (evil-delete beg end type register yank-handler))
+
+(evil-define-operator evil-delete-char (beg end type register)
+  "Delete next character."
+  :motion evil-forward-char
+  (interactive "<R><x>")
+  (evil-delete beg end type register))
+
+(evil-define-operator evil-delete-backward-char (beg end type register)
+  "Delete previous character."
+  :motion evil-backward-char
+  (interactive "<R><x>")
+  (evil-delete beg end type register))
+
+(evil-define-command evil-delete-backward-word ()
+  "Delete previous word."
+  (if (and (bolp) (not (bobp)))
+      (delete-char -1)
+    (evil-delete (save-excursion
+                   (evil-backward-word-begin)
+                   (point))
+                 (point)
+                 'exclusive
+                 nil)))
+
+(evil-define-operator evil-change
+  (beg end type register yank-handler delete-func)
+  "Change text from BEG to END with TYPE.
+Save in REGISTER or the kill-ring with YANK-HANDLER.
+DELETE-FUNC is a function for deleting text, default `evil-delete'.
+If TYPE is `line', insertion starts on an empty line.
+If TYPE is `block', the inserted text in inserted at each line
+of the block."
+  (interactive "<R><x><y>")
+  (let ((delete-func (or delete-func #'evil-delete))
+        (nlines (1+ (- (line-number-at-pos end)
+                       (line-number-at-pos beg))))
+        (opoint (save-excursion
+                  (goto-char beg)
+                  (line-beginning-position))))
+    (funcall delete-func beg end type register yank-handler)
+    (cond
+     ((eq type 'line)
+      (if ( = opoint (point))
+          (evil-open-above 1)
+        (evil-open-below 1)))
+     ((eq type 'block)
+      (evil-insert 1 nlines))
+     (t
+      (evil-insert 1)))))
+
+(evil-define-operator evil-change-line (beg end type register yank-handler)
+  "Change to end of line."
+  :motion evil-end-of-line
+  (interactive "<R><x><y>")
+  (evil-change beg end type register yank-handler #'evil-delete-line))
+
+(evil-define-operator evil-change-whole-line
+  (beg end type register yank-handler)
+  "Change whole line."
+  :motion evil-line
+  (interactive "<R><x>")
+  (evil-change beg end type register yank-handler #'evil-delete-whole-line))
+
+(evil-define-operator evil-substitute (beg end type register)
+  "Change a character."
+  :motion evil-forward-char
+  (interactive "<R><x>")
+  (evil-change beg end type register))
+
+(evil-define-operator evil-upcase (beg end type)
+  "Convert text to upper case."
+  (if (eq type 'block)
+      (evil-apply-on-block #'evil-upcase beg end nil)
+    (upcase-region beg end)))
+
+(evil-define-operator evil-downcase (beg end type)
+  "Convert text to lower case."
+  (if (eq type 'block)
+      (evil-apply-on-block #'evil-downcase beg end nil)
+    (downcase-region beg end)))
+
+(evil-define-operator evil-invert-case (beg end type)
+  "Invert case of text."
+  (let (char)
+    (if (eq type 'block)
+        (evil-apply-on-block #'evil-invert-case beg end nil)
+      (save-excursion
+        (goto-char beg)
+        (while (< beg end)
+          (setq char (following-char))
+          (delete-char 1 nil)
+          (if (eq (upcase char) char)
+              (insert-char (downcase char) 1)
+            (insert-char (upcase char) 1))
+          (setq beg (1+ beg)))))))
+
+(evil-define-operator evil-invert-char (beg end type)
+  "Invert case of character."
+  :motion evil-forward-char
+  (if (eq type 'block)
+      (evil-apply-on-block #'evil-invert-case beg end nil)
+    (evil-invert-case beg end)
+    (when evil-this-motion
+      (goto-char end))))
+
+(evil-define-operator evil-rot13 (beg end type)
+  "ROT13 encrypt text."
+  (if (eq type 'block)
+      (evil-apply-on-block #'evil-rot13 beg end nil)
+    (rot13-region beg end)))
+
+(evil-define-operator evil-join (beg end)
+  "Join the selected lines."
+  :motion evil-line
+  (let ((count (count-lines beg end)))
+    (when (> count 1)
+      (setq count (1- count)))
+    (dotimes (var count)
+      (join-line 1))))
+
+(evil-define-operator evil-join-whitespace (beg end)
+  "Join the selected lines without changing whitespace.
+\\<evil-normal-state-map>Like \\[evil-join], \
+but doesn't insert or remove any spaces."
+  :motion evil-line
+  (let ((count (count-lines beg end)))
+    (when (> count 1)
+      (setq count (1- count)))
+    (dotimes (var count)
+      (evil-move-end-of-line 1)
+      (unless (eobp)
+        (delete-char 1)))))
+
+(evil-define-operator evil-fill (beg end)
+  "Fill text."
+  :move-point nil
+  :type line
+  (save-excursion
+    (condition-case nil
+        (fill-region beg end)
+      (error nil))))
+
+(evil-define-operator evil-fill-and-move (beg end)
+  "Fill text and move point to the end of the filled region."
+  :move-point nil
+  :type line
+  (let ((marker (make-marker)))
+    (move-marker marker (1- end))
+    (condition-case nil
+        (progn
+          (fill-region beg end)
+          (goto-char marker)
+          (evil-first-non-blank))
+      (error nil))))
+
+(evil-define-operator evil-indent (beg end)
+  "Indent text."
+  :move-point nil
+  :type line
+  (if (and (= beg (line-beginning-position))
+           (= end (line-beginning-position 2)))
+      ;; since some Emacs modes can only indent one line at a time,
+      ;; implement "==" as a call to `indent-according-to-mode'
+      (indent-according-to-mode)
+    (goto-char beg)
+    (indent-region beg end))
+  (back-to-indentation))
+
+(evil-define-operator evil-indent-line (beg end)
+  "Indent the line."
+  :motion evil-line
+  (evil-indent beg end))
+
+(evil-define-operator evil-shift-left (beg end &optional count)
+  "Shift text from BEG to END to the left.
+The text is shifted to the nearest multiple of `evil-shift-width'
+\(the rounding can be disabled by setting `evil-shift-round').
+See also `evil-shift-right'."
+  :type line
+  (interactive "<r><vc>")
+  (let ((beg (set-marker (make-marker) beg))
+        (end (set-marker (make-marker) end)))
+    (dotimes (i (or count 1))
+      (if (not evil-shift-round)
+          (indent-rigidly beg end (- evil-shift-width))
+        (let* ((indent
+                (save-excursion
+                  (goto-char beg)
+                  (evil-move-beginning-of-line)
+                  ;; ignore blank lines
+                  (while (and (< (point) end) (looking-at "[ \t]*$"))
+                    (forward-line))
+                  (if (> (point) end) 0
+                    (current-indentation))))
+               (offset (1+ (mod (1- indent) evil-shift-width))))
+          (indent-rigidly beg end (- offset)))))
+    (set-marker beg nil)
+    (set-marker end nil)))
+
+(evil-define-operator evil-shift-right (beg end &optional count)
+  "Shift text from BEG to END to the right.
+The text is shifted to the nearest multiple of `evil-shift-width'
+\(the rounding can be disabled by setting `evil-shift-round').
+See also `evil-shift-left'."
+  :type line
+  (interactive "<r><vc>")
+  (let ((beg (set-marker (make-marker) beg))
+        (end (set-marker (make-marker) end)))
+    (dotimes (i (or count 1))
+      (if (not evil-shift-round)
+          (indent-rigidly beg end evil-shift-width)
+        (let* ((indent
+                (save-excursion
+                  (goto-char beg)
+                  (evil-move-beginning-of-line nil)
+                  (while (and (< (point) end) (looking-at "[ \t]*$"))
+                    (forward-line))
+                  (if (> (point) end) 0
+                    (current-indentation))))
+               (offset (- evil-shift-width (mod indent evil-shift-width))))
+          (indent-rigidly beg end offset))))
+    (set-marker beg nil)
+    (set-marker end nil)))
+
+(evil-define-operator evil-align-left (beg end type &optional width)
+  "Right-align lines in the region at WIDTH columns.
+The default for width is the value of `fill-column'."
+  :motion evil-line
+  :type line
+  (interactive "<R><a>")
+  (evil-justify-lines beg end 'left (if width
+                                        (string-to-number width)
+                                      0)))
+
+(evil-define-operator evil-align-right (beg end type &optional width)
+  "Right-align lines in the region at WIDTH columns.
+The default for width is the value of `fill-column'."
+  :motion evil-line
+  :type line
+  (interactive "<R><a>")
+  (evil-justify-lines beg end 'right (if width
+                                         (string-to-number width)
+                                       fill-column)))
+
+(evil-define-operator evil-align-center (beg end type &optional width)
+  "Centers lines in the region between WIDTH columns.
+The default for width is the value of `fill-column'."
+  :motion evil-line
+  :type line
+  (interactive "<R><a>")
+  (evil-justify-lines beg end 'center (if width
+                                          (string-to-number width)
+                                        fill-column)))
+
+(evil-define-operator evil-replace (beg end type char)
+  "Replace text from BEG to END with CHAR."
+  :motion evil-forward-char
+  (interactive "<R>"
+               (evil-save-cursor
+                 (evil-refresh-cursor 'replace)
+                 (list (evil-read-key))))
+  (when char
+    (if (eq type 'block)
+        (save-excursion
+          (evil-apply-on-rectangle
+           #'(lambda (begcol endcol char)
+               (let ((maxcol (evil-column (line-end-position))))
+                 (when (< begcol maxcol)
+                   (setq endcol (min endcol maxcol))
+                   (let ((beg (evil-move-to-column begcol nil t))
+                         (end (evil-move-to-column endcol nil t)))
+                     (delete-region beg end)
+                     (insert (make-string (- endcol begcol) char))))))
+           beg end char))
+      (goto-char beg)
+      (cond
+       ((eq char ?\n)
+        (delete-region beg end)
+        (newline)
+        (when evil-auto-indent
+          (indent-according-to-mode)))
+       (t
+        (while (< (point) end)
+          (if (eq (char-after) ?\n)
+              (forward-char)
+            (delete-char 1)
+            (insert-char char 1)))
+        (goto-char (max beg (1- end))))))))
+
+(evil-define-command evil-paste-before
+  (count &optional register yank-handler)
+  "Pastes the latest yanked text before the cursor position.
+The return value is the yanked text."
+  :suppress-operator t
+  (interactive "P<x>")
+  (if (evil-visual-state-p)
+      (evil-visual-paste count register)
+    (evil-with-undo
+      (let* ((text (if register
+                       (evil-get-register register)
+                     (current-kill 0)))
+             (yank-handler (or yank-handler
+                               (when (stringp text)
+                                 (car-safe (get-text-property
+                                            0 'yank-handler text)))))
+             (opoint (point)))
+        (when text
+          (if (functionp yank-handler)
+              (let ((evil-paste-count count)
+                    ;; for non-interactive use
+                    (this-command #'evil-paste-before))
+                (push-mark opoint t)
+                (insert-for-yank text))
+            ;; no yank-handler, default
+            (set-text-properties 0 (length text) nil text)
+            (push-mark opoint t)
+            (dotimes (i (or count 1))
+              (insert-for-yank text))
+            (setq evil-last-paste
+                  (list #'evil-paste-before
+                        count
+                        opoint
+                        opoint    ; beg
+                        (point))) ; end
+            (evil-set-marker ?\[ opoint)
+            (evil-set-marker ?\] (1- (point)))
+            (when (> (length text) 0)
+              (backward-char))))
+        ;; no paste-pop after pasting from a register
+        (when register
+          (setq evil-last-paste nil))
+        (and (> (length text) 0) text)))))
+
+(evil-define-command evil-paste-after
+  (count &optional register yank-handler)
+  "Pastes the latest yanked text behind point.
+The return value is the yanked text."
+  :suppress-operator t
+  (interactive "P<x>")
+  (if (evil-visual-state-p)
+      (evil-visual-paste count register)
+    (evil-with-undo
+      (let* ((text (if register
+                       (evil-get-register register)
+                     (current-kill 0)))
+             (yank-handler (or yank-handler
+                               (when (stringp text)
+                                 (car-safe (get-text-property
+                                            0 'yank-handler text)))))
+             (opoint (point)))
+        (when text
+          (if (functionp yank-handler)
+              (let ((evil-paste-count count)
+                    ;; for non-interactive use
+                    (this-command #'evil-paste-after))
+                (insert-for-yank text))
+            ;; no yank-handler, default
+            (set-text-properties 0 (length text) nil text)
+            (unless (eolp) (forward-char))
+            (push-mark (point) t)
+            ;; TODO: Perhaps it is better to collect a list of all
+            ;; (point . mark) pairs to undo the yanking for COUNT > 1.
+            ;; The reason is that this yanking could very well use
+            ;; `yank-handler'.
+            (let ((beg (point)))
+              (dotimes (i (or count 1))
+                (insert-for-yank text))
+              (setq evil-last-paste
+                    (list #'evil-paste-after
+                          count
+                          opoint
+                          beg       ; beg
+                          (point))) ; end
+              (evil-set-marker ?\[ beg)
+              (evil-set-marker ?\] (1- (point)))
+              (when (evil-normal-state-p)
+                (evil-move-cursor-back)))))
+        (when register
+          (setq evil-last-paste nil))
+        (and (> (length text) 0) text)))))
+
+(evil-define-command evil-visual-paste (count &optional register)
+  "Paste over Visual selection."
+  :suppress-operator t
+  (interactive "P<x>")
+  (let* ((text (if register
+                   (evil-get-register register)
+                 (current-kill 0)))
+         (yank-handler (car-safe (get-text-property
+                                  0 'yank-handler text)))
+         paste-eob)
+    (evil-with-undo
+      (when (evil-visual-state-p)
+        ;; add replaced text to the kill-ring
+        (unless register
+          ;; if pasting from the kill-ring,
+          ;; add replaced text before the current kill
+          (setq kill-ring (delete text kill-ring)))
+        (setq kill-ring-yank-pointer kill-ring)
+        (evil-visual-rotate 'upper-left)
+        ;; if we replace the last buffer line that does not end in a
+        ;; newline, we use `evil-paste-after' because `evil-delete'
+        ;; will move point to the line above
+        (when (and (= evil-visual-end (point-max))
+                   (/= (char-before (point-max)) ?\n))
+          (setq paste-eob t))
+        (evil-delete evil-visual-beginning evil-visual-end
+                     (evil-visual-type))
+        (unless register
+          (kill-new text))
+        (when (and (eq yank-handler #'evil-yank-line-handler)
+                   (not (eq (evil-visual-type) 'line))
+                   (not (= evil-visual-end (point-max))))
+          (insert "\n"))
+        (evil-normal-state))
+      (if paste-eob
+          (evil-paste-after count register)
+        (evil-paste-before count register)))))
+
+(defun evil-paste-from-register (register)
+  "Paste from REGISTER."
+  (interactive
+   (let ((overlay (make-overlay (point) (point)))
+         (string "\""))
+     (unwind-protect
+         (progn
+           ;; display " in the buffer while reading register
+           (put-text-property 0 1 'face 'minibuffer-prompt string)
+           (put-text-property 0 1 'cursor t string)
+           (overlay-put overlay 'after-string string)
+           (list (or evil-this-register (read-char))))
+       (delete-overlay overlay))))
+  (when (evil-paste-before nil register t)
+    ;; go to end of pasted text
+    (forward-char)))
+
+(evil-define-command evil-use-register (register)
+  "Use REGISTER for the next command."
+  :keep-visual t
+  (interactive "<C>")
+  (setq evil-this-register register))
+
+(evil-define-command evil-record-macro (register)
+  "Record a keyboard macro into REGISTER."
+  :keep-visual t
+  :suppress-operator t
+  (interactive
+   (list (unless (and evil-this-macro defining-kbd-macro)
+           (or evil-this-register (read-char)))))
+  (cond
+   ((and evil-this-macro defining-kbd-macro)
+    (condition-case nil
+        (end-kbd-macro)
+      (error nil))
+    (when last-kbd-macro
+      (when (member last-kbd-macro '("" []))
+        (setq last-kbd-macro nil))
+      (evil-set-register evil-this-macro last-kbd-macro))
+    (setq evil-this-macro nil))
+   (t
+    (when defining-kbd-macro (end-kbd-macro))
+    (setq evil-this-macro register)
+    (evil-set-register evil-this-macro nil)
+    (start-kbd-macro nil))))
+
+(evil-define-command evil-execute-macro (count macro)
+  "Execute keyboard macro MACRO, COUNT times.
+When called with a non-numerical prefix \
+\(such as \\[universal-argument]),
+COUNT is infinite. MACRO is read from a register
+when called interactively."
+  :keep-visual t
+  :suppress-operator t
+  (interactive
+   (let (count macro register)
+     (setq count (if current-prefix-arg
+                     (if (numberp current-prefix-arg)
+                         current-prefix-arg
+                       0) 1)
+           register (or evil-this-register (read-char)))
+     (if (eq register ?@)
+         (setq macro last-kbd-macro)
+       (setq macro (evil-get-register register t)))
+     (list count macro)))
+  (if (or (and (not (stringp macro))
+               (not (vectorp macro)))
+          (member macro '("" [])))
+      ;; allow references to currently empty registers
+      ;; when defining macro
+      (unless evil-this-macro
+        (error "No previous macro"))
+    (condition-case err
+        (execute-kbd-macro macro count)
+      ;; enter Normal state if the macro fails
+      (error
+       (evil-normal-state)
+       (evil-normalize-keymaps)
+       (signal (car err) (cdr err))))))
+
+;;; Visual commands
+
+(evil-define-motion evil-visual-restore ()
+  "Restore previous selection."
+  (let* ((point (point))
+         (mark (or (mark t) point))
+         (dir evil-visual-direction)
+         (type (evil-visual-type))
+         range)
+    (unless (evil-visual-state-p)
+      (cond
+       ;; No previous selection.
+       ((or (null evil-visual-selection)
+            (null evil-visual-mark)
+            (null evil-visual-point)))
+       ;; If the type was one-to-one, it is preferable to infer
+       ;; point and mark from the selection's boundaries. The reason
+       ;; is that a destructive operation may displace the markers
+       ;; inside the selection.
+       ((evil-type-property type :one-to-one)
+        (setq range (evil-contract-range (evil-visual-range))
+              mark (evil-range-beginning range)
+              point (evil-range-end range))
+        (when (< dir 0)
+          (evil-swap mark point)))
+       ;; If the type wasn't one-to-one, we have to restore the
+       ;; selection on the basis of the previous point and mark.
+       (t
+        (setq mark evil-visual-mark
+              point evil-visual-point)))
+      (evil-visual-make-selection mark point type t))))
+
+(evil-define-motion evil-visual-exchange-corners ()
+  "Rearrange corners in Visual Block mode.
+
+        M---+           +---M
+        |   |    <=>    |   |
+        +---P           P---+
+
+For example, if mark is in the upper left corner and point
+in the lower right, this function puts mark in the upper right
+corner and point in the lower left."
+  (cond
+   ((eq evil-visual-selection 'block)
+    (let* ((point (point))
+           (mark (or (mark t) point))
+           (point-col (evil-column point))
+           (mark-col (evil-column mark))
+           (mark (save-excursion
+                   (goto-char mark)
+                   (evil-move-to-column point-col)
+                   (point)))
+           (point (save-excursion
+                    (goto-char point)
+                    (evil-move-to-column mark-col)
+                    (point))))
+      (evil-visual-refresh mark point)))
+   (t
+    (evil-exchange-point-and-mark)
+    (evil-visual-refresh))))
+
+(evil-define-command evil-visual-rotate (corner &optional beg end type)
+  "In Visual Block selection, put point in CORNER.
+Corner may be one of `upper-left', `upper-right', `lower-left'
+and `lower-right':
+
+        upper-left +---+ upper-right
+                   |   |
+        lower-left +---+ lower-right
+
+When called interactively, the selection is rotated blockwise."
+  :keep-visual t
+  (interactive
+   (let ((corners '(upper-left upper-right lower-right lower-left)))
+     (list (or (cadr (memq (evil-visual-block-corner) corners))
+               'upper-left))))
+  (let* ((beg (or beg (point)))
+         (end (or end (mark t) beg))
+         (type (or type evil-this-type))
+         range)
+    (cond
+     ((memq type '(rectangle block))
+      (setq range (evil-block-rotate beg end :corner corner)
+            beg (pop range)
+            end (pop range))
+      (unless (eq corner (evil-visual-block-corner corner beg end))
+        (evil-swap beg end))
+      (goto-char beg)
+      (when (evil-visual-state-p)
+        (evil-move-mark end)
+        (evil-visual-refresh nil nil nil :corner corner)))
+     ((memq corner '(upper-right lower-right))
+      (goto-char (max beg end))
+      (when (evil-visual-state-p)
+        (evil-move-mark (min beg end))))
+     (t
+      (goto-char (min beg end))
+      (when (evil-visual-state-p)
+        (evil-move-mark (max beg end)))))))
+
+;;; Insertion commands
+
+(defun evil-insert (count &optional vcount skip-empty-lines)
+  "Switch to Insert state just before point.
+The insertion will be repeated COUNT times and repeated once for
+the next VCOUNT - 1 lines starting at the same column.
+If SKIP-EMPTY-LINES is non-nil, the insertion will not be performed
+on lines on which the insertion point would be after the end of the
+lines.  This is the default behaviour for Visual-state insertion."
+  (interactive
+   (list (prefix-numeric-value current-prefix-arg)
+         (and (evil-visual-state-p)
+              (memq (evil-visual-type) '(line block))
+              (save-excursion
+                ;; go to upper-left corner temporarily so
+                ;; `count-lines' yields accurate results
+                (evil-visual-rotate 'upper-left)
+                (count-lines evil-visual-beginning evil-visual-end)))
+         (evil-visual-state-p)))
+  (if (and (evil-called-interactively-p)
+           (evil-visual-state-p))
+      (cond
+       ((eq (evil-visual-type) 'line)
+        (evil-visual-rotate 'upper-left)
+        (evil-insert-line count vcount))
+       ((eq (evil-visual-type) 'block)
+        (let ((column (min (evil-column evil-visual-beginning)
+                           (evil-column evil-visual-end))))
+          (evil-visual-rotate 'upper-left)
+          (move-to-column column t)
+          (evil-insert count vcount skip-empty-lines)))
+       (t
+        (evil-visual-rotate 'upper-left)
+        (evil-insert count vcount skip-empty-lines)))
+    (setq evil-insert-count count
+          evil-insert-lines nil
+          evil-insert-vcount (and vcount
+                                  (> vcount 1)
+                                  (list (line-number-at-pos)
+                                        (current-column)
+                                        vcount))
+          evil-insert-skip-empty-lines skip-empty-lines)
+    (evil-insert-state 1)))
+
+(defun evil-append (count &optional vcount skip-empty-lines)
+  "Switch to Insert state just after point.
+The insertion will be repeated COUNT times and repeated once for
+the next VCOUNT - 1 lines starting at the same column.  If
+SKIP-EMPTY-LINES is non-nil, the insertion will not be performed
+on lines on which the insertion point would be after the end of
+the lines."
+  (interactive
+   (list (prefix-numeric-value current-prefix-arg)
+         (and (evil-visual-state-p)
+              (memq (evil-visual-type) '(line block))
+              (save-excursion
+                ;; go to upper-left corner temporarily so
+                ;; `count-lines' yields accurate results
+                (evil-visual-rotate 'upper-left)
+                (count-lines evil-visual-beginning evil-visual-end)))))
+  (if (and (evil-called-interactively-p)
+           (evil-visual-state-p))
+      (cond
+       ((or (eq (evil-visual-type) 'line)
+            (and (eq (evil-visual-type) 'block)
+                 (memq last-command '(next-line previous-line))
+                 (numberp temporary-goal-column)
+                 (= temporary-goal-column most-positive-fixnum)))
+        (evil-visual-rotate 'upper-left)
+        (evil-append-line count vcount))
+       ((eq (evil-visual-type) 'block)
+        (let ((column (max (evil-column evil-visual-beginning)
+                           (evil-column evil-visual-end))))
+          (evil-visual-rotate 'upper-left)
+          (move-to-column column t)
+          (evil-insert count vcount skip-empty-lines)))
+       (t
+        (evil-visual-rotate 'lower-right)
+        (evil-append count)))
+    (unless (eolp) (forward-char))
+    (evil-insert count vcount skip-empty-lines)))
+
+(defun evil-insert-resume (count)
+  "Switch to Insert state at previous insertion point.
+The insertion will be repeated COUNT times."
+  (interactive "p")
+  (evil-goto-mark ?^ t)
+  (evil-insert count))
+
+(defun evil-maybe-remove-spaces ()
+  "Remove space from newly opened empty line.
+This function should be called from `post-command-hook' after
+`evil-open-above' or `evil-open-below'.  If the last command
+finished insert state and if the current line consists of
+whitespaces only, then those spaces have been inserted because of
+the indentation.  In this case those spaces are removed leaving a
+completely empty line."
+  (unless (memq this-command '(evil-open-above evil-open-below))
+    (remove-hook 'post-command-hook 'evil-maybe-remove-spaces)
+    (when (and (not (evil-insert-state-p))
+               (save-excursion
+                 (beginning-of-line)
+                 (looking-at "^\\s-*$")))
+      (delete-region (line-beginning-position)
+                     (line-end-position)))))
+
+(defun evil-open-above (count)
+  "Insert a new line above point and switch to Insert state.
+The insertion will be repeated COUNT times."
+  (interactive "p")
+  (evil-insert-newline-above)
+  (setq evil-insert-count count
+        evil-insert-lines t
+        evil-insert-vcount nil)
+  (evil-insert-state 1)
+  (add-hook 'post-command-hook #'evil-maybe-remove-spaces)
+  (when evil-auto-indent
+    (indent-according-to-mode)))
+
+(defun evil-open-below (count)
+  "Insert a new line below point and switch to Insert state.
+The insertion will be repeated COUNT times."
+  (interactive "p")
+  (evil-insert-newline-below)
+  (setq evil-insert-count count
+        evil-insert-lines t
+        evil-insert-vcount nil)
+  (evil-insert-state 1)
+  (add-hook 'post-command-hook #'evil-maybe-remove-spaces)
+  (when evil-auto-indent
+    (indent-according-to-mode)))
+
+(defun evil-insert-line (count &optional vcount)
+  "Switch to insert state at beginning of current line.
+Point is placed at the first non-blank character on the current
+line.  The insertion will be repeated COUNT times.  If VCOUNT is
+non nil it should be number > 0. The insertion will be repeated
+in the next VCOUNT - 1 lines below the current one."
+  (interactive "p")
+  (back-to-indentation)
+  (setq evil-insert-count count
+        evil-insert-lines nil
+        evil-insert-vcount
+        (and vcount
+             (> vcount 1)
+             (list (line-number-at-pos)
+                   #'evil-first-non-blank
+                   vcount)))
+  (evil-insert-state 1))
+
+(defun evil-append-line (count &optional vcount)
+  "Switch to Insert state at the end of the current line.
+The insertion will be repeated COUNT times.  If VCOUNT is non nil
+it should be number > 0. The insertion will be repeated in the
+next VCOUNT - 1 lines below the current one."
+  (interactive "p")
+  (evil-move-end-of-line)
+  (setq evil-insert-count count
+        evil-insert-lines nil
+        evil-insert-vcount
+        (and vcount
+             (> vcount 1)
+             (list (line-number-at-pos)
+                   #'end-of-line
+                   vcount)))
+  (evil-insert-state 1))
+
+(defun evil-insert-digraph (count digraph)
+  "Insert COUNT digraphs DIGRAPH."
+  (interactive
+   (let (count char1 char2 overlay string)
+     (unwind-protect
+         (progn
+           (setq count (prefix-numeric-value current-prefix-arg)
+                 overlay (make-overlay (point) (point)))
+           ;; create overlay prompt
+           (setq string "?")
+           (put-text-property 0 1 'face 'minibuffer-prompt string)
+           ;; put cursor at (i.e., right before) the prompt
+           (put-text-property 0 1 'cursor t string)
+           (overlay-put overlay 'after-string string)
+           (setq char1 (evil-read-key))
+           (setq string (string char1))
+           (put-text-property 0 1 'face 'minibuffer-prompt string)
+           (put-text-property 0 1 'cursor t string)
+           (overlay-put overlay 'after-string string)
+           (setq char2 (evil-read-key)))
+       (delete-overlay overlay))
+     (list count (list char1 char2))))
+  (let ((digraph (or (evil-digraph digraph)
+                     ;; use the last character if undefined
+                     (cadr digraph))))
+    (dotimes (var count)
+      (insert digraph))))
+
+(defun evil-copy-from-above (arg)
+  "Copy characters from preceding non-blank line.
+The copied text is inserted before point.
+ARG is the number of lines to move backward.
+See also \\<evil-insert-state-map>\\[evil-copy-from-below]."
+  (interactive
+   (cond
+    ;; if a prefix argument was given, repeat it for subsequent calls
+    ((and (null current-prefix-arg)
+          (eq last-command #'evil-copy-from-above))
+     (setq current-prefix-arg last-prefix-arg)
+     (list (prefix-numeric-value current-prefix-arg)))
+    (t
+     (list (prefix-numeric-value current-prefix-arg)))))
+  (insert (evil-copy-chars-from-line 1 (- arg))))
+
+(defun evil-copy-from-below (arg)
+  "Copy characters from following non-blank line.
+The copied text is inserted before point.
+ARG is the number of lines to move forward.
+See also \\<evil-insert-state-map>\\[evil-copy-from-above]."
+  (interactive
+   (cond
+    ((and (null current-prefix-arg)
+          (eq last-command #'evil-copy-from-below))
+     (setq current-prefix-arg last-prefix-arg)
+     (list (prefix-numeric-value current-prefix-arg)))
+    (t
+     (list (prefix-numeric-value current-prefix-arg)))))
+  (insert (evil-copy-chars-from-line 1 arg)))
+
+;; adapted from `copy-from-above-command' in misc.el
+(defun evil-copy-chars-from-line (n num &optional col)
+  "Return N characters from line NUM, starting at column COL.
+NUM is relative to the current line and can be negative.
+COL defaults to the current column."
+  (interactive "p")
+  (let ((col (or col (current-column))) prefix)
+    (save-excursion
+      (forward-line num)
+      (when (looking-at "[[:space:]]*$")
+        (if (< num 0)
+            (skip-chars-backward " \t\n")
+          (skip-chars-forward " \t\n")))
+      (evil-move-beginning-of-line)
+      (move-to-column col)
+      ;; if the column winds up in middle of a tab,
+      ;; return the appropriate number of spaces
+      (when (< col (current-column))
+        (if (eq (preceding-char) ?\t)
+            (let ((len (min n (- (current-column) col))))
+              (setq prefix (make-string len ?\s)
+                    n (- n len)))
+          ;; if in middle of a control char, return the whole char
+          (backward-char 1)))
+      (concat prefix
+              (buffer-substring (point)
+                                (min (line-end-position)
+                                     (+ n (point))))))))
+
+;; completion
+(evil-define-command evil-complete-next (&optional arg)
+  "Complete to the nearest following word.
+Search backward if a match isn't found.
+Calls `evil-complete-next-func'."
+  :repeat change
+  (interactive "P")
+  (if (minibufferp)
+      (funcall evil-complete-next-minibuffer-func)
+    (funcall evil-complete-next-func arg)))
+
+(evil-define-command evil-complete-previous (&optional arg)
+  "Complete to the nearest preceding word.
+Search forward if a match isn't found.
+Calls `evil-complete-previous-func'."
+  :repeat change
+  (interactive "P")
+  (if (minibufferp)
+      (funcall evil-complete-previous-minibuffer-func)
+    (funcall evil-complete-previous-func arg)))
+
+(evil-define-command evil-complete-next-line (&optional arg)
+  "Complete a whole line.
+Calls `evil-complete-next-line-func'."
+  :repeat change
+  (interactive "P")
+  (if (minibufferp)
+      (funcall evil-complete-next-minibuffer-func)
+    (funcall evil-complete-next-line-func arg)))
+
+(evil-define-command evil-complete-previous-line (&optional arg)
+  "Complete a whole line.
+Calls `evil-complete-previous-line-func'."
+  :repeat change
+  (interactive "P")
+  (if (minibufferp)
+      (funcall evil-complete-previous-minibuffer-func)
+    (funcall evil-complete-previous-line-func arg)))
+
+;;; Search
+
+(defun evil-repeat-search (flag)
+  "Called to record a search command.
+FLAG is either 'pre or 'post if the function is called before resp.
+after executing the command."
+  (cond
+   ((and (evil-operator-state-p) (eq flag 'pre))
+    (evil-repeat-record (this-command-keys))
+    (evil-clear-command-keys))
+   ((and (evil-operator-state-p) (eq flag 'post))
+    ;; The value of (this-command-keys) at this point should be the
+    ;; key-sequence that called the last command that finished the
+    ;; search, usually RET. Therefore this key-sequence will be
+    ;; recorded in the post-command of the operator. Alternatively we
+    ;; could do it here.
+    (evil-repeat-record (if evil-regexp-search
+                            (car-safe regexp-search-ring)
+                          (car-safe search-ring))))
+   (t (evil-repeat-motion flag))))
+
+(evil-define-motion evil-search-forward ()
+  (format "Search forward for user-entered text.
+Searches for regular expression if `evil-regexp-search' is t.%s"
+          (if (and (fboundp 'isearch-forward)
+                   (documentation 'isearch-forward))
+              (format "\n\nBelow is the documentation string \
+for `isearch-forward',\nwhich lists available keys:\n\n%s"
+                      (documentation 'isearch-forward)) ""))
+  :jump t
+  :type exclusive
+  :repeat evil-repeat-search
+  (evil-search-incrementally t evil-regexp-search))
+
+(evil-define-motion evil-search-backward ()
+  (format "Search backward for user-entered text.
+Searches for regular expression if `evil-regexp-search' is t.%s"
+          (if (and (fboundp 'isearch-forward)
+                   (documentation 'isearch-forward))
+              (format "\n\nBelow is the documentation string \
+for `isearch-forward',\nwhich lists available keys:\n\n%s"
+                      (documentation 'isearch-forward)) ""))
+  :jump t
+  :type exclusive
+  :repeat evil-repeat-search
+  (evil-search-incrementally nil evil-regexp-search))
+
+(evil-define-motion evil-search-next (count)
+  "Repeat the last search."
+  :jump t
+  :type exclusive
+  (dotimes (var (or count 1))
+    (evil-search (if evil-regexp-search
+                     (car-safe regexp-search-ring)
+                   (car-safe search-ring))
+                 isearch-forward evil-regexp-search)))
+
+(evil-define-motion evil-search-previous (count)
+  "Repeat the last search in the opposite direction."
+  :jump t
+  :type exclusive
+  (dotimes (var (or count 1))
+    (evil-search (if evil-regexp-search
+                     (car-safe regexp-search-ring)
+                   (car-safe search-ring))
+                 (not isearch-forward) evil-regexp-search)))
+
+(evil-define-motion evil-search-symbol-backward (count)
+  "Search backward for symbol under point."
+  :jump t
+  :type exclusive
+  (dotimes (var (or count 1))
+    (evil-search-symbol nil)))
+
+(evil-define-motion evil-search-symbol-forward (count)
+  "Search forward for symbol under point."
+  :jump t
+  :type exclusive
+  (dotimes (var (or count 1))
+    (evil-search-symbol t)))
+
+(evil-define-motion evil-goto-definition ()
+  "Go to definition or first occurrence of symbol under point."
+  :jump t
+  :type exclusive
+  (let* ((string (evil-find-symbol t))
+         (search (format "\\_<%s\\_>" (regexp-quote string)))
+         ientry ipos)
+    ;; load imenu if available
+    (unless (featurep 'imenu)
+      (condition-case nil
+          (require 'imenu)
+        (error nil)))
+    (if (null string)
+        (error "No symbol under cursor")
+      (setq isearch-forward t)
+      ;; if imenu is available, try it
+      (cond
+       ((fboundp 'imenu--make-index-alist)
+        (condition-case nil
+            (setq ientry (imenu--make-index-alist))
+          (error nil))
+        (setq ientry (assoc string ientry))
+        (setq ipos (cdr ientry))
+        (when (and (markerp ipos)
+                   (eq (marker-buffer ipos) (current-buffer)))
+          (setq ipos (marker-position ipos)))
+        (cond
+         ;; imenu found a position, so go there and
+         ;; highlight the occurrence
+         ((numberp ipos)
+          (evil-search search t t ipos))
+         ;; imenu failed, so just go to first occurrence in buffer
+         (t
+          (evil-search search t t (point-min)))))
+       ;; no imenu, so just go to first occurrence in buffer
+       (t
+        (evil-search search t t (point-min)))))))
+
+;;; Folding
+
+(evil-define-command evil-toggle-fold ()
+  "Open or close a fold."
+  (when (fboundp 'hs-minor-mode)
+    (hs-minor-mode 1)
+    (with-no-warnings (hs-toggle-hiding))))
+
+(evil-define-command evil-open-folds ()
+  "Open all folds.
+See also `evil-close-folds'."
+  (when (fboundp 'hs-minor-mode)
+    (hs-minor-mode 1)
+    (with-no-warnings (hs-show-all)))
+  (when (memq major-mode '(c-mode c++-mode))
+    (when (fboundp 'hide-ifdef-mode)
+      (hide-ifdef-mode 1)
+      (with-no-warnings (show-ifdefs)))))
+
+(evil-define-command evil-close-folds ()
+  "Close all folds.
+See also `evil-open-folds'."
+  (when (fboundp 'hs-minor-mode)
+    (hs-minor-mode 1)
+    (with-no-warnings (hs-hide-all)))
+  (when (memq major-mode '(c-mode c++-mode))
+    (when (fboundp 'hide-ifdef-mode)
+      (hide-ifdef-mode 1)
+      (with-no-warnings (hide-ifdefs)))))
+
+(evil-define-command evil-open-fold ()
+  "Open fold.
+See also `evil-close-fold'."
+  (with-no-warnings
+    (cond
+     ((and (memq major-mode '(c-mode c++-mode))
+           (fboundp 'hide-ifdef-mode)
+           (hide-ifdef-mode 1)
+           (save-excursion
+             (beginning-of-line)
+             (looking-at hif-ifx-else-endif-regexp)))
+      (show-ifdef-block))
+     ((fboundp 'hs-minor-mode)
+      (hs-minor-mode 1)
+      (hs-show-block)))))
+
+(evil-define-command evil-close-fold ()
+  "Close fold.
+See also `evil-open-fold'."
+  (with-no-warnings
+    (cond
+     ((and (memq major-mode '(c-mode c++-mode))
+           (fboundp 'hide-ifdef-mode)
+           (hide-ifdef-mode 1)
+           (save-excursion
+             (beginning-of-line)
+             (looking-at hif-ifx-else-endif-regexp)))
+      (hide-ifdef-block))
+     ((fboundp 'hs-minor-mode)
+      (hs-minor-mode 1)
+      (hs-hide-block)))))
+
+;;; Ex
+
+(evil-define-operator evil-write (beg end type filename &optional bang)
+  "Save the current buffer, from BEG to END, to FILENAME.
+The current buffer's filename is not changed unless it has no
+associated file and no region is specified.  If the file already
+exists and the BANG argument is non-nil, it is overwritten
+without confirmation."
+  :motion nil
+  :move-point nil
+  :type line
+  :repeat nil
+  (interactive "<R><fsh><!>")
+  (let ((bufname (buffer-file-name (buffer-base-buffer))))
+    (when (zerop (length filename))
+      (setq filename bufname))
+    (cond
+     ((zerop (length filename))
+      (error "Please specify a file name for the buffer"))
+     ;; execute command on region
+     ((eq (aref filename 0) ?!)
+      (shell-command-on-region beg end (substring filename 1)))
+     ;; with region, always save to file without resetting modified flag
+     ((and beg end)
+      (write-region beg end filename nil nil nil (not bang)))
+     ;; no current file
+     ((null bufname)
+      (write-file filename (not bang)))
+     ;; save current buffer to its file
+     ((string= filename bufname)
+      (if (not bang) (save-buffer) (write-file filename)))
+     ;; save to another file
+     (t
+      (write-region nil nil filename
+                    nil (not bufname) nil
+                    (not bang))))))
+
+(evil-define-command evil-write-all (bang)
+  "Saves all buffers visiting a file.
+If BANG is non nil then read-only buffers are saved, too,
+otherwise they are skipped. "
+  :repeat nil
+  :move-point nil
+  (interactive "<!>")
+  (if bang
+      (save-some-buffers t)
+    ;; save only buffer that are not read-only and
+    ;; that are visiting a file
+    (save-some-buffers t
+                       #'(lambda ()
+                           (and (not buffer-read-only)
+                                (buffer-file-name))))))
+
+(evil-define-command evil-save (filename &optional bang)
+  "Save the current buffer to FILENAME.
+Changes the file name of the current buffer to FILENAME.  If no
+FILENAME is given, the current file name is used."
+  :repeat nil
+  :move-point nil
+  (interactive "<f><!>")
+  (when (zerop (length filename))
+    (setq filename (buffer-file-name (buffer-base-buffer))))
+  (write-file filename (not bang)))
+
+(evil-define-command evil-edit (file &optional bang)
+  "Open FILE.
+If no FILE is specified, reload the current buffer from disk."
+  :repeat nil
+  (interactive "<f><!>")
+  (if file
+      (find-file file)
+    (revert-buffer bang (or bang (not (buffer-modified-p))) t)))
+
+(evil-define-command evil-read (count file)
+  "Inserts the contents of FILE below the current line or line COUNT."
+  :repeat nil
+  :move-point nil
+  (interactive "P<fsh>")
+  (when (and file (not (zerop (length file))))
+    (when count (goto-char (point-min)))
+    (when (or (not (zerop (forward-line (or count 1))))
+              (not (bolp)))
+      (insert "\n"))
+    (if (/= (aref file 0) ?!)
+        (let ((result (insert-file-contents file)))
+          (save-excursion
+            (forward-char (cadr result))
+            (unless (bolp) (insert "\n"))))
+      (shell-command (substring file 1) t)
+      (save-excursion
+        (goto-char (mark))
+        (unless (bolp) (insert "\n"))))))
+
+(evil-define-command evil-show-buffers ()
+  "Shows the buffer-list."
+  :repeat nil
+  (let (message-truncate-lines message-log-max)
+    (display-message-or-buffer
+     (mapconcat #'identity
+                (sort
+                 (mapcar #'buffer-name (buffer-list))
+                 #'string<)
+                "\n")
+     "*Buffers*")))
+
+(evil-define-command evil-buffer (buffer)
+  "Switches to another buffer."
+  :repeat nil
+  (interactive "<b>")
+  (if buffer
+      (when (or (get-buffer buffer)
+                (y-or-n-p (format "No buffer with name \"%s\" exists. \
+Create new buffer? " buffer)))
+        (switch-to-buffer buffer))
+    (switch-to-buffer (other-buffer))))
+
+(evil-define-command evil-next-buffer (&optional count)
+  "Goes to the `count'-th next buffer in the buffer list."
+  :repeat nil
+  (interactive "p")
+  (dotimes (i (or count 1))
+    (next-buffer)))
+
+(evil-define-command evil-prev-buffer (&optional count)
+  "Goes to the `count'-th prev buffer in the buffer list."
+  :repeat nil
+  (interactive "p")
+  (dotimes (i (or count 1))
+    (previous-buffer)))
+
+(evil-define-command evil-delete-buffer (buffer &optional bang)
+  "Deletes a buffer.
+All windows currently showing this buffer will be closed except
+for the last window in each frame."
+  (interactive "<b><!>")
+  (with-current-buffer (or buffer (current-buffer))
+    (when bang
+      (set-buffer-modified-p nil)
+      (dolist (process (process-list))
+        (when (eq (process-buffer process) (current-buffer))
+          (set-process-query-on-exit-flag process nil))))
+    ;; get all windows that show this buffer
+    (let ((wins (get-buffer-window-list (current-buffer) nil t)))
+      ;; if the buffer which was initiated by emacsclient,
+      ;; call `server-edit' from server.el to avoid
+      ;; "Buffer still has clients" message
+      (if (and (fboundp 'server-edit)
+               (boundp 'server-buffer-clients)
+               server-buffer-clients)
+          (server-edit)
+        (kill-buffer nil))
+      ;; close all windows that showed this buffer
+      (mapc #'(lambda (w)
+                (condition-case nil
+                    (delete-window w)
+                  (error nil)))
+            wins))))
+
+(evil-define-command evil-quit (&optional bang)
+  "Closes the current window, current frame, Emacs.
+If the current frame belongs to some client the client connection
+is closed."
+  :repeat nil
+  (interactive "<!>")
+  (condition-case nil
+      (delete-window)
+    (error
+     (condition-case nil
+         (let ((proc (frame-parameter (selected-frame) 'client)))
+           (if proc
+               (evil-quit-all bang)
+             (delete-frame)))
+       (error
+        (evil-quit-all bang))))))
+
+(evil-define-command evil-quit-all (&optional bang)
+  "Exits Emacs, asking for saving."
+  :repeat nil
+  (interactive "<!>")
+  (if (null bang)
+      (save-buffers-kill-terminal)
+    (let ((proc (frame-parameter (selected-frame) 'client)))
+      (if proc
+          (with-no-warnings
+            (server-delete-client proc))
+        (dolist (process (process-list))
+          (set-process-query-on-exit-flag process nil))
+        (kill-emacs)))))
+
+(evil-define-command evil-save-and-quit ()
+  "Exits Emacs, without saving."
+  (save-buffers-kill-terminal t))
+
+(evil-define-command evil-save-and-close (file &optional bang)
+  "Saves the current buffer and closes the window."
+  :repeat nil
+  (interactive "<f><!>")
+  (evil-write nil nil nil file bang)
+  (evil-quit))
+
+(evil-define-command evil-save-modified-and-close (file &optional bang)
+  "Saves the current buffer and closes the window."
+  :repeat nil
+  (interactive "<f><!>")
+  (when (buffer-modified-p)
+    (evil-write nil nil nil file bang))
+  (evil-quit))
+
+(evil-define-operator evil-shell-command
+  (beg end command &optional previous)
+  "Execute a shell command.
+If BEG and END is specified, COMMAND is executed on the region,
+which is replaced with the command's output. Otherwise, the
+output is displayed in its own buffer. If PREVIOUS is non-nil,
+the previous shell command is executed instead."
+  :motion nil
+  (interactive "<r><sh><!>")
+  (when command
+    (setq command (evil-ex-replace-special-filenames command)))
+  (if (zerop (length command))
+      (when previous (setq command evil-previous-shell-command))
+    (setq evil-previous-shell-command command))
+  (cond
+   ((zerop (length command))
+    (if previous (error "No previous shell command")
+      (error "No shell command")))
+   ((and beg end)
+    (shell-command-on-region beg end command t)
+    (goto-char beg)
+    (evil-first-non-blank))
+   (t
+    (shell-command command))))
+
+;; TODO: escape special characters (currently only \n) ... perhaps
+;; there is some Emacs function doing this?
+(evil-define-command evil-show-registers ()
+  "Shows the contents of all registers."
+  :repeat nil
+  (let (message-truncate-lines message-log-max)
+    (message "%s"
+             (mapconcat #'(lambda (reg)
+                            (format "\"%c\t%s"
+                                    (car reg)
+                                    (if (stringp (cdr reg))
+                                        (replace-regexp-in-string "\n" "^J" (cdr reg))
+                                      (cdr reg))))
+                        (evil-register-list) "\n"))))
+
+(eval-when-compile (require 'ffap))
+(evil-define-command evil-find-file-at-point-with-line ()
+  "Opens the file at point and goes to line-number."
+  (require 'ffap)
+  (let ((fname (with-no-warnings (ffap-file-at-point))))
+    (if fname
+        (let ((line
+               (save-excursion
+                 (goto-char (cadr ffap-string-at-point-region))
+                 (and (re-search-backward ":\\([0-9]+\\)\\="
+                                          (line-beginning-position) t)
+                      (string-to-number (match-string 1))))))
+          (with-no-warnings (ffap-other-window))
+          (when line
+            (goto-char (point-min))
+            (forward-line (1- line))))
+      (error "File does not exist."))))
+
+(evil-ex-define-argument-type state
+  "Defines an argument type which can take state names."
+  :completer
+  (lambda ()
+    (list
+     (point-min) (point-max)
+     (lambda (arg predicate flag)
+       (let ((completions
+              (append '("nil")
+                      (mapcar #'(lambda (state)
+                                  (format "%s" (car state)))
+                              evil-state-properties))))
+         (when arg
+           (cond
+            ((eq flag nil)
+             (try-completion arg completions predicate))
+            ((eq flag t)
+             (all-completions arg completions predicate))
+            ((eq flag 'lambda)
+             (test-completion arg completions predicate))
+            ((eq (car-safe flag) 'boundaries)
+             (cons 'boundaries
+                   (completion-boundaries arg
+                                          completions
+                                          predicate
+                                          (cdr flag)))))))))))
+
+(evil-define-interactive-code "<state>"
+  "A valid evil state."
+  :ex-arg state
+  (list (when (and (evil-ex-p) evil-ex-argument)
+          (intern evil-ex-argument))))
+
+;; TODO: should we merge this command with `evil-set-initial-state'?
+(evil-define-command evil-ex-set-initial-state (state)
+  "Set the initial state for the current major mode to STATE.
+This is the state the buffer comes up in. See `evil-set-initial-state'."
+  :repeat nil
+  (interactive "<state>")
+  (if (not (or (assq state evil-state-properties)
+               (null state)))
+      (error "State %s cannot be set as initial Evil state" state)
+    (let ((current-initial-state (evil-initial-state major-mode)))
+      (unless (eq current-initial-state state)
+        ;; only if we selected a new mode
+        (when (y-or-n-p (format "Major-mode `%s' has initial mode `%s'. \
+Change to `%s'? "
+                                major-mode
+                                (or current-initial-state "DEFAULT")
+                                (or state "DEFAULT")))
+          (evil-set-initial-state major-mode state)
+          (when (y-or-n-p "Save setting in customization file? ")
+            (dolist (s (list current-initial-state state))
+              (when s
+                (let ((var (intern (format "evil-%s-state-modes" s))))
+                  (customize-save-variable var (symbol-value var)))))))))))
+
+(evil-define-command evil-force-normal-state ()
+  "Switch to normal state without recording current command."
+  :repeat abort
+  :suppress-operator t
+  (evil-normal-state))
+
+(evil-define-motion evil-ex-search-next (count)
+  "Goes to the next occurrence."
+  :jump t
+  :type exclusive
+  (setq evil-ex-search-start-point (point))
+  (let ((orig (point))
+        wrapped)
+    (dotimes (i (or count 1))
+      (if (eq evil-ex-search-direction 'backward)
+          (unless (bobp) (backward-char))
+        (unless (eobp) (forward-char))
+        ;; maybe skip end-of-line
+        (when (and evil-move-cursor-back
+                   (eolp) (not (eobp)))
+          (forward-char)))
+      (let ((res (evil-ex-find-next)))
+        (cond
+         ((not res)
+          (goto-char orig)
+          (signal 'search-failed
+                  (list (evil-ex-pattern-regex evil-ex-search-pattern))))
+         ((eq res 'wrapped) (setq wrapped t)))))
+    (if wrapped
+        (let (message-log-max)
+          (message "Search wrapped")))
+    (goto-char (match-beginning 0))
+    (setq evil-ex-search-match-beg (match-beginning 0)
+          evil-ex-search-match-end (match-end 0))
+    (evil-ex-search-goto-offset evil-ex-search-offset)
+    (evil-ex-search-activate-highlight evil-ex-search-pattern)))
+
+(evil-define-motion evil-ex-search-previous (count)
+  "Goes the the previous occurrence."
+  :jump t
+  :type exclusive
+  (let ((evil-ex-search-direction
+         (if (eq evil-ex-search-direction 'backward) 'forward 'backward)))
+    (evil-ex-search-next count)))
+
+(defun evil-repeat-ex-search (flag)
+  "Called to record a search command.
+FLAG is either 'pre or 'post if the function is called before
+resp.  after executing the command."
+  (cond
+   ((and (evil-operator-state-p) (eq flag 'pre))
+    (evil-repeat-record (this-command-keys))
+    (evil-clear-command-keys))
+   ((and (evil-operator-state-p) (eq flag 'post))
+    ;; The value of (this-command-keys) at this point should be the
+    ;; key-sequence that called the last command that finished the
+    ;; search, usually RET. Therefore this key-sequence will be
+    ;; recorded in the post-command of the operator. Alternatively we
+    ;; could do it here.
+    (evil-repeat-record (evil-ex-pattern-regex evil-ex-search-pattern)))
+   (t (evil-repeat-motion flag))))
+
+(evil-define-motion evil-ex-search-forward (count)
+  "Starts a forward search."
+  :jump t
+  :type exclusive
+  :repeat evil-repeat-ex-search
+  (evil-ex-start-search 'forward count))
+
+(evil-define-motion evil-ex-search-backward (count)
+  "Starts a forward search."
+  :jump t
+  :repeat evil-repeat-ex-search
+  (evil-ex-start-search 'backward count))
+
+(evil-define-motion evil-ex-search-symbol-forward (count)
+  "Search for the next occurrence of word under the cursor."
+  :jump t
+  :type exclusive
+  (evil-ex-start-symbol-search nil 'forward count))
+
+(evil-define-motion evil-ex-search-symbol-backward (count)
+  "Search for the next occurrence of word under the cursor."
+  :jump t
+  :type exclusive
+  (evil-ex-start-symbol-search nil 'backward count))
+
+(evil-define-motion evil-ex-search-unbounded-symbol-forward (count)
+  "Search for the next occurrence of word under the cursor."
+  :jump t
+  :type exclusive
+  (evil-ex-start-symbol-search t 'forward count))
+
+(evil-define-motion evil-ex-search-unbounded-symbol-backward (count)
+  "Search for the next occurrence of word under the cursor."
+  :jump t
+  :type exclusive
+  (evil-ex-start-symbol-search t 'backward count))
+
+(evil-define-operator evil-ex-substitute
+  (beg end pattern replacement flags)
+  "The Ex substitute command.
+\[BEG,END]substitute/PATTERN/REPLACEMENT/FLAGS"
+  :repeat nil
+  :jump t
+  :move-point nil
+  :motion evil-line
+  (interactive "<r><s/>")
+  (evil-ex-nohighlight)
+  (unless pattern
+    (error "No pattern given"))
+  (unless replacement
+    (error "No replacement given"))
+  (let* ((flags (append flags nil))
+         (confirm (memq ?c flags))
+         (case-fold-search (eq (evil-ex-pattern-case-fold pattern)
+                               'insensitive))
+         (evil-ex-substitute-regex (evil-ex-pattern-regex pattern)))
+    (setq evil-ex-substitute-pattern pattern
+          evil-ex-substitute-replacement replacement
+          evil-ex-substitute-flags flags
+          isearch-string evil-ex-substitute-regex)
+    (isearch-update-ring evil-ex-substitute-regex t)
+    (if (evil-ex-pattern-whole-line pattern)
+        ;; this one is easy, just use the built-in function
+        (perform-replace evil-ex-substitute-regex
+                         evil-ex-substitute-replacement
+                         confirm t nil nil nil
+                         beg
+                         (if (and (> end (point-min))
+                                  (= (char-after (1- end)) ?\n))
+                             (1- end)
+                           end))
+      (let ((evil-ex-substitute-nreplaced 0)
+            (evil-ex-substitute-next-line (line-number-at-pos beg))
+            (evil-ex-substitute-last-line
+             (if (save-excursion (goto-char end) (bolp))
+                 (1- (line-number-at-pos end))
+               (line-number-at-pos end)))
+            (evil-ex-substitute-last-point (point)))
+        (if confirm
+            (let ((evil-ex-substitute-overlay
+                   (make-overlay (point) (point)))
+                  (evil-ex-substitute-hl
+                   (evil-ex-make-hl 'evil-ex-substitute)))
+              (evil-ex-hl-change 'evil-ex-substitute pattern)
+              (unwind-protect
+                  ;; this one is more difficult: we have to do
+                  ;; the highlighting and querying on our own
+                  (progn
+                    (overlay-put evil-ex-substitute-overlay
+                                 'face 'isearch)
+                    (overlay-put evil-ex-substitute-overlay
+                                 'priority 1001)
+                    (map-y-or-n-p
+                     #'(lambda (x)
+                         (set-match-data x)
+                         (move-overlay evil-ex-substitute-overlay
+                                       (match-beginning 0)
+                                       (match-end 0))
+                         (format "Query replacing %s with %s: "
+                                 (match-string 0)
+                                 (evil-match-substitute-replacement
+                                  evil-ex-substitute-replacement
+                                  (not case-replace))))
+                     #'(lambda (x)
+                         (set-match-data x)
+                         (evil-replace-match evil-ex-substitute-replacement
+                                             (not case-replace))
+                         (setq evil-ex-substitute-last-point (point))
+                         (setq evil-ex-substitute-nreplaced
+                               (1+ evil-ex-substitute-nreplaced))
+                         (evil-ex-hl-set-region 'evil-ex-substitute
+                                                (save-excursion
+                                                  (forward-line)
+                                                  (point))
+                                                (evil-ex-hl-get-max
+                                                 'evil-ex-substitute)))
+                     #'(lambda ()
+                         (goto-char (point-min))
+                         (when (and
+                                (zerop
+                                 (forward-line
+                                  (1- evil-ex-substitute-next-line)))
+                                (bolp)
+                                (re-search-forward
+                                 evil-ex-substitute-regex
+                                 nil t nil)
+                                (<= (line-number-at-pos (match-end 0))
+                                    evil-ex-substitute-last-line))
+                           (goto-char (match-beginning 0))
+                           (setq evil-ex-substitute-next-line
+                                 (1+ (line-number-at-pos (point))))
+                           (match-data)))))
+                (evil-ex-delete-hl 'evil-ex-substitute)
+                (delete-overlay evil-ex-substitute-overlay)))
+
+          ;; just replace the first occurrences per line
+          ;; without highlighting and asking
+          (goto-char (point-min))
+          (let ((num (1- evil-ex-substitute-next-line)))
+            (while (and (zerop (forward-line num))
+                        (bolp)
+                        (re-search-forward
+                         evil-ex-substitute-regex nil t nil)
+                        (<= (line-number-at-pos
+                             (match-beginning 0))
+                            evil-ex-substitute-last-line))
+              (setq evil-ex-substitute-nreplaced
+                    (1+ evil-ex-substitute-nreplaced))
+              (evil-replace-match evil-ex-substitute-replacement
+                                  (not case-replace))
+              (setq evil-ex-substitute-last-point (point))
+              (setq num 1))))
+
+        (goto-char evil-ex-substitute-last-point)
+
+        (message "Replaced %d occurrence%s"
+                 evil-ex-substitute-nreplaced
+                 (if (/= evil-ex-substitute-nreplaced 1) "s" ""))))
+    (evil-first-non-blank)))
+
+(evil-define-operator evil-ex-repeat-substitute
+  (beg end flags)
+  "Repeat last substitute command.
+This is the same as :s//~/"
+  :repeat nil
+  :jump t
+  :move-point nil
+  :motion evil-line
+  (interactive "<r><a>")
+  (apply #'evil-ex-substitute beg end
+         (evil-ex-get-substitute-info (concat "//~/" flags))))
+
+(evil-define-operator evil-ex-repeat-substitute-with-flags
+  (beg end flags)
+  "Repeat last substitute command with last flags.
+This is the same as :s//~/&"
+  :repeat nil
+  :jump t
+  :move-point nil
+  :motion evil-line
+  (interactive "<r><a>")
+  (apply #'evil-ex-substitute beg end
+         (evil-ex-get-substitute-info (concat "//~/&" flags))))
+
+(evil-define-operator evil-ex-repeat-substitute-with-search
+  (beg end flags)
+  "Repeat last substitute command with last search pattern.
+This is the same as :s//~/r"
+  :repeat nil
+  :jump t
+  :move-point nil
+  :motion evil-line
+  (interactive "<r><a>")
+  (apply #'evil-ex-substitute beg end
+         (evil-ex-get-substitute-info (concat "//~/r" flags))))
+
+(evil-define-operator evil-ex-repeat-substitute-with-search-and-flags
+  (beg end flags)
+  "Repeat last substitute command with last search pattern and last flags.
+This is the same as :s//~/&r"
+  :repeat nil
+  :jump t
+  :move-point nil
+  :motion evil-line
+  (interactive "<r><a>")
+  (apply #'evil-ex-substitute beg end
+         (evil-ex-get-substitute-info (concat "//~/&r" flags))))
+
+(evil-define-operator evil-ex-repeat-global-substitute ()
+  "Repeat last substitute command on the whole buffer.
+This is the same as :%s//~/&"
+  :repeat nil
+  :jump t
+  :move-point nil
+  :motion evil-line
+  (interactive)
+  (apply #'evil-ex-substitute (point-min) (point-max)
+         (evil-ex-get-substitute-info (concat "//~/&"))))
+
+(evil-define-operator evil-ex-global
+  (beg end pattern command &optional invert)
+  "The Ex global command.
+\[BEG,END]global[!]/PATTERN/COMMAND"
+  :motion mark-whole-buffer
+  :move-point nil
+  (interactive "<r><g/><!>")
+  (unless pattern
+    (error "No pattern given"))
+  (unless command
+    (error "No command given"))
+  (evil-with-single-undo
+    (let ((case-fold-search
+           (eq (evil-ex-regex-case pattern 'smart) 'insensitive))
+          match markers)
+      (when (and pattern command)
+        (setq isearch-string pattern)
+        (isearch-update-ring pattern t)
+        (goto-char beg)
+        (evil-move-beginning-of-line)
+        (while (< (point) end)
+          (setq match (re-search-forward pattern (line-end-position) t))
+          (when (or (and match (not invert))
+                    (and invert (not match)))
+            (push (move-marker (make-marker)
+                               (or (and match (match-beginning 0))
+                                   (line-beginning-position)))
+                  markers))
+          (forward-line))
+        (setq markers (nreverse markers))
+        (unwind-protect
+            (dolist (marker markers)
+              (goto-char marker)
+              (evil-ex-eval command))
+          ;; ensure that all markers are deleted afterwards,
+          ;; even in the event of failure
+          (dolist (marker markers)
+            (set-marker marker nil)))))))
+
+(evil-define-operator evil-ex-global-inverted
+  (beg end pattern command &optional invert)
+  "The Ex vglobal command.
+\[BEG,END]vglobal/PATTERN/COMMAND"
+  :motion mark-whole-buffer
+  :move-point nil
+  (interactive "<r><g/><!>")
+  (evil-ex-global beg end pattern command (not invert)))
+
+(evil-define-command evil-goto-char (position)
+  "Go to POSITION in the buffer.
+Default position is the beginning of the buffer."
+  (interactive "p")
+  (let ((position (evil-normalize-position
+                   (or position (point-min)))))
+    (goto-char position)))
+
+(evil-define-operator evil-ex-line-number (beg end)
+  "Print the last line number."
+  :motion mark-whole-buffer
+  :move-point nil
+  (interactive "<r>")
+  (message "%d" (count-lines (point-min) end)))
+
+(evil-define-command evil-show-file-info ()
+  "Shows basic file information."
+  (let* ((nlines   (count-lines (point-min) (point-max)))
+         (curr     (line-number-at-pos (point)))
+         (perc     (* (/ (float curr) (float nlines)) 100.0))
+         (file     (buffer-file-name (buffer-base-buffer)))
+         (writable (and file (file-writable-p file)))
+         (readonly (if (and file (not writable)) "[readonly] " "")))
+    (if file
+        (message "\"%s\" %d %slines --%d%%--" file nlines readonly perc)
+      (message "%d lines --%d%%--" nlines perc))))
+
+;;; Window navigation
+
+(defun evil-resize-window (new-size &optional horizontal)
+  "Set the current window's width or height to NEW-SIZE.
+If HORIZONTAL is non-nil the width of the window is changed,
+otherwise its height is changed."
+  (let ((wincfg (current-window-configuration))
+        (nwins (length (window-list)))
+        (count (if horizontal
+                   (- new-size (window-width))
+                 (- new-size (window-height)))))
+    (catch 'done
+      (save-window-excursion
+        (while (not (zerop count))
+          (if (> count 0)
+              (progn
+                (enlarge-window 1 horizontal)
+                (setq count (1- count)))
+            (progn
+              (shrink-window 1 horizontal)
+              (setq count (1+ count))))
+          (if (= nwins (length (window-list)))
+              (setq wincfg (current-window-configuration))
+            (throw 'done t)))))
+    (set-window-configuration wincfg)))
+
+(defun evil-get-buffer-tree (wintree)
+  "Extracts the buffer tree from a given window tree WINTREE."
+  (if (consp wintree)
+      (cons (car wintree) (mapcar #'evil-get-buffer-tree (cddr wintree)))
+    (window-buffer wintree)))
+
+(defun evil-restore-window-tree (win tree)
+  "Restore the given buffer-tree layout as subwindows of WIN.
+TREE is the tree layout to be restored."
+  (cond
+   ((and (consp tree) (cddr tree))
+    (let ((newwin (split-window win nil (not (car tree)))))
+      (evil-restore-window-tree win (cadr tree))
+      (evil-restore-window-tree newwin (cons (car tree) (cddr tree)))))
+   ((consp tree)
+    (set-window-buffer win (cadr tree)))
+   (t
+    (set-window-buffer win tree))))
+
+(evil-define-command evil-window-split (&optional count file)
+  "Splits the current window horizontally, COUNT lines height,
+editing a certain FILE."
+  :repeat nil
+  (interactive "P<f>")
+  (let ((new-win (split-window (selected-window) count)))
+    (when file
+      (evil-edit file))))
+
+(evil-define-command evil-window-vsplit (&optional count file)
+  "Splits the current window vertically, COUNT columns width,
+editing a certain FILE."
+  :repeat nil
+  (interactive "P<f>")
+  (let ((new-win (split-window (selected-window) count t)))
+    (when file
+      (evil-edit file))))
+
+(evil-define-command evil-split-buffer (buffer)
+  "Splits window and switches to another buffer."
+  :repeat nil
+  (interactive "<b>")
+  (evil-window-split)
+  (evil-buffer buffer))
+
+(evil-define-command evil-split-next-buffer (&optional count)
+  "Splits the window and goes to the COUNT-th next buffer in the buffer list."
+  :repeat nil
+  (interactive "p")
+  (evil-window-split)
+  (evil-next-buffer count))
+
+(evil-define-command evil-split-prev-buffer (&optional count)
+  "Splits window and goes to the COUNT-th prev buffer in the buffer list."
+  :repeat nil
+  (interactive "p")
+  (evil-window-split)
+  (evil-prev-buffer count))
+
+(evil-define-command evil-window-left (count)
+  "Move the cursor to new COUNT-th window left of the current one."
+  :repeat nil
+  (interactive "p")
+  (dotimes (i count)
+    (windmove-left)))
+
+(evil-define-command evil-window-right (count)
+  "Move the cursor to new COUNT-th window right of the current one."
+  :repeat nil
+  (interactive "p")
+  (dotimes (i count)
+    (windmove-right)))
+
+(evil-define-command evil-window-up (count)
+  "Move the cursor to new COUNT-th window above the current one."
+  :repeat nil
+  (interactive "p")
+  (dotimes (i (or count 1))
+    (windmove-up)))
+
+(evil-define-command evil-window-down (count)
+  "Move the cursor to new COUNT-th window below the current one."
+  :repeat nil
+  (interactive "p")
+  (dotimes (i (or count 1))
+    (windmove-down)))
+
+(evil-define-command evil-window-bottom-right ()
+  "Move the cursor to bottom-right window."
+  :repeat nil
+  (while (let (success)
+           (condition-case nil
+               (progn
+                 (windmove-right)
+                 (setq success t))
+             (error nil))
+           (condition-case nil
+               (progn
+                 (windmove-down)
+                 (setq success t))
+             (error nil))
+           success)))
+
+(evil-define-command evil-window-top-left ()
+  "Move the cursor to top-left window."
+  :repeat nil
+  (while (let (success)
+           (condition-case nil
+               (progn
+                 (windmove-left)
+                 (setq success t))
+             (error nil))
+           (condition-case nil
+               (progn
+                 (windmove-up)
+                 (setq success t))
+             (error nil))
+           success)))
+
+(evil-define-command evil-window-mru ()
+  "Move the cursor to the previous (last accessed) buffer in another window.
+More precisely, it selectes the most recently used buffer that is
+shown in some other window, preferably of the current frame, and
+is different from the current one."
+  :repeat nil
+  (catch 'done
+    (dolist (buf (buffer-list (selected-frame)))
+      (let ((win (get-buffer-window buf)))
+        (when (and (not (eq buf (current-buffer)))
+                   win
+                   (not (eq win (selected-window))))
+          (select-window win)
+          (throw 'done nil))))))
+
+(evil-define-command evil-window-next (count)
+  "Move the cursor to the next window in the cyclic order.
+With COUNT go to the count-th window in the order starting from
+top-left."
+  :repeat nil
+  (interactive "P")
+  (if (not count)
+      (select-window (next-window))
+    (evil-window-top-left)
+    (other-window (1- count))))
+
+(evil-define-command evil-window-prev (count)
+  "Move the cursor to the previous window in the cyclic order.
+With COUNT go to the count-th window in the order starting from
+top-left."
+  :repeat nil
+  (interactive "P")
+  (if (not count)
+      (select-window (previous-window))
+    (evil-window-top-left)
+    (other-window (1- count))))
+
+(evil-define-command evil-window-new (count file)
+  "Splits the current window horizontally
+and opens a new buffer or edits a certain FILE."
+  :repeat nil
+  (interactive "P<f>")
+  (split-window (selected-window) count)
+  (if file
+      (evil-edit file)
+    (let ((buffer (generate-new-buffer "*new*")))
+      (set-window-buffer (selected-window) buffer)
+      (with-current-buffer buffer
+        (evil-normal-state)))))
+
+(evil-define-command evil-window-vnew (count file)
+  "Splits the current window vertically
+and opens a new buffer name or edits a certain FILE."
+  :repeat nil
+  (interactive "P<f>")
+  (split-window (selected-window) count t)
+  (if file
+      (evil-edit file)
+    (let ((buffer (generate-new-buffer "*new*")))
+      (set-window-buffer (selected-window) buffer)
+      (with-current-buffer buffer
+        (evil-normal-state)))))
+
+(evil-define-command evil-window-increase-height (count)
+  "Increase current window height by COUNT."
+  :repeat nil
+  (interactive "p")
+  (evil-resize-window (+ (window-height) count)))
+
+(evil-define-command evil-window-decrease-height (count)
+  "Decrease current window height by COUNT."
+  :repeat nil
+  (interactive "p")
+  (evil-resize-window (- (window-height) count)))
+
+(evil-define-command evil-window-increase-width (count)
+  "Increase current window width by COUNT."
+  :repeat nil
+  (interactive "p")
+  (evil-resize-window (+ (window-width) count) t))
+
+(evil-define-command evil-window-decrease-width (count)
+  "Decrease current window width by COUNT."
+  :repeat nil
+  (interactive "p")
+  (evil-resize-window (- (window-width) count) t))
+
+(evil-define-command evil-window-set-height (count)
+  "Sets the height of the current window to COUNT."
+  :repeat nil
+  (interactive "P")
+  (evil-resize-window (or count (frame-height)) nil))
+
+(evil-define-command evil-window-set-width (count)
+  "Sets the width of the current window to COUNT."
+  :repeat nil
+  (interactive "P")
+  (evil-resize-window (or count (frame-width)) t))
+
+(evil-define-command evil-window-rotate-upwards ()
+  "Rotates the windows according to the currenty cyclic ordering."
+  :repeat nil
+  (let ((wlist (window-list))
+        (blist (mapcar #'(lambda (w) (window-buffer w))
+                       (window-list))))
+    (setq blist (append (cdr blist) (list (car blist))))
+    (while (and wlist blist)
+      (set-window-buffer (car wlist) (car blist))
+      (setq wlist (cdr wlist)
+            blist (cdr blist)))
+    (select-window (car (last (window-list))))))
+
+(evil-define-command evil-window-rotate-downwards ()
+  "Rotates the windows according to the currenty cyclic ordering."
+  :repeat nil
+  (let ((wlist (window-list))
+        (blist (mapcar #'(lambda (w) (window-buffer w))
+                       (window-list))))
+    (setq blist (append (last blist) blist))
+    (while (and wlist blist)
+      (set-window-buffer (car wlist) (car blist))
+      (setq wlist (cdr wlist)
+            blist (cdr blist)))
+    (select-window (cadr (window-list)))))
+
+(evil-define-command evil-window-move-very-top ()
+  "Closes the current window, splits the upper-left one horizontally
+and redisplays the current buffer there."
+  :repeat nil
+  (unless (one-window-p)
+    (let ((b (current-buffer)))
+      (delete-window)
+      (let ((btree (evil-get-buffer-tree (car (window-tree)))))
+        (delete-other-windows)
+        (let ((newwin (selected-window))
+              (subwin (split-window)))
+          (evil-restore-window-tree subwin btree)
+          (set-window-buffer newwin b)
+          (select-window newwin))))
+    (balance-windows)))
+
+(evil-define-command evil-window-move-far-left ()
+  "Closes the current window, splits the upper-left one vertically
+and redisplays the current buffer there."
+  :repeat nil
+  (unless (one-window-p)
+    (let ((b (current-buffer)))
+      (delete-window)
+      (let ((btree (evil-get-buffer-tree (car (window-tree)))))
+        (delete-other-windows)
+        (let ((newwin (selected-window))
+              (subwin (split-window-horizontally)))
+          (evil-restore-window-tree subwin btree)
+          (set-window-buffer newwin b)
+          (select-window newwin))))
+    (balance-windows)))
+
+(evil-define-command evil-window-move-far-right ()
+  "Closes the current window, splits the lower-right one vertically
+and redisplays the current buffer there."
+  :repeat nil
+  (unless (one-window-p)
+    (let ((b (current-buffer)))
+      (delete-window)
+      (let ((btree (evil-get-buffer-tree (car (window-tree)))))
+        (delete-other-windows)
+        (let ((subwin (selected-window))
+              (newwin (split-window-horizontally)))
+          (evil-restore-window-tree subwin btree)
+          (set-window-buffer newwin b)
+          (select-window newwin))))
+    (balance-windows)))
+
+(evil-define-command evil-window-move-very-bottom ()
+  "Closes the current window, splits the lower-right one horizontally
+and redisplays the current buffer there."
+  :repeat nil
+  (unless (one-window-p)
+    (let ((b (current-buffer)))
+      (delete-window)
+      (let ((btree (evil-get-buffer-tree (car (window-tree)))))
+        (delete-other-windows)
+        (let ((subwin (selected-window))
+              (newwin (split-window)))
+          (evil-restore-window-tree subwin btree)
+          (set-window-buffer newwin b)
+          (select-window newwin))))
+    (balance-windows)))
+
+;;; Mouse handling
+
+;; Large parts of this code are taken from mouse.el which is
+;; distributed with GNU Emacs
+(defun evil-mouse-drag-region (start-event)
+  "Set the region to the text that the mouse is dragged over.
+Highlight the drag area as you move the mouse.
+This must be bound to a button-down mouse event.
+
+If the click is in the echo area, display the `*Messages*' buffer.
+
+START-EVENT should be the event that started the drag."
+  (interactive "e")
+  ;; Give temporary modes such as isearch a chance to turn off.
+  (run-hooks 'mouse-leave-buffer-hook)
+  (evil-mouse-drag-track start-event t))
+(evil-set-command-property 'evil-mouse-drag-region :keep-visual t)
+
+(defun evil-mouse-drag-track (start-event &optional
+                                          do-mouse-drag-region-post-process)
+  "Track mouse drags by highlighting area between point and cursor.
+The region will be defined with mark and point.
+DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
+`mouse-drag-region'."
+  (mouse-minibuffer-check start-event)
+  (setq mouse-selection-click-count-buffer (current-buffer))
+  (deactivate-mark)
+  (let* ((scroll-margin 0) ; Avoid margin scrolling (Bug#9541).
+         (original-window (selected-window))
+         ;; We've recorded what we needed from the current buffer and
+         ;; window, now let's jump to the place of the event, where things
+         ;; are happening.
+         (_ (mouse-set-point start-event))
+         (echo-keystrokes 0)
+         (start-posn (event-start start-event))
+         (start-point (posn-point start-posn))
+         (start-window (posn-window start-posn))
+         (start-window-start (window-start start-window))
+         (start-hscroll (window-hscroll start-window))
+         (bounds (window-edges start-window))
+         (make-cursor-line-fully-visible nil)
+         (top (nth 1 bounds))
+         (bottom (if (window-minibuffer-p start-window)
+                     (nth 3 bounds)
+                   ;; Don't count the mode line.
+                   (1- (nth 3 bounds))))
+         (on-link (and mouse-1-click-follows-link
+                       (or mouse-1-click-in-non-selected-windows
+                           (eq start-window original-window))
+                       ;; Use start-point before the intangibility
+                       ;; treatment, in case we click on a link inside an
+                       ;; intangible text.
+                       (mouse-on-link-p start-posn)))
+         (click-count (1- (event-click-count start-event)))
+         (remap-double-click (and on-link
+                                  (eq mouse-1-click-follows-link 'double)
+                                  (= click-count 1)))
+         ;; Suppress automatic hscrolling, because that is a nuisance
+         ;; when setting point near the right fringe (but see below).
+         (auto-hscroll-mode-saved auto-hscroll-mode)
+         (auto-hscroll-mode nil)
+         event end end-point)
+
+    (setq mouse-selection-click-count click-count)
+    ;; In case the down click is in the middle of some intangible text,
+    ;; use the end of that text, and put it in START-POINT.
+    (if (< (point) start-point)
+        (goto-char start-point))
+    (setq start-point (point))
+    (if remap-double-click
+        (setq click-count 0))
+
+    (setq click-count (mod click-count 4))
+
+    ;; activate correct visual state
+    (let ((range (evil-mouse-start-end start-point start-point click-count)))
+      (set-mark (nth 0 range))
+      (goto-char (nth 1 range)))
+
+    (cond
+     ((= click-count 0)
+      (when (evil-visual-state-p) (evil-exit-visual-state)))
+     ((= click-count 1)
+      (evil-visual-char)
+      (evil-visual-post-command))
+     ((= click-count 2)
+      (evil-visual-line)
+      (evil-visual-post-command))
+     ((= click-count 3)
+      (evil-visual-block)
+      (evil-visual-post-command)))
+
+    ;; Track the mouse until we get a non-movement event.
+    (track-mouse
+      (while (progn
+               (setq event (read-event))
+               (or (mouse-movement-p event)
+                   (memq (car-safe event) '(switch-frame select-window))))
+        (unless (evil-visual-state-p)
+          (cond
+           ((= click-count 0) (evil-visual-char))
+           ((= click-count 1) (evil-visual-char))
+           ((= click-count 2) (evil-visual-line))
+           ((= click-count 3) (evil-visual-block))))
+
+        (evil-visual-pre-command)
+        (unless (memq (car-safe event) '(switch-frame select-window))
+          ;; Automatic hscrolling did not occur during the call to
+          ;; `read-event'; but if the user subsequently drags the
+          ;; mouse, go ahead and hscroll.
+          (let ((auto-hscroll-mode auto-hscroll-mode-saved))
+            (redisplay))
+          (setq end (event-end event)
+                end-point (posn-point end))
+          (if (and (eq (posn-window end) start-window)
+                   (integer-or-marker-p end-point))
+              (evil-mouse--drag-set-mark-and-point start-point
+                                                   end-point click-count)
+            (let ((mouse-row (cdr (cdr (mouse-position)))))
+              (cond
+               ((null mouse-row))
+               ((< mouse-row top)
+                (mouse-scroll-subr start-window (- mouse-row top)
+                                   nil start-point))
+               ((>= mouse-row bottom)
+                (mouse-scroll-subr start-window (1+ (- mouse-row bottom))
+                                   nil start-point))))))
+        (evil-visual-post-command)))
+
+    ;; Handle the terminating event if possible.
+    (when (consp event)
+      ;; Ensure that point is on the end of the last event.
+      (when (and (setq end-point (posn-point (event-end event)))
+                 (eq (posn-window end) start-window)
+                 (integer-or-marker-p end-point)
+                 (/= start-point end-point))
+        (evil-mouse--drag-set-mark-and-point start-point
+                                             end-point click-count))
+
+      ;; Find its binding.
+      (let* ((fun (key-binding (vector (car event))))
+             (do-multi-click (and (> (event-click-count event) 0)
+                                  (functionp fun)
+                                  (not (memq fun '(mouse-set-point
+                                                   mouse-set-region))))))
+        (if (and (or (/= (mark) (point))
+                     (= click-count 1) ; word selection
+                     (and (memq (evil-visual-type) '(line block))))
+                 (not do-multi-click))
+
+            ;; If point has moved, finish the drag.
+            (let (last-command this-command)
+              (and mouse-drag-copy-region
+                   do-mouse-drag-region-post-process
+                   (let (deactivate-mark)
+                     (evil-visual-expand-region)
+                     (copy-region-as-kill (mark) (point))
+                     (evil-visual-contract-region))))
+
+          ;; If point hasn't moved, run the binding of the
+          ;; terminating up-event.
+          (if do-multi-click
+              (goto-char start-point)
+            (deactivate-mark))
+          (when (and (functionp fun)
+                     (= start-hscroll (window-hscroll start-window))
+                     ;; Don't run the up-event handler if the window
+                     ;; start changed in a redisplay after the
+                     ;; mouse-set-point for the down-mouse event at
+                     ;; the beginning of this function.  When the
+                     ;; window start has changed, the up-mouse event
+                     ;; contains a different position due to the new
+                     ;; window contents, and point is set again.
+                     (or end-point
+                         (= (window-start start-window)
+                            start-window-start)))
+            (when (and on-link
+                       (= start-point (point))
+                       (evil-mouse--remap-link-click-p start-event event))
+              ;; If we rebind to mouse-2, reselect previous selected
+              ;; window, so that the mouse-2 event runs in the same
+              ;; situation as if user had clicked it directly.  Fixes
+              ;; the bug reported by juri@jurta.org on 2005-12-27.
+              (if (or (vectorp on-link) (stringp on-link))
+                  (setq event (aref on-link 0))
+                (select-window original-window)
+                (setcar event 'mouse-2)
+                ;; If this mouse click has never been done by the
+                ;; user, it doesn't have the necessary property to be
+                ;; interpreted correctly.
+                (put 'mouse-2 'event-kind 'mouse-click)))
+            (push event unread-command-events)))))))
+
+;; This function is a plain copy of `mouse--drag-set-mark-and-point',
+;; which is only available in Emacs 24
+(defun evil-mouse--drag-set-mark-and-point (start click click-count)
+  (let* ((range (evil-mouse-start-end start click click-count))
+         (beg (nth 0 range))
+         (end (nth 1 range)))
+    (cond ((eq (mark) beg)
+           (goto-char end))
+          ((eq (mark) end)
+           (goto-char beg))
+          ((< click (mark))
+           (set-mark end)
+           (goto-char beg))
+          (t
+           (set-mark beg)
+           (goto-char end)))))
+
+;; This function is a plain copy of `mouse--remap-link-click-p',
+;; which is only available in Emacs 23
+(defun evil-mouse--remap-link-click-p (start-event end-event)
+  (or (and (eq mouse-1-click-follows-link 'double)
+           (= (event-click-count start-event) 2))
+      (and
+       (not (eq mouse-1-click-follows-link 'double))
+       (= (event-click-count start-event) 1)
+       (= (event-click-count end-event) 1)
+       (or (not (integerp mouse-1-click-follows-link))
+           (let ((t0 (posn-timestamp (event-start start-event)))
+                 (t1 (posn-timestamp (event-end   end-event))))
+             (and (integerp t0) (integerp t1)
+                  (if (> mouse-1-click-follows-link 0)
+                      (<= (- t1 t0) mouse-1-click-follows-link)
+                    (< (- t0 t1) mouse-1-click-follows-link))))))))
+
+(defun evil-mouse-start-end (start end mode)
+  "Return a list of region bounds based on START and END according to MODE.
+If MODE is not 1 then set point to (min START END), mark to (max
+START END).  If MODE is 1 then set point to start of word at (min
+START END), mark to end of word at (max START END)."
+  (evil-sort start end)
+  (setq mode (mod mode 4))
+  (if (/= mode 1) (list start end)
+    (list
+     (save-excursion
+       (goto-char (min (point-max) (1+ start)))
+       (if (zerop (funcall evil-mouse-word -1))
+           (let ((bpnt (point)))
+             (funcall evil-mouse-word +1)
+             (if (> (point) start) bpnt (point)))
+         (point-min)))
+     (save-excursion
+       (goto-char end)
+       (1-
+        (if (zerop (funcall evil-mouse-word +1))
+            (let ((epnt (point)))
+              (funcall evil-mouse-word -1)
+              (if (<= (point) end) epnt (point)))
+          (point-max)))))))
+
+;;; State switching
+
+(evil-define-command evil-exit-emacs-state (&optional buffer message)
+  "Exit Emacs state.
+Changes the state to the previous state, or to Normal state
+if the previous state was Emacs state."
+  :keep-visual t
+  :suppress-operator t
+  (interactive '(nil t))
+  (with-current-buffer (or buffer (current-buffer))
+    (when (evil-emacs-state-p)
+      (evil-change-to-previous-state buffer message)
+      (when (evil-emacs-state-p)
+        (evil-normal-state (and message 1))))))
+
+(defun evil-execute-in-normal-state ()
+  "Execute the next command in Normal state."
+  (interactive)
+  (evil-delay '(not (memq this-command
+                          '(evil-execute-in-normal-state
+                            evil-use-register
+                            digit-argument
+                            negative-argument
+                            universal-argument
+                            universal-argument-minus
+                            universal-argument-more
+                            universal-argument-other-key)))
+      `(progn
+         (evil-change-to-previous-state)
+         (setq evil-move-cursor-back ',evil-move-cursor-back))
+    'post-command-hook)
+  (setq evil-move-cursor-back nil)
+  (evil-normal-state)
+  (evil-echo "Switched to Normal state for the next command ..."))
+
+(defun evil-execute-in-emacs-state (&optional arg)
+  "Execute the next command in Emacs state."
+  (interactive "p")
+  (cond
+   (arg
+    (add-hook 'post-command-hook #'evil-execute-in-emacs-state t)
+    (setq evil-execute-in-emacs-state-buffer (current-buffer))
+    (evil-emacs-state)
+    (evil-echo "Switched to Emacs state for the next command ..."))
+   ((and (not (eq this-command #'evil-execute-in-emacs-state))
+         (not (minibufferp)))
+    (remove-hook 'post-command-hook 'evil-execute-in-emacs-state)
+    (when (buffer-live-p evil-execute-in-emacs-state-buffer)
+      (with-current-buffer evil-execute-in-emacs-state-buffer
+        (evil-change-to-previous-state)))
+    (setq evil-execute-in-emacs-state-buffer))))
+
+;; TODO: this will probably not work well with the repeat-system.
+(evil-define-command evil-esc (arg)
+  "Wait for further keys within `evil-esc-delay'.
+Otherwise send [escape]."
+  :repeat ignore
+  (interactive "P")
+  (if (sit-for evil-esc-delay t)
+      (progn
+        (push 'escape unread-command-events)
+        (when defining-kbd-macro
+          ;; we need to replace the ESC by 'escape in the currently
+          ;; defined keyboard macro
+          (evil-save-echo-area
+            (end-kbd-macro)
+            (setq last-kbd-macro (vconcat last-kbd-macro [escape]))
+            (start-kbd-macro t t))))
+    (push last-command-event unread-command-events)
+    ;; preserve prefix argument
+    (setq prefix-arg arg))
+  ;; disable interception for the next key sequence
+  (evil-esc-mode -1)
+  (setq this-command last-command)
+  (add-hook 'pre-command-hook #'evil-turn-on-esc-mode nil t))
+
+(defun evil-exit-visual-and-repeat (event)
+  "Exit insert state and repeat event.
+This special command should be used if some command called from
+visual state should actually be called in normal-state.  The main
+reason for doing this is that the repeat system should *not*
+record the visual state information for some command.  This
+command should be bound to exactly the same event in visual state
+as the original command is bound in normal state.  EVENT is the
+event that triggered the execution of this command."
+  (interactive "e")
+  (when (evil-visual-state-p)
+    (evil-exit-visual-state)
+    (push event unread-command-events)))
+(evil-declare-ignore-repeat 'evil-exit-visual-and-repeat)
+
+(provide 'evil-commands)
+
+;;; evil-commands.el ends here
diff --git a/elpa/evil-1.0.1/evil-common.el b/elpa/evil-1.0.1/evil-common.el
new file mode 100644
index 00000000..31dac756
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-common.el
@@ -0,0 +1,3217 @@
+;;; evil-common.el --- Common functions and utilities
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-vars)
+(require 'rect)
+
+;;; Code:
+
+(declare-function evil-visual-state-p "evil-states")
+
+;;; Compatibility for Emacs 23
+(unless (fboundp 'deactivate-input-method)
+  (defalias 'deactivate-input-method 'inactivate-input-method))
+(unless (boundp 'input-method-deactivate-hook)
+  (defvaralias 'input-method-deactivate-hook 'input-method-inactivate-hook))
+
+(condition-case nil
+    (require 'windmove)
+  (error
+   (message "evil: Could not load `windmove', \
+window commands not available.")
+   nil))
+
+(when (and (require 'undo-tree nil t)
+           (fboundp 'global-undo-tree-mode))
+  (global-undo-tree-mode 1))
+
+;;; Compatibility with different Emacs versions
+
+(defmacro evil-called-interactively-p ()
+  "Wrapper for `called-interactively-p'.
+In older versions of Emacs, `called-interactively-p' takes
+no arguments.  In Emacs 23.2 and newer, it takes one argument."
+  (if (version< emacs-version "23.2")
+      '(called-interactively-p)
+    '(called-interactively-p 'any)))
+
+(unless (fboundp 'region-active-p)
+  (defun region-active-p ()
+    "Returns t iff region and mark are active."
+    (and transient-mark-mode mark-active)))
+
+;; Emacs <23 does not know `characterp'
+(unless (fboundp 'characterp)
+  (defalias 'characterp 'char-valid-p))
+
+;; `make-char-table' requires this property in Emacs 22
+(unless (get 'display-table 'char-table-extra-slots)
+  (put 'display-table 'char-table-extra-slots 0))
+
+;; macro helper
+(eval-and-compile
+  (defun evil-unquote (exp)
+    "Return EXP unquoted."
+    (while (eq (car-safe exp) 'quote)
+      (setq exp (cadr exp)))
+    exp))
+
+(defun evil-delay (condition form hook &optional append local name)
+  "Execute FORM when CONDITION becomes true, checking with HOOK.
+NAME specifies the name of the entry added to HOOK. If APPEND is
+non-nil, the entry is appended to the hook. If LOCAL is non-nil,
+the buffer-local value of HOOK is modified."
+  (if (and (not (booleanp condition)) (eval condition))
+      (eval form)
+    (let* ((name (or name (format "evil-delay-form-in-%s" hook)))
+           (fun (make-symbol name))
+           (condition (or condition t)))
+      (fset fun `(lambda (&rest args)
+                   (when ,condition
+                     (remove-hook ',hook #',fun ',local)
+                     ,form)))
+      (put fun 'permanent-local-hook t)
+      (add-hook hook fun append local))))
+(put 'evil-delay 'lisp-indent-function 2)
+
+;;; List functions
+
+(defun evil-add-to-alist (list-var key val &rest elements)
+  "Add the assocation of KEY and VAL to the value of LIST-VAR.
+If the list already contains an entry for KEY, update that entry;
+otherwise add at the end of the list."
+  (let ((tail (symbol-value list-var)))
+    (while (and tail (not (equal (car-safe (car-safe tail)) key)))
+      (setq tail (cdr tail)))
+    (if tail
+        (setcar tail (cons key val))
+      (set list-var (append (symbol-value list-var)
+                            (list (cons key val)))))
+    (if elements
+        (apply #'evil-add-to-alist list-var elements)
+      (symbol-value list-var))))
+
+;; custom version of `delete-if'
+(defun evil-filter-list (predicate list &optional pointer)
+  "Delete by side-effect all items satisfying PREDICATE in LIST.
+Stop when reaching POINTER.  If the first item satisfies PREDICATE,
+there is no way to remove it by side-effect; therefore, write
+\(setq foo (evil-filter-list 'predicate foo)) to be sure of
+changing the value of `foo'."
+  (let ((tail list) elt head)
+    (while (and tail (not (eq tail pointer)))
+      (setq elt (car tail))
+      (cond
+       ((funcall predicate elt)
+        (setq tail (cdr tail))
+        (if head
+            (setcdr head tail)
+          (setq list tail)))
+       (t
+        (setq head tail
+              tail (cdr tail)))))
+    list))
+
+(defun evil-member-if (predicate list &optional pointer)
+  "Find the first item satisfying PREDICATE in LIST.
+Stop when reaching POINTER, which should point at a link
+in the list."
+  (let (elt)
+    (catch 'done
+      (while (and (consp list) (not (eq list pointer)))
+        (setq elt (car list))
+        (if (funcall predicate elt)
+            (throw 'done elt)
+          (setq list (cdr list)))))))
+
+(defun evil-member-recursive-if (predicate tree)
+  "Find the first item satisfying PREDICATE in TREE."
+  (cond
+   ((funcall predicate tree)
+    tree)
+   ((listp tree)
+    (catch 'done
+      (dolist (elt tree)
+        (when (setq elt (evil-member-recursive-if predicate elt))
+          (throw 'done elt)))))))
+
+(defun evil-concat-lists (&rest sequences)
+  "Concatenate lists, removing duplicates.
+Elements are compared with `eq'."
+  (let (result)
+    (dolist (sequence sequences)
+      (dolist (elt sequence)
+        (add-to-list 'result elt nil #'eq)))
+    (nreverse result)))
+
+(defun evil-concat-alists (&rest sequences)
+  "Concatenate association lists, removing duplicates.
+An alist is a list of cons cells (KEY . VALUE) where each key
+may occur only once. Later values overwrite earlier values."
+  (let (result)
+    (dolist (sequence sequences)
+      (dolist (elt sequence)
+        (setq result (assq-delete-all (car-safe elt) result))
+        (push elt result)))
+    (nreverse result)))
+
+(defun evil-concat-plists (&rest sequences)
+  "Concatenate property lists, removing duplicates.
+A property list is a list (:KEYWORD1 VALUE1 :KEYWORD2 VALUE2...)
+where each keyword may occur only once. Later values overwrite
+earlier values."
+  (let (result)
+    (dolist (sequence sequences result)
+      (while sequence
+        (setq result
+              (plist-put result (pop sequence) (pop sequence)))))))
+
+(defun evil-concat-keymap-alists (&rest sequences)
+  "Concatenate keymap association lists, removing duplicates.
+A keymap alist is a list of cons cells (VAR . MAP) where each keymap
+may occur only once, but where the variables may be repeated
+\(e.g., (VAR . MAP1) (VAR . MAP2) is allowed). The order matters,
+with the highest priority keymaps being listed first."
+  (let (result)
+    (dolist (sequence sequences)
+      (dolist (elt sequence)
+        (unless (rassq (cdr-safe elt) result)
+          (push elt result))))
+    (nreverse result)))
+
+(defun evil-plist-delete (prop plist)
+  "Delete by side effect the property PROP from PLIST.
+If PROP is the first property in PLIST, there is no way
+to remove it by side-effect; therefore, write
+\(setq foo (evil-plist-delete :prop foo)) to be sure of
+changing the value of `foo'."
+  (let ((tail plist) elt head)
+    (while tail
+      (setq elt (car tail))
+      (cond
+       ((eq elt prop)
+        (setq tail (cdr (cdr tail)))
+        (if head
+            (setcdr (cdr head) tail)
+          (setq plist tail)))
+       (t
+        (setq head tail
+              tail (cdr (cdr tail))))))
+    plist))
+
+(defun evil-get-property (alist key &optional prop)
+  "Return property PROP for KEY in ALIST.
+ALIST is an association list with entries of the form
+\(KEY . PLIST), where PLIST is a property list.
+If PROP is nil, return all properties for KEY.
+If KEY is t, return an association list of keys
+and their PROP values."
+  (cond
+   ((null prop)
+    (cdr (assq key alist)))
+   ((eq key t)
+    (let (result val)
+      (dolist (entry alist result)
+        (setq key (car entry)
+              val (cdr entry))
+        (when (plist-member val prop)
+          (setq val (plist-get val prop))
+          (push (cons key val) result)))))
+   (t
+    (plist-get (cdr (assq key alist)) prop))))
+
+(defun evil-put-property (alist-var key prop val &rest properties)
+  "Set PROP to VAL for KEY in ALIST-VAR.
+ALIST-VAR points to an association list with entries of the form
+\(KEY . PLIST), where PLIST is a property list storing PROP and VAL."
+  (set alist-var
+       (let* ((alist (symbol-value alist-var))
+              (plist (cdr (assq key alist))))
+         (setq plist (plist-put plist prop val))
+         (when properties
+           (setq plist (evil-concat-plists plist properties)
+                 val (car (last properties))))
+         (setq alist (assq-delete-all key alist))
+         (push (cons key plist) alist)))
+  val)
+
+(defun evil-state-property (state prop &optional value)
+  "Return the value of property PROP for STATE.
+PROP is a keyword as used by `evil-define-state'.
+STATE is the state's symbolic name.
+If VALUE is non-nil and the value is a variable,
+return the value of that variable."
+  (let ((val (evil-get-property evil-state-properties state prop)))
+    (if (and value (symbolp val) (boundp val))
+        (symbol-value val)
+      val)))
+
+(defmacro evil-swap (this that &rest vars)
+  "Swap the values of variables THIS and THAT.
+If three or more arguments are given, the values are rotated.
+E.g., (evil-swap A B C) sets A to B, B to C, and C to A."
+  `(progn
+     (setq ,this (prog1 ,that
+                   (setq ,that ,this)))
+     ,@(when vars
+         `((evil-swap ,that ,@vars)))))
+
+(defmacro evil-sort (min max &rest vars)
+  "Place the smallest value in MIN and the largest in MAX.
+If three or more arguments are given, place the smallest
+value in the first argument and the largest in the last,
+sorting in between."
+  (let ((sorted (make-symbol "sortvar")))
+    `(let ((,sorted (sort (list ,min ,max ,@vars) '<)))
+       (setq ,min (pop ,sorted)
+             ,max (pop ,sorted)
+             ,@(apply #'append
+                      (mapcar #'(lambda (var)
+                                  (list var `(pop ,sorted)))
+                              vars))))))
+
+;;; Command properties
+
+(defmacro evil-define-command (command &rest body)
+  "Define a command COMMAND.
+
+\(fn COMMAND (ARGS...) DOC [[KEY VALUE]...] BODY...)"
+  (declare (indent defun)
+           (debug (&define name
+                           [&optional lambda-list]
+                           [&optional stringp]
+                           [&rest keywordp sexp]
+                           [&optional ("interactive" [&rest form])]
+                           def-body)))
+  (let ((interactive '(interactive))
+        arg args doc doc-form key keys)
+    ;; collect arguments
+    (when (listp (car-safe body))
+      (setq args (pop body)))
+    ;; collect docstring
+    (when (> (length body) 1)
+      (if (eq (car-safe (car-safe body)) 'format)
+          (setq doc-form (pop body))
+        (when (stringp (car-safe body))
+          (setq doc (pop body)))))
+    ;; collect keywords
+    (setq keys (plist-put keys :repeat t))
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            arg (pop body))
+      (unless nil ; TODO: add keyword check
+        (setq keys (plist-put keys key arg))))
+    ;; collect `interactive' form
+    (when (and body (consp (car body))
+               (eq (car (car body)) 'interactive))
+      (let* ((iform (pop body))
+             (result (apply #'evil-interactive-form (cdr iform)))
+             (form (car result))
+             (attrs (cdr result)))
+        (setq interactive `(interactive ,form)
+              keys (evil-concat-plists keys attrs))))
+    `(progn
+       ;; the compiler does not recognize `defun' inside `let'
+       ,(when (and command body)
+          `(defun ,command ,args
+             ,@(when doc `(,doc))
+             ,interactive
+             ,@body))
+       ,(when (and command doc-form)
+          `(put ',command 'function-documentation ,doc-form))
+       ;; set command properties for symbol or lambda function
+       (let ((func ',(if (and (null command) body)
+                         `(lambda ,args
+                            ,interactive
+                            ,@body)
+                       command)))
+         (apply #'evil-set-command-properties func ',keys)
+         func))))
+
+;; If no Evil properties are defined for the command, several parts of
+;; Evil apply certain default rules; e.g., the repeat system decides
+;; whether the command is repeatable by monitoring buffer changes.
+(defun evil-has-command-property-p (command property)
+  "Whether COMMAND has Evil PROPERTY.
+See also `evil-has-command-properties-p'."
+  (plist-member (evil-get-command-properties command) property))
+
+(defun evil-has-command-properties-p (command)
+  "Whether Evil properties are defined for COMMAND.
+See also `evil-has-command-property-p'."
+  (and (evil-get-command-properties command) t))
+
+(defun evil-get-command-property (command property &optional default)
+  "Return the value of Evil PROPERTY of COMMAND.
+If the command does not have the property, return DEFAULT.
+See also `evil-get-command-properties'."
+  (if (evil-has-command-property-p command property)
+      (evil-get-property evil-command-properties command property)
+    default))
+
+(defun evil-get-command-properties (command)
+  "Return all Evil properties of COMMAND.
+See also `evil-get-command-property'."
+  (evil-get-property evil-command-properties command))
+
+(defun evil-set-command-property (command property value)
+  "Set PROPERTY to VALUE for COMMAND.
+To set multiple properties at once, see
+`evil-set-command-properties' and `evil-add-command-properties'."
+  (evil-put-property 'evil-command-properties command property value))
+(defalias 'evil-put-command-property 'evil-set-command-property)
+
+(defun evil-add-command-properties (command &rest properties)
+  "Add PROPERTIES to COMMAND.
+PROPERTIES should be a property list.
+To replace all properties at once, use `evil-set-command-properties'."
+  (apply #'evil-put-property
+         'evil-command-properties command properties))
+
+(defun evil-set-command-properties (command &rest properties)
+  "Replace all of COMMAND's properties with PROPERTIES.
+PROPERTIES should be a property list.
+This erases all previous properties; to only add properties,
+use `evil-set-command-property'."
+  (setq evil-command-properties
+        (assq-delete-all command evil-command-properties))
+  (when properties
+    (apply #'evil-add-command-properties command properties)))
+
+(defun evil-remove-command-properties (command &rest properties)
+  "Remove PROPERTIES from COMMAND.
+PROPERTIES should be a list of properties (:PROP1 :PROP2 ...).
+If PROPERTIES is the empty list, all properties are removed."
+  (let (plist)
+    (when properties
+      (setq plist (evil-get-command-properties command))
+      (dolist (property properties)
+        (setq plist (evil-plist-delete property plist))))
+    (apply #'evil-set-command-properties command plist)))
+
+(defun evil-yank-handler (&optional motion)
+  "Return the yank handler for MOTION.
+MOTION defaults to the current motion."
+  (setq motion (or motion evil-this-motion))
+  (evil-get-command-property motion :yank-handler))
+
+(defun evil-declare-motion (command)
+  "Declare COMMAND to be a movement function.
+This ensures that it behaves correctly in Visual state."
+  (evil-add-command-properties command :keep-visual t :repeat 'motion))
+
+(defun evil-declare-repeat (command)
+  "Declare COMMAND to be repeatable."
+  (evil-add-command-properties command :repeat t))
+
+(defun evil-declare-not-repeat (command)
+  "Declare COMMAND to be nonrepeatable."
+  (evil-add-command-properties command :repeat nil))
+
+(defun evil-declare-ignore-repeat (command)
+  "Declare COMMAND to be nonrepeatable."
+  (evil-add-command-properties command :repeat 'ignore))
+
+(defun evil-declare-change-repeat (command)
+  "Declare COMMAND to be repeatable by buffer changes."
+  (evil-add-command-properties command :repeat 'change))
+
+(defun evil-declare-insert-at-point-repeat (command)
+  "Declare COMMAND to be repeatable by buffer changes."
+  (evil-add-command-properties command :repeat 'insert-at-point))
+
+(defun evil-declare-abort-repeat (command)
+  "Declare COMMAND to be nonrepeatable."
+  (evil-add-command-properties command :repeat 'abort))
+
+(defun evil-delimited-arguments (string &optional num)
+  "Parse STRING as a sequence of delimited arguments.
+Returns a list of NUM strings, or as many arguments as
+the string contains. The first non-blank character is
+taken to be the delimiter. If some arguments are missing
+from STRING, the resulting list is padded with nil values.
+Two delimiters following directly after each other gives
+an empty string."
+  (save-match-data
+    (let ((string (or string ""))
+          (count (or num -1)) (idx 0)
+          argument delim match result)
+      (when (string-match "^[[:space:]]*\\([^[:space:]]\\)" string)
+        (setq delim (match-string 1 string)
+              argument (format "%s\\(\\(?:[\\].\\|[^%s]\\)*\\)"
+                               (regexp-quote delim)
+                               delim))
+        (while (and (/= count 0) (string-match argument string idx))
+          (setq match (match-string 1 string)
+                idx (match-end 1)
+                count (1- count))
+          (when (= count 0)
+            (unless (save-match-data
+                      (string-match
+                       (format "%s[[:space:]]*$" delim) string idx))
+              (setq match (substring string (match-beginning 1)))))
+          (unless (and (zerop (length match))
+                       (zerop (length (substring string idx))))
+            (push match result))))
+      (when (and num (< (length result) num))
+        (dotimes (i (- num (length result)))
+          (push nil result)))
+      (nreverse result))))
+
+(defun evil-concat-charsets (&rest sets)
+  "Concatenate character sets.
+A character set is the part between [ and ] in a regular expression.
+If any character set is complemented, the result is also complemented."
+  (let ((bracket "") (complement "") (hyphen "") result)
+    (save-match-data
+      (dolist (set sets)
+        (when (string-match "^\\^" set)
+          (setq set (substring set 1)
+                complement "^"))
+        (when (string-match "^]" set)
+          (setq set (substring set 1)
+                bracket "]"))
+        (when (string-match "^-" set)
+          (setq set (substring set 1)
+                hyphen "-"))
+        (setq result (concat result set)))
+      (format "%s%s%s%s" complement bracket hyphen result))))
+
+;;; Key sequences
+
+(defun evil-keypress-parser (&optional input)
+  "Read from keyboard or INPUT and build a command description.
+Returns (CMD COUNT), where COUNT is the numeric prefix argument.
+Both COUNT and CMD may be nil."
+  (let ((input (listify-key-sequence input))
+        (inhibit-quit t)
+        char cmd count digit event seq)
+    (while (progn
+             (setq event (or (pop input) (read-event)))
+             (when (eq event ?\e)
+               (when (sit-for evil-esc-delay t)
+                 (setq event 'escape)))
+             (setq char (or (when (characterp event) event)
+                            (when (symbolp event)
+                              (get event 'ascii-character))))
+             ;; this trick from simple.el's `digit-argument'
+             ;; converts keystrokes like C-0 and C-M-1 to digits
+             (if (or (characterp char) (integerp char))
+                 (setq digit (- (logand char ?\177) ?0))
+               (setq digit nil))
+             (if (keymapp cmd)
+                 (setq seq (append seq (list event)))
+               (setq seq (list event)))
+             (setq cmd (key-binding (vconcat seq) t))
+             (cond
+              ;; if CMD is a keymap, we need to read more
+              ((keymapp cmd)
+               t)
+              ;; numeric prefix argument
+              ((or (eq cmd #'digit-argument)
+                   (and (eq (length seq) 1)
+                        (not (keymapp cmd))
+                        count
+                        (memq digit '(0 1 2 3 4 5 6 7 8 9))))
+               ;; store digits in a string, which is easily converted
+               ;; to a number afterwards
+               (setq count (concat (or count "")
+                                   (number-to-string digit)))
+               t)
+              ;; catch middle digits like "da2w"
+              ((and (not cmd)
+                    (> (length seq) 1)
+                    (memq digit '(0 1 2 3 4 5 6 7 8 9)))
+               (setq count (concat (or count "")
+                                   (number-to-string digit)))
+               ;; remove the digit from the key sequence
+               ;; so we can see if the previous one goes anywhere
+               (setq seq (nbutlast seq 1))
+               (setq cmd (key-binding (vconcat seq)))
+               t)
+              ((eq cmd 'negative-argument)
+               (unless count
+                 (setq count "-"))))))
+    ;; determine COUNT
+    (when (stringp count)
+      (if (string= count "-")
+          (setq count nil)
+        (setq count (string-to-number count))))
+    ;; return command description
+    (when (arrayp cmd)
+      (let ((result (evil-keypress-parser cmd)))
+        (setq cmd (car result)
+              count (cond
+                     ((and count (cadr result))
+                      (* count (cadr result)))
+                     (count count)
+                     (t (cadr result))))))
+    (list cmd count)))
+
+(defun evil-read-key (&optional prompt)
+  "Read a key from the keyboard.
+Translates it according to the input method."
+  (let ((old-global-map (current-global-map))
+        (new-global-map (make-sparse-keymap))
+        (overriding-terminal-local-map evil-read-key-map)
+        overriding-local-map seq char cmd)
+    (unwind-protect
+        (condition-case nil
+            (progn
+              (define-key new-global-map [menu-bar]
+                (lookup-key global-map [menu-bar]))
+              (define-key new-global-map [tool-bar]
+                (lookup-key global-map [tool-bar]))
+              (add-to-list 'new-global-map
+                           (make-char-table 'display-table
+                                            'self-insert-command) t)
+              (use-global-map new-global-map)
+              (setq seq (read-key-sequence prompt nil t)
+                    char (aref seq 0)
+                    cmd (key-binding seq))
+              (while (arrayp cmd)
+                (setq char (aref cmd 0)
+                      cmd (key-binding cmd)))
+              (cond
+               ((eq cmd 'self-insert-command)
+                char)
+               (cmd
+                (call-interactively cmd))
+               (t
+                (error "No replacement character typed"))))
+          (quit
+           (when (fboundp 'evil-repeat-abort)
+             (evil-repeat-abort))
+           (signal 'quit nil)))
+      (use-global-map old-global-map))))
+
+(defun evil-read-quoted-char ()
+  "Command that calls `read-quoted-char'.
+This command can be used wherever `read-quoted-char' is required
+as a command. Its main use is in the `evil-read-key-map'."
+  (interactive)
+  (read-quoted-char))
+
+(defun evil-read-motion (&optional motion count type modifier)
+  "Read a MOTION, motion COUNT and motion TYPE from the keyboard.
+The type may be overridden with MODIFIER, which may be a type
+or a Visual selection as defined by `evil-define-visual-selection'.
+Return a list (MOTION COUNT [TYPE])."
+  (let ((modifiers '((evil-visual-char . char)
+                     (evil-visual-line . line)
+                     (evil-visual-block . block)))
+        command prefix)
+    (unless motion
+      (while (progn
+               (setq command (evil-keypress-parser)
+                     motion (pop command)
+                     prefix (pop command))
+               (when prefix
+                 (if count
+                     (setq count (string-to-number
+                                  (concat (number-to-string count)
+                                          (number-to-string prefix))))
+                   (setq count prefix)))
+               ;; if the command is a type modifier, read more
+               (when (rassq motion evil-visual-alist)
+                 (setq modifier
+                       (or modifier
+                           (car (rassq motion evil-visual-alist))))))))
+    (when modifier
+      (setq type (or type (evil-type motion 'exclusive)))
+      (cond
+       ((eq modifier 'char)
+        ;; TODO: this behavior could be less hard-coded
+        (if (eq type 'exclusive)
+            (setq type 'inclusive)
+          (setq type 'exclusive)))
+       (t
+        (setq type modifier))))
+    (list motion count type)))
+
+(defun evil-mouse-events-p (keys)
+  "Returns non-nil iff KEYS contains a mouse event."
+  (catch 'done
+    (dotimes (i (length keys))
+      (when (or (and (fboundp 'mouse-event-p)
+                     (mouse-event-p (aref keys i)))
+                (mouse-movement-p (aref keys i)))
+        (throw 'done t)))
+    nil))
+
+(defun evil-extract-count (keys)
+  "Splits the key-sequence KEYS into prefix-argument and the rest.
+Returns the list (PREFIX CMD SEQ REST), where PREFIX is the
+prefix count, CMD the command to be executed, SEQ the subsequence
+calling CMD, and REST is all remaining events in the
+key-sequence. PREFIX and REST may be nil if they do not exist.
+If a command is bound to some keyboard macro, it is expanded
+recursively."
+  (catch 'done
+    (let* ((len (length keys))
+           (beg 0)
+           (end 1)
+           (found-prefix nil))
+      (while (and (<= end len))
+        (let ((cmd (key-binding (substring keys beg end))))
+          (cond
+           ((memq cmd '(undefined nil))
+            (error "No command bound to %s" (substring keys beg end)))
+           ((arrayp cmd) ; keyboard macro, replace command with macro
+            (setq keys (vconcat (substring keys 0 beg)
+                                cmd
+                                (substring keys end))
+                  end (1+ beg)
+                  len (length keys)))
+           ((functionp cmd)
+            (if (or (memq cmd '(digit-argument negative-argument))
+                    (and found-prefix
+                         (evil-get-command-property
+                          cmd :digit-argument-redirection)))
+                ;; skip those commands
+                (setq found-prefix t ; found at least one prefix argument
+                      beg end
+                      end (1+ end))
+              ;; a real command, finish
+              (throw 'done
+                     (list (unless (zerop beg)
+                             (string-to-number
+                              (concat (substring keys 0 beg))))
+                           cmd
+                           (substring keys beg end)
+                           (when (< end len)
+                             (substring keys end))))))
+           (t ; append a further event
+            (setq end (1+ end))))))
+      (error "Key sequence contains no complete binding"))))
+
+(defmacro evil-redirect-digit-argument (map keys target)
+  "Bind a wrapper function calling TARGET or `digit-argument'.
+MAP is a keymap for binding KEYS to the wrapper for TARGET.
+The wrapper only calls `digit-argument' if a prefix-argument
+has already been started; otherwise TARGET is called."
+  (let* ((target (eval target))
+         (wrapper (intern (format "evil-digit-argument-or-%s"
+                                  target))))
+    `(progn
+       (define-key ,map ,keys ',wrapper)
+       (evil-define-command ,wrapper ()
+         :digit-argument-redirection ,target
+         :keep-visual t
+         :repeat nil
+         (interactive)
+         (cond
+          (current-prefix-arg
+           (setq this-command #'digit-argument)
+           (call-interactively #'digit-argument))
+          (t
+           (setq this-command #',target)
+           (call-interactively #',target)))))))
+
+(defun evil-set-keymap-prompt (map prompt)
+  "Set the prompt-string of MAP to PROMPT."
+  (delq (keymap-prompt map) map)
+  (when prompt
+    (setcdr map (cons prompt (cdr map)))))
+
+;;; Display
+
+(defun evil-set-cursor (specs)
+  "Change the cursor's apperance according to SPECS.
+SPECS may be a cursor type as per `cursor-type', a color
+string as passed to `set-cursor-color', a zero-argument
+function for changing the cursor, or a list of the above."
+  (unless (and (listp specs)
+               (null (cdr-safe (last specs))))
+    (setq specs (list specs)))
+  (dolist (spec specs)
+    (cond
+     ((functionp spec)
+      (condition-case nil
+          (funcall spec)
+        (error nil)))
+     ((stringp spec)
+      (evil-set-cursor-color spec))
+     (t
+      (setq cursor-type spec)))))
+
+(defun evil-set-cursor-color (color)
+  "Set the cursor color to COLOR."
+  (unless (equal (frame-parameter nil 'cursor-color) color)
+    ;; `set-cursor-color' forces a redisplay, so only
+    ;; call it when the color actually changes
+    (set-cursor-color color)))
+
+(defun evil-refresh-cursor (&optional state buffer)
+  "Refresh the cursor for STATE in BUFFER.
+STATE defaults to the current state.
+BUFFER defaults to the current buffer."
+  (when (and (boundp 'evil-local-mode) evil-local-mode)
+    (let* ((state (or state evil-state 'normal))
+           (default (or evil-default-cursor t))
+           (cursor (evil-state-property state :cursor t))
+           (color (or (and (stringp cursor) cursor)
+                      (and (listp cursor)
+                           (evil-member-if #'stringp cursor)))))
+      (with-current-buffer (or buffer (current-buffer))
+        ;; if both STATE and `evil-default-cursor'
+        ;; specify a color, don't set it twice
+        (when (and color (listp default))
+          (setq default (evil-filter-list #'stringp default)))
+        (evil-set-cursor default)
+        (evil-set-cursor cursor)))))
+(put 'evil-refresh-cursor 'permanent-local-hook t)
+
+(defmacro evil-save-cursor (&rest body)
+  "Save the current cursor; execute BODY; restore the cursor."
+  (declare (indent defun)
+           (debug t))
+  `(let ((cursor cursor-type)
+         (color (frame-parameter (selected-frame) 'cursor-color))
+         (inhibit-quit t))
+     (unwind-protect
+         (progn ,@body)
+       (evil-set-cursor cursor)
+       (evil-set-cursor color))))
+
+(defun evil-echo (string &rest args)
+  "Display an unlogged message in the echo area.
+That is, the message is not logged in the *Messages* buffer.
+\(To log the message, just use `message'.)"
+  (unless evil-no-display
+    (let (message-log-max)
+      (apply #'message string args))))
+
+(defun evil-echo-area-save ()
+  "Save the current echo area in `evil-echo-area-message'."
+  (setq evil-echo-area-message (current-message)))
+
+(defun evil-echo-area-restore ()
+  "Restore the echo area from `evil-echo-area-message'.
+Does not restore if `evil-write-echo-area' is non-nil."
+  (unless evil-write-echo-area
+    (if evil-echo-area-message
+        (message "%s" evil-echo-area-message)
+      (message nil)))
+  (setq evil-echo-area-message nil
+        evil-write-echo-area nil))
+
+;; toggleable version of `with-temp-message'
+(defmacro evil-save-echo-area (&rest body)
+  "Save the echo area; execute BODY; restore the echo area.
+Intermittent messages are not logged in the *Messages* buffer."
+  (declare (indent defun)
+           (debug t))
+  `(let ((inhibit-quit t)
+         evil-echo-area-message
+         evil-write-echo-area)
+     (unwind-protect
+         (progn
+           (evil-echo-area-save)
+           ,@body)
+       (evil-echo-area-restore))))
+
+(defmacro evil-without-display (&rest body)
+  "Execute BODY without Evil displays.
+Inhibits echo area messages, mode line updates and cursor changes."
+  (declare (indent defun)
+           (debug t))
+  `(let ((evil-no-display t))
+     ,@body))
+
+(defun evil-num-visible-lines ()
+  "Returns the number of currently visible lines."
+  (- (window-height) 1))
+
+(defun evil-max-scroll-up ()
+  "Returns the maximal number of lines that can be scrolled up."
+  (1- (line-number-at-pos (window-start))))
+
+(defun evil-max-scroll-down ()
+  "Returns the maximal number of lines that can be scrolled down."
+  (if (pos-visible-in-window-p (window-end))
+      0
+    (1+ (- (line-number-at-pos (point-max))
+           (line-number-at-pos (window-end))))))
+
+;;; Movement
+
+(defun evil-normalize-position (pos)
+  "Return POS if it does not exceed the buffer boundaries.
+If POS is less than `point-min', return `point-min'.
+Is POS is more than `point-max', return `point-max'.
+If POS is a marker, return its position."
+  (cond
+   ((not (number-or-marker-p pos))
+    pos)
+   ((< pos (point-min))
+    (point-min))
+   ((> pos (point-max))
+    (point-max))
+   ((markerp pos)
+    (marker-position pos))
+   (t
+    pos)))
+
+(defmacro evil-save-goal-column (&rest body)
+  "Restores the goal column after execution of BODY.
+See also `evil-save-column'."
+  (declare (indent defun)
+           (debug t))
+  `(let ((goal-column goal-column)
+         (temporary-goal-column temporary-goal-column))
+     ,@body))
+
+(defmacro evil-save-column (&rest body)
+  "Restores the column after execution of BODY.
+See also `evil-save-goal-column'."
+  (declare (indent defun)
+           (debug t))
+  `(let ((col (current-column)))
+     (evil-save-goal-column
+       ,@body
+       (move-to-column col))))
+
+(defun evil-narrow (beg end)
+  "Restrict the buffer to BEG and END.
+BEG or END may be nil, specifying a one-sided restriction including
+`point-min' or `point-max'. See also `evil-with-restriction.'"
+  (setq beg (or (evil-normalize-position beg) (point-min)))
+  (setq end (or (evil-normalize-position end) (point-max)))
+  (narrow-to-region beg end))
+
+(defmacro evil-with-restriction (beg end &rest body)
+  "Execute BODY with the buffer narrowed to BEG and END.
+BEG or END may be nil as passed to `evil-narrow'; this creates
+a one-sided restriction."
+  (declare (indent 2)
+           (debug t))
+  `(save-restriction
+     (evil-narrow ,beg ,end)
+     ,@body))
+
+(defmacro evil-narrow-to-field (&rest body)
+  "Narrow to the current field."
+  (declare (indent defun)
+           (debug t))
+  `(evil-with-restriction (field-beginning) (field-end)
+     ,@body))
+
+(defun evil-move-beginning-of-line (&optional arg)
+  "Move to the beginning of the line as displayed.
+Like `move-beginning-of-line', but retains the goal column."
+  (evil-save-goal-column
+    (move-beginning-of-line arg)
+    (beginning-of-line)))
+
+(defun evil-move-end-of-line (&optional arg)
+  "Move to the end of the line as displayed.
+Like `move-end-of-line', but retains the goal column."
+  (evil-save-goal-column
+    (move-end-of-line arg)
+    (end-of-line)))
+
+(defun evil-adjust-cursor (&optional force)
+  "Move point one character back if at the end of a non-empty line.
+This behavior is contingent on the variable `evil-move-cursor-back';
+use the FORCE parameter to override it."
+  (when (and (eolp)
+             (not (bolp))
+             (= (point)
+                (save-excursion
+                  (evil-move-end-of-line)
+                  (point))))
+    (evil-move-cursor-back force)))
+
+(defun evil-move-cursor-back (&optional force)
+  "Move point one character back within the current line.
+Contingent on the variable `evil-move-cursor-back' or the FORCE
+argument. Honors field boundaries, i.e., constrains the movement
+to the current field as recognized by `line-beginning-position'."
+  (when (or evil-move-cursor-back force)
+    (unless (or (= (point) (line-beginning-position))
+                (and (boundp 'visual-line-mode)
+                     visual-line-mode
+                     (= (point) (save-excursion
+                                  (beginning-of-visual-line)
+                                  (point)))))
+      (backward-char))))
+
+(defun evil-line-position (line &optional column)
+  "Return the position of LINE.
+If COLUMN is specified, return its position on the line.
+A negative number means the end of the line."
+  (save-excursion
+    (when (fboundp 'evil-goto-line)
+      (evil-goto-line line))
+    (if (numberp column)
+        (if (< column 0)
+            (beginning-of-line 2)
+          (move-to-column column))
+      (beginning-of-line))
+    (point)))
+
+(defun evil-column (&optional pos)
+  "Return the horizontal position of POS.
+POS defaults to point."
+  (save-excursion
+    (when pos
+      (goto-char pos))
+    (current-column)))
+
+(defun evil-move-to-column (column &optional dir force)
+  "Move point to column COLUMN in the current line.
+Places point at left of the tab character (at the right if DIR
+is non-nil) and returns point."
+  (interactive "p")
+  (move-to-column column force)
+  (unless force
+    (when (or (not dir) (and (numberp dir) (< dir 1)))
+      (when (> (current-column) column)
+        (evil-move-cursor-back))))
+  (point))
+
+(defmacro evil-loop (spec &rest body)
+  "Loop with countdown variable.
+Evaluate BODY with VAR counting down from COUNT to 0.
+COUNT can be negative, in which case VAR counts up instead.
+The return value is the value of VAR when the loop
+terminates, which is 0 if the loop completes successfully.
+RESULT specifies a variable for storing this value.
+
+\(fn (VAR COUNT [RESULT]) BODY...)"
+  (declare (indent defun)
+           (debug dolist))
+  (let* ((i (make-symbol "loopvar"))
+         (var (pop spec))
+         (count (pop spec))
+         (result (pop spec)))
+    (setq var (or (unless (eq var result) var) i)
+          result (or result var))
+    `(let ((,var ,count))
+       (setq ,result ,var)
+       (while (/= ,var 0)
+         ,@body
+         (if (> ,var 0)
+             (setq ,var (1- ,var))
+           (setq ,var (1+ ,var)))
+         (setq ,result ,var))
+       ,var)))
+
+(defmacro evil-motion-loop (spec &rest body)
+  "Loop a certain number of times.
+Evaluate BODY repeatedly COUNT times with VAR bound to 1 or -1,
+depending on the sign of COUNT. RESULT, if specified, holds
+the number of unsuccessful iterations, which is 0 if the loop
+completes successfully. This is also the return value.
+
+Each iteration must move point; if point does not change,
+the loop immediately quits. See also `evil-loop'.
+
+\(fn (VAR COUNT [RESULT]) BODY...)"
+  (declare (indent defun)
+           (debug ((symbolp form &optional symbolp) body)))
+  (let* ((var (or (pop spec) (make-symbol "unitvar")))
+         (countval (or (pop spec) 0))
+         (result (pop spec))
+         (i (make-symbol "loopvar"))
+         (count (make-symbol "countvar"))
+         (done (make-symbol "donevar"))
+         (orig (make-symbol "origvar")))
+    `(let* ((,count ,countval)
+            (,var (if (< ,count 0) -1 1)))
+       (catch ',done
+         (evil-loop (,i ,count ,result)
+           (let ((,orig (point)))
+             ,@body
+             (when (= (point) ,orig)
+               (throw ',done ,i))))))))
+
+(defmacro evil-signal-without-movement (&rest body)
+  "Catches errors provided point moves within this scope."
+  (declare (indent defun)
+           (debug t))
+  `(let ((p (point)))
+     (condition-case err
+         (progn ,@body)
+       (error
+        (when (= p (point))
+          (signal (car err) (cdr err)))))))
+
+(defun evil-goto-min (&rest positions)
+  "Go to the smallest position in POSITIONS.
+Non-numerical elements are ignored.
+See also `evil-goto-max'."
+  (when (setq positions (evil-filter-list
+                         #'(lambda (elt)
+                             (not (number-or-marker-p elt)))
+                         positions))
+    (goto-char (apply #'min positions))))
+
+(defun evil-goto-max (&rest positions)
+  "Go to the largest position in POSITIONS.
+Non-numerical elements are ignored.
+See also `evil-goto-min'."
+  (when (setq positions (evil-filter-list
+                         #'(lambda (elt)
+                             (not (number-or-marker-p elt)))
+                         positions))
+    (goto-char (apply #'max positions))))
+
+;; The purpose of this function is the provide line motions which
+;; preserve the column. This is how `previous-line' and `next-line'
+;; work, but unfortunately the behaviour is hard-coded: if and only if
+;; the last command was `previous-line' or `next-line', the column is
+;; preserved. Furthermore, in contrast to Vim, when we cannot go
+;; further, those motions move point to the beginning resp. the end of
+;; the line (we never want point to leave its column). The code here
+;; comes from simple.el, and I hope it will work in future.
+(defun evil-line-move (count &optional noerror)
+  "A wrapper for line motions which conserves the column.
+Signals an error at buffer boundaries unless NOERROR is non-nil."
+  (cond
+   (noerror
+    (condition-case nil
+        (evil-line-move count)
+      (error nil)))
+   (t
+    (evil-signal-without-movement
+      (setq this-command (if (>= count 0)
+                             #'next-line
+                           #'previous-line))
+      (let ((opoint (point)))
+        (condition-case err
+            (with-no-warnings
+              (funcall this-command (abs count)))
+          ((beginning-of-buffer end-of-buffer)
+           (let ((col (or goal-column
+                          (if (consp temporary-goal-column)
+                              (car temporary-goal-column)
+                            temporary-goal-column))))
+             (if line-move-visual
+                 (vertical-motion (cons col 0))
+               (line-move-finish col opoint (< count 0)))
+             ;; Maybe we should just `ding'?
+             (signal (car err) (cdr err))))))))))
+
+(defun evil-forward-word (&optional count)
+  "Move by words.
+Moves point COUNT words forward or (- COUNT) words backward if
+COUNT is negative. This function is the same as `forward-word'
+but returns the number of words by which point could *not* be
+moved."
+  (setq count (or count 1))
+  (let* ((dir (if (>= count 0) +1 -1))
+         (count (abs count)))
+    (while (and (> count 0)
+                (forward-word dir))
+      (setq count (1- count)))
+    count))
+
+(defun evil-move-chars (chars count)
+  "Move point to the end or beginning of a sequence of CHARS.
+CHARS is a character set as inside [...] in a regular expression."
+  (let ((regexp (format "[%s]" chars)))
+    (evil-motion-loop (var count)
+      (cond
+       ((< var 0)
+        (re-search-backward regexp nil t)
+        (skip-chars-backward chars))
+       (t
+        (re-search-forward regexp nil t)
+        (skip-chars-forward chars))))))
+
+;; this function is slightly adapted from paragraphs.el
+(defun evil-move-sentence (count)
+  "Move by sentence."
+  (let ((count (or count 1))
+        (opoint (point))
+        (sentence-end (sentence-end))
+        pos par-beg par-end)
+    (evil-motion-loop (var count)
+      (cond
+       ;; backward
+       ((< var 0)
+        (setq pos (point)
+              par-beg (save-excursion
+                        (and (zerop (evil-move-paragraph -1))
+                             (point))))
+        (if (and (re-search-backward sentence-end par-beg t)
+                 (or (< (match-end 0) pos)
+                     (re-search-backward sentence-end par-beg t)))
+            (goto-char (match-end 0))
+          (goto-char (or par-beg pos))))
+       ;; forward
+       (t
+        (setq par-end (save-excursion
+                        (and (zerop (evil-move-paragraph 1))
+                             (point))))
+        (if (re-search-forward sentence-end par-end t)
+            (skip-chars-backward " \t\n")
+          (goto-char (or par-end (point)))))))))
+
+(defun evil-move-paragraph (count)
+  "Move by paragraph."
+  (let ((count (or count 1))
+        npoint opoint)
+    (evil-motion-loop (var count)
+      (setq opoint (point))
+      (cond
+       ((< var 0)
+        (forward-paragraph -1)
+        (setq npoint (point))
+        (skip-chars-forward " \t\n")
+        (when (and (>= (point) opoint) (< npoint opoint))
+          (goto-char npoint)
+          (forward-paragraph -1)
+          (skip-chars-forward " \t\n")
+          (when (and (>= (point) opoint) (< npoint opoint))
+            (goto-char opoint))))
+       (t
+        (forward-paragraph 1)
+        (setq npoint (point))
+        (skip-chars-backward " \t\n")
+        (when (<= (point) opoint)
+          (goto-char npoint)
+          (forward-paragraph 1)
+          (skip-chars-backward " \t\n")
+          (when (<= (point) opoint)
+            (goto-char opoint))))))))
+
+(defun evil-in-regexp-p (regexp &optional pos)
+  "Whether POS is inside a match for REGEXP.
+POS defaults to the current position of point."
+  (let ((pos (or pos (point))))
+    (save-excursion
+      (goto-char pos)
+      (if (re-search-forward regexp nil t)
+          (goto-char (match-beginning 0))
+        (goto-char (point-max)))
+      (when (re-search-backward regexp nil t)
+        (and (> pos (match-beginning 0))
+             (< pos (match-end 0)))))))
+
+(defun evil-in-string-p (&optional pos)
+  "Whether POS is inside a string.
+POS defaults to the current position of point."
+  (save-excursion
+    (let ((state (syntax-ppss pos)))
+      (and (nth 3 state) (nth 8 state)))))
+
+(defun evil-string-beginning (&optional pos)
+  "Return beginning of string containing POS.
+POS defaults to the current position of point."
+  (evil-normalize-position (evil-in-string-p)))
+
+(defun evil-string-end (&optional pos limit)
+  "Return end of string containing POS.
+POS defaults to the current position of point. Stops at LIMIT,
+which defaults to the end of the buffer."
+  (save-excursion
+    (let ((state (syntax-ppss pos)))
+      (when (nth 3 state)
+        (parse-partial-sexp (or pos (point))
+                            (or limit (point-max))
+                            nil
+                            nil
+                            state
+                            'syntax-table)
+        (evil-normalize-position (point))))))
+
+(defun evil-in-comment-p (&optional pos)
+  "Checks if POS is within a comment according to current syntax.
+If POS is nil, (point) is used. The return value is the beginning
+position of the comment."
+  (setq pos (or pos (point)))
+  (let ((chkpos
+         (cond
+          ((eobp) pos)
+          ((= (char-syntax (char-after)) ?<) (1+ pos))
+          ((and (not (zerop (logand (car (syntax-after (point)))
+                                    (lsh 1 16))))
+                (not (zerop (logand (or (car (syntax-after (1+ (point)))) 0)
+                                    (lsh 1 17)))))
+           (+ pos 2))
+          ((and (not (zerop (logand (car (syntax-after (point)))
+                                    (lsh 1 17))))
+                (not (zerop (logand (or (car (syntax-after (1- (point)))) 0)
+                                    (lsh 1 16)))))
+           (1+ pos))
+          (t pos))))
+    (let ((syn (save-excursion (syntax-ppss chkpos))))
+      (and (nth 4 syn) (nth 8 syn)))))
+
+(defun evil-looking-at-start-comment (&optional move)
+  "Returns t if point is at the start of a comment.
+point must be on one of the opening characters of a block comment
+according to the current syntax table. Futhermore these
+characters must been parsed as opening characters, i.e. they
+won't be considered as comment starters inside a string or
+possibly another comment. Point is moved to the first character
+of the comment opener if MOVE is non-nil."
+  (cond
+   ;; one character opener
+   ((= (char-syntax (char-after)) ?<)
+    (equal (point) (evil-in-comment-p (1+ (point)))))
+   ;; two character opener on first char
+   ((and (not (zerop (logand (car (syntax-after (point)))
+                             (lsh 1 16))))
+         (not (zerop (logand (or (car (syntax-after (1+ (point)))) 0)
+                             (lsh 1 17)))))
+    (equal (point) (evil-in-comment-p (+ 2 (point)))))
+   ;; two character opener on second char
+   ((and (not (zerop (logand (car (syntax-after (point)))
+                             (lsh 1 17))))
+         (not (zerop (logand (or (car (syntax-after (1- (point)))) 0)
+                             (lsh 1 16)))))
+    (and (equal (1- (point)) (evil-in-comment-p (1+ (point))))
+         (prog1 t (when move (backward-char)))))))
+
+(defun evil-looking-at-end-comment (&optional move)
+  "Returns t if point is at the end of a comment.
+point must be on one of the opening characters of a block comment
+according to the current syntax table. Futhermore these
+characters must been parsed as opening characters, i.e. they
+won't be considered as comment starters inside a string or
+possibly another comment. Point is moved right after the comment
+closer if MOVE is non-nil."
+  (cond
+   ;; one char closer
+   ((= (char-syntax (char-after)) ?>)
+    (and (evil-in-comment-p) ; in comment
+         (not (evil-in-comment-p (1+ (point))))
+         (prog1 t (when move (forward-char)))))
+   ;; two char closer on first char
+   ((and (not (zerop (logand (car (syntax-after (point)))
+                             (lsh 1 18))))
+         (not (zerop (logand (or (car (syntax-after (1+ (point)))) 0)
+                             (lsh 1 19)))))
+    (and (evil-in-comment-p)
+         (not (evil-in-comment-p (+ (point) 2)))
+         (prog1 t (when move (forward-char 2)))))
+   ;; two char closer on second char
+   ((and (not (zerop (logand (car (syntax-after (point)))
+                             (lsh 1 19))))
+         (not (zerop (logand (or (car (syntax-after (1- (point)))) 0)
+                             (lsh 1 18)))))
+    (and (evil-in-comment-p)
+         (not (evil-in-comment-p (1+ (point))))
+         (prog1 t (when move (forward-char)))))))
+
+(defun evil-comment-beginning (&optional pos)
+  "Return beginning of comment containing POS.
+POS defaults to the current position of point."
+  (evil-in-comment-p pos))
+
+(defun evil-comment-end (&optional pos)
+  "Return end of comment containing POS.
+POS defaults to the current position of point."
+  (let ((beg (evil-in-comment-p pos)))
+    (and beg
+         (save-excursion
+           (goto-char beg)
+           (forward-comment 1)
+           (1- (point))))))
+
+(defmacro evil-narrow-to-comment (&rest body)
+  "Narrow to the current comment or docstring, if any."
+  (declare (indent defun)
+           (debug t))
+  `(save-restriction
+     (cond
+      ((evil-in-comment-p)
+       (narrow-to-region (evil-comment-beginning) (evil-comment-end)))
+      ((evil-in-string-p)
+       (narrow-to-region (evil-string-beginning) (evil-string-end))))
+     ,@body))
+
+(defmacro evil-with-or-without-comment (&rest body)
+  "Try BODY narrowed to the current comment; then try BODY unnarrowed.
+If BODY returns non-nil inside the current comment, return that.
+Otherwise, execute BODY again, but without the restriction."
+  (declare (indent defun)
+           (debug t))
+  `(or (when (or (evil-in-comment-p) (evil-in-string-p))
+         (evil-narrow-to-comment ,@body))
+       (progn ,@body)))
+
+(defun evil-insert-newline-above ()
+  "Inserts a new line above point and places point in that line
+with regard to indentation."
+  (evil-narrow-to-field
+    (evil-move-beginning-of-line)
+    (insert "\n")
+    (forward-line -1)
+    (back-to-indentation)))
+
+(defun evil-insert-newline-below ()
+  "Inserts a new line below point and places point in that line
+with regard to indentation."
+  (evil-narrow-to-field
+    (evil-move-end-of-line)
+    (insert "\n")
+    (back-to-indentation)))
+
+;;; Markers
+
+(defun evil-global-marker-p (char)
+  "Whether CHAR denotes a global marker."
+  (or (and (>= char ?A) (<= char ?Z))
+      (assq char (default-value 'evil-markers-alist))))
+
+(defun evil-set-marker (char &optional pos advance)
+  "Set the marker denoted by CHAR to position POS.
+POS defaults to the current position of point.
+If ADVANCE is t, the marker advances when inserting text at it;
+otherwise, it stays behind."
+  (interactive (list (read-char)))
+  (let ((marker (evil-get-marker char t)) alist)
+    (unless (markerp marker)
+      (cond
+       ((and marker (symbolp marker) (boundp marker))
+        (set marker (or (symbol-value marker) (make-marker)))
+        (setq marker (symbol-value marker)))
+       ((functionp marker)
+        (error "Cannot set special marker `%c'" char))
+       ((evil-global-marker-p char)
+        (setq alist (default-value 'evil-markers-alist)
+              marker (make-marker))
+        (evil-add-to-alist 'alist char marker)
+        (setq-default evil-markers-alist alist))
+       (t
+        (setq marker (make-marker))
+        (evil-add-to-alist 'evil-markers-alist char marker))))
+    (add-hook 'kill-buffer-hook #'evil-swap-out-markers nil t)
+    (set-marker-insertion-type marker advance)
+    (set-marker marker (or pos (point)))))
+
+(defun evil-get-marker (char &optional raw)
+  "Return the marker denoted by CHAR.
+This is either a marker object as returned by `make-marker',
+a number, a cons cell (FILE . POS) with FILE being a string
+and POS a number, or nil. If RAW is non-nil, then the
+return value may also be a variable, a movement function,
+or a marker object pointing nowhere."
+  (let ((marker (if (evil-global-marker-p char)
+                    (cdr-safe (assq char (default-value
+                                           'evil-markers-alist)))
+                  (cdr-safe (assq char evil-markers-alist)))))
+    (save-excursion
+      (if raw
+          marker
+        (when (and (symbolp marker) (boundp marker))
+          (setq marker (symbol-value marker)))
+        (when (functionp marker)
+          (funcall marker)
+          (setq marker (point)))
+        (when (markerp marker)
+          (if (eq (marker-buffer marker) (current-buffer))
+              (setq marker (marker-position marker))
+            (setq marker (and (marker-buffer marker) marker))))
+        (when (or (numberp marker)
+                  (markerp marker)
+                  (and (consp marker)
+                       (stringp (car marker))
+                       (numberp (cdr marker))))
+          marker)))))
+
+(defun evil-swap-out-markers ()
+  "Turn markers into file references when the buffer is killed."
+  (and buffer-file-name
+       (dolist (entry evil-markers-alist)
+         (and (markerp (cdr entry))
+              (eq (marker-buffer (cdr entry)) (current-buffer))
+              (setcdr entry (cons buffer-file-name
+                                  (marker-position (cdr entry))))))))
+(put 'evil-swap-out-markers 'permanent-local-hook t)
+
+(defun evil-jump-hook (&optional command)
+  "Set jump point if COMMAND has a non-nil :jump property."
+  (setq command (or command this-command))
+  (when (evil-get-command-property command :jump)
+    (evil-set-jump)))
+
+(defun evil-set-jump (&optional pos)
+  "Set jump point at POS.
+POS defaults to point."
+  (unless (or (region-active-p) (evil-visual-state-p))
+    (evil-save-echo-area
+      (mapc #'(lambda (marker)
+                (set-marker marker nil))
+            evil-jump-list)
+      (setq evil-jump-list nil)
+      (push-mark pos))))
+
+(defun evil-get-register (register &optional noerror)
+  "Return contents of REGISTER.
+Signal an error if empty, unless NOERROR is non-nil.
+
+The following special registers are supported.
+  \"  the unnamed register
+  *  the clipboard contents
+  +  the clipboard contents
+  %  the current file name (read only)
+  #  the alternate file name (read only)
+  /  the last search pattern (read only)
+  :  the last command line (read only)
+  .  the last inserted text (read only)
+  -  the last small (less than a line) delete
+  =  the expression register (read only)"
+  (when (characterp register)
+    (or (cond
+         ((eq register ?\")
+          (current-kill 0))
+         ((and (<= ?0 register) (<= register ?9))
+          (current-kill (- register ?0) t))
+         ((eq register ?*)
+          (let ((x-select-enable-primary t))
+            (current-kill 0)))
+         ((eq register ?+)
+          (let ((x-select-enable-clipboard t))
+            (current-kill 0)))
+         ((eq register ?%)
+          (or (buffer-file-name) (unless noerror (error "No file name"))))
+         ((= register ?#)
+          (or (with-current-buffer (other-buffer) (buffer-file-name))
+              (unless noerror (error "No file name"))))
+         ((eq register ?/)
+          (or (car-safe
+               (or (and (boundp 'evil-search-module)
+                        (eq evil-search-module 'evil-search)
+                        evil-ex-search-history)
+                   (and isearch-regexp regexp-search-ring)
+                   search-ring))
+              (unless noerror (error "No previous regular expression"))))
+         ((eq register ?:)
+          (or (car-safe evil-ex-history)
+              (unless noerror (error "No previous command line"))))
+         ((eq register ?.)
+          evil-last-insertion)
+         ((eq register ?-)
+          evil-last-small-deletion)
+         ((eq register ?=)
+          (let* ((enable-recursive-minibuffers t)
+                 (result (eval (car (read-from-string (read-string "="))))))
+            (cond
+             ((or (stringp result)
+                  (numberp result)
+                  (symbolp result))
+              (prin1-to-string result))
+             ((sequencep result)
+              (mapconcat #'prin1-to-string result "\n"))
+             (t (error "Using %s as a string" (type-of result))))))
+         ((eq register ?_) ; the black hole register
+          "")
+         (t
+          (setq register (downcase register))
+          (get-register register)))
+        (unless noerror
+          (error "Register `%c' is empty" register)))))
+
+(defun evil-set-register (register text)
+  "Set the contents of register REGISTER to TEXT.
+If REGISTER is an upcase character then text is appended to that
+register instead of replacing its content."
+  (cond
+   ((eq register ?\")
+    (kill-new text))
+   ((and (<= ?0 register) (<= register ?9))
+    (if (null kill-ring)
+        (kill-new text)
+      (let ((kill-ring-yank-pointer kill-ring-yank-pointer)
+            interprogram-paste-function
+            interprogram-cut-function)
+        (current-kill (- register ?0))
+        (setcar kill-ring-yank-pointer text))))
+   ((eq register ?*)
+    (let ((x-select-enable-primary t))
+      (kill-new text)))
+   ((eq register ?+)
+    (let ((x-select-enable-clipboard t))
+      (kill-new text)))
+   ((eq register ?-)
+    (setq evil-last-small-deletion text))
+   ((eq register ?_) ; the black hole register
+    nil)
+   ((and (<= ?A register) (<= register ?Z))
+    (setq register (downcase register))
+    (let ((content (get-register register)))
+      (cond
+       ((not content)
+        (set-register register text))
+       ((or (text-property-not-all 0 (length content)
+                                   'yank-handler nil
+                                   content)
+            (text-property-not-all 0 (length text)
+                                   'yank-handler nil
+                                   text))
+        ;; some non-trivial yank-handler -> always switch to line handler
+        ;; ensure complete lines
+        (when (and (> (length content) 0)
+                   (/= (aref content (1- (length content))) ?\n))
+          (setq content (concat content "\n")))
+        (when (and (> (length text) 0)
+                   (/= (aref text (1- (length text))) ?\n))
+          (setq text (concat text "\n")))
+        (setq text (concat content text))
+        (remove-list-of-text-properties 0 (length text) '(yank-handler) text)
+        (setq text (propertize text 'yank-handler '(evil-yank-line-handler)))
+        (set-register register text))
+       (t
+        (set-register register (concat content text))))))
+   (t
+    (set-register register text))))
+
+(defun evil-register-list ()
+  "Returns an alist of all registers"
+  (sort (append (mapcar #'(lambda (reg)
+                            (cons reg (evil-get-register reg t)))
+                        '(?\" ?* ?+ ?% ?# ?/ ?: ?. ?-
+                              ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
+                register-alist)
+        #'(lambda (reg1 reg2) (< (car reg1) (car reg2)))))
+
+(defsubst evil-kbd-macro-suppress-motion-error ()
+  "Returns non-nil if a motion error should be suppressed.
+Whether the motion error should be suppressed depends on the
+variable `evil-kbd-macro-suppress-motion-error'."
+  (or (and defining-kbd-macro
+           (memq evil-kbd-macro-suppress-motion-error '(t record)))
+      (and executing-kbd-macro
+           (memq evil-kbd-macro-suppress-motion-error '(t replay)))))
+
+;;; Region
+
+;; `set-mark' does too much at once
+(defun evil-move-mark (pos)
+  "Set buffer's mark to POS.
+If POS is nil, delete the mark."
+  (when pos
+    (setq pos (evil-normalize-position pos)))
+  (set-marker (mark-marker) pos))
+
+(defun evil-save-transient-mark-mode ()
+  "Save Transient Mark mode and make it buffer-local.
+Any changes to Transient Mark mode are now local to the current
+buffer, until `evil-restore-transient-mark-mode' is called.
+
+Variables pertaining to Transient Mark mode are listed in
+`evil-transient-vars', and their values are stored in
+`evil-transient-vals'."
+  (dolist (var evil-transient-vars)
+    (when (and (boundp var)
+               (not (assq var evil-transient-vals)))
+      (push (list var (symbol-value var)
+                  (and (assq var (buffer-local-variables)) t))
+            evil-transient-vals)
+      (make-variable-buffer-local var)
+      (put var 'permanent-local t))))
+
+(defun evil-restore-transient-mark-mode ()
+  "Restore Transient Mark mode.
+This presupposes that `evil-save-transient-mark-mode' has been
+called earlier. If Transient Mark mode was disabled before but
+enabled in the meantime, this function disables it; if it was
+enabled before but disabled in the meantime, this function
+enables it.
+
+The earlier settings of Transient Mark mode are stored in
+`evil-transient-vals'."
+  (let (entry local var val)
+    (while (setq entry (pop evil-transient-vals))
+      (setq var (pop entry)
+            val (pop entry)
+            local (pop entry))
+      (unless local
+        (kill-local-variable var))
+      (unless (equal (symbol-value var) val)
+        (if (fboundp var)
+            (funcall var (if var 1 -1))
+          (setq var val))))))
+
+(defun evil-save-mark ()
+  "Save the current mark, including whether it is transient.
+See also `evil-restore-mark'."
+  (unless evil-visual-previous-mark
+    (setq evil-visual-previous-mark (mark t))
+    (evil-save-transient-mark-mode)))
+
+(defun evil-restore-mark ()
+  "Restore the mark, including whether it was transient.
+See also `evil-save-mark'."
+  (when evil-visual-previous-mark
+    (evil-restore-transient-mark-mode)
+    (evil-move-mark evil-visual-previous-mark)
+    (setq evil-visual-previous-mark nil)))
+
+;; In theory, an active region implies Transient Mark mode, and
+;; disabling Transient Mark mode implies deactivating the region.
+;; In practice, Emacs never clears `mark-active' except in Transient
+;; Mark mode, so we define our own toggle functions to make things
+;; more predictable.
+(defun evil-transient-mark (&optional arg)
+  "Toggle Transient Mark mode.
+Ensure that the region is properly deactivated.
+Enable with positive ARG, disable with negative ARG."
+  (unless (numberp arg)
+    (setq arg (if transient-mark-mode -1 1)))
+  (cond
+   ((< arg 1)
+    (evil-active-region -1)
+    ;; Transient Mark mode cannot be disabled
+    ;; while CUA mode is enabled
+    (when (fboundp 'cua-mode)
+      (cua-mode -1))
+    (when transient-mark-mode
+      (transient-mark-mode -1)))
+   (t
+    (unless transient-mark-mode
+      (evil-active-region -1)
+      (transient-mark-mode 1)))))
+
+(defun evil-active-region (&optional arg)
+  "Toggle active region.
+Ensure that Transient Mark mode is properly enabled.
+Enable with positive ARG, disable with negative ARG."
+  (unless (numberp arg)
+    (setq arg (if (region-active-p) -1 1)))
+  (cond
+   ((and (< arg 1))
+    (when (or transient-mark-mode mark-active)
+      (setq mark-active nil
+            deactivate-mark nil)
+      (when (boundp 'cua--explicit-region-start)
+        (setq cua--explicit-region-start nil))
+      (run-hooks 'deactivate-mark-hook)))
+   (t
+    (evil-transient-mark 1)
+    (when deactivate-mark
+      (setq deactivate-mark nil))
+    (unless (mark t)
+      (evil-move-mark (point)))
+    (unless (region-active-p)
+      (set-mark (mark t)))
+    (when (boundp 'cua--explicit-region-start)
+      (setq cua--explicit-region-start t)))))
+
+(defmacro evil-with-transient-mark-mode (&rest body)
+  "Execute BODY with Transient Mark mode.
+Then restore Transient Mark mode to its previous setting."
+  (declare (indent defun)
+           (debug t))
+  `(let ((inhibit-quit t)
+         evil-transient-vals)
+     (unwind-protect
+         (progn
+           (evil-save-transient-mark-mode)
+           (evil-transient-mark 1)
+           ,@body)
+       (evil-restore-transient-mark-mode))))
+
+(defmacro evil-with-active-region (beg end &rest body)
+  "Execute BODY with an active region from BEG to END."
+  (declare (indent 2)
+           (debug t))
+  `(let ((beg ,beg) (end ,end)
+         evil-transient-vals)
+     (evil-with-transient-mark-mode
+       (save-excursion
+         (evil-active-region 1)
+         (evil-move-mark beg)
+         (goto-char end)
+         ,@body))))
+
+(defun evil-exchange-point-and-mark ()
+  "Exchange point and mark without activating the region."
+  (let* ((point (point))
+         (mark  (or (mark t) point)))
+    (set-marker (mark-marker) point)
+    (goto-char mark)))
+
+(defun evil-apply-on-block (func beg end pass-columns &rest args)
+  "Call FUNC for each line of a block selection.
+The selection is specified by the region BEG and END.  FUNC must
+take at least two arguments, the beginning and end of each
+line. If PASS-COLUMNS is non-nil, these values are the columns,
+otherwise tey are buffer positions. Extra arguments to FUNC may
+be passed via ARGS."
+  (let ((eol-col (and (memq last-command '(next-line previous-line))
+                      (numberp temporary-goal-column)
+                      temporary-goal-column))
+        startcol startpt endcol endpt)
+    (save-excursion
+      (goto-char beg)
+      (setq startcol (current-column))
+      (beginning-of-line)
+      (setq startpt (point))
+      (goto-char end)
+      (setq endcol (current-column))
+      (forward-line 1)
+      (setq endpt (point-marker))
+      ;; ensure the start column is the left one.
+      (evil-sort startcol endcol)
+      ;; maybe find maximal column
+      (when eol-col
+        (setq eol-col 0)
+        (goto-char startpt)
+        (while (< (point) endpt)
+          (setq eol-col (max eol-col
+                             (evil-column (line-end-position))))
+          (forward-line 1))
+        (setq endcol (max endcol
+                          (min eol-col
+                               (1+ (min (1- most-positive-fixnum)
+                                        temporary-goal-column))))))
+      ;; start looping over lines
+      (goto-char startpt)
+      (while (< (point) endpt)
+        (if pass-columns
+            (apply func startcol endcol args)
+          (apply func
+                 (save-excursion (evil-move-to-column startcol))
+                 (save-excursion (evil-move-to-column endcol t))
+                 args))
+        (forward-line 1)))))
+
+(defun evil-apply-on-rectangle (function start end &rest args)
+  "Like `apply-on-rectangle' but maybe extends to eol.
+If `temporary-goal-column' is set to a big number, then the
+region of each line is extended to the end of each line. The end
+column is set to the maximal column in all covered lines."
+  (apply #'evil-apply-on-block function start end t args))
+
+;;; Insertion
+
+(defun evil-concat-ranges (ranges)
+  "Concatenate RANGES.
+RANGES must be a list of ranges.  They must be ordered so that
+successive ranges share their boundaries.  The return value is a
+single range of disjoint union of the ranges or nil if the
+disjoint union is not a single range."
+  (let ((range (car-safe ranges)) (ranges (cdr ranges)) r)
+    (while (and range (setq r (car-safe ranges)))
+      (setq range
+            (cond ((and (= (cdr r) (car range))) (cons (car r) (cdr range)))
+                  ((and (= (cdr range) (car r))) (cons (car range) (cdr r)))))
+      (setq ranges (cdr ranges)))
+    range))
+
+(defun evil-track-last-insertion (beg end len)
+  "Track the last insertion range and its text.
+The insertion range is stored as a pair of buffer positions in
+`evil-current-insertion'. If a subsequent change is compatible,
+then the current range is modified, otherwise it is replaced by a
+new range. Compatible changes are changes that do not create a
+disjoin range."
+  (cond
+   ((zerop len)
+    ;; insertion
+    (if (and evil-current-insertion
+             (>= beg (car evil-current-insertion))
+             (<= beg (cdr evil-current-insertion)))
+        (setcdr evil-current-insertion
+                (+ (- end beg)
+                   (cdr evil-current-insertion)))
+      (setq evil-current-insertion (cons beg end))))
+   (t
+    ;; deletion of something in range is recorded
+    (if (and evil-current-insertion
+             (>= beg (car evil-current-insertion))
+             (<= (+ beg len) (cdr evil-current-insertion)))
+        (setcdr evil-current-insertion
+                (- (cdr evil-current-insertion) len))
+      (setq evil-current-insertion nil)))))
+(put 'evil-track-last-insertion 'permanent-local-hook t)
+
+(defun evil-start-track-last-insertion ()
+  "Start tracking the last insertion."
+  (setq evil-current-insertion nil)
+  (add-hook 'after-change-functions #'evil-track-last-insertion nil t))
+
+(defun evil-stop-track-last-insertion ()
+  "Stop tracking the last insertion.
+The tracked insertion is set to `evil-last-insertion'."
+  (setq evil-last-insertion
+        (and evil-current-insertion
+             (buffer-substring-no-properties (car evil-current-insertion)
+                                             (cdr evil-current-insertion))))
+  (remove-hook 'after-change-functions #'evil-track-last-insertion t))
+
+;;; Paste
+
+(defun evil-yank-characters (beg end &optional register yank-handler)
+  "Saves the characters defined by the region BEG and END in the kill-ring."
+  (let ((text (filter-buffer-substring beg end)))
+    (when yank-handler
+      (setq text (propertize text 'yank-handler (list yank-handler))))
+    (when register
+      (evil-set-register register text))
+    (kill-new text)))
+
+(defun evil-yank-lines (beg end &optional register yank-handler)
+  "Saves the lines in the region BEG and END into the kill-ring."
+  (let* ((text (filter-buffer-substring beg end))
+         (yank-handler (list (or yank-handler
+                                 #'evil-yank-line-handler))))
+    ;; Ensure the text ends with a newline. This is required
+    ;; if the deleted lines were the last lines in the buffer.
+    (when (or (zerop (length text))
+              (/= (aref text (1- (length text))) ?\n))
+      (setq text (concat text "\n")))
+    (setq text (propertize text 'yank-handler yank-handler))
+    (when register
+      (evil-set-register register text))
+    (kill-new text)))
+
+(defun evil-yank-rectangle (beg end &optional register yank-handler)
+  "Stores the rectangle defined by region BEG and END into the kill-ring."
+  (let ((lines (list nil)))
+    (evil-apply-on-rectangle #'extract-rectangle-line beg end lines)
+    ;; We remove spaces from the beginning and the end of the next.
+    ;; Spaces are inserted explicitly in the yank-handler in order to
+    ;; NOT insert lines full of spaces.
+    (setq lines (nreverse (cdr lines)))
+    ;; `text' is used as default insert text when pasting this rectangle
+    ;; in another program, e.g., using the X clipboard.
+    (let* ((yank-handler (list (or yank-handler
+                                   #'evil-yank-block-handler)
+                               lines
+                               nil
+                               #'evil-delete-yanked-rectangle))
+           (text (propertize (mapconcat #'identity lines "\n")
+                             'yank-handler yank-handler)))
+      (when register
+        (evil-set-register register text))
+      (kill-new text))))
+
+(defun evil-yank-line-handler (text)
+  "Inserts the current text linewise."
+  (let ((text (apply #'concat (make-list (or evil-paste-count 1) text)))
+        (opoint (point)))
+    (remove-list-of-text-properties
+     0 (length text) yank-excluded-properties text)
+    (cond
+     ((eq this-command #'evil-paste-before)
+      (evil-move-beginning-of-line)
+      (evil-move-mark (point))
+      (insert text)
+      (setq evil-last-paste
+            (list #'evil-paste-before
+                  evil-paste-count
+                  opoint
+                  (mark t)
+                  (point)))
+      (evil-set-marker ?\[ (mark))
+      (evil-set-marker ?\] (1- (point)))
+      (evil-exchange-point-and-mark)
+      (back-to-indentation))
+     ((eq this-command #'evil-paste-after)
+      (evil-move-end-of-line)
+      (evil-move-mark (point))
+      (insert "\n")
+      (insert text)
+      (evil-set-marker ?\[ (1+ (mark)))
+      (evil-set-marker ?\] (1- (point)))
+      (delete-char -1) ; delete the last newline
+      (setq evil-last-paste
+            (list #'evil-paste-after
+                  evil-paste-count
+                  opoint
+                  (mark t)
+                  (point)))
+      (evil-move-mark (1+ (mark t)))
+      (evil-exchange-point-and-mark)
+      (back-to-indentation))
+     (t
+      (insert text)))))
+
+(defun evil-yank-block-handler (lines)
+  "Inserts the current text as block."
+  (let ((count (or evil-paste-count 1))
+        (col (if (eq this-command #'evil-paste-after)
+                 (1+ (current-column))
+               (current-column)))
+        (current-line (line-number-at-pos (point)))
+        (opoint (point))
+        epoint)
+    (dolist (line lines)
+      ;; concat multiple copies according to count
+      (setq line (apply #'concat (make-list count line)))
+      ;; strip whitespaces at beginning and end
+      (string-match "^ *\\(.*?\\) *$" line)
+      (let ((text (match-string 1 line))
+            (begextra (match-beginning 1))
+            (endextra (- (match-end 0) (match-end 1))))
+        ;; maybe we have to insert a new line at eob
+        (while (< (line-number-at-pos (point))
+                  current-line)
+          (goto-char (point-max))
+          (insert "\n"))
+        (setq current-line (1+ current-line))
+        ;; insert text unless we insert an empty line behind eol
+        (unless (and (< (evil-column (line-end-position)) col)
+                     (zerop (length text)))
+          ;; if we paste behind eol, it may be sufficient to insert tabs
+          (if (< (evil-column (line-end-position)) col)
+              (move-to-column (+ col begextra) t)
+            (move-to-column col t)
+            (insert (make-string begextra ? )))
+          (remove-list-of-text-properties 0 (length text)
+                                          yank-excluded-properties text)
+          (insert text)
+          (unless (eolp)
+            ;; text follows, so we have to insert spaces
+            (insert (make-string endextra ? )))
+          (setq epoint (point)))
+        (forward-line 1)))
+    (setq evil-last-paste
+          (list this-command
+                evil-paste-count
+                opoint
+                (length lines)                   ; number of rows
+                (* count (length (car lines))))) ; number of colums
+    (evil-set-marker ?\[ opoint)
+    (evil-set-marker ?\] (1- epoint))
+    (goto-char opoint)
+    (when (and (eq this-command #'evil-paste-after)
+               (not (eolp)))
+      (forward-char))))
+
+(defun evil-delete-yanked-rectangle (nrows ncols)
+  "Special function to delete the block yanked by a previous paste command."
+  (let ((opoint (point))
+        (col (if (eq last-command #'evil-paste-after)
+                 (1+ (current-column))
+               (current-column))))
+    (dotimes (i nrows)
+      (delete-region (save-excursion
+                       (move-to-column col)
+                       (point))
+                     (save-excursion
+                       (move-to-column (+ col ncols))
+                       (point)))
+      (unless (eobp) (forward-line)))
+    (goto-char opoint)))
+
+;; TODO: if undoing is disabled in the current buffer, paste-pop won't
+;; work. Although this is probably not a big problem, because usually
+;; buffers where `evil-paste-pop' may be useful have undoing enabled.
+;; A solution would be to temporarily enable undo when pasting and
+;; store the undo information in a special variable that does not
+;; interfere with `buffer-undo-list'.
+(defun evil-paste-pop (count)
+  "Replace the just-yanked stretch of killed text with a different stretch.
+This command is allowed only immediatly after a `yank',
+`evil-paste-before', `evil-paste-after' or `evil-paste-pop'.
+This command uses the same paste command as before, i.e., when
+used after `evil-paste-after' the new text is also yanked using
+`evil-paste-after', used with the same paste-count argument.
+
+The COUNT argument inserts the COUNTth previous kill.  If COUNT
+is negative this is a more recent kill."
+  (interactive "p")
+  (unless (memq last-command
+                '(evil-paste-after
+                  evil-paste-before))
+    (error "Previous command was not an evil-paste: %s" last-command))
+  (unless evil-last-paste
+    (error "Previous paste command used a register"))
+  (evil-undo-pop)
+  (goto-char (nth 2 evil-last-paste))
+  (current-kill count)
+  (setq this-command (nth 0 evil-last-paste))
+  (funcall (nth 0 evil-last-paste) (nth 1 evil-last-paste)))
+
+(defun evil-paste-pop-next (count)
+  "Same as `evil-paste-pop' but with negative argument."
+  (interactive "p")
+  (evil-paste-pop (- count)))
+
+;;; Interactive forms
+
+(defun evil-match-interactive-code (interactive &optional pos)
+  "Match an interactive code at position POS in string INTERACTIVE.
+Returns the first matching entry in `evil-interactive-alist', or nil."
+  (let ((length (length interactive))
+        (pos (or pos 0)))
+    (catch 'done
+      (dolist (entry evil-interactive-alist)
+        (let* ((string (car entry))
+               (end (+ (length string) pos)))
+          (when (and (<= end length)
+                     (string= string
+                              (substring interactive pos end)))
+            (throw 'done entry)))))))
+
+(defun evil-concatenate-interactive-forms (&rest forms)
+  "Concatenate interactive list expressions FORMS.
+Returns a single expression where successive expressions
+are joined, if possible."
+  (let (result)
+    (when forms
+      (while (cdr forms)
+        (cond
+         ((null (car forms))
+          (pop forms))
+         ((and (eq (car (car forms)) 'list)
+               (eq (car (cadr forms)) 'list))
+          (setq forms (cons (append (car forms)
+                                    (cdr (cadr forms)))
+                            (cdr (cdr forms)))))
+         (t
+          (push (pop forms) result))))
+      (when (car forms)
+        (push (pop forms) result))
+      (setq result (nreverse result))
+      (cond
+       ((null result))
+       ((null (cdr result))
+        (car result))
+       (t
+        `(append ,@result))))))
+
+(defun evil-interactive-string (string)
+  "Evaluate the interactive string STRING.
+The string may contain extended interactive syntax.
+The return value is a cons cell (FORM . PROPERTIES),
+where FORM is a single list-expression to be passed to
+a standard `interactive' statement, and PROPERTIES is a
+list of command properties as passed to `evil-define-command'."
+  (let ((length (length string))
+        (pos 0)
+        code expr forms match plist prompt properties)
+    (while (< pos length)
+      (if (eq (aref string pos) ?\n)
+          (setq pos (1+ pos))
+        (setq match (evil-match-interactive-code string pos))
+        (if (null match)
+            (error "Unknown interactive code: `%s'"
+                   (substring string pos))
+          (setq code (car match)
+                expr (car (cdr match))
+                plist (cdr (cdr match))
+                pos (+ pos (length code)))
+          (when (functionp expr)
+            (setq prompt
+                  (substring string pos
+                             (or (string-match "\n" string pos)
+                                 length))
+                  pos (+ pos (length prompt))
+                  expr `(funcall ,expr ,prompt)))
+          (setq forms (append forms (list expr))
+                properties (append properties plist)))))
+    (cons `(append ,@forms) properties)))
+
+(defun evil-interactive-form (&rest args)
+  "Evaluate interactive forms ARGS.
+The return value is a cons cell (FORM . PROPERTIES),
+where FORM is a single list-expression to be passed to
+a standard `interactive' statement, and PROPERTIES is a
+list of command properties as passed to `evil-define-command'."
+  (let (forms properties)
+    (dolist (arg args)
+      (if (not (stringp arg))
+          (setq forms (append forms (list arg)))
+        (setq arg (evil-interactive-string arg)
+              forms (append forms (cdr (car arg)))
+              properties (append properties (cdr arg)))))
+    (cons (apply #'evil-concatenate-interactive-forms forms)
+          properties)))
+
+;;; Types
+
+(defun evil-type (object &optional default)
+  "Return the type of OBJECT, or DEFAULT if none."
+  (let (type)
+    (cond
+     ((overlayp object)
+      (setq type (overlay-get object :type)))
+     ((evil-range-p object)
+      (setq type (nth 2 object)))
+     ((listp object)
+      (setq type (plist-get object :type)))
+     ((commandp object)
+      (setq type (evil-get-command-property object :type)))
+     ((symbolp object)
+      (setq type (get object 'type))))
+    (setq type (or type default))
+    (and (evil-type-p type) type)))
+
+(defun evil-set-type (object type)
+  "Set the type of OBJECT to TYPE.
+For example, (evil-set-type 'next-line 'line)
+will make `line' the type of the `next-line' command."
+  (cond
+   ((overlayp object)
+    (overlay-put object :type type))
+   ((evil-range-p object)
+    (evil-set-range-type object type))
+   ((listp object)
+    (plist-put object :type type))
+   ((commandp object)
+    (evil-set-command-property object :type type))
+   ((symbolp object)
+    (put object 'type type)))
+  object)
+
+(defun evil-type-property (type prop)
+  "Return property PROP for TYPE."
+  (evil-get-property evil-type-properties type prop))
+
+(defun evil-type-p (sym)
+  "Whether SYM is the name of a type."
+  (assq sym evil-type-properties))
+
+(defun evil-expand (beg end type &rest properties)
+  "Expand BEG and END as TYPE with PROPERTIES.
+Returns a list (BEG END TYPE PROPERTIES ...), where the tail
+may contain a property list."
+  (apply #'evil-transform
+         ;; don't expand if already expanded
+         (unless (plist-get properties :expanded) :expand)
+         beg end type properties))
+
+(defun evil-contract (beg end type &rest properties)
+  "Contract BEG and END as TYPE with PROPERTIES.
+Returns a list (BEG END TYPE PROPERTIES ...), where the tail
+may contain a property list."
+  (apply #'evil-transform :contract beg end type properties))
+
+(defun evil-normalize (beg end type &rest properties)
+  "Normalize BEG and END as TYPE with PROPERTIES.
+Returns a list (BEG END TYPE PROPERTIES ...), where the tail
+may contain a property list."
+  (apply #'evil-transform :normalize beg end type properties))
+
+(defun evil-transform
+  (transform beg end type &rest properties)
+  "Apply TRANSFORM on BEG and END with PROPERTIES.
+Returns a list (BEG END TYPE PROPERTIES ...), where the tail
+may contain a property list. If TRANSFORM is undefined,
+return positions unchanged."
+  (let* ((type (or type (evil-type properties)))
+         (transform (when (and type transform)
+                      (evil-type-property type transform))))
+    (if transform
+        (apply transform beg end properties)
+      (apply #'evil-range beg end type properties))))
+
+(defun evil-describe (beg end type &rest properties)
+  "Return description of BEG and END with PROPERTIES.
+If no description is available, return the empty string."
+  (let* ((type (or type (evil-type properties)))
+         (properties (plist-put properties :type type))
+         (describe (evil-type-property type :string)))
+    (or (when describe
+          (apply describe beg end properties))
+        "")))
+
+;;; Ranges
+
+(defun evil-range (beg end &optional type &rest properties)
+  "Return a list (BEG END [TYPE] PROPERTIES...).
+BEG and END are buffer positions (numbers or markers),
+TYPE is a type as per `evil-type-p', and PROPERTIES is
+a property list."
+  (let ((beg (evil-normalize-position beg))
+        (end (evil-normalize-position end)))
+    (when (and (numberp beg) (numberp end))
+      (append (list (min beg end) (max beg end))
+              (when (evil-type-p type)
+                (list type))
+              properties))))
+
+(defun evil-range-p (object)
+  "Whether OBJECT is a range."
+  (and (listp object)
+       (>= (length object) 2)
+       (numberp (nth 0 object))
+       (numberp (nth 1 object))))
+
+(defun evil-range-beginning (range)
+  "Return beginning of RANGE."
+  (when (evil-range-p range)
+    (let ((beg (evil-normalize-position (nth 0 range)))
+          (end (evil-normalize-position (nth 1 range))))
+      (min beg end))))
+
+(defun evil-range-end (range)
+  "Return end of RANGE."
+  (when (evil-range-p range)
+    (let ((beg (evil-normalize-position (nth 0 range)))
+          (end (evil-normalize-position (nth 1 range))))
+      (max beg end))))
+
+(defun evil-range-properties (range)
+  "Return properties of RANGE."
+  (when (evil-range-p range)
+    (if (evil-type range)
+        (nthcdr 3 range)
+      (nthcdr 2 range))))
+
+(defun evil-copy-range (range)
+  "Return a copy of RANGE."
+  (copy-sequence range))
+
+(defun evil-set-range (range &optional beg end type &rest properties)
+  "Set RANGE to have beginning BEG and end END.
+The TYPE and additional PROPERTIES may also be specified.
+If an argument is nil, it's not used; the previous value is retained.
+See also `evil-set-range-beginning', `evil-set-range-end',
+`evil-set-range-type' and `evil-set-range-properties'."
+  (when (evil-range-p range)
+    (let ((beg (or (evil-normalize-position beg)
+                   (evil-range-beginning range)))
+          (end (or (evil-normalize-position end)
+                   (evil-range-end range)))
+          (type (or type (evil-type range)))
+          (plist (evil-range-properties range)))
+      (evil-sort beg end)
+      (setq plist (evil-concat-plists plist properties))
+      (evil-set-range-beginning range beg)
+      (evil-set-range-end range end)
+      (evil-set-range-type range type)
+      (evil-set-range-properties range plist)
+      range)))
+
+(defun evil-set-range-beginning (range beg &optional copy)
+  "Set RANGE's beginning to BEG.
+If COPY is non-nil, return a copy of RANGE."
+  (when copy
+    (setq range (evil-copy-range range)))
+  (setcar range beg)
+  range)
+
+(defun evil-set-range-end (range end &optional copy)
+  "Set RANGE's end to END.
+If COPY is non-nil, return a copy of RANGE."
+  (when copy
+    (setq range (evil-copy-range range)))
+  (setcar (cdr range) end)
+  range)
+
+(defun evil-set-range-type (range type &optional copy)
+  "Set RANGE's type to TYPE.
+If COPY is non-nil, return a copy of RANGE."
+  (when copy
+    (setq range (evil-copy-range range)))
+  (if type
+      (setcdr (cdr range)
+              (cons type (evil-range-properties range)))
+    (setcdr (cdr range) (evil-range-properties range)))
+  range)
+
+(defun evil-set-range-properties (range properties &optional copy)
+  "Set RANGE's properties to PROPERTIES.
+If COPY is non-nil, return a copy of RANGE."
+  (when copy
+    (setq range (evil-copy-range range)))
+  (if (evil-type range)
+      (setcdr (cdr (cdr range)) properties)
+    (setcdr (cdr range) properties))
+  range)
+
+(defun evil-range-union (range1 range2 &optional type)
+  "Return the union of the ranges RANGE1 and RANGE2.
+If the ranges have conflicting types, use RANGE1's type.
+This can be overridden with TYPE."
+  (when (and (evil-range-p range1)
+             (evil-range-p range2))
+    (evil-range (min (evil-range-beginning range1)
+                     (evil-range-beginning range2))
+                (max (evil-range-end range1)
+                     (evil-range-end range2))
+                (or type
+                    (evil-type range1)
+                    (evil-type range2)))))
+
+(defun evil-subrange-p (range1 range2)
+  "Whether RANGE1 is contained within RANGE2."
+  (and (evil-range-p range1)
+       (evil-range-p range2)
+       (<= (evil-range-beginning range2)
+           (evil-range-beginning range1))
+       (>= (evil-range-end range2)
+           (evil-range-end range1))))
+
+(defun evil-add-whitespace-to-range (range &optional dir pos regexp)
+  "Add whitespace at one side of RANGE, depending on POS.
+If POS is before the range, add trailing whitespace;
+if POS is after the range, add leading whitespace.
+If there is no trailing whitespace, add leading and vice versa.
+If POS is inside the range, add trailing if DIR is positive and
+leading if DIR is negative. POS defaults to point.
+REGEXP is a regular expression for matching whitespace;
+the default is \"[ \\f\\t\\n\\r\\v]+\"."
+  (let* ((pos (or pos (point)))
+         (dir (or (when (<= pos (evil-range-beginning range)) 1)
+                  (when (>= pos (evil-range-end range)) -1)
+                  dir 1))
+         (regexp (or regexp "[ \f\t\n\r\v]+")))
+    (save-excursion
+      (save-match-data
+        (goto-char pos)
+        (cond
+         ((if (< dir 0)
+              (looking-back regexp (1- (line-beginning-position)))
+            (not (looking-at regexp)))
+          (or (evil-add-whitespace-after-range range regexp)
+              (evil-add-whitespace-before-range range regexp)))
+         (t
+          (or (evil-add-whitespace-before-range range regexp)
+              (evil-add-whitespace-after-range range regexp))))
+        range))))
+
+(defun evil-add-whitespace-before-range (range &optional regexp)
+  "Add whitespace at the beginning of RANGE.
+REGEXP is a regular expression for matching whitespace;
+the default is \"[ \\f\\t\\n\\r\\v]+\".
+Returns t if RANGE was successfully increased and nil otherwise."
+  (let ((orig (evil-copy-range range))
+        (regexp (or regexp "[ \f\t\n\r\v]+")))
+    (save-excursion
+      (save-match-data
+        (goto-char (evil-range-beginning range))
+        (when (looking-back regexp (1- (line-beginning-position)) t)
+          ;; exclude the newline on the preceding line
+          (goto-char (match-beginning 0))
+          (when (eolp) (forward-char))
+          (evil-set-range range (point)))
+        (not (evil-subrange-p range orig))))))
+
+(defun evil-add-whitespace-after-range (range &optional regexp)
+  "Add whitespace at the end of RANGE.
+REGEXP is a regular expression for matching whitespace;
+the default is \"[ \\f\\t\\n\\r\\v]+\".
+Returns t if RANGE was successfully increased and nil otherwise."
+  (let ((orig (evil-copy-range range))
+        (regexp (or regexp "[ \f\t\n\r\v]+")))
+    (save-excursion
+      (save-match-data
+        (goto-char (evil-range-end range))
+        (when (looking-at regexp)
+          (evil-set-range range nil (match-end 0)))
+        (not (evil-subrange-p range orig))))))
+
+(defun evil-adjust-whitespace-inside-range (range &optional shrink regexp)
+  "Adjust whitespace inside RANGE.
+Leading whitespace at the end of the line is excluded.
+If SHRINK is non-nil, indentation may also be excluded,
+and the trailing whitespace is adjusted as well.
+REGEXP is a regular expression for matching whitespace;
+the default is \"[ \\f\\t\\n\\r\\v]*\".
+Returns t if RANGE was successfully adjusted and nil otherwise."
+  (let ((orig (evil-copy-range range))
+        (regexp (or regexp "[ \f\t\n\r\v]*")))
+    (save-excursion
+      (goto-char (evil-range-beginning range))
+      (when (looking-at (concat regexp "$"))
+        (forward-line)
+        (if (and shrink evil-auto-indent)
+            (back-to-indentation)
+          (evil-move-beginning-of-line))
+        (evil-set-range range (point) nil))
+      (goto-char (evil-range-end range))
+      (when (and shrink (looking-back (concat "^" regexp)
+                                      (line-beginning-position)))
+        (evil-set-range range nil (line-end-position 0)))
+      (not (evil-subrange-p orig range)))))
+
+(defun evil-inner-object-range (count beg end type forward &optional backward range-type)
+  "Return an inner text object range (BEG END) of COUNT objects.
+If COUNT is positive, return objects following point;
+if COUNT is negative, return objects preceding point.
+FORWARD is a function which moves to the end of an object, and
+BACKWARD is a function which moves to the beginning.
+If one is unspecified, the other is used with a negative argument."
+  (let* ((count (or count 1))
+         (forward-func forward)
+         (backward-func backward)
+         (forward  (or forward
+                       #'(lambda (count)
+                           (funcall backward-func (- count)))))
+         (backward (or backward
+                       #'(lambda (count)
+                           (funcall forward-func (- count)))))
+         (current
+          #'(lambda ()
+              (save-excursion
+                (let ((pnt (point))
+                      beg-obj end-obj)
+                  (funcall forward 1)
+                  (setq end-obj (point))
+                  (funcall backward 1)
+                  (setq beg-obj (point))
+                  (cond
+                   ((<= beg-obj pnt)
+                    (cons beg-obj end-obj))
+                   ((zerop (funcall backward 1))
+                    (funcall forward 1)
+                    (cons (if (and (eolp) (not (bolp)))
+                              (1+ (point))
+                            (point))
+                          beg-obj))
+                   (t
+                    (cons (point-min) beg-obj))))))))
+
+    (save-excursion
+      (cond
+       ((> count 0)
+        (let ((obj (funcall current)))
+          (if (or (not beg) (not end)
+                  (> beg (car obj))
+                  (< end (cdr obj)))
+              ;; current object not yet selected
+              (progn
+                (when (or (not beg) (< (car obj) beg))
+                  (setq beg (car obj)))
+                (when (or (not end) (> (cdr obj) end))
+                  (setq end (cdr obj)))
+                (setq count (1- count))
+                (goto-char end))
+            (goto-char (cdr obj))))
+        (dotimes(i count)
+          (let ((obj (funcall current)))
+            (goto-char (cdr obj))))
+        (evil-range beg (point) range-type))
+       (t
+        (setq count (- count))
+        (let ((obj (funcall current)))
+          (if (or (not beg) (not end)
+                  (> beg (car obj))
+                  (< end (cdr obj)))
+              ;; current object not yet selected
+              (progn
+                (when (or (not beg) (< (car obj) beg))
+                  (setq beg (car obj)))
+                (when (or (not end) (> (cdr obj) end))
+                  (setq end (cdr obj)))
+                (setq count (1- count))
+                (goto-char beg))
+            (goto-char (car obj))))
+        (dotimes(i count)
+          (backward-char 1)
+          (let ((obj (funcall current)))
+            (goto-char (car obj))))
+        (evil-range (point) end range-type))))))
+
+(defun evil-an-object-range (count beg end type forward &optional backward range-type newlines)
+  "Return a text object range of COUNT objects with whitespace.
+BEG, END and TYPE specify the range of the current selection that
+should be extended.  The function returns a list (B E) specifying
+the new (extended) text object range.  See
+`evil-inner-object-range' for more details."
+  (let* ((count (or count 1))
+         (forward-func forward)
+         (backward-func backward)
+         (forward  (or forward
+                       #'(lambda (count)
+                           (funcall backward-func (- count)))))
+         (backward (or backward
+                       #'(lambda (count)
+                           (funcall forward-func (- count))))))
+    (if (> count 0)
+        ;; ensure we select the next object
+        (when (and beg end) (forward-char 1))
+      ;; going backward
+      (evil-swap forward backward)
+      (setq count (abs count)))
+    (let ((range
+           (evil-range (save-excursion
+                         (funcall forward 1)
+                         (funcall backward 1)
+                         (point))
+                       (save-excursion
+                         (funcall forward count)
+                         (point))
+                       range-type)))
+      (setq range
+            (save-excursion
+              (if newlines
+                  (evil-add-whitespace-to-range range count)
+                (evil-with-restriction
+                    (save-excursion
+                      (goto-char (evil-range-beginning range))
+                      (line-beginning-position))
+                    (save-excursion
+                      (goto-char (evil-range-end range))
+                      (line-end-position))
+                  (evil-add-whitespace-to-range range count)))))
+      (if (and beg end)
+          (evil-range-union range (evil-range beg end))
+        range))))
+
+(defun evil-paren-range (count beg end type open close &optional exclusive)
+  "Return a range (BEG END) of COUNT delimited text objects.
+BEG, END and TYPE are the currently selected (visual) range.
+OPEN is an opening character and CLOSE is a closing character.
+If EXCLUSIVE is non-nil, OPEN and CLOSE are excluded from
+the range; otherwise they are included.
+
+This function uses Emacs' syntax table and can therefore only
+handle single-character delimiters. To match whole strings,
+use `evil-regexp-range'."
+  (let ((open-regexp (regexp-quote (string open)))
+        (close-regexp (regexp-quote (string close)))
+        (count (or count 1))
+        forward-sexp-function ; always use the default one
+        level range)
+    (save-excursion
+      (if (or (evil-in-comment-p)
+              (and (evil-in-string-p)
+                   ;; TODO: this checks whether the current closing
+                   ;; quote is indeed the end of a string. This is
+                   ;; only a quick fix and should be done more
+                   ;; carefully!
+                   (or (/= (char-after) close)
+                       (eobp)
+                       (evil-in-string-p (1+ (point))))))
+          ;; if in a comment, first look inside the comment only;
+          ;; failing that, look outside it
+          (or (evil-regexp-range count
+                                 beg end type
+                                 open-regexp close-regexp
+                                 exclusive)
+              (progn
+                (evil-goto-min (evil-string-beginning)
+                               (evil-comment-beginning))
+                (evil-paren-range count beg end type open close exclusive)))
+        (with-syntax-table (copy-syntax-table (syntax-table))
+          (cond
+           ((= count 0))
+           ;; if OPEN is equal to CLOSE, handle as string delimiters
+           ((eq open close)
+            (modify-syntax-entry open "\"")
+            ;; syntax table is out-of-date, encourage reparsing
+            (let ((pnt (point)))
+              (beginning-of-defun)
+              (let ((state (parse-partial-sexp (point) pnt)))
+                (when (not (nth 3 state))
+                  (setq state (parse-partial-sexp (point)
+                                                  (point-max)
+                                                  0
+                                                  nil
+                                                  state
+                                                  'syntax-table)))
+                (when (nth 3 state)
+                  (let ((beg (nth 8 state)))
+                    (parse-partial-sexp (point) (point-max)
+                                        0
+                                        nil
+                                        state
+                                        'syntax-table)
+                    (setq range (evil-range
+                                 (if exclusive (1+ beg) beg)
+                                 (if exclusive (1- (point)) (point)))))))))
+           (t
+            ;; otherwise handle as open and close parentheses
+            (modify-syntax-entry open (format "(%c" close))
+            (modify-syntax-entry close (format ")%c" open))
+            (if (< count 0)
+                (when (looking-back close-regexp (line-beginning-position))
+                  (backward-char))
+              (when (looking-at open-regexp)
+                (forward-char)
+                (when (and beg end (= (1+ beg) end))
+                  (setq beg (1+ beg)))))
+            ;; find OPEN, start at beginning of current range (if any)
+            (when (and beg end)
+              (goto-char (min beg (point)))
+              ;; check if current object matches current selection
+              (condition-case nil
+                  (save-excursion
+                    ;; find OPEN of current object
+                    (while (progn
+                             (backward-up-list 1)
+                             (not (looking-at open-regexp))))
+                    (let ((beg1 (point)))
+                      ;; find CLOSE of current object
+                      (forward-list)
+                      ;; modify current object of inclusive range
+                      (when exclusive
+                        (setq beg1 (1+ beg1))
+                        (backward-char))
+                      (when (and (= beg1 beg)
+                                 (= (point) end))
+                        ;; current object *is* current selection,
+                        ;; select one more
+                        (if (> count 0)
+                            (setq count (1+ count))
+                          (setq count (1- count))))))
+                (error nil)))
+            ;; find OPEN again with correct count
+            (evil-motion-loop (nil count level)
+              (condition-case nil
+                  (while (progn
+                           (backward-up-list 1)
+                           (not (looking-at open-regexp))))
+                (error nil)))
+            (when (/= level count)
+              (setq beg (if exclusive (1+ (point)) (point)))
+              ;; find CLOSE
+              (forward-list)
+              (setq end (if exclusive (1- (point)) (point)))
+              (setq range (evil-range beg end))
+              (when exclusive
+                (evil-adjust-whitespace-inside-range
+                 range (not (eq evil-this-operator #'evil-delete)))))))
+          range)))))
+
+(defun evil-quote-range (count beg end type open close &optional exclusive)
+  "Return a range (BEG END) of COUNT quotes.
+BEG, END and TYPE are the currently selected (visual) range.
+OPEN is the opening quote, CLOSE is the closing quote (often both
+are equal). If EXCLUSIVE is non-nil, OPEN and CLOSE are excluded
+from the range unless COUNT is 2 in which case they are included;
+otherwise they are included as well as any succeeding (or
+preceding if no whitespace follows) white space."
+  (if exclusive
+      (if (and count (= count 2))
+          (evil-paren-range 1 nil nil nil open close nil)
+        (evil-paren-range count nil nil nil open close t))
+    (let ((range (evil-paren-range count nil nil nil open close nil)))
+      (save-excursion
+        (if (progn
+              (goto-char (evil-range-end range))
+              (looking-at "[[:space:]]+"))
+            (evil-range (evil-range-beginning range) (match-end 0))
+          (goto-char (evil-range-beginning range))
+          (skip-chars-backward "[:space:]")
+          (evil-range (point) (evil-range-end range)))))))
+
+(defun evil-regexp-range (count beg end type open close &optional exclusive)
+  "Return a range (BEG END) of COUNT delimited text objects.
+BEG END TYPE are the currently selected (visual) range.
+OPEN is a regular expression matching the opening sequence,
+and CLOSE is a regular expression matching the closing sequence.
+If EXCLUSIVE is non-nil, OPEN and CLOSE are excluded from
+the range; otherwise they are included. See also `evil-paren-range'."
+  (let ((either (format "\\(%s\\)\\|\\(%s\\)" open close))
+        (count (or count 1))
+        (level 0))
+    (let ((select
+           #'(lambda (count)
+               ;; Is point inside a delimiter?
+               (evil-with-or-without-comment
+                 (save-excursion
+                   (save-match-data
+                     (let ((level 0)
+                           beg-inc end-inc beg-exc end-exc)
+                       (when (evil-in-regexp-p either)
+                         (if (< count 0)
+                             (goto-char (match-end 0))
+                           (goto-char (match-beginning 0))))
+                       ;; Is point next to a delimiter?
+                       (if (< count 0)
+                           (when (looking-back close (line-beginning-position))
+                             (goto-char (match-beginning 0)))
+                         (when (looking-at open)
+                           (goto-char (match-end 0))))
+                       ;; find beginning of range
+                       (while (and (< level (abs count))
+                                   (re-search-backward either nil t))
+                         (if (looking-at open)
+                             (setq level (1+ level))
+                           ;; found a CLOSE, so need to find another
+                           ;; OPEN first
+                           (setq level (1- level))))
+                       ;; find end of range
+                       (when (> level 0)
+                         (forward-char)
+                         (setq level 1
+                               beg-inc (match-beginning 0)
+                               beg-exc (match-end 0))
+                         (while (and (> level 0)
+                                     (re-search-forward either nil t))
+                           (if (looking-back close (line-beginning-position))
+                               (setq level (1- level))
+                             ;; found an OPEN, so need to find another
+                             ;; CLOSE first
+                             (setq level (1+ level))))
+                         (when (= level 0)
+                           (setq end-inc (match-end 0)
+                                 end-exc (match-beginning 0))
+                           (cons (evil-range beg-inc end-inc)
+                                 (evil-range beg-exc end-exc)))))))))))
+      (when (and beg end)
+        (let* ((ranges1 (funcall select (if (> count 0) 1 -1)))
+               (rng-inc1 (car ranges1))
+               (rng-exc1 (cdr ranges1)))
+          (cond
+           ((and (= beg (evil-range-beginning rng-inc1))
+                 (= end (evil-range-end rng-inc1)))
+            (setq count (+ count (if (> count 0) 1 -1))))
+           ((and exclusive
+                 (= beg (evil-range-beginning rng-exc1))
+                 (= end (evil-range-end rng-exc1)))
+            (if (= (abs count) 1)
+                (setq exclusive nil)
+              (setq count (+ count (if (> count 0) 1 -1))))))))
+      (let ((ranges (funcall select count)))
+        (if exclusive (cdr ranges) (car ranges))))))
+
+(defun evil-xml-range (&optional count beg end type exclusive)
+  "Return a range (BEG END) of COUNT matching XML tags.
+If EXCLUSIVE is non-nil, the tags themselves are excluded
+from the range."
+  (evil-regexp-range
+   count beg end type
+   "<\\(?:[^/ ]\\(?:[^>]*?[^/>]\\)?\\)?>" "</[^>]+?>"
+   exclusive))
+
+(defun evil-expand-range (range &optional copy)
+  "Expand RANGE according to its type.
+Return a new range if COPY is non-nil."
+  (when copy
+    (setq range (evil-copy-range range)))
+  (unless (plist-get (evil-range-properties range) :expanded)
+    (setq range (evil-transform-range :expand range)))
+  range)
+
+(defun evil-contract-range (range &optional copy)
+  "Contract RANGE according to its type.
+Return a new range if COPY is non-nil."
+  (evil-transform-range :contract range copy))
+
+(defun evil-normalize-range (range &optional copy)
+  "Normalize RANGE according to its type.
+Return a new range if COPY is non-nil."
+  (evil-transform-range :normalize range copy))
+
+(defun evil-transform-range (transform range &optional copy)
+  "Apply TRANSFORM to RANGE according to its type.
+Return a new range if COPY is non-nil."
+  (when copy
+    (setq range (evil-copy-range range)))
+  (when (evil-type range)
+    (apply #'evil-set-range range
+           (apply #'evil-transform transform range)))
+  range)
+
+(defun evil-describe-range (range)
+  "Return description of RANGE.
+If no description is available, return the empty string."
+  (apply #'evil-describe range))
+
+;;; Undo
+
+(defun evil-start-undo-step (&optional continue)
+  "Start a undo step.
+All following buffer modifications are grouped together as a
+single action. If CONTINUE is non-nil, preceding modifications
+are included. The step is terminated with `evil-end-undo-step'."
+  (when (and (listp buffer-undo-list)
+             (not evil-in-single-undo))
+    (if evil-undo-list-pointer
+        (evil-refresh-undo-step)
+      (unless (or continue (null (car-safe buffer-undo-list)))
+        (undo-boundary))
+      (setq evil-undo-list-pointer (or buffer-undo-list t)))))
+
+(defun evil-end-undo-step (&optional continue)
+  "End a undo step started with `evil-start-undo-step'.
+Adds an undo boundary unless CONTINUE is specified."
+  (when (and evil-undo-list-pointer
+             (not evil-in-single-undo))
+    (evil-refresh-undo-step)
+    (unless continue
+      (undo-boundary))
+    (remove-hook 'post-command-hook #'evil-refresh-undo-step t)
+    (setq evil-undo-list-pointer nil)))
+
+(defun evil-refresh-undo-step ()
+  "Refresh `buffer-undo-list' entries for current undo step.
+Undo boundaries until `evil-undo-list-pointer' are removed
+to make the entries undoable as a single action.
+See `evil-start-undo-step'."
+  (when evil-undo-list-pointer
+    (setq buffer-undo-list
+          (evil-filter-list #'null buffer-undo-list
+                            evil-undo-list-pointer)
+          evil-undo-list-pointer (or buffer-undo-list t))))
+
+(defmacro evil-with-undo (&rest body)
+  "Execute BODY with enabled undo.
+If undo is disabled in the current buffer, the undo information
+is stored in `evil-temporary-undo' instead of `buffer-undo-list'."
+  (declare (indent defun)
+           (debug t))
+  `(unwind-protect
+       (let (buffer-undo-list)
+         (prog1
+             (progn ,@body)
+           (setq evil-temporary-undo (cons nil buffer-undo-list))))
+     (unless (eq buffer-undo-list t)
+       ;; undo is enabled, so update the global buffer undo list
+       (setq buffer-undo-list
+             ;; prepend new undos (if there are any)
+             (if (cdr evil-temporary-undo)
+                 (nconc evil-temporary-undo buffer-undo-list)
+               buffer-undo-list)
+             evil-temporary-undo nil))))
+
+(defmacro evil-with-single-undo (&rest body)
+  "Execute BODY as a single undo step."
+  (declare (indent defun)
+           (debug t))
+  `(let (evil-undo-list-pointer)
+     (evil-with-undo
+       (unwind-protect
+           (progn
+             (evil-start-undo-step)
+             (let ((evil-in-single-undo t))
+               ,@body))
+         (evil-end-undo-step)))))
+
+(defun evil-undo-pop ()
+  "Undo the last buffer change.
+Removes the last undo information from `buffer-undo-list'.
+If undo is disabled in the current buffer, use the information
+in `evil-temporary-undo' instead."
+  (let ((paste-undo (list nil)))
+    (let ((undo-list (if (eq buffer-undo-list t)
+                         evil-temporary-undo
+                       buffer-undo-list)))
+      (when (or (not undo-list) (car undo-list))
+        (error "Can't undo previous change"))
+      (while (and undo-list (null (car undo-list)))
+        (pop undo-list)) ; remove nil
+      (while (and undo-list (car undo-list))
+        (push (pop undo-list) paste-undo))
+      (let ((buffer-undo-list (nreverse paste-undo)))
+        (evil-save-echo-area
+          (undo)))
+      (if (eq buffer-undo-list t)
+          (setq evil-temporary-undo nil)
+        (setq buffer-undo-list undo-list)))))
+
+;;; Search
+(defun evil-transform-regexp (regexp replacements-alist)
+  (let ((pos 0) result)
+    (replace-regexp-in-string
+     "\\\\+[^\\\\]"
+     #'(lambda (txt)
+         (let* ((b (match-beginning 0))
+                (e (match-end 0))
+                (ch (aref txt (1- e)))
+                (repl (assoc ch replacements-alist)))
+           (if (and repl (zerop (mod (length txt) 2)))
+               (concat (substring txt b (- e 2))
+                       (cdr repl))
+             txt)))
+     regexp nil t)))
+
+(defun evil-transform-magic (str magic quote transform &optional start)
+  "Transforms STR with magic characters.
+MAGIC is a regexp that matches all potential magic
+characters. Each occurence of CHAR as magic character within str
+is replaced by the result of calling the associated TRANSFORM
+function. TRANSFORM is a function taking two arguments, the
+character to be transformed and the rest of string after the
+character. The function should return a triple (REPLACEMENT REST
+. STOP) where REPLACEMENT is the replacement and REST is the rest
+of the string that has not been transformed. If STOP is non-nil
+then the substitution stops immediately.  The replacement starts
+at position START, everything before that position is returned
+literally.  The result is a pair (RESULT . REST). RESULT is a
+list containing the transformed parts in order. If two
+subsequents parts are both strings, they are concatenated. REST
+is the untransformed rest string (usually \"\" but may be more if
+TRANSFORM stopped the substitution). Which characters are
+considered as magic characters (i.e. the transformation happens
+if the character is NOT preceeded by a backslash) is determined
+by `evil-magic'. The special tokens \\v, \\V, \\m and \\M have
+always a special meaning (like in Vim) and should not be
+contained in TRANSFORMS, otherwise their meaning is overwritten.
+
+The parameter QUOTE is a quoting function applied to literal
+transformations, usually `regexp-quote' or `replace-quote'."
+  (save-match-data
+    (let ((regexp (concat "\\(?:\\`\\|[^\\]\\)\\(\\\\\\(?:\\(" magic "\\)\\|\\(.\\)\\)\\|\\(" magic "\\)\\)"))
+          (magic-chars (evil-get-magic evil-magic))
+          (evil-magic evil-magic)
+          (quote (or quote #'identity))
+          result stop)
+      (while (and (not stop) str (string-match regexp str))
+        (unless (zerop (match-beginning 1))
+          (push (substring str 0 (match-beginning 1)) result))
+        (let ((char (or (match-string 2 str)
+                        (match-string 3 str)
+                        (match-string 4 str)))
+              (rest (substring str (match-end 0))))
+          (cond
+           ((match-beginning 4)
+            ;; magic character without backslash
+            (if (string-match magic-chars char)
+                ;; magic, do transform
+                (let ((trans (funcall transform (aref char 0) rest)))
+                  (push (car trans) result)
+                  (setq str (cadr trans) stop (nthcdr 2 trans)))
+              ;; non-magic, literal transformation
+              (push (funcall quote char) result)
+              (setq str rest)))
+           ((match-beginning 2)
+            ;; magic character with backslash
+            (if (not (string-match magic-chars char))
+                ;; non-magic, do transform
+                (let ((trans (funcall transform (aref char 0) rest)))
+                  (push (car trans) result)
+                  (setq str (cadr trans) stop (nthcdr 2 trans)))
+              ;; magic, literal transformation
+              (push (funcall quote char) result)
+              (setq str rest)))
+           ((memq (aref char 0) '(?m ?M ?v ?V))
+            (setq evil-magic (cdr (assq (aref char 0)
+                                        '((?m . t)
+                                          (?M . nil)
+                                          (?v . very-magic)
+                                          (?V . very-nomagic)))))
+            (setq magic-chars (evil-get-magic evil-magic))
+            (setq str rest))
+           (t
+            ;; non-magic char with backslash, literal transformation
+            (push (funcall quote char) result)
+            (setq str rest)))))
+      (cond
+       ((and str (not stop))
+        (push str result)
+        (setq str ""))
+       ((not str)
+        (setq str "")))
+      ;; concatenate subsequent strings
+      ;; note that result is in reverse order
+      (let (repl)
+        (while result
+          (cond
+           ((and (stringp (car result))
+                 (zerop (length (car result))))
+            (pop result))
+           ((and (stringp (car result))
+                 (stringp (cadr result)))
+            (setq result (cons (concat (cadr result)
+                                       (car result))
+                               (nthcdr 2 result))))
+           (t
+            (push (pop result) repl))))
+        (cons repl str)))))
+
+(defconst evil-vim-regexp-replacements
+  '((?n . "\n")           (?r . "\r")
+    (?t . "\t")           (?b . "\b")
+    (?s . "[[:space:]]")  (?S . "[^[:space:]]")
+    (?d . "[[:digit:]]")  (?D . "[^[:digit:]]")
+    (?x . "[[:xdigit:]]") (?X . "[^[:xdigit:]]")
+    (?o . "[0-7]")        (?O . "[^0-7]")
+    (?a . "[[:alpha:]]")  (?A . "[^[:alpha:]]")
+    (?l . "[a-z]")        (?L . "[^a-z]")
+    (?u . "[A-Z]")        (?U . "[^A-Z]")
+    (?y . "\\s")          (?Y . "\\S")
+    (?( . "\\(")          (?) . "\\)")
+    (?{ . "\\{")          (?} . "\\}")
+    (?[ . "[")            (?] . "]")
+    (?< . "\\<")          (?> . "\\>")
+    (?_ . "\\_")
+    (?* . "*")            (?+ . "+")
+    (?? . "?")            (?= . "?")
+    (?. . ".")
+    (?` . "`")            (?^ . "^")
+    (?$ . "$")            (?| . "\\|")))
+
+(defconst evil-regexp-magic "[][(){}<>_dDsSxXoOaAlLuUwWyY.*+?=^$`|nrtb]")
+
+(defun evil-transform-vim-style-regexp (regexp)
+  "Transforms vim-style backslash codes to Emacs regexp.
+This includes the backslash codes \\d, \\D, \\s, \\S, \\x, \\X,
+\\o, \\O, \\a, \\A, \\l, \\L, \\u, \\U and \\w, \\W. The new
+codes \\y and \\Y can be used instead of the Emacs code \\s and
+\\S which have a different meaning in Vim-style."
+  (car
+   (car
+    (evil-transform-magic
+     regexp evil-regexp-magic #'regexp-quote
+     #'(lambda (char rest)
+         (let ((repl (assoc char evil-vim-regexp-replacements)))
+           (if repl
+               (list (cdr repl) rest)
+             (list (concat "\\" (char-to-string char)) rest))))))))
+
+;;; Substitute
+
+(defun evil-downcase-first (str)
+  "Return STR with the first letter downcased."
+  (if (zerop (length str))
+      str
+    (concat (downcase (substring str 0 1))
+            (substring str 1))))
+
+(defun evil-upcase-first (str)
+  "Return STR with the first letter upcased."
+  (if (zerop (length str))
+      str
+    (concat (upcase (substring str 0 1))
+            (substring str 1))))
+
+(defun evil-get-magic (magic)
+  "Returns a regexp matching the magic characters according to MAGIC.
+Depending on the value of MAGIC the following characters are
+considered magic.
+  t             [][{}*+?.&~$^
+  nil           [][{}*+?$^
+  'very-magic   not 0-9A-Za-z_
+  'very-nomagic empty."
+  (cond
+   ((eq magic t) "[][}{*+?.&~$^]")
+   ((eq magic 'very-magic) "[^0-9A-Za-z_]")
+   ((eq magic 'very-nomagic) "\\\\")
+   (t "[][}{*+?$^]")))
+
+;; TODO: support magic characters in patterns
+(defconst evil-replacement-magic "[eElLuU0-9&#,rnbt]"
+  "All magic characters in a replacement string")
+
+(defun evil-compile-subreplacement (to &optional start)
+  "Convert a regexp replacement TO to Lisp from START until \\e or \\E.
+Returns a pair (RESULT . REST). RESULT is a list suitable for
+`perform-replace' if necessary, the original string if not.
+REST is the unparsed remainder of TO."
+  (let ((result
+         (evil-transform-magic
+          to evil-replacement-magic #'replace-quote
+          #'(lambda (char rest)
+              (cond
+               ((eq char ?#)
+                (list '(number-to-string replace-count) rest))
+               ((eq char ?r) (list "\r" rest))
+               ((eq char ?n) (list "\n" rest))
+               ((eq char ?b) (list "\b" rest))
+               ((eq char ?t) (list "\t" rest))
+               ((memq char '(?e ?E))
+                `("" ,rest . t))
+               ((memq char '(?l ?L ?u ?U))
+                (let ((result (evil-compile-subreplacement rest))
+                      (func (cdr (assoc char
+                                        '((?l . evil-downcase-first)
+                                          (?L . downcase)
+                                          (?u . evil-upcase-first)
+                                          (?U . upcase))))))
+                  (list `(,func
+                          (replace-quote
+                           (evil-match-substitute-replacement
+                            ,(car result) t)))
+                        (cdr result))))
+               ((eq char ?,)
+                (let* ((obj (read-from-string rest))
+                       (result `(replace-quote ,(car obj)))
+                       (end
+                        ;; swallow a space after a symbol
+                        (if (and (or (symbolp (car obj))
+                                     ;; swallow a space after 'foo,
+                                     ;; but not after (quote foo)
+                                     (and (eq (car-safe (car obj)) 'quote)
+                                          (not (= ?\( (aref rest 0)))))
+                                 (eq (string-match " " rest (cdr obj))
+                                     (cdr obj)))
+                            (1+ (cdr obj))
+                          (cdr obj))))
+                  (list result (substring rest end))))
+               (t
+                (list (concat "\\" (char-to-string char)) rest))))
+          start)))
+    (let ((rest (cdr result))
+          (result (car result)))
+      (replace-match-string-symbols result)
+      (cons (if (cdr result)
+                (cons 'concat result)
+              (or (car result) ""))
+            rest))))
+
+(defun evil-compile-replacement (to)
+  "Maybe convert a regexp replacement TO to Lisp.
+Returns a list suitable for `perform-replace' if necessary, the
+original string if not. Currently the following magic characters
+in replacements are supported: 0-9&#lLuUrnbt,
+The magic character , (comma) start an Emacs-lisp expression."
+  (when (stringp to)
+    (save-match-data
+      (cons 'replace-eval-replacement
+            (car (evil-compile-subreplacement to))))))
+
+(defun evil-replace-match (replacement &optional fixedcase string)
+  "Replace text match by last search with REPLACEMENT.
+If REPLACEMENT is an expression it will be evaluated to compute
+the replacement text, otherwise the function behaves as
+`replace-match'."
+  (if (stringp replacement)
+      (replace-match replacement fixedcase nil string)
+    (replace-match (funcall (car replacement)
+                            (cdr replacement)
+                            0)
+                   fixedcase nil string)))
+
+(defun evil-match-substitute-replacement (replacement &optional fixedcase string)
+  "Return REPLACEMENT as it will be inserted by `evil-replace-match'."
+  (if (stringp replacement)
+      (match-substitute-replacement replacement fixedcase nil string)
+    (match-substitute-replacement (funcall (car replacement)
+                                           (cdr replacement)
+                                           0)
+                                  fixedcase nil string)))
+
+;;; Alignment
+
+(defun evil-justify-lines (beg end justify position)
+  "Justifes all lines in a range.
+BEG and END specify the range of those lines to be
+justified. JUSTIFY is either 'left, 'right or 'center according
+to the justification type. POSITION is the maximal text width for
+right and center justification or the column at which the lines
+should be left-aligned for left justification."
+  (let ((fill-column position)
+        adaptive-fill-mode fill-prefix)
+    (evil-with-restriction
+        (save-excursion
+          (goto-char beg)
+          (line-beginning-position))
+        (save-excursion
+          (goto-char end)
+          (if (bolp)
+              (line-end-position 0)
+            (line-end-position)))
+      (goto-char (point-min))
+      (while (progn
+               (if (eq justify 'left)
+                   (indent-line-to position)
+                 (when (re-search-forward "^[[:space:]]*" nil t)
+                   (delete-region (match-beginning 0)
+                                  (match-end 0)))
+                 (justify-current-line justify nil t))
+               (and (zerop (forward-line)) (bolp))))
+      (goto-char (point-min))
+      (back-to-indentation))))
+
+(provide 'evil-common)
+
+;;; evil-common.el ends here
diff --git a/elpa/evil-1.0.1/evil-core.el b/elpa/evil-1.0.1/evil-core.el
new file mode 100644
index 00000000..c3405034
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-core.el
@@ -0,0 +1,1082 @@
+;;; evil-core.el --- Core functionality
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Evil is defined as a globalized minor mode, enabled with the toggle
+;; function `evil-mode'.  This in turn enables `evil-local-mode' in
+;; every buffer, which sets up the buffer's state.
+;;
+;; Each state has its own keymaps, and these keymaps have status as
+;; "emulation keymaps" with priority over regular keymaps.  Emacs
+;; maintains the following keymap hierarchy (highest priority first):
+;;
+;;     * Overriding keymaps/overlay keymaps...
+;;     * Emulation mode keymaps...
+;;       - Evil keymaps...
+;;     * Minor mode keymaps...
+;;     * Local keymap (`local-set-key')
+;;     * Global keymap (`global-set-key')
+;;
+;; Within this hierarchy, Evil arranges the keymaps for the current
+;; state as shown below:
+;;
+;;     * Intercept keymaps...
+;;     * Local state keymap
+;;     * Auxiliary keymaps...
+;;     * Overriding keymaps...
+;;     * Global state keymap
+;;     * Keymaps for other states...
+;;
+;; These keymaps are listed in `evil-mode-map-alist', which is listed
+;; in `emulation-mode-map-alist'.
+;;
+;; Most of the key bindings for a state are stored in its global
+;; keymap, which has a name such as `evil-normal-state-map'.  (See the
+;; file evil-maps.el, which contains all the default key bindings.)
+;; A state also has a local keymap (`evil-normal-state-local-map'),
+;; which may contain user customizations for the current buffer.
+;; Furthermore, any Emacs mode may be assigned state bindings of its
+;; own by passing the mode's keymap to the function `evil-define-key'.
+;; These mode-specific bindings are ultimately stored in so-called
+;; auxiliary keymaps, which are sandwiched between the local keymap
+;; and the global keymap.  Finally, the state may also activate the
+;; keymaps of other states (e.g., Normal state inherits bindings
+;; from Motion state).
+;;
+;; For integration purposes, a regular Emacs keymap may be "elevated"
+;; to emulation status by passing it to `evil-make-intercept-map' or
+;; `evil-make-overriding-map'.  An "intercept" keymap has priority over
+;; all other Evil keymaps.  (Evil uses this facility when debugging and
+;; for handling the "ESC" key in the terminal.) More common is the
+;; "overriding" keymap, which only has priority over the global state
+;; keymap.  (This is useful for adapting key-heavy modes such as Dired,
+;; where all but a few keys should be left as-is and should not be
+;; shadowed by Evil's default bindings.)
+;;
+;; States are defined with the macro `evil-define-state', which
+;; creates a command for switching to the state.  This command,
+;; for example `evil-normal-state' for Normal state, performs
+;; the following tasks:
+;;
+;;     * Setting `evil-state' to the new state.
+;;     * Refreshing the keymaps in `evil-mode-map-alist'.
+;;     * Updating the mode line.
+;;       - Normal state depends on `evil-normal-state-tag'.
+;;     * Adjusting the cursor's appearance.
+;;       - Normal state depends on `evil-normal-state-cursor'.
+;;     * Displaying a message in the echo area.
+;;       - Normal state depends on `evil-normal-state-message'.
+;;     * Running hooks.
+;;       - Normal state runs `evil-normal-state-entry-hook' when
+;;         entering, and `evil-normal-state-exit-hook' when exiting.
+;;
+;; The various properties of a state can be accessed through their
+;; respective variables, or by passing a keyword and the state's name
+;; to the `evil-state-property' function.  Evil defines the states
+;; Normal state ("normal"), Insert state ("insert"), Visual state
+;; ("visual"), Replace state ("replace"), Operator-Pending state
+;; ("operator"), Motion state ("motion") and Emacs state ("emacs").
+
+(require 'evil-common)
+
+;;; Code:
+
+(define-minor-mode evil-local-mode
+  "Minor mode for setting up Evil in a single buffer."
+  :init-value nil
+  (cond
+   ((evil-disabled-buffer-p))
+   (evil-local-mode
+    (setq emulation-mode-map-alists
+          (evil-concat-lists '(evil-mode-map-alist)
+                             emulation-mode-map-alists))
+    (evil-initialize-local-keymaps)
+    ;; restore the proper value of `major-mode' in Fundamental buffers
+    (when (eq major-mode 'turn-on-evil-mode)
+      (setq major-mode 'fundamental-mode))
+    ;; The initial state is usually setup by `evil-initialize' when
+    ;; the major-mode in a buffer changes. This preliminary
+    ;; initialization is only for the case when `evil-local-mode' is
+    ;; called directly for the first time in a buffer.
+    (unless evil-state (evil-initialize-state))
+    (add-hook 'input-method-activate-hook #'evil-activate-input-method t t)
+    (add-hook 'input-method-deactivate-hook #'evil-deactivate-input-method t t)
+    (add-hook 'activate-mark-hook #'evil-visual-activate-hook nil t)
+    (add-hook 'pre-command-hook #'evil-repeat-pre-hook)
+    (add-hook 'pre-command-hook #'evil-jump-hook nil t)
+    (add-hook 'post-command-hook #'evil-repeat-post-hook)
+    (add-hook 'post-command-hook #'evil-refresh-cursor))
+   (t
+    (evil-refresh-mode-line)
+    (remove-hook 'pre-command-hook #'evil-jump-hook t)
+    (remove-hook 'activate-mark-hook #'evil-visual-activate-hook t)
+    (remove-hook 'input-method-activate-hook #'evil-activate-input-method t)
+    (remove-hook 'input-method-deactivate-hook #'evil-deactivate-input-method t)
+    (evil-change-state nil))))
+
+(defun turn-on-evil-mode (&optional arg)
+  "Turn on Evil in the current buffer."
+  (interactive)
+  (evil-local-mode (or arg 1)))
+
+(defun turn-off-evil-mode (&optional arg)
+  "Turn off Evil in the current buffer."
+  (interactive)
+  (evil-local-mode (or arg -1)))
+
+;; The function `evil-initialize' should only be used to initialize
+;; `evil-local-mode' from the globalized minor-mode `evil-mode'. It is
+;; called whenever evil is enabled in a buffer for the first time or
+;; when evil is active and the major-mode of the buffer changes. In
+;; addition to enabling `evil-local-mode' it also sets the initial
+;; evil-state according to the major-mode.
+(defun evil-initialize ()
+  "Enable Evil in the current buffer, if appropriate.
+To enable Evil globally, do (evil-mode 1)."
+  ;; TODO: option for enabling vi keys in the minibuffer
+  (unless (minibufferp)
+    (evil-local-mode 1)
+    (evil-initialize-state)))
+
+;;;###autoload (autoload 'evil-mode "evil" "Toggle evil in all buffers" t)
+(define-globalized-minor-mode evil-mode
+  evil-local-mode evil-initialize)
+
+;; No hooks are run in Fundamental buffers, so other measures are
+;; necessary to initialize Evil in these buffers. When Evil is
+;; enabled globally, the default value of `major-mode' is set to
+;; `turn-on-evil-mode', so that Evil is enabled in Fundamental
+;; buffers as well. Then, the buffer-local value of `major-mode' is
+;; changed back to `fundamental-mode'. (Since the `evil-mode' function
+;; is created by a macro, we use `defadvice' to augment it.)
+(defadvice evil-mode (after start-evil activate)
+  "Enable Evil in Fundamental mode."
+  (if evil-mode
+      (progn
+        ;; changed back by `evil-local-mode'
+        (setq-default major-mode 'turn-on-evil-mode)
+        (ad-enable-regexp "^evil")
+        (ad-activate-regexp "^evil"))
+    (setq-default major-mode 'fundamental-mode)
+    (ad-disable-regexp "^evil")
+    (ad-update-regexp "^evil")))
+
+(put 'evil-mode 'function-documentation
+     "Toggle Evil in all buffers.
+Enable with positive ARG and disable with negative ARG.
+See `evil-local-mode' to toggle Evil in the
+current buffer only.")
+
+(defun evil-change-state (state &optional message)
+  "Change the state to STATE.
+If STATE is nil, disable all states."
+  (let ((func (evil-state-property (or state evil-state) :toggle)))
+    (when (and (functionp func)
+               (or message (not (eq state evil-state))))
+      (funcall func (if state (and message 1) -1)))))
+
+(defmacro evil-save-state (&rest body)
+  "Save the current state; execute BODY; restore the state."
+  (declare (indent defun)
+           (debug t))
+  `(let* ((evil-state evil-state)
+          (evil-previous-state evil-previous-state)
+          (evil-previous-state-alist (copy-tree evil-previous-state-alist))
+          (evil-next-state evil-next-state)
+          (old-state evil-state)
+          (inhibit-quit t))
+     (unwind-protect
+         (progn ,@body)
+       (evil-change-state old-state))))
+
+(defmacro evil-with-state (state &rest body)
+  "Change to STATE and execute BODY without refreshing the display.
+Restore the previous state afterwards."
+  (declare (indent defun)
+           (debug t))
+  `(evil-without-display
+     (evil-save-state
+       (evil-change-state ',state)
+       ,@body)))
+
+(defun evil-initializing-p (&optional buffer)
+  "Whether Evil is in the process of being initialized."
+  (memq (or buffer (current-buffer)) evil-mode-buffers))
+
+(defun evil-initialize-state (&optional state buffer)
+  "Set up the initial state for BUFFER.
+BUFFER defaults to the current buffer.
+Uses STATE if specified, or calls `evil-initial-state-for-buffer'.
+See also `evil-set-initial-state'."
+  (with-current-buffer (or buffer (current-buffer))
+    (if state (evil-change-state state)
+      (evil-change-to-initial-state buffer))))
+(put 'evil-initialize-state 'permanent-local-hook t)
+
+(defun evil-initial-state-for-buffer-name (&optional name default)
+  "Return the initial Evil state to use for a buffer with name NAME.
+Matches the name against the regular expressions in
+`evil-buffer-regexps'. If none matches, returns DEFAULT."
+  (let ((name (if (stringp name) name (buffer-name name)))
+        regexp state)
+    (when (stringp name)
+      (catch 'done
+        (dolist (entry evil-buffer-regexps default)
+          (setq regexp (car entry)
+                state (cdr entry))
+          (when (string-match regexp name)
+            (throw 'done state)))))))
+
+(defun evil-disabled-buffer-p (&optional buffer)
+  "Whether Evil should be disabled in BUFFER."
+  (null (evil-initial-state-for-buffer-name buffer 'undefined)))
+
+(defun evil-initial-state-for-buffer (&optional buffer default)
+  "Return the initial Evil state to use for BUFFER.
+BUFFER defaults to the current buffer. Returns DEFAULT
+if no initial state is associated with BUFFER.
+See also `evil-initial-state'."
+  (with-current-buffer (or buffer (current-buffer))
+    (or (evil-initial-state-for-buffer-name (buffer-name))
+        (catch 'done
+          (dolist (mode minor-mode-map-alist)
+            (setq mode (car-safe mode))
+            (when (and (boundp mode) (symbol-value mode))
+              (when (setq mode (evil-initial-state mode))
+                (throw 'done mode)))))
+        (evil-initial-state major-mode)
+        default)))
+
+(defun evil-initial-state (mode &optional default)
+  "Return the Evil state to use for MODE.
+Returns DEFAULT if no initial state is associated with MODE.
+The initial state for a mode can be set with
+`evil-set-initial-state'."
+  (let (state modes)
+    (catch 'done
+      (dolist (entry (evil-state-property t :modes) default)
+        (setq state (car entry)
+              modes (symbol-value (cdr entry)))
+        (when (memq mode modes)
+          (throw 'done state))))))
+
+(defun evil-set-initial-state (mode state)
+  "Set the initial state for MODE to STATE.
+This is the state the buffer comes up in."
+  (dolist (modes (evil-state-property t :modes))
+    (setq modes (cdr-safe modes))
+    (set modes (delq mode (symbol-value modes))))
+  (when state
+    (add-to-list (evil-state-property state :modes) mode)))
+
+(evil-define-command evil-change-to-initial-state
+  (&optional buffer message)
+  "Change the state of BUFFER to its initial state.
+This is the state the buffer came up in."
+  :keep-visual t
+  :suppress-operator t
+  (with-current-buffer (or buffer (current-buffer))
+    (evil-change-state (evil-initial-state-for-buffer
+                        buffer (or evil-default-state 'normal))
+                       message)))
+
+(evil-define-command evil-change-to-previous-state
+  (&optional buffer message)
+  "Change the state of BUFFER to its previous state."
+  :keep-visual t
+  :repeat abort
+  :suppress-operator t
+  (with-current-buffer (or buffer (current-buffer))
+    (let ((prev-state evil-previous-state)
+          (prev-prev-state (cdr-safe (assoc evil-previous-state
+                                            evil-previous-state-alist))))
+      (evil-change-state nil)
+      (when prev-prev-state
+        (setq evil-previous-state prev-prev-state))
+      (evil-change-state (or prev-state evil-default-state 'normal)
+                         message))))
+
+;; When a buffer is created in a low-level way, it is invisible to
+;; Evil (as well as other globalized minor modes) because no hooks are
+;; run. This is appropriate since many buffers are used for throwaway
+;; purposes. Passing the buffer to `display-buffer' indicates
+;; otherwise, though, so advise this function to initialize Evil.
+(defadvice display-buffer (before evil activate)
+  "Initialize Evil in the displayed buffer."
+  (when evil-mode
+    (when (get-buffer (ad-get-arg 0))
+      (with-current-buffer (ad-get-arg 0)
+        (unless evil-local-mode
+          (evil-local-mode 1))))))
+
+(defadvice switch-to-buffer (before evil activate)
+  "Initialize Evil in the displayed buffer."
+  (when evil-mode
+    (let* ((arg0 (ad-get-arg 0))
+           (buffer (if arg0 (get-buffer arg0) (other-buffer))))
+      (when buffer
+        (with-current-buffer buffer
+          (unless evil-local-mode
+            (evil-local-mode 1)))))))
+
+(defun evil-generate-mode-line-tag (&optional state)
+  "Generate the evil mode-line tag for STATE."
+  (let ((tag (evil-state-property state :tag t)))
+    ;; prepare mode-line: add tooltip
+    (if (stringp tag)
+        (propertize tag
+                    'help-echo (evil-state-property state :name)
+                    'mouse-face 'mode-line-highlight)
+      tag)))
+
+(defun evil-refresh-mode-line (&optional state)
+  "Refresh mode line tag."
+  (when (listp mode-line-format)
+    (setq evil-mode-line-tag (evil-generate-mode-line-tag state))
+    ;; refresh mode line data structure
+    ;; first remove evil from mode-line
+    (setq mode-line-format (delq 'evil-mode-line-tag mode-line-format))
+    (let ((mlpos mode-line-format)
+          pred which where)
+      ;; determine before/after which symbol the tag should be placed
+      (cond
+       ((eq evil-mode-line-format 'before)
+        (setq where 'after which 'mode-line-position))
+       ((eq evil-mode-line-format 'after)
+        (setq where 'after which 'mode-line-modes))
+       ((consp evil-mode-line-format)
+        (setq where (car evil-mode-line-format)
+              which (cdr evil-mode-line-format))))
+      ;; find the cons-cell of the symbol before/after which the tag
+      ;; should be placed
+      (while (and mlpos
+                  (let ((sym (or (car-safe (car mlpos)) (car mlpos))))
+                    (not (eq which sym))))
+        (setq pred mlpos
+              mlpos (cdr mlpos)))
+      ;; put evil tag at the right position in the mode line
+      (cond
+       ((not mlpos)) ;; position not found, so do not add the tag
+       ((eq where 'before)
+        (if pred
+            (setcdr pred (cons 'evil-mode-line-tag mlpos))
+          (setq mode-line-format
+                (cons 'evil-mode-line-tag mode-line-format))))
+       ((eq where 'after)
+        (setcdr mlpos (cons 'evil-mode-line-tag (cdr mlpos)))))
+      (force-mode-line-update))))
+
+;; input methods should be disabled in non-insertion states
+(defun evil-activate-input-method ()
+  "Disable input method in states with :input-method nil."
+  (let (input-method-activate-hook
+        input-method-deactivate-hook)
+    (when (and evil-local-mode evil-state)
+      (setq evil-input-method current-input-method)
+      (unless (evil-state-property evil-state :input-method)
+        (deactivate-input-method)))))
+(put 'evil-activate-input-method 'permanent-local-hook t)
+
+(defun evil-deactivate-input-method ()
+  "Disable input method in states with :input-method nil."
+  (let (input-method-activate-hook
+        input-method-deactivate-hook)
+    (when (and evil-local-mode evil-state)
+      (setq evil-input-method nil))))
+(put 'evil-deactivate-input-method 'permanent-local-hook t)
+
+(defadvice toggle-input-method (around evil activate)
+  "Refresh `evil-input-method'."
+  (cond
+   ((not evil-local-mode)
+    ad-do-it)
+   ((evil-state-property evil-state :input-method)
+    ad-do-it)
+   (t
+    (let ((current-input-method evil-input-method))
+      ad-do-it))))
+
+;; Local keymaps are implemented using buffer-local variables.
+;; However, unless a buffer-local value already exists,
+;; `define-key' acts on the variable's default (global) value.
+;; So we need to initialize the variable whenever we enter a
+;; new buffer or when the buffer-local values are reset.
+(defun evil-initialize-local-keymaps ()
+  "Initialize a buffer-local value for local keymaps as necessary.
+The initial value is that of `make-sparse-keymap'."
+  (dolist (entry evil-local-keymaps-alist)
+    (let ((mode (car entry))
+          (map  (cdr entry)))
+      (unless (and (keymapp (symbol-value map))
+                   (assq map (buffer-local-variables)))
+        (set map (make-sparse-keymap))))))
+
+(defun evil-make-overriding-map (keymap &optional state copy)
+  "Give KEYMAP precedence over the global keymap of STATE.
+The keymap will have lower precedence than custom STATE bindings.
+If STATE is nil, give it precedence over all states.
+If COPY is t, create a copy of KEYMAP and give that
+higher precedence. See also `evil-make-intercept-map'."
+  (let ((key [override-state]))
+    (if (not copy)
+        (define-key keymap key (or state 'all))
+      (unless (keymapp copy)
+        (setq copy (assq-delete-all 'menu-bar (copy-keymap keymap))))
+      (define-key copy key (or state 'all))
+      (define-key keymap key copy))))
+
+(defun evil-make-intercept-map (keymap &optional state)
+  "Give KEYMAP precedence over all Evil keymaps in STATE.
+If STATE is nil, give it precedence over all states.
+See also `evil-make-overriding-map'."
+  (let ((key [intercept-state]))
+    (define-key keymap key (or state 'all))))
+
+(defmacro evil-define-keymap (keymap doc &rest body)
+  "Define a keymap KEYMAP listed in `evil-mode-map-alist'.
+That means it will have precedence over regular keymaps.
+
+DOC is the documentation for the variable. BODY, if specified,
+is executed after toggling the mode. Optional keyword arguments
+may be specified before the body code:
+
+:mode VAR       Mode variable. If unspecified, the variable
+                is based on the keymap name.
+:local BOOLEAN  Whether the keymap should be buffer-local, that is,
+                reinitialized for each buffer.
+:func BOOLEAN   Create a toggle function even if BODY is empty.
+
+\(fn KEYMAP DOC [[KEY VAL]...] BODY...)"
+  (declare (indent defun)
+           (debug (&define name
+                           [&optional stringp]
+                           [&rest [keywordp sexp]]
+                           def-body)))
+  (let ((func t)
+        arg intercept key local mode overriding)
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            arg (pop body))
+      (cond
+       ((eq key :mode)
+        (setq mode arg))
+       ((eq key :local)
+        (setq local arg))
+       ((eq key :func)
+        (setq func arg))
+       ((eq key :intercept)
+        (setq intercept arg))
+       ((eq key :overriding)
+        (setq overriding arg))))
+    (setq mode (or mode
+                   (intern (replace-regexp-in-string
+                            "\\(?:-\\(?:mode-\\)?\\(?:key\\)?map\\)?$"
+                            "-mode"
+                            (symbol-name keymap)))))
+    `(progn
+       (defvar ,keymap ,(unless local '(make-sparse-keymap)))
+       (unless (get ',keymap 'variable-documentation)
+         (put ',keymap 'variable-documentation ,doc))
+       (defvar ,mode nil)
+       (unless (get ',mode 'variable-documentation)
+         (put ',mode 'variable-documentation ,doc))
+       (make-variable-buffer-local ',mode)
+       (put ',mode 'permanent-local t)
+       (when ,intercept
+         (evil-make-intercept-map ,keymap))
+       (when ,overriding
+         (evil-make-overriding-map ,keymap))
+       ,@(if local
+             `((make-variable-buffer-local ',keymap)
+               (put ',keymap 'permanent-local t)
+               (evil-add-to-alist 'evil-local-keymaps-alist
+                                  ',mode ',keymap))
+           `((evil-add-to-alist 'evil-global-keymaps-alist
+                                ',mode ',keymap)
+             (evil-add-to-alist 'evil-mode-map-alist
+                                ',mode ,keymap)))
+       ,(when (or body func)
+          `(defun ,mode (&optional arg)
+             ,@(when doc `(,doc))
+             (interactive)
+             (cond
+              ((numberp arg)
+               (setq ,mode (> arg 0)))
+              (t
+               (setq ,mode (not ,mode))))
+             ,@body))
+       ',keymap)))
+
+;; Intercept the ESC event when running in the terminal. This allows
+;; keys that use "ESC" as a prefix key, such as "M-x". If "ESC" is
+;; immediately followed by another key, or another key is pressed
+;; within `evil-esc-delay', the prefixed key sequence is sent.
+;; Otherwise only [escape] is sent.
+(evil-define-keymap evil-esc-map
+  "Keymap for intercepting ESC."
+  :intercept t)
+
+(defun evil-turn-on-esc-mode ()
+  "Enable interception of ESC."
+  (unless (eq this-command #'evil-esc)
+    (evil-esc-mode 1)
+    (remove-hook 'pre-command-hook #'evil-turn-on-esc-mode t)))
+(put 'evil-turn-on-esc-mode 'permanent-local-hook t)
+
+;; `evil-esc' is bound to (kbd "ESC"), while other commands
+;; are bound to [escape]. That way `evil-esc' is used only when
+;; (kbd "ESC") and [escape] are the same event -- i.e., when
+;; running Emacs in the terminal.
+(define-key evil-esc-map (kbd "ESC") 'evil-esc)
+
+(defun evil-state-p (sym)
+  "Whether SYM is the name of a state."
+  (assq sym evil-state-properties))
+
+(defun evil-state-keymaps (state &rest excluded)
+  "Return a keymap alist of keymaps activated by STATE.
+If STATE references other states in its :enable property,
+these states are recursively processed and added to the list.
+\(The EXCLUDED argument is an internal safeguard against
+infinite recursion, keeping track of processed states.)"
+  (let* ((state (or state evil-state))
+         (enable (evil-state-property state :enable))
+         (map (cons
+               (evil-state-property state :mode)
+               (evil-state-property state :keymap t)))
+         (local-map (cons
+                     (evil-state-property state :local)
+                     (evil-state-property state :local-keymap t)))
+         (aux-maps (evil-state-auxiliary-keymaps state))
+         (overriding-maps
+          (evil-state-overriding-keymaps state))
+         (intercept-maps
+          (evil-state-intercept-keymaps state))
+         (result `(,intercept-maps))
+         (remove-duplicates (null excluded)))
+    (unless (memq state enable)
+      (setq enable (cons state enable)))
+    ;; process STATE's :enable property
+    (dolist (entry enable)
+      (cond
+       ((memq entry excluded))
+       ;; the keymaps for STATE
+       ((eq entry state)
+        (setq result `(,@result
+                       (,local-map)
+                       ,aux-maps
+                       ,overriding-maps
+                       (,map)))
+        (push state excluded))
+       ;; the keymaps for another state: call `evil-state-keymaps'
+       ;; recursively, but keep track of processed states
+       ((evil-state-p entry)
+        (setq result `(,@result
+                       ,(apply #'evil-state-keymaps entry excluded))))
+       ;; a single keymap
+       ((or (keymapp entry)
+            (and (keymapp (symbol-value entry))
+                 (setq entry (symbol-value entry)))
+            (setq entry (evil-keymap-for-mode entry)))
+        (setq result `(,@result
+                       ((,(evil-mode-for-keymap entry t) .
+                         ,entry)))))))
+    ;; postpone the expensive filtering of duplicates to the top level
+    (if remove-duplicates
+        (apply #'evil-concat-keymap-alists result)
+      (apply #'append result))))
+
+(defun evil-normalize-keymaps (&optional state)
+  "Create a buffer-local value for `evil-mode-map-alist'.
+This is a keymap alist, determined by the current state
+\(or by STATE if specified)."
+  (let ((state (or state evil-state))
+        (excluded '(nil t))
+        map mode temp)
+    ;; initialize buffer-local keymaps as necessary
+    (evil-initialize-local-keymaps)
+    ;; deactivate keymaps of previous state
+    (dolist (entry evil-mode-map-alist)
+      (setq mode (car-safe entry)
+            map (cdr-safe entry))
+      ;; don't deactivate overriding keymaps;
+      ;; they are toggled by their associated mode
+      (if (or (memq mode excluded)
+              (evil-intercept-keymap-p map)
+              (evil-overriding-keymap-p map)
+              (evil-auxiliary-keymap-p map))
+          (push mode excluded)
+        (when (and (fboundp mode) (symbol-value mode))
+          (funcall mode -1))
+        (set mode nil)))
+    (setq evil-mode-map-alist nil)
+    ;; activate keymaps of current state
+    (when state
+      (setq temp (evil-state-keymaps state))
+      (dolist (entry temp)
+        (setq mode (car entry)
+              map (cdr entry))
+        (unless (and (boundp mode) (symbol-value mode))
+          (when (fboundp mode)
+            (funcall mode 1))
+          (set mode t))
+        ;; refresh the keymap in case it has changed
+        ;; (e.g., `evil-operator-shortcut-map' is
+        ;; reset on toggling)
+        (if (or (memq mode excluded)
+                (evil-intercept-keymap-p map)
+                (evil-overriding-keymap-p map)
+                (evil-auxiliary-keymap-p map))
+            (push mode excluded)
+          (setcdr entry (or (evil-keymap-for-mode mode) map))))
+      ;; update `evil-mode-map-alist'
+      (setq evil-mode-map-alist temp))))
+
+(defun evil-mode-for-keymap (keymap &optional default)
+  "Return the minor mode associated with KEYMAP.
+Returns DEFAULT if no mode is found.
+See also `evil-keymap-for-mode'."
+  (let ((map (if (keymapp keymap) keymap (symbol-value keymap)))
+        (var (when (symbolp keymap) keymap)))
+    ;; Check Evil variables first for speed purposes.
+    ;; If all else fails, check `minor-mode-map-alist'.
+    (or (when var
+          (or (car (rassq var evil-global-keymaps-alist))
+              (car (rassq var evil-local-keymaps-alist))))
+        (car (rassq map (mapcar #'(lambda (e)
+                                    ;; from (MODE-VAR . MAP-VAR)
+                                    ;; to (MODE-VAR . MAP)
+                                    (cons (car-safe e)
+                                          (symbol-value (cdr-safe e))))
+                                (append evil-global-keymaps-alist
+                                        evil-local-keymaps-alist))))
+        (car (rassq map minor-mode-map-alist))
+        default)))
+
+(defun evil-keymap-for-mode (mode &optional variable)
+  "Return the keymap associated with MODE.
+Return the keymap variable if VARIABLE is non-nil.
+See also `evil-mode-for-keymap'."
+  (let* ((var (or (cdr (assq mode evil-global-keymaps-alist))
+                  (cdr (assq mode evil-local-keymaps-alist))))
+         (map (or (symbol-value var)
+                  (cdr (assq mode minor-mode-map-alist)))))
+    (if variable var map)))
+
+(defun evil-state-auxiliary-keymaps (state)
+  "Return a keymap alist of auxiliary keymaps for STATE."
+  (let ((state (or state evil-state))
+        aux result)
+    (dolist (map (current-active-maps) result)
+      (when (setq aux (evil-get-auxiliary-keymap map state))
+        (push (cons (evil-mode-for-keymap map t) aux) result)))
+    (nreverse result)))
+
+(defun evil-state-overriding-keymaps (&optional state)
+  "Return a keymap alist of overriding keymaps for STATE."
+  (let* ((state (or state evil-state))
+         result)
+    (dolist (map (current-active-maps))
+      (when (setq map (evil-overriding-keymap-p map state))
+        (push (cons (evil-mode-for-keymap map t) map) result)))
+    (nreverse result)))
+
+(defun evil-state-intercept-keymaps (&optional state)
+  "Return a keymap alist of intercept keymaps for STATE."
+  (let* ((state (or state evil-state))
+         result)
+    (dolist (map (current-active-maps))
+      (when (setq map (evil-intercept-keymap-p map state))
+        (push (cons (evil-mode-for-keymap map t) map) result)))
+    (setq result (nreverse result))
+    (add-to-list 'result `(evil-esc-mode . ,evil-esc-map))
+    result))
+
+(defun evil-set-auxiliary-keymap (map state &optional aux)
+  "Set the auxiliary keymap for MAP in STATE to AUX.
+If AUX is nil, create a new auxiliary keymap."
+  (unless (keymapp aux)
+    (setq aux (make-sparse-keymap)))
+  (unless (evil-auxiliary-keymap-p aux)
+    (evil-set-keymap-prompt
+     aux (format "Auxiliary keymap for %s"
+                 (or (evil-state-property state :name)
+                     (format "%s state" state)))))
+  (define-key map
+    (vconcat (list (intern (format "%s-state" state)))) aux)
+  aux)
+(put 'evil-set-auxiliary-keymap 'lisp-indent-function 'defun)
+
+(defun evil-get-auxiliary-keymap (map state &optional create)
+  "Get the auxiliary keymap for MAP in STATE.
+If CREATE is non-nil, create an auxiliary keymap
+if MAP does not have one."
+  (when state
+    (let* ((key (vconcat (list (intern (format "%s-state" state)))))
+           (aux (if state (lookup-key map key) map)))
+      (cond
+       ((evil-auxiliary-keymap-p aux)
+        aux)
+       (create
+        (evil-set-auxiliary-keymap map state))))))
+
+(defun evil-auxiliary-keymap-p (map)
+  "Whether MAP is an auxiliary keymap."
+  (and (keymapp map)
+       (string-match "Auxiliary keymap"
+                     (or (keymap-prompt map) "")) t))
+
+(defun evil-intercept-keymap-p (map &optional state)
+  "Whether MAP is an intercept keymap for STATE.
+If STATE is nil, it means any state."
+  (let ((entry (and (keymapp map)
+                    (lookup-key map [intercept-state]))))
+    (cond
+     ((null entry)
+      nil)
+     ((null state)
+      map)
+     ((eq entry state)
+      map)
+     ((eq entry 'all)
+      map))))
+
+(defun evil-overriding-keymap-p (map &optional state)
+  "Whether MAP is an overriding keymap for STATE.
+If STATE is nil, it means any state."
+  (let ((entry (and (keymapp map)
+                    (lookup-key map [override-state]))))
+    (cond
+     ((null entry)
+      nil)
+     ((keymapp entry)
+      (evil-overriding-keymap-p entry state))
+     ((null state)
+      map)
+     ((eq entry state)
+      map)
+     ((eq entry 'all)
+      map))))
+
+(defun evil-intercept-keymap-state (map)
+  "Return the state for the intercept keymap MAP.
+A return value of t means all states."
+  (let ((state (lookup-key map [intercept-state] map)))
+    (cond
+     ((keymapp state)
+      (evil-intercept-keymap-state state))
+     ((eq state 'all)
+      t)
+     (t
+      state))))
+
+(defun evil-overriding-keymap-state (map)
+  "Return the state for the overriding keymap MAP.
+A return value of t means all states."
+  (let ((state (lookup-key map [override-state] map)))
+    (cond
+     ((keymapp state)
+      (evil-overriding-keymap-state state))
+     ((eq state 'all)
+      t)
+     (t
+      state))))
+
+(defmacro evil-define-key (state keymap key def &rest bindings)
+  "Create a STATE binding from KEY to DEF for KEYMAP.
+STATE is one of `normal', `insert', `visual', `replace',
+`operator', `motion' and `emacs'. The remaining arguments
+are like those of `define-key'. For example:
+
+    (evil-define-key 'normal foo-map \"a\" 'bar)
+
+This creates a binding from \"a\" to `bar' in Normal state,
+which is active whenever `foo-map' is active. It is possible
+to specify multiple bindings at once:
+
+    (evil-define-key 'normal foo-map
+      \"a\" 'bar
+      \"b\" 'foo)
+
+If foo-map has not been initialized yet, this macro adds an entry
+to `after-load-functions', delaying execution as necessary."
+  (declare (indent defun))
+  `(evil-delay ',(if (symbolp keymap)
+                     `(and (boundp ',keymap) (keymapp ,keymap))
+                   `(keymapp ,keymap))
+       '(let* ((state ,state) (keymap ,keymap) (key ,key) (def ,def)
+               (bindings (list ,@bindings)) aux)
+          (if state
+              (setq aux (evil-get-auxiliary-keymap keymap state t))
+            (setq aux keymap))
+          (while key
+            (define-key aux key def)
+            (setq key (pop bindings)
+                  def (pop bindings)))
+          ;; ensure the prompt string comes first
+          (evil-set-keymap-prompt aux (keymap-prompt aux)))
+     'after-load-functions t nil
+     (format "evil-define-key-in-%s"
+             ',(if (symbolp keymap) keymap 'keymap))))
+(defalias 'evil-declare-key 'evil-define-key)
+
+(defmacro evil-add-hjkl-bindings (keymap &optional state &rest bindings)
+  "Add \"h\", \"j\", \"k\", \"l\" bindings to KEYMAP in STATE.
+Add additional BINDINGS if specified."
+  (declare (indent defun))
+  `(evil-define-key ,state ,keymap
+     "h" (lookup-key evil-motion-state-map "h")
+     "j" (lookup-key evil-motion-state-map "j")
+     "k" (lookup-key evil-motion-state-map "k")
+     "l" (lookup-key evil-motion-state-map "l")
+     ":" (lookup-key evil-motion-state-map ":")
+     ,@bindings))
+
+;; may be useful for programmatic purposes
+(defun evil-global-set-key (state key def)
+  "Bind KEY to DEF in STATE."
+  (define-key (evil-state-property state :keymap t) key def))
+
+(defun evil-local-set-key (state key def)
+  "Bind KEY to DEF in STATE in the current buffer."
+  (define-key (evil-state-property state :local-keymap t) key def))
+
+;; Advise these functions as they may activate an overriding keymap or
+;; a keymap with state bindings; if so, refresh `evil-mode-map-alist'.
+(defadvice use-global-map (after evil activate)
+  "Refresh Evil keymaps."
+  (evil-normalize-keymaps))
+
+(defadvice use-local-map (after evil activate)
+  "Refresh Evil keymaps."
+  (evil-normalize-keymaps))
+
+(defmacro evil-define-state (state doc &rest body)
+  "Define an Evil state STATE.
+DOC is a general description and shows up in all docstrings;
+the first line of the string should be the full name of the state.
+Then follows one or more optional keywords:
+
+:tag STRING             Mode line indicator.
+:message STRING         Echo area message when changing to STATE.
+:cursor SPEC            Cursor to use in STATE.
+:entry-hook LIST        Hooks run when changing to STATE.
+:exit-hook LIST         Hooks run when changing from STATE.
+:enable LIST            List of other states and modes enabled by STATE.
+:suppress-keymap FLAG   If FLAG is non-nil, makes `evil-suppress-map'
+                        the parent of the global map of STATE,
+                        effectively disabling bindings to
+                        `self-insert-command'.
+
+Following the keywords is optional code to be executed each time
+the state is enabled or disabled. For example:
+
+    (evil-define-state test
+      \"Test state.\"
+      :tag \"<T> \"
+      (setq test-var t))
+
+The global keymap of this state will be `evil-test-state-map',
+the local keymap will be `evil-test-state-local-map', and so on.
+
+\(fn STATE DOC [[KEY VAL]...] BODY...)"
+  (declare (indent defun)
+           (debug (&define name
+                           [&optional stringp]
+                           [&rest [keywordp sexp]]
+                           def-body)))
+  (let* ((name (and (string-match "^\\(.+\\)\\(\\(?:.\\|\n\\)*\\)" doc)
+                    (match-string 1 doc)))
+         (doc (match-string 2 doc))
+         (name (and (string-match "^\\(.+?\\)\\.?$" name)
+                    (match-string 1 name)))
+         (doc (if (or (null doc) (string= doc "")) ""
+                (format "\n%s" doc)))
+         (toggle (intern (format "evil-%s-state" state)))
+         (mode (intern (format "%s-minor-mode" toggle)))
+         (keymap (intern (format "%s-map" toggle)))
+         (local (intern (format "%s-local-minor-mode" toggle)))
+         (local-keymap (intern (format "%s-local-map" toggle)))
+         (tag (intern (format "%s-tag" toggle)))
+         (message (intern (format "%s-message" toggle)))
+         (cursor (intern (format "%s-cursor" toggle)))
+         (entry-hook (intern (format "%s-entry-hook" toggle)))
+         (exit-hook (intern (format "%s-exit-hook" toggle)))
+         (modes (intern (format "%s-modes" toggle)))
+         (predicate (intern (format "%s-p" toggle)))
+         (intercept-esc t)
+         arg cursor-value enable entry-hook-value exit-hook-value
+         input-method key message-value suppress-keymap tag-value)
+    ;; collect keywords
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            arg (pop body))
+      (cond
+       ((eq key :tag)
+        (setq tag-value arg))
+       ((eq key :message)
+        (setq message-value arg))
+       ((eq key :cursor)
+        (setq cursor-value arg))
+       ((eq key :entry-hook)
+        (setq entry-hook-value arg)
+        (unless (listp entry-hook-value)
+          (setq entry-hook-value (list entry-hook-value))))
+       ((eq key :exit-hook)
+        (setq exit-hook-value arg)
+        (unless (listp exit-hook-value)
+          (setq exit-hook-value (list entry-hook-value))))
+       ((eq key :enable)
+        (setq enable arg))
+       ((eq key :input-method)
+        (setq input-method arg))
+       ((eq key :intercept-esc)
+        (setq intercept-esc arg))
+       ((eq key :suppress-keymap)
+        (setq suppress-keymap arg))))
+
+    ;; macro expansion
+    `(progn
+       ;; Save the state's properties in `evil-state-properties' for
+       ;; runtime lookup. Among other things, this information is used
+       ;; to determine what keymaps should be activated by the state
+       ;; (and, when processing :enable, what keymaps are activated by
+       ;; other states). We cannot know this at compile time because
+       ;; it depends on the current buffer and its active keymaps
+       ;; (to which we may have assigned state bindings), as well as
+       ;; states whose definitions may not have been processed yet.
+       (evil-put-property
+        'evil-state-properties ',state
+        :name ',name
+        :toggle ',toggle
+        :mode (defvar ,mode nil
+                ,(format "Non-nil if %s is enabled.
+Use the command `%s' to change this variable." name toggle))
+        :keymap (defvar ,keymap (make-sparse-keymap)
+                  ,(format "Keymap for %s." name))
+        :local (defvar ,local nil
+                 ,(format "Non-nil if %s is enabled.
+Use the command `%s' to change this variable." name toggle))
+        :local-keymap (defvar ,local-keymap nil
+                        ,(format "Buffer-local keymap for %s." name))
+        :tag (defvar ,tag ,tag-value
+               ,(format "Mode line tag for %s." name))
+        :message (defvar ,message ,message-value
+                   ,(format "Echo area message for %s." name))
+        :cursor (defvar ,cursor ',cursor-value
+                  ,(format "Cursor for %s.
+May be a cursor type as per `cursor-type', a color string as passed
+to `set-cursor-color', a zero-argument function for changing the
+cursor, or a list of the above." name))
+        :entry-hook (defvar ,entry-hook nil
+                      ,(format "Hooks to run when entering %s." name))
+        :exit-hook (defvar ,exit-hook nil
+                     ,(format "Hooks to run when exiting %s." name))
+        :modes (defvar ,modes nil
+                 ,(format "Modes that should come up in %s." name))
+        :input-method ',input-method
+        :predicate ',predicate
+        :enable ',enable)
+
+       ,@(when suppress-keymap
+           `((set-keymap-parent ,keymap evil-suppress-map)))
+
+       (dolist (func ',entry-hook-value)
+         (add-hook ',entry-hook func))
+
+       (dolist (func ',exit-hook-value)
+         (add-hook ',exit-hook func))
+
+       (defun ,predicate (&optional state)
+         ,(format "Whether the current state is %s.
+\(That is, whether `evil-state' is `%s'.)" name state)
+         (and evil-local-mode
+              (eq (or state evil-state) ',state)))
+
+       ;; define state function
+       (defun ,toggle (&optional arg)
+         ,(format "Enable %s. Disable with negative ARG.
+If ARG is nil, don't display a message in the echo area.%s" name doc)
+         (interactive "p")
+         (cond
+          ((and (numberp arg) (< arg 1))
+           (setq evil-previous-state evil-state
+                 evil-state nil)
+           (let ((evil-state ',state))
+             (run-hooks ',exit-hook)
+             (setq evil-state nil)
+             (evil-esc-mode -1)
+             (evil-normalize-keymaps)
+             ,@body))
+          (t
+           (unless evil-local-mode
+             (evil-local-mode 1))
+           (let ((evil-next-state ',state)
+                 input-method-activate-hook
+                 input-method-deactivate-hook)
+             (evil-change-state nil)
+             (setq evil-state ',state)
+             (evil-add-to-alist 'evil-previous-state-alist
+                                ',state evil-previous-state)
+             (let ((evil-state ',state))
+               (evil-normalize-keymaps)
+               (if ,intercept-esc
+                   (evil-esc-mode 1)
+                 (evil-esc-mode -1))
+               (if ',input-method
+                   (activate-input-method evil-input-method)
+                 (deactivate-input-method))
+               (unless evil-no-display
+                 (evil-refresh-cursor ',state)
+                 (evil-refresh-mode-line ',state)
+                 (when (evil-called-interactively-p)
+                   (redisplay)))
+               ,@body
+               (run-hooks ',entry-hook)
+               (when (and evil-echo-state
+                          arg (not evil-no-display) ,message)
+                 (if (functionp ,message)
+                     (funcall ,message)
+                   (evil-echo "%s" ,message))))))))
+
+       (evil-set-command-property ',toggle :keep-visual t)
+       (evil-set-command-property ',toggle :suppress-operator t)
+
+       (evil-define-keymap ,keymap nil
+         :mode ,mode
+         :func nil)
+
+       (evil-define-keymap ,local-keymap nil
+         :mode ,local
+         :local t
+         :func nil)
+
+       ',state)))
+
+(provide 'evil-core)
+
+;;; evil-core.el ends here
diff --git a/elpa/evil-1.0.1/evil-digraphs.el b/elpa/evil-1.0.1/evil-digraphs.el
new file mode 100644
index 00000000..1266f446
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-digraphs.el
@@ -0,0 +1,1729 @@
+;;; evil-digraphs.el --- Digraphs
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-vars)
+
+;;; Code:
+
+(defgroup evil-digraphs nil
+  "Digraph support based on RFC 1345."
+  :group 'evil
+  :prefix "evil-digraph-")
+
+(defcustom evil-digraphs-table-user nil
+  "List of user-defined digraphs.
+Entries have the form ((?CHAR1 ?CHAR2) . ?DIGRAPH).  That is,
+a cons cell of the digraph and its character replacement,
+where the digraph is a list of two characters.
+See also `evil-digraphs-table'."
+  :type '(alist :key-type (list character character)
+                :value-type character)
+  :require 'evil-digraphs
+  :group 'evil-digraphs)
+
+(defconst evil-digraphs-table
+  '(((?N ?U) . ?\x00)
+    ((?S ?H) . ?\x01)
+    ((?S ?X) . ?\x02)
+    ((?E ?X) . ?\x03)
+    ((?E ?T) . ?\x04)
+    ((?E ?Q) . ?\x05)
+    ((?A ?K) . ?\x06)
+    ((?B ?L) . ?\x07)
+    ((?B ?S) . ?\x08)
+    ((?H ?T) . ?\x09)
+    ((?L ?F) . ?\x0a)
+    ((?V ?T) . ?\x0b)
+    ((?F ?F) . ?\x0c)
+    ((?C ?R) . ?\x0d)
+    ((?S ?O) . ?\x0e)
+    ((?S ?I) . ?\x0f)
+    ((?D ?L) . ?\x10)
+    ((?D ?1) . ?\x11)
+    ((?D ?2) . ?\x12)
+    ((?D ?3) . ?\x13)
+    ((?D ?4) . ?\x14)
+    ((?N ?K) . ?\x15)
+    ((?S ?Y) . ?\x16)
+    ((?E ?B) . ?\x17)
+    ((?C ?N) . ?\x18)
+    ((?E ?M) . ?\x19)
+    ((?S ?B) . ?\x1a)
+    ((?E ?C) . ?\x1b)
+    ((?F ?S) . ?\x1c)
+    ((?G ?S) . ?\x1d)
+    ((?R ?S) . ?\x1e)
+    ((?U ?S) . ?\x1f)
+    ((?S ?P) . ?\x20)
+    ((?N ?b) . ?\x23)
+    ((?D ?O) . ?\x24)
+    ((?A ?t) . ?\x40)
+    ((?< ?\() . ?\x5b)
+    ((?/ ?/) . ?\x5c)
+    ((?\) ?>) . ?\x5d)
+    ((?' ?>) . ?\x5e)
+    ((?' ?!) . ?\x60)
+    ((?\( ?!) . ?\x7b)
+    ((?! ?!) . ?\x7c)
+    ((?! ?\)) . ?\x7d)
+    ((?' ??) . ?\x7e)
+    ((?D ?T) . ?\x7f)
+    ((?P ?A) . ?\x80)
+    ((?H ?O) . ?\x81)
+    ((?B ?H) . ?\x82)
+    ((?N ?H) . ?\x83)
+    ((?I ?N) . ?\x84)
+    ((?N ?L) . ?\x85)
+    ((?S ?A) . ?\x86)
+    ((?E ?S) . ?\x87)
+    ((?H ?S) . ?\x88)
+    ((?H ?J) . ?\x89)
+    ((?V ?S) . ?\x8a)
+    ((?P ?D) . ?\x8b)
+    ((?P ?U) . ?\x8c)
+    ((?R ?I) . ?\x8d)
+    ((?S ?2) . ?\x8e)
+    ((?S ?3) . ?\x8f)
+    ((?D ?C) . ?\x90)
+    ((?P ?1) . ?\x91)
+    ((?P ?2) . ?\x92)
+    ((?T ?S) . ?\x93)
+    ((?C ?C) . ?\x94)
+    ((?M ?W) . ?\x95)
+    ((?S ?G) . ?\x96)
+    ((?E ?G) . ?\x97)
+    ((?S ?S) . ?\x98)
+    ((?G ?C) . ?\x99)
+    ((?S ?C) . ?\x9a)
+    ((?C ?I) . ?\x9b)
+    ((?S ?T) . ?\x9c)
+    ((?O ?C) . ?\x9d)
+    ((?P ?M) . ?\x9e)
+    ((?A ?C) . ?\x9f)
+    ((?N ?S) . ?\xa0)
+    ((?! ?I) . ?\xa1)
+    ((?C ?t) . ?\xa2)
+    ((?P ?d) . ?\xa3)
+    ((?C ?u) . ?\xa4)
+    ((?Y ?e) . ?\xa5)
+    ((?B ?B) . ?\xa6)
+    ((?S ?E) . ?\xa7)
+    ((?' ?:) . ?\xa8)
+    ((?C ?o) . ?\xa9)
+    ((?- ?a) . ?\xaa)
+    ((?< ?<) . ?\xab)
+    ((?N ?O) . ?\xac)
+    ((?- ?-) . ?\xad)
+    ((?R ?g) . ?\xae)
+    ((?' ?m) . ?\xaf)
+    ((?D ?G) . ?\xb0)
+    ((?+ ?-) . ?\xb1)
+    ((?2 ?S) . ?\xb2)
+    ((?3 ?S) . ?\xb3)
+    ((?' ?') . ?\xb4)
+    ((?M ?y) . ?\xb5)
+    ((?P ?I) . ?\xb6)
+    ((?. ?M) . ?\xb7)
+    ((?' ?,) . ?\xb8)
+    ((?1 ?S) . ?\xb9)
+    ((?- ?o) . ?\xba)
+    ((?> ?>) . ?\xbb)
+    ((?1 ?4) . ?\xbc)
+    ((?1 ?2) . ?\xbd)
+    ((?3 ?4) . ?\xbe)
+    ((?? ?I) . ?\xbf)
+    ((?A ?!) . ?\xc0)
+    ((?A ?') . ?\xc1)
+    ((?A ?>) . ?\xc2)
+    ((?A ??) . ?\xc3)
+    ((?A ?:) . ?\xc4)
+    ((?A ?A) . ?\xc5)
+    ((?A ?E) . ?\xc6)
+    ((?C ?,) . ?\xc7)
+    ((?E ?!) . ?\xc8)
+    ((?E ?') . ?\xc9)
+    ((?E ?>) . ?\xca)
+    ((?E ?:) . ?\xcb)
+    ((?I ?!) . ?\xcc)
+    ((?I ?') . ?\xcd)
+    ((?I ?>) . ?\xce)
+    ((?I ?:) . ?\xcf)
+    ((?D ?-) . ?\xd0)
+    ((?N ??) . ?\xd1)
+    ((?O ?!) . ?\xd2)
+    ((?O ?') . ?\xd3)
+    ((?O ?>) . ?\xd4)
+    ((?O ??) . ?\xd5)
+    ((?O ?:) . ?\xd6)
+    ((?* ?X) . ?\xd7)
+    ((?O ?/) . ?\xd8)
+    ((?U ?!) . ?\xd9)
+    ((?U ?') . ?\xda)
+    ((?U ?>) . ?\xdb)
+    ((?U ?:) . ?\xdc)
+    ((?Y ?') . ?\xdd)
+    ((?T ?H) . ?\xde)
+    ((?s ?s) . ?\xdf)
+    ((?a ?!) . ?\xe0)
+    ((?a ?') . ?\xe1)
+    ((?a ?>) . ?\xe2)
+    ((?a ??) . ?\xe3)
+    ((?a ?:) . ?\xe4)
+    ((?a ?a) . ?\xe5)
+    ((?a ?e) . ?\xe6)
+    ((?c ?,) . ?\xe7)
+    ((?e ?!) . ?\xe8)
+    ((?e ?') . ?\xe9)
+    ((?e ?>) . ?\xea)
+    ((?e ?:) . ?\xeb)
+    ((?i ?!) . ?\xec)
+    ((?i ?') . ?\xed)
+    ((?i ?>) . ?\xee)
+    ((?i ?:) . ?\xef)
+    ((?d ?-) . ?\xf0)
+    ((?n ??) . ?\xf1)
+    ((?o ?!) . ?\xf2)
+    ((?o ?') . ?\xf3)
+    ((?o ?>) . ?\xf4)
+    ((?o ??) . ?\xf5)
+    ((?o ?:) . ?\xf6)
+    ((?- ?:) . ?\xf7)
+    ((?o ?/) . ?\xf8)
+    ((?u ?!) . ?\xf9)
+    ((?u ?') . ?\xfa)
+    ((?u ?>) . ?\xfb)
+    ((?u ?:) . ?\xfc)
+    ((?y ?') . ?\xfd)
+    ((?t ?h) . ?\xfe)
+    ((?y ?:) . ?\xff)
+    ((?A ?-) . ?\x0100)
+    ((?a ?-) . ?\x0101)
+    ((?A ?\() . ?\x0102)
+    ((?a ?\() . ?\x0103)
+    ((?A ?\;) . ?\x0104)
+    ((?a ?\;) . ?\x0105)
+    ((?C ?') . ?\x0106)
+    ((?c ?') . ?\x0107)
+    ((?C ?>) . ?\x0108)
+    ((?c ?>) . ?\x0109)
+    ((?C ?.) . ?\x010a)
+    ((?c ?.) . ?\x010b)
+    ((?C ?<) . ?\x010c)
+    ((?c ?<) . ?\x010d)
+    ((?D ?<) . ?\x010e)
+    ((?d ?<) . ?\x010f)
+    ((?D ?/) . ?\x0110)
+    ((?d ?/) . ?\x0111)
+    ((?E ?-) . ?\x0112)
+    ((?e ?-) . ?\x0113)
+    ((?E ?\() . ?\x0114)
+    ((?e ?\() . ?\x0115)
+    ((?E ?.) . ?\x0116)
+    ((?e ?.) . ?\x0117)
+    ((?E ?\;) . ?\x0118)
+    ((?e ?\;) . ?\x0119)
+    ((?E ?<) . ?\x011a)
+    ((?e ?<) . ?\x011b)
+    ((?G ?>) . ?\x011c)
+    ((?g ?>) . ?\x011d)
+    ((?G ?\() . ?\x011e)
+    ((?g ?\() . ?\x011f)
+    ((?G ?.) . ?\x0120)
+    ((?g ?.) . ?\x0121)
+    ((?G ?,) . ?\x0122)
+    ((?g ?,) . ?\x0123)
+    ((?H ?>) . ?\x0124)
+    ((?h ?>) . ?\x0125)
+    ((?H ?/) . ?\x0126)
+    ((?h ?/) . ?\x0127)
+    ((?I ??) . ?\x0128)
+    ((?i ??) . ?\x0129)
+    ((?I ?-) . ?\x012a)
+    ((?i ?-) . ?\x012b)
+    ((?I ?\() . ?\x012c)
+    ((?i ?\() . ?\x012d)
+    ((?I ?\;) . ?\x012e)
+    ((?i ?\;) . ?\x012f)
+    ((?I ?.) . ?\x0130)
+    ((?i ?.) . ?\x0131)
+    ((?I ?J) . ?\x0132)
+    ((?i ?j) . ?\x0133)
+    ((?J ?>) . ?\x0134)
+    ((?j ?>) . ?\x0135)
+    ((?K ?,) . ?\x0136)
+    ((?k ?,) . ?\x0137)
+    ((?k ?k) . ?\x0138)
+    ((?L ?') . ?\x0139)
+    ((?l ?') . ?\x013a)
+    ((?L ?,) . ?\x013b)
+    ((?l ?,) . ?\x013c)
+    ((?L ?<) . ?\x013d)
+    ((?l ?<) . ?\x013e)
+    ((?L ?.) . ?\x013f)
+    ((?l ?.) . ?\x0140)
+    ((?L ?/) . ?\x0141)
+    ((?l ?/) . ?\x0142)
+    ((?N ?') . ?\x0143)
+    ((?n ?') . ?\x0144)
+    ((?N ?,) . ?\x0145)
+    ((?n ?,) . ?\x0146)
+    ((?N ?<) . ?\x0147)
+    ((?n ?<) . ?\x0148)
+    ((?' ?n) . ?\x0149)
+    ((?N ?G) . ?\x014a)
+    ((?n ?g) . ?\x014b)
+    ((?O ?-) . ?\x014c)
+    ((?o ?-) . ?\x014d)
+    ((?O ?\() . ?\x014e)
+    ((?o ?\() . ?\x014f)
+    ((?O ?\") . ?\x0150)
+    ((?o ?\") . ?\x0151)
+    ((?O ?E) . ?\x0152)
+    ((?o ?e) . ?\x0153)
+    ((?R ?') . ?\x0154)
+    ((?r ?') . ?\x0155)
+    ((?R ?,) . ?\x0156)
+    ((?r ?,) . ?\x0157)
+    ((?R ?<) . ?\x0158)
+    ((?r ?<) . ?\x0159)
+    ((?S ?') . ?\x015a)
+    ((?s ?') . ?\x015b)
+    ((?S ?>) . ?\x015c)
+    ((?s ?>) . ?\x015d)
+    ((?S ?,) . ?\x015e)
+    ((?s ?,) . ?\x015f)
+    ((?S ?<) . ?\x0160)
+    ((?s ?<) . ?\x0161)
+    ((?T ?,) . ?\x0162)
+    ((?t ?,) . ?\x0163)
+    ((?T ?<) . ?\x0164)
+    ((?t ?<) . ?\x0165)
+    ((?T ?/) . ?\x0166)
+    ((?t ?/) . ?\x0167)
+    ((?U ??) . ?\x0168)
+    ((?u ??) . ?\x0169)
+    ((?U ?-) . ?\x016a)
+    ((?u ?-) . ?\x016b)
+    ((?U ?\() . ?\x016c)
+    ((?u ?\() . ?\x016d)
+    ((?U ?0) . ?\x016e)
+    ((?u ?0) . ?\x016f)
+    ((?U ?\") . ?\x0170)
+    ((?u ?\") . ?\x0171)
+    ((?U ?\;) . ?\x0172)
+    ((?u ?\;) . ?\x0173)
+    ((?W ?>) . ?\x0174)
+    ((?w ?>) . ?\x0175)
+    ((?Y ?>) . ?\x0176)
+    ((?y ?>) . ?\x0177)
+    ((?Y ?:) . ?\x0178)
+    ((?Z ?') . ?\x0179)
+    ((?z ?') . ?\x017a)
+    ((?Z ?.) . ?\x017b)
+    ((?z ?.) . ?\x017c)
+    ((?Z ?<) . ?\x017d)
+    ((?z ?<) . ?\x017e)
+    ((?O ?9) . ?\x01a0)
+    ((?o ?9) . ?\x01a1)
+    ((?O ?I) . ?\x01a2)
+    ((?o ?i) . ?\x01a3)
+    ((?y ?r) . ?\x01a6)
+    ((?U ?9) . ?\x01af)
+    ((?u ?9) . ?\x01b0)
+    ((?Z ?/) . ?\x01b5)
+    ((?z ?/) . ?\x01b6)
+    ((?E ?D) . ?\x01b7)
+    ((?A ?<) . ?\x01cd)
+    ((?a ?<) . ?\x01ce)
+    ((?I ?<) . ?\x01cf)
+    ((?i ?<) . ?\x01d0)
+    ((?O ?<) . ?\x01d1)
+    ((?o ?<) . ?\x01d2)
+    ((?U ?<) . ?\x01d3)
+    ((?u ?<) . ?\x01d4)
+    ((?A ?1) . ?\x01de)
+    ((?a ?1) . ?\x01df)
+    ((?A ?7) . ?\x01e0)
+    ((?a ?7) . ?\x01e1)
+    ((?A ?3) . ?\x01e2)
+    ((?a ?3) . ?\x01e3)
+    ((?G ?/) . ?\x01e4)
+    ((?g ?/) . ?\x01e5)
+    ((?G ?<) . ?\x01e6)
+    ((?g ?<) . ?\x01e7)
+    ((?K ?<) . ?\x01e8)
+    ((?k ?<) . ?\x01e9)
+    ((?O ?\;) . ?\x01ea)
+    ((?o ?\;) . ?\x01eb)
+    ((?O ?1) . ?\x01ec)
+    ((?o ?1) . ?\x01ed)
+    ((?E ?Z) . ?\x01ee)
+    ((?e ?z) . ?\x01ef)
+    ((?j ?<) . ?\x01f0)
+    ((?G ?') . ?\x01f4)
+    ((?g ?') . ?\x01f5)
+    ((?\; ?S) . ?\x02bf)
+    ((?' ?<) . ?\x02c7)
+    ((?' ?\() . ?\x02d8)
+    ((?' ?.) . ?\x02d9)
+    ((?' ?0) . ?\x02da)
+    ((?' ?\;) . ?\x02db)
+    ((?' ?\") . ?\x02dd)
+    ((?A ?%) . ?\x0386)
+    ((?E ?%) . ?\x0388)
+    ((?Y ?%) . ?\x0389)
+    ((?I ?%) . ?\x038a)
+    ((?O ?%) . ?\x038c)
+    ((?U ?%) . ?\x038e)
+    ((?W ?%) . ?\x038f)
+    ((?i ?3) . ?\x0390)
+    ((?A ?*) . ?\x0391)
+    ((?B ?*) . ?\x0392)
+    ((?G ?*) . ?\x0393)
+    ((?D ?*) . ?\x0394)
+    ((?E ?*) . ?\x0395)
+    ((?Z ?*) . ?\x0396)
+    ((?Y ?*) . ?\x0397)
+    ((?H ?*) . ?\x0398)
+    ((?I ?*) . ?\x0399)
+    ((?K ?*) . ?\x039a)
+    ((?L ?*) . ?\x039b)
+    ((?M ?*) . ?\x039c)
+    ((?N ?*) . ?\x039d)
+    ((?C ?*) . ?\x039e)
+    ((?O ?*) . ?\x039f)
+    ((?P ?*) . ?\x03a0)
+    ((?R ?*) . ?\x03a1)
+    ((?S ?*) . ?\x03a3)
+    ((?T ?*) . ?\x03a4)
+    ((?U ?*) . ?\x03a5)
+    ((?F ?*) . ?\x03a6)
+    ((?X ?*) . ?\x03a7)
+    ((?Q ?*) . ?\x03a8)
+    ((?W ?*) . ?\x03a9)
+    ((?J ?*) . ?\x03aa)
+    ((?V ?*) . ?\x03ab)
+    ((?a ?%) . ?\x03ac)
+    ((?e ?%) . ?\x03ad)
+    ((?y ?%) . ?\x03ae)
+    ((?i ?%) . ?\x03af)
+    ((?u ?3) . ?\x03b0)
+    ((?a ?*) . ?\x03b1)
+    ((?b ?*) . ?\x03b2)
+    ((?g ?*) . ?\x03b3)
+    ((?d ?*) . ?\x03b4)
+    ((?e ?*) . ?\x03b5)
+    ((?z ?*) . ?\x03b6)
+    ((?y ?*) . ?\x03b7)
+    ((?h ?*) . ?\x03b8)
+    ((?i ?*) . ?\x03b9)
+    ((?k ?*) . ?\x03ba)
+    ((?l ?*) . ?\x03bb)
+    ((?m ?*) . ?\x03bc)
+    ((?n ?*) . ?\x03bd)
+    ((?c ?*) . ?\x03be)
+    ((?o ?*) . ?\x03bf)
+    ((?p ?*) . ?\x03c0)
+    ((?r ?*) . ?\x03c1)
+    ((?* ?s) . ?\x03c2)
+    ((?s ?*) . ?\x03c3)
+    ((?t ?*) . ?\x03c4)
+    ((?u ?*) . ?\x03c5)
+    ((?f ?*) . ?\x03c6)
+    ((?x ?*) . ?\x03c7)
+    ((?q ?*) . ?\x03c8)
+    ((?w ?*) . ?\x03c9)
+    ((?j ?*) . ?\x03ca)
+    ((?v ?*) . ?\x03cb)
+    ((?o ?%) . ?\x03cc)
+    ((?u ?%) . ?\x03cd)
+    ((?w ?%) . ?\x03ce)
+    ((?' ?G) . ?\x03d8)
+    ((?, ?G) . ?\x03d9)
+    ((?T ?3) . ?\x03da)
+    ((?t ?3) . ?\x03db)
+    ((?M ?3) . ?\x03dc)
+    ((?m ?3) . ?\x03dd)
+    ((?K ?3) . ?\x03de)
+    ((?k ?3) . ?\x03df)
+    ((?P ?3) . ?\x03e0)
+    ((?p ?3) . ?\x03e1)
+    ((?' ?%) . ?\x03f4)
+    ((?j ?3) . ?\x03f5)
+    ((?I ?O) . ?\x0401)
+    ((?D ?%) . ?\x0402)
+    ((?G ?%) . ?\x0403)
+    ((?I ?E) . ?\x0404)
+    ((?D ?S) . ?\x0405)
+    ((?I ?I) . ?\x0406)
+    ((?Y ?I) . ?\x0407)
+    ((?J ?%) . ?\x0408)
+    ((?L ?J) . ?\x0409)
+    ((?N ?J) . ?\x040a)
+    ((?T ?s) . ?\x040b)
+    ((?K ?J) . ?\x040c)
+    ((?V ?%) . ?\x040e)
+    ((?D ?Z) . ?\x040f)
+    ((?A ?=) . ?\x0410)
+    ((?B ?=) . ?\x0411)
+    ((?V ?=) . ?\x0412)
+    ((?G ?=) . ?\x0413)
+    ((?D ?=) . ?\x0414)
+    ((?E ?=) . ?\x0415)
+    ((?Z ?%) . ?\x0416)
+    ((?Z ?=) . ?\x0417)
+    ((?I ?=) . ?\x0418)
+    ((?J ?=) . ?\x0419)
+    ((?K ?=) . ?\x041a)
+    ((?L ?=) . ?\x041b)
+    ((?M ?=) . ?\x041c)
+    ((?N ?=) . ?\x041d)
+    ((?O ?=) . ?\x041e)
+    ((?P ?=) . ?\x041f)
+    ((?R ?=) . ?\x0420)
+    ((?S ?=) . ?\x0421)
+    ((?T ?=) . ?\x0422)
+    ((?U ?=) . ?\x0423)
+    ((?F ?=) . ?\x0424)
+    ((?H ?=) . ?\x0425)
+    ((?C ?=) . ?\x0426)
+    ((?C ?%) . ?\x0427)
+    ((?S ?%) . ?\x0428)
+    ((?S ?c) . ?\x0429)
+    ((?= ?\") . ?\x042a)
+    ((?Y ?=) . ?\x042b)
+    ((?% ?\") . ?\x042c)
+    ((?J ?E) . ?\x042d)
+    ((?J ?U) . ?\x042e)
+    ((?J ?A) . ?\x042f)
+    ((?a ?=) . ?\x0430)
+    ((?b ?=) . ?\x0431)
+    ((?v ?=) . ?\x0432)
+    ((?g ?=) . ?\x0433)
+    ((?d ?=) . ?\x0434)
+    ((?e ?=) . ?\x0435)
+    ((?z ?%) . ?\x0436)
+    ((?z ?=) . ?\x0437)
+    ((?i ?=) . ?\x0438)
+    ((?j ?=) . ?\x0439)
+    ((?k ?=) . ?\x043a)
+    ((?l ?=) . ?\x043b)
+    ((?m ?=) . ?\x043c)
+    ((?n ?=) . ?\x043d)
+    ((?o ?=) . ?\x043e)
+    ((?p ?=) . ?\x043f)
+    ((?r ?=) . ?\x0440)
+    ((?s ?=) . ?\x0441)
+    ((?t ?=) . ?\x0442)
+    ((?u ?=) . ?\x0443)
+    ((?f ?=) . ?\x0444)
+    ((?h ?=) . ?\x0445)
+    ((?c ?=) . ?\x0446)
+    ((?c ?%) . ?\x0447)
+    ((?s ?%) . ?\x0448)
+    ((?s ?c) . ?\x0449)
+    ((?= ?') . ?\x044a)
+    ((?y ?=) . ?\x044b)
+    ((?% ?') . ?\x044c)
+    ((?j ?e) . ?\x044d)
+    ((?j ?u) . ?\x044e)
+    ((?j ?a) . ?\x044f)
+    ((?i ?o) . ?\x0451)
+    ((?d ?%) . ?\x0452)
+    ((?g ?%) . ?\x0453)
+    ((?i ?e) . ?\x0454)
+    ((?d ?s) . ?\x0455)
+    ((?i ?i) . ?\x0456)
+    ((?y ?i) . ?\x0457)
+    ((?j ?%) . ?\x0458)
+    ((?l ?j) . ?\x0459)
+    ((?n ?j) . ?\x045a)
+    ((?t ?s) . ?\x045b)
+    ((?k ?j) . ?\x045c)
+    ((?v ?%) . ?\x045e)
+    ((?d ?z) . ?\x045f)
+    ((?Y ?3) . ?\x0462)
+    ((?y ?3) . ?\x0463)
+    ((?O ?3) . ?\x046a)
+    ((?o ?3) . ?\x046b)
+    ((?F ?3) . ?\x0472)
+    ((?f ?3) . ?\x0473)
+    ((?V ?3) . ?\x0474)
+    ((?v ?3) . ?\x0475)
+    ((?C ?3) . ?\x0480)
+    ((?c ?3) . ?\x0481)
+    ((?G ?3) . ?\x0490)
+    ((?g ?3) . ?\x0491)
+    ((?A ?+) . ?\x05d0)
+    ((?B ?+) . ?\x05d1)
+    ((?G ?+) . ?\x05d2)
+    ((?D ?+) . ?\x05d3)
+    ((?H ?+) . ?\x05d4)
+    ((?W ?+) . ?\x05d5)
+    ((?Z ?+) . ?\x05d6)
+    ((?X ?+) . ?\x05d7)
+    ((?T ?j) . ?\x05d8)
+    ((?J ?+) . ?\x05d9)
+    ((?K ?%) . ?\x05da)
+    ((?K ?+) . ?\x05db)
+    ((?L ?+) . ?\x05dc)
+    ((?M ?%) . ?\x05dd)
+    ((?M ?+) . ?\x05de)
+    ((?N ?%) . ?\x05df)
+    ((?N ?+) . ?\x05e0)
+    ((?S ?+) . ?\x05e1)
+    ((?E ?+) . ?\x05e2)
+    ((?P ?%) . ?\x05e3)
+    ((?P ?+) . ?\x05e4)
+    ((?Z ?j) . ?\x05e5)
+    ((?Z ?J) . ?\x05e6)
+    ((?Q ?+) . ?\x05e7)
+    ((?R ?+) . ?\x05e8)
+    ((?S ?h) . ?\x05e9)
+    ((?T ?+) . ?\x05ea)
+    ((?, ?+) . ?\x060c)
+    ((?\; ?+) . ?\x061b)
+    ((?? ?+) . ?\x061f)
+    ((?H ?') . ?\x0621)
+    ((?a ?M) . ?\x0622)
+    ((?a ?H) . ?\x0623)
+    ((?w ?H) . ?\x0624)
+    ((?a ?h) . ?\x0625)
+    ((?y ?H) . ?\x0626)
+    ((?a ?+) . ?\x0627)
+    ((?b ?+) . ?\x0628)
+    ((?t ?m) . ?\x0629)
+    ((?t ?+) . ?\x062a)
+    ((?t ?k) . ?\x062b)
+    ((?g ?+) . ?\x062c)
+    ((?h ?k) . ?\x062d)
+    ((?x ?+) . ?\x062e)
+    ((?d ?+) . ?\x062f)
+    ((?d ?k) . ?\x0630)
+    ((?r ?+) . ?\x0631)
+    ((?z ?+) . ?\x0632)
+    ((?s ?+) . ?\x0633)
+    ((?s ?n) . ?\x0634)
+    ((?c ?+) . ?\x0635)
+    ((?d ?d) . ?\x0636)
+    ((?t ?j) . ?\x0637)
+    ((?z ?H) . ?\x0638)
+    ((?e ?+) . ?\x0639)
+    ((?i ?+) . ?\x063a)
+    ((?+ ?+) . ?\x0640)
+    ((?f ?+) . ?\x0641)
+    ((?q ?+) . ?\x0642)
+    ((?k ?+) . ?\x0643)
+    ((?l ?+) . ?\x0644)
+    ((?m ?+) . ?\x0645)
+    ((?n ?+) . ?\x0646)
+    ((?h ?+) . ?\x0647)
+    ((?w ?+) . ?\x0648)
+    ((?j ?+) . ?\x0649)
+    ((?y ?+) . ?\x064a)
+    ((?: ?+) . ?\x064b)
+    ((?\" ?+) . ?\x064c)
+    ((?= ?+) . ?\x064d)
+    ((?/ ?+) . ?\x064e)
+    ((?' ?+) . ?\x064f)
+    ((?1 ?+) . ?\x0650)
+    ((?3 ?+) . ?\x0651)
+    ((?0 ?+) . ?\x0652)
+    ((?a ?S) . ?\x0670)
+    ((?p ?+) . ?\x067e)
+    ((?v ?+) . ?\x06a4)
+    ((?g ?f) . ?\x06af)
+    ((?0 ?a) . ?\x06f0)
+    ((?1 ?a) . ?\x06f1)
+    ((?2 ?a) . ?\x06f2)
+    ((?3 ?a) . ?\x06f3)
+    ((?4 ?a) . ?\x06f4)
+    ((?5 ?a) . ?\x06f5)
+    ((?6 ?a) . ?\x06f6)
+    ((?7 ?a) . ?\x06f7)
+    ((?8 ?a) . ?\x06f8)
+    ((?9 ?a) . ?\x06f9)
+    ((?B ?.) . ?\x1e02)
+    ((?b ?.) . ?\x1e03)
+    ((?B ?_) . ?\x1e06)
+    ((?b ?_) . ?\x1e07)
+    ((?D ?.) . ?\x1e0a)
+    ((?d ?.) . ?\x1e0b)
+    ((?D ?_) . ?\x1e0e)
+    ((?d ?_) . ?\x1e0f)
+    ((?D ?,) . ?\x1e10)
+    ((?d ?,) . ?\x1e11)
+    ((?F ?.) . ?\x1e1e)
+    ((?f ?.) . ?\x1e1f)
+    ((?G ?-) . ?\x1e20)
+    ((?g ?-) . ?\x1e21)
+    ((?H ?.) . ?\x1e22)
+    ((?h ?.) . ?\x1e23)
+    ((?H ?:) . ?\x1e26)
+    ((?h ?:) . ?\x1e27)
+    ((?H ?,) . ?\x1e28)
+    ((?h ?,) . ?\x1e29)
+    ((?K ?') . ?\x1e30)
+    ((?k ?') . ?\x1e31)
+    ((?K ?_) . ?\x1e34)
+    ((?k ?_) . ?\x1e35)
+    ((?L ?_) . ?\x1e3a)
+    ((?l ?_) . ?\x1e3b)
+    ((?M ?') . ?\x1e3e)
+    ((?m ?') . ?\x1e3f)
+    ((?M ?.) . ?\x1e40)
+    ((?m ?.) . ?\x1e41)
+    ((?N ?.) . ?\x1e44)
+    ((?n ?.) . ?\x1e45)
+    ((?N ?_) . ?\x1e48)
+    ((?n ?_) . ?\x1e49)
+    ((?P ?') . ?\x1e54)
+    ((?p ?') . ?\x1e55)
+    ((?P ?.) . ?\x1e56)
+    ((?p ?.) . ?\x1e57)
+    ((?R ?.) . ?\x1e58)
+    ((?r ?.) . ?\x1e59)
+    ((?R ?_) . ?\x1e5e)
+    ((?r ?_) . ?\x1e5f)
+    ((?S ?.) . ?\x1e60)
+    ((?s ?.) . ?\x1e61)
+    ((?T ?.) . ?\x1e6a)
+    ((?t ?.) . ?\x1e6b)
+    ((?T ?_) . ?\x1e6e)
+    ((?t ?_) . ?\x1e6f)
+    ((?V ??) . ?\x1e7c)
+    ((?v ??) . ?\x1e7d)
+    ((?W ?!) . ?\x1e80)
+    ((?w ?!) . ?\x1e81)
+    ((?W ?') . ?\x1e82)
+    ((?w ?') . ?\x1e83)
+    ((?W ?:) . ?\x1e84)
+    ((?w ?:) . ?\x1e85)
+    ((?W ?.) . ?\x1e86)
+    ((?w ?.) . ?\x1e87)
+    ((?X ?.) . ?\x1e8a)
+    ((?x ?.) . ?\x1e8b)
+    ((?X ?:) . ?\x1e8c)
+    ((?x ?:) . ?\x1e8d)
+    ((?Y ?.) . ?\x1e8e)
+    ((?y ?.) . ?\x1e8f)
+    ((?Z ?>) . ?\x1e90)
+    ((?z ?>) . ?\x1e91)
+    ((?Z ?_) . ?\x1e94)
+    ((?z ?_) . ?\x1e95)
+    ((?h ?_) . ?\x1e96)
+    ((?t ?:) . ?\x1e97)
+    ((?w ?0) . ?\x1e98)
+    ((?y ?0) . ?\x1e99)
+    ((?A ?2) . ?\x1ea2)
+    ((?a ?2) . ?\x1ea3)
+    ((?E ?2) . ?\x1eba)
+    ((?e ?2) . ?\x1ebb)
+    ((?E ??) . ?\x1ebc)
+    ((?e ??) . ?\x1ebd)
+    ((?I ?2) . ?\x1ec8)
+    ((?i ?2) . ?\x1ec9)
+    ((?O ?2) . ?\x1ece)
+    ((?o ?2) . ?\x1ecf)
+    ((?U ?2) . ?\x1ee6)
+    ((?u ?2) . ?\x1ee7)
+    ((?Y ?!) . ?\x1ef2)
+    ((?y ?!) . ?\x1ef3)
+    ((?Y ?2) . ?\x1ef6)
+    ((?y ?2) . ?\x1ef7)
+    ((?Y ??) . ?\x1ef8)
+    ((?y ??) . ?\x1ef9)
+    ((?\; ?') . ?\x1f00)
+    ((?, ?') . ?\x1f01)
+    ((?\; ?!) . ?\x1f02)
+    ((?, ?!) . ?\x1f03)
+    ((?? ?\;) . ?\x1f04)
+    ((?? ?,) . ?\x1f05)
+    ((?! ?:) . ?\x1f06)
+    ((?? ?:) . ?\x1f07)
+    ((?1 ?N) . ?\x2002)
+    ((?1 ?M) . ?\x2003)
+    ((?3 ?M) . ?\x2004)
+    ((?4 ?M) . ?\x2005)
+    ((?6 ?M) . ?\x2006)
+    ((?1 ?T) . ?\x2009)
+    ((?1 ?H) . ?\x200a)
+    ((?- ?1) . ?\x2010)
+    ((?- ?N) . ?\x2013)
+    ((?- ?M) . ?\x2014)
+    ((?- ?3) . ?\x2015)
+    ((?! ?2) . ?\x2016)
+    ((?= ?2) . ?\x2017)
+    ((?' ?6) . ?\x2018)
+    ((?' ?9) . ?\x2019)
+    ((?. ?9) . ?\x201a)
+    ((?9 ?') . ?\x201b)
+    ((?\" ?6) . ?\x201c)
+    ((?\" ?9) . ?\x201d)
+    ((?: ?9) . ?\x201e)
+    ((?9 ?\") . ?\x201f)
+    ((?/ ?-) . ?\x2020)
+    ((?/ ?=) . ?\x2021)
+    ((?. ?.) . ?\x2025)
+    ((?% ?0) . ?\x2030)
+    ((?1 ?') . ?\x2032)
+    ((?2 ?') . ?\x2033)
+    ((?3 ?') . ?\x2034)
+    ((?1 ?\") . ?\x2035)
+    ((?2 ?\") . ?\x2036)
+    ((?3 ?\") . ?\x2037)
+    ((?C ?a) . ?\x2038)
+    ((?< ?1) . ?\x2039)
+    ((?> ?1) . ?\x203a)
+    ((?: ?X) . ?\x203b)
+    ((?' ?-) . ?\x203e)
+    ((?/ ?f) . ?\x2044)
+    ((?0 ?S) . ?\x2070)
+    ((?4 ?S) . ?\x2074)
+    ((?5 ?S) . ?\x2075)
+    ((?6 ?S) . ?\x2076)
+    ((?7 ?S) . ?\x2077)
+    ((?8 ?S) . ?\x2078)
+    ((?9 ?S) . ?\x2079)
+    ((?+ ?S) . ?\x207a)
+    ((?- ?S) . ?\x207b)
+    ((?= ?S) . ?\x207c)
+    ((?\( ?S) . ?\x207d)
+    ((?\) ?S) . ?\x207e)
+    ((?n ?S) . ?\x207f)
+    ((?0 ?s) . ?\x2080)
+    ((?1 ?s) . ?\x2081)
+    ((?2 ?s) . ?\x2082)
+    ((?3 ?s) . ?\x2083)
+    ((?4 ?s) . ?\x2084)
+    ((?5 ?s) . ?\x2085)
+    ((?6 ?s) . ?\x2086)
+    ((?7 ?s) . ?\x2087)
+    ((?8 ?s) . ?\x2088)
+    ((?9 ?s) . ?\x2089)
+    ((?+ ?s) . ?\x208a)
+    ((?- ?s) . ?\x208b)
+    ((?= ?s) . ?\x208c)
+    ((?\( ?s) . ?\x208d)
+    ((?\) ?s) . ?\x208e)
+    ((?L ?i) . ?\x20a4)
+    ((?P ?t) . ?\x20a7)
+    ((?W ?=) . ?\x20a9)
+    ((?= ?e) . ?\x20ac)
+    ((?E ?u) . ?\x20ac)
+    ((?o ?C) . ?\x2103)
+    ((?c ?o) . ?\x2105)
+    ((?o ?F) . ?\x2109)
+    ((?N ?0) . ?\x2116)
+    ((?P ?O) . ?\x2117)
+    ((?R ?x) . ?\x211e)
+    ((?S ?M) . ?\x2120)
+    ((?T ?M) . ?\x2122)
+    ((?O ?m) . ?\x2126)
+    ((?A ?O) . ?\x212b)
+    ((?1 ?3) . ?\x2153)
+    ((?2 ?3) . ?\x2154)
+    ((?1 ?5) . ?\x2155)
+    ((?2 ?5) . ?\x2156)
+    ((?3 ?5) . ?\x2157)
+    ((?4 ?5) . ?\x2158)
+    ((?1 ?6) . ?\x2159)
+    ((?5 ?6) . ?\x215a)
+    ((?1 ?8) . ?\x215b)
+    ((?3 ?8) . ?\x215c)
+    ((?5 ?8) . ?\x215d)
+    ((?7 ?8) . ?\x215e)
+    ((?1 ?R) . ?\x2160)
+    ((?2 ?R) . ?\x2161)
+    ((?3 ?R) . ?\x2162)
+    ((?4 ?R) . ?\x2163)
+    ((?5 ?R) . ?\x2164)
+    ((?6 ?R) . ?\x2165)
+    ((?7 ?R) . ?\x2166)
+    ((?8 ?R) . ?\x2167)
+    ((?9 ?R) . ?\x2168)
+    ((?a ?R) . ?\x2169)
+    ((?b ?R) . ?\x216a)
+    ((?c ?R) . ?\x216b)
+    ((?1 ?r) . ?\x2170)
+    ((?2 ?r) . ?\x2171)
+    ((?3 ?r) . ?\x2172)
+    ((?4 ?r) . ?\x2173)
+    ((?5 ?r) . ?\x2174)
+    ((?6 ?r) . ?\x2175)
+    ((?7 ?r) . ?\x2176)
+    ((?8 ?r) . ?\x2177)
+    ((?9 ?r) . ?\x2178)
+    ((?a ?r) . ?\x2179)
+    ((?b ?r) . ?\x217a)
+    ((?c ?r) . ?\x217b)
+    ((?< ?-) . ?\x2190)
+    ((?- ?!) . ?\x2191)
+    ((?- ?>) . ?\x2192)
+    ((?- ?v) . ?\x2193)
+    ((?< ?>) . ?\x2194)
+    ((?U ?D) . ?\x2195)
+    ((?< ?=) . ?\x21d0)
+    ((?= ?>) . ?\x21d2)
+    ((?= ?=) . ?\x21d4)
+    ((?F ?A) . ?\x2200)
+    ((?d ?P) . ?\x2202)
+    ((?T ?E) . ?\x2203)
+    ((?/ ?0) . ?\x2205)
+    ((?D ?E) . ?\x2206)
+    ((?N ?B) . ?\x2207)
+    ((?\( ?-) . ?\x2208)
+    ((?- ?\)) . ?\x220b)
+    ((?* ?P) . ?\x220f)
+    ((?+ ?Z) . ?\x2211)
+    ((?- ?2) . ?\x2212)
+    ((?- ?+) . ?\x2213)
+    ((?* ?-) . ?\x2217)
+    ((?O ?b) . ?\x2218)
+    ((?S ?b) . ?\x2219)
+    ((?R ?T) . ?\x221a)
+    ((?0 ?\() . ?\x221d)
+    ((?0 ?0) . ?\x221e)
+    ((?- ?L) . ?\x221f)
+    ((?- ?V) . ?\x2220)
+    ((?P ?P) . ?\x2225)
+    ((?A ?N) . ?\x2227)
+    ((?O ?R) . ?\x2228)
+    ((?\( ?U) . ?\x2229)
+    ((?\) ?U) . ?\x222a)
+    ((?I ?n) . ?\x222b)
+    ((?D ?I) . ?\x222c)
+    ((?I ?o) . ?\x222e)
+    ((?. ?:) . ?\x2234)
+    ((?: ?.) . ?\x2235)
+    ((?: ?R) . ?\x2236)
+    ((?: ?:) . ?\x2237)
+    ((?? ?1) . ?\x223c)
+    ((?C ?G) . ?\x223e)
+    ((?? ?-) . ?\x2243)
+    ((?? ?=) . ?\x2245)
+    ((?? ?2) . ?\x2248)
+    ((?= ??) . ?\x224c)
+    ((?H ?I) . ?\x2253)
+    ((?! ?=) . ?\x2260)
+    ((?= ?3) . ?\x2261)
+    ((?= ?<) . ?\x2264)
+    ((?> ?=) . ?\x2265)
+    ((?< ?*) . ?\x226a)
+    ((?* ?>) . ?\x226b)
+    ((?! ?<) . ?\x226e)
+    ((?! ?>) . ?\x226f)
+    ((?\( ?C) . ?\x2282)
+    ((?\) ?C) . ?\x2283)
+    ((?\( ?_) . ?\x2286)
+    ((?\) ?_) . ?\x2287)
+    ((?0 ?.) . ?\x2299)
+    ((?0 ?2) . ?\x229a)
+    ((?- ?T) . ?\x22a5)
+    ((?. ?P) . ?\x22c5)
+    ((?: ?3) . ?\x22ee)
+    ((?. ?3) . ?\x22ef)
+    ((?E ?h) . ?\x2302)
+    ((?< ?7) . ?\x2308)
+    ((?> ?7) . ?\x2309)
+    ((?7 ?<) . ?\x230a)
+    ((?7 ?>) . ?\x230b)
+    ((?N ?I) . ?\x2310)
+    ((?\( ?A) . ?\x2312)
+    ((?T ?R) . ?\x2315)
+    ((?I ?u) . ?\x2320)
+    ((?I ?l) . ?\x2321)
+    ((?< ?/) . ?\x2329)
+    ((?/ ?>) . ?\x232a)
+    ((?V ?s) . ?\x2423)
+    ((?1 ?h) . ?\x2440)
+    ((?3 ?h) . ?\x2441)
+    ((?2 ?h) . ?\x2442)
+    ((?4 ?h) . ?\x2443)
+    ((?1 ?j) . ?\x2446)
+    ((?2 ?j) . ?\x2447)
+    ((?3 ?j) . ?\x2448)
+    ((?4 ?j) . ?\x2449)
+    ((?1 ?.) . ?\x2488)
+    ((?2 ?.) . ?\x2489)
+    ((?3 ?.) . ?\x248a)
+    ((?4 ?.) . ?\x248b)
+    ((?5 ?.) . ?\x248c)
+    ((?6 ?.) . ?\x248d)
+    ((?7 ?.) . ?\x248e)
+    ((?8 ?.) . ?\x248f)
+    ((?9 ?.) . ?\x2490)
+    ((?h ?h) . ?\x2500)
+    ((?H ?H) . ?\x2501)
+    ((?v ?v) . ?\x2502)
+    ((?V ?V) . ?\x2503)
+    ((?3 ?-) . ?\x2504)
+    ((?3 ?_) . ?\x2505)
+    ((?3 ?!) . ?\x2506)
+    ((?3 ?/) . ?\x2507)
+    ((?4 ?-) . ?\x2508)
+    ((?4 ?_) . ?\x2509)
+    ((?4 ?!) . ?\x250a)
+    ((?4 ?/) . ?\x250b)
+    ((?d ?r) . ?\x250c)
+    ((?d ?R) . ?\x250d)
+    ((?D ?r) . ?\x250e)
+    ((?D ?R) . ?\x250f)
+    ((?d ?l) . ?\x2510)
+    ((?d ?L) . ?\x2511)
+    ((?D ?l) . ?\x2512)
+    ((?L ?D) . ?\x2513)
+    ((?u ?r) . ?\x2514)
+    ((?u ?R) . ?\x2515)
+    ((?U ?r) . ?\x2516)
+    ((?U ?R) . ?\x2517)
+    ((?u ?l) . ?\x2518)
+    ((?u ?L) . ?\x2519)
+    ((?U ?l) . ?\x251a)
+    ((?U ?L) . ?\x251b)
+    ((?v ?r) . ?\x251c)
+    ((?v ?R) . ?\x251d)
+    ((?V ?r) . ?\x2520)
+    ((?V ?R) . ?\x2523)
+    ((?v ?l) . ?\x2524)
+    ((?v ?L) . ?\x2525)
+    ((?V ?l) . ?\x2528)
+    ((?V ?L) . ?\x252b)
+    ((?d ?h) . ?\x252c)
+    ((?d ?H) . ?\x252f)
+    ((?D ?h) . ?\x2530)
+    ((?D ?H) . ?\x2533)
+    ((?u ?h) . ?\x2534)
+    ((?u ?H) . ?\x2537)
+    ((?U ?h) . ?\x2538)
+    ((?U ?H) . ?\x253b)
+    ((?v ?h) . ?\x253c)
+    ((?v ?H) . ?\x253f)
+    ((?V ?h) . ?\x2542)
+    ((?V ?H) . ?\x254b)
+    ((?F ?D) . ?\x2571)
+    ((?B ?D) . ?\x2572)
+    ((?T ?B) . ?\x2580)
+    ((?L ?B) . ?\x2584)
+    ((?F ?B) . ?\x2588)
+    ((?l ?B) . ?\x258c)
+    ((?R ?B) . ?\x2590)
+    ((?. ?S) . ?\x2591)
+    ((?: ?S) . ?\x2592)
+    ((?? ?S) . ?\x2593)
+    ((?f ?S) . ?\x25a0)
+    ((?O ?S) . ?\x25a1)
+    ((?R ?O) . ?\x25a2)
+    ((?R ?r) . ?\x25a3)
+    ((?R ?F) . ?\x25a4)
+    ((?R ?Y) . ?\x25a5)
+    ((?R ?H) . ?\x25a6)
+    ((?R ?Z) . ?\x25a7)
+    ((?R ?K) . ?\x25a8)
+    ((?R ?X) . ?\x25a9)
+    ((?s ?B) . ?\x25aa)
+    ((?S ?R) . ?\x25ac)
+    ((?O ?r) . ?\x25ad)
+    ((?U ?T) . ?\x25b2)
+    ((?u ?T) . ?\x25b3)
+    ((?P ?R) . ?\x25b6)
+    ((?T ?r) . ?\x25b7)
+    ((?D ?t) . ?\x25bc)
+    ((?d ?T) . ?\x25bd)
+    ((?P ?L) . ?\x25c0)
+    ((?T ?l) . ?\x25c1)
+    ((?D ?b) . ?\x25c6)
+    ((?D ?w) . ?\x25c7)
+    ((?L ?Z) . ?\x25ca)
+    ((?0 ?m) . ?\x25cb)
+    ((?0 ?o) . ?\x25ce)
+    ((?0 ?M) . ?\x25cf)
+    ((?0 ?L) . ?\x25d0)
+    ((?0 ?R) . ?\x25d1)
+    ((?S ?n) . ?\x25d8)
+    ((?I ?c) . ?\x25d9)
+    ((?F ?d) . ?\x25e2)
+    ((?B ?d) . ?\x25e3)
+    ((?* ?2) . ?\x2605)
+    ((?* ?1) . ?\x2606)
+    ((?< ?H) . ?\x261c)
+    ((?> ?H) . ?\x261e)
+    ((?0 ?u) . ?\x263a)
+    ((?0 ?U) . ?\x263b)
+    ((?S ?U) . ?\x263c)
+    ((?F ?m) . ?\x2640)
+    ((?M ?l) . ?\x2642)
+    ((?c ?S) . ?\x2660)
+    ((?c ?H) . ?\x2661)
+    ((?c ?D) . ?\x2662)
+    ((?c ?C) . ?\x2663)
+    ((?M ?d) . ?\x2669)
+    ((?M ?8) . ?\x266a)
+    ((?M ?2) . ?\x266b)
+    ((?M ?b) . ?\x266d)
+    ((?M ?x) . ?\x266e)
+    ((?M ?X) . ?\x266f)
+    ((?O ?K) . ?\x2713)
+    ((?X ?X) . ?\x2717)
+    ((?- ?X) . ?\x2720)
+    ((?I ?S) . ?\x3000)
+    ((?, ?_) . ?\x3001)
+    ((?. ?_) . ?\x3002)
+    ((?+ ?\") . ?\x3003)
+    ((?+ ?_) . ?\x3004)
+    ((?* ?_) . ?\x3005)
+    ((?\; ?_) . ?\x3006)
+    ((?0 ?_) . ?\x3007)
+    ((?< ?+) . ?\x300a)
+    ((?> ?+) . ?\x300b)
+    ((?< ?') . ?\x300c)
+    ((?> ?') . ?\x300d)
+    ((?< ?\") . ?\x300e)
+    ((?> ?\") . ?\x300f)
+    ((?\( ?\") . ?\x3010)
+    ((?\) ?\") . ?\x3011)
+    ((?= ?T) . ?\x3012)
+    ((?= ?_) . ?\x3013)
+    ((?\( ?') . ?\x3014)
+    ((?\) ?') . ?\x3015)
+    ((?\( ?I) . ?\x3016)
+    ((?\) ?I) . ?\x3017)
+    ((?- ??) . ?\x301c)
+    ((?A ?5) . ?\x3041)
+    ((?a ?5) . ?\x3042)
+    ((?I ?5) . ?\x3043)
+    ((?i ?5) . ?\x3044)
+    ((?U ?5) . ?\x3045)
+    ((?u ?5) . ?\x3046)
+    ((?E ?5) . ?\x3047)
+    ((?e ?5) . ?\x3048)
+    ((?O ?5) . ?\x3049)
+    ((?o ?5) . ?\x304a)
+    ((?k ?a) . ?\x304b)
+    ((?g ?a) . ?\x304c)
+    ((?k ?i) . ?\x304d)
+    ((?g ?i) . ?\x304e)
+    ((?k ?u) . ?\x304f)
+    ((?g ?u) . ?\x3050)
+    ((?k ?e) . ?\x3051)
+    ((?g ?e) . ?\x3052)
+    ((?k ?o) . ?\x3053)
+    ((?g ?o) . ?\x3054)
+    ((?s ?a) . ?\x3055)
+    ((?z ?a) . ?\x3056)
+    ((?s ?i) . ?\x3057)
+    ((?z ?i) . ?\x3058)
+    ((?s ?u) . ?\x3059)
+    ((?z ?u) . ?\x305a)
+    ((?s ?e) . ?\x305b)
+    ((?z ?e) . ?\x305c)
+    ((?s ?o) . ?\x305d)
+    ((?z ?o) . ?\x305e)
+    ((?t ?a) . ?\x305f)
+    ((?d ?a) . ?\x3060)
+    ((?t ?i) . ?\x3061)
+    ((?d ?i) . ?\x3062)
+    ((?t ?U) . ?\x3063)
+    ((?t ?u) . ?\x3064)
+    ((?d ?u) . ?\x3065)
+    ((?t ?e) . ?\x3066)
+    ((?d ?e) . ?\x3067)
+    ((?t ?o) . ?\x3068)
+    ((?d ?o) . ?\x3069)
+    ((?n ?a) . ?\x306a)
+    ((?n ?i) . ?\x306b)
+    ((?n ?u) . ?\x306c)
+    ((?n ?e) . ?\x306d)
+    ((?n ?o) . ?\x306e)
+    ((?h ?a) . ?\x306f)
+    ((?b ?a) . ?\x3070)
+    ((?p ?a) . ?\x3071)
+    ((?h ?i) . ?\x3072)
+    ((?b ?i) . ?\x3073)
+    ((?p ?i) . ?\x3074)
+    ((?h ?u) . ?\x3075)
+    ((?b ?u) . ?\x3076)
+    ((?p ?u) . ?\x3077)
+    ((?h ?e) . ?\x3078)
+    ((?b ?e) . ?\x3079)
+    ((?p ?e) . ?\x307a)
+    ((?h ?o) . ?\x307b)
+    ((?b ?o) . ?\x307c)
+    ((?p ?o) . ?\x307d)
+    ((?m ?a) . ?\x307e)
+    ((?m ?i) . ?\x307f)
+    ((?m ?u) . ?\x3080)
+    ((?m ?e) . ?\x3081)
+    ((?m ?o) . ?\x3082)
+    ((?y ?A) . ?\x3083)
+    ((?y ?a) . ?\x3084)
+    ((?y ?U) . ?\x3085)
+    ((?y ?u) . ?\x3086)
+    ((?y ?O) . ?\x3087)
+    ((?y ?o) . ?\x3088)
+    ((?r ?a) . ?\x3089)
+    ((?r ?i) . ?\x308a)
+    ((?r ?u) . ?\x308b)
+    ((?r ?e) . ?\x308c)
+    ((?r ?o) . ?\x308d)
+    ((?w ?A) . ?\x308e)
+    ((?w ?a) . ?\x308f)
+    ((?w ?i) . ?\x3090)
+    ((?w ?e) . ?\x3091)
+    ((?w ?o) . ?\x3092)
+    ((?n ?5) . ?\x3093)
+    ((?v ?u) . ?\x3094)
+    ((?\" ?5) . ?\x309b)
+    ((?0 ?5) . ?\x309c)
+    ((?* ?5) . ?\x309d)
+    ((?+ ?5) . ?\x309e)
+    ((?a ?6) . ?\x30a1)
+    ((?A ?6) . ?\x30a2)
+    ((?i ?6) . ?\x30a3)
+    ((?I ?6) . ?\x30a4)
+    ((?u ?6) . ?\x30a5)
+    ((?U ?6) . ?\x30a6)
+    ((?e ?6) . ?\x30a7)
+    ((?E ?6) . ?\x30a8)
+    ((?o ?6) . ?\x30a9)
+    ((?O ?6) . ?\x30aa)
+    ((?K ?a) . ?\x30ab)
+    ((?G ?a) . ?\x30ac)
+    ((?K ?i) . ?\x30ad)
+    ((?G ?i) . ?\x30ae)
+    ((?K ?u) . ?\x30af)
+    ((?G ?u) . ?\x30b0)
+    ((?K ?e) . ?\x30b1)
+    ((?G ?e) . ?\x30b2)
+    ((?K ?o) . ?\x30b3)
+    ((?G ?o) . ?\x30b4)
+    ((?S ?a) . ?\x30b5)
+    ((?Z ?a) . ?\x30b6)
+    ((?S ?i) . ?\x30b7)
+    ((?Z ?i) . ?\x30b8)
+    ((?S ?u) . ?\x30b9)
+    ((?Z ?u) . ?\x30ba)
+    ((?S ?e) . ?\x30bb)
+    ((?Z ?e) . ?\x30bc)
+    ((?S ?o) . ?\x30bd)
+    ((?Z ?o) . ?\x30be)
+    ((?T ?a) . ?\x30bf)
+    ((?D ?a) . ?\x30c0)
+    ((?T ?i) . ?\x30c1)
+    ((?D ?i) . ?\x30c2)
+    ((?T ?U) . ?\x30c3)
+    ((?T ?u) . ?\x30c4)
+    ((?D ?u) . ?\x30c5)
+    ((?T ?e) . ?\x30c6)
+    ((?D ?e) . ?\x30c7)
+    ((?T ?o) . ?\x30c8)
+    ((?D ?o) . ?\x30c9)
+    ((?N ?a) . ?\x30ca)
+    ((?N ?i) . ?\x30cb)
+    ((?N ?u) . ?\x30cc)
+    ((?N ?e) . ?\x30cd)
+    ((?N ?o) . ?\x30ce)
+    ((?H ?a) . ?\x30cf)
+    ((?B ?a) . ?\x30d0)
+    ((?P ?a) . ?\x30d1)
+    ((?H ?i) . ?\x30d2)
+    ((?B ?i) . ?\x30d3)
+    ((?P ?i) . ?\x30d4)
+    ((?H ?u) . ?\x30d5)
+    ((?B ?u) . ?\x30d6)
+    ((?P ?u) . ?\x30d7)
+    ((?H ?e) . ?\x30d8)
+    ((?B ?e) . ?\x30d9)
+    ((?P ?e) . ?\x30da)
+    ((?H ?o) . ?\x30db)
+    ((?B ?o) . ?\x30dc)
+    ((?P ?o) . ?\x30dd)
+    ((?u ?R) . ?\x2515)
+    ((?U ?r) . ?\x2516)
+    ((?U ?R) . ?\x2517)
+    ((?u ?l) . ?\x2518)
+    ((?u ?L) . ?\x2519)
+    ((?U ?l) . ?\x251a)
+    ((?U ?L) . ?\x251b)
+    ((?v ?r) . ?\x251c)
+    ((?v ?R) . ?\x251d)
+    ((?V ?r) . ?\x2520)
+    ((?V ?R) . ?\x2523)
+    ((?v ?l) . ?\x2524)
+    ((?v ?L) . ?\x2525)
+    ((?V ?l) . ?\x2528)
+    ((?V ?L) . ?\x252b)
+    ((?d ?h) . ?\x252c)
+    ((?d ?H) . ?\x252f)
+    ((?D ?h) . ?\x2530)
+    ((?D ?H) . ?\x2533)
+    ((?u ?h) . ?\x2534)
+    ((?u ?H) . ?\x2537)
+    ((?U ?h) . ?\x2538)
+    ((?U ?H) . ?\x253b)
+    ((?v ?h) . ?\x253c)
+    ((?v ?H) . ?\x253f)
+    ((?V ?h) . ?\x2542)
+    ((?V ?H) . ?\x254b)
+    ((?F ?D) . ?\x2571)
+    ((?B ?D) . ?\x2572)
+    ((?T ?B) . ?\x2580)
+    ((?L ?B) . ?\x2584)
+    ((?F ?B) . ?\x2588)
+    ((?l ?B) . ?\x258c)
+    ((?R ?B) . ?\x2590)
+    ((?. ?S) . ?\x2591)
+    ((?: ?S) . ?\x2592)
+    ((?? ?S) . ?\x2593)
+    ((?f ?S) . ?\x25a0)
+    ((?O ?S) . ?\x25a1)
+    ((?R ?O) . ?\x25a2)
+    ((?R ?r) . ?\x25a3)
+    ((?R ?F) . ?\x25a4)
+    ((?R ?Y) . ?\x25a5)
+    ((?R ?H) . ?\x25a6)
+    ((?R ?Z) . ?\x25a7)
+    ((?R ?K) . ?\x25a8)
+    ((?R ?X) . ?\x25a9)
+    ((?s ?B) . ?\x25aa)
+    ((?S ?R) . ?\x25ac)
+    ((?O ?r) . ?\x25ad)
+    ((?U ?T) . ?\x25b2)
+    ((?u ?T) . ?\x25b3)
+    ((?P ?R) . ?\x25b6)
+    ((?T ?r) . ?\x25b7)
+    ((?D ?t) . ?\x25bc)
+    ((?d ?T) . ?\x25bd)
+    ((?P ?L) . ?\x25c0)
+    ((?T ?l) . ?\x25c1)
+    ((?D ?b) . ?\x25c6)
+    ((?D ?w) . ?\x25c7)
+    ((?L ?Z) . ?\x25ca)
+    ((?0 ?m) . ?\x25cb)
+    ((?0 ?o) . ?\x25ce)
+    ((?0 ?M) . ?\x25cf)
+    ((?0 ?L) . ?\x25d0)
+    ((?0 ?R) . ?\x25d1)
+    ((?S ?n) . ?\x25d8)
+    ((?I ?c) . ?\x25d9)
+    ((?F ?d) . ?\x25e2)
+    ((?B ?d) . ?\x25e3)
+    ((?* ?2) . ?\x2605)
+    ((?* ?1) . ?\x2606)
+    ((?< ?H) . ?\x261c)
+    ((?> ?H) . ?\x261e)
+    ((?0 ?u) . ?\x263a)
+    ((?0 ?U) . ?\x263b)
+    ((?S ?U) . ?\x263c)
+    ((?F ?m) . ?\x2640)
+    ((?M ?l) . ?\x2642)
+    ((?c ?S) . ?\x2660)
+    ((?c ?H) . ?\x2661)
+    ((?c ?D) . ?\x2662)
+    ((?c ?C) . ?\x2663)
+    ((?M ?d) . ?\x2669)
+    ((?M ?8) . ?\x266a)
+    ((?M ?2) . ?\x266b)
+    ((?M ?b) . ?\x266d)
+    ((?M ?x) . ?\x266e)
+    ((?M ?X) . ?\x266f)
+    ((?O ?K) . ?\x2713)
+    ((?X ?X) . ?\x2717)
+    ((?- ?X) . ?\x2720)
+    ((?I ?S) . ?\x3000)
+    ((?, ?_) . ?\x3001)
+    ((?. ?_) . ?\x3002)
+    ((?+ ?\") . ?\x3003)
+    ((?+ ?_) . ?\x3004)
+    ((?* ?_) . ?\x3005)
+    ((?\; ?_) . ?\x3006)
+    ((?0 ?_) . ?\x3007)
+    ((?< ?+) . ?\x300a)
+    ((?> ?+) . ?\x300b)
+    ((?< ?') . ?\x300c)
+    ((?> ?') . ?\x300d)
+    ((?< ?\") . ?\x300e)
+    ((?> ?\") . ?\x300f)
+    ((?\( ?\") . ?\x3010)
+    ((?\) ?\") . ?\x3011)
+    ((?= ?T) . ?\x3012)
+    ((?= ?_) . ?\x3013)
+    ((?\( ?') . ?\x3014)
+    ((?\) ?') . ?\x3015)
+    ((?\( ?I) . ?\x3016)
+    ((?\) ?I) . ?\x3017)
+    ((?- ??) . ?\x301c)
+    ((?A ?5) . ?\x3041)
+    ((?a ?5) . ?\x3042)
+    ((?I ?5) . ?\x3043)
+    ((?i ?5) . ?\x3044)
+    ((?U ?5) . ?\x3045)
+    ((?u ?5) . ?\x3046)
+    ((?E ?5) . ?\x3047)
+    ((?e ?5) . ?\x3048)
+    ((?O ?5) . ?\x3049)
+    ((?o ?5) . ?\x304a)
+    ((?k ?a) . ?\x304b)
+    ((?g ?a) . ?\x304c)
+    ((?k ?i) . ?\x304d)
+    ((?g ?i) . ?\x304e)
+    ((?k ?u) . ?\x304f)
+    ((?g ?u) . ?\x3050)
+    ((?k ?e) . ?\x3051)
+    ((?g ?e) . ?\x3052)
+    ((?k ?o) . ?\x3053)
+    ((?g ?o) . ?\x3054)
+    ((?s ?a) . ?\x3055)
+    ((?z ?a) . ?\x3056)
+    ((?s ?i) . ?\x3057)
+    ((?z ?i) . ?\x3058)
+    ((?s ?u) . ?\x3059)
+    ((?z ?u) . ?\x305a)
+    ((?s ?e) . ?\x305b)
+    ((?z ?e) . ?\x305c)
+    ((?s ?o) . ?\x305d)
+    ((?z ?o) . ?\x305e)
+    ((?t ?a) . ?\x305f)
+    ((?d ?a) . ?\x3060)
+    ((?t ?i) . ?\x3061)
+    ((?d ?i) . ?\x3062)
+    ((?t ?U) . ?\x3063)
+    ((?t ?u) . ?\x3064)
+    ((?d ?u) . ?\x3065)
+    ((?t ?e) . ?\x3066)
+    ((?d ?e) . ?\x3067)
+    ((?t ?o) . ?\x3068)
+    ((?d ?o) . ?\x3069)
+    ((?n ?a) . ?\x306a)
+    ((?n ?i) . ?\x306b)
+    ((?n ?u) . ?\x306c)
+    ((?n ?e) . ?\x306d)
+    ((?n ?o) . ?\x306e)
+    ((?h ?a) . ?\x306f)
+    ((?b ?a) . ?\x3070)
+    ((?p ?a) . ?\x3071)
+    ((?h ?i) . ?\x3072)
+    ((?b ?i) . ?\x3073)
+    ((?p ?i) . ?\x3074)
+    ((?h ?u) . ?\x3075)
+    ((?b ?u) . ?\x3076)
+    ((?p ?u) . ?\x3077)
+    ((?h ?e) . ?\x3078)
+    ((?b ?e) . ?\x3079)
+    ((?p ?e) . ?\x307a)
+    ((?h ?o) . ?\x307b)
+    ((?b ?o) . ?\x307c)
+    ((?p ?o) . ?\x307d)
+    ((?m ?a) . ?\x307e)
+    ((?m ?i) . ?\x307f)
+    ((?m ?u) . ?\x3080)
+    ((?m ?e) . ?\x3081)
+    ((?m ?o) . ?\x3082)
+    ((?y ?A) . ?\x3083)
+    ((?y ?a) . ?\x3084)
+    ((?y ?U) . ?\x3085)
+    ((?y ?u) . ?\x3086)
+    ((?y ?O) . ?\x3087)
+    ((?y ?o) . ?\x3088)
+    ((?r ?a) . ?\x3089)
+    ((?r ?i) . ?\x308a)
+    ((?r ?u) . ?\x308b)
+    ((?r ?e) . ?\x308c)
+    ((?r ?o) . ?\x308d)
+    ((?w ?A) . ?\x308e)
+    ((?w ?a) . ?\x308f)
+    ((?w ?i) . ?\x3090)
+    ((?w ?e) . ?\x3091)
+    ((?w ?o) . ?\x3092)
+    ((?n ?5) . ?\x3093)
+    ((?v ?u) . ?\x3094)
+    ((?\" ?5) . ?\x309b)
+    ((?0 ?5) . ?\x309c)
+    ((?* ?5) . ?\x309d)
+    ((?+ ?5) . ?\x309e)
+    ((?a ?6) . ?\x30a1)
+    ((?A ?6) . ?\x30a2)
+    ((?i ?6) . ?\x30a3)
+    ((?I ?6) . ?\x30a4)
+    ((?u ?6) . ?\x30a5)
+    ((?U ?6) . ?\x30a6)
+    ((?e ?6) . ?\x30a7)
+    ((?E ?6) . ?\x30a8)
+    ((?o ?6) . ?\x30a9)
+    ((?O ?6) . ?\x30aa)
+    ((?K ?a) . ?\x30ab)
+    ((?G ?a) . ?\x30ac)
+    ((?K ?i) . ?\x30ad)
+    ((?G ?i) . ?\x30ae)
+    ((?K ?u) . ?\x30af)
+    ((?G ?u) . ?\x30b0)
+    ((?K ?e) . ?\x30b1)
+    ((?G ?e) . ?\x30b2)
+    ((?K ?o) . ?\x30b3)
+    ((?G ?o) . ?\x30b4)
+    ((?S ?a) . ?\x30b5)
+    ((?Z ?a) . ?\x30b6)
+    ((?S ?i) . ?\x30b7)
+    ((?Z ?i) . ?\x30b8)
+    ((?S ?u) . ?\x30b9)
+    ((?Z ?u) . ?\x30ba)
+    ((?S ?e) . ?\x30bb)
+    ((?Z ?e) . ?\x30bc)
+    ((?S ?o) . ?\x30bd)
+    ((?Z ?o) . ?\x30be)
+    ((?T ?a) . ?\x30bf)
+    ((?D ?a) . ?\x30c0)
+    ((?T ?i) . ?\x30c1)
+    ((?D ?i) . ?\x30c2)
+    ((?T ?U) . ?\x30c3)
+    ((?T ?u) . ?\x30c4)
+    ((?D ?u) . ?\x30c5)
+    ((?T ?e) . ?\x30c6)
+    ((?D ?e) . ?\x30c7)
+    ((?T ?o) . ?\x30c8)
+    ((?D ?o) . ?\x30c9)
+    ((?N ?a) . ?\x30ca)
+    ((?N ?i) . ?\x30cb)
+    ((?N ?u) . ?\x30cc)
+    ((?N ?e) . ?\x30cd)
+    ((?N ?o) . ?\x30ce)
+    ((?H ?a) . ?\x30cf)
+    ((?B ?a) . ?\x30d0)
+    ((?P ?a) . ?\x30d1)
+    ((?H ?i) . ?\x30d2)
+    ((?B ?i) . ?\x30d3)
+    ((?P ?i) . ?\x30d4)
+    ((?H ?u) . ?\x30d5)
+    ((?B ?u) . ?\x30d6)
+    ((?P ?u) . ?\x30d7)
+    ((?H ?e) . ?\x30d8)
+    ((?B ?e) . ?\x30d9)
+    ((?P ?e) . ?\x30da)
+    ((?H ?o) . ?\x30db)
+    ((?B ?o) . ?\x30dc)
+    ((?P ?o) . ?\x30dd)
+    ((?M ?a) . ?\x30de)
+    ((?M ?i) . ?\x30df)
+    ((?M ?u) . ?\x30e0)
+    ((?M ?e) . ?\x30e1)
+    ((?M ?o) . ?\x30e2)
+    ((?Y ?A) . ?\x30e3)
+    ((?Y ?a) . ?\x30e4)
+    ((?Y ?U) . ?\x30e5)
+    ((?Y ?u) . ?\x30e6)
+    ((?Y ?O) . ?\x30e7)
+    ((?Y ?o) . ?\x30e8)
+    ((?R ?a) . ?\x30e9)
+    ((?R ?i) . ?\x30ea)
+    ((?R ?u) . ?\x30eb)
+    ((?R ?e) . ?\x30ec)
+    ((?R ?o) . ?\x30ed)
+    ((?W ?A) . ?\x30ee)
+    ((?W ?a) . ?\x30ef)
+    ((?W ?i) . ?\x30f0)
+    ((?W ?e) . ?\x30f1)
+    ((?W ?o) . ?\x30f2)
+    ((?N ?6) . ?\x30f3)
+    ((?V ?u) . ?\x30f4)
+    ((?K ?A) . ?\x30f5)
+    ((?K ?E) . ?\x30f6)
+    ((?V ?a) . ?\x30f7)
+    ((?V ?i) . ?\x30f8)
+    ((?V ?e) . ?\x30f9)
+    ((?V ?o) . ?\x30fa)
+    ((?. ?6) . ?\x30fb)
+    ((?- ?6) . ?\x30fc)
+    ((?* ?6) . ?\x30fd)
+    ((?+ ?6) . ?\x30fe)
+    ((?b ?4) . ?\x3105)
+    ((?p ?4) . ?\x3106)
+    ((?m ?4) . ?\x3107)
+    ((?f ?4) . ?\x3108)
+    ((?d ?4) . ?\x3109)
+    ((?t ?4) . ?\x310a)
+    ((?n ?4) . ?\x310b)
+    ((?l ?4) . ?\x310c)
+    ((?g ?4) . ?\x310d)
+    ((?k ?4) . ?\x310e)
+    ((?h ?4) . ?\x310f)
+    ((?j ?4) . ?\x3110)
+    ((?q ?4) . ?\x3111)
+    ((?x ?4) . ?\x3112)
+    ((?z ?h) . ?\x3113)
+    ((?c ?h) . ?\x3114)
+    ((?s ?h) . ?\x3115)
+    ((?r ?4) . ?\x3116)
+    ((?z ?4) . ?\x3117)
+    ((?c ?4) . ?\x3118)
+    ((?s ?4) . ?\x3119)
+    ((?a ?4) . ?\x311a)
+    ((?o ?4) . ?\x311b)
+    ((?e ?4) . ?\x311c)
+    ((?a ?i) . ?\x311e)
+    ((?e ?i) . ?\x311f)
+    ((?a ?u) . ?\x3120)
+    ((?o ?u) . ?\x3121)
+    ((?a ?n) . ?\x3122)
+    ((?e ?n) . ?\x3123)
+    ((?a ?N) . ?\x3124)
+    ((?e ?N) . ?\x3125)
+    ((?e ?r) . ?\x3126)
+    ((?i ?4) . ?\x3127)
+    ((?u ?4) . ?\x3128)
+    ((?i ?u) . ?\x3129)
+    ((?v ?4) . ?\x312a)
+    ((?n ?G) . ?\x312b)
+    ((?g ?n) . ?\x312c)
+    ((?1 ?c) . ?\x3220)
+    ((?2 ?c) . ?\x3221)
+    ((?3 ?c) . ?\x3222)
+    ((?4 ?c) . ?\x3223)
+    ((?5 ?c) . ?\x3224)
+    ((?6 ?c) . ?\x3225)
+    ((?7 ?c) . ?\x3226)
+    ((?8 ?c) . ?\x3227)
+    ((?9 ?c) . ?\x3228)
+    ((?\s ?\s) . ?\xe000)
+    ((?/ ?c) . ?\xe001)
+    ((?U ?A) . ?\xe002)
+    ((?U ?B) . ?\xe003)
+    ((?\" ?3) . ?\xe004)
+    ((?\" ?1) . ?\xe005)
+    ((?\" ?!) . ?\xe006)
+    ((?\" ?') . ?\xe007)
+    ((?\" ?>) . ?\xe008)
+    ((?\" ??) . ?\xe009)
+    ((?\" ?-) . ?\xe00a)
+    ((?\" ?\() . ?\xe00b)
+    ((?\" ?.) . ?\xe00c)
+    ((?\" ?:) . ?\xe00d)
+    ((?\" ?0) . ?\xe00e)
+    ((?\" ?\") . ?\xe00f)
+    ((?\" ?<) . ?\xe010)
+    ((?\" ?,) . ?\xe011)
+    ((?\" ?\;) . ?\xe012)
+    ((?\" ?_) . ?\xe013)
+    ((?\" ?=) . ?\xe014)
+    ((?\" ?/) . ?\xe015)
+    ((?\" ?i) . ?\xe016)
+    ((?\" ?d) . ?\xe017)
+    ((?\" ?p) . ?\xe018)
+    ((?\; ?\;) . ?\xe019)
+    ((?, ?,) . ?\xe01a)
+    ((?b ?3) . ?\xe01b)
+    ((?C ?i) . ?\xe01c)
+    ((?f ?\() . ?\xe01d)
+    ((?e ?d) . ?\xe01e)
+    ((?a ?m) . ?\xe01f)
+    ((?p ?m) . ?\xe020)
+    ((?F ?l) . ?\xe023)
+    ((?G ?F) . ?\xe024)
+    ((?> ?V) . ?\xe025)
+    ((?! ?*) . ?\xe026)
+    ((?? ?*) . ?\xe027)
+    ((?J ?<) . ?\xe028)
+    ((?f ?f) . ?\xfb00)
+    ((?f ?i) . ?\xfb01)
+    ((?f ?l) . ?\xfb02)
+    ((?f ?t) . ?\xfb05)
+    ((?s ?t) . ?\xfb06)
+    ((?~ ?!) . ?\x00a1)
+    ((?c ?|) . ?\x00a2)
+    ((?$ ?$) . ?\x00a3)
+    ((?o ?x) . ?\x00a4)
+    ((?Y ?-) . ?\x00a5)
+    ((?| ?|) . ?\x00a6)
+    ((?c ?O) . ?\x00a9)
+    ((?- ?,) . ?\x00ac)
+    ((?- ?=) . ?\x00af)
+    ((?~ ?o) . ?\x00b0)
+    ((?2 ?2) . ?\x00b2)
+    ((?3 ?3) . ?\x00b3)
+    ((?p ?p) . ?\x00b6)
+    ((?~ ?.) . ?\x00b7)
+    ((?1 ?1) . ?\x00b9)
+    ((?~ ??) . ?\x00bf)
+    ((?A ?`) . ?\x00c0)
+    ((?A ?^) . ?\x00c2)
+    ((?A ?~) . ?\x00c3)
+    ((?A ?\") . ?\x00c4)
+    ((?A ?@) . ?\x00c5)
+    ((?E ?`) . ?\x00c8)
+    ((?E ?^) . ?\x00ca)
+    ((?E ?\") . ?\x00cb)
+    ((?I ?`) . ?\x00cc)
+    ((?I ?^) . ?\x00ce)
+    ((?I ?\") . ?\x00cf)
+    ((?N ?~) . ?\x00d1)
+    ((?O ?`) . ?\x00d2)
+    ((?O ?^) . ?\x00d4)
+    ((?O ?~) . ?\x00d5)
+    ((?/ ?\\) . ?\x00d7)
+    ((?U ?`) . ?\x00d9)
+    ((?U ?^) . ?\x00db)
+    ((?I ?p) . ?\x00de)
+    ((?a ?`) . ?\x00e0)
+    ((?a ?^) . ?\x00e2)
+    ((?a ?~) . ?\x00e3)
+    ((?a ?\") . ?\x00e4)
+    ((?a ?@) . ?\x00e5)
+    ((?e ?`) . ?\x00e8)
+    ((?e ?^) . ?\x00ea)
+    ((?e ?\") . ?\x00eb)
+    ((?i ?`) . ?\x00ec)
+    ((?i ?^) . ?\x00ee)
+    ((?n ?~) . ?\x00f1)
+    ((?o ?`) . ?\x00f2)
+    ((?o ?^) . ?\x00f4)
+    ((?o ?~) . ?\x00f5)
+    ((?u ?`) . ?\x00f9)
+    ((?u ?^) . ?\x00fb)
+    ((?y ?\") . ?\x00ff))
+  "Table of default digraphs.
+This includes all digraphs defined in RFC 1345,
+as well as miscellaneous digraphs for multi-byte characters.
+See also `evil-digraphs-table-user'.")
+
+(defun evil-digraph (digraph)
+  "Convert DIGRAPH to character or list representation.
+If DIGRAPH is a list (CHAR1 CHAR2), return the corresponding character;
+if DIGRAPH is a character, return the corresponding list.
+Searches in `evil-digraphs-table-user' and `evil-digraphs-table'."
+  (if (listp digraph)
+      (let* ((char1 (car digraph))
+             (char2 (cadr digraph)))
+        (or (cdr (assoc (list char1 char2) evil-digraphs-table-user))
+            (cdr (assoc (list char1 char2) evil-digraphs-table))
+            (unless (eq char1 char2)
+              (or (cdr (assoc (list char2 char1) evil-digraphs-table-user))
+                  (cdr (assoc (list char2 char1) evil-digraphs-table))))))
+    (or (car (rassoc digraph evil-digraphs-table-user))
+        (car (rassoc digraph evil-digraphs-table)))))
+
+(provide 'evil-digraphs)
+
+;;; evil-digraphs.el ends here
diff --git a/elpa/evil-1.0.1/evil-ex.el b/elpa/evil-1.0.1/evil-ex.el
new file mode 100644
index 00000000..48ed13e5
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-ex.el
@@ -0,0 +1,1044 @@
+;;; evil-ex.el --- Ex-mode
+
+;; Author: Frank Fischer <frank fischer at mathematik.tu-chemnitz.de>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Ex is implemented as an extensible minilanguage, whose grammar
+;; is stored in `evil-ex-grammar'.  Ex commands are defined with
+;; `evil-ex-define-cmd', which creates a binding from a string
+;; to an interactive function.  It is also possible to define key
+;; sequences which execute a command immediately when entered:
+;; such shortcuts go in `evil-ex-map'.
+;;
+;; To provide buffer and filename completion, as well as interactive
+;; feedback, Ex defines the concept of an argument handler, specified
+;; with `evil-ex-define-argument-type'.  In the case of the
+;; substitution command (":s/foo/bar"), the handler incrementally
+;; highlights matches in the buffer as the substitution is typed.
+
+(require 'evil-common)
+(require 'evil-states)
+
+;;; Code:
+
+(defconst evil-ex-grammar
+  '((expression
+     (count command argument #'evil-ex-call-command)
+     ((\? range) command argument #'evil-ex-call-command)
+     (line #'evil-goto-line)
+     (sexp #'eval-expression))
+    (count
+     number)
+    (command #'evil-ex-parse-command)
+    (binding
+     "[~&*@<>=:]+\\|[[:alpha:]-]+\\|!")
+    (bang
+     (\? (! space) "!" #'$1))
+    (argument
+     ((\? space) (\? "\\(?:.\\|\n\\)+") #'$2))
+    (range
+     ("%" #'(evil-ex-full-range))
+     (line (\? "[,;]" line #'$2) #'evil-ex-range))
+    (line
+     (base (\? offset) #'evil-ex-line)
+     ((\? base) offset #'evil-ex-line))
+    (base
+     number
+     marker
+     search
+     ("\\^" #'(evil-ex-first-line))
+     ("\\$" #'(evil-ex-last-line))
+     ("\\." #'(evil-ex-current-line)))
+    (offset
+     (+ signed-number #'+))
+    (marker
+     ("'" "[-a-zA-Z_<>']" #'(evil-ex-marker $2)))
+    (search
+     forward
+     backward
+     next
+     prev
+     subst)
+    (forward
+     ("/" "\\(?:[\\].\\|[^/,; ]\\)+" (! "/")
+      #'(evil-ex-re-fwd $2))
+     ("/" "\\(?:[\\].\\|[^/]\\)+" "/"
+      #'(evil-ex-re-fwd $2)))
+    (backward
+     ("\\?" "\\(?:[\\].\\|[^?,; ]\\)+" (! "\\?")
+      #'(evil-ex-re-bwd $2))
+     ("\\?" "\\(?:[\\].\\|[^?]\\)+" "\\?"
+      #'(evil-ex-re-bwd $2)))
+    (next
+     "\\\\/" #'(evil-ex-prev-search))
+    (prev
+     "\\\\\\?" #'(evil-ex-prev-search))
+    (subst
+     "\\\\&" #'(evil-ex-prev-search))
+    (signed-number
+     (sign (\? number) #'evil-ex-signed-number))
+    (sign
+     "\\+\\|-" #'intern)
+    (number
+     "[0-9]+" #'string-to-number)
+    (space
+     "[ ]+")
+    (sexp
+     "(.*)" #'(car-safe (read-from-string $1))))
+  "Grammar for Ex.
+An association list of syntactic symbols and their definitions.
+The first entry is the start symbol.  A symbol's definition may
+reference other symbols, but the grammar cannot contain
+left recursion.  See `evil-parser' for a detailed explanation
+of the syntax.")
+
+(defun evil-ex-p ()
+  "Whether Ex is currently active."
+  (and evil-ex-current-buffer t))
+
+(evil-define-command evil-ex (&optional initial-input)
+  "Enter an Ex command."
+  :keep-visual t
+  (interactive
+   (cond
+    ((evil-visual-state-p)
+     '("'<,'>"))
+    (current-prefix-arg
+     (let ((arg (prefix-numeric-value current-prefix-arg)))
+       (cond ((< arg 0) (setq arg (1+ arg)))
+             ((> arg 0) (setq arg (1- arg))))
+       (if (= arg 0) '(".")
+         `(,(format ".,.%+d" arg)))))))
+  (let ((minibuffer-local-completion-map evil-ex-completion-map)
+        (evil-ex-current-buffer (current-buffer))
+        (evil-ex-previous-command (unless initial-input
+                                    (car-safe evil-ex-history)))
+        evil-ex-argument-handler evil-ex-info-string result)
+    (add-hook 'minibuffer-setup-hook #'evil-ex-setup)
+    (setq result (read-from-minibuffer
+                  ":"
+                  (or initial-input
+                      (and evil-ex-previous-command
+                           (format "(default: %s) "
+                                   evil-ex-previous-command)))
+                  evil-ex-completion-map
+                  nil
+                  'evil-ex-history
+                  evil-ex-previous-command
+                  t))
+    (when (zerop (length result))
+      (setq result evil-ex-previous-command))
+    (evil-ex-update nil nil nil result)
+    (unless (zerop (length result))
+      (if evil-ex-expression
+          (eval evil-ex-expression)
+        (error "Ex: syntax error")))))
+
+(defun evil-ex-delete-backward-char ()
+  "Close the minibuffer if it is empty.
+Otherwise behaves like `delete-backward-char'."
+  (interactive)
+  (call-interactively
+   (if (zerop (length (minibuffer-contents)))
+       #'abort-recursive-edit
+     #'delete-backward-char)))
+
+(defun evil-ex-setup ()
+  "Initialize Ex minibuffer."
+  (add-hook 'after-change-functions #'evil-ex-update nil t)
+  (add-hook 'minibuffer-exit-hook #'evil-ex-teardown)
+  (when evil-ex-previous-command
+    (add-hook 'pre-command-hook #'evil-ex-remove-default))
+  (remove-hook 'minibuffer-setup-hook #'evil-ex-setup)
+  (with-no-warnings
+    (make-variable-buffer-local 'completion-at-point-functions))
+  (setq completion-at-point-functions
+        '(evil-ex-completion-at-point)))
+(put 'evil-ex-setup 'permanent-local-hook t)
+
+(defun evil-ex-teardown ()
+  "Deinitialize Ex minibuffer."
+  (remove-hook 'minibuffer-exit-hook #'evil-ex-teardown)
+  (remove-hook 'after-change-functions #'evil-ex-update t)
+  (when evil-ex-argument-handler
+    (let ((runner (evil-ex-argument-handler-runner
+                   evil-ex-argument-handler)))
+      (when runner
+        (funcall runner 'stop)))))
+(put 'evil-ex-teardown 'permanent-local-hook t)
+
+(defun evil-ex-remove-default ()
+  (delete-minibuffer-contents)
+  (remove-hook 'pre-command-hook #'evil-ex-remove-default))
+(put 'evil-ex-remove-default 'permanent-local-hook t)
+
+(defun evil-ex-update (&optional beg end len string)
+  "Update Ex variables when the minibuffer changes.
+This function is usually called from `after-change-functions'
+hook. If BEG is non-nil (which is the case when called from
+`after-change-functions'), then an error description is shown
+in case of incomplete or unknown commands."
+  (let* ((prompt (minibuffer-prompt-end))
+         (string (or string (buffer-substring prompt (point-max))))
+         arg bang cmd count expr func handler range tree type)
+    (cond
+     ((and (eq this-command #'self-insert-command)
+           (commandp (setq cmd (lookup-key evil-ex-map string))))
+      (setq evil-ex-expression `(call-interactively #',cmd))
+      (when (minibufferp)
+        (exit-minibuffer)))
+     (t
+      (setq cmd nil)
+      ;; store the buffer position of each character
+      ;; as the `ex-index' text property
+      (dotimes (i (length string))
+        (add-text-properties
+         i (1+ i) (list 'ex-index (+ i prompt)) string))
+      (with-current-buffer evil-ex-current-buffer
+        (setq tree (evil-ex-parse string t)
+              expr (evil-ex-parse string))
+        (when (eq (car-safe expr) 'evil-ex-call-command)
+          (setq count (eval (nth 1 expr))
+                cmd (eval (nth 2 expr))
+                arg (eval (nth 3 expr))
+                range (cond
+                       ((evil-range-p count)
+                        count)
+                       ((numberp count)
+                        (evil-ex-range count count)))
+                bang (and (string-match ".!$" cmd) t))))
+      (setq evil-ex-tree tree
+            evil-ex-expression expr
+            evil-ex-range range
+            evil-ex-command cmd
+            evil-ex-bang bang
+            evil-ex-argument arg)
+      ;; test the current command
+      (when (and cmd (minibufferp))
+        (setq func (evil-ex-completed-binding cmd t))
+        (cond
+         ;; update argument-handler
+         (func
+          (when (setq type (evil-get-command-property
+                            func :ex-arg))
+            (setq handler (cdr-safe
+                           (assoc type
+                                  evil-ex-argument-types))))
+          (unless (eq handler evil-ex-argument-handler)
+            (let ((runner (and evil-ex-argument-handler
+                               (evil-ex-argument-handler-runner
+                                evil-ex-argument-handler))))
+              (when runner (funcall runner 'stop)))
+            (setq evil-ex-argument-handler handler)
+            (let ((runner (and evil-ex-argument-handler
+                               (evil-ex-argument-handler-runner
+                                evil-ex-argument-handler))))
+              (when runner (funcall runner 'start evil-ex-argument))))
+          (let ((runner (and evil-ex-argument-handler
+                             (evil-ex-argument-handler-runner
+                              evil-ex-argument-handler))))
+            (when runner (funcall runner 'update evil-ex-argument))))
+         ((all-completions cmd evil-ex-commands)
+          ;; show error message only when called from `after-change-functions'
+          (when beg (evil-ex-echo "Incomplete command")))
+         (t
+          ;; show error message only when called from `after-change-functions'
+          (when beg (evil-ex-echo "Unknown command")))))))))
+(put 'evil-ex-update 'permanent-local-hook t)
+
+(defun evil-ex-echo (string &rest args)
+  "Display a message after the current Ex command."
+  (with-selected-window (minibuffer-window)
+    (with-current-buffer (window-buffer (minibuffer-window))
+      (unless (or evil-no-display
+                  (zerop (length string)))
+        (let ((string (format " [%s]" (apply #'format string args)))
+              after-change-functions before-change-functions)
+          (put-text-property 0 (length string) 'face 'evil-ex-info string)
+          (minibuffer-message string))))))
+
+(defun evil-ex-define-cmd (cmd function)
+  "Binds the function FUNCTION to the command CMD."
+  (if (string-match "^[^][]*\\(\\[\\(.*\\)\\]\\)[^][]*$" cmd)
+      (let ((abbrev (replace-match "" nil t cmd 1))
+            (full (replace-match "\\2" nil nil cmd 1)))
+        (evil-add-to-alist 'evil-ex-commands full function)
+        (evil-add-to-alist 'evil-ex-commands abbrev full))
+    (evil-add-to-alist 'evil-ex-commands cmd function)))
+
+(defun evil-ex-make-argument-handler (runner completer)
+  (list runner completer))
+
+(defun evil-ex-argument-handler-runner (arg-handler)
+  (car arg-handler))
+
+(defun evil-ex-argument-handler-completer (arg-handler)
+  (cadr arg-handler))
+
+(defmacro evil-ex-define-argument-type (arg-type doc &rest body)
+  "Defines a new handler for argument-type ARG-TYPE.
+DOC is the documentation string. It is followed by a list of
+keywords and function:
+
+:completer FUNC     Function to be called to initialize a
+                    potential completion. FUNC must match the
+                    requirements as described for the variable
+                    `completion-at-point-functions'. When FUNC is
+                    called the minibuffer content is narrowed to
+                    exactly match the argument.
+
+:runner FUNC        Function to be called when the type of the
+                    current argument changes or when the content
+                    of this argument changes. This function
+                    should take one obligatory argument FLAG
+                    followed by an optional argument ARG. FLAG is
+                    one of three symbol 'start, 'stop or
+                    'update. When the argument type is recognized
+                    for the first time and this handler is
+                    started the FLAG is 'start. If the argument
+                    type changes to something else or ex state
+                    finished the handler FLAG is 'stop. If the
+                    content of the argument has changed FLAG is
+                    'update. If FLAG is either 'start or 'update
+                    then ARG is the current value of this
+                    argument. If FLAG is 'stop then arg is nil."
+  (declare (indent defun)
+           (debug (&define name
+                           [&optional stringp]
+                           [&rest [keywordp function-form]])))
+  (unless (stringp doc) (push doc body))
+  (let (runner completer)
+    (while (keywordp (car-safe body))
+      (let ((key (pop body))
+            (func (pop body)))
+        (cond
+         ((eq key :runner)
+          (setq runner func))
+         ((eq key :completer)
+          (setq completer func)))))
+    `(eval-and-compile
+       (evil-add-to-alist
+        'evil-ex-argument-types
+        ',arg-type
+        '(,runner ,completer)))))
+
+(defun evil-ex-filename-completion-at-point ()
+  "Completion at point function for file arguments."
+  (list
+   (point-min) (point-max)
+   (lambda (arg predicate flag)
+     (if (null arg)
+         default-directory
+       (let ((dir (or (file-name-directory arg)
+                      (with-current-buffer evil-ex-current-buffer
+                        default-directory)))
+             (fname (file-name-nondirectory arg)))
+         (cond
+          ((null dir) (ding))
+          ((null flag)
+           (let ((result (file-name-completion fname dir)))
+             (cond
+              ((null result) nil)
+              ((eq result t) t)
+              (t (concat dir result)))))
+
+          ((eq t flag)
+           (file-name-all-completions fname dir))
+
+          ((eq 'lambda flag)
+           (eq (file-name-completion fname dir) t))))))))
+
+(evil-ex-define-argument-type file
+  "Handles a file argument."
+  :completer evil-ex-filename-completion-at-point)
+
+(evil-ex-define-argument-type buffer
+  "Called to complete a buffer name argument."
+  :completer (lambda ()
+               (list
+                (point-min) (point-max)
+                (lambda (arg predicate flag)
+                  (when arg
+                    (let ((buffers (mapcar #'(lambda (buffer)
+                                               (cons (buffer-name buffer) nil))
+                                           (buffer-list t))))
+                      (cond
+                       ((null flag)
+                        (try-completion arg buffers predicate))
+                       ((eq t flag)
+                        (all-completions arg buffers predicate))
+                       ((eq 'lambda flag)
+                        (test-completion arg buffers predicate)))))))))
+
+(declare-function shell-completion-vars "shell" ())
+
+(defun evil-ex-init-shell-argument-completion (flag &optional arg)
+  "Prepares the current minibuffer for completion of shell commands.
+This function must be called from the :runner function of some
+argument handler that requires shell completion."
+  (when (and (eq flag 'start)
+             (not evil-ex-shell-argument-initialized)
+             (require 'shell nil t)
+             (require 'comint nil t))
+    (set (make-local-variable 'evil-ex-shell-argument-initialized) t)
+    (cond
+     ;; Emacs 24
+     ((fboundp 'comint-completion-at-point)
+      (shell-completion-vars))
+     (t
+      (set (make-local-variable 'minibuffer-default-add-function)
+           'minibuffer-default-add-shell-commands)))
+    (setq completion-at-point-functions
+          '(evil-ex-completion-at-point))))
+
+;; because this variable is used only for Emacs 23 shell completion,
+;; we put it here instead of "evil-vars.el"
+(defvar evil-ex-shell-argument-range nil
+  "Internal helper variable for Emacs 23 shell completion.")
+
+(defun evil-ex-complete-shell-command-at-point ()
+  "Completion at point function for shell commands."
+  (cond
+   ;; Emacs 24
+   ((fboundp 'comint-completion-at-point)
+    (comint-completion-at-point))
+   ;; Emacs 23
+   ((fboundp 'minibuffer-complete-shell-command)
+    (set (make-local-variable 'evil-ex-shell-argument-range)
+         (list (point-min) (point-max)))
+    #'(lambda ()
+        ;; We narrow the buffer to the argument so
+        ;; `minibuffer-complete-shell-command' will correctly detect
+        ;; the beginning of the argument.  When narrowing the buffer
+        ;; to the argument the leading text in the minibuffer will be
+        ;; hidden. Therefore we add a dummy overlay which shows that
+        ;; text during narrowing.
+        (let* ((beg (car evil-ex-shell-argument-range))
+               (end (cdr evil-ex-shell-argument-range))
+               (prev-text (buffer-substring
+                           (point-min)
+                           (car evil-ex-shell-argument-range)))
+               (ov (make-overlay beg beg)))
+          (overlay-put ov 'before-string prev-text)
+          (save-restriction
+            (apply #'narrow-to-region evil-ex-shell-argument-range)
+            (minibuffer-complete-shell-command))
+          (delete-overlay ov))))))
+
+(evil-ex-define-argument-type shell
+  "Shell argument type, supports completion."
+  :completer evil-ex-complete-shell-command-at-point
+  :runner evil-ex-init-shell-argument-completion)
+
+(evil-ex-define-argument-type file-or-shell
+  "File or shell argument type.
+If the current argument starts with a ! the rest of the argument
+is considered a shell command, otherwise a file-name. Completion
+works accordingly."
+  :completer (lambda ()
+               (if (and (< (point-min) (point-max))
+                        (= (char-after (point-min)) ?!))
+                   (save-restriction
+                     (narrow-to-region (1+ (point-min)) (point-max))
+                     (evil-ex-complete-shell-command-at-point))
+                 (evil-ex-filename-completion-at-point)))
+  :runner evil-ex-init-shell-argument-completion)
+
+(defun evil-ex-binding (command &optional noerror)
+  "Returns the final binding of COMMAND."
+  (let ((binding command))
+    (when binding
+      (string-match "^\\(.+?\\)\\!?$" binding)
+      (setq binding (match-string 1 binding))
+      (while (progn
+               (setq binding (cdr (assoc binding evil-ex-commands)))
+               (stringp binding)))
+      (unless binding
+        (setq binding (intern command)))
+      (if (commandp binding)
+          binding
+        (unless noerror
+          (error "Unknown command: `%s'" command))))))
+
+(defun evil-ex-completed-binding (command &optional noerror)
+  "Returns the final binding of the completion of COMMAND."
+  (let ((completion (try-completion command evil-ex-commands)))
+    (evil-ex-binding (if (eq completion t) command
+                       (or completion command))
+                     noerror)))
+
+;;; TODO: extensions likes :p :~ <cfile> ...
+(defun evil-ex-replace-special-filenames (file-name)
+  "Replace special symbols in FILE-NAME.
+Replaces % by the current file-name,
+Replaces # by the alternate file-name in FILE-NAME."
+  (let ((current-fname (buffer-file-name))
+        (alternate-fname (and (other-buffer)
+                              (buffer-file-name (other-buffer)))))
+    (when current-fname
+      (setq file-name
+            (replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(%\\)"
+                                      current-fname file-name
+                                      t t 2)))
+    (when alternate-fname
+      (setq file-name
+            (replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(#\\)"
+                                      alternate-fname file-name
+                                      t t 2)))
+    (setq file-name
+          (replace-regexp-in-string "\\\\\\([#%]\\)"
+                                    "\\1" file-name t)))
+  file-name)
+
+(defun evil-ex-file-arg ()
+  "Returns the current Ex argument as a file name.
+This function interprets special file names like # and %."
+  (unless (or (null evil-ex-argument)
+              (zerop (length evil-ex-argument)))
+    (evil-ex-replace-special-filenames evil-ex-argument)))
+
+(defun evil-ex-run-completion-at-point ()
+  "Same as `completion-at-point' but disables `evil-ex-update' during call.
+This function calls `evil-ex-update' explicitly when
+`completion-at-point' finished."
+  (interactive)
+  (let ((after-change-functions
+         (remq 'evil-ex-update after-change-functions)))
+    (completion-at-point)
+    (evil-ex-update t)))
+
+(defun evil-ex-completion-at-point ()
+  (let ((string (minibuffer-contents))
+        (prompt (minibuffer-prompt-end))
+        context start prefix)
+    (when (= (point) (+ (length string) prompt))
+      (evil-ex-update)
+      (setq context (evil-ex-syntactic-context (1- (point))))
+      (cond
+       ((memq 'command context)
+        (setq start (or (get-text-property
+                         0 'ex-index evil-ex-command)
+                        (point))
+              prefix (buffer-substring prompt start))
+        (list start (point-max) #'evil-ex-complete-command))
+       ((memq 'argument context)
+        (let ((arg (or evil-ex-argument "")))
+          (setq start (or (get-text-property
+                           0 'ex-index arg)
+                          (point))
+                prefix (buffer-substring prompt start))
+          (let* ((binding (evil-ex-completed-binding evil-ex-command))
+                 (arg-type (evil-get-command-property binding :ex-arg))
+                 (arg-handler (assoc arg-type evil-ex-argument-types))
+                 (completer (and arg-handler
+                                 (evil-ex-argument-handler-completer
+                                  (cdr arg-handler)))))
+            (when completer
+              (save-restriction
+                (narrow-to-region start (point-max))
+                (funcall completer))))))))))
+
+(defun evil-ex-complete-command (cmd predicate flag)
+  "Called to complete a command."
+  (cond
+   ((eq flag nil)
+    (let ((result (try-completion cmd evil-ex-commands predicate)))
+      (if (and (eq result t) (evil-ex-command-force-p cmd))
+          cmd
+        result)))
+   ((eq flag t)
+    (let ((result (all-completions cmd evil-ex-commands predicate))
+          new-result)
+      (mapc #'(lambda (x)
+                (push x new-result)
+                (when (evil-ex-command-force-p cmd)
+                  (push (concat x "!") new-result)))
+            result)
+      new-result))
+   ((eq flag 'lambda)
+    (test-completion cmd evil-ex-commands predicate))))
+
+(defun evil-ex-repeat (count)
+  "Repeats the last ex command."
+  (interactive "P")
+  (when count
+    (goto-char (point-min))
+    (forward-line (1- count)))
+  (let ((evil-ex-current-buffer (current-buffer))
+        (hist evil-ex-history))
+    (while hist
+      (let ((evil-ex-last-cmd (pop hist)))
+        (when evil-ex-last-cmd
+          (evil-ex-update nil nil nil evil-ex-last-cmd)
+          (let ((binding (evil-ex-binding evil-ex-command)))
+            (unless (eq binding #'evil-ex-repeat)
+              (setq hist nil)
+              (if evil-ex-expression
+                  (eval evil-ex-expression)
+                (error "Ex: syntax error")))))))))
+
+(defun evil-ex-call-command (range command argument)
+  "Execute the given command COMMAND."
+  (let* ((count (when (numberp range) range))
+         (range (when (evil-range-p range) range))
+         (bang (and (string-match ".!$" command) t))
+         (evil-ex-range
+          (or range (and count (evil-ex-range count count))))
+         (evil-ex-command (evil-ex-completed-binding command))
+         (evil-ex-bang (and bang t))
+         (evil-ex-argument (copy-sequence argument))
+         (evil-this-type (evil-type evil-ex-range))
+         (current-prefix-arg count)
+         (prefix-arg current-prefix-arg))
+    (when (stringp evil-ex-argument)
+      (set-text-properties
+       0 (length evil-ex-argument) nil evil-ex-argument))
+    (let ((buf (current-buffer)))
+      (unwind-protect
+          (if (not evil-ex-range)
+              (call-interactively evil-ex-command)
+            ;; set visual selection to match the region if an explicit
+            ;; range has been specified
+            (let ((ex-range (evil-copy-range evil-ex-range))
+                  beg end)
+              (evil-expand-range ex-range)
+              (setq beg (evil-range-beginning ex-range)
+                    end (evil-range-end ex-range))
+              (evil-sort beg end)
+              (set-mark end)
+              (goto-char beg)
+              (activate-mark)
+              (call-interactively evil-ex-command)))
+        (when (buffer-live-p buf)
+          (with-current-buffer buf
+            (deactivate-mark)))))))
+
+(defun evil-ex-line (base &optional offset)
+  "Return the line number of BASE plus OFFSET."
+  (+ (or base (line-number-at-pos))
+     (or offset 0)))
+
+(defun evil-ex-first-line ()
+  "Return the line number of the first line."
+  (line-number-at-pos (point-min)))
+
+(defun evil-ex-current-line ()
+  "Return the line number of the current line."
+  (line-number-at-pos (point)))
+
+(defun evil-ex-last-line ()
+  "Return the line number of the last line."
+  (save-excursion
+    (goto-char (point-max))
+    (when (bolp)
+      (forward-line -1))
+    (line-number-at-pos)))
+
+(defun evil-ex-range (beg-line &optional end-line)
+  "Returns the first and last position of the current range."
+  (evil-range
+   (evil-line-position beg-line)
+   (evil-line-position (or end-line beg-line) -1)
+   'line
+   :expanded t))
+
+(defun evil-ex-full-range ()
+  "Return a range encompassing the whole buffer."
+  (evil-range (point-min) (point-max) 'line))
+
+(defun evil-ex-marker (marker)
+  "Return MARKER's line number in the current buffer.
+Signal an error if MARKER is in a different buffer."
+  (when (stringp marker)
+    (setq marker (aref marker 0)))
+  (setq marker (evil-get-marker marker))
+  (if (numberp marker)
+      (line-number-at-pos marker)
+    (error "Ex does not support markers in other files")))
+
+(defun evil-ex-re-fwd (pattern)
+  "Search forward for PATTERN.
+Returns the line number of the match."
+  (condition-case err
+      (save-excursion
+        (set-text-properties 0 (length pattern) nil pattern)
+        (evil-move-end-of-line)
+        (and (re-search-forward pattern nil t)
+             (line-number-at-pos (1- (match-end 0)))))
+    (invalid-regexp
+     (evil-ex-echo (cadr err))
+     nil)))
+
+(defun evil-ex-re-bwd (pattern)
+  "Search backward for PATTERN.
+Returns the line number of the match."
+  (condition-case err
+      (save-excursion
+        (set-text-properties 0 (length pattern) nil pattern)
+        (evil-move-beginning-of-line)
+        (and (re-search-backward pattern nil t)
+             (line-number-at-pos (match-beginning 0))))
+    (invalid-regexp
+     (evil-ex-echo (cadr err))
+     nil)))
+
+(defun evil-ex-prev-search ()
+  (error "Previous search not yet implemented"))
+
+(defun evil-ex-signed-number (sign &optional number)
+  "Return a signed number like -3 and +1.
+NUMBER defaults to 1."
+  (funcall sign (or number 1)))
+
+(defun evil-ex-eval (string &optional start)
+  "Evaluate STRING as an Ex command.
+START is the start symbol, which defaults to `expression'."
+  ;; disable the mark before executing, otherwise the visual region
+  ;; may be used as operator range instead of the ex-range
+  (let ((form (evil-ex-parse string nil start))
+        transient-mark-mode deactivate-mark)
+    (eval form)))
+
+(defun evil-ex-parse (string &optional syntax start)
+  "Parse STRING as an Ex expression and return an evaluation tree.
+If SYNTAX is non-nil, return a syntax tree instead.
+START is the start symbol, which defaults to `expression'."
+  (let* ((start (or start (car-safe (car-safe evil-ex-grammar))))
+         (match (evil-parser
+                 string start evil-ex-grammar t syntax)))
+    (car-safe match)))
+
+(defun evil-ex-parse-command (string)
+  "Parse STRING as an Ex binding."
+  (let ((result (evil-parser string 'binding evil-ex-grammar))
+        bang command)
+    (when result
+      (setq command (car-safe result)
+            string (cdr-safe result))
+      ;; parse a following "!" as bang only if
+      ;; the command has the property :ex-bang t
+      (when (evil-ex-command-force-p command)
+        (setq result (evil-parser string 'bang evil-ex-grammar)
+              bang (or (car-safe result) "")
+              string (cdr-safe result)
+              command (concat command bang)))
+      (cons command string))))
+
+(defun evil-ex-command-force-p (command)
+  "Whether COMMAND accepts the bang argument."
+  (let ((binding (evil-ex-completed-binding command t)))
+    (when binding
+      (evil-get-command-property binding :ex-bang))))
+
+(defun evil-flatten-syntax-tree (tree)
+  "Find all paths from the root of TREE to its leaves.
+TREE is a syntax tree, i.e., all its leave nodes are strings.
+The `nth' element in the result is the syntactic context
+for the corresponding string index (counted from zero)."
+  (let* ((result nil)
+         (traverse nil)
+         (traverse
+          #'(lambda (tree path)
+              (if (stringp tree)
+                  (dotimes (char (length tree))
+                    (push path result))
+                (let ((path (cons (car tree) path)))
+                  (dolist (subtree (cdr tree))
+                    (funcall traverse subtree path)))))))
+    (funcall traverse tree nil)
+    (nreverse result)))
+
+(defun evil-ex-syntactic-context (&optional pos)
+  "Return the syntactical context of the character at POS.
+POS defaults to the current position of point."
+  (let* ((contexts (evil-flatten-syntax-tree evil-ex-tree))
+         (length (length contexts))
+         (pos (- (or pos (point)) (minibuffer-prompt-end))))
+    (when (>= pos length)
+      (setq pos (1- length)))
+    (when (< pos 0)
+      (setq pos 0))
+    (when contexts
+      (nth pos contexts))))
+
+(defun evil-parser (string symbol grammar &optional greedy syntax)
+  "Parse STRING as a SYMBOL in GRAMMAR.
+If GREEDY is non-nil, the whole of STRING must match.
+If the parse succeeds, the return value is a cons cell
+\(RESULT . TAIL), where RESULT is a parse tree and TAIL is
+the remainder of STRING. Otherwise, the return value is nil.
+
+GRAMMAR is an association list of symbols and their definitions.
+A definition is either a list of production rules, which are
+tried in succession, or a #'-quoted function, which is called
+to parse the input.
+
+A production rule can be one of the following:
+
+    nil matches the empty string.
+    A regular expression matches a substring.
+    A symbol matches a production for that symbol.
+    (X Y) matches X followed by Y.
+    (\\? X) matches zero or one of X.
+    (* X) matches zero or more of X.
+    (+ X) matches one or more of X.
+    (& X) matches X, but does not consume.
+    (! X) matches anything but X, but does not consume.
+
+Thus, a simple grammar may look like:
+
+    ((plus \"\\\\+\")           ; plus <- \"+\"
+     (minus \"-\")            ; minus <- \"-\"
+     (operator plus minus)) ; operator <- plus / minus
+
+All input-consuming rules have a value. A regular expression evaluates
+to the text matched, while a list evaluates to a list of values.
+The value of a list may be overridden with a semantic action, which is
+specified with a #'-quoted expression at the end:
+
+    (X Y #'foo)
+
+The value of this rule is the result of calling foo with the values
+of X and Y as arguments. Alternatively, the function call may be
+specified explicitly:
+
+    (X Y #'(foo $1 $2))
+
+Here, $1 refers to X and $2 refers to Y. $0 refers to the whole list.
+Dollar expressions can also be used directly:
+
+    (X Y #'$1)
+
+This matches X followed by Y, but ignores the value of Y;
+the value of the list is the same as the value of X.
+
+If the SYNTAX argument is non-nil, then all semantic actions
+are ignored, and a syntax tree is constructed instead. The
+syntax tree obeys the property that all the leave nodes are
+parts of the input string. Thus, by traversing the syntax tree,
+one can determine how each character was parsed.
+
+The following symbols have reserved meanings within a grammar:
+`\\?', `*', `+', `&', `!', `function', `alt', `seq' and nil."
+  (let ((string (or string ""))
+        func pair result rules tail)
+    (cond
+     ;; epsilon
+     ((member symbol '("" nil))
+      (setq pair (cons (if syntax "" nil) string)))
+     ;; token
+     ((stringp symbol)
+      (save-match-data
+        (when (or (eq (string-match symbol string) 0)
+                  ;; ignore leading whitespace
+                  (and (eq (string-match "^[ \f\t\n\r\v]+" string) 0)
+                       (eq (match-end 0)
+                           (string-match
+                            symbol string (match-end 0)))))
+          (setq result (match-string 0 string)
+                tail (substring string (match-end 0))
+                pair (cons result tail))
+          (when (and syntax pair)
+            (setq result (substring string 0
+                                    (- (length string)
+                                       (length tail))))
+            (setcar pair result)))))
+     ;; symbol
+     ((symbolp symbol)
+      (let ((context symbol))
+        (setq rules (cdr-safe (assq symbol grammar)))
+        (setq pair (evil-parser string `(alt ,@rules)
+                                grammar greedy syntax))
+        (when (and syntax pair)
+          (setq result (car pair))
+          (if (and (listp result) (sequencep (car result)))
+              (setq result `(,symbol ,@result))
+            (setq result `(,symbol ,result)))
+          (setcar pair result))))
+     ;; function
+     ((eq (car-safe symbol) 'function)
+      (setq symbol (cadr symbol)
+            pair (funcall symbol string))
+      (when (and syntax pair)
+        (setq tail (or (cdr pair) "")
+              result (substring string 0
+                                (- (length string)
+                                   (length tail))))
+        (setcar pair result)))
+     ;; list
+     ((listp symbol)
+      (setq rules symbol
+            symbol (car-safe rules))
+      (if (memq symbol '(& ! \? * + alt seq))
+          (setq rules (cdr rules))
+        (setq symbol 'seq))
+      (when (and (memq symbol '(+ alt seq))
+                 (> (length rules) 1))
+        (setq func (car (last rules)))
+        (if (eq (car-safe func) 'function)
+            (setq rules (delq func (copy-sequence rules))
+                  func (cadr func))
+          (setq func nil)))
+      (cond
+       ;; positive lookahead
+       ((eq symbol '&)
+        (when (evil-parser string rules grammar greedy syntax)
+          (setq pair (evil-parser string nil grammar nil syntax))))
+       ;; negative lookahead
+       ((eq symbol '!)
+        (unless (evil-parser string rules grammar greedy syntax)
+          (setq pair (evil-parser string nil grammar nil syntax))))
+       ;; zero or one
+       ((eq symbol '\?)
+        (setq rules (if (> (length rules) 1)
+                        `(alt ,rules nil)
+                      `(alt ,@rules nil))
+              pair (evil-parser string rules grammar greedy syntax)))
+       ;; zero or more
+       ((eq symbol '*)
+        (setq rules `(alt (+ ,@rules) nil)
+              pair (evil-parser string rules grammar greedy syntax)))
+       ;; one or more
+       ((eq symbol '+)
+        (let (current results)
+          (catch 'done
+            (while (setq current (evil-parser
+                                  string rules grammar nil syntax))
+              (setq result (car-safe current)
+                    tail (or (cdr-safe current) "")
+                    results (append results (if syntax result
+                                              (cdr-safe result))))
+              ;; stop if stuck
+              (if (equal string tail)
+                  (throw 'done nil)
+                (setq string tail))))
+          (when results
+            (setq func (or func 'list)
+                  pair (cons results tail)))))
+       ;; alternatives
+       ((eq symbol 'alt)
+        (catch 'done
+          (dolist (rule rules)
+            (when (setq pair (evil-parser
+                              string rule grammar greedy syntax))
+              (throw 'done pair)))))
+       ;; sequence
+       (t
+        (setq func (or func 'list))
+        (let ((last (car-safe (last rules)))
+              current results rule)
+          (catch 'done
+            (while rules
+              (setq rule (pop rules)
+                    current (evil-parser string rule grammar
+                                         (when greedy
+                                           (null rules))
+                                         syntax))
+              (cond
+               ((null current)
+                (setq results nil)
+                (throw 'done nil))
+               (t
+                (setq result (car-safe current)
+                      tail (cdr-safe current))
+                (unless (memq (car-safe rule) '(& !))
+                  (if (and syntax
+                           (or (null result)
+                               (and (listp result)
+                                    (listp rule)
+                                    ;; splice in single-element
+                                    ;; (\? ...) expressions
+                                    (not (and (eq (car-safe rule) '\?)
+                                              (eq (length rule) 2))))))
+                      (setq results (append results result))
+                    (setq results (append results (list result)))))
+                (setq string (or tail ""))))))
+          (when results
+            (setq pair (cons results tail))))))
+      ;; semantic action
+      (when (and pair func (not syntax))
+        (setq result (car pair))
+        (let* ((dexp
+                #'(lambda (obj)
+                    (when (symbolp obj)
+                      (let ((str (symbol-name obj)))
+                        (when (string-match "\\$\\([0-9]+\\)" str)
+                          (string-to-number (match-string 1 str)))))))
+               ;; traverse a tree for dollar expressions
+               (dval nil)
+               (dval
+                #'(lambda (obj)
+                    (if (listp obj)
+                        (mapcar dval obj)
+                      (let ((num (funcall dexp obj)))
+                        (if num
+                            (if (not (listp result))
+                                result
+                              (if (eq num 0)
+                                  `(list ,@result)
+                                (nth (1- num) result)))
+                          obj))))))
+          (cond
+           ((null func)
+            (setq result nil))
+           ;; lambda function
+           ((eq (car-safe func) 'lambda)
+            (if (memq symbol '(+ seq))
+                (setq result `(funcall ,func ,@result))
+              (setq result `(funcall ,func ,result))))
+           ;; string replacement
+           ((or (stringp func) (stringp (car-safe func)))
+            (let* ((symbol (or (car-safe (cdr-safe func))
+                               (and (boundp 'context) context)
+                               (car-safe (car-safe grammar))))
+                   (string (if (stringp func) func (car-safe func))))
+              (setq result (car-safe (evil-parser string symbol grammar
+                                                  greedy syntax)))))
+           ;; dollar expression
+           ((funcall dexp func)
+            (setq result (funcall dval func)))
+           ;; function call
+           ((listp func)
+            (setq result (funcall dval func)))
+           ;; symbol
+           (t
+            (if (memq symbol '(+ seq))
+                (setq result `(,func ,@result))
+              (setq result `(,func ,result))))))
+        (setcar pair result))))
+    ;; weed out incomplete matches
+    (when pair
+      (if (not greedy) pair
+        (if (null (cdr pair)) pair
+          ;; ignore trailing whitespace
+          (when (string-match "^[ \f\t\n\r\v]*$" (cdr pair))
+            (unless syntax (setcdr pair nil))
+            pair))))))
+
+(provide 'evil-ex)
+
+;;; evil-ex.el ends here
diff --git a/elpa/evil-1.0.1/evil-integration.el b/elpa/evil-1.0.1/evil-integration.el
new file mode 100644
index 00000000..e65bf3ee
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-integration.el
@@ -0,0 +1,288 @@
+;;; evil-integration.el --- Integrate Evil with other modules
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-maps)
+(require 'evil-core)
+
+;;; Code:
+
+;;; Evilize some commands
+
+(mapc #'(lambda (cmd)
+          (evil-set-command-property cmd :keep-visual t)
+          (evil-declare-not-repeat cmd))
+      '(digit-argument
+        negative-argument
+        universal-argument
+        universal-argument-minus
+        universal-argument-more
+        universal-argument-other-key))
+(mapc #'evil-declare-not-repeat
+      '(what-cursor-position))
+(mapc #'evil-declare-change-repeat
+      '(dabbrev-expand
+        hippie-expand))
+(mapc #'evil-declare-abort-repeat
+      '(balance-windows
+        eval-expression
+        execute-extended-command
+        exit-minibuffer
+        compile
+        delete-window
+        delete-other-windows
+        find-file-at-point
+        ffap-other-window
+        recompile
+        save-buffer
+        split-window
+        split-window-horizontally
+        split-window-vertically))
+
+(evil-set-type #'previous-line 'line)
+(evil-set-type #'next-line 'line)
+
+(dolist (cmd '(keyboard-quit keyboard-escape-quit))
+  (evil-set-command-property cmd :suppress-operator t))
+
+;;; Mouse
+(evil-declare-insert-at-point-repeat 'mouse-yank-primary)
+(evil-declare-insert-at-point-repeat 'mouse-yank-secondary)
+
+;;; key-binding
+
+;; disable evil-esc-mode during a call to key-binding
+(defadvice key-binding (around evil activate)
+  (let (evil-esc-mode)
+    ad-do-it))
+
+;; disable evil-esc-mode during the read of a key-sequence
+;; TODO: should we handle the special ESC-delay, too?
+(defadvice read-key-sequence (around evil activate)
+  (let (evil-esc-mode)
+    ad-do-it))
+
+;; disable evil-esc-mode during the read of a key-sequence
+;; TODO: should we handle the special ESC-delay, too?
+(defadvice read-key-sequence-vector (around evil activate)
+  (let (evil-esc-mode)
+    ad-do-it))
+
+;; Calling `keyboard-quit' should cancel repeat
+(defadvice keyboard-quit (before evil activate)
+  (when (fboundp 'evil-repeat-abort)
+    (evil-repeat-abort)))
+
+;; etags-select
+;; FIXME: probably etags-select should be recomended in docs
+(eval-after-load 'etags-select
+  '(progn
+     (define-key evil-motion-state-map "g]" 'etags-select-find-tag-at-point)))
+
+;;; Buffer-menu
+
+(evil-add-hjkl-bindings Buffer-menu-mode-map 'motion)
+
+;; dictionary.el
+
+(evil-add-hjkl-bindings dictionary-mode-map 'motion
+  "?" 'dictionary-help        ; "h"
+  "C-o" 'dictionary-previous) ; "l"
+
+;;; Dired
+
+(eval-after-load 'dired
+  '(progn
+     ;; use the standard Dired bindings as a base
+     (evil-make-overriding-map dired-mode-map 'normal t)
+     (evil-add-hjkl-bindings dired-mode-map 'normal
+       "J" 'dired-goto-file                   ; "j"
+       "K" 'dired-do-kill-lines               ; "k"
+       "r" 'dired-do-redisplay                ; "l"
+       ";" (lookup-key dired-mode-map ":")))) ; ":d", ":v", ":s", ":e"
+
+(eval-after-load 'wdired
+  '(progn
+     (add-hook 'wdired-mode-hook #'evil-change-to-initial-state)
+     (defadvice wdired-change-to-dired-mode (after evil activate)
+       (evil-change-to-initial-state nil t))))
+
+;;; ELP
+
+(eval-after-load 'elp
+  '(defadvice elp-results (after evil activate)
+     (evil-motion-state)))
+
+;;; ERT
+
+(evil-add-hjkl-bindings ert-results-mode-map 'motion)
+
+;;; Info
+
+(evil-add-hjkl-bindings Info-mode-map 'motion
+  "0" 'evil-digit-argument-or-evil-beginning-of-line
+  (kbd "\M-h") 'Info-help   ; "h"
+  "\C-t" 'Info-history-back ; "l"
+  "\C-o" 'Info-history-back
+  " " 'Info-scroll-up
+  "\C-]" 'Info-follow-nearest-node
+  (kbd "DEL") 'Info-scroll-down)
+
+;;; Parentheses
+
+(defadvice show-paren-function (around evil)
+  "Match parentheses in Normal state."
+  (if (if (memq 'not evil-highlight-closing-paren-at-point-states)
+          (memq evil-state evil-highlight-closing-paren-at-point-states)
+        (not (memq evil-state evil-highlight-closing-paren-at-point-states)))
+      ad-do-it
+    (let ((pos (point)) syntax narrow)
+      (setq pos
+            (catch 'end
+              (dotimes (var (1+ (* 2 evil-show-paren-range)))
+                (if (zerop (mod var 2))
+                    (setq pos (+ pos var))
+                  (setq pos (- pos var)))
+                (setq syntax (syntax-class (syntax-after pos)))
+                (cond
+                 ((eq syntax 4)
+                  (setq narrow pos)
+                  (throw 'end pos))
+                 ((eq syntax 5)
+                  (throw 'end (1+ pos)))))))
+      (if pos
+          (save-excursion
+            (goto-char pos)
+            (save-restriction
+              (when narrow
+                (narrow-to-region narrow (point-max)))
+              ad-do-it))
+        ;; prevent the preceding pair from being highlighted
+        (when (overlayp show-paren-overlay)
+          (delete-overlay show-paren-overlay))
+        (when (overlayp show-paren-overlay-1)
+          (delete-overlay show-paren-overlay-1))))))
+
+;;; Speedbar
+
+(evil-add-hjkl-bindings speedbar-key-map 'motion
+  "h" 'backward-char
+  "j" 'speedbar-next
+  "k" 'speedbar-prev
+  "l" 'forward-char
+  "i" 'speedbar-item-info
+  "r" 'speedbar-refresh
+  "u" 'speedbar-up-directory
+  "o" 'speedbar-toggle-line-expansion
+  (kbd "RET") 'speedbar-edit-line)
+
+;; Ibuffer
+(eval-after-load 'ibuffer
+  '(progn
+     (evil-make-overriding-map ibuffer-mode-map 'normal t)
+     (evil-define-key 'normal ibuffer-mode-map
+       "j" 'evil-next-line
+       "k" 'evil-previous-line
+       "RET" 'ibuffer-visit-buffer)))
+
+;;; Undo tree visualizer
+
+(defadvice undo-tree-visualize (after evil activate)
+  "Initialize Evil in the visualization buffer."
+  (when evil-local-mode
+    (evil-initialize-state)))
+
+(when (boundp 'undo-tree-visualizer-map)
+  (define-key undo-tree-visualizer-map [remap evil-backward-char]
+    'undo-tree-visualize-switch-branch-left)
+  (define-key undo-tree-visualizer-map [remap evil-forward-char]
+    'undo-tree-visualize-switch-branch-right)
+  (define-key undo-tree-visualizer-map [remap evil-next-line]
+    'undo-tree-visualize-redo)
+  (define-key undo-tree-visualizer-map [remap evil-previous-line]
+    'undo-tree-visualize-undo))
+
+;;; Auto-complete
+(eval-after-load 'auto-complete
+  '(progn
+     (evil-add-command-properties 'ac-complete :repeat 'evil-ac-repeat)
+     (evil-add-command-properties 'ac-expand :repeat 'evil-ac-repeat)
+     (evil-add-command-properties 'ac-next :repeat 'ignore)
+     (evil-add-command-properties 'ac-previous :repeat 'ignore)
+
+     (defvar evil-ac-prefix-len nil
+       "The length of the prefix of the current item to be completed.")
+
+     (defun evil-ac-repeat (flag)
+       "Record the changes for auto-completion."
+       (cond
+        ((eq flag 'pre)
+         (setq evil-ac-prefix-len (length ac-prefix))
+         (evil-repeat-start-record-changes))
+        ((eq flag 'post)
+         ;; Add change to remove the prefix
+         (evil-repeat-record-change (- evil-ac-prefix-len)
+                                    ""
+                                    evil-ac-prefix-len)
+         ;; Add change to insert the full completed text
+         (evil-repeat-record-change
+          (- evil-ac-prefix-len)
+          (buffer-substring-no-properties (- evil-repeat-pos
+                                             evil-ac-prefix-len)
+                                          (point))
+          0)
+         ;; Finish repeation
+         (evil-repeat-finish-record-changes))))))
+
+;; Eval last sexp
+(defadvice preceding-sexp (around evil activate)
+  "In normal-state, last sexp ends at point."
+  (if (evil-normal-state-p)
+      (save-excursion
+        (unless (or (eobp) (eolp)) (forward-char))
+        ad-do-it)
+    ad-do-it))
+
+(defadvice pp-last-sexp (around evil activate)
+  "In normal-state, last sexp ends at point."
+  (if (evil-normal-state-p)
+      (save-excursion
+        (unless (or (eobp) (eolp)) (forward-char))
+        ad-do-it)
+    ad-do-it))
+
+;; Show key
+(defadvice quail-show-key (around evil activate)
+  "Temporarily go to Emacs state"
+  (evil-with-state emacs ad-do-it))
+
+(defadvice describe-char (around evil activate)
+  "Temporarily go to Emacs state"
+  (evil-with-state emacs ad-do-it))
+
+(provide 'evil-integration)
+
+;;; evil-integration.el ends here
diff --git a/elpa/evil-1.0.1/evil-macros.el b/elpa/evil-1.0.1/evil-macros.el
new file mode 100644
index 00000000..1a84bd31
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-macros.el
@@ -0,0 +1,751 @@
+;;; evil-macros.el --- Macros
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-common)
+(require 'evil-states)
+(require 'evil-repeat)
+
+;;; Code:
+
+(declare-function evil-ex-p "evil-ex")
+
+(defun evil-motion-range (motion &optional count type)
+  "Execute a motion and return the buffer positions.
+The return value is a list (BEG END TYPE)."
+  (let ((opoint   (point))
+        (omark    (mark t))
+        (omactive (and (boundp 'mark-active) mark-active))
+        (obuffer  (current-buffer))
+        (evil-motion-marker (move-marker (make-marker) (point)))
+        range)
+    (evil-with-transient-mark-mode
+      (evil-narrow-to-field
+        (unwind-protect
+            (let ((current-prefix-arg count)
+                  ;; Store type in global variable `evil-this-type'.
+                  ;; If necessary, motions can change their type
+                  ;; during execution by setting this variable.
+                  (evil-this-type
+                   (or type (evil-type motion 'exclusive))))
+              (condition-case err
+                  (let ((repeat-type (evil-repeat-type motion t)))
+                    (if (functionp repeat-type)
+                        (funcall repeat-type 'pre))
+                    (unless (with-local-quit
+                              (setq range (call-interactively motion))
+                              t)
+                      (evil-repeat-abort)
+                      (setq quit-flag t))
+                    (if (functionp repeat-type)
+                        (funcall repeat-type 'post)))
+                (error (prog1 nil
+                         (evil-repeat-abort)
+                         (setq evil-this-type 'exclusive
+                               evil-write-echo-area t)
+                         (message (error-message-string err)))))
+              (cond
+               ;; the motion returned a range
+               ((evil-range-p range))
+               ;; the motion made a Visual selection
+               ((evil-visual-state-p)
+                (setq range (evil-visual-range)))
+               ;; the motion made an active region
+               ((region-active-p)
+                (setq range (evil-range (region-beginning)
+                                        (region-end)
+                                        evil-this-type)))
+               ;; default: range from previous position to current
+               (t
+                (setq range (evil-expand-range
+                             (evil-normalize evil-motion-marker
+                                             (point)
+                                             evil-this-type)))))
+              (unless (or (null type) (eq (evil-type range) type))
+                (evil-set-type range type)
+                (evil-expand-range range))
+              (evil-set-range-properties range nil)
+              range)
+          ;; restore point and mark like `save-excursion',
+          ;; but only if the motion hasn't disabled the operator
+          (unless evil-inhibit-operator
+            (set-buffer obuffer)
+            (evil-move-mark omark)
+            (goto-char opoint))
+          ;; delete marker so it doesn't slow down editing
+          (move-marker evil-motion-marker nil))))))
+
+(defmacro evil-define-motion (motion args &rest body)
+  "Define an motion command MOTION.
+
+\(fn MOTION (COUNT ARGS...) DOC [[KEY VALUE]...] BODY...)"
+  (declare (indent defun)
+           (debug (&define name lambda-list
+                           [&optional stringp]
+                           [&rest keywordp sexp]
+                           [&optional ("interactive" [&rest form])]
+                           def-body)))
+  (let (arg doc interactive key keys type)
+    (when args
+      (setq args `(&optional ,@(delq '&optional args))
+            ;; the count is either numerical or nil
+            interactive '("<c>")))
+    ;; collect docstring
+    (when (and (> (length body) 1)
+               (or (eq (car-safe (car-safe body)) 'format)
+                   (stringp (car-safe body))))
+      (setq doc (pop body)))
+    ;; collect keywords
+    (setq keys (plist-put keys :repeat 'motion))
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            arg (pop body)
+            keys (plist-put keys key arg)))
+    ;; collect `interactive' specification
+    (when (eq (car-safe (car-safe body)) 'interactive)
+      (setq interactive (cdr (pop body))))
+    ;; macro expansion
+    `(progn
+       ;; refresh echo area in Eldoc mode
+       (when ',motion
+         (eval-after-load 'eldoc
+           '(eldoc-add-command ',motion)))
+       (evil-define-command ,motion (,@args)
+         ,@(when doc `(,doc))          ; avoid nil before `interactive'
+         ,@keys
+         :keep-visual t
+         (interactive ,@interactive)
+         ,@body))))
+
+(defmacro evil-define-union-move (name args &rest moves)
+  "Create a movement function named NAME.
+The function moves to the nearest object boundary defined by one
+of the movement function in MOVES, which is a list where each
+element has the form \(FUNC PARAMS... COUNT).
+
+COUNT is a variable which is bound to 1 or -1, depending on the
+direction. In each iteration, the function calls each move in
+isolation and settles for the nearest position. If unable to move
+further, the return value is the number of iterations that could
+not be performed.
+
+\(fn NAME (COUNT) MOVES...)"
+  (declare (indent defun)
+           (debug (&define name lambda-list
+                           [&optional stringp]
+                           def-body)))
+  (let* ((var (or (car-safe args) 'var))
+         (doc (when (stringp (car-safe moves))
+                (pop moves)))
+         (moves (mapcar #'(lambda (move)
+                            `(save-excursion
+                               ;; don't include failing moves
+                               (when (zerop ,move)
+                                 (point))))
+                        moves)))
+    `(evil-define-motion ,name (count)
+       ,@(when doc `(,doc))
+       (evil-motion-loop (,var (or count 1))
+         (if (> ,var 0)
+             (evil-goto-min ,@moves)
+           (evil-goto-max ,@moves))))))
+
+(defmacro evil-narrow-to-line (&rest body)
+  "Narrow BODY to the current line.
+BODY will signal the errors \"Beginning of line\" or \"End of line\"
+upon reaching the beginning or end of the current line.
+
+\(fn [[KEY VAL]...] BODY...)"
+  (declare (indent defun)
+           (debug t))
+  `(let* ((range (evil-expand (point) (point) 'line))
+          (beg (evil-range-beginning range))
+          (end (evil-range-end range))
+          (min (point-min))
+          (max (point-max)))
+     (when (save-excursion (goto-char end) (bolp))
+       (setq end (max beg (1- end))))
+     ;; don't include the newline in Normal state
+     (when (and evil-move-cursor-back
+                (not (evil-visual-state-p))
+                (not (evil-operator-state-p)))
+       (setq end (max beg (1- end))))
+     (evil-with-restriction beg end
+       (evil-signal-without-movement
+         (condition-case err
+             (progn ,@body)
+           (beginning-of-buffer
+            (if (= beg min)
+                (signal (car err) (cdr err))
+              (error "Beginning of line")))
+           (end-of-buffer
+            (if (= end max)
+                (signal (car err) (cdr err))
+              (error "End of line"))))))))
+
+;; we don't want line boundaries to trigger the debugger
+;; when `debug-on-error' is t
+(add-to-list 'debug-ignored-errors "^Beginning of line$")
+(add-to-list 'debug-ignored-errors "^End of line$")
+
+(defun evil-eobp (&optional pos)
+  "Whether point is at end-of-buffer with regard to end-of-line."
+  (save-excursion
+    (when pos (goto-char pos))
+    (cond
+     ((eobp))
+     ;; the rest only pertains to Normal state
+     ((not (evil-normal-state-p))
+      nil)
+     ;; at the end of the last line
+     ((eolp)
+      (forward-char)
+      (eobp))
+     ;; at the last character of the last line
+     (t
+      (forward-char)
+      (cond
+       ((eobp))
+       ((eolp)
+        (forward-char)
+        (eobp)))))))
+
+(defun evil-move-beginning (count forward &optional backward)
+  "Move to the beginning of the COUNT next object.
+If COUNT is negative, move to the COUNT previous object.
+FORWARD is a function which moves to the end of the object, and
+BACKWARD is a function which moves to the beginning.
+If one is unspecified, the other is used with a negative argument."
+  (let* ((count (or count 1))
+         (backward (or backward
+                       #'(lambda (count)
+                           (funcall forward (- count)))))
+         (forward (or forward
+                      #'(lambda (count)
+                          (funcall backward (- count)))))
+         (opoint (point)))
+    (cond
+     ((< count 0)
+      (when (bobp)
+        (signal 'beginning-of-buffer nil))
+      (unwind-protect
+          (evil-motion-loop (nil count count)
+            (funcall backward 1))
+        (unless (zerop count)
+          (goto-char (point-min)))))
+     ((> count 0)
+      (when (evil-eobp)
+        (signal 'end-of-buffer nil))
+      ;; Do we need to move past the current object?
+      (when (<= (save-excursion
+                  (funcall forward 1)
+                  (funcall backward 1)
+                  (point))
+                opoint)
+        (setq count (1+ count)))
+      (unwind-protect
+          (evil-motion-loop (nil count count)
+            (funcall forward 1))
+        (if (zerop count)
+            ;; go back to beginning of object
+            (funcall backward 1)
+          (goto-char (point-max)))))
+     (t
+      count))))
+
+(defun evil-move-end (count forward &optional backward inclusive)
+  "Move to the end of the COUNT next object.
+If COUNT is negative, move to the COUNT previous object.
+FORWARD is a function which moves to the end of the object, and
+BACKWARD is a function which moves to the beginning.
+If one is unspecified, the other is used with a negative argument.
+If INCLUSIVE is non-nil, then point is placed at the last character
+of the object; otherwise it is placed at the end of the object."
+  (let* ((count (or count 1))
+         (backward (or backward
+                       #'(lambda (count)
+                           (funcall forward (- count)))))
+         (forward (or forward
+                      #'(lambda (count)
+                          (funcall backward (- count)))))
+         (opoint (point)))
+    (cond
+     ((< count 0)
+      (when (bobp)
+        (signal 'beginning-of-buffer nil))
+      ;; Do we need to move past the current object?
+      (when (>= (save-excursion
+                  (funcall backward 1)
+                  (funcall forward 1)
+                  (point))
+                (if inclusive
+                    (1+ opoint)
+                  opoint))
+        (setq count (1- count)))
+      (unwind-protect
+          (evil-motion-loop (nil count count)
+            (funcall backward 1))
+        (if (not (zerop count))
+            (goto-char (point-min))
+          ;; go to end of object
+          (funcall forward 1)
+          (when inclusive
+            (unless (bobp) (backward-char)))
+          (when (or (evil-normal-state-p)
+                    (evil-motion-state-p))
+            (evil-adjust-cursor t)))))
+     ((> count 0)
+      (when (evil-eobp)
+        (signal 'end-of-buffer nil))
+      (when inclusive
+        (forward-char))
+      (unwind-protect
+          (evil-motion-loop (nil count count)
+            (funcall forward 1))
+        (if (not (zerop count))
+            (goto-char (point-max))
+          (when inclusive
+            (unless (bobp) (backward-char)))
+          (when (or (evil-normal-state-p)
+                    (evil-motion-state-p))
+            (evil-adjust-cursor t)))))
+     (t
+      count))))
+
+(defmacro evil-define-text-object (object args &rest body)
+  "Define a text object command OBJECT.
+BODY should return a range (BEG END) to the right of point
+if COUNT is positive, and to the left of it if negative.
+
+\(fn OBJECT (COUNT) DOC [[KEY VALUE]...] BODY...)"
+  (declare (indent defun)
+           (debug (&define name lambda-list
+                           [&optional stringp]
+                           [&rest keywordp sexp]
+                           def-body)))
+  (let* ((args (delq '&optional args))
+         (count (or (pop args) 'count))
+         (args (when args `(&optional ,@args)))
+         (interactive '((interactive "<c><v>")))
+         arg doc key keys)
+    ;; collect docstring
+    (when (stringp (car-safe body))
+      (setq doc (pop body)))
+    ;; collect keywords
+    (setq keys (plist-put keys :extend-selection t))
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            arg (pop body)
+            keys (plist-put keys key arg)))
+    ;; interactive
+    (when (eq (car-safe (car-safe body)) 'interactive)
+      (setq interactive (list (pop body))))
+    ;; macro expansion
+    `(evil-define-motion ,object (,count ,@args)
+       ,@(when doc `(,doc))
+       ,@keys
+       ,@interactive
+       (setq ,count (or ,count 1))
+       (when (/= ,count 0)
+         (let ((type (evil-type ',object evil-visual-char))
+               (extend (evil-get-command-property
+                        ',object :extend-selection
+                        ',(plist-get keys :extend-selection)))
+               (dir evil-visual-direction)
+               mark point range selection)
+           (cond
+            ;; Visual state: extend the current selection
+            ((and (evil-visual-state-p)
+                  (evil-called-interactively-p))
+             ;; if we are at the beginning of the Visual selection,
+             ;; go to the left (negative COUNT); if at the end,
+             ;; go to the right (positive COUNT)
+             (setq dir evil-visual-direction
+                   ,count (* ,count dir))
+             (setq range (progn ,@body))
+             (when (evil-range-p range)
+               (setq range (evil-expand-range range))
+               (evil-set-type range (evil-type range type))
+               (setq range (evil-contract-range range))
+               ;; the beginning is mark and the end is point
+               ;; unless the selection goes the other way
+               (setq mark  (evil-range-beginning range)
+                     point (evil-range-end range)
+                     type  (evil-type range))
+               (when (< dir 0)
+                 (evil-swap mark point))
+               ;; select the union
+               (evil-visual-make-selection mark point type)))
+            ;; not Visual state: return a pair of buffer positions
+            (t
+             (setq range (progn ,@body))
+             (unless (evil-range-p range)
+               (setq ,count (- ,count)
+                     range (progn ,@body)))
+             (when (evil-range-p range)
+               (setq selection (evil-range (point) (point) type))
+               (if extend
+                   (setq range (evil-range-union range selection))
+                 (evil-set-type range (evil-type range type)))
+               ;; ensure the range is properly expanded
+               (evil-contract-range range)
+               (evil-expand-range range)
+               (evil-set-range-properties range nil)
+               range))))))))
+
+(defmacro evil-define-operator (operator args &rest body)
+  "Define an operator command OPERATOR.
+
+\(fn OPERATOR (BEG END ARGS...) DOC [[KEY VALUE]...] BODY...)"
+  (declare (indent defun)
+           (debug (&define name lambda-list
+                           [&optional stringp]
+                           [&rest keywordp sexp]
+                           [&optional ("interactive" [&rest form])]
+                           def-body)))
+  (let* ((args (delq '&optional args))
+         (interactive (if (> (length args) 2) '("<R>") '("<r>")))
+         (args (if (> (length args) 2)
+                   `(,(nth 0 args) ,(nth 1 args)
+                     &optional ,@(nthcdr 2 args))
+                 args))
+         arg doc key keys visual)
+    ;; collect docstring
+    (when (and (> (length body) 1)
+               (or (eq (car-safe (car-safe body)) 'format)
+                   (stringp (car-safe body))))
+      (setq doc (pop body)))
+    ;; collect keywords
+    (setq keys (plist-put keys :move-point t))
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            arg (pop body))
+      (cond
+       ((eq key :keep-visual)
+        (setq visual arg))
+       (t
+        (setq keys (plist-put keys key arg)))))
+    ;; collect `interactive' specification
+    (when (eq (car-safe (car-safe body)) 'interactive)
+      (setq interactive (cdr-safe (pop body))))
+    ;; transform extended interactive specs
+    (setq interactive (apply #'evil-interactive-form interactive))
+    (setq keys (evil-concat-plists keys (cdr-safe interactive))
+          interactive (car-safe interactive))
+    ;; macro expansion
+    `(evil-define-command ,operator ,args
+       ,@(when doc `(,doc))
+       ,@keys
+       :keep-visual t
+       :suppress-operator t
+       (interactive
+        (let* ((evil-operator-range-motion
+                (when (evil-has-command-property-p ',operator :motion)
+                  ;; :motion nil is equivalent to :motion undefined
+                  (or (evil-get-command-property ',operator :motion)
+                      #'undefined)))
+               (evil-operator-range-type
+                (evil-get-command-property ',operator :type))
+               (orig (point))
+               evil-operator-range-beginning
+               evil-operator-range-end
+               evil-inhibit-operator)
+          (setq evil-inhibit-operator-value nil
+                evil-this-operator this-command)
+          (prog1 ,interactive
+            (setq orig (point)
+                  evil-inhibit-operator-value evil-inhibit-operator)
+            (if ,visual
+                (when (evil-visual-state-p)
+                  (evil-visual-expand-region))
+              (when (or (evil-visual-state-p) (region-active-p))
+                (setq deactivate-mark t)))
+            (cond
+             ((evil-visual-state-p)
+              (evil-visual-rotate 'upper-left))
+             ((evil-get-command-property ',operator :move-point)
+              (goto-char (or evil-operator-range-beginning orig)))
+             (t
+              (goto-char orig))))))
+       (unwind-protect
+           (let ((evil-inhibit-operator evil-inhibit-operator-value))
+             (unless (and evil-inhibit-operator
+                          (evil-called-interactively-p))
+               ,@body))
+         (setq evil-inhibit-operator-value nil)))))
+
+;; this is used in the `interactive' specification of an operator command
+(defun evil-operator-range (&optional return-type)
+  "Read a motion from the keyboard and return its buffer positions.
+The return value is a list (BEG END), or (BEG END TYPE) if
+RETURN-TYPE is non-nil."
+  (let ((motion (or evil-operator-range-motion
+                    (when (evil-ex-p) #'evil-line)))
+        (type evil-operator-range-type)
+        (range (evil-range (point) (point)))
+        command count modifier)
+    (evil-save-echo-area
+      (cond
+       ;; Ex mode
+       ((and (evil-ex-p) evil-ex-range)
+        (setq range evil-ex-range))
+       ;; Visual selection
+       ((and (not (evil-ex-p)) (evil-visual-state-p))
+        (setq range (evil-visual-range)))
+       ;; active region
+       ((and (not (evil-ex-p)) (region-active-p))
+        (setq range (evil-range (region-beginning)
+                                (region-end)
+                                (or evil-this-type 'exclusive))))
+       (t
+        ;; motion
+        (evil-save-state
+          (unless motion
+            (evil-change-state 'operator)
+            ;; Make linewise operator shortcuts. E.g., "d" yields the
+            ;; shortcut "dd", and "g?" yields shortcuts "g??" and "g?g?".
+            (let ((keys (nth 2 (evil-extract-count (this-command-keys)))))
+              (setq keys (listify-key-sequence keys))
+              (dotimes (var (length keys))
+                (define-key evil-operator-shortcut-map
+                  (vconcat (nthcdr var keys)) 'evil-line)))
+            ;; read motion from keyboard
+            (setq command (evil-read-motion motion)
+                  motion (nth 0 command)
+                  count (nth 1 command)
+                  type (or type (nth 2 command))))
+          (cond
+           ((eq motion #'undefined)
+            (setq range (if return-type '(nil nil nil) '(nil nil))
+                  motion nil))
+           ((or (null motion) ; keyboard-quit
+                (evil-get-command-property motion :suppress-operator))
+            (when (fboundp 'evil-repeat-abort)
+              (evil-repeat-abort))
+            (setq quit-flag t
+                  motion nil))
+           (evil-repeat-count
+            (setq count evil-repeat-count
+                  ;; only the first operator's count is overwritten
+                  evil-repeat-count nil))
+           ((or count current-prefix-arg)
+            ;; multiply operator count and motion count together
+            (setq count
+                  (* (prefix-numeric-value count)
+                     (prefix-numeric-value current-prefix-arg)))))
+          (when motion
+            (let ((evil-state 'operator)
+                  mark-active)
+              ;; calculate motion range
+              (setq range (evil-motion-range
+                           motion
+                           count
+                           type))))
+          ;; update global variables
+          (setq evil-this-motion motion
+                evil-this-motion-count count
+                type (evil-type range type)
+                evil-this-type type))))
+      (when (evil-range-p range)
+        (unless (or (null type) (eq (evil-type range) type))
+          (evil-contract-range range)
+          (evil-set-type range type)
+          (evil-expand-range range))
+        (evil-set-range-properties range nil)
+        (unless return-type
+          (evil-set-type range nil))
+        (setq evil-operator-range-beginning (evil-range-beginning range)
+              evil-operator-range-end (evil-range-end range)
+              evil-operator-range-type (evil-type range)))
+      range)))
+
+(defmacro evil-define-type (type doc &rest body)
+  "Define type TYPE.
+DOC is a general description and shows up in all docstrings.
+It is followed by a list of keywords and functions:
+
+:expand FUNC     Expansion function. This function should accept
+                 two positions in the current buffer, BEG and END,
+                 and return a pair of expanded buffer positions.
+:contract FUNC   The opposite of :expand, optional.
+:one-to-one BOOL Whether expansion is one-to-one. This means that
+                 :expand followed by :contract always returns the
+                 original range.
+:normalize FUNC  Normalization function, optional. This function should
+                 accept two unexpanded positions and adjust them before
+                 expansion. May be used to deal with buffer boundaries.
+:string FUNC     Description function. This takes two buffer positions
+                 and returns a human-readable string, for example,
+                 \"2 lines\".
+
+If further keywords and functions are specified, they are assumed to
+be transformations on buffer positions, like :expand and :contract.
+
+\(fn TYPE DOC [[KEY FUNC]...])"
+  (declare (indent defun)
+           (debug (&define name
+                           [&optional stringp]
+                           [&rest [keywordp function-form]])))
+  (let (args defun-forms func key name plist string sym val)
+    ;; standard values
+    (setq plist (plist-put plist :one-to-one t))
+    ;; keywords
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            val (pop body))
+      (if (plist-member plist key) ; not a function
+          (setq plist (plist-put plist key val))
+        (setq func val
+              sym (intern (replace-regexp-in-string
+                           "^:" "" (symbol-name key)))
+              name (intern (format "evil-%s-%s" type sym))
+              args (car (cdr-safe func))
+              string (car (cdr (cdr-safe func)))
+              string (if (stringp string)
+                         (format "%s\n\n" string) "")
+              plist (plist-put plist key `',name))
+        (add-to-list
+         'defun-forms
+         (cond
+          ((eq key :string)
+           `(defun ,name (beg end &rest properties)
+              ,(format "Return size of %s from BEG to END \
+with PROPERTIES.\n\n%s%s" type string doc)
+              (let ((beg (evil-normalize-position beg))
+                    (end (evil-normalize-position end))
+                    (type ',type)
+                    plist range)
+                (when (and beg end)
+                  (save-excursion
+                    (evil-sort beg end)
+                    (unless (plist-get properties :expanded)
+                      (setq range (apply #'evil-expand
+                                         beg end type properties)
+                            beg (evil-range-beginning range)
+                            end (evil-range-end range)
+                            type (evil-type range type)
+                            plist (evil-range-properties range))
+                      (setq properties
+                            (evil-concat-plists properties plist)))
+                    (or (apply #',func beg end
+                               (when ,(> (length args) 2)
+                                 properties))
+                        ""))))))
+          (t
+           `(defun ,name (beg end &rest properties)
+              ,(format "Perform %s transformation on %s from BEG to END \
+with PROPERTIES.\n\n%s%s" sym type string doc)
+              (let ((beg (evil-normalize-position beg))
+                    (end (evil-normalize-position end))
+                    (type ',type)
+                    plist range)
+                (when (and beg end)
+                  (save-excursion
+                    (evil-sort beg end)
+                    (when (memq ,key '(:expand :contract))
+                      (setq properties
+                            (plist-put properties
+                                       :expanded
+                                       ,(eq key :expand))))
+                    (setq range (or (apply #',func beg end
+                                           (when ,(> (length args) 2)
+                                             properties))
+                                    (apply #'evil-range
+                                           beg end type properties))
+                          beg (evil-range-beginning range)
+                          end (evil-range-end range)
+                          type (evil-type range type)
+                          plist (evil-range-properties range))
+                    (setq properties
+                          (evil-concat-plists properties plist))
+                    (apply #'evil-range beg end type properties)))))))
+         t)))
+    ;; :one-to-one requires both or neither of :expand and :contract
+    (when (plist-get plist :expand)
+      (setq plist (plist-put plist :one-to-one
+                             (and (plist-get plist :contract)
+                                  (plist-get plist :one-to-one)))))
+    `(progn
+       (evil-put-property 'evil-type-properties ',type ,@plist)
+       ,@defun-forms
+       ',type)))
+
+(defmacro evil-define-interactive-code (code &rest body)
+  "Define an interactive code.
+PROMPT, if given, is the remainder of the interactive string
+up to the next newline. Command properties may be specified
+via KEY-VALUE pairs. BODY should evaluate to a list of values.
+
+\(fn CODE (PROMPT) [[KEY VALUE]...] BODY...)"
+  (declare (indent defun))
+  (let* ((args (when (and (> (length body) 1)
+                          (listp (car-safe body)))
+                 (pop body)))
+         (doc (when (stringp (car-safe body)) (pop body)))
+         func properties)
+    (while (keywordp (car-safe body))
+      (setq properties
+            (append properties (list (pop body) (pop body)))))
+    (cond
+     (args
+      (setq func `(lambda ,args
+                    ,@(when doc `(,doc))
+                    ,@body)))
+     ((> (length body) 1)
+      (setq func `(progn ,@body)))
+     (t
+      (setq func (car body))))
+    `(eval-and-compile
+       (let* ((code ,code)
+              (entry (assoc code evil-interactive-alist))
+              (value (cons ',func ',properties)))
+         (if entry
+             (setcdr entry value)
+           (push (cons code value) evil-interactive-alist))
+         code))))
+
+;;; Highlighting
+
+(when (fboundp 'font-lock-add-keywords)
+  (font-lock-add-keywords
+   'emacs-lisp-mode
+   ;; Match all `evil-define-' forms except `evil-define-key'.
+   ;; (In the interests of speed, this expression is incomplete
+   ;; and does not match all three-letter words.)
+   '(("(\\(evil-\\(?:ex-\\)?define-\
+\\(?:[^ k][^ e][^ y]\\|[-[:word:]]\\{4,\\}\\)\\)\
+\\>[ \f\t\n\r\v]*\\(\\sw+\\)?"
+      (1 font-lock-keyword-face)
+      (2 font-lock-function-name-face nil t))
+     ("(\\(evil-\\(?:delay\\|narrow\\|signal\\|save\\|with\\(?:out\\)?\\)\
+\\(?:-[-[:word:]]+\\)?\\)\\>\[ \f\t\n\r\v]+"
+      1 font-lock-keyword-face)
+     ("(\\(evil-\\(?:[-[:word:]]\\)*loop\\)\\>[ \f\t\n\r\v]+"
+      1 font-lock-keyword-face))))
+
+(provide 'evil-macros)
+
+;;; evil-macros.el ends here
diff --git a/elpa/evil-1.0.1/evil-maps.el b/elpa/evil-1.0.1/evil-maps.el
new file mode 100644
index 00000000..a01890e1
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-maps.el
@@ -0,0 +1,464 @@
+;;; evil-maps.el --- Default keymaps
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-states)
+(require 'evil-ex)
+
+;;; Code:
+
+;;; Normal state
+
+(define-key evil-normal-state-map "a" 'evil-append)
+(define-key evil-normal-state-map "A" 'evil-append-line)
+(define-key evil-normal-state-map "c" 'evil-change)
+(define-key evil-normal-state-map "C" 'evil-change-line)
+(define-key evil-normal-state-map "d" 'evil-delete)
+(define-key evil-normal-state-map "D" 'evil-delete-line)
+(define-key evil-normal-state-map "i" 'evil-insert)
+(define-key evil-normal-state-map "I" 'evil-insert-line)
+(define-key evil-normal-state-map "J" 'evil-join)
+(define-key evil-normal-state-map "m" 'evil-set-marker)
+(define-key evil-normal-state-map "o" 'evil-open-below)
+(define-key evil-normal-state-map "O" 'evil-open-above)
+(define-key evil-normal-state-map "p" 'evil-paste-after)
+(define-key evil-normal-state-map "P" 'evil-paste-before)
+(define-key evil-normal-state-map "q" 'evil-record-macro)
+(define-key evil-normal-state-map "r" 'evil-replace)
+(define-key evil-normal-state-map "R" 'evil-replace-state)
+(define-key evil-normal-state-map "s" 'evil-substitute)
+(define-key evil-normal-state-map "S" 'evil-change-whole-line)
+(define-key evil-normal-state-map "x" 'evil-delete-char)
+(define-key evil-normal-state-map "X" 'evil-delete-backward-char)
+(define-key evil-normal-state-map "y" 'evil-yank)
+(define-key evil-normal-state-map "Y" 'evil-yank-line)
+(define-key evil-normal-state-map "&" 'evil-ex-repeat-substitute)
+(define-key evil-normal-state-map "g&" 'evil-ex-repeat-global-substitute)
+(define-key evil-normal-state-map "g8" 'what-cursor-position)
+(define-key evil-normal-state-map "ga" 'what-cursor-position)
+(define-key evil-normal-state-map "gi" 'evil-insert-resume)
+(define-key evil-normal-state-map "gJ" 'evil-join-whitespace)
+(define-key evil-normal-state-map "gq" 'evil-fill-and-move)
+(define-key evil-normal-state-map "gw" 'evil-fill)
+(define-key evil-normal-state-map "gu" 'evil-downcase)
+(define-key evil-normal-state-map "gU" 'evil-upcase)
+(define-key evil-normal-state-map "gf" 'find-file-at-point)
+(define-key evil-normal-state-map "gF" 'evil-find-file-at-point-with-line)
+(define-key evil-normal-state-map "g?" 'evil-rot13)
+(define-key evil-normal-state-map "g~" 'evil-invert-case)
+(define-key evil-normal-state-map "zo" 'evil-open-fold)
+(define-key evil-normal-state-map "zc" 'evil-close-fold)
+(define-key evil-normal-state-map "za" 'evil-toggle-fold)
+(define-key evil-normal-state-map "zr" 'evil-open-folds)
+(define-key evil-normal-state-map "zm" 'evil-close-folds)
+(define-key evil-normal-state-map "\C-n" 'evil-paste-pop-next)
+(define-key evil-normal-state-map "\C-p" 'evil-paste-pop)
+(define-key evil-normal-state-map "\C-t" 'pop-tag-mark)
+(define-key evil-normal-state-map (kbd "C-.") 'evil-repeat-pop)
+(define-key evil-normal-state-map (kbd "M-.") 'evil-repeat-pop-next)
+(define-key evil-normal-state-map "." 'evil-repeat)
+(define-key evil-normal-state-map "@" 'evil-execute-macro)
+(define-key evil-normal-state-map "\"" 'evil-use-register)
+(define-key evil-normal-state-map "~" 'evil-invert-char)
+(define-key evil-normal-state-map "=" 'evil-indent)
+(define-key evil-normal-state-map "<" 'evil-shift-left)
+(define-key evil-normal-state-map ">" 'evil-shift-right)
+(define-key evil-normal-state-map "ZZ" 'evil-save-modified-and-close)
+(define-key evil-normal-state-map "ZQ" 'evil-quit)
+(define-key evil-normal-state-map (kbd "DEL") 'evil-backward-char)
+(define-key evil-normal-state-map [escape] 'evil-force-normal-state)
+(define-key evil-normal-state-map [remap cua-paste-pop] 'evil-paste-pop)
+(define-key evil-normal-state-map [remap yank-pop] 'evil-paste-pop)
+
+;; go to last change
+(define-key evil-normal-state-map "g;" 'goto-last-change)
+(define-key evil-normal-state-map "g," 'goto-last-change-reverse)
+
+;; undo
+(define-key evil-normal-state-map "u" 'undo)
+
+(when (fboundp 'undo-tree-undo)
+  (define-key evil-normal-state-map "u" 'undo-tree-undo)
+  (define-key evil-normal-state-map "\C-r" 'undo-tree-redo))
+
+;; window commands
+(define-prefix-command 'evil-window-map)
+(define-key evil-window-map "b" 'evil-window-bottom-right)
+(define-key evil-window-map "c" 'delete-window)
+(define-key evil-window-map "h" 'evil-window-left)
+(define-key evil-window-map "H" 'evil-window-move-far-left)
+(define-key evil-window-map "j" 'evil-window-down)
+(define-key evil-window-map "J" 'evil-window-move-very-bottom)
+(define-key evil-window-map "k" 'evil-window-up)
+(define-key evil-window-map "K" 'evil-window-move-very-top)
+(define-key evil-window-map "l" 'evil-window-right)
+(define-key evil-window-map "L" 'evil-window-move-far-right)
+(define-key evil-window-map "n" 'evil-window-new)
+(define-key evil-window-map "o" 'delete-other-windows)
+(define-key evil-window-map "p" 'evil-window-mru)
+(define-key evil-window-map "r" 'evil-window-rotate-downwards)
+(define-key evil-window-map "R" 'evil-window-rotate-upwards)
+(define-key evil-window-map "s" 'split-window-vertically)
+(define-key evil-window-map "S" 'split-window-vertically)
+(define-key evil-window-map "t" 'evil-window-top-left)
+(define-key evil-window-map "v" 'split-window-horizontally)
+(define-key evil-window-map "w" 'evil-window-next)
+(define-key evil-window-map "W" 'evil-window-prev)
+(define-key evil-window-map "+" 'evil-window-increase-height)
+(define-key evil-window-map "-" 'evil-window-decrease-height)
+(define-key evil-window-map "_" 'evil-window-set-height)
+(define-key evil-window-map "<" 'evil-window-decrease-width)
+(define-key evil-window-map ">" 'evil-window-increase-width)
+(define-key evil-window-map "=" 'balance-windows)
+(define-key evil-window-map "|" 'evil-window-set-width)
+(define-key evil-window-map "\C-b" 'evil-window-bottom-right)
+(define-key evil-window-map "\C-c" 'delete-window)
+(define-key evil-window-map "\C-H" 'evil-window-move-far-left)
+(define-key evil-window-map "\C-h" 'evil-window-left)
+(define-key evil-window-map "\C-J" 'evil-window-move-very-bottom)
+(define-key evil-window-map "\C-j" 'evil-window-down)
+(define-key evil-window-map "\C-K" 'evil-window-move-very-top)
+(define-key evil-window-map "\C-k" 'evil-window-up)
+(define-key evil-window-map "\C-L" 'evil-window-move-far-right)
+(define-key evil-window-map "\C-l" 'evil-window-right)
+(define-key evil-window-map "\C-n" 'evil-window-new)
+(define-key evil-window-map "\C-o" 'delete-other-windows)
+(define-key evil-window-map "\C-p" 'evil-window-mru)
+(define-key evil-window-map "\C-r" 'evil-window-rotate-downwards)
+(define-key evil-window-map "\C-R" 'evil-window-rotate-upwards)
+(define-key evil-window-map "\C-s" 'split-window-vertically)
+(define-key evil-window-map "\C-S" 'split-window-vertically)
+(define-key evil-window-map "\C-t" 'evil-window-top-left)
+(define-key evil-window-map "\C-v" 'split-window-horizontally)
+(define-key evil-window-map "\C-w" 'evil-window-next)
+(define-key evil-window-map "\C-W" 'evil-window-prev)
+(define-key evil-window-map "\C-_" 'evil-window-set-height)
+(define-key evil-window-map "\C-f" 'ffap-other-window)
+
+;;; Motion state
+
+;; "0" is a special command when called first
+(evil-redirect-digit-argument evil-motion-state-map "0" 'evil-beginning-of-line)
+(define-key evil-motion-state-map "1" 'digit-argument)
+(define-key evil-motion-state-map "2" 'digit-argument)
+(define-key evil-motion-state-map "3" 'digit-argument)
+(define-key evil-motion-state-map "4" 'digit-argument)
+(define-key evil-motion-state-map "5" 'digit-argument)
+(define-key evil-motion-state-map "6" 'digit-argument)
+(define-key evil-motion-state-map "7" 'digit-argument)
+(define-key evil-motion-state-map "8" 'digit-argument)
+(define-key evil-motion-state-map "9" 'digit-argument)
+(define-key evil-motion-state-map "b" 'evil-backward-word-begin)
+(define-key evil-motion-state-map "B" 'evil-backward-WORD-begin)
+(define-key evil-motion-state-map "e" 'evil-forward-word-end)
+(define-key evil-motion-state-map "E" 'evil-forward-WORD-end)
+(define-key evil-motion-state-map "f" 'evil-find-char)
+(define-key evil-motion-state-map "F" 'evil-find-char-backward)
+(define-key evil-motion-state-map "G" 'evil-goto-line)
+(define-key evil-motion-state-map "h" 'evil-backward-char)
+(define-key evil-motion-state-map "H" 'evil-window-top)
+(define-key evil-motion-state-map "j" 'evil-next-line)
+(define-key evil-motion-state-map "k" 'evil-previous-line)
+(define-key evil-motion-state-map "l" 'evil-forward-char)
+(define-key evil-motion-state-map " " 'evil-forward-char)
+(define-key evil-motion-state-map "K" 'evil-lookup)
+(define-key evil-motion-state-map "L" 'evil-window-bottom)
+(define-key evil-motion-state-map "M" 'evil-window-middle)
+(define-key evil-motion-state-map "n" 'evil-search-next)
+(define-key evil-motion-state-map "N" 'evil-search-previous)
+(define-key evil-motion-state-map "t" 'evil-find-char-to)
+(define-key evil-motion-state-map "T" 'evil-find-char-to-backward)
+(define-key evil-motion-state-map "w" 'evil-forward-word-begin)
+(define-key evil-motion-state-map "W" 'evil-forward-WORD-begin)
+(define-key evil-motion-state-map "gd" 'evil-goto-definition)
+(define-key evil-motion-state-map "ge" 'evil-backward-word-end)
+(define-key evil-motion-state-map "gE" 'evil-backward-WORD-end)
+(define-key evil-motion-state-map "gg" 'evil-goto-first-line)
+(define-key evil-motion-state-map "gj" 'evil-next-visual-line)
+(define-key evil-motion-state-map "gk" 'evil-previous-visual-line)
+(define-key evil-motion-state-map "g0" 'evil-beginning-of-visual-line)
+(define-key evil-motion-state-map "g_" 'evil-last-non-blank)
+(define-key evil-motion-state-map "g^" 'evil-first-non-blank-of-visual-line)
+(define-key evil-motion-state-map "g$" 'evil-end-of-visual-line)
+(define-key evil-motion-state-map "g\C-]" 'find-tag)
+(define-key evil-motion-state-map "{" 'evil-backward-paragraph)
+(define-key evil-motion-state-map "}" 'evil-forward-paragraph)
+(define-key evil-motion-state-map "#" 'evil-search-symbol-backward)
+(define-key evil-motion-state-map "$" 'evil-end-of-line)
+(define-key evil-motion-state-map "%" 'evil-jump-item)
+(define-key evil-motion-state-map "`" 'evil-goto-mark)
+(define-key evil-motion-state-map "'" 'evil-goto-mark-line)
+(define-key evil-motion-state-map "(" 'evil-backward-sentence)
+(define-key evil-motion-state-map ")" 'evil-forward-sentence)
+(define-key evil-motion-state-map "]]" 'evil-forward-section-begin)
+(define-key evil-motion-state-map "][" 'evil-forward-section-end)
+(define-key evil-motion-state-map "[[" 'evil-backward-section-begin)
+(define-key evil-motion-state-map "[]" 'evil-backward-section-end)
+(define-key evil-motion-state-map "[(" 'evil-previous-open-paren)
+(define-key evil-motion-state-map "])" 'evil-next-close-paren)
+(define-key evil-motion-state-map "[{" 'evil-previous-open-brace)
+(define-key evil-motion-state-map "]}" 'evil-next-close-brace)
+(define-key evil-motion-state-map "*" 'evil-search-symbol-forward)
+(define-key evil-motion-state-map "," 'evil-repeat-find-char-reverse)
+(define-key evil-motion-state-map "/" 'evil-search-forward)
+(define-key evil-motion-state-map ";" 'evil-repeat-find-char)
+(define-key evil-motion-state-map "?" 'evil-search-backward)
+(define-key evil-motion-state-map "|" 'evil-goto-column)
+(define-key evil-motion-state-map "^" 'evil-first-non-blank)
+(define-key evil-motion-state-map "+" 'evil-next-line-first-non-blank)
+(define-key evil-motion-state-map "_" 'evil-next-line-1-first-non-blank)
+(define-key evil-motion-state-map "-" 'evil-previous-line-first-non-blank)
+(define-key evil-motion-state-map "\C-w" 'evil-window-map)
+(define-key evil-motion-state-map "\C-]" 'evil-jump-to-tag)
+(define-key evil-motion-state-map (kbd "C-b") 'evil-scroll-page-up)
+(define-key evil-motion-state-map (kbd "C-d") 'evil-scroll-down)
+(define-key evil-motion-state-map (kbd "C-e") 'evil-scroll-line-down)
+(define-key evil-motion-state-map (kbd "C-f") 'evil-scroll-page-down)
+(define-key evil-motion-state-map (kbd "C-o") 'evil-jump-backward)
+(define-key evil-motion-state-map (kbd "C-y") 'evil-scroll-line-up)
+(define-key evil-motion-state-map (kbd "RET") 'evil-ret)
+(define-key evil-motion-state-map "\\" 'evil-execute-in-emacs-state)
+(define-key evil-motion-state-map "z^" 'evil-scroll-top-line-to-bottom)
+(define-key evil-motion-state-map "z+" 'evil-scroll-bottom-line-to-top)
+(define-key evil-motion-state-map "zt" 'evil-scroll-line-to-top)
+;; TODO: z RET has an advanced form taking an count before the RET
+;; but this requires again a special state with a single command
+;; bound to RET
+(define-key evil-motion-state-map (vconcat "z" [return]) "zt^")
+(define-key evil-motion-state-map (kbd "z RET") (vconcat "z" [return]))
+(define-key evil-motion-state-map "zz" 'evil-scroll-line-to-center)
+(define-key evil-motion-state-map "z." "zz^")
+(define-key evil-motion-state-map "zb" 'evil-scroll-line-to-bottom)
+(define-key evil-motion-state-map "z-" "zb^")
+(define-key evil-motion-state-map "v" 'evil-visual-char)
+(define-key evil-motion-state-map "V" 'evil-visual-line)
+(define-key evil-motion-state-map "\C-v" 'evil-visual-block)
+(define-key evil-motion-state-map "gv" 'evil-visual-restore)
+(define-key evil-motion-state-map (kbd "C-^") 'evil-buffer)
+(define-key evil-motion-state-map [left] 'evil-backward-char)
+(define-key evil-motion-state-map [right] 'evil-forward-char)
+(define-key evil-motion-state-map [up] 'evil-previous-line)
+(define-key evil-motion-state-map [down] 'evil-next-line)
+(define-key evil-motion-state-map
+  (read-kbd-macro evil-toggle-key) 'evil-emacs-state)
+
+;; text objects
+(define-key evil-outer-text-objects-map "w" 'evil-a-word)
+(define-key evil-outer-text-objects-map "W" 'evil-a-WORD)
+(define-key evil-outer-text-objects-map "s" 'evil-a-sentence)
+(define-key evil-outer-text-objects-map "p" 'evil-a-paragraph)
+(define-key evil-outer-text-objects-map "b" 'evil-a-paren)
+(define-key evil-outer-text-objects-map "(" 'evil-a-paren)
+(define-key evil-outer-text-objects-map ")" 'evil-a-paren)
+(define-key evil-outer-text-objects-map "[" 'evil-a-bracket)
+(define-key evil-outer-text-objects-map "]" 'evil-a-bracket)
+(define-key evil-outer-text-objects-map "B" 'evil-a-curly)
+(define-key evil-outer-text-objects-map "{" 'evil-a-curly)
+(define-key evil-outer-text-objects-map "}" 'evil-a-curly)
+(define-key evil-outer-text-objects-map "<" 'evil-an-angle)
+(define-key evil-outer-text-objects-map ">" 'evil-an-angle)
+(define-key evil-outer-text-objects-map "'" 'evil-a-single-quote)
+(define-key evil-outer-text-objects-map "\"" 'evil-a-double-quote)
+(define-key evil-outer-text-objects-map "`" 'evil-a-back-quote)
+(define-key evil-outer-text-objects-map "t" 'evil-a-tag)
+(define-key evil-outer-text-objects-map "o" 'evil-a-symbol)
+(define-key evil-inner-text-objects-map "w" 'evil-inner-word)
+(define-key evil-inner-text-objects-map "W" 'evil-inner-WORD)
+(define-key evil-inner-text-objects-map "s" 'evil-inner-sentence)
+(define-key evil-inner-text-objects-map "p" 'evil-inner-paragraph)
+(define-key evil-inner-text-objects-map "b" 'evil-inner-paren)
+(define-key evil-inner-text-objects-map "(" 'evil-inner-paren)
+(define-key evil-inner-text-objects-map ")" 'evil-inner-paren)
+(define-key evil-inner-text-objects-map "[" 'evil-inner-bracket)
+(define-key evil-inner-text-objects-map "]" 'evil-inner-bracket)
+(define-key evil-inner-text-objects-map "B" 'evil-inner-curly)
+(define-key evil-inner-text-objects-map "{" 'evil-inner-curly)
+(define-key evil-inner-text-objects-map "}" 'evil-inner-curly)
+(define-key evil-inner-text-objects-map "<" 'evil-inner-angle)
+(define-key evil-inner-text-objects-map ">" 'evil-inner-angle)
+(define-key evil-inner-text-objects-map "'" 'evil-inner-single-quote)
+(define-key evil-inner-text-objects-map "\"" 'evil-inner-double-quote)
+(define-key evil-inner-text-objects-map "`" 'evil-inner-back-quote)
+(define-key evil-inner-text-objects-map "t" 'evil-inner-tag)
+(define-key evil-inner-text-objects-map "o" 'evil-inner-symbol)
+
+(when evil-want-C-i-jump
+  (define-key evil-motion-state-map (kbd "C-i") 'evil-jump-forward))
+
+(when evil-want-C-u-scroll
+  (define-key evil-motion-state-map (kbd "C-u") 'evil-scroll-up))
+
+;;; Visual state
+
+(define-key evil-visual-state-map "A" 'evil-append)
+(define-key evil-visual-state-map "I" 'evil-insert)
+(define-key evil-visual-state-map "o" 'exchange-point-and-mark)
+(define-key evil-visual-state-map "O" 'evil-visual-exchange-corners)
+(define-key evil-visual-state-map "R" 'evil-change)
+(define-key evil-visual-state-map "u" 'evil-downcase)
+(define-key evil-visual-state-map "U" 'evil-upcase)
+(define-key evil-visual-state-map "a" evil-outer-text-objects-map)
+(define-key evil-visual-state-map "i" evil-inner-text-objects-map)
+(define-key evil-visual-state-map [remap evil-repeat] 'undefined)
+(define-key evil-visual-state-map [escape] 'evil-exit-visual-state)
+
+;;; Operator-Pending state
+
+(define-key evil-operator-state-map "a" evil-outer-text-objects-map)
+(define-key evil-operator-state-map "i" evil-inner-text-objects-map)
+;; (define-key evil-operator-state-map [escape] 'keyboard-quit)
+
+;;; Insert state
+
+(define-key evil-insert-state-map "\C-k" 'evil-insert-digraph)
+(define-key evil-insert-state-map "\C-o" 'evil-execute-in-normal-state)
+(define-key evil-insert-state-map "\C-r" 'evil-paste-from-register)
+(define-key evil-insert-state-map "\C-y" 'evil-copy-from-above)
+(define-key evil-insert-state-map "\C-e" 'evil-copy-from-below)
+(define-key evil-insert-state-map "\C-n" 'evil-complete-next)
+(define-key evil-insert-state-map "\C-p" 'evil-complete-previous)
+(define-key evil-insert-state-map "\C-x\C-n" 'evil-complete-next-line)
+(define-key evil-insert-state-map "\C-x\C-p" 'evil-complete-previous-line)
+(define-key evil-insert-state-map [remap newline] 'evil-ret)
+(define-key evil-insert-state-map [remap newline-and-indent] 'evil-ret)
+(define-key evil-insert-state-map [escape] 'evil-normal-state)
+(define-key evil-insert-state-map
+  (read-kbd-macro evil-toggle-key) 'evil-emacs-state)
+
+(if evil-want-C-w-delete
+    (define-key evil-insert-state-map "\C-w" 'evil-delete-backward-word)
+  (define-key evil-insert-state-map "\C-w" 'evil-window-map))
+
+;;; Replace state
+
+(define-key evil-replace-state-map (kbd "DEL") 'evil-replace-backspace)
+(define-key evil-replace-state-map [escape] 'evil-normal-state)
+
+;;; Emacs state
+
+(define-key evil-emacs-state-map
+  (read-kbd-macro evil-toggle-key) 'evil-exit-emacs-state)
+
+(when evil-want-C-w-in-emacs-state
+  (define-key evil-emacs-state-map "\C-w" 'evil-window-map))
+
+;;; Minibuffer
+
+(define-key minibuffer-local-map "\C-p" 'evil-complete-next)
+(define-key minibuffer-local-map "\C-n" 'evil-complete-previous)
+(define-key minibuffer-local-map "\C-x\C-p" 'evil-complete-next-line)
+(define-key minibuffer-local-map "\C-x\C-n" 'evil-complete-previous-line)
+
+;;; Mouse
+(define-key evil-motion-state-map [down-mouse-1] 'evil-mouse-drag-region)
+(define-key evil-visual-state-map [mouse-2] 'evil-exit-visual-and-repeat)
+(define-key evil-normal-state-map [mouse-2] 'mouse-yank-primary)
+(define-key evil-insert-state-map [mouse-2] 'mouse-yank-primary)
+
+;; Ex
+(define-key evil-motion-state-map ":" 'evil-ex)
+
+(evil-ex-define-cmd "e[dit]" 'evil-edit)
+(evil-ex-define-cmd "w[rite]" 'evil-write)
+(evil-ex-define-cmd "wa[ll]" 'evil-write-all)
+(evil-ex-define-cmd "sav[eas]" 'evil-save)
+(evil-ex-define-cmd "r[ead]" 'evil-read)
+(evil-ex-define-cmd "b[uffer]" 'evil-buffer)
+(evil-ex-define-cmd "bn[ext]" 'evil-next-buffer)
+(evil-ex-define-cmd "bp[revious]" 'evil-prev-buffer)
+(evil-ex-define-cmd "bN[ext]" "bprevious")
+(evil-ex-define-cmd "sb[uffer]" 'evil-split-buffer)
+(evil-ex-define-cmd "sbn[ext]" 'evil-split-next-buffer)
+(evil-ex-define-cmd "sbp[revious]" 'evil-split-prev-buffer)
+(evil-ex-define-cmd "sbN[ext]" "sbprevious")
+(evil-ex-define-cmd "buffers" 'evil-show-buffers)
+(evil-ex-define-cmd "files" "buffers")
+(evil-ex-define-cmd "ls" "buffers")
+
+(evil-ex-define-cmd "c[hange]" 'evil-change)
+(evil-ex-define-cmd "d[elete]" 'evil-delete)
+(evil-ex-define-cmd "go[to]" 'evil-goto-char)
+(evil-ex-define-cmd "j[oin]" 'evil-join)
+(evil-ex-define-cmd "le[ft]" 'evil-align-left)
+(evil-ex-define-cmd "ri[ght]" 'evil-align-right)
+(evil-ex-define-cmd "ce[nter]" 'evil-align-center)
+(evil-ex-define-cmd "sp[lit]" 'evil-window-split)
+(evil-ex-define-cmd "vs[plit]" 'evil-window-vsplit)
+(evil-ex-define-cmd "new" 'evil-window-new)
+(evil-ex-define-cmd "vne[w]" 'evil-window-vnew)
+(evil-ex-define-cmd "clo[se]" 'delete-window)
+(evil-ex-define-cmd "on[ly]" 'delete-other-windows)
+(evil-ex-define-cmd "q[uit]" 'evil-quit)
+(evil-ex-define-cmd "wq" 'evil-save-and-close)
+(evil-ex-define-cmd "quita[ll]" 'evil-quit-all)
+(evil-ex-define-cmd "qa[ll]" "quitall")
+(evil-ex-define-cmd "wqa[ll]" 'evil-save-and-quit)
+(evil-ex-define-cmd "xa[ll]" "wqall")
+(evil-ex-define-cmd "x[it]" 'evil-save-modified-and-close)
+(evil-ex-define-cmd "exi[t]" 'evil-save-modified-and-close)
+(evil-ex-define-cmd "bd[elete]" 'evil-delete-buffer)
+(evil-ex-define-cmd "g[lobal]" 'evil-ex-global)
+(evil-ex-define-cmd "v[global]" 'evil-ex-global-inverted)
+(evil-ex-define-cmd "s[ubstitute]" 'evil-ex-substitute)
+(evil-ex-define-cmd "&" 'evil-ex-repeat-substitute)
+(evil-ex-define-cmd "&&" 'evil-ex-repeat-substitute-with-flags)
+(evil-ex-define-cmd "~" 'evil-ex-repeat-substitute-with-search)
+(evil-ex-define-cmd "~&" 'evil-ex-repeat-substitute-with-search-and-flags)
+(evil-ex-define-cmd "registers" 'evil-show-registers)
+(evil-ex-define-cmd "marks" 'evil-show-marks)
+(evil-ex-define-cmd "ju[mps]" 'evil-show-jumps)
+(evil-ex-define-cmd "noh[lsearch]" 'evil-ex-nohighlight)
+(evil-ex-define-cmd "f[ile]" 'evil-show-file-info)
+(evil-ex-define-cmd "<" 'evil-shift-left)
+(evil-ex-define-cmd ">" 'evil-shift-right)
+(evil-ex-define-cmd "=" 'evil-ex-line-number)
+(evil-ex-define-cmd "!" 'evil-shell-command)
+(evil-ex-define-cmd "@:" 'evil-ex-repeat)
+(evil-ex-define-cmd "set-initial-state" 'evil-ex-set-initial-state)
+
+(when (fboundp 'undo-tree-visualize)
+  (evil-ex-define-cmd "undol[ist]" 'undo-tree-visualize)
+  (evil-ex-define-cmd "ul" 'undo-tree-visualize))
+
+;; completion
+(define-key evil-ex-search-keymap "\d" #'evil-ex-delete-backward-char)
+(define-key evil-ex-completion-map "\d" #'evil-ex-delete-backward-char)
+(define-key evil-ex-completion-map "\t" #'evil-ex-run-completion-at-point)
+(define-key evil-ex-completion-map [tab] #'evil-ex-run-completion-at-point)
+(define-key evil-ex-completion-map "\C-p" #'evil-ex-run-completion-at-point)
+(define-key evil-ex-completion-map "\C-n" #'evil-ex-run-completion-at-point)
+(define-key evil-ex-completion-map "?" nil)
+
+;; evil-read-key
+(define-key evil-read-key-map (kbd "ESC") #'keyboard-quit)
+(define-key evil-read-key-map (kbd "C-]") #'keyboard-quit)
+(define-key evil-read-key-map (kbd "C-q") #'evil-read-quoted-char)
+(define-key evil-read-key-map (kbd "C-v") #'evil-read-quoted-char)
+(define-key evil-read-key-map "\r" "\n")
+
+(provide 'evil-maps)
+
+;;; evil-maps.el ends here
diff --git a/elpa/evil-1.0.1/evil-pkg.el b/elpa/evil-1.0.1/evil-pkg.el
new file mode 100644
index 00000000..a690aebd
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-pkg.el
@@ -0,0 +1,5 @@
+(define-package
+  "evil"
+  "1.0.1"
+  "Extensible Vi layer for Emacs."
+  '((undo-tree "0.5.1")))
diff --git a/elpa/evil-1.0.1/evil-repeat.el b/elpa/evil-1.0.1/evil-repeat.el
new file mode 100644
index 00000000..5dc80375
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-repeat.el
@@ -0,0 +1,607 @@
+;;; evil-repeat.el --- Repeat system
+
+;; Author: Frank Fischer <frank.fischer at mathematik.tu-chemnitz.de>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; A repeat begins when leaving Normal state; it ends when re-entering
+;; Normal state. The diagram below shows possible routes between
+;; Normal state (N), Insert state (I), Visual state (V),
+;; Operator-Pending state (O) and Replace state (R). (Emacs state
+;; is an exception: nothing is repeated in that state.)
+;;                              ___
+;;                             /   \
+;;                             | R |
+;;                             \___/
+;;                             ^   |
+;;                             |   |
+;;               ___           |___V           ___
+;;              /   \ <------- /   \ -------> /   \
+;;              | V |          | N |          | O |
+;;              \___/ -------> \___/ <------- \___/
+;;                  |          |   ^          |
+;;                  |          |   |          |
+;;                  |          V___|          |
+;;                  |          /   \          |
+;;                  +--------> | I | <--------+
+;;                             \___/
+;;
+;; The recording of a repeat is started in one of two cases: Either a
+;; command is about being executed (in pre-command-hook) or normal
+;; state is exited. The recording is stopped whenever a command has
+;; being completed and evil is in normal state afterwards. Therefore,
+;; a non-inserting command in normal-state is recorded as a single
+;; repeat unit. In contrast, if the command leaves normal state and
+;; starts insert-state, all commands that are executed until
+;; insert-state is left and normal state is reactivated are recorded
+;; together in one repeat unit. In other words, a repeat unit consists
+;; of all commands that are executed starting and ending in normal
+;; state.
+;;
+;; Not all commands are recored. There are several commands that are
+;; completely ignored and other commands that even abort the currently
+;; active recording, e.g., commands that change the current buffer.
+;;
+;; During recording the repeat information is appended to the variable
+;; `evil-repeat-info', which is cleared when the recording
+;; starts. This accumulated repeat information is put into the
+;; `evil-repeat-ring' when the recording is finished. The dot command,
+;; `\[evil-repeat]' (`evil-repeat') replays the most recent entry in
+;; the ring, preceeding repeats can be replayed using
+;; `\[evil-repeat-pop]' (`evil-repeat-pop').
+;;
+;; Repeat information can be stored in almost arbitrary form. How the
+;; repeat information for each single command is recored is determined
+;; by the :repeat property of the command. This property has the
+;; following interpretation:
+;;
+;; t         record commands by storing the key-sequence that invoked it
+;; nil       ignore this command completely
+;; ignore    synonym to nil
+;; motion    command is recorded by storing the key-sequence but only in
+;;           insert state, otherwise it is ignored.
+;; abort     stop recording of repeat information immediately
+;; change    record commands by storing buffer changes
+;; SYMBOL    if SYMBOL is contained as key in `evil-repeat-types'
+;;           call the corresponding (function-)value, otherwise
+;;           call the function associated with SYMBOL. In both
+;;           cases the function should take exactly one argument
+;;           which is either 'pre or 'post depending on whether
+;;           the function is called before or after the execution
+;;           of the command.
+;;
+;; Therefore, using a certain SYMBOL one can write specific repeation
+;; functions for each command.
+;;
+;; Each value of ring `evil-repeat-info', i.e., each single repeat
+;; information must be one of the following two possibilities:
+;; If element is a sequence, it is regarded as a key-sequence to
+;; be repeated. Otherwise the element must be a list
+;; (FUNCTION PARAMS ...) which will be called using
+;; (apply FUNCTION PARAMS) whenever this repeat is being executed.
+;;
+;; A user supplied repeat function can use the functions
+;; `evil-record-repeat' to append further repeat-information of the
+;; form described above to `evil-repeat-info'. See the implementation
+;; of `evil-repeat-keystrokes' and `evil-repeat-changes' for examples.
+;; Those functions are called in different situations before and after
+;; the execution of a command. Each function should take one argument
+;; which can be either 'pre, 'post, 'pre-operator or 'post-operator
+;; specifying when the repeat function has been called. If the command
+;; is a usual command the function is called with 'pre before the
+;; command is executed and with 'post after the command has been
+;; executed.
+;;
+;; The repeat information is executed with `evil-execute-repeat-info',
+;; which passes key-sequence elements to `execute-kbd-macro' and
+;; executes other elements as defined above.  A special version is
+;; `evil-execute-repeat-info-with-count'.  This function works as
+;; `evil-execute-repeat-info', but replaces the count of the first
+;; command. This is done by parsing the key-sequence, ignoring all
+;; calls to `digit-prefix-argument' and `negative-argument', and
+;; prepending the count as a string to the vector of the remaining
+;; key-sequence.
+
+(require 'evil-states)
+
+;;; Code:
+
+(declare-function evil-visual-state-p "evil-visual")
+(declare-function evil-visual-range "evil-visual")
+(declare-function evil-visual-char "evil-visual")
+(declare-function evil-visual-line "evil-visual")
+(declare-function evil-visual-block "evil-visual")
+
+(defsubst evil-repeat-recording-p ()
+  "Returns non-nil iff a recording is in progress."
+  (eq evil-recording-repeat t))
+
+(defun evil-repeat-start ()
+  "Start recording a new repeat into `evil-repeat-info'."
+  (evil-repeat-reset t)
+  (evil-repeat-record-buffer)
+  (when (evil-visual-state-p)
+    (let* ((range (evil-visual-range))
+           (beg (evil-range-beginning range))
+           (end (1- (evil-range-end range)))
+           (nfwdlines (- (line-number-at-pos end)
+                         (line-number-at-pos beg))))
+      (evil-repeat-record
+       (cond
+        ((eq evil-visual-selection 'char)
+         (list #'evil-repeat-visual-char
+               nfwdlines
+               (- end
+                  (if (zerop nfwdlines)
+                      beg
+                    (save-excursion
+                      (goto-char end)
+                      (line-beginning-position))))))
+        ((eq evil-visual-selection 'line)
+         (list #'evil-repeat-visual-line nfwdlines))
+        ((eq evil-visual-selection 'block)
+         (list #'evil-repeat-visual-block
+               nfwdlines
+               (abs (- (evil-column beg) (evil-column end))))))))))
+
+(defun evil-repeat-stop ()
+  "Stop recording a repeat.
+Update `evil-repeat-ring' with the accumulated changes
+in `evil-repeat-info' and clear variables."
+  (unwind-protect
+      (when (evil-repeat-recording-p)
+        (setq evil-repeat-info
+              (evil-normalize-repeat-info evil-repeat-info))
+        (when (and evil-repeat-info evil-repeat-ring)
+          (ring-insert evil-repeat-ring evil-repeat-info)))
+    (evil-repeat-reset nil)))
+
+(defun evil-repeat-abort ()
+  "Abort current repeation."
+  (evil-repeat-reset 'abort))
+
+(defun evil-repeat-reset (flag)
+  "Clear all repeat recording variables.
+Set `evil-recording-repeat' to FLAG."
+  (setq evil-recording-repeat flag
+        evil-repeat-info nil
+        evil-repeat-buffer nil))
+
+(defsubst evil-repeat-record-position (&optional pos)
+  "Set `evil-repeat-pos' to POS or point."
+  (setq evil-repeat-pos (or pos (point))))
+
+(defun evil-repeat-record-buffer ()
+  "Set `evil-repeat-buffer' to the current buffer."
+  (unless (minibufferp)
+    (setq evil-repeat-buffer (current-buffer))))
+
+(defmacro evil-save-repeat-info (&rest body)
+  "Execute BODY, protecting the values of repeat variables."
+  (declare (indent defun)
+           (debug t))
+  `(let (evil-repeat-ring
+         evil-recording-repeat
+         evil-recording-current-command
+         evil-repeat-info
+         evil-repeat-changes
+         evil-repeat-pos
+         evil-repeat-keys
+         evil-repeat-buffer
+         this-command
+         last-command)
+     ,@body))
+
+(defun evil-repeat-different-buffer-p (&optional strict)
+  "Whether the buffer has changed in a repeat.
+If STRICT is non-nil, returns t if the previous buffer
+is unknown; otherwise returns t only if the previous
+buffer is known and different from the current buffer."
+  (and (or (buffer-live-p evil-repeat-buffer) strict)
+       (not (minibufferp))
+       (not (eq (current-buffer) evil-repeat-buffer))))
+
+(defun evil-repeat-type (command &optional default)
+  "Return the :repeat property of COMMAND.
+If COMMAND doesn't have this property, return DEFAULT."
+  (when (functionp command) ; ignore keyboard macros
+    (let* ((type (evil-get-command-property command :repeat default))
+           (repeat-type (assq type evil-repeat-types)))
+      (if repeat-type (cdr repeat-type) type))))
+
+(defun evil-repeat-force-abort-p (repeat-type)
+  "Returns non-nil iff the current command should abort the recording of repeat information."
+  (or (evil-repeat-different-buffer-p)           ; ... buffer changed
+      (eq repeat-type 'abort)                    ; ... explicitely forced
+      (eq evil-recording-repeat 'abort)          ; ... already aborted
+      (evil-emacs-state-p)                       ; ... in Emacs state
+      (and (evil-mouse-events-p (this-command-keys))  ; ... mouse events
+           (eq repeat-type nil))
+      (minibufferp)))                            ; ... minibuffer activated
+
+(defun evil-repeat-record (info)
+  "Add INFO to the end of `evil-repeat-info'."
+  (when (evil-repeat-recording-p)
+    (setq evil-repeat-info (nconc evil-repeat-info (list info)))))
+
+;; called from `evil-normal-state-exit-hook'
+(defun evil-repeat-start-hook ()
+  "Record a new repeat when exiting Normal state.
+Does not record in Emacs state or if the current command
+has :repeat nil."
+  (when (and (eq (evil-repeat-type this-command t) t)
+             (not (evil-emacs-state-p)))
+    (evil-repeat-start)))
+
+;; called from `pre-command-hook'
+(defun evil-repeat-pre-hook ()
+  "Prepare the current command for recording the repeation."
+  (when evil-local-mode
+    (let ((repeat-type (evil-repeat-type this-command t)))
+      (cond
+       ;; abort the repeat
+       ((evil-repeat-force-abort-p repeat-type)
+        ;; We mark the current record as being aborted, because there
+        ;; may be further pre-hooks following before the post-hook is
+        ;; called.
+        (evil-repeat-abort))
+       ;; ignore those commands completely
+       ((null repeat-type))
+       ;; record command
+       (t
+        ;; In normal-state or visual state, each command is a single
+        ;; repeation, therefore start a new repeation.
+        (when (or (evil-normal-state-p)
+                  (evil-visual-state-p))
+          (evil-repeat-start))
+        (setq evil-recording-current-command t)
+        (funcall repeat-type 'pre))))))
+(put 'evil-repeat-pre-hook 'permanent-local-hook t)
+
+;; called from `post-command-hook'
+(defun evil-repeat-post-hook ()
+  "Finish recording of repeat-information for the current-command."
+  (when (and evil-local-mode evil-recording-repeat)
+    (let ((repeat-type (evil-repeat-type this-command t)))
+      (cond
+       ;; abort the repeat
+       ((evil-repeat-force-abort-p repeat-type)
+        ;; The command has been aborted but is complete, so just reset
+        ;; the recording state.
+        (evil-repeat-reset nil))
+       ;; ignore if command should not be recorded or the current
+       ;; command is not being recorded
+       ((or (null repeat-type)
+            (not evil-recording-current-command)))
+       ;; record command
+       (t
+        (funcall repeat-type 'post)
+        ;; In normal state, the repeat sequence is complete, so record it.
+        (when (evil-normal-state-p)
+          (evil-repeat-stop)))))
+    ;; done with recording the current command
+    (setq evil-recording-current-command nil)))
+(put 'evil-repeat-post-hook 'permanent-local-hook t)
+
+(defun evil-clear-command-keys ()
+  "Clear `this-command-keys' and all information about the current command keys.
+Calling this function prevents further recording of the keys that
+invoked the current command"
+  (clear-this-command-keys t)
+  (setq evil-repeat-keys ""))
+
+(defun evil-repeat-keystrokes (flag)
+  "Repeation recording function for commands that are repeated by keystrokes."
+  (cond
+   ((eq flag 'pre)
+    (setq evil-repeat-keys (this-command-keys)))
+   ((eq flag 'post)
+    (evil-repeat-record (if (zerop (length (this-command-keys)))
+                            evil-repeat-keys
+                          (this-command-keys)))
+    ;; erase commands keys to prevent double recording
+    (evil-clear-command-keys))))
+
+(defun evil-repeat-motion (flag)
+  "Repeation for motions. Motions are recorded by keystroke but only in insert state."
+  (when (memq evil-state '(insert replace))
+    (evil-repeat-keystrokes flag)))
+
+(defun evil-repeat-changes (flag)
+  "Repeation recording function for commands that are repeated by buffer changes."
+  (cond
+   ((eq flag 'pre)
+    (add-hook 'after-change-functions #'evil-repeat-change-hook nil t)
+    (evil-repeat-start-record-changes))
+   ((eq flag 'post)
+    (remove-hook 'after-change-functions #'evil-repeat-change-hook t)
+    (evil-repeat-finish-record-changes))))
+
+;; called from the `after-change-functions' hook
+(defun evil-repeat-change-hook (beg end length)
+  "Record change information for current command."
+  (let ((repeat-type (evil-repeat-type this-command t)))
+    (when (and (evil-repeat-recording-p)
+               (eq repeat-type 'evil-repeat-changes)
+               (not (evil-emacs-state-p))
+               (not (evil-repeat-different-buffer-p t))
+               evil-state)
+      (unless (evil-repeat-recording-p)
+        (evil-repeat-start))
+      (evil-repeat-record-change (- beg evil-repeat-pos)
+                                 (buffer-substring beg end)
+                                 length))))
+(put 'evil-repeat-change-hook 'permanent-local-hook t)
+
+(defun evil-repeat-record-change (relpos ins ndel)
+  "Record the current buffer changes during a repeat.
+If CHANGE is specified, it is added to `evil-repeat-changes'."
+  (when (evil-repeat-recording-p)
+    (setq evil-repeat-changes
+          (nconc evil-repeat-changes (list (list relpos ins ndel))))))
+
+(defun evil-repeat-start-record-changes ()
+  "Starts the recording of a new set of buffer changes."
+  (setq evil-repeat-changes nil)
+  (evil-repeat-record-position))
+
+(defun evil-repeat-finish-record-changes ()
+  "Finishes the recording of buffer changes and records them as repeat."
+  (when (evil-repeat-recording-p)
+    (evil-repeat-record `(evil-execute-change
+                          ,evil-repeat-changes
+                          ,(- (point) evil-repeat-pos)))
+    (setq evil-repeat-changes nil)))
+
+(defun evil-repeat-insert-at-point (flag)
+  "Repeation recording function for commands that insert text in region.
+This records text insertion when a command inserts some text in a
+buffer between (point) and (mark)."
+  (cond
+   ((eq flag 'pre)
+    (add-hook 'after-change-functions #'evil-repeat-insert-at-point-hook nil t))
+   ((eq flag 'post)
+    (remove-hook 'after-change-functions #'evil-repeat-insert-at-point-hook t))))
+
+(defun evil-repeat-insert-at-point-hook (beg end length)
+  (let ((repeat-type (evil-repeat-type this-command t)))
+    (when (and (evil-repeat-recording-p)
+               (eq repeat-type 'evil-repeat-insert-at-point)
+               (not (evil-emacs-state-p))
+               (not (evil-repeat-different-buffer-p t))
+               evil-state)
+      (setq evil-repeat-pos beg)
+      (evil-repeat-record (list 'insert (buffer-substring beg end))))))
+(put 'evil-repeat-insert-at-point-hook 'permanent-local-hook t)
+
+(defun evil-normalize-repeat-info (repeat-info)
+  "Concatenate consecutive arrays in REPEAT-INFO.
+Returns a single array."
+  (let* ((result (cons nil nil))
+         (result-last result)
+         cur cur-last)
+    (dolist (rep repeat-info)
+      (cond
+       ((null rep))
+       ((arrayp rep)
+        (setq rep (listify-key-sequence rep))
+        (cond
+         (cur
+          (setcdr cur-last (cons rep nil))
+          (setq cur-last (cdr cur-last)))
+         (t
+          (setq cur (cons rep nil))
+          (setq cur-last cur))))
+       (t
+        (when cur
+          (setcdr result-last (cons (apply #'vconcat cur) nil))
+          (setq result-last (cdr result-last))
+          (setq cur nil))
+        (setcdr result-last (cons rep nil))
+        (setq result-last (cdr result-last)))))
+    (when cur
+      (setcdr result-last (cons (apply #'vconcat cur) nil)))
+    (cdr result)))
+
+(defun evil-repeat-visual-char (nfwdlines nfwdchars)
+  "Restores a character visual selection.
+If the selection is in a single line, the restored visual
+selection covers the same number of characters. If the selection
+covers several lines, the restored selection covers the same
+number of lines and the same number of characters in the last
+line as the original selection."
+  (evil-visual-char)
+  (when (> nfwdlines 0)
+    (forward-line nfwdlines))
+  (forward-char nfwdchars))
+
+(defun evil-repeat-visual-line (nfwdlines)
+  "Restores a character visual selection.
+If the selection is in a single line, the restored visual
+selection covers the same number of characters. If the selection
+covers several lines, the restored selection covers the same
+number of lines and the same number of characters in the last
+line as the original selection."
+  (evil-visual-line)
+  (forward-line nfwdlines))
+
+(defun evil-repeat-visual-block (nfwdlines nfwdchars)
+  "Restores a character visual selection.
+If the selection is in a single line, the restored visual
+selection covers the same number of characters. If the selection
+covers several lines, the restored selection covers the same
+number of lines and the same number of characters in the last
+line as the original selection."
+  (evil-visual-block)
+  (let ((col (current-column)))
+    (forward-line nfwdlines)
+    (move-to-column (+ col nfwdchars) t)))
+
+(defun evil-execute-change (changes rel-point)
+  "Executes as list of changes.
+
+CHANGES is a list of triples (REL-BEG INSERT-TEXT NDEL).
+REL-BEG is the relative position (to point) where the change
+takes place. INSERT-TEXT is the text to be inserted at that
+position and NDEL the number of characters to be deleted at that
+position before insertion.
+
+REL-POINT is the relative position to point before the changed
+where point should be placed after all changes."
+  (evil-save-repeat-info
+    (let ((point (point)))
+      (dolist (change changes)
+        (goto-char (+ point (nth 0 change)))
+        (delete-char (nth 2 change))
+        (insert (nth 1 change)))
+      (goto-char (+ point rel-point)))))
+
+(defun evil-execute-repeat-info (repeat-info)
+  "Executes a repeat-information REPEAT-INFO."
+  (evil-save-repeat-info
+    (dolist (rep repeat-info)
+      (cond
+       ((or (arrayp rep) (stringp rep))
+        (execute-kbd-macro rep))
+       ((consp rep)
+        (apply (car rep) (cdr rep)))
+       (t
+        (error "Unexpected repeat-info: %S" rep))))))
+
+;; TODO: currently we prepend the replacing count before the
+;; key-sequence that calls the command. Can we use direct
+;; modification of prefix-arg instead? Does it work in
+;; conjunction with `execute-kbd-macro'?
+(defun evil-execute-repeat-info-with-count (count repeat-info)
+  "Repeat the repeat-information REPEAT-INFO with the count of
+the first command replaced by COUNT. The count is replaced if
+and only if COUNT is non-nil."
+  (evil-save-repeat-info
+    (cond
+     ;; do nothing (zero repeating)
+     ((and count (zerop count)))
+     ;; replace count
+     (count
+      (let ((evil-repeat-count count)
+            done)
+        (while (and repeat-info
+                    (arrayp (car repeat-info))
+                    (not done))
+          (let* ((count-and-cmd (evil-extract-count (pop repeat-info))))
+            (push (vconcat (number-to-string count)
+                           (nth 2 count-and-cmd)
+                           (nth 3 count-and-cmd))
+                  repeat-info)
+            (setq done t)))
+        (evil-execute-repeat-info repeat-info)))
+     ;; repeat with original count
+     (t
+      (evil-execute-repeat-info repeat-info)))))
+
+(evil-define-command evil-repeat (count &optional save-point)
+  "Repeat the last editing command with count replaced by COUNT.
+If SAVE-POINT is non-nil, do not move point."
+  :repeat ignore
+  :suppress-operator t
+  (interactive (list current-prefix-arg
+                     (not evil-repeat-move-cursor)))
+  (cond
+   ((null evil-repeat-ring)
+    (error "Already executing repeat"))
+   (save-point
+    (save-excursion
+      (evil-repeat count)))
+   (t
+    (unwind-protect
+        (let ((confirm-kill-emacs t)
+              (kill-buffer-hook
+               (cons #'(lambda ()
+                         (error "Cannot delete buffer in repeat command"))
+                     kill-buffer-hook))
+              (undo-pointer buffer-undo-list))
+          (evil-with-single-undo
+            (setq evil-last-repeat (list (point) count undo-pointer))
+            (evil-execute-repeat-info-with-count
+             count (ring-ref evil-repeat-ring 0))))
+      (evil-normal-state)))))
+
+;; TODO: the same issue concering disabled undos as for `evil-paste-pop'
+(evil-define-command evil-repeat-pop (count &optional save-point)
+  "Replace the just repeated command with a previously executed command.
+Only allowed after `evil-repeat', `evil-repeat-pop' or
+`evil-repeat-pop-next'. Uses the same repeat count that
+was used for the first repeat.
+
+The COUNT argument inserts the COUNT-th previous kill.
+If COUNT is negative, this is a more recent kill."
+  :repeat nil
+  :suppress-operator t
+  (interactive (list (prefix-numeric-value current-prefix-arg)
+                     (not evil-repeat-move-cursor)))
+  (cond
+   ((not (and (eq last-command #'evil-repeat)
+              evil-last-repeat))
+    (error "Previous command was not evil-repeat: %s" last-command))
+   (save-point
+    (save-excursion
+      (evil-repeat-pop count)))
+   (t
+    (unless (eq buffer-undo-list (nth 2 evil-last-repeat))
+      (evil-undo-pop))
+    (goto-char (car evil-last-repeat))
+    ;; rotate the repeat-ring
+    (while (> count 0)
+      (when evil-repeat-ring
+        (ring-insert-at-beginning evil-repeat-ring
+                                  (ring-remove evil-repeat-ring 0)))
+      (setq count (1- count)))
+    (while (< count 0)
+      (when evil-repeat-ring
+        (ring-insert evil-repeat-ring
+                     (ring-remove evil-repeat-ring)))
+      (setq count (1+ count)))
+    (setq this-command #'evil-repeat)
+    (evil-repeat (cadr evil-last-repeat)))))
+
+(evil-define-command evil-repeat-pop-next (count &optional save-point)
+  "Same as `evil-repeat-pop', but with negative COUNT."
+  :repeat nil
+  :suppress-operator t
+  (interactive (list (prefix-numeric-value current-prefix-arg)
+                     (not evil-repeat-move-cursor)))
+  (evil-repeat-pop (- count) save-point))
+
+(defadvice read-key-sequence (before evil activate)
+  "Record `this-command-keys' before it is reset."
+  (when (and (evil-repeat-recording-p)
+             evil-recording-current-command)
+    (let ((repeat-type (evil-repeat-type this-command t)))
+      (if (functionp repeat-type)
+          (funcall repeat-type 'post)))))
+
+(provide 'evil-repeat)
+
+;;; evil-repeat.el ends here
diff --git a/elpa/evil-1.0.1/evil-search.el b/elpa/evil-1.0.1/evil-search.el
new file mode 100644
index 00000000..3ddd40a3
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-search.el
@@ -0,0 +1,1124 @@
+;;; evil-search.el --- Search and substitute
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-common)
+(require 'evil-ex)
+
+;;; Code:
+
+(defun evil-select-search-module (option module)
+  "Change the search module according to MODULE.
+If MODULE is `isearch', then Emacs' isearch module is used.
+If MODULE is `evil-search', then Evil's own interactive
+search module is used."
+  (let ((search-functions
+         '(forward
+           backward
+           symbol-forward
+           symbol-backward
+           unbounded-symbol-forward
+           unbounded-symbol-backward
+           next
+           previous)))
+    (dolist (fun search-functions)
+      (let ((isearch (intern (format "evil-search-%s" fun)))
+            (evil-search (intern (format "evil-ex-search-%s" fun))))
+        (if (eq module 'isearch)
+            (substitute-key-definition
+             evil-search isearch evil-motion-state-map)
+          (substitute-key-definition
+           isearch evil-search evil-motion-state-map)))))
+  (set-default option module))
+
+;; this customization is here because it requires
+;; the knowledge of `evil-select-search-mode'
+(defcustom evil-search-module 'isearch
+  "The search module to be used."
+  :type '(radio (const :tag "Emacs built-in isearch." :value isearch)
+                (const :tag "Evil interactive search." :value evil-search))
+  :group 'evil
+  :set 'evil-select-search-module
+  :initialize 'evil-custom-initialize-pending-reset)
+
+(defun evil-search-incrementally (forward regexp-p)
+  "Search incrementally for user-entered text."
+  (let ((evil-search-prompt (evil-search-prompt forward))
+        (isearch-search-fun-function 'evil-isearch-function)
+        (point (point))
+        isearch-success search-nonincremental-instead)
+    (setq isearch-forward forward)
+    (evil-save-echo-area
+      (if forward
+          (isearch-forward regexp-p)
+        (isearch-backward regexp-p))
+      (if (not isearch-success)
+          (goto-char point)
+        ;; always position point at the beginning of the match
+        (when (and forward isearch-other-end)
+          (goto-char isearch-other-end))
+        (when (and (eq point (point))
+                   (not (string= isearch-string "")))
+          (if forward
+              (isearch-repeat-forward)
+            (isearch-repeat-backward))
+          (isearch-exit)
+          (when (and forward isearch-other-end)
+            (goto-char isearch-other-end)))
+        (evil-flash-search-pattern
+         (evil-search-message isearch-string forward))))))
+
+(defun evil-flash-search-pattern (string &optional all)
+  "Flash last search matches for duration of `evil-flash-delay'.
+If ALL is non-nil, flash all matches. STRING is a message
+to display in the echo area."
+  (let ((lazy-highlight-initial-delay 0)
+        (isearch-search-fun-function 'evil-isearch-function)
+        (isearch-case-fold-search case-fold-search)
+        (disable #'(lambda (&optional arg) (evil-flash-hook t))))
+    (when evil-flash-timer
+      (cancel-timer evil-flash-timer))
+    (unless (or (null string)
+                (string= string ""))
+      (evil-echo-area-save)
+      (evil-echo "%s" string)
+      (isearch-highlight (match-beginning 0) (match-end 0))
+      (when all
+        (setq isearch-lazy-highlight-wrapped nil
+              isearch-lazy-highlight-start (point)
+              isearch-lazy-highlight-end (point))
+        (isearch-lazy-highlight-new-loop)
+        (unless isearch-lazy-highlight-overlays
+          (isearch-lazy-highlight-update)))
+      (add-hook 'pre-command-hook #'evil-flash-hook nil t)
+      (add-hook 'evil-operator-state-exit-hook #'evil-flash-hook nil t)
+      (add-hook 'pre-command-hook #'evil-clean-isearch-overlays nil t)
+      (setq evil-flash-timer
+            (run-at-time evil-flash-delay nil disable)))))
+
+(defun evil-clean-isearch-overlays ()
+  "Clean isearch overlays unless `this-command' is search."
+  (remove-hook 'pre-command-hook #'evil-clean-isearch-overlays t)
+  (unless (memq this-command
+                '(evil-search-backward
+                  evil-search-forward
+                  evil-search-next
+                  evil-search-previous
+                  evil-search-symbol-backward
+                  evil-search-symbol-forward))
+    (isearch-clean-overlays)))
+(put 'evil-clean-isearch-overlays 'permanent-local-hook t)
+
+(defun evil-flash-hook (&optional force)
+  "Disable hightlighting if `this-command' is not search.
+Disable anyway if FORCE is t."
+  (when (or force
+            ;; to avoid flicker, don't disable highlighting
+            ;; if the next command is also a search command
+            (not (memq this-command
+                       '(evil-search-backward
+                         evil-search-forward
+                         evil-search-next
+                         evil-search-previous
+                         evil-search-symbol-backward
+                         evil-search-symbol-forward))))
+    (evil-echo-area-restore)
+    (isearch-dehighlight)
+    (setq isearch-lazy-highlight-last-string nil)
+    (lazy-highlight-cleanup t)
+    (when evil-flash-timer
+      (cancel-timer evil-flash-timer)))
+  (remove-hook 'pre-command-hook #'evil-flash-hook t)
+  (remove-hook 'evil-operator-state-exit-hook #'evil-flash-hook t))
+(put 'evil-flash-hook 'permanent-local-hook t)
+
+(defun evil-search-function (&optional forward regexp-p wrap)
+  "Return a search function.
+If FORWARD is nil, search backward, otherwise forward.
+If REGEXP-P is non-nil, the input is a regular expression.
+If WRAP is non-nil, the search wraps around the top or bottom
+of the buffer."
+  `(lambda (string &optional bound noerror count)
+     (let ((start (point))
+           (search-fun ',(if regexp-p
+                             (if forward
+                                 're-search-forward
+                               're-search-backward)
+                           (if forward
+                               'search-forward
+                             'search-backward)))
+           result)
+       (setq result (funcall search-fun string bound
+                             ,(if wrap t 'noerror) count))
+       (when (and ,wrap (null result))
+         (goto-char ,(if forward '(point-min) '(point-max)))
+         (unwind-protect
+             (setq result (funcall search-fun string bound noerror count))
+           (unless result
+             (goto-char start))))
+       result)))
+
+(defun evil-isearch-function ()
+  "Return a search function for use with isearch.
+Based on `isearch-regexp' and `isearch-forward'."
+  (evil-search-function isearch-forward evil-regexp-search evil-search-wrap))
+
+(defun evil-search (string forward &optional regexp-p start)
+  "Search for STRING and highlight matches.
+If FORWARD is nil, search backward, otherwise forward.
+If REGEXP-P is non-nil, STRING is taken to be a regular expression.
+START is the position to search from; if unspecified, it is
+one more than the current position."
+  (when (and (stringp string)
+             (not (string= string "")))
+    (let* ((orig (point))
+           (start (or start
+                      (if forward
+                          (min (point-max) (1+ orig))
+                        orig)))
+           (isearch-regexp regexp-p)
+           (isearch-forward forward)
+           (case-fold-search
+            (unless (and search-upper-case
+                         (not (isearch-no-upper-case-p string nil)))
+              case-fold-search))
+           (search-func (evil-search-function
+                         forward regexp-p evil-search-wrap)))
+      ;; no text properties, thank you very much
+      (set-text-properties 0 (length string) nil string)
+      ;; position to search from
+      (goto-char start)
+      (condition-case nil
+          (funcall search-func string)
+        (search-failed
+         (goto-char orig)
+         (error "\"%s\": %s not found"
+                string (if regexp-p "pattern" "string"))))
+      (setq isearch-string string)
+      (isearch-update-ring string regexp-p)
+      ;; handle opening and closing of invisible area
+      (when (boundp 'isearch-filter-predicate)
+        (funcall isearch-filter-predicate
+                 (match-beginning 0) (match-end 0)))
+      ;; always position point at the beginning of the match
+      (goto-char (match-beginning 0))
+      ;; determine message for echo area
+      (cond
+       ((and forward (< (point) start))
+        (setq string "Search wrapped around BOTTOM of buffer"))
+       ((and (not forward) (> (point) start))
+        (setq string "Search wrapped around TOP of buffer"))
+       (t
+        (setq string (evil-search-message string forward))))
+      (evil-flash-search-pattern string t))))
+
+(defun evil-search-symbol (forward)
+  "Search for symbol near point.
+If FORWARD is nil, search backward, otherwise forward."
+  (let ((string (car-safe regexp-search-ring))
+        (move (if forward #'forward-char #'backward-char))
+        (end (if forward #'eobp #'bobp)))
+    (setq isearch-forward forward)
+    (cond
+     ((and (memq last-command
+                 '(evil-search-symbol-forward
+                   evil-search-symbol-backward))
+           (stringp string)
+           (not (string= string "")))
+      (evil-search string forward t))
+     (t
+      (setq string (evil-find-symbol forward))
+      (if (null string)
+          (error "No symbol under point")
+        (setq string (format "\\_<%s\\_>" (regexp-quote string))))
+      (evil-search string forward t)))))
+
+(defun evil-find-symbol (forward)
+  "Return symbol near point as a string.
+If FORWARD is nil, search backward, otherwise forward.
+Returns nil if nothing is found."
+  (let ((move (if forward #'forward-char #'backward-char))
+        (end (if forward #'eobp #'bobp))
+        string)
+    (save-excursion
+      (setq string (thing-at-point 'symbol))
+      ;; if there's nothing under point, go forwards
+      ;; (or backwards) to find it
+      (while (and (null string) (not (funcall end)))
+        (funcall move)
+        (setq string (thing-at-point 'symbol)))
+      (when (stringp string)
+        (set-text-properties 0 (length string) nil string))
+      (when (> (length string) 0)
+        string))))
+
+(defun evil-search-prompt (forward)
+  "Return the search prompt for the given direction."
+  (if forward "/" "?"))
+
+(defun evil-search-message (string forward)
+  "Prefix STRING with the search prompt."
+  (format "%s%s" (evil-search-prompt forward) string))
+
+(defadvice isearch-message-prefix (around evil activate)
+  "Use `evil-search-prompt'."
+  (if evil-search-prompt
+      (setq ad-return-value evil-search-prompt)
+    ad-do-it))
+
+(defadvice isearch-delete-char (around evil activate)
+  "Exit search if no search string."
+  (cond
+   ((and evil-search-prompt (string= isearch-string ""))
+    (let (search-nonincremental-instead)
+      (setq isearch-success nil)
+      (isearch-exit)))
+   (t
+    ad-do-it)))
+
+(defadvice isearch-lazy-highlight-search (around evil activate)
+  "Never wrap the search in this context."
+  (let (evil-search-wrap)
+    ad-do-it))
+
+;;; Ex search
+
+;; a pattern
+(defun evil-ex-make-pattern (regexp casefold whole-line)
+  "Create a new search pattern.
+REGEXP is the regular expression to be searched for.
+CASEFOLD is the case-fold property of the search,
+which can be either `sensitive', `insensitive' or `smart'.
+Here `smart' means the pattern is case sensitive if and only if
+it contains a capital character. If WHOLE-LINE is non-nil,
+all occurrences of the pattern on a line will be highlighted,
+otherwise only the first one."
+  (let ((re (evil-ex-regex-without-case regexp)))
+    (when evil-ex-search-vim-style-regexp
+      (setq re (evil-transform-vim-style-regexp re)))
+    (setq re (evil-transform-regexp re
+                                    '((?t . "\t")
+                                      (?n . "\n")
+                                      (?r . "\r"))))
+    (list re
+          (evil-ex-regex-case regexp casefold)
+          whole-line)))
+
+(defun evil-ex-pattern-regex (pattern)
+  "Return the regular expression of a search PATTERN."
+  (car pattern))
+
+(defun evil-ex-pattern-case-fold (pattern)
+  "Return the case-fold property of a search PATTERN."
+  (cadr pattern))
+
+(defun evil-ex-pattern-whole-line (pattern)
+  "Return the whole-line property of a search PATTERN."
+  (nth 2 pattern))
+
+(defun evil-ex-regex-without-case (re)
+  "Return the regular expression without all occurrences of \\c and \\C."
+  (evil-transform-regexp re '((?c . "") (?C . ""))))
+
+(defun evil-ex-regex-case (re default-case)
+  "Return the case as implied by \\c or \\C in regular expression RE.
+If \\c appears anywhere in the pattern, the pattern is case
+insensitive. If \\C appears, the pattern is case sensitive.
+Only the first occurrence of \\c or \\C is used, all others are
+ignored. If neither \\c nor \\C appears in the pattern, the case
+specified by DEFAULT-CASE is used. DEFAULT-CASE should be either
+`sensitive', `insensitive' or `smart'. In the latter case, the pattern
+will be case-sensitive if and only if it contains an upper-case
+letter, otherwise it will be case-insensitive."
+  (cond
+   ((string-match "\\(?:^\\|[^\\\\]\\)\\(?:\\\\\\\\\\)*\\\\\\([cC]\\)" re)
+    (if (eq (aref (match-string 1 re) 0) ?c) 'insensitive 'sensitive))
+   ((eq default-case 'smart)
+    (if (isearch-no-upper-case-p re t)
+        'insensitive
+      'sensitive))
+   (t default-case)))
+
+(defun evil-ex-make-hl (name &rest args)
+  "Create a new highlight object with name NAME and properties ARGS.
+The following properties are supported:
+:face The face to be used for the highlighting overlays.
+:win The window in which the highlighting should be shown.
+     Note that the highlight will be visible in all windows showing
+     the corresponding buffer, but only the matches visible in the
+     specified window will actually be highlighted. If :win is nil,
+     the matches in all windows will be highlighted.
+:min The minimal buffer position for highlighted matches.
+:max The maximal buffer position for highlighted matches.
+:match-hook A hook to be called once for each highlight.
+            The hook must take two arguments, the highlight and
+            the overlay for that highlight.
+:update-hook A hook called once after updating the highlighting
+             with two arguments, the highlight and a message string
+             describing the current match status."
+  (unless (symbolp name)
+    (error "Expected symbol as name of highlight"))
+  (let ((face 'evil-ex-lazy-highlight)
+        (win (selected-window))
+        min max match-hook update-hook)
+    (while args
+      (let ((key (pop args))
+            (val (pop args)))
+        (cond
+         ((eq key :face) (setq face val))
+         ((eq key :win)  (setq win val))
+         ((eq key :min)  (setq min val))
+         ((eq key :max)  (setq max val))
+         ((eq key :match-hook) (setq match-hook val))
+         ((eq key :update-hook) (setq update-hook val))
+         (t (error "Unexpected keyword: %s" key)))))
+    (when (assoc name evil-ex-active-highlights-alist)
+      (evil-ex-delete-hl name))
+    (when (null evil-ex-active-highlights-alist)
+      (add-hook 'window-scroll-functions
+                #'evil-ex-hl-update-highlights-scroll nil t)
+      (add-hook 'window-size-change-functions
+                #'evil-ex-hl-update-highlights-resize nil))
+    (push (cons name (vector name
+                             nil
+                             face
+                             win
+                             min
+                             max
+                             match-hook
+                             update-hook
+                             nil))
+          evil-ex-active-highlights-alist)))
+
+(defun evil-ex-hl-name (hl)
+  "Return the name of the highlight HL."
+  (aref hl 0))
+
+(defun evil-ex-hl-pattern (hl)
+  "Return the pattern of the highlight HL."
+  (aref hl 1))
+
+(defun evil-ex-hl-set-pattern (hl pattern)
+  "Set the pattern of the highlight HL to PATTERN."
+  (aset hl 1 pattern))
+
+(defun evil-ex-hl-face (hl)
+  "Return the face of the highlight HL."
+  (aref hl 2))
+
+(defun evil-ex-hl-window (hl)
+  "Return the window of the highlight HL."
+  (aref hl 3))
+
+(defun evil-ex-hl-min (hl)
+  "Return the minimal buffer position of the highlight HL."
+  (aref hl 4))
+
+(defun evil-ex-hl-set-min (hl min)
+  "Set the minimal buffer position of the highlight HL to MIN."
+  (aset hl 4 min))
+
+(defun evil-ex-hl-max (hl)
+  "Return the maximal buffer position of the highlight HL."
+  (aref hl 5))
+
+(defun evil-ex-hl-set-max (hl max)
+  "Set the minimal buffer position of the highlight HL to MAX."
+  (aset hl 5 max))
+
+(defun evil-ex-hl-match-hook (hl)
+  "Return the match-hook of the highlight HL."
+  (aref hl 6))
+
+(defun evil-ex-hl-update-hook (hl)
+  "Return the update-hook of the highlight HL."
+  (aref hl 7))
+
+(defun evil-ex-hl-overlays (hl)
+  "Return the list of active overlays of the highlight HL."
+  (aref hl 8))
+
+(defun evil-ex-hl-set-overlays (hl overlays)
+  "Set the list of active overlays of the highlight HL to OVERLAYS."
+  (aset hl 8 overlays))
+
+(defun evil-ex-delete-hl (name)
+  "Remove the highlighting object with a certain NAME."
+  (let ((hl (cdr-safe (assoc name evil-ex-active-highlights-alist))))
+    (when hl
+      (mapc #'delete-overlay (evil-ex-hl-overlays hl))
+      (setq evil-ex-active-highlights-alist
+            (assq-delete-all name evil-ex-active-highlights-alist))
+      (evil-ex-hl-update-highlights))
+    (when (null evil-ex-active-highlights-alist)
+      (remove-hook 'window-scroll-functions
+                   #'evil-ex-hl-update-highlights-scroll t)
+      (remove-hook 'window-size-change-functions
+                   #'evil-ex-hl-update-highlights-resize))))
+
+(defun evil-ex-hl-active-p (name)
+  "Whether the highlight with a certain NAME is active."
+  (and (assoc name evil-ex-active-highlights-alist) t))
+
+(defun evil-ex-hl-change (name pattern)
+  "Set the regular expression of highlight NAME to PATTERN."
+  (let ((hl (cdr-safe (assoc name evil-ex-active-highlights-alist))))
+    (when hl
+      (evil-ex-hl-set-pattern hl
+                              (if (zerop (length pattern))
+                                  nil
+                                pattern))
+      (evil-ex-hl-idle-update))))
+
+(defun evil-ex-hl-set-region (name beg end &optional type)
+  "Set minimal and maximal position of highlight NAME to BEG and END."
+  (let ((hl (cdr-safe (assoc name evil-ex-active-highlights-alist))))
+    (when hl
+      (evil-ex-hl-set-min hl beg)
+      (evil-ex-hl-set-max hl end)
+      (evil-ex-hl-idle-update))))
+
+(defun evil-ex-hl-get-max (name)
+  "Return the maximal position of the highlight with name NAME."
+  (let ((hl (cdr-safe (assoc name evil-ex-active-highlights-alist))))
+    (and hl (evil-ex-hl-max hl))))
+
+(defun evil-ex-hl-update-highlights ()
+  "Update the overlays of all active highlights."
+  (dolist (hl (mapcar #'cdr evil-ex-active-highlights-alist))
+    (let ((old-ovs (evil-ex-hl-overlays hl))
+          new-ovs
+          (pattern (evil-ex-hl-pattern hl))
+          (face (evil-ex-hl-face hl))
+          (match-hook (evil-ex-hl-match-hook hl))
+          result)
+      (if pattern
+          ;; collect all visible ranges
+          (let (ranges sranges)
+            (dolist (win (if (eq evil-ex-interactive-search-highlight
+                                 'all-windows)
+                             (get-buffer-window-list (current-buffer) nil t)
+                           (list (evil-ex-hl-window hl))))
+              (let ((beg (max (window-start win)
+                              (or (evil-ex-hl-min hl) (point-min))))
+                    (end (min (window-end win)
+                              (or (evil-ex-hl-max hl) (point-max)))))
+                (when (< beg end)
+                  (push (cons beg end) ranges))))
+            (setq ranges
+                  (sort ranges #'(lambda (r1 r2) (< (car r1) (car r2)))))
+            (while ranges
+              (let ((r1 (pop ranges))
+                    (r2 (pop ranges)))
+                (cond
+                 ;; last range
+                 ((null r2)
+                  (push r1 sranges))
+                 ;; ranges overlap, union
+                 ((>= (cdr r1) (car r2))
+                  (push (cons (car r1)
+                              (max (cdr r1) (cdr r2)))
+                        ranges))
+                 ;; ranges distinct
+                 (t
+                  (push r1 sranges)
+                  (push r2 ranges)))))
+
+            ;; run through all ranges
+            (condition-case lossage
+                (save-match-data
+                  (dolist (r sranges)
+                    (let ((beg (car r))
+                          (end (cdr r)))
+                      (save-excursion
+                        (goto-char beg)
+                        ;; set the overlays for the current highlight,
+                        ;; reusing old overlays (if possible)
+                        (while (and (not (eobp))
+                                    (evil-ex-search-find-next-pattern pattern)
+                                    (<= (match-end 0) end))
+                          (let ((ov (or (pop old-ovs) (make-overlay 0 0))))
+                            (move-overlay ov (match-beginning 0) (match-end 0))
+                            (overlay-put ov 'face face)
+                            (overlay-put ov 'evil-ex-hl (evil-ex-hl-name hl))
+                            (overlay-put ov 'priority 1000)
+                            (push ov new-ovs)
+                            (when match-hook (funcall match-hook hl ov)))
+                          (cond
+                           ((not (evil-ex-pattern-whole-line pattern))
+                            (forward-line))
+                           ((= (match-beginning 0) (match-end 0))
+                            (forward-char))
+                           (t (goto-char (match-end 0))))))))
+                  (mapc #'delete-overlay old-ovs)
+                  (evil-ex-hl-set-overlays hl new-ovs)
+                  (if (or (null pattern) new-ovs)
+                      (setq result t)
+                    ;; Maybe the match could just not be found somewhere else?
+                    (save-excursion
+                      (goto-char (or (evil-ex-hl-min hl) (point-min)))
+                      (if (and (evil-ex-search-find-next-pattern pattern)
+                               (< (match-end 0) (or (evil-ex-hl-max hl)
+                                                    (point-max))))
+                          (setq result (format "Match in line %d"
+                                               (line-number-at-pos
+                                                (match-beginning 0))))
+                        (setq result "No match")))))
+
+              (invalid-regexp
+               (setq result (cadr lossage)))
+
+              (search-failed
+               (setq result (nth 2 lossage)))
+
+              (error
+               (setq result (format "%s" lossage)))))
+        ;; no pattern, remove all highlights
+        (mapc #'delete-overlay old-ovs)
+        (evil-ex-hl-set-overlays hl new-ovs))
+      (when (evil-ex-hl-update-hook hl)
+        (funcall (evil-ex-hl-update-hook hl) hl result)))))
+
+(defun evil-ex-search-find-next-pattern (pattern &optional direction)
+  "Look for the next occurrence of PATTERN in a certain DIRECTION.
+Note that this function ignores the whole-line property of PATTERN."
+  (setq direction (or direction 'forward))
+  (let ((case-fold-search (eq (evil-ex-pattern-case-fold pattern)
+                              'insensitive)))
+    (cond
+     ((eq direction 'forward)
+      (re-search-forward (evil-ex-pattern-regex pattern) nil t))
+     ((eq direction 'backward)
+      (re-search-backward (evil-ex-pattern-regex pattern) nil t))
+     (t
+      (error "Unknown search direction: %s" direction)))))
+
+(defun evil-ex-hl-idle-update ()
+  "Triggers the timer to update the highlights in the current buffer."
+  (when (and evil-ex-interactive-search-highlight
+             evil-ex-active-highlights-alist)
+    (when evil-ex-hl-update-timer
+      (cancel-timer evil-ex-hl-update-timer))
+    (setq evil-ex-hl-update-timer
+          (run-at-time evil-ex-hl-update-delay nil
+                       #'evil-ex-hl-do-update-highlight
+                       (current-buffer)))))
+
+(defun evil-ex-hl-do-update-highlight (&optional buffer)
+  "Timer function for updating the highlights."
+  (with-current-buffer buffer
+    (evil-ex-hl-update-highlights))
+  (setq evil-ex-hl-update-timer nil))
+
+(defun evil-ex-hl-update-highlights-scroll (win beg)
+  "Update highlights after scrolling in some window."
+  (with-current-buffer (window-buffer win)
+    (evil-ex-hl-idle-update)))
+(put 'evil-ex-hl-update-highlights-scroll 'permanent-local-hook t)
+
+(defun evil-ex-hl-update-highlights-resize (frame)
+  "Update highlights after resizing a window."
+  (let ((buffers (delete-dups (mapcar #'window-buffer (window-list frame)))))
+    (dolist (buf buffers)
+      (with-current-buffer buf
+        (evil-ex-hl-idle-update)))))
+(put 'evil-ex-hl-update-highlights-resize 'permanent-local-hook t)
+
+;; interactive search
+(defun evil-ex-search-activate-highlight (pattern)
+  "Activate highlighting of the search pattern set to PATTERN.
+This function does nothing if `evil-ex-search-interactive' or
+`evil-ex-search-highlight-all' is nil. "
+  (when (and evil-ex-search-interactive evil-ex-search-highlight-all)
+    (with-current-buffer (or evil-ex-current-buffer (current-buffer))
+      (unless (evil-ex-hl-active-p 'evil-ex-search)
+        (evil-ex-make-hl 'evil-ex-search
+                         :win (minibuffer-selected-window)))
+      (if pattern
+          (evil-ex-hl-change 'evil-ex-search pattern)))))
+
+(defun evil-ex-find-next (&optional pattern direction nowrap)
+  "Search for the next occurrence of the PATTERN in DIRECTION.
+PATTERN must be created using `evil-ex-make-pattern', DIRECTION
+is either 'forward or 'backward. If NOWRAP is non nil, the search
+does not wrap at buffer boundaries. Furthermore this function
+only searches invisible text if `search-invisible' is t. If
+PATTERN is not specified the current global pattern
+`evil-ex-search-pattern' and if DIRECTION is not specified the
+current global direction `evil-ex-search-direction' is used.
+This function return t if the search was successful, nil if it
+was unsuccessful and 'wrapped if the search was successful but
+has been wrapped at the buffer boundaries."
+  (setq pattern (or pattern evil-ex-search-pattern)
+        direction (or direction evil-ex-search-direction))
+  (unless (and pattern (evil-ex-pattern-regex pattern))
+    (signal 'search-failed (list "No search pattern")))
+  (catch 'done
+    (let (wrapped)
+      (while t
+        (let ((search-result (evil-ex-search-find-next-pattern pattern
+                                                               direction)))
+          (cond
+           ((and search-result
+                 (or (eq search-invisible t)
+                     (not (isearch-range-invisible
+                           (match-beginning 0) (match-end 0)))))
+            ;; successful search and not invisible
+            (throw 'done (if wrapped 'wrapped t)))
+           ((not search-result)
+            ;; unsuccessful search
+            (if nowrap
+                (throw 'done nil)
+              (setq nowrap t
+                    wrapped t)
+              (goto-char (if (eq direction 'forward)
+                             (point-min)
+                           (point-max)))))))))))
+
+(defun evil-ex-search-update (pattern offset beg end message)
+  "Update the highlighting and info-message for the search pattern.
+PATTERN is the search pattern and OFFSET the associated offset.
+BEG and END specifiy the current match, MESSAGE is the info
+message to be shown. This function does nothing if
+`evil-ex-search-interactive' is nil."
+  (when evil-ex-search-interactive
+    (cond
+     ((and beg end)
+      ;; update overlay
+      (if evil-ex-search-overlay
+          (move-overlay evil-ex-search-overlay beg end)
+        (setq evil-ex-search-overlay
+              (make-overlay beg end))
+        (overlay-put evil-ex-search-overlay 'priority 1001)
+        (overlay-put evil-ex-search-overlay 'face 'evil-ex-search))
+      ;; move point
+      (goto-char beg)
+      (evil-ex-search-goto-offset offset)
+      ;; update highlights
+      (when evil-ex-search-highlight-all
+        (evil-ex-hl-change 'evil-ex-search pattern)))
+     (t
+      ;; no match
+      (when evil-ex-search-overlay
+        ;; remove overlay
+        (delete-overlay evil-ex-search-overlay)
+        (setq evil-ex-search-overlay nil))
+      ;; no highlights
+      (when evil-ex-search-highlight-all
+        (evil-ex-hl-change 'evil-ex-search nil))
+      ;; and go to initial position
+      (goto-char evil-ex-search-start-point)))
+    (when (stringp message)
+      (evil-ex-echo "%s" message))))
+
+(defun evil-ex-search-start-session ()
+  "Initialize Ex for interactive search."
+  (remove-hook 'minibuffer-setup-hook #'evil-ex-search-start-session)
+  (add-hook 'after-change-functions #'evil-ex-search-update-pattern nil t)
+  (add-hook 'minibuffer-exit-hook #'evil-ex-search-stop-session)
+  (evil-ex-search-activate-highlight nil))
+(put 'evil-ex-search-start-session 'permanent-local-hook t)
+
+(defun evil-ex-search-stop-session ()
+  "Stop interactive search."
+  (with-current-buffer evil-ex-current-buffer
+    ;; TODO: This is a bad fix to remove duplicates. The duplicates
+    ;;       exist because `isearch-range-invisible' may add a single
+    ;;       overlay multiple times if we are in an unlucky situation
+    ;;       of overlapping overlays. This happens in our case because
+    ;;       of the overlays that are used for (lazy) highlighting.
+    ;;       Perhaps it would be better to disable those overlays
+    ;;       temporarily before calling `isearch-range-invisible'.
+    (setq isearch-opened-overlays (delete-dups isearch-opened-overlays))
+    (isearch-clean-overlays))
+  (remove-hook 'minibuffer-exit-hook #'evil-ex-search-stop-session)
+  (remove-hook 'after-change-functions #'evil-ex-search-update-pattern t)
+  (when evil-ex-search-overlay
+    (delete-overlay evil-ex-search-overlay)
+    (setq evil-ex-search-overlay nil)))
+(put 'evil-ex-search-stop-session 'permanent-local-hook t)
+
+(defun evil-ex-split-search-pattern (pattern direction)
+  "Split PATTERN in regexp, offset and next-pattern parts.
+Returns a triple (regexp  offset next-search)."
+  (save-match-data
+    (if (or (and (eq direction 'forward)
+                 (string-match "\\(?:^\\|[^\\\\]\\)\\(?:\\\\\\\\\\)*\\(/\\([^;]*\\)\\(?:;\\([/?].*\\)?\\)?\\)?$"
+                               pattern))
+            (and (eq direction 'backward)
+                 (string-match "\\(?:^\\|[^\\\\]\\)\\(?:\\\\\\\\\\)*\\(\\?\\([^;]*\\)\\(?:;\\([/?].*\\)?\\)?\\)?$"
+                               pattern)))
+        (list (substring pattern 0 (match-beginning 1))
+              (match-string 2 pattern)
+              (match-string 3 pattern))
+      (list pattern nil nil))))
+
+(defun evil-ex-search-full-pattern (pattern-string count direction)
+  "Search for a full search pattern PATTERN-STRING in DIRECTION.
+This function split PATTERN-STRING in
+pattern/offset/;next-pattern parts and performs the search in
+DIRECTION which must be either 'forward or 'backward. The first
+search is repeated COUNT times. If the pattern part of
+PATTERN-STRING is empty, the last global pattern stored in
+`evil-ex-search-pattern' is used instead if in addition the
+offset part is nil (i.e. no pattern/offset separator), the last
+global offset stored in `evil-ex-search-offset' is used as
+offset. The current match data will correspond to the last
+successful match.  This function returns a triple (RESULT PATTERN
+OFFSET) where RESULT is
+
+  t              the search has been successful without wrap
+  'wrap          the search has been successful with wrap
+  'empty-pattern the last pattern has been empty
+  nil            the search has not been successful
+
+and PATTERN and OFFSET are the last pattern and offset this
+function searched for. Note that this function does not handle
+any error conditions."
+  (setq count (or count 1))
+  (catch 'done
+    (while t
+      (let* ((res (evil-ex-split-search-pattern pattern-string direction))
+             (pat (pop res))
+             (offset (pop res))
+             (next-pat (pop res)))
+        ;; use last pattern of no new pattern has been specified
+        (if (not (zerop (length pat)))
+            (setq pat (evil-ex-make-pattern pat
+                                            evil-ex-search-case
+                                            t))
+          (setq pat evil-ex-search-pattern
+                offset (or offset evil-ex-search-offset)))
+        (when (zerop (length pat))
+          (throw 'done (list 'empty-pattern pat offset)))
+        (let (search-result)
+          (while (> count 0)
+            (let ((result (evil-ex-find-next pat direction)))
+              (if (not result) (setq search-result nil count 0)
+                (setq search-result
+                      (if (or (eq result 'wrap)
+                              (eq search-result 'wrap))
+                          'wrap t)
+                      count (1- count)))))
+          (cond
+           ;; search failed
+           ((not search-result) (throw 'done (list nil pat offset)))
+           ;; no next pattern, search complete
+           ((zerop (length next-pat))
+            (evil-ex-search-goto-offset offset)
+            (throw 'done (list search-result pat offset)))
+           ;; next pattern but empty
+           ((= 1 (length next-pat))
+            (evil-ex-search-goto-offset offset)
+            (throw 'done (list 'empty-pattern pat offset)))
+           ;; next non-empty pattern, next search iteration
+           (t
+            (evil-ex-search-goto-offset offset)
+            (setq count 1
+                  pattern-string (substring next-pat 1)
+                  direction (if (= (aref next-pat 0) ?/)
+                                'forward
+                              'backward)))))))))
+
+(defun evil-ex-search-update-pattern (beg end range)
+  "Update the current search pattern."
+  (let ((pattern-string (minibuffer-contents)))
+    (with-current-buffer evil-ex-current-buffer
+      (with-selected-window (minibuffer-selected-window)
+        (goto-char (1+ evil-ex-search-start-point))
+        (condition-case err
+            (let* ((result (evil-ex-search-full-pattern pattern-string
+                                                        (or evil-ex-search-count 1)
+                                                        evil-ex-search-direction))
+                   (success (pop result))
+                   (pattern (pop result))
+                   (offset (pop result)))
+              (cond
+               ((eq success 'wrap)
+                (evil-ex-search-update pattern offset
+                                       (match-beginning 0) (match-end 0)
+                                       "Wrapped"))
+               ((eq success 'empty-pattern)
+                (evil-ex-search-update nil nil nil nil nil))
+               (success
+                (evil-ex-search-update pattern offset
+                                       (match-beginning 0) (match-end 0)
+                                       nil))
+               (t
+                (evil-ex-search-update nil nil
+                                       nil nil
+                                       "search failed"))))
+          (invalid-regexp
+           (evil-ex-search-update nil nil nil nil (cadr err)))
+          (error
+           (evil-ex-search-update nil nil nil nil (format "%s" err))))))))
+(put 'evil-ex-search-update-pattern 'permanent-local-hook t)
+
+(defun evil-ex-search-exit ()
+  "Exit interactive search, keeping lazy highlighting active."
+  (interactive)
+  (evil-ex-search-stop-session)
+  (exit-minibuffer))
+
+(defun evil-ex-search-abort ()
+  "Abort interactive search, disabling lazy highlighting."
+  (interactive)
+  (evil-ex-search-stop-session)
+  (evil-ex-delete-hl 'evil-ex-search)
+  (abort-recursive-edit))
+
+(defun evil-ex-search-goto-offset (offset)
+  "Move point according to search OFFSET and set `evil-this-type' accordingly.
+This function assumes that the current match data represents the
+current search result."
+  (unless (zerop (length offset))
+    (let ((beg (match-beginning 0))
+          (end (match-end 0)))
+      (save-match-data
+        (unless
+            (string-match
+             "^\\([esb]\\)?\\(\\([-+]\\)?\\([0-9]*\\)\\)$"
+             offset)
+          (error "Invalid search offset: %s" offset))
+        (let ((count (if (= (match-beginning 4) (match-end 4))
+                         (cond
+                          ((not (match-beginning 3)) 0)
+                          ((= (aref offset (match-beginning 3)) ?+) +1)
+                          (t -1))
+                       (string-to-number (match-string 2 offset)))))
+          (cond
+           ((not (match-beginning 1))
+            (setq evil-this-type 'line)
+            (forward-line count))
+           ((= (aref offset (match-beginning 1)) ?e)
+            (goto-char (+ end count -1))
+            (setq evil-this-type 'inclusive))
+           ((memq (aref offset (match-beginning 1)) '(?s ?b))
+            (goto-char (+ beg count))
+            (setq evil-this-type 'inclusive))))))))
+
+(defun evil-ex-start-search (direction count)
+  "Start a new search in a certain DIRECTION."
+  ;; store buffer and window where the search started
+  (let ((evil-ex-current-buffer (current-buffer)))
+    (setq evil-ex-search-count count
+          evil-ex-search-direction direction
+          evil-ex-search-start-point (point))
+    (progn
+      ;; ensure minibuffer is initialized accordingly
+      (add-hook 'minibuffer-setup-hook #'evil-ex-search-start-session)
+      ;; read the search string
+      (let* ((minibuffer-local-map evil-ex-search-keymap)
+             (search-string
+              (condition-case err
+                  (read-string (if (eq evil-ex-search-direction 'forward)
+                                   "/" "?")
+                               nil 'evil-ex-search-history)
+                (quit
+                 (evil-ex-search-stop-session)
+                 (evil-ex-delete-hl 'evil-ex-search)
+                 (goto-char evil-ex-search-start-point)
+                 (signal (car err) (cdr err))))))
+        ;; pattern entered successful
+        (goto-char (1+ evil-ex-search-start-point))
+        (let* ((result
+                (evil-ex-search-full-pattern search-string
+                                             evil-ex-search-count
+                                             evil-ex-search-direction))
+               (success (pop result))
+               (pattern (pop result))
+               (offset (pop result)))
+          (setq evil-ex-search-pattern pattern
+                evil-ex-search-offset offset)
+          (cond
+           ((memq success '(t wrap))
+            (goto-char (match-beginning 0))
+            (setq evil-ex-search-match-beg (match-beginning 0)
+                  evil-ex-search-match-end (match-end 0))
+            (evil-ex-search-goto-offset offset))
+           (t
+            (goto-char evil-ex-search-start-point)
+            (evil-ex-delete-hl 'evil-ex-search)
+            (signal 'search-failed (list search-string)))))))))
+
+(defun evil-ex-start-symbol-search (unbounded direction count)
+  "Search for the symbol under point.
+The search matches the COUNT-th occurrence of the word.
+If the UNBOUNDED argument is nil, the search matches only
+at symbol boundaries, otherwise it matches anywhere.
+The DIRECTION argument should be either `forward' or
+`backward', determining the search direction."
+  (let ((string (evil-find-symbol (eq direction 'forward))))
+    (if (null string)
+        (error "No symbol under point")
+      (let ((regex (if unbounded
+                       (regexp-quote (match-string 0))
+                     (format "\\_<%s\\_>" (regexp-quote (match-string 0))))))
+        (setq evil-ex-search-count count
+              evil-ex-search-direction direction
+              evil-ex-search-pattern
+              (evil-ex-make-pattern regex evil-ex-search-case t)
+              evil-ex-search-offset nil)
+        ;; update search history unless this pattern equals the
+        ;; previous pattern
+        (unless (equal (car-safe evil-ex-search-history) regex)
+          (push regex evil-ex-search-history)))
+      (evil-ex-delete-hl 'evil-ex-search)
+      (when (fboundp 'evil-ex-search-next)
+        (evil-ex-search-next count)))))
+
+;; substitute
+(evil-ex-define-argument-type substitution
+  "A substitution pattern argument /pattern/replacement/flags.
+This handler highlights the pattern of the current substitution."
+  :runner
+  (lambda (flag &optional arg)
+    (with-selected-window (minibuffer-selected-window)
+      (with-current-buffer evil-ex-current-buffer
+        (cond
+         ((eq flag 'start)
+          (evil-ex-make-hl
+           'evil-ex-substitute
+           :face 'evil-ex-substitute-matches
+           :update-hook #'evil-ex-pattern-update-ex-info
+           :match-hook (and evil-ex-substitute-interactive-replace
+                            #'evil-ex-pattern-update-replacement))
+          (setq flag 'update))
+
+         ((eq flag 'stop)
+          (evil-ex-delete-hl 'evil-ex-substitute))))
+
+      (when (and (eq flag 'update)
+                 evil-ex-substitute-highlight-all
+                 (not (zerop (length arg))))
+        (condition-case lossage
+            (let* ((result (evil-ex-get-substitute-info arg))
+                   (pattern (pop result))
+                   (replacement (pop result))
+                   (range (or (evil-copy-range evil-ex-range)
+                              (evil-range (line-beginning-position)
+                                          (line-end-position)
+                                          'line
+                                          :expaned t))))
+              (setq evil-ex-substitute-current-replacement replacement)
+              (evil-expand-range range)
+              (evil-ex-hl-set-region 'evil-ex-substitute
+                                     (evil-range-beginning range)
+                                     (evil-range-end range))
+              (evil-ex-hl-change 'evil-ex-substitute pattern))
+          (end-of-file
+           (evil-ex-pattern-update-ex-info nil
+                                           "incomplete replacement"))
+          (error
+           (evil-ex-pattern-update-ex-info nil
+                                           (format "%s" lossage))))))))
+
+(defun evil-ex-pattern-update-ex-info (hl result)
+  "Update the Ex info string."
+  (when (stringp result)
+    (evil-ex-echo "%s" result)))
+
+(defun evil-ex-pattern-update-replacement (hl overlay)
+  "Update the replacement display."
+  (when (fboundp 'match-substitute-replacement)
+    (let ((fixedcase (not case-replace))
+          repl)
+      (setq repl (if evil-ex-substitute-current-replacement
+                     (evil-match-substitute-replacement
+                      evil-ex-substitute-current-replacement
+                      fixedcase)
+                   ""))
+      (put-text-property 0 (length repl)
+                         'face 'evil-ex-substitute-replacement
+                         repl)
+      (overlay-put overlay 'after-string repl))))
+
+(defun evil-ex-parse-global (string)
+  "Parse STRING as a global argument."
+  (evil-delimited-arguments string 2))
+
+(defun evil-ex-get-substitute-info (string)
+  "Returns the substitution info of command line STRING.
+This function returns a three-element list \(PATTERN REPLACEMENT
+FLAGS) consisting of the substitution parts of STRING. PATTERN is
+a ex-pattern (see `evil-ex-make-pattern') and REPLACEMENT in a
+compiled replacement expression (see `evil-compile-replacement').
+The information returned is the actual substitution information
+w.r.t. to special situations like empty patterns or repetition of
+previous substitution commands."
+  (let (pattern replacement flags)
+    (cond
+     ((or (null string) (string-match "^[a-zA-Z]" string))
+      ;; starts with letter so there is no pattern because the
+      ;; separate must not be a letter repeat last substitute
+      (setq replacement evil-ex-substitute-replacement)
+      ;; flags are everything that is not a white space
+      (when (and string (string-match "[^[:space:]]+" string))
+        (setq flags (match-string 0 string))))
+     (t
+      (let ((args (evil-delimited-arguments string 3)))
+        (setq pattern (pop args)
+              replacement (pop args)
+              flags (pop args))
+        ;; if replacment equals "~" use previous replacement
+        (if (equal replacement "~")
+            (setq replacement evil-ex-substitute-replacement)
+          (setq replacement (evil-compile-replacement replacement))))))
+    ;; if flags equals "&" add previous flags
+    (if (and (not (zerop (length flags)))
+             (= (aref flags 0) ?&))
+        (setq flags (append (substring flags 1)
+                            evil-ex-substitute-flags))
+      (setq flags (append flags nil)))
+    ;; if no pattern, use previous pattern
+    (when (zerop (length pattern))
+      (if (memq ?r flags)
+          (setq pattern (and evil-ex-search-pattern
+                             (evil-ex-pattern-regex evil-ex-search-pattern))
+                flags (remq ?r flags))
+        (setq pattern (and evil-ex-substitute-pattern
+                           (evil-ex-pattern-regex evil-ex-substitute-pattern)))))
+    ;; generate pattern
+    (when pattern
+      (setq pattern
+            (evil-ex-make-pattern
+             pattern
+             (or (and (memq ?i flags) 'insensitive)
+                 (and (memq ?I flags) 'sensitive)
+                 evil-ex-substitute-case
+                 evil-ex-search-case)
+             (memq ?g flags))))
+    (list pattern replacement flags)))
+
+(defun evil-ex-nohighlight ()
+  "Disable the active search highlightings."
+  (interactive)
+  (evil-ex-delete-hl 'evil-ex-substitute)
+  (evil-ex-delete-hl 'evil-ex-search))
+
+(provide 'evil-search)
+
+;;; evil-search.el ends here
diff --git a/elpa/evil-1.0.1/evil-states.el b/elpa/evil-1.0.1/evil-states.el
new file mode 100644
index 00000000..071a4136
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-states.el
@@ -0,0 +1,865 @@
+;;; evil-states.el --- States
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'evil-core)
+
+;;; Code:
+
+;;; Normal state
+
+(evil-define-state normal
+  "Normal state.
+AKA \"Command\" state."
+  :tag " <N> "
+  :enable (motion)
+  :exit-hook (evil-repeat-start-hook)
+  (cond
+   ((evil-normal-state-p)
+    (add-hook 'post-command-hook #'evil-normal-post-command nil t))
+   (t
+    (remove-hook 'post-command-hook #'evil-normal-post-command t))))
+
+(defun evil-normal-post-command (&optional command)
+  "Reset command loop variables in Normal state.
+Also prevent point from reaching the end of the line.
+If the region is activated, enter Visual state."
+  (unless (evil-initializing-p)
+    (setq command (or command this-command))
+    (when (evil-normal-state-p)
+      (setq evil-this-type nil
+            evil-this-operator nil
+            evil-this-motion nil
+            evil-this-motion-count nil
+            evil-inhibit-operator nil
+            evil-inhibit-operator-value nil)
+      (unless (memq command '(evil-use-register
+                              digit-argument
+                              negative-argument
+                              universal-argument
+                              universal-argument-minus
+                              universal-argument-more
+                              universal-argument-other-key))
+        (setq evil-this-register nil))
+      (evil-adjust-cursor))))
+(put 'evil-normal-post-command 'permanent-local-hook t)
+
+;;; Insert state
+
+(evil-define-state insert
+  "Insert state."
+  :tag " <I> "
+  :cursor (bar . 2)
+  :message "-- INSERT --"
+  :entry-hook (evil-start-track-last-insertion)
+  :exit-hook (evil-cleanup-insert-state evil-stop-track-last-insertion)
+  :input-method t
+  (cond
+   ((evil-insert-state-p)
+    (add-hook 'pre-command-hook #'evil-insert-repeat-hook)
+    (unless evil-want-fine-undo
+      (evil-start-undo-step t)))
+   (t
+    (remove-hook 'pre-command-hook #'evil-insert-repeat-hook)
+    (setq evil-insert-repeat-info evil-repeat-info)
+    (evil-set-marker ?^ nil t)
+    (unless evil-want-fine-undo
+      (evil-end-undo-step t))
+    (when evil-move-cursor-back
+      (when (or (evil-normal-state-p evil-next-state)
+                (evil-motion-state-p evil-next-state))
+        (evil-move-cursor-back))))))
+
+(defun evil-insert-repeat-hook ()
+  "Record insertion keys in `evil-insert-repeat-info'."
+  (setq evil-insert-repeat-info (last evil-repeat-info))
+  (remove-hook 'pre-command-hook #'evil-insert-repeat-hook))
+(put 'evil-insert-repeat-hook 'permanent-local-hook t)
+
+(defun evil-cleanup-insert-state ()
+  "Called when Insert state is about to be exited.
+Handles the repeat-count of the insertion command."
+  (when evil-insert-count
+    (dotimes (i (1- evil-insert-count))
+      (when evil-insert-lines
+        (evil-insert-newline-below))
+      (when (fboundp 'evil-execute-repeat-info)
+        (evil-execute-repeat-info
+         (cdr evil-insert-repeat-info)))))
+  (when evil-insert-vcount
+    (let ((buffer-invisibility-spec buffer-invisibility-spec))
+      ;; make all lines hidden by hideshow temporarily visible
+      (when (listp buffer-invisibility-spec)
+        (setq buffer-invisibility-spec
+              (evil-filter-list
+               #'(lambda (x)
+                   (or (eq x 'hs)
+                       (eq (car-safe x) 'hs)))
+               buffer-invisibility-spec)))
+      (let ((line (nth 0 evil-insert-vcount))
+            (col (nth 1 evil-insert-vcount))
+            (vcount (nth 2 evil-insert-vcount)))
+        (save-excursion
+          (dotimes (v (1- vcount))
+            (goto-char (point-min))
+            (forward-line (+ line v))
+            (when (or (not evil-insert-skip-empty-lines)
+                      (not (integerp col))
+                      (save-excursion
+                        (evil-move-end-of-line)
+                        (>= (current-column) col)))
+              (if (integerp col)
+                  (move-to-column col t)
+                (funcall col))
+              (dotimes (i (or evil-insert-count 1))
+                (when (fboundp 'evil-execute-repeat-info)
+                  (evil-execute-repeat-info
+                   (cdr evil-insert-repeat-info)))))))))))
+
+;;; Visual state
+
+;; Visual selections are implemented in terms of types, and are
+;; compatible with the Emacs region. This is achieved by "translating"
+;; the region to the selected text right before a command is executed.
+;; If the command is a motion, the translation is postponed until a
+;; non-motion command is invoked (distinguished by the :keep-visual
+;; command property).
+;;
+;; Visual state activates the region, enabling Transient Mark mode if
+;; not already enabled. This is only temporay: if Transient Mark mode
+;; was disabled before entering Visual state, it is disabled when
+;; exiting Visual state. This allows Visual state to harness the
+;; "transient" behavior of many commands without overriding the user's
+;; preferences in other states.
+
+(defmacro evil-define-visual-selection (selection doc &rest body)
+  "Define a Visual selection SELECTION.
+Creates a command evil-visual-SELECTION for enabling the selection.
+DOC is the function's documentation string. The following keywords
+may be specified in BODY:
+
+:message STRING         Status message when enabling the selection.
+:type TYPE              Type to use (defaults to SELECTION).
+
+Following the keywords is optional code which is executed each time
+the selection is enabled.
+
+\(fn SELECTION DOC [[KEY VAL]...] BODY...)"
+  (declare (indent defun)
+           (debug (&define name stringp
+                           [&rest keywordp sexp]
+                           def-body)))
+  (let* ((name (intern (format "evil-visual-%s" selection)))
+         (message (intern (format "%s-message" name)))
+         (type selection)
+         arg key string)
+    ;; collect keywords
+    (while (keywordp (car-safe body))
+      (setq key (pop body)
+            arg (pop body))
+      (cond
+       ((eq key :message)
+        (setq string arg))
+       ((eq key :type)
+        (setq type arg))))
+    ;; macro expansion
+    `(progn
+       (add-to-list 'evil-visual-alist (cons ',selection ',name))
+       (defvar ,name ',type ,(format "*%s" doc))
+       (defvar ,message ,string ,doc)
+       (evil-define-command ,name (&optional mark point type message)
+         ,@(when doc `(,doc))
+         :keep-visual t
+         :repeat nil
+         (interactive
+          (list nil nil
+                (if (and (evil-visual-state-p)
+                         (eq evil-visual-selection ',selection))
+                    'exit ,name) t))
+         (if (eq type 'exit)
+             (evil-exit-visual-state)
+           (setq type (or type ,name)
+                 evil-visual-selection ',selection)
+           (evil-visual-make-region mark point type message)
+           ,@body))
+       ',selection)))
+
+(evil-define-visual-selection char
+  "Characterwise selection."
+  :type inclusive
+  :message "-- VISUAL --")
+
+(evil-define-visual-selection line
+  "Linewise selection."
+  :message "-- VISUAL LINE --")
+
+(evil-define-visual-selection block
+  "Blockwise selection."
+  :message "-- VISUAL BLOCK --"
+  (evil-transient-mark -1)
+  ;; refresh the :corner property
+  (setq evil-visual-properties
+        (plist-put evil-visual-properties :corner
+                   (evil-visual-block-corner 'upper-left))))
+
+(evil-define-state visual
+  "Visual state."
+  :tag " <V> "
+  :enable (motion normal)
+  :message 'evil-visual-message
+  (cond
+   ((evil-visual-state-p)
+    (evil-save-transient-mark-mode)
+    (setq select-active-regions nil)
+    (cond
+     ((region-active-p)
+      (if (< (evil-visual-direction) 0)
+          (evil-visual-select (region-beginning) (region-end)
+                              evil-visual-char
+                              (evil-visual-direction))
+        (evil-visual-make-selection (mark t) (point)
+                                    evil-visual-char))
+      (evil-visual-highlight))
+     (t
+      (evil-visual-make-region (point) (point) evil-visual-char)))
+    (add-hook 'pre-command-hook #'evil-visual-pre-command nil t)
+    (add-hook 'post-command-hook #'evil-visual-post-command nil t)
+    (add-hook 'deactivate-mark-hook #'evil-visual-deactivate-hook nil t))
+   (t
+    ;; Postpone deactivation of region if next state is Insert.
+    ;; This gives certain insertion commands (auto-pairing characters,
+    ;; for example) an opportunity to access the region.
+    (if (and (eq evil-next-state 'insert)
+             (eq evil-visual-selection 'char))
+        (add-hook 'evil-normal-state-entry-hook
+                  #'evil-visual-deactivate-hook nil t)
+      (evil-visual-deactivate-hook))
+    (setq evil-visual-region-expanded nil)
+    (remove-hook 'pre-command-hook #'evil-visual-pre-command t)
+    (remove-hook 'post-command-hook #'evil-visual-post-command t)
+    (remove-hook 'deactivate-mark-hook #'evil-visual-deactivate-hook t)
+    (evil-visual-highlight -1))))
+
+(defun evil-visual-pre-command (&optional command)
+  "Run before each COMMAND in Visual state.
+Expand the region to the selection unless COMMAND is a motion."
+  (when (evil-visual-state-p)
+    (setq command (or command this-command))
+    (unless (evil-get-command-property command :keep-visual)
+      (evil-visual-expand-region
+       ;; exclude final newline from linewise selection
+       ;; unless the command has real need of it
+       (and (eq (evil-visual-type) 'line)
+            (evil-get-command-property command :exclude-newline))))))
+
+(put 'evil-visual-pre-command 'permanent-local-hook t)
+
+(defun evil-visual-post-command (&optional command)
+  "Run after each COMMAND in Visual state.
+If COMMAND is a motion, refresh the selection;
+otherwise exit Visual state."
+  (when (evil-visual-state-p)
+    (setq command (or command this-command))
+    (when evil-visual-x-select-timer
+      (cancel-timer evil-visual-x-select-timer))
+    (if (or quit-flag
+            (eq command #'keyboard-quit)
+            ;; Is `mark-active' nil for an unexpanded region?
+            deactivate-mark
+            (and (not evil-visual-region-expanded)
+                 (not (region-active-p))
+                 (not (eq evil-visual-selection 'block))))
+        (progn
+          (evil-exit-visual-state)
+          (evil-adjust-cursor))
+      (if evil-visual-region-expanded
+          (evil-visual-contract-region)
+        (evil-visual-refresh))
+      (setq evil-visual-x-select-timer
+            (run-with-idle-timer evil-visual-x-select-timeout nil
+                                 #'evil-visual-update-x-selection
+                                 (current-buffer)))
+      (evil-visual-highlight))))
+(put 'evil-visual-post-command 'permanent-local-hook t)
+
+(defun evil-visual-update-x-selection (&optional buffer)
+  "Update the X selection with the current visual region."
+  (with-current-buffer (or buffer (current-buffer))
+    (when (and (evil-visual-state-p)
+               (fboundp 'x-select-text)
+               (or (not (boundp 'ns-initialized))
+                   (with-no-warnings ns-initialized))
+               (not (eq evil-visual-selection 'block)))
+      (x-select-text (buffer-substring-no-properties
+                      evil-visual-beginning
+                      evil-visual-end)))))
+
+(defun evil-visual-activate-hook (&optional command)
+  "Enable Visual state if the region is activated."
+  (unless (evil-visual-state-p)
+    (evil-delay nil
+        ;; the activation may only be momentary, so re-check
+        ;; in `post-command-hook' before entering Visual state
+        '(unless (or (evil-visual-state-p)
+                     (evil-insert-state-p)
+                     (evil-emacs-state-p))
+           (when (and (region-active-p)
+                      (not deactivate-mark))
+             (evil-visual-state)))
+      'post-command-hook nil t
+      "evil-activate-visual-state")))
+(put 'evil-visual-activate-hook 'permanent-local-hook t)
+
+(defun evil-visual-deactivate-hook (&optional command)
+  "Deactivate the region and restore Transient Mark mode."
+  (setq command (or command this-command))
+  (remove-hook 'deactivate-mark-hook
+               #'evil-visual-deactivate-hook t)
+  (remove-hook 'evil-normal-state-entry-hook
+               #'evil-visual-deactivate-hook t)
+  (cond
+   ((and (evil-visual-state-p) command
+         (not (evil-get-command-property command :keep-visual)))
+    (setq evil-visual-region-expanded nil)
+    (evil-exit-visual-state))
+   ((not (evil-visual-state-p))
+    (evil-active-region -1)
+    (evil-restore-transient-mark-mode))))
+(put 'evil-visual-deactivate-hook 'permanent-local-hook t)
+
+(evil-define-command evil-exit-visual-state (&optional later buffer)
+  "Exit from Visual state to the previous state.
+If LATER is non-nil, exit after the current command."
+  :keep-visual t
+  :repeat abort
+  (with-current-buffer (or buffer (current-buffer))
+    (when (evil-visual-state-p)
+      (evil-visual-update-x-selection)
+      (if later
+          (setq deactivate-mark t)
+        (when evil-visual-region-expanded
+          (evil-visual-contract-region))
+        (evil-change-to-previous-state)))))
+
+(defun evil-visual-message (&optional selection)
+  "Create an echo area message for SELECTION.
+SELECTION is a kind of selection as defined by
+`evil-define-visual-selection', such as `char', `line'
+or `block'."
+  (let (message)
+    (setq selection (or selection evil-visual-selection))
+    (when selection
+      (setq message
+            (symbol-value (intern (format "evil-visual-%s-message"
+                                          selection))))
+      (cond
+       ((functionp message)
+        (funcall message))
+       ((stringp message)
+        (evil-echo "%s" message))))))
+
+(defun evil-visual-select (beg end &optional type dir message)
+  "Create a Visual selection of type TYPE from BEG to END.
+Point and mark are positioned so that the resulting selection
+has the specified boundaries. If DIR is negative, point precedes mark,
+otherwise it succedes it. To specify point and mark directly,
+use `evil-visual-make-selection'."
+  (let* ((range (evil-contract beg end type))
+         (mark (evil-range-beginning range))
+         (point (evil-range-end range))
+         (dir (or dir 1)))
+    (when (< dir 0)
+      (evil-swap mark point))
+    (evil-visual-make-selection mark point type message)))
+
+(defun evil-visual-make-selection (mark point &optional type message)
+  "Create a Visual selection with point at POINT and mark at MARK.
+The boundaries of the selection are inferred from these
+and the current TYPE. To specify the boundaries and infer
+mark and point, use `evil-visual-select' instead."
+  (let* ((selection (evil-visual-selection-for-type type))
+         (func (evil-visual-selection-function selection))
+         (prev (and (evil-visual-state-p) evil-visual-selection))
+         (mark (evil-normalize-position mark))
+         (point (evil-normalize-position point))
+         (state evil-state))
+    (unless (evil-visual-state-p)
+      (evil-visual-state))
+    (setq evil-visual-selection selection)
+    (funcall func mark point type
+             ;; signal a message when changing the selection
+             (when (or (not (evil-visual-state-p state))
+                       (not (eq selection prev)))
+               message))))
+
+(defun evil-visual-make-region (mark point &optional type message)
+  "Create an active region from MARK to POINT.
+If TYPE is given, also set the Visual type.
+If MESSAGE is given, display it in the echo area."
+  (interactive)
+  (let* ((point (evil-normalize-position
+                 (or point (point))))
+         (mark (evil-normalize-position
+                (or mark
+                    (when (or (evil-visual-state-p)
+                              (region-active-p))
+                      (mark t))
+                    point))))
+    (unless (evil-visual-state-p)
+      (evil-visual-state))
+    (evil-active-region 1)
+    (setq evil-visual-region-expanded nil)
+    (evil-visual-refresh mark point type)
+    (cond
+     ((null evil-echo-state))
+     ((stringp message)
+      (evil-echo "%s" message))
+     (message
+      (cond
+       ((stringp evil-visual-state-message)
+        (evil-echo "%s" evil-visual-state-message))
+       ((functionp evil-visual-state-message)
+        (funcall evil-visual-state-message)))))))
+
+(defun evil-visual-expand-region (&optional exclude-newline)
+  "Expand the region to the Visual selection.
+If EXCLUDE-NEWLINE is non-nil and the selection ends with a newline,
+exclude that newline from the region."
+  (when (and (evil-visual-state-p)
+             (not evil-visual-region-expanded))
+    (let ((mark evil-visual-beginning)
+          (point evil-visual-end))
+      (when (< evil-visual-direction 0)
+        (evil-swap mark point))
+      (setq evil-visual-region-expanded t)
+      (evil-visual-refresh mark point)
+      (when (and exclude-newline
+                 (save-excursion
+                   (goto-char evil-visual-end)
+                   (and (bolp) (not (bobp)))))
+        (if (< evil-visual-direction 0)
+            (evil-move-mark (max point (1- (mark))))
+          (goto-char (max mark (1- (point)))))))))
+
+(defun evil-visual-contract-region ()
+  "The inverse of `evil-visual-expand-region'.
+Create a Visual selection that expands to the current region."
+  (evil-visual-refresh)
+  (setq evil-visual-region-expanded nil)
+  (evil-visual-refresh evil-visual-mark evil-visual-point))
+
+(defun evil-visual-refresh (&optional mark point type &rest properties)
+  "Refresh point, mark and Visual variables.
+Refreshes `evil-visual-beginning', `evil-visual-end',
+`evil-visual-mark', `evil-visual-point', `evil-visual-selection',
+`evil-visual-direction', `evil-visual-properties' and `evil-this-type'."
+  (let* ((point (or point (point)))
+         (mark (or mark (mark t) point))
+         (dir (evil-visual-direction))
+         (type (or type (evil-visual-type evil-visual-selection)
+                   (evil-visual-type)))
+         range)
+    (evil-move-mark mark)
+    (goto-char point)
+    (setq evil-visual-beginning
+          (or evil-visual-beginning
+              (let ((marker (make-marker)))
+                (move-marker marker (min point mark))))
+          evil-visual-end
+          (or evil-visual-end
+              (let ((marker (make-marker)))
+                (set-marker-insertion-type marker t)
+                (move-marker marker (max point mark))))
+          evil-visual-mark
+          (or evil-visual-mark
+              (let ((marker (make-marker)))
+                (move-marker marker mark)))
+          evil-visual-point
+          (or evil-visual-point
+              (let ((marker (make-marker)))
+                (move-marker marker point))))
+    (setq evil-visual-properties
+          (evil-concat-plists evil-visual-properties properties))
+    (cond
+     (evil-visual-region-expanded
+      (setq type (or (evil-visual-type) type))
+      (move-marker evil-visual-beginning (min point mark))
+      (move-marker evil-visual-end (max point mark))
+      ;; if the type is one-to-one, we can safely refresh
+      ;; the unexpanded positions as well
+      (when (evil-type-property type :one-to-one)
+        (setq range (apply #'evil-contract point mark type
+                           evil-visual-properties)
+              mark (evil-range-beginning range)
+              point (evil-range-end range))
+        (when (< dir 0)
+          (evil-swap mark point))
+        (move-marker evil-visual-mark mark)
+        (move-marker evil-visual-point point)))
+     (t
+      (setq range (apply #'evil-expand point mark type
+                         evil-visual-properties)
+            type (evil-type range type))
+      (move-marker evil-visual-beginning (evil-range-beginning range))
+      (move-marker evil-visual-end (evil-range-end range))
+      (move-marker evil-visual-mark mark)
+      (move-marker evil-visual-point point)))
+    (setq evil-visual-direction dir
+          evil-this-type type)))
+
+(defun evil-visual-highlight (&optional arg)
+  "Highlight Visual selection, depending on the Visual type.
+With negative ARG, disable highlighting."
+  (cond
+   ((and (numberp arg) (< arg 1))
+    (when evil-visual-overlay
+      (delete-overlay evil-visual-overlay)
+      (setq evil-visual-overlay nil))
+    (when evil-visual-block-overlays
+      (mapc #'delete-overlay evil-visual-block-overlays)
+      (setq evil-visual-block-overlays nil)))
+   ((eq evil-visual-selection 'block)
+    (when evil-visual-overlay
+      (evil-visual-highlight -1))
+    (evil-visual-highlight-block
+     evil-visual-beginning
+     evil-visual-end))
+   (t
+    (when evil-visual-block-overlays
+      (evil-visual-highlight -1))
+    (if evil-visual-overlay
+        (move-overlay evil-visual-overlay
+                      evil-visual-beginning evil-visual-end)
+      (setq evil-visual-overlay
+            (make-overlay evil-visual-beginning evil-visual-end)))
+    (overlay-put evil-visual-overlay 'face 'region)
+    (overlay-put evil-visual-overlay 'priority 99))))
+
+(defun evil-visual-highlight-block (beg end &optional overlays)
+  "Highlight rectangular region from BEG to END.
+Do this by putting an overlay on each line within the rectangle.
+Each overlay extends across all the columns of the rectangle.
+Reuse overlays where possible to prevent flicker."
+  (let* ((point (point))
+         (mark (or (mark t) point))
+         (overlays (or overlays 'evil-visual-block-overlays))
+         (old (symbol-value overlays))
+         (eol-col (and (memq this-command '(next-line previous-line))
+                       (numberp temporary-goal-column)
+                       (1+ (min (round temporary-goal-column)
+                                (1- most-positive-fixnum)))))
+         beg-col end-col new nlines overlay window-beg window-end)
+    (save-excursion
+      ;; calculate the rectangular region represented by BEG and END,
+      ;; but put BEG in the upper-left corner and END in the
+      ;; lower-right if not already there
+      (setq beg-col (evil-column beg)
+            end-col (evil-column end))
+      (when (>= beg-col end-col)
+        (if (= beg-col end-col)
+            (setq end-col (1+ end-col))
+          (evil-sort beg-col end-col))
+        (setq beg (save-excursion
+                    (goto-char beg)
+                    (evil-move-to-column beg-col))
+              end (save-excursion
+                    (goto-char end)
+                    (evil-move-to-column end-col 1))))
+      ;; update end column with eol-col (extension to eol).
+      (when (and eol-col (> eol-col end-col))
+        (setq end-col eol-col))
+      ;; force a redisplay so we can do reliable window
+      ;; BEG/END calculations
+      (sit-for 0)
+      (setq window-beg (max (window-start) beg)
+            window-end (min (window-end) (1+ end))
+            nlines (count-lines window-beg
+                                (min window-end (point-max))))
+      ;; iterate over those lines of the rectangle which are
+      ;; visible in the currently selected window
+      (goto-char window-beg)
+      (dotimes (i nlines)
+        (let (before after row-beg row-end)
+          ;; beginning of row
+          (evil-move-to-column beg-col)
+          (when (< (current-column) beg-col)
+            ;; prepend overlay with virtual spaces if unable to
+            ;; move directly to the first column
+            (setq before
+                  (propertize
+                   (make-string
+                    (- beg-col (current-column)) ?\ )
+                   'face
+                   (or (get-text-property (1- (point)) 'face)
+                       'default))))
+          (setq row-beg (point))
+          ;; end of row
+          (evil-move-to-column end-col)
+          (when (and (not (eolp))
+                     (< (current-column) end-col))
+            ;; append overlay with virtual spaces if unable to
+            ;; move directly to the last column
+            (setq after
+                  (propertize
+                   (make-string
+                    (if (= (point) row-beg)
+                        (- end-col beg-col)
+                      (- end-col (current-column)))
+                    ?\ ) 'face 'region))
+            ;; place cursor on one of the virtual spaces
+            (if (= point row-beg)
+                (put-text-property
+                 0 (min (length after) 1)
+                 'cursor t after)
+              (put-text-property
+               (max 0 (1- (length after))) (length after)
+               'cursor t after)))
+          (setq row-end (min (point) (line-end-position)))
+          ;; trim old leading overlays
+          (while (and old
+                      (setq overlay (car old))
+                      (< (overlay-start overlay) row-beg)
+                      (/= (overlay-end overlay) row-end))
+            (delete-overlay overlay)
+            (setq old (cdr old)))
+          ;; reuse an overlay if possible, otherwise create one
+          (cond
+           ((and old (setq overlay (car old))
+                 (or (= (overlay-start overlay) row-beg)
+                     (= (overlay-end overlay) row-end)))
+            (move-overlay overlay row-beg row-end)
+            (overlay-put overlay 'before-string before)
+            (overlay-put overlay 'after-string after)
+            (setq new (cons overlay new)
+                  old (cdr old)))
+           (t
+            (setq overlay (make-overlay row-beg row-end))
+            (overlay-put overlay 'before-string before)
+            (overlay-put overlay 'after-string after)
+            (setq new (cons overlay new)))))
+        (forward-line 1))
+      ;; display overlays
+      (dolist (overlay new)
+        (overlay-put overlay 'face 'region)
+        (overlay-put overlay 'priority 99))
+      ;; trim old overlays
+      (dolist (overlay old)
+        (delete-overlay overlay))
+      (set overlays (nreverse new)))))
+
+(defun evil-visual-range ()
+  "Return the Visual selection as a range.
+This is a list (BEG END TYPE PROPERTIES...), where BEG is the
+beginning of the selection, END is the end of the selection,
+TYPE is the selection's type, and PROPERTIES is a property list
+of miscellaneous selection attributes."
+  (apply #'evil-range
+         evil-visual-beginning evil-visual-end
+         (evil-visual-type)
+         :expanded t
+         evil-visual-properties))
+
+(defun evil-visual-direction ()
+  "Return direction of Visual selection.
+The direction is -1 if point precedes mark and 1 otherwise.
+See also the variable `evil-visual-direction', which holds
+the direction of the last selection."
+  (let* ((point (point))
+         (mark (or (mark t) point)))
+    (if (< point mark) -1 1)))
+
+(defun evil-visual-type (&optional selection)
+  "Return the type of the Visual selection.
+If SELECTION is specified, return the type of that instead."
+  (if (and (null selection) (evil-visual-state-p))
+      (or evil-this-type (evil-visual-type evil-visual-selection))
+    (setq selection (or selection evil-visual-selection))
+    (symbol-value (cdr-safe (assq selection evil-visual-alist)))))
+
+(defun evil-visual-goto-end ()
+  "Go to the last line of the Visual selection.
+This position may differ from `evil-visual-end' depending on
+the selection type, and is contained in the selection."
+  (let ((range (evil-contract-range (evil-visual-range))))
+    (goto-char (evil-range-end range))))
+
+(defun evil-visual-alist ()
+  "Return an association list from types to selection symbols."
+  (mapcar #'(lambda (e)
+              (cons (symbol-value (cdr-safe e)) (cdr-safe e)))
+          evil-visual-alist))
+
+(defun evil-visual-selection-function (selection)
+  "Return a selection function for TYPE.
+Default to `evil-visual-make-region'."
+  (or (cdr-safe (assq selection evil-visual-alist))
+      ;; generic selection function
+      'evil-visual-make-region))
+
+(defun evil-visual-selection-for-type (type)
+  "Return a Visual selection for TYPE."
+  (catch 'done
+    (dolist (selection evil-visual-alist)
+      (when (eq (symbol-value (cdr selection)) type)
+        (throw 'done (car selection))))))
+
+(defun evil-visual-block-corner (&optional corner point mark)
+  "Block corner corresponding to POINT, with MARK in opposite corner.
+Depending on POINT and MARK, the return value is `upper-left',
+`upper-right', `lower-left' or `lower-right':
+
+        upper-left +---+ upper-right
+                   |   |
+        lower-left +---+ lower-right
+
+One-column or one-row blocks are ambiguous. In such cases,
+the horizontal or vertical component of CORNER is used.
+CORNER defaults to `upper-left'."
+  (let* ((point (or point (point)))
+         (mark (or mark (mark t)))
+         (corner (symbol-name
+                  (or corner
+                      (and (overlayp evil-visual-overlay)
+                           (overlay-get evil-visual-overlay
+                                        :corner))
+                      'upper-left)))
+         (point-col (evil-column point))
+         (mark-col (evil-column mark))
+         horizontal vertical)
+    (cond
+     ((= point-col mark-col)
+      (setq horizontal
+            (or (and (string-match "left\\|right" corner)
+                     (match-string 0 corner))
+                "left")))
+     ((< point-col mark-col)
+      (setq horizontal "left"))
+     ((> point-col mark-col)
+      (setq horizontal "right")))
+    (cond
+     ((= (line-number-at-pos point)
+         (line-number-at-pos mark))
+      (setq vertical
+            (or (and (string-match "upper\\|lower" corner)
+                     (match-string 0 corner))
+                "upper")))
+     ((< point mark)
+      (setq vertical "upper"))
+     ((> point mark)
+      (setq vertical "lower")))
+    (intern (format "%s-%s" vertical horizontal))))
+
+;;; Operator-Pending state
+
+(evil-define-state operator
+  "Operator-Pending state."
+  :tag " <O> "
+  :cursor evil-half-cursor
+  :enable (evil-operator-shortcut-map operator motion normal))
+
+(evil-define-keymap evil-operator-shortcut-map
+  "Keymap for Operator-Pending shortcuts like \"dd\" and \"gqq\"."
+  :local t
+  (setq evil-operator-shortcut-map (make-sparse-keymap))
+  (evil-initialize-local-keymaps))
+
+;; the half-height "Operator-Pending cursor" cannot be specified
+;; as a static `cursor-type' value, since its height depends on
+;; the current font size
+(defun evil-half-cursor ()
+  "Change cursor to a half-height box.
+\(This is really just a thick horizontal bar.)"
+  (let (height)
+    ;; make `window-line-height' reliable
+    (redisplay)
+    (setq height (window-line-height))
+    (setq height (+ (nth 0 height) (nth 3 height)))
+    ;; cut cursor height in half
+    (setq height (/ height 2))
+    (setq cursor-type (cons 'hbar height))
+    ;; ensure the cursor is redisplayed
+    (force-window-update (selected-window))
+    (redisplay)))
+
+;;; Replace state
+
+(evil-define-state replace
+  "Replace state."
+  :tag " <R> "
+  :cursor hbar
+  :message "-- REPLACE --"
+  (cond
+   ((evil-replace-state-p)
+    (overwrite-mode 1)
+    (add-hook 'pre-command-hook #'evil-replace-pre-command nil t))
+   (t
+    (overwrite-mode -1)
+    (remove-hook 'pre-command-hook #'evil-replace-pre-command t)
+    (when evil-move-cursor-back
+      (evil-move-cursor-back))))
+  (setq evil-replace-alist nil))
+
+(defun evil-replace-pre-command ()
+  "Remember the character under point."
+  (when (evil-replace-state-p)
+    (unless (assq (point) evil-replace-alist)
+      (add-to-list 'evil-replace-alist
+                   (cons (point)
+                         (unless (eolp)
+                           (char-after)))))))
+(put 'evil-replace-pre-command 'permanent-local-hook t)
+
+(defun evil-replace-backspace ()
+  "Restore character under cursor."
+  (interactive)
+  (let (char)
+    (backward-char)
+    (when (assq (point) evil-replace-alist)
+      (setq char (cdr (assq (point) evil-replace-alist)))
+      (save-excursion
+        (delete-char 1)
+        (when char
+          (insert char))))))
+
+;;; Motion state
+
+(evil-define-state motion
+  "Motion state."
+  :tag " <M> "
+  :suppress-keymap t)
+
+;;; Emacs state
+
+(evil-define-state emacs
+  "Emacs state."
+  :tag " <E> "
+  :message "-- EMACS --"
+  :input-method t
+  :intercept-esc nil)
+
+(provide 'evil-states)
+
+;;; evil-states.el ends here
diff --git a/elpa/evil-1.0.1/evil-types.el b/elpa/evil-1.0.1/evil-types.el
new file mode 100644
index 00000000..ffc08596
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-types.el
@@ -0,0 +1,361 @@
+;;; evil-types.el --- Type system
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; A type defines a transformation on a pair of buffer positions.
+;; Types are used by Visual state (character/line/block selection)
+;; and Operator-Pending state (character/line/block motions).
+;;
+;; The basic transformation is "expansion". For example, the `line'
+;; type "expands" a pair of positions to whole lines by moving the
+;; first position to the beginning of the line and the last position
+;; to the end of the line. That expanded selection is what the rest
+;; of Emacs sees and acts on.
+;;
+;; An optional transformation is "contraction", which is the opposite
+;; of expansion. If the transformation is one-to-one, expansion
+;; followed by contraction always returns the original range.
+;; (The `line' type is not one-to-one, as it may expand multiple
+;; positions to the same lines.)
+;;
+;; Another optional transformation is "normalization", which takes
+;; two unexpanded positions and adjusts them before expansion.
+;; This is useful for cleaning up "invalid" positions.
+;;
+;; Types are defined at the end of this file using the macro
+;; `evil-define-type'.
+
+(require 'evil-common)
+(require 'evil-macros)
+
+;;; Code:
+
+;;; Type definitions
+
+(evil-define-type exclusive
+  "Return the positions unchanged, with some exceptions.
+If the end position is at the beginning of a line, then:
+
+* If the beginning position is at or before the first non-blank
+  character on the line, return `line' (expanded).
+
+* Otherwise, move the end position to the end of the previous
+  line and return `inclusive' (expanded)."
+  :normalize (lambda (beg end)
+               (cond
+                ((progn
+                   (goto-char end)
+                   (and (/= beg end) (bolp)))
+                 (setq end (max beg (1- end)))
+                 (cond
+                  ((progn
+                     (goto-char beg)
+                     (looking-back "^[ \f\t\v]*" (line-beginning-position)))
+                   (evil-expand beg end 'line))
+                  (t
+                   (unless evil-cross-lines
+                     (setq end (max beg (1- end))))
+                   (evil-expand beg end 'inclusive))))
+                (t
+                 (evil-range beg end))))
+  :string (lambda (beg end)
+            (let ((width (- end beg)))
+              (format "%s character%s" width
+                      (if (= width 1) "" "s")))))
+
+(evil-define-type inclusive
+  "Include the character under point.
+If the end position is at the beginning of a line or the end of a
+line and `evil-want-visual-char-semi-exclusive', then:
+
+* If in visual state return `exclusive' (expanded)."
+  :expand (lambda (beg end)
+            (if (and evil-want-visual-char-semi-exclusive
+                     (evil-visual-state-p)
+                     (< beg end)
+                     (save-excursion
+                       (goto-char end)
+                       (or (bolp) (eolp))))
+                (evil-range beg end 'exclusive)
+              (evil-range beg (1+ end))))
+  :contract (lambda (beg end)
+              (evil-range beg (max beg (1- end))))
+  :normalize (lambda (beg end)
+               (goto-char end)
+               (when (eq (char-after) ?\n)
+                 (setq end (max beg (1- end))))
+               (evil-range beg end))
+  :string (lambda (beg end)
+            (let ((width (- end beg)))
+              (format "%s character%s" width
+                      (if (= width 1) "" "s")))))
+
+(evil-define-type line
+  "Include whole lines."
+  :one-to-one nil
+  :expand (lambda (beg end)
+            (evil-range
+             (progn
+               (goto-char beg)
+               (min (line-beginning-position)
+                    (progn
+                      ;; move to beginning of line as displayed
+                      (evil-move-beginning-of-line)
+                      (line-beginning-position))))
+             (progn
+               (goto-char end)
+               (max (line-beginning-position 2)
+                    (progn
+                      ;; move to end of line as displayed
+                      (evil-move-end-of-line)
+                      (line-beginning-position 2))))))
+  :contract (lambda (beg end)
+              (evil-range beg (max beg (1- end))))
+  :string (lambda (beg end)
+            (let ((height (count-lines beg end)))
+              (format "%s line%s" height
+                      (if (= height 1) "" "s")))))
+
+(evil-define-type block
+  "Like `inclusive', but for rectangles:
+the last column is included."
+  :expand (lambda (beg end &rest properties)
+            (let ((beg-col (evil-column beg))
+                  (end-col (evil-column end))
+                  (corner (plist-get properties :corner)))
+              ;; Since blocks are implemented as a pair of buffer
+              ;; positions, expansion is restricted to what the buffer
+              ;; allows. In the case of a one-column block, there are
+              ;; two ways to expand it (either move the upper corner
+              ;; beyond the lower corner, or the lower beyond the
+              ;; upper), so try out both possibilities when
+              ;; encountering the end of the line.
+              (cond
+               ((= beg-col end-col)
+                (goto-char end)
+                (cond
+                 ((eolp)
+                  (goto-char beg)
+                  (if (eolp)
+                      (evil-range beg end)
+                    (evil-range (1+ beg) end)))
+                 ((memq corner '(lower-right upper-right right))
+                  (evil-range (1+ beg) end))
+                 (t
+                  (evil-range beg (1+ end)))))
+               ((< beg-col end-col)
+                (goto-char end)
+                (if (eolp)
+                    (evil-range beg end)
+                  (evil-range beg (1+ end))))
+               (t
+                (goto-char beg)
+                (if (eolp)
+                    (evil-range beg end)
+                  (evil-range (1+ beg) end))))))
+  :contract (lambda (beg end)
+              (let ((beg-col (evil-column beg))
+                    (end-col (evil-column end)))
+                (if (> beg-col end-col)
+                    (evil-range (1- beg) end)
+                  (evil-range beg (max beg (1- end))))))
+  :string (lambda (beg end)
+            (let ((height (count-lines
+                           beg
+                           (progn
+                             (goto-char end)
+                             (if (and (bolp) (not (eobp)))
+                                 (1+ end)
+                               end))))
+                  (width (abs (- (evil-column beg)
+                                 (evil-column end)))))
+              (format "%s row%s and %s column%s"
+                      height
+                      (if (= height 1) "" "s")
+                      width
+                      (if (= width 1) "" "s"))))
+  :rotate (lambda (beg end &rest properties)
+            "Rotate block according to :corner property.
+:corner can be one of `upper-left',``upper-right', `lower-left'
+and `lower-right'."
+            (let ((left  (evil-column beg))
+                  (right (evil-column end))
+                  (corner (or (plist-get properties :corner)
+                              'upper-left)))
+              (evil-sort left right)
+              (goto-char beg)
+              (if (memq corner '(upper-right lower-left))
+                  (move-to-column right)
+                (move-to-column left))
+              (setq beg (point))
+              (goto-char end)
+              (if (memq corner '(upper-right lower-left))
+                  (move-to-column left)
+                (move-to-column right))
+              (setq end (point))
+              (setq properties (plist-put properties
+                                          :corner corner))
+              (apply #'evil-range beg end properties))))
+
+(evil-define-type rectangle
+  "Like `exclusive', but for rectangles:
+the last column is excluded."
+  :expand (lambda (beg end)
+            ;; select at least one column
+            (if (= (evil-column beg) (evil-column end))
+                (evil-expand beg end 'block)
+              (evil-range beg end 'block))))
+
+;;; Standard interactive codes
+
+(evil-define-interactive-code "*"
+  "Signal error if the buffer is read-only."
+  (when buffer-read-only
+    (signal 'buffer-read-only nil)))
+
+(evil-define-interactive-code "b" (prompt)
+  "Name of existing buffer."
+  (list (read-buffer prompt (current-buffer) t)))
+
+(evil-define-interactive-code "c"
+  "Read character."
+  (list (read-char)))
+
+(evil-define-interactive-code "p"
+  "Prefix argument converted to number."
+  (list (prefix-numeric-value current-prefix-arg)))
+
+(evil-define-interactive-code "P"
+  "Prefix argument in raw form."
+  (list current-prefix-arg))
+
+;;; Custom interactive codes
+
+(evil-define-interactive-code "<c>"
+  "Count."
+  (list (when current-prefix-arg
+          (prefix-numeric-value
+           current-prefix-arg))))
+
+(evil-define-interactive-code "<vc>"
+  "Count, but only in visual state.
+This should be used by an operator taking a count. In normal
+state the count should not be handled by the operator but by the
+motion that defines the operator's range. In visual state the
+range is specified by the visual region and the count is not used
+at all. Thus in the case the operator may use the count
+directly."
+  (list (when (and (evil-visual-state-p) current-prefix-arg)
+          (prefix-numeric-value
+           current-prefix-arg))))
+
+(evil-define-interactive-code "<C>"
+  "Character read through `evil-read-key'."
+  (list (evil-read-key)))
+
+(evil-define-interactive-code "<r>"
+  "Untyped motion range (BEG END)."
+  (evil-operator-range))
+
+(evil-define-interactive-code "<R>"
+  "Typed motion range (BEG END TYPE)."
+  (evil-operator-range t))
+
+(evil-define-interactive-code "<v>"
+  "Typed motion range of visual range(BEG END TYPE).
+If visual state is inactive then those values are nil."
+  (if (evil-visual-state-p)
+      (let ((range (evil-visual-range)))
+        (list (car range)
+              (cadr range)
+              (evil-type range)))
+    (list nil nil nil)))
+
+(evil-define-interactive-code "<x>"
+  "Current register."
+  (list evil-this-register))
+
+(evil-define-interactive-code "<y>"
+  "Current yank-handler."
+  (list (evil-yank-handler)))
+
+(evil-define-interactive-code "<a>"
+  "Ex argument."
+  :ex-arg t
+  (list (when (evil-ex-p) evil-ex-argument)))
+
+(evil-define-interactive-code "<f>"
+  "Ex file argument."
+  :ex-arg file
+  (list (when (evil-ex-p) (evil-ex-file-arg))))
+
+(evil-define-interactive-code "<b>"
+  "Ex buffer argument."
+  :ex-arg buffer
+  (list (when (evil-ex-p) evil-ex-argument)))
+
+(evil-define-interactive-code "<sh>"
+  "Ex shell command argument."
+  :ex-arg shell
+  (list (when (evil-ex-p) evil-ex-argument)))
+
+(evil-define-interactive-code "<fsh>"
+  "Ex file or shell command argument."
+  :ex-arg file-or-shell
+  (list (when (evil-ex-p) evil-ex-argument)))
+
+(evil-define-interactive-code "<sym>"
+  "Ex symbolic argument."
+  :ex-arg sym
+  (list (when (and (evil-ex-p) evil-ex-argument)
+          (intern evil-ex-argument))))
+
+(evil-define-interactive-code "<!>"
+  "Ex bang argument."
+  :ex-bang t
+  (list (when (evil-ex-p) evil-ex-bang)))
+
+(evil-define-interactive-code "</>"
+  "Ex delimited argument."
+  (when (evil-ex-p)
+    (evil-delimited-arguments evil-ex-argument)))
+
+(evil-define-interactive-code "<g/>"
+  "Ex global argument."
+  (when (evil-ex-p)
+    (evil-ex-parse-global evil-ex-argument)))
+
+(evil-define-interactive-code "<s/>"
+  "Ex substitution argument."
+  :ex-arg substitution
+  (when (evil-ex-p)
+    (evil-ex-get-substitute-info evil-ex-argument)))
+
+(provide 'evil-types)
+
+;;; evil-types.el ends here
diff --git a/elpa/evil-1.0.1/evil-vars.el b/elpa/evil-1.0.1/evil-vars.el
new file mode 100644
index 00000000..69a6f72e
--- /dev/null
+++ b/elpa/evil-1.0.1/evil-vars.el
@@ -0,0 +1,1392 @@
+;;; evil-vars.el --- Settings and variables
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+
+;; Version: 1.0.1
+
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+;;; Hooks
+
+(defvar evil-after-load-hook nil
+  "Functions to be run when loading of evil is finished.
+This hook can be used the execute some initialization routines
+when evil is completely loaded.")
+
+;;; Initialization
+
+(defvar evil-pending-custom-initialize nil
+  "A list of pending initializations for custom variables.
+Each element is a triple (FUNC VAR VALUE). When evil is
+completely loaded then the functions (funcall FUNC VAR VALUE) is
+called for each element. FUNC should be a function suitable for
+the :initialize property of `defcustom'.")
+
+(defun evil-custom-initialize-pending-reset (var value)
+  "Add a pending customization with `custom-initialize-reset'."
+  (push (list 'custom-initialize-reset var value)
+        evil-pending-custom-initialize))
+
+(defun evil-run-pending-custom-initialize ()
+  "Executes the pending initializations.
+See `evil-pending-custom-initialize'."
+  (dolist (init evil-pending-custom-initialize)
+    (apply (car init) (cdr init)))
+  (remove-hook 'evil-after-load-hook 'evil-run-pending-custom-initialize))
+(add-hook 'evil-after-load-hook 'evil-run-pending-custom-initialize)
+
+;;; Setters
+
+(defun evil-set-toggle-key (key)
+  "Set `evil-toggle-key' to KEY.
+KEY must be readable by `read-kbd-macro'."
+  (let ((old-key (read-kbd-macro
+                  (if (boundp 'evil-toggle-key)
+                      evil-toggle-key
+                    "C-z")))
+        (key (read-kbd-macro key)))
+    (with-no-warnings
+      (dolist (pair '((evil-motion-state-map evil-emacs-state)
+                      (evil-insert-state-map evil-emacs-state)
+                      (evil-emacs-state-map evil-exit-emacs-state)))
+        (when (boundp (car pair))
+          (let ((map (symbol-value (car pair)))
+                (fun (cadr pair)))
+            (when (keymapp map)
+              (define-key map key fun)
+              (define-key map old-key nil))))))))
+
+(defun evil-set-custom-state-maps (var pending-var key make newlist)
+  "Changes the list of special keymaps.
+VAR         is the variable containing the list of keymaps.
+PENDING-VAR is the variable containing the list of the currently pending
+            keymaps.
+KEY         the special symbol to be stored in the keymaps.
+MAKE        the creation function of the special keymaps.
+NEWLIST     the list of new special keymaps."
+  (set-default pending-var newlist)
+  (when (default-boundp var)
+    (dolist (map (default-value var))
+      (when (and (boundp (car map))
+                 (keymapp (default-value (car map))))
+        (define-key (default-value (car map)) (vector key) nil))))
+  (set-default var newlist)
+  (evil-update-pending-maps))
+
+(defun evil-update-pending-maps (&optional file)
+  "Tries to set pending special keymaps.
+This function should be called from an `after-load-functions'
+hook."
+  (let ((maps '((evil-make-overriding-map . evil-pending-overriding-maps)
+                (evil-make-intercept-map . evil-pending-intercept-maps))))
+    (while maps
+      (let* ((map (pop maps))
+             (make (car map))
+             (pending-var (cdr map))
+             (pending (symbol-value pending-var))
+             newlist)
+        (while pending
+          (let* ((map (pop pending))
+                 (kmap (and (boundp (car map))
+                            (keymapp (symbol-value (car map)))
+                            (symbol-value (car map))))
+                 (state (cdr map)))
+            (if kmap
+                (funcall make kmap state)
+              (push map newlist))))
+        (set-default pending-var newlist)))))
+
+(defun evil-set-visual-newline-commands (var value)
+  "Set the value of `evil-visual-newline-commands'.
+Setting this variable changes the properties of the appropriate
+commands."
+  (with-no-warnings
+    (when (default-boundp var)
+      (dolist (cmd (default-value var))
+        (evil-set-command-property cmd :exclude-newline nil)))
+    (set-default var value)
+    (dolist (cmd (default-value var))
+      (evil-set-command-property cmd :exclude-newline t))))
+
+(defun evil-set-custom-motions (var values)
+  "Sets the list of motion commands."
+  (with-no-warnings
+    (when (default-boundp var)
+      (dolist (motion (default-value var))
+        (evil-add-command-properties motion :keep-visual nil :repeat nil)))
+    (set-default var values)
+    (mapc #'evil-declare-motion (default-value var))))
+
+;;; Customization group
+
+(defgroup evil nil
+  "Extensible vi layer."
+  :group 'emulations
+  :prefix 'evil-)
+
+(defcustom evil-auto-indent t
+  "Whether to auto-indent when entering Insert state."
+  :type  'boolean
+  :group 'evil)
+(make-variable-buffer-local 'evil-auto-indent)
+
+(defcustom evil-shift-width 4
+  "The offset used by \\<evil-normal-state-map>\\[evil-shift-right] \
+and \\[evil-shift-left]."
+  :type 'integer
+  :group 'evil)
+(make-variable-buffer-local 'evil-shift-width)
+
+(defcustom evil-shift-round t
+  "Whether \\<evil-normal-state-map>\\[evil-shift-right] \
+and \\[evil-shift-left] round to the nearest multiple \
+of `evil-shift-width'."
+  :type 'boolean
+  :group 'evil)
+(make-variable-buffer-local 'evil-shift-round)
+
+(defcustom evil-default-cursor
+  (list (or (frame-parameter nil 'cursor-color) "black") t)
+  "The default cursor.
+May be a cursor type as per `cursor-type', a color string as passed
+to `set-cursor-color', a zero-argument function for changing the
+cursor, or a list of the above."
+  :type '(set symbol (cons symbol symbol) string function)
+  :group 'evil)
+
+(defcustom evil-repeat-move-cursor t
+  "Whether \"\\<evil-normal-state-map>\\[evil-repeat]\" \
+moves the cursor."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-cross-lines nil
+  "Whether motions may cross newlines."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-move-cursor-back t
+  "Whether the cursor is moved backwards when exiting Insert state."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-kbd-macro-suppress-motion-error nil
+  "Whether left/right motions signal errors during keyboard-macro definition.
+If this variable is set to non-nil, then the function
+`evil-forward-char' and `evil-backward-char' do not signal
+`end-of-line' or `beginning-of-line' errors when a keyboard macro
+is being defined and/or it is being executed. This may be desired
+because such an error would cause the macro definition/execution
+being terminated."
+  :type '(radio (const :tag "No" :value nil)
+                (const :tag "Record" :value record)
+                (const :tag "Replay" :value replay)
+                (const :tag "Both" :value t))
+  :group 'evil)
+
+(defcustom evil-track-eol t
+  "If non-nil line moves after a call to `evil-end-of-line' stay at eol.
+This is analogous to `track-eol' but deals with the end-of-line
+interpretation of evil."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-mode-line-format 'before
+  "The position of the mode line tag.
+Either a symbol or a cons-cell. If it is a symbol it should be
+one of 'before, 'after or 'nil. 'before mean the the tag is
+placed before the mode-list, 'after means it is placed after the
+mode-list, and 'nil means no mode line tag. If it is a cons cell
+it should have the form (WHERE . WHICH) where WHERE is either
+'before or 'after and WHICH is a symbol in
+`mode-line-format'. The tag is then placed right before or after
+that symbol."
+  :type '(radio :value 'before
+                (const before)
+                (const after)
+                (cons :tag "Next to symbol"
+                      (choice :value after
+                              (const before)
+                              (const after))
+                      symbol))
+  :group 'evil)
+
+(defcustom evil-mouse-word 'evil-move-word
+  "The (movement) function to be used for double click selection.
+The double-click starts visual state in a special word selection
+mode. This function is used to determine the words to be
+selected. Possible values are 'evil-move-word or
+'evil-move-WORD."
+  :type 'symbol
+  :group 'evil)
+
+(defcustom evil-bigword "^ \t\r\n"
+  "The characters to be considered as a big word.
+This should be a regexp set without the enclosing []."
+  :type 'string
+  :group 'evil)
+(make-variable-buffer-local 'evil-bigword)
+
+(defcustom evil-want-fine-undo nil
+  "Whether actions like \"cw\" are undone in several steps."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-regexp-search t
+  "Whether to use regular expressions for searching."
+  :type  'boolean
+  :group 'evil)
+
+(defcustom evil-search-wrap t
+  "Whether search wraps around."
+  :type  'boolean
+  :group 'evil)
+
+(defcustom evil-flash-delay 2
+  "Time in seconds to flash search matches."
+  :type  'number
+  :group 'evil)
+
+(defcustom evil-fold-level 0
+  "Default fold level."
+  :type  'integer
+  :group 'evil)
+
+(defcustom evil-esc-delay 0.01
+  "Time in seconds to wait for another key after ESC."
+  :type 'number
+  :group 'evil)
+
+(defcustom evil-show-paren-range 0
+  "The minimal distance between point and a parenthesis
+which causes the parenthesis to be highlighted."
+  :type 'integer
+  :group 'evil)
+
+(defcustom evil-ex-hl-update-delay 0.02
+  "Time in seconds of idle before updating search highlighting.
+Setting this to a period shorter than that of keyboard's repeat
+rate allows highlights to update while scrolling."
+  :type 'number
+  :group 'evil)
+
+(defcustom evil-highlight-closing-paren-at-point-states
+  '(not emacs insert replace)
+  "The states in which the closing parenthesis at point should be highlighted.
+All states listed here highlight the closing parenthesis at
+point (which is Vim default behavior), all others highlight the
+parenthesis before point (which is Emacs default behavior). If
+this list contains the symbol 'not then its meaning is inverted,
+i.e., all states listed here highlight the closing parenthesis
+before point."
+  :type '(repeat symbol)
+  :group 'evil)
+
+(defcustom evil-want-C-i-jump t
+  "Whether \"C-i\" jumps forward like in Vim."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-want-C-u-scroll nil
+  "Whether \"C-u\" scrolls like in Vim."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-want-C-w-delete t
+  "Whether \"C-w\" deletes a word in Insert state."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-want-C-w-in-emacs-state nil
+  "Whether \"C-w\" prefixes windows commands in Emacs state."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-want-change-word-to-end t
+  "Whether \"cw\" behaves like \"ce\"."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-echo-state t
+  "Whether to signal the current state in the echo area."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-complete-all-buffers t
+  "Whether completion looks for matches in all buffers."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-complete-next-func
+  #'(lambda (arg)
+      (require 'dabbrev)
+      (let ((dabbrev-search-these-buffers-only
+             (unless evil-complete-all-buffers
+               (list (current-buffer))))
+            dabbrev-case-distinction)
+        (condition-case nil
+            (if (eq last-command this-command)
+                (dabbrev-expand nil)
+              (dabbrev-expand (- (abs (or arg 1)))))
+          (error (dabbrev-expand nil)))))
+  "Completion function used by \
+\\<evil-insert-state-map>\\[evil-complete-next]."
+  :type 'function
+  :group 'evil)
+
+(defcustom evil-complete-previous-func
+  #'(lambda (arg)
+      (require 'dabbrev)
+      (let ((dabbrev-search-these-buffers-only
+             (unless evil-complete-all-buffers
+               (list (current-buffer))))
+            dabbrev-case-distinction)
+        (dabbrev-expand arg)))
+  "Completion function used by \
+\\<evil-insert-state-map>\\[evil-complete-previous]."
+  :type 'function
+  :group 'evil)
+
+(defcustom evil-complete-next-minibuffer-func 'minibuffer-complete
+  "Minibuffer completion function used by \
+\\<evil-insert-state-map>\\[evil-complete-next]."
+  :type 'function
+  :group 'evil)
+
+(defcustom evil-complete-previous-minibuffer-func 'minibuffer-complete
+  "Minibuffer completion function used by \
+\\<evil-insert-state-map>\\[evil-complete-previous]."
+  :type 'function
+  :group 'evil)
+
+(defcustom evil-complete-next-line-func
+  #'(lambda (arg)
+      (let ((hippie-expand-try-functions-list
+             '(try-expand-line
+               try-expand-line-all-buffers)))
+        (hippie-expand arg)))
+  "Minibuffer completion function used by \
+\\<evil-insert-state-map>\\[evil-complete-next-line]."
+  :type 'function
+  :group 'evil)
+
+(defcustom evil-complete-previous-line-func
+  evil-complete-next-line-func
+  "Minibuffer completion function used by \
+\\<evil-insert-state-map>\\[evil-complete-previous-line]."
+  :type 'function
+  :group 'evil)
+
+(defcustom evil-lookup-func #'woman
+  "Lookup function used by \
+\"\\<evil-motion-state-map>\\[evil-lookup]\"."
+  :type 'function
+  :group 'evil)
+
+(defcustom evil-toggle-key "C-z"
+  "The key used to change to and from Emacs state.
+Must be readable by `read-kbd-macro'. For example: \"C-z\"."
+  :type 'string
+  :group 'evil
+  :set #'(lambda (sym value)
+           (evil-set-toggle-key value)
+           (set-default sym value)))
+
+(defcustom evil-default-state 'normal
+  "The default state.
+This is the state a mode comes up in when it is not listed
+in `evil-emacs-state-modes', `evil-insert-state-modes' or
+`evil-motion-state-modes'. The value may be one of `normal',
+`insert', `visual', `replace', `operator', `motion' and
+`emacs'."
+  :type  'symbol
+  :group 'evil)
+
+(defcustom evil-buffer-regexps
+  '(("^ \\*load\\*" . nil))
+  "Regular expression determining the initial state for a buffer.
+Entries have the form (REGEXP . STATE), where REGEXP is a regular
+expression matching the buffer's name and STATE is one of `normal',
+`insert', `visual', `replace', `operator', `motion', `emacs' and nil.
+If STATE is nil, Evil is disabled in the buffer."
+  :type '(alist :key-type string :value-type symbol)
+  :group 'evil)
+
+(defcustom evil-emacs-state-modes
+  '(archive-mode
+    bbdb-mode
+    bookmark-bmenu-mode
+    bookmark-edit-annotation-mode
+    browse-kill-ring-mode
+    bzr-annotate-mode
+    calc-mode
+    cfw:calendar-mode
+    completion-list-mode
+    Custom-mode
+    debugger-mode
+    delicious-search-mode
+    desktop-menu-blist-mode
+    desktop-menu-mode
+    doc-view-mode
+    dvc-bookmarks-mode
+    dvc-diff-mode
+    dvc-info-buffer-mode
+    dvc-log-buffer-mode
+    dvc-revlist-mode
+    dvc-revlog-mode
+    dvc-status-mode
+    dvc-tips-mode
+    ediff-mode
+    ediff-meta-mode
+    efs-mode
+    Electric-buffer-menu-mode
+    emms-browser-mode
+    emms-mark-mode
+    emms-metaplaylist-mode
+    emms-playlist-mode
+    etags-select-mode
+    fj-mode
+    gc-issues-mode
+    gdb-breakpoints-mode
+    gdb-disassembly-mode
+    gdb-frames-mode
+    gdb-locals-mode
+    gdb-memory-mode
+    gdb-registers-mode
+    gdb-threads-mode
+    gist-list-mode
+    gnus-article-mode
+    gnus-browse-mode
+    gnus-group-mode
+    gnus-server-mode
+    gnus-summary-mode
+    google-maps-static-mode
+    ibuffer-mode
+    jde-javadoc-checker-report-mode
+    magit-commit-mode
+    magit-diff-mode
+    magit-key-mode
+    magit-log-mode
+    magit-mode
+    magit-reflog-mode
+    magit-show-branches-mode
+    magit-stash-mode
+    magit-status-mode
+    magit-wazzup-mode
+    mh-folder-mode
+    monky-mode
+    notmuch-hello-mode
+    notmuch-search-mode
+    notmuch-show-mode
+    occur-mode
+    org-agenda-mode
+    package-menu-mode
+    proced-mode
+    rcirc-mode
+    rebase-mode
+    recentf-dialog-mode
+    reftex-select-bib-mode
+    reftex-toc-mode
+    sldb-mode
+    slime-inspector-mode
+    slime-thread-control-mode
+    slime-xref-mode
+    sr-buttons-mode
+    sr-mode
+    sr-tree-mode
+    sr-virtual-mode
+    tar-mode
+    tetris-mode
+    tla-annotate-mode
+    tla-archive-list-mode
+    tla-bconfig-mode
+    tla-bookmarks-mode
+    tla-branch-list-mode
+    tla-browse-mode
+    tla-category-list-mode
+    tla-changelog-mode
+    tla-follow-symlinks-mode
+    tla-inventory-file-mode
+    tla-inventory-mode
+    tla-lint-mode
+    tla-logs-mode
+    tla-revision-list-mode
+    tla-revlog-mode
+    tla-tree-lint-mode
+    tla-version-list-mode
+    twittering-mode
+    urlview-mode
+    vc-annotate-mode
+    vc-dir-mode
+    vc-git-log-view-mode
+    vc-svn-log-view-mode
+    vm-mode
+    vm-summary-mode
+    w3m-mode
+    wab-compilation-mode
+    xgit-annotate-mode
+    xgit-changelog-mode
+    xgit-diff-mode
+    xgit-revlog-mode
+    xhg-annotate-mode
+    xhg-log-mode
+    xhg-mode
+    xhg-mq-mode
+    xhg-mq-sub-mode
+    xhg-status-extra-mode)
+  "Modes that should come up in Emacs state."
+  :type  '(repeat symbol)
+  :group 'evil)
+
+(defcustom evil-insert-state-modes
+  '(comint-mode
+    erc-mode
+    eshell-mode
+    geiser-repl-mode
+    gud-mode
+    inferior-apl-mode
+    inferior-caml-mode
+    inferior-emacs-lisp-mode
+    inferior-j-mode
+    inferior-python-mode
+    inferior-scheme-mode
+    inferior-sml-mode
+    internal-ange-ftp-mode
+    prolog-inferior-mode
+    reb-mode
+    shell-mode
+    slime-repl-mode
+    term-mode
+    wdired-mode)
+  "Modes that should come up in Insert state."
+  :type  '(repeat symbol)
+  :group 'evil)
+
+(defcustom evil-motion-state-modes
+  '(apropos-mode
+    Buffer-menu-mode
+    calendar-mode
+    color-theme-mode
+    command-history-mode
+    compilation-mode
+    dictionary-mode
+    ert-results-mode
+    help-mode
+    Info-mode
+    speedbar-mode
+    undo-tree-visualizer-mode
+    view-mode)
+  "Modes that should come up in Motion state."
+  :type  '(repeat symbol)
+  :group 'evil)
+
+(defvar evil-pending-overriding-maps nil
+  "An alist of pending overriding maps.")
+
+(defvar evil-pending-intercept-maps nil
+  "An alist of pending intercept maps.")
+
+(defcustom evil-overriding-maps
+  '((Buffer-menu-mode-map . nil)
+    (color-theme-mode-map . nil)
+    (comint-mode-map . nil)
+    (compilation-mode-map . nil)
+    (dictionary-mode-map . nil)
+    (ert-results-mode-map . motion)
+    (Info-mode-map . motion)
+    (speedbar-key-map . nil)
+    (speedbar-file-key-map . nil)
+    (speedbar-buffers-key-map . nil))
+  "Keymaps that should override Evil maps.
+Entries have the form (MAP-VAR . STATE), where MAP-VAR is
+a keymap variable and STATE is the state whose bindings
+should be overridden. If STATE is nil, all states are
+overridden."
+  :type '(alist :key-type symbol :value-type symbol)
+  :group 'evil
+  :set #'(lambda (var values)
+           (evil-set-custom-state-maps 'evil-overriding-maps
+                                       'evil-pending-overriding-maps
+                                       'override-state
+                                       'evil-make-overriding-map
+                                       values))
+  :initialize 'evil-custom-initialize-pending-reset)
+
+(add-hook 'after-load-functions #'evil-update-pending-maps)
+
+(defcustom evil-intercept-maps
+  '((edebug-mode-map . nil))
+  "Keymaps that should intercept Evil maps.
+Entries have the form (MAP-VAR . STATE), where MAP-VAR is
+a keymap variable and STATE is the state whose bindings
+should be intercepted. If STATE is nil, all states are
+intercepted."
+  :type '(alist :key-type symbol :value-type symbol)
+  :group 'evil
+  :set #'(lambda (var values)
+           (evil-set-custom-state-maps 'evil-intercept-maps
+                                       'evil-pending-intercept-maps
+                                       'intercept-state
+                                       'evil-make-intercept-map
+                                       values))
+  :initialize 'evil-custom-initialize-pending-reset)
+
+(defcustom evil-motions
+  '(back-to-indentation
+    backward-char
+    backward-list
+    backward-paragraph
+    backward-sentence
+    backward-sexp
+    backward-up-list
+    backward-word
+    beginning-of-buffer
+    beginning-of-defun
+    beginning-of-line
+    beginning-of-visual-line
+    c-beginning-of-defun
+    c-end-of-defun
+    down-list
+    end-of-buffer
+    end-of-defun
+    end-of-line
+    end-of-visual-line
+    exchange-point-and-mark
+    forward-char
+    forward-list
+    forward-paragraph
+    forward-sentence
+    forward-sexp
+    forward-word
+    goto-last-change
+    ibuffer-backward-line
+    ibuffer-forward-line
+    isearch-abort
+    isearch-cancel
+    isearch-complete
+    isearch-del-char
+    isearch-delete-char
+    isearch-edit-string
+    isearch-exit
+    isearch-highlight-regexp
+    isearch-occur
+    isearch-other-control-char
+    isearch-other-meta-char
+    isearch-printing-char
+    isearch-query-replace
+    isearch-query-replace-regexp
+    isearch-quote-char
+    isearch-repeat-backward
+    isearch-repeat-forward
+    isearch-ring-advance
+    isearch-ring-retreat
+    isearch-toggle-case-fold
+    isearch-toggle-input-method
+    isearch-toggle-regexp
+    isearch-toggle-specified-input-method
+    isearch-toggle-word
+    isearch-yank-char
+    isearch-yank-kill
+    isearch-yank-line
+    isearch-yank-word-or-char
+    keyboard-quit
+    left-char
+    left-word
+    mouse-drag-region
+    mouse-save-then-kill
+    mouse-set-point
+    mouse-set-region
+    mwheel-scroll
+    move-beginning-of-line
+    move-end-of-line
+    next-error
+    next-line
+    paredit-backward
+    paredit-backward-down
+    paredit-backward-up
+    paredit-forward
+    paredit-forward-down
+    paredit-forward-up
+    pop-global-mark
+    pop-tag-mark
+    pop-to-mark-command
+    previous-error
+    previous-line
+    redo
+    right-char
+    right-word
+    scroll-down
+    scroll-up
+    undo
+    undo-tree-redo
+    undo-tree-undo
+    up-list)
+  "Non-Evil commands to initialize to motions."
+  :type  '(repeat symbol)
+  :group 'evil
+  :set 'evil-set-custom-motions
+  :initialize 'evil-custom-initialize-pending-reset)
+
+(defcustom evil-visual-newline-commands
+  '(LaTeX-section
+    TeX-font)
+  "Commands excluding the trailing newline of a Visual Line selection.
+These commands work better without this newline."
+  :type  '(repeat symbol)
+  :group 'evil
+  :set 'evil-set-visual-newline-commands
+  :initialize 'evil-custom-initialize-pending-reset)
+
+(defcustom evil-want-visual-char-semi-exclusive nil
+  "Visual character selection to beginning/end of line is exclusive.
+If non nil then an inclusive visual character selection which
+ends at the beginning or end of a line is turned into an
+exclusive selection. Thus if the selected (inclusive) range ends
+at the beginning of a line it is changed to not include the first
+character of that line, and if the selected range ends at the end
+of a line it is changed to not include the newline character of
+that line."
+  :type 'boolean
+  :group 'evil)
+
+(defgroup evil-cjk nil
+  "CJK support"
+  :prefix "evil-cjk-"
+  :group 'evil)
+
+(defcustom evil-cjk-emacs-word-boundary nil
+  "Determine word boundary exactly the same way as Emacs does."
+  :type 'boolean
+  :group 'evil-cjk)
+
+(defcustom evil-cjk-word-separating-categories
+  '(;; Kanji
+    (?C . ?H) (?C . ?K) (?C . ?k) (?C . ?A) (?C . ?G)
+    ;; Hiragana
+    (?H . ?C) (?H . ?K) (?H . ?k) (?H . ?A) (?H . ?G)
+    ;; Katakana
+    (?K . ?C) (?K . ?H) (?K . ?k) (?K . ?A) (?K . ?G)
+    ;; half-width Katakana
+    (?k . ?C) (?k . ?H) (?k . ?K) ; (?k . ?A) (?k . ?G)
+    ;; full-width alphanumeric
+    (?A . ?C) (?A . ?H) (?A . ?K) ; (?A . ?k) (?A . ?G)
+    ;; full-width Greek
+    (?G . ?C) (?G . ?H) (?G . ?K) ; (?G . ?k) (?G . ?A)
+    )
+  "List of pair (cons) of categories to determine word boundary
+used in `evil-cjk-word-boundary-p'. See the documentation of
+`word-separating-categories'. Use `describe-categories' to see
+the list of categories."
+  :type '((character . character))
+  :group 'evil-cjk)
+
+(defcustom evil-cjk-word-combining-categories
+  '(;; default value in word-combining-categories
+    (nil . ?^) (?^ . nil)
+    ;; Roman
+    (?r . ?k) (?r . ?A) (?r . ?G)
+    ;; half-width Katakana
+    (?k . ?r) (?k . ?A) (?k . ?G)
+    ;; full-width alphanumeric
+    (?A . ?r) (?A . ?k) (?A . ?G)
+    ;; full-width Greek
+    (?G . ?r) (?G . ?k) (?G . ?A)
+    )
+  "List of pair (cons) of categories to determine word boundary
+used in `evil-cjk-word-boundary-p'. See the documentation of
+`word-combining-categories'. Use `describe-categories' to see the
+list of categories."
+  :type '((character . character))
+  :group 'evil-cjk)
+
+(defface evil-ex-info '(( ((supports :slant))
+                          :slant italic
+                          :foreground "red"))
+  "Face for the info message in ex mode."
+  :group 'evil)
+
+;; Searching
+(defcustom evil-magic t
+  "Meaning which characters in a pattern are magic.
+The meaning of those values is the same as in Vim. Note that it
+only has influence if the evil search module is chosen in
+`evil-search-module'."
+  :group 'evil
+  :type '(radio (const :tag "Very magic." :value very-magic)
+                (const :tag "Magic" :value t)
+                (const :tag "Nomagic" :value nil)
+                (const :tag "Very nomagic" :value very-nomagic)))
+
+(defcustom evil-ex-search-vim-style-regexp nil
+  "If non-nil Vim-style backslash codes are supported in search patterns.
+See `evil-transform-vim-style-regexp' for the supported backslash
+codes.  Note that this only affects the search command if
+`evil-search-module' is set to 'evil. The isearch module always
+uses plain Emacs regular expressions."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-ex-interactive-search-highlight 'all-windows
+  "Determine in which windows the interactive highlighting should be shown."
+  :type '(radio (const :tag "All windows." all-windows)
+                (const :tag "Selected window." selected-window)
+                (const :tag "Disable highlighting." nil))
+  :group 'evil)
+
+(defcustom evil-ex-search-case 'smart
+  "The case behaviour of the search command.
+Smart case means that the pattern is case sensitive if and only
+if it contains an upper case letter, otherwise it is case
+insensitive."
+  :type '(radio (const :tag "Case sensitive." sensitive)
+                (const :tag "Case insensitive." insensitive)
+                (const :tag "Smart case." smart))
+  :group 'evil)
+
+(defcustom evil-ex-substitute-case nil
+  "The case behaviour of the search command.
+Smart case means that the pattern is case sensitive if and only
+if it contains an upper case letter, otherwise it is case
+insensitive. If nil then the setting of `evil-ex-search-case' is
+used."
+  :type '(radio (const :tag "Same as interactive search." nil)
+                (const :tag "Case sensitive." sensitive)
+                (const :tag "Case insensitive." insensitive)
+                (const :tag "Smart case." smart))
+  :group 'evil)
+
+(defcustom evil-ex-search-interactive t
+  "If t search is interactive."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-ex-search-highlight-all t
+  "If t and interactive search is enabled, all matches are
+highlighted."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-ex-substitute-highlight-all t
+  "If t all matches for the substitute pattern are highlighted."
+  :type 'boolean
+  :group 'evil)
+
+(defcustom evil-ex-substitute-interactive-replace t
+  "If t and substitute patterns are highlighted,
+the replacement is shown interactively."
+  :type 'boolean
+  :group 'evil)
+
+(defface evil-ex-search '((t :inherit isearch))
+  "Face for interactive search."
+  :group 'evil)
+
+(defface evil-ex-lazy-highlight '((t :inherit lazy-highlight))
+  "Face for highlighting all matches in interactive search."
+  :group 'evil)
+
+(defface evil-ex-substitute-matches '((t :inherit lazy-highlight))
+  "Face for interactive substitute matches."
+  :group 'evil)
+
+(defface evil-ex-substitute-replacement '((((supports :underline))
+                                           :underline t
+                                           :foreground "red"))
+  "Face for interactive replacement text."
+  :group 'evil)
+
+;;; Variables
+
+(defmacro evil-define-local-var (symbol &optional initvalue docstring)
+  "Define SYMBOL as permanent buffer local variable, and return SYMBOL.
+The parameters are the same as for `defvar', but the variable
+SYMBOL is made permanent buffer local."
+  (declare (indent defun)
+           (debug (symbolp &optional form stringp)))
+  `(progn
+     (defvar ,symbol ,initvalue ,docstring)
+     (make-variable-buffer-local ',symbol)
+     (put ',symbol 'permanent-local t)))
+
+(evil-define-local-var evil-state nil
+  "The current Evil state.
+To change the state, use `evil-change-state'
+or call the state function (e.g., `evil-normal-state').")
+
+;; these may be used inside `evil-define-state'
+(evil-define-local-var evil-next-state nil
+  "The Evil state being switched to.")
+
+(evil-define-local-var evil-previous-state-alist nil
+  "For Each evil state the Evil state being switched from.")
+
+(evil-define-local-var evil-previous-state nil
+  "The Evil state being switched from.")
+
+(defvar evil-execute-in-emacs-state-buffer nil
+  "The buffer of the latest `evil-execute-in-emacs-state'.
+When this command is being executed the current buffer is stored
+in this variable. This is necessary in case the Emacs-command to
+be called changes the current buffer.")
+
+(evil-define-local-var evil-mode-line-tag nil
+  "Mode-Line indicator for the current state.")
+(put 'evil-mode-line-tag 'risky-local-variable t)
+
+(defvar evil-global-keymaps-alist nil
+  "Association list of keymap variables.
+Entries have the form (MODE . KEYMAP), where KEYMAP
+is the variable containing the keymap for MODE.")
+
+(defvar evil-local-keymaps-alist nil
+  "Association list of keymap variables that must be
+reinitialized in each buffer. Entries have the form
+\(MODE . KEYMAP), where KEYMAP is the variable containing
+the keymap for MODE.")
+
+(defvar evil-state-properties nil
+  "Specifications made by `evil-define-state'.
+Entries have the form (STATE . PLIST), where PLIST is a property
+list specifying various aspects of the state. To access a property,
+use `evil-state-property'.")
+
+(evil-define-local-var evil-mode-map-alist nil
+  "Association list of keymaps to use for Evil modes.
+Elements have the form (MODE . KEYMAP), with the first keymaps
+having higher priority.")
+
+(defvar evil-command-properties nil
+  "Specifications made by `evil-define-command'.")
+
+(defvar evil-transient-vars '(cua-mode transient-mark-mode select-active-regions)
+  "List of variables pertaining to Transient Mark mode.")
+
+(defvar evil-transient-vals nil
+  "Association list of old values for Transient Mark mode variables.
+Entries have the form (VARIABLE VALUE LOCAL), where LOCAL is
+whether the variable was previously buffer-local.")
+
+(evil-define-local-var evil-no-display nil
+  "If non-nil, various Evil displays are inhibited.
+Use the macro `evil-without-display' to set this variable.")
+
+(defvar evil-type-properties nil
+  "Specifications made by `evil-define-type'.
+Entries have the form (TYPE . PLIST), where PLIST is a property
+list specifying functions for handling the type: expanding it,
+describing it, etc.")
+
+(defvar evil-interactive-alist nil
+  "Association list of Evil-specific interactive codes.")
+
+(evil-define-local-var evil-motion-marker nil
+  "Marker for storing the starting position of a motion.")
+
+(evil-define-local-var evil-this-type nil
+  "Current motion type.")
+
+(evil-define-local-var evil-this-register nil
+  "Current register.")
+
+(evil-define-local-var evil-this-macro nil
+  "Current macro register.")
+
+(evil-define-local-var evil-this-operator nil
+  "Current operator.")
+
+(evil-define-local-var evil-this-motion nil
+  "Current motion.")
+
+(evil-define-local-var evil-this-motion-count nil
+  "Current motion count.")
+
+(defvar evil-inhibit-operator nil
+  "Inhibit current operator.
+If an operator calls a motion and the motion sets this variable
+to t, the operator code is not executed.")
+
+(defvar evil-inhibit-operator-value nil
+  "This variable is used to transfer the value
+of `evil-inhibit-operator' from one local scope to another.")
+
+;; used by `evil-define-operator'
+(defvar evil-operator-range-beginning nil
+  "Beginning of `evil-operator-range'.")
+
+(defvar evil-operator-range-end nil
+  "End of `evil-operator-range'.")
+
+(defvar evil-operator-range-type nil
+  "Type of `evil-operator-range'.")
+
+(defvar evil-operator-range-motion nil
+  "Motion of `evil-operator-range'.")
+
+(evil-define-local-var evil-markers-alist
+  '((?\( . evil-backward-sentence)
+    (?\) . evil-forward-sentence)
+    (?{ . evil-backward-paragraph)
+    (?} . evil-forward-paragraph)
+    (?' . evil-jump-backward)
+    (?` . evil-jump-backward)
+    (?< . evil-visual-beginning)
+    (?> . evil-visual-goto-end)
+    (?. . (lambda ()
+            (let (last-command)
+              (goto-last-change nil)))))
+  "Association list for markers.
+Entries have the form (CHAR . DATA), where CHAR is the marker's
+name and DATA is either a marker object as returned by `make-marker',
+a variable, a movement function, or a cons cell (STRING NUMBER),
+where STRING is a file path and NUMBER is a buffer position.
+The global value of this variable holds markers available from
+every buffer, while the buffer-local value holds markers available
+only in the current buffer.")
+
+(evil-define-local-var evil-jump-list nil
+  "Jump list.")
+
+(defconst evil-suppress-map (make-keymap)
+  "Full keymap disabling default bindings to `self-insert-command'.")
+(suppress-keymap evil-suppress-map t)
+
+(defvar evil-read-key-map (make-sparse-keymap)
+  "Keymap active during `evil-read-key'.
+This keymap can be used to bind some commands during the
+execution of `evil-read-key' which is usually used to read a
+character argument for some commands, e.g. `evil-replace'.")
+
+;; TODO: customize size of ring
+(defvar evil-repeat-ring (make-ring 10)
+  "A ring of repeat-informations to repeat the last command.")
+
+(defvar evil-repeat-types
+  '((t . evil-repeat-keystrokes)
+    (change . evil-repeat-changes)
+    (motion . evil-repeat-motion)
+    (insert-at-point . evil-repeat-insert-at-point)
+    (ignore . nil))
+  "An alist of defined repeat-types.")
+
+(defvar evil-recording-repeat nil
+  "Whether we are recording a repeat.")
+
+(defvar evil-recording-current-command nil
+  "Whether we are recording the current command for repeat.")
+
+(defvar evil-repeat-changes nil
+  "Accumulated buffer changes for changed-based commands.")
+
+(defvar evil-repeat-info nil
+  "Information accumulated during current repeat.")
+
+(defvar evil-repeat-buffer nil
+  "The buffer in which the repeat started.
+If the buffer is changed, the repeat is cancelled.")
+
+(defvar evil-repeat-pos nil
+  "The position of point at the beginning of an change-tracking
+  editing command.")
+
+(defvar evil-repeat-keys nil
+  "The keys that invoked the current command.")
+
+(defvar evil-last-repeat nil
+  "Information about the latest repeat command.
+This is a list of three elements (POINT COUNT UNDO-POINTER),
+where POINT is the position of point before the latest repeat,
+COUNT the count-argument of the latest repeat command and
+UNDO-POINTER the head of the undo-list before the last command
+has been repeated.")
+
+(defvar evil-repeat-count nil
+  "The explicit count when repeating a command.")
+
+(evil-define-local-var evil-insert-count nil
+  "The explicit count passed to an command starting Insert state.")
+
+(evil-define-local-var evil-insert-vcount nil
+  "The information about the number of following lines the
+insertion should be repeated. This is list (LINE COLUMN COUNT)
+where LINE is the line-number where the original insertion
+started and COLUMN is either a number of function determining the
+column where the repeated insertions should take place. COUNT is
+number of repeats (including the original insertion).")
+
+(defvar evil-insert-skip-empty-lines nil
+  "Non-nil of the current insertion should not take place on
+  lines at which the insertion point is behind the end of the
+  line.")
+
+(evil-define-local-var evil-insert-lines nil
+  "Non-nil if the current insertion command is a line-insertion
+command o or O.")
+
+(evil-define-local-var evil-insert-repeat-info nil
+  "Repeat information accumulated during an insertion.")
+
+(evil-define-local-var evil-replace-alist nil
+  "Association list of characters overwritten in Replace state.
+The format is (POS . CHAR).")
+
+(evil-define-local-var evil-echo-area-message nil
+  "Previous value of `current-message'.")
+
+(defvar evil-write-echo-area nil
+  "If set to t inside `evil-save-echo-area', then the echo area
+is not restored.")
+
+(defvar evil-last-find nil
+  "A pair (FUNCTION . CHAR) describing the lastest character
+  search command.")
+
+(defvar evil-last-paste nil
+  "Information about the latest paste.
+This should be a list (CMD POINT BEG END) where CMD is the last
+paste-command (either `evil-paste-before' or `evil-paste-after'),
+POINT is the position of point before the paste,
+BEG end END are the region of the inserted text.")
+
+(evil-define-local-var evil-last-undo-entry nil
+  "Information about the latest undo entry in the buffer.
+This should be a pair (OBJ . CONS) where OBJ is the entry as an
+object, and CONS is a copy of the entry.")
+
+(evil-define-local-var evil-current-insertion nil
+  "Information about the latest insertion in insert state.
+This should be a pair (BEG . END) that describes the
+buffer-region of the newly inserted text.")
+
+(defvar evil-last-insertion nil
+  "The last piece of inserted text.")
+
+(defvar evil-last-small-deletion nil
+  "The last piece of deleted text.
+The text should be less than a line.")
+
+(defvar evil-paste-count nil
+  "The count argument of the current paste command.")
+
+(defvar evil-temporary-undo nil
+  "When undo is disabled in current buffer.
+Certain commands depending on undo use this variable
+instead of `buffer-undo-list'.")
+
+(evil-define-local-var evil-undo-list-pointer nil
+  "Everything up to this mark is united in the undo-list.")
+
+(defvar evil-in-single-undo nil
+  "Set to non-nil if the current undo steps are connected.")
+
+(defvar evil-flash-timer nil
+  "Timer for flashing search results.")
+
+(defvar evil-search-prompt nil
+  "String to use for search prompt.")
+
+(defvar evil-inner-text-objects-map (make-sparse-keymap)
+  "Keymap for inner text objects.")
+
+(defvar evil-outer-text-objects-map (make-sparse-keymap)
+  "Keymap for outer text objects.")
+
+(defvar evil-window-map (make-sparse-keymap)
+  "Keymap for window-related commands.")
+
+(evil-define-local-var evil-input-method nil
+  "Input method used in Insert state and Emacs state.")
+
+;;; Visual state
+
+(evil-define-local-var evil-visual-beginning nil
+  "The beginning of the Visual selection, a marker.")
+
+(evil-define-local-var evil-visual-end nil
+  "The end of the Visual selection, a marker.")
+
+(evil-define-local-var evil-visual-point nil
+  "The position of point in Visual state, a marker.")
+
+(evil-define-local-var evil-visual-mark nil
+  "The position of mark in Visual state, a marker.")
+
+(evil-define-local-var evil-visual-previous-mark nil
+  "The position of mark before Visual state, a marker.")
+
+(evil-define-local-var evil-visual-selection nil
+  "The kind of Visual selection.
+This is a selection as defined by `evil-define-visual-selection'.")
+
+;; we could infer the direction by comparing `evil-visual-mark'
+;; and `evil-visual-point', but destructive operations may
+;; displace the markers
+(evil-define-local-var evil-visual-direction 0
+  "Whether point follows mark in Visual state.
+Negative if point precedes mark, otherwise positive.
+See also the function `evil-visual-direction'.")
+
+(evil-define-local-var evil-visual-properties nil
+  "Property list of miscellaneous Visual properties.")
+
+(evil-define-local-var evil-visual-region-expanded nil
+  "Whether the region matches the Visual selection.
+That is, whether the positions of point and mark have been
+expanded to coincide with the selection's boundaries.
+This makes the selection available to functions acting
+on Emacs' region.")
+
+(evil-define-local-var evil-visual-overlay nil
+  "Overlay for highlighting the Visual selection.
+Not used for blockwise selections, in which case
+see `evil-visual-block-overlays'.")
+
+(evil-define-local-var evil-visual-block-overlays nil
+  "Overlays for Visual Block selection, one for each line.
+They are reused to minimize flicker.")
+
+(defvar evil-visual-alist nil
+  "Association list of Visual selection functions.
+Elements have the form (NAME . FUNCTION).")
+
+(evil-define-local-var evil-visual-x-select-timer nil
+  "Timer for updating the X selection in visual state.")
+
+(defvar evil-visual-x-select-timeout 0.1
+  "Time in seconds for the update of the X selection.")
+
+;;; Ex
+
+(defvar evil-ex-map (make-sparse-keymap)
+  "Keymap for Ex.
+Key sequences bound in this map are immediately executed.")
+
+(defvar evil-ex-completion-map (make-sparse-keymap)
+  "Completion keymap for Ex.")
+(set-keymap-parent evil-ex-completion-map minibuffer-local-completion-map)
+(define-key evil-ex-completion-map (kbd "SPC") #'self-insert-command)
+
+(defvar evil-ex-shell-argument-initialized nil
+  "This variable is set to t if shell command completion has been initialized.
+See `evil-ex-init-shell-argument-completion'.")
+
+(defvar evil-ex-commands nil
+  "Association list of command bindings and functions.")
+
+(defvar evil-ex-history nil
+  "History of Ex commands.")
+
+(defvar evil-ex-current-buffer nil
+  "The buffer from which Ex was started.")
+
+(defvar evil-ex-expression nil
+  "The evaluation tree.")
+
+(defvar evil-ex-tree nil
+  "The syntax tree.")
+
+(defvar evil-ex-command nil
+  "The current Ex command.")
+
+(defvar evil-ex-previous-command nil
+  "The previously executed Ex command.")
+
+(defvar evil-ex-range nil
+  "The current range of the Ex command.")
+
+(defvar evil-ex-bang nil
+  "The \"!\" argument of the current Ex command.")
+
+(defvar evil-ex-argument nil
+  "The current argument of the Ex command.")
+
+(defvar evil-ex-argument-handler nil
+  "The argument handler for the current Ex command.")
+
+(defvar evil-ex-argument-types nil
+  "Association list of argument handlers.")
+
+(defvar evil-previous-shell-command nil
+  "The last shell command.")
+
+;; Searching
+(defvar evil-ex-search-history nil
+  "The history for the search command.")
+
+(defvar evil-ex-search-direction nil
+  "The direction of the current search, either 'forward or 'backward.")
+
+(defvar evil-ex-search-count nil
+  "The count if the current search.")
+
+(defvar evil-ex-search-start-point nil
+  "The point where the search started.")
+
+(defvar evil-ex-search-overlay nil
+  "The overlay for the current search result.")
+
+(defvar evil-ex-search-pattern nil
+  "The last search pattern.")
+
+(defvar evil-ex-search-offset nil
+  "The last search offset.")
+
+(defvar evil-ex-search-match-beg nil
+  "The beginning position of the last match.")
+
+(defvar evil-ex-search-match-end nil
+  "The end position of the last match.")
+
+(defvar evil-ex-substitute-pattern nil
+  "The last substitute pattern.")
+
+(defvar evil-ex-substitute-replacement nil
+  "The last substitute replacement.")
+
+(defvar evil-ex-substitute-flags nil
+  "The last substitute flags.")
+
+(defvar evil-ex-substitute-current-replacement nil
+  "The actual replacement.")
+
+;; The lazy-highlighting framework.
+(evil-define-local-var evil-ex-active-highlights-alist nil
+  "An alist of currently active highlights.")
+
+(evil-define-local-var evil-ex-hl-update-timer nil
+  "Time used for updating highlights.")
+
+(defvar evil-ex-search-keymap (make-sparse-keymap)
+  "Keymap used in ex-search-mode.")
+(set-keymap-parent evil-ex-search-keymap minibuffer-local-map)
+
+(defconst evil-version "1.0.1"
+  "The current version of Evil")
+
+(defun evil-version ()
+  (interactive)
+  (message "Evil version %s" evil-version))
+
+(provide 'evil-vars)
+
+;;; evil-vars.el ends here
diff --git a/elpa/evil-1.0.1/evil.el b/elpa/evil-1.0.1/evil.el
new file mode 100644
index 00000000..ba0a8a85
--- /dev/null
+++ b/elpa/evil-1.0.1/evil.el
@@ -0,0 +1,114 @@
+;;; evil.el --- extensible vi layer
+
+;; Author: Vegard Øye <vegard_oye at hotmail.com>
+;;      Antono Vasiljev <antono.vasiljev at gmail.com>
+;;      Barry O'Reilly <gundaetiapo at gmail.com>
+;;      Christoph Lange <langec at web.de>
+;;      Frank Fischer <frank.fischer at mathematik.tu-chemnitz.de>
+;;      Frank Terbeck <ft at bewatermyfriend.org>
+;;      Jonathan Claggett <jclaggett at lonocloud.com>
+;;      Marian Schubert <maio@netsafe.cz>
+;;      Michael Markert <markert.michael at googlemail.com>
+;;      Nikolai Weibull <now at bitwi.se>
+;;      Sanel Zukan <sanelz at gmail.com>
+;;      Simon Hafner <hafnersimon at gmail.com>
+;;      Sune Simonsen <sune.simonsen at jayway.com>
+;;      Thomas Hisch <thomas at opentech.at>
+;;      Ulrich Müller <ulm at gentoo.org>
+;;      Winfred Lu <winfred.lu@gmail.com>
+;;      Wolfgang Jenkner <wjenkner at inode.at>
+;;      York Zhao <yzhao at telecor.com>
+;;      Lintaro Ina <tarao.gnn at gmail.com>
+
+;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
+;;      To get in touch, please use the bug tracker or the
+;;      mailing list (see below).
+;; Created: 2011-03-01
+;; Version: 1.0.1
+;; Keywords: emulation, vim
+;; URL: http://gitorious.org/evil
+;;      Repository: git://gitorious.org/evil/evil.git
+;;      EmacsWiki: http://www.emacswiki.org/emacs/Evil
+;; Bug tracker: https://bitbucket.org/lyro/evil/issues
+;;      If you have bug reports, suggestions or patches, please
+;;      create an issue at the bug tracker (open for everyone).
+;;      Other discussions (tips, extensions) go to the mailing list.
+;; Mailing list: <implementations-list at lists.ourproject.org>
+;;      Subscribe: http://tinyurl.com/implementations-list
+;;      Newsgroup: nntp://news.gmane.org/gmane.emacs.vim-emulation
+;;      Archives: http://dir.gmane.org/gmane.emacs.vim-emulation
+;;      You don't have to subscribe to post; we usually reply
+;;      within a few days and CC our replies back to you.
+;;
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This file is part of Evil.
+;;
+;; Evil 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.
+;;
+;; Evil 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 Evil.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Evil is an extensible vi layer for Emacs. It emulates the main
+;; features of Vim, and provides facilities for writing custom
+;; extensions.
+;;
+;; Evil lives in a Git repository. To obtain Evil, do
+;;
+;;      git clone git://gitorious.org/evil/evil.git
+;;
+;; Move Evil to ~/.emacs.d/evil (or somewhere else in the `load-path').
+;; Then add the following lines to ~/.emacs:
+;;
+;;      (add-to-list 'load-path "~/.emacs.d/evil")
+;;      (require 'evil)
+;;      (evil-mode 1)
+;;
+;; Evil requires undo-tree.el for linear undo and undo branches:
+;;
+;;      http://www.emacswiki.org/emacs/UndoTree
+;;
+;; Otherwise, Evil uses regular Emacs undo.
+;;
+;; Evil requires `goto-last-change' and `goto-last-change-reverse'
+;; function for the corresponding motions g; g, as well as the
+;; last-change-register `.'. One package providing these functions is
+;; goto-chg.el:
+;;
+;;     http://www.emacswiki.org/emacs/GotoChg
+;;
+;; Without this package the corresponding motions will raise an error.
+
+;;; Code:
+
+(require 'evil-vars)
+(require 'evil-common)
+(require 'evil-core)
+(require 'evil-states)
+(require 'evil-repeat)
+(require 'evil-macros)
+(require 'evil-search)
+(require 'evil-ex)
+(require 'evil-digraphs)
+(require 'evil-types)
+(require 'evil-commands)
+(require 'evil-maps)
+(require 'evil-integration)
+
+(run-hooks 'evil-after-load-hook)
+
+(provide 'evil)
+
+;;; evil.el ends here
diff --git a/elpa/undo-tree-0.6.3/undo-tree-autoloads.el b/elpa/undo-tree-0.6.3/undo-tree-autoloads.el
new file mode 100644
index 00000000..76a800bc
--- /dev/null
+++ b/elpa/undo-tree-0.6.3/undo-tree-autoloads.el
@@ -0,0 +1,64 @@
+;;; undo-tree-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (global-undo-tree-mode undo-tree-mode) "undo-tree"
+;;;;;;  "undo-tree.el" (20836 47447))
+;;; Generated autoloads from undo-tree.el
+
+(autoload 'undo-tree-mode "undo-tree" "\
+Toggle undo-tree mode.
+With no argument, this command toggles the mode.
+A positive prefix argument turns the mode on.
+A negative prefix argument turns it off.
+
+Undo-tree-mode replaces Emacs' standard undo feature with a more
+powerful yet easier to use version, that treats the undo history
+as what it is: a tree.
+
+The following keys are available in `undo-tree-mode':
+
+  \\{undo-tree-map}
+
+Within the undo-tree visualizer, the following keys are available:
+
+  \\{undo-tree-visualizer-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-undo-tree-mode nil "\
+Non-nil if Global-Undo-Tree mode is enabled.
+See the command `global-undo-tree-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-undo-tree-mode'.")
+
+(custom-autoload 'global-undo-tree-mode "undo-tree" nil)
+
+(autoload 'global-undo-tree-mode "undo-tree" "\
+Toggle Undo-Tree mode in all buffers.
+With prefix ARG, enable Global-Undo-Tree mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Undo-Tree mode is enabled in all buffers where
+`turn-on-undo-tree-mode' would do it.
+See `undo-tree-mode' for more information on Undo-Tree mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("undo-tree-pkg.el") (20836 47447 427512))
+
+;;;***
+
+(provide 'undo-tree-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; undo-tree-autoloads.el ends here
diff --git a/elpa/undo-tree-0.6.3/undo-tree-pkg.el b/elpa/undo-tree-0.6.3/undo-tree-pkg.el
new file mode 100644
index 00000000..1a273541
--- /dev/null
+++ b/elpa/undo-tree-0.6.3/undo-tree-pkg.el
@@ -0,0 +1 @@
+(define-package "undo-tree" "0.6.3" "Treat undo history as a tree" (quote nil))
diff --git a/elpa/undo-tree-0.6.3/undo-tree.el b/elpa/undo-tree-0.6.3/undo-tree.el
new file mode 100644
index 00000000..d12c93e6
--- /dev/null
+++ b/elpa/undo-tree-0.6.3/undo-tree.el
@@ -0,0 +1,4287 @@
+;;; undo-tree.el --- Treat undo history as a tree  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc
+
+;; Author: Toby Cubitt <toby-undo-tree@dr-qubit.org>
+;; Version: 0.6.3
+;; Keywords: convenience, files, undo, redo, history, tree
+;; URL: http://www.dr-qubit.org/emacs.php
+;; Repository: http://www.dr-qubit.org/git/undo-tree.git
+
+;; This file is part of Emacs.
+;;
+;; This file is free software: you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free
+;; Software Foundation, either version 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.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+;; Emacs has a powerful undo system. Unlike the standard undo/redo system in
+;; most software, it allows you to recover *any* past state of a buffer
+;; (whereas the standard undo/redo system can lose past states as soon as you
+;; redo). However, this power comes at a price: many people find Emacs' undo
+;; system confusing and difficult to use, spawning a number of packages that
+;; replace it with the less powerful but more intuitive undo/redo system.
+;;
+;; Both the loss of data with standard undo/redo, and the confusion of Emacs'
+;; undo, stem from trying to treat undo history as a linear sequence of
+;; changes. It's not. The `undo-tree-mode' provided by this package replaces
+;; Emacs' undo system with a system that treats undo history as what it is: a
+;; branching tree of changes. This simple idea allows the more intuitive
+;; behaviour of the standard undo/redo system to be combined with the power of
+;; never losing any history. An added side bonus is that undo history can in
+;; some cases be stored more efficiently, allowing more changes to accumulate
+;; before Emacs starts discarding history.
+;;
+;; The only downside to this more advanced yet simpler undo system is that it
+;; was inspired by Vim. But, after all, most successful religions steal the
+;; best ideas from their competitors!
+;;
+;;
+;; Installation
+;; ============
+;;
+;; This package has only been tested with Emacs versions 24 and CVS. It should
+;; work in Emacs versions 22 and 23 too, but will not work without
+;; modifications in earlier versions of Emacs.
+;;
+;; To install `undo-tree-mode', make sure this file is saved in a directory in
+;; your `load-path', and add the line:
+;;
+;;   (require 'undo-tree)
+;;
+;; to your .emacs file. Byte-compiling undo-tree.el is recommended (e.g. using
+;; "M-x byte-compile-file" from within emacs).
+;;
+;; If you want to replace the standard Emacs' undo system with the
+;; `undo-tree-mode' system in all buffers, you can enable it globally by
+;; adding:
+;;
+;;   (global-undo-tree-mode)
+;;
+;; to your .emacs file.
+;;
+;;
+;; Quick-Start
+;; ===========
+;;
+;; If you're the kind of person who likes to jump in the car and drive,
+;; without bothering to first figure out whether the button on the left dips
+;; the headlights or operates the ejector seat (after all, you'll soon figure
+;; it out when you push it), then here's the minimum you need to know:
+;;
+;; `undo-tree-mode' and `global-undo-tree-mode'
+;;   Enable undo-tree mode (either in the current buffer or globally).
+;;
+;; C-_  C-/  (`undo-tree-undo')
+;;   Undo changes.
+;;
+;; M-_  C-?  (`undo-tree-redo')
+;;   Redo changes.
+;;
+;; `undo-tree-switch-branch'
+;;   Switch undo-tree branch.
+;;   (What does this mean? Better press the button and see!)
+;;
+;; C-x u  (`undo-tree-visualize')
+;;   Visualize the undo tree.
+;;   (Better try pressing this button too!)
+;;
+;; C-x r u  (`undo-tree-save-state-to-register')
+;;   Save current buffer state to register.
+;;
+;; C-x r U  (`undo-tree-restore-state-from-register')
+;;   Restore buffer state from register.
+;;
+;;
+;;
+;; In the undo-tree visualizer:
+;;
+;; <up>  p  C-p  (`undo-tree-visualize-undo')
+;;   Undo changes.
+;;
+;; <down>  n  C-n  (`undo-tree-visualize-redo')
+;;   Redo changes.
+;;
+;; <left>  b  C-b  (`undo-tree-visualize-switch-branch-left')
+;;   Switch to previous undo-tree branch.
+;;
+;; <right>  f  C-f  (`undo-tree-visualize-switch-branch-right')
+;;   Switch to next undo-tree branch.
+;;
+;; C-<up>  M-{  (`undo-tree-visualize-undo-to-x')
+;;   Undo changes up to last branch point.
+;;
+;; C-<down>  M-}  (`undo-tree-visualize-redo-to-x')
+;;   Redo changes down to next branch point.
+;;
+;; <down>  n  C-n  (`undo-tree-visualize-redo')
+;;   Redo changes.
+;;
+;; <mouse-1>  (`undo-tree-visualizer-mouse-set')
+;;   Set state to node at mouse click.
+;;
+;; t  (`undo-tree-visualizer-toggle-timestamps')
+;;   Toggle display of time-stamps.
+;;
+;; d  (`undo-tree-visualizer-toggle-diff')
+;;   Toggle diff display.
+;;
+;; s  (`undo-tree-visualizer-selection-mode')
+;;   Toggle keyboard selection mode.
+;;
+;; q  (`undo-tree-visualizer-quit')
+;;   Quit undo-tree-visualizer.
+;;
+;; C-q  (`undo-tree-visualizer-abort')
+;;   Abort undo-tree-visualizer.
+;;
+;; ,  <
+;;   Scroll left.
+;;
+;; .  >
+;;   Scroll right.
+;;
+;; <pgup>  M-v
+;;   Scroll up.
+;;
+;; <pgdown>  C-v
+;;   Scroll down.
+;;
+;;
+;;
+;; In visualizer selection mode:
+;;
+;; <up>  p  C-p  (`undo-tree-visualizer-select-previous')
+;;   Select previous node.
+;;
+;; <down>  n  C-n  (`undo-tree-visualizer-select-next')
+;;   Select next node.
+;;
+;; <left>  b  C-b  (`undo-tree-visualizer-select-left')
+;;   Select left sibling node.
+;;
+;; <right>  f  C-f  (`undo-tree-visualizer-select-right')
+;;   Select right sibling node.
+;;
+;; <pgup>  M-v
+;;   Select node 10 above.
+;;
+;; <pgdown>  C-v
+;;   Select node 10 below.
+;;
+;; <enter>  (`undo-tree-visualizer-set')
+;;   Set state to selected node and exit selection mode.
+;;
+;; s  (`undo-tree-visualizer-mode')
+;;   Exit selection mode.
+;;
+;; t  (`undo-tree-visualizer-toggle-timestamps')
+;;   Toggle display of time-stamps.
+;;
+;; d  (`undo-tree-visualizer-toggle-diff')
+;;   Toggle diff display.
+;;
+;; q  (`undo-tree-visualizer-quit')
+;;   Quit undo-tree-visualizer.
+;;
+;; C-q  (`undo-tree-visualizer-abort')
+;;   Abort undo-tree-visualizer.
+;;
+;; ,  <
+;;   Scroll left.
+;;
+;; .  >
+;;   Scroll right.
+;;
+;;
+;;
+;; Persistent undo history:
+;;
+;; Note: Requires a recent development version of Emacs checked out out from
+;;       the Emacs bzr repository. All stable versions of Emacs currently
+;;       break this feature.
+;;
+;; `undo-tree-auto-save-history' (variable)
+;;    automatically save and restore undo-tree history along with buffer
+;;    (disabled by default)
+;;
+;; `undo-tree-save-history' (command)
+;;    manually save undo history to file
+;;
+;; `undo-tree-load-history' (command)
+;;    manually load undo history from file
+;;
+;;
+;;
+;; Compressing undo history:
+;;
+;;   Undo history files cannot grow beyond the maximum undo tree size, which
+;;   is limited by `undo-limit', `undo-strong-limit' and
+;;   `undo-outer-limit'. Nevertheless, undo history files can grow quite
+;;   large. If you want to automatically compress undo history, add the
+;;   following advice to your .emacs file (replacing ".gz" with the filename
+;;   extension of your favourite compression algorithm):
+;;
+;;   (defadvice undo-tree-make-history-save-file-name
+;;     (after undo-tree activate)
+;;     (setq concat ad-return-value ".gz"))
+;;
+;;
+;;
+;;
+;; Undo Systems
+;; ============
+;;
+;; To understand the different undo systems, it's easiest to consider an
+;; example. Imagine you make a few edits in a buffer. As you edit, you
+;; accumulate a history of changes, which we might visualize as a string of
+;; past buffer states, growing downwards:
+;;
+;;                                o  (initial buffer state)
+;;                                |
+;;                                |
+;;                                o  (first edit)
+;;                                |
+;;                                |
+;;                                o  (second edit)
+;;                                |
+;;                                |
+;;                                x  (current buffer state)
+;;
+;;
+;; Now imagine that you undo the last two changes. We can visualize this as
+;; rewinding the current state back two steps:
+;;
+;;                                o  (initial buffer state)
+;;                                |
+;;                                |
+;;                                x  (current buffer state)
+;;                                |
+;;                                |
+;;                                o
+;;                                |
+;;                                |
+;;                                o
+;;
+;;
+;; However, this isn't a good representation of what Emacs' undo system
+;; does. Instead, it treats the undos as *new* changes to the buffer, and adds
+;; them to the history:
+;;
+;;                                o  (initial buffer state)
+;;                                |
+;;                                |
+;;                                o  (first edit)
+;;                                |
+;;                                |
+;;                                o  (second edit)
+;;                                |
+;;                                |
+;;                                x  (buffer state before undo)
+;;                                |
+;;                                |
+;;                                o  (first undo)
+;;                                |
+;;                                |
+;;                                x  (second undo)
+;;
+;;
+;; Actually, since the buffer returns to a previous state after an undo,
+;; perhaps a better way to visualize it is to imagine the string of changes
+;; turning back on itself:
+;;
+;;        (initial buffer state)  o
+;;                                |
+;;                                |
+;;                  (first edit)  o  x  (second undo)
+;;                                |  |
+;;                                |  |
+;;                 (second edit)  o  o  (first undo)
+;;                                | /
+;;                                |/
+;;                                o  (buffer state before undo)
+;;
+;; Treating undos as new changes might seem a strange thing to do. But the
+;; advantage becomes clear as soon as we imagine what happens when you edit
+;; the buffer again. Since you've undone a couple of changes, new edits will
+;; branch off from the buffer state that you've rewound to. Conceptually, it
+;; looks like this:
+;;
+;;                                o  (initial buffer state)
+;;                                |
+;;                                |
+;;                                o
+;;                                |\
+;;                                | \
+;;                                o  x  (new edit)
+;;                                |
+;;                                |
+;;                                o
+;;
+;; The standard undo/redo system only lets you go backwards and forwards
+;; linearly. So as soon as you make that new edit, it discards the old
+;; branch. Emacs' undo just keeps adding changes to the end of the string. So
+;; the undo history in the two systems now looks like this:
+;;
+;;            Undo/Redo:                      Emacs' undo
+;;
+;;               o                                o
+;;               |                                |
+;;               |                                |
+;;               o                                o  o
+;;               .\                               |  |\
+;;               . \                              |  | \
+;;               .  x  (new edit)                 o  o  |
+;;   (discarded  .                                | /   |
+;;     branch)   .                                |/    |
+;;               .                                o     |
+;;                                                      |
+;;                                                      |
+;;                                                      x  (new edit)
+;;
+;; Now, what if you change your mind about those undos, and decide you did
+;; like those other changes you'd made after all? With the standard undo/redo
+;; system, you're lost. There's no way to recover them, because that branch
+;; was discarded when you made the new edit.
+;;
+;; However, in Emacs' undo system, those old buffer states are still there in
+;; the undo history. You just have to rewind back through the new edit, and
+;; back through the changes made by the undos, until you reach them. Of
+;; course, since Emacs treats undos (even undos of undos!) as new changes,
+;; you're really weaving backwards and forwards through the history, all the
+;; time adding new changes to the end of the string as you go:
+;;
+;;                       o
+;;                       |
+;;                       |
+;;                       o  o     o  (undo new edit)
+;;                       |  |\    |\
+;;                       |  | \   | \
+;;                       o  o  |  |  o  (undo the undo)
+;;                       | /   |  |  |
+;;                       |/    |  |  |
+;;      (trying to get   o     |  |  x  (undo the undo)
+;;       to this state)        | /
+;;                             |/
+;;                             o
+;;
+;; So far, this is still reasonably intuitive to use. It doesn't behave so
+;; differently to standard undo/redo, except that by going back far enough you
+;; can access changes that would be lost in standard undo/redo.
+;;
+;; However, imagine that after undoing as just described, you decide you
+;; actually want to rewind right back to the initial state. If you're lucky,
+;; and haven't invoked any command since the last undo, you can just keep on
+;; undoing until you get back to the start:
+;;
+;;      (trying to get   o              x  (got there!)
+;;       to this state)  |              |
+;;                       |              |
+;;                       o  o     o     o  (keep undoing)
+;;                       |  |\    |\    |
+;;                       |  | \   | \   |
+;;                       o  o  |  |  o  o  (keep undoing)
+;;                       | /   |  |  | /
+;;                       |/    |  |  |/
+;;      (already undid   o     |  |  o  (got this far)
+;;       to this state)        | /
+;;                             |/
+;;                             o
+;;
+;; But if you're unlucky, and you happen to have moved the point (say) after
+;; getting to the state labelled "got this far", then you've "broken the undo
+;; chain". Hold on to something solid, because things are about to get
+;; hairy. If you try to undo now, Emacs thinks you're trying to undo the
+;; undos! So to get back to the initial state you now have to rewind through
+;; *all* the changes, including the undos you just did:
+;;
+;;      (trying to get   o                          x  (finally got there!)
+;;       to this state)  |                          |
+;;                       |                          |
+;;                       o  o     o     o     o     o
+;;                       |  |\    |\    |\    |\    |
+;;                       |  | \   | \   | \   | \   |
+;;                       o  o  |  |  o  o  o  |  o  o
+;;                       | /   |  |  | /   |  |  | /
+;;                       |/    |  |  |/    |  |  |/
+;;      (already undid   o     |  |  o<.   |  |  o
+;;       to this state)        | /     :   | /
+;;                             |/      :   |/
+;;                             o       :   o
+;;                                     :
+;;                             (got this far, but
+;;                              broke the undo chain)
+;;
+;; Confused?
+;;
+;; In practice you can just hold down the undo key until you reach the buffer
+;; state that you want. But whatever you do, don't move around in the buffer
+;; to *check* that you've got back to where you want! Because you'll break the
+;; undo chain, and then you'll have to traverse the entire string of undos
+;; again, just to get back to the point at which you broke the
+;; chain. Undo-in-region and commands such as `undo-only' help to make using
+;; Emacs' undo a little easier, but nonetheless it remains confusing for many
+;; people.
+;;
+;;
+;; So what does `undo-tree-mode' do? Remember the diagram we drew to represent
+;; the history we've been discussing (make a few edits, undo a couple of them,
+;; and edit again)? The diagram that conceptually represented our undo
+;; history, before we started discussing specific undo systems? It looked like
+;; this:
+;;
+;;                                o  (initial buffer state)
+;;                                |
+;;                                |
+;;                                o
+;;                                |\
+;;                                | \
+;;                                o  x  (current state)
+;;                                |
+;;                                |
+;;                                o
+;;
+;; Well, that's *exactly* what the undo history looks like to
+;; `undo-tree-mode'.  It doesn't discard the old branch (as standard undo/redo
+;; does), nor does it treat undos as new changes to be added to the end of a
+;; linear string of buffer states (as Emacs' undo does). It just keeps track
+;; of the tree of branching changes that make up the entire undo history.
+;;
+;; If you undo from this point, you'll rewind back up the tree to the previous
+;; state:
+;;
+;;                                o
+;;                                |
+;;                                |
+;;                                x  (undo)
+;;                                |\
+;;                                | \
+;;                                o  o
+;;                                |
+;;                                |
+;;                                o
+;;
+;; If you were to undo again, you'd rewind back to the initial state. If on
+;; the other hand you redo the change, you'll end up back at the bottom of the
+;; most recent branch:
+;;
+;;                                o  (undo takes you here)
+;;                                |
+;;                                |
+;;                                o  (start here)
+;;                                |\
+;;                                | \
+;;                                o  x  (redo takes you here)
+;;                                |
+;;                                |
+;;                                o
+;;
+;; So far, this is just like the standard undo/redo system. But what if you
+;; want to return to a buffer state located on a previous branch of the
+;; history? Since `undo-tree-mode' keeps the entire history, you simply need
+;; to tell it to switch to a different branch, and then redo the changes you
+;; want:
+;;
+;;                                o
+;;                                |
+;;                                |
+;;                                o  (start here, but switch
+;;                                |\  to the other branch)
+;;                                | \
+;;                        (redo)  o  o
+;;                                |
+;;                                |
+;;                        (redo)  x
+;;
+;; Now you're on the other branch, if you undo and redo changes you'll stay on
+;; that branch, moving up and down through the buffer states located on that
+;; branch. Until you decide to switch branches again, of course.
+;;
+;; Real undo trees might have multiple branches and sub-branches:
+;;
+;;                                o
+;;                            ____|______
+;;                           /           \
+;;                          o             o
+;;                      ____|__         __|
+;;                     /    |  \       /   \
+;;                    o     o   o     o     x
+;;                    |               |
+;;                   / \             / \
+;;                  o   o           o   o
+;;
+;; Trying to imagine what Emacs' undo would do as you move about such a tree
+;; will likely frazzle your brain circuits! But in `undo-tree-mode', you're
+;; just moving around this undo history tree. Most of the time, you'll
+;; probably only need to stay on the most recent branch, in which case it
+;; behaves like standard undo/redo, and is just as simple to understand. But
+;; if you ever need to recover a buffer state on a different branch, the
+;; possibility of switching between branches and accessing the full undo
+;; history is still there.
+;;
+;;
+;;
+;; The Undo-Tree Visualizer
+;; ========================
+;;
+;; Actually, it gets better. You don't have to imagine all these tree
+;; diagrams, because `undo-tree-mode' includes an undo-tree visualizer which
+;; draws them for you! In fact, it draws even better diagrams: it highlights
+;; the node representing the current buffer state, it highlights the current
+;; branch, and you can toggle the display of time-stamps (by hitting "t") and
+;; a diff of the undo changes (by hitting "d"). (There's one other tiny
+;; difference: the visualizer puts the most recent branch on the left rather
+;; than the right.)
+;;
+;; Bring up the undo tree visualizer whenever you want by hitting "C-x u".
+;;
+;; In the visualizer, the usual keys for moving up and down a buffer instead
+;; move up and down the undo history tree (e.g. the up and down arrow keys, or
+;; "C-n" and "C-p"). The state of the "parent" buffer (the buffer whose undo
+;; history you are visualizing) is updated as you move around the undo tree in
+;; the visualizer. If you reach a branch point in the visualizer, the usual
+;; keys for moving forward and backward in a buffer instead switch branch
+;; (e.g. the left and right arrow keys, or "C-f" and "C-b").
+;;
+;; Clicking with the mouse on any node in the visualizer will take you
+;; directly to that node, resetting the state of the parent buffer to the
+;; state represented by that node.
+;;
+;; You can also select nodes directly using the keyboard, by hitting "s" to
+;; toggle selection mode. The usual motion keys now allow you to move around
+;; the tree without changing the parent buffer. Hitting <enter> will reset the
+;; state of the parent buffer to the state represented by the currently
+;; selected node.
+;;
+;; It can be useful to see how long ago the parent buffer was in the state
+;; represented by a particular node in the visualizer. Hitting "t" in the
+;; visualizer toggles the display of time-stamps for all the nodes. (Note
+;; that, because of the way `undo-tree-mode' works, these time-stamps may be
+;; somewhat later than the true times, especially if it's been a long time
+;; since you last undid any changes.)
+;;
+;; To get some idea of what changes are represented by a given node in the
+;; tree, it can be useful to see a diff of the changes. Hit "d" in the
+;; visualizer to toggle a diff display. This normally displays a diff between
+;; the current state and the previous one, i.e. it shows you the changes that
+;; will be applied if you undo (move up the tree). However, the diff display
+;; really comes into its own in the visualizer's selection mode (see above),
+;; where it instead shows a diff between the current state and the currently
+;; selected state, i.e. it shows you the changes that will be applied if you
+;; reset to the selected state.
+;;
+;; (Note that the diff is generated by the Emacs `diff' command, and is
+;; displayed using `diff-mode'. See the corresponding customization groups if
+;; you want to customize the diff display.)
+;;
+;; Finally, hitting "q" will quit the visualizer, leaving the parent buffer in
+;; whatever state you ended at. Hitting "C-q" will abort the visualizer,
+;; returning the parent buffer to whatever state it was originally in when the
+;; visualizer was .
+;;
+;;
+;;
+;; Undo-in-Region
+;; ==============
+;;
+;; Emacs allows a very useful and powerful method of undoing only selected
+;; changes: when a region is active, only changes that affect the text within
+;; that region will be undone. With the standard Emacs undo system, changes
+;; produced by undoing-in-region naturally get added onto the end of the
+;; linear undo history:
+;;
+;;                       o
+;;                       |
+;;                       |  x  (second undo-in-region)
+;;                       o  |
+;;                       |  |
+;;                       |  o  (first undo-in-region)
+;;                       o  |
+;;                       | /
+;;                       |/
+;;                       o
+;;
+;; You can of course redo these undos-in-region as usual, by undoing the
+;; undos:
+;;
+;;                       o
+;;                       |
+;;                       |  o_
+;;                       o  | \
+;;                       |  |  |
+;;                       |  o  o  (undo the undo-in-region)
+;;                       o  |  |
+;;                       | /   |
+;;                       |/    |
+;;                       o     x  (undo the undo-in-region)
+;;
+;;
+;; In `undo-tree-mode', undo-in-region works similarly: when there's an active
+;; region, undoing only undoes changes that affect that region. However, the
+;; way these undos-in-region are recorded in the undo history is quite
+;; different. In `undo-tree-mode', undo-in-region creates a new branch in the
+;; undo history. The new branch consists of an undo step that undoes some of
+;; the changes that affect the current region, and another step that undoes
+;; the remaining changes needed to rejoin the previous undo history.
+;;
+;;      Previous undo history                Undo-in-region
+;;
+;;               o                                o
+;;               |                                |
+;;               |                                |
+;;               o                                o
+;;               |                                |\
+;;               |                                | \
+;;               o                                o  x  (undo-in-region)
+;;               |                                |  |
+;;               |                                |  |
+;;               x                                o  o
+;;
+;; As long as you don't change the active region after undoing-in-region,
+;; continuing to undo-in-region extends the new branch, pulling more changes
+;; that affect the current region into an undo step immediately above your
+;; current location in the undo tree, and pushing the point at which the new
+;; branch is attached further up the tree:
+;;
+;;      First undo-in-region                 Second undo-in-region
+;;
+;;               o                                o
+;;               |                                |\
+;;               |                                | \
+;;               o                                o  x  (undo-in-region)
+;;               |\                               |  |
+;;               | \                              |  |
+;;               o  x                             o  o
+;;               |  |                             |  |
+;;               |  |                             |  |
+;;               o  o                             o  o
+;;
+;; Redoing takes you back down the undo tree, as usual (as long as you haven't
+;; changed the active region after undoing-in-region, it doesn't matter if it
+;; is still active):
+;;
+;;                       o
+;;			 |\
+;;			 | \
+;;			 o  o
+;;			 |  |
+;;			 |  |
+;;			 o  o  (redo)
+;;			 |  |
+;;			 |  |
+;;			 o  x  (redo)
+;;
+;;
+;; What about redo-in-region? Obviously, this only makes sense if you have
+;; already undone some changes, so that there are some changes to redo!
+;; Redoing-in-region splits off a new branch of the undo history below your
+;; current location in the undo tree. This time, the new branch consists of a
+;; redo step that redoes some of the redo changes that affect the current
+;; region, followed by all the remaining redo changes.
+;;
+;;      Previous undo history                Redo-in-region
+;;
+;;               o                                o
+;;               |                                |
+;;               |                                |
+;;               x                                o
+;;               |                                |\
+;;               |                                | \
+;;               o                                o  x  (redo-in-region)
+;;               |                                |  |
+;;               |                                |  |
+;;               o                                o  o
+;;
+;; As long as you don't change the active region after redoing-in-region,
+;; continuing to redo-in-region extends the new branch, pulling more redo
+;; changes into a redo step immediately below your current location in the
+;; undo tree.
+;;
+;;      First redo-in-region                 Second redo-in-region
+;;
+;;          o                                     o
+;;          |                                     |
+;;          |                                     |
+;;          o                                     o
+;;          |\                                    |\
+;;          | \                                   | \
+;;          o  x  (redo-in-region)                o  o
+;;          |  |                                  |  |
+;;          |  |                                  |  |
+;;          o  o                                  o  x  (redo-in-region)
+;;                                                   |
+;;                                                   |
+;;                                                   o
+;;
+;; Note that undo-in-region and redo-in-region only ever add new changes to
+;; the undo tree, they *never* modify existing undo history. So you can always
+;; return to previous buffer states by switching to a previous branch of the
+;; tree.
+
+
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'diff)
+
+
+
+;;; =====================================================================
+;;;              Compatibility hacks for older Emacsen
+
+;; `characterp' isn't defined in Emacs versions < 23
+(unless (fboundp 'characterp)
+  (defalias 'characterp 'char-valid-p))
+
+;; `region-active-p' isn't defined in Emacs versions < 23
+(unless (fboundp 'region-active-p)
+  (defun region-active-p () (and transient-mark-mode mark-active)))
+
+
+;; `registerv' defstruct isn't defined in Emacs versions < 24
+(unless (fboundp 'registerv-make)
+  (defmacro registerv-make (data &rest _dummy) data))
+
+(unless (fboundp 'registerv-data)
+  (defmacro registerv-data (data) data))
+
+
+;; `diff-no-select' and `diff-file-local-copy' aren't defined in Emacs
+;; versions < 24 (copied and adapted from Emacs 24)
+(unless (fboundp 'diff-no-select)
+  (defun diff-no-select (old new &optional switches no-async buf)
+    ;; Noninteractive helper for creating and reverting diff buffers
+    (unless (bufferp new) (setq new (expand-file-name new)))
+    (unless (bufferp old) (setq old (expand-file-name old)))
+    (or switches (setq switches diff-switches)) ; If not specified, use default.
+    (unless (listp switches) (setq switches (list switches)))
+    (or buf (setq buf (get-buffer-create "*Diff*")))
+    (let* ((old-alt (diff-file-local-copy old))
+	   (new-alt (diff-file-local-copy new))
+	   (command
+	    (mapconcat 'identity
+		       `(,diff-command
+			 ;; Use explicitly specified switches
+			 ,@switches
+			 ,@(mapcar #'shell-quote-argument
+				   (nconc
+				    (when (or old-alt new-alt)
+				      (list "-L" (if (stringp old)
+						     old (prin1-to-string old))
+					    "-L" (if (stringp new)
+						     new (prin1-to-string new))))
+				    (list (or old-alt old)
+					  (or new-alt new)))))
+		       " "))
+	   (thisdir default-directory))
+      (with-current-buffer buf
+	(setq buffer-read-only t)
+	(buffer-disable-undo (current-buffer))
+	(let ((inhibit-read-only t))
+	  (erase-buffer))
+	(buffer-enable-undo (current-buffer))
+	(diff-mode)
+	(set (make-local-variable 'revert-buffer-function)
+	     (lambda (_ignore-auto _noconfirm)
+	       (diff-no-select old new switches no-async (current-buffer))))
+	(setq default-directory thisdir)
+	(let ((inhibit-read-only t))
+	  (insert command "\n"))
+	(if (and (not no-async) (fboundp 'start-process))
+	    (let ((proc (start-process "Diff" buf shell-file-name
+				       shell-command-switch command)))
+	      (set-process-filter proc 'diff-process-filter)
+	      (set-process-sentinel
+	       proc (lambda (proc _msg)
+		      (with-current-buffer (process-buffer proc)
+			(diff-sentinel (process-exit-status proc))
+			(if old-alt (delete-file old-alt))
+			(if new-alt (delete-file new-alt))))))
+	  ;; Async processes aren't available.
+	  (let ((inhibit-read-only t))
+	    (diff-sentinel
+	     (call-process shell-file-name nil buf nil
+			   shell-command-switch command))
+	    (if old-alt (delete-file old-alt))
+	    (if new-alt (delete-file new-alt)))))
+      buf)))
+
+(unless (fboundp 'diff-file-local-copy)
+  (defun diff-file-local-copy (file-or-buf)
+    (if (bufferp file-or-buf)
+	(with-current-buffer file-or-buf
+	  (let ((tempfile (make-temp-file "buffer-content-")))
+	    (write-region nil nil tempfile nil 'nomessage)
+	    tempfile))
+      (file-local-copy file-or-buf))))
+
+
+
+
+;;; =====================================================================
+;;;              Global variables and customization options
+
+(defvar buffer-undo-tree nil
+  "Tree of undo entries in current buffer.")
+(make-variable-buffer-local 'buffer-undo-tree)
+(put 'buffer-undo-tree 'permanent-local t)
+
+
+(defgroup undo-tree nil
+  "Tree undo/redo."
+  :group 'undo)
+
+(defcustom undo-tree-mode-lighter " Undo-Tree"
+  "Lighter displayed in mode line
+when `undo-tree-mode' is enabled."
+  :group 'undo-tree
+  :type 'string)
+
+
+(defcustom undo-tree-incompatible-major-modes '(term-mode)
+  "List of major-modes in which `undo-tree-mode' should not be enabled.
+\(See `turn-on-undo-tree-mode'.\)"
+  :group 'undo-tree
+  :type '(repeat symbol))
+
+
+(defcustom undo-tree-enable-undo-in-region t
+  "When non-nil, enable undo-in-region.
+
+When undo-in-region is enabled, undoing or redoing when the
+region is active (in `transient-mark-mode') or with a prefix
+argument (not in `transient-mark-mode') only undoes changes
+within the current region."
+  :group 'undo-tree
+  :type 'boolean)
+
+
+(defcustom undo-tree-auto-save-history nil
+  "When non-nil, `undo-tree-mode' will save undo history to file
+when a buffer is saved to file.
+
+It will automatically load undo history when a buffer is loaded
+from file, if an undo save file exists.
+
+Undo-tree history is saved to a file called
+\".<buffer-file-name>.~undo-tree\" in the same directory as the
+file itself.
+
+WARNING! `undo-tree-auto-save-history' will not work properly in
+Emacs versions prior to 24.3, so it cannot be enabled via
+the customization interface in versions earlier than that one. To
+ignore this warning and enable it regardless, set
+`undo-tree-auto-save-history' to a non-nil value outside of
+customize."
+  :group 'undo-tree
+  :type (if (version-list-< (version-to-list emacs-version) '(24 3))
+	    '(choice (const :tag "<disabled>" nil))
+	  'boolean))
+
+
+(defcustom undo-tree-history-directory-alist nil
+  "Alist of filename patterns and undo history directory names.
+Each element looks like (REGEXP . DIRECTORY).  Undo history for
+files with names matching REGEXP will be saved in DIRECTORY.
+DIRECTORY may be relative or absolute.  If it is absolute, so
+that all matching files are backed up into the same directory,
+the file names in this directory will be the full name of the
+file backed up with all directory separators changed to `!' to
+prevent clashes.  This will not work correctly if your filesystem
+truncates the resulting name.
+
+For the common case of all backups going into one directory, the
+alist should contain a single element pairing \".\" with the
+appropriate directory name.
+
+If this variable is nil, or it fails to match a filename, the
+backup is made in the original file's directory.
+
+On MS-DOS filesystems without long names this variable is always
+ignored."
+  :group 'undo-tree
+  :type '(repeat (cons (regexp :tag "Regexp matching filename")
+		       (directory :tag "Undo history directory name"))))
+
+
+
+(defcustom undo-tree-visualizer-relative-timestamps t
+  "When non-nil, display times relative to current time
+when displaying time stamps in visualizer.
+
+Otherwise, display absolute times."
+  :group 'undo-tree
+  :type 'boolean)
+
+
+(defcustom undo-tree-visualizer-timestamps nil
+  "When non-nil, display time-stamps by default
+in undo-tree visualizer.
+
+\\<undo-tree-visualizer-map>You can always toggle time-stamps on and off \
+using \\[undo-tree-visualizer-toggle-timestamps], regardless of the
+setting of this variable."
+  :group 'undo-tree
+  :type 'boolean)
+
+
+(defcustom undo-tree-visualizer-diff nil
+  "When non-nil, display diff by default in undo-tree visualizer.
+
+\\<undo-tree-visualizer-map>You can always toggle the diff display \
+using \\[undo-tree-visualizer-toggle-diff], regardless of the
+setting of this variable."
+  :group 'undo-tree
+  :type 'boolean)
+
+
+(defcustom undo-tree-visualizer-lazy-drawing 100
+  "When non-nil, use lazy undo-tree drawing in visualizer.
+
+Setting this to a number causes the visualizer to switch to lazy
+drawing when the number of nodes in the tree is larger than this
+value.
+
+Lazy drawing means that only the visible portion of the tree will
+be drawn initially , and the tree will be extended later as
+needed. For the most part, the only visible effect of this is to
+significantly speed up displaying the visualizer for very large
+trees.
+
+There is one potential negative effect of lazy drawing. Other
+branches of the tree will only be drawn once the node from which
+they branch off becomes visible. So it can happen that certain
+portions of the tree that would be shown with lazy drawing
+disabled, will not be drawn immediately when it is
+enabled. However, this effect is quite rare in practice."
+  :group 'undo-tree
+  :type '(choice (const :tag "never" nil)
+		 (const :tag "always" t)
+		 (integer :tag "> size")))
+
+
+(defface undo-tree-visualizer-default-face
+  '((((class color)) :foreground "gray"))
+  "Face used to draw undo-tree in visualizer."
+  :group 'undo-tree)
+
+(defface undo-tree-visualizer-current-face
+  '((((class color)) :foreground "red"))
+  "Face used to highlight current undo-tree node in visualizer."
+  :group 'undo-tree)
+
+(defface undo-tree-visualizer-active-branch-face
+  '((((class color) (background dark))
+     (:foreground "white" :weight bold))
+    (((class color) (background light))
+     (:foreground "black" :weight bold)))
+  "Face used to highlight active undo-tree branch in visualizer."
+  :group 'undo-tree)
+
+(defface undo-tree-visualizer-register-face
+  '((((class color)) :foreground "yellow"))
+  "Face used to highlight undo-tree nodes saved to a register
+in visualizer."
+  :group 'undo-tree)
+
+(defface undo-tree-visualizer-unmodified-face
+  '((((class color)) :foreground "cyan"))
+  "Face used to highlight nodes corresponding to unmodified buffers
+in visualizer."
+  :group 'undo-tree)
+
+
+(defvar undo-tree-visualizer-parent-buffer nil
+  "Parent buffer in visualizer.")
+(make-variable-buffer-local 'undo-tree-visualizer-parent-buffer)
+
+;; stores modification time of parent buffer's file, if any
+(defvar undo-tree-visualizer-parent-mtime nil)
+(make-variable-buffer-local 'undo-tree-visualizer-parent-mtime)
+
+;; stores current horizontal spacing needed for drawing undo-tree
+(defvar undo-tree-visualizer-spacing nil)
+(make-variable-buffer-local 'undo-tree-visualizer-spacing)
+
+;; calculate horizontal spacing required for drawing tree with current
+;; settings
+(defsubst undo-tree-visualizer-calculate-spacing ()
+  (if undo-tree-visualizer-timestamps
+      (if undo-tree-visualizer-relative-timestamps 9 13)
+    3))
+
+;; holds node that was current when visualizer was invoked
+(defvar undo-tree-visualizer-initial-node nil)
+(make-variable-buffer-local 'undo-tree-visualizer-initial-node)
+
+;; holds currently selected node in visualizer selection mode
+(defvar undo-tree-visualizer-selected-node nil)
+(make-variable-buffer-local 'undo-tree-visualizer-selected)
+
+;; used to store nodes at edge of currently drawn portion of tree
+(defvar undo-tree-visualizer-needs-extending-down nil)
+(make-variable-buffer-local 'undo-tree-visualizer-needs-extending-down)
+(defvar undo-tree-visualizer-needs-extending-up nil)
+(make-variable-buffer-local 'undo-tree-visualizer-needs-extending-up)
+
+;; dynamically bound to t when undoing from visualizer, to inhibit
+;; `undo-tree-kill-visualizer' hook function in parent buffer
+(defvar undo-tree-inhibit-kill-visualizer nil)
+
+;; can be let-bound to a face name, used in drawing functions
+(defvar undo-tree-insert-face nil)
+
+;; visualizer buffer names
+(defconst undo-tree-visualizer-buffer-name " *undo-tree*")
+(defconst undo-tree-diff-buffer-name "*undo-tree Diff*")
+
+;; prevent debugger being called on "No further redo information"
+(add-to-list 'debug-ignored-errors "^No further redo information")
+(add-to-list 'debug-ignored-errors "^No further redo information for region")
+
+;; install history-auto-save hooks
+(add-hook 'write-file-functions 'undo-tree-save-history-hook)
+(add-hook 'find-file-hook 'undo-tree-load-history-hook)
+
+
+
+
+;;; =================================================================
+;;;                          Default keymaps
+
+(defvar undo-tree-map nil
+  "Keymap used in undo-tree-mode.")
+
+(unless undo-tree-map
+  (let ((map (make-sparse-keymap)))
+    ;; remap `undo' and `undo-only' to `undo-tree-undo'
+    (define-key map [remap undo] 'undo-tree-undo)
+    (define-key map [remap undo-only] 'undo-tree-undo)
+    ;; bind standard undo bindings (since these match redo counterparts)
+    (define-key map (kbd "C-/") 'undo-tree-undo)
+    (define-key map "\C-_" 'undo-tree-undo)
+    ;; redo doesn't exist normally, so define our own keybindings
+    (define-key map (kbd "C-?") 'undo-tree-redo)
+    (define-key map (kbd "M-_") 'undo-tree-redo)
+    ;; just in case something has defined `redo'...
+    (define-key map [remap redo] 'undo-tree-redo)
+    ;; we use "C-x u" for the undo-tree visualizer
+    (define-key map (kbd "\C-x u") 'undo-tree-visualize)
+    ;; bind register commands
+    (define-key map (kbd "C-x r u") 'undo-tree-save-state-to-register)
+    (define-key map (kbd "C-x r U") 'undo-tree-restore-state-from-register)
+    ;; set keymap
+    (setq undo-tree-map map)))
+
+
+(defvar undo-tree-visualizer-map nil
+  "Keymap used in undo-tree visualizer.")
+
+(unless undo-tree-visualizer-map
+  (let ((map (make-sparse-keymap)))
+    ;; vertical motion keys undo/redo
+    (define-key map [remap previous-line] 'undo-tree-visualize-undo)
+    (define-key map [remap next-line] 'undo-tree-visualize-redo)
+    (define-key map [up] 'undo-tree-visualize-undo)
+    (define-key map "p" 'undo-tree-visualize-undo)
+    (define-key map "\C-p" 'undo-tree-visualize-undo)
+    (define-key map [down] 'undo-tree-visualize-redo)
+    (define-key map "n" 'undo-tree-visualize-redo)
+    (define-key map "\C-n" 'undo-tree-visualize-redo)
+    ;; horizontal motion keys switch branch
+    (define-key map [remap forward-char]
+      'undo-tree-visualize-switch-branch-right)
+    (define-key map [remap backward-char]
+      'undo-tree-visualize-switch-branch-left)
+    (define-key map [right] 'undo-tree-visualize-switch-branch-right)
+    (define-key map "f" 'undo-tree-visualize-switch-branch-right)
+    (define-key map "\C-f" 'undo-tree-visualize-switch-branch-right)
+    (define-key map [left] 'undo-tree-visualize-switch-branch-left)
+    (define-key map "b" 'undo-tree-visualize-switch-branch-left)
+    (define-key map "\C-b" 'undo-tree-visualize-switch-branch-left)
+    ;; paragraph motion keys undo/redo to significant points in tree
+    (define-key map [remap backward-paragraph] 'undo-tree-visualize-undo-to-x)
+    (define-key map [remap forward-paragraph] 'undo-tree-visualize-redo-to-x)
+    (define-key map "\M-{" 'undo-tree-visualize-undo-to-x)
+    (define-key map "\M-}" 'undo-tree-visualize-redo-to-x)
+    (define-key map [C-down] 'undo-tree-visualize-undo-to-x)
+    (define-key map [C-up] 'undo-tree-visualize-redo-to-x)
+    ;; mouse sets buffer state to node at click
+    (define-key map [mouse-1] 'undo-tree-visualizer-mouse-set)
+    ;; toggle timestamps
+    (define-key map "t" 'undo-tree-visualizer-toggle-timestamps)
+    ;; toggle diff
+    (define-key map "d" 'undo-tree-visualizer-toggle-diff)
+    ;; selection mode
+    (define-key map "s" 'undo-tree-visualizer-selection-mode)
+    ;; horizontal scrolling may be needed if the tree is very wide
+    (define-key map "," 'undo-tree-visualizer-scroll-left)
+    (define-key map "." 'undo-tree-visualizer-scroll-right)
+    (define-key map "<" 'undo-tree-visualizer-scroll-left)
+    (define-key map ">" 'undo-tree-visualizer-scroll-right)
+    ;; vertical scrolling may be needed if the tree is very tall
+    (define-key map [next] 'undo-tree-visualizer-scroll-up)
+    (define-key map [prior] 'undo-tree-visualizer-scroll-down)
+    ;; quit/abort visualizer
+    (define-key map "q" 'undo-tree-visualizer-quit)
+    (define-key map "\C-q" 'undo-tree-visualizer-abort)
+    ;; set keymap
+    (setq undo-tree-visualizer-map map)))
+
+
+(defvar undo-tree-visualizer-selection-map nil
+  "Keymap used in undo-tree visualizer selection mode.")
+
+(unless undo-tree-visualizer-selection-map
+  (let ((map (make-sparse-keymap)))
+    ;; vertical motion keys move up and down tree
+    (define-key map [remap previous-line]
+      'undo-tree-visualizer-select-previous)
+    (define-key map [remap next-line]
+      'undo-tree-visualizer-select-next)
+    (define-key map [up] 'undo-tree-visualizer-select-previous)
+    (define-key map "p" 'undo-tree-visualizer-select-previous)
+    (define-key map "\C-p" 'undo-tree-visualizer-select-previous)
+    (define-key map [down] 'undo-tree-visualizer-select-next)
+    (define-key map "n" 'undo-tree-visualizer-select-next)
+    (define-key map "\C-n" 'undo-tree-visualizer-select-next)
+    ;; vertical scroll keys move up and down quickly
+    (define-key map [next]
+      (lambda () (interactive) (undo-tree-visualizer-select-next 10)))
+    (define-key map [prior]
+      (lambda () (interactive) (undo-tree-visualizer-select-previous 10)))
+    ;; horizontal motion keys move to left and right siblings
+    (define-key map [remap forward-char] 'undo-tree-visualizer-select-right)
+    (define-key map [remap backward-char] 'undo-tree-visualizer-select-left)
+    (define-key map [right] 'undo-tree-visualizer-select-right)
+    (define-key map "f" 'undo-tree-visualizer-select-right)
+    (define-key map "\C-f" 'undo-tree-visualizer-select-right)
+    (define-key map [left] 'undo-tree-visualizer-select-left)
+    (define-key map "b" 'undo-tree-visualizer-select-left)
+    (define-key map "\C-b" 'undo-tree-visualizer-select-left)
+    ;; horizontal scroll keys move left or right quickly
+    (define-key map ","
+      (lambda () (interactive) (undo-tree-visualizer-select-left 10)))
+    (define-key map "."
+      (lambda () (interactive) (undo-tree-visualizer-select-right 10)))
+    (define-key map "<"
+      (lambda () (interactive) (undo-tree-visualizer-select-left 10)))
+    (define-key map ">"
+      (lambda () (interactive) (undo-tree-visualizer-select-right 10)))
+    ;; mouse or <enter> sets buffer state to node at point/click
+    (define-key map "\r" 'undo-tree-visualizer-set)
+    (define-key map [mouse-1] 'undo-tree-visualizer-mouse-set)
+    ;; toggle timestamps
+    (define-key map "t" 'undo-tree-visualizer-toggle-timestamps)
+    ;; toggle diff
+    (define-key map "d" 'undo-tree-visualizer-selection-toggle-diff)
+    ;; quit visualizer selection mode
+    (define-key map "s" 'undo-tree-visualizer-mode)
+    ;; quit visualizer
+    (define-key map "q" 'undo-tree-visualizer-quit)
+    (define-key map "\C-q" 'undo-tree-visualizer-abort)
+    ;; set keymap
+    (setq undo-tree-visualizer-selection-map map)))
+
+
+
+
+;;; =====================================================================
+;;;                     Undo-tree data structure
+
+(defstruct
+  (undo-tree
+   :named
+   (:constructor nil)
+   (:constructor make-undo-tree
+                 (&aux
+                  (root (undo-tree-make-node nil nil))
+                  (current root)
+                  (size 0)
+		  (count 0)
+		  (object-pool (make-hash-table :test 'eq :weakness 'value))))
+   ;;(:copier nil)
+   )
+  root current size count object-pool)
+
+
+
+(defstruct
+  (undo-tree-node
+   (:type vector)   ; create unnamed struct
+   (:constructor nil)
+   (:constructor undo-tree-make-node
+                 (previous undo
+		  &optional redo
+                  &aux
+                  (timestamp (current-time))
+                  (branch 0)))
+   (:constructor undo-tree-make-node-backwards
+                 (next-node undo
+		  &optional redo
+                  &aux
+                  (next (list next-node))
+                  (timestamp (current-time))
+                  (branch 0)))
+   (:copier nil))
+  previous next undo redo timestamp branch meta-data)
+
+
+(defmacro undo-tree-node-p (n)
+  (let ((len (length (undo-tree-make-node nil nil))))
+    `(and (vectorp ,n) (= (length ,n) ,len))))
+
+
+
+(defstruct
+  (undo-tree-region-data
+   (:type vector)   ; create unnamed struct
+   (:constructor nil)
+   (:constructor undo-tree-make-region-data
+		 (&optional undo-beginning undo-end
+			     redo-beginning redo-end))
+   (:constructor undo-tree-make-undo-region-data
+		 (undo-beginning undo-end))
+   (:constructor undo-tree-make-redo-region-data
+		 (redo-beginning redo-end))
+   (:copier nil))
+  undo-beginning undo-end redo-beginning redo-end)
+
+
+(defmacro undo-tree-region-data-p (r)
+  (let ((len (length (undo-tree-make-region-data))))
+    `(and (vectorp ,r) (= (length ,r) ,len))))
+
+(defmacro undo-tree-node-clear-region-data (node)
+  `(setf (undo-tree-node-meta-data ,node)
+	 (delq nil
+	       (delq :region
+		     (plist-put (undo-tree-node-meta-data ,node)
+				:region nil)))))
+
+
+(defmacro undo-tree-node-undo-beginning (node)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (when (undo-tree-region-data-p r)
+       (undo-tree-region-data-undo-beginning r))))
+
+(defmacro undo-tree-node-undo-end (node)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (when (undo-tree-region-data-p r)
+       (undo-tree-region-data-undo-end r))))
+
+(defmacro undo-tree-node-redo-beginning (node)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (when (undo-tree-region-data-p r)
+       (undo-tree-region-data-redo-beginning r))))
+
+(defmacro undo-tree-node-redo-end (node)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (when (undo-tree-region-data-p r)
+       (undo-tree-region-data-redo-end r))))
+
+
+(defsetf undo-tree-node-undo-beginning (node) (val)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (unless (undo-tree-region-data-p r)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :region
+			(setq r (undo-tree-make-region-data)))))
+     (setf (undo-tree-region-data-undo-beginning r) ,val)))
+
+(defsetf undo-tree-node-undo-end (node) (val)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (unless (undo-tree-region-data-p r)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :region
+			(setq r (undo-tree-make-region-data)))))
+     (setf (undo-tree-region-data-undo-end r) ,val)))
+
+(defsetf undo-tree-node-redo-beginning (node) (val)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (unless (undo-tree-region-data-p r)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :region
+			(setq r (undo-tree-make-region-data)))))
+     (setf (undo-tree-region-data-redo-beginning r) ,val)))
+
+(defsetf undo-tree-node-redo-end (node) (val)
+  `(let ((r (plist-get (undo-tree-node-meta-data ,node) :region)))
+     (unless (undo-tree-region-data-p r)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :region
+			(setq r (undo-tree-make-region-data)))))
+     (setf (undo-tree-region-data-redo-end r) ,val)))
+
+
+
+(defstruct
+  (undo-tree-visualizer-data
+   (:type vector)   ; create unnamed struct
+   (:constructor nil)
+   (:constructor undo-tree-make-visualizer-data
+		 (&optional lwidth cwidth rwidth marker))
+   (:copier nil))
+  lwidth cwidth rwidth marker)
+
+
+(defmacro undo-tree-visualizer-data-p (v)
+  (let ((len (length (undo-tree-make-visualizer-data))))
+    `(and (vectorp ,v) (= (length ,v) ,len))))
+
+(defun undo-tree-node-clear-visualizer-data (node)
+  (let ((plist (undo-tree-node-meta-data node)))
+    (if (eq (car plist) :visualizer)
+	(setf (undo-tree-node-meta-data node) (nthcdr 2 plist))
+      (while (and plist (not (eq (cadr plist) :visualizer)))
+	(setq plist (cdr plist)))
+      (if plist (setcdr plist (nthcdr 3 plist))))))
+
+(defmacro undo-tree-node-lwidth (node)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (when (undo-tree-visualizer-data-p v)
+       (undo-tree-visualizer-data-lwidth v))))
+
+(defmacro undo-tree-node-cwidth (node)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (when (undo-tree-visualizer-data-p v)
+       (undo-tree-visualizer-data-cwidth v))))
+
+(defmacro undo-tree-node-rwidth (node)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (when (undo-tree-visualizer-data-p v)
+       (undo-tree-visualizer-data-rwidth v))))
+
+(defmacro undo-tree-node-marker (node)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (when (undo-tree-visualizer-data-p v)
+       (undo-tree-visualizer-data-marker v))))
+
+
+(defsetf undo-tree-node-lwidth (node) (val)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (unless (undo-tree-visualizer-data-p v)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :visualizer
+			(setq v (undo-tree-make-visualizer-data)))))
+     (setf (undo-tree-visualizer-data-lwidth v) ,val)))
+
+(defsetf undo-tree-node-cwidth (node) (val)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (unless (undo-tree-visualizer-data-p v)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :visualizer
+			(setq v (undo-tree-make-visualizer-data)))))
+     (setf (undo-tree-visualizer-data-cwidth v) ,val)))
+
+(defsetf undo-tree-node-rwidth (node) (val)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (unless (undo-tree-visualizer-data-p v)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :visualizer
+			(setq v (undo-tree-make-visualizer-data)))))
+     (setf (undo-tree-visualizer-data-rwidth v) ,val)))
+
+(defsetf undo-tree-node-marker (node) (val)
+  `(let ((v (plist-get (undo-tree-node-meta-data ,node) :visualizer)))
+     (unless (undo-tree-visualizer-data-p v)
+       (setf (undo-tree-node-meta-data ,node)
+	     (plist-put (undo-tree-node-meta-data ,node) :visualizer
+			(setq v (undo-tree-make-visualizer-data)))))
+     (setf (undo-tree-visualizer-data-marker v) ,val)))
+
+
+
+(defstruct
+  (undo-tree-register-data
+   (:type vector)
+   (:constructor nil)
+   (:constructor undo-tree-make-register-data (buffer node)))
+  buffer node)
+
+(defun undo-tree-register-data-p (data)
+  (and (vectorp data)
+       (= (length data) 2)
+       (undo-tree-node-p (undo-tree-register-data-node data))))
+
+(defun undo-tree-register-data-print-func (data)
+  (princ (format "an undo-tree state for buffer %s"
+		 (undo-tree-register-data-buffer data))))
+
+(defmacro undo-tree-node-register (node)
+  `(plist-get (undo-tree-node-meta-data ,node) :register))
+
+(defsetf undo-tree-node-register (node) (val)
+  `(setf (undo-tree-node-meta-data ,node)
+	 (plist-put (undo-tree-node-meta-data ,node) :register ,val)))
+
+
+
+
+;;; =====================================================================
+;;;              Basic undo-tree data structure functions
+
+(defun undo-tree-grow (undo)
+  "Add an UNDO node to current branch of `buffer-undo-tree'."
+  (let* ((current (undo-tree-current buffer-undo-tree))
+         (new (undo-tree-make-node current undo)))
+    (push new (undo-tree-node-next current))
+    (setf (undo-tree-current buffer-undo-tree) new)))
+
+
+(defun undo-tree-grow-backwards (node undo &optional redo)
+  "Add new node *above* undo-tree NODE, and return new node.
+Note that this will overwrite NODE's \"previous\" link, so should
+only be used on a detached NODE, never on nodes that are already
+part of `buffer-undo-tree'."
+  (let ((new (undo-tree-make-node-backwards node undo redo)))
+    (setf (undo-tree-node-previous node) new)
+    new))
+
+
+(defun undo-tree-splice-node (node splice)
+  "Splice NODE into undo tree, below node SPLICE.
+Note that this will overwrite NODE's \"next\" and \"previous\"
+links, so should only be used on a detached NODE, never on nodes
+that are already part of `buffer-undo-tree'."
+  (setf (undo-tree-node-next node) (undo-tree-node-next splice)
+	(undo-tree-node-branch node) (undo-tree-node-branch splice)
+	(undo-tree-node-previous node) splice
+	(undo-tree-node-next splice) (list node)
+	(undo-tree-node-branch splice) 0)
+  (dolist (n (undo-tree-node-next node))
+    (setf (undo-tree-node-previous n) node)))
+
+
+(defun undo-tree-snip-node (node)
+  "Snip NODE out of undo tree."
+  (let* ((parent (undo-tree-node-previous node))
+	 position p)
+    ;; if NODE is only child, replace parent's next links with NODE's
+    (if (= (length (undo-tree-node-next parent)) 0)
+	(setf (undo-tree-node-next parent) (undo-tree-node-next node)
+	      (undo-tree-node-branch parent) (undo-tree-node-branch node))
+      ;; otherwise...
+      (setq position (undo-tree-position node (undo-tree-node-next parent)))
+      (cond
+       ;; if active branch used do go via NODE, set parent's branch to active
+       ;; branch of NODE
+       ((= (undo-tree-node-branch parent) position)
+	(setf (undo-tree-node-branch parent)
+	      (+ position (undo-tree-node-branch node))))
+       ;; if active branch didn't go via NODE, update parent's branch to point
+       ;; to same node as before
+       ((> (undo-tree-node-branch parent) position)
+	(incf (undo-tree-node-branch parent)
+	      (1- (length (undo-tree-node-next node))))))
+      ;; replace NODE in parent's next list with NODE's entire next list
+      (if (= position 0)
+	  (setf (undo-tree-node-next parent)
+		(nconc (undo-tree-node-next node)
+		       (cdr (undo-tree-node-next parent))))
+	(setq p (nthcdr (1- position) (undo-tree-node-next parent)))
+	(setcdr p (nconc (undo-tree-node-next node) (cddr p)))))
+    ;; update previous links of NODE's children
+    (dolist (n (undo-tree-node-next node))
+      (setf (undo-tree-node-previous n) parent))))
+
+
+(defun undo-tree-mapc (--undo-tree-mapc-function-- node)
+  ;; Apply FUNCTION to NODE and to each node below it.
+  (let ((stack (list node))
+	n)
+    (while stack
+      (setq n (pop stack))
+      (funcall --undo-tree-mapc-function-- n)
+      (setq stack (append (undo-tree-node-next n) stack)))))
+
+
+(defmacro undo-tree-num-branches ()
+  "Return number of branches at current undo tree node."
+  '(length (undo-tree-node-next (undo-tree-current buffer-undo-tree))))
+
+
+(defun undo-tree-position (node list)
+  "Find the first occurrence of NODE in LIST.
+Return the index of the matching item, or nil of not found.
+Comparison is done with `eq'."
+  (let ((i 0))
+    (catch 'found
+      (while (progn
+               (when (eq node (car list)) (throw 'found i))
+               (incf i)
+               (setq list (cdr list))))
+      nil)))
+
+
+(defvar *undo-tree-id-counter* 0)
+(make-variable-buffer-local '*undo-tree-id-counter*)
+
+(defmacro undo-tree-generate-id ()
+  ;; Generate a new, unique id (uninterned symbol).
+  ;; The name is made by appending a number to "undo-tree-id".
+  ;; (Copied from CL package `gensym'.)
+  `(let ((num (prog1 *undo-tree-id-counter* (incf *undo-tree-id-counter*))))
+     (make-symbol (format "undo-tree-id%d" num))))
+
+
+(defun undo-tree-decircle (undo-tree)
+  ;; Nullify PREVIOUS links of UNDO-TREE nodes, to make UNDO-TREE data
+  ;; structure non-circular.
+  (undo-tree-mapc
+   (lambda (node)
+     (dolist (n (undo-tree-node-next node))
+       (setf (undo-tree-node-previous n) nil)))
+   (undo-tree-root undo-tree)))
+
+
+(defun undo-tree-recircle (undo-tree)
+  ;; Recreate PREVIOUS links of UNDO-TREE nodes, to restore circular UNDO-TREE
+  ;; data structure.
+  (undo-tree-mapc
+   (lambda (node)
+     (dolist (n (undo-tree-node-next node))
+       (setf (undo-tree-node-previous n) node)))
+   (undo-tree-root undo-tree)))
+
+
+
+
+;;; =====================================================================
+;;;             Undo list and undo changeset utility functions
+
+(defmacro undo-list-marker-elt-p (elt)
+  `(markerp (car-safe ,elt)))
+
+(defmacro undo-list-GCd-marker-elt-p (elt)
+  ;; Return t if ELT is a marker element whose marker has been moved to the
+  ;; object-pool, so may potentially have been garbage-collected.
+  ;; Note: Valid marker undo elements should be uniquely identified as cons
+  ;; cells with a symbol in the car (replacing the marker), and a number in
+  ;; the cdr. However, to guard against future changes to undo element
+  ;; formats, we perform an additional redundant check on the symbol name.
+  `(and (car-safe ,elt)
+	(symbolp (car ,elt))
+	(let ((str (symbol-name (car ,elt))))
+	  (and (> (length str) 12)
+	       (string= (substring str 0 12) "undo-tree-id")))
+	(numberp (cdr-safe ,elt))))
+
+
+(defun undo-tree-move-GC-elts-to-pool (elt)
+  ;; Move elements that can be garbage-collected into `buffer-undo-tree'
+  ;; object pool, substituting a unique id that can be used to retrieve them
+  ;; later. (Only markers require this treatment currently.)
+  (when (undo-list-marker-elt-p elt)
+    (let ((id (undo-tree-generate-id)))
+      (puthash id (car elt) (undo-tree-object-pool buffer-undo-tree))
+      (setcar elt id))))
+
+
+(defun undo-tree-restore-GC-elts-from-pool (elt)
+  ;; Replace object id's in ELT with corresponding objects from
+  ;; `buffer-undo-tree' object pool and return modified ELT, or return nil if
+  ;; any object in ELT has been garbage-collected.
+  (if (undo-list-GCd-marker-elt-p elt)
+      (when (setcar elt (gethash (car elt)
+				 (undo-tree-object-pool buffer-undo-tree)))
+	elt)
+    elt))
+
+
+(defun undo-list-clean-GCd-elts (undo-list)
+  ;; Remove object id's from UNDO-LIST that refer to elements that have been
+  ;; garbage-collected. UNDO-LIST is modified by side-effect.
+  (while (undo-list-GCd-marker-elt-p (car undo-list))
+    (unless (gethash (caar undo-list)
+		     (undo-tree-object-pool buffer-undo-tree))
+      (setq undo-list (cdr undo-list))))
+  (let ((p undo-list))
+    (while (cdr p)
+      (when (and (undo-list-GCd-marker-elt-p (cadr p))
+		 (null (gethash (car (cadr p))
+				(undo-tree-object-pool buffer-undo-tree))))
+	(setcdr p (cddr p)))
+      (setq p (cdr p))))
+  undo-list)
+
+
+(defun undo-list-pop-changeset (&optional discard-pos)
+  ;; Pop changeset from `buffer-undo-list'. If DISCARD-POS is non-nil, discard
+  ;; any position entries from changeset.
+
+  ;; discard undo boundaries and (if DISCARD-POS is non-nil) position entries
+  ;; at head of undo list
+  (while (or (null (car buffer-undo-list))
+	     (and discard-pos (integerp (car buffer-undo-list))))
+    (setq buffer-undo-list (cdr buffer-undo-list)))
+  ;; pop elements up to next undo boundary, discarding position entries if
+  ;; DISCARD-POS is non-nil
+  (if (eq (car buffer-undo-list) 'undo-tree-canary)
+      (push nil buffer-undo-list)
+    (let* ((changeset (list (pop buffer-undo-list)))
+           (p changeset))
+      (while (progn
+	       (undo-tree-move-GC-elts-to-pool (car p))
+	       (while (and discard-pos (integerp (car buffer-undo-list)))
+		 (setq buffer-undo-list (cdr buffer-undo-list)))
+	       (and (car buffer-undo-list)
+		    (not (eq (car buffer-undo-list) 'undo-tree-canary))))
+        (setcdr p (list (pop buffer-undo-list)))
+	(setq p (cdr p)))
+      changeset)))
+
+
+(defun undo-tree-copy-list (undo-list)
+  ;; Return a deep copy of first changeset in `undo-list'. Object id's are
+  ;; replaced by corresponding objects from `buffer-undo-tree' object-pool.
+  (when undo-list
+    (let (copy p)
+      ;; if first element contains an object id, replace it with object from
+      ;; pool, discarding element entirely if it's been GC'd
+      (while (null copy)
+	(setq copy
+	      (undo-tree-restore-GC-elts-from-pool (pop undo-list))))
+      (setq copy (list copy)
+	    p copy)
+      ;; copy remaining elements, replacing object id's with objects from
+      ;; pool, or discarding them entirely if they've been GC'd
+      (while undo-list
+	(when (setcdr p (undo-tree-restore-GC-elts-from-pool
+			 (undo-copy-list-1 (pop undo-list))))
+	  (setcdr p (list (cdr p)))
+	  (setq p (cdr p))))
+      copy)))
+
+
+
+(defun undo-list-transfer-to-tree ()
+  ;; Transfer entries accumulated in `buffer-undo-list' to `buffer-undo-tree'.
+
+  ;; `undo-list-transfer-to-tree' should never be called when undo is disabled
+  ;; (i.e. `buffer-undo-tree' is t)
+  (assert (not (eq buffer-undo-tree t)))
+
+  ;; if `buffer-undo-tree' is empty, create initial undo-tree
+  (when (null buffer-undo-tree) (setq buffer-undo-tree (make-undo-tree)))
+  ;; make sure there's a canary at end of `buffer-undo-list'
+  (when (null buffer-undo-list)
+    (setq buffer-undo-list '(nil undo-tree-canary)))
+
+  (unless (or (eq (cadr buffer-undo-list) 'undo-tree-canary)
+	      (eq (car buffer-undo-list) 'undo-tree-canary))
+    ;; create new node from first changeset in `buffer-undo-list', save old
+    ;; `buffer-undo-tree' current node, and make new node the current node
+    (let* ((node (undo-tree-make-node nil (undo-list-pop-changeset)))
+	   (splice (undo-tree-current buffer-undo-tree))
+	   (size (undo-list-byte-size (undo-tree-node-undo node)))
+	   (count 1))
+      (setf (undo-tree-current buffer-undo-tree) node)
+      ;; grow tree fragment backwards using `buffer-undo-list' changesets
+      (while (and buffer-undo-list
+		  (not (eq (cadr buffer-undo-list) 'undo-tree-canary)))
+	(setq node
+	      (undo-tree-grow-backwards node (undo-list-pop-changeset)))
+	(incf size (undo-list-byte-size (undo-tree-node-undo node)))
+	(incf count))
+      ;; if no undo history has been discarded from `buffer-undo-list' since
+      ;; last transfer, splice new tree fragment onto end of old
+      ;; `buffer-undo-tree' current node
+      (if (or (eq (cadr buffer-undo-list) 'undo-tree-canary)
+	      (eq (car buffer-undo-list) 'undo-tree-canary))
+	  (progn
+	    (setf (undo-tree-node-previous node) splice)
+	    (push node (undo-tree-node-next splice))
+	    (setf (undo-tree-node-branch splice) 0)
+	    (incf (undo-tree-size buffer-undo-tree) size)
+	    (incf (undo-tree-count buffer-undo-tree) count))
+	;; if undo history has been discarded, replace entire
+	;; `buffer-undo-tree' with new tree fragment
+	(setq node (undo-tree-grow-backwards node nil))
+	(setf (undo-tree-root buffer-undo-tree) node)
+	(setq buffer-undo-list '(nil undo-tree-canary))
+	(setf (undo-tree-size buffer-undo-tree) size)
+	(setf (undo-tree-count buffer-undo-tree) count)
+	(setq buffer-undo-list '(nil undo-tree-canary))))
+    ;; discard undo history if necessary
+    (undo-tree-discard-history)))
+
+
+(defun undo-list-byte-size (undo-list)
+  ;; Return size (in bytes) of UNDO-LIST
+  (let ((size 0) (p undo-list))
+    (while p
+      (incf size 8)  ; cons cells use up 8 bytes
+      (when (and (consp (car p)) (stringp (caar p)))
+        (incf size (string-bytes (caar p))))
+      (setq p (cdr p)))
+    size))
+
+
+
+(defun undo-list-rebuild-from-tree ()
+  "Rebuild `buffer-undo-list' from information in `buffer-undo-tree'."
+  (unless (eq buffer-undo-list t)
+    (undo-list-transfer-to-tree)
+    (setq buffer-undo-list nil)
+    (when buffer-undo-tree
+      (let ((stack (list (list (undo-tree-root buffer-undo-tree)))))
+	(push (sort (mapcar 'identity (undo-tree-node-next (caar stack)))
+		    (lambda (a b)
+		      (time-less-p (undo-tree-node-timestamp a)
+				   (undo-tree-node-timestamp b))))
+	      stack)
+	;; Traverse tree in depth-and-oldest-first order, but add undo records
+	;; on the way down, and redo records on the way up.
+	(while (or (car stack)
+		   (not (eq (car (nth 1 stack))
+			    (undo-tree-current buffer-undo-tree))))
+	  (if (car stack)
+	      (progn
+		(setq buffer-undo-list
+		      (append (undo-tree-node-undo (caar stack))
+			      buffer-undo-list))
+		(undo-boundary)
+		(push (sort (mapcar 'identity
+				    (undo-tree-node-next (caar stack)))
+			    (lambda (a b)
+			      (time-less-p (undo-tree-node-timestamp a)
+					   (undo-tree-node-timestamp b))))
+		      stack))
+	    (pop stack)
+	    (setq buffer-undo-list
+		  (append (undo-tree-node-redo (caar stack))
+			  buffer-undo-list))
+	    (undo-boundary)
+	    (pop (car stack))))))))
+
+
+
+
+;;; =====================================================================
+;;;                History discarding utility functions
+
+(defun undo-tree-oldest-leaf (node)
+  ;; Return oldest leaf node below NODE.
+  (while (undo-tree-node-next node)
+    (setq node
+          (car (sort (mapcar 'identity (undo-tree-node-next node))
+                     (lambda (a b)
+                       (time-less-p (undo-tree-node-timestamp a)
+                                    (undo-tree-node-timestamp b)))))))
+  node)
+
+
+(defun undo-tree-discard-node (node)
+  ;; Discard NODE from `buffer-undo-tree', and return next in line for
+  ;; discarding.
+
+  ;; don't discard current node
+  (unless (eq node (undo-tree-current buffer-undo-tree))
+
+    ;; discarding root node...
+    (if (eq node (undo-tree-root buffer-undo-tree))
+        (cond
+         ;; should always discard branches before root
+         ((> (length (undo-tree-node-next node)) 1)
+          (error "Trying to discard undo-tree root which still\
+ has multiple branches"))
+         ;; don't discard root if current node is only child
+         ((eq (car (undo-tree-node-next node))
+              (undo-tree-current buffer-undo-tree))
+	  nil)
+	 ;; discard root
+         (t
+	  ;; clear any register referring to root
+	  (let ((r (undo-tree-node-register node)))
+	    (when (and r (eq (get-register r) node))
+	      (set-register r nil)))
+          ;; make child of root into new root
+          (setq node (setf (undo-tree-root buffer-undo-tree)
+                           (car (undo-tree-node-next node))))
+	  ;; update undo-tree size
+	  (decf (undo-tree-size buffer-undo-tree)
+		(+ (undo-list-byte-size (undo-tree-node-undo node))
+		   (undo-list-byte-size (undo-tree-node-redo node))))
+	  (decf (undo-tree-count buffer-undo-tree))
+	  ;; discard new root's undo data and PREVIOUS link
+	  (setf (undo-tree-node-undo node) nil
+		(undo-tree-node-redo node) nil
+		(undo-tree-node-previous node) nil)
+          ;; if new root has branches, or new root is current node, next node
+          ;; to discard is oldest leaf, otherwise it's new root
+          (if (or (> (length (undo-tree-node-next node)) 1)
+                  (eq (car (undo-tree-node-next node))
+                      (undo-tree-current buffer-undo-tree)))
+              (undo-tree-oldest-leaf node)
+            node)))
+
+      ;; discarding leaf node...
+      (let* ((parent (undo-tree-node-previous node))
+             (current (nth (undo-tree-node-branch parent)
+                           (undo-tree-node-next parent))))
+	;; clear any register referring to the discarded node
+	(let ((r (undo-tree-node-register node)))
+	  (when (and r (eq (get-register r) node))
+	    (set-register r nil)))
+	;; update undo-tree size
+	(decf (undo-tree-size buffer-undo-tree)
+	      (+ (undo-list-byte-size (undo-tree-node-undo node))
+		 (undo-list-byte-size (undo-tree-node-redo node))))
+	(decf (undo-tree-count buffer-undo-tree))
+	;; discard leaf
+        (setf (undo-tree-node-next parent)
+                (delq node (undo-tree-node-next parent))
+              (undo-tree-node-branch parent)
+                (undo-tree-position current (undo-tree-node-next parent)))
+        ;; if parent has branches, or parent is current node, next node to
+        ;; discard is oldest leaf, otherwise it's the parent itself
+        (if (or (eq parent (undo-tree-current buffer-undo-tree))
+                (and (undo-tree-node-next parent)
+                     (or (not (eq parent (undo-tree-root buffer-undo-tree)))
+                         (> (length (undo-tree-node-next parent)) 1))))
+            (undo-tree-oldest-leaf parent)
+          parent)))))
+
+
+
+(defun undo-tree-discard-history ()
+  "Discard undo history until we're within memory usage limits
+set by `undo-limit', `undo-strong-limit' and `undo-outer-limit'."
+
+  (when (> (undo-tree-size buffer-undo-tree) undo-limit)
+    ;; if there are no branches off root, first node to discard is root;
+    ;; otherwise it's leaf node at botom of oldest branch
+    (let ((node (if (> (length (undo-tree-node-next
+                                (undo-tree-root buffer-undo-tree))) 1)
+                    (undo-tree-oldest-leaf (undo-tree-root buffer-undo-tree))
+                  (undo-tree-root buffer-undo-tree))))
+
+      ;; discard nodes until memory use is within `undo-strong-limit'
+      (while (and node
+                  (> (undo-tree-size buffer-undo-tree) undo-strong-limit))
+        (setq node (undo-tree-discard-node node)))
+
+      ;; discard nodes until next node to discard would bring memory use
+      ;; within `undo-limit'
+      (while (and node
+		  ;; check first if last discard has brought us within
+		  ;; `undo-limit', in case we can avoid more expensive
+		  ;; `undo-strong-limit' calculation
+		  ;; Note: this assumes undo-strong-limit > undo-limit;
+		  ;;       if not, effectively undo-strong-limit = undo-limit
+		  (> (undo-tree-size buffer-undo-tree) undo-limit)
+                  (> (- (undo-tree-size buffer-undo-tree)
+			;; if next node to discard is root, the memory we
+			;; free-up comes from discarding changesets from its
+			;; only child...
+			(if (eq node (undo-tree-root buffer-undo-tree))
+			    (+ (undo-list-byte-size
+				(undo-tree-node-undo
+				 (car (undo-tree-node-next node))))
+			       (undo-list-byte-size
+				(undo-tree-node-redo
+				 (car (undo-tree-node-next node)))))
+			  ;; ...otherwise, it comes from discarding changesets
+			  ;; from along with the node itself
+			  (+ (undo-list-byte-size (undo-tree-node-undo node))
+			     (undo-list-byte-size (undo-tree-node-redo node)))
+			  ))
+                     undo-limit))
+        (setq node (undo-tree-discard-node node)))
+
+      ;; if we're still over the `undo-outer-limit', discard entire history
+      (when (> (undo-tree-size buffer-undo-tree) undo-outer-limit)
+        ;; query first if `undo-ask-before-discard' is set
+        (if undo-ask-before-discard
+            (when (yes-or-no-p
+                   (format
+                    "Buffer `%s' undo info is %d bytes long;  discard it? "
+                    (buffer-name) (undo-tree-size buffer-undo-tree)))
+              (setq buffer-undo-tree nil))
+          ;; otherwise, discard and display warning
+          (display-warning
+           '(undo discard-info)
+           (concat
+            (format "Buffer `%s' undo info was %d bytes long.\n"
+                    (buffer-name) (undo-tree-size buffer-undo-tree))
+            "The undo info was discarded because it exceeded\
+ `undo-outer-limit'.
+
+This is normal if you executed a command that made a huge change
+to the buffer. In that case, to prevent similar problems in the
+future, set `undo-outer-limit' to a value that is large enough to
+cover the maximum size of normal changes you expect a single
+command to make, but not so large that it might exceed the
+maximum memory allotted to Emacs.
+
+If you did not execute any such command, the situation is
+probably due to a bug and you should report it.
+
+You can disable the popping up of this buffer by adding the entry
+\(undo discard-info) to the user option `warning-suppress-types',
+which is defined in the `warnings' library.\n")
+           :warning)
+          (setq buffer-undo-tree nil)))
+      )))
+
+
+
+
+;;; =====================================================================
+;;;                   Visualizer utility functions
+
+(defun undo-tree-compute-widths (node)
+  "Recursively compute widths for nodes below NODE."
+  (let ((stack (list node))
+        res)
+    (while stack
+      ;; try to compute widths for node at top of stack
+      (if (undo-tree-node-p
+           (setq res (undo-tree-node-compute-widths (car stack))))
+          ;; if computation fails, it returns a node whose widths still need
+          ;; computing, which we push onto the stack
+          (push res stack)
+        ;; otherwise, store widths and remove it from stack
+        (setf (undo-tree-node-lwidth (car stack)) (aref res 0)
+              (undo-tree-node-cwidth (car stack)) (aref res 1)
+              (undo-tree-node-rwidth (car stack)) (aref res 2))
+        (pop stack)))))
+
+
+(defun undo-tree-node-compute-widths (node)
+  ;; Compute NODE's left-, centre-, and right-subtree widths. Returns widths
+  ;; (in a vector) if successful. Otherwise, returns a node whose widths need
+  ;; calculating before NODE's can be calculated.
+  (let ((num-children (length (undo-tree-node-next node)))
+        (lwidth 0) (cwidth 0) (rwidth 0) p)
+    (catch 'need-widths
+      (cond
+       ;; leaf nodes have 0 width
+       ((= 0 num-children)
+        (setf cwidth 1
+              (undo-tree-node-lwidth node) 0
+              (undo-tree-node-cwidth node) 1
+              (undo-tree-node-rwidth node) 0))
+
+       ;; odd number of children
+       ((= (mod num-children 2) 1)
+        (setq p (undo-tree-node-next node))
+        ;; compute left-width
+        (dotimes (i (/ num-children 2))
+          (if (undo-tree-node-lwidth (car p))
+              (incf lwidth (+ (undo-tree-node-lwidth (car p))
+                              (undo-tree-node-cwidth (car p))
+                              (undo-tree-node-rwidth (car p))))
+            ;; if child's widths haven't been computed, return that child
+            (throw 'need-widths (car p)))
+          (setq p (cdr p)))
+        (if (undo-tree-node-lwidth (car p))
+            (incf lwidth (undo-tree-node-lwidth (car p)))
+          (throw 'need-widths (car p)))
+        ;; centre-width is inherited from middle child
+        (setf cwidth (undo-tree-node-cwidth (car p)))
+        ;; compute right-width
+        (incf rwidth (undo-tree-node-rwidth (car p)))
+        (setq p (cdr p))
+        (dotimes (i (/ num-children 2))
+          (if (undo-tree-node-lwidth (car p))
+              (incf rwidth (+ (undo-tree-node-lwidth (car p))
+                              (undo-tree-node-cwidth (car p))
+                              (undo-tree-node-rwidth (car p))))
+            (throw 'need-widths (car p)))
+          (setq p (cdr p))))
+
+       ;; even number of children
+       (t
+        (setq p (undo-tree-node-next node))
+        ;; compute left-width
+        (dotimes (i (/ num-children 2))
+          (if (undo-tree-node-lwidth (car p))
+              (incf lwidth (+ (undo-tree-node-lwidth (car p))
+                              (undo-tree-node-cwidth (car p))
+                              (undo-tree-node-rwidth (car p))))
+            (throw 'need-widths (car p)))
+          (setq p (cdr p)))
+        ;; centre-width is 0 when number of children is even
+        (setq cwidth 0)
+        ;; compute right-width
+        (dotimes (i (/ num-children 2))
+          (if (undo-tree-node-lwidth (car p))
+              (incf rwidth (+ (undo-tree-node-lwidth (car p))
+                              (undo-tree-node-cwidth (car p))
+                              (undo-tree-node-rwidth (car p))))
+            (throw 'need-widths (car p)))
+          (setq p (cdr p)))))
+
+      ;; return left-, centre- and right-widths
+      (vector lwidth cwidth rwidth))))
+
+
+(defun undo-tree-clear-visualizer-data (tree)
+  ;; Clear visualizer data below NODE.
+  (undo-tree-mapc
+   (lambda (n) (undo-tree-node-clear-visualizer-data n))
+   (undo-tree-root tree)))
+
+
+(defun undo-tree-node-unmodified-p (node &optional mtime)
+  ;; Return non-nil if NODE corresponds to a buffer state that once upon a
+  ;; time was unmodified. If a file modification time MTIME is specified,
+  ;; return non-nil if the corresponding buffer state really is unmodified.
+  (let (changeset ntime)
+    (setq changeset
+	  (or (undo-tree-node-redo node)
+	      (and (setq changeset (car (undo-tree-node-next node)))
+		   (undo-tree-node-undo changeset)))
+	  ntime
+	  (catch 'found
+	    (dolist (elt changeset)
+	      (when (and (consp elt) (eq (car elt) t) (consp (cdr elt))
+			 (throw 'found (cdr elt)))))))
+    (and ntime
+	 (or (null mtime)
+	     ;; high-precision timestamps
+	     (if (listp (cdr ntime))
+		 (equal ntime mtime)
+	       ;; old-style timestamps
+	       (and (= (car ntime) (car mtime))
+		    (= (cdr ntime) (cadr mtime))))))))
+
+
+
+
+;;; =====================================================================
+;;;                  Undo-in-region utility functions
+
+;; `undo-elt-in-region' uses this as a dynamically-scoped variable
+(defvar undo-adjusted-markers nil)
+
+
+(defun undo-tree-pull-undo-in-region-branch (start end)
+  ;; Pull out entries from undo changesets to create a new undo-in-region
+  ;; branch, which undoes changeset entries lying between START and END first,
+  ;; followed by remaining entries from the changesets, before rejoining the
+  ;; existing undo tree history. Repeated calls will, if appropriate, extend
+  ;; the current undo-in-region branch rather than creating a new one.
+
+  ;; if we're just reverting the last redo-in-region, we don't need to
+  ;; manipulate the undo tree at all
+  (if (undo-tree-reverting-redo-in-region-p start end)
+      t  ; return t to indicate success
+
+    ;; We build the `region-changeset' and `delta-list' lists forwards, using
+    ;; pointers `r' and `d' to the penultimate element of the list. So that we
+    ;; don't have to treat the first element differently, we prepend a dummy
+    ;; leading nil to the lists, and have the pointers point to that
+    ;; initially.
+    ;; Note: using '(nil) instead of (list nil) in the `let*' results in
+    ;;       bizarre errors when the code is byte-compiled, where parts of the
+    ;;       lists appear to survive across different calls to this function.
+    ;;       An obscure byte-compiler bug, perhaps?
+    (let* ((region-changeset (list nil))
+	   (r region-changeset)
+	   (delta-list (list nil))
+	   (d delta-list)
+	   (node (undo-tree-current buffer-undo-tree))
+	   (repeated-undo-in-region
+	    (undo-tree-repeated-undo-in-region-p start end))
+	   undo-adjusted-markers  ; `undo-elt-in-region' expects this
+	   fragment splice original-fragment original-splice original-current
+	   got-visible-elt undo-list elt)
+
+      ;; --- initialisation ---
+      (cond
+       ;; if this is a repeated undo in the same region, start pulling changes
+       ;; from NODE at which undo-in-region branch iss attached, and detatch
+       ;; the branch, using it as initial FRAGMENT of branch being constructed
+       (repeated-undo-in-region
+	(setq original-current node
+	      fragment (car (undo-tree-node-next node))
+	      splice node)
+	;; undo up to node at which undo-in-region branch is attached
+	;; (recognizable as first node with more than one branch)
+	(let ((mark-active nil))
+	  (while (= (length (undo-tree-node-next node)) 1)
+	    (undo-tree-undo-1)
+	    (setq fragment node
+		  node (undo-tree-current buffer-undo-tree))))
+	(when (eq splice node) (setq splice nil))
+	;; detatch undo-in-region branch
+	(setf (undo-tree-node-next node)
+	      (delq fragment (undo-tree-node-next node))
+	      (undo-tree-node-previous fragment) nil
+	      original-fragment fragment
+	      original-splice node))
+
+       ;; if this is a new undo-in-region, initial FRAGMENT is a copy of all
+       ;; nodes below the current one in the active branch
+       ((undo-tree-node-next node)
+	(setq fragment (undo-tree-make-node nil nil)
+	      splice fragment)
+	(while (setq node (nth (undo-tree-node-branch node)
+			       (undo-tree-node-next node)))
+	  (push (undo-tree-make-node
+		 splice
+		 (undo-copy-list (undo-tree-node-undo node))
+		 (undo-copy-list (undo-tree-node-redo node)))
+		(undo-tree-node-next splice))
+	  (setq splice (car (undo-tree-node-next splice))))
+	(setq fragment (car (undo-tree-node-next fragment))
+	      splice nil
+	      node (undo-tree-current buffer-undo-tree))))
+
+
+      ;; --- pull undo-in-region elements into branch ---
+      ;; work backwards up tree, pulling out undo elements within region until
+      ;; we've got one that undoes a visible change (insertion or deletion)
+      (catch 'abort
+	(while (and (not got-visible-elt) node (undo-tree-node-undo node))
+	  ;; we cons a dummy nil element on the front of the changeset so that
+	  ;; we can conveniently remove the first (real) element from the
+	  ;; changeset if we need to; the leading nil is removed once we're
+	  ;; done with this changeset
+	  (setq undo-list (cons nil (undo-copy-list (undo-tree-node-undo node)))
+		elt (cadr undo-list))
+	  (if fragment
+	      (progn
+		(setq fragment (undo-tree-grow-backwards fragment undo-list))
+		(unless splice (setq splice fragment)))
+	    (setq fragment (undo-tree-make-node nil undo-list))
+	    (setq splice fragment))
+
+	  (while elt
+	    (cond
+	     ;; keep elements within region
+	     ((undo-elt-in-region elt start end)
+	      ;; set flag if kept element is visible (insertion or deletion)
+	      (when (and (consp elt)
+			 (or (stringp (car elt)) (integerp (car elt))))
+		(setq got-visible-elt t))
+	      ;; adjust buffer positions in elements previously undone before
+	      ;; kept element, as kept element will now be undone first
+	      (undo-tree-adjust-elements-to-elt splice elt)
+	      ;; move kept element to undo-in-region changeset, adjusting its
+	      ;; buffer position as it will now be undone first
+	      (setcdr r (list (undo-tree-apply-deltas elt (cdr delta-list))))
+	      (setq r (cdr r))
+	      (setcdr undo-list (cddr undo-list)))
+
+	     ;; discard "was unmodified" elements
+	     ;; FIXME: deal properly with these
+	     ((and (consp elt) (eq (car elt) t))
+	      (setcdr undo-list (cddr undo-list)))
+
+	     ;; if element crosses region, we can't pull any more elements
+	     ((undo-elt-crosses-region elt start end)
+	      ;; if we've found a visible element, it must be earlier in
+	      ;; current node's changeset; stop pulling elements (null
+	      ;; `undo-list' and non-nil `got-visible-elt' cause loop to exit)
+	      (if got-visible-elt
+		  (setq undo-list nil)
+		;; if we haven't found a visible element yet, pulling
+		;; undo-in-region branch has failed
+		(setq region-changeset nil)
+		(throw 'abort t)))
+
+	     ;; if rejecting element, add its delta (if any) to the list
+	     (t
+	      (let ((delta (undo-delta elt)))
+		(when (/= 0 (cdr delta))
+		  (setcdr d (list delta))
+		  (setq d (cdr d))))
+	      (setq undo-list (cdr undo-list))))
+
+	    ;; process next element of current changeset
+	    (setq elt (cadr undo-list)))
+
+	  ;; if there are remaining elements in changeset, remove dummy nil
+	  ;; from front
+	  (if (cadr (undo-tree-node-undo fragment))
+	      (pop (undo-tree-node-undo fragment))
+	    ;; otherwise, if we've kept all elements in changeset, discard
+	    ;; empty changeset
+	    (when (eq splice fragment) (setq splice nil))
+	    (setq fragment (car (undo-tree-node-next fragment))))
+	  ;; process changeset from next node up the tree
+	  (setq node (undo-tree-node-previous node))))
+
+      ;; pop dummy nil from front of `region-changeset'
+      (setq region-changeset (cdr region-changeset))
+
+
+      ;; --- integrate branch into tree ---
+      ;; if no undo-in-region elements were found, restore undo tree
+      (if (null region-changeset)
+	  (when original-current
+	    (push original-fragment (undo-tree-node-next original-splice))
+	    (setf (undo-tree-node-branch original-splice) 0
+		  (undo-tree-node-previous original-fragment) original-splice)
+	    (let ((mark-active nil))
+	      (while (not (eq (undo-tree-current buffer-undo-tree)
+			      original-current))
+		(undo-tree-redo-1)))
+	    nil)  ; return nil to indicate failure
+
+	;; otherwise...
+	;; need to undo up to node where new branch will be attached, to
+	;; ensure redo entries are populated, and then redo back to where we
+	;; started
+	(let ((mark-active nil)
+	      (current (undo-tree-current buffer-undo-tree)))
+	  (while (not (eq (undo-tree-current buffer-undo-tree) node))
+	    (undo-tree-undo-1))
+	  (while (not (eq (undo-tree-current buffer-undo-tree) current))
+	    (undo-tree-redo-1)))
+
+	(cond
+	 ;; if there's no remaining fragment, just create undo-in-region node
+	 ;; and attach it to parent of last node from which elements were
+	 ;; pulled
+	 ((null fragment)
+	  (setq fragment (undo-tree-make-node node region-changeset))
+	  (push fragment (undo-tree-node-next node))
+	  (setf (undo-tree-node-branch node) 0)
+	  ;; set current node to undo-in-region node
+	  (setf (undo-tree-current buffer-undo-tree) fragment))
+
+	 ;; if no splice point has been set, add undo-in-region node to top of
+	 ;; fragment and attach it to parent of last node from which elements
+	 ;; were pulled
+	 ((null splice)
+	  (setq fragment (undo-tree-grow-backwards fragment region-changeset))
+	  (push fragment (undo-tree-node-next node))
+	  (setf (undo-tree-node-branch node) 0
+		(undo-tree-node-previous fragment) node)
+	  ;; set current node to undo-in-region node
+	  (setf (undo-tree-current buffer-undo-tree) fragment))
+
+	 ;; if fragment contains nodes, attach fragment to parent of last node
+	 ;; from which elements were pulled, and splice in undo-in-region node
+	 (t
+	  (setf (undo-tree-node-previous fragment) node)
+	  (push fragment (undo-tree-node-next node))
+	  (setf (undo-tree-node-branch node) 0)
+	  ;; if this is a repeated undo-in-region, then we've left the current
+	  ;; node at the original splice-point; we need to set the current
+	  ;; node to the equivalent node on the undo-in-region branch and redo
+	  ;; back to where we started
+	  (when repeated-undo-in-region
+	    (setf (undo-tree-current buffer-undo-tree)
+		  (undo-tree-node-previous original-fragment))
+	    (let ((mark-active nil))
+	      (while (not (eq (undo-tree-current buffer-undo-tree) splice))
+		(undo-tree-redo-1 nil 'preserve-undo))))
+	  ;; splice new undo-in-region node into fragment
+	  (setq node (undo-tree-make-node nil region-changeset))
+	  (undo-tree-splice-node node splice)
+	  ;; set current node to undo-in-region node
+	  (setf (undo-tree-current buffer-undo-tree) node)))
+
+	;; update undo-tree size
+	(setq node (undo-tree-node-previous fragment))
+	(while (progn
+		 (and (setq node (car (undo-tree-node-next node)))
+		      (not (eq node original-fragment))
+		      (incf (undo-tree-count buffer-undo-tree))
+		      (incf (undo-tree-size buffer-undo-tree)
+			    (+ (undo-list-byte-size (undo-tree-node-undo node))
+			       (undo-list-byte-size (undo-tree-node-redo node)))))))
+	t)  ; indicate undo-in-region branch was successfully pulled
+      )))
+
+
+
+(defun undo-tree-pull-redo-in-region-branch (start end)
+  ;; Pull out entries from redo changesets to create a new redo-in-region
+  ;; branch, which redoes changeset entries lying between START and END first,
+  ;; followed by remaining entries from the changesets. Repeated calls will,
+  ;; if appropriate, extend the current redo-in-region branch rather than
+  ;; creating a new one.
+
+  ;; if we're just reverting the last undo-in-region, we don't need to
+  ;; manipulate the undo tree at all
+  (if (undo-tree-reverting-undo-in-region-p start end)
+      t  ; return t to indicate success
+
+    ;; We build the `region-changeset' and `delta-list' lists forwards, using
+    ;; pointers `r' and `d' to the penultimate element of the list. So that we
+    ;; don't have to treat the first element differently, we prepend a dummy
+    ;; leading nil to the lists, and have the pointers point to that
+    ;; initially.
+    ;; Note: using '(nil) instead of (list nil) in the `let*' causes bizarre
+    ;;       errors when the code is byte-compiled, where parts of the lists
+    ;;       appear to survive across different calls to this function.  An
+    ;;       obscure byte-compiler bug, perhaps?
+    (let* ((region-changeset (list nil))
+	   (r region-changeset)
+	   (delta-list (list nil))
+	   (d delta-list)
+	   (node (undo-tree-current buffer-undo-tree))
+	   (repeated-redo-in-region
+	    (undo-tree-repeated-redo-in-region-p start end))
+	   undo-adjusted-markers  ; `undo-elt-in-region' expects this
+	   fragment splice got-visible-elt redo-list elt)
+
+      ;; --- inisitalisation ---
+      (cond
+       ;; if this is a repeated redo-in-region, detach fragment below current
+       ;; node
+       (repeated-redo-in-region
+	(when (setq fragment (car (undo-tree-node-next node)))
+	  (setf (undo-tree-node-previous fragment) nil
+		(undo-tree-node-next node)
+		(delq fragment (undo-tree-node-next node)))))
+       ;; if this is a new redo-in-region, initial fragment is a copy of all
+       ;; nodes below the current one in the active branch
+       ((undo-tree-node-next node)
+	(setq fragment (undo-tree-make-node nil nil)
+	      splice fragment)
+	(while (setq node (nth (undo-tree-node-branch node)
+			       (undo-tree-node-next node)))
+	  (push (undo-tree-make-node
+		 splice nil
+		 (undo-copy-list (undo-tree-node-redo node)))
+		(undo-tree-node-next splice))
+	  (setq splice (car (undo-tree-node-next splice))))
+	(setq fragment (car (undo-tree-node-next fragment)))))
+
+
+      ;; --- pull redo-in-region elements into branch ---
+      ;; work down fragment, pulling out redo elements within region until
+      ;; we've got one that redoes a visible change (insertion or deletion)
+      (setq node fragment)
+      (catch 'abort
+	(while (and (not got-visible-elt) node (undo-tree-node-redo node))
+	  ;; we cons a dummy nil element on the front of the changeset so that
+	  ;; we can conveniently remove the first (real) element from the
+	  ;; changeset if we need to; the leading nil is removed once we're
+	  ;; done with this changeset
+	  (setq redo-list (push nil (undo-tree-node-redo node))
+		elt (cadr redo-list))
+	  (while elt
+	    (cond
+	     ;; keep elements within region
+	     ((undo-elt-in-region elt start end)
+	      ;; set flag if kept element is visible (insertion or deletion)
+	      (when (and (consp elt)
+			 (or (stringp (car elt)) (integerp (car elt))))
+		(setq got-visible-elt t))
+	      ;; adjust buffer positions in elements previously redone before
+	      ;; kept element, as kept element will now be redone first
+	      (undo-tree-adjust-elements-to-elt fragment elt t)
+	      ;; move kept element to redo-in-region changeset, adjusting its
+	      ;; buffer position as it will now be redone first
+	      (setcdr r (list (undo-tree-apply-deltas elt (cdr delta-list) -1)))
+	      (setq r (cdr r))
+	      (setcdr redo-list (cddr redo-list)))
+
+	     ;; discard "was unmodified" elements
+	     ;; FIXME: deal properly with these
+	     ((and (consp elt) (eq (car elt) t))
+	      (setcdr redo-list (cddr redo-list)))
+
+	     ;; if element crosses region, we can't pull any more elements
+	     ((undo-elt-crosses-region elt start end)
+	      ;; if we've found a visible element, it must be earlier in
+	      ;; current node's changeset; stop pulling elements (null
+	      ;; `redo-list' and non-nil `got-visible-elt' cause loop to exit)
+	      (if got-visible-elt
+		  (setq redo-list nil)
+		;; if we haven't found a visible element yet, pulling
+		;; redo-in-region branch has failed
+		(setq region-changeset nil)
+		(throw 'abort t)))
+
+	     ;; if rejecting element, add its delta (if any) to the list
+	     (t
+	      (let ((delta (undo-delta elt)))
+		(when (/= 0 (cdr delta))
+		  (setcdr d (list delta))
+		  (setq d (cdr d))))
+	      (setq redo-list (cdr redo-list))))
+
+	    ;; process next element of current changeset
+	    (setq elt (cadr redo-list)))
+
+	  ;; if there are remaining elements in changeset, remove dummy nil
+	  ;; from front
+	  (if (cadr (undo-tree-node-redo node))
+	      (pop (undo-tree-node-undo node))
+	    ;; otherwise, if we've kept all elements in changeset, discard
+	    ;; empty changeset
+	    (if (eq fragment node)
+		(setq fragment (car (undo-tree-node-next fragment)))
+	      (undo-tree-snip-node node)))
+	  ;; process changeset from next node in fragment
+	  (setq node (car (undo-tree-node-next node)))))
+
+      ;; pop dummy nil from front of `region-changeset'
+      (setq region-changeset (cdr region-changeset))
+
+
+      ;; --- integrate branch into tree ---
+      (setq node (undo-tree-current buffer-undo-tree))
+      ;; if no redo-in-region elements were found, restore undo tree
+      (if (null (car region-changeset))
+	  (when (and repeated-redo-in-region fragment)
+	    (push fragment (undo-tree-node-next node))
+	    (setf (undo-tree-node-branch node) 0
+		  (undo-tree-node-previous fragment) node)
+	    nil)  ; return nil to indicate failure
+
+	;; otherwise, add redo-in-region node to top of fragment, and attach
+	;; it below current node
+	(setq fragment
+	      (if fragment
+		  (undo-tree-grow-backwards fragment nil region-changeset)
+		(undo-tree-make-node nil nil region-changeset)))
+	(push fragment (undo-tree-node-next node))
+	(setf (undo-tree-node-branch node) 0
+	      (undo-tree-node-previous fragment) node)
+	;; update undo-tree size
+	(unless repeated-redo-in-region
+	  (setq node fragment)
+	  (while (and (setq node (car (undo-tree-node-next node)))
+		      (incf (undo-tree-count buffer-undo-tree))
+		      (incf (undo-tree-size buffer-undo-tree)
+			    (undo-list-byte-size
+			     (undo-tree-node-redo node))))))
+	(incf (undo-tree-size buffer-undo-tree)
+	      (undo-list-byte-size (undo-tree-node-redo fragment)))
+	t)  ; indicate redo-in-region branch was successfully pulled
+      )))
+
+
+
+(defun undo-tree-adjust-elements-to-elt (node undo-elt &optional below)
+  "Adjust buffer positions of undo elements, starting at NODE's
+and going up the tree (or down the active branch if BELOW is
+non-nil) and through the nodes' undo elements until we reach
+UNDO-ELT.  UNDO-ELT must appear somewhere in the undo changeset
+of either NODE itself or some node above it in the tree."
+  (let ((delta (list (undo-delta undo-elt)))
+	(undo-list (undo-tree-node-undo node)))
+    ;; adjust elements until we reach UNDO-ELT
+    (while (and (car undo-list)
+		(not (eq (car undo-list) undo-elt)))
+      (setcar undo-list
+	      (undo-tree-apply-deltas (car undo-list) delta -1))
+      ;; move to next undo element in list, or to next node if we've run out
+      ;; of elements
+      (unless (car (setq undo-list (cdr undo-list)))
+	(if below
+	    (setq node (nth (undo-tree-node-branch node)
+			    (undo-tree-node-next node)))
+	  (setq node (undo-tree-node-previous node)))
+	(setq undo-list (undo-tree-node-undo node))))))
+
+
+
+(defun undo-tree-apply-deltas (undo-elt deltas &optional sgn)
+  ;; Apply DELTAS in order to UNDO-ELT, multiplying deltas by SGN
+  ;; (only useful value for SGN is -1).
+  (let (position offset)
+    (dolist (delta deltas)
+      (setq position (car delta)
+	    offset (* (cdr delta) (or sgn 1)))
+      (cond
+       ;; POSITION
+       ((integerp undo-elt)
+	(when (>= undo-elt position)
+	  (setq undo-elt (- undo-elt offset))))
+       ;; nil (or any other atom)
+       ((atom undo-elt))
+       ;; (TEXT . POSITION)
+       ((stringp (car undo-elt))
+	(let ((text-pos (abs (cdr undo-elt)))
+	      (point-at-end (< (cdr undo-elt) 0)))
+	  (if (>= text-pos position)
+	      (setcdr undo-elt (* (if point-at-end -1 1)
+				  (- text-pos offset))))))
+       ;; (BEGIN . END)
+       ((integerp (car undo-elt))
+	(when (>= (car undo-elt) position)
+	  (setcar undo-elt (- (car undo-elt) offset))
+	  (setcdr undo-elt (- (cdr undo-elt) offset))))
+       ;; (nil PROPERTY VALUE BEG . END)
+       ((null (car undo-elt))
+	(let ((tail (nthcdr 3 undo-elt)))
+	  (when (>= (car tail) position)
+	    (setcar tail (- (car tail) offset))
+	    (setcdr tail (- (cdr tail) offset)))))
+       ))
+    undo-elt))
+
+
+
+(defun undo-tree-repeated-undo-in-region-p (start end)
+  ;; Return non-nil if undo-in-region between START and END is a repeated
+  ;; undo-in-region
+  (let ((node (undo-tree-current buffer-undo-tree)))
+    (and (setq node
+	       (nth (undo-tree-node-branch node) (undo-tree-node-next node)))
+	 (eq (undo-tree-node-undo-beginning node) start)
+	 (eq (undo-tree-node-undo-end node) end))))
+
+
+(defun undo-tree-repeated-redo-in-region-p (start end)
+  ;; Return non-nil if undo-in-region between START and END is a repeated
+  ;; undo-in-region
+  (let ((node (undo-tree-current buffer-undo-tree)))
+    (and (eq (undo-tree-node-redo-beginning node) start)
+	 (eq (undo-tree-node-redo-end node) end))))
+
+
+;; Return non-nil if undo-in-region between START and END is simply
+;; reverting the last redo-in-region
+(defalias 'undo-tree-reverting-undo-in-region-p
+  'undo-tree-repeated-undo-in-region-p)
+
+
+;; Return non-nil if redo-in-region between START and END is simply
+;; reverting the last undo-in-region
+(defalias 'undo-tree-reverting-redo-in-region-p
+  'undo-tree-repeated-redo-in-region-p)
+
+
+
+
+;;; =====================================================================
+;;;                        Undo-tree commands
+
+;;;###autoload
+(define-minor-mode undo-tree-mode
+  "Toggle undo-tree mode.
+With no argument, this command toggles the mode.
+A positive prefix argument turns the mode on.
+A negative prefix argument turns it off.
+
+Undo-tree-mode replaces Emacs' standard undo feature with a more
+powerful yet easier to use version, that treats the undo history
+as what it is: a tree.
+
+The following keys are available in `undo-tree-mode':
+
+  \\{undo-tree-map}
+
+Within the undo-tree visualizer, the following keys are available:
+
+  \\{undo-tree-visualizer-map}"
+
+  nil                       ; init value
+  undo-tree-mode-lighter    ; lighter
+  undo-tree-map             ; keymap
+
+  ;; if disabling `undo-tree-mode', rebuild `buffer-undo-list' from tree so
+  ;; Emacs undo can work
+  (if (not undo-tree-mode)
+    (undo-list-rebuild-from-tree)
+    (setq buffer-undo-tree nil)))
+
+
+(defun turn-on-undo-tree-mode (&optional print-message)
+  "Enable `undo-tree-mode' in the current buffer, when appropriate.
+Some major modes implement their own undo system, which should
+not normally be overridden by `undo-tree-mode'. This command does
+not enable `undo-tree-mode' in such buffers. If you want to force
+`undo-tree-mode' to be enabled regardless, use (undo-tree-mode 1)
+instead.
+
+The heuristic used to detect major modes in which
+`undo-tree-mode' should not be used is to check whether either
+the `undo' command has been remapped, or the default undo
+keybindings (C-/ and C-_) have been overridden somewhere other
+than in the global map. In addition, `undo-tree-mode' will not be
+enabled if the buffer's `major-mode' appears in
+`undo-tree-incompatible-major-modes'."
+  (interactive "p")
+  (if (or (key-binding [remap undo])
+	  (undo-tree-overridden-undo-bindings-p)
+	  (memq major-mode undo-tree-incompatible-major-modes))
+      (when print-message
+	(message "Buffer does not support undo-tree-mode;\
+ undo-tree-mode NOT enabled"))
+    (undo-tree-mode 1)))
+
+
+(defun undo-tree-overridden-undo-bindings-p ()
+  "Returns t if default undo bindings are overridden, nil otherwise.
+Checks if either of the default undo key bindings (\"C-/\" or
+\"C-_\") are overridden in the current buffer by any keymap other
+than the global one. (So global redefinitions of the default undo
+key bindings do not count.)"
+  (let ((binding1 (lookup-key (current-global-map) [?\C-/]))
+	(binding2 (lookup-key (current-global-map) [?\C-_])))
+    (global-set-key [?\C-/] 'undo)
+    (global-set-key [?\C-_] 'undo)
+    (unwind-protect
+	(or (and (key-binding [?\C-/])
+		 (not (eq (key-binding [?\C-/]) 'undo)))
+	    (and (key-binding [?\C-_])
+		 (not (eq (key-binding [?\C-_]) 'undo))))
+      (global-set-key [?\C-/] binding1)
+      (global-set-key [?\C-_] binding2))))
+
+
+;;;###autoload
+(define-globalized-minor-mode global-undo-tree-mode
+  undo-tree-mode turn-on-undo-tree-mode)
+
+
+
+(defun undo-tree-undo (&optional arg)
+  "Undo changes.
+Repeat this command to undo more changes.
+A numeric ARG serves as a repeat count.
+
+In Transient Mark mode when the mark is active, only undo changes
+within the current region. Similarly, when not in Transient Mark
+mode, just \\[universal-argument] as an argument limits undo to
+changes within the current region."
+  (interactive "*P")
+  ;; throw error if undo is disabled in buffer
+  (when (eq buffer-undo-list t) (error "No undo information in this buffer"))
+  (undo-tree-undo-1 arg)
+  ;; inform user if at branch point
+  (when (> (undo-tree-num-branches) 1) (message "Undo branch point!")))
+
+
+(defun undo-tree-undo-1 (&optional arg preserve-redo preserve-timestamps)
+  ;; Internal undo function. An active mark in `transient-mark-mode', or
+  ;; non-nil ARG otherwise, enables undo-in-region. Non-nil PRESERVE-REDO
+  ;; causes the existing redo record to be preserved, rather than replacing it
+  ;; with the new one generated by undoing. Non-nil PRESERVE-TIMESTAMPS
+  ;; disables updating of timestamps in visited undo-tree nodes. (This latter
+  ;; should *only* be used when temporarily visiting another undo state and
+  ;; immediately returning to the original state afterwards. Otherwise, it
+  ;; could cause history-discarding errors.)
+  (let ((undo-in-progress t)
+	(undo-in-region (and undo-tree-enable-undo-in-region
+			     (or (region-active-p)
+				 (and arg (not (numberp arg))))))
+	pos current)
+    ;; transfer entries accumulated in `buffer-undo-list' to
+    ;; `buffer-undo-tree'
+    (undo-list-transfer-to-tree)
+
+    (dotimes (i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
+      ;; check if at top of undo tree
+      (unless (undo-tree-node-previous (undo-tree-current buffer-undo-tree))
+	(error "No further undo information"))
+
+      ;; if region is active, or a non-numeric prefix argument was supplied,
+      ;; try to pull out a new branch of changes affecting the region
+      (when (and undo-in-region
+		 (not (undo-tree-pull-undo-in-region-branch
+		       (region-beginning) (region-end))))
+	(error "No further undo information for region"))
+
+      ;; remove any GC'd elements from node's undo list
+      (setq current (undo-tree-current buffer-undo-tree))
+      (decf (undo-tree-size buffer-undo-tree)
+	    (undo-list-byte-size (undo-tree-node-undo current)))
+      (setf (undo-tree-node-undo current)
+	    (undo-list-clean-GCd-elts (undo-tree-node-undo current)))
+      (incf (undo-tree-size buffer-undo-tree)
+	    (undo-list-byte-size (undo-tree-node-undo current)))
+      ;; undo one record from undo tree
+      (when undo-in-region
+	(setq pos (set-marker (make-marker) (point)))
+	(set-marker-insertion-type pos t))
+      (primitive-undo 1 (undo-tree-copy-list (undo-tree-node-undo current)))
+      (undo-boundary)
+
+      ;; if preserving old redo record, discard new redo entries that
+      ;; `primitive-undo' has added to `buffer-undo-list', and remove any GC'd
+      ;; elements from node's redo list
+      (if preserve-redo
+	  (progn
+	    (undo-list-pop-changeset)
+	    (decf (undo-tree-size buffer-undo-tree)
+		  (undo-list-byte-size (undo-tree-node-redo current)))
+	    (setf (undo-tree-node-redo current)
+		  (undo-list-clean-GCd-elts (undo-tree-node-redo current)))
+	    (incf (undo-tree-size buffer-undo-tree)
+		  (undo-list-byte-size (undo-tree-node-redo current))))
+	;; otherwise, record redo entries that `primitive-undo' has added to
+	;; `buffer-undo-list' in current node's redo record, replacing
+	;; existing entry if one already exists
+	(decf (undo-tree-size buffer-undo-tree)
+	      (undo-list-byte-size (undo-tree-node-redo current)))
+	(setf (undo-tree-node-redo current)
+	      (undo-list-pop-changeset 'discard-pos))
+	(incf (undo-tree-size buffer-undo-tree)
+	      (undo-list-byte-size (undo-tree-node-redo current))))
+
+      ;; rewind current node and update timestamp
+      (setf (undo-tree-current buffer-undo-tree)
+	    (undo-tree-node-previous (undo-tree-current buffer-undo-tree)))
+      (unless preserve-timestamps
+	(setf (undo-tree-node-timestamp (undo-tree-current buffer-undo-tree))
+	      (current-time)))
+
+      ;; if undoing-in-region, record current node, region and direction so we
+      ;; can tell if undo-in-region is repeated, and re-activate mark if in
+      ;; `transient-mark-mode'; if not, erase any leftover data
+      (if (not undo-in-region)
+	  (undo-tree-node-clear-region-data current)
+	(goto-char pos)
+	;; note: we deliberately want to store the region information in the
+	;; node *below* the now current one
+	(setf (undo-tree-node-undo-beginning current) (region-beginning)
+	      (undo-tree-node-undo-end current) (region-end))
+	(set-marker pos nil)))
+
+    ;; undo deactivates mark unless undoing-in-region
+    (setq deactivate-mark (not undo-in-region))))
+
+
+
+(defun undo-tree-redo (&optional arg)
+  "Redo changes. A numeric ARG serves as a repeat count.
+
+In Transient Mark mode when the mark is active, only redo changes
+within the current region. Similarly, when not in Transient Mark
+mode, just \\[universal-argument] as an argument limits redo to
+changes within the current region."
+  (interactive "*P")
+  ;; throw error if undo is disabled in buffer
+  (when (eq buffer-undo-list t) (error "No undo information in this buffer"))
+  (undo-tree-redo-1 arg)
+  ;; inform user if at branch point
+  (when (> (undo-tree-num-branches) 1) (message "Undo branch point!")))
+
+
+(defun undo-tree-redo-1 (&optional arg preserve-undo preserve-timestamps)
+  ;; Internal redo function. An active mark in `transient-mark-mode', or
+  ;; non-nil ARG otherwise, enables undo-in-region. Non-nil PRESERVE-UNDO
+  ;; causes the existing redo record to be preserved, rather than replacing it
+  ;; with the new one generated by undoing. Non-nil PRESERVE-TIMESTAMPS
+  ;; disables updating of timestamps in visited undo-tree nodes. (This latter
+  ;; should *only* be used when temporarily visiting another undo state and
+  ;; immediately returning to the original state afterwards. Otherwise, it
+  ;; could cause history-discarding errors.)
+  (let ((undo-in-progress t)
+	(redo-in-region (and undo-tree-enable-undo-in-region
+			     (or (region-active-p)
+				 (and arg (not (numberp arg))))))
+	pos current)
+    ;; transfer entries accumulated in `buffer-undo-list' to
+    ;; `buffer-undo-tree'
+    (undo-list-transfer-to-tree)
+
+    (dotimes (i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
+      ;; check if at bottom of undo tree
+      (when (null (undo-tree-node-next (undo-tree-current buffer-undo-tree)))
+	(error "No further redo information"))
+
+      ;; if region is active, or a non-numeric prefix argument was supplied,
+      ;; try to pull out a new branch of changes affecting the region
+      (when (and redo-in-region
+		 (not (undo-tree-pull-redo-in-region-branch
+		       (region-beginning) (region-end))))
+	(error "No further redo information for region"))
+
+      ;; get next node (but DON'T advance current node in tree yet, in case
+      ;; redoing fails)
+      (setq current (undo-tree-current buffer-undo-tree)
+	    current (nth (undo-tree-node-branch current)
+			 (undo-tree-node-next current)))
+      ;; remove any GC'd elements from node's redo list
+      (decf (undo-tree-size buffer-undo-tree)
+	    (undo-list-byte-size (undo-tree-node-redo current)))
+      (setf (undo-tree-node-redo current)
+	    (undo-list-clean-GCd-elts (undo-tree-node-redo current)))
+      (incf (undo-tree-size buffer-undo-tree)
+	    (undo-list-byte-size (undo-tree-node-redo current)))
+      ;; redo one record from undo tree
+      (when redo-in-region
+	(setq pos (set-marker (make-marker) (point)))
+	(set-marker-insertion-type pos t))
+      (primitive-undo 1 (undo-tree-copy-list (undo-tree-node-redo current)))
+      (undo-boundary)
+      ;; advance current node in tree
+      (setf (undo-tree-current buffer-undo-tree) current)
+
+      ;; if preserving old undo record, discard new undo entries that
+      ;; `primitive-undo' has added to `buffer-undo-list', and remove any GC'd
+      ;; elements from node's redo list
+      (if preserve-undo
+	  (progn
+	    (undo-list-pop-changeset)
+	    (decf (undo-tree-size buffer-undo-tree)
+		  (undo-list-byte-size (undo-tree-node-undo current)))
+	    (setf (undo-tree-node-undo current)
+		  (undo-list-clean-GCd-elts (undo-tree-node-undo current)))
+	    (incf (undo-tree-size buffer-undo-tree)
+		  (undo-list-byte-size (undo-tree-node-undo current))))
+	;; otherwise, record undo entries that `primitive-undo' has added to
+	;; `buffer-undo-list' in current node's undo record, replacing
+	;; existing entry if one already exists
+	(decf (undo-tree-size buffer-undo-tree)
+	      (undo-list-byte-size (undo-tree-node-undo current)))
+	(setf (undo-tree-node-undo current)
+	      (undo-list-pop-changeset 'discard-pos))
+	(incf (undo-tree-size buffer-undo-tree)
+	      (undo-list-byte-size (undo-tree-node-undo current))))
+
+      ;; update timestamp
+      (unless preserve-timestamps
+	(setf (undo-tree-node-timestamp current) (current-time)))
+
+      ;; if redoing-in-region, record current node, region and direction so we
+      ;; can tell if redo-in-region is repeated, and re-activate mark if in
+      ;; `transient-mark-mode'
+      (if (not redo-in-region)
+	  (undo-tree-node-clear-region-data current)
+	(goto-char pos)
+	(setf (undo-tree-node-redo-beginning current) (region-beginning)
+	      (undo-tree-node-redo-end current) (region-end))
+	(set-marker pos nil)))
+
+    ;; redo deactivates the mark unless redoing-in-region
+    (setq deactivate-mark (not redo-in-region))))
+
+
+
+(defun undo-tree-switch-branch (branch)
+  "Switch to a different BRANCH of the undo tree.
+This will affect which branch to descend when *redoing* changes
+using `undo-tree-redo'."
+  (interactive (list (or (and prefix-arg (prefix-numeric-value prefix-arg))
+                         (and (not (eq buffer-undo-list t))
+			      (or (undo-list-transfer-to-tree) t)
+			      (let ((b (undo-tree-node-branch
+					(undo-tree-current
+					 buffer-undo-tree))))
+				(cond
+				 ;; switch to other branch if only 2
+				 ((= (undo-tree-num-branches) 2) (- 1 b))
+				 ;; prompt if more than 2
+				 ((> (undo-tree-num-branches) 2)
+				  (read-number
+				   (format "Branch (0-%d, on %d): "
+					   (1- (undo-tree-num-branches)) b)))
+				 ))))))
+  ;; throw error if undo is disabled in buffer
+  (when (eq buffer-undo-list t) (error "No undo information in this buffer"))
+  ;; sanity check branch number
+  (when (<= (undo-tree-num-branches) 1) (error "Not at undo branch point"))
+  (when (or (< branch 0) (> branch (1- (undo-tree-num-branches))))
+    (error "Invalid branch number"))
+  ;; transfer entries accumulated in `buffer-undo-list' to `buffer-undo-tree'
+  (undo-list-transfer-to-tree)
+  ;; switch branch
+  (setf (undo-tree-node-branch (undo-tree-current buffer-undo-tree))
+	branch)
+  (message "Switched to branch %d" branch))
+
+
+(defun undo-tree-set (node &optional preserve-timestamps)
+  ;; Set buffer to state corresponding to NODE. Returns intersection point
+  ;; between path back from current node and path back from selected NODE.
+  ;; Non-nil PRESERVE-TIMESTAMPS disables updating of timestamps in visited
+  ;; undo-tree nodes. (This should *only* be used when temporarily visiting
+  ;; another undo state and immediately returning to the original state
+  ;; afterwards. Otherwise, it could cause history-discarding errors.)
+  (let ((path (make-hash-table :test 'eq))
+        (n node))
+    (puthash (undo-tree-root buffer-undo-tree) t path)
+    ;; build list of nodes leading back from selected node to root, updating
+    ;; branches as we go to point down to selected node
+    (while (progn
+             (puthash n t path)
+             (when (undo-tree-node-previous n)
+               (setf (undo-tree-node-branch (undo-tree-node-previous n))
+                     (undo-tree-position
+                      n (undo-tree-node-next (undo-tree-node-previous n))))
+               (setq n (undo-tree-node-previous n)))))
+    ;; work backwards from current node until we intersect path back from
+    ;; selected node
+    (setq n (undo-tree-current buffer-undo-tree))
+    (while (not (gethash n path))
+      (setq n (undo-tree-node-previous n)))
+    ;; ascend tree until intersection node
+    (while (not (eq (undo-tree-current buffer-undo-tree) n))
+      (undo-tree-undo-1 nil nil preserve-timestamps))
+    ;; descend tree until selected node
+    (while (not (eq (undo-tree-current buffer-undo-tree) node))
+      (undo-tree-redo-1 nil nil preserve-timestamps))
+    n))  ; return intersection node
+
+
+
+(defun undo-tree-save-state-to-register (register)
+  "Store current undo-tree state to REGISTER.
+The saved state can be restored using
+`undo-tree-restore-state-from-register'.
+Argument is a character, naming the register."
+  (interactive "cUndo-tree state to register: ")
+  ;; throw error if undo is disabled in buffer
+  (when (eq buffer-undo-list t) (error "No undo information in this buffer"))
+  ;; transfer entries accumulated in `buffer-undo-list' to `buffer-undo-tree'
+  (undo-list-transfer-to-tree)
+  ;; save current node to REGISTER
+  (set-register
+   register (registerv-make
+	     (undo-tree-make-register-data
+	      (current-buffer) (undo-tree-current buffer-undo-tree))
+	     :print-func 'undo-tree-register-data-print-func))
+  ;; record REGISTER in current node, for visualizer
+  (setf (undo-tree-node-register (undo-tree-current buffer-undo-tree))
+	register))
+
+
+
+(defun undo-tree-restore-state-from-register (register)
+  "Restore undo-tree state from REGISTER.
+The state must be saved using `undo-tree-save-state-to-register'.
+Argument is a character, naming the register."
+  (interactive "*cRestore undo-tree state from register: ")
+  ;; throw error if undo is disabled in buffer, or if register doesn't contain
+  ;; an undo-tree node
+  (let ((data (registerv-data (get-register register))))
+    (cond
+     ((eq buffer-undo-list t)
+      (error "No undo information in this buffer"))
+     ((not (undo-tree-register-data-p data))
+      (error "Register doesn't contain undo-tree state"))
+     ((not (eq (current-buffer) (undo-tree-register-data-buffer data)))
+      (error "Register contains undo-tree state for a different buffer")))
+    ;; transfer entries accumulated in `buffer-undo-list' to `buffer-undo-tree'
+    (undo-list-transfer-to-tree)
+    ;; restore buffer state corresponding to saved node
+    (undo-tree-set (undo-tree-register-data-node data))))
+
+
+
+
+;;; =====================================================================
+;;;                    Persistent storage commands
+
+(defun undo-tree-make-history-save-file-name (file)
+  "Create the undo history file name for FILE.
+Normally this is the file's name with `.' prepended and
+`~undo-tree~' appended.
+
+A match for FILE is sought in `undo-tree-history-directory-alist';
+see the documentation of that variable.  If the directory for the
+backup doesn't exist, it is created."
+  (let* ((backup-directory-alist undo-tree-history-directory-alist)
+	 (name (make-backup-file-name-1 file)))
+    (concat (file-name-directory name) "." (file-name-nondirectory name)
+	    "~undo-tree~")))
+
+
+(defun undo-tree-save-history (&optional filename overwrite)
+  "Store undo-tree history to file.
+
+If optional argument FILENAME is omitted, default save file is
+\".<buffer-file-name>.~undo-tree\" if buffer is visiting a file.
+Otherwise, prompt for one.
+
+If OVERWRITE is non-nil, any existing file will be overwritten
+without asking for confirmation."
+  (interactive)
+  (when (eq buffer-undo-list t) (error "No undo information in this buffer"))
+  (undo-list-transfer-to-tree)
+  (when (and buffer-undo-tree (not (eq buffer-undo-tree t)))
+    (condition-case nil
+	(undo-tree-kill-visualizer)
+      (error (undo-tree-clear-visualizer-data buffer-undo-tree)))
+    (let ((buff (current-buffer))
+	  tree)
+      ;; get filename
+      (unless filename
+	(setq filename
+	      (if buffer-file-name
+		  (undo-tree-make-history-save-file-name buffer-file-name)
+		(expand-file-name (read-file-name "File to save in: ") nil))))
+      (when (or (not (file-exists-p filename))
+		overwrite
+		(yes-or-no-p (format "Overwrite \"%s\"? " filename)))
+	(unwind-protect
+	    (progn
+	      ;; transform undo-tree into non-circular structure, and make
+	      ;; temporary copy
+	      (undo-tree-decircle buffer-undo-tree)
+	      (setq tree (copy-undo-tree buffer-undo-tree))
+	      ;; discard undo-tree object pool before saving
+	      (setf (undo-tree-object-pool tree) nil)
+	      ;; print undo-tree to file
+	      ;; NOTE: We use `with-temp-buffer' instead of `with-temp-file'
+	      ;;       to allow `auto-compression-mode' to take effect, in
+	      ;;       case user has overridden or advised the default
+	      ;;       `undo-tree-make-history-save-file-name' to add a
+	      ;;       compressed file extension.
+	      (with-auto-compression-mode
+		(with-temp-buffer
+		  (prin1 (sha1 buff) (current-buffer))
+		  (terpri (current-buffer))
+		  (let ((print-circle t)) (prin1 tree (current-buffer)))
+		  (write-region nil nil filename))))
+	  ;; restore circular undo-tree data structure
+	  (undo-tree-recircle buffer-undo-tree))
+	))))
+
+
+
+(defun undo-tree-load-history (&optional filename noerror)
+  "Load undo-tree history from file.
+
+If optional argument FILENAME is null, default load file is
+\".<buffer-file-name>.~undo-tree\" if buffer is visiting a file.
+Otherwise, prompt for one.
+
+If optional argument NOERROR is non-nil, return nil instead of
+signaling an error if file is not found."
+  (interactive)
+  ;; get filename
+  (unless filename
+    (setq filename
+	  (if buffer-file-name
+	      (undo-tree-make-history-save-file-name buffer-file-name)
+	    (expand-file-name (read-file-name "File to load from: ") nil))))
+
+  ;; attempt to read undo-tree from FILENAME
+  (catch 'load-error
+    (unless (file-exists-p filename)
+      (if noerror
+	  (throw 'load-error nil)
+	(error "File \"%s\" does not exist; could not load undo-tree history"
+	       filename)))
+    (let (buff hash tree)
+      (setq buff (current-buffer))
+      (with-auto-compression-mode
+	(with-temp-buffer
+	  (insert-file-contents filename)
+	  (goto-char (point-min))
+	  (condition-case nil
+	      (setq hash (read (current-buffer)))
+	    (error
+	     (kill-buffer nil)
+	     (funcall (if noerror 'message 'error)
+		      "Error reading undo-tree history from \"%s\"" filename)
+	     (throw 'load-error nil)))
+	  (unless (string= (sha1 buff) hash)
+	    (kill-buffer nil)
+	    (funcall (if noerror 'message 'error)
+		     "Buffer has been modified; could not load undo-tree history")
+	    (throw 'load-error nil))
+	  (condition-case nil
+	      (setq tree (read (current-buffer)))
+	    (error
+	     (kill-buffer nil)
+	     (funcall (if noerror 'message 'error)
+		      "Error reading undo-tree history from \"%s\"" filename)
+	     (throw 'load-error nil)))
+	  (kill-buffer nil)))
+      ;; initialise empty undo-tree object pool
+      (setf (undo-tree-object-pool tree)
+	    (make-hash-table :test 'eq :weakness 'value))
+      ;; restore circular undo-tree data structure
+      (undo-tree-recircle tree)
+      (setq buffer-undo-tree tree))))
+
+
+
+;; Versions of save/load functions for use in hooks
+(defun undo-tree-save-history-hook ()
+  (when (and undo-tree-mode undo-tree-auto-save-history
+	     (not (eq buffer-undo-list t)))
+    (undo-tree-save-history nil t) nil))
+
+(defun undo-tree-load-history-hook ()
+  (when (and undo-tree-mode undo-tree-auto-save-history
+	     (not (eq buffer-undo-list t)))
+    (undo-tree-load-history nil t)))
+
+
+
+
+;;; =====================================================================
+;;;                    Visualizer drawing functions
+
+(defun undo-tree-visualize ()
+  "Visualize the current buffer's undo tree."
+  (interactive "*")
+  (deactivate-mark)
+  ;; throw error if undo is disabled in buffer
+  (when (eq buffer-undo-list t) (error "No undo information in this buffer"))
+  ;; transfer entries accumulated in `buffer-undo-list' to `buffer-undo-tree'
+  (undo-list-transfer-to-tree)
+  ;; add hook to kill visualizer buffer if original buffer is changed
+  (add-hook 'before-change-functions 'undo-tree-kill-visualizer nil t)
+  ;; prepare *undo-tree* buffer, then draw tree in it
+  (let ((undo-tree buffer-undo-tree)
+        (buff (current-buffer))
+	(display-buffer-mark-dedicated 'soft))
+    (switch-to-buffer-other-window
+     (get-buffer-create undo-tree-visualizer-buffer-name))
+    (setq undo-tree-visualizer-parent-buffer buff)
+    (setq undo-tree-visualizer-parent-mtime
+	  (and (buffer-file-name buff)
+	       (nth 5 (file-attributes (buffer-file-name buff)))))
+    (setq buffer-undo-tree undo-tree)
+    (setq undo-tree-visualizer-initial-node (undo-tree-current undo-tree))
+    (setq undo-tree-visualizer-spacing
+	  (undo-tree-visualizer-calculate-spacing))
+    (make-local-variable 'undo-tree-visualizer-timestamps)
+    (make-local-variable 'undo-tree-visualizer-diff)
+    (set (make-local-variable 'undo-tree-visualizer-lazy-drawing)
+	 (or (eq undo-tree-visualizer-lazy-drawing t)
+	     (and (numberp undo-tree-visualizer-lazy-drawing)
+		  (>= (undo-tree-count undo-tree)
+		      undo-tree-visualizer-lazy-drawing))))
+    (when undo-tree-visualizer-diff (undo-tree-visualizer-show-diff))
+    (undo-tree-visualizer-mode)
+    (let ((inhibit-read-only t)) (undo-tree-draw-tree undo-tree))))
+
+
+(defun undo-tree-kill-visualizer (&rest _dummy)
+  ;; Kill visualizer. Added to `before-change-functions' hook of original
+  ;; buffer when visualizer is invoked.
+  (unless undo-tree-inhibit-kill-visualizer
+    (unwind-protect
+	(with-current-buffer undo-tree-visualizer-buffer-name
+	  (undo-tree-visualizer-quit)))))
+
+
+
+(defun undo-tree-draw-tree (undo-tree)
+  ;; Draw undo-tree in current buffer starting from NODE (or root if nil).
+  (let ((node (if undo-tree-visualizer-lazy-drawing
+		  (undo-tree-current undo-tree)
+		(undo-tree-root undo-tree))))
+    (erase-buffer)
+    (undo-tree-clear-visualizer-data undo-tree)
+    (undo-tree-compute-widths node)
+    ;; lazy drawing starts vertically centred and displaced horizontally to
+    ;; the left (window-width/4), since trees will typically grow right
+    (if undo-tree-visualizer-lazy-drawing
+	(progn
+	  (undo-tree-move-down (/ (window-height) 2))
+	  (undo-tree-move-forward (max 2 (/ (window-width) 4)))) ; left margin
+      ;; non-lazy drawing starts in centre at top of buffer
+      (undo-tree-move-down 1)  ; top margin
+      (undo-tree-move-forward
+       (max (/ (window-width) 2)
+	    (+ (undo-tree-node-char-lwidth node)
+	       ;; add space for left part of left-most time-stamp
+	       (if undo-tree-visualizer-timestamps
+		   (/ (- undo-tree-visualizer-spacing 4) 2)
+		 0)
+	       2))))  ; left margin
+    ;; link starting node to its representation in visualizer
+    (setf (undo-tree-node-marker node) (make-marker))
+    (set-marker-insertion-type (undo-tree-node-marker node) nil)
+    (move-marker (undo-tree-node-marker node) (point))
+    ;; draw undo-tree
+    (let ((undo-tree-insert-face 'undo-tree-visualizer-default-face)
+	  node-list)
+      (if (not undo-tree-visualizer-lazy-drawing)
+	  (undo-tree-extend-down node t)
+	(undo-tree-extend-down node)
+	(undo-tree-extend-up node)
+	(setq node-list undo-tree-visualizer-needs-extending-down
+	      undo-tree-visualizer-needs-extending-down nil)
+	(while node-list (undo-tree-extend-down (pop node-list)))))
+    ;; highlight active branch
+    (let ((undo-tree-insert-face 'undo-tree-visualizer-active-branch-face))
+      (undo-tree-highlight-active-branch
+       (or undo-tree-visualizer-needs-extending-up
+	   (undo-tree-root undo-tree))))
+    ;; highlight current node
+    (undo-tree-draw-node (undo-tree-current undo-tree) 'current)))
+
+
+(defun undo-tree-extend-down (node &optional bottom)
+  ;; Extend tree downwards starting from NODE and point. If BOTTOM is t,
+  ;; extend all the way down to the leaves. If BOTTOM is a node, extend down
+  ;; as far as that node. If BOTTOM is an integer, extend down as far as that
+  ;; line. Otherwise, only extend visible portion of tree. NODE is assumed to
+  ;; already have a node marker. Returns non-nil if anything was actually
+  ;; extended.
+  (let ((extended nil)
+	(cur-stack (list node))
+	next-stack)
+    ;; don't bother extending if BOTTOM specifies an already-drawn node
+    (unless (and (undo-tree-node-p bottom) (undo-tree-node-marker bottom))
+      ;; draw nodes layer by layer
+      (while (or cur-stack
+		 (prog1 (setq cur-stack next-stack)
+		   (setq next-stack nil)))
+	(setq node (pop cur-stack))
+	;; if node is within range being drawn...
+	(if (or (eq bottom t)
+		(and (undo-tree-node-p bottom)
+		     (not (eq (undo-tree-node-previous node) bottom)))
+		(and (integerp bottom)
+		     (>= bottom (line-number-at-pos
+				 (undo-tree-node-marker node))))
+		(and (null bottom)
+		     (pos-visible-in-window-p (undo-tree-node-marker node)
+					      nil t)))
+	    ;; ...draw one layer of node's subtree (if not already drawn)
+	    (progn
+	      (unless (and (undo-tree-node-next node)
+			   (undo-tree-node-marker
+			    (nth (undo-tree-node-branch node)
+				 (undo-tree-node-next node))))
+		(goto-char (undo-tree-node-marker node))
+		(undo-tree-draw-subtree node)
+		(setq extended t))
+	      (setq next-stack
+		    (append (undo-tree-node-next node) next-stack)))
+	  ;; ...otherwise, postpone drawing until later
+	  (push node undo-tree-visualizer-needs-extending-down))))
+    extended))
+
+
+(defun undo-tree-extend-up (node &optional top)
+  ;; Extend tree upwards starting from NODE. If TOP is t, extend all the way
+  ;; to root. If TOP is a node, extend up as far as that node. If TOP is an
+  ;; integer, extend up as far as that line. Otherwise, only extend visible
+  ;; portion of tree. NODE is assumed to already have a node marker. Returns
+  ;; non-nil if anything was actually extended.
+  (let ((extended nil) parent n)
+    ;; don't bother extending if TOP specifies an already-drawn node
+    (unless (and (undo-tree-node-p top) (undo-tree-node-marker top))
+      (while node
+	(setq parent (undo-tree-node-previous node))
+	;; if we haven't reached root...
+	(if parent
+	    ;; ...and node is within range being drawn...
+	    (if (or (eq top t)
+		    (and (undo-tree-node-p top) (not (eq node top)))
+		    (and (integerp top)
+			 (< top (line-number-at-pos
+				 (undo-tree-node-marker node))))
+		    (and (null top)
+			 ;; NOTE: check point in case window-start is outdated
+			 (< (min (line-number-at-pos (point))
+				 (line-number-at-pos (window-start)))
+			    (line-number-at-pos
+			     (undo-tree-node-marker node)))))
+		;; ...and it hasn't already been drawn
+		(when (not (undo-tree-node-marker parent))
+		  ;; link parent node to its representation in visualizer
+		  (undo-tree-compute-widths parent)
+		  (undo-tree-move-to-parent node)
+		  (setf (undo-tree-node-marker parent) (make-marker))
+		  (set-marker-insertion-type
+		   (undo-tree-node-marker parent) nil)
+		  (move-marker (undo-tree-node-marker parent) (point))
+		  ;; draw subtree beneath parent
+		  (setq undo-tree-visualizer-needs-extending-down
+			(nconc (delq node (undo-tree-draw-subtree parent))
+			       undo-tree-visualizer-needs-extending-down))
+		  (setq extended t))
+	      ;; ...otherwise, postpone drawing for later and exit
+	      (setq undo-tree-visualizer-needs-extending-up (when parent node)
+		    parent nil))
+
+	  ;; if we've reached root, stop extending and add top margin
+	  (setq undo-tree-visualizer-needs-extending-up nil)
+	  (goto-char (undo-tree-node-marker node))
+	  (undo-tree-move-up 1)  ; top margin
+	  (delete-region (point-min) (line-beginning-position)))
+	;; next iteration
+	(setq node parent)))
+    extended))
+
+
+(defun undo-tree-expand-down (from &optional to)
+  ;; Expand tree downwards. FROM is the node to start expanding from. Stop
+  ;; expanding at TO if specified. Otherwise, just expand visible portion of
+  ;; tree and highlight active branch from FROM.
+  (when undo-tree-visualizer-needs-extending-down
+    (let ((inhibit-read-only t)
+	  node-list extended)
+      ;; extend down as far as TO node
+      (when to
+	(setq extended (undo-tree-extend-down from to))
+	(goto-char (undo-tree-node-marker to))
+	(redisplay t))  ; force redisplay to scroll buffer if necessary
+      ;; extend visible portion of tree downwards
+      (setq node-list undo-tree-visualizer-needs-extending-down
+	    undo-tree-visualizer-needs-extending-down nil)
+      (when node-list
+	(dolist (n node-list)
+	  (when (undo-tree-extend-down n) (setq extended t)))
+	;; highlight active branch in newly-extended-down portion, if any
+	(when extended
+	  (let ((undo-tree-insert-face
+		 'undo-tree-visualizer-active-branch-face))
+	    (undo-tree-highlight-active-branch from)))))))
+
+
+(defun undo-tree-expand-up (from &optional to)
+  ;; Expand tree upwards. FROM is the node to start expanding from, TO is the
+  ;; node to stop expanding at. If TO node isn't specified, just expand visible
+  ;; portion of tree and highlight active branch down to FROM.
+  (when undo-tree-visualizer-needs-extending-up
+    (let ((inhibit-read-only t)
+	  extended node-list)
+      ;; extend up as far as TO node
+      (when to
+	(setq extended (undo-tree-extend-up from to))
+	(goto-char (undo-tree-node-marker to))
+	;; simulate auto-scrolling if close to top of buffer
+	(when (<= (line-number-at-pos (point)) scroll-margin)
+	  (undo-tree-move-up (if (= scroll-conservatively 0)
+				 (/ (window-height) 2) 3))
+	  (when (undo-tree-extend-up to) (setq extended t))
+	  (goto-char (undo-tree-node-marker to))
+	  (unless (= scroll-conservatively 0) (recenter scroll-margin))))
+      ;; extend visible portion of tree upwards
+      (and undo-tree-visualizer-needs-extending-up
+	   (undo-tree-extend-up undo-tree-visualizer-needs-extending-up)
+	   (setq extended t))
+      ;; extend visible portion of tree downwards
+      (setq node-list undo-tree-visualizer-needs-extending-down
+	    undo-tree-visualizer-needs-extending-down nil)
+      (dolist (n node-list) (undo-tree-extend-down n))
+      ;; highlight active branch in newly-extended-up portion, if any
+      (when extended
+	(let ((undo-tree-insert-face
+	       'undo-tree-visualizer-active-branch-face))
+	  (undo-tree-highlight-active-branch
+	   (or undo-tree-visualizer-needs-extending-up
+	       (undo-tree-root buffer-undo-tree))
+	   from))))))
+
+
+
+(defun undo-tree-highlight-active-branch (node &optional end)
+  ;; Draw highlighted active branch below NODE in current buffer. Stop
+  ;; highlighting at END node if specified.
+  (let ((stack (list node)))
+    ;; draw active branch
+    (while stack
+      (setq node (pop stack))
+      (unless (or (eq node end)
+		  (memq node undo-tree-visualizer-needs-extending-down))
+	(goto-char (undo-tree-node-marker node))
+	(setq node (undo-tree-draw-subtree node 'active)
+	      stack (nconc stack node))))))
+
+
+(defun undo-tree-draw-node (node &optional current)
+  ;; Draw symbol representing NODE in visualizer. If CURRENT is non-nil, node
+  ;; is current node.
+  (goto-char (undo-tree-node-marker node))
+  (when undo-tree-visualizer-timestamps
+    (undo-tree-move-backward (/ undo-tree-visualizer-spacing 2)))
+
+  (let* ((undo-tree-insert-face (and undo-tree-insert-face
+				     (or (and (consp undo-tree-insert-face)
+					      undo-tree-insert-face)
+					 (list undo-tree-insert-face))))
+	 (register (undo-tree-node-register node))
+	 (unmodified (if undo-tree-visualizer-parent-mtime
+			 (undo-tree-node-unmodified-p
+			  node undo-tree-visualizer-parent-mtime)
+		       (undo-tree-node-unmodified-p node)))
+	node-string)
+    ;; check node's register (if any) still stores appropriate undo-tree state
+    (unless (and register
+		 (undo-tree-register-data-p
+		  (registerv-data (get-register register)))
+		 (eq node (undo-tree-register-data-node
+			   (registerv-data (get-register register)))))
+      (setq register nil))
+    ;; represent node by different symbols, depending on whether it's the
+    ;; current node, is saved in a register, or corresponds to an unmodified
+    ;; buffer
+    (setq node-string
+	    (cond
+	     (undo-tree-visualizer-timestamps
+	        (undo-tree-timestamp-to-string
+	         (undo-tree-node-timestamp node)
+		 undo-tree-visualizer-relative-timestamps
+		 current register))
+	     (register (char-to-string register))
+	     (unmodified "s")
+	     (current "x")
+	     (t "o"))
+	  undo-tree-insert-face
+	    (nconc
+	     (cond
+	      (current    '(undo-tree-visualizer-current-face))
+	      (unmodified '(undo-tree-visualizer-unmodified-face))
+	      (register   '(undo-tree-visualizer-register-face)))
+	     undo-tree-insert-face))
+    ;; draw node and link it to its representation in visualizer
+    (undo-tree-insert node-string)
+    (undo-tree-move-backward (if undo-tree-visualizer-timestamps
+				 (1+ (/ undo-tree-visualizer-spacing 2))
+			       1))
+    (move-marker (undo-tree-node-marker node) (point))
+    (put-text-property (point) (1+ (point)) 'undo-tree-node node)))
+
+
+(defun undo-tree-draw-subtree (node &optional active-branch)
+  ;; Draw subtree rooted at NODE. The subtree will start from point.
+  ;; If ACTIVE-BRANCH is non-nil, just draw active branch below NODE. Returns
+  ;; list of nodes below NODE.
+  (let ((num-children (length (undo-tree-node-next node)))
+        node-list pos trunk-pos n)
+    ;; draw node itself
+    (undo-tree-draw-node node)
+
+    (cond
+     ;; if we're at a leaf node, we're done
+     ((= num-children 0))
+
+     ;; if node has only one child, draw it (not strictly necessary to deal
+     ;; with this case separately, but as it's by far the most common case
+     ;; this makes the code clearer and more efficient)
+     ((= num-children 1)
+      (undo-tree-move-down 1)
+      (undo-tree-insert ?|)
+      (undo-tree-move-backward 1)
+      (undo-tree-move-down 1)
+      (undo-tree-insert ?|)
+      (undo-tree-move-backward 1)
+      (undo-tree-move-down 1)
+      (setq n (car (undo-tree-node-next node)))
+      ;; link next node to its representation in visualizer
+      (unless (markerp (undo-tree-node-marker n))
+        (setf (undo-tree-node-marker n) (make-marker))
+        (set-marker-insertion-type (undo-tree-node-marker n) nil))
+      (move-marker (undo-tree-node-marker n) (point))
+      ;; add next node to list of nodes to draw next
+      (push n node-list))
+
+     ;; if node has multiple children, draw branches
+     (t
+      (undo-tree-move-down 1)
+      (undo-tree-insert ?|)
+      (undo-tree-move-backward 1)
+      (move-marker (setq trunk-pos (make-marker)) (point))
+      ;; left subtrees
+      (undo-tree-move-backward
+       (- (undo-tree-node-char-lwidth node)
+          (undo-tree-node-char-lwidth
+           (car (undo-tree-node-next node)))))
+      (move-marker (setq pos (make-marker)) (point))
+      (setq n (cons nil (undo-tree-node-next node)))
+      (dotimes (i (/ num-children 2))
+        (setq n (cdr n))
+        (when (or (null active-branch)
+                  (eq (car n)
+                      (nth (undo-tree-node-branch node)
+                           (undo-tree-node-next node))))
+          (undo-tree-move-forward 2)
+          (undo-tree-insert ?_ (- trunk-pos pos 2))
+          (goto-char pos)
+          (undo-tree-move-forward 1)
+          (undo-tree-move-down 1)
+          (undo-tree-insert ?/)
+          (undo-tree-move-backward 2)
+          (undo-tree-move-down 1)
+          ;; link node to its representation in visualizer
+          (unless (markerp (undo-tree-node-marker (car n)))
+            (setf (undo-tree-node-marker (car n)) (make-marker))
+            (set-marker-insertion-type (undo-tree-node-marker (car n)) nil))
+          (move-marker (undo-tree-node-marker (car n)) (point))
+          ;; add node to list of nodes to draw next
+          (push (car n) node-list))
+        (goto-char pos)
+        (undo-tree-move-forward
+         (+ (undo-tree-node-char-rwidth (car n))
+            (undo-tree-node-char-lwidth (cadr n))
+            undo-tree-visualizer-spacing 1))
+        (move-marker pos (point)))
+      ;; middle subtree (only when number of children is odd)
+      (when (= (mod num-children 2) 1)
+        (setq n (cdr n))
+        (when (or (null active-branch)
+                  (eq (car n)
+                      (nth (undo-tree-node-branch node)
+                           (undo-tree-node-next node))))
+          (undo-tree-move-down 1)
+          (undo-tree-insert ?|)
+          (undo-tree-move-backward 1)
+          (undo-tree-move-down 1)
+          ;; link node to its representation in visualizer
+          (unless (markerp (undo-tree-node-marker (car n)))
+            (setf (undo-tree-node-marker (car n)) (make-marker))
+            (set-marker-insertion-type (undo-tree-node-marker (car n)) nil))
+          (move-marker (undo-tree-node-marker (car n)) (point))
+          ;; add node to list of nodes to draw next
+          (push (car n) node-list))
+        (goto-char pos)
+        (undo-tree-move-forward
+         (+ (undo-tree-node-char-rwidth (car n))
+            (if (cadr n) (undo-tree-node-char-lwidth (cadr n)) 0)
+            undo-tree-visualizer-spacing 1))
+        (move-marker pos (point)))
+      ;; right subtrees
+      (move-marker trunk-pos (1+ trunk-pos))
+      (dotimes (i (/ num-children 2))
+        (setq n (cdr n))
+        (when (or (null active-branch)
+                  (eq (car n)
+                      (nth (undo-tree-node-branch node)
+                           (undo-tree-node-next node))))
+          (goto-char trunk-pos)
+          (undo-tree-insert ?_ (- pos trunk-pos 1))
+          (goto-char pos)
+          (undo-tree-move-backward 1)
+          (undo-tree-move-down 1)
+          (undo-tree-insert ?\\)
+          (undo-tree-move-down 1)
+          ;; link node to its representation in visualizer
+          (unless (markerp (undo-tree-node-marker (car n)))
+            (setf (undo-tree-node-marker (car n)) (make-marker))
+            (set-marker-insertion-type (undo-tree-node-marker (car n)) nil))
+          (move-marker (undo-tree-node-marker (car n)) (point))
+          ;; add node to list of nodes to draw next
+          (push (car n) node-list))
+        (when (cdr n)
+          (goto-char pos)
+          (undo-tree-move-forward
+           (+ (undo-tree-node-char-rwidth (car n))
+              (if (cadr n) (undo-tree-node-char-lwidth (cadr n)) 0)
+              undo-tree-visualizer-spacing 1))
+          (move-marker pos (point))))
+      ))
+    ;; return list of nodes to draw next
+    (nreverse node-list)))
+
+
+(defun undo-tree-node-char-lwidth (node)
+  ;; Return left-width of NODE measured in characters.
+  (if (= (length (undo-tree-node-next node)) 0) 0
+    (- (* (+ undo-tree-visualizer-spacing 1) (undo-tree-node-lwidth node))
+       (if (= (undo-tree-node-cwidth node) 0)
+           (1+ (/ undo-tree-visualizer-spacing 2)) 0))))
+
+
+(defun undo-tree-node-char-rwidth (node)
+  ;; Return right-width of NODE measured in characters.
+  (if (= (length (undo-tree-node-next node)) 0) 0
+    (- (* (+ undo-tree-visualizer-spacing 1) (undo-tree-node-rwidth node))
+       (if (= (undo-tree-node-cwidth node) 0)
+           (1+ (/ undo-tree-visualizer-spacing 2)) 0))))
+
+
+(defun undo-tree-insert (str &optional arg)
+  ;; Insert character or string STR ARG times, overwriting, and using
+  ;; `undo-tree-insert-face'.
+  (unless arg (setq arg 1))
+  (when (characterp str)
+    (setq str (make-string arg str))
+    (setq arg 1))
+  (dotimes (i arg) (insert str))
+  (setq arg (* arg (length str)))
+  (undo-tree-move-forward arg)
+  ;; make sure mark isn't active, otherwise `backward-delete-char' might
+  ;; delete region instead of single char if transient-mark-mode is enabled
+  (setq mark-active nil)
+  (backward-delete-char arg)
+  (when undo-tree-insert-face
+    (put-text-property (- (point) arg) (point) 'face undo-tree-insert-face)))
+
+
+(defun undo-tree-move-down (&optional arg)
+  ;; Move down, extending buffer if necessary.
+  (let ((row (line-number-at-pos))
+        (col (current-column))
+        line)
+    (unless arg (setq arg 1))
+    (forward-line arg)
+    (setq line (line-number-at-pos))
+    ;; if buffer doesn't have enough lines, add some
+    (when (/= line (+ row arg))
+      (cond
+       ((< arg 0)
+	(insert (make-string (- line row arg) ?\n))
+	(forward-line (+ arg (- row line))))
+       (t (insert (make-string (- arg (- line row)) ?\n)))))
+    (undo-tree-move-forward col)))
+
+
+(defun undo-tree-move-up (&optional arg)
+  ;; Move up, extending buffer if necessary.
+  (unless arg (setq arg 1))
+  (undo-tree-move-down (- arg)))
+
+
+(defun undo-tree-move-forward (&optional arg)
+  ;; Move forward, extending buffer if necessary.
+  (unless arg (setq arg 1))
+  (let (n)
+    (cond
+     ((>= arg 0)
+      (setq n (- (line-end-position) (point)))
+      (if (> n arg)
+	  (forward-char arg)
+	(end-of-line)
+	(insert (make-string (- arg n) ? ))))
+     ((< arg 0)
+      (setq arg (- arg))
+      (setq n (- (point) (line-beginning-position)))
+      (when (< (- n 2) arg)  ; -2 to create left-margin
+	;; no space left - shift entire buffer contents right!
+	(let ((pos (move-marker (make-marker) (point))))
+	  (set-marker-insertion-type pos t)
+	  (goto-char (point-min))
+	  (while (not (eobp))
+	    (insert-before-markers (make-string (- arg -2 n) ? ))
+	    (forward-line 1))
+	  (goto-char pos)))
+      (backward-char arg)))))
+
+
+(defun undo-tree-move-backward (&optional arg)
+  ;; Move backward, extending buffer if necessary.
+  (unless arg (setq arg 1))
+  (undo-tree-move-forward (- arg)))
+
+
+(defun undo-tree-move-to-parent (node)
+  ;; Move to position of parent of NODE, extending buffer if necessary.
+  (let* ((parent (undo-tree-node-previous node))
+	 (n (undo-tree-node-next parent))
+	 (l (length n)) p)
+    (goto-char (undo-tree-node-marker node))
+    (unless (= l 1)
+      ;; move horizontally
+      (setq p (undo-tree-position node n))
+      (cond
+       ;; node in centre subtree: no horizontal movement
+       ((and (= (mod l 2) 1) (= p (/ l 2))))
+       ;; node in left subtree: move right
+       ((< p (/ l 2))
+	(setq n (nthcdr p n))
+	(undo-tree-move-forward
+	 (+ (undo-tree-node-char-rwidth (car n))
+	    (/ undo-tree-visualizer-spacing 2) 1))
+	(dotimes (i (- (/ l 2) p 1))
+	  (setq n (cdr n))
+	  (undo-tree-move-forward
+	   (+ (undo-tree-node-char-lwidth (car n))
+	      (undo-tree-node-char-rwidth (car n))
+	      undo-tree-visualizer-spacing 1)))
+	(when (= (mod l 2) 1)
+	  (setq n (cdr n))
+	  (undo-tree-move-forward
+	   (+ (undo-tree-node-char-lwidth (car n))
+	      (/ undo-tree-visualizer-spacing 2) 1))))
+       (t ;; node in right subtree: move left
+	(setq n (nthcdr (/ l 2) n))
+	(when (= (mod l 2) 1)
+	  (undo-tree-move-backward
+	   (+ (undo-tree-node-char-rwidth (car n))
+	      (/ undo-tree-visualizer-spacing 2) 1))
+	  (setq n (cdr n)))
+	(dotimes (i (- p (/ l 2) (mod l 2)))
+	  (undo-tree-move-backward
+	   (+ (undo-tree-node-char-lwidth (car n))
+	      (undo-tree-node-char-rwidth (car n))
+	      undo-tree-visualizer-spacing 1))
+	  (setq n (cdr n)))
+	(undo-tree-move-backward
+	 (+ (undo-tree-node-char-lwidth (car n))
+	    (/ undo-tree-visualizer-spacing 2) 1)))))
+    ;; move vertically
+    (undo-tree-move-up 3)))
+
+
+(defun undo-tree-timestamp-to-string
+  (timestamp &optional relative current register)
+  ;; Convert TIMESTAMP to string (either absolute or RELATVE time), indicating
+  ;; if it's the CURRENT node and/or has an associated REGISTER.
+  (if relative
+      ;; relative time
+      (let ((time (floor (float-time
+			  (subtract-time (current-time) timestamp))))
+	    n)
+	(setq time
+	      ;; years
+	      (if (> (setq n (/ time 315360000)) 0)
+		  (if (> n 999) "-ages" (format "-%dy" n))
+		(setq time (% time 315360000))
+		;; days
+		(if (> (setq n (/ time 86400)) 0)
+		    (format "-%dd" n)
+		  (setq time (% time 86400))
+		  ;; hours
+		  (if (> (setq n (/ time 3600)) 0)
+		      (format "-%dh" n)
+		    (setq time (% time 3600))
+		    ;; mins
+		    (if (> (setq n (/ time 60)) 0)
+			(format "-%dm" n)
+		      ;; secs
+		      (format "-%ds" (% time 60)))))))
+	(setq time (concat
+		    (if current "*" " ")
+		    time
+		    (if register (concat "[" (char-to-string register) "]")
+		      "   ")))
+	(setq n (length time))
+	(if (< n 9)
+	    (concat (make-string (- 9 n) ? ) time)
+	  time))
+    ;; absolute time
+    (concat (if current "*" " ")
+	    (format-time-string "%H:%M:%S" timestamp)
+	    (if register
+		(concat "[" (char-to-string register) "]")
+	      "   "))))
+
+
+
+
+;;; =====================================================================
+;;;                        Visualizer commands
+
+(defun undo-tree-visualizer-mode ()
+  "Major mode used in undo-tree visualizer.
+
+The undo-tree visualizer can only be invoked from a buffer in
+which `undo-tree-mode' is enabled. The visualizer displays the
+undo history tree graphically, and allows you to browse around
+the undo history, undoing or redoing the corresponding changes in
+the parent buffer.
+
+Within the undo-tree visualizer, the following keys are available:
+
+  \\{undo-tree-visualizer-map}"
+  (interactive)
+  (setq major-mode 'undo-tree-visualizer-mode)
+  (setq mode-name "undo-tree-visualizer-mode")
+  (use-local-map undo-tree-visualizer-map)
+  (setq truncate-lines t)
+  (setq cursor-type nil)
+  (setq buffer-read-only t)
+  (setq undo-tree-visualizer-selected-node nil)
+  (when undo-tree-visualizer-diff (undo-tree-visualizer-update-diff)))
+
+
+
+(defun undo-tree-visualize-undo (&optional arg)
+  "Undo changes. A numeric ARG serves as a repeat count."
+  (interactive "p")
+  (let ((old (undo-tree-current buffer-undo-tree))
+	current)
+    ;; unhighlight old current node
+    (let ((undo-tree-insert-face 'undo-tree-visualizer-active-branch-face)
+	  (inhibit-read-only t))
+      (undo-tree-draw-node old))
+    ;; undo in parent buffer
+    (switch-to-buffer-other-window undo-tree-visualizer-parent-buffer)
+    (deactivate-mark)
+    (unwind-protect
+	(let ((undo-tree-inhibit-kill-visualizer t)) (undo-tree-undo-1 arg))
+      (setq current (undo-tree-current buffer-undo-tree))
+      (switch-to-buffer-other-window undo-tree-visualizer-buffer-name)
+      ;; when using lazy drawing, extend tree upwards as required
+      (when undo-tree-visualizer-lazy-drawing
+	(undo-tree-expand-up old current))
+      ;; highlight new current node
+      (let ((inhibit-read-only t)) (undo-tree-draw-node current 'current))
+      ;; update diff display, if any
+      (when undo-tree-visualizer-diff (undo-tree-visualizer-update-diff)))))
+
+
+(defun undo-tree-visualize-redo (&optional arg)
+  "Redo changes. A numeric ARG serves as a repeat count."
+  (interactive "p")
+  (let ((old (undo-tree-current buffer-undo-tree))
+	current)
+    ;; unhighlight old current node
+    (let ((undo-tree-insert-face 'undo-tree-visualizer-active-branch-face)
+	  (inhibit-read-only t))
+      (undo-tree-draw-node (undo-tree-current buffer-undo-tree)))
+    ;; redo in parent buffer
+    (switch-to-buffer-other-window undo-tree-visualizer-parent-buffer)
+    (deactivate-mark)
+    (unwind-protect
+	(let ((undo-tree-inhibit-kill-visualizer t)) (undo-tree-redo-1 arg))
+      (setq current (undo-tree-current buffer-undo-tree))
+      (switch-to-buffer-other-window undo-tree-visualizer-buffer-name)
+      ;; when using lazy drawing, extend tree downwards as required
+      (when undo-tree-visualizer-lazy-drawing
+	(undo-tree-expand-down old current))
+      ;; highlight new current node
+      (let ((inhibit-read-only t)) (undo-tree-draw-node current 'current))
+      ;; update diff display, if any
+      (when undo-tree-visualizer-diff (undo-tree-visualizer-update-diff)))))
+
+
+(defun undo-tree-visualize-switch-branch-right (arg)
+  "Switch to next branch of the undo tree.
+This will affect which branch to descend when *redoing* changes
+using `undo-tree-redo' or `undo-tree-visualizer-redo'."
+  (interactive "p")
+  ;; un-highlight old active branch below current node
+  (goto-char (undo-tree-node-marker (undo-tree-current buffer-undo-tree)))
+  (let ((undo-tree-insert-face 'undo-tree-visualizer-default-face)
+	(inhibit-read-only t))
+    (undo-tree-highlight-active-branch (undo-tree-current buffer-undo-tree)))
+  ;; increment branch
+  (let ((branch (undo-tree-node-branch (undo-tree-current buffer-undo-tree))))
+  (setf (undo-tree-node-branch (undo-tree-current buffer-undo-tree))
+        (cond
+         ((>= (+ branch arg) (undo-tree-num-branches))
+          (1- (undo-tree-num-branches)))
+         ((<= (+ branch arg) 0) 0)
+         (t (+ branch arg))))
+  (let ((inhibit-read-only t))
+    ;; highlight new active branch below current node
+    (goto-char (undo-tree-node-marker (undo-tree-current buffer-undo-tree)))
+    (let ((undo-tree-insert-face 'undo-tree-visualizer-active-branch-face))
+      (undo-tree-highlight-active-branch (undo-tree-current buffer-undo-tree)))
+    ;; re-highlight current node
+    (undo-tree-draw-node (undo-tree-current buffer-undo-tree) 'current))))
+
+
+(defun undo-tree-visualize-switch-branch-left (arg)
+  "Switch to previous branch of the undo tree.
+This will affect which branch to descend when *redoing* changes
+using `undo-tree-redo' or `undo-tree-visualizer-redo'."
+  (interactive "p")
+  (undo-tree-visualize-switch-branch-right (- arg)))
+
+
+(defun undo-tree-visualizer-quit ()
+  "Quit the undo-tree visualizer."
+  (interactive)
+  (undo-tree-clear-visualizer-data buffer-undo-tree)
+  ;; remove kill visualizer hook from parent buffer
+  (unwind-protect
+      (with-current-buffer undo-tree-visualizer-parent-buffer
+	(remove-hook 'before-change-functions 'undo-tree-kill-visualizer t))
+    ;; kill diff buffer, if any
+    (when undo-tree-visualizer-diff (undo-tree-visualizer-hide-diff))
+    (let ((parent undo-tree-visualizer-parent-buffer)
+	  window)
+      ;; kill visualizer buffer
+      (kill-buffer nil)
+      ;; switch back to parent buffer
+      (unwind-protect
+	  (if (setq window (get-buffer-window parent))
+	      (select-window window)
+	    (switch-to-buffer parent))))))
+
+
+(defun undo-tree-visualizer-abort ()
+  "Quit the undo-tree visualizer and return buffer to original state."
+  (interactive)
+  (let ((node undo-tree-visualizer-initial-node))
+    (undo-tree-visualizer-quit)
+    (undo-tree-set node)))
+
+
+(defun undo-tree-visualizer-set (&optional pos)
+  "Set buffer to state corresponding to undo tree node
+at POS, or point if POS is nil."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (let ((node (get-text-property pos 'undo-tree-node)))
+    (when node
+      ;; set parent buffer to state corresponding to node at POS
+      (switch-to-buffer-other-window undo-tree-visualizer-parent-buffer)
+      (let ((undo-tree-inhibit-kill-visualizer t)) (undo-tree-set node))
+      (switch-to-buffer-other-window undo-tree-visualizer-buffer-name)
+      ;; re-draw undo tree
+      (let ((inhibit-read-only t)) (undo-tree-draw-tree buffer-undo-tree))
+      (when undo-tree-visualizer-diff (undo-tree-visualizer-update-diff)))))
+
+
+(defun undo-tree-visualizer-mouse-set (pos)
+  "Set buffer to state corresponding to undo tree node
+at mouse event POS."
+  (interactive "@e")
+  (undo-tree-visualizer-set (event-start (nth 1 pos))))
+
+
+(defun undo-tree-visualize-undo-to-x (&optional x)
+  "Undo to last branch point, register, or saved state.
+If X is 'branch, undo to last branch point. If X is 'register,
+undo to last register. If X is 'saved, undo to last saved state.
+
+Interactively, a single \\[universal-argument] specifies
+`branch', a double \\[universal-argument] \[universal-argument]
+spcified `saved', and a negative prefix argument specifies
+`register'."
+  (interactive "P")
+  (when (and (called-interactively-p 'any) x)
+    (setq x (prefix-numeric-value x)
+	  x (cond
+	     ((< x 0)  'register)
+	     ((<= x 4) 'branch)
+	     (t        'saved))))
+  (let ((current (undo-tree-current buffer-undo-tree))
+	r)
+    (while (and (undo-tree-node-previous current)
+		(or (undo-tree-visualize-undo) t)
+		(setq current (undo-tree-current buffer-undo-tree))
+		         ;; branch point
+		(not (or (and (or (null x) (eq x 'branch))
+			      (> (undo-tree-num-branches) 1))
+			 ;; register
+			 (and (or (null x) (eq x 'register))
+			      (setq r (undo-tree-node-register current))
+			      (undo-tree-register-data-p
+			       (setq r (registerv-data (get-register r))))
+			      (eq current (undo-tree-register-data-node r)))
+			 ;; saved state
+			 (and (or (null x) (eq x 'saved))
+			      (undo-tree-node-unmodified-p current))
+			 ))))))
+
+
+(defun undo-tree-visualize-redo-to-x (&optional x)
+  "Redo to next branch point or register.
+If X is the symbol `branch', redo to next branch point ignoring
+registers. If X is the symbol 'register', redo to next register,
+ignoring branch points.
+
+Interactively, a positive prefix argument specifies `branch', and
+a negative prefix argument specifies `register'."
+  (interactive "P")
+  (when (and (called-interactively-p 'any) x)
+    (setq x (prefix-numeric-value x)
+	  x (cond
+	     ((< x 0)  'register)
+	     ((<= x 4) 'branch)
+	     (t        'saved))))
+  (let ((current (undo-tree-current buffer-undo-tree))
+	r)
+    (while (and (undo-tree-node-next current)
+		(or (undo-tree-visualize-redo) t)
+		(setq current (undo-tree-current buffer-undo-tree))
+		         ;; branch point
+		(not (or (and (or (null x) (eq x 'branch))
+			      (> (undo-tree-num-branches) 1))
+			 ;; register
+			 (and (or (null x) (eq x 'register))
+			      (setq r (undo-tree-node-register current))
+			      (undo-tree-register-data-p
+			       (setq r (registerv-data (get-register r))))
+			      (eq current (undo-tree-register-data-node r)))
+			 ;; saved state
+			 (and (or (null x) (eq x 'saved))
+			      (undo-tree-node-unmodified-p current))
+			 ))))))
+
+
+(defun undo-tree-visualizer-toggle-timestamps ()
+  "Toggle display of time-stamps."
+  (interactive)
+  (setq undo-tree-visualizer-timestamps (not undo-tree-visualizer-timestamps))
+  (setq undo-tree-visualizer-spacing (undo-tree-visualizer-calculate-spacing))
+  ;; redraw tree
+  (let ((inhibit-read-only t)) (undo-tree-draw-tree buffer-undo-tree)))
+
+
+(defun undo-tree-visualizer-scroll-left (&optional arg)
+  (interactive "p")
+  (scroll-left (or arg 1) t))
+
+
+(defun undo-tree-visualizer-scroll-right (&optional arg)
+  (interactive "p")
+  (scroll-right (or arg 1) t))
+
+
+(defun undo-tree-visualizer-scroll-up (&optional arg)
+  (interactive "P")
+  (if (or (and (numberp arg) (< arg 0)) (eq arg '-))
+      (undo-tree-visualizer-scroll-down arg)
+    ;; scroll up and expand newly-visible portion of tree
+    (unwind-protect
+	(scroll-up-command arg)
+      (undo-tree-expand-down
+       (nth (undo-tree-node-branch (undo-tree-current buffer-undo-tree))
+	    (undo-tree-node-next (undo-tree-current buffer-undo-tree)))))
+    ;; signal error if at eob
+    (when (and (not undo-tree-visualizer-needs-extending-down) (eobp))
+      (scroll-up))))
+
+
+(defun undo-tree-visualizer-scroll-down (&optional arg)
+  (interactive "P")
+  (if (or (and (numberp arg) (< arg 0)) (eq arg '-))
+      (undo-tree-visualizer-scroll-up arg)
+    ;; ensure there's enough room at top of buffer to scroll
+    (let ((scroll-lines
+	   (or arg (- (window-height) next-screen-context-lines)))
+	  (window-line (1- (line-number-at-pos (window-start)))))
+      (when (and undo-tree-visualizer-needs-extending-up
+		 (< window-line scroll-lines))
+	(let ((inhibit-read-only t))
+	  (goto-char (point-min))
+	  (undo-tree-move-up (- scroll-lines window-line)))))
+    ;; scroll down and expand newly-visible portion of tree
+    (unwind-protect
+	(scroll-down-command arg)
+      (undo-tree-expand-up
+       (undo-tree-node-previous (undo-tree-current buffer-undo-tree))))
+    ;; signal error if at bob
+    (when (and (not undo-tree-visualizer-needs-extending-down) (bobp))
+      (scroll-down))))
+
+
+
+
+;;; =====================================================================
+;;;                    Visualizer selection mode
+
+(defun undo-tree-visualizer-selection-mode ()
+  "Major mode used to select nodes in undo-tree visualizer."
+  (interactive)
+  (setq major-mode 'undo-tree-visualizer-selection-mode)
+  (setq mode-name "undo-tree-visualizer-selection-mode")
+  (use-local-map undo-tree-visualizer-selection-map)
+  (setq cursor-type 'box)
+  (setq undo-tree-visualizer-selected-node
+	(undo-tree-current buffer-undo-tree))
+  ;; erase diff (if any), as initially selected node is identical to current
+  (when undo-tree-visualizer-diff
+    (let ((buff (get-buffer undo-tree-diff-buffer-name))
+	  (inhibit-read-only t))
+      (when buff (with-current-buffer buff (erase-buffer))))))
+
+
+(defun undo-tree-visualizer-select-previous (&optional arg)
+  "Move to previous node."
+  (interactive "p")
+  (let ((node undo-tree-visualizer-selected-node))
+    (catch 'top
+      (dotimes (i arg)
+	(unless (undo-tree-node-previous node) (throw 'top t))
+	(setq node (undo-tree-node-previous node))))
+    ;; when using lazy drawing, extend tree upwards as required
+    (when undo-tree-visualizer-lazy-drawing
+      (undo-tree-expand-up undo-tree-visualizer-selected-node node))
+    ;; update diff display, if any
+    (when (and undo-tree-visualizer-diff
+	       (not (eq node undo-tree-visualizer-selected-node)))
+      (undo-tree-visualizer-update-diff node))
+    ;; move to selected node
+    (goto-char (undo-tree-node-marker node))
+    (setq undo-tree-visualizer-selected-node node)))
+
+
+(defun undo-tree-visualizer-select-next (&optional arg)
+  "Move to next node."
+  (interactive "p")
+  (let ((node undo-tree-visualizer-selected-node))
+    (catch 'bottom
+      (dotimes (i arg)
+	(unless (nth (undo-tree-node-branch node) (undo-tree-node-next node))
+	  (throw 'bottom t))
+	(setq node
+	      (nth (undo-tree-node-branch node) (undo-tree-node-next node)))))
+    ;; when using lazy drawing, extend tree upwards as required
+    (when undo-tree-visualizer-lazy-drawing
+      (undo-tree-expand-down undo-tree-visualizer-selected-node node))
+    ;; update diff display, if any
+    (when (and undo-tree-visualizer-diff
+	       (not (eq node undo-tree-visualizer-selected-node)))
+      (undo-tree-visualizer-update-diff node))
+    ;; move to selected node
+    (goto-char (undo-tree-node-marker node))
+    (setq undo-tree-visualizer-selected-node node)))
+
+
+(defun undo-tree-visualizer-select-right (&optional arg)
+  "Move right to a sibling node."
+  (interactive "p")
+  (let ((node undo-tree-visualizer-selected-node)
+	end)
+    (goto-char (undo-tree-node-marker undo-tree-visualizer-selected-node))
+    (setq end (line-end-position))
+    (catch 'end
+      (dotimes (i arg)
+	(while (or (null node) (eq node undo-tree-visualizer-selected-node))
+	  (forward-char)
+	  (setq node (get-text-property (point) 'undo-tree-node))
+	  (when (= (point) end) (throw 'end t)))))
+    (goto-char (undo-tree-node-marker
+		(or node undo-tree-visualizer-selected-node)))
+    (when (and undo-tree-visualizer-diff node
+	       (not (eq node undo-tree-visualizer-selected-node)))
+      (undo-tree-visualizer-update-diff node))
+    (when node (setq undo-tree-visualizer-selected-node node))))
+
+
+(defun undo-tree-visualizer-select-left (&optional arg)
+  "Move left to a sibling node."
+  (interactive "p")
+  (let ((node (get-text-property (point) 'undo-tree-node))
+	beg)
+    (goto-char (undo-tree-node-marker undo-tree-visualizer-selected-node))
+    (setq beg (line-beginning-position))
+    (catch 'beg
+      (dotimes (i arg)
+	(while (or (null node) (eq node undo-tree-visualizer-selected-node))
+	  (backward-char)
+	  (setq node (get-text-property (point) 'undo-tree-node))
+	  (when (= (point) beg) (throw 'beg t)))))
+    (goto-char (undo-tree-node-marker
+		(or node undo-tree-visualizer-selected-node)))
+    (when (and undo-tree-visualizer-diff node
+	       (not (eq node undo-tree-visualizer-selected-node)))
+      (undo-tree-visualizer-update-diff node))
+    (when node (setq undo-tree-visualizer-selected-node node))))
+
+
+
+;;; =====================================================================
+;;;                      Visualizer diff display
+
+(defun undo-tree-visualizer-toggle-diff ()
+  "Toggle diff display in undo-tree visualizer."
+  (interactive)
+  (if undo-tree-visualizer-diff
+      (undo-tree-visualizer-hide-diff)
+    (undo-tree-visualizer-show-diff)))
+
+
+(defun undo-tree-visualizer-selection-toggle-diff ()
+  "Toggle diff display in undo-tree visualizer selection mode."
+  (interactive)
+  (if undo-tree-visualizer-diff
+      (undo-tree-visualizer-hide-diff)
+    (let ((node (get-text-property (point) 'undo-tree-node)))
+      (when node (undo-tree-visualizer-show-diff node)))))
+
+
+(defun undo-tree-visualizer-show-diff (&optional node)
+  ;; show visualizer diff display
+  (setq undo-tree-visualizer-diff t)
+  (let ((buff (with-current-buffer undo-tree-visualizer-parent-buffer
+		(undo-tree-diff node)))
+	(display-buffer-mark-dedicated 'soft)
+	win)
+    (setq win (split-window))
+    (set-window-buffer win buff)
+    (shrink-window-if-larger-than-buffer win)))
+
+
+(defun undo-tree-visualizer-hide-diff ()
+  ;; hide visualizer diff display
+  (setq undo-tree-visualizer-diff nil)
+  (let ((win (get-buffer-window undo-tree-diff-buffer-name)))
+    (when win (with-selected-window win (kill-buffer-and-window)))))
+
+
+(defun undo-tree-diff (&optional node)
+  ;; Create diff between current state and NODE (or previous state, if NODE is
+  ;; null). Returns buffer containing diff.
+  (let (tmpfile buff)
+    ;; generate diff
+    (let ((undo-tree-inhibit-kill-visualizer t)
+	  (current (undo-tree-current buffer-undo-tree)))
+      (undo-tree-set (or node (undo-tree-node-previous current) current)
+		     'preserve-timestamps)
+      (setq tmpfile (diff-file-local-copy (current-buffer)))
+      (undo-tree-set current 'preserve-timestamps))
+    (setq buff (diff-no-select
+		(current-buffer) tmpfile nil 'noasync
+		(get-buffer-create undo-tree-diff-buffer-name)))
+    ;; delete process messages and useless headers from diff buffer
+    (with-current-buffer buff
+      (goto-char (point-min))
+      (delete-region (point) (1+ (line-end-position 3)))
+      (goto-char (point-max))
+      (forward-line -2)
+      (delete-region (point) (point-max))
+      (setq cursor-type nil)
+      (setq buffer-read-only t))
+    buff))
+
+
+(defun undo-tree-visualizer-update-diff (&optional node)
+  ;; update visualizer diff display to show diff between current state and
+  ;; NODE (or previous state, if NODE is null)
+  (with-current-buffer undo-tree-visualizer-parent-buffer
+    (undo-tree-diff node))
+  (let ((win (get-buffer-window undo-tree-diff-buffer-name)))
+    (when win
+      (balance-windows)
+      (shrink-window-if-larger-than-buffer win))))
+
+;;;; ChangeLog:
+
+;; 2012-09-25  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	Updated undo-tree package to version 0.5.5.
+;; 	
+;; 	Small bug-fix to avoid hooks triggering an error when trying to save undo
+;; 	history in a buffer where undo is disabled.
+;; 
+;; 2012-09-11  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	Updated undo-tree package to version 0.5.4
+;; 	
+;; 	Bug-fixes and improvements to persistent history storage.
+;; 
+;; 2012-07-18  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	Update undo-tree to version 0.5.3
+;; 	
+;; 	* undo-tree.el: Cope gracefully with undo boundaries being deleted
+;; 	(cf. bug#11774). Allow customization of directory to which undo history is
+;; 	saved.
+;; 
+;; 2012-05-24  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	updated undo-tree package to version 0.5.2
+;; 	
+;; 	* undo-tree.el: add diff view feature in undo-tree visualizer.
+;; 
+;; 2012-05-02  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	undo-tree.el: Update package to version 0.4
+;; 
+;; 2012-04-20  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	undo-tree.el: Update package to version 0.3.4
+;; 	
+;; 	* undo-tree.el (undo-list-pop-changeset): fix pernicious bug causing undo
+;; 	history to be lost.
+;; 	(buffer-undo-tree): set permanent-local property.
+;; 	(undo-tree-enable-undo-in-region): add new customization option allowing
+;; 	undo-in-region to be disabled.
+;; 
+;; 2012-01-26  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	undo-tree.el: Fixed copyright attribution and Emacs status.
+;; 
+;; 2012-01-26  Toby S. Cubitt  <tsc25@cantab.net>
+;; 
+;; 	undo-tree.el: Update package to version 0.3.3
+;; 
+;; 2011-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+;; 
+;; 	Add undo-tree.el
+;; 
+
+
+
+
+(provide 'undo-tree)
+
+;;; undo-tree.el ends here
diff --git a/init.el b/init.el
index c0bc86a3..c16b9673 100644
--- a/init.el
+++ b/init.el
@@ -59,17 +59,9 @@
 (menu-bar-mode -1)
 
 ;; =============================================================================
-;;                                                                          tmux
+;;                                                                       Flymake
 ;; =============================================================================
 
-(defun tmux-copy (&optional b e) 
-  (interactive "r")
-  (shell-command-on-region b e "cat | tmux loadb -"))
-
-;; ;; =============================================================================
-;; ;;                                                                       Flymake
-;; ;; =============================================================================
-
 (require 'flymake)
 (require 'flymake-cursor)
 
@@ -83,7 +75,7 @@
 
 (add-to-list 'flymake-allowed-file-name-masks '("\\.py\\'" flymake-pylint-init))
 
-;; Load flymake on non-temp buffers
+; Load flymake on non-temp buffers
 (add-hook 'python-mode-hook
 	  (lambda () (unless (eq buffer-file-name nil) (flymake-mode 1))))
 
@@ -108,8 +100,7 @@
   (setq tab-width 4
         indent-tabs-mode t
         python-indent-offset 4))
-
-(add-hook 'python-mode-hook 'subword-mode)
+(python-tabs)
 
 ;; Yelp always uses tabs.
 (add-hook 'python-mode-hook 'python-tabs)
@@ -124,19 +115,16 @@
 (global-set-key (kbd "ESC <down>") (lambda () (interactive) (next-line 5)))
 (global-set-key (kbd "ESC <up>") (lambda () (interactive) (previous-line 5)))
 
+;; Macros
+(fset 'ipdb "import ipdb; ipdb.set_trace()")
+
 ;; Miscellaneous
 (global-set-key "\C-x\C-b" 'buffer-menu)
 (global-set-key "\C-xw" 'whitespace-mode)
 (global-set-key "\C-x\C-r" (lambda () (interactive) (revert-buffer t t)))
+(global-set-key "\C-x\C-i" 'increase-left-margin)
+(global-set-key "\C-x\C-d" 'decrease-left-margin)
 (global-set-key "\C-c\C-c" 'comment-region)
-(global-set-key (kbd "C-c w") 'tmux-copy)
-(global-set-key (kbd "C-x O") (lambda () (interactive) (other-window -1)))
-
-;; Something will occasionally override this binding.
-(global-set-key "\C-cg" 'rope-goto-definition)
-
-;; Macros
-(fset 'ipdb "import ipdb; ipdb.set_trace()")
 
 ;; =============================================================================
 ;;                                                                          ELPA
@@ -158,7 +146,7 @@
 ;;   (package-refresh-contents))
 
 ;; ;; Add in your own as you wish:
-;; (defvar my-packages '(starter-kit starter-starter-kit-bindings)
+;; (defvar my-packages '(starter-kit starter-kit-lisp starter-kit-bindings)
 ;;   "A list of packages to ensure are installed at launch.")
 
 ;; (dolist (p my-packages)
@@ -221,12 +209,11 @@
 
 (load-file "~/.emacs.d/emacs-for-python/epy-init.el")
 
-(setq skeleton-pair nil) ;; This breaks pasting from os clipboard
+(setq skeleton-pair nil) ;; This stuff sucks.
 
 ;; =============================================================================
 ;;                                                                     Customize
 ;; =============================================================================
-
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.